Completed
Pull Request — master (#2229)
by
unknown
54s
created
classes/helpers/FrmListHelper.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -223,8 +223,8 @@  discard block
 block discarded – undo
223 223
 			return $this->get_pagenum();
224 224
 		}
225 225
 
226
-		if ( isset( $this->_pagination_args[ $key ] ) ) {
227
-			return $this->_pagination_args[ $key ];
226
+		if ( isset( $this->_pagination_args[$key] ) ) {
227
+			return $this->_pagination_args[$key];
228 228
 		}
229 229
 	}
230 230
 
@@ -269,8 +269,8 @@  discard block
 block discarded – undo
269 269
 	}
270 270
 
271 271
 	private function hidden_search_inputs( $param_name ) {
272
-		if ( ! empty( $_REQUEST[ $param_name ] ) ) {
273
-			$value = sanitize_text_field( wp_unslash( $_REQUEST[ $param_name ] ) );
272
+		if ( ! empty( $_REQUEST[$param_name] ) ) {
273
+			$value = sanitize_text_field( wp_unslash( $_REQUEST[$param_name] ) );
274 274
 			echo '<input type="hidden" name="' . esc_attr( $param_name ) . '" value="' . esc_attr( $value ) . '" />';
275 275
 		}
276 276
 	}
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
 
313 313
 		echo "<ul class='subsubsub'>\n";
314 314
 		foreach ( $views as $class => $view ) {
315
-			$views[ $class ] = "\t" . '<li class="' . esc_attr( $class ) . '">' . $view;
315
+			$views[$class] = "\t" . '<li class="' . esc_attr( $class ) . '">' . $view;
316 316
 		}
317 317
 		echo implode( " |</li>\n", $views ) . "</li>\n"; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
318 318
 		echo '</ul>';
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
 
462 462
 		$out = '<div class="' . ( $always_visible ? 'row-actions visible' : 'row-actions' ) . '">';
463 463
 		foreach ( $actions as $action => $link ) {
464
-			++$i;
464
+			++ $i;
465 465
 			$sep  = $i == $action_count ? '' : ' | ';
466 466
 			$out .= "<span class='$action'>$link$sep</span>";
467 467
 		}
@@ -684,7 +684,7 @@  discard block
 block discarded – undo
684 684
 			'next'  => __( 'Next page', 'formidable' ),
685 685
 		);
686 686
 
687
-		return $labels[ $link ];
687
+		return $labels[$link];
688 688
 	}
689 689
 
690 690
 	private function current_url() {
@@ -774,7 +774,7 @@  discard block
 block discarded – undo
774 774
 
775 775
 		// If the primary column doesn't exist fall back to the
776 776
 		// first non-checkbox column.
777
-		if ( ! isset( $columns[ $default ] ) ) {
777
+		if ( ! isset( $columns[$default] ) ) {
778 778
 			$default = self::get_default_primary_column_name();
779 779
 		}
780 780
 
@@ -788,7 +788,7 @@  discard block
 block discarded – undo
788 788
 		 */
789 789
 		$column = apply_filters( 'list_table_primary_column', $default, $this->screen->id );
790 790
 
791
-		if ( empty( $column ) || ! isset( $columns[ $column ] ) ) {
791
+		if ( empty( $column ) || ! isset( $columns[$column] ) ) {
792 792
 			$column = $default;
793 793
 		}
794 794
 
@@ -809,7 +809,7 @@  discard block
 block discarded – undo
809 809
 			// In 4.3, we added a fourth argument for primary column.
810 810
 			$column_headers = array( array(), array(), array(), $this->get_primary_column_name() );
811 811
 			foreach ( $this->_column_headers as $key => $value ) {
812
-				$column_headers[ $key ] = $value;
812
+				$column_headers[$key] = $value;
813 813
 			}
814 814
 
815 815
 			return $column_headers;
@@ -842,7 +842,7 @@  discard block
 block discarded – undo
842 842
 				$data[1] = false;
843 843
 			}
844 844
 
845
-			$sortable[ $id ] = $data;
845
+			$sortable[$id] = $data;
846 846
 		}
847 847
 
848 848
 		$primary = $this->get_primary_column_name();
@@ -898,7 +898,7 @@  discard block
 block discarded – undo
898 898
 			static $cb_counter = 1;
899 899
 			$columns['cb']     = '<label class="screen-reader-text" for="cb-select-all-' . $cb_counter . '">' . __( 'Select All', 'formidable' ) . '</label>';
900 900
 			$columns['cb']    .= '<input id="cb-select-all-' . esc_attr( $cb_counter ) . '" type="checkbox" />';
901
-			++$cb_counter;
901
+			++ $cb_counter;
902 902
 		}
903 903
 
904 904
 		foreach ( $columns as $column_key => $column_display_name ) {
@@ -920,8 +920,8 @@  discard block
 block discarded – undo
920 920
 				$class[] = 'column-primary';
921 921
 			}
922 922
 
