Skip to content
This repository has been archived by the owner on Mar 14, 2021. It is now read-only.

Commit

Permalink
Merge pull request #241 from Codeinwp/development
Browse files Browse the repository at this point in the history 
Adds email content wysiwyg editor. 
Improves layout for custom spam trap.
  • Loading branch information
@selul
selul authored Nov 27, 2017
2 parents 27bb9ea + 74d60db commit 3465933
Show file tree
Hide file tree
Showing 16 changed files with 270 additions and 754 deletions.
167 changes: 98 additions & 69 deletions admin/class-pirateforms-admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ public function enqueue_styles_and_scripts() {
wp_enqueue_script( 'pirateforms_scripts_admin', PIRATEFORMS_URL . 'admin/js/scripts-admin.js', array( 'jquery' ), $this->version );
wp_localize_script(
'pirateforms_scripts_admin', 'cwp_top_ajaxload', array(
'ajaxurl' => admin_url( 'admin-ajax.php' ),
'nonce' => wp_create_nonce( PIRATEFORMS_SLUG ),
'i10n' => array(
'ajaxurl' => admin_url( 'admin-ajax.php' ),
'nonce' => wp_create_nonce( PIRATEFORMS_SLUG ),
'i10n' => array(
'recaptcha' => __( 'Please specify the Site Key and Secret Key.', 'pirate-forms' ),
),
)
Expand Down Expand Up @@ -177,67 +177,77 @@ public function render_upsell() {
function settings() {
global $current_user;
$pirate_forms_options = PirateForms_Util::get_option();
$plugin_options = $this->pirate_forms_plugin_options();
$plugin_options = $this->get_plugin_options();
include_once PIRATEFORMS_DIR . 'admin/partials/pirateforms-settings-display.php';
}

/**
* Get any options that might be configured through the theme.
*/
function get_theme_options() {
$recaptcha_show = '';
$button_label = __( 'Send Message', 'pirate-forms' );
$email = get_bloginfo( 'admin_email' );

$theme = strtolower( wp_get_theme()->__get( 'name' ) );

// Default values from Zerif Lite.
if ( strpos( $theme, 'zerif' ) === 0 ) {
$zerif_contactus_recaptcha_show = get_theme_mod( 'zerif_contactus_recaptcha_show' );
if ( isset( $zerif_contactus_recaptcha_show ) && ( $zerif_contactus_recaptcha_show == '1' ) ) {
$recaptcha_show = '';
} else {
$recaptcha_show = 'custom';
}

$zerif_contactus_button_label = get_theme_mod( 'zerif_contactus_button_label', __( 'Send Message', 'pirate-forms' ) );
if ( ! empty( $zerif_contactus_button_label ) ) {
$button_label = $zerif_contactus_button_label;
}

$zerif_contactus_email = get_theme_mod( 'zerif_contactus_email' );
$zerif_email = get_theme_mod( 'zerif_email' );
if ( ! empty( $zerif_contactus_email ) ) {
$email = $zerif_contactus_email;
} elseif ( ! empty( $zerif_email ) ) {
$email = $zerif_email;
}
}

return array(
$recaptcha_show,
$button_label,
$email,
);
}


/**
*
* OPTIONS
*
* @since 1.0.0
* name; id; desc; type; default; options
*/
function pirate_forms_plugin_options() {
/**
********** Default values from Zerif Lite */
$zerif_contactus_sitekey = get_theme_mod( 'zerif_contactus_sitekey' );
if ( ! empty( $zerif_contactus_sitekey ) ) :
$pirate_forms_contactus_sitekey = $zerif_contactus_sitekey;
else :
$pirate_forms_contactus_sitekey = '';
endif;
$zerif_contactus_secretkey = get_theme_mod( 'zerif_contactus_secretkey' );
if ( ! empty( $zerif_contactus_secretkey ) ) :
$pirate_forms_contactus_secretkey = $zerif_contactus_secretkey;
else :
$pirate_forms_contactus_secretkey = '';
endif;
$zerif_contactus_recaptcha_show = get_theme_mod( 'zerif_contactus_recaptcha_show' );
if ( isset( $zerif_contactus_recaptcha_show ) && ( $zerif_contactus_recaptcha_show == '1' ) ) :
$pirate_forms_contactus_recaptcha_show = '';
else :
$pirate_forms_contactus_recaptcha_show = 'custom';
endif;
$zerif_contactus_button_label = get_theme_mod( 'zerif_contactus_button_label', __( 'Send Message', 'pirate-forms' ) );
if ( ! empty( $zerif_contactus_button_label ) ) :
$pirate_forms_contactus_button_label = $zerif_contactus_button_label;
else :
$pirate_forms_contactus_button_label = __( 'Send Message', 'pirate-forms' );
endif;
$zerif_contactus_email = get_theme_mod( 'zerif_contactus_email' );
$zerif_email = get_theme_mod( 'zerif_email' );
$pirate_forms_contactus_email = '';
if ( ! empty( $zerif_contactus_email ) ) :
$pirate_forms_contactus_email = $zerif_contactus_email;
elseif ( ! empty( $zerif_email ) ) :
$pirate_forms_contactus_email = $zerif_email;
else :
$pirate_forms_contactus_email = get_bloginfo( 'admin_email' );
endif;
function get_plugin_options() {
list(
$pirate_forms_contactus_recaptcha_show,
$pirate_forms_contactus_button_label,
$pirate_forms_contactus_email
) = $this->get_theme_options();

// check if akismet is installed
$akismet_status = false;
if ( is_plugin_active( 'akismet/akismet.php' ) ) {
$akismet_key = get_option( 'wordpress_api_key' );
$akismet_key = get_option( 'wordpress_api_key' );
if ( ! empty( $akismet_key ) ) {
$akismet_status = true;
}
}

$akismet_msg = '';
$akismet_msg = '';
if ( ! $akismet_status ) {
$akismet_msg = __( 'To use this option, please ensure Akismet is activated with a valid key.', 'pirate-forms' );
$akismet_msg = __( 'To use this option, please ensure Akismet is activated with a valid key.', 'pirate-forms' );
}

// the key(s) will be added to the div as class names
Expand Down Expand Up @@ -362,22 +372,22 @@ function pirate_forms_plugin_options() {
'options' => PirateForms_Util::get_thank_you_pages(),
),
array(
'id' => 'pirateformsopt_akismet',
'type' => 'checkbox',
'label' => array(
'id' => 'pirateformsopt_akismet',
'type' => 'checkbox',
'label' => array(
'value' => __( 'Integrate with Akismet?', 'pirate-forms' ),
'html' => '<span class="dashicons dashicons-editor-help"></span>',
'desc' => array(
'value' => sprintf( __( 'Checking this option will verify the content of the message with Akismet to check if it\'s spam. If it is determined to be spam, the message will be blocked. %s', 'pirate-forms' ), $akismet_msg ),
'class' => 'pirate_forms_option_description',
),
),
'value' => PirateForms_Util::get_option( 'pirateformsopt_akismet' ),
'wrap' => array(
'value' => PirateForms_Util::get_option( 'pirateformsopt_akismet' ),
'wrap' => array(
'type' => 'div',
'class' => 'pirate-forms-grouped',
),
'options' => array(
'options' => array(
'yes' => __( 'Yes', 'pirate-forms' ),
),
'disabled' => ! empty( $akismet_msg ),
Expand Down Expand Up @@ -497,9 +507,9 @@ function pirate_forms_plugin_options() {
'class' => 'pirate-forms-grouped',
),
'options' => array(
'' => __( 'No', 'pirate-forms' ),
'' => __( 'No', 'pirate-forms' ),
'custom' => __( 'Custom', 'pirate-forms' ),
'yes' => __( 'Google reCAPTCHA', 'pirate-forms' ),
'yes' => __( 'Google reCAPTCHA', 'pirate-forms' ),
),
),
/* Site key */
Expand All @@ -514,7 +524,6 @@ function pirate_forms_plugin_options() {
'class' => 'pirate_forms_option_description',
),
),
'default' => $pirate_forms_contactus_sitekey,
'value' => PirateForms_Util::get_option( 'pirateformsopt_recaptcha_sitekey' ),
'wrap' => array(
'type' => 'div',
Expand All @@ -528,7 +537,6 @@ function pirate_forms_plugin_options() {
'label' => array(
'value' => __( 'Secret key', 'pirate-forms' ),
),
'default' => $pirate_forms_contactus_secretkey,
'value' => PirateForms_Util::get_option( 'pirateformsopt_recaptcha_secretkey' ),
'wrap' => array(
'type' => 'div',
Expand All @@ -538,7 +546,7 @@ function pirate_forms_plugin_options() {
)
),
),
'pirate_labels' => array(
'pirate_labels pirate_dashicons' => array(
'heading' => __( 'Fields Labels', 'pirate-forms' ),
'controls' => apply_filters(
'pirate_forms_admin_controls_for_field_labels', array(
Expand Down Expand Up @@ -607,6 +615,25 @@ function pirate_forms_plugin_options() {
'class' => 'pirate-forms-grouped',
),
),
array(
'id' => 'pirateformsopt_email_content',
'type' => 'wysiwyg',
'label' => array(
'value' => __( 'Email content', 'pirate-forms' ),
'html' => '<br/><br/>' . esc_attr( __( 'You can use the next magic tags:', 'pirate-forms' ) ) . '<br/>' . PirateForms_Util::get_magic_tags(),
),
'default' => PirateForms_Util::get_default_email_content(),
'value' => PirateForms_Util::get_option( 'pirateformsopt_email_content' ),
'wrap' => array(
'type' => 'div',
'class' => 'pirate-forms-grouped',
),
'wysiwyg' => array(
'quicktags' => false,
'editor_class' => 'pirate-forms-wysiwyg',
'editor_height' => 500,
),
),
)
),
),
Expand Down Expand Up @@ -823,7 +850,7 @@ function pirate_forms_plugin_options() {
public function settings_init() {
if ( ! PirateForms_Util::get_option() ) {
$new_opt = array();
foreach ( $this->pirate_forms_plugin_options() as $tab => $array ) {
foreach ( $this->get_plugin_options() as $tab => $array ) {
foreach ( $array['controls'] as $controls ) {
$new_opt[ $controls['id'] ] = isset( $controls['default'] ) ? $controls['default'] : '';
}
Expand Down Expand Up @@ -937,12 +964,12 @@ public function manage_contact_posts_columns( $columns ) {
public function manage_contact_posts_custom_column( $column, $id ) {
switch ( $column ) {
case 'pf_mailstatus':
$response = get_post_meta( $id, PIRATEFORMS_SLUG . 'mail-status', true );
$failed = $response == 'false';
$response = get_post_meta( $id, PIRATEFORMS_SLUG . 'mail-status', true );
$failed = $response == 'false';
echo empty( $response ) ? __( 'Status not captured', 'pirate-forms' ) : ( $failed ? __( 'Mail sending failed!', 'pirate-forms' ) : __( 'Mail sent successfully!', 'pirate-forms' ) );

if ( $failed ) {
$reason = get_post_meta( $id, PIRATEFORMS_SLUG . 'mail-status-reason', true );
$reason = get_post_meta( $id, PIRATEFORMS_SLUG . 'mail-status-reason', true );
if ( ! empty( $reason ) ) {
echo ' (' . $reason . ')';
}
Expand All @@ -960,15 +987,15 @@ public function manage_contact_posts_custom_column( $column, $id ) {
public function test_email() {
check_ajax_referer( PIRATEFORMS_SLUG, 'security' );
add_filter( 'pirateformpro_get_form_attributes', array( $this, 'test_configuration' ), 999, 2 );
add_action( 'pirate_forms_after_processing', array( $this, 'test_result'), 10, 1 );
add_filter( 'pirate_forms_validate_request', array( $this, 'test_alter_session'), 10, 3 );
$_POST = array(
'honeypot' => '',
'pirate_forms_form_id' => isset( $_POST['pirate_forms_form_id'] ) ? $_POST['pirate_forms_form_id'] : '',
'pirate-forms-contact-name' => 'Test Name',
'pirate-forms-contact-email' => get_bloginfo( 'admin_email' ),
'pirate-forms-contact-subject' => 'Test Email',
'pirate-forms-contact-message' => 'This is a test.',
add_action( 'pirate_forms_after_processing', array( $this, 'test_result' ), 10, 1 );
add_filter( 'pirate_forms_validate_request', array( $this, 'test_alter_session' ), 10, 3 );
$_POST = array(
'honeypot' => '',
'pirate_forms_form_id' => isset( $_POST['pirate_forms_form_id'] ) ? $_POST['pirate_forms_form_id'] : '',
'pirate-forms-contact-name' => 'Test Name',
'pirate-forms-contact-email' => get_bloginfo( 'admin_email' ),
'pirate-forms-contact-subject' => 'Test Email',
'pirate-forms-contact-message' => 'This is a test.',
);
do_action( 'pirate_forms_send_email', true );
}
Expand All @@ -978,9 +1005,10 @@ public function test_email() {
*/
public function test_configuration( $options, $id ) {
// disable captcha
$options['pirateformsopt_recaptcha_field'] = 'no';
$options['pirateformsopt_recaptcha_field'] = 'no';
// disable attachments
$options['pirateformsopt_attachment_field'] = 'no';

return $options;
}

Expand All @@ -996,6 +1024,7 @@ public function test_result( $response ) {
*/
public function test_alter_session( $body, $error_key, $pirate_forms_options ) {
$_SESSION[ $error_key ] = '';

return $body;
}
}
2 changes: 1 addition & 1 deletion admin/css/wp-admin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -371,4 +371,4 @@ input#save.pirate-forms-save-button {

.pirate-forms-password-toggle span.dashicons {
cursor: pointer;
}
}
2 changes: 2 additions & 0 deletions admin/js/scripts-admin.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* global cwp_top_ajaxload */
/* global console */
/* global tinyMCE */

jQuery(document).ready(function() {
initAll();
Expand All @@ -17,6 +18,7 @@ function initAll(){

jQuery('.pirate-forms-save-button').click(function (e) {
e.preventDefault();
tinyMCE.triggerSave();
cwpTopUpdateForm();
return false;
});
Expand Down
3 changes: 3 additions & 0 deletions admin/partials/pirateforms-settings-sidebar-subscribe.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
<ul>
<li>Multiple forms builder</li>
<li>MailChimp integration</li>
<li>Aweber integration</li>
<li>GetResponse integration</li>
<li>Sendinblue integration</li>
<li>Developer friendly</li>
<li>Custom fields</li>
<li>12 months Support & Updates</li>
Expand Down
14 changes: 13 additions & 1 deletion includes/class-pirateforms-html.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ private function get_label( $args ) {
if ( isset( $args['label']['desc']['class'] ) ) {
$html .= ' class="' . esc_attr( $args['label']['desc']['class'] ) . '"';
}
$html .= '>' . esc_html( $args['label']['desc']['value'] ) . '</div>';
$html .= '>' . $args['label']['desc']['value'] . '</div>';
}
$html .= '</label>';
}
Expand Down Expand Up @@ -374,4 +374,16 @@ private function button( $args ) {
return $this->get_wrap( $args, $html );
}

/**
* The WYSIWYG element.
*/
private function wysiwyg( $args ) {
$html = $this->get_label( $args );
$content = isset( $args['value'] ) && ! empty( $args['value'] ) ? $args['value'] : $args['default'];
ob_start();
wp_editor( $content, $args['id'], $args['wysiwyg'] );
$html .= ob_get_clean();
return $this->get_wrap( $args, $html );
}

}
6 changes: 5 additions & 1 deletion includes/class-pirateforms-phpformbuilder.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,13 @@ function build_form( $elements, $pirate_forms_options, $from_widget ) {
$classes[] = $val['id'] . '-on';
} else {
$element = $html_helper->add( $val, false );
if ( 'form_honeypot' === $val['id'] || in_array( $val['type'], array( 'hidden', 'div' ) ) ) {
if ( ( 'form_honeypot' === $val['id'] || in_array( $val['type'], array( 'hidden', 'div' ) ) ) && $val['id'] !== 'pirate-forms-maps-custom'
) {
$form_end .= $element;
}
if ( $val['id'] === 'pirate-forms-maps-custom' ) {
$this->set_element( 'captcha', $element );
}
$this->set_element( $val['id'], $element );
$classes[] = $val['id'] . '-on';
}
Expand Down
Loading

0 comments on commit 3465933

Please sign in to comment.