Completed
Push — master ( af4004...c351ef )
by Jamie
03:28
created
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.
classes/views/frm-forms/add_field_links.php 2 patches
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -62,16 +62,16 @@  discard block
 block discarded – undo
62 62
                 	</ul>
63 63
                 </li>
64 64
 <?php
65
-                } else {
66
-                    $field_label = $field_type;
67
-                    ?>
65
+				} else {
66
+					$field_label = $field_type;
67
+					?>
68 68
                     <li class="frmbutton button <?php echo esc_attr( $col_class .' '. $no_allow_class .' frm_t'. $field_key ) ?>" id="<?php echo esc_attr( $field_key ) ?>"><?php echo apply_filters( 'frmpro_field_links', $field_label, $id, $field_key ) ?></li>
69 69
                     <?php
70
-                }
70
+				}
71 71
 
72
-                $col_class = empty($col_class) ? 'frm_col_one' : '';
73
-                unset($field_key, $field_type, $field_label);
74
-            } ?>
72
+				$col_class = empty($col_class) ? 'frm_col_one' : '';
73
+				unset($field_key, $field_type, $field_label);
74
+			} ?>
75 75
             </ul>
76 76
             <div class="clear"></div>
77 77
         </div>
@@ -81,33 +81,33 @@  discard block
 block discarded – undo
81 81
 			<p class="howto"><?php _e( 'Add classes in the "CSS layout classes" field option', 'formidable' ) ?></p>
82 82
     	    <ul class="frm_code_list">
83 83
     	    <?php $classes = array(
84
-                    'frm_first'     => array(
85
-                        'label' => __( 'First', 'formidable' ),
86
-                        'title' => __( 'Add this to the first field in each row along with a width. ie frm_first frm_third', 'formidable' ),
87
-                    ),
88
-                    'frm_half'      => __( '1/2', 'formidable' ),
89
-                    'frm_third'     => __( '1/3', 'formidable' ),
90
-                    'frm_two_thirds' => __( '2/3', 'formidable' ),
91
-    	            'frm_fourth'    => __( '1/4', 'formidable' ),
84
+					'frm_first'     => array(
85
+						'label' => __( 'First', 'formidable' ),
86
+						'title' => __( 'Add this to the first field in each row along with a width. ie frm_first frm_third', 'formidable' ),
87
+					),
88
+					'frm_half'      => __( '1/2', 'formidable' ),
89
+					'frm_third'     => __( '1/3', 'formidable' ),
90
+					'frm_two_thirds' => __( '2/3', 'formidable' ),
91
+					'frm_fourth'    => __( '1/4', 'formidable' ),
92 92
 					'frm_three_fourths' => __( '3/4', 'formidable' ),
93
-                    'frm_fifth'     => __( '1/5', 'formidable' ),
93
+					'frm_fifth'     => __( '1/5', 'formidable' ),
94 94
 					'frm_two_fifths' => __( '2/5', 'formidable' ),
95
-                    'frm_sixth'     => __( '1/6', 'formidable' ),
96
-                    'frm_seventh'   => __( '1/7', 'formidable' ),
95
+					'frm_sixth'     => __( '1/6', 'formidable' ),
96
+					'frm_seventh'   => __( '1/7', 'formidable' ),
97 97
 					'frm_eighth'    => __( '1/8', 'formidable' ),
98 98
 					'frm_alignright' => __( 'Right', 'formidable' ),
99
-    	            'frm_inline'    => array(
100
-                        'label' => __( 'Inline', 'formidable' ),
99
+					'frm_inline'    => array(
100
+						'label' => __( 'Inline', 'formidable' ),
101 101
 						'title' => __( 'Align fields in a row without a specific width.', 'formidable' ),
102
-                    ),
102
+					),
103 103
 
104
-    	            'frm_full' => array(
105
-                        'label' => __( '100% width', 'formidable' ),
104
+					'frm_full' => array(
105
+						'label' => __( '100% width', 'formidable' ),
106 106
 						'title' => __( 'Force the field to fill the full space with 100% width.', 'formidable' ),
107
-                    ),
108
-    	            'frm_grid_first' => __( 'First Grid Row', 'formidable' ),
109
-    	            'frm_grid' => __( 'Even Grid Row', 'formidable' ),
110
-    	            'frm_grid_odd' => __( 'Odd Grid Row', 'formidable' ),
107
+					),
108
+					'frm_grid_first' => __( 'First Grid Row', 'formidable' ),
109
+					'frm_grid' => __( 'Even Grid Row', 'formidable' ),
110
+					'frm_grid_odd' => __( 'Odd Grid Row', 'formidable' ),
111 111
 					'frm_two_col' => array( 'label' => __( '2 Col Options', 'formidable' ), 'title' => __( 'Put your radio button or checkbox options into two columns.', 'formidable' ) ),
112 112
 					'frm_three_col' => array( 'label' => __( '3 Col Options', 'formidable' ), 'title' => __( 'Put your radio button or checkbox options into three columns.', 'formidable' ) ),
113 113
 					'frm_four_col' => array( 'label' => __( '4 Col Options', 'formidable' ), 'title' => __( 'Put your radio button or checkbox options into four columns.', 'formidable' ) ),
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 					'frm_scroll_box' => array( 'label' => __( 'Scroll Box', 'formidable' ), 'title' => __( 'If you have many checkbox or radio button options, you may add this class to allow your user to easily scroll through the options.', 'formidable' ) ),
116 116
 					'frm_text_block' => array( 'label' => __( 'Align Option Text', 'formidable' ), 'title' => __( 'If you have a large amount of text in a checkbox or radio button field, use this class to align all the text in a block.', 'formidable' ) ),
117 117
 					'frm_capitalize' => array( 'label' => __( 'Capitalize', 'formidable' ), 'title' => __( 'Automatically capitalize the first letter in each word.', 'formidable' ) ),
118
-    	        );
118
+				);
119 119
 
