Completed
Branch 3.0 (864fc8)
by Stephanie
02:53
created
classes/views/styles/_buttons.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <p class="frm_no_top_margin">
2 2
 	<label for="frm_submit_style">
3
-		<input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name('submit_style') ) ?>" id="frm_submit_style" <?php checked( $style->post_content['submit_style'], 1 ) ?> value="1" />
3
+		<input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_style' ) ) ?>" id="frm_submit_style" <?php checked( $style->post_content['submit_style'], 1 ) ?> value="1" />
4 4
 		<?php esc_html_e( 'Disable submit button styling', 'formidable' ); ?>
5 5
 		<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Note: If disabled, you may not see the change take effect until you make 2 more styling changes or click "Update Options".', 'formidable' ) ?>"></span>
6 6
 	</label>
@@ -9,10 +9,10 @@  discard block
 block discarded – undo
9 9
 <div class="posttypediv">
10 10
 	<ul class="posttype-tabs add-menu-item-tabs">
11 11
 		<li <?php echo ( 'default' == $current_tab ? ' class="tabs"' : '' ); ?>>
12
-    		<a href="<?php echo esc_url('?page=formidable-styles&page-tab=default#tabs-panel-button-default') ?>" class="nav-tab-link" data-type="tabs-panel-button-default" ><?php _e( 'Default', 'formidable' ) ?></a>
12
+    		<a href="<?php echo esc_url( '?page=formidable-styles&page-tab=default#tabs-panel-button-default' ) ?>" class="nav-tab-link" data-type="tabs-panel-button-default" ><?php _e( 'Default', 'formidable' ) ?></a>
13 13
     	</li>
14 14
 		<li <?php echo ( 'button-hover' == $current_tab ? ' class="tabs"' : '' ); ?>>
15
-			<a href="<?php echo esc_url('?page=formidable-styles&page-tab=button-hover#page-button-hover') ?>" class="nav-tab-link" data-type="tabs-panel-button-hover" ><?php _e( 'Hover', 'formidable' ) ?></a>
15
+			<a href="<?php echo esc_url( '?page=formidable-styles&page-tab=button-hover#page-button-hover' ) ?>" class="nav-tab-link" data-type="tabs-panel-button-hover" ><?php _e( 'Hover', 'formidable' ) ?></a>
16 16
 		</li>
17 17
 		<li <?php echo ( 'button-click' == $current_tab ? ' class="tabs"' : '' ); ?>>
18 18
 			<a href="?page=formidable-styles&page-tab=button-click#tabs-panel-button-click" class="nav-tab-link" data-type="tabs-panel-button-click"><?php _e( 'Click', 'formidable' ) ?></a>
@@ -24,22 +24,22 @@  discard block
 block discarded – undo
24 24
 	?>">
25 25
 	    <div class="field-group field-group-border clearfix">
26 26
         	<label><?php _e( 'Size', 'formidable' ) ?></label>
27
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_font_size') ) ?>" id="frm_submit_font_size" value="<?php echo esc_attr( $style->post_content['submit_font_size'] ) ?>"  size="3" />
27
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_font_size' ) ) ?>" id="frm_submit_font_size" value="<?php echo esc_attr( $style->post_content['submit_font_size'] ) ?>"  size="3" />
28 28
         </div>
29 29
 
30 30
         <div class="field-group clearfix">
31 31
         	<label><?php _e( 'Width', 'formidable' ) ?></label>
32
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_width') ) ?>" id="frm_submit_width" value="<?php echo esc_attr( $style->post_content['submit_width'] ) ?>"  size="5" />
32
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_width' ) ) ?>" id="frm_submit_width" value="<?php echo esc_attr( $style->post_content['submit_width'] ) ?>"  size="5" />
33 33
         </div>
34 34
 
35 35
         <div class="field-group clearfix">
36 36
         	<label><?php _e( 'Height', 'formidable' ) ?></label>
37
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_height') ) ?>" id="frm_submit_height" value="<?php echo esc_attr( $style->post_content['submit_height'] ) ?>"  size="5" />
37
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_height' ) ) ?>" id="frm_submit_height" value="<?php echo esc_attr( $style->post_content['submit_height'] ) ?>"  size="5" />
38 38
         </div>
39 39
 
40 40
         <div class="field-group clearfix">
41 41
         	<label><?php _e( 'Weight', 'formidable' ) ?></label>
42
-        	<select name="<?php echo esc_attr( $frm_style->get_field_name('submit_weight') ) ?>" id="frm_submit_weight">
42
+        	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_weight' ) ) ?>" id="frm_submit_weight">
43 43
 				<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
44 44
 				<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['submit_weight'], $value ) ?>><?php echo esc_html( $name ) ?></option>
45 45
 				<?php } ?>
@@ -48,48 +48,48 @@  discard block
 block discarded – undo
48 48
 
49 49
         <div class="field-group clearfix">
50 50
         	<label><?php _e( 'Corners', 'formidable' ) ?></label>
51
-        	<input type="text" value="<?php echo esc_attr( $style->post_content['submit_border_radius'] ) ?>" name="<?php echo esc_attr( $frm_style->get_field_name('submit_border_radius') ) ?>" id="frm_submit_border_radius" size="4"/>
51
+        	<input type="text" value="<?php echo esc_attr( $style->post_content['submit_border_radius'] ) ?>" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_border_radius' ) ) ?>" id="frm_submit_border_radius" size="4"/>
52 52
         </div>
53 53
 
54 54
         <div class="field-group field-group-border clearfix">
55 55
         	<label><?php _e( 'BG color', 'formidable' ) ?></label>
56
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_bg_color') ) ?>" id="frm_submit_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_bg_color'] ) ?>" />
56
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_bg_color' ) ) ?>" id="frm_submit_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_bg_color'] ) ?>" />
57 57
         </div>
58 58
 
59 59
         <div class="field-group clearfix">
60 60
         	<label><?php _e( 'Text', 'formidable' ) ?></label>
61
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_text_color') ) ?>" id="frm_submit_text_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_text_color'] ) ?>" />
61
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_text_color' ) ) ?>" id="frm_submit_text_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_text_color'] ) ?>" />
62 62
         </div>
63 63
 
64 64
         <div class="field-group field-group-border clearfix">
65 65
         	<label><?php _e( 'Border', 'formidable' ) ?></label>
66
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_border_color') ) ?>" id="frm_submit_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_border_color'] ) ?>" />
66
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_border_color' ) ) ?>" id="frm_submit_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_border_color'] ) ?>" />
67 67
         </div>
68 68
 
69 69
         <div class="field-group clearfix">
70 70
         	<label><?php _e( 'Thickness', 'formidable' ) ?></label>
71
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_border_width') ) ?>" id="frm_submit_border_width" value="<?php echo esc_attr( $style->post_content['submit_border_width'] ) ?>" size="4" />
71
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_border_width' ) ) ?>" id="frm_submit_border_width" value="<?php echo esc_attr( $style->post_content['submit_border_width'] ) ?>" size="4" />
72 72
         </div>
73 73
 
74 74
         <div class="field-group clearfix">
75 75
         	<label><?php _e( 'Shadow', 'formidable' ) ?></label>
76
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_shadow_color') ) ?>" id="frm_submit_shadow_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_shadow_color'] ) ?>" />
76
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_shadow_color' ) ) ?>" id="frm_submit_shadow_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_shadow_color'] ) ?>" />
77 77
         </div>
78 78
 
79 79
         <div class="clear"></div>
80 80
         <div class="field-group field-group-border frm-full">
81 81
         	<label><?php _e( 'BG Image', 'formidable' ) ?></label>
82
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_bg_img') ) ?>" id="frm_submit_bg_img" value="<?php echo esc_attr( $style->post_content['submit_bg_img'] ) ?>"  />
82
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_bg_img' ) ) ?>" id="frm_submit_bg_img" value="<?php echo esc_attr( $style->post_content['submit_bg_img'] ) ?>"  />
83 83
         </div>
84 84
 
85 85
         <div class="field-group field-group-border clearfix">
86 86
         	<label><?php _e( 'Margin', 'formidable' ) ?></label>
87
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_margin') ) ?>" id="frm_submit_margin" value="<?php echo esc_attr( $style->post_content['submit_margin'] ) ?>" size="6" />
87
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_margin' ) ) ?>" id="frm_submit_margin" value="<?php echo esc_attr( $style->post_content['submit_margin'] ) ?>" size="6" />
88 88
         </div>
89 89
 
90 90
         <div class="field-group clearfix">
91 91
         	<label><?php _e( 'Padding', 'formidable' ) ?></label>
92
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_padding') ) ?>" id="frm_submit_padding" value="<?php echo esc_attr( $style->post_content['submit_padding'] ) ?>" size="6" />
92
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_padding' ) ) ?>" id="frm_submit_padding" value="<?php echo esc_attr( $style->post_content['submit_padding'] ) ?>" size="6" />
93 93
         </div>
94 94
         <div class="clear"></div>
95 95
 	</div><!-- /.tabs-panel -->
@@ -99,17 +99,17 @@  discard block
 block discarded – undo
99 99
 	?>">
100 100
 	    <div class="field-group clearfix">
101 101
         	<label><?php _e( 'BG color', 'formidable' ) ?></label>
102
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_hover_bg_color') ) ?>" id="frm_submit_hover_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_bg_color'] ) ?>" />
102
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_hover_bg_color' ) ) ?>" id="frm_submit_hover_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_bg_color'] ) ?>" />
103 103
         </div>
104 104
 
105 105
         <div class="field-group clearfix">
106 106
     	    <label><?php _e( 'Text', 'formidable' ) ?></label>
107
-    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_hover_color') ) ?>" id="frm_submit_hover_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_color'] ) ?>" />
107
+    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_hover_color' ) ) ?>" id="frm_submit_hover_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_color'] ) ?>" />
108 108
         </div>
109 109
 
110 110
         <div class="field-group clearfix">
111 111
             <label><?php _e( 'Border', 'formidable' ) ?></label>
112
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_hover_border_color') ) ?>" id="frm_submit_hover_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_border_color'] ) ?>" />
112
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_hover_border_color' ) ) ?>" id="frm_submit_hover_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_border_color'] ) ?>" />
113 113
         </div>
114 114
 
115 115
 	    <div class="clear"></div>
@@ -120,17 +120,17 @@  discard block
 block discarded – undo
120 120
 	?>">
121 121
 	    <div class="field-group clearfix">
122 122
         	<label><?php _e( 'BG color', 'formidable' ) ?></label>
123
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_active_bg_color') ) ?>" id="frm_submit_active_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_bg_color'] ) ?>" />
123
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_active_bg_color' ) ) ?>" id="frm_submit_active_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_bg_color'] ) ?>" />
124 124
         </div>
125 125
 
126 126
         <div class="field-group clearfix">
127 127
     	    <label><?php _e( 'Text', 'formidable' ) ?></label>
128
-    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_active_color') ) ?>" id="frm_submit_active_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_color'] ) ?>" />
128
+    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_active_color' ) ) ?>" id="frm_submit_active_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_color'] ) ?>" />
129 129
         </div>
130 130
 
131 131
         <div class="field-group clearfix">
132 132
             <label><?php _e( 'Border', 'formidable' ) ?></label>
133
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_active_border_color') ) ?>" id="frm_submit_active_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_border_color'] ) ?>" />
133
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_active_border_color' ) ) ?>" id="frm_submit_active_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_border_color'] ) ?>" />
134 134
         </div>
135 135
 
136 136
 	    <div class="clear"></div>
Please login to merge, or discard this patch.
classes/views/frm-entries/list.php 1 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 id="form_entries_page" class="wrap">
2 2
 	<h1><?php _e( 'Entries', 'formidable' ); ?>
3
-        <?php do_action('frm_entry_inside_h2', $form); ?>
3
+        <?php do_action( 'frm_entry_inside_h2', $form ); ?>
4 4
 	</h1>
5 5
 
6 6
 	<?php require( FrmAppHelper::plugin_path() . '/classes/views/shared/errors.php' ); ?>
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
         <div id="poststuff">
10 10
             <div id="post-body" class="metabox-holder columns-2">
11 11
             <div id="post-body-content">
12
-                <?php FrmAppController::get_form_nav($form, true, 'hide'); ?>
12
+                <?php FrmAppController::get_form_nav( $form, true, 'hide' ); ?>
13 13
             </div>
14 14
             <div id="postbox-container-1" class="postbox-container">
15 15
                 <input type="hidden" name="page" value="formidable-entries" />
Please login to merge, or discard this patch.
classes/models/FrmEmail.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 			'entry'     => $this->entry,
96 96
 			'form'      => $this->form,
97 97
 		);
98
-		$to     = apply_filters( 'frm_to_email', $to, $values, $this->form->id, $args );
98
+		$to = apply_filters( 'frm_to_email', $to, $values, $this->form->id, $args );
99 99
 
100 100
 		$this->to = array_unique( (array) $to );
101 101
 
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
433 433
 	 * @return array
434 434
 	 */
435 435
 	private function package_header() {
436
-		$header   = array();
436
+		$header = array();
437 437
 
438 438
 		if ( ! empty( $this->cc ) ) {
439 439
 			$header[] = 'CC: ' . implode( ',', $this->cc );
@@ -546,12 +546,12 @@  discard block
 block discarded – undo
546 546
 					$name = trim( str_replace( $email, '', $val ) );
547 547
 				} else {
548 548
 					// If user enters a name without an email
549
-					unset( $recipients[ $key ] );
549
+					unset( $recipients[$key] );
550 550
 					continue;
551 551
 				}
552 552
 			}
553 553
 
554
-			$recipients[ $key ] = $name . ' <' . $email . '>';
554
+			$recipients[$key] = $name . ' <' . $email . '>';
555 555
 		}
556 556
 
557 557
 		return $recipients;
@@ -668,7 +668,7 @@  discard block
 block discarded – undo
668 668
 				) );
669 669
 
670 670
 				// Remove phone number from to addresses
671
-				unset( $this->to[ $key ] );
671
+				unset( $this->to[$key] );
672 672
 			}
673 673
 		}
674 674
 	}
Please login to merge, or discard this patch.
classes/models/FrmEntryMeta.php 3 patches
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -281,6 +281,7 @@
 block discarded – undo
281 281
      * @param string|array $where
282 282
      * @param string $order_by
283 283
      * @param string $limit
284
+     * @param boolean $unique
284 285
      */
285 286
 	private static function get_ids_query( $where, $order_by, $limit, $unique, $args, array &$query ) {
286 287
         global $wpdb;
Please login to merge, or discard this patch.
Indentation   +175 added lines, -175 removed lines patch added patch discarded remove patch
@@ -5,25 +5,25 @@  discard block
 block discarded – undo
5 5
 
6 6
 class FrmEntryMeta {
7 7
 
8
-    /**
9
-     * @param string $meta_key
10
-     */
8
+	/**
9
+	 * @param string $meta_key
10
+	 */
11 11
 	public static function add_entry_meta( $entry_id, $field_id, $meta_key = null, $meta_value ) {
12
-        global $wpdb;
12
+		global $wpdb;
13 13
 
14
-        if ( FrmAppHelper::is_empty_value( $meta_value ) ) {
15
-            // don't save blank fields
16
-            return 0;
17
-        }
14
+		if ( FrmAppHelper::is_empty_value( $meta_value ) ) {
15
+			// don't save blank fields
16
+			return 0;
17
+		}
18 18
 
19
-        $new_values = array(
19
+		$new_values = array(
20 20
 			'meta_value'    => is_array( $meta_value ) ? serialize( array_filter( $meta_value, 'FrmAppHelper::is_not_empty_value' ) ) : trim( $meta_value ),
21
-            'item_id'       => $entry_id,
22
-            'field_id'      => $field_id,
23
-            'created_at'    => current_time('mysql', 1),
24
-        );
21
+			'item_id'       => $entry_id,
22
+			'field_id'      => $field_id,
23
+			'created_at'    => current_time('mysql', 1),
24
+		);
25 25
 
26
-        $new_values = apply_filters('frm_add_entry_meta', $new_values);
26
+		$new_values = apply_filters('frm_add_entry_meta', $new_values);
27 27
 
28 28
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_item_metas', $new_values );
29 29
 
@@ -34,40 +34,40 @@  discard block
 block discarded – undo
34 34
 			$id = 0;
35 35
 		}
36 36
 
37
-        return $id;
38
-    }
37
+		return $id;
38
+	}
39 39
 
40
-    /**
41
-     * @param string $meta_key
42
-     */
40
+	/**
41
+	 * @param string $meta_key
42
+	 */
43 43
 	public static function update_entry_meta( $entry_id, $field_id, $meta_key = null, $meta_value ) {
44
-        if ( ! $field_id ) {
45
-            return false;
46
-        }
44
+		if ( ! $field_id ) {
45
+			return false;
46
+		}
47 47
 
48
-        global $wpdb;
48
+		global $wpdb;
49 49
 
50 50
 		$values = array( 'item_id' => $entry_id, 'field_id' => $field_id );
51 51
 		$where_values = $values;
52
-        $values['meta_value'] = $meta_value;
53
-        $values = apply_filters('frm_update_entry_meta', $values);
52
+		$values['meta_value'] = $meta_value;
53
+		$values = apply_filters('frm_update_entry_meta', $values);
54 54
 		if ( is_array($values['meta_value']) ) {
55 55
 			$values['meta_value'] = array_filter( $values['meta_value'], 'FrmAppHelper::is_not_empty_value' );
56 56
 		}
57
-        $meta_value = maybe_serialize($values['meta_value']);
57
+		$meta_value = maybe_serialize($values['meta_value']);
58 58
 
59
-        wp_cache_delete( $entry_id, 'frm_entry');
59
+		wp_cache_delete( $entry_id, 'frm_entry');
60 60
 		self::clear_cache();
61 61
 
62 62
 		return $wpdb->update( $wpdb->prefix . 'frm_item_metas', array( 'meta_value' => $meta_value ), $where_values );
63
-    }
63
+	}
64 64
 
65 65
 	public static function update_entry_metas( $entry_id, $values ) {
66
-        global $wpdb;
66
+		global $wpdb;
67 67
 
68 68
 		$prev_values = FrmDb::get_col( $wpdb->prefix . 'frm_item_metas', array( 'item_id' => $entry_id, 'field_id !' => 0 ), 'field_id' );
69 69
 
70
-        foreach ( $values as $field_id => $meta_value ) {
70
+		foreach ( $values as $field_id => $meta_value ) {
71 71
 			$field = false;
72 72
 			if ( ! empty( $field_id ) ) {
73 73
 				$field = FrmField::getOne( $field_id );
@@ -91,39 +91,39 @@  discard block
 block discarded – undo
91 91
 			}
92 92
 		}
93 93
 
94
-        if ( empty($prev_values) ) {
95
-            return;
96
-        }
94
+		if ( empty($prev_values) ) {
95
+			return;
96
+		}
97 97
 
98
-        $prev_values = array_diff($prev_values, array_keys($values));
98
+		$prev_values = array_diff($prev_values, array_keys($values));
99 99
 
100
-        if ( empty($prev_values) ) {
101
-            return;
102
-        }
100
+		if ( empty($prev_values) ) {
101
+			return;
102
+		}
103 103
 
104 104
 		// prepare the query
105 105
 		$where = array( 'item_id' => $entry_id, 'field_id' => $prev_values );
106 106
 		FrmDb::get_where_clause_and_values( $where );
107 107
 
108
-        // Delete any leftovers
109
-        $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas ' . $where['where'], $where['values'] ) );
108
+		// Delete any leftovers
109
+		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas ' . $where['where'], $where['values'] ) );
110 110
 		self::clear_cache();
111
-    }
111
+	}
112 112
 
113 113
 	public static function duplicate_entry_metas( $old_id, $new_id ) {
114
-        $metas = self::get_entry_meta_info($old_id);
115
-        foreach ( $metas as $meta ) {
116
-            self::add_entry_meta($new_id, $meta->field_id, null, $meta->meta_value);
117
-            unset($meta);
118
-        }
114
+		$metas = self::get_entry_meta_info($old_id);
115
+		foreach ( $metas as $meta ) {
116
+			self::add_entry_meta($new_id, $meta->field_id, null, $meta->meta_value);
117
+			unset($meta);
118
+		}
119 119
 		self::clear_cache();
120
-    }
120
+	}
121 121
 
122 122
 	public static function delete_entry_meta( $entry_id, $field_id ) {
123
-        global $wpdb;
123
+		global $wpdb;
124 124
 		self::clear_cache();
125
-        return $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id));
126
-    }
125
+		return $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id));
126
+	}
127 127
 
