Completed
Push — master ( 2c01cd...74f1ae )
by Jamie
04:01
created
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-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   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -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">
@@ -78,13 +78,13 @@  discard block
 block discarded – undo
78 78
                     <?php
79 79
                 }
80 80
 
81
-                $col_class = empty($col_class) ? 'frm_col_one' : '';
82
-                unset($field_key, $field_type, $field_label);
81
+                $col_class = empty( $col_class ) ? 'frm_col_one' : '';
82
+                unset( $field_key, $field_type, $field_label );
83 83
             } ?>
84 84
             </ul>
85 85
             <div class="clear"></div>
86 86
         </div>
87
-    	<?php do_action('frm_extra_form_instructions'); ?>
87
+    	<?php do_action( 'frm_extra_form_instructions' ); ?>
88 88
 
89 89
     	<div id="frm-layout-classes" class="tabs-panel">
90 90
 			<p class="howto"><?php _e( 'Add classes in the "CSS layout classes" field option', 'formidable' ) ?></p>
@@ -135,9 +135,9 @@  discard block
 block discarded – undo
135 135
                     <a href="javascript:void(0);" class="frmbutton frm_insert_code button show_frm_classes<?php
136 136
 	if ( ! empty( $title ) ) {
137 137
 		echo ' frm_help';
138
-	} ?>" data-code="<?php echo esc_attr($c) ?>" <?php
138
+	} ?>" data-code="<?php echo esc_attr( $c ) ?>" <?php
139 139
 	if ( ! empty( $title ) ) {
140
-		?>title="<?php echo esc_attr($title); ?>"<?php
140
+		?>title="<?php echo esc_attr( $title ); ?>"<?php
141 141
 	} ?>>
142 142
 <?php
143 143
 	if ( empty( $d ) ) {
@@ -162,14 +162,14 @@  discard block
 block discarded – undo
162 162
 
163 163
     <div class="submitbox" id="major-publishing-actions">
164 164
         <div id="delete-action">
165
-            <?php echo FrmFormsHelper::delete_trash_link($id, $values['status']); ?>
165
+            <?php echo FrmFormsHelper::delete_trash_link( $id, $values['status'] ); ?>
166 166
         </div>
167 167
 
168 168
         <div id="publishing-action">
169 169
             <form method="post" id="frm_js_build_form">
170 170
             <span class="spinner"></span>
171 171
 		    <input type="hidden" id="frm_compact_fields" name="frm_compact_fields" value="" />
172
-    	    <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" />
172
+    	    <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" />
173 173
     	    </form>
174 174
 		</div>
175 175
         <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   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 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
 
Please login to merge, or discard this patch.
classes/views/frm-forms/mb_html_tab.php 2 patches
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -1,53 +1,53 @@
 block discarded – undo
1 1
 <div id="frm-html-tags" class="tabs-panel">
2 2
     <ul class="frm_code_list">
3 3
     <?php
4
-    $col = 'one';
5
-    $entry_shortcodes = array(
6
-        'id' => __( 'Field ID', 'formidable' ),
7
-        'key' => __( 'Field Key', 'formidable' ),
8
-        'field_name' => __( 'Field Name', 'formidable' ),
9
-        'description' => __( 'Field Description', 'formidable' ),
10
-        'label_position' => __( 'Label Position', 'formidable' ),
11
-        'required_label' => __( 'Required Label', 'formidable' ),
12
-        'input' => __( 'Input Field', 'formidable' ),
4
+	$col = 'one';
5
+	$entry_shortcodes = array(
6
+		'id' => __( 'Field ID', 'formidable' ),
7
+		'key' => __( 'Field Key', 'formidable' ),
8
+		'field_name' => __( 'Field Name', 'formidable' ),
9
+		'description' => __( 'Field Description', 'formidable' ),
10
+		'label_position' => __( 'Label Position', 'formidable' ),
11
+		'required_label' => __( 'Required Label', 'formidable' ),
12
+		'input' => __( 'Input Field', 'formidable' ),
13 13
 		'input opt=1' => array( 'label' => __( 'Single Option', 'formidable' ), 'title' => __( 'Show a single radio or checkbox option by replacing 1 with the order of the option', 'formidable' ) ),
14
-        'input label=0' => __( 'Hide Option Label', 'formidable' ),
14
+		'input label=0' => __( 'Hide Option Label', 'formidable' ),
15 15
 		'required_class' => array( 'label' => __( 'Required Class', 'formidable' ), 'title' => __( 'Add class name if field is required', 'formidable' ) ),
16 16
 		'error_class' => array( 'label' => __( 'Error Class', 'formidable' ), 'title' => __( 'Add class name if field has an error on form submit', 'formidable' ) ),
17
-    );
17
+	);
18 18
 
19 19
 	foreach ( $entry_shortcodes as $skey => $sname ) {
20
-    ?>
20
+	?>
21 21
 	<li class="frm_col_<?php echo esc_attr( $col ) ?>">
22 22
 		<a href="javascript:void(0)" class="show_field_custom_html frmbutton button frm_insert_code <?php echo is_array( $sname ) ? 'frm_help' : ''; ?>" data-code="<?php echo esc_attr( $skey ) ?>" <?php echo is_array( $sname ) ? 'title="' . esc_attr( $sname['title'] ) . '"' : ''; ?>><?php echo is_array( $sname ) ? $sname['label'] : $sname; ?></a>
23 23
 	</li>
24 24
     <?php
25
-        $col = ($col == 'one') ? 'two' : 'one';
26
-        unset($skey, $sname);
27
-    }
28
-    ?>
25
+		$col = ($col == 'one') ? 'two' : 'one';
26
+		unset($skey, $sname);
27
+	}
28
+	?>
29 29
     </ul>