120 120
 $classes = apply_filters( 'frm_layout_classes', $classes );
121 121
 $col = 'one';
@@ -132,11 +132,11 @@  discard block
 block discarded – undo
132 132
 	} ?>>
133 133
 <?php
134 134
 	if ( empty( $d ) ) {
135
-    	echo $c;
135
+		echo $c;
136 136
 	} else if ( ! is_array( $d ) ) {
137
-    	echo $d;
137
+		echo $d;
138 138
 	} else if ( isset( $d['label'] ) ) {
139
-    	echo $d['label'];
139
+		echo $d['label'];
140 140
 	}
141 141
 ?>
142 142
                     </a>
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
6 6
 $button = ( $action == 'new' || $action == 'duplicate' ) ? __( 'Create', 'formidable' ) : __( 'Update', 'formidable' );
7 7
 
8
-include(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/_publish_box.php');
8
+include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php' );
9 9
 ?>
10 10
 
11 11
     <div id="frm_position_ele"></div>
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
         <ul id="category-tabs" class="category-tabs frm-category-tabs">
18 18
     		<li class="tabs" ><a href="#frm-insert-fields" id="frm_insert_fields_tab"><?php _e( 'Fields', 'formidable' ); ?></a></li>
19 19
     		<li class="hide-if-no-js"><a href="#frm-layout-classes" id="frm_layout_classes_tab" class="frm_help" title="<?php esc_attr_e( 'Open the Field Options and click on the CSS Layout Classes option to enable this tab', 'formidable' ) ?>"><?php _e( 'Layout', 'formidable' ); ?></a></li>
20
-<?php do_action('frm_extra_form_instruction_tabs'); ?>
20
+<?php do_action( 'frm_extra_form_instruction_tabs' ); ?>
21 21
     	</ul>
22 22
 
23 23
     	<div id="frm-insert-fields" class="tabs-panel">
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 <?php
26 26
 $col_class = 'frm_col_one';
27 27
 foreach ( $frm_field_selection as $field_key => $field_type ) { ?>
28
-                <li class="frmbutton button <?php echo esc_attr( $col_class .' frm_t'. $field_key ) ?>" id="<?php echo esc_attr( $field_key ) ?>"><a href="#" class="frm_add_field"><?php echo esc_html( $field_type ) ?></a></li>
28
+                <li class="frmbutton button <?php echo esc_attr( $col_class . ' frm_t' . $field_key ) ?>" id="<?php echo esc_attr( $field_key ) ?>"><a href="#" class="frm_add_field"><?php echo esc_html( $field_type ) ?></a></li>
29 29
 <?php
30 30
 	$col_class = empty( $col_class ) ? 'frm_col_one' : '';
31 31
 	unset( $field_key, $field_type );
@@ -44,19 +44,19 @@  discard block
 block discarded – undo
44 44
 		$field_label = $field_type['name'];
45 45
 
46 46
 		if ( isset( $field_type['switch_from'] ) ) { ?>
47
-                <li class="frmbutton button <?php echo esc_attr( $col_class .' '. $no_allow_class .' frm_t'. $field_key ) ?>" id="<?php echo esc_attr( $field_key ) ?>" data-switchto="<?php echo esc_attr( $field_type['switch_from'] ) ?>" style="display:none !important;"><?php echo apply_filters( 'frmpro_field_links', $field_label, $id, $field_key ) ?></li>
47
+                <li class="frmbutton button <?php echo esc_attr( $col_class . ' ' . $no_allow_class . ' frm_t' . $field_key ) ?>" id="<?php echo esc_attr( $field_key ) ?>" data-switchto="<?php echo esc_attr( $field_type['switch_from'] ) ?>" style="display:none !important;"><?php echo apply_filters( 'frmpro_field_links', $field_label, $id, $field_key ) ?></li>
48 48
 <?php
49 49
 			continue;
50 50
 		}
51 51
 
52 52
 ?>
53
-                <li class="frmbutton button <?php echo esc_attr( $col_class .' '. $no_allow_class .' frm_t'. $field_key ) ?> dropdown" id="<?php echo esc_attr( $field_key ) ?>" <?php echo ( isset( $field_type['switch_to'] ) ) ? 'data-switchto="'. esc_attr( $field_type['switch_to'] ) .'"' : ''; ?>>
53
+                <li class="frmbutton button <?php echo esc_attr( $col_class . ' ' . $no_allow_class . ' frm_t' . $field_key ) ?> dropdown" id="<?php echo esc_attr( $field_key ) ?>" <?php echo ( isset( $field_type['switch_to'] ) ) ? 'data-switchto="' . esc_attr( $field_type['switch_to'] ) . '"' : ''; ?>>
54 54
 	                <a href="#" id="frm-<?php echo esc_attr( $field_key ) ?>Drop" class="frm-dropdown-toggle" data-toggle="dropdown"><?php echo esc_html( $field_label ) ?> <b class="caret"></b></a>
55 55
 
56 56
                     <ul class="frm-dropdown-menu" role="menu" aria-labelledby="frm-<?php echo esc_attr( $field_key ) ?>Drop">
57 57
                 	<?php
58 58
 					foreach ( $field_type['types'] as $k => $type ) { ?>
59
-                        <li class="frm_t<?php echo esc_attr( $field_key ) ?>" id="<?php echo esc_attr( $field_key ) ?>|<?php echo esc_attr( $k ) ?>"><?php echo apply_filters( 'frmpro_field_links', $type, $id, $field_key .'|'. $k ) ?></li>
59
+                        <li class="frm_t<?php echo esc_attr( $field_key ) ?>" id="<?php echo esc_attr( $field_key ) ?>|<?php echo esc_attr( $k ) ?>"><?php echo apply_filters( 'frmpro_field_links', $type, $id, $field_key . '|' . $k ) ?></li>
60 60
                 	<?php
61 61
 						unset( $k, $type );
62 62
 					} ?>
@@ -66,17 +66,17 @@  discard block
 block discarded – undo
66 66
                 } else {
67 67
                     $field_label = $field_type;
68 68
                     ?>
69
-                    <li class="frmbutton button <?php echo esc_attr( $col_class .' '. $no_allow_class .' frm_t'. $field_key ) ?>" id="<?php echo esc_attr( $field_key ) ?>"><?php echo apply_filters( 'frmpro_field_links', $field_label, $id, $field_key ) ?></li>
69
+                    <li class="frmbutton button <?php echo esc_attr( $col_class . ' ' . $no_allow_class . ' frm_t' . $field_key ) ?>" id="<?php echo esc_attr( $field_key ) ?>"><?php echo apply_filters( 'frmpro_field_links', $field_label, $id, $field_key ) ?></li>
70 70
                     <?php
71 71
                 }
72 72
 
73
-                $col_class = empty($col_class) ? 'frm_col_one' : '';
74
-                unset($field_key, $field_type, $field_label);
73
+                $col_class = empty( $col_class ) ? 'frm_col_one' : '';
74
+                unset( $field_key, $field_type, $field_label );
75 75
             } ?>