128 128
 	/**
129 129
 	 * Clear entry meta caching
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 	}
149 149
 
150 150
 	public static function get_entry_meta_by_field( $entry_id, $field_id ) {
151
-        global $wpdb;
151
+		global $wpdb;
152 152
 
153 153
 		if ( is_object( $entry_id ) ) {
154 154
 			$entry = $entry_id;
@@ -161,130 +161,130 @@  discard block
 block discarded – undo
161 161
 
162 162
 		if ( $cached && isset( $cached->metas ) && isset( $cached->metas[ $field_id ] ) ) {
163 163
 			$result = $cached->metas[ $field_id ];
164
-            return stripslashes_deep($result);
165
-        }
164
+			return stripslashes_deep($result);
165
+		}
166 166
 
167 167
 		$get_table = $wpdb->prefix . 'frm_item_metas';
168 168
 		$query = array( 'item_id' => $entry_id );
169
-        if ( is_numeric($field_id) ) {
169
+		if ( is_numeric($field_id) ) {
170 170
 			$query['field_id'] = $field_id;
171
-        } else {
171
+		} else {
172 172
 			$get_table .= ' it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id';
173 173
 			$query['fi.field_key'] = $field_id;
174
-        }
174
+		}
175 175
 
176 176
 		$result = FrmDb::get_var( $get_table, $query, 'meta_value' );
177
-        $result = maybe_unserialize($result);
178
-        $result = stripslashes_deep($result);
177
+		$result = maybe_unserialize($result);
178
+		$result = stripslashes_deep($result);
179 179
 
180
-        return $result;
181
-    }
180
+		return $result;
181
+	}
182 182
 
183
-    public static function get_entry_metas_for_field( $field_id, $order = '', $limit = '', $args = array() ) {
183
+	public static function get_entry_metas_for_field( $field_id, $order = '', $limit = '', $args = array() ) {
184 184
 		$defaults = array( 'value' => false, 'unique' => false, 'stripslashes' => true, 'is_draft' => false );
185
-        $args = wp_parse_args( $args, $defaults );
185
+		$args = wp_parse_args( $args, $defaults );
186 186
 
187
-        $query = array();
188
-        self::meta_field_query($field_id, $order, $limit, $args, $query);
189
-        $query = implode(' ', $query);
187
+		$query = array();
188
+		self::meta_field_query($field_id, $order, $limit, $args, $query);
189
+		$query = implode(' ', $query);
190 190
 
191 191
 		$cache_key = 'entry_metas_for_field_' . $field_id . $order . $limit . maybe_serialize( $args );
192
-        $values = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, 'get_col');
192
+		$values = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, 'get_col');
193 193
 
194
-        if ( ! $args['stripslashes'] ) {
195
-            return $values;
196
-        }
194
+		if ( ! $args['stripslashes'] ) {
195
+			return $values;
196
+		}
197 197
 
198 198
 		foreach ( $values as $k => $v ) {
199 199
 			$values[ $k ] = maybe_unserialize( $v );
200
-            unset($k, $v);
201
-        }
200
+			unset($k, $v);
201
+		}
202 202
 
203
-        return stripslashes_deep($values);
204
-    }
203
+		return stripslashes_deep($values);
204
+	}
205 205
 
206
-    /**
207
-     * @param string $order
208
-     * @param string $limit
209
-     */
206
+	/**
207
+	 * @param string $order
208
+	 * @param string $limit
209
+	 */
210 210
 	private static function meta_field_query( $field_id, $order, $limit, $args, array &$query ) {
211
-        global $wpdb;
212
-        $query[] = 'SELECT';
213
-        $query[] = $args['unique'] ? 'DISTINCT(em.meta_value)' : 'em.meta_value';
211
+		global $wpdb;
212
+		$query[] = 'SELECT';
213
+		$query[] = $args['unique'] ? 'DISTINCT(em.meta_value)' : 'em.meta_value';
214 214
 		$query[] = 'FROM ' . $wpdb->prefix . 'frm_item_metas em ';
215 215
 
216
-        if ( ! $args['is_draft'] ) {
216
+		if ( ! $args['is_draft'] ) {
217 217
 			$query[] = 'INNER JOIN ' . $wpdb->prefix . 'frm_items e ON (e.id=em.item_id)';
218
-        }
218
+		}
219 219
 
220
-        if ( is_numeric($field_id) ) {
221
-            $query[] = $wpdb->prepare('WHERE em.field_id=%d', $field_id);
222
-        } else {
220
+		if ( is_numeric($field_id) ) {
221
+			$query[] = $wpdb->prepare('WHERE em.field_id=%d', $field_id);
222
+		} else {
223 223
 			$query[] = $wpdb->prepare( 'LEFT JOIN ' . $wpdb->prefix . 'frm_fields fi ON (em.field_id = fi.id) WHERE fi.field_key=%s', $field_id );
224
-        }
224
+		}
225 225
 
226
-        if ( ! $args['is_draft'] ) {
227
-            $query[] = 'AND e.is_draft=0';
228
-        }
226
+		if ( ! $args['is_draft'] ) {
227
+			$query[] = 'AND e.is_draft=0';
228
+		}
229 229
 
230
-        if ( $args['value'] ) {
231
-            $query[] = $wpdb->prepare(' AND meta_value=%s', $args['value']);
232
-        }
233
-        $query[] = $order . $limit;
234
-    }
230
+		if ( $args['value'] ) {
231
+			$query[] = $wpdb->prepare(' AND meta_value=%s', $args['value']);
232
+		}
233
+		$query[] = $order . $limit;
234
+	}
235 235
 
236 236
 	public static function get_entry_meta_info( $entry_id ) {
237 237
 		return FrmDb::get_results( 'frm_item_metas', array( 'item_id' => $entry_id ) );
238
-    }
238
+	}
239 239
 
240 240
 	public static function getAll( $where = array(), $order_by = '', $limit = '', $stripslashes = false ) {
241
-        global $wpdb;
242
-        $query = 'SELECT it.*, fi.type as field_type, fi.field_key as field_key,
241
+		global $wpdb;
242
+		$query = 'SELECT it.*, fi.type as field_type, fi.field_key as field_key,
243 243
             fi.required as required, fi.form_id as field_form_id, fi.name as field_name, fi.options as fi_options
244 244
 			FROM ' . $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id' .
245
-            FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
245
+			FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
246 246
 
247 247
 		$cache_key = 'all_' . maybe_serialize( $where ) . $order_by . $limit;
248
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
248
+		$results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
249 249
 
250
-        if ( ! $results || ! $stripslashes ) {
251
-            return $results;
252
-        }
250
+		if ( ! $results || ! $stripslashes ) {
251
+			return $results;
252
+		}
253 253
 
254
-        foreach ( $results as $k => $result ) {
254
+		foreach ( $results as $k => $result ) {
255 255
 			$results[ $k ]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
256
-            unset($k, $result);
257
-        }
256
+			unset($k, $result);
257
+		}
258 258
 
259
-        return $results;
260
-    }
259
+		return $results;
260
+	}
261 261
 
262
-    public static function getEntryIds( $where = array(), $order_by = '', $limit = '', $unique = true, $args = array() ) {
262
+	public static function getEntryIds( $where = array(), $order_by = '', $limit = '', $unique = true, $args = array() ) {
263 263
 		$defaults = array(
264 264
 			'is_draft' => false,
265 265
 			'user_id'  => '',
266 266
 			'group_by' => '',
267 267
 		);
268
-        $args = wp_parse_args($args, $defaults);
268
+		$args = wp_parse_args($args, $defaults);
269 269
 
270
-        $query = array();
271
-        self::get_ids_query($where, $order_by, $limit, $unique, $args, $query );
272
-        $query = implode(' ', $query);
270
+		$query = array();
271
+		self::get_ids_query($where, $order_by, $limit, $unique, $args, $query );
272
+		$query = implode(' ', $query);
273 273
 
274 274
 		$cache_key = 'ids_' . maybe_serialize( $where ) . $order_by . 'l' . $limit . 'u' . $unique . maybe_serialize( $args );
275
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
275
+		$results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
276 276
 
277
-        return $results;
278
-    }
277
+		return $results;
278
+	}
279 279
 
280
-    /**
281
-     * @param string|array $where
282
-     * @param string $order_by
283
-     * @param string $limit
284
-     */
280
+	/**
281
+	 * @param string|array $where
282
+	 * @param string $order_by
283
+	 * @param string $limit
284
+	 */
285 285
 	private static function get_ids_query( $where, $order_by, $limit, $unique, $args, array &$query ) {
286
-        global $wpdb;
287
-        $query[] = 'SELECT';
286
+		global $wpdb;
287
+		$query[] = 'SELECT';
288 288
 
289 289
 		$defaults = array( 'return_parent_id' => false );
290 290
 		$args = array_merge( $defaults, $args );
@@ -298,89 +298,89 @@  discard block
 block discarded – undo
298 298
 		$query[] = 'FROM ' . $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id';
299 299
 
300 300
 		$query[] = 'INNER JOIN ' . $wpdb->prefix . 'frm_items e ON (e.id=it.item_id)';
301
-        if ( is_array($where) ) {
302
-            if ( ! $args['is_draft'] ) {
303
-                $where['e.is_draft'] = 0;
304
-            } else if ( $args['is_draft'] == 1 ) {
305
-                $where['e.is_draft'] = 1;
306
-            }
307
-
308
-            if ( ! empty($args['user_id']) ) {
309
-                $where['e.user_id'] = $args['user_id'];
310
-            }
311
-            $query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
301
+		if ( is_array($where) ) {
302
+			if ( ! $args['is_draft'] ) {
303
+				$where['e.is_draft'] = 0;
304
+			} else if ( $args['is_draft'] == 1 ) {
305
+				$where['e.is_draft'] = 1;
306
+			}
307
+
308
+			if ( ! empty($args['user_id']) ) {
309
+				$where['e.user_id'] = $args['user_id'];
310
+			}
311
+			$query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
312 312
 
313 313
 			if ( $args['group_by'] ) {
314 314
 				$query[] = ' GROUP BY ' . sanitize_text_field( $args['group_by'] );
315 315
 			}
316
-            return;
317
-        }
316
+			return;
317
+		}
318 318
 
319 319
 		$draft_where = '';
320 320
 		$user_where = '';
321
-        if ( ! $args['is_draft'] ) {
321
+		if ( ! $args['is_draft'] ) {
322 322
 			$draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 0 );
323
-        } else if ( $args['is_draft'] == 1 ) {
323
+		} else if ( $args['is_draft'] == 1 ) {
324 324
 			$draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 1 );
325
-        }
325
+		}
326 326
 
327
-        if ( ! empty($args['user_id']) ) {
328
-            $user_where = $wpdb->prepare(' AND e.user_id=%d', $args['user_id']);
329
-        }
327
+		if ( ! empty($args['user_id']) ) {
328
+			$user_where = $wpdb->prepare(' AND e.user_id=%d', $args['user_id']);
329
+		}
330 330
 
331
-        if ( strpos($where, ' GROUP BY ') ) {
332
-            // don't inject WHERE filtering after GROUP BY
333
-            $parts = explode(' GROUP BY ', $where);
334
-            $where = $parts[0];
335
-            $where .= $draft_where . $user_where;
331
+		if ( strpos($where, ' GROUP BY ') ) {
332
+			// don't inject WHERE filtering after GROUP BY
333
+			$parts = explode(' GROUP BY ', $where);
334
+			$where = $parts[0];
335
+			$where .= $draft_where . $user_where;
336 336
 			$where .= ' GROUP BY ' . $parts[1];
337
-        } else {
338
-            $where .= $draft_where . $user_where;
339
-        }
337
+		} else {
338
+			$where .= $draft_where . $user_where;
339
+		}
340 340
 
341 341
 		// The query has already been prepared
342 342
 		$query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
343
-    }
343
+	}
344 344
 
345
-    public static function search_entry_metas( $search, $field_id = '', $operator ) {
345
+	public static function search_entry_metas( $search, $field_id = '', $operator ) {
346 346
 		$cache_key = 'search_' . maybe_serialize( $search ) . $field_id . $operator;
347
-        $results = wp_cache_get($cache_key, 'frm_entry');
348
-        if ( false !== $results ) {
349
-            return $results;
350
-        }
347
+		$results = wp_cache_get($cache_key, 'frm_entry');
348
+		if ( false !== $results ) {
349
+			return $results;
350
+		}
351 351
 
352
-        global $wpdb;
352
+		global $wpdb;
353 353
 		if ( is_array( $search ) ) {
354
-            $where = '';
354
+			$where = '';
355 355
 			foreach ( $search as $field => $value ) {
356 356
 				if ( $value <= 0 || ! in_array( $field, array( 'year', 'month', 'day' ) ) ) {
357
-                    continue;
358
-                }
357
+					continue;
358
+				}
359 359
 
360
-                switch ( $field ) {
361
-                    case 'year':
360
+				switch ( $field ) {
361
+					case 'year':
362 362
 						$value = '%' . $value;
363
-                    break;
364
-                    case 'month':
365
-                        $value .= '%';
366
-                    break;
367
-                    case 'day':
363
+					break;
364
+					case 'month':
365
+						$value .= '%';
366
+					break;
367
+					case 'day':
368 368
 						$value = '%' . $value . '%';
369
-                }
369
+				}
370 370
 				$where .= $wpdb->prepare(' meta_value ' . $operator . ' %s and', $value );
371
-            }
372
-            $where .= $wpdb->prepare(' field_id=%d', $field_id);
371
+			}
372
+			$where .= $wpdb->prepare(' field_id=%d', $field_id);
373 373
 			$query = 'SELECT DISTINCT item_id FROM ' . $wpdb->prefix . 'frm_item_metas' . FrmAppHelper::prepend_and_or_where( ' WHERE ', $where );
374
-        } else {
374
+		} else {
375 375
 			if ( $operator == 'LIKE' ) {
376
-                $search = '%' . $search . '%';
376
+				$search = '%' . $search . '%';
377 377
 			}
378
-            $query = $wpdb->prepare("SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id);
379
-        }
378
+			$query = $wpdb->prepare("SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id);
379
+		}
380 380
 
381
-        $results = $wpdb->get_col($query, 0);
381
+		$results = $wpdb->get_col($query, 0);
382 382
 		FrmAppHelper::set_cache( $cache_key, $results, 'frm_entry' );
383 383
 
384
-        return $results;
385
-    }
384
+		return $results;
385
+	}
386 386
 }
Please login to merge, or discard this patch.
Spacing   +53 added lines, -53 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined('ABSPATH') ) {
2
+if ( ! defined( 'ABSPATH' ) ) {
3 3
 	die( 'You are not allowed to call this page directly.' );
4 4
 }
5 5
 
@@ -20,10 +20,10 @@  discard block
 block discarded – undo
20 20
 			'meta_value'    => is_array( $meta_value ) ? serialize( array_filter( $meta_value, 'FrmAppHelper::is_not_empty_value' ) ) : trim( $meta_value ),
21 21
             'item_id'       => $entry_id,
22 22
             'field_id'      => $field_id,
23
-            'created_at'    => current_time('mysql', 1),
23
+            'created_at'    => current_time( 'mysql', 1 ),
24 24
         );
25 25
 
26
-        $new_values = apply_filters('frm_add_entry_meta', $new_values);
26
+        $new_values = apply_filters( 'frm_add_entry_meta', $new_values );
27 27
 
28 28
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_item_metas', $new_values );
29 29
 
@@ -50,13 +50,13 @@  discard block
 block discarded – undo
50 50
 		$values = array( 'item_id' => $entry_id, 'field_id' => $field_id );
51 51
 		$where_values = $values;
52 52
         $values['meta_value'] = $meta_value;
53
-        $values = apply_filters('frm_update_entry_meta', $values);
54
-		if ( is_array($values['meta_value']) ) {
53
+        $values = apply_filters( 'frm_update_entry_meta', $values );
54
+		if ( is_array( $values['meta_value'] ) ) {
55 55
 			$values['meta_value'] = array_filter( $values['meta_value'], 'FrmAppHelper::is_not_empty_value' );
56 56
 		}
57
-        $meta_value = maybe_serialize($values['meta_value']);
57
+        $meta_value = maybe_serialize( $values['meta_value'] );
58 58
 
59
-        wp_cache_delete( $entry_id, 'frm_entry');
59
+        wp_cache_delete( $entry_id, 'frm_entry' );
60 60
 		self::clear_cache();
61 61
 
62 62
 		return $wpdb->update( $wpdb->prefix . 'frm_item_metas', array( 'meta_value' => $meta_value ), $where_values );
@@ -76,11 +76,11 @@  discard block
 block discarded – undo
76 76
 			// set the value for the file upload field and add new tags (in Pro version)
77 77
 			$meta_value = apply_filters( 'frm_prepare_data_before_db', $meta_value, $field_id, $entry_id, compact( 'field' ) );
78 78
 
79
-			if ( $prev_values && in_array($field_id, $prev_values) ) {
79
+			if ( $prev_values && in_array( $field_id, $prev_values ) ) {
80 80
 
81 81
 				if ( ( is_array( $meta_value ) && empty( $meta_value ) ) || ( ! is_array( $meta_value ) && trim( $meta_value ) == '' ) ) {
82 82
 					// remove blank fields
83
-					unset( $values[ $field_id ] );
83
+					unset( $values[$field_id] );
84 84
 				} else {
85 85
 					// if value exists, then update it
86 86
 					self::update_entry_meta( $entry_id, $field_id, '', $meta_value );
@@ -91,13 +91,13 @@  discard block
 block discarded – undo
91 91
 			}
92 92
 		}
93 93
 
94
-        if ( empty($prev_values) ) {
94
+        if ( empty( $prev_values ) ) {
95 95
             return;
96 96
         }
97 97
 
98
-        $prev_values = array_diff($prev_values, array_keys($values));
98
+        $prev_values = array_diff( $prev_values, array_keys( $values ) );
99 99
 
100
-        if ( empty($prev_values) ) {
100
+        if ( empty( $prev_values ) ) {
101 101
             return;
102 102
         }
103 103
 
@@ -111,10 +111,10 @@  discard block
 block discarded – undo
111 111
     }
112 112
 
113 113
 	public static function duplicate_entry_metas( $old_id, $new_id ) {
114
-        $metas = self::get_entry_meta_info($old_id);
114
+        $metas = self::get_entry_meta_info( $old_id );
115 115
         foreach ( $metas as $meta ) {
116
-            self::add_entry_meta($new_id, $meta->field_id, null, $meta->meta_value);
117
-            unset($meta);
116
+            self::add_entry_meta( $new_id, $meta->field_id, null, $meta->meta_value );
117
+            unset( $meta );
118 118
         }
119 119
 		self::clear_cache();
120 120
     }
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	public static function delete_entry_meta( $entry_id, $field_id ) {
123 123
         global $wpdb;
124 124
 		self::clear_cache();
125
-        return $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id));
125
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id ) );
126 126
     }
127 127
 
128 128
 	/**
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	 */
142 142
 	public static function get_meta_value( $entry, $field_id ) {
143 143
 		if ( isset( $entry->metas ) ) {
144
-			return isset( $entry->metas[ $field_id ] ) ? $entry->metas[ $field_id ] : false;
144
+			return isset( $entry->metas[$field_id] ) ? $entry->metas[$field_id] : false;
145 145
 		} else {
146 146
 			return self::get_entry_meta_by_field( $entry->id, $field_id );
147 147
 		}
@@ -159,14 +159,14 @@  discard block
 block discarded – undo
159 159
 			$cached = FrmAppHelper::check_cache( $entry_id, 'frm_entry' );
160 160
 		}
161 161
 
162
-		if ( $cached && isset( $cached->metas ) && isset( $cached->metas[ $field_id ] ) ) {
163
-			$result = $cached->metas[ $field_id ];
164
-            return stripslashes_deep($result);
162
+		if ( $cached && isset( $cached->metas ) && isset( $cached->metas[$field_id] ) ) {
163
+			$result = $cached->metas[$field_id];
164
+            return stripslashes_deep( $result );
165 165
         }
166 166
 
167 167
 		$get_table = $wpdb->prefix . 'frm_item_metas';
168 168
 		$query = array( 'item_id' => $entry_id );
169
-        if ( is_numeric($field_id) ) {
169
+        if ( is_numeric( $field_id ) ) {
170 170
 			$query['field_id'] = $field_id;
171 171
         } else {
172 172
 			$get_table .= ' it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id';
@@ -174,8 +174,8 @@  discard block
 block discarded – undo
174 174
         }
175 175
 
176 176
 		$result = FrmDb::get_var( $get_table, $query, 'meta_value' );
177
-        $result = maybe_unserialize($result);
178
-        $result = stripslashes_deep($result);
177
+        $result = maybe_unserialize( $result );
178
+        $result = stripslashes_deep( $result );
179 179
 
180 180
         return $result;
181 181
     }
@@ -185,22 +185,22 @@  discard block
 block discarded – undo
185 185
         $args = wp_parse_args( $args, $defaults );
186 186
 
187 187
         $query = array();
188
-        self::meta_field_query($field_id, $order, $limit, $args, $query);
189
-        $query = implode(' ', $query);
188
+        self::meta_field_query( $field_id, $order, $limit, $args, $query );
189
+        $query = implode( ' ', $query );
190 190
 
191 191
 		$cache_key = 'entry_metas_for_field_' . $field_id . $order . $limit . maybe_serialize( $args );
192
-        $values = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, 'get_col');
192
+        $values = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, 'get_col' );
193 193
 
194 194
         if ( ! $args['stripslashes'] ) {
195 195
             return $values;
196 196
         }
197 197
 
198 198
 		foreach ( $values as $k => $v ) {
199
-			$values[ $k ] = maybe_unserialize( $v );
200
-            unset($k, $v);
199
+			$values[$k] = maybe_unserialize( $v );
200
+            unset( $k, $v );
201 201
         }
202 202
 
203
-        return stripslashes_deep($values);
203
+        return stripslashes_deep( $values );
204 204
     }
205 205
 
