Completed
Pull Request — master (#1456)
by Stephanie
52s
created
classes/models/FrmEntryValues.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -181,12 +181,12 @@  discard block
 block discarded – undo
181 181
 	 * @return array
182 182
 	 */
183 183
 	private function prepare_array_property( $index, $atts ) {
184
-		if ( isset( $atts[ $index ] ) && ! empty( $atts[ $index ] ) ) {
184
+		if ( isset( $atts[$index] ) && ! empty( $atts[$index] ) ) {
185 185
 
186
-			if ( is_array( $atts[ $index ] ) ) {
187
-				$property = $atts[ $index ];
186
+			if ( is_array( $atts[$index] ) ) {
187
+				$property = $atts[$index];
188 188
 			} else {
189
-				$property = explode( ',', $atts[ $index ] );
189
+				$property = explode( ',', $atts[$index] );
190 190
 			}
191 191
 		} else {
192 192
 			$property = array();
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 			);
267 267
 		}
268 268
 
269
-		$ip      = array(
269
+		$ip = array(
270 270
 			'label' => __( 'IP Address', 'formidable' ),
271 271
 			'value' => $this->entry->ip,
272 272
 		);
@@ -356,6 +356,6 @@  discard block
 block discarded – undo
356 356
 	 * @return void
357 357
 	 */
358 358
 	protected function add_field_values( $field ) {
359
-		$this->field_values[ $field->id ] = new FrmFieldValue( $field, $this->entry );
359
+		$this->field_values[$field->id] = new FrmFieldValue( $field, $this->entry );
360 360
 	}
361 361
 }
Please login to merge, or discard this patch.
classes/models/FrmReviews.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -80,12 +80,12 @@  discard block
 block discarded – undo
80 80
 		$show_intervals = array( 50, 200, 500 );
81 81
 		$asked          = $this->review_status['asked'];
82 82
 
83
-		if ( ! isset( $show_intervals[ $asked ] ) ) {
83
+		if ( ! isset( $show_intervals[$asked] ) ) {
84 84
 			return;
85 85
 		}
86 86
 
87 87
 		$entries = FrmEntry::getRecordCount();
88
-		$count   = $show_intervals[ $asked ];
88
+		$count   = $show_intervals[$asked];
89 89
 		$user    = wp_get_current_user();
90 90
 
91 91
 		// Only show review request if the site has collected enough entries
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 		$requests = $message->get_messages();
135 135
 		$key      = $this->inbox_key . ( $asked ? $asked : '' );
136 136
 
137
-		if ( isset( $requests[ $key ] ) ) {
137
+		if ( isset( $requests[$key] ) ) {
138 138
 			return;
139 139
 		}
140 140
 
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 	 * @return bool
174 174
 	 */
175 175
 	private function has_later_request( $requests, $asked ) {
176
-		return isset( $requests[ $this->inbox_key . ( $asked + 1 ) ] ) || isset( $requests[ $this->inbox_key . ( $asked + 2 ) ] );
176
+		return isset( $requests[$this->inbox_key . ( $asked + 1 )] ) || isset( $requests[$this->inbox_key . ( $asked + 2 )] );
177 177
 	}
178 178
 
179 179
 	/**
Please login to merge, or discard this patch.
classes/models/FrmInbox.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 			return;
106 106
 		}
107 107
 
108
-		if ( isset( self::$messages[ $message['key'] ] ) && ! isset( $message['force'] ) ) {
108
+		if ( isset( self::$messages[$message['key']] ) && ! isset( $message['force'] ) ) {
109 109
 			// Don't replace messages unless required.
110 110
 			return;
111 111
 		}
@@ -114,13 +114,13 @@  discard block
 block discarded – undo
114 114
 			return;
115 115
 		}
116 116
 
117
-		if ( isset( self::$messages[ $message['key'] ] ) ) {
117
+		if ( isset( self::$messages[$message['key']] ) ) {
118 118
 			// Move up and mark as new.
119
-			unset( self::$messages[ $message['key'] ] );
119
+			unset( self::$messages[$message['key']] );
120 120
 		}
121 121
 
122 122
 		$this->fill_message( $message );
123
-		self::$messages[ $message['key'] ] = $message;
123
+		self::$messages[$message['key']] = $message;
124 124
 
125 125
 		$this->update_list();
126 126
 
@@ -156,11 +156,11 @@  discard block
 block discarded – undo
156 156
 	private function clean_messages() {
157 157
 		$removed = false;
158 158
 		foreach ( self::$messages as $t => $message ) {
159
-			$read      = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][ get_current_user_id() ] ) && $message['read'][ get_current_user_id() ] < strtotime( '-1 month' );
160
-			$dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][ get_current_user_id() ] ) && $message['dismissed'][ get_current_user_id() ] < strtotime( '-1 week' );
159
+			$read      = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][get_current_user_id()] ) && $message['read'][get_current_user_id()] < strtotime( '-1 month' );
160
+			$dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][get_current_user_id()] ) && $message['dismissed'][get_current_user_id()] < strtotime( '-1 week' );
161 161
 			$expired   = $this->is_expired( $message );
162 162
 			if ( $read || $expired || $dismissed ) {
163
-				unset( self::$messages[ $t ] );
163
+				unset( self::$messages[$t] );
164 164
 				$removed = true;
165 165
 			}
166 166
 		}
@@ -176,11 +176,11 @@  discard block
 block discarded – undo
176 176
 	private function filter_messages( &$messages ) {
177 177
 		$user_id = get_current_user_id();
178 178
 		foreach ( $messages as $k => $message ) {
179
-			$dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][ $user_id ] );
179
+			$dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][$user_id] );
180 180
 			if ( empty( $k ) || $this->is_expired( $message ) || $dismissed ) {
181
-				unset( $messages[ $k ] );
181
+				unset( $messages[$k] );
182 182
 			} elseif ( ! $this->is_for_user( $message ) ) {
183
-				unset( $messages[ $k ] );
183
+				unset( $messages[$k] );
184 184
 			}
185 185
 		}
186 186
 		$messages = apply_filters( 'frm_filter_inbox', $messages );
@@ -226,14 +226,14 @@  discard block
 block discarded – undo
226 226
 	 * @return void
227 227
 	 */
228 228
 	public function mark_read( $key ) {
229
-		if ( ! $key || ! isset( self::$messages[ $key ] ) ) {
229
+		if ( ! $key || ! isset( self::$messages[$key] ) ) {
230 230
 			return;
231 231
 		}
232 232
 
233
-		if ( ! isset( self::$messages[ $key ]['read'] ) ) {
234
-			self::$messages[ $key ]['read'] = array();
233
+		if ( ! isset( self::$messages[$key]['read'] ) ) {
234
+			self::$messages[$key]['read'] = array();
235 235
 		}
236
-		self::$messages[ $key ]['read'][ get_current_user_id() ] = time();
236
+		self::$messages[$key]['read'][get_current_user_id()] = time();
237 237
 
238 238
 		$this->update_list();
239 239
 	}
@@ -246,9 +246,9 @@  discard block
 block discarded – undo
246 246
 	 * @return void
247 247
 	 */
248 248
 	public function mark_unread( $key ) {
249
-		$is_read = isset( self::$messages[ $key ] ) && isset( self::$messages[ $key ]['read'] ) && isset( self::$messages[ $key ]['read'][ get_current_user_id() ] );
249
+		$is_read = isset( self::$messages[$key] ) && isset( self::$messages[$key]['read'] ) && isset( self::$messages[$key]['read'][get_current_user_id()] );
250 250
 		if ( $is_read ) {
251
-			unset( self::$messages[ $key ]['read'][ get_current_user_id() ] );
251
+			unset( self::$messages[$key]['read'][get_current_user_id()] );
252 252
 			$this->update_list();
253 253
 		}
254 254
 	}
@@ -264,14 +264,14 @@  discard block
 block discarded – undo
264 264
 			return;
265 265
 		}
266 266
 
267
-		if ( ! isset( self::$messages[ $key ] ) ) {
267
+		if ( ! isset( self::$messages[$key] ) ) {
268 268
 			return;
269 269
 		}
270 270
 
271
-		if ( ! isset( self::$messages[ $key ]['dismissed'] ) ) {
272
-			self::$messages[ $key ]['dismissed'] = array();
271
+		if ( ! isset( self::$messages[$key]['dismissed'] ) ) {
272
+			self::$messages[$key]['dismissed'] = array();
273 273
 		}
274
-		self::$messages[ $key ]['dismissed'][ get_current_user_id() ] = time();
274
+		self::$messages[$key]['dismissed'][get_current_user_id()] = time();
275 275
 
276 276
 		$this->update_list();
277 277
 	}
@@ -285,11 +285,11 @@  discard block
 block discarded – undo
285 285
 		$user_id = get_current_user_id();
286 286
 		foreach ( self::$messages as $key => $message ) {
287 287
 			if ( ! isset( $message['dismissed'] ) ) {
288
-				self::$messages[ $key ]['dismissed'] = array();
288
+				self::$messages[$key]['dismissed'] = array();
289 289
 			}
290 290
 
291
-			if ( ! isset( $message['dismissed'][ $user_id ] ) ) {
292
-				self::$messages[ $key ]['dismissed'][ $user_id ] = time();
291
+			if ( ! isset( $message['dismissed'][$user_id] ) ) {
292
+				self::$messages[$key]['dismissed'][$user_id] = time();
293 293
 			}
294 294
 		}
295 295
 		$this->update_list();
@@ -299,8 +299,8 @@  discard block
 block discarded – undo
299 299
 		$messages = $this->get_messages( 'filter' );
300 300
 		$user_id  = get_current_user_id();
301 301
 		foreach ( $messages as $t => $message ) {
302
-			if ( isset( $message['read'] ) && isset( $message['read'][ $user_id ] ) ) {
303
-				unset( $messages[ $t ] );
302
+			if ( isset( $message['read'] ) && isset( $message['read'][$user_id] ) ) {
303
+				unset( $messages[$t] );
304 304
 			}
305 305
 		}
306 306
 		return $messages;
@@ -328,8 +328,8 @@  discard block
 block discarded – undo
328 328
 	 * @return void
329 329
 	 */
330 330
 	public function remove( $key ) {
331
-		if ( isset( self::$messages[ $key ] ) ) {
332
-			unset( self::$messages[ $key ] );
331
+		if ( isset( self::$messages[$key] ) ) {
332
+			unset( self::$messages[$key] );
333 333
 			$this->update_list();
334 334
 		}
335 335
 	}
Please login to merge, or discard this patch.
classes/models/FrmTableHTMLGenerator.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 	 * @return void
87 87
 	 */
88 88
 	private function init_style_settings( $atts ) {
89
-		$style_settings       = array(
89
+		$style_settings = array(
90 90
 			'border_color' => 'dddddd',
91 91
 			'bg_color'     => 'f7f7f7',
92 92
 			'text_color'   => '444444',
@@ -97,12 +97,12 @@  discard block
 block discarded – undo
97 97
 		$this->style_settings = apply_filters( 'frm_show_entry_styles', $style_settings );
98 98
 
99 99
 		foreach ( $this->style_settings as $key => $setting ) {
100
-			if ( isset( $atts[ $key ] ) && $atts[ $key ] !== '' ) {
101
-				$this->style_settings[ $key ] = $atts[ $key ];
100
+			if ( isset( $atts[$key] ) && $atts[$key] !== '' ) {
101
+				$this->style_settings[$key] = $atts[$key];
102 102
 			}
103 103
 
104 104
 			if ( $this->is_color_setting( $key ) ) {
105
-				$this->style_settings[ $key ] = $this->get_color_markup( $this->style_settings[ $key ] );
105
+				$this->style_settings[$key] = $this->get_color_markup( $this->style_settings[$key] );
106 106
 			}
107 107
 		}
108 108
 
Please login to merge, or discard this patch.
classes/models/FrmFormState.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 	 * @return void
60 60
 	 */
61 61
 	public function set( $key, $value ) {
62
-		$this->state[ $key ] = $value;
62
+		$this->state[$key] = $value;
63 63
 	}
64 64
 
65 65
 	/**
@@ -75,8 +75,8 @@  discard block
 block discarded – undo
75 75
 	}
76 76
 
77 77
 	public function get( $key, $default ) {
78
-		if ( isset( $this->state[ $key ] ) ) {
79
-			return $this->state[ $key ];
78
+		if ( isset( $this->state[$key] ) ) {
79
+			return $this->state[$key];
80 80
 		}
81 81
 		return $default;
82 82
 	}
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 	private function compressed_state() {
172 172
 		$compressed = array();
173 173
 		foreach ( $this->state as $key => $value ) {
174
-			$compressed[ self::compressed_key( $key ) ] = $value;
174
+			$compressed[self::compressed_key( $key )] = $value;
175 175
 		}
176 176
 		return $compressed;
177 177
 	}
Please login to merge, or discard this patch.
classes/controllers/FrmEntriesAJAXSubmitController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@
 block discarded – undo
85 85
 			foreach ( $errors as $field => $error ) {
86 86
 				$field_id         = str_replace( 'field', '', $field );
87 87
 				$error            = self::maybe_modify_ajax_error( $error, $field_id, $form, $errors );
88
-				$obj[ $field_id ] = $error;
88
+				$obj[$field_id] = $error;
89 89
 			}
90 90
 
91 91
 			$response['errors']        = $obj;
Please login to merge, or discard this patch.
classes/models/FrmEntry.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 			$metas       = FrmEntryMeta::get_entry_meta_info( $entry_exist );
81 81
 			$field_metas = array();
82 82
 			foreach ( $metas as $meta ) {
83
-				$field_metas[ $meta->field_id ] = $meta->meta_value;
83
+				$field_metas[$meta->field_id] = $meta->meta_value;
84 84
 			}
85 85
 
86 86
 			$filtered_vals = array_filter( $values['item_meta'] );
@@ -136,10 +136,10 @@  discard block
 block discarded – undo
136 136
 		$reduced = array();
137 137
 		foreach ( $filter_vals as $field_id => $value ) {
138 138
 			$field                = FrmFieldFactory::get_field_object( $field_id );
139
-			$reduced[ $field_id ] = $field->get_value_to_save( $value, array( 'entry_id' => $entry_id ) );
140
-			$reduced[ $field_id ] = $field->set_value_before_save( $reduced[ $field_id ] );
141
-			if ( '' === $reduced[ $field_id ] || ( is_array( $reduced[ $field_id ] ) && 0 === count( $reduced[ $field_id ] ) ) ) {
142
-				unset( $reduced[ $field_id ] );
139
+			$reduced[$field_id] = $field->get_value_to_save( $value, array( 'entry_id' => $entry_id ) );
140
+			$reduced[$field_id] = $field->set_value_before_save( $reduced[$field_id] );
141
+			if ( '' === $reduced[$field_id] || ( is_array( $reduced[$field_id] ) && 0 === count( $reduced[$field_id] ) ) ) {
142
+				unset( $reduced[$field_id] );
143 143
 			}
144 144
 		}
145 145
 		return $reduced;
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
 		$query = "SELECT it.*, fr.name as form_name, fr.form_key as form_key FROM {$wpdb->prefix}frm_items it
355 355
                   LEFT OUTER JOIN {$wpdb->prefix}frm_forms fr ON it.form_id=fr.id WHERE ";
356 356
 
357
-		$query      .= is_numeric( $id ) ? 'it.id=%d' : 'it.item_key=%s';
357
+		$query .= is_numeric( $id ) ? 'it.id=%d' : 'it.item_key=%s';
358 358
 		$query_args = array( $id );
359 359
 		$query      = $wpdb->prepare( $query, $query_args ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
360 360
 
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
 	private static function prepare_entries( &$entries ) {
400 400
 		foreach ( $entries as $k => $entry ) {
401 401
 			self::prepare_entry( $entry );
402
-			$entries[ $k ] = $entry;
402
+			$entries[$k] = $entry;
403 403
 		}
404 404
 	}
405 405
 
@@ -425,19 +425,19 @@  discard block
 block discarded – undo
425 425
 			FrmFieldsHelper::prepare_field_value( $meta_val->meta_value, $meta_val->type );
426 426
 
427 427
 			if ( $meta_val->item_id == $entry->id ) {
428
-				$entry->metas[ $meta_val->field_id ] = $meta_val->meta_value;
428
+				$entry->metas[$meta_val->field_id] = $meta_val->meta_value;
429 429
 				if ( $include_key ) {
430
-					$entry->metas[ $meta_val->field_key ] = $entry->metas[ $meta_val->field_id ];
430
+					$entry->metas[$meta_val->field_key] = $entry->metas[$meta_val->field_id];
431 431
 				}
432 432
 				continue;
433 433
 			}
434 434
 
435 435
 			// include sub entries in an array
436
-			if ( ! isset( $entry->metas[ $meta_val->field_id ] ) ) {
437
-				$entry->metas[ $meta_val->field_id ] = array();
436
+			if ( ! isset( $entry->metas[$meta_val->field_id] ) ) {
437
+				$entry->metas[$meta_val->field_id] = array();
438 438
 			}
439 439
 
440
-			$entry->metas[ $meta_val->field_id ][] = $meta_val->meta_value;
440
+			$entry->metas[$meta_val->field_id][] = $meta_val->meta_value;
441 441
 
442 442
 			unset( $meta_val );
443 443
 		}
@@ -484,7 +484,7 @@  discard block
 block discarded – undo
484 484
 
485 485
 			if ( $inc_form ) {
486 486
 				$fields = 'it.*, fr.name as form_name,fr.form_key as form_key';
487
-				$table  .= 'LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id ';
487
+				$table .= 'LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id ';
488 488
 			}
489 489
 
490 490
 			if ( preg_match( '/ meta_([0-9]+)/', $order_by, $order_matches ) ) {
@@ -532,16 +532,16 @@  discard block
 block discarded – undo
532 532
 		}
533 533
 
534 534
 		foreach ( $metas as $m_key => $meta_val ) {
535
-			if ( ! isset( $entries[ $meta_val->item_id ] ) ) {
535
+			if ( ! isset( $entries[$meta_val->item_id] ) ) {
536 536
 				continue;
537 537
 			}
538 538
 
539
-			if ( ! isset( $entries[ $meta_val->item_id ]->metas ) ) {
540
-				$entries[ $meta_val->item_id ]->metas = array();
539
+			if ( ! isset( $entries[$meta_val->item_id]->metas ) ) {
540
+				$entries[$meta_val->item_id]->metas = array();
541 541
 			}
542 542
 
543 543
 			FrmFieldsHelper::prepare_field_value( $meta_val->meta_value, $meta_val->type );
544
-			$entries[ $meta_val->item_id ]->metas[ $meta_val->field_id ] = $meta_val->meta_value;
544
+			$entries[$meta_val->item_id]->metas[$meta_val->field_id] = $meta_val->meta_value;
545 545
 			unset( $m_key, $meta_val );
546 546
 		}
547 547
 
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
 	}
720 720
 
721 721
 	private static function get_entry_value( $values, $name, $default ) {
722
-		return isset( $values[ $name ] ) ? $values[ $name ] : $default;
722
+		return isset( $values[$name] ) ? $values[$name] : $default;
723 723
 	}
724 724
 
725 725
 	/**
@@ -900,7 +900,7 @@  discard block
 block discarded – undo
900 900
 	private static function maybe_add_captcha_meta( $form_id, $entry_id ) {
901 901
 		global $frm_vars;
902 902
 		if ( array_key_exists( 'captcha_scores', $frm_vars ) && array_key_exists( $form_id, $frm_vars['captcha_scores'] ) ) {
903
-			$captcha_score_meta = array( 'captcha_score' => $frm_vars['captcha_scores'][ $form_id ] );
903
+			$captcha_score_meta = array( 'captcha_score' => $frm_vars['captcha_scores'][$form_id] );
904 904
 			FrmEntryMeta::add_entry_meta( $entry_id, 0, '', maybe_serialize( $captcha_score_meta ) );
905 905
 		}
906 906
 	}
Please login to merge, or discard this patch.
classes/helpers/FrmStringReaderHelper.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
 		while ( $count > 0 && ! is_null( $one = $this->read_one() ) ) {
80 80
 			$value .= $one;
81
-			--$count;
81
+			-- $count;
82 82
 		}
83 83
 
84 84
 		return $this->strip_quotes( $value );
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	 */
93 93
 	private function read_one() {
94 94
 		if ( $this->pos <= $this->max ) {
95
-			$value = $this->string[ $this->pos ];
95
+			$value = $this->string[$this->pos];
96 96
 			$this->pos += 1;
97 97
 		} else {
98 98
 			$value = null;
Please login to merge, or discard this patch.
classes/helpers/FrmSerializedStringParserHelper.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -65,12 +65,12 @@
 block discarded – undo
65 65
 				$string->read( 1 );
66 66
 
67 67
 				$val = array();
68
-				for ( $i = 0; $i < $count; $i++ ) {
68
+				for ( $i = 0; $i < $count; $i ++ ) {
69 69
 					$array_key   = $this->do_parse( $string );
70 70
 					$array_value = $this->do_parse( $string );
71 71
 
72 72
 					if ( ! is_array( $array_key ) ) {
73
-						$val[ $array_key ] = $array_value;
73
+						$val[$array_key] = $array_value;
74 74
 					}
75 75
 				}
76 76
 
Please login to merge, or discard this patch.