30 30
 
31 31
     <ul class="frm_code_list frm_clear">
32 32
         <?php
33
-        $col = 'one';
33
+		$col = 'one';
34 34
 		foreach ( array(
35
-            'form_name' => __( 'Form Name', 'formidable' ), 'form_description' => __( 'Form Description', 'formidable' ),
36
-            'form_key' => __( 'Form Key', 'formidable' ), 'deletelink' => __( 'Delete Entry Link', 'formidable' ),
35
+			'form_name' => __( 'Form Name', 'formidable' ), 'form_description' => __( 'Form Description', 'formidable' ),
36
+			'form_key' => __( 'Form Key', 'formidable' ), 'deletelink' => __( 'Delete Entry Link', 'formidable' ),
37 37
 		) as $skey => $sname ) { ?>
38 38
         <li class="frm_col_<?php echo esc_attr( $col ) ?>">
39 39
     	    <a href="javascript:void(0)" class="show_before_html show_after_html frmbutton button frm_insert_code" data-code="<?php echo esc_attr($skey) ?>"><?php echo $sname; ?></a>
40 40
     	</li>
41 41
         <?php
42
-            $col = ($col == 'one') ? 'two' : 'one';
43
-        }
42
+			$col = ($col == 'one') ? 'two' : 'one';
43
+		}
44 44
 
45
-        foreach ( array( 'button_label' => __( 'Button Label', 'formidable' ), 'button_action' => __( 'Button Hook', 'formidable' ) ) as $skey => $sname ) { ?>
45
+		foreach ( array( 'button_label' => __( 'Button Label', 'formidable' ), 'button_action' => __( 'Button Hook', 'formidable' ) ) as $skey => $sname ) { ?>
46 46
         <li class="frm_col_<?php echo esc_attr( $col ) ?>">
47 47
     	    <a href="javascript:void(0)" class="show_submit_html frmbutton button frm_insert_code" data-code="<?php echo esc_attr($skey) ?>"><?php echo $sname; ?></a>
48 48
     	</li>
49 49
         <?php
50
-            $col = ($col == 'one') ? 'two' : 'one';
51
-        } ?>
50
+			$col = ($col == 'one') ? 'two' : 'one';
51
+		} ?>
52 52
     </ul>
53 53
 </div>
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -22,8 +22,8 @@  discard block
 block discarded – undo
22 22
 		<a href="javascript:void(0)" class="show_field_custom_html frmbutton button frm_insert_code <?php echo is_array( $sname ) ? 'frm_help' : ''; ?>" data-code="<?php echo esc_attr( $skey ) ?>" <?php echo is_array( $sname ) ? 'title="' . esc_attr( $sname['title'] ) . '"' : ''; ?>><?php echo is_array( $sname ) ? $sname['label'] : $sname; ?></a>