206 206
     /**
@@ -217,8 +217,8 @@  discard block
 block discarded – undo
217 217
 			$query[] = 'INNER JOIN ' . $wpdb->prefix . 'frm_items e ON (e.id=em.item_id)';
218 218
         }
219 219
 
220
-        if ( is_numeric($field_id) ) {
221
-            $query[] = $wpdb->prepare('WHERE em.field_id=%d', $field_id);
220
+        if ( is_numeric( $field_id ) ) {
221
+            $query[] = $wpdb->prepare( 'WHERE em.field_id=%d', $field_id );
222 222
         } else {
223 223
 			$query[] = $wpdb->prepare( 'LEFT JOIN ' . $wpdb->prefix . 'frm_fields fi ON (em.field_id = fi.id) WHERE fi.field_key=%s', $field_id );
224 224
         }
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
         }
229 229
 
230 230
         if ( $args['value'] ) {
231
-            $query[] = $wpdb->prepare(' AND meta_value=%s', $args['value']);
231
+            $query[] = $wpdb->prepare( ' AND meta_value=%s', $args['value'] );
232 232
         }
233 233
         $query[] = $order . $limit;
234 234
     }
@@ -242,18 +242,18 @@  discard block
 block discarded – undo
242 242
         $query = 'SELECT it.*, fi.type as field_type, fi.field_key as field_key,
243 243
             fi.required as required, fi.form_id as field_form_id, fi.name as field_name, fi.options as fi_options
244 244
 			FROM ' . $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id' .
245
-            FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
245
+            FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
246 246
 
247 247
 		$cache_key = 'all_' . maybe_serialize( $where ) . $order_by . $limit;
248
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
248
+        $results = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, ( $limit == ' LIMIT 1' ? 'get_row' : 'get_results' ) );
249 249
 
250 250
         if ( ! $results || ! $stripslashes ) {
251 251
             return $results;
252 252
         }
253 253
 
254 254
         foreach ( $results as $k => $result ) {
255
-			$results[ $k ]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
256
-            unset($k, $result);
255
+			$results[$k]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
256
+            unset( $k, $result );
257 257
         }
258 258
 
259 259
         return $results;
@@ -265,14 +265,14 @@  discard block
 block discarded – undo
265 265
 			'user_id'  => '',
266 266
 			'group_by' => '',
267 267
 		);
268
-        $args = wp_parse_args($args, $defaults);
268
+        $args = wp_parse_args( $args, $defaults );
269 269
 
270 270
         $query = array();
271
-        self::get_ids_query($where, $order_by, $limit, $unique, $args, $query );
272
-        $query = implode(' ', $query);
271
+        self::get_ids_query( $where, $order_by, $limit, $unique, $args, $query );
272
+        $query = implode( ' ', $query );
273 273
 
274 274
 		$cache_key = 'ids_' . maybe_serialize( $where ) . $order_by . 'l' . $limit . 'u' . $unique . maybe_serialize( $args );
275
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
275
+        $results = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, ( $limit == ' LIMIT 1' ? 'get_var' : 'get_col' ) );
276 276
 
277 277
         return $results;
278 278
     }
@@ -298,17 +298,17 @@  discard block
 block discarded – undo
298 298
 		$query[] = 'FROM ' . $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id';
299 299
 
300 300
 		$query[] = 'INNER JOIN ' . $wpdb->prefix . 'frm_items e ON (e.id=it.item_id)';
301
-        if ( is_array($where) ) {
301
+        if ( is_array( $where ) ) {
302 302
             if ( ! $args['is_draft'] ) {
303 303
                 $where['e.is_draft'] = 0;
304 304
             } else if ( $args['is_draft'] == 1 ) {
305 305
                 $where['e.is_draft'] = 1;
306 306
             }
307 307
 
308
-            if ( ! empty($args['user_id']) ) {
308
+            if ( ! empty( $args['user_id'] ) ) {
309 309
                 $where['e.user_id'] = $args['user_id'];
310 310
             }
311
-            $query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
311
+            $query[] = FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
312 312
 
313 313
 			if ( $args['group_by'] ) {
314 314
 				$query[] = ' GROUP BY ' . sanitize_text_field( $args['group_by'] );
@@ -324,13 +324,13 @@  discard block
 block discarded – undo
324 324
 			$draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 1 );
325 325
         }
326 326
 
327
-        if ( ! empty($args['user_id']) ) {
328
-            $user_where = $wpdb->prepare(' AND e.user_id=%d', $args['user_id']);
327
+        if ( ! empty( $args['user_id'] ) ) {
328
+            $user_where = $wpdb->prepare( ' AND e.user_id=%d', $args['user_id'] );
329 329
         }
330 330
 
331
-        if ( strpos($where, ' GROUP BY ') ) {
331
+        if ( strpos( $where, ' GROUP BY ' ) ) {
332 332
             // don't inject WHERE filtering after GROUP BY
333
-            $parts = explode(' GROUP BY ', $where);
333
+            $parts = explode( ' GROUP BY ', $where );
334 334
             $where = $parts[0];
335 335
             $where .= $draft_where . $user_where;
336 336
 			$where .= ' GROUP BY ' . $parts[1];
@@ -339,12 +339,12 @@  discard block
 block discarded – undo
339 339
         }
340 340
 
341 341
 		// The query has already been prepared
342
-		$query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
342
+		$query[] = FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
343 343
     }
344 344
 
345 345
     public static function search_entry_metas( $search, $field_id = '', $operator ) {
346 346
 		$cache_key = 'search_' . maybe_serialize( $search ) . $field_id . $operator;
347
-        $results = wp_cache_get($cache_key, 'frm_entry');
347
+        $results = wp_cache_get( $cache_key, 'frm_entry' );
348 348
         if ( false !== $results ) {
349 349
             return $results;
350 350
         }
@@ -367,18 +367,18 @@  discard block
 block discarded – undo
367 367
                     case 'day':
368 368
 						$value = '%' . $value . '%';
369 369
                 }
370
-				$where .= $wpdb->prepare(' meta_value ' . $operator . ' %s and', $value );
370
+				$where .= $wpdb->prepare( ' meta_value ' . $operator . ' %s and', $value );
371 371
             }
372
-            $where .= $wpdb->prepare(' field_id=%d', $field_id);
372
+            $where .= $wpdb->prepare( ' field_id=%d', $field_id );
373 373
 			$query = 'SELECT DISTINCT item_id FROM ' . $wpdb->prefix . 'frm_item_metas' . FrmAppHelper::prepend_and_or_where( ' WHERE ', $where );
374 374
         } else {
375 375
 			if ( $operator == 'LIKE' ) {
376 376
                 $search = '%' . $search . '%';
377 377
 			}
378
-            $query = $wpdb->prepare("SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id);
378
+            $query = $wpdb->prepare( "SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id );
379 379
         }
380 380
 
381
-        $results = $wpdb->get_col($query, 0);
381
+        $results = $wpdb->get_col( $query, 0 );
382 382
 		FrmAppHelper::set_cache( $cache_key, $results, 'frm_entry' );
383 383
 
384 384
         return $results;
Please login to merge, or discard this patch.
classes/models/FrmFieldOption.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -31,6 +31,10 @@
 block discarded – undo
31 31
 	 */
32 32
 	protected $option_label = '';
33 33
 
