Strategy11 / formidable-forms

classes/controllers/FrmSMTPController.php

Spacing +1 added lines, -1 removed lines

@@ -235,7 +235,7 @@
 		if ( is_array( $upsell ) ) {
 			foreach ( $upsell as $k => $plugin ) {
 				if ( strpos( $plugin['slug'], 'wpforms' ) !== false ) {
-					unset( $upsell[ $k ] );
+					unset( $upsell[$k] );
 				}
 			}
 		}

css/_single_theme.css.php

Spacing +4 added lines, -4 removed lines

@@ -129,11 +129,11 @@ 
 <?php } ?>
 
 .<?php echo esc_html( $style_class ); ?> .frm_icon_font.frm_minus_icon:before{
-	content:"\e<?php echo esc_html( isset( $minus_icons[ $repeat_icon ] ) ? $minus_icons[ $repeat_icon ]['-'] : $minus_icons[1]['-'] ); ?>";
+	content:"\e<?php echo esc_html( isset( $minus_icons[$repeat_icon] ) ? $minus_icons[$repeat_icon]['-'] : $minus_icons[1]['-'] ); ?>";
 }
 
 .<?php echo esc_html( $style_class ); ?> .frm_icon_font.frm_plus_icon:before{
-	content:"\e<?php echo esc_html( isset( $minus_icons[ $repeat_icon ] ) ? $minus_icons[ $repeat_icon ]['+'] : $minus_icons[1]['+'] ); ?>";
+	content:"\e<?php echo esc_html( isset( $minus_icons[$repeat_icon] ) ? $minus_icons[$repeat_icon]['+'] : $minus_icons[1]['+'] ); ?>";
 }
 
 .<?php echo esc_html( $style_class ); ?> .frm_icon_font.frm_minus_icon:before,