23 23
 	</li>
24 24
     <?php
25
-        $col = ($col == 'one') ? 'two' : 'one';
26
-        unset($skey, $sname);
25
+        $col = ( $col == 'one' ) ? 'two' : 'one';
26
+        unset( $skey, $sname );
27 27
     }
28 28
     ?>
29 29
     </ul>
@@ -36,18 +36,18 @@  discard block
 block discarded – undo
36 36
             'form_key' => __( 'Form Key', 'formidable' ), 'deletelink' => __( 'Delete Entry Link', 'formidable' ),
37 37
 		) as $skey => $sname ) { ?>
38 38
         <li class="frm_col_<?php echo esc_attr( $col ) ?>">
39
-    	    <a href="javascript:void(0)" class="show_before_html show_after_html frmbutton button frm_insert_code" data-code="<?php echo esc_attr($skey) ?>"><?php echo esc_html( $sname ); ?></a>
39
+    	    <a href="javascript:void(0)" class="show_before_html show_after_html frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $skey ) ?>"><?php echo esc_html( $sname ); ?></a>
40 40
     	</li>
41 41
         <?php
42
-            $col = ($col == 'one') ? 'two' : 'one';
42
+            $col = ( $col == 'one' ) ? 'two' : 'one';
43 43
         }
44 44
 
45 45
         foreach ( array( 'button_label' => __( 'Button Label', 'formidable' ), 'button_action' => __( 'Button Hook', 'formidable' ) ) as $skey => $sname ) { ?>
46 46
         <li class="frm_col_<?php echo esc_attr( $col ) ?>">
47
-    	    <a href="javascript:void(0)" class="show_submit_html frmbutton button frm_insert_code" data-code="<?php echo esc_attr($skey) ?>"><?php echo esc_html( $sname ); ?></a>
47
+    	    <a href="javascript:void(0)" class="show_submit_html frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $skey ) ?>"><?php echo esc_html( $sname ); ?></a>
48 48
     	</li>
49 49
         <?php
50
-            $col = ($col == 'one') ? 'two' : 'one';
50
+            $col = ( $col == 'one' ) ? 'two' : 'one';
51 51
         } ?>
52 52
     </ul>
53 53
 </div>
Please login to merge, or discard this patch.
classes/views/frm-forms/mb_insert_fields.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,6 +2,6 @@
 block discarded – undo
2 2
 	<div class="handlediv" title="<?php esc_attr_e( 'Click to toggle', 'formidable' ) ?>"><br/></div>
3 3
 	<h3 class="hndle"><span><?php _e( 'Customization', 'formidable' ) ?></span></h3>
4 4
     <div class="inside">
5
-    <?php FrmFormsController::mb_tags_box($id); ?>
5
+    <?php FrmFormsController::mb_tags_box( $id ); ?>
6 6
     </div>
7 7
 </div>
Please login to merge, or discard this patch.
classes/views/frm-forms/shortcode_opts.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,14 +12,14 @@  discard block
 block discarded – undo
12 12
     <ul>
13 13
 <?php