34
+	/**
35
+	 * @param string $option_key
36
+	 * @param string $option
37
+	 */
34 38
 	public function __construct( $option_key, $option, $args = array() ) {
35 39
 		$this->option_key = $option_key;
36 40
 		$this->option = $option;
Please login to merge, or discard this patch.
classes/models/FrmFieldValueSelector.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@
 block discarded – undo
75 75
 	/**
76 76
 	 * FrmFieldValueSelector constructor
77 77
 	 *
78
-	 * @param int|string $field_id
78
+	 * @param integer $field_id
79 79
 	 */
80 80
 	public function __construct( $field_id, $args ) {
81 81
 		$this->set_html_name( $args );
Please login to merge, or discard this patch.
classes/models/FrmForm.php 2 patches
Spacing   +96 added lines, -96 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined('ABSPATH') ) {
3
-    die('You are not allowed to call this page directly.');
2
+if ( ! defined( 'ABSPATH' ) ) {
3
+    die( 'You are not allowed to call this page directly.' );
4 4
 }
5 5
 
6 6
 class FrmForm {
@@ -15,24 +15,24 @@  discard block
 block discarded – undo
15 15
 			'form_key'      => FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key' ),
16 16
             'name'          => $values['name'],
17 17
             'description'   => $values['description'],
18
-            'status'        => isset($values['status']) ? $values['status'] : 'draft',
19
-            'logged_in'     => isset($values['logged_in']) ? $values['logged_in'] : 0,
20
-            'is_template'   => isset($values['is_template']) ? (int) $values['is_template'] : 0,
18
+            'status'        => isset( $values['status'] ) ? $values['status'] : 'draft',
19
+            'logged_in'     => isset( $values['logged_in'] ) ? $values['logged_in'] : 0,
20
+            'is_template'   => isset( $values['is_template'] ) ? (int) $values['is_template'] : 0,
21 21
 			'parent_form_id' => isset( $values['parent_form_id'] ) ? absint( $values['parent_form_id'] ) : 0,
22
-            'editable'      => isset($values['editable']) ? (int) $values['editable'] : 0,
23
-            'default_template' => isset($values['default_template']) ? (int) $values['default_template'] : 0,
24
-            'created_at'    => isset($values['created_at']) ? $values['created_at'] : current_time('mysql', 1),
22
+            'editable'      => isset( $values['editable'] ) ? (int) $values['editable'] : 0,
23
+            'default_template' => isset( $values['default_template'] ) ? (int) $values['default_template'] : 0,
24
+            'created_at'    => isset( $values['created_at'] ) ? $values['created_at'] : current_time( 'mysql', 1 ),
25 25
         );
26 26
 
27 27
 		$options = isset( $values['options'] ) ? (array) $values['options'] : array();
28 28
 		FrmFormsHelper::fill_form_options( $options, $values );
29 29
 
30
-        $options['before_html'] = isset($values['options']['before_html']) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html('before');
31
-        $options['after_html'] = isset($values['options']['after_html']) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html('after');
32
-        $options['submit_html'] = isset($values['options']['submit_html']) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html('submit');
30
+        $options['before_html'] = isset( $values['options']['before_html'] ) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html( 'before' );
31
+        $options['after_html'] = isset( $values['options']['after_html'] ) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html( 'after' );
32
+        $options['submit_html'] = isset( $values['options']['submit_html'] ) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html( 'submit' );
33 33
 
34
-        $options = apply_filters('frm_form_options_before_update', $options, $values);
35
-        $new_values['options'] = serialize($options);
34
+        $options = apply_filters( 'frm_form_options_before_update', $options, $values );
35
+        $new_values['options'] = serialize( $options );
36 36
 
37 37
         //if(isset($values['id']) && is_numeric($values['id']))
38 38
         //    $new_values['id'] = $values['id'];
@@ -67,22 +67,22 @@  discard block
 block discarded – undo
67 67
             'status'        => $template ? 'published' : 'draft',
68 68
             'logged_in'     => $values->logged_in ? $values->logged_in : 0,
69 69
             'editable'      => $values->editable ? $values->editable : 0,
70
-            'created_at'    => current_time('mysql', 1),
70
+            'created_at'    => current_time( 'mysql', 1 ),
71 71
             'is_template'   => $template ? 1 : 0,
72 72
         );
73 73
 
74 74
         if ( $blog_id ) {
75 75
             $new_values['status'] = 'published';
76
-            $new_options = maybe_unserialize($values->options);
77
-            $new_options['email_to'] = get_option('admin_email');
76
+            $new_options = maybe_unserialize( $values->options );
77
+            $new_options['email_to'] = get_option( 'admin_email' );
78 78
             $new_options['copy'] = false;
79 79
             $new_values['options'] = $new_options;
80 80
         } else {
81 81
             $new_values['options'] = $values->options;
82 82
         }
83 83
 
84
-        if ( is_array($new_values['options']) ) {
85
-            $new_values['options'] = serialize($new_values['options']);
84
+        if ( is_array( $new_values['options'] ) ) {
85
+            $new_values['options'] = serialize( $new_values['options'] );
86 86
         }
87 87
 
88 88
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_forms', $new_values );
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 			self::clear_form_cache();
93 93
 
94 94
             $form_id = $wpdb->insert_id;
95
-            FrmField::duplicate($id, $form_id, $copy_keys, $blog_id);
95
+            FrmField::duplicate( $id, $form_id, $copy_keys, $blog_id );
96 96
 
97 97
             // update form settings after fields are created
98 98
 			do_action( 'frm_after_duplicate_form', $form_id, $new_values, array( 'old_id' => $id ) );
@@ -106,11 +106,11 @@  discard block
 block discarded – undo
106 106
 		$new_opts = maybe_unserialize( $values['options'] );
107 107
 		$values['options'] = $new_opts;
108 108
 
109
-        if ( isset($new_opts['success_msg']) ) {
110
-            $new_opts['success_msg'] = FrmFieldsHelper::switch_field_ids($new_opts['success_msg']);
109
+        if ( isset( $new_opts['success_msg'] ) ) {
110
+            $new_opts['success_msg'] = FrmFieldsHelper::switch_field_ids( $new_opts['success_msg'] );
111 111
         }
112 112
 
113
-        $new_opts = apply_filters('frm_after_duplicate_form_values', $new_opts, $form_id);
113
+        $new_opts = apply_filters( 'frm_after_duplicate_form_values', $new_opts, $form_id );
114 114
 
115 115
         if ( $new_opts != $values['options'] ) {
116 116
             global $wpdb;
@@ -128,17 +128,17 @@  discard block
 block discarded – undo
128 128
             $values['status'] = 'published';
129 129
         }
130 130
 
131
-        if ( isset($values['form_key']) ) {
131
+        if ( isset( $values['form_key'] ) ) {
132 132
 			$values['form_key'] = FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key', $id );
133 133
         }
134 134
 
135 135
 		$form_fields = array( 'form_key', 'name', 'description', 'status', 'parent_form_id' );
136 136
 
137
-        $new_values = self::set_update_options( array(), $values);
137
+        $new_values = self::set_update_options( array(), $values );
138 138
 
139 139
         foreach ( $values as $value_key => $value ) {
140 140
 			if ( $value_key && in_array( $value_key, $form_fields ) ) {
141
-				$new_values[ $value_key ] = $value;
141
+				$new_values[$value_key] = $value;
142 142
             }
143 143
         }
144 144
 
@@ -154,9 +154,9 @@  discard block
 block discarded – undo
154 154
         } else {
155 155
             $query_results = true;
156 156
         }
157
-        unset($new_values);
157
+        unset( $new_values );
158 158
 
159
-        $values = self::update_fields($id, $values);
159
+        $values = self::update_fields( $id, $values );
160 160
 
161 161
 		do_action( 'frm_update_form', $id, $values );
162 162
 		do_action( 'frm_update_form_' . $id, $values );
@@ -168,20 +168,20 @@  discard block
 block discarded – undo
168 168
      * @return array
169 169
      */
170 170
 	public static function set_update_options( $new_values, $values ) {
171
-        if ( ! isset($values['options']) ) {
171
+        if ( ! isset( $values['options'] ) ) {
172 172
             return $new_values;
173 173
         }
174 174
 
175 175
 		$options = isset( $values['options'] ) ? (array) $values['options'] : array();
176 176
 		FrmFormsHelper::fill_form_options( $options, $values );
177 177
 
178
-        $options['custom_style'] = isset($values['options']['custom_style']) ? $values['options']['custom_style'] : 0;
179
-        $options['before_html'] = isset($values['options']['before_html']) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html('before');
180
-        $options['after_html'] = isset($values['options']['after_html']) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html('after');
181
-        $options['submit_html'] = (isset($values['options']['submit_html']) && $values['options']['submit_html'] != '') ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html('submit');
178
+        $options['custom_style'] = isset( $values['options']['custom_style'] ) ? $values['options']['custom_style'] : 0;
179
+        $options['before_html'] = isset( $values['options']['before_html'] ) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html( 'before' );
180
+        $options['after_html'] = isset( $values['options']['after_html'] ) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html( 'after' );
181
+        $options['submit_html'] = ( isset( $values['options']['submit_html'] ) && $values['options']['submit_html'] != '' ) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html( 'submit' );
182 182
 
183
-        $options = apply_filters('frm_form_options_before_update', $options, $values);
184
-        $new_values['options'] = serialize($options);
183
+        $options = apply_filters( 'frm_form_options_before_update', $options, $values );
184
+        $new_values['options'] = serialize( $options );
185 185
 
186 186
         return $new_values;
187 187
     }
@@ -192,54 +192,54 @@  discard block
 block discarded – undo
192 192
      */
193 193
 	public static function update_fields( $id, $values ) {
194 194
 
195
-        if ( ! isset($values['item_meta']) && ! isset($values['field_options']) ) {
195
+        if ( ! isset( $values['item_meta'] ) && ! isset( $values['field_options'] ) ) {
196 196
             return $values;
197 197
         }
198 198
 
199
-        $all_fields = FrmField::get_all_for_form($id);
200
-        if ( empty($all_fields) ) {
199
+        $all_fields = FrmField::get_all_for_form( $id );
200
+        if ( empty( $all_fields ) ) {
201 201
             return $values;
202 202
         }
203 203
 
204
-        if ( ! isset($values['item_meta']) ) {
204
+        if ( ! isset( $values['item_meta'] ) ) {
205 205
             $values['item_meta'] = array();
206 206
         }
207 207
 
208 208
         $field_array = array();
209
-        $existing_keys = array_keys($values['item_meta']);
209
+        $existing_keys = array_keys( $values['item_meta'] );
210 210
         foreach ( $all_fields as $fid ) {
211
-            if ( ! in_array($fid->id, $existing_keys) && ( isset($values['frm_fields_submitted']) && in_array($fid->id, $values['frm_fields_submitted']) ) || isset($values['options']) ) {
212
-				$values['item_meta'][ $fid->id ] = '';
211
+            if ( ! in_array( $fid->id, $existing_keys ) && ( isset( $values['frm_fields_submitted'] ) && in_array( $fid->id, $values['frm_fields_submitted'] ) ) || isset( $values['options'] ) ) {
212
+				$values['item_meta'][$fid->id] = '';
213 213
             }
214
-			$field_array[ $fid->id ] = $fid;
214
+			$field_array[$fid->id] = $fid;
215 215
         }
216
-        unset($all_fields);
216
+        unset( $all_fields );
217 217
 
218 218
         foreach ( $values['item_meta'] as $field_id => $default_value ) {
219
-			if ( isset( $field_array[ $field_id ] ) ) {
220
-				$field = $field_array[ $field_id ];
219
+			if ( isset( $field_array[$field_id] ) ) {
220
+				$field = $field_array[$field_id];
221 221
             } else {
222
-                $field = FrmField::getOne($field_id);
222
+                $field = FrmField::getOne( $field_id );
223 223
             }
224 224
 
225 225
             if ( ! $field ) {
226 226
                 continue;
227 227
             }
228 228
 
229
-			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options'][ 'custom_html_' . $field_id ] ) );
229
+			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options']['custom_html_' . $field_id] ) );
230 230
 			if ( $is_settings_page ) {
231 231
                 //updating the settings page
232
-				if ( isset( $values['field_options'][ 'custom_html_' . $field_id ] ) ) {
233
-					$field->field_options['custom_html'] = isset( $values['field_options'][ 'custom_html_' . $field_id ] ) ? $values['field_options'][ 'custom_html_' . $field_id ] : ( isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type ) );
234
-                    $field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
232
+				if ( isset( $values['field_options']['custom_html_' . $field_id] ) ) {
233
+					$field->field_options['custom_html'] = isset( $values['field_options']['custom_html_' . $field_id] ) ? $values['field_options']['custom_html_' . $field_id] : ( isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type ) );
234
+                    $field->field_options = apply_filters( 'frm_update_form_field_options', $field->field_options, $field, $values );
235 235
 					FrmField::update( $field_id, array( 'field_options' => $field->field_options ) );
236 236
                 } else if ( $field->type == 'hidden' || $field->type == 'user_id' ) {
237 237
                     $prev_opts = $field->field_options;
238
-                    $field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
238
+                    $field->field_options = apply_filters( 'frm_update_form_field_options', $field->field_options, $field, $values );
239 239
                     if ( $prev_opts != $field->field_options ) {
240 240
 						FrmField::update( $field_id, array( 'field_options' => $field->field_options ) );
241 241
                     }
242
-                    unset($prev_opts);
242
+                    unset( $prev_opts );
243 243
                 }
244 244
             }
245 245
 
@@ -253,11 +253,11 @@  discard block
 block discarded – undo
253 253
 			$update_options = apply_filters( 'frm_field_options_to_update', $update_options );
254 254
 
255 255
 			foreach ( $update_options as $opt => $default ) {
256
-				$field->field_options[ $opt ] = isset( $values['field_options'][ $opt . '_' . $field_id ] ) ? trim( sanitize_text_field( $values['field_options'][ $opt . '_' . $field_id ] ) ) : $default;
256
+				$field->field_options[$opt] = isset( $values['field_options'][$opt . '_' . $field_id] ) ? trim( sanitize_text_field( $values['field_options'][$opt . '_' . $field_id] ) ) : $default;
257 257
             }
258 258
 
259
-            $field->field_options = apply_filters('frm_update_field_options', $field->field_options, $field, $values);
260
-			$default_value = maybe_serialize( $values['item_meta'][ $field_id ] );
259
+            $field->field_options = apply_filters( 'frm_update_field_options', $field->field_options, $field, $values );
260
+			$default_value = maybe_serialize( $values['item_meta'][$field_id] );
261 261
 
262 262
 			$new_field = array(
263 263
 				'field_options' => $field->field_options,
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 
269 269
 			FrmField::update( $field_id, $new_field );
270 270
 
271
-            FrmField::delete_form_transient($field->form_id);
271
+            FrmField::delete_form_transient( $field->form_id );
272 272
         }
273 273
 		self::clear_form_cache();
274 274
 
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
 		);
283 283
 		foreach ( $field_cols as $col => $default ) {
284 284
 			$default = ( $default === '' ) ? $field->{$col} : $default;
285
-			$new_field[ $col ] = isset( $values['field_options'][ $col . '_' . $field->id ] ) ? $values['field_options'][ $col . '_' . $field->id ] : $default;
285
+			$new_field[$col] = isset( $values['field_options'][$col . '_' . $field->id] ) ? $values['field_options'][$col . '_' . $field->id] : $default;
286 286
 		}
287 287
 	}
288 288
 
@@ -292,17 +292,17 @@  discard block
 block discarded – undo
292 292
      */
293 293
 	public static function set_status( $id, $status ) {
294 294
         if ( 'trash' == $status ) {
295
-            return self::trash($id);
295
+            return self::trash( $id );
296 296
         }
297 297
 
298
-		$statuses  = array( 'published', 'draft', 'trash' );
298
+		$statuses = array( 'published', 'draft', 'trash' );
299 299
         if ( ! in_array( $status, $statuses ) ) {
300 300
             return false;
301 301
         }
302 302
 
303 303
         global $wpdb;
304 304
 
305
-        if ( is_array($id) ) {
305
+        if ( is_array( $id ) ) {
306 306
 			$where = array( 'id' => $id, 'parent_form_id' => $id, 'or' => 1 );
307 307
 			FrmDb::get_where_clause_and_values( $where );
308 308
 			array_unshift( $where['values'], $status );
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
             return self::destroy( $id );
329 329
         }
330 330
 
331
-        $form = self::getOne($id);
331
+        $form = self::getOne( $id );
332 332
         if ( ! $form ) {
333 333
             return false;
334 334
         }
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
 	public static function destroy( $id ) {
363 363
         global $wpdb;
364 364
 
365
-        $form = self::getOne($id);
365
+        $form = self::getOne( $id );
366 366
         if ( ! $form ) {
367 367
             return false;
368 368
         }
@@ -371,8 +371,8 @@  discard block
 block discarded – undo
371 371
         // Disconnect the entries from this form
372 372
 		$entries = FrmDb::get_col( $wpdb->prefix . 'frm_items', array( 'form_id' => $id ) );
373 373
         foreach ( $entries as $entry_id ) {
374
-            FrmEntry::destroy($entry_id);
375
-            unset($entry_id);
374
+            FrmEntry::destroy( $entry_id );
375
+            unset( $entry_id );
376 376
         }
377 377
 
378 378
         // Disconnect the fields from this form
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
         if ( $query_results ) {
383 383
             // Delete all form actions linked to this form
384 384
             $action_control = FrmFormActionsController::get_form_actions( 'email' );
385
-            $action_control->destroy($id, 'all');
385
+            $action_control->destroy( $id, 'all' );
386 386
 
387 387
 			// Clear form caching
388 388
 			self::clear_form_cache();
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
 			$form->options = maybe_unserialize( $form->options );
417 417
 			if ( ! isset( $form->options['trash_time'] ) || $form->options['trash_time'] < $delete_timestamp ) {
418 418
 				self::destroy( $form->id );
419
-				$count++;
419
+				$count ++;
420 420
 			}
421 421
 
422 422
 			unset( $form );
@@ -428,15 +428,15 @@  discard block
 block discarded – undo
428 428
      * @return string form name
429 429
      */
430 430
     public static function getName( $id ) {
431
-        $form = FrmAppHelper::check_cache($id, 'frm_form');
431
+        $form = FrmAppHelper::check_cache( $id, 'frm_form' );
432 432
         if ( $form ) {
433
-            $r = stripslashes($form->name);
433
+            $r = stripslashes( $form->name );
434 434
             return $r;
435 435
         }
436 436
 
437 437
         $query_key = is_numeric( $id ) ? 'id' : 'form_key';
438 438
         $r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' );
439
-        $r = stripslashes($r);
439
+        $r = stripslashes( $r );
440 440
 
441 441
         return $r;
442 442
     }
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
      */
457 457
 	public static function getKeyById( $id ) {
458 458
         $id = (int) $id;
459
-        $cache = FrmAppHelper::check_cache($id, 'frm_form');
459
+        $cache = FrmAppHelper::check_cache( $id, 'frm_form' );
460 460
         if ( $cache ) {
461 461
             return $cache->form_key;
462 462
         }
@@ -490,17 +490,17 @@  discard block
 block discarded – undo
490 490
 			$table_name = $prefix . 'frm_forms';
491 491
         } else {
492 492
 			$table_name = $wpdb->prefix . 'frm_forms';
493
-            $cache = wp_cache_get($id, 'frm_form');
493
+            $cache = wp_cache_get( $id, 'frm_form' );
494 494
             if ( $cache ) {
495
-                if ( isset($cache->options) ) {
496
-                    $cache->options = maybe_unserialize($cache->options);
495
+                if ( isset( $cache->options ) ) {
496
+                    $cache->options = maybe_unserialize( $cache->options );
497 497
                 }
498 498
 
499
-                return stripslashes_deep($cache);
499
+                return stripslashes_deep( $cache );
500 500
             }
501 501
         }
502 502
 
503
-        if ( is_numeric($id) ) {
503
+        if ( is_numeric( $id ) ) {
504 504
             $where = array( 'id' => $id );
505 505
         } else {
506 506
             $where = array( 'form_key' => $id );
@@ -508,11 +508,11 @@  discard block
 block discarded – undo
508 508
 
509 509
         $results = FrmDb::get_row( $table_name, $where );
510 510
 
511
-        if ( isset($results->options) ) {
511
+        if ( isset( $results->options ) ) {
512 512
 			FrmAppHelper::set_cache( $results->id, $results, 'frm_form' );
513
-            $results->options = maybe_unserialize($results->options);
513
+            $results->options = maybe_unserialize( $results->options );
514 514
         }
515
-        return stripslashes_deep($results);
515
+        return stripslashes_deep( $results );
516 516
     }
517 517
 
518 518
     /**
@@ -541,7 +541,7 @@  discard block
 block discarded – undo
541 541
 			$results = reset( $results );
542 542
 		}
543 543
 
544
-        return stripslashes_deep($results);
544
+        return stripslashes_deep( $results );
545 545
     }
546 546
 
547 547
 	/**
@@ -581,19 +581,19 @@  discard block
 block discarded – undo
581 581
     	foreach ( $results as $row ) {
582 582
             if ( 'trash' != $row->status ) {
583 583
     	        if ( $row->is_template ) {
584
-					$counts['template']++;
584
+					$counts['template'] ++;
585 585
     	        } else {
586
-					$counts['published']++;
586
+					$counts['published'] ++;
587 587
     	        }
588 588
     	    } else {
589
-				$counts['trash']++;
589
+				$counts['trash'] ++;
590 590
         	}
591 591
 
592 592
     	    if ( 'draft' == $row->status ) {
593
-				$counts['draft']++;
593
+				$counts['draft'] ++;
594 594
     	    }
595 595
 
596
-    		unset($row);
596
+    		unset( $row );
597 597
     	}
598 598
 
599 599
     	$counts = (object) $counts;
@@ -619,7 +619,7 @@  discard block
 block discarded – undo
619 619
 	public static function validate( $values ) {
620 620
         $errors = array();
621 621
 
622
-        return apply_filters('frm_validate_form', $errors, $values);
622
+        return apply_filters( 'frm_validate_form', $errors, $values );
623 623
     }
624 624
 
625 625
 	public static function get_params( $form = null ) {
@@ -631,11 +631,11 @@  discard block
 block discarded – undo
631 631
 			self::maybe_get_form( $form );
632 632
 		}
633 633
 
634
-		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][ $form->id ] ) ) {
635
-			return $frm_vars['form_params'][ $form->id ];
634
+		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][$form->id] ) ) {
635
+			return $frm_vars['form_params'][$form->id];
636 636
 		}
637 637
 
638
-		$action_var = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
638
+		$action_var = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
639 639
 		$action = apply_filters( 'frm_show_new_entry_page', FrmAppHelper::get_param( $action_var, 'new', 'get', 'sanitize_title' ), $form );
640 640
 
641 641
 		$default_values = array(
@@ -653,15 +653,15 @@  discard block
 block discarded – undo
653 653
 			//if there are two forms on the same page, make sure not to submit both
654 654
 			foreach ( $default_values as $var => $default ) {
655 655
 				if ( $var == 'action' ) {
656
-					$values[ $var ] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
656
+					$values[$var] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
657 657
 				} else {
658
-					$values[ $var ] = FrmAppHelper::get_param( $var, $default );
658
+					$values[$var] = FrmAppHelper::get_param( $var, $default );
659 659
 				}
660 660
 				unset( $var, $default );
661 661
 			}
662 662
 		} else {
663 663
 			foreach ( $default_values as $var => $default ) {
664
-				$values[ $var ] = $default;
664
+				$values[$var] = $default;
665 665
 				unset( $var, $default );
666 666
 			}
667 667
 		}
@@ -676,7 +676,7 @@  discard block
 block discarded – undo
676 676
 	public static function list_page_params() {
677 677
 		$values = array();
678 678
 		foreach ( array( 'template' => 0, 'id' => '', 'paged' => 1, 'form' => '', 'search' => '', 'sort' => '', 'sdir' => '' ) as $var => $default ) {
679
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default );
679
+			$values[$var] = FrmAppHelper::get_param( $var, $default );
680 680
 		}
681 681
 
682 682
 		return $values;
@@ -696,7 +696,7 @@  discard block
 block discarded – undo
696 696
 			'field_id' => '', 'search' => '', 'sort' => '', 'sdir' => '', 'fid' => '',
697 697
 			'keep_post' => '',
698 698
 		) as $var => $default ) {
699
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default );
699
+			$values[$var] = FrmAppHelper::get_param( $var, $default );
700 700
 		}
701 701
 
702 702
 		return $values;
@@ -753,7 +753,7 @@  discard block
 block discarded – undo
753 753
 		$small_form = new stdClass();
754 754
 		foreach ( array( 'id', 'form_key', 'name' ) as $var ) {
755 755
 			$small_form->{$var} = $form->{$var};
756
-			unset($var);
756
+			unset( $var );
757 757
 		}
758 758
 
759 759
 		$frm_vars['forms_loaded'][] = $small_form;
@@ -763,7 +763,7 @@  discard block
 block discarded – undo
763 763
 			$frm_vars['load_css'] = true;
764 764
 		}
765 765
 
766
-		return ( ( ! isset($frm_vars['css_loaded']) || ! $frm_vars['css_loaded'] ) && $global_load );
766
+		return ( ( ! isset( $frm_vars['css_loaded'] ) || ! $frm_vars['css_loaded'] ) && $global_load );
767 767
 	}
768 768
 
769 769
 	public static function show_submit( $form ) {
@@ -777,6 +777,6 @@  discard block
 block discarded – undo
777 777
 	 */
778 778
 	public static function get_option( $atts ) {
779 779
 		$form = $atts['form'];
780
-		return isset( $form->options[ $atts['option'] ] ) ? $form->options[ $atts['option'] ] : $atts['default'];
780
+		return isset( $form->options[$atts['option']] ) ? $form->options[$atts['option']] : $atts['default'];
781 781
 	}
782 782
 }
Please login to merge, or discard this patch.
Indentation   +324 added lines, -324 removed lines patch added patch discarded remove patch
@@ -1,262 +1,262 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 if ( ! defined('ABSPATH') ) {
3
-    die('You are not allowed to call this page directly.');
3
+	die('You are not allowed to call this page directly.');
4 4
 }
5 5
 
6 6
 class FrmForm {
7 7
 
8
-    /**
9
-     * @return int|boolean id on success or false on failure
10
-     */
11
-    public static function create( $values ) {
12
-        global $wpdb;
8
+	/**
9
+	 * @return int|boolean id on success or false on failure
10
+	 */
11
+	public static function create( $values ) {
12
+		global $wpdb;
13 13
 
14
-        $new_values = array(
14
+		$new_values = array(
15 15
 			'form_key'      => FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key' ),
16
-            'name'          => $values['name'],
17
-            'description'   => $values['description'],
18
-            'status'        => isset($values['status']) ? $values['status'] : 'draft',
19
-            'logged_in'     => isset($values['logged_in']) ? $values['logged_in'] : 0,
20
-            'is_template'   => isset($values['is_template']) ? (int) $values['is_template'] : 0,
16
+			'name'          => $values['name'],
17
+			'description'   => $values['description'],
18
+			'status'        => isset($values['status']) ? $values['status'] : 'draft',
19
+			'logged_in'     => isset($values['logged_in']) ? $values['logged_in'] : 0,
20
+			'is_template'   => isset($values['is_template']) ? (int) $values['is_template'] : 0,
21 21
 			'parent_form_id' => isset( $values['parent_form_id'] ) ? absint( $values['parent_form_id'] ) : 0,
22
-            'editable'      => isset($values['editable']) ? (int) $values['editable'] : 0,
23
-            'default_template' => isset($values['default_template']) ? (int) $values['default_template'] : 0,
24
-            'created_at'    => isset($values['created_at']) ? $values['created_at'] : current_time('mysql', 1),
25
-        );
22
+			'editable'      => isset($values['editable']) ? (int) $values['editable'] : 0,
23
+			'default_template' => isset($values['default_template']) ? (int) $values['default_template'] : 0,
24
+			'created_at'    => isset($values['created_at']) ? $values['created_at'] : current_time('mysql', 1),
25
+		);
26 26
 
27 27
 		$options = isset( $values['options'] ) ? (array) $values['options'] : array();
28 28
 		FrmFormsHelper::fill_form_options( $options, $values );
29 29
 
30
-        $options['before_html'] = isset($values['options']['before_html']) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html('before');
31
-        $options['after_html'] = isset($values['options']['after_html']) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html('after');
32
-        $options['submit_html'] = isset($values['options']['submit_html']) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html('submit');
30
+		$options['before_html'] = isset($values['options']['before_html']) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html('before');
31
+		$options['after_html'] = isset($values['options']['after_html']) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html('after');
32
+		$options['submit_html'] = isset($values['options']['submit_html']) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html('submit');
33 33
 
34
-        $options = apply_filters('frm_form_options_before_update', $options, $values);
35
-        $new_values['options'] = serialize($options);
34
+		$options = apply_filters('frm_form_options_before_update', $options, $values);
35
+		$new_values['options'] = serialize($options);
36 36
 
37
-        //if(isset($values['id']) && is_numeric($values['id']))
38
-        //    $new_values['id'] = $values['id'];
37
+		//if(isset($values['id']) && is_numeric($values['id']))
38
+		//    $new_values['id'] = $values['id'];
39 39
 
40 40
 		$wpdb->insert( $wpdb->prefix . 'frm_forms', $new_values );
41 41
 
42
-        $id = $wpdb->insert_id;
42
+		$id = $wpdb->insert_id;
43 43
 
44 44
 		// Clear form caching
45 45
 		self::clear_form_cache();
46 46
 
47
-        return $id;
48
-    }
47
+		return $id;
48
+	}
49 49
 
50
-    /**
51
-     * @return int|boolean ID on success or false on failure
52
-     */
53
-    public static function duplicate( $id, $template = false, $copy_keys = false, $blog_id = false ) {
54
-        global $wpdb;
50
+	/**
51
+	 * @return int|boolean ID on success or false on failure
52
+	 */
53
+	public static function duplicate( $id, $template = false, $copy_keys = false, $blog_id = false ) {
54
+		global $wpdb;
55 55
 
56
-        $values = self::getOne( $id, $blog_id );
57
-        if ( ! $values ) {
58
-            return false;
59
-        }
56
+		$values = self::getOne( $id, $blog_id );
57
+		if ( ! $values ) {
58
+			return false;
59
+		}
60 60
 
61
-        $new_key = $copy_keys ? $values->form_key : '';
61
+		$new_key = $copy_keys ? $values->form_key : '';
62 62
 
63
-        $new_values = array(
63
+		$new_values = array(
64 64
 			'form_key'      => FrmAppHelper::get_unique_key( $new_key, $wpdb->prefix . 'frm_forms', 'form_key' ),
65
-            'name'          => $values->name,
66
-            'description'   => $values->description,
67
-            'status'        => $template ? 'published' : 'draft',
68
-            'logged_in'     => $values->logged_in ? $values->logged_in : 0,
69
-            'editable'      => $values->editable ? $values->editable : 0,
70
-            'created_at'    => current_time('mysql', 1),
71
-            'is_template'   => $template ? 1 : 0,
72
-        );
73
-
74
-        if ( $blog_id ) {
75
-            $new_values['status'] = 'published';
76
-            $new_options = maybe_unserialize($values->options);
77
-            $new_options['email_to'] = get_option('admin_email');
78
-            $new_options['copy'] = false;
79
-            $new_values['options'] = $new_options;
80
-        } else {
81
-            $new_values['options'] = $values->options;
82
-        }
83
-
84
-        if ( is_array($new_values['options']) ) {
85
-            $new_values['options'] = serialize($new_values['options']);
86
-        }
65
+			'name'          => $values->name,
66
+			'description'   => $values->description,
67
+			'status'        => $template ? 'published' : 'draft',
68
+			'logged_in'     => $values->logged_in ? $values->logged_in : 0,
69
+			'editable'      => $values->editable ? $values->editable : 0,
70
+			'created_at'    => current_time('mysql', 1),
71
+			'is_template'   => $template ? 1 : 0,
72
+		);
73
+
74
+		if ( $blog_id ) {
75
+			$new_values['status'] = 'published';
76
+			$new_options = maybe_unserialize($values->options);
77
+			$new_options['email_to'] = get_option('admin_email');
78
+			$new_options['copy'] = false;
79
+			$new_values['options'] = $new_options;
80
+		} else {
81
+			$new_values['options'] = $values->options;
82
+		}
83
+
84
+		if ( is_array($new_values['options']) ) {
85
+			$new_values['options'] = serialize($new_values['options']);
86
+		}
87 87
 
88 88
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_forms', $new_values );
89 89
 
90
-        if ( $query_results ) {
90
+		if ( $query_results ) {
91 91
 			// Clear form caching
92 92
 			self::clear_form_cache();
93 93
 
94
-            $form_id = $wpdb->insert_id;
95
-            FrmField::duplicate($id, $form_id, $copy_keys, $blog_id);
94
+			$form_id = $wpdb->insert_id;
95
+			FrmField::duplicate($id, $form_id, $copy_keys, $blog_id);
96 96
 
97
-            // update form settings after fields are created
97
+			// update form settings after fields are created
98 98
 			do_action( 'frm_after_duplicate_form', $form_id, $new_values, array( 'old_id' => $id ) );
99
-            return $form_id;
100
-        }
99
+			return $form_id;
100
+		}
101 101
 
102
-        return false;
103
-    }
102
+		return false;
103
+	}
104 104
 
105 105
 	public static function after_duplicate( $form_id, $values ) {
106 106
 		$new_opts = maybe_unserialize( $values['options'] );
107 107
 		$values['options'] = $new_opts;
108 108
 
109
-        if ( isset($new_opts['success_msg']) ) {
110
-            $new_opts['success_msg'] = FrmFieldsHelper::switch_field_ids($new_opts['success_msg']);
111
-        }
109
+		if ( isset($new_opts['success_msg']) ) {
110
+			$new_opts['success_msg'] = FrmFieldsHelper::switch_field_ids($new_opts['success_msg']);
111
+		}
112 112
 
113
-        $new_opts = apply_filters('frm_after_duplicate_form_values', $new_opts, $form_id);
113
+		$new_opts = apply_filters('frm_after_duplicate_form_values', $new_opts, $form_id);
114 114
 
115
-        if ( $new_opts != $values['options'] ) {
116
-            global $wpdb;
115
+		if ( $new_opts != $values['options'] ) {
116
+			global $wpdb;
117 117
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => maybe_serialize( $new_opts ) ), array( 'id' => $form_id ) );
118
-        }
119
-    }
118
+		}
119
+	}
120 120
 
121
-    /**
122
-     * @return int|boolean
123
-     */
124
-    public static function update( $id, $values, $create_link = false ) {
125
-        global $wpdb;
121
+	/**
122
+	 * @return int|boolean
123
+	 */
124
+	public static function update( $id, $values, $create_link = false ) {
125
+		global $wpdb;
126 126
 
127
-        if ( ! isset( $values['status'] ) && ( $create_link || isset( $values['options'] ) || isset( $values['item_meta'] ) || isset( $values['field_options'] ) ) ) {
128
-            $values['status'] = 'published';
129
-        }
127
+		if ( ! isset( $values['status'] ) && ( $create_link || isset( $values['options'] ) || isset( $values['item_meta'] ) || isset( $values['field_options'] ) ) ) {
128
+			$values['status'] = 'published';
129
+		}
130 130
 
131
-        if ( isset($values['form_key']) ) {
131
+		if ( isset($values['form_key']) ) {
132 132
 			$values['form_key'] = FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key', $id );
133
-        }
133
+		}
134 134
 
135 135
 		$form_fields = array( 'form_key', 'name', 'description', 'status', 'parent_form_id' );
136 136
 
137
-        $new_values = self::set_update_options( array(), $values);
137
+		$new_values = self::set_update_options( array(), $values);
138 138
 
139
-        foreach ( $values as $value_key => $value ) {
139
+		foreach ( $values as $value_key => $value ) {
140 140
 			if ( $value_key && in_array( $value_key, $form_fields ) ) {
141 141
 				$new_values[ $value_key ] = $value;
142
-            }
143
-        }
142
+			}
143
+		}
144 144
 
145
-        if ( isset( $values['new_status'] ) && ! empty( $values['new_status'] ) ) {
146
-            $new_values['status'] = $values['new_status'];
147
-        }
145
+		if ( isset( $values['new_status'] ) && ! empty( $values['new_status'] ) ) {
146
+			$new_values['status'] = $values['new_status'];
147
+		}
148 148
 
149
-        if ( ! empty( $new_values ) ) {
149
+		if ( ! empty( $new_values ) ) {
150 150
 			$query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', $new_values, array( 'id' => $id ) );
151
-            if ( $query_results ) {
151
+			if ( $query_results ) {
152 152
 				self::clear_form_cache();
153
-            }
154
-        } else {
155
-            $query_results = true;
156
-        }
157
-        unset($new_values);
153
+			}
154
+		} else {
155
+			$query_results = true;
156
+		}
157
+		unset($new_values);
158 158
 
159
-        $values = self::update_fields($id, $values);
159
+		$values = self::update_fields($id, $values);
160 160
 
161 161
 		do_action( 'frm_update_form', $id, $values );
162 162
 		do_action( 'frm_update_form_' . $id, $values );
163 163
 
164
-        return $query_results;
165
-    }
164
+		return $query_results;
165
+	}
166 166
 
167
-    /**
168
-     * @return array
169
-     */
167
+	/**
168
+	 * @return array
169
+	 */
170 170
 	public static function set_update_options( $new_values, $values ) {
171
-        if ( ! isset($values['options']) ) {
172
-            return $new_values;
173
-        }
171
+		if ( ! isset($values['options']) ) {
172
+			return $new_values;
173
+		}
174 174
 
175 175
 		$options = isset( $values['options'] ) ? (array) $values['options'] : array();
176 176
 		FrmFormsHelper::fill_form_options( $options, $values );
177 177
 
178
-        $options['custom_style'] = isset($values['options']['custom_style']) ? $values['options']['custom_style'] : 0;
179
-        $options['before_html'] = isset($values['options']['before_html']) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html('before');
180
-        $options['after_html'] = isset($values['options']['after_html']) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html('after');
181
-        $options['submit_html'] = (isset($values['options']['submit_html']) && $values['options']['submit_html'] != '') ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html('submit');
178
+		$options['custom_style'] = isset($values['options']['custom_style']) ? $values['options']['custom_style'] : 0;
179
+		$options['before_html'] = isset($values['options']['before_html']) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html('before');
180
+		$options['after_html'] = isset($values['options']['after_html']) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html('after');
181
+		$options['submit_html'] = (isset($values['options']['submit_html']) && $values['options']['submit_html'] != '') ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html('submit');
182 182
 
183
-        $options = apply_filters('frm_form_options_before_update', $options, $values);
184
-        $new_values['options'] = serialize($options);
183
+		$options = apply_filters('frm_form_options_before_update', $options, $values);
184
+		$new_values['options'] = serialize($options);
185 185
 
186
-        return $new_values;
187
-    }
186
+		return $new_values;
187
+	}
188 188
 
189 189
 
190
-    /**
191
-     * @return array
192
-     */
190
+	/**
191
+	 * @return array
192
+	 */
193 193
 	public static function update_fields( $id, $values ) {
194 194
 
195
-        if ( ! isset($values['item_meta']) && ! isset($values['field_options']) ) {
196
-            return $values;
197
-        }
195
+		if ( ! isset($values['item_meta']) && ! isset($values['field_options']) ) {
196
+			return $values;
197
+		}
198 198
 
199
-        $all_fields = FrmField::get_all_for_form($id);
200
-        if ( empty($all_fields) ) {
201
-            return $values;
202
-        }
199
+		$all_fields = FrmField::get_all_for_form($id);
200
+		if ( empty($all_fields) ) {
201
+			return $values;
202
+		}
203 203
 
204
-        if ( ! isset($values['item_meta']) ) {
205
-            $values['item_meta'] = array();
206
-        }
204
+		if ( ! isset($values['item_meta']) ) {
205
+			$values['item_meta'] = array();
206
+		}
207 207
 
208
-        $field_array = array();
209
-        $existing_keys = array_keys($values['item_meta']);
210
-        foreach ( $all_fields as $fid ) {
211
-            if ( ! in_array($fid->id, $existing_keys) && ( isset($values['frm_fields_submitted']) && in_array($fid->id, $values['frm_fields_submitted']) ) || isset($values['options']) ) {
208
+		$field_array = array();
209
+		$existing_keys = array_keys($values['item_meta']);
210
+		foreach ( $all_fields as $fid ) {
211
+			if ( ! in_array($fid->id, $existing_keys) && ( isset($values['frm_fields_submitted']) && in_array($fid->id, $values['frm_fields_submitted']) ) || isset($values['options']) ) {
212 212
 				$values['item_meta'][ $fid->id ] = '';
213
-            }
213
+			}
214 214
 			$field_array[ $fid->id ] = $fid;
215
-        }
216
-        unset($all_fields);
215
+		}
216
+		unset($all_fields);
217 217
 
218
-        foreach ( $values['item_meta'] as $field_id => $default_value ) {
218
+		foreach ( $values['item_meta'] as $field_id => $default_value ) {
219 219
 			if ( isset( $field_array[ $field_id ] ) ) {
220 220
 				$field = $field_array[ $field_id ];
221
-            } else {
222
-                $field = FrmField::getOne($field_id);
223
-            }
221
+			} else {
222
+				$field = FrmField::getOne($field_id);
223
+			}
224 224
 
225
-            if ( ! $field ) {
226
-                continue;
227
-            }
225
+			if ( ! $field ) {
226
+				continue;
227
+			}
228 228
 
229 229
 			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options'][ 'custom_html_' . $field_id ] ) );
230 230
 			if ( $is_settings_page ) {
231
-                //updating the settings page
231
+				//updating the settings page
232 232
 				if ( isset( $values['field_options'][ 'custom_html_' . $field_id ] ) ) {
233 233
 					$field->field_options['custom_html'] = isset( $values['field_options'][ 'custom_html_' . $field_id ] ) ? $values['field_options'][ 'custom_html_' . $field_id ] : ( isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type ) );
234
-                    $field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
234
+					$field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
235 235
 					FrmField::update( $field_id, array( 'field_options' => $field->field_options ) );
236
-                } else if ( $field->type == 'hidden' || $field->type == 'user_id' ) {
237
-                    $prev_opts = $field->field_options;
238
-                    $field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
239
-                    if ( $prev_opts != $field->field_options ) {
236
+				} else if ( $field->type == 'hidden' || $field->type == 'user_id' ) {
237
+					$prev_opts = $field->field_options;
238
+					$field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
239
+					if ( $prev_opts != $field->field_options ) {
240 240
 						FrmField::update( $field_id, array( 'field_options' => $field->field_options ) );
241
-                    }
242
-                    unset($prev_opts);
243
-                }
244
-            }
241
+					}
242
+					unset($prev_opts);
243
+				}
244
+			}
245 245
 
246 246
 			if ( $is_settings_page && ! defined( 'WP_IMPORTING' ) ) {
247
-                continue;
248
-            }
247
+				continue;
248
+			}
249 249
 
250
-            //updating the form
250
+			//updating the form
251 251
 			$update_options = FrmFieldsHelper::get_default_field_options( $field->type );
252 252
 			unset( $update_options['custom_html'] ); // don't check for POST html
253 253
 			$update_options = apply_filters( 'frm_field_options_to_update', $update_options );
254 254
 
255 255
 			foreach ( $update_options as $opt => $default ) {
256 256
 				$field->field_options[ $opt ] = isset( $values['field_options'][ $opt . '_' . $field_id ] ) ? trim( sanitize_text_field( $values['field_options'][ $opt . '_' . $field_id ] ) ) : $default;
257
-            }
257
+			}
258 258
 
259
-            $field->field_options = apply_filters('frm_update_field_options', $field->field_options, $field, $values);
259
+			$field->field_options = apply_filters('frm_update_field_options', $field->field_options, $field, $values);
260 260
 			$default_value = maybe_serialize( $values['item_meta'][ $field_id ] );
261 261
 
262 262
 			$new_field = array(
@@ -268,12 +268,12 @@  discard block
 block discarded – undo
268 268
 
269 269
 			FrmField::update( $field_id, $new_field );
270 270
 
271
-            FrmField::delete_form_transient($field->form_id);
272
-        }
271
+			FrmField::delete_form_transient($field->form_id);
272
+		}
273 273
 		self::clear_form_cache();
274 274
 
275
-        return $values;
276
-    }
275
+		return $values;
276
+	}
277 277
 
278 278
 	private static function prepare_field_update_values( $field, $values, &$new_field ) {
279 279
 		$field_cols = array(
@@ -286,113 +286,113 @@  discard block
 block discarded – undo
286 286
 		}
287 287
 	}
288 288
 
289
-    /**
290
-     * @param string $status
291
-     * @return int|boolean
292
-     */
289
+	/**
290
+	 * @param string $status
291
+	 * @return int|boolean
292
+	 */
293 293
 	public static function set_status( $id, $status ) {
294
-        if ( 'trash' == $status ) {
295
-            return self::trash($id);
296
-        }
294
+		if ( 'trash' == $status ) {
295
+			return self::trash($id);
296
+		}
297 297
 
298 298
 		$statuses  = array( 'published', 'draft', 'trash' );
299
-        if ( ! in_array( $status, $statuses ) ) {
300
-            return false;
301
-        }
299
+		if ( ! in_array( $status, $statuses ) ) {
300
+			return false;
301
+		}
302 302
 
303
-        global $wpdb;
303
+		global $wpdb;
304 304
 
305
-        if ( is_array($id) ) {
305
+		if ( is_array($id) ) {
306 306
 			$where = array( 'id' => $id, 'parent_form_id' => $id, 'or' => 1 );
307 307
 			FrmDb::get_where_clause_and_values( $where );
308 308
 			array_unshift( $where['values'], $status );
309 309
 
310 310
 			$query_results = $wpdb->query( $wpdb->prepare( 'UPDATE ' . $wpdb->prefix . 'frm_forms SET status = %s ' . $where['where'], $where['values'] ) );
311
-        } else {
311
+		} else {
312 312
 			$query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', array( 'status' => $status ), array( 'id' => $id ) );
313 313
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'status' => $status ), array( 'parent_form_id' => $id ) );
314
-        }
314
+		}
315 315
 
316
-        if ( $query_results ) {
316
+		if ( $query_results ) {
317 317
 			self::clear_form_cache();
318
-        }
318
+		}
319 319
 
320
-        return $query_results;
321
-    }
320
+		return $query_results;
321
+	}
322 322
 
323
-    /**
324
-     * @return int|boolean
325
-     */
323
+	/**
324
+	 * @return int|boolean
325
+	 */
326 326
 	public static function trash( $id ) {
327
-        if ( ! EMPTY_TRASH_DAYS ) {
328
-            return self::destroy( $id );
329
-        }
327
+		if ( ! EMPTY_TRASH_DAYS ) {
328
+			return self::destroy( $id );
329
+		}
330 330
 
331
-        $form = self::getOne($id);
332
-        if ( ! $form ) {
333
-            return false;
334
-        }
331
+		$form = self::getOne($id);
332
+		if ( ! $form ) {
333
+			return false;
334
+		}
335 335
 
336
-        $options = $form->options;
337
-        $options['trash_time'] = time();
336
+		$options = $form->options;
337
+		$options['trash_time'] = time();
338 338
 
339
-        global $wpdb;
340
-        $query_results = $wpdb->update(
339
+		global $wpdb;
340
+		$query_results = $wpdb->update(
341 341
 			$wpdb->prefix . 'frm_forms',
342 342
 			array( 'status' => 'trash', 'options' => serialize( $options ) ),
343 343
 			array( 'id' => $id )
344
-        );
344
+		);
345 345
 
346
-        $wpdb->update(
346
+		$wpdb->update(
347 347
 			$wpdb->prefix . 'frm_forms',
348 348
 			array( 'status' => 'trash', 'options' => serialize( $options ) ),
349 349
 			array( 'parent_form_id' => $id )
350
-        );
350
+		);
351 351
 
352
-        if ( $query_results ) {
352
+		if ( $query_results ) {
353 353
 			self::clear_form_cache();
354
-        }
354
+		}
355 355
 
356
-        return $query_results;
357
-    }
356
+		return $query_results;
357
+	}
358 358
 
