Completed
Pull Request — master (#549)
by Stephanie
45s
created
classes/models/FrmInbox.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 			return;
85 85
 		}
86 86
 
87
-		if ( isset( $this->messages[ $message['key'] ] ) && ! isset( $message['force'] ) ) {
87
+		if ( isset( $this->messages[$message['key']] ) && ! isset( $message['force'] ) ) {
88 88
 			// Don't replace messages unless required.
89 89
 			return;
90 90
 		}
@@ -93,13 +93,13 @@  discard block
 block discarded – undo
93 93
 			return;
94 94
 		}
95 95
 
96
-		if ( isset( $this->messages[ $message['key'] ] ) ) {
96
+		if ( isset( $this->messages[$message['key']] ) ) {
97 97
 			// Move up and mark as new.
98
-			unset( $this->messages[ $message['key'] ] );
98
+			unset( $this->messages[$message['key']] );
99 99
 		}
100 100
 
101 101
 		$this->fill_message( $message );
102
-		$this->messages[ $message['key'] ] = $message;
102
+		$this->messages[$message['key']] = $message;
103 103
 
104 104
 		$this->update_list();
105 105
 
@@ -127,11 +127,11 @@  discard block
 block discarded – undo
127 127
 	private function clean_messages() {
128 128
 		$removed  = false;
129 129
 		foreach ( $this->messages as $t => $message ) {
130
-			$read    = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][ get_current_user_id() ] ) && $message['read'][ get_current_user_id() ] < strtotime( '-1 month' );
131
-			$dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][ get_current_user_id() ] ) && $message['dismissed'][ get_current_user_id() ] < strtotime( '-1 week' );
130
+			$read    = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][get_current_user_id()] ) && $message['read'][get_current_user_id()] < strtotime( '-1 month' );
131
+			$dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][get_current_user_id()] ) && $message['dismissed'][get_current_user_id()] < strtotime( '-1 week' );
132 132
 			$expired = $this->is_expired( $message );
133 133
 			if ( $read || $expired || $dismissed ) {
134
-				unset( $this->messages[ $t ] );
134
+				unset( $this->messages[$t] );
135 135
 				$removed = true;
136 136
 			}
137 137
 		}
@@ -144,11 +144,11 @@  discard block
 block discarded – undo
144 144
 	private function filter_messages( &$messages ) {
145 145
 		$user_id = get_current_user_id();
146 146
 		foreach ( $messages as $k => $message ) {
147
-			$dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][ $user_id ] );
147
+			$dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][$user_id] );
148 148
 			if ( empty( $k ) || $this->is_expired( $message ) || $dismissed ) {
149
-				unset( $messages[ $k ] );
149
+				unset( $messages[$k] );
150 150
 			} elseif ( ! $this->is_for_user( $message ) ) {
151
-				unset( $messages[ $k ] );
151
+				unset( $messages[$k] );
152 152
 			}
153 153
 		}
154 154
 		$messages = apply_filters( 'frm_filter_inbox', $messages );
@@ -181,14 +181,14 @@  discard block
 block discarded – undo
181 181
 	 * @param string $key
182 182
 	 */