14 14
 foreach ( $opts as $opt => $val ) {
15
-    if ( isset( $val['type'] ) && 'text' == $val['type'] ) { ?>
15
+	if ( isset( $val['type'] ) && 'text' == $val['type'] ) { ?>
16 16
         <li><label class="setting" for="frmsc_<?php echo esc_attr( $shortcode .'_'. $opt ) ?>">
17 17
             <span><?php echo esc_html( $val['label'] ) ?></span>
18 18
             <input type="text" id="frmsc_<?php echo esc_attr( $shortcode .'_'. $opt ) ?>" value="<?php echo esc_attr( $val['val'] ) ?>" />
19 19
             </label>
20 20
         </li>
21 21
 <?php
22
-    } else if ( isset( $val['type'] ) && 'select' == $val['type'] ) { ?>
22
+	} else if ( isset( $val['type'] ) && 'select' == $val['type'] ) { ?>
23 23
         <li><label class="setting" for="frmsc_<?php echo esc_attr( $shortcode .'_'. $opt ) ?>">
24 24
             <span><?php echo esc_html( $val['label'] ) ?></span>
25 25
             <select id="frmsc_<?php echo esc_attr( $shortcode .'_'. $opt ) ?>">
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
             </label>
31 31
         </li>
32 32
     <?php
33
-    } else { ?>
33
+	} else { ?>
34 34
         <li><label class="setting" for="frmsc_<?php echo esc_attr( $shortcode .'_'. $opt ) ?>"><input type="checkbox" id="frmsc_<?php echo esc_attr( $shortcode .'_'. $opt ) ?>" value="<?php echo esc_attr( $val['val'] ) ?>" /> <?php echo esc_html( $val['label'] ) ?></label></li>
35 35
 <?php
36 36
 	}
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! empty($form_id) ) {
2
+if ( ! empty( $form_id ) ) {
3 3
 ?>
4 4
     <h4 class="frm_left_label"><?php _e( 'Select a form:', 'formidable' ) ?></h4>
5 5
 	<?php FrmFormsHelper::forms_dropdown( 'frmsc_' . $shortcode . '_' . $form_id ); ?>
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 <?php
8 8
 }
9 9
 
10
-if ( ! empty($opts) ) { ?>
10
+if ( ! empty( $opts ) ) { ?>
11 11
     <h4><?php _e( 'Options', 'formidable' ) ?></h4>
12 12
     <ul>
13 13
 <?php
Please login to merge, or discard this patch.
classes/views/frm-settings/form.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -157,10 +157,10 @@
 block discarded – undo
157 157
 					call_user_func( array( $section['class'], $section['function'] ) );
158 158
 				} else {
159 159
 					call_user_func( ( isset( $section['function'] ) ? $section['function'] : $section ) );
160
-                } ?>
160
+				} ?>
161 161
             </div>
162 162
         <?php
163
-        } ?>
163
+		} ?>
164 164
 
165 165
         <p class="alignright frm_uninstall">
166 166
             <a href="javascript:void(0)" id="frm_uninstall_now"><?php _e( 'Uninstall Formidable', 'formidable' ) ?></a>
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
         <div class="contextual-help-tabs">
15 15
         <ul class="frm-category-tabs">
16 16
 			<?php $a = FrmAppHelper::simple_get( 't', 'sanitize_title', 'general_settings' ); ?>