359
-    /**
360
-     * @return int|boolean
361
-     */
359
+	/**
360
+	 * @return int|boolean
361
+	 */
362 362
 	public static function destroy( $id ) {
363
-        global $wpdb;
363
+		global $wpdb;
364 364
 
365
-        $form = self::getOne($id);
366
-        if ( ! $form ) {
367
-            return false;
368
-        }
365
+		$form = self::getOne($id);
366
+		if ( ! $form ) {
367
+			return false;
368
+		}
369 369
 		$id = $form->id;
370 370
 
371
-        // Disconnect the entries from this form
371
+		// Disconnect the entries from this form
372 372
 		$entries = FrmDb::get_col( $wpdb->prefix . 'frm_items', array( 'form_id' => $id ) );
373
-        foreach ( $entries as $entry_id ) {
374
-            FrmEntry::destroy($entry_id);
375
-            unset($entry_id);
376
-        }
373
+		foreach ( $entries as $entry_id ) {
374
+			FrmEntry::destroy($entry_id);
375
+			unset($entry_id);
376
+		}
377 377
 
378
-        // Disconnect the fields from this form
378
+		// Disconnect the fields from this form
379 379
 		$wpdb->query( $wpdb->prepare( 'DELETE fi FROM ' . $wpdb->prefix . 'frm_fields AS fi LEFT JOIN ' . $wpdb->prefix . 'frm_forms fr ON (fi.form_id = fr.id) WHERE fi.form_id=%d OR parent_form_id=%d', $id, $id ) );
380 380
 
381 381
 		$query_results = $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_forms WHERE id=%d OR parent_form_id=%d', $id, $id ) );
382
-        if ( $query_results ) {
383
-            // Delete all form actions linked to this form
384
-            $action_control = FrmFormActionsController::get_form_actions( 'email' );
385
-            $action_control->destroy($id, 'all');
382
+		if ( $query_results ) {
383
+			// Delete all form actions linked to this form
384
+			$action_control = FrmFormActionsController::get_form_actions( 'email' );
385
+			$action_control->destroy($id, 'all');
386 386
 
387 387
 			// Clear form caching
388 388
 			self::clear_form_cache();
389 389
 
390 390
 			do_action( 'frm_destroy_form', $id );
391 391
 			do_action( 'frm_destroy_form_' . $id );
392
-        }
392
+		}
393 393
 
394
-        return $query_results;
395
-    }
394
+		return $query_results;
395
+	}
396 396
 
397 397
 	/**
398 398
 	 * Delete trashed forms based on how long they have been trashed
@@ -424,47 +424,47 @@  discard block
 block discarded – undo
424 424
 		return $count;
425 425
 	}
426 426
 
427
-    /**
428
-     * @return string form name
429
-     */
430
-    public static function getName( $id ) {
431
-        $form = FrmAppHelper::check_cache($id, 'frm_form');
432
-        if ( $form ) {
433
-            $r = stripslashes($form->name);
434
-            return $r;
435
-        }
436
-
437
-        $query_key = is_numeric( $id ) ? 'id' : 'form_key';
438
-        $r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' );
439
-        $r = stripslashes($r);
440
-
441
-        return $r;
442
-    }
443
-
444
-    /**
445
-     * @param string $key
446
-     * @return int form id
447
-     */
427
+	/**
428
+	 * @return string form name
429
+	 */
430
+	public static function getName( $id ) {
431
+		$form = FrmAppHelper::check_cache($id, 'frm_form');
432
+		if ( $form ) {
433
+			$r = stripslashes($form->name);
434
+			return $r;
435
+		}
436
+
437
+		$query_key = is_numeric( $id ) ? 'id' : 'form_key';
438
+		$r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' );
439
+		$r = stripslashes($r);
440
+
441
+		return $r;
442
+	}
443
+
444
+	/**
445
+	 * @param string $key
446
+	 * @return int form id
447
+	 */
448 448
 	public static function getIdByKey( $key ) {
449
-        $id = FrmDb::get_var( 'frm_forms', array( 'form_key' => sanitize_title( $key ) ) );
450
-        return $id;
451
-    }
452
-
453
-    /**
454
-     * @param int $id
455
-     * @return string form key
456
-     */
449
+		$id = FrmDb::get_var( 'frm_forms', array( 'form_key' => sanitize_title( $key ) ) );
450
+		return $id;
451
+	}
452
+
453
+	/**
454
+	 * @param int $id
455
+	 * @return string form key
456
+	 */
457 457
 	public static function getKeyById( $id ) {
458
-        $id = (int) $id;
459
-        $cache = FrmAppHelper::check_cache($id, 'frm_form');
460
-        if ( $cache ) {
461
-            return $cache->form_key;
462
-        }
458
+		$id = (int) $id;
459
+		$cache = FrmAppHelper::check_cache($id, 'frm_form');
460
+		if ( $cache ) {
461
+			return $cache->form_key;
462
+		}
463 463
 
464
-        $key = FrmDb::get_var( 'frm_forms', array( 'id' => $id ), 'form_key' );
464
+		$key = FrmDb::get_var( 'frm_forms', array( 'id' => $id ), 'form_key' );
465 465
 
466
-        return $key;
467
-    }
466
+		return $key;
467
+	}
468 468
 
469 469
 	/**
470 470
 	 * If $form is numeric, get the form object
@@ -477,47 +477,47 @@  discard block
 block discarded – undo
477 477
 		}
478 478
 	}
479 479
 
480
-    /**
481
-     * @return object form
482
-     */
483
-    public static function getOne( $id, $blog_id = false ) {
484
-        global $wpdb;
480
+	/**
481
+	 * @return object form
482
+	 */
483
+	public static function getOne( $id, $blog_id = false ) {
484
+		global $wpdb;
485 485
 
486
-        if ( $blog_id && is_multisite() ) {
487
-            global $wpmuBaseTablePrefix;
486
+		if ( $blog_id && is_multisite() ) {
487
+			global $wpmuBaseTablePrefix;
488 488
 			$prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix . $blog_id . '_' : $wpdb->get_blog_prefix( $blog_id );
489 489
 
490 490
 			$table_name = $prefix . 'frm_forms';
491
-        } else {
491
+		} else {
492 492
 			$table_name = $wpdb->prefix . 'frm_forms';
493
-            $cache = wp_cache_get($id, 'frm_form');
494
-            if ( $cache ) {
495
-                if ( isset($cache->options) ) {
496
-                    $cache->options = maybe_unserialize($cache->options);
497
-                }
493
+			$cache = wp_cache_get($id, 'frm_form');
494
+			if ( $cache ) {
495
+				if ( isset($cache->options) ) {
496
+					$cache->options = maybe_unserialize($cache->options);
497
+				}
498 498
 
499
-                return stripslashes_deep($cache);
500
-            }
501
-        }
499
+				return stripslashes_deep($cache);
500
+			}
501
+		}
502 502
 
503
-        if ( is_numeric($id) ) {
504
-            $where = array( 'id' => $id );
505
-        } else {
506
-            $where = array( 'form_key' => $id );
507
-        }
503
+		if ( is_numeric($id) ) {
504
+			$where = array( 'id' => $id );
505
+		} else {
506
+			$where = array( 'form_key' => $id );
507
+		}
508 508
 
509
-        $results = FrmDb::get_row( $table_name, $where );
509
+		$results = FrmDb::get_row( $table_name, $where );
510 510
 
511
-        if ( isset($results->options) ) {
511
+		if ( isset($results->options) ) {
512 512
 			FrmAppHelper::set_cache( $results->id, $results, 'frm_form' );
513
-            $results->options = maybe_unserialize($results->options);
514
-        }
515
-        return stripslashes_deep($results);
516
-    }
517
-
518
-    /**
519
-     * @return object|array of objects
520
-     */
513
+			$results->options = maybe_unserialize($results->options);
514
+		}
515
+		return stripslashes_deep($results);
516
+	}
517
+
518
+	/**
519
+	 * @return object|array of objects
520
+	 */
521 521
 	public static function getAll( $where = array(), $order_by = '', $limit = '' ) {
522 522
 		if ( is_array( $where ) && ! empty( $where ) ) {
523 523
 			$results = FrmDb::get_results( 'frm_forms', $where, '*', array( 'order_by' => $order_by, 'limit' => $limit ) );
@@ -541,8 +541,8 @@  discard block
 block discarded – undo
541 541
 			$results = reset( $results );
542 542
 		}
543 543
 
544
-        return stripslashes_deep($results);
545
-    }
544
+		return stripslashes_deep($results);
545
+	}
546 546
 
547 547
 	/**
548 548
 	 * Get all published forms
@@ -560,47 +560,47 @@  discard block
 block discarded – undo
560 560
 		return $forms;
561 561
 	}
562 562
 
563
-    /**
564
-     * @return int count of forms
565
-     */
566
-    public static function get_count() {
567
-    	global $wpdb;
563
+	/**
564
+	 * @return int count of forms
565
+	 */
566
+	public static function get_count() {
567
+		global $wpdb;
568 568
 
569
-    	$cache_key = 'frm_form_counts';
569
+		$cache_key = 'frm_form_counts';
570 570
 
571
-    	$counts = wp_cache_get( $cache_key, 'frm_form' );
572
-    	if ( false !== $counts ) {
573
-    	    return $counts;
574
-    	}
571
+		$counts = wp_cache_get( $cache_key, 'frm_form' );
572
+		if ( false !== $counts ) {
573
+			return $counts;
574
+		}
575 575
 
576
-        $results = (array) FrmDb::get_results( 'frm_forms', array( 'or' => 1, 'parent_form_id' => null, 'parent_form_id <' => 0 ), 'status, is_template' );
576
+		$results = (array) FrmDb::get_results( 'frm_forms', array( 'or' => 1, 'parent_form_id' => null, 'parent_form_id <' => 0 ), 'status, is_template' );
577 577
 
578 578
 		$statuses = array( 'published', 'draft', 'template', 'trash' );
579
-    	$counts = array_fill_keys( $statuses, 0 );
579
+		$counts = array_fill_keys( $statuses, 0 );
580 580
 
581
-    	foreach ( $results as $row ) {
582
-            if ( 'trash' != $row->status ) {
583
-    	        if ( $row->is_template ) {
581
+		foreach ( $results as $row ) {
582
+			if ( 'trash' != $row->status ) {
583
+				if ( $row->is_template ) {
584 584
 					$counts['template']++;
585
-    	        } else {
585
+				} else {
586 586
 					$counts['published']++;
587
-    	        }
588
-    	    } else {
587
+				}
588
+			} else {
589 589
 				$counts['trash']++;
590
-        	}
590
+			}
591 591
 
592
-    	    if ( 'draft' == $row->status ) {
592
+			if ( 'draft' == $row->status ) {
593 593
 				$counts['draft']++;
594
-    	    }
594
+			}
595 595
 
596
-    		unset($row);
597
-    	}
596
+			unset($row);
597
+		}
598 598
 
599
-    	$counts = (object) $counts;
599
+		$counts = (object) $counts;
600 600
 		FrmAppHelper::set_cache( $cache_key, $counts, 'frm_form' );
601 601
 
602
-    	return $counts;
603
-    }
602
+		return $counts;
603
+	}
604 604
 
605 605
 	/**
606 606
 	 * Clear form caching
@@ -613,14 +613,14 @@  discard block
 block discarded – undo
613 613
 		FrmAppHelper::cache_delete_group( 'frm_form' );
614 614
 	}
615 615
 
616
-    /**
617
-     * @return array of errors
618
-     */
616
+	/**
617
+	 * @return array of errors
618
+	 */
619 619
 	public static function validate( $values ) {
620
-        $errors = array();
620
+		$errors = array();
621 621
 
622
-        return apply_filters('frm_validate_form', $errors, $values);
623
-    }
622
+		return apply_filters('frm_validate_form', $errors, $values);
623
+	}
624 624
 
625 625
 	public static function get_params( $form = null ) {
626 626
 		global $frm_vars;
Please login to merge, or discard this patch.
classes/models/FrmField.php 2 patches
Indentation   +195 added lines, -195 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 
6 6
 class FrmField {
7 7
 
8
-    static $use_cache = true;
8
+	static $use_cache = true;
9 9
 	static $transient_size = 200;
10 10
 
11 11
 	public static function field_selection() {
@@ -52,39 +52,39 @@  discard block
 block discarded – undo
52 52
 		));
53 53
 	}
54 54
 
55
-    public static function create( $values, $return = true ) {
56
-        global $wpdb, $frm_duplicate_ids;
55
+	public static function create( $values, $return = true ) {
56
+		global $wpdb, $frm_duplicate_ids;
57 57
 
58
-        $new_values = array();
59
-        $key = isset($values['field_key']) ? $values['field_key'] : $values['name'];
58
+		$new_values = array();
59
+		$key = isset($values['field_key']) ? $values['field_key'] : $values['name'];
60 60
 		$new_values['field_key'] = FrmAppHelper::get_unique_key( $key, $wpdb->prefix . 'frm_fields', 'field_key' );
61 61
 
62 62
 		foreach ( array( 'name', 'description', 'type', 'default_value' ) as $col ) {
63 63
 			$new_values[ $col ] = $values[ $col ];
64
-        }
64
+		}
65 65
 
66
-        $new_values['options'] = $values['options'];
66
+		$new_values['options'] = $values['options'];
67 67
 
68
-        $new_values['field_order'] = isset($values['field_order']) ? (int) $values['field_order'] : null;
69
-        $new_values['required'] = isset($values['required']) ? (int) $values['required'] : 0;
70
-        $new_values['form_id'] = isset($values['form_id']) ? (int) $values['form_id'] : null;
71
-        $new_values['field_options'] = $values['field_options'];
72
-        $new_values['created_at'] = current_time('mysql', 1);
68
+		$new_values['field_order'] = isset($values['field_order']) ? (int) $values['field_order'] : null;
69
+		$new_values['required'] = isset($values['required']) ? (int) $values['required'] : 0;
70
+		$new_values['form_id'] = isset($values['form_id']) ? (int) $values['form_id'] : null;
71
+		$new_values['field_options'] = $values['field_options'];
72
+		$new_values['created_at'] = current_time('mysql', 1);
73 73
 
74 74
 		if ( isset( $values['id'] ) ) {
75 75
 			$frm_duplicate_ids[ $values['field_key'] ] = $new_values['field_key'];
76
-            $new_values = apply_filters('frm_duplicated_field', $new_values);
77
-        }
76
+			$new_values = apply_filters('frm_duplicated_field', $new_values);
77
+		}
78 78
 