@@ -145,14 +145,14 @@ 
 }
 
 .<?php echo esc_html( $style_class ); ?> .frm_trigger.active .frm_icon_font.frm_arrow_icon:before{
-	content:"\e<?php echo esc_html( isset( $arrow_icons[ $collapse_icon ] ) ? $arrow_icons[ $collapse_icon ]['-'] : $arrow_icons[1]['-'] ); ?>";
+	content:"\e<?php echo esc_html( isset( $arrow_icons[$collapse_icon] ) ? $arrow_icons[$collapse_icon]['-'] : $arrow_icons[1]['-'] ); ?>";
 	<?php if ( ! empty( $section_color ) ) { ?>
 		color:<?php echo esc_html( $section_color . $important ); ?>;
 	<?php } ?>
 }
 
 .<?php echo esc_html( $style_class ); ?> .frm_trigger .frm_icon_font.frm_arrow_icon:before{
-	content:"\e<?php echo esc_html( isset( $arrow_icons[ $collapse_icon ] ) ? $arrow_icons[ $collapse_icon ]['+'] : $arrow_icons[1]['+'] ); ?>";
+	content:"\e<?php echo esc_html( isset( $arrow_icons[$collapse_icon] ) ? $arrow_icons[$collapse_icon]['+'] : $arrow_icons[1]['+'] ); ?>";
 	<?php if ( ! empty( $section_color ) ) { ?>
 		color:<?php echo esc_html( $section_color . $important ); ?>;
 	<?php } ?>

classes/models/FrmReviews.php

Spacing +4 added lines, -4 removed lines

@@ -71,12 +71,12 @@ 
 		$show_intervals = array( 50, 200, 500 );
 		$asked          = $this->review_status['asked'];
 
-		if ( ! isset( $show_intervals[ $asked ] ) ) {
+		if ( ! isset( $show_intervals[$asked] ) ) {
 			return;
 		}
 
 		$entries = FrmEntry::getRecordCount();
-		$count   = $show_intervals[ $asked ];
+		$count   = $show_intervals[$asked];
 		$user    = wp_get_current_user();
 
 		// Only show review request if the site has collected enough entries
@@ -118,7 +118,7 @@ 
 		$requests = $message->get_messages();
 		$key      = $this->inbox_key . ( $asked ? $asked : '' );
 
-		if ( isset( $requests[ $key ] ) ) {
+		if ( isset( $requests[$key] ) ) {
 			return;
 		}
 
@@ -154,7 +154,7 @@ 
 	 * @since 4.05.02
 	 */
 	private function has_later_request( $requests, $asked ) {
-		return isset( $requests[ $this->inbox_key . ( $asked + 1 ) ] ) || isset( $requests[ $this->inbox_key . ( $asked + 2 ) ] );
+		return isset( $requests[$this->inbox_key . ( $asked + 1 )] ) || isset( $requests[$this->inbox_key . ( $asked + 2 )] );
 	}
 
 	/**

classes/helpers/FrmStylesHelper.php

Spacing +14 added lines, -14 removed lines

@@ -191,7 +191,7 @@ 
 				'-' => 'down',
 				'+' => 'up',
 			);
-			$class = 'frm_arrow' . $arrow[ $icon ];
+			$class = 'frm_arrow' . $arrow[$icon];
 		} else {
 			//frm_minus1_icon
 			$key   = str_replace( 'p', '', $key );
@@ -199,7 +199,7 @@ 
 				'-' => 'minus',
 				'+' => 'plus',
 			);
-			$class = 'frm_' . $plus[ $icon ];
+			$class = 'frm_' . $plus[$icon];
 		}
 
 		if ( $key ) {
@@ -219,8 +219,8 @@ 
 		?>
 		<div class="btn-group" id="frm_<?php echo esc_attr( $name ); ?>_select">
 			<button class="multiselect dropdown-toggle btn btn-default" data-toggle="dropdown" type="button">
-				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[ $name ], '+', $type ) ); ?>
-				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[ $name ], '-', $type ) ); ?>
+				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[$name], '+', $type ) ); ?>
+				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[$name], '-', $type ) ); ?>
 				<b class="caret"></b>
 			</button>
 			<ul class="multiselect-container frm-dropdown-menu">
@@ -228,7 +228,7 @@ 
 					<li <?php echo ( $style->post_content['collapse_icon'] == $key ) ? 'class="active"' : ''; ?>>
 						<a href="javascript:void(0);">
 							<label>
-								<input type="radio" value="<?php echo esc_attr( $key ); ?>" name="<?php echo esc_attr( $frm_style->get_field_name( $name ) ); ?>" <?php checked( $style->post_content[ $name ], $key ); ?>/>
+								<input type="radio" value="<?php echo esc_attr( $key ); ?>" name="<?php echo esc_attr( $frm_style->get_field_name( $name ) ); ?>" <?php checked( $style->post_content[$name], $key ); ?>/>
 								<span>
 									<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $key, '+', $type ) ); ?>
 									<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $key, '-', $type ) ); ?>
@@ -310,15 +310,15 @@ 
 		$vars   = array_diff( $vars, $remove );
 
 		foreach ( $vars as $var ) {
-			if ( ! isset( $settings[ $var ] ) ) {
+			if ( ! isset( $settings[$var] ) ) {
 				continue;
 			}
-			if ( ! isset( $defaults[ $var ] ) ) {
-				$defaults[ $var ] = '';
+			if ( ! isset( $defaults[$var] ) ) {
+				$defaults[$var] = '';
 			}
-			$show = empty( $defaults ) || ( $settings[ $var ] !== '' && $settings[ $var ] !== $defaults[ $var ] );
+			$show = empty( $defaults ) || ( $settings[$var] !== '' && $settings[$var] !== $defaults[$var] );
 			if ( $show ) {
-				echo '--' . esc_html( str_replace( '_', '-', $var ) ) . ':' . ( $var === 'font' ? FrmAppHelper::kses( $settings[ $var ] ) : esc_html( $settings[ $var ] ) ) . ';'; // WPCS: XSS ok.
+				echo '--' . esc_html( str_replace( '_', '-', $var ) ) . ':' . ( $var === 'font' ? FrmAppHelper::kses( $settings[$var] ) : esc_html( $settings[$var] ) ) . ';'; // WPCS: XSS ok.
 			}
 		}
 	}
@@ -358,14 +358,14 @@ 
 			$settings['style_class'] = 'frm_style_' . $style->post_name . '.';
 		}
 
-		$settings['style_class']   .= 'with_frm_style';
+		$settings['style_class'] .= 'with_frm_style';
 		$settings['font']          = stripslashes( $settings['font'] );
 		$settings['change_margin'] = self::description_margin_for_screensize( $settings['width'] );
 
 		$checkbox_opts = array( 'important_style', 'auto_width', 'submit_style', 'collapse_icon', 'center_form' );
 		foreach ( $checkbox_opts as $opt ) {
-			if ( ! isset( $settings[ $opt ] ) ) {
-				$settings[ $opt ] = 0;
+			if ( ! isset( $settings[$opt] ) ) {
+				$settings[$opt] = 0;
 			}
 		}
 
@@ -389,7 +389,7 @@ 
 				$css = '';
 			}
 			foreach ( $opts as $opt ) {
-				self::get_color_output( $css, $settings[ $opt ] );
+				self::get_color_output( $css, $settings[$opt] );
 			}
 		}
 	}

classes/models/FrmEntryFormatter.php

Spacing +7 added lines, -7 removed lines

@@ -161,8 +161,8 @@ 
 
 		$conditionally_add = array( 'include_fields', 'fields', 'exclude_fields', 'entry' );
 		foreach ( $conditionally_add as $index ) {
-			if ( isset( $atts[ $index ] ) ) {
-				$entry_atts[ $index ] = $atts[ $index ];
+			if ( isset( $atts[$index] ) ) {
+				$entry_atts[$index] = $atts[$index];
 			}
 		}
 
@@ -331,8 +331,8 @@ 
 
 		$unset = array( 'id', 'entry', 'form_id', 'format' );
 		foreach ( $unset as $param ) {
-			if ( isset( $atts[ $param ] ) ) {
-				unset( $atts[ $param ] );
+			if ( isset( $atts[$param] ) ) {
+				unset( $atts[$param] );
 			}
 		}
 
@@ -485,11 +485,11 @@ 
 
 			$displayed_value = $this->prepare_display_value_for_array( $field_value->get_displayed_value() );
 
-			$output[ $this->get_key_or_id( $field_value ) ] = $displayed_value;
+			$output[$this->get_key_or_id( $field_value )] = $displayed_value;
 
 			$has_separate_value = (bool) $field_value->get_field_option( 'separate_value' );
 			if ( $has_separate_value || $displayed_value !== $field_value->get_saved_value() ) {
-				$output[ $this->get_key_or_id( $field_value ) . '-value' ] = $field_value->get_saved_value();
+				$output[$this->get_key_or_id( $field_value ) . '-value'] = $field_value->get_saved_value();
 			}
 		}
 	}
@@ -876,7 +876,7 @@ 
 
 			if ( is_array( $value ) ) {
 				foreach ( $value as $key => $single_value ) {
-					$value[ $key ] = $this->strip_html( $single_value );
+					$value[$key] = $this->strip_html( $single_value );
 				}
 			} elseif ( $this->is_plain_text && ! is_array( $value ) ) {
 				if ( strpos( $value, '<img' ) !== false ) {

classes/models/FrmSolution.php

Braces +2 added lines, -1 removed lines

@@ -125,7 +125,8 @@
 		}
 
 		// Only do this for single site installs.
-		if ( isset( $_GET['activate-multi'] ) || is_network_admin() ) { // WPCS: CSRF ok.
+		if ( isset( $_GET['activate-multi'] ) || is_network_admin() ) {
+// WPCS: CSRF ok.
 			return;
 		}
 

Spacing +10 added lines, -10 removed lines

@@ -159,7 +159,7 @@ 
 	 */
 	public function add_settings( $sections ) {
 		wp_enqueue_style( 'formidable-pro-fields' );
-		$sections[ $this->plugin_slug ] = array(
+		$sections[$this->plugin_slug] = array(
 			'class'    => $this,
 			'function' => 'settings_page',
 			'name'     => $this->plugin_name(),
@@ -316,9 +316,9 @@ 
 			// Set the current step.
 			if ( ! isset( $step['current'] ) ) {
 				if ( $step['complete'] ) {
-					$steps[ $k ]['current'] = false;
+					$steps[$k]['current'] = false;
 				} else {
-					$steps[ $k ]['current'] = ! $has_current;
+					$steps[$k]['current'] = ! $has_current;
 					$has_current = true;
 				}
 			} elseif ( $step['current'] ) {
@@ -328,10 +328,10 @@ 
 			// Set disabled buttons.
 			$class = isset( $step['button_class'] ) ? $step['button_class'] : '';
 			$class .= ' button-primary frm-button-primary';
-			if ( ! $steps[ $k ]['current'] ) {
+			if ( ! $steps[$k]['current'] ) {
 				$class .= ' frm_grey disabled';
 			}
-			$steps[ $k ]['button_class'] = $class;
+			$steps[$k]['button_class'] = $class;
 		}
 
 		return $steps;
@@ -353,7 +353,7 @@ 
 			if ( $plugin['status'] === 'active' ) {
 				continue;
 			}
-			$links[ $plugin_key ] = $plugin;
+			$links[$plugin_key] = $plugin;
 			if ( isset( $plugin['url'] ) ) {
 				$rel[] = $plugin['url'];
 			} else {
@@ -468,7 +468,7 @@ 
 		$addons = $api->get_api_info();
 
 		$id = $this->download_id();
-		$has_file = isset( $addons[ $id ] ) && isset( $addons[ $id ]['beta'] );
+		$has_file = isset( $addons[$id] ) && isset( $addons[$id]['beta'] );
 
 		if ( ! $step['current'] ) {
 			?>
@@ -483,10 +483,10 @@ 
 
 		if ( ! $has_file ) {
 			echo '<p class="frm_error_style">' . esc_html__( 'We didn\'t find anything to import. Please contact our team.', 'formidable' ) . '</p>';
-		} elseif ( ! isset( $addons[ $id ]['beta']['package'] ) ) {
+		} elseif ( ! isset( $addons[$id]['beta']['package'] ) ) {
 			echo '<p class="frm_error_style">' . esc_html__( 'Looks like you may not have a current subscription for this solution. Please check your account.', 'formidable' ) . '</p>';
 		} else {
-			$xml = $addons[ $id ]['beta']['package'];
+			$xml = $addons[$id]['beta']['package'];
 			if ( is_array( $xml ) ) {
 				$xml = reset( $xml );
 			}
@@ -624,7 +624,7 @@ 
 		foreach ( $forms as $form ) {
 			$was_imported = isset( $form['form'] ) ? FrmForm::get_id_by_key( $form['form'] ) : false;
 			if ( $was_imported ) {
-				$imported[ $form['form'] ] = $was_imported;
+				$imported[$form['form']] = $was_imported;
 			}
 		}
 

classes/views/inbox/list.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 			</h3>
 			<span class="frm_inbox_date">
 				<?php
-				if ( ! isset( $message['read'] ) || ! isset( $message['read'][ $user->ID ] ) ) {
+				if ( ! isset( $message['read'] ) || ! isset( $message['read'][$user->ID] ) ) {
 					$inbox->mark_read( $key );
 					?>
 					<span class="frm_inbox_unread"></span>

classes/helpers/FrmEntriesHelper.php

Spacing +29 added lines, -29 removed lines

@@ -117,10 +117,10 @@ 
 		if ( $_POST ) {
 			$repeating = isset( $args['repeating'] ) && $args['repeating'];
 			if ( $repeating ) {
-				if ( isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field->id ] ) ) {
+				if ( isset( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field->id] ) ) {
 					$value_is_posted = true;
 				}
-			} elseif ( isset( $_POST['item_meta'][ $field->id ] ) ) {
+			} elseif ( isset( $_POST['item_meta'][$field->id] ) ) {
 				$value_is_posted = true;
 			}
 		}
@@ -150,7 +150,7 @@ 
 		preg_match_all( "/\[(default-message|default_message)\b(.*?)(?:(\/))?\]/s", $message, $shortcodes, PREG_PATTERN_ORDER );
 
 		foreach ( $shortcodes[0] as $short_key => $tag ) {
-			$add_atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[2][ $short_key ] );
+			$add_atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[2][$short_key] );
 			if ( ! empty( $add_atts ) ) {
 				$this_atts = array_merge( $atts, $add_atts );
 			} else {
@@ -160,14 +160,14 @@ 
 			$default = FrmEntriesController::show_entry_shortcode( $this_atts );
 
 			// Add the default message.
-			$message = str_replace( $shortcodes[0][ $short_key ], $default, $message );
+			$message = str_replace( $shortcodes[0][$short_key], $default, $message );
 		}
 
 		return $message;
 	}
 
 	public static function prepare_display_value( $entry, $field, $atts ) {
-		$field_value = isset( $entry->metas[ $field->id ] ) ? $entry->metas[ $field->id ] : false;
+		$field_value = isset( $entry->metas[$field->id] ) ? $entry->metas[$field->id] : false;
 
 		if ( FrmAppHelper::pro_is_installed() ) {
 			$empty = empty( $field_value );
@@ -190,7 +190,7 @@ 
 			$child_entries = FrmEntry::getAll( array( 'it.parent_item_id' => $entry->id ) );
 		} else {
 			// Get all values for this field.
-			$child_values = isset( $entry->metas[ $atts['embedded_field_id'] ] ) ? $entry->metas[ $atts['embedded_field_id'] ] : false;
+			$child_values = isset( $entry->metas[$atts['embedded_field_id']] ) ? $entry->metas[$atts['embedded_field_id']] : false;
 
 			if ( $child_values ) {
 				$child_entries = FrmEntry::getAll( array( 'it.id' => (array) $child_values ) );
@@ -308,7 +308,7 @@ 
 			$value = $args['temp_value'];
 		}
 		if ( empty( $args['parent_field_id'] ) ) {
-			$_POST['item_meta'][ $field->id ] = $value;
+			$_POST['item_meta'][$field->id] = $value;
 		} else {
 			self::set_parent_field_posted_value( $field, $value, $args );
 		}
@@ -320,20 +320,20 @@ 
 	 * @since 4.01
 	 */
 	private static function set_parent_field_posted_value( $field, $value, $args ) {
-		if ( isset( $_POST['item_meta'][ $args['parent_field_id'] ] ) &&
-			 is_array( $_POST['item_meta'][ $args['parent_field_id'] ] ) ) {
+		if ( isset( $_POST['item_meta'][$args['parent_field_id']] ) &&
+			 is_array( $_POST['item_meta'][$args['parent_field_id']] ) ) {
 
-			if ( ! isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ] ) ||
-				 ! is_array( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ] ) ) {
-				$_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ] = array();
+			if ( ! isset( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']] ) ||
+				 ! is_array( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']] ) ) {
+				$_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']] = array();
 			}
 		} else {
 			// All of the section was probably removed.
-			$_POST['item_meta'][ $args['parent_field_id'] ] = array();
-			$_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ] = array();
+			$_POST['item_meta'][$args['parent_field_id']] = array();
+			$_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']] = array();
 		}
 
-		$_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field->id ] = $value;
+		$_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field->id] = $value;
 	}
 
 	public static function get_posted_value( $field, &$value, $args ) {
@@ -364,10 +364,10 @@ 
 		if ( empty( $args['parent_field_id'] ) ) {
 			// Sanitizing is done next.
 			// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-			$value = isset( $_POST['item_meta'][ $field_id ] ) ? wp_unslash( $_POST['item_meta'][ $field_id ] ) : '';
+			$value = isset( $_POST['item_meta'][$field_id] ) ? wp_unslash( $_POST['item_meta'][$field_id] ) : '';
 		} else {
 			// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-			$value = isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] ) ? wp_unslash( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] ) : '';
+			$value = isset( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field_id] ) ? wp_unslash( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field_id] ) : '';
 		}
 		return $value;
 	}
@@ -398,7 +398,7 @@ 
 		self::set_other_repeating_vals( $field, $value, $args );
 
 		// Check if there are any posted "Other" values.
-		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta']['other'][ $field->id ] ) ) {
+		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta']['other'][$field->id] ) ) {
 
 			// Save original value.
 			$args['temp_value'] = $value;
@@ -406,7 +406,7 @@ 
 
 			// Sanitizing is done next.
 			// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-			$other_vals = wp_unslash( $_POST['item_meta']['other'][ $field->id ] );
+			$other_vals = wp_unslash( $_POST['item_meta']['other'][$field->id] );
 			FrmAppHelper::sanitize_value( 'sanitize_text_field', $other_vals );
 
 			// Set the validation value now
@@ -429,13 +429,13 @@ 
 		}
 
 		// Check if there are any other posted "other" values for this field.
-		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ]['other'][ $field->id ] ) ) {
+		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']]['other'][$field->id] ) ) {
 			// Save original value
 			$args['temp_value'] = $value;
 			$args['other']      = true;
 
 			// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-			$other_vals = wp_unslash( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ]['other'][ $field->id ] );
+			$other_vals = wp_unslash( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']]['other'][$field->id] );
 			FrmAppHelper::sanitize_value( 'sanitize_text_field', $other_vals );
 
 			// Set the validation value now.
@@ -462,7 +462,7 @@ 
 		if ( is_array( $value ) && $field->type === 'checkbox' ) {
 			// Combine "Other" values with checked values. "Other" values will override checked box values.
 			foreach ( $other_vals as $k => $v ) {
-				if ( isset( $value[ $k ] ) && trim( $v ) === '' ) {
+				if ( isset( $value[$k] ) && trim( $v ) === '' ) {
 					// If the other box is checked, but doesn't have a value.
 					$value = '';
 					break;
@@ -479,25 +479,25 @@ 
 
 			// Multi-select dropdown.
 			if ( is_array( $value ) ) {
-				$o_key = array_search( $field->options[ $other_key ], $value );
+				$o_key = array_search( $field->options[$other_key], $value );
 
 				if ( $o_key !== false ) {
 					// Modify the original value so other key will be preserved.
-					$value[ $other_key ] = $value[ $o_key ];
+					$value[$other_key] = $value[$o_key];
 
 					// By default, the array keys will be numeric for multi-select dropdowns.
 					// If going backwards and forwards between pages, the array key will match the other key.
 					if ( $o_key !== $other_key ) {
-						unset( $value[ $o_key ] );
+						unset( $value[$o_key] );
 					}
 
 					$args['temp_value']  = $value;
-					$value[ $other_key ] = reset( $other_vals );
-					if ( FrmAppHelper::is_empty_value( $value[ $other_key ] ) ) {
-						unset( $value[ $other_key ] );
+					$value[$other_key] = reset( $other_vals );
+					if ( FrmAppHelper::is_empty_value( $value[$other_key] ) ) {
+						unset( $value[$other_key] );
 					}
 				}
-			} elseif ( $field->options[ $other_key ] == $value ) {
+			} elseif ( $field->options[$other_key] == $value ) {
 				$value = $other_vals;
 			}
 		}

classes/models/FrmForm.php

Spacing +20 added lines, -20 removed lines

@@ -140,7 +140,7 @@ 
 
 		foreach ( $values as $value_key => $value ) {
 			if ( $value_key && in_array( $value_key, $form_fields ) ) {
-				$new_values[ $value_key ] = $value;
+				$new_values[$value_key] = $value;
 			}
 		}
 
@@ -210,15 +210,15 @@ 
 		$existing_keys = array_keys( $values['item_meta'] );
 		foreach ( $all_fields as $fid ) {
 			if ( ! in_array( $fid->id, $existing_keys ) && ( isset( $values['frm_fields_submitted'] ) && in_array( $fid->id, $values['frm_fields_submitted'] ) ) || isset( $values['options'] ) ) {
-				$values['item_meta'][ $fid->id ] = '';
+				$values['item_meta'][$fid->id] = '';
 			}
-			$field_array[ $fid->id ] = $fid;
+			$field_array[$fid->id] = $fid;
 		}
 		unset( $all_fields );
 
 		foreach ( $values['item_meta'] as $field_id => $default_value ) {
-			if ( isset( $field_array[ $field_id ] ) ) {
-				$field = $field_array[ $field_id ];
+			if ( isset( $field_array[$field_id] ) ) {
+				$field = $field_array[$field_id];
 			} else {
 				$field = FrmField::getOne( $field_id );
 			}
@@ -227,7 +227,7 @@ 
 				continue;
 			}
 
-			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options'][ 'custom_html_' . $field_id ] ) );
+			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options']['custom_html_' . $field_id] ) );
 			if ( $is_settings_page ) {
 				self::get_settings_page_html( $values, $field );
 
@@ -242,15 +242,15 @@ 
 			$update_options = apply_filters( 'frm_field_options_to_update', $update_options );
 
 			foreach ( $update_options as $opt => $default ) {
-				$field->field_options[ $opt ] = isset( $values['field_options'][ $opt . '_' . $field_id ] ) ? $values['field_options'][ $opt . '_' . $field_id ] : $default;
-				self::sanitize_field_opt( $opt, $field->field_options[ $opt ] );
+				$field->field_options[$opt] = isset( $values['field_options'][$opt . '_' . $field_id] ) ? $values['field_options'][$opt . '_' . $field_id] : $default;
+				self::sanitize_field_opt( $opt, $field->field_options[$opt] );
 			}
 
 			$field->field_options = apply_filters( 'frm_update_field_options', $field->field_options, $field, $values );
 
 			$new_field = array(
 				'field_options' => $field->field_options,
-				'default_value' => isset( $values[ 'default_value_' . $field_id ] ) ? FrmAppHelper::maybe_json_encode( $values[ 'default_value_' . $field_id ] ) : '',
+				'default_value' => isset( $values['default_value_' . $field_id] ) ? FrmAppHelper::maybe_json_encode( $values['default_value_' . $field_id] ) : '',
 			);
 
 			self::prepare_field_update_values( $field, $values, $new_field );
@@ -283,11 +283,11 @@ 
 	 * Updating the settings page
 	 */
 	private static function get_settings_page_html( $values, &$field ) {
-		if ( isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ) {
+		if ( isset( $values['field_options']['custom_html_' . $field->id] ) ) {
 			$prev_opts     = array();
 			$fallback_html = isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type );
 
-			$field->field_options['custom_html'] = isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ? $values['field_options'][ 'custom_html_' . $field->id ] : $fallback_html;
+			$field->field_options['custom_html'] = isset( $values['field_options']['custom_html_' . $field->id] ) ? $values['field_options']['custom_html_' . $field->id] : $fallback_html;
 		} elseif ( $field->type == 'hidden' || $field->type == 'user_id' ) {
 			$prev_opts = $field->field_options;
 		}
@@ -313,7 +313,7 @@ 
 		foreach ( $field_cols as $col => $default ) {
 			$default = ( $default === '' ) ? $field->{$col} : $default;
 
-			$new_field[ $col ] = isset( $values['field_options'][ $col . '_' . $field->id ] ) ? $values['field_options'][ $col . '_' . $field->id ] : $default;
+			$new_field[$col] = isset( $values['field_options'][$col . '_' . $field->id] ) ? $values['field_options'][$col . '_' . $field->id] : $default;
 		}
 
 		// Don't save the template option.
@@ -727,8 +727,8 @@ 
 			self::maybe_get_form( $form );
 		}
 
-		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][ $form->id ] ) ) {
-			return $frm_vars['form_params'][ $form->id ];
+		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][$form->id] ) ) {
+			return $frm_vars['form_params'][$form->id];
 		}
 
 		$action_var = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action'; // WPCS: CSRF ok.
@@ -757,15 +757,15 @@ 
 			//if there are two forms on the same page, make sure not to submit both
 			foreach ( $default_values as $var => $default ) {
 				if ( $var == 'action' ) {
-					$values[ $var ] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
+					$values[$var] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
 				} else {
-					$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+					$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 				}
 				unset( $var, $default );
 			}
 		} else {
 			foreach ( $default_values as $var => $default ) {
-				$values[ $var ] = $default;
+				$values[$var] = $default;
 				unset( $var, $default );
 			}
 		}
@@ -791,7 +791,7 @@ 
 			'sdir'     => '',
 		);
 		foreach ( $defaults as $var => $default ) {
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+			$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 		}
 
 		return $values;
@@ -819,7 +819,7 @@ 
 			'keep_post' => '',
 		);
 		foreach ( $defaults as $var => $default ) {
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+			$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 		}
 
 		return $values;
@@ -905,7 +905,7 @@ 
 		$form = $atts['form'];
 		$default = isset( $atts['default'] ) ? $atts['default'] : '';
 
-		return isset( $form->options[ $atts['option'] ] ) ? $form->options[ $atts['option'] ] : $default;
+		return isset( $form->options[$atts['option']] ) ? $form->options[$atts['option']] : $default;
 	}
 
 	/**