923
-			if ( isset( $sortable[ $column_key ] ) ) {
924
-				list( $orderby, $desc_first ) = $sortable[ $column_key ];
923
+			if ( isset( $sortable[$column_key] ) ) {
924
+				list( $orderby, $desc_first ) = $sortable[$column_key];
925 925
 
926 926
 				if ( $current_orderby == $orderby ) {
927 927
 					// The sorted column. The `aria-sort` attribute must be set only on the sorted column.
@@ -1034,7 +1034,7 @@  discard block
 block discarded – undo
1034 1034
 	 * @return bool Returns true if the setting is not set or if it is not false; otherwise, returns false.
1035 1035
 	 */
1036 1036
 	protected function should_display( $args, $settings ) {
1037
-		return ! isset( $args[ $settings ] ) || false !== $args[ $settings ];
1037
+		return ! isset( $args[$settings] ) || false !== $args[$settings];
1038 1038
 	}
1039 1039
 
1040 1040
 	/**
Please login to merge, or discard this patch.
classes/views/dashboard/templates/counters.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -14,20 +14,26 @@
 block discarded – undo
14 14
 				<h4><?php echo esc_html( $counter['heading'] ); ?></h4>
15 15
 				<?php if ( isset( $counter['cta'] ) && isset( $counter['cta']['display'] ) && true === $counter['cta']['display'] ) : ?>
16 16
 					<a href="<?php echo esc_url( $counter['cta']['link'] ); ?>"><?php echo esc_html( $counter['cta']['title'] ); ?></a>
17
-				<?php else : ?>
17
+				<?php else {
18
+	: ?>
18 19
 					<?php if ( 'currency' === $counter['type'] ) : ?>
19 20
 						<div class="frm-flex-box frm-gap-md">
20 21
 							<?php foreach ( $counter['items'] as $item ) : ?>
21 22
 								<b>
22
-									<?php echo esc_attr( $item['counter_label']['symbol_left'] ); ?>
23
+									<?php echo esc_attr( $item['counter_label']['symbol_left'] );
24
+}
25
+?>
23 26
 									<span class="frm-counter" data-type="<?php echo esc_attr( $counter['type'] ); ?>" data-locale="<?php echo esc_attr( get_locale() ); ?>" data-counter="<?php echo (int) $item['counter']; ?>"><?php echo (int) $item['counter']; ?></span>
24 27
 									<?php echo esc_attr( $item['counter_label']['symbol_right'] ); ?>
25 28
 								</b>
26 29
 							<?php endforeach; ?>
27 30
 						</div>
28
-					<?php else : ?>
31
+					<?php else {
32
+	: ?>
29 33
 						<b>
30
-							<span class="frm-counter" data-type="<?php echo esc_attr( $counter['type'] ); ?>" data-locale="<?php echo esc_attr( get_locale() ); ?>" data-counter="<?php echo (int) $counter['counter']; ?>"><?php echo (int) $counter['counter']; ?></span>
34
+							<span class="frm-counter" data-type="<?php echo esc_attr( $counter['type'] );
35
+}
36
+?>" data-locale="<?php echo esc_attr( get_locale() ); ?>" data-counter="<?php echo (int) $counter['counter']; ?>"><?php echo (int) $counter['counter']; ?></span>
31 37
 						</b>
32 38
 					<?php endif; ?>
33 39
 				<?php endif; ?>
Please login to merge, or discard this patch.
classes/controllers/FrmXMLController.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 			return;
164 164
 		}
165 165
 
166
-		$selected_xml = isset( $form['xml'] ) && isset( $form['xml'][ $selected_form ] ) ? $form['xml'][ $selected_form ] : '';
166
+		$selected_xml = isset( $form['xml'] ) && isset( $form['xml'][$selected_form] ) ? $form['xml'][$selected_form] : '';
167 167
 		if ( empty( $selected_xml ) || strpos( $selected_xml, 'http' ) !== 0 ) {
168 168
 			return;
169 169
 		}
@@ -178,8 +178,8 @@  discard block
 block discarded – undo
178 178
 	 * @param string $value
179 179
 	 */
180 180
 	private static function get_selected_in_form( $form, $value = 'form' ) {
181
-		if ( ! empty( $form ) && ! empty( $form[ $value ] ) ) {
182
-			return $form[ $value ];
181
+		if ( ! empty( $form ) && ! empty( $form[$value] ) ) {
182
+			return $form[$value];
183 183
 		}
184 184
 
185 185
 		return '';
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 			}
209 209
 
210 210
 			if ( $for === 'view' ) {
211
-				$item_key  = is_array( $view_keys ) ? $view_keys[ $form_key ] : $view_keys;
211
+				$item_key  = is_array( $view_keys ) ? $view_keys[$form_key] : $view_keys;
212 212
 				$shortcode = '[display-frm-data id=%1$s filter=limited]';
213 213
 			} elseif ( $for === 'form' ) {
214 214
 				$item_key  = $form_key;
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
 				continue;
224 224
 			}
225 225
 
226
-			$page_ids[ $for ] = wp_insert_post(
226
+			$page_ids[$for] = wp_insert_post(
227 227
 				array(
228 228
 					'post_title'   => $name,
229 229
 					'post_type'    => 'page',
@@ -376,7 +376,7 @@  discard block
 block discarded – undo
376 376
 		// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash, WordPress.Security.NonceVerification.Missing
377 377
 		$file_type = sanitize_option( 'upload_path', $_FILES['frm_import_file']['name'] );
378 378
 		$file_type = strtolower( pathinfo( $file_type, PATHINFO_EXTENSION ) );
379
-		if ( 'xml' !== $file_type && isset( $export_format[ $file_type ] ) ) {
379
+		if ( 'xml' !== $file_type && isset( $export_format[$file_type] ) ) {
380 380
 			// allow other file types to be imported
381 381
 			do_action( 'frm_before_import_' . $file_type );
382 382
 
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
470 470
 		foreach ( $type as $tb_type ) {
471 471
 			$where = array();
472 472
 			$join  = '';
473
-			$table = $tables[ $tb_type ];
473
+			$table = $tables[$tb_type];
474 474
 
475 475
 			$select     = $table . '.id';
476 476
 			$query_vars = array();
@@ -485,7 +485,7 @@  discard block
 block discarded – undo
485 485
 							$table . '.parent_form_id' => $args['ids'],
486 486
 						);
487 487
 					} else {
488
-						$where[ $table . '.status !' ] = 'draft';
488
+						$where[$table . '.status !'] = 'draft';
489 489
 					}
490 490
 					break;
491 491
 				case 'actions':
@@ -498,7 +498,7 @@  discard block
 block discarded – undo
498 498
 				case 'items':
499 499
 					// $join = "INNER JOIN {$wpdb->prefix}frm_item_metas im ON ($table.id = im.item_id)";
500 500
 					if ( $args['ids'] ) {
501
-						$where[ $table . '.form_id' ] = $args['ids'];
501
+						$where[$table . '.form_id'] = $args['ids'];
502 502
 					}
503 503
 					break;
504 504
 				case 'styles':
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
539 539
 					}
540 540
 			}//end switch
541 541
 
542
-			$records[ $tb_type ] = FrmDb::get_col( $table . $join, $where, $select );
542
+			$records[$tb_type] = FrmDb::get_col( $table . $join, $where, $select );
543 543
 			unset( $tb_type );
544 544
 		}//end foreach
545 545
 
@@ -734,7 +734,7 @@  discard block
 block discarded – undo
734 734
 		$no_export_fields = FrmField::no_save_fields();
735 735
 		foreach ( $csv_fields as $k => $f ) {
736 736
 			if ( in_array( $f->type, $no_export_fields, true ) ) {
737
-				unset( $csv_fields[ $k ] );
737
+				unset( $csv_fields[$k] );
738 738
 			}
739 739
 		}
740 740
 
Please login to merge, or discard this patch.
classes/helpers/FrmXMLHelper.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -126,7 +126,8 @@
 block discarded – undo
126 126
 
127 127
 		if ( empty( $imported['form_status'] ) ) {
128 128
 			// Check for an error message in the XML.
129
-			if ( isset( $xml->Code ) && isset( $xml->Message ) ) { // phpcs:ignore WordPress.NamingConventions
129
+			if ( isset( $xml->Code ) && isset( $xml->Message ) ) {
130
+// phpcs:ignore WordPress.NamingConventions
130 131
 				$imported['error'] = (string) $xml->Message; // phpcs:ignore WordPress.NamingConventions
131 132
 			}
132 133
 		}
Please login to merge, or discard this patch.
Spacing   +99 added lines, -99 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 				$content_before_channel_tag,
93 93
 				1
94 94
 			);
95
-			$xml_string                 = $content_before_channel_tag . substr( $xml_string, $channel_start_position );
95
+			$xml_string = $content_before_channel_tag . substr( $xml_string, $channel_start_position );
96 96
 		}
97 97
 	}
98 98
 
@@ -176,8 +176,8 @@  discard block
 block discarded – undo
176 176
 			);
177 177
 
178 178
 			if ( $term && is_array( $term ) ) {
179
-				++$imported['imported']['terms'];
180
-				$imported['terms'][ (int) $t->term_id ] = $term['term_id'];
179
+				++ $imported['imported']['terms'];
180
+				$imported['terms'][(int) $t->term_id] = $term['term_id'];
181 181
 			}
182 182
 
183 183
 			unset( $term, $t );
@@ -229,11 +229,11 @@  discard block
 block discarded – undo
229 229
 				if ( $form_id ) {
230 230
 					if ( empty( $form['parent_form_id'] ) ) {
231 231
 						// Don't include the repeater form in the imported count.
232
-						++$imported['imported']['forms'];
232
+						++ $imported['imported']['forms'];
233 233
 					}
234 234
 
235 235
 					// Keep track of whether this specific form was updated or not.
236
-					$imported['form_status'][ $form_id ] = 'imported';
236
+					$imported['form_status'][$form_id] = 'imported';
237 237
 				}
238 238
 			}
239 239
 
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 			// Update field ids/keys to new ones.
249 249
 			do_action( 'frm_after_duplicate_form', $form_id, $form, array( 'old_id' => $old_id ) );
250 250
 
251
-			$imported['forms'][ (int) $item->id ] = $form_id;
251
+			$imported['forms'][(int) $item->id] = $form_id;
252 252
 
253 253
 			// Send pre 2.0 form options through function that creates actions.
254 254
 			self::migrate_form_settings_to_actions( $form['options'], $form_id, $imported, true );
@@ -318,19 +318,19 @@  discard block
 block discarded – undo
318 318
 		FrmForm::update( $form_id, $form );
319 319
 		if ( empty( $form['parent_form_id'] ) ) {
320 320
 			// Don't include the repeater form in the updated count.
321
-			++$imported['updated']['forms'];
321
+			++ $imported['updated']['forms'];
322 322
 		}
323 323
 
324 324
 		// Keep track of whether this specific form was updated or not
325
-		$imported['form_status'][ $form_id ] = 'updated';
325
+		$imported['form_status'][$form_id] = 'updated';
326 326
 	}