79 79
 		foreach ( $new_values as $k => $v ) {
80
-            if ( is_array( $v ) ) {
80
+			if ( is_array( $v ) ) {
81 81
 				$new_values[ $k ] = serialize( $v );
82 82
 			}
83
-            unset( $k, $v );
84
-        }
83
+			unset( $k, $v );
84
+		}
85 85
 
86
-        //if(isset($values['id']) and is_numeric($values['id']))
87
-        //    $new_values['id'] = $values['id'];
86
+		//if(isset($values['id']) and is_numeric($values['id']))
87
+		//    $new_values['id'] = $values['id'];
88 88
 
89 89
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_fields', $new_values );
90 90
 		$new_id = 0;
@@ -105,22 +105,22 @@  discard block
 block discarded – undo
105 105
 		} else {
106 106
 			return false;
107 107
 		}
108
-    }
108
+	}
109 109
 
110
-    public static function duplicate( $old_form_id, $form_id, $copy_keys = false, $blog_id = false ) {
111
-        global $frm_duplicate_ids;
110
+	public static function duplicate( $old_form_id, $form_id, $copy_keys = false, $blog_id = false ) {
111
+		global $frm_duplicate_ids;
112 112
 
113 113
 		$where = array( array( 'or' => 1, 'fi.form_id' => $old_form_id, 'fr.parent_form_id' => $old_form_id ) );
114 114
 		$fields = self::getAll( $where, 'field_order', '', $blog_id );
115 115
 
116
-        foreach ( (array) $fields as $field ) {
117
-            $new_key = ($copy_keys) ? $field->field_key : '';
118
-            if ( $copy_keys && substr($field->field_key, -1) == 2 ) {
119
-                $new_key = rtrim($new_key, 2);
120
-            }
116
+		foreach ( (array) $fields as $field ) {
117
+			$new_key = ($copy_keys) ? $field->field_key : '';
118
+			if ( $copy_keys && substr($field->field_key, -1) == 2 ) {
119
+				$new_key = rtrim($new_key, 2);
120
+			}
121 121
 
122
-            $values = array();
123
-            FrmFieldsHelper::fill_field( $values, $field, $form_id, $new_key );
122
+			$values = array();
123
+			FrmFieldsHelper::fill_field( $values, $field, $form_id, $new_key );
124 124
 
125 125
 			// If this is a repeating section, create new form
126 126
 			if ( self::is_repeating_field( $field ) ) {
@@ -139,16 +139,16 @@  discard block
 block discarded – undo
139 139
 				$values['form_id'] = $new_repeat_form_id;
140 140
 			}
141 141
 
142
-            $values = apply_filters('frm_duplicated_field', $values);
143
-            $new_id = self::create($values);
144
-            $frm_duplicate_ids[ $field->id ] = $new_id;
145
-            $frm_duplicate_ids[ $field->field_key ] = $new_id;
146
-            unset($field);
147
-        }
148
-    }
142
+			$values = apply_filters('frm_duplicated_field', $values);
143
+			$new_id = self::create($values);
144
+			$frm_duplicate_ids[ $field->id ] = $new_id;
145
+			$frm_duplicate_ids[ $field->field_key ] = $new_id;
146
+			unset($field);
147
+		}
148
+	}
149 149
 
150 150
 	public static function update( $id, $values ) {
151
-        global $wpdb;
151
+		global $wpdb;
152 152
 
153 153
 		$id = absint( $id );
154 154
 
@@ -156,9 +156,9 @@  discard block
 block discarded – undo
156 156
 			$values['field_key'] = FrmAppHelper::get_unique_key( $values['field_key'], $wpdb->prefix . 'frm_fields', 'field_key', $id );
157 157
 		}
158 158
 
159
-        if ( isset($values['required']) ) {
160
-            $values['required'] = (int) $values['required'];
161
-        }
159
+		if ( isset($values['required']) ) {
160
+			$values['required'] = (int) $values['required'];
161
+		}
162 162
 
163 163
 		self::preserve_format_option_backslashes( $values );
164 164
 
@@ -175,41 +175,41 @@  discard block
 block discarded – undo
175 175
 
176 176
 		$query_results = $wpdb->update( $wpdb->prefix . 'frm_fields', $values, array( 'id' => $id ) );
177 177
 
178
-        $form_id = 0;
178
+		$form_id = 0;
179 179
 		if ( isset( $values['form_id'] ) ) {
180
-            $form_id = absint( $values['form_id'] );
180
+			$form_id = absint( $values['form_id'] );
181 181
 		} else {
182
-            $field = self::getOne($id);
183
-            if ( $field ) {
184
-                $form_id = $field->form_id;
185
-            }
186
-            unset($field);
187
-        }
188
-        unset($values);
182
+			$field = self::getOne($id);
183
+			if ( $field ) {
184
+				$form_id = $field->form_id;
185
+			}
186
+			unset($field);
187
+		}
188
+		unset($values);
189 189
 
190 190
 		if ( $query_results ) {
191
-            wp_cache_delete( $id, 'frm_field' );
192
-            if ( $form_id ) {
193
-                self::delete_form_transient( $form_id );
194
-            }
195
-        }
191
+			wp_cache_delete( $id, 'frm_field' );
192
+			if ( $form_id ) {
193
+				self::delete_form_transient( $form_id );
194
+			}
195
+		}
196 196
 
197
-        return $query_results;
198
-    }
197
+		return $query_results;
198
+	}
199 199
 
200 200
 	/**
201
-	* Keep backslashes in the phone format option
202
-	*
203
-	* @since 2.0.8
204
-	* @param $values array - pass by reference
205
-	*/
201
+	 * Keep backslashes in the phone format option
202
+	 *
203
+	 * @since 2.0.8
204
+	 * @param $values array - pass by reference
205
+	 */
206 206
 	private static function preserve_format_option_backslashes( &$values ) {
207 207
 		if ( isset( $values['field_options']['format'] ) ) {
208 208
 			$values['field_options']['format'] = FrmAppHelper::preserve_backslashes( $values['field_options']['format'] );
209 209
 		}
210 210
 	}
211 211
 
212
-    public static function destroy( $id ) {
212
+	public static function destroy( $id ) {
213 213
 		global $wpdb;
214 214
 
215 215
 		do_action( 'frm_before_destroy_field', $id );
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 
225 225
 		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas WHERE field_id=%d', $id ) );
226 226
 		return $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_fields WHERE id=%d', $id ) );
227
-    }
227
+	}
228 228
 
229 229
 	public static function delete_form_transient( $form_id ) {
230 230
 		$form_id = absint( $form_id );
@@ -238,11 +238,11 @@  discard block
 block discarded – undo
238 238
 
239 239
 		FrmAppHelper::cache_delete_group( 'frm_field' );
240 240
 
241
-        $form = FrmForm::getOne($form_id);
242
-        if ( $form && $form->parent_form_id && $form->parent_form_id != $form_id ) {
243
-            self::delete_form_transient( $form->parent_form_id );
244
-        }
245
-    }
241
+		$form = FrmForm::getOne($form_id);
242
+		if ( $form && $form->parent_form_id && $form->parent_form_id != $form_id ) {
243
+			self::delete_form_transient( $form->parent_form_id );
244
+		}
245
+	}
246 246
 
247 247
 	/**
248 248
 	 * If $field is numeric, get the field object
@@ -258,131 +258,131 @@  discard block
 block discarded – undo
258 258
 			return null;
259 259
 		}
260 260
 
261
-        global $wpdb;
261
+		global $wpdb;
262 262
 
263
-        $where = is_numeric($id) ? 'id=%d' : 'field_key=%s';
263
+		$where = is_numeric($id) ? 'id=%d' : 'field_key=%s';
264 264
 		$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->prefix . 'frm_fields WHERE ' . $where, $id );
265 265
 
266
-        $results = FrmAppHelper::check_cache( $id, 'frm_field', $query, 'get_row', 0 );
266
+		$results = FrmAppHelper::check_cache( $id, 'frm_field', $query, 'get_row', 0 );
267 267
 
268
-        if ( empty($results) ) {
269
-            return $results;
270
-        }
268
+		if ( empty($results) ) {
269
+			return $results;
270
+		}
271 271
 
272
-        if ( is_numeric($id) ) {
272
+		if ( is_numeric($id) ) {
273 273
 			FrmAppHelper::set_cache( $results->field_key, $results, 'frm_field' );
274
-        } else if ( $results ) {
274
+		} else if ( $results ) {
275 275
 			FrmAppHelper::set_cache( $results->id, $results, 'frm_field' );
276
-        }
276
+		}
277 277
 
278 278
 		self::prepare_options( $results );
279 279
 
280
-        return stripslashes_deep($results);
281
-    }
280
+		return stripslashes_deep($results);
281
+	}
282 282
 
283
-    /**
284
-     * Get the field type by key or id
285
-     * @param int|string The field id or key
283
+	/**
284
+	 * Get the field type by key or id
285
+	 * @param int|string The field id or key
286 286
 	 * @param mixed $col The name of the column in the fields database table
287
-     */
288
-    public static function get_type( $id, $col = 'type' ) {
289
-        $field = FrmAppHelper::check_cache( $id, 'frm_field' );
290
-        if ( $field ) {
291
-            $type = $field->{$col};
292
-        } else {
293
-            $type = FrmDb::get_var( 'frm_fields', array( 'or' => 1, 'id' => $id, 'field_key' => $id ), $col );
294
-        }
295
-
296
-        return $type;
297
-    }
287
+	 */
288
+	public static function get_type( $id, $col = 'type' ) {
289
+		$field = FrmAppHelper::check_cache( $id, 'frm_field' );
290
+		if ( $field ) {
291
+			$type = $field->{$col};
292
+		} else {
293
+			$type = FrmDb::get_var( 'frm_fields', array( 'or' => 1, 'id' => $id, 'field_key' => $id ), $col );
294
+		}
295
+
296
+		return $type;
297
+	}
298 298
 
299 299
 	public static function get_all_types_in_form( $form_id, $type, $limit = '', $inc_sub = 'exclude' ) {
300
-        if ( ! $form_id ) {
301
-            return array();
302
-        }
300
+		if ( ! $form_id ) {
301
+			return array();
302
+		}
303 303
 
304 304
 		$results = self::get_fields_from_transients( $form_id, array( 'inc_embed' => $inc_sub, 'inc_repeat' => $inc_sub ) );
305 305
 		if ( ! empty( $results ) ) {
306
-            $fields = array();
307
-            $count = 0;
308
-            foreach ( $results as $result ) {
309
-                if ( $type != $result->type ) {
310
-                    continue;
311
-                }
306
+			$fields = array();
307
+			$count = 0;
308
+			foreach ( $results as $result ) {
309
+				if ( $type != $result->type ) {
310
+					continue;
311
+				}
312 312
 
313 313
 				$fields[ $result->id ] = $result;
314
-                $count++;
315
-                if ( $limit == 1 ) {
316
-                    $fields = $result;
317
-                    break;
318
-                }
314
+				$count++;
315
+				if ( $limit == 1 ) {
316
+					$fields = $result;
317
+					break;
318
+				}
319 319
 
320
-                if ( ! empty($limit) && $count >= $limit ) {
321
-                    break;
322
-                }
320
+				if ( ! empty($limit) && $count >= $limit ) {
321
+					break;
322
+				}
323 323
 
324
-                unset($result);
325
-            }
326
-            return stripslashes_deep($fields);
327
-        }
324
+				unset($result);
325
+			}
326
+			return stripslashes_deep($fields);
327
+		}
328 328
 
329
-        self::$use_cache = false;
329
+		self::$use_cache = false;
330 330
 
331 331
 		$where = array( 'fi.form_id' => (int) $form_id, 'fi.type' => $type );
332 332
 		self::maybe_include_repeating_fields( $inc_sub, $where );
333 333
 		$results = self::getAll( $where, 'field_order', $limit );
334
-        self::$use_cache = true;
335
-        self::include_sub_fields($results, $inc_sub, $type);
334
+		self::$use_cache = true;
335
+		self::include_sub_fields($results, $inc_sub, $type);
336 336
 
337
-        return $results;
338
-    }
337
+		return $results;
338
+	}
339 339
 
340 340
 	public static function get_all_for_form( $form_id, $limit = '', $inc_embed = 'exclude', $inc_repeat = 'include' ) {
341
-        if ( ! (int) $form_id ) {
342
-            return array();
343
-        }
341
+		if ( ! (int) $form_id ) {
342
+			return array();
343
+		}
344 344
 
345 345
 		$results = self::get_fields_from_transients( $form_id, array( 'inc_embed' => $inc_embed, 'inc_repeat' => $inc_repeat ) );
346 346
 		if ( ! empty( $results ) ) {
347
-            if ( empty($limit) ) {
347
+			if ( empty($limit) ) {
348 348
 				return $results;
349
-            }
349
+			}
350 350
 
351
-            $fields = array();
352
-            $count = 0;
353
-            foreach ( $results as $result ) {
351
+			$fields = array();
352
+			$count = 0;
353
+			foreach ( $results as $result ) {
354 354
 				$fields[ $result->id ] = $result;
355
-                if ( ! empty($limit) && $count >= $limit ) {
356
-                    break;
357
-                }
358
-            }
355
+				if ( ! empty($limit) && $count >= $limit ) {
356
+					break;
357
+				}
358
+			}
359 359
 
360 360
 			return $fields;
361
-        }
361
+		}
362 362
 
363
-        self::$use_cache = false;
363
+		self::$use_cache = false;
364 364
 
365 365
 		$where = array( 'fi.form_id' => absint( $form_id ) );
366 366
 		self::maybe_include_repeating_fields( $inc_repeat, $where );
367 367
 		$results = self::getAll( $where, 'field_order', $limit );
368 368
 
369
-        self::$use_cache = true;
369
+		self::$use_cache = true;
370 370
 
371 371
 		self::include_sub_fields( $results, $inc_embed, 'all' );
372 372
 
373
-        if ( empty($limit) ) {
373
+		if ( empty($limit) ) {
374 374
 			self::set_field_transient( $results, $form_id, 0, array( 'inc_embed' => $inc_embed, 'inc_repeat' => $inc_repeat ) );
375
-        }
375
+		}
376 376
 
377 377
 		return $results;
378
-    }
378
+	}
379 379
 
380 380
 	/**
381
-	* If repeating fields should be included, adjust $where accordingly
382
-	*
383
-	* @param string $inc_repeat
384
-	* @param array $where - pass by reference
385
-	*/
381
+	 * If repeating fields should be included, adjust $where accordingly
382
+	 *
383
+	 * @param string $inc_repeat
384
+	 * @param array $where - pass by reference
385
+	 */
386 386
 	private static function maybe_include_repeating_fields( $inc_repeat, &$where ) {
387 387
 		if ( $inc_repeat == 'include' ) {
388 388
 			$form_id = $where['fi.form_id'];
@@ -393,77 +393,77 @@  discard block
 block discarded – undo
393 393
 
394 394
 	public static function include_sub_fields( &$results, $inc_embed, $type = 'all' ) {
395 395
 		if ( 'include' != $inc_embed || empty( $results ) ) {
396
-            return;
397
-        }
396
+			return;
397
+		}
398 398
 
399
-        $form_fields = $results;
399
+		$form_fields = $results;
400 400
 		$index_offset = 1;
401
-        foreach ( $form_fields as $k => $field ) {
402
-            if ( 'form' != $field->type || ! isset($field->field_options['form_select']) ) {
403
-                continue;
404
-            }
405
-
406
-            if ( $type == 'all' ) {
407
-                $sub_fields = self::get_all_for_form( $field->field_options['form_select'] );
408
-            } else {
409
-                $sub_fields = self::get_all_types_in_form($field->form_id, $type);
410
-            }
411
-
412
-            if ( ! empty($sub_fields) ) {
401
+		foreach ( $form_fields as $k => $field ) {
402
+			if ( 'form' != $field->type || ! isset($field->field_options['form_select']) ) {
403
+				continue;
404
+			}
405
+
406
+			if ( $type == 'all' ) {
407
+				$sub_fields = self::get_all_for_form( $field->field_options['form_select'] );
408
+			} else {
409
+				$sub_fields = self::get_all_types_in_form($field->form_id, $type);
410
+			}
411
+
412
+			if ( ! empty($sub_fields) ) {
413 413
 				$index = $k + $index_offset;
414 414
 				$index_offset += count( $sub_fields );
415 415
 				array_splice($results, $index, 0, $sub_fields);
416
-            }
417
-            unset($field, $sub_fields);
418
-        }
419
-    }
416
+			}
417
+			unset($field, $sub_fields);
418
+		}
419
+	}
420 420
 
421 421
 	public static function getAll( $where = array(), $order_by = '', $limit = '', $blog_id = false ) {
422 422
 		$cache_key = maybe_serialize( $where ) . $order_by . 'l' . $limit . 'b' . $blog_id;
423
-        if ( self::$use_cache ) {
424
-            // make sure old cache doesn't get saved as a transient
425
-            $results = wp_cache_get($cache_key, 'frm_field');
426
-            if ( false !== $results ) {
427
-                return stripslashes_deep($results);
428
-            }
429
-        }
430
-
431
-        global $wpdb;
432
-
433
-        if ( $blog_id && is_multisite() ) {
434
-            global $wpmuBaseTablePrefix;
435
-            if ( $wpmuBaseTablePrefix ) {
423
+		if ( self::$use_cache ) {
424
+			// make sure old cache doesn't get saved as a transient
425
+			$results = wp_cache_get($cache_key, 'frm_field');
426
+			if ( false !== $results ) {
427
+				return stripslashes_deep($results);
428
+			}
429
+		}
430
+
431
+		global $wpdb;
432
+
433
+		if ( $blog_id && is_multisite() ) {
434
+			global $wpmuBaseTablePrefix;
435
+			if ( $wpmuBaseTablePrefix ) {
436 436
 				$prefix = $wpmuBaseTablePrefix . $blog_id . '_';
437
-            } else {
438
-                $prefix = $wpdb->get_blog_prefix( $blog_id );
439
-            }
437
+			} else {
438
+				$prefix = $wpdb->get_blog_prefix( $blog_id );
439
+			}
440 440
 
441 441
 			$table_name = $prefix . 'frm_fields';
442 442
 			$form_table_name = $prefix . 'frm_forms';
443 443
 		} else {
444 444
 			$table_name = $wpdb->prefix . 'frm_fields';
445 445
 			$form_table_name = $wpdb->prefix . 'frm_forms';
446
-        }
446
+		}
447 447
 
448 448
 		if ( ! empty( $order_by ) && strpos( $order_by, 'ORDER BY' ) === false ) {
449 449
 			$order_by = ' ORDER BY ' . $order_by;
450 450
 		}
451 451
 
452
-        $limit = FrmAppHelper::esc_limit($limit);
452
+		$limit = FrmAppHelper::esc_limit($limit);
453 453
 
454
-        $query = "SELECT fi.*, fr.name as form_name  FROM {$table_name} fi LEFT OUTER JOIN {$form_table_name} fr ON fi.form_id=fr.id";
455
-        $query_type = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'row' : 'results';
454
+		$query = "SELECT fi.*, fr.name as form_name  FROM {$table_name} fi LEFT OUTER JOIN {$form_table_name} fr ON fi.form_id=fr.id";
455
+		$query_type = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'row' : 'results';
456 456
 
457
-        if ( is_array($where) ) {
458
-            $results = FrmDb::get_var( $table_name . ' fi LEFT OUTER JOIN ' . $form_table_name . ' fr ON fi.form_id=fr.id', $where, 'fi.*, fr.name as form_name', array( 'order_by' => $order_by, 'limit' => $limit ), '', $query_type );
457
+		if ( is_array($where) ) {
458
+			$results = FrmDb::get_var( $table_name . ' fi LEFT OUTER JOIN ' . $form_table_name . ' fr ON fi.form_id=fr.id', $where, 'fi.*, fr.name as form_name', array( 'order_by' => $order_by, 'limit' => $limit ), '', $query_type );
459 459
 		} else {
460 460
 			// if the query is not an array, then it has already been prepared
461
-            $query .= FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
461
+			$query .= FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
462 462
 
463 463
 			$function_name = ( $query_type == 'row' ) ? 'get_row' : 'get_results';
464 464
 			$results = $wpdb->$function_name( $query );
465
-        }
466
-        unset( $where );
465
+		}
466
+		unset( $where );
467 467
 
468 468
 		self::format_field_results( $results );
469 469
 
@@ -701,8 +701,8 @@  discard block
 block discarded – undo
701 701
 	}
702 702
 
703 703
 	/**
704
-	* @since 2.0.09
705
-	*/
704
+	 * @since 2.0.09
705
+	 */
706 706
 	public static function is_repeating_field( $field ) {
707 707
 		if ( is_array( $field ) ) {
708 708
 			$is_repeating_field = ( 'divider' == $field['type'] );
@@ -712,14 +712,14 @@  discard block
 block discarded – undo
712 712
 		return ( $is_repeating_field && self::is_option_true( $field, 'repeat' ) );
713 713
 	}
714 714
 
715
-    /**
716
-     * @param string $key
717
-     * @return int field id
718
-     */
715
+	/**
716
+	 * @param string $key
717
+	 * @return int field id
718
+	 */
719 719
 	public static function get_id_by_key( $key ) {
720
-        $id = FrmDb::get_var( 'frm_fields', array( 'field_key' => sanitize_title( $key ) ) );
721
-        return $id;
722
-    }
720
+		$id = FrmDb::get_var( 'frm_fields', array( 'field_key' => sanitize_title( $key ) ) );
721
+		return $id;
722
+	}
723 723
 