76 76
             </ul>
77 77
             <div class="clear"></div>
78 78
         </div>
79
-    	<?php do_action('frm_extra_form_instructions'); ?>
79
+    	<?php do_action( 'frm_extra_form_instructions' ); ?>
80 80
 
81 81
     	<div id="frm-layout-classes" class="tabs-panel">
82 82
 			<p class="howto"><?php _e( 'Add classes in the "CSS layout classes" field option', 'formidable' ) ?></p>
@@ -127,9 +127,9 @@  discard block
 block discarded – undo
127 127
                     <a href="javascript:void(0);" class="frmbutton frm_insert_code button show_frm_classes<?php
128 128
 	if ( ! empty( $title ) ) {
129 129
 		echo ' frm_help';
130
-	} ?>" data-code="<?php echo esc_attr($c) ?>" <?php
130
+	} ?>" data-code="<?php echo esc_attr( $c ) ?>" <?php
131 131
 	if ( ! empty( $title ) ) {
132
-		?>title="<?php echo esc_attr($title); ?>"<?php
132
+		?>title="<?php echo esc_attr( $title ); ?>"<?php
133 133
 	} ?>>
134 134
 <?php
135 135
 	if ( empty( $d ) ) {
@@ -154,14 +154,14 @@  discard block
 block discarded – undo
154 154
 
155 155
     <div class="submitbox" id="major-publishing-actions">
156 156
         <div id="delete-action">
157
-            <?php echo FrmFormsHelper::delete_trash_link($id, $values['status']); ?>
157
+            <?php echo FrmFormsHelper::delete_trash_link( $id, $values['status'] ); ?>
158 158
         </div>
159 159
 
160 160
         <div id="publishing-action">
161 161
             <form method="post" id="frm_js_build_form">
162 162
             <span class="spinner"></span>
163 163
 		    <input type="hidden" id="frm_compact_fields" name="frm_compact_fields" value="" />
164
-    	    <input type="button" value="<?php echo esc_attr($button) ?>" 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" />
164
+    	    <input type="button" value="<?php echo esc_attr( $button ) ?>" 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" />
165 165
     	    </form>
166 166
 		</div>
167 167
         <div class="clear"></div>
Please login to merge, or discard this patch.
classes/views/frm-forms/edit.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 		FrmAppController::get_form_nav( $id, true, 'hide' );
21 21
 	}