17
-        	<li <?php echo ($a == 'general_settings') ? 'class="tabs active"' : '' ?>><a href="#general_settings" class="frm_cursor_pointer"><?php _e( 'General', 'formidable' ) ?></a></li>
17
+        	<li <?php echo ( $a == 'general_settings' ) ? 'class="tabs active"' : '' ?>><a href="#general_settings" class="frm_cursor_pointer"><?php _e( 'General', 'formidable' ) ?></a></li>
18 18
 			<?php foreach ( $sections as $sec_name => $section ) { ?>
19 19
 				<li <?php echo ( $a == $sec_name . '_settings' ) ? 'class="tabs active"' : '' ?>>
20 20
 					<a href="#<?php echo esc_attr( $sec_name ) ?>_settings">
@@ -25,14 +25,14 @@  discard block
 block discarded – undo
25 25
         </ul>
26 26
         </div>
27 27
 
28
-    <?php do_action('frm_before_settings'); ?>
28
+    <?php do_action( 'frm_before_settings' ); ?>
29 29
 
30 30
 	<form name="frm_settings_form" method="post" class="frm_settings_form" action="?page=formidable-settings<?php echo ( $a ? '&amp;t=' . $a : '' ); ?>">
31 31
         <input type="hidden" name="frm_action" value="process-form" />
32 32
         <input type="hidden" name="action" value="process-form" />
33
-        <?php wp_nonce_field('process_form_nonce', 'process_form'); ?>
33
+        <?php wp_nonce_field( 'process_form_nonce', 'process_form' ); ?>
34 34
 
35
-        <div class="general_settings tabs-panel <?php echo ($a == 'general_settings') ? 'frm_block' : 'frm_hidden'; ?>">
35
+        <div class="general_settings tabs-panel <?php echo ( $a == 'general_settings' ) ? 'frm_block' : 'frm_hidden'; ?>">
36 36
             <p class="submit">
37 37
 				<input class="button-primary" type="submit" value="<?php esc_attr_e( 'Update Options', 'formidable' ) ?>" />
38 38
             </p>
@@ -41,20 +41,20 @@  discard block
 block discarded – undo
41 41
 
42 42
             <p><label class="frm_left_label"><?php _e( 'Load form styling', 'formidable' ) ?></label>
43 43
                 <select id="frm_load_style" name="frm_load_style">
44
-                <option value="all" <?php selected($frm_settings->load_style, 'all') ?>><?php _e( 'on every page of your site', 'formidable' ) ?></option>
45
-                <option value="dynamic" <?php selected($frm_settings->load_style, 'dynamic') ?>><?php _e( 'only on applicable pages', 'formidable' ) ?></option>
46
-                <option value="none" <?php selected($frm_settings->load_style, 'none') ?>><?php _e( 'Don\'t use form styling on any page', 'formidable' ) ?></option>
44
+                <option value="all" <?php selected( $frm_settings->load_style, 'all' ) ?>><?php _e( 'on every page of your site', 'formidable' ) ?></option>
45
+                <option value="dynamic" <?php selected( $frm_settings->load_style, 'dynamic' ) ?>><?php _e( 'only on applicable pages', 'formidable' ) ?></option>
46
+                <option value="none" <?php selected( $frm_settings->load_style, 'none' ) ?>><?php _e( 'Don\'t use form styling on any page', 'formidable' ) ?></option>
47 47
                 </select>
48 48
             </p>
49 49
 
50 50
             <p>
51 51
 				<label for="frm_use_html">
52
-					<input type="checkbox" id="frm_use_html" name="frm_use_html" value="1" <?php checked($frm_settings->use_html, 1) ?>	> <?php _e( 'Use HTML5 in forms', 'formidable' ) ?>
52
+					<input type="checkbox" id="frm_use_html" name="frm_use_html" value="1" <?php checked( $frm_settings->use_html, 1 ) ?>	> <?php _e( 'Use HTML5 in forms', 'formidable' ) ?>
53 53
 				</label>
54 54
 				<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'We recommend using HTML 5 for your forms. It adds some nifty options like placeholders, patterns, and autocomplete.', 'formidable' ) ?>"></span>
55 55
             </p>
56 56
 
57
-            <?php do_action('frm_style_general_settings', $frm_settings); ?>
57
+            <?php do_action( 'frm_style_general_settings', $frm_settings ); ?>
58 58
 
59 59
 			<h3><?php _e( 'User Permissions', 'formidable' ); ?>
60 60
 				<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Select users that are allowed access to Formidable. Without access to View Forms, users will be unable to see the Formidable menu.', 'formidable' ) ?>"></span>
@@ -77,15 +77,15 @@  discard block
 block discarded – undo
77 77
 			</p>
78 78
 
79 79
 			<p><label class="frm_left_label"><?php _e( 'Site Key', 'formidable' ) ?></label>
80
-			<input type="text" name="frm_pubkey" id="frm_pubkey" size="42" value="<?php echo esc_attr($frm_settings->pubkey) ?>" placeholder="<?php esc_attr_e( 'Optional', 'formidable' ) ?>" /></p>
80
+			<input type="text" name="frm_pubkey" id="frm_pubkey" size="42" value="<?php echo esc_attr( $frm_settings->pubkey ) ?>" placeholder="<?php esc_attr_e( 'Optional', 'formidable' ) ?>" /></p>
81 81
 
82 82
 			<p><label class="frm_left_label"><?php _e( 'Private Key', 'formidable' ) ?></label>
83
-			<input type="text" name="frm_privkey" id="frm_privkey" size="42" value="<?php echo esc_attr($frm_settings->privkey) ?>" placeholder="<?php esc_attr_e( 'Optional', 'formidable' ) ?>" /></p>
83
+			<input type="text" name="frm_privkey" id="frm_privkey" size="42" value="<?php echo esc_attr( $frm_settings->privkey ) ?>" placeholder="<?php esc_attr_e( 'Optional', 'formidable' ) ?>" /></p>
84 84
 
85 85
 		    <p><label class="frm_left_label"><?php _e( 'reCAPTCHA Language', 'formidable' ) ?></label>
