Completed
Push — master ( ea430e...236b06 )
by Jamie
03:00
created
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.
classes/views/shared/errors.php 2 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,23 +1,23 @@
 block discarded – undo
1 1
 <div class="clear"></div>
2 2
 <?php
3 3
 if ( isset($message) && $message != '' ) {
4
-    if ( FrmAppHelper::is_admin() ) {
5
-        ?><div id="message" class="updated frm_msg_padding"><?php
6
-        echo $message;
7
-        ?></div><?php
8
-    } else {
9
-        echo $message;
10
-    }
4
+	if ( FrmAppHelper::is_admin() ) {
5
+		?><div id="message" class="updated frm_msg_padding"><?php
6
+		echo $message;
7
+		?></div><?php
8
+	} else {
9
+		echo $message;
10
+	}
11 11
 }
12 12
 
13 13
 if ( isset($errors) && is_array($errors) && count($errors) > 0 ) { ?>
14 14
     <div class="error">
15 15
         <ul id="frm_errors">
16 16
             <?php
17
-            foreach ( $errors as $error ) {
18
-                echo '<li>' . $error . '</li>';
19
-            }
20
-            ?>
17
+			foreach ( $errors as $error ) {
18
+				echo '<li>' . $error . '</li>';
19
+			}
20
+			?>
21 21
         </ul>
22 22
     </div>
23 23
 <?php
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <div class="clear"></div>
2 2
 <?php
3
-if ( isset($message) && $message != '' ) {
3
+if ( isset( $message ) && $message != '' ) {
4 4
     if ( FrmAppHelper::is_admin() ) {
5 5
         ?><div id="message" class="updated frm_msg_padding"><?php
6 6
         echo $message;
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
     }
11 11
 }
12 12
 
13
-if ( isset($errors) && is_array($errors) && count($errors) > 0 ) { ?>
13
+if ( isset( $errors ) && is_array( $errors ) && count( $errors ) > 0 ) { ?>
14 14
     <div class="error">
15 15
         <ul id="frm_errors">
16 16
             <?php
Please login to merge, or discard this patch.
classes/views/shared/head.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,2 +1,2 @@
 block discarded – undo
1 1
 <?php
2
-_deprecated_file( basename(__FILE__), '2.0', null, __( 'Use wp_enqueue_script and wp_enqueue_style.', 'formidable' ) );
2
+_deprecated_file( basename( __FILE__ ), '2.0', null, __( 'Use wp_enqueue_script and wp_enqueue_style.', 'formidable' ) );
Please login to merge, or discard this patch.
classes/views/styles/_check-box-radio-fields.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,26 +1,26 @@  discard block
 block discarded – undo
1 1
 <div class="field-group clearfix frm-half frm-first-row">
2 2
 	<label><?php _e( 'Radio', 'formidable' ) ?></label>
3
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('radio_align') ) ?>" id="frm_radio_align">
4
-        <option value="block" <?php selected($style->post_content['radio_align'], 'block') ?>><?php _e( 'Multiple Rows' , 'formidable' ) ?></option>
5
-        <option value="inline" <?php selected($style->post_content['radio_align'], 'inline') ?>><?php _e( 'Single Row' , 'formidable' ) ?></option>
3
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'radio_align' ) ) ?>" id="frm_radio_align">
4
+        <option value="block" <?php selected( $style->post_content['radio_align'], 'block' ) ?>><?php _e( 'Multiple Rows', 'formidable' ) ?></option>
5
+        <option value="inline" <?php selected( $style->post_content['radio_align'], 'inline' ) ?>><?php _e( 'Single Row', 'formidable' ) ?></option>
6 6
 	</select>
7 7
 </div>
8 8
 
9 9
 <div class="field-group clearfix frm-half frm-first-row">
10 10
 	<label><?php _e( 'Check Box', 'formidable' ) ?></label>
11
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('check_align') ) ?>" id="frm_check_align">
12
-        <option value="block" <?php selected($style->post_content['check_align'], 'block') ?>><?php _e( 'Multiple Rows' , 'formidable' ) ?></option>
13
-        <option value="inline" <?php selected($style->post_content['check_align'], 'inline') ?>><?php _e( 'Single Row' , 'formidable' ) ?></option>
11
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'check_align' ) ) ?>" id="frm_check_align">
12
+        <option value="block" <?php selected( $style->post_content['check_align'], 'block' ) ?>><?php _e( 'Multiple Rows', 'formidable' ) ?></option>
13
+        <option value="inline" <?php selected( $style->post_content['check_align'], 'inline' ) ?>><?php _e( 'Single Row', 'formidable' ) ?></option>
14 14
 	</select>
15 15
 </div>
16 16
 
17 17
 <div class="field-group field-group-background clearfix">
18 18
 	<label><?php _e( 'Color', 'formidable' ) ?></label>
19
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('check_label_color') ) ?>" id="frm_check_label_color" class="hex" value="<?php echo esc_attr( $style->post_content['check_label_color'] ) ?>" />
19
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'check_label_color' ) ) ?>" id="frm_check_label_color" class="hex" value="<?php echo esc_attr( $style->post_content['check_label_color'] ) ?>" />
20 20
 </div>
21 21
 <div class="field-group clearfix">
22 22
 	<label><?php _e( 'Weight', 'formidable' ) ?></label>
23
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('check_weight') ) ?>" id="frm_check_weight">
23
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'check_weight' ) ) ?>" id="frm_check_weight">
24 24
 		<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
25 25
 		<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['check_weight'], $value ) ?>><?php echo $name ?></option>
26 26
 		<?php } ?>
@@ -28,5 +28,5 @@  discard block
 block discarded – undo
