Completed
Push — master ( 34a6d7...6a5510 )
by Jamie
04:20
created
classes/views/frm-fields/radio.php 2 patches
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,22 +1,22 @@
 block discarded – undo
1 1
 <?php
2 2
 if ( ! is_array($field['options']) ) {
3
-    return;
3
+	return;
4 4
 }
5 5
 
6 6
 foreach ( $field['options'] as $opt_key => $opt ) {
7
-    $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
8
-    $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
7
+	$field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
8
+	$opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
9 9
 
10
-    // Get string for Other text field, if needed
10
+	// Get string for Other text field, if needed
11 11
 	$other_val = FrmFieldsHelper::get_other_val( compact( 'opt_key', 'field' ) );
12 12
 
13
-    $checked = ( $other_val || isset($field['value']) &&  (( ! is_array($field['value']) && $field['value'] == $field_val ) || (is_array($field['value']) && in_array($field_val, $field['value']) ) ) ) ? ' checked="checked"':'';
13
+	$checked = ( $other_val || isset($field['value']) &&  (( ! is_array($field['value']) && $field['value'] == $field_val ) || (is_array($field['value']) && in_array($field_val, $field['value']) ) ) ) ? ' checked="checked"':'';
14 14
 
15 15
 	if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
16
-        include(FrmAppHelper::plugin_path() .'/pro/classes/views/frmpro-fields/other-option.php');
17
-    } else {
18
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/single-option.php');
19
-    }
16
+		include(FrmAppHelper::plugin_path() .'/pro/classes/views/frmpro-fields/other-option.php');
17
+	} else {
18
+		include(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/single-option.php');
19
+	}
20 20
 
21
-    unset($checked, $other_val);
21
+	unset($checked, $other_val);
22 22
 }
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,22 +1,22 @@
 block discarded – undo
1 1
 <?php
2
-if ( ! is_array($field['options']) ) {
2
+if ( ! is_array( $field['options'] ) ) {
3 3
     return;
4 4
 }
5 5
 
6 6
 foreach ( $field['options'] as $opt_key => $opt ) {
7
-    $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
8
-    $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
7
+    $field_val = apply_filters( 'frm_field_value_saved', $opt, $opt_key, $field );
8
+    $opt = apply_filters( 'frm_field_label_seen', $opt, $opt_key, $field );
9 9
 
10 10
     // Get string for Other text field, if needed
11 11
 	$other_val = FrmFieldsHelper::get_other_val( compact( 'opt_key', 'field' ) );
12 12
 
13
-    $checked = ( $other_val || isset($field['value']) &&  (( ! is_array($field['value']) && $field['value'] == $field_val ) || (is_array($field['value']) && in_array($field_val, $field['value']) ) ) ) ? ' checked="checked"':'';
13
+    $checked = ( $other_val || isset( $field['value'] ) && ( ( ! is_array( $field['value'] ) && $field['value'] == $field_val ) || ( is_array( $field['value'] ) && in_array( $field_val, $field['value'] ) ) ) ) ? ' checked="checked"' : '';
14 14
 
15 15
 	if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
16
-        include(FrmAppHelper::plugin_path() .'/pro/classes/views/frmpro-fields/other-option.php');
16
+        include( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
17 17
     } else {
18
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/single-option.php');
18
+        include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
19 19
     }
20 20
 
21
-    unset($checked, $other_val);
21
+    unset( $checked, $other_val );
22 22
 }
Please login to merge, or discard this patch.
classes/views/frm-fields/show-build.php 2 patches
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -2,39 +2,39 @@  discard block
 block discarded – undo
2 2
     <input type="text" name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" value="<?php echo esc_attr( $field['default_value'] ); ?>" <?php echo ( FrmField::is_option_true( $field, 'size' ) ) ? esc_attr( 'style="width:'. $field['size'] . ( is_numeric($field['size']) ? 'px' : '') .';"' ) : ''; ?> class="dyn_default_value" />
3 3
 <?php } else if ( $field['type'] == 'textarea' ) { ?>
4 4
     <textarea name="<?php echo esc_attr( $field_name ) ?>" <?php
5
-    echo ( FrmField::is_option_true( $field, 'size' ) ) ? esc_attr( 'style="width:'. $field['size'] . ( is_numeric($field['size']) ? 'px' : '') .';"' ) : '';
6
-    ?> rows="<?php echo esc_attr( $field['max'] ); ?>" id="<?php echo esc_attr( $html_id ) ?>" class="dyn_default_value"><?php echo FrmAppHelper::esc_textarea(force_balance_tags($field['default_value'])); ?></textarea>
5
+	echo ( FrmField::is_option_true( $field, 'size' ) ) ? esc_attr( 'style="width:'. $field['size'] . ( is_numeric($field['size']) ? 'px' : '') .';"' ) : '';
6
+	?> rows="<?php echo esc_attr( $field['max'] ); ?>" id="<?php echo esc_attr( $html_id ) ?>" class="dyn_default_value"><?php echo FrmAppHelper::esc_textarea(force_balance_tags($field['default_value'])); ?></textarea>
7 7
 
8 8
 <?php
9 9
 
10 10
 } else if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
11
-    $field['default_value'] = maybe_unserialize($field['default_value']);
12
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
11
+	$field['default_value'] = maybe_unserialize($field['default_value']);
12
+	if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
13 13
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
14
-    } else {
15
-        do_action('frm_add_multiple_opts_labels', $field); ?>
14
+	} else {
15
+		do_action('frm_add_multiple_opts_labels', $field); ?>
16 16
         <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts frm_clear<?php echo (count($field['options']) > 10) ? ' frm_field_opts_list' : ''; ?>">
17 17
         <?php include(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/radio.php'); ?>
18 18
         </ul>
19 19
     <?php
20
-    }
20
+	}
21 21
 } else if ( $field['type'] == 'select' ) {
22
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
22
+	if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
23 23
 		echo FrmFieldsHelper::dropdown_categories( array( 'name' => $field_name, 'field' => $field ) );
24
-    } else { ?>
24
+	} else { ?>
25 25
 	<select name="<?php echo esc_attr( $field_name ) . ( FrmField::is_option_true( $field, 'multiple' ) ? '[]' : '' ); ?>" <?php
26 26
 		echo FrmField::is_option_true( $field, 'size' ) ? 'class="auto_width"' : '';
27 27
 		echo FrmField::is_option_true( $field, 'multiple' ) ? ' multiple="multiple"' : ''; ?> >
28 28
 		<?php foreach ( $field['options'] as $opt_key => $opt ) {
29
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
30
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
29
+			$field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
30
+			$opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
31 31
 			$selected = ( $field['default_value'] == $field_val || FrmFieldsHelper::get_other_val( array( 'opt_key', 'field' ) ) ) ? ' selected="selected"' : ''; ?>
32 32
             <option value="<?php echo esc_attr( $field_val ) ?>"<?php echo $selected ?>><?php echo esc_html( $opt ) ?> </option>
33 33
         <?php } ?>
34 34
     </select>
35 35
 <?php }
36 36
 