86 86
 			<select name="frm_re_lang" id="frm_re_lang">
87 87
 			    <?php foreach ( $captcha_lang as $lang => $lang_name ) { ?>
88
-				<option value="<?php echo esc_attr($lang) ?>" <?php selected($frm_settings->re_lang, $lang) ?>><?php echo esc_html( $lang_name ) ?></option>
88
+				<option value="<?php echo esc_attr( $lang ) ?>" <?php selected( $frm_settings->re_lang, $lang ) ?>><?php echo esc_html( $lang_name ) ?></option>
89 89
                 <?php } ?>
90 90
             </select></p>
91 91
 
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 			<label class="frm_left_label"><?php _e( 'Success Message', 'formidable' ); ?>
139 139
 				<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'The default message seen after a form is submitted.', 'formidable' ) ?>" ></span>
140 140
 			</label>
141
-            <input type="text" id="frm_success_msg" name="frm_success_msg" class="frm_with_left_label" value="<?php echo esc_attr($frm_settings->success_msg) ?>" />
141
+            <input type="text" id="frm_success_msg" name="frm_success_msg" class="frm_with_left_label" value="<?php echo esc_attr( $frm_settings->success_msg ) ?>" />
142 142
 		</p>
143 143
 
144 144
 		<p>
@@ -146,21 +146,21 @@  discard block
 block discarded – undo
146 146
 			<input type="text" value="<?php echo esc_attr( $frm_settings->submit_value ) ?>" id="frm_submit_value" name="frm_submit_value" class="frm_with_left_label" />
147 147
 		</p>
148 148
 
149
-        <?php do_action('frm_settings_form', $frm_settings); ?>
149
+        <?php do_action( 'frm_settings_form', $frm_settings ); ?>
150 150
 
151 151
         <?php if ( ! FrmAppHelper::pro_is_installed() ) { ?>
152 152
         <div class="clear"></div>
153 153
         <h3><?php _e( 'Miscellaneous', 'formidable' ) ?></h3>
154 154
         <?php } ?>
155 155
         <p><label class="frm_left_label"><?php _e( 'Admin menu label', 'formidable' ); ?></label>
156
-            <input type="text" name="frm_menu" id="frm_menu" value="<?php echo esc_attr($frm_settings->menu) ?>" />
156
+            <input type="text" name="frm_menu" id="frm_menu" value="<?php echo esc_attr( $frm_settings->menu ) ?>" />
157 157
             <?php if ( is_multisite() && is_super_admin() ) { ?>
158
-            <label for="frm_mu_menu"><input type="checkbox" name="frm_mu_menu" id="frm_mu_menu" value="1" <?php checked($frm_settings->mu_menu, 1) ?> /> <?php _e( 'Use this menu name site-wide', 'formidable' ); ?></label>
158
+            <label for="frm_mu_menu"><input type="checkbox" name="frm_mu_menu" id="frm_mu_menu" value="1" <?php checked( $frm_settings->mu_menu, 1 ) ?> /> <?php _e( 'Use this menu name site-wide', 'formidable' ); ?></label>
159 159
             <?php } ?>
160 160
         </p>
161 161
 
162 162
         <p><label class="frm_left_label"><?php _e( 'Preview Page', 'formidable' ); ?></label>
163
-        <?php FrmAppHelper::wp_pages_dropdown('frm-preview-page-id', $frm_settings->preview_page_id ) ?>
163
+        <?php FrmAppHelper::wp_pages_dropdown( 'frm-preview-page-id', $frm_settings->preview_page_id ) ?>
164 164
         </p>
165 165
 
166 166
     </div>
Please login to merge, or discard this patch.
classes/views/frm-settings/license_box.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<div class="general_settings metabox-holder tabs-panel frm_license_box <?php echo ($a == 'general_settings') ? 'frm_block' : 'frm_hidden'; ?>">
1
+<div class="general_settings metabox-holder tabs-panel frm_license_box <?php echo ( $a == 'general_settings' ) ? 'frm_block' : 'frm_hidden'; ?>">
2 2
 <?php if ( ! is_multisite() || is_super_admin() ) { ?>
3 3
     <div class="postbox">
4 4
         <div class="inside">
Please login to merge, or discard this patch.