28 28
 </div>
29 29
 <div class="field-group clearfix">
30 30
 	<label><?php _e( 'Size', 'formidable' ) ?></label>
31
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('check_font_size') ) ?>" id="frm_check_font_size" value="<?php echo esc_attr( $style->post_content['check_font_size'] ) ?>"  size="3" />
31
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'check_font_size' ) ) ?>" id="frm_check_font_size" value="<?php echo esc_attr( $style->post_content['check_font_size'] ) ?>"  size="3" />
32 32
 </div>
Please login to merge, or discard this patch.
classes/views/styles/_date-fields.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -2,19 +2,19 @@
 block discarded – undo
2 2
 $jquery_themes = FrmStylesHelper::jquery_themes();
3 3
 
4 4
 $alt_img_name = array(
5
-    'ui-lightness'  => 'ui_light',
6
-    'ui-darkness'   => 'ui_dark',
7
-    'start'         => 'start_menu',
8
-    'redmond'       => 'windoze',
9
-    'vader'         => 'black_matte',
10
-    'mint-choc'     => 'mint_choco',
5
+	'ui-lightness'  => 'ui_light',
6
+	'ui-darkness'   => 'ui_dark',
7
+	'start'         => 'start_menu',
8
+	'redmond'       => 'windoze',
9
+	'vader'         => 'black_matte',
10
+	'mint-choc'     => 'mint_choco',
11 11
 );
12 12
 $theme_names = array_keys($jquery_themes);
13 13
 $theme_names = array_combine($theme_names, $theme_names);
14 14
 
15 15
 foreach ( $theme_names as $k => $v ) {
16 16
 	$theme_names[ $k ] = str_replace( '-', '_', $v );
17
-    unset($k, $v);
17
+	unset($k, $v);
18 18
 }
19 19
 
20 20
 $alt_img_name = array_merge($theme_names, $alt_img_name);
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -9,25 +9,25 @@  discard block
 block discarded – undo
9 9
     'vader'         => 'black_matte',
10 10
     'mint-choc'     => 'mint_choco',
11 11
 );
12
-$theme_names = array_keys($jquery_themes);
13
-$theme_names = array_combine($theme_names, $theme_names);
12
+$theme_names = array_keys( $jquery_themes );
13
+$theme_names = array_combine( $theme_names, $theme_names );
14 14
 
15 15
 foreach ( $theme_names as $k => $v ) {
16
-	$theme_names[ $k ] = str_replace( '-', '_', $v );
17
-    unset($k, $v);
16
+	$theme_names[$k] = str_replace( '-', '_', $v );
17
+    unset( $k, $v );
18 18
 }
19 19
 
20
-$alt_img_name = array_merge($theme_names, $alt_img_name);
20
+$alt_img_name = array_merge( $theme_names, $alt_img_name );
21 21
 $alt_img_name['-1'] = '';
22
-unset($theme_names);
22
+unset( $theme_names );
23 23
 
24 24
 ?>
25 25
 
26 26
 <div class="field-group clearfix frm-half frm-first-row">
27 27
 	<label><?php _e( 'Theme', 'formidable' ) ?></label>
28
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('theme_selector') ) ?>">
28
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'theme_selector' ) ) ?>">
29 29
 	    <?php foreach ( $jquery_themes as $theme_name => $theme_title ) { ?>
30
-		<option value="<?php echo esc_attr( $theme_name ) ?>" id="90_<?php echo esc_attr( $alt_img_name[ $theme_name ] ); ?>" <?php selected( $theme_title, $style->post_content['theme_name'] ) ?>>
30
+		<option value="<?php echo esc_attr( $theme_name ) ?>" id="90_<?php echo esc_attr( $alt_img_name[$theme_name] ); ?>" <?php selected( $theme_title, $style->post_content['theme_name'] ) ?>>
31 31
 			<?php echo esc_html( $theme_title ) ?>
32 32
 		</option>
33 33
         <?php } ?>
@@ -38,8 +38,8 @@  discard block
 block discarded – undo
38 38
 </div>
39 39
 
40 40
 <div class="field-group clearfix frm-half frm-first-row frm_right_text">
41
-    <img id="frm_show_cal" src="//jqueryui.com/resources/images/themeGallery/theme_90_<?php echo esc_attr( $alt_img_name[ $style->post_content['theme_css'] ] ) ?>.png" alt="" />
42
-	<input type="hidden" value="<?php echo esc_attr($style->post_content['theme_css']) ?>" id="frm_theme_css" name="<?php echo esc_attr( $frm_style->get_field_name('theme_css') ) ?>" />
43
-    <input type="hidden" value="<?php echo esc_attr($style->post_content['theme_name']) ?>" id="frm_theme_name" name="<?php echo esc_attr( $frm_style->get_field_name('theme_name') ) ?>" />
41
+    <img id="frm_show_cal" src="//jqueryui.com/resources/images/themeGallery/theme_90_<?php echo esc_attr( $alt_img_name[$style->post_content['theme_css']] ) ?>.png" alt="" />
42
+	<input type="hidden" value="<?php echo esc_attr( $style->post_content['theme_css'] ) ?>" id="frm_theme_css" name="<?php echo esc_attr( $frm_style->get_field_name( 'theme_css' ) ) ?>" />
43
+    <input type="hidden" value="<?php echo esc_attr( $style->post_content['theme_name'] ) ?>" id="frm_theme_name" name="<?php echo esc_attr( $frm_style->get_field_name( 'theme_name' ) ) ?>" />
44 44
 </div>
45 45
 <div class="clear"></div>
Please login to merge, or discard this patch.