Completed
Pull Request — master (#1356)
by Stephanie
44s
created
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.
classes/helpers/FrmOnSubmitHelper.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -240,26 +240,26 @@  discard block
 block discarded – undo
240 240
 	public static function populate_on_submit_data( &$form_options, $action = null, $event = 'create' ) {
241 241
 		$opt = 'update' === $event ? 'edit_' : 'success_';
242 242
 		if ( ! $action || ! is_object( $action ) ) {
243
-			$form_options[ $opt . 'action' ] = self::get_default_action_type();
244
-			$form_options[ $opt . 'msg' ]    = self::get_default_msg();
243
+			$form_options[$opt . 'action'] = self::get_default_action_type();
244
+			$form_options[$opt . 'msg']    = self::get_default_msg();
245 245
 
246 246
 			return;
247 247
 		}
248 248
 
249
-		$form_options[ $opt . 'action' ] = isset( $action->post_content['success_action'] ) ? $action->post_content['success_action'] : 'message';
249
+		$form_options[$opt . 'action'] = isset( $action->post_content['success_action'] ) ? $action->post_content['success_action'] : 'message';
250 250
 
251
-		switch ( $form_options[ $opt . 'action' ] ) {
251
+		switch ( $form_options[$opt . 'action'] ) {
252 252
 			case 'redirect':
253
-				$form_options[ $opt . 'url' ]    = isset( $action->post_content['success_url'] ) ? $action->post_content['success_url'] : '';
253
+				$form_options[$opt . 'url']    = isset( $action->post_content['success_url'] ) ? $action->post_content['success_url'] : '';
254 254
 				$form_options['open_in_new_tab'] = ! empty( $action->post_content['open_in_new_tab'] );
255 255
 				break;
256 256
 
257 257
 			case 'page':
258
-				$form_options[ $opt . 'page_id' ] = isset( $action->post_content['success_page_id'] ) ? $action->post_content['success_page_id'] : '';
258
+				$form_options[$opt . 'page_id'] = isset( $action->post_content['success_page_id'] ) ? $action->post_content['success_page_id'] : '';
259 259
 				break;
260 260
 
261 261
 			default:
262
-				$form_options[ $opt . 'msg' ] = ! empty( $action->post_content['success_msg'] ) ? $action->post_content['success_msg'] : self::get_default_msg();
262
+				$form_options[$opt . 'msg'] = ! empty( $action->post_content['success_msg'] ) ? $action->post_content['success_msg'] : self::get_default_msg();
263 263
 				$form_options['show_form']    = ! empty( $action->post_content['show_form'] );
264 264
 		}
265 265
 	}
@@ -348,20 +348,20 @@  discard block
 block discarded – undo
348 348
 	private static function get_on_submit_action_data_from_form_options( $form_options, $event = 'create' ) {
349 349
 		$opt  = 'update' === $event ? 'edit_' : 'success_';
350 350
 		$data = array(
351
-			'success_action' => isset( $form_options[ $opt . 'action' ] ) ? $form_options[ $opt . 'action' ] : self::get_default_action_type(),
351
+			'success_action' => isset( $form_options[$opt . 'action'] ) ? $form_options[$opt . 'action'] : self::get_default_action_type(),
352 352
 		);
353 353
 
354 354
 		switch ( $data['success_action'] ) {
355 355
 			case 'redirect':
356
-				$data['success_url'] = isset( $form_options[ $opt . 'url' ] ) ? $form_options[ $opt . 'url' ] : '';
356
+				$data['success_url'] = isset( $form_options[$opt . 'url'] ) ? $form_options[$opt . 'url'] : '';
357 357
 				break;
358 358
 
359 359
 			case 'page':
360
-				$data['success_page_id'] = isset( $form_options[ $opt . 'page_id' ] ) ? $form_options[ $opt . 'page_id' ] : '';
360
+				$data['success_page_id'] = isset( $form_options[$opt . 'page_id'] ) ? $form_options[$opt . 'page_id'] : '';
361 361
 				break;
362 362
 
363 363
 			default:
364
-				$data['success_msg'] = isset( $form_options[ $opt . 'msg' ] ) ? $form_options[ $opt . 'msg' ] : self::get_default_msg();
364
+				$data['success_msg'] = isset( $form_options[$opt . 'msg'] ) ? $form_options[$opt . 'msg'] : self::get_default_msg();
365 365
 				$data['show_form']   = ! empty( $form_options['show_form'] );
366 366
 		}
367 367
 
Please login to merge, or discard this patch.
classes/controllers/FrmSimpleBlocksController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@
 block discarded – undo
76 76
 			return false;
77 77
 		}
78 78
 
79
-		return $addons[ $addon_id ];
79
+		return $addons[$addon_id];
80 80
 	}
81 81
 
82 82
 	/**
Please login to merge, or discard this patch.
classes/models/FrmSettings.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -187,8 +187,8 @@  discard block
 block discarded – undo
187 187
 		}
188 188
 
189 189
 		foreach ( $settings as $setting => $default ) {
190
-			if ( isset( $params[ 'frm_' . $setting ] ) ) {
191
-				$this->{$setting} = $params[ 'frm_' . $setting ];
190
+			if ( isset( $params['frm_' . $setting] ) ) {
191
+				$this->{$setting} = $params['frm_' . $setting];
192 192
 			} elseif ( ! isset( $this->{$setting} ) ) {
193 193
 				$this->{$setting} = $default;
194 194
 			}
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
 
357 357
 		$checkboxes = array( 'mu_menu', 're_multi', 'use_html', 'jquery_css', 'accordion_js', 'fade_form', 'no_ips', 'custom_header_ip', 'tracking', 'admin_bar', 'summary_emails' );
358 358
 		foreach ( $checkboxes as $set ) {
359
-			$this->$set = isset( $params[ 'frm_' . $set ] ) ? absint( $params[ 'frm_' . $set ] ) : 0;
359
+			$this->$set = isset( $params['frm_' . $set] ) ? absint( $params['frm_' . $set] ) : 0;
360 360
 		}
361 361
 	}
362 362
 
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
 		$frm_roles = FrmAppHelper::frm_capabilities();
370 370
 		$roles     = get_editable_roles();
371 371
 		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
372
-			$this->$frm_role = (array) ( isset( $params[ $frm_role ] ) ? $params[ $frm_role ] : 'administrator' );
372
+			$this->$frm_role = (array) ( isset( $params[$frm_role] ) ? $params[$frm_role] : 'administrator' );
373 373
 
374 374
 			// Make sure administrators always have permissions
375 375
 			if ( ! in_array( 'administrator', $this->$frm_role ) ) {
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
@@ -108,7 +108,7 @@
 block discarded – undo
108 108
 			'credit_card' => 'FrmFieldCreditCard',
109 109
 		);
110 110
 
111
-		$class = isset( $type_classes[ $field_type ] ) ? $type_classes[ $field_type ] : '';
111
+		$class = isset( $type_classes[$field_type] ) ? $type_classes[$field_type] : '';
112 112
 
113 113
 		return apply_filters( 'frm_get_field_type_class', $class, $field_type );
114 114
 	}
Please login to merge, or discard this patch.