724 724
 	/**
725 725
 	 * @param string $id
Please login to merge, or discard this patch.
Spacing   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined('ABSPATH') ) {
2
+if ( ! defined( 'ABSPATH' ) ) {
3 3
 	die( 'You are not allowed to call this page directly.' );
4 4
 }
5 5
 
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 	static $transient_size = 200;
10 10
 
11 11
 	public static function field_selection() {
12
-		$fields = apply_filters('frm_available_fields', array(
12
+		$fields = apply_filters( 'frm_available_fields', array(
13 13
 			'text'      => __( 'Single Line Text', 'formidable' ),
14 14
 			'textarea'  => __( 'Paragraph Text', 'formidable' ),
15 15
 			'checkbox'  => __( 'Checkboxes', 'formidable' ),
@@ -23,13 +23,13 @@  discard block
 block discarded – undo
23 23
 			'hidden'    => __( 'Hidden Field', 'formidable' ),
24 24
 			'user_id'   => __( 'User ID (hidden)', 'formidable' ),
25 25
 			'captcha'   => __( 'reCAPTCHA', 'formidable' ),
26
-		));
26
+		) );
27 27
 
28 28
 		return $fields;
29 29
 	}
30 30
 
31 31
 	public static function pro_field_selection() {
32
-		return apply_filters('frm_pro_available_fields', array(
32
+		return apply_filters( 'frm_pro_available_fields', array(
33 33
 			'end_divider' => array(
34 34
 				'name'  => __( 'End Section', 'formidable' ),
35 35
 				'switch_from' => 'divider',
@@ -49,36 +49,36 @@  discard block
 block discarded – undo
49 49
 			'tag'       => __( 'Tags', 'formidable' ),
50 50
 			'credit_card' => __( 'Credit Card', 'formidable' ),
51 51
 			'address'   => __( 'Address', 'formidable' ),
52
-		));
52
+		) );
53 53
 	}
54 54
 
55 55
     public static function create( $values, $return = true ) {
56 56
         global $wpdb, $frm_duplicate_ids;
57 57
 
58 58
         $new_values = array();
59
-        $key = isset($values['field_key']) ? $values['field_key'] : $values['name'];
59
+        $key = isset( $values['field_key'] ) ? $values['field_key'] : $values['name'];
60 60
 		$new_values['field_key'] = FrmAppHelper::get_unique_key( $key, $wpdb->prefix . 'frm_fields', 'field_key' );
61 61
 
62 62
 		foreach ( array( 'name', 'description', 'type', 'default_value' ) as $col ) {
63
-			$new_values[ $col ] = $values[ $col ];
63
+			$new_values[$col] = $values[$col];
64 64
         }
65 65
 
66 66
         $new_values['options'] = $values['options'];
67 67
 
68
-        $new_values['field_order'] = isset($values['field_order']) ? (int) $values['field_order'] : null;
69
-        $new_values['required'] = isset($values['required']) ? (int) $values['required'] : 0;
70
-        $new_values['form_id'] = isset($values['form_id']) ? (int) $values['form_id'] : null;
68
+        $new_values['field_order'] = isset( $values['field_order'] ) ? (int) $values['field_order'] : null;
69
+        $new_values['required'] = isset( $values['required'] ) ? (int) $values['required'] : 0;
70
+        $new_values['form_id'] = isset( $values['form_id'] ) ? (int) $values['form_id'] : null;
71 71
         $new_values['field_options'] = $values['field_options'];
72
-        $new_values['created_at'] = current_time('mysql', 1);
72
+        $new_values['created_at'] = current_time( 'mysql', 1 );
73 73
 
74 74
 		if ( isset( $values['id'] ) ) {
75
-			$frm_duplicate_ids[ $values['field_key'] ] = $new_values['field_key'];
76
-            $new_values = apply_filters('frm_duplicated_field', $new_values);
75
+			$frm_duplicate_ids[$values['field_key']] = $new_values['field_key'];
76
+            $new_values = apply_filters( 'frm_duplicated_field', $new_values );
77 77
         }
78 78
 
79 79
 		foreach ( $new_values as $k => $v ) {
80 80
             if ( is_array( $v ) ) {
81
-				$new_values[ $k ] = serialize( $v );
81
+				$new_values[$k] = serialize( $v );
82 82
 			}
83 83
             unset( $k, $v );
84 84
         }
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 
100 100
 		if ( $query_results ) {
101 101
 			if ( isset( $values['id'] ) ) {
102
-				$frm_duplicate_ids[ $values['id'] ] = $new_id;
102
+				$frm_duplicate_ids[$values['id']] = $new_id;
103 103
 			}
104 104
 			return $new_id;
105 105
 		} else {
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
 		$fields = self::getAll( $where, 'field_order', '', $blog_id );
115 115
 
116 116
         foreach ( (array) $fields as $field ) {
117
-            $new_key = ($copy_keys) ? $field->field_key : '';
118
-            if ( $copy_keys && substr($field->field_key, -1) == 2 ) {
119
-                $new_key = rtrim($new_key, 2);
117
+            $new_key = ( $copy_keys ) ? $field->field_key : '';
118
+            if ( $copy_keys && substr( $field->field_key, -1 ) == 2 ) {
119
+                $new_key = rtrim( $new_key, 2 );
120 120
             }
121 121
 
122 122
             $values = array();
@@ -139,11 +139,11 @@  discard block
 block discarded – undo
139 139
 				$values['form_id'] = $new_repeat_form_id;
140 140
 			}
141 141
 
142
-            $values = apply_filters('frm_duplicated_field', $values);
143
-            $new_id = self::create($values);
144
-            $frm_duplicate_ids[ $field->id ] = $new_id;
145
-            $frm_duplicate_ids[ $field->field_key ] = $new_id;
146
-            unset($field);
142
+            $values = apply_filters( 'frm_duplicated_field', $values );
143
+            $new_id = self::create( $values );
144
+            $frm_duplicate_ids[$field->id] = $new_id;
145
+            $frm_duplicate_ids[$field->field_key] = $new_id;
146
+            unset( $field );
147 147
         }
148 148
     }
149 149
 
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 			$values['field_key'] = FrmAppHelper::get_unique_key( $values['field_key'], $wpdb->prefix . 'frm_fields', 'field_key', $id );
157 157
 		}
158 158
 
159
-        if ( isset($values['required']) ) {
159
+        if ( isset( $values['required'] ) ) {
160 160
             $values['required'] = (int) $values['required'];
161 161
         }
162 162
 
@@ -168,8 +168,8 @@  discard block
 block discarded – undo
168 168
 
169 169
 		// serialize array values
170 170
 		foreach ( array( 'default_value', 'field_options', 'options' ) as $opt ) {
171
-			if ( isset( $values[ $opt ] ) && is_array( $values[ $opt ] ) ) {
172
-				$values[ $opt ] = serialize( $values[ $opt ] );
171
+			if ( isset( $values[$opt] ) && is_array( $values[$opt] ) ) {
172
+				$values[$opt] = serialize( $values[$opt] );
173 173
 			}
174 174
 		}
175 175
 
@@ -179,13 +179,13 @@  discard block
 block discarded – undo
179 179
 		if ( isset( $values['form_id'] ) ) {
180 180
             $form_id = absint( $values['form_id'] );
181 181
 		} else {
182
-            $field = self::getOne($id);
182
+            $field = self::getOne( $id );
183 183
             if ( $field ) {
184 184
                 $form_id = $field->form_id;
185 185
             }
186
-            unset($field);
186
+            unset( $field );
187 187
         }
188
-        unset($values);
188
+        unset( $values );
189 189
 
190 190
 		if ( $query_results ) {
191 191
             wp_cache_delete( $id, 'frm_field' );
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 
239 239
 		FrmAppHelper::cache_delete_group( 'frm_field' );
240 240
 
241
-        $form = FrmForm::getOne($form_id);
241
+        $form = FrmForm::getOne( $form_id );
242 242
         if ( $form && $form->parent_form_id && $form->parent_form_id != $form_id ) {
243 243
             self::delete_form_transient( $form->parent_form_id );
244 244
         }
@@ -260,16 +260,16 @@  discard block
 block discarded – undo
260 260
 
261 261
         global $wpdb;
262 262
 
263
-        $where = is_numeric($id) ? 'id=%d' : 'field_key=%s';
263
+        $where = is_numeric( $id ) ? 'id=%d' : 'field_key=%s';
264 264
 		$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->prefix . 'frm_fields WHERE ' . $where, $id );
265 265
 
266 266
         $results = FrmAppHelper::check_cache( $id, 'frm_field', $query, 'get_row', 0 );
267 267
 
268
-        if ( empty($results) ) {
268
+        if ( empty( $results ) ) {
269 269
             return $results;
270 270
         }
271 271
 
272
-        if ( is_numeric($id) ) {
272
+        if ( is_numeric( $id ) ) {
273 273
 			FrmAppHelper::set_cache( $results->field_key, $results, 'frm_field' );
274 274
         } else if ( $results ) {
275 275
 			FrmAppHelper::set_cache( $results->id, $results, 'frm_field' );
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
 
278 278
 		self::prepare_options( $results );
279 279
 
280
-        return stripslashes_deep($results);
280
+        return stripslashes_deep( $results );
281 281
     }
282 282
 
283 283
     /**
@@ -310,20 +310,20 @@  discard block
 block discarded – undo
310 310
                     continue;
311 311
                 }
312 312
 
313
-				$fields[ $result->id ] = $result;
314
-                $count++;
313
+				$fields[$result->id] = $result;
314
+                $count ++;
315 315
                 if ( $limit == 1 ) {
316 316
                     $fields = $result;
317 317
                     break;
318 318
                 }
319 319
 
320
-                if ( ! empty($limit) && $count >= $limit ) {
320
+                if ( ! empty( $limit ) && $count >= $limit ) {
321 321
                     break;
322 322
                 }
323 323
 
324
-                unset($result);
324
+                unset( $result );
325 325
             }
326
-            return stripslashes_deep($fields);
326
+            return stripslashes_deep( $fields );
327 327
         }
328 328
 
329 329
         self::$use_cache = false;
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
 		self::maybe_include_repeating_fields( $inc_sub, $where );
333 333
 		$results = self::getAll( $where, 'field_order', $limit );
334 334
         self::$use_cache = true;
335
-        self::include_sub_fields($results, $inc_sub, $type);
335
+        self::include_sub_fields( $results, $inc_sub, $type );
336 336
 
337 337
         return $results;
338 338
     }
@@ -344,15 +344,15 @@  discard block
 block discarded – undo
344 344
 
345 345
 		$results = self::get_fields_from_transients( $form_id, array( 'inc_embed' => $inc_embed, 'inc_repeat' => $inc_repeat ) );
346 346
 		if ( ! empty( $results ) ) {
347
-            if ( empty($limit) ) {
347
+            if ( empty( $limit ) ) {
348 348
 				return $results;
349 349
             }
350 350
 
351 351
             $fields = array();
352 352
             $count = 0;
353 353
             foreach ( $results as $result ) {
354
-				$fields[ $result->id ] = $result;
355
-                if ( ! empty($limit) && $count >= $limit ) {
354
+				$fields[$result->id] = $result;
355
+                if ( ! empty( $limit ) && $count >= $limit ) {
356 356
                     break;
357 357
                 }
358 358
             }
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
 
371 371
 		self::include_sub_fields( $results, $inc_embed, 'all' );
372 372
 
373
-        if ( empty($limit) ) {
373
+        if ( empty( $limit ) ) {
374 374
 			self::set_field_transient( $results, $form_id, 0, array( 'inc_embed' => $inc_embed, 'inc_repeat' => $inc_repeat ) );
375 375
         }
376 376
 
@@ -399,22 +399,22 @@  discard block
 block discarded – undo
399 399
         $form_fields = $results;
400 400
 		$index_offset = 1;
401 401
         foreach ( $form_fields as $k => $field ) {
402
-            if ( 'form' != $field->type || ! isset($field->field_options['form_select']) ) {
402
+            if ( 'form' != $field->type || ! isset( $field->field_options['form_select'] ) ) {
403 403
                 continue;
404 404
             }
405 405
 
406 406
             if ( $type == 'all' ) {
407 407
                 $sub_fields = self::get_all_for_form( $field->field_options['form_select'] );
408 408
             } else {
409
-                $sub_fields = self::get_all_types_in_form($field->form_id, $type);
409
+                $sub_fields = self::get_all_types_in_form( $field->form_id, $type );
410 410
             }
411 411
 
412
-            if ( ! empty($sub_fields) ) {
412
+            if ( ! empty( $sub_fields ) ) {
413 413
 				$index = $k + $index_offset;
414 414
 				$index_offset += count( $sub_fields );
415
-				array_splice($results, $index, 0, $sub_fields);
415
+				array_splice( $results, $index, 0, $sub_fields );
416 416
             }
417
-            unset($field, $sub_fields);
417
+            unset( $field, $sub_fields );
418 418
         }
419 419
     }
420 420
 
@@ -422,9 +422,9 @@  discard block
 block discarded – undo
422 422
 		$cache_key = maybe_serialize( $where ) . $order_by . 'l' . $limit . 'b' . $blog_id;
423 423
         if ( self::$use_cache ) {
424 424
             // make sure old cache doesn't get saved as a transient
425
-            $results = wp_cache_get($cache_key, 'frm_field');
425
+            $results = wp_cache_get( $cache_key, 'frm_field' );
426 426
             if ( false !== $results ) {
427
-                return stripslashes_deep($results);
427
+                return stripslashes_deep( $results );
428 428
             }
429 429
         }
430 430
 
@@ -449,16 +449,16 @@  discard block
 block discarded – undo
449 449
 			$order_by = ' ORDER BY ' . $order_by;
450 450
 		}
451 451
 
452
-        $limit = FrmAppHelper::esc_limit($limit);
452
+        $limit = FrmAppHelper::esc_limit( $limit );
453 453
 
454 454
         $query = "SELECT fi.*, fr.name as form_name  FROM {$table_name} fi LEFT OUTER JOIN {$form_table_name} fr ON fi.form_id=fr.id";
455 455
         $query_type = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'row' : 'results';
456 456
 
457
-        if ( is_array($where) ) {
457
+        if ( is_array( $where ) ) {
458 458
             $results = FrmDb::get_var( $table_name . ' fi LEFT OUTER JOIN ' . $form_table_name . ' fr ON fi.form_id=fr.id', $where, 'fi.*, fr.name as form_name', array( 'order_by' => $order_by, 'limit' => $limit ), '', $query_type );
459 459
 		} else {
460 460
 			// if the query is not an array, then it has already been prepared
461
-            $query .= FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
461
+            $query .= FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
462 462
 
463 463
 			$function_name = ( $query_type == 'row' ) ? 'get_row' : 'get_results';
464 464
 			$results = $wpdb->$function_name( $query );
@@ -481,9 +481,9 @@  discard block
 block discarded – undo
481 481
 				FrmAppHelper::set_cache( $result->id, $result, 'frm_field' );
482 482
 				FrmAppHelper::set_cache( $result->field_key, $result, 'frm_field' );
483 483
 
484
-				$results[ $r_key ]->field_options = maybe_unserialize( $result->field_options );
485
-				$results[ $r_key ]->options = maybe_unserialize( $result->options );
486
-				$results[ $r_key ]->default_value = maybe_unserialize( $result->default_value );
484
+				$results[$r_key]->field_options = maybe_unserialize( $result->field_options );
485
+				$results[$r_key]->options = maybe_unserialize( $result->options );
486
+				$results[$r_key]->default_value = maybe_unserialize( $result->default_value );
487 487
 
488 488
 				unset( $r_key, $result );
489 489
 			}
@@ -502,8 +502,8 @@  discard block
 block discarded – undo
502 502
 	private static function prepare_options( &$results ) {
503 503
 		$results->field_options = maybe_unserialize( $results->field_options );
504 504
 
505
-		$results->options = maybe_unserialize($results->options);
506
-		$results->default_value = maybe_unserialize($results->default_value);
505
+		$results->options = maybe_unserialize( $results->options );
506
+		$results->default_value = maybe_unserialize( $results->default_value );
507 507
 	}
508 508
 
509 509
 	/**
@@ -530,7 +530,7 @@  discard block
 block discarded – undo
530 530
 
531 531
 			if ( count( $next_fields ) >= self::$transient_size ) {
532 532
 				// if this transient is full, check for another
533
-				$next++;
533
+				$next ++;
534 534
 				self::get_next_transient( $fields, $base_name, $next );
535 535
 			}
536 536
 		}
@@ -556,7 +556,7 @@  discard block
 block discarded – undo
556 556
 				return;
557 557
 			}
558 558
 
559
-			$next++;
559
+			$next ++;
560 560
 		}
561 561
 	}
562 562
 
@@ -586,8 +586,8 @@  discard block
 block discarded – undo
586 586
 			$is_multi_value_field = (
587 587
 				$field['type'] == 'checkbox' ||
588 588
 				$field['type'] == 'address' ||
589
-				( $field['type'] == 'data' && isset($field['data_type']) && $field['data_type'] == 'checkbox' ) ||
590
-				( $field['type'] == 'lookup' && isset($field['data_type']) && $field['data_type'] == 'checkbox' ) ||
589
+				( $field['type'] == 'data' && isset( $field['data_type'] ) && $field['data_type'] == 'checkbox' ) ||
590
+				( $field['type'] == 'lookup' && isset( $field['data_type'] ) && $field['data_type'] == 'checkbox' ) ||
591 591
 				self::is_multiple_select( $field )
592 592
 			);
593 593
 
@@ -612,9 +612,9 @@  discard block
 block discarded – undo
612 612
 	 */
613 613
 	public static function is_multiple_select( $field ) {
614 614
 		if ( is_array( $field ) ) {
615
-			return self::is_option_true( $field, 'multiple' ) && ( ( $field['type'] == 'select' || ( $field['type'] == 'data' && isset( $field['data_type'] ) && $field['data_type'] == 'select') ) );
615
+			return self::is_option_true( $field, 'multiple' ) && ( ( $field['type'] == 'select' || ( $field['type'] == 'data' && isset( $field['data_type'] ) && $field['data_type'] == 'select' ) ) );
616 616
 		} else {
617
-			return self::is_option_true( $field, 'multiple' ) && ( ( $field->type == 'select' || ( $field->type == 'data' && isset($field->field_options['data_type'] ) && $field->field_options['data_type'] == 'select') ) );
617
+			return self::is_option_true( $field, 'multiple' ) && ( ( $field->type == 'select' || ( $field->type == 'data' && isset( $field->field_options['data_type'] ) && $field->field_options['data_type'] == 'select' ) ) );
618 618
 		}
619 619
 	}
620 620
 
@@ -661,23 +661,23 @@  discard block
 block discarded – undo
661 661
 	}
662 662
 
663 663
 	public static function is_option_true_in_array( $field, $option ) {
664
-		return isset( $field[ $option ] ) && $field[ $option ];
664
+		return isset( $field[$option] ) && $field[$option];
665 665
 	}
666 666
 
667 667
 	public static function is_option_true_in_object( $field, $option ) {
668
-		return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ];
668
+		return isset( $field->field_options[$option] ) && $field->field_options[$option];
669 669
 	}
670 670
 
671 671
 	public static function is_option_empty_in_array( $field, $option ) {
672
-		return ! isset( $field[ $option ] ) || empty( $field[ $option ] );
672
+		return ! isset( $field[$option] ) || empty( $field[$option] );
673 673
 	}
674 674
 
675 675
 	public static function is_option_empty_in_object( $field, $option ) {
676
-		return ! isset( $field->field_options[ $option ] ) || empty( $field->field_options[ $option ] );
676
+		return ! isset( $field->field_options[$option] ) || empty( $field->field_options[$option] );
677 677
 	}
678 678
 
679 679
 	public static function is_option_value_in_object( $field, $option ) {
680
-		return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ] != '';
680
+		return isset( $field->field_options[$option] ) && $field->field_options[$option] != '';
681 681
 	}
682 682
 