22 22
 
23
-    ?>
23
+	?>
24 24
     <div class="frm_form_builder<?php echo FrmFormsHelper::get_form_style_class($form); ?>">
25 25
 
26 26
         <p class="frm_hidden frm-no-margin">
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <div class="wrap">
2 2
     <div class="frmicon icon32"><br/></div>
3
-    <h2><?php echo ( $form->is_template ? __( 'Templates', 'formidable' ) : __( 'Build', 'formidable' )); ?>
3
+    <h2><?php echo ( $form->is_template ? __( 'Templates', 'formidable' ) : __( 'Build', 'formidable' ) ); ?>
4 4
         <a href="?page=formidable&amp;frm_action=new" class="add-new-h2"><?php _e( 'Add New', 'formidable' ); ?></a>
5 5
     </h2>
6 6
 
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
         <input type="hidden" name="action" value="update" />
34 34
         <input type="hidden" name="id" id="form_id" value="<?php echo (int) $id; ?>" />
35 35
 
36
-        <?php require(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/form.php'); ?>
36
+        <?php require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/form.php' ); ?>
37 37
 
38 38
         <p>
39 39
 			<input type="button" value="<?php esc_attr_e( 'Update', 'formidable' ) ?>" class="frm_submit_<?php echo ( isset( $values['ajax_load'] ) && $values['ajax_load'] ) ? '' : 'no_'; ?>ajax button-primary" />
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
     </form>
43 43
     </div>
44 44
     </div>
45
-    <?php require(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/add_field_links.php'); ?>
45
+    <?php require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_field_links.php' ); ?>
46 46
     </div>
47 47
     </div>
48 48
 </div>
Please login to merge, or discard this patch.
classes/views/frm-forms/form.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -51,15 +51,15 @@
 block discarded – undo
51 51
 <ul id="new_fields" class="frm_sorting <?php echo version_compare( $GLOBALS['wp_version'], '3.7.2', '>') ? 'inside' : ''; ?>">
52 52
 <?php
53 53
 if ( isset($values['fields']) && ! empty($values['fields']) ) {
54
-    $count = 0;
55
-    foreach ( $values['fields'] as $field ) {
56
-        $count++;
57
-        $field_name = 'item_meta['. $field['id'] .']';
58
-        $html_id = FrmFieldsHelper::get_html_id($field);
59
-        require(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/add_field.php');
60
-        unset($field, $field_name);
61
-    }
62
-    unset($count);
54
+	$count = 0;
55
+	foreach ( $values['fields'] as $field ) {
56
+		$count++;
57
+		$field_name = 'item_meta['. $field['id'] .']';
58
+		$html_id = FrmFieldsHelper::get_html_id($field);
59
+		require(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/add_field.php');
60
+		unset($field, $field_name);
61
+	}
62
+	unset($count);
63 63
 } ?>
64 64
 </ul>
65 65
 </div>
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@  discard block
 block discarded – undo
1
-<?php wp_nonce_field('frm_save_form_nonce', 'frm_save_form'); ?>
1
+<?php wp_nonce_field( 'frm_save_form_nonce', 'frm_save_form' ); ?>
2 2
 <input type="hidden" name="status" value="<?php echo esc_attr( $values['status'] ); ?>" />
3 3
 <input type="hidden" name="new_status" value="" />
4 4
 
5 5
 <div id="frm_form_editor_container">
6 6
 <div id="titlediv">
7
-    <input type="text" name="name" value="<?php echo esc_attr($form->name); ?>" id="title" placeholder="<?php esc_attr_e( 'Enter title here') ?>" />
7
+    <input type="text" name="name" value="<?php echo esc_attr( $form->name ); ?>" id="title" placeholder="<?php esc_attr_e( 'Enter title here' ) ?>" />
8 8
     <div id="edit-slug-box" class="hide-if-no-js">
9 9
         <div id="frm_form_key_box" class="alignright">
10 10
         <strong><?php _e( 'Form Key:', 'formidable' ) ?></strong>
@@ -15,10 +15,10 @@  discard block
 block discarded – undo
15 15
     </div>
16 16
 </div>
17 17
 
18
-<div <?php echo version_compare( $GLOBALS['wp_version'], '3.7.2', '>') ? 'class="postbox"' : ''; ?>>
19
-    <div class="frm_no_fields <?php echo ( isset($values['fields']) && ! empty($values['fields']) ) ? 'frm_hidden' : ''; ?>">
18
+<div <?php echo version_compare( $GLOBALS['wp_version'], '3.7.2', '>' ) ? 'class="postbox"' : ''; ?>>
19
+    <div class="frm_no_fields <?php echo ( isset( $values['fields'] ) && ! empty( $values['fields'] ) ) ? 'frm_hidden' : ''; ?>">
20 20
 	    <div class="alignleft sketch1">
21
-	        <img src="<?php echo FrmAppHelper::plugin_url() .'/images/sketch_arrow1.png'; ?>" alt="" />
21
+	        <img src="<?php echo FrmAppHelper::plugin_url() . '/images/sketch_arrow1.png'; ?>" alt="" />
22 22
 	    </div>
23 23
 	    <div class="alignleft sketch1_text">
24 24
 	        <?php _e( '1. Name your form', 'formidable' ) ?>
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	    <div class="alignright sketch2">
28 28
 	        <?php _e( '2. Click or drag a field to<br/>add it to your form', 'formidable' ) ?>
29 29
 	        <div class="clear"></div>
30
-	        <img src="<?php echo FrmAppHelper::plugin_url() .'/images/sketch_arrow2.png'; ?>" alt="" />
30
+	        <img src="<?php echo FrmAppHelper::plugin_url() . '/images/sketch_arrow2.png'; ?>" alt="" />
31 31
 	    </div>
32 32
 	    <div class="clear"></div>
33 33
 
@@ -44,22 +44,22 @@  discard block
 block discarded – undo
44 44
 
45 45
     	<div class="alignleft sketch3">
46 46
 	        <div class="alignright"><?php _e( '3. Save your form', 'formidable' ) ?></div>
47
-	        <img src="<?php echo FrmAppHelper::plugin_url() .'/images/sketch_arrow3.png'; ?>" alt="" />
47
+	        <img src="<?php echo FrmAppHelper::plugin_url() . '/images/sketch_arrow3.png'; ?>" alt="" />
48 48
 	    </div>
49 49
     	<div class="clear"></div>
50 50
     </div>
51
-<ul id="new_fields" class="frm_sorting <?php echo version_compare( $GLOBALS['wp_version'], '3.7.2', '>') ? 'inside' : ''; ?>">
51
+<ul id="new_fields" class="frm_sorting <?php echo version_compare( $GLOBALS['wp_version'], '3.7.2', '>' ) ? 'inside' : ''; ?>">
52 52
 <?php
53
-if ( isset($values['fields']) && ! empty($values['fields']) ) {
53
+if ( isset( $values['fields'] ) && ! empty( $values['fields'] ) ) {
54 54
     $count = 0;
55 55
     foreach ( $values['fields'] as $field ) {
56
-        $count++;
57
-        $field_name = 'item_meta['. $field['id'] .']';
58
-        $html_id = FrmFieldsHelper::get_html_id($field);
59
-        require(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/add_field.php');
60
-        unset($field, $field_name);
56
+        $count ++;
57
+        $field_name = 'item_meta[' . $field['id'] . ']';
58
+        $html_id = FrmFieldsHelper::get_html_id( $field );
59
+        require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_field.php' );
60
+        unset( $field, $field_name );
61 61
     }
62
-    unset($count);
62
+    unset( $count );
63 63
 } ?>
64 64
 </ul>
65 65
 </div>
Please login to merge, or discard this patch.