37
-    if ( $display['default_blank'] ) { ?>
37
+	if ( $display['default_blank'] ) { ?>
38 38
         <span id="frm_clear_on_focus_<?php echo esc_attr( $field['id'] ) ?>" class="frm_clear_on_focus frm-show-click">
39 39
 		<?php FrmFieldsHelper::show_default_blank_js( $field['default_blank'] ); ?>
40 40
         </span>
@@ -49,17 +49,17 @@  discard block
 block discarded – undo
49 49
         <?php FrmFieldsHelper::show_single_option($field); ?>
50 50
         </ul>
51 51
 <?php
52
-    } ?>
52
+	} ?>
53 53
     </div>
54 54
 <?php
55 55
 } else if ( $field['type'] == 'captcha' ) {
56 56
 	if ( empty($frm_settings->pubkey) ) { ?>
57 57
     <div class="howto frm_no_captcha_text"><?php printf(__( 'Your captcha will not appear on your form until you %1$sset up%2$s the Site and Private Keys', 'formidable' ), '<a href="?page=formidable-settings">', '</a>') ?></div>
58 58
     <?php
59
-    } ?>
59
+	} ?>
60 60
 	<img src="<?php echo esc_url( FrmAppHelper::plugin_url() . '/images/recaptcha.png' ) ?>" class="recaptcha_placeholder" alt="reCaptcha"/>
61 61
     <input type="hidden" name="<?php echo esc_attr( $field_name ) ?>" value="1" />
62 62
 <?php
63 63
 } else {
64
-    do_action( 'frm_display_added_fields', $field );
64
+	do_action( 'frm_display_added_fields', $field );
65 65
 }
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,33 +1,33 @@  discard block
 block discarded – undo
1 1
 <?php if ( in_array( $display['type'], array( 'text', 'website', 'email', 'url' ) ) ) { ?>
2
-    <input type="text" name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" value="<?php echo esc_attr( $field['default_value'] ); ?>" <?php echo ( FrmField::is_option_true( $field, 'size' ) ) ? esc_attr( 'style="width:'. $field['size'] . ( is_numeric($field['size']) ? 'px' : '') .';"' ) : ''; ?> class="dyn_default_value" />
2
+    <input type="text" name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" value="<?php echo esc_attr( $field['default_value'] ); ?>" <?php echo ( FrmField::is_option_true( $field, 'size' ) ) ? esc_attr( 'style="width:' . $field['size'] . ( is_numeric( $field['size'] ) ? 'px' : '' ) . ';"' ) : ''; ?> class="dyn_default_value" />
3 3
 <?php } else if ( $field['type'] == 'textarea' ) { ?>
4 4
     <textarea name="<?php echo esc_attr( $field_name ) ?>" <?php
5
-    echo ( FrmField::is_option_true( $field, 'size' ) ) ? esc_attr( 'style="width:'. $field['size'] . ( is_numeric($field['size']) ? 'px' : '') .';"' ) : '';
6
-    ?> rows="<?php echo esc_attr( $field['max'] ); ?>" id="<?php echo esc_attr( $html_id ) ?>" class="dyn_default_value"><?php echo FrmAppHelper::esc_textarea(force_balance_tags($field['default_value'])); ?></textarea>
5
+    echo ( FrmField::is_option_true( $field, 'size' ) ) ? esc_attr( 'style="width:' . $field['size'] . ( is_numeric( $field['size'] ) ? 'px' : '' ) . ';"' ) : '';
6
+    ?> rows="<?php echo esc_attr( $field['max'] ); ?>" id="<?php echo esc_attr( $html_id ) ?>" class="dyn_default_value"><?php echo FrmAppHelper::esc_textarea( force_balance_tags( $field['default_value'] ) ); ?></textarea>
7 7
 
8 8
 <?php
9 9
 
10 10
 } else if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