183 183
 	public function mark_read( $key ) {
184
-		if ( ! $key || ! isset( $this->messages[ $key ] ) ) {
184
+		if ( ! $key || ! isset( $this->messages[$key] ) ) {
185 185
 			return;
186 186
 		}
187 187
 
188
-		if ( ! isset( $this->messages[ $key ]['read'] ) ) {
189
-			$this->messages[ $key ]['read'] = array();
188
+		if ( ! isset( $this->messages[$key]['read'] ) ) {
189
+			$this->messages[$key]['read'] = array();
190 190
 		}
191
-		$this->messages[ $key ]['read'][ get_current_user_id() ] = time();
191
+		$this->messages[$key]['read'][get_current_user_id()] = time();
192 192
 
193 193
 		$this->update_list();
194 194
 	}
@@ -199,9 +199,9 @@  discard block
 block discarded – undo
199 199
 	 * @since 4.05.02
200 200
 	 */
201 201
 	public function mark_unread( $key ) {
202
-		$is_read = isset( $this->messages[ $key ] ) && isset( $this->messages[ $key ]['read'] ) && isset( $this->messages[ $key ]['read'][ get_current_user_id() ] );
202
+		$is_read = isset( $this->messages[$key] ) && isset( $this->messages[$key]['read'] ) && isset( $this->messages[$key]['read'][get_current_user_id()] );
203 203
 		if ( $is_read ) {
204
-			unset( $this->messages[ $key ]['read'][ get_current_user_id() ] );
204
+			unset( $this->messages[$key]['read'][get_current_user_id()] );
205 205
 			$this->update_list();
206 206
 		}
207 207
 	}
@@ -215,14 +215,14 @@  discard block
 block discarded – undo
215 215
 			return;
216 216
 		}
217 217
 
218
-		if ( ! isset( $this->messages[ $key ] ) ) {
218
+		if ( ! isset( $this->messages[$key] ) ) {
219 219
 			return;
220 220
 		}
221 221
 
222
-		if ( ! isset( $this->messages[ $key ]['dismissed'] ) ) {
223
-			$this->messages[ $key ]['dismissed'] = array();
222
+		if ( ! isset( $this->messages[$key]['dismissed'] ) ) {
223
+			$this->messages[$key]['dismissed'] = array();
224 224
 		}
225
-		$this->messages[ $key ]['dismissed'][ get_current_user_id() ] = time();
225
+		$this->messages[$key]['dismissed'][get_current_user_id()] = time();
226 226
 
227 227
 		$this->update_list();
228 228
 	}
@@ -234,11 +234,11 @@  discard block
 block discarded – undo
234 234
 		$user_id = get_current_user_id();
235 235
 		foreach ( $this->messages as $key => $message ) {
236 236
 			if ( ! isset( $message['dismissed'] ) ) {
237
-				$this->messages[ $key ]['dismissed'] = array();
237
+				$this->messages[$key]['dismissed'] = array();
238 238
 			}
239 239
 
240
-			if ( ! isset( $message['dismissed'][ $user_id ] ) ) {
241
-				$this->messages[ $key ]['dismissed'][ $user_id ] = time();
240
+			if ( ! isset( $message['dismissed'][$user_id] ) ) {
241
+				$this->messages[$key]['dismissed'][$user_id] = time();
242 242
 			}
243 243
 		}
244 244
 		$this->update_list();
@@ -248,8 +248,8 @@  discard block
 block discarded – undo
248 248
 		$messages = $this->get_messages( 'filter' );
249 249
 		$user_id  = get_current_user_id();
250 250
 		foreach ( $messages as $t => $message ) {
251
-			if ( isset( $message['read'] ) && isset( $message['read'][ $user_id ] ) ) {
252
-				unset( $messages[ $t ] );
251
+			if ( isset( $message['read'] ) && isset( $message['read'][$user_id] ) ) {
252
+				unset( $messages[$t] );
253 253
 			}
254 254
 		}
255 255
 		return $messages;
@@ -273,8 +273,8 @@  discard block
 block discarded – undo
273 273
 	 * @since 4.05.02
274 274
 	 */
275 275
 	public function remove( $key ) {
276
-		if ( isset( $this->messages[ $key ] ) ) {
277
-			unset( $this->messages[ $key ] );
276
+		if ( isset( $this->messages[$key] ) ) {
277
+			unset( $this->messages[$key] );
278 278
 			$this->update_list();
279 279
 		}
280 280
 	}
Please login to merge, or discard this patch.
classes/factories/FrmFieldFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@
 block discarded – undo
102 102
 			'name'     => 'FrmFieldName',
103 103
 		);
104 104
 
105
-		$class = isset( $type_classes[ $field_type ] ) ? $type_classes[ $field_type ] : '';
105
+		$class = isset( $type_classes[$field_type] ) ? $type_classes[$field_type] : '';
106 106
 
107 107
 		return apply_filters( 'frm_get_field_type_class', $class, $field_type );
108 108
 	}
Please login to merge, or discard this patch.
classes/models/fields/FrmFieldCombo.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,8 @@
 block discarded – undo
39 39
 			}
40 40
 
41 41
 			foreach ( $sub_field['options'] as $option ) {
42
-				if ( 'default_value' === $option ) { // We parse default value from field column.
42
+				if ( 'default_value' === $option ) {
43
+// We parse default value from field column.
43 44
 					continue;
44 45
 				}
45 46
 
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -59,12 +59,12 @@  discard block
 block discarded – undo
59 59
 			if ( is_array( $sub_field ) ) {
60 60
 				$sub_field                 = wp_parse_args( $sub_field, $defaults );
61 61
 				$sub_field['name']         = $name;
62
-				$this->sub_fields[ $name ] = $sub_field;
62
+				$this->sub_fields[$name] = $sub_field;
63 63
 				continue;
64 64
 			}
65 65
 
66 66
 			if ( is_string( $sub_field ) ) {
67
-				$this->sub_fields[ $name ] = wp_parse_args(
67
+				$this->sub_fields[$name] = wp_parse_args(
68 68
 					array(
69 69
 						'name'  => $name,
70 70
 						'label' => $sub_field,
@@ -116,9 +116,9 @@  discard block
 block discarded – undo
116 116
 				}
117 117
 
118 118
 				if ( is_string( $option ) ) {
119
-					$extra_options[ $key . '_' . $option ] = '';
119
+					$extra_options[$key . '_' . $option] = '';
120 120
 				} elseif ( ! empty( $option['name'] ) ) {
121
-					$extra_options[ $key . '_' . $option['name'] ] = '';
121
+					$extra_options[$key . '_' . $option['name']] = '';
122 122
 				}
123 123
 			}
124 124
 		}
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 		foreach ( $this->sub_fields as $name => $sub_field ) {
142 142
 			$sub_field['name'] = $name;
143 143
 			$wrapper_classes   = 'frm_grid_container frm_sub_field_options frm_sub_field_options-' . $sub_field['name'];
144
-			if ( ! isset( $processed_sub_fields[ $name ] ) ) {
144
+			if ( ! isset( $processed_sub_fields[$name] ) ) {
145 145
 				// Options for this subfield should be hidden.
146 146
 				$wrapper_classes .= ' frm_hidden';
147 147
 			}
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 			$default_value = array();
172 172
 
173 173
 			foreach ( $this->sub_fields as $name => $sub_field ) {
174
-				$default_value[ $name ] = '';
174
+				$default_value[$name] = '';
175 175
 			}
176 176
 
177 177
 			return $default_value;
@@ -342,8 +342,8 @@  discard block
 block discarded – undo
342 342
 		// Placeholder.
343 343
 		if ( in_array( 'placeholder', $sub_field['options'], true ) ) {
344 344
 			$placeholders = FrmField::get_option( $field, 'placeholder' );
345
-			if ( ! empty( $placeholders[ $sub_field['name'] ] ) ) {
346
-				$atts[] = 'placeholder="' . esc_attr( $placeholders[ $sub_field['name'] ] ) . '"';
345
+			if ( ! empty( $placeholders[$sub_field['name']] ) ) {
346
+				$atts[] = 'placeholder="' . esc_attr( $placeholders[$sub_field['name']] ) . '"';
347 347
 			}
348 348
 		}
349 349
 
@@ -390,9 +390,9 @@  discard block
 block discarded – undo
390 390
 
391 391
 		// Validate not empty.
392 392
 		foreach ( $sub_fields as $name => $sub_field ) {
393
-			if ( empty( $sub_field['optional'] ) && empty( $args['value'][ $name ] ) ) {
394
-				$errors[ 'field' . $args['id'] . '-' . $name ] = '';
395
-				$errors[ 'field' . $args['id'] ]               = $blank_msg;
393
+			if ( empty( $sub_field['optional'] ) && empty( $args['value'][$name] ) ) {
394
+				$errors['field' . $args['id'] . '-' . $name] = '';
395
+				$errors['field' . $args['id']]               = $blank_msg;
396 396
 			}
397 397
 		}
398 398
 
@@ -411,7 +411,7 @@  discard block
 block discarded – undo
411 411
 		$field_key  = isset( $this->field->field_key ) ? $this->field->field_key : $this->field['field_key'];
412 412
 		$sub_fields = $this->get_processed_sub_fields();
413 413
 		foreach ( $sub_fields as $name => $sub_field ) {
414
-			$headings[ $field_id . '_' . $name ] = $field_name . ' (' . $field_key . ') - ' . $sub_field['label'];
414
+			$headings[$field_id . '_' . $name] = $field_name . ' (' . $field_key . ') - ' . $sub_field['label'];
415 415
 		}
416 416
 
417 417
 		return $headings;
Please login to merge, or discard this patch.
classes/views/frm-fields/front-end/combo-field/combo-field.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 			$sub_field_class   = "frm_form_field form-field frm_form_subfield-{$name} {$sub_field['wrapper_classes']}";
41 41
 			$sub_field_desc    = FrmField::get_option( $field, $name . '_desc' );
42 42
 
43
-			if ( isset( $errors[ 'field' . $field_id . '-' . $name ] ) ) {
43
+			if ( isset( $errors['field' . $field_id . '-' . $name] ) ) {
44 44
 				$sub_field_class .= ' frm_blank_field';
45 45
 			}
46 46
 			?>
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 						<input
61 61
 							type="<?php echo esc_attr( $sub_field['type'] ); ?>"
62 62
 							id="<?php echo esc_attr( $html_id . '_' . $name ); ?>"
63
-							value="<?php echo esc_attr( isset( $field_value[ $name ] ) ? $field_value[ $name ] : '' ); ?>"
63
+							value="<?php echo esc_attr( isset( $field_value[$name] ) ? $field_value[$name] : '' ); ?>"
64 64
 							<?php
65 65
 							if ( empty( $args['remove_names'] ) ) {
66 66
 								echo 'name="' . esc_attr( $field_name ) . '[' . esc_attr( $name ) . ']" ';
@@ -77,9 +77,9 @@  discard block
 block discarded – undo
77 77
 				}
78 78
 
79 79
 				// Don't show individual field errors when there is a combo field error.
80
-				if ( ! empty( $errors ) && isset( $errors[ 'field' . $field_id . '-' . $name ] ) && ! isset( $errors[ 'field' . $field_id ] ) ) {
80
+				if ( ! empty( $errors ) && isset( $errors['field' . $field_id . '-' . $name] ) && ! isset( $errors['field' . $field_id] ) ) {
81 81
 					?>
82
-					<div class="frm_error"><?php echo esc_html( $errors[ 'field' . $field_id . '-' . $name ] ); ?></div>
82
+					<div class="frm_error"><?php echo esc_html( $errors['field' . $field_id . '-' . $name] ); ?></div>
83 83
 				<?php } ?>
84 84
 			</div>
85 85
 		<?php } ?>
Please login to merge, or discard this patch.
classes/views/frm-fields/back-end/combo-field/sub-field-options.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -51,13 +51,13 @@  discard block
 block discarded – undo
51 51
 							type="text"
52 52
 							name="<?php echo esc_attr( $input_name ); ?>"
53 53
 							id="<?php echo esc_attr( $input_id ); ?>"
54
-							value="<?php echo esc_attr( isset( $default_value[ $sub_field['name'] ] ) ? $default_value[ $sub_field['name'] ] : '' ); ?>"
54
+							value="<?php echo esc_attr( isset( $default_value[$sub_field['name']] ) ? $default_value[$sub_field['name']] : '' ); ?>"
55 55
 							data-changeme="field_<?php echo esc_attr( $field_key . '_' . $sub_field['name'] ); ?>"
56 56
 							data-changeatt="value"
57 57
 						/>
58 58
 					</span>
59 59
 					<label class="frm_description" for="<?php echo esc_attr( $input_id ); ?>">
60
-						<?php echo esc_html( $labels[ $option ] ); ?>
60
+						<?php echo esc_html( $labels[$option] ); ?>
61 61
 					</label>
62 62
 				</p>
63 63
 				<?php
@@ -74,12 +74,12 @@  discard block
 block discarded – undo
74 74
 						type="text"
75 75
 						name="<?php echo esc_attr( $input_name ); ?>"
76 76
 						id="<?php echo esc_attr( $input_id ); ?>"
77
-						value="<?php echo esc_attr( isset( $input_value[ $sub_field['name'] ] ) ? $input_value[ $sub_field['name'] ] : '' ); ?>"
77
+						value="<?php echo esc_attr( isset( $input_value[$sub_field['name']] ) ? $input_value[$sub_field['name']] : '' ); ?>"
78 78
 						data-changeme="field_<?php echo esc_attr( $field_key . '_' . $sub_field['name'] ); ?>"
79 79
 						data-changeatt="<?php echo esc_attr( $option ); ?>"
80 80
 					/>
81 81
 					<label class="frm_description" for="<?php echo esc_attr( $input_id ); ?>">
82
-						<?php echo esc_html( $labels[ $option ] ); ?>
82
+						<?php echo esc_html( $labels[$option] ); ?>
83 83
 					</label>
84 84
 				</p>
85 85
 				<?php
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 						data-changeme="frm_field_<?php echo esc_attr( $field_id . '_' . $sub_field['name'] ); ?>_desc"
101 101
 					/>
102 102
 					<label class="frm_description" for="<?php echo esc_attr( $input_id ); ?>">
103
-						<?php echo esc_html( $labels[ $option ] ); ?>
103
+						<?php echo esc_html( $labels[$option] ); ?>
104 104
 					</label>
105 105
 				</p>
106 106
 				<?php
Please login to merge, or discard this patch.
classes/helpers/FrmCSVExportHelper.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -122,7 +122,8 @@
 block discarded – undo
122 122
 
123 123
 	private static function field_headings( $col ) {
124 124
 		$field_type_obj = FrmFieldFactory::get_field_factory( $col );
125
-		if ( ! empty( $field_type_obj->is_combo_field ) ) { // This is combo field.
125
+		if ( ! empty( $field_type_obj->is_combo_field ) ) {
126
+// This is combo field.
126 127
 			return $field_type_obj->get_export_headings();
127 128
 		}
128 129
 
Please login to merge, or discard this patch.
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 		self::print_file_headers( $filename );
42 42
 		unset( $filename );
43 43
 
44
-		$comment_count       = FrmDb::get_count(
44
+		$comment_count = FrmDb::get_count(
45 45
 			'frm_item_metas',
46 46
 			array(
47 47
 				'item_id'         => $atts['entry_ids'],
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 	private static function prepare_csv_headings() {
108 108
 		$headings = array();
109 109
 		self::csv_headings( $headings );
110
-		$headings       = apply_filters(
110
+		$headings = apply_filters(
111 111
 			'frm_csv_columns',
112 112
 			$headings,
113 113
 			self::$form_id,
@@ -129,10 +129,10 @@  discard block
 block discarded – undo
129 129
 		$field_headings  = array();
130 130
 		$separate_values = array( 'user_id', 'file', 'data', 'date' );
131 131
 		if ( ! empty( $col->field_options['separate_value'] ) && ! in_array( $col->type, $separate_values, true ) ) {
132
-			$field_headings[ $col->id . '_label' ] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
132
+			$field_headings[$col->id . '_label'] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
133 133
 		}
134 134
 
135
-		$field_headings[ $col->id ] = strip_tags( $col->name );
135
+		$field_headings[$col->id] = strip_tags( $col->name );
136 136
 		$field_headings             = apply_filters(
137 137
 			'frm_csv_field_columns',
138 138
 			$field_headings,
@@ -151,14 +151,14 @@  discard block
 block discarded – undo
151 151
 		foreach ( self::$fields as $col ) {
152 152
 			if ( self::is_the_child_of_a_repeater( $col ) ) {
153 153
 				$repeater_id                           = $col->field_options['in_section'];
154
-				$headings[ 'repeater' . $repeater_id ] = array(); // set a placeholder to maintain order for repeater fields
154
+				$headings['repeater' . $repeater_id] = array(); // set a placeholder to maintain order for repeater fields
155 155
 
156
-				if ( ! isset( $fields_by_repeater_id[ $repeater_id ] ) ) {
157
-					$fields_by_repeater_id[ $repeater_id ] = array();
156
+				if ( ! isset( $fields_by_repeater_id[$repeater_id] ) ) {
157
+					$fields_by_repeater_id[$repeater_id] = array();
158 158
 					$repeater_ids[]                        = $repeater_id;
159 159
 				}
160 160
 
161
-				$fields_by_repeater_id[ $repeater_id ][] = $col;
161
+				$fields_by_repeater_id[$repeater_id][] = $col;
162 162
 
163 163
 				continue;
164 164
 			}
@@ -177,8 +177,8 @@  discard block
 block discarded – undo
177 177
 				$end    = strpos( $row->meta_value, ':{' );
178 178
 				$length = substr( $row->meta_value, $start, $end - $start );
179 179
 
180
-				if ( $length > $max[ $row->field_id ] ) {
181
-					$max[ $row->field_id ] = $length;
180
+				if ( $length > $max[$row->field_id] ) {
181
+					$max[$row->field_id] = $length;
182 182
 				}
183 183
 			}
184 184
 			unset( $start, $end, $length, $row, $repeater_meta, $where );
@@ -189,17 +189,17 @@  discard block
 block discarded – undo
189 189
 					$repeater_id = str_replace( 'repeater', '', $key );
190 190
 
191 191
 					$repeater_headings = array();
192
-					foreach ( $fields_by_repeater_id[ $repeater_id ] as $col ) {
192
+					foreach ( $fields_by_repeater_id[$repeater_id] as $col ) {
193 193
 						$repeater_headings += self::field_headings( $col );
194 194
 					}
195 195
 
196
-					for ( $i = 0; $i < $max[ $repeater_id ]; $i ++ ) {
196
+					for ( $i = 0; $i < $max[$repeater_id]; $i ++ ) {
197 197
 						foreach ( $repeater_headings as $repeater_key => $repeater_name ) {
198
-							$flat[ $repeater_key . '[' . $i . ']' ] = $repeater_name;
198
+							$flat[$repeater_key . '[' . $i . ']'] = $repeater_name;
199 199
 						}
200 200
 					}
201 201
 				} else {
202
-					$flat[ $key ] = $heading;
202
+					$flat[$key] = $heading;
203 203
 				}
204 204
 			}
205 205
 
@@ -213,9 +213,9 @@  discard block
 block discarded – undo
213 213
 
214 214
 		if ( self::$comment_count ) {
215 215
 			for ( $i = 0; $i < self::$comment_count; $i ++ ) {
216
-				$headings[ 'comment' . $i ]            = __( 'Comment', 'formidable' );
217
-				$headings[ 'comment_user_id' . $i ]    = __( 'Comment User', 'formidable' );
218
-				$headings[ 'comment_created_at' . $i ] = __( 'Comment Date', 'formidable' );
216
+				$headings['comment' . $i]            = __( 'Comment', 'formidable' );
217
+				$headings['comment_user_id' . $i]    = __( 'Comment User', 'formidable' );
218
+				$headings['comment_created_at' . $i] = __( 'Comment Date', 'formidable' );
219 219
 			}
220 220
 			unset( $i );
221 221
 		}
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 
259 259
 	private static function prepare_next_csv_rows( $next_set ) {
260 260
 		// order by parent_item_id so children will be first
261
-		$where   = array(
261
+		$where = array(
262 262
 			'or'             => 1,
263 263
 			'id'             => $next_set,
264 264
 			'parent_item_id' => $next_set,
@@ -303,32 +303,32 @@  discard block
 block discarded – undo
303 303
 					continue;
304 304
 				}
305 305
 
306
-				if ( ! isset( $entries[ self::$entry->parent_item_id ] ) ) {
307
-					$entries[ self::$entry->parent_item_id ]        = new stdClass();
308
-					$entries[ self::$entry->parent_item_id ]->metas = array();
306
+				if ( ! isset( $entries[self::$entry->parent_item_id] ) ) {
307
+					$entries[self::$entry->parent_item_id]        = new stdClass();
308
+					$entries[self::$entry->parent_item_id]->metas = array();
309 309
 				}
310 310
 
311
-				if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
312
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = array();
313
-				} elseif ( ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
311
+				if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
312
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = array();
313
+				} elseif ( ! is_array( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
314 314
 					// if the data is here, it should be an array but if this field has collected data
315 315
 					// both while inside and outside of the repeating section, it's possible this is a string
316
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = (array) $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ];
316
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = (array) $entries[self::$entry->parent_item_id]->metas[$meta_id];
317 317
 				}
318 318
 
319 319
 				//add the repeated values
320
-				$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ][] = $meta_value;
320
+				$entries[self::$entry->parent_item_id]->metas[$meta_id][] = $meta_value;
321 321
 			}
322 322
 
323 323
 			self::$entry->metas                              = self::fill_missing_repeater_metas( self::$entry->metas, $entries );
324
-			$entries[ self::$entry->parent_item_id ]->metas += self::$entry->metas;
324
+			$entries[self::$entry->parent_item_id]->metas += self::$entry->metas;
325 325
 		}
326 326
 
327 327
 		// add the embedded form id
328
-		if ( ! isset( $entries[ self::$entry->parent_item_id ]->embedded_fields ) ) {
329
-			$entries[ self::$entry->parent_item_id ]->embedded_fields = array();
328
+		if ( ! isset( $entries[self::$entry->parent_item_id]->embedded_fields ) ) {
329
+			$entries[self::$entry->parent_item_id]->embedded_fields = array();
330 330
 		}
331
-		$entries[ self::$entry->parent_item_id ]->embedded_fields[ self::$entry->id ] = self::$entry->form_id;
331
+		$entries[self::$entry->parent_item_id]->embedded_fields[self::$entry->id] = self::$entry->form_id;
332 332
 	}
333 333
 
334 334
 	/**
@@ -349,14 +349,14 @@  discard block
 block discarded – undo
349 349
 		}
350 350
 
351 351
 		$repeater_id = $field->field_options['in_section'];
352
-		if ( ! isset( self::$fields_by_repeater_id[ $repeater_id ] ) ) {
352
+		if ( ! isset( self::$fields_by_repeater_id[$repeater_id] ) ) {
353 353
 			return $metas;
354 354
 		}
355 355
 
356
-		foreach ( self::$fields_by_repeater_id[ $repeater_id ] as $repeater_child ) {
357
-			if ( ! isset( $metas[ $repeater_child->id ] ) ) {
358
-				$metas[ $repeater_child->id ]                                            = '';
359
-				$entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ][] = '';
356
+		foreach ( self::$fields_by_repeater_id[$repeater_id] as $repeater_child ) {
357
+			if ( ! isset( $metas[$repeater_child->id] ) ) {
358
+				$metas[$repeater_child->id]                                            = '';
359
+				$entries[self::$entry->parent_item_id]->metas[$repeater_child->id][] = '';
360 360
 			}
361 361
 		}
362 362
 
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 
376 376
 	private static function add_field_values_to_csv( &$row ) {
377 377
 		foreach ( self::$fields as $col ) {
378
-			$field_value = isset( self::$entry->metas[ $col->id ] ) ? self::$entry->metas[ $col->id ] : false;
378
+			$field_value = isset( self::$entry->metas[$col->id] ) ? self::$entry->metas[$col->id] : false;
379 379
 
380 380
 			FrmAppHelper::unserialize_or_decode( $field_value );
381 381
 			self::add_array_values_to_columns( $row, compact( 'col', 'field_value' ) );
@@ -393,17 +393,17 @@  discard block
 block discarded – undo
393 393
 			if ( ! empty( $col->field_options['separate_value'] ) ) {
394 394
 				$label_key = $col->id . '_label';
395 395
 				if ( self::is_the_child_of_a_repeater( $col ) ) {
396
-					$row[ $label_key ] = array();
396
+					$row[$label_key] = array();
397 397
 					foreach ( $field_value as $value ) {
398
-						$row[ $label_key ][] = self::get_separate_value_label( $value, $col );
398
+						$row[$label_key][] = self::get_separate_value_label( $value, $col );
399 399
 					}
400 400
 				} else {
401
-					$row[ $label_key ] = self::get_separate_value_label( $field_value, $col );
401
+					$row[$label_key] = self::get_separate_value_label( $field_value, $col );
402 402
 				}
403 403
 				unset( $label_key );
404 404
 			}
405 405
 
406
-			$row[ $col->id ] = $field_value;
406
+			$row[$col->id] = $field_value;
407 407
 
408 408
 			unset( $col, $field_value );
409 409
 		}
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
 				'show_icon'         => false,
427 427
 				'entry_id'          => self::$entry->id,
428 428
 				'sep'               => self::$separator,
429
-				'embedded_field_id' => ( isset( self::$entry->embedded_fields ) && isset( self::$entry->embedded_fields[ self::$entry->id ] ) ) ? 'form' . self::$entry->embedded_fields[ self::$entry->id ] : 0,
429
+				'embedded_field_id' => ( isset( self::$entry->embedded_fields ) && isset( self::$entry->embedded_fields[self::$entry->id] ) ) ? 'form' . self::$entry->embedded_fields[self::$entry->id] : 0,
430 430
 			)
431 431
 		);
432 432
 	}
@@ -441,8 +441,8 @@  discard block
 block discarded – undo
441 441
 					// This is combo field inside repeater. The heading key has this format: [86_first[0]].
442 442
 					foreach ( $sub_value as $sub_key => $sub_sub_value ) {
443 443
 						$column_key = $atts['col']->id . '_' . $sub_key . '[' . $key . ']';
444
-						if ( ! is_numeric( $sub_key ) && isset( self::$headings[ $column_key ] ) ) {
445
-							$row[ $column_key ] = $sub_sub_value;
444
+						if ( ! is_numeric( $sub_key ) && isset( self::$headings[$column_key] ) ) {
445
+							$row[$column_key] = $sub_sub_value;
446 446
 						}
447 447
 					}
448 448
 
@@ -450,8 +450,8 @@  discard block
 block discarded – undo
450 450
 				}
451 451
 
452 452
 				$column_key = $atts['col']->id . '_' . $key;
453
-				if ( ! is_numeric( $key ) && isset( self::$headings[ $column_key ] ) ) {
454
-					$row[ $column_key ] = $sub_value;
453
+				if ( ! is_numeric( $key ) && isset( self::$headings[$column_key] ) ) {
454
+					$row[$column_key] = $sub_value;
455 455
 				}
456 456
 			}
457 457
 		}
@@ -475,18 +475,18 @@  discard block
 block discarded – undo
475 475
 		$sep = '';
476 476
 
477 477
 		foreach ( self::$headings as $k => $heading ) {
478
-			if ( isset( $rows[ $k ] ) ) {
479
-				$row = $rows[ $k ];
478
+			if ( isset( $rows[$k] ) ) {
479
+				$row = $rows[$k];
480 480
 			} else {
481 481
 				$row = '';
482 482
 				// array indexed data is not at $rows[ $k ]
483
-				if ( $k[ strlen( $k ) - 1 ] === ']' ) {
483
+				if ( $k[strlen( $k ) - 1] === ']' ) {
484 484
 					$start = strrpos( $k, '[' );
485 485
 					$key   = substr( $k, 0, $start ++ );
486 486
 					$index = substr( $k, $start, strlen( $k ) - 1 - $start );
487 487
 
488
-					if ( isset( $rows[ $key ] ) && isset( $rows[ $key ][ $index ] ) ) {
489
-						$row = $rows[ $key ][ $index ];
488
+					if ( isset( $rows[$key] ) && isset( $rows[$key][$index] ) ) {
489
+						$row = $rows[$key][$index];
490 490
 					}
491 491
 
492 492
 					unset( $start, $key, $index );
Please login to merge, or discard this patch.
classes/models/FrmAntiSpam.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -213,10 +213,10 @@
 block discarded – undo
213 213
 			return false;
214 214
 		}
215 215
 		$form_params = $frm_vars['form_params'];
216
-		if ( ! isset( $form_params[ $this->form_id ] ) ) {
216
+		if ( ! isset( $form_params[$this->form_id] ) ) {
217 217
 			return false;
218 218
 		}
219
-		$this_form_params = $form_params[ $this->form_id ];
219
+		$this_form_params = $form_params[$this->form_id];
220 220
 		return ! empty( $this_form_params['action'] ) && 'update' === $this_form_params['action'];
221 221
 	}
222 222
 
Please login to merge, or discard this patch.
classes/models/FrmHoneypot.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
 	private function check_honeypot_setting() {
49 49
 		$form = $this->get_form();
50 50
 		$key  = $this->get_option_key();
51
-		return $form->options[ $key ];
51
+		return $form->options[$key];
52 52
 	}
53 53
 
54 54
 	/**
Please login to merge, or discard this patch.
classes/models/FrmValidate.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
 	protected function is_option_on() {
39 39
 		$form = $this->get_form();
40 40
 		$key  = $this->get_option_key();
41
-		return ! empty( $form->options[ $key ] ) && 'off' !== $form->options[ $key ];
41
+		return ! empty( $form->options[$key] ) && 'off' !== $form->options[$key];
42 42
 	}
43 43
 
44 44
 	/**
Please login to merge, or discard this patch.