683 683
 	/**
@@ -693,11 +693,11 @@  discard block
 block discarded – undo
693 693
 	}
694 694
 
695 695
 	public static function get_option_in_array( $field, $option ) {
696
-		return $field[ $option ];
696
+		return $field[$option];
697 697
 	}
698 698
 
699 699
 	public static function get_option_in_object( $field, $option ) {
700
-		return isset( $field->field_options[ $option ] ) ? $field->field_options[ $option ] : '';
700
+		return isset( $field->field_options[$option] ) ? $field->field_options[$option] : '';
701 701
 	}
702 702
 
703 703
 	/**
Please login to merge, or discard this patch.
classes/models/FrmEntryValidate.php 2 patches
Indentation   +92 added lines, -92 removed lines patch added patch discarded remove patch
@@ -1,18 +1,18 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 class FrmEntryValidate {
4
-    public static function validate( $values, $exclude = false ) {
5
-        FrmEntry::sanitize_entry_post( $values );
6
-        $errors = array();
4
+	public static function validate( $values, $exclude = false ) {
5
+		FrmEntry::sanitize_entry_post( $values );
6
+		$errors = array();
7 7
 
8
-        if ( ! isset($values['form_id']) || ! isset($values['item_meta']) ) {
9
-            $errors['form'] = __( 'There was a problem with your submission. Please try again.', 'formidable' );
10
-            return $errors;
11
-        }
8
+		if ( ! isset($values['form_id']) || ! isset($values['item_meta']) ) {
9
+			$errors['form'] = __( 'There was a problem with your submission. Please try again.', 'formidable' );
10
+			return $errors;
11
+		}
12 12
 
13 13
 		if ( FrmAppHelper::is_admin() && is_user_logged_in() && ( ! isset( $values[ 'frm_submit_entry_' . $values['form_id'] ] ) || ! wp_verify_nonce( $values[ 'frm_submit_entry_' . $values['form_id'] ], 'frm_submit_entry_nonce' ) ) ) {
14
-            $errors['form'] = __( 'You do not have permission to do that', 'formidable' );
15
-        }
14
+			$errors['form'] = __( 'You do not have permission to do that', 'formidable' );
15
+		}
16 16
 
17 17
 		self::set_item_key( $values );
18 18
 
@@ -69,24 +69,24 @@  discard block
 block discarded – undo
69 69
 		return FrmField::getAll( $where, 'field_order' );
70 70
 	}
71 71
 
72
-    public static function validate_field( $posted_field, &$errors, $values, $args = array() ) {
73
-        $defaults = array(
74
-            'id'              => $posted_field->id,
75
-            'parent_field_id' => '', // the id of the repeat or embed form
76
-            'key_pointer'     => '', // the pointer in the posted array
77
-            'exclude'         => array(), // exclude these field types from validation
78
-        );
79
-        $args = wp_parse_args( $args, $defaults );
72
+	public static function validate_field( $posted_field, &$errors, $values, $args = array() ) {
73
+		$defaults = array(
74
+			'id'              => $posted_field->id,
75
+			'parent_field_id' => '', // the id of the repeat or embed form
76
+			'key_pointer'     => '', // the pointer in the posted array
77
+			'exclude'         => array(), // exclude these field types from validation
78
+		);
79
+		$args = wp_parse_args( $args, $defaults );
80 80
 
81
-        if ( empty($args['parent_field_id']) ) {
81
+		if ( empty($args['parent_field_id']) ) {
82 82
 			$value = isset( $values['item_meta'][ $args['id'] ] ) ? $values['item_meta'][ $args['id'] ] : '';
83
-        } else {
84
-            // value is from a nested form
85
-            $value = $values;
86
-        }
83
+		} else {
84
+			// value is from a nested form
85
+			$value = $values;
86
+		}
87 87
 
88
-        // Check for values in "Other" fields
89
-        FrmEntriesHelper::maybe_set_other_validation( $posted_field, $value, $args );
88
+		// Check for values in "Other" fields
89
+		FrmEntriesHelper::maybe_set_other_validation( $posted_field, $value, $args );
90 90
 
91 91
 		self::maybe_clear_value_for_default_blank_setting( $posted_field, $value );
92 92
 
@@ -95,11 +95,11 @@  discard block
 block discarded – undo
95 95
 			$value = reset($value);
96 96
 		}
97 97
 
98
-        if ( $posted_field->required == '1' && ! is_array( $value ) && trim( $value ) == '' ) {
98
+		if ( $posted_field->required == '1' && ! is_array( $value ) && trim( $value ) == '' ) {
99 99
 			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
100
-        } else if ( $posted_field->type == 'text' && ! isset( $_POST['item_name'] ) ) {
101
-            $_POST['item_name'] = $value;
102
-        }
100
+		} else if ( $posted_field->type == 'text' && ! isset( $_POST['item_name'] ) ) {
101
+			$_POST['item_name'] = $value;
102
+		}
103 103
 
104 104
 		if ( $value != '' ) {
105 105
 			self::validate_url_field( $errors, $posted_field, $value, $args );
@@ -108,13 +108,13 @@  discard block
 block discarded – undo
108 108
 			self::validate_phone_field( $errors, $posted_field, $value, $args );
109 109
 		}
110 110
 
111
-        FrmEntriesHelper::set_posted_value($posted_field, $value, $args);
111
+		FrmEntriesHelper::set_posted_value($posted_field, $value, $args);
112 112
 
113
-        self::validate_recaptcha($errors, $posted_field, $args);
113
+		self::validate_recaptcha($errors, $posted_field, $args);
114 114
 
115 115
 		$errors = apply_filters( 'frm_validate_' . $posted_field->type . '_field_entry', $errors, $posted_field, $value, $args );
116 116
 		$errors = apply_filters( 'frm_validate_field_entry', $errors, $posted_field, $value, $args );
117
-    }
117
+	}
118 118
 
119 119
 	private static function maybe_clear_value_for_default_blank_setting( $field, &$value ) {
120 120
 		if ( FrmField::is_option_true_in_object( $field, 'default_blank' ) && $value == $field->default_value ) {
@@ -124,32 +124,32 @@  discard block
 block discarded – undo
124 124
 
125 125
 	public static function validate_url_field( &$errors, $field, &$value, $args ) {
126 126
 		if ( $value == '' || ! in_array( $field->type, array( 'website', 'url', 'image' ) ) ) {
127
-            return;
128
-        }
127
+			return;
128
+		}
129 129
 
130
-        if ( trim($value) == 'http://' ) {
131
-            $value = '';
132
-        } else {
133
-            $value = esc_url_raw( $value );
130
+		if ( trim($value) == 'http://' ) {
131
+			$value = '';
132
+		} else {
133
+			$value = esc_url_raw( $value );
134 134
 			$value = preg_match( '/^(https?|ftps?|mailto|news|feed|telnet):/is', $value ) ? $value : 'http://' . $value;
135
-        }
135
+		}
136 136
 
137
-        // validate the url format
137
+		// validate the url format
138 138
 		if ( ! preg_match('/^http(s)?:\/\/(?:localhost|(?:[\da-z\.-]+\.[\da-z\.-]+))/i', $value) ) {
139 139
 			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
140 140
 		}
141
-    }
141
+	}
142 142
 
143 143
 	public static function validate_email_field( &$errors, $field, $value, $args ) {
144
-        if ( $value == '' || $field->type != 'email' ) {
145
-            return;
146
-        }
144
+		if ( $value == '' || $field->type != 'email' ) {
145
+			return;
146
+		}
147 147
 
148
-        //validate the email format
149
-        if ( ! is_email($value) ) {
148
+		//validate the email format
149
+		if ( ! is_email($value) ) {
150 150
 			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
151
-        }
152
-    }
151
+		}
152
+	}
153 153
 
154 154
 	public static function validate_number_field( &$errors, $field, $value, $args ) {
155 155
 		//validate the number format
@@ -243,9 +243,9 @@  discard block
 block discarded – undo
243 243
 	}
244 244
 
245 245
 	public static function validate_recaptcha( &$errors, $field, $args ) {
246
-        if ( $field->type != 'captcha' || FrmAppHelper::is_admin() || apply_filters( 'frm_is_field_hidden', false, $field, stripslashes_deep( $_POST ) ) ) {
247
-            return;
248
-        }
246
+		if ( $field->type != 'captcha' || FrmAppHelper::is_admin() || apply_filters( 'frm_is_field_hidden', false, $field, stripslashes_deep( $_POST ) ) ) {
247
+			return;
248
+		}
249 249
 
250 250
 		$frm_settings = FrmAppHelper::get_settings();
251 251
 		if ( empty( $frm_settings->pubkey ) ) {
@@ -253,61 +253,61 @@  discard block
 block discarded – undo
253 253
 			return;
254 254
 		}
255 255
 
256
-        if ( ! isset($_POST['g-recaptcha-response']) ) {
257
-            // If captcha is missing, check if it was already verified
256
+		if ( ! isset($_POST['g-recaptcha-response']) ) {
257
+			// If captcha is missing, check if it was already verified
258 258
 			if ( ! isset( $_POST['recaptcha_checked'] ) || ! wp_verify_nonce( $_POST['recaptcha_checked'], 'frm_ajax' ) ) {
259
-                // There was no captcha submitted
259
+				// There was no captcha submitted
260 260
 				$errors[ 'field' . $args['id'] ] = __( 'The captcha is missing from this form', 'formidable' );
261
-            }
262
-            return;
263
-        }
261
+			}
262
+			return;
263
+		}
264 264
 
265
-        $arg_array = array(
266
-            'body'      => array(
265
+		$arg_array = array(
266
+			'body'      => array(
267 267
 				'secret'   => $frm_settings->privkey,
268 268
 				'response' => $_POST['g-recaptcha-response'],
269 269
 				'remoteip' => FrmAppHelper::get_ip_address(),
270 270
 			),
271 271
 		);
272
-        $resp = wp_remote_post( 'https://www.google.com/recaptcha/api/siteverify', $arg_array );
273
-        $response = json_decode(wp_remote_retrieve_body( $resp ), true);
272
+		$resp = wp_remote_post( 'https://www.google.com/recaptcha/api/siteverify', $arg_array );
273
+		$response = json_decode(wp_remote_retrieve_body( $resp ), true);
274 274
 
275
-        if ( isset( $response['success'] ) && ! $response['success'] ) {
276
-            // What happens when the CAPTCHA was entered incorrectly
275
+		if ( isset( $response['success'] ) && ! $response['success'] ) {
276
+			// What happens when the CAPTCHA was entered incorrectly
277 277
 			$errors[ 'field' . $args['id'] ] = ( ! isset( $field->field_options['invalid'] ) || $field->field_options['invalid'] == '' ) ? $frm_settings->re_msg : $field->field_options['invalid'];
278
-        } else if ( is_wp_error( $resp ) ) {
278
+		} else if ( is_wp_error( $resp ) ) {
279 279
 			$error_string = $resp->get_error_message();
280 280
 			$errors[ 'field' . $args['id'] ] = __( 'There was a problem verifying your recaptcha', 'formidable' );
281 281
 			$errors[ 'field' . $args['id'] ] .= ' ' . $error_string;
282
-        }
283
-    }
284
-
285
-    /**
286
-     * check for spam
287
-     * @param boolean $exclude
288
-     * @param array $values
289
-     * @param array $errors by reference
290
-     */
291
-    public static function spam_check( $exclude, $values, &$errors ) {
292
-        if ( ! empty( $exclude ) || ! isset( $values['item_meta'] ) || empty( $values['item_meta'] ) || ! empty( $errors ) ) {
293
-            // only check spam if there are no other errors
294
-            return;
295
-        }
282
+		}
283
+	}
284
+
285
+	/**
286
+	 * check for spam
287
+	 * @param boolean $exclude
288
+	 * @param array $values
289
+	 * @param array $errors by reference
290
+	 */
291
+	public static function spam_check( $exclude, $values, &$errors ) {
292
+		if ( ! empty( $exclude ) || ! isset( $values['item_meta'] ) || empty( $values['item_meta'] ) || ! empty( $errors ) ) {
293
+			// only check spam if there are no other errors
294
+			return;
295
+		}
296 296
 
297 297
 		if ( self::is_honeypot_spam() || self::is_spam_bot() ) {
298 298
 			$errors['spam'] = __( 'Your entry appears to be spam!', 'formidable' );
299 299
 		}
300 300
 
301
-    	if ( self::blacklist_check( $values ) ) {
302
-            $errors['spam'] = __( 'Your entry appears to be blacklist spam!', 'formidable' );
303
-    	}
301
+		if ( self::blacklist_check( $values ) ) {
302
+			$errors['spam'] = __( 'Your entry appears to be blacklist spam!', 'formidable' );
303
+		}
304 304
 
305
-        if ( self::is_akismet_spam( $values ) ) {
305
+		if ( self::is_akismet_spam( $values ) ) {
306 306
 			if ( self::is_akismet_enabled_for_user( $values['form_id'] ) ) {
307 307
 				$errors['spam'] = __( 'Your entry appears to be spam!', 'formidable' );
308 308
 			}
309
-	    }
310
-    }
309
+		}
310
+	}
311 311
 
312 312
 	private static function is_honeypot_spam() {
313 313
 		$honeypot_value = FrmAppHelper::get_param( 'frm_verify', '', 'get', 'sanitize_text_field' );
@@ -329,15 +329,15 @@  discard block
 block discarded – undo
329 329
 		return ( isset( $form->options['akismet'] ) && ! empty( $form->options['akismet'] ) && ( $form->options['akismet'] != 'logged' || ! is_user_logged_in() ) );
330 330
 	}
331 331
 
332
-    public static function blacklist_check( $values ) {
333
-        if ( ! apply_filters('frm_check_blacklist', true, $values) ) {
334
-            return false;
335
-        }
332
+	public static function blacklist_check( $values ) {
333
+		if ( ! apply_filters('frm_check_blacklist', true, $values) ) {
334
+			return false;
335
+		}
336 336
 
337
-    	$mod_keys = trim( get_option( 'blacklist_keys' ) );
338
-    	if ( empty( $mod_keys ) ) {
339
-    		return false;
340
-    	}
337
+		$mod_keys = trim( get_option( 'blacklist_keys' ) );
338
+		if ( empty( $mod_keys ) ) {
339
+			return false;
340
+		}
341 341
 
342 342
 		$content = FrmEntriesHelper::entry_array_to_string( $values );
343 343
 		if ( empty( $content ) ) {
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
 		$user_info = self::get_spam_check_user_info( $values );
350 350
 
351 351
 		return wp_blacklist_check( $user_info['comment_author'], $user_info['comment_author_email'], $user_info['comment_author_url'], $content, $ip, $user_agent );
352
-    }
352
+	}
353 353
 
354 354
 	/**
355 355
 	 * Check entries for Akismet spam
Please login to merge, or discard this patch.
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -5,12 +5,12 @@  discard block
 block discarded – undo
5 5
         FrmEntry::sanitize_entry_post( $values );
6 6
         $errors = array();
7 7
 
8
-        if ( ! isset($values['form_id']) || ! isset($values['item_meta']) ) {
8
+        if ( ! isset( $values['form_id'] ) || ! isset( $values['item_meta'] ) ) {
9 9
             $errors['form'] = __( 'There was a problem with your submission. Please try again.', 'formidable' );
10 10
             return $errors;
11 11
         }
12 12
 
13
-		if ( FrmAppHelper::is_admin() && is_user_logged_in() && ( ! isset( $values[ 'frm_submit_entry_' . $values['form_id'] ] ) || ! wp_verify_nonce( $values[ 'frm_submit_entry_' . $values['form_id'] ], 'frm_submit_entry_nonce' ) ) ) {
13
+		if ( FrmAppHelper::is_admin() && is_user_logged_in() && ( ! isset( $values['frm_submit_entry_' . $values['form_id']] ) || ! wp_verify_nonce( $values['frm_submit_entry_' . $values['form_id']], 'frm_submit_entry_nonce' ) ) ) {
14 14
             $errors['form'] = __( 'You do not have permission to do that', 'formidable' );
15 15
         }
16 16
 
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
67 67
         );
68 68
         $args = wp_parse_args( $args, $defaults );
69 69
 
70
-        if ( empty($args['parent_field_id']) ) {
71
-			$value = isset( $values['item_meta'][ $args['id'] ] ) ? $values['item_meta'][ $args['id'] ] : '';
70
+        if ( empty( $args['parent_field_id'] ) ) {
71
+			$value = isset( $values['item_meta'][$args['id']] ) ? $values['item_meta'][$args['id']] : '';
72 72
         } else {
73 73
             // value is from a nested form
74 74
             $value = $values;
@@ -80,12 +80,12 @@  discard block
 block discarded – undo
80 80
 		self::maybe_clear_value_for_default_blank_setting( $posted_field, $value );
81 81
 
82 82
 		// Reset arrays with only one value if it's not a field where array keys need to be preserved
83
-		if ( is_array($value) && count( $value ) == 1 && isset( $value[0] ) ) {
84
-			$value = reset($value);
83
+		if ( is_array( $value ) && count( $value ) == 1 && isset( $value[0] ) ) {
84
+			$value = reset( $value );
85 85
 		}
86 86
 
87 87
         if ( $posted_field->required == '1' && ! is_array( $value ) && trim( $value ) == '' ) {
88
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
88
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
89 89
         } else if ( $posted_field->type == 'text' && ! isset( $_POST['item_name'] ) ) {
90 90
             $_POST['item_name'] = $value;
91 91
         }
@@ -97,9 +97,9 @@  discard block
 block discarded – undo
97 97
 			self::validate_phone_field( $errors, $posted_field, $value, $args );
98 98
 		}
99 99
 
100
-        FrmEntriesHelper::set_posted_value($posted_field, $value, $args);
100
+        FrmEntriesHelper::set_posted_value( $posted_field, $value, $args );
101 101
 
102
-        self::validate_recaptcha($errors, $posted_field, $args);
102
+        self::validate_recaptcha( $errors, $posted_field, $args );
103 103
 
104 104
 		$errors = apply_filters( 'frm_validate_' . $posted_field->type . '_field_entry', $errors, $posted_field, $value, $args );
105 105
 		$errors = apply_filters( 'frm_validate_field_entry', $errors, $posted_field, $value, $args );
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
             return;
117 117
         }
118 118
 
119
-        if ( trim($value) == 'http://' ) {
119
+        if ( trim( $value ) == 'http://' ) {
120 120
             $value = '';
121 121
         } else {
122 122
             $value = esc_url_raw( $value );
@@ -124,8 +124,8 @@  discard block
 block discarded – undo
124 124
         }
125 125
 
126 126
         // validate the url format
127
-		if ( ! preg_match('/^http(s)?:\/\/(?:localhost|(?:[\da-z\.-]+\.[\da-z\.-]+))/i', $value) ) {
128
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
127
+		if ( ! preg_match( '/^http(s)?:\/\/(?:localhost|(?:[\da-z\.-]+\.[\da-z\.-]+))/i', $value ) ) {
128
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
129 129
 		}
130 130
     }
131 131
 
@@ -135,8 +135,8 @@  discard block
 block discarded – undo
135 135
         }
136 136
 
137 137
         //validate the email format
138
-        if ( ! is_email($value) ) {
139
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
138
+        if ( ! is_email( $value ) ) {
139
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
140 140
         }
141 141
     }
142 142
 
@@ -146,8 +146,8 @@  discard block
 block discarded – undo
146 146
 			return;
147 147
 		}
148 148
 
149
-		if ( ! is_numeric( $value) ) {
150
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
149
+		if ( ! is_numeric( $value ) ) {
150
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
151 151
 		}
152 152
 
153 153
 		// validate number settings
@@ -157,9 +157,9 @@  discard block
 block discarded – undo
157 157
 			if ( $frm_settings->use_html && isset( $field->field_options['minnum'] ) && isset( $field->field_options['maxnum'] ) ) {
158 158
 				//minnum maxnum
159 159
 				if ( (float) $value < $field->field_options['minnum'] ) {
160
-					$errors[ 'field' . $args['id'] ] = __( 'Please select a higher number', 'formidable' );
160
+					$errors['field' . $args['id']] = __( 'Please select a higher number', 'formidable' );
161 161
 				} else if ( (float) $value > $field->field_options['maxnum'] ) {
162
-					$errors[ 'field' . $args['id'] ] = __( 'Please select a lower number', 'formidable' );
162
+					$errors['field' . $args['id']] = __( 'Please select a lower number', 'formidable' );
163 163
 				}
164 164
 			}
165 165
 		}
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 			$pattern = self::phone_format( $field );
172 172
 
173 173
 			if ( ! preg_match( $pattern, $value ) ) {
174
-				$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
174
+				$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
175 175
 			}
176 176
 		}
177 177
 	}
@@ -242,11 +242,11 @@  discard block
 block discarded – undo
242 242
 			return;
243 243
 		}
244 244
 
245
-        if ( ! isset($_POST['g-recaptcha-response']) ) {
245
+        if ( ! isset( $_POST['g-recaptcha-response'] ) ) {
246 246
             // If captcha is missing, check if it was already verified
247 247
 			if ( ! isset( $_POST['recaptcha_checked'] ) || ! wp_verify_nonce( $_POST['recaptcha_checked'], 'frm_ajax' ) ) {
248 248
                 // There was no captcha submitted
249
-				$errors[ 'field' . $args['id'] ] = __( 'The captcha is missing from this form', 'formidable' );
249
+				$errors['field' . $args['id']] = __( 'The captcha is missing from this form', 'formidable' );
250 250
             }
251 251
             return;
252 252
         }
@@ -259,15 +259,15 @@  discard block
 block discarded – undo
259 259
 			),
260 260
 		);
261 261
         $resp = wp_remote_post( 'https://www.google.com/recaptcha/api/siteverify', $arg_array );
262
-        $response = json_decode(wp_remote_retrieve_body( $resp ), true);
262
+        $response = json_decode( wp_remote_retrieve_body( $resp ), true );
263 263
 
264 264
         if ( isset( $response['success'] ) && ! $response['success'] ) {
265 265
             // What happens when the CAPTCHA was entered incorrectly
266
-			$errors[ 'field' . $args['id'] ] = ( ! isset( $field->field_options['invalid'] ) || $field->field_options['invalid'] == '' ) ? $frm_settings->re_msg : $field->field_options['invalid'];
266
+			$errors['field' . $args['id']] = ( ! isset( $field->field_options['invalid'] ) || $field->field_options['invalid'] == '' ) ? $frm_settings->re_msg : $field->field_options['invalid'];
267 267
         } else if ( is_wp_error( $resp ) ) {
268 268
 			$error_string = $resp->get_error_message();
269
-			$errors[ 'field' . $args['id'] ] = __( 'There was a problem verifying your recaptcha', 'formidable' );
270
-			$errors[ 'field' . $args['id'] ] .= ' ' . $error_string;
269
+			$errors['field' . $args['id']] = __( 'There was a problem verifying your recaptcha', 'formidable' );
270
+			$errors['field' . $args['id']] .= ' ' . $error_string;
271 271
         }
272 272
     }
273 273
 
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 
311 311
 	private static function is_akismet_spam( $values ) {
312 312
 		global $wpcom_api_key;
313
-		return ( is_callable('Akismet::http_post') && ( get_option('wordpress_api_key') || $wpcom_api_key ) && self::akismet( $values ) );
313
+		return ( is_callable( 'Akismet::http_post' ) && ( get_option( 'wordpress_api_key' ) || $wpcom_api_key ) && self::akismet( $values ) );
314 314
 	}
315 315
 
316 316
 	private static function is_akismet_enabled_for_user( $form_id ) {
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 	}
320 320
 
321 321
     public static function blacklist_check( $values ) {
322
-        if ( ! apply_filters('frm_check_blacklist', true, $values) ) {
322
+        if ( ! apply_filters( 'frm_check_blacklist', true, $values ) ) {
323 323
             return false;
324 324
         }
325 325
 
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 		$datas['user_agent'] = FrmAppHelper::get_server_value( 'HTTP_USER_AGENT' );
376 376
 		$datas['referrer'] = isset( $_SERVER['HTTP_REFERER'] ) ? FrmAppHelper::get_server_value( 'HTTP_REFERER' ) : false;
377 377
 		$datas['blog_lang'] = get_locale();
378
-		$datas['blog_charset'] = get_option('blog_charset');
378
+		$datas['blog_charset'] = get_option( 'blog_charset' );
379 379
 
380 380
 		if ( akismet_test_mode() ) {
381 381
 			$datas['is_test'] = 'true';
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
 
430 430
 			// Send any potentially useful $_SERVER vars, but avoid sending junk we don't need.
431 431
 			if ( $include_value ) {
432
-				$datas[ $key ] = $value;
432
+				$datas[$key] = $value;
433 433
 			}
434 434
 			unset( $key, $value );
435 435
 		}
Please login to merge, or discard this patch.