11
-    $field['default_value'] = maybe_unserialize($field['default_value']);
12
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
11
+    $field['default_value'] = maybe_unserialize( $field['default_value'] );
12
+    if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' ) {
13 13
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
14 14
     } else {
15
-        do_action('frm_add_multiple_opts_labels', $field); ?>
16
-        <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts frm_clear<?php echo (count($field['options']) > 10) ? ' frm_field_opts_list' : ''; ?>">
17
-        <?php include(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/radio.php'); ?>
15
+        do_action( 'frm_add_multiple_opts_labels', $field ); ?>
16
+        <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts frm_clear<?php echo ( count( $field['options'] ) > 10 ) ? ' frm_field_opts_list' : ''; ?>">
17
+        <?php include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/radio.php' ); ?>
18 18
         </ul>
19 19
     <?php
20 20
     }
21 21
 } else if ( $field['type'] == 'select' ) {
22
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
22
+    if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' ) {
23 23
 		echo FrmFieldsHelper::dropdown_categories( array( 'name' => $field_name, 'field' => $field ) );
24 24
     } else { ?>
25 25
 	<select name="<?php echo esc_attr( $field_name ) . ( FrmField::is_option_true( $field, 'multiple' ) ? '[]' : '' ); ?>" <?php
26 26
 		echo FrmField::is_option_true( $field, 'size' ) ? 'class="auto_width"' : '';
27 27
 		echo FrmField::is_option_true( $field, 'multiple' ) ? ' multiple="multiple"' : ''; ?> >
28 28
 		<?php foreach ( $field['options'] as $opt_key => $opt ) {
29
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
30
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
29
+            $field_val = apply_filters( 'frm_field_value_saved', $opt, $opt_key, $field );
30
+            $opt = apply_filters( 'frm_field_label_seen', $opt, $opt_key, $field );
31 31
 			$selected = ( $field['default_value'] == $field_val || FrmFieldsHelper::get_other_val( array( 'opt_key', 'field' ) ) ) ? ' selected="selected"' : ''; ?>
32 32
             <option value="<?php echo esc_attr( $field_val ) ?>"<?php echo $selected ?>><?php echo esc_html( $opt ) ?> </option>
33 33
         <?php } ?>
@@ -44,17 +44,17 @@  discard block
 block discarded – undo
44 44
     <?php
45 45
 
46 46
 	if ( ! isset( $field['post_field'] ) || ! in_array( $field['post_field'], array( 'post_category' ) ) ) { ?>
47
-        <?php do_action('frm_add_multiple_opts_labels', $field); ?>
48
-        <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts<?php echo ( count($field['options']) > 10 ) ? ' frm_field_opts_list' : ''; ?>">
49
-        <?php FrmFieldsHelper::show_single_option($field); ?>
47
+        <?php do_action( 'frm_add_multiple_opts_labels', $field ); ?>
48
+        <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts<?php echo ( count( $field['options'] ) > 10 ) ? ' frm_field_opts_list' : ''; ?>">
49
+        <?php FrmFieldsHelper::show_single_option( $field ); ?>
50 50
         </ul>
51 51
 <?php
52 52
     } ?>
53 53
     </div>
54 54
 <?php
55 55
 } else if ( $field['type'] == 'captcha' ) {
56
-	if ( empty($frm_settings->pubkey) ) { ?>
57
-    <div class="howto frm_no_captcha_text"><?php printf(__( 'Your captcha will not appear on your form until you %1$sset up%2$s the Site and Private Keys', 'formidable' ), '<a href="?page=formidable-settings">', '</a>') ?></div>
56
+	if ( empty( $frm_settings->pubkey ) ) { ?>
57
+    <div class="howto frm_no_captcha_text"><?php printf( __( 'Your captcha will not appear on your form until you %1$sset up%2$s the Site and Private Keys', 'formidable' ), '<a href="?page=formidable-settings">', '</a>' ) ?></div>
58 58
     <?php
59 59
     } ?>
60 60
 	<img src="<?php echo esc_url( FrmAppHelper::plugin_url() . '/images/recaptcha.png' ) ?>" class="recaptcha_placeholder" alt="reCaptcha"/>
Please login to merge, or discard this patch.
classes/views/frm-fields/single-option.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <li id="frm_delete_field_<?php echo esc_attr( $field['id'] ); ?>-<?php echo esc_attr( $opt_key ) ?>_container" class="frm_single_option">
2 2
     <a href="javascript:void(0)" class="frm_single_visible_hover frm_icon_font frm_delete_icon" data-fid="<?php echo esc_attr( $field['id'] ); ?>"> </a>
3 3
     <?php if ( $field['type'] != 'select' ) { ?>
4
-        <input type="<?php echo esc_attr( $field['type'] ) ?>" name="<?php echo esc_attr( $field_name ) ?><?php echo ( $field['type'] == 'checkbox' ) ? '[]' : ''; ?>" value="<?php echo esc_attr($field_val) ?>"<?php echo isset( $checked ) ? $checked : ''; ?>/>
4
+        <input type="<?php echo esc_attr( $field['type'] ) ?>" name="<?php echo esc_attr( $field_name ) ?><?php echo ( $field['type'] == 'checkbox' ) ? '[]' : ''; ?>" value="<?php echo esc_attr( $field_val ) ?>"<?php echo isset( $checked ) ? $checked : ''; ?>/>
5 5
     <?php } ?>
6
-	<label class="frm_ipe_field_option field_<?php echo esc_attr( $field['id'] ) ?>_option <?php echo $field['separate_value'] ? 'frm_with_key' : ''; ?>" id="<?php echo esc_attr( $html_id . '-' . $opt_key ) ?>"><?php echo ($opt == '') ? __( '(Blank)', 'formidable' ) : $opt ?></label>
6
+	<label class="frm_ipe_field_option field_<?php echo esc_attr( $field['id'] ) ?>_option <?php echo $field['separate_value'] ? 'frm_with_key' : ''; ?>" id="<?php echo esc_attr( $html_id . '-' . $opt_key ) ?>"><?php echo ( $opt == '' ) ? __( '(Blank)', 'formidable' ) : $opt ?></label>
7 7
     <span class="frm_option_key field_<?php echo esc_attr( $field['id'] ) ?>_option_key<?php echo $field['separate_value'] ? '' : ' frm_hidden'; ?>">
8 8
 		<label class="frm-show-click frm_ipe_field_option_key" id="field_key_<?php echo esc_attr( $field['id'] . '-' . $opt_key ) ?>"><?php echo ( $field_val == '' ) ? esc_html__( '(Blank)', 'formidable' ) : $field_val ?></label>
9 9
     </span>
10 10
 </li>
11 11
 <?php
12
-unset($field_val, $opt, $opt_key);
12
+unset( $field_val, $opt, $opt_key );
Please login to merge, or discard this patch.
classes/views/frm-form-actions/_action_inside.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@  discard block
 block discarded – undo
1
-<input type="hidden" name="<?php echo esc_attr( $action_control->get_field_name('post_excerpt', '') ) ?>" class="frm_action_name" value="<?php echo esc_attr( $form_action->post_excerpt ); ?>" />
2
-<input type="hidden" name="<?php echo esc_attr( $action_control->get_field_name('ID', '') ) ?>" value="<?php echo esc_attr( $form_action->ID ); ?>" />
1
+<input type="hidden" name="<?php echo esc_attr( $action_control->get_field_name( 'post_excerpt', '' ) ) ?>" class="frm_action_name" value="<?php echo esc_attr( $form_action->post_excerpt ); ?>" />
2
+<input type="hidden" name="<?php echo esc_attr( $action_control->get_field_name( 'ID', '' ) ) ?>" value="<?php echo esc_attr( $form_action->ID ); ?>" />
3 3
 
4 4
 <table class="form-table">
5 5
     <tr>
6 6
         <th>
7
-            <label <?php FrmAppHelper::maybe_add_tooltip('action_title') ?>><?php _e( 'Label', 'formidable' ) ?></label>
7
+            <label <?php FrmAppHelper::maybe_add_tooltip( 'action_title' ) ?>><?php _e( 'Label', 'formidable' ) ?></label>
8 8
         </th>
9
-        <td><input type="text" name="<?php echo esc_attr( $action_control->get_field_name('post_title', '') ) ?>" value="<?php echo esc_attr($form_action->post_title); ?>" class="large-text <?php FrmAppHelper::maybe_add_tooltip('action_title', 'open') ?>" id="<?php echo esc_attr( $action_control->get_field_id('action_post_title') ) ?>" />
9
+        <td><input type="text" name="<?php echo esc_attr( $action_control->get_field_name( 'post_title', '' ) ) ?>" value="<?php echo esc_attr( $form_action->post_title ); ?>" class="large-text <?php FrmAppHelper::maybe_add_tooltip( 'action_title', 'open' ) ?>" id="<?php echo esc_attr( $action_control->get_field_id( 'action_post_title' ) ) ?>" />
10 10
         </td>
11 11
     </tr>
12 12
 </table>
13
-<?php $action_control->form($form_action, compact('form', 'action_key', 'values')); ?>
13
+<?php $action_control->form( $form_action, compact( 'form', 'action_key', 'values' ) ); ?>
14 14
 
15 15
 <table class="form-table frm-no-margin">
16 16
     <tr><td>
@@ -25,18 +25,18 @@  discard block
 block discarded – undo
25 25
 
26 26
 if ( count( $action_control->action_options['event'] ) == 1 || $action_control->action_options['force_event'] ) {
27 27
 	foreach ( $action_control->action_options['event'] as $e ) { ?>
28
-	<input type="hidden" name="<?php echo esc_attr( $action_control->get_field_name('event') ) ?>[]" value="<?php echo esc_attr( $e ) ?>" />
28
+	<input type="hidden" name="<?php echo esc_attr( $action_control->get_field_name( 'event' ) ) ?>[]" value="<?php echo esc_attr( $e ) ?>" />
29 29
 <?php
30 30
 	}
31 31
 } else {
32 32
 ?>
33 33
 	<p><label class="frm_left_label"><?php _e( 'Trigger this action after', 'formidable' ) ?></label>
34
-		<select name="<?php echo esc_attr( $action_control->get_field_name('event') ) ?>[]" multiple="multiple" class="frm_multiselect" id="<?php echo esc_attr( $action_control->get_field_id('event') ) ?>">
34
+		<select name="<?php echo esc_attr( $action_control->get_field_name( 'event' ) ) ?>[]" multiple="multiple" class="frm_multiselect" id="<?php echo esc_attr( $action_control->get_field_id( 'event' ) ) ?>">
35 35
 <?php
36 36
 
37 37
 	$event_labels = FrmFormAction::trigger_labels();
38 38
 	foreach ( $action_control->action_options['event'] as $event ) { ?>
39
-		<option value="<?php echo esc_attr( $event ) ?>" <?php echo in_array( $event, (array) $form_action->post_content['event'] ) ? ' selected="selected"' : ''; ?> ><?php echo isset( $event_labels[ $event ] ) ? $event_labels[ $event ] : $event; ?></option>
39
+		<option value="<?php echo esc_attr( $event ) ?>" <?php echo in_array( $event, (array) $form_action->post_content['event'] ) ? ' selected="selected"' : ''; ?> ><?php echo isset( $event_labels[$event] ) ? $event_labels[$event] : $event; ?></option>
40 40
 <?php
41 41
 	}
42 42
 ?>		</select>
@@ -47,6 +47,6 @@  discard block
 block discarded – undo
47 47
 do_action( 'frm_additional_action_settings', $form_action, compact( 'form', 'action_control', 'action_key', 'values' ) );
48 48
 
49 49
 ?>
50
-    <span class="alignright frm_action_id <?php echo empty( $form_action->ID ) ? 'frm_hidden' : ''; ?>"><?php printf( __( 'Action ID: %1$s', 'formidable' ), $form_action->ID); ?></span>
50
+    <span class="alignright frm_action_id <?php echo empty( $form_action->ID ) ? 'frm_hidden' : ''; ?>"><?php printf( __( 'Action ID: %1$s', 'formidable' ), $form_action->ID ); ?></span>
51 51
     </td></tr>
52 52
 </table>
Please login to merge, or discard this patch.
classes/views/frm-form-actions/_email_settings.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,11 +6,11 @@
 block discarded – undo
6 6
     </td>
7 7
     <td class="frm_bcc_cc_container">
8 8
         <a href="javascript:void(0)" class="button frm_email_buttons frm_bcc_button <?php
9
-        echo ( ! empty($form_action->post_content['bcc'])  ? 'frm_hidden' : '' );
10
-        ?>" data-emailrow="bcc"><?php _e( 'BCC', 'formidable' ) ?></a>
9
+		echo ( ! empty($form_action->post_content['bcc'])  ? 'frm_hidden' : '' );
10
+		?>" data-emailrow="bcc"><?php _e( 'BCC', 'formidable' ) ?></a>
11 11
         <a href="javascript:void(0)" class="button frm_email_buttons frm_cc_button <?php
12
-        echo ( ! empty($form_action->post_content['cc'])  ? 'frm_hidden' : '' );
13
-        ?>" data-emailrow="cc"><?php _e( 'CC', 'formidable' ) ?></a>
12
+		echo ( ! empty($form_action->post_content['cc'])  ? 'frm_hidden' : '' );
13
+		?>" data-emailrow="cc"><?php _e( 'CC', 'formidable' ) ?></a>
14 14
     </td>
15 15
 </tr>
16 16
 <tr id="frm_cc_row" class="<?php echo empty( $form_action->post_content['cc'] )  ? 'frm_hidden' : ''; ?>" >
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -1,63 +1,63 @@
 block discarded – undo
1 1
 <table class="form-table frm-no-margin">
2 2
 <tr>
3
-    <th><label <?php FrmAppHelper::maybe_add_tooltip('email_to') ?>><?php _e( 'To', 'formidable' ) ?></label>
3
+    <th><label <?php FrmAppHelper::maybe_add_tooltip( 'email_to' ) ?>><?php _e( 'To', 'formidable' ) ?></label>
4 4
     </th>
5
-    <td><input type="text" name="<?php echo esc_attr( $this->get_field_name('email_to') ) ?>" value="<?php echo esc_attr( $form_action->post_content['email_to'] ); ?>" class="frm_not_email_to frm_email_blur large-text <?php FrmAppHelper::maybe_add_tooltip('email_to', 'open') ?>" id="<?php echo esc_attr( $this->get_field_id('email_to') ) ?>" />
5
+    <td><input type="text" name="<?php echo esc_attr( $this->get_field_name( 'email_to' ) ) ?>" value="<?php echo esc_attr( $form_action->post_content['email_to'] ); ?>" class="frm_not_email_to frm_email_blur large-text <?php FrmAppHelper::maybe_add_tooltip( 'email_to', 'open' ) ?>" id="<?php echo esc_attr( $this->get_field_id( 'email_to' ) ) ?>" />
6 6
     </td>
7 7
     <td class="frm_bcc_cc_container">
8 8
         <a href="javascript:void(0)" class="button frm_email_buttons frm_bcc_button <?php
9
-        echo ( ! empty($form_action->post_content['bcc'])  ? 'frm_hidden' : '' );
9
+        echo ( ! empty( $form_action->post_content['bcc'] ) ? 'frm_hidden' : '' );
10 10
         ?>" data-emailrow="bcc"><?php _e( 'BCC', 'formidable' ) ?></a>
11 11
         <a href="javascript:void(0)" class="button frm_email_buttons frm_cc_button <?php
12
-        echo ( ! empty($form_action->post_content['cc'])  ? 'frm_hidden' : '' );
12
+        echo ( ! empty( $form_action->post_content['cc'] ) ? 'frm_hidden' : '' );
13 13
         ?>" data-emailrow="cc"><?php _e( 'CC', 'formidable' ) ?></a>
14 14
     </td>
15 15
 </tr>
16
-<tr id="frm_cc_row" class="<?php echo empty( $form_action->post_content['cc'] )  ? 'frm_hidden' : ''; ?>" >
17
-    <th><label <?php FrmAppHelper::maybe_add_tooltip('cc') ?>><?php _e( 'CC', 'formidable' ) ?></label>
16
+<tr id="frm_cc_row" class="<?php echo empty( $form_action->post_content['cc'] ) ? 'frm_hidden' : ''; ?>" >
17
+    <th><label <?php FrmAppHelper::maybe_add_tooltip( 'cc' ) ?>><?php _e( 'CC', 'formidable' ) ?></label>
18 18
     </th>
19 19
     <td class="frm_right_addon">
20
-        <input type="text" name="<?php echo esc_attr( $this->get_field_name('cc') ) ?>" value="<?php echo esc_attr( $form_action->post_content['cc'] ); ?>" class="frm_not_email_to large-text <?php FrmAppHelper::maybe_add_tooltip('cc', 'open') ?>" id="<?php echo esc_attr( $this->get_field_id('cc') ) ?>" />
20
+        <input type="text" name="<?php echo esc_attr( $this->get_field_name( 'cc' ) ) ?>" value="<?php echo esc_attr( $form_action->post_content['cc'] ); ?>" class="frm_not_email_to large-text <?php FrmAppHelper::maybe_add_tooltip( 'cc', 'open' ) ?>" id="<?php echo esc_attr( $this->get_field_id( 'cc' ) ) ?>" />
21 21
         <a href="javascript:void(0)" class="frm_icon_font frm_remove_field frm_cancel1_icon" data-emailrow="cc"></a>
22 22
     </td>
23 23
     <td></td>
24 24
 </tr>
25
-<tr id="frm_bcc_row" class="<?php echo empty( $form_action->post_content['bcc'] )  ? 'frm_hidden' : ''; ?>" >
26
-    <th><label <?php FrmAppHelper::maybe_add_tooltip('bcc') ?>><?php _e( 'BCC', 'formidable' ) ?></label>
25
+<tr id="frm_bcc_row" class="<?php echo empty( $form_action->post_content['bcc'] ) ? 'frm_hidden' : ''; ?>" >
26
+    <th><label <?php FrmAppHelper::maybe_add_tooltip( 'bcc' ) ?>><?php _e( 'BCC', 'formidable' ) ?></label>
27 27
     </th>
28 28
     <td class="frm_right_addon">
29
-        <input type="text" name="<?php echo esc_attr( $this->get_field_name('bcc') ) ?>" value="<?php echo esc_attr( $form_action->post_content['bcc'] ); ?>" class="frm_not_email_to large-text <?php FrmAppHelper::maybe_add_tooltip('bcc', 'open') ?>" id="<?php echo esc_attr( $this->get_field_id('bcc') ) ?>" />
29
+        <input type="text" name="<?php echo esc_attr( $this->get_field_name( 'bcc' ) ) ?>" value="<?php echo esc_attr( $form_action->post_content['bcc'] ); ?>" class="frm_not_email_to large-text <?php FrmAppHelper::maybe_add_tooltip( 'bcc', 'open' ) ?>" id="<?php echo esc_attr( $this->get_field_id( 'bcc' ) ) ?>" />
30 30
         <a href="javascript:void(0)" class="frm_icon_font frm_remove_field frm_cancel1_icon" data-emailrow="bcc"></a>
31 31
     </td>
32 32
     <td></td>
33 33
 </tr>
34
-<tr id="frm_reply_to_row" class="<?php echo empty( $form_action->post_content['reply_to'] )  ? 'frm_hidden' : ''; ?>">
35
-    <th><label <?php FrmAppHelper::maybe_add_tooltip('reply_to') ?>><?php _e( 'Reply to', 'formidable' ) ?></label>
34
+<tr id="frm_reply_to_row" class="<?php echo empty( $form_action->post_content['reply_to'] ) ? 'frm_hidden' : ''; ?>">
35
+    <th><label <?php FrmAppHelper::maybe_add_tooltip( 'reply_to' ) ?>><?php _e( 'Reply to', 'formidable' ) ?></label>
36 36
     </th>
37 37
     <td class="frm_right_addon">
38
-        <input type="text" name="<?php echo esc_attr( $this->get_field_name('reply_to') ) ?>" value="<?php echo esc_attr( $form_action->post_content['reply_to'] ); ?>" class="frm_not_email_to large-text <?php FrmAppHelper::maybe_add_tooltip('reply_to', 'open') ?>" id="<?php echo esc_attr( $this->get_field_id('reply_to') ) ?>" />
38
+        <input type="text" name="<?php echo esc_attr( $this->get_field_name( 'reply_to' ) ) ?>" value="<?php echo esc_attr( $form_action->post_content['reply_to'] ); ?>" class="frm_not_email_to large-text <?php FrmAppHelper::maybe_add_tooltip( 'reply_to', 'open' ) ?>" id="<?php echo esc_attr( $this->get_field_id( 'reply_to' ) ) ?>" />
39 39
         <a href="javascript:void(0)" class="frm_icon_font frm_remove_field frm_cancel1_icon" data-emailrow="reply_to"></a>
40 40
     </td>
41 41
     <td></td>
42 42
 </tr>
43 43
 <tr>
44
-    <th><label <?php FrmAppHelper::maybe_add_tooltip('from') ?>><?php _e( 'From', 'formidable' ) ?></label></th>
45
-    <td><input type="text" name="<?php echo esc_attr( $this->get_field_name('from') ) ?>" value="<?php echo esc_attr( $form_action->post_content['from'] ); ?>" class="frm_not_email_to frm_email_blur large-text <?php FrmAppHelper::maybe_add_tooltip('from', 'open') ?>" id="<?php echo esc_attr( $this->get_field_id('from') ) ?>" />
44
+    <th><label <?php FrmAppHelper::maybe_add_tooltip( 'from' ) ?>><?php _e( 'From', 'formidable' ) ?></label></th>
45
+    <td><input type="text" name="<?php echo esc_attr( $this->get_field_name( 'from' ) ) ?>" value="<?php echo esc_attr( $form_action->post_content['from'] ); ?>" class="frm_not_email_to frm_email_blur large-text <?php FrmAppHelper::maybe_add_tooltip( 'from', 'open' ) ?>" id="<?php echo esc_attr( $this->get_field_id( 'from' ) ) ?>" />
46 46
     </td>
47
-    <td><a href="javascript:void(0)" class="button frm_email_buttons frm_reply_to_button <?php echo ( ! empty( $form_action->post_content['reply_to'] )  ? 'frm_hidden' : '' ) ?>" data-emailrow="reply_to"><?php _e( 'Reply To', 'formidable' ) ?></a></td>
47
+    <td><a href="javascript:void(0)" class="button frm_email_buttons frm_reply_to_button <?php echo ( ! empty( $form_action->post_content['reply_to'] ) ? 'frm_hidden' : '' ) ?>" data-emailrow="reply_to"><?php _e( 'Reply To', 'formidable' ) ?></a></td>
48 48
 </tr>
49 49
  <tr>
50 50
      <td colspan="3" class="frm_no_top_padding">
51
-         <p><label <?php FrmAppHelper::maybe_add_tooltip('email_subject', '', $form->name) ?>><?php _e( 'Subject', 'formidable' ) ?></label><br/>
52
-         <input type="text" name="<?php echo esc_attr( $this->get_field_name('email_subject') ) ?>" class="frm_not_email_subject large-text <?php FrmAppHelper::maybe_add_tooltip('email_subject', 'open', $form->name) ?>" id="<?php echo esc_attr( $this->get_field_id('email_subject') ) ?>" size="55" value="<?php echo esc_attr( $form_action->post_content['email_subject'] ); ?>" /></p>
51
+         <p><label <?php FrmAppHelper::maybe_add_tooltip( 'email_subject', '', $form->name ) ?>><?php _e( 'Subject', 'formidable' ) ?></label><br/>
52
+         <input type="text" name="<?php echo esc_attr( $this->get_field_name( 'email_subject' ) ) ?>" class="frm_not_email_subject large-text <?php FrmAppHelper::maybe_add_tooltip( 'email_subject', 'open', $form->name ) ?>" id="<?php echo esc_attr( $this->get_field_id( 'email_subject' ) ) ?>" size="55" value="<?php echo esc_attr( $form_action->post_content['email_subject'] ); ?>" /></p>
53 53
 
54 54
         <p><label><?php _e( 'Message', 'formidable' ) ?> </label><br/>
55
-        <textarea name="<?php echo esc_attr( $this->get_field_name('email_message') ) ?>" class="frm_not_email_message large-text" id="<?php echo esc_attr( $this->get_field_id('email_message') ) ?>" cols="50" rows="5"><?php echo FrmAppHelper::esc_textarea($form_action->post_content['email_message']) ?></textarea></p>
55
+        <textarea name="<?php echo esc_attr( $this->get_field_name( 'email_message' ) ) ?>" class="frm_not_email_message large-text" id="<?php echo esc_attr( $this->get_field_id( 'email_message' ) ) ?>" cols="50" rows="5"><?php echo FrmAppHelper::esc_textarea( $form_action->post_content['email_message'] ) ?></textarea></p>
56 56
 
57 57
         <h4><?php _e( 'Options', 'formidable' ) ?> </h4>
58
-            <label for="<?php echo esc_attr( $this->get_field_id('inc_user_info') ) ?>"><input type="checkbox" name="<?php echo esc_attr( $this->get_field_name('inc_user_info') ) ?>" class="frm_not_inc_user_info" id="<?php echo esc_attr( $this->get_field_id('inc_user_info') ) ?>" value="1" <?php checked( $form_action->post_content['inc_user_info'], 1 ); ?> /> <?php _e( 'Append IP Address, Browser, and Referring URL to message', 'formidable' ) ?></label>
58
+            <label for="<?php echo esc_attr( $this->get_field_id( 'inc_user_info' ) ) ?>"><input type="checkbox" name="<?php echo esc_attr( $this->get_field_name( 'inc_user_info' ) ) ?>" class="frm_not_inc_user_info" id="<?php echo esc_attr( $this->get_field_id( 'inc_user_info' ) ) ?>" value="1" <?php checked( $form_action->post_content['inc_user_info'], 1 ); ?> /> <?php _e( 'Append IP Address, Browser, and Referring URL to message', 'formidable' ) ?></label>
59 59
 
60
-        <p><label for="<?php echo esc_attr( $this->get_field_id('plain_text') ) ?>"><input type="checkbox" name="<?php echo esc_attr( $this->get_field_name('plain_text') ) ?>" id="<?php echo esc_attr( $this->get_field_id('plain_text') ) ?>" value="1" <?php checked( $form_action->post_content['plain_text'], 1 ); ?> /> <?php _e( 'Send Emails in Plain Text', 'formidable' ) ?></label></p>
60
+        <p><label for="<?php echo esc_attr( $this->get_field_id( 'plain_text' ) ) ?>"><input type="checkbox" name="<?php echo esc_attr( $this->get_field_name( 'plain_text' ) ) ?>" id="<?php echo esc_attr( $this->get_field_id( 'plain_text' ) ) ?>" value="1" <?php checked( $form_action->post_content['plain_text'], 1 ); ?> /> <?php _e( 'Send Emails in Plain Text', 'formidable' ) ?></label></p>
61 61
     </td>
62 62
 </tr>
63 63
 </table>
Please login to merge, or discard this patch.
classes/views/frm-form-actions/default_actions.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 class FrmDefPostAction extends FrmFormAction {
4 4
 	public function __construct() {
5 5
 		$action_ops = FrmFormAction::default_action_opts();
6
-	    $action_ops['classes'] = 'ab-icon frm_dashicon_font dashicons-before';
6
+		$action_ops['classes'] = 'ab-icon frm_dashicon_font dashicons-before';
7 7
 
8 8
 		parent::__construct( 'wppost', __( 'Create Post', 'formidable' ), $action_ops );
9 9
 	}
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 // add register action
13 13
 class FrmDefRegAction extends FrmFormAction {
14 14
 	public function __construct() {
15
-		$action_ops = FrmFormAction::default_action_opts('frm_register_icon');
15
+		$action_ops = FrmFormAction::default_action_opts( 'frm_register_icon' );
16 16
 		parent::__construct( 'register', __( 'Register User', 'formidable' ), $action_ops );
17 17
 	}
18 18
 }
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 // add paypal action
21 21
 class FrmDefPayPalAction extends FrmFormAction {
22 22
 	public function __construct() {
23
-		$action_ops = FrmFormAction::default_action_opts('frm_paypal_icon');
23
+		$action_ops = FrmFormAction::default_action_opts( 'frm_paypal_icon' );
24 24
 		parent::__construct( 'paypal', __( 'Collect Payment', 'formidable' ), $action_ops );
25 25
 	}
26 26
 }
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 // add aweber action
29 29
 class FrmDefAweberAction extends FrmFormAction {
30 30
 	public function __construct() {
31
-		$action_ops = FrmFormAction::default_action_opts('frm_aweber_icon');
31
+		$action_ops = FrmFormAction::default_action_opts( 'frm_aweber_icon' );
32 32
 		parent::__construct( 'aweber', __( 'Aweber', 'formidable' ), $action_ops );
33 33
 	}
34 34
 }
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 // add mailchimp action
37 37
 class FrmDefMlcmpAction extends FrmFormAction {
38 38
 	public function __construct() {
39
-		$action_ops = FrmFormAction::default_action_opts('frm_mailchimp_icon');
39
+		$action_ops = FrmFormAction::default_action_opts( 'frm_mailchimp_icon' );
40 40
 		parent::__construct( 'mailchimp', __( 'MailChimp', 'formidable' ), $action_ops );
41 41
 	}
42 42
 }
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 // add twilio action
45 45
 class FrmDefTwilioAction extends FrmFormAction {
46 46
 	public function __construct() {
47
-		$action_ops = FrmFormAction::default_action_opts('frm_sms_icon');
47
+		$action_ops = FrmFormAction::default_action_opts( 'frm_sms_icon' );
48 48
 		parent::__construct( 'twilio', __( 'Twilio', 'formidable' ), $action_ops );
49 49
 	}
50 50
 }
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 // add highrise action
53 53
 class FrmDefHrsAction extends FrmFormAction {
54 54
 	public function __construct() {
55
-		$action_ops = FrmFormAction::default_action_opts('frm_highrise_icon');
55
+		$action_ops = FrmFormAction::default_action_opts( 'frm_highrise_icon' );
56 56
 		parent::__construct( 'highrise', __( 'Highrise', 'formidable' ), $action_ops );
57 57
 	}
58 58
 }
Please login to merge, or discard this patch.
classes/views/frm-form-actions/email_action.php 2 patches
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -4,12 +4,12 @@  discard block
 block discarded – undo
4 4
 
5 5
 	public function __construct() {
6 6
 		$action_ops = array(
7
-		    'classes'   => 'frm_email_icon frm_icon_font',
8
-            'active'    => true,
7
+			'classes'   => 'frm_email_icon frm_icon_font',
8
+			'active'    => true,
9 9
 			'event'     => array( 'create' ),
10
-            'limit'     => 99,
11
-            'priority'  => 10,
12
-            'ajax_load' => false,
10
+			'limit'     => 99,
11
+			'priority'  => 10,
12
+			'ajax_load' => false,
13 13
 		);
14 14
 		$action_ops = apply_filters('frm_email_control_settings', $action_ops);
15 15
 
@@ -17,23 +17,23 @@  discard block
 block discarded – undo
17 17
 	}
18 18
 
19 19
 	public function form( $form_action, $args = array() ) {
20
-	    extract($args);
20
+		extract($args);
21 21
 
22
-	    include(FrmAppHelper::plugin_path() .'/classes/views/frm-form-actions/_email_settings.php');
22
+		include(FrmAppHelper::plugin_path() .'/classes/views/frm-form-actions/_email_settings.php');
23 23
 	}
24 24
 
25 25
 	public function get_defaults() {
26
-	    return array(
27
-            'email_to'      => '[admin_email]',
28
-            'cc'            => '',
29
-            'bcc'           => '',
30
-            'from'          => '[sitename] <[admin_email]>',
31
-            'reply_to'      => '',
32
-            'email_subject' => '',
33
-            'email_message' => '[default-message]',
34
-            'inc_user_info' => 0,
35
-            'plain_text'    => 0,
26
+		return array(
27
+			'email_to'      => '[admin_email]',
28
+			'cc'            => '',
29
+			'bcc'           => '',
30
+			'from'          => '[sitename] <[admin_email]>',
31
+			'reply_to'      => '',
32
+			'email_subject' => '',
33
+			'email_message' => '[default-message]',
34
+			'inc_user_info' => 0,
35
+			'plain_text'    => 0,
36 36
 			'event'         => array( 'create' ),
37
-	    );
37
+		);
38 38
 	}
39 39
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -11,15 +11,15 @@
 block discarded – undo
11 11
             'priority'  => 10,
12 12
             'ajax_load' => false,
13 13
 		);
14
-		$action_ops = apply_filters('frm_email_control_settings', $action_ops);
14
+		$action_ops = apply_filters( 'frm_email_control_settings', $action_ops );
15 15
 
16
-		parent::__construct('email', __( 'Email Notification', 'formidable' ), $action_ops);
16
+		parent::__construct( 'email', __( 'Email Notification', 'formidable' ), $action_ops );
17 17
 	}
18 18
 
19 19
 	public function form( $form_action, $args = array() ) {
20
-	    extract($args);
20
+	    extract( $args );
21 21
 
22
-	    include(FrmAppHelper::plugin_path() .'/classes/views/frm-form-actions/_email_settings.php');
22
+	    include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/_email_settings.php' );
23 23
 	}
24 24
 
25 25
 	public function get_defaults() {
Please login to merge, or discard this patch.
classes/views/frm-form-actions/form_action.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -21,15 +21,15 @@
 block discarded – undo
21 21
     </div>
22 22
     <div class="widget-inside frm_hidden">
23 23
         <?php
24
-        if ( defined('DOING_AJAX') || ! $action_control->action_options['ajax_load'] ) {
25
-            // only load settings if they are just added or are open
26
-            include(dirname(__FILE__) .'/_action_inside.php');
27
-        } else {
28
-            // include hidden settings so action won't get lost on update ?>
24
+		if ( defined('DOING_AJAX') || ! $action_control->action_options['ajax_load'] ) {
25
+			// only load settings if they are just added or are open
26
+			include(dirname(__FILE__) .'/_action_inside.php');
27
+		} else {
28
+			// include hidden settings so action won't get lost on update ?>
29 29
         <input type="hidden" name="<?php echo esc_attr( $action_control->get_field_name('post_excerpt', '') ) ?>" class="frm_action_name" value="<?php echo esc_attr( $form_action->post_excerpt ); ?>" />
30 30
         <input type="hidden" name="<?php echo esc_attr( $action_control->get_field_name('ID', '') ) ?>" value="<?php echo esc_attr( $form_action->ID ); ?>" />
31 31
         <?php
32
-        } ?>
32
+		} ?>
33 33
     </div>
34 34
 <style type="text/css">
35 35
 .frm_no_actions{
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 $a = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
3 3
 
4
-$form_action = apply_filters('frm_form_action_settings', $form_action, $form_action->post_excerpt);
5
-$form_action = apply_filters('frm_form_'. $form_action->post_excerpt .'_action_settings', $form_action);
4
+$form_action = apply_filters( 'frm_form_action_settings', $form_action, $form_action->post_excerpt );
5
+$form_action = apply_filters( 'frm_form_' . $form_action->post_excerpt . '_action_settings', $form_action );
6 6
 
7 7
 ?>
8 8
 <div id="frm_form_action_<?php echo esc_attr( $action_key ) ?>" class="widget frm_form_action_settings frm_single_<?php echo esc_attr( $form_action->post_excerpt ) ?>_settings" data-actionkey="<?php echo esc_attr( $action_key ) ?>">
@@ -21,13 +21,13 @@  discard block
 block discarded – undo
21 21
     </div>
22 22
     <div class="widget-inside frm_hidden">
23 23
         <?php
24
-        if ( defined('DOING_AJAX') || ! $action_control->action_options['ajax_load'] ) {
24
+        if ( defined( 'DOING_AJAX' ) || ! $action_control->action_options['ajax_load'] ) {
25 25
             // only load settings if they are just added or are open
26
-            include(dirname(__FILE__) .'/_action_inside.php');
26
+            include( dirname( __FILE__ ) . '/_action_inside.php' );
27 27
         } else {
28 28
             // include hidden settings so action won't get lost on update ?>
29
-        <input type="hidden" name="<?php echo esc_attr( $action_control->get_field_name('post_excerpt', '') ) ?>" class="frm_action_name" value="<?php echo esc_attr( $form_action->post_excerpt ); ?>" />
30
-        <input type="hidden" name="<?php echo esc_attr( $action_control->get_field_name('ID', '') ) ?>" value="<?php echo esc_attr( $form_action->ID ); ?>" />
29
+        <input type="hidden" name="<?php echo esc_attr( $action_control->get_field_name( 'post_excerpt', '' ) ) ?>" class="frm_action_name" value="<?php echo esc_attr( $form_action->post_excerpt ); ?>" />
30
+        <input type="hidden" name="<?php echo esc_attr( $action_control->get_field_name( 'ID', '' ) ) ?>" value="<?php echo esc_attr( $form_action->ID ); ?>" />
31 31
         <?php
32 32
         } ?>
33 33
     </div>
Please login to merge, or discard this patch.
classes/views/frm-forms/_publish_box.php 2 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -12,15 +12,15 @@  discard block
 block discarded – undo
12 12
             <?php } ?>
13 13
             <div id="preview-action">
14 14
                 <?php
15
-                if ( ! isset($hide_preview) || ! $hide_preview ) {
15
+				if ( ! isset($hide_preview) || ! $hide_preview ) {
16 16
 
17
-                    if ( isset($values['form_key']) ) {
18
-                        $frm_settings = FrmAppHelper::get_settings();
19
-                        if ( empty($frm_settings->preview_page_id) ) { ?>
17
+					if ( isset($values['form_key']) ) {
18
+						$frm_settings = FrmAppHelper::get_settings();
19
+						if ( empty($frm_settings->preview_page_id) ) { ?>
20 20
                     <a href="<?php echo esc_url( FrmFormsHelper::get_direct_link($values['form_key']) ); ?>" class="preview button" target="wp-frm-preview-<?php echo esc_attr( $id ) ?>"><?php _e( 'Preview', 'formidable' ) ?></a>
21 21
                 <?php
22
-                        } else {
23
-                ?>
22
+						} else {
23
+				?>
24 24
                     <div class="preview dropdown">
25 25
                         <a href="#" id="frm-previewDrop" class="frm-dropdown-toggle button" data-toggle="dropdown"><?php _e( 'Preview', 'formidable' ) ?> <b class="caret"></b></a>
26 26
 
@@ -30,8 +30,8 @@  discard block
 block discarded – undo
30 30
                     	</ul>
31 31
                     </div>
32 32
                 <?php   }
33
-                    }
34
-                } ?>
33
+					}
34
+				} ?>
35 35
             </div>
36 36
             <?php if ( 'draft' == $values['status'] ) { ?>
37 37
             <div class="clear"></div>
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -6,18 +6,18 @@  discard block
 block discarded – undo
6 6
         <div id="minor-publishing-actions">
7 7
             <?php if ( 'draft' == $values['status'] ) { ?>
8 8
             <div id="save-action">
9
-        	    <input type="button" value="<?php esc_html_e( 'Save Draft', 'formidable' ); ?>" class="frm_submit_form frm_submit_<?php echo ( isset($values['ajax_load']) && $values['ajax_load'] ) ? '': 'no_'; ?>ajax button-secondary button-large" id="save-post" />
9
+        	    <input type="button" value="<?php esc_html_e( 'Save Draft', 'formidable' ); ?>" class="frm_submit_form frm_submit_<?php echo ( isset( $values['ajax_load'] ) && $values['ajax_load'] ) ? '' : 'no_'; ?>ajax button-secondary button-large" id="save-post" />
10 10
         	    <span class="spinner"></span>
11 11
             </div>
12 12
             <?php } ?>
13 13
             <div id="preview-action">
14 14
                 <?php
15
-                if ( ! isset($hide_preview) || ! $hide_preview ) {
15
+                if ( ! isset( $hide_preview ) || ! $hide_preview ) {
16 16
 
17
-                    if ( isset($values['form_key']) ) {
17
+                    if ( isset( $values['form_key'] ) ) {
18 18
                         $frm_settings = FrmAppHelper::get_settings();
19
-                        if ( empty($frm_settings->preview_page_id) ) { ?>
20
-                    <a href="<?php echo esc_url( FrmFormsHelper::get_direct_link($values['form_key']) ); ?>" class="preview button" target="wp-frm-preview-<?php echo esc_attr( $id ) ?>"><?php _e( 'Preview', 'formidable' ) ?></a>
19
+                        if ( empty( $frm_settings->preview_page_id ) ) { ?>
20
+                    <a href="<?php echo esc_url( FrmFormsHelper::get_direct_link( $values['form_key'] ) ); ?>" class="preview button" target="wp-frm-preview-<?php echo esc_attr( $id ) ?>"><?php _e( 'Preview', 'formidable' ) ?></a>
21 21
                 <?php
22 22
                         } else {
23 23
                 ?>
@@ -25,8 +25,8 @@  discard block
 block discarded – undo
25 25
                         <a href="#" id="frm-previewDrop" class="frm-dropdown-toggle button" data-toggle="dropdown"><?php _e( 'Preview', 'formidable' ) ?> <b class="caret"></b></a>
26 26
 
27 27
                         <ul class="frm-dropdown-menu pull-right" role="menu" aria-labelledby="frm-previewDrop">
28
-                            <li><a href="<?php echo esc_url( FrmFormsHelper::get_direct_link($values['form_key']) ); ?>" target="_blank"><?php _e( 'On Blank Page', 'formidable' ) ?></a></li>
29
-                            <li><a href="<?php echo esc_url( add_query_arg('form', $values['form_key'], get_permalink( $frm_settings->preview_page_id )) ) ?>" target="_blank"><?php _e( 'In Theme', 'formidable' ) ?></a></li>
28
+                            <li><a href="<?php echo esc_url( FrmFormsHelper::get_direct_link( $values['form_key'] ) ); ?>" target="_blank"><?php _e( 'On Blank Page', 'formidable' ) ?></a></li>
29
+                            <li><a href="<?php echo esc_url( add_query_arg( 'form', $values['form_key'], get_permalink( $frm_settings->preview_page_id ) ) ) ?>" target="_blank"><?php _e( 'In Theme', 'formidable' ) ?></a></li>
30 30
                     	</ul>
31 31
                     </div>
32 32
                 <?php   }
@@ -62,24 +62,24 @@  discard block
 block discarded – undo
62 62
 
63 63
 
64 64
             <div class="misc-pub-section misc-pub-post-status"><label for="post_status"><?php _e( 'Status', 'formidable' ) ?>:</label>
65
-                <span id="form-status-display"><?php echo FrmFormsHelper::status_nice_name($values['status']); ?></span>
65
+                <span id="form-status-display"><?php echo FrmFormsHelper::status_nice_name( $values['status'] ); ?></span>
66 66
 				<?php if ( 'draft' != $values['status'] && ( ! isset( $_GET['frm_action'] ) || 'settings' != FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ) ) ) { ?>
67
-                <a href="#post_status" class="edit-form-status hide-if-no-js" data-slidedown="form-status-select"><span aria-hidden="true"><?php _e( 'Edit') ?></span> <span class="screen-reader-text"><?php _e( 'Edit status') ?></span></a>
67
+                <a href="#post_status" class="edit-form-status hide-if-no-js" data-slidedown="form-status-select"><span aria-hidden="true"><?php _e( 'Edit' ) ?></span> <span class="screen-reader-text"><?php _e( 'Edit status' ) ?></span></a>
68 68
 
69 69
                 <div id="form-status-select" class="frm_hidden">
70 70
                     <select name="frm_change_status" id="form_change_status">
71
-                        <option value="published" <?php selected($values['status'], 'published') ?>><?php _e( 'Published' ) ?></option>
72
-                        <option value="draft" <?php selected($values['status'], 'draft') ?>><?php _e( 'Draft' ) ?></option>
71
+                        <option value="published" <?php selected( $values['status'], 'published' ) ?>><?php _e( 'Published' ) ?></option>
72
+                        <option value="draft" <?php selected( $values['status'], 'draft' ) ?>><?php _e( 'Draft' ) ?></option>
73 73
                     </select>
74
-                    <a href="#post_status" class="save-form-status hide-if-no-js button"><?php _e( 'OK') ?></a>
75
-                    <a href="#post_status" class="cancel-form-status hide-if-no-js button-cancel" data-slideup="form-status-select"><?php _e( 'Cancel') ?></a>
74
+                    <a href="#post_status" class="save-form-status hide-if-no-js button"><?php _e( 'OK' ) ?></a>
75
+                    <a href="#post_status" class="cancel-form-status hide-if-no-js button-cancel" data-slideup="form-status-select"><?php _e( 'Cancel' ) ?></a>
76 76
                 </div>
77 77
                 <?php } ?>
78 78
             </div><!-- .misc-pub-section -->
79 79
 
80
-            <?php if ( has_action('frm_settings_buttons') ) { ?>
80
+            <?php if ( has_action( 'frm_settings_buttons' ) ) { ?>
81 81
             <div class="misc-pub-section">
82
-                <?php do_action('frm_settings_buttons', $values); ?>
82
+                <?php do_action( 'frm_settings_buttons', $values ); ?>
83 83
                 <div class="clear"></div>
84 84
             </div>
85 85
             <?php } ?>
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 
91 91
     <div id="major-publishing-actions">
92 92
         <div id="delete-action">
93
-            <?php echo FrmFormsHelper::delete_trash_link($id, $values['status']); ?>
93
+            <?php echo FrmFormsHelper::delete_trash_link( $id, $values['status'] ); ?>
94 94
         </div>
95 95
 
96 96
 		<div id="publishing-action">
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 			<?php if ( 'settings' == FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ) ) { ?>
99 99
 			<input type="button" value="<?php esc_attr_e( 'Update', 'formidable' ); ?>" class="frm_submit_form frm_submit_settings_btn button-primary button-large" id="frm_submit_side_top" />
100 100
             <?php } else { ?>
101
-    	    <input type="button" value="<?php echo isset($button) ? esc_attr($button) : __( 'Update', 'formidable' ); ?>" class="frm_submit_form frm_submit_<?php echo ( isset($values['ajax_load']) && $values['ajax_load'] ) ? '': 'no_'; ?>ajax button-primary button-large" id="frm_submit_side_top" />
101
+    	    <input type="button" value="<?php echo isset( $button ) ? esc_attr( $button ) : __( 'Update', 'formidable' ); ?>" class="frm_submit_form frm_submit_<?php echo ( isset( $values['ajax_load'] ) && $values['ajax_load'] ) ? '' : 'no_'; ?>ajax button-primary button-large" id="frm_submit_side_top" />
102 102
     	    <?php } ?>
103 103
 		</div>
104 104
 
Please login to merge, or discard this patch.