327 327
 
328 328
 	private static function get_form_fields( $form_id ) {
329 329
 		$form_fields = FrmField::get_all_for_form( $form_id, '', 'exclude', 'exclude' );
330 330
 		$old_fields  = array();
331 331
 		foreach ( $form_fields as $f ) {
332
-			$old_fields[ $f->id ]        = $f;
333
-			$old_fields[ $f->field_key ] = $f->id;
332
+			$old_fields[$f->id]        = $f;
333
+			$old_fields[$f->field_key] = $f->id;
334 334
 			unset( $f );
335 335
 		}
336 336
 		$form_fields = $old_fields;
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
 	 */
388 388
 	private static function track_imported_child_forms( $form_id, $parent_form_id, &$child_forms ) {
389 389
 		if ( $parent_form_id ) {
390
-			$child_forms[ $form_id ] = $parent_form_id;
390
+			$child_forms[$form_id] = $parent_form_id;
391 391
 		}
392 392
 	}
393 393
 
@@ -402,9 +402,9 @@  discard block
 block discarded – undo
402 402
 	 */
403 403
 	private static function maybe_update_child_form_parent_id( $imported_forms, $child_forms ) {
404 404
 		foreach ( $child_forms as $child_form_id => $old_parent_form_id ) {
405
-			if ( isset( $imported_forms[ $old_parent_form_id ] ) && (int) $imported_forms[ $old_parent_form_id ] !== (int) $old_parent_form_id ) {
405
+			if ( isset( $imported_forms[$old_parent_form_id] ) && (int) $imported_forms[$old_parent_form_id] !== (int) $old_parent_form_id ) {
406 406
 				// Update all children with this old parent_form_id
407
-				$new_parent_form_id = (int) $imported_forms[ $old_parent_form_id ];
407
+				$new_parent_form_id = (int) $imported_forms[$old_parent_form_id];
408 408
 				FrmForm::update( $child_form_id, array( 'parent_form_id' => $new_parent_form_id ) );
409 409
 				do_action( 'frm_update_child_form_parent_id', $child_form_id, $new_parent_form_id );
410 410
 			}
@@ -434,34 +434,34 @@  discard block
 block discarded – undo
434 434
 
435 435
 			if ( ! empty( $this_form ) ) {
436 436
 				// check for field to edit by field id
437
-				if ( isset( $form_fields[ $f['id'] ] ) ) {
437
+				if ( isset( $form_fields[$f['id']] ) ) {
438 438
 					FrmField::update( $f['id'], $f );
439
-					++$imported['updated']['fields'];
439
+					++ $imported['updated']['fields'];
440 440
 
441
-					unset( $form_fields[ $f['id'] ] );
441
+					unset( $form_fields[$f['id']] );
442 442
 
443 443
 					// Unset old field key.
444
-					if ( isset( $form_fields[ $f['field_key'] ] ) ) {
445
-						unset( $form_fields[ $f['field_key'] ] );
444
+					if ( isset( $form_fields[$f['field_key']] ) ) {
445
+						unset( $form_fields[$f['field_key']] );
446 446
 					}
447
-				} elseif ( isset( $form_fields[ $f['field_key'] ] ) ) {
448
-					$keys_by_original_field_id[ $f['id'] ] = $f['field_key'];
447
+				} elseif ( isset( $form_fields[$f['field_key']] ) ) {
448
+					$keys_by_original_field_id[$f['id']] = $f['field_key'];
449 449
 
450 450
 					$old_field_id = $f['id'];
451 451
 
452 452
 					// check for field to edit by field key
453 453
 					unset( $f['id'] );
454 454
 
455
-					FrmField::update( $form_fields[ $f['field_key'] ], $f );
456
-					++$imported['updated']['fields'];
455
+					FrmField::update( $form_fields[$f['field_key']], $f );
456
+					++ $imported['updated']['fields'];
457 457
 
458 458
 					self::do_after_field_imported_action( $f, $form_fields, $old_field_id );
459 459
 
460 460
 					// Unset old field id.
461
-					unset( $form_fields[ $form_fields[ $f['field_key'] ] ] );
461
+					unset( $form_fields[$form_fields[$f['field_key']]] );
462 462
 
463 463
 					// Unset old field key.
464
-					unset( $form_fields[ $f['field_key'] ] );
464
+					unset( $form_fields[$f['field_key']] );
465 465
 				} else {
466 466
 					// If no matching field id or key in this form, create the field.
467 467
 					self::create_imported_field( $f, $imported );
@@ -501,7 +501,7 @@  discard block
 block discarded – undo
501 501
 	 */
502 502
 	private static function do_after_field_imported_action( $field_array, $form_fields, $old_field_id ) {
503 503
 		// Assign field array the update field's ID.
504
-		$field_array['id'] = $form_fields[ $field_array['field_key'] ];
504
+		$field_array['id'] = $form_fields[$field_array['field_key']];
505 505
 
506 506
 		/**
507 507
 		 * Fires when an existing field is imported.
@@ -512,7 +512,7 @@  discard block
 block discarded – undo
512 512
 		 * @param int   $field_id
513 513
 		 * @param int   $old_field_id
514 514
 		 */
515
-		do_action( 'frm_after_existing_field_is_imported', $field_array, $form_fields[ $field_array['field_key'] ], $old_field_id );
515
+		do_action( 'frm_after_existing_field_is_imported', $field_array, $form_fields[$field_array['field_key']], $old_field_id );
516 516
 	}
517 517
 
518 518
 	private static function fill_field( $field, $form_id ) {
@@ -608,8 +608,8 @@  discard block
 block discarded – undo
608 608
 		if ( $f['type'] === 'form' || ( $f['type'] === 'divider' && FrmField::is_option_true( $f['field_options'], 'repeat' ) ) ) {
609 609
 			if ( FrmField::is_option_true( $f['field_options'], 'form_select' ) ) {
610 610
 				$form_select = (int) $f['field_options']['form_select'];
611
-				if ( isset( $imported['forms'][ $form_select ] ) ) {
612
-					$f['field_options']['form_select'] = $imported['forms'][ $form_select ];
611
+				if ( isset( $imported['forms'][$form_select] ) ) {
612
+					$f['field_options']['form_select'] = $imported['forms'][$form_select];
613 613
 				}
614 614
 			}
615 615
 		}
@@ -630,8 +630,8 @@  discard block
 block discarded – undo
630 630
 
631 631
 		if ( FrmField::is_option_true_in_array( $f['field_options'], 'get_values_form' ) ) {
632 632
 			$old_form = $f['field_options']['get_values_form'];
633
-			if ( isset( $imported['forms'][ $old_form ] ) ) {
634
-				$f['field_options']['get_values_form'] = $imported['forms'][ $old_form ];
633
+			if ( isset( $imported['forms'][$old_form] ) ) {
634
+				$f['field_options']['get_values_form'] = $imported['forms'][$old_form];
635 635
 			}
636 636
 		}
637 637
 	}
@@ -652,12 +652,12 @@  discard block
 block discarded – undo
652 652
 	private static function migrate_placeholders( &$f ) {
653 653
 		$update_values = self::migrate_field_placeholder( $f, 'clear_on_focus' );
654 654
 		foreach ( $update_values as $k => $v ) {
655
-			$f[ $k ] = $v;
655
+			$f[$k] = $v;
656 656
 		}
657 657
 
658 658
 		$update_values = self::migrate_field_placeholder( $f, 'default_blank' );
659 659
 		foreach ( $update_values as $k => $v ) {
660
-			$f[ $k ] = $v;
660
+			$f[$k] = $v;
661 661
 		}
662 662
 	}
663 663
 
@@ -671,7 +671,7 @@  discard block
 block discarded – undo
671 671
 	public static function migrate_field_placeholder( $field, $type ) {
672 672
 		$field         = (array) $field;
673 673
 		$field_options = $field['field_options'];
674
-		if ( empty( $field_options[ $type ] ) || empty( $field['default_value'] ) ) {
674
+		if ( empty( $field_options[$type] ) || empty( $field['default_value'] ) ) {
675 675
 			return array();
676 676
 		}
677 677
 
@@ -697,7 +697,7 @@  discard block
 block discarded – undo
697 697
 				}
698 698
 
699 699
 				if ( $opt == $default_value ) {
700
-					unset( $options[ $opt_key ] );
700
+					unset( $options[$opt_key] );
701 701
 					break;
702 702
 				}
703 703
 			}
@@ -724,7 +724,7 @@  discard block
 block discarded – undo
724 724
 
725 725
 		$new_id = FrmField::create( $f );
726 726
 		if ( $new_id != false ) {
727
-			++$imported['imported']['fields'];
727
+			++ $imported['imported']['fields'];
728 728
 			do_action( 'frm_after_field_is_imported', $f, $new_id );
729 729
 		}
730 730
 	}
@@ -753,10 +753,10 @@  discard block
 block discarded – undo
753 753
 
754 754
 			$image_id = FrmProFileImport::import_attachment( $option['src'], $field_object );
755 755
 			// Remove the src from options as it isn't required after import.
756
-			unset( $field['options'][ $key ]['src'] );
756
+			unset( $field['options'][$key]['src'] );
757 757
 
758 758
 			if ( is_numeric( $image_id ) ) {
759
-				$field['options'][ $key ]['image'] = $image_id;
759
+				$field['options'][$key]['image'] = $image_id;
760 760
 			}
761 761
 		}
762 762
 
@@ -924,8 +924,8 @@  discard block
 block discarded – undo
924 924
 			} else {
925 925
 				if ( $post['post_type'] === 'frm_display' ) {
926 926
 					$post['post_content'] = self::maybe_prepare_json_view_content( $post['post_content'] );
927
-				} elseif ( 'page' === $post['post_type'] && isset( $imported['posts'][ $post['post_parent'] ] ) ) {
928
-					$post['post_parent'] = $imported['posts'][ $post['post_parent'] ];
927
+				} elseif ( 'page' === $post['post_type'] && isset( $imported['posts'][$post['post_parent']] ) ) {
928
+					$post['post_parent'] = $imported['posts'][$post['post_parent']];
929 929
 				}
930 930
 				// Create/update post now
931 931
 				$post_id = wp_insert_post( $post );
@@ -936,27 +936,27 @@  discard block
 block discarded – undo
936 936
 			}
937 937
 
938 938
 			if ( false !== strpos( $post['post_content'], '[display-frm-data' ) || false !== strpos( $post['post_content'], '[formidable' ) ) {
939
-				$posts_with_shortcodes[ $post_id ] = $post;
939
+				$posts_with_shortcodes[$post_id] = $post;
940 940
 			}
941 941
 
942 942
 			self::update_postmeta( $post, $post_id );
943 943
 			self::update_layout( $post, $post_id );
944 944
 
945 945
 			$this_type = 'posts';
946
-			if ( isset( $post_types[ $post['post_type'] ] ) ) {
947
-				$this_type = $post_types[ $post['post_type'] ];
946
+			if ( isset( $post_types[$post['post_type']] ) ) {
947
+				$this_type = $post_types[$post['post_type']];
948 948
 			}
949 949
 
950 950
 			if ( isset( $post['ID'] ) && $post_id == $post['ID'] ) {
951
-				++$imported['updated'][ $this_type ];
951
+				++ $imported['updated'][$this_type];
952 952
 			} else {
953
-				++$imported['imported'][ $this_type ];
953
+				++ $imported['imported'][$this_type];
954 954
 			}
955 955
 
956
-			$imported['posts'][ $old_id ] = $post_id;
956
+			$imported['posts'][$old_id] = $post_id;
957 957
 
958 958
 			if ( $post['post_type'] === 'frm_display' ) {
959
-				$view_ids[ $old_id ] = $post_id;
959
+				$view_ids[$old_id] = $post_id;
960 960
 			}
961 961
 
962 962
 			do_action( 'frm_after_import_view', $post_id, $post );
@@ -1117,9 +1117,9 @@  discard block
 block discarded – undo
1117 1117
 			$post['attachment_url'] = (string) $item->attachment_url;
1118 1118
 		}
1119 1119
 
1120
-		if ( $post['post_type'] == FrmFormActionsController::$action_post_type && isset( $imported['forms'][ (int) $post['menu_order'] ] ) ) {
1120
+		if ( $post['post_type'] == FrmFormActionsController::$action_post_type && isset( $imported['forms'][(int) $post['menu_order']] ) ) {
1121 1121
 			// update to new form id
1122
-			$post['menu_order'] = $imported['forms'][ (int) $post['menu_order'] ];
1122
+			$post['menu_order'] = $imported['forms'][(int) $post['menu_order']];
1123 1123
 		}
1124 1124
 
1125 1125
 		// Don't allow default styles to take over a site's default style
@@ -1156,8 +1156,8 @@  discard block
 block discarded – undo
1156 1156
 		);
1157 1157
 
1158 1158
 		// Switch old form and field ids to new ones.
1159
-		if ( 'frm_form_id' === $m['key'] && isset( $imported['forms'][ (int) $m['value'] ] ) ) {
1160
-			$m['value'] = $imported['forms'][ (int) $m['value'] ];
1159
+		if ( 'frm_form_id' === $m['key'] && isset( $imported['forms'][(int) $m['value']] ) ) {
1160
+			$m['value'] = $imported['forms'][(int) $m['value']];
1161 1161
 		} else {
1162 1162
 			$m['value'] = FrmAppHelper::maybe_json_decode( $m['value'] );
1163 1163
 
@@ -1168,31 +1168,31 @@  discard block
 block discarded – undo
1168 1168
 				} elseif ( 'frm_options' === $m['key'] ) {
1169 1169
 
1170 1170
 					foreach ( array( 'date_field_id', 'edate_field_id' ) as $setting_name ) {
1171
-						if ( isset( $m['value'][ $setting_name ] ) && is_numeric( $m['value'][ $setting_name ] ) && isset( $frm_duplicate_ids[ $m['value'][ $setting_name ] ] ) ) {
1172
-							$m['value'][ $setting_name ] = $frm_duplicate_ids[ $m['value'][ $setting_name ] ];
1171
+						if ( isset( $m['value'][$setting_name] ) && is_numeric( $m['value'][$setting_name] ) && isset( $frm_duplicate_ids[$m['value'][$setting_name]] ) ) {
1172
+							$m['value'][$setting_name] = $frm_duplicate_ids[$m['value'][$setting_name]];
1173 1173
 						}
1174 1174
 					}
1175 1175
 
1176 1176
 					if ( ! empty( $m['value']['map_address_fields'] ) ) {
1177 1177
 						foreach ( $m['value']['map_address_fields'] as $address_field_key => $address_field_id ) {
1178
-							if ( isset( $frm_duplicate_ids[ $address_field_id ] ) ) {
1179
-								$m['value']['map_address_fields'][ $address_field_key ] = $frm_duplicate_ids[ $address_field_id ];
1178
+							if ( isset( $frm_duplicate_ids[$address_field_id] ) ) {
1179
+								$m['value']['map_address_fields'][$address_field_key] = $frm_duplicate_ids[$address_field_id];
1180 1180
 							}
1181 1181
 						}
1182 1182
 					}
1183 1183
 
1184 1184
 					if ( ! empty( $m['value']['calendar_options'] ) ) {
1185 1185
 						foreach ( $m['value']['calendar_options'] as $calendar_option_group_key => $calendar_option ) {
1186
-							if ( isset( $frm_duplicate_ids[ $calendar_option['value'] ] ) ) {
1187
-								$m['value']['calendar_options'][ $calendar_option_group_key ]['value'] = $frm_duplicate_ids[ $calendar_option['value'] ];
1186
+							if ( isset( $frm_duplicate_ids[$calendar_option['value']] ) ) {
1187
+								$m['value']['calendar_options'][$calendar_option_group_key]['value'] = $frm_duplicate_ids[$calendar_option['value']];
1188 1188
 							}
1189 1189
 						}
1190 1190
 					}
1191 1191
 
1192 1192
 					$check_dup_array = array();
1193 1193
 					if ( ! empty( $m['value']['order_by'] ) ) {
1194
-						if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[ $m['value']['order_by'] ] ) ) {
1195
-							$m['value']['order_by'] = $frm_duplicate_ids[ $m['value']['order_by'] ];
1194
+						if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[$m['value']['order_by']] ) ) {
1195
+							$m['value']['order_by'] = $frm_duplicate_ids[$m['value']['order_by']];
1196 1196
 						} elseif ( is_array( $m['value']['order_by'] ) ) {
1197 1197
 							$check_dup_array[] = 'order_by';
1198 1198
 						}
@@ -1203,9 +1203,9 @@  discard block
 block discarded – undo
1203 1203
 					}
1204 1204
 
1205 1205
 					foreach ( $check_dup_array as $check_k ) {
1206
-						foreach ( (array) $m['value'][ $check_k ] as $mk => $mv ) {
1207
-							if ( isset( $frm_duplicate_ids[ $mv ] ) ) {
1208
-								$m['value'][ $check_k ][ $mk ] = $frm_duplicate_ids[ $mv ];
1206
+						foreach ( (array) $m['value'][$check_k] as $mk => $mv ) {
1207
+							if ( isset( $frm_duplicate_ids[$mv] ) ) {
1208
+								$m['value'][$check_k][$mk] = $frm_duplicate_ids[$mv];
1209 1209
 							}
1210 1210
 							unset( $mk, $mv );
1211 1211
 						}
@@ -1218,11 +1218,11 @@  discard block
 block discarded – undo
1218 1218
 			$m['value'] = FrmAppHelper::maybe_json_decode( $m['value'] );
1219 1219
 		}
1220 1220
 
1221
-		$post['postmeta'][ (string) $meta->meta_key ] = $m['value'];
1221
+		$post['postmeta'][(string) $meta->meta_key] = $m['value'];
1222 1222
 	}
1223 1223
 
1224 1224
 	private static function populate_layout( &$post, $layout ) {
1225
-		$post['layout'][ (string) $layout->type ] = (string) $layout->data;
1225
+		$post['layout'][(string) $layout->type] = (string) $layout->data;
1226 1226
 	}
1227 1227
 
1228 1228
 	/**
@@ -1250,11 +1250,11 @@  discard block
 block discarded – undo
1250 1250
 				$name = (string) $c;
1251 1251
 			}
1252 1252
 
1253
-			if ( ! isset( $post['tax_input'][ $taxonomy ] ) ) {
1254
-				$post['tax_input'][ $taxonomy ] = array();
1253
+			if ( ! isset( $post['tax_input'][$taxonomy] ) ) {
1254
+				$post['tax_input'][$taxonomy] = array();
1255 1255
 			}
1256 1256
 
1257
-			$post['tax_input'][ $taxonomy ][] = $name;
1257
+			$post['tax_input'][$taxonomy][] = $name;
1258 1258
 			unset( $name );
1259 1259
 		}//end foreach
1260 1260
 	}
@@ -1394,7 +1394,7 @@  discard block
 block discarded – undo
1394 1394
 
1395 1395
 		$message = '<ul>';
1396 1396
 		foreach ( $result as $type => $results ) {
1397
-			if ( ! isset( $t_strings[ $type ] ) ) {
1397
+			if ( ! isset( $t_strings[$type] ) ) {
1398 1398
 				// only print imported and updated
1399 1399
 				continue;
1400 1400
 			}
@@ -1406,7 +1406,7 @@  discard block
 block discarded – undo
1406 1406
 			}
1407 1407
 
1408 1408
 			if ( ! empty( $s_message ) ) {
1409
-				$message .= '<li><strong>' . $t_strings[ $type ] . ':</strong> ';
1409
+				$message .= '<li><strong>' . $t_strings[$type] . ':</strong> ';
1410 1410
 				$message .= implode( ', ', $s_message );
1411 1411
 				$message .= '</li>';
1412 1412
 			}
@@ -1458,8 +1458,8 @@  discard block
 block discarded – undo
1458 1458
 			'actions' => sprintf( _n( '%1$s Form Action', '%1$s Form Actions', $m, 'formidable' ), $m ),
1459 1459
 		);
1460 1460
 
1461
-		if ( isset( $strings[ $type ] ) ) {
1462
-			$s_message[] = $strings[ $type ];
1461
+		if ( isset( $strings[$type] ) ) {
1462
+			$s_message[] = $strings[$type];
1463 1463
 		} else {
1464 1464
 			$string = ' ' . $m . ' ' . ucfirst( $type );
1465 1465
 
@@ -1607,7 +1607,7 @@  discard block
 block discarded – undo
1607 1607
 
1608 1608
 		foreach ( $options as $key => $option ) {
1609 1609
 			if ( is_array( $option ) && ! empty( $option['image'] ) ) {
1610
-				$options[ $key ]['src'] = wp_get_attachment_url( $option['image'] );
1610
+				$options[$key]['src'] = wp_get_attachment_url( $option['image'] );
1611 1611
 				$updated                = true;
1612 1612
 			}
1613 1613
 		}
@@ -1636,8 +1636,8 @@  discard block
 block discarded – undo
1636 1636
 	 */
1637 1637
 	private static function remove_defaults( $defaults, &$saved ) {
1638 1638
 		foreach ( $saved as $key => $value ) {
1639
-			if ( isset( $defaults[ $key ] ) && $defaults[ $key ] === $value ) {
1640
-				unset( $saved[ $key ] );
1639
+			if ( isset( $defaults[$key] ) && $defaults[$key] === $value ) {
1640
+				unset( $saved[$key] );
1641 1641
 			}
1642 1642
 		}
1643 1643
 	}
@@ -1648,14 +1648,14 @@  discard block
 block discarded – undo
1648 1648
 	 * @since 3.06
1649 1649
 	 */
1650 1650
 	private static function remove_default_html( $html_name, $defaults, &$options ) {
1651
-		if ( ! isset( $options[ $html_name ] ) || ! isset( $defaults[ $html_name ] ) ) {
1651
+		if ( ! isset( $options[$html_name] ) || ! isset( $defaults[$html_name] ) ) {
1652 1652
 			return;
1653 1653
 		}
1654 1654
 
1655
-		$old_html     = str_replace( "\r\n", "\n", $options[ $html_name ] );
1656
-		$default_html = $defaults[ $html_name ];
1655
+		$old_html     = str_replace( "\r\n", "\n", $options[$html_name] );
1656
+		$default_html = $defaults[$html_name];
1657 1657
 		if ( $old_html == $default_html ) {
1658
-			unset( $options[ $html_name ] );
1658
+			unset( $options[$html_name] );
1659 1659
 
1660 1660
 			return;
1661 1661
 		}
@@ -1663,7 +1663,7 @@  discard block
 block discarded – undo
1663 1663
 		// Account for some of the older field default HTML.
1664 1664
 		$default_html = str_replace( ' id="frm_desc_field_[key]"', '', $default_html );
1665 1665
 		if ( $old_html == $default_html ) {
1666
-			unset( $options[ $html_name ] );
1666
+			unset( $options[$html_name] );
1667 1667
 		}
1668 1668
 	}
1669 1669
 
@@ -1754,8 +1754,8 @@  discard block
 block discarded – undo
1754 1754
 		);
1755 1755
 
1756 1756
 		foreach ( $post_settings as $post_setting ) {
1757
-			if ( isset( $form_options[ $post_setting ] ) ) {
1758
-				$new_action['post_content'][ $post_setting ] = $form_options[ $post_setting ];
1757
+			if ( isset( $form_options[$post_setting] ) ) {
1758
+				$new_action['post_content'][$post_setting] = $form_options[$post_setting];
1759 1759
 			}
1760 1760
 			unset( $post_setting );
1761 1761
 		}
@@ -1793,7 +1793,7 @@  discard block
 block discarded – undo
1793 1793
 		if ( ! $exists ) {
1794 1794
 			// this isn't an email, but we need to use a class that will always be included
1795 1795
 			FrmDb::save_json_post( $new_action );
1796
-			++$imported['imported']['actions'];
1796
+			++ $imported['imported']['actions'];
1797 1797
 		}
1798 1798
 	}
1799 1799
 
@@ -1826,11 +1826,11 @@  discard block
 block discarded – undo
1826 1826
 		foreach ( $post_content as $key => $setting ) {
1827 1827
 			if ( ! is_array( $setting ) && in_array( $key, $basic_fields ) ) {
1828 1828
 				// Replace old IDs with new IDs
1829
-				$post_content[ $key ] = str_replace( $old, $new, $setting );
1829
+				$post_content[$key] = str_replace( $old, $new, $setting );
1830 1830
 			} elseif ( is_array( $setting ) && in_array( $key, $array_fields ) ) {
1831 1831
 				foreach ( $setting as $k => $val ) {
1832 1832
 					// Replace old IDs with new IDs
1833
-					$post_content[ $key ][ $k ] = str_replace( $old, $new, $val );
1833
+					$post_content[$key][$k] = str_replace( $old, $new, $val );
1834 1834
 				}
1835 1835
 			}
1836 1836
 			unset( $key, $setting );
@@ -1887,7 +1887,7 @@  discard block
 block discarded – undo
1887 1887
 
1888 1888
 			if ( empty( $exists ) ) {
1889 1889
 				FrmDb::save_json_post( $new_notification );
1890
-				++$imported['imported']['actions'];
1890
+				++ $imported['imported']['actions'];
1891 1891
 			}
1892 1892
 			unset( $new_notification );
1893 1893
 		}//end foreach
@@ -1906,8 +1906,8 @@  discard block
 block discarded – undo
1906 1906
 	private static function remove_deprecated_notification_settings( $form_id, $form_options ) {
1907 1907
 		$delete_settings = array( 'notification', 'autoresponder', 'email_to' );
1908 1908
 		foreach ( $delete_settings as $index ) {
1909
-			if ( isset( $form_options[ $index ] ) ) {
1910
-				unset( $form_options[ $index ] );
1909
+			if ( isset( $form_options[$index] ) ) {
1910
+				unset( $form_options[$index] );
1911 1911
 			}
1912 1912
 		}
1913 1913
 		FrmForm::update( $form_id, array( 'options' => $form_options ) );
@@ -1960,12 +1960,12 @@  discard block
 block discarded – undo
1960 1960
 			'reply_to_name' => '',
1961 1961
 		);
1962 1962
 		foreach ( $reply_fields as $f => $val ) {
1963
-			if ( isset( $notification[ $f ] ) ) {
1964
-				$atts[ $f ] = $notification[ $f ];
1965
-				if ( 'custom' == $notification[ $f ] ) {
1966
-					$atts[ $f ] = $notification[ 'cust_' . $f ];
1967
-				} elseif ( is_numeric( $atts[ $f ] ) && ! empty( $atts[ $f ] ) ) {
1968
-					$atts[ $f ] = '[' . $atts[ $f ] . ']';
1963
+			if ( isset( $notification[$f] ) ) {
1964
+				$atts[$f] = $notification[$f];
1965
+				if ( 'custom' == $notification[$f] ) {
1966
+					$atts[$f] = $notification['cust_' . $f];
1967
+				} elseif ( is_numeric( $atts[$f] ) && ! empty( $atts[$f] ) ) {
1968
+					$atts[$f] = '[' . $atts[$f] . ']';
1969 1969
 				}
1970 1970
 			}
1971 1971
 			unset( $f, $val );
@@ -1996,13 +1996,13 @@  discard block
 block discarded – undo
1996 1996
 		foreach ( $atts['email_to'] as $key => $email_field ) {
1997 1997
 
1998 1998
 			if ( is_numeric( $email_field ) ) {
1999
-				$atts['email_to'][ $key ] = '[' . $email_field . ']';
1999
+				$atts['email_to'][$key] = '[' . $email_field . ']';
2000 2000
 			}
2001 2001
 
2002 2002
 			if ( strpos( $email_field, '|' ) ) {
2003 2003
 				$email_opt = explode( '|', $email_field );
2004 2004
 				if ( isset( $email_opt[0] ) ) {
2005
-					$atts['email_to'][ $key ] = '[' . $email_opt[0] . ' show=' . $email_opt[1] . ']';
2005
+					$atts['email_to'][$key] = '[' . $email_opt[0] . ' show=' . $email_opt[1] . ']';
2006 2006
 				}
2007 2007
 				unset( $email_opt );
2008 2008
 			}
@@ -2023,12 +2023,12 @@  discard block
 block discarded – undo
2023 2023
 		// Add more fields to the new notification
2024 2024
 		$add_fields = array( 'email_message', 'email_subject', 'plain_text', 'inc_user_info', 'conditions' );
2025 2025
 		foreach ( $add_fields as $add_field ) {
2026
-			if ( isset( $notification[ $add_field ] ) ) {
2027
-				$new_notification['post_content'][ $add_field ] = $notification[ $add_field ];
2026
+			if ( isset( $notification[$add_field] ) ) {
2027
+				$new_notification['post_content'][$add_field] = $notification[$add_field];
2028 2028
 			} elseif ( in_array( $add_field, array( 'plain_text', 'inc_user_info' ) ) ) {
2029
-				$new_notification['post_content'][ $add_field ] = 0;
2029
+				$new_notification['post_content'][$add_field] = 0;
2030 2030
 			} else {
2031
-				$new_notification['post_content'][ $add_field ] = '';
2031
+				$new_notification['post_content'][$add_field] = '';
2032 2032
 			}
2033 2033
 			unset( $add_field );
2034 2034
 		}
@@ -2052,7 +2052,7 @@  discard block
 block discarded – undo
2052 2052
 		if ( isset( $post_content['conditions'] ) && is_array( $post_content['conditions'] ) ) {
2053 2053
 			foreach ( $post_content['conditions'] as $email_key => $val ) {
2054 2054
 				if ( is_numeric( $email_key ) ) {
2055
-					$post_content['conditions'][ $email_key ] = self::switch_action_field_ids( $val, array( 'hide_field' ) );
2055
+					$post_content['conditions'][$email_key] = self::switch_action_field_ids( $val, array( 'hide_field' ) );
2056 2056
 				}
2057 2057
 				unset( $email_key, $val );
2058 2058
 			}
Please login to merge, or discard this patch.
classes/models/FrmEntryValues.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -177,12 +177,12 @@  discard block
 block discarded – undo
177 177
 	 * @return array
178 178
 	 */
179 179
 	private function prepare_array_property( $index, $atts ) {
180
-		if ( ! empty( $atts[ $index ] ) ) {
180
+		if ( ! empty( $atts[$index] ) ) {
181 181
 
182
-			if ( is_array( $atts[ $index ] ) ) {
183
-				$property = $atts[ $index ];
182
+			if ( is_array( $atts[$index] ) ) {
183
+				$property = $atts[$index];
184 184
 			} else {
185
-				$property = explode( ',', $atts[ $index ] );
185
+				$property = explode( ',', $atts[$index] );
186 186
 			}
187 187
 		} else {
188 188
 			$property = array();
@@ -262,11 +262,11 @@  discard block
 block discarded – undo
262 262
 			);
263 263
 		}
264 264
 
265
-		$ip       = array(
265
+		$ip = array(
266 266
 			'label' => __( 'IP Address', 'formidable' ),
267 267
 			'value' => $this->entry->ip,
268 268
 		);
269
-		$browser  = array(
269
+		$browser = array(
270 270
 			'label' => __( 'User-Agent (Browser/OS)', 'formidable' ),
271 271
 			'value' => isset( $entry_description['browser'] ) ? FrmEntriesHelper::get_browser( $entry_description['browser'] ) : '',
272 272
 		);
@@ -353,6 +353,6 @@  discard block
 block discarded – undo
353 353
 	 * @return void
354 354
 	 */
355 355
 	protected function add_field_values( $field ) {
356
-		$this->field_values[ $field->id ] = new FrmFieldValue( $field, $this->entry );
356
+		$this->field_values[$field->id] = new FrmFieldValue( $field, $this->entry );
357 357
 	}
358 358
 }
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
@@ -89,12 +89,12 @@
 block discarded – undo
89 89
 		$string->skip_next_character();
90 90
 
91 91
 		$val = array();
92
-		for ( $i = 0; $i < $count; $i++ ) {
92
+		for ( $i = 0; $i < $count; $i ++ ) {
93 93
 			$array_key   = $this->do_parse( $string );
94 94
 			$array_value = $this->do_parse( $string );
95 95
 
96 96
 			if ( ! is_array( $array_key ) ) {
97
-				$val[ $array_key ] = $array_value;
97
+				$val[$array_key] = $array_value;
98 98
 			}
99 99
 		}
100 100
 
Please login to merge, or discard this patch.
classes/helpers/FrmStringReaderHelper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 	 */
51 51
 	public function read_until( $char ) {
52 52
 		$value = '';
53
-		while ( $this->pos <= $this->max && ( $one = $this->string[ $this->pos++ ] ) !== $char ) {
53
+		while ( $this->pos <= $this->max && ( $one = $this->string[$this->pos ++] ) !== $char ) {
54 54
 			$value .= $one;
55 55
 		}
56 56
 		return $value;
@@ -67,10 +67,10 @@  discard block
 block discarded – undo
67 67
 	public function read( $count ) {
68 68
 		$value = '';
69 69
 
70
-		while ( $count > 0 && $this->pos <= $this->max && ( ( $one = $this->string[ $this->pos ] ) || '0' === $one ) ) {
70
+		while ( $count > 0 && $this->pos <= $this->max && ( ( $one = $this->string[$this->pos] ) || '0' === $one ) ) {
71 71
 			$value     .= $one;
72 72
 			$this->pos += 1;
73
-			--$count;
73
+			-- $count;
74 74
 		}
75 75
 
76 76
 		/**
Please login to merge, or discard this patch.
classes/models/FrmInbox.php 1 patch
Spacing   +32 added lines, -32 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
 
@@ -157,11 +157,11 @@  discard block
 block discarded – undo
157 157
 	private function clean_messages() {
158 158
 		$removed = false;
159 159
 		foreach ( self::$messages as $t => $message ) {
160
-			$read      = ! empty( $message['read'] ) && isset( $message['read'][ get_current_user_id() ] ) && $message['read'][ get_current_user_id() ] < strtotime( '-1 month' );
161
-			$dismissed = ! empty( $message['dismissed'] ) && isset( $message['dismissed'][ get_current_user_id() ] ) && $message['dismissed'][ get_current_user_id() ] < strtotime( '-1 week' );
160
+			$read      = ! empty( $message['read'] ) && isset( $message['read'][get_current_user_id()] ) && $message['read'][get_current_user_id()] < strtotime( '-1 month' );
161
+			$dismissed = ! empty( $message['dismissed'] ) && isset( $message['dismissed'][get_current_user_id()] ) && $message['dismissed'][get_current_user_id()] < strtotime( '-1 week' );
162 162
 			$expired   = $this->is_expired( $message );
163 163
 			if ( $read || $expired || $dismissed ) {
164
-				unset( self::$messages[ $t ] );
164
+				unset( self::$messages[$t] );
165 165
 				$removed = true;
166 166
 			}
167 167
 		}
@@ -179,11 +179,11 @@  discard block
 block discarded – undo
179 179
 	public function filter_messages( &$messages, $type = 'unread' ) {
180 180
 		$user_id = get_current_user_id();
181 181
 		foreach ( $messages as $k => $message ) {
182
-			$dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][ $user_id ] );
182
+			$dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][$user_id] );
183 183
 			if ( empty( $k ) || $this->is_expired( $message ) || ( $type === 'dismissed' ) !== $dismissed ) {
184
-				unset( $messages[ $k ] );
184
+				unset( $messages[$k] );
185 185
 			} elseif ( ! $this->is_for_user( $message ) ) {
186
-				unset( $messages[ $k ] );
186
+				unset( $messages[$k] );
187 187
 			}
188 188
 		}
189 189
 		$messages = apply_filters( 'frm_filter_inbox', $messages );
@@ -241,14 +241,14 @@  discard block
 block discarded – undo
241 241
 	 * @return void
242 242
 	 */
243 243
 	public function mark_read( $key ) {
244
-		if ( ! $key || ! isset( self::$messages[ $key ] ) ) {
244
+		if ( ! $key || ! isset( self::$messages[$key] ) ) {
245 245
 			return;
246 246
 		}
247 247
 
248
-		if ( ! isset( self::$messages[ $key ]['read'] ) ) {
249
-			self::$messages[ $key ]['read'] = array();
248
+		if ( ! isset( self::$messages[$key]['read'] ) ) {
249
+			self::$messages[$key]['read'] = array();
250 250
 		}
251
-		self::$messages[ $key ]['read'][ get_current_user_id() ] = time();
251
+		self::$messages[$key]['read'][get_current_user_id()] = time();
252 252
 
253 253
 		$this->update_list();
254 254
 	}
@@ -260,9 +260,9 @@  discard block
 block discarded – undo
260 260
 	 * @return void
261 261
 	 */
262 262
 	public function mark_unread( $key ) {
263
-		$is_read = isset( self::$messages[ $key ] ) && isset( self::$messages[ $key ]['read'] ) && isset( self::$messages[ $key ]['read'][ get_current_user_id() ] );
263
+		$is_read = isset( self::$messages[$key] ) && isset( self::$messages[$key]['read'] ) && isset( self::$messages[$key]['read'][get_current_user_id()] );
264 264
 		if ( $is_read ) {
265
-			unset( self::$messages[ $key ]['read'][ get_current_user_id() ] );
265
+			unset( self::$messages[$key]['read'][get_current_user_id()] );
266 266
 			$this->update_list();
267 267
 		}
268 268
 	}
@@ -278,14 +278,14 @@  discard block
 block discarded – undo
278 278
 			return;
279 279
 		}
280 280
 
281
-		if ( ! isset( self::$messages[ $key ] ) ) {
281
+		if ( ! isset( self::$messages[$key] ) ) {
282 282
 			return;
283 283
 		}
284 284
 
285
-		if ( ! isset( self::$messages[ $key ]['dismissed'] ) ) {
286
-			self::$messages[ $key ]['dismissed'] = array();
285
+		if ( ! isset( self::$messages[$key]['dismissed'] ) ) {
286
+			self::$messages[$key]['dismissed'] = array();
287 287
 		}
288
-		self::$messages[ $key ]['dismissed'][ get_current_user_id() ] = time();
288
+		self::$messages[$key]['dismissed'][get_current_user_id()] = time();
289 289
 
290 290
 		$this->update_list();
291 291
 	}
@@ -299,11 +299,11 @@  discard block
 block discarded – undo
299 299
 		$user_id = get_current_user_id();
300 300
 		foreach ( self::$messages as $key => $message ) {
301 301
 			if ( ! isset( $message['dismissed'] ) ) {
302
-				self::$messages[ $key ]['dismissed'] = array();
302
+				self::$messages[$key]['dismissed'] = array();
303 303
 			}
304 304
 
305
-			if ( ! isset( $message['dismissed'][ $user_id ] ) ) {
306
-				self::$messages[ $key ]['dismissed'][ $user_id ] = time();
305
+			if ( ! isset( $message['dismissed'][$user_id] ) ) {
306
+				self::$messages[$key]['dismissed'][$user_id] = time();
307 307
 			}
308 308
 		}
309 309
 		$this->update_list();
@@ -313,8 +313,8 @@  discard block
 block discarded – undo
313 313
 		$messages = $this->get_messages( 'filter' );
314 314
 		$user_id  = get_current_user_id();
315 315
 		foreach ( $messages as $t => $message ) {
316
-			if ( isset( $message['read'] ) && isset( $message['read'][ $user_id ] ) ) {
317
-				unset( $messages[ $t ] );
316
+			if ( isset( $message['read'] ) && isset( $message['read'][$user_id] ) ) {
317
+				unset( $messages[$t] );
318 318
 			}
319 319
 		}
320 320
 		return $messages;
@@ -353,8 +353,8 @@  discard block
 block discarded – undo
353 353
 	 * @return void
354 354
 	 */
355 355
 	public function remove( $key ) {
356
-		if ( isset( self::$messages[ $key ] ) ) {
357
-			unset( self::$messages[ $key ] );
356
+		if ( isset( self::$messages[$key] ) ) {
357
+			unset( self::$messages[$key] );
358 358
 			$this->update_list();
359 359
 		}
360 360
 	}
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
 			 * @param array $matches The regex results for a single match.
401 401
 			 * @return string
402 402
 			 */
403
-			function ( $matches ) {
403
+			function( $matches ) {
404 404
 				$url   = $matches[2];
405 405
 				$parts = parse_url( $url );
406 406
 
@@ -463,8 +463,8 @@  discard block
 block discarded – undo
463 463
 		$inbox = new self();
464 464
 		return array_filter(
465 465
 			$inbox->get_messages( 'filter' ),
466
-			function ( $message ) use ( $key ) {
467
-				return ! empty( $message[ $key ] );
466
+			function( $message ) use ( $key ) {
467
+				return ! empty( $message[$key] );
468 468
 			}
469 469
 		);
470 470
 	}
@@ -510,8 +510,8 @@  discard block
 block discarded – undo
510 510
 
511 511
 		return array_reduce(
512 512
 			$keys_to_return,
513
-			function ( $total, $key ) use ( $message ) {
514
-				$total[ $key ] = isset( $message[ $key ] ) ? $message[ $key ] : '';
513
+			function( $total, $key ) use ( $message ) {
514
+				$total[$key] = isset( $message[$key] ) ? $message[$key] : '';
515 515
 				return $total;
516 516
 			},
517 517
 			array()
Please login to merge, or discard this patch.
classes/models/FrmFieldTypeOptionData.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -19,9 +19,9 @@
 block discarded – undo
19 19
 	 * @return array
20 20
 	 */
21 21
 	public static function get_field_types( $type ) {
22
-		if ( ! isset( self::$data[ $type ] ) ) {
23
-			self::$data[ $type ] = FrmFieldsHelper::get_field_types( $type );
22
+		if ( ! isset( self::$data[$type] ) ) {
23
+			self::$data[$type] = FrmFieldsHelper::get_field_types( $type );
24 24
 		}
25
-		return self::$data[ $type ];
25
+		return self::$data[$type];
26 26
 	}
27 27
 }
Please login to merge, or discard this patch.