Strategy11 / formidable-forms

classes/models/FrmForm.php

Spacing +32 added lines, -32 removed lines

@@ -216,7 +216,7 @@ 
 			}
 
 			if ( $new_val !== $value ) {
-				$new_values[ $key ] = $new_val;
+				$new_values[$key] = $new_val;
 			}
 		}//end foreach
 
@@ -253,7 +253,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;
 			}
 		}
 
@@ -338,15 +338,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 );
 			}
@@ -355,7 +355,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 );
 
@@ -375,22 +375,22 @@ 
 			}
 
 			foreach ( $update_options as $opt => $default ) {
-				$field->field_options[ $opt ] = $values['field_options'][ $opt . '_' . $field_id ] ?? $default;
-				self::sanitize_field_opt( $opt, $field->field_options[ $opt ] );
+				$field->field_options[$opt] = $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] ) : '',
 			);
 
-			if ( ! FrmAppHelper::allow_unfiltered_html() && isset( $values['field_options'][ 'options_' . $field_id ] ) && is_array( $values['field_options'][ 'options_' . $field_id ] ) ) {
-				foreach ( $values['field_options'][ 'options_' . $field_id ] as $option_key => $option ) {
+			if ( ! FrmAppHelper::allow_unfiltered_html() && isset( $values['field_options']['options_' . $field_id] ) && is_array( $values['field_options']['options_' . $field_id] ) ) {
+				foreach ( $values['field_options']['options_' . $field_id] as $option_key => $option ) {
 					if ( is_array( $option ) ) {
 						foreach ( $option as $key => $item ) {
-							$values['field_options'][ 'options_' . $field_id ][ $option_key ][ $key ] = FrmAppHelper::kses( $item, 'all' );
+							$values['field_options']['options_' . $field_id][$option_key][$key] = FrmAppHelper::kses( $item, 'all' );
 						}
 					}
 				}
@@ -420,8 +420,8 @@ 
 	 */
 	private static function maybe_update_max_option( $field, $values, &$new_field ) {
 		if ( $field->type === 'textarea' &&
-			! empty( $values['field_options'][ 'type_' . $field->id ] ) &&
-			in_array( $values['field_options'][ 'type_' . $field->id ], array( 'text', 'email', 'url', 'password', 'phone' ), true ) ) {
+			! empty( $values['field_options']['type_' . $field->id] ) &&
+			in_array( $values['field_options']['type_' . $field->id], array( 'text', 'email', 'url', 'password', 'phone' ), true ) ) {
 
 			$new_field['field_options']['max'] = '';
 
@@ -429,7 +429,7 @@ 
 			 * Update posted field setting so that new 'max' option is displayed after form is saved and page reloads.
 			 * FrmFieldsHelper::fill_default_field_opts populates field options by calling self::get_posted_field_setting.
 			 */
-			$_POST['field_options'][ 'max_' . $field->id ] = '';
+			$_POST['field_options']['max_' . $field->id] = '';
 		}
 	}
 
@@ -511,11 +511,11 @@ 
 	 * @return void
 	 */
 	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 = $field->field_options['custom_html'] ?? FrmFieldsHelper::get_default_html( $field->type );
 
-			$field->field_options['custom_html'] = $values['field_options'][ 'custom_html_' . $field->id ] ?? $fallback_html;
+			$field->field_options['custom_html'] = $values['field_options']['custom_html_' . $field->id] ?? $fallback_html;
 		} elseif ( $field->type === 'hidden' || $field->type === 'user_id' ) {
 			$prev_opts = $field->field_options;
 		}
@@ -540,7 +540,7 @@ 
 		);
 		foreach ( $field_cols as $col => $default ) {
 			$default           = $default === '' ? $field->{$col} : $default;
-			$new_field[ $col ] = $values['field_options'][ $col . '_' . $field->id ] ?? $default;
+			$new_field[$col] = $values['field_options'][$col . '_' . $field->id] ?? $default;
 		}
 
 		if ( $field->type === 'submit' && isset( $new_field['field_order'] ) && (int) $new_field['field_order'] === FrmSubmitHelper::DEFAULT_ORDER ) {
@@ -734,7 +734,7 @@ 
 			if ( ! isset( $form->options['trash_time'] ) || $form->options['trash_time'] < $delete_timestamp ) {
 				self::destroy( $form->id );
 				if ( empty( $form->parent_form_id ) ) {
-					++$count;
+					++ $count;
 				}
 			}
 
@@ -961,16 +961,16 @@ 
 		foreach ( $results as $row ) {
 			if ( 'trash' != $row->status ) {
 				if ( $row->is_template ) {
-					++$counts['template'];
+					++ $counts['template'];
 				} else {
-					++$counts['published'];
+					++ $counts['published'];
 				}
 			} else {
-				++$counts['trash'];
+				++ $counts['trash'];
 			}
 
 			if ( 'draft' == $row->status ) {
-				++$counts['draft'];
+				++ $counts['draft'];
 			}
 
 			unset( $row );
@@ -1011,8 +1011,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'; // phpcs:ignore WordPress.Security.NonceVerification.Missing
@@ -1041,15 +1041,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 );
 			}
 		}
@@ -1075,7 +1075,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;
@@ -1103,7 +1103,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;
@@ -1217,7 +1217,7 @@ 
 		$form    = $atts['form'];
 		$default = $atts['default'] ?? '';
 
-		return $form->options[ $atts['option'] ] ?? $default;
+		return $form->options[$atts['option']] ?? $default;
 	}
 
 	/**

classes/helpers/FrmEntriesHelper.php

Spacing +29 added lines, -29 removed lines

@@ -137,10 +137,10 @@ 
 		if ( $_POST ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
 			$repeating = isset( $args['repeating'] ) && $args['repeating'];
 			if ( $repeating ) {
-				if ( isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+				if ( isset( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field->id] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
 					$value_is_posted = true;
 				}
-			} elseif ( isset( $_POST['item_meta'][ $field->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+			} elseif ( isset( $_POST['item_meta'][$field->id] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
 				$value_is_posted = true;
 			}
 		}
@@ -172,7 +172,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 {
@@ -182,7 +182,7 @@ 
 			$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;
@@ -195,7 +195,7 @@ 
 	 * @return string
 	 */
 	public static function prepare_display_value( $entry, $field, $atts ) {
-		$field_value = $entry->metas[ $field->id ] ?? false;
+		$field_value = $entry->metas[$field->id] ?? false;
 
 		if ( FrmAppHelper::pro_is_installed() ) {
 			$empty = empty( $field_value );
@@ -223,7 +223,7 @@ 
 			$child_entries = FrmEntry::getAll( array( 'it.parent_item_id' => $entry->id ), '', '', true );
 		} else {
 			// Get all values for this field.
-			$child_values = $entry->metas[ $atts['embedded_field_id'] ] ?? false;
+			$child_values = $entry->metas[$atts['embedded_field_id']] ?? false;
 
 			if ( $child_values ) {
 				$child_entries = FrmEntry::getAll( array( 'it.id' => (array) $child_values ) );
@@ -345,7 +345,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 );
 		}
@@ -363,17 +363,17 @@ 
 	 * @return void
 	 */
 	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'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
-			if ( ! isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ] ) || ! is_array( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
-				$_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ] = array(); // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		if ( isset( $_POST['item_meta'][$args['parent_field_id']] ) && is_array( $_POST['item_meta'][$args['parent_field_id']] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+			if ( ! isset( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']] ) || ! is_array( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+				$_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']] = array(); // phpcs:ignore WordPress.Security.NonceVerification.Missing
 			}
 		} else {
 			// All of the section was probably removed.
-			$_POST['item_meta'][ $args['parent_field_id'] ]                         = array(); // phpcs:ignore WordPress.Security.NonceVerification.Missing
-			$_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ] = array(); // phpcs:ignore WordPress.Security.NonceVerification.Missing
+			$_POST['item_meta'][$args['parent_field_id']]                         = array(); // phpcs:ignore WordPress.Security.NonceVerification.Missing
+			$_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']] = array(); // phpcs:ignore WordPress.Security.NonceVerification.Missing
 		}
 
-		$_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field->id ] = $value; // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		$_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field->id] = $value; // phpcs:ignore WordPress.Security.NonceVerification.Missing
 	}
 
 	public static function get_posted_value( $field, &$value, $args ) {
@@ -413,9 +413,9 @@ 
 	private static function get_posted_meta( $field_id, $args ) {
 		if ( empty( $args['parent_field_id'] ) ) {
 			// Sanitizing is done next.
-			$value = isset( $_POST['item_meta'][ $field_id ] ) ? wp_unslash( $_POST['item_meta'][ $field_id ] ) : ''; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
+			$value = isset( $_POST['item_meta'][$field_id] ) ? wp_unslash( $_POST['item_meta'][$field_id] ) : ''; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
 		} else {
-			$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 ] ) : ''; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
+			$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] ) : ''; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
 		}
 		return $value;
 	}
@@ -446,14 +446,14 @@ 
 		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 ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta']['other'][$field->id] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
 
 			// Save original value.
 			$args['temp_value'] = $value;
 			$args['other']      = true;
 
 			// Sanitizing is done next.
-			$other_vals = wp_unslash( $_POST['item_meta']['other'][ $field->id ] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
+			$other_vals = wp_unslash( $_POST['item_meta']['other'][$field->id] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
 			FrmAppHelper::sanitize_value( 'sanitize_text_field', $other_vals );
 
 			// Set the validation value now
@@ -476,12 +476,12 @@ 
 		}
 
 		// 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 ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']]['other'][$field->id] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
 			// Save original value
 			$args['temp_value'] = $value;
 			$args['other']      = true;
 
-			$other_vals = wp_unslash( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ]['other'][ $field->id ] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
+			$other_vals = wp_unslash( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']]['other'][$field->id] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
 			FrmAppHelper::sanitize_value( 'sanitize_text_field', $other_vals );
 
 			// Set the validation value now.
@@ -508,7 +508,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;
@@ -525,25 +525,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;
 			}//end if
 		}//end if
@@ -797,7 +797,7 @@ 
 	 * @return void
 	 */
 	public static function maybe_render_captcha_score( $entry_id ) {
-		$query                 = array(
+		$query = array(
 			'item_id'  => (int) $entry_id,
 			'field_id' => 0,
 		);
@@ -851,7 +851,7 @@ 
 	public static function get_entry_status_label( $status ) {
 		$statuses = self::get_entry_statuses();
 
-		return $statuses[ self::get_entry_status( $status ) ];
+		return $statuses[self::get_entry_status( $status )];
 	}
 
 	/**

classes/controllers/FrmEntriesController.php

Spacing +26 added lines, -26 removed lines

@@ -152,20 +152,20 @@ 
 		global $frm_vars;
 		$form_id = FrmForm::get_current_form_id();
 
-		$columns[ $form_id . '_id' ]       = 'ID';
-		$columns[ $form_id . '_item_key' ] = esc_html__( 'Entry Key', 'formidable' );
+		$columns[$form_id . '_id']       = 'ID';
+		$columns[$form_id . '_item_key'] = esc_html__( 'Entry Key', 'formidable' );
 
 		if ( $form_id ) {
 			self::get_columns_for_form( $form_id, $columns );
 		} else {
-			$columns[ $form_id . '_form_id' ] = esc_html__( 'Form', 'formidable' );
-			$columns[ $form_id . '_name' ]    = esc_html__( 'Entry Name', 'formidable' );
-			$columns[ $form_id . '_user_id' ] = esc_html__( 'Created By', 'formidable' );
+			$columns[$form_id . '_form_id'] = esc_html__( 'Form', 'formidable' );
+			$columns[$form_id . '_name']    = esc_html__( 'Entry Name', 'formidable' );
+			$columns[$form_id . '_user_id'] = esc_html__( 'Created By', 'formidable' );
 		}
 
-		$columns[ $form_id . '_is_draft' ]   = esc_html__( 'Entry Status', 'formidable' );
-		$columns[ $form_id . '_created_at' ] = __( 'Entry creation date', 'formidable' );
-		$columns[ $form_id . '_updated_at' ] = __( 'Entry update date', 'formidable' );
+		$columns[$form_id . '_is_draft']   = esc_html__( 'Entry Status', 'formidable' );
+		$columns[$form_id . '_created_at'] = __( 'Entry creation date', 'formidable' );
+		$columns[$form_id . '_updated_at'] = __( 'Entry update date', 'formidable' );
 		self::maybe_add_ip_col( $form_id, $columns );
 
 		$frm_vars['cols'] = $columns;
@@ -229,10 +229,10 @@ 
 
 		foreach ( $sub_form_cols as $k => $sub_form_col ) {
 			if ( FrmField::is_no_save_field( $sub_form_col->type ) ) {
-				unset( $sub_form_cols[ $k ] );
+				unset( $sub_form_cols[$k] );
 				continue;
 			}
-			$columns[ $form_id . '_' . $sub_form_col->field_key . '-_-' . $field->id ] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
+			$columns[$form_id . '_' . $sub_form_col->field_key . '-_-' . $field->id] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
 			unset( $sub_form_col );
 		}
 	}
@@ -256,10 +256,10 @@ 
 		$is_post_status             = FrmField::is_option_true( $field, 'post_field' ) && $field->field_options['post_field'] === 'post_status';
 		$include_column_for_sep_val = $has_separate_value && ! $is_post_status;
 		if ( $include_column_for_sep_val ) {
-			$columns[ $form_id . '_frmsep_' . $col_id ] = self::maybe_format_field_name_for_column_title( $field, $include_column_for_sep_val );
+			$columns[$form_id . '_frmsep_' . $col_id] = self::maybe_format_field_name_for_column_title( $field, $include_column_for_sep_val );
 		}
 
-		$columns[ $form_id . '_' . $col_id ] = self::maybe_format_field_name_for_column_title( $field, $include_column_for_sep_val, false );
+		$columns[$form_id . '_' . $col_id] = self::maybe_format_field_name_for_column_title( $field, $include_column_for_sep_val, false );
 	}
 
 	/**
@@ -291,7 +291,7 @@ 
 	 */
 	private static function maybe_add_ip_col( $form_id, &$columns ) {
 		if ( FrmAppHelper::ips_saved() ) {
-			$columns[ $form_id . '_ip' ] = 'IP';
+			$columns[$form_id . '_ip'] = 'IP';
 		}
 	}
 
@@ -346,7 +346,7 @@ 
 		foreach ( $meta_value as $mk => $mv ) {
 			// Remove blank values.
 			if ( empty( $mv ) ) {
-				unset( $meta_value[ $mk ] );
+				unset( $meta_value[$mk] );
 			}
 		}
 
@@ -423,14 +423,14 @@ 
 		);
 
 		if ( ! $form_id ) {
-			$columns[ $form_id . '_user_id' ] = 'user_id';
-			$columns[ $form_id . '_name' ]    = 'name';
-			$columns[ $form_id . '_form_id' ] = 'form_id';
+			$columns[$form_id . '_user_id'] = 'user_id';
+			$columns[$form_id . '_name']    = 'name';
+			$columns[$form_id . '_form_id'] = 'form_id';
 		}
 
 		foreach ( $fields as $field ) {
 			if ( self::field_supports_sorting( $field ) ) {
-				$columns[ $form_id . '_' . $field->field_key ] = 'meta_' . $field->id;
+				$columns[$form_id . '_' . $field->field_key] = 'meta_' . $field->id;
 			}
 		}
 
@@ -518,7 +518,7 @@ 
 			$atts['form_id'] . '_item_key' => '',
 			$atts['form_id'] . '_id'       => '',
 		);
-		$cols         = $remove_first + array_reverse( $frm_vars['cols'], true );
+		$cols = $remove_first + array_reverse( $frm_vars['cols'], true );
 
 		$i = $atts['i'];
 
@@ -529,7 +529,7 @@ 
 
 			if ( empty( $result ) || ! in_array( $col_key, $result, true ) ) {
 				$result[] = $col_key;
-				--$i;
+				-- $i;
 			}
 
 			unset( $col_key, $col );
@@ -677,9 +677,9 @@ 
 		if ( ! isset( $frm_vars['form_params'] ) ) {
 			$frm_vars['form_params'] = array();
 		}
-		$frm_vars['form_params'][ $form->id ] = $params;
+		$frm_vars['form_params'][$form->id] = $params;
 
-		if ( isset( $frm_vars['created_entries'][ $form_id ] ) ) {
+		if ( isset( $frm_vars['created_entries'][$form_id] ) ) {
 			return;
 		}
 
@@ -695,16 +695,16 @@ 
 		 */
 		$errors = apply_filters( 'frm_entries_before_create', $errors, $form );
 
-		$frm_vars['created_entries'][ $form_id ] = array( 'errors' => $errors );
+		$frm_vars['created_entries'][$form_id] = array( 'errors' => $errors );
 
 		if ( empty( $errors ) ) {
 			$_POST['frm_skip_cookie'] = 1;
 			$do_success               = false;
 			if ( $params['action'] === 'create' ) {
-				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) {
-					$frm_vars['created_entries'][ $form_id ]['entry_id'] = FrmEntry::create( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
+				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][$form_id]['entry_id'] ) ) {
+					$frm_vars['created_entries'][$form_id]['entry_id'] = FrmEntry::create( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
 
-					$params['id'] = $frm_vars['created_entries'][ $form_id ]['entry_id'];
+					$params['id'] = $frm_vars['created_entries'][$form_id]['entry_id'];
 					$do_success   = true;
 				}
 			}

classes/helpers/FrmXMLHelper.php

Spacing +101 added lines, -101 removed lines

@@ -96,7 +96,7 @@ 
 				$content_before_channel_tag,
 				1
 			);
-			$xml_string                 = $content_before_channel_tag . substr( $xml_string, $channel_start_position );
+			$xml_string = $content_before_channel_tag . substr( $xml_string, $channel_start_position );
 		}
 	}
 
@@ -185,8 +185,8 @@ 
 			);
 
 			if ( $term && is_array( $term ) ) {
-				++$imported['imported']['terms'];
-				$imported['terms'][ (int) $t->term_id ] = $term['term_id'];
+				++ $imported['imported']['terms'];
+				$imported['terms'][(int) $t->term_id] = $term['term_id'];
 			}
 
 			unset( $term, $t );
@@ -246,11 +246,11 @@ 
 				if ( $form_id ) {
 					if ( empty( $form['parent_form_id'] ) ) {
 						// Don't include the repeater form in the imported count.
-						++$imported['imported']['forms'];
+						++ $imported['imported']['forms'];
 					}
 
 					// Keep track of whether this specific form was updated or not.
-					$imported['form_status'][ $form_id ] = 'imported';
+					$imported['form_status'][$form_id] = 'imported';
 				}
 			}
 
@@ -265,7 +265,7 @@ 
 			// Update field ids/keys to new ones.
 			do_action( 'frm_after_duplicate_form', $form_id, $form, array( 'old_id' => $old_id ) );
 
-			$imported['forms'][ (int) $item->id ] = $form_id;
+			$imported['forms'][(int) $item->id] = $form_id;
 
 			// Send pre 2.0 form options through function that creates actions.
 			self::migrate_form_settings_to_actions( $form['options'], $form_id, $imported, true );
@@ -335,19 +335,19 @@ 
 		FrmForm::update( $form_id, $form );
 		if ( empty( $form['parent_form_id'] ) ) {
 			// Don't include the repeater form in the updated count.
-			++$imported['updated']['forms'];
+			++ $imported['updated']['forms'];
 		}
 
 		// Keep track of whether this specific form was updated or not
-		$imported['form_status'][ $form_id ] = 'updated';
+		$imported['form_status'][$form_id] = 'updated';
 	}
 
 	private static function get_form_fields( $form_id ) {
 		$form_fields = FrmField::get_all_for_form( $form_id, '', 'exclude', 'exclude' );
 		$old_fields  = array();
 		foreach ( $form_fields as $f ) {
-			$old_fields[ $f->id ]        = $f;
-			$old_fields[ $f->field_key ] = $f->id;
+			$old_fields[$f->id]        = $f;
+			$old_fields[$f->field_key] = $f->id;
 			unset( $f );
 		}
 		$form_fields = $old_fields;
@@ -407,7 +407,7 @@ 
 	 */
 	private static function track_imported_child_forms( $form_id, $parent_form_id, &$child_forms ) {
 		if ( $parent_form_id ) {
-			$child_forms[ $form_id ] = $parent_form_id;
+			$child_forms[$form_id] = $parent_form_id;
 		}
 	}
 
@@ -422,9 +422,9 @@ 
 	 */
 	private static function maybe_update_child_form_parent_id( $imported_forms, $child_forms ) {
 		foreach ( $child_forms as $child_form_id => $old_parent_form_id ) {
-			if ( isset( $imported_forms[ $old_parent_form_id ] ) && (int) $imported_forms[ $old_parent_form_id ] !== (int) $old_parent_form_id ) {
+			if ( isset( $imported_forms[$old_parent_form_id] ) && (int) $imported_forms[$old_parent_form_id] !== (int) $old_parent_form_id ) {
 				// Update all children with this old parent_form_id
-				$new_parent_form_id = (int) $imported_forms[ $old_parent_form_id ];
+				$new_parent_form_id = (int) $imported_forms[$old_parent_form_id];
 				FrmForm::update( $child_form_id, array( 'parent_form_id' => $new_parent_form_id ) );
 				do_action( 'frm_update_child_form_parent_id', $child_form_id, $new_parent_form_id );
 			}
@@ -460,34 +460,34 @@ 
 
 			if ( ! empty( $this_form ) ) {
 				// check for field to edit by field id
-				if ( isset( $form_fields[ $f['id'] ] ) ) {
+				if ( isset( $form_fields[$f['id']] ) ) {
 					FrmField::update( $f['id'], $f );
-					++$imported['updated']['fields'];
+					++ $imported['updated']['fields'];
 
-					unset( $form_fields[ $f['id'] ] );
+					unset( $form_fields[$f['id']] );
 
 					// Unset old field key.
-					if ( isset( $form_fields[ $f['field_key'] ] ) ) {
-						unset( $form_fields[ $f['field_key'] ] );
+					if ( isset( $form_fields[$f['field_key']] ) ) {
+						unset( $form_fields[$f['field_key']] );
 					}
-				} elseif ( isset( $form_fields[ $f['field_key'] ] ) ) {
-					$keys_by_original_field_id[ $f['id'] ] = $f['field_key'];
+				} elseif ( isset( $form_fields[$f['field_key']] ) ) {
+					$keys_by_original_field_id[$f['id']] = $f['field_key'];
 
 					$old_field_id = $f['id'];
 
 					// check for field to edit by field key
 					unset( $f['id'] );
 
-					FrmField::update( $form_fields[ $f['field_key'] ], $f );
-					++$imported['updated']['fields'];
+					FrmField::update( $form_fields[$f['field_key']], $f );
+					++ $imported['updated']['fields'];
 
 					self::do_after_field_imported_action( $f, $form_fields, $old_field_id );
 
 					// Unset old field id.
-					unset( $form_fields[ $form_fields[ $f['field_key'] ] ] );
+					unset( $form_fields[$form_fields[$f['field_key']]] );
 
 					// Unset old field key.
-					unset( $form_fields[ $f['field_key'] ] );
+					unset( $form_fields[$f['field_key']] );
 				} else {
 					// If no matching field id or key in this form, create the field.
 					self::create_imported_field( $f, $imported );
@@ -527,7 +527,7 @@ 
 	 */
 	private static function do_after_field_imported_action( $field_array, $form_fields, $old_field_id ) {
 		// Assign field array the update field's ID.
-		$field_array['id'] = $form_fields[ $field_array['field_key'] ];
+		$field_array['id'] = $form_fields[$field_array['field_key']];
 
 		/**
 		 * Fires when an existing field is imported.
@@ -538,7 +538,7 @@ 
 		 * @param int   $field_id
 		 * @param int   $old_field_id
 		 */
-		do_action( 'frm_after_existing_field_is_imported', $field_array, $form_fields[ $field_array['field_key'] ], $old_field_id );
+		do_action( 'frm_after_existing_field_is_imported', $field_array, $form_fields[$field_array['field_key']], $old_field_id );
 	}
 
 	private static function fill_field( $field, $form_id ) {
@@ -641,8 +641,8 @@ 
 		if ( $f['type'] === 'form' || ( $f['type'] === 'divider' && FrmField::is_option_true( $f['field_options'], 'repeat' ) ) ) {
 			if ( FrmField::is_option_true( $f['field_options'], 'form_select' ) ) {
 				$form_select = (int) $f['field_options']['form_select'];
-				if ( isset( $imported['forms'][ $form_select ] ) ) {
-					$f['field_options']['form_select'] = $imported['forms'][ $form_select ];
+				if ( isset( $imported['forms'][$form_select] ) ) {
+					$f['field_options']['form_select'] = $imported['forms'][$form_select];
 				}
 			}
 		}
@@ -664,8 +664,8 @@ 
 
 		if ( FrmField::is_option_true_in_array( $f['field_options'], 'get_values_form' ) ) {
 			$old_form = $f['field_options']['get_values_form'];
-			if ( isset( $imported['forms'][ $old_form ] ) ) {
-				$f['field_options']['get_values_form'] = $imported['forms'][ $old_form ];
+			if ( isset( $imported['forms'][$old_form] ) ) {
+				$f['field_options']['get_values_form'] = $imported['forms'][$old_form];
 			}
 		}
 	}
@@ -692,12 +692,12 @@ 
 	private static function migrate_placeholders( &$f ) {
 		$update_values = self::migrate_field_placeholder( $f, 'clear_on_focus' );
 		foreach ( $update_values as $k => $v ) {
-			$f[ $k ] = $v;
+			$f[$k] = $v;
 		}
 
 		$update_values = self::migrate_field_placeholder( $f, 'default_blank' );
 		foreach ( $update_values as $k => $v ) {
-			$f[ $k ] = $v;
+			$f[$k] = $v;
 		}
 	}
 
@@ -715,7 +715,7 @@ 
 	public static function migrate_field_placeholder( $field, $type ) {
 		$field         = (array) $field;
 		$field_options = $field['field_options'];
-		if ( empty( $field_options[ $type ] ) || empty( $field['default_value'] ) ) {
+		if ( empty( $field_options[$type] ) || empty( $field['default_value'] ) ) {
 			return array();
 		}
 
@@ -741,7 +741,7 @@ 
 				}
 
 				if ( $opt == $default_value ) {
-					unset( $options[ $opt_key ] );
+					unset( $options[$opt_key] );
 					break;
 				}
 			}
@@ -769,7 +769,7 @@ 
 
 		$new_id = FrmField::create( $f );
 		if ( $new_id != false ) {
-			++$imported['imported']['fields'];
+			++ $imported['imported']['fields'];
 			do_action( 'frm_after_field_is_imported', $f, $new_id );
 		}
 	}
@@ -798,10 +798,10 @@ 
 
 			$image_id = FrmProFileImport::import_attachment( $option['src'], $field_object );
 			// Remove the src from options as it isn't required after import.
-			unset( $field['options'][ $key ]['src'] );
+			unset( $field['options'][$key]['src'] );
 
 			if ( is_numeric( $image_id ) ) {
-				$field['options'][ $key ]['image'] = $image_id;
+				$field['options'][$key]['image'] = $image_id;
 			}
 		}
 
@@ -988,8 +988,8 @@ 
 			} else {
 				if ( $post['post_type'] === 'frm_display' ) {
 					$post['post_content'] = self::maybe_prepare_json_view_content( $post['post_content'] );
-				} elseif ( 'page' === $post['post_type'] && isset( $imported['posts'][ $post['post_parent'] ] ) ) {
-					$post['post_parent'] = $imported['posts'][ $post['post_parent'] ];
+				} elseif ( 'page' === $post['post_type'] && isset( $imported['posts'][$post['post_parent']] ) ) {
+					$post['post_parent'] = $imported['posts'][$post['post_parent']];
 				}
 				// Create/update post now
 				$post_id = wp_insert_post( $post );
@@ -1000,27 +1000,27 @@ 
 			}
 
 			if ( false !== strpos( $post['post_content'], '[display-frm-data' ) || false !== strpos( $post['post_content'], '[formidable' ) ) {
-				$posts_with_shortcodes[ $post_id ] = $post;
+				$posts_with_shortcodes[$post_id] = $post;
 			}
 
 			self::update_postmeta( $post, $post_id );
 			self::update_layout( $post, $post_id );
 
 			$this_type = 'posts';
-			if ( isset( $post_types[ $post['post_type'] ] ) ) {
-				$this_type = $post_types[ $post['post_type'] ];
+			if ( isset( $post_types[$post['post_type']] ) ) {
+				$this_type = $post_types[$post['post_type']];
 			}
 
 			if ( isset( $post['ID'] ) && $post_id == $post['ID'] ) {
-				++$imported['updated'][ $this_type ];
+				++ $imported['updated'][$this_type];
 			} else {
-				++$imported['imported'][ $this_type ];
+				++ $imported['imported'][$this_type];
 			}
 
-			$imported['posts'][ $old_id ] = $post_id;
+			$imported['posts'][$old_id] = $post_id;
 
 			if ( $post['post_type'] === 'frm_display' ) {
-				$view_ids[ $old_id ] = $post_id;
+				$view_ids[$old_id] = $post_id;
 			}
 
 			do_action( 'frm_after_import_view', $post_id, $post );
@@ -1182,9 +1182,9 @@ 
 			$post['attachment_url'] = (string) $item->attachment_url;
 		}
 
-		if ( $post['post_type'] == FrmFormActionsController::$action_post_type && isset( $imported['forms'][ (int) $post['menu_order'] ] ) ) {
+		if ( $post['post_type'] == FrmFormActionsController::$action_post_type && isset( $imported['forms'][(int) $post['menu_order']] ) ) {
 			// update to new form id
-			$post['menu_order'] = $imported['forms'][ (int) $post['menu_order'] ];
+			$post['menu_order'] = $imported['forms'][(int) $post['menu_order']];
 		}
 
 		// Don't allow default styles to take over a site's default style
@@ -1221,8 +1221,8 @@ 
 		);
 
 		// Switch old form and field ids to new ones.
-		if ( 'frm_form_id' === $m['key'] && isset( $imported['forms'][ (int) $m['value'] ] ) ) {
-			$m['value'] = $imported['forms'][ (int) $m['value'] ];
+		if ( 'frm_form_id' === $m['key'] && isset( $imported['forms'][(int) $m['value']] ) ) {
+			$m['value'] = $imported['forms'][(int) $m['value']];
 		} else {
 			$m['value'] = FrmAppHelper::maybe_json_decode( $m['value'] );
 
@@ -1233,23 +1233,23 @@ 
 				} elseif ( 'frm_options' === $m['key'] ) {
 
 					foreach ( array( 'date_field_id', 'edate_field_id' ) as $setting_name ) {
-						if ( isset( $m['value'][ $setting_name ] ) && is_numeric( $m['value'][ $setting_name ] ) && isset( $frm_duplicate_ids[ $m['value'][ $setting_name ] ] ) ) {
-							$m['value'][ $setting_name ] = $frm_duplicate_ids[ $m['value'][ $setting_name ] ];
+						if ( isset( $m['value'][$setting_name] ) && is_numeric( $m['value'][$setting_name] ) && isset( $frm_duplicate_ids[$m['value'][$setting_name]] ) ) {
+							$m['value'][$setting_name] = $frm_duplicate_ids[$m['value'][$setting_name]];
 						}
 					}
 
 					if ( ! empty( $m['value']['map_address_fields'] ) ) {
 						foreach ( $m['value']['map_address_fields'] as $address_field_key => $address_field_id ) {
-							if ( isset( $frm_duplicate_ids[ $address_field_id ] ) ) {
-								$m['value']['map_address_fields'][ $address_field_key ] = $frm_duplicate_ids[ $address_field_id ];
+							if ( isset( $frm_duplicate_ids[$address_field_id] ) ) {
+								$m['value']['map_address_fields'][$address_field_key] = $frm_duplicate_ids[$address_field_id];
 							}
 						}
 					}
 
 					if ( ! empty( $m['value']['calendar_options'] ) ) {
 						foreach ( $m['value']['calendar_options'] as $calendar_option_group_key => $calendar_option ) {
-							if ( isset( $frm_duplicate_ids[ $calendar_option['value'] ] ) ) {
-								$m['value']['calendar_options'][ $calendar_option_group_key ]['value'] = $frm_duplicate_ids[ $calendar_option['value'] ];
+							if ( isset( $frm_duplicate_ids[$calendar_option['value']] ) ) {
+								$m['value']['calendar_options'][$calendar_option_group_key]['value'] = $frm_duplicate_ids[$calendar_option['value']];
 							}
 						}
 					}
@@ -1257,8 +1257,8 @@ 
 					if ( ! empty( $m['value']['timeline_options'] ) ) {
 						foreach ( $m['value']['timeline_options'] as $timeline_option_group_key => $timeline_group_option ) {
 							foreach ( $timeline_group_option as $timeline_option_key => $timeline_option ) {
-								if ( isset( $frm_duplicate_ids[ $timeline_option ] ) ) {
-									$m['value']['timeline_options'][ $timeline_option_group_key ][ $timeline_option_key ] = $frm_duplicate_ids[ $timeline_option ];
+								if ( isset( $frm_duplicate_ids[$timeline_option] ) ) {
+									$m['value']['timeline_options'][$timeline_option_group_key][$timeline_option_key] = $frm_duplicate_ids[$timeline_option];
 								}
 							}
 						}
@@ -1266,8 +1266,8 @@ 
 
 					$check_dup_array = array();
 					if ( ! empty( $m['value']['order_by'] ) ) {
-						if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[ $m['value']['order_by'] ] ) ) {
-							$m['value']['order_by'] = $frm_duplicate_ids[ $m['value']['order_by'] ];
+						if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[$m['value']['order_by']] ) ) {
+							$m['value']['order_by'] = $frm_duplicate_ids[$m['value']['order_by']];
 						} elseif ( is_array( $m['value']['order_by'] ) ) {
 							$check_dup_array[] = 'order_by';
 						}
@@ -1278,9 +1278,9 @@ 
 					}
 
 					foreach ( $check_dup_array as $check_k ) {
-						foreach ( (array) $m['value'][ $check_k ] as $mk => $mv ) {
-							if ( isset( $frm_duplicate_ids[ $mv ] ) ) {
-								$m['value'][ $check_k ][ $mk ] = $frm_duplicate_ids[ $mv ];
+						foreach ( (array) $m['value'][$check_k] as $mk => $mv ) {
+							if ( isset( $frm_duplicate_ids[$mv] ) ) {
+								$m['value'][$check_k][$mk] = $frm_duplicate_ids[$mv];
 							}
 							unset( $mk, $mv );
 						}
@@ -1293,11 +1293,11 @@ 
 			$m['value'] = FrmAppHelper::maybe_json_decode( $m['value'] );
 		}
 
-		$post['postmeta'][ (string) $meta->meta_key ] = $m['value'];
+		$post['postmeta'][(string) $meta->meta_key] = $m['value'];
 	}
 
 	private static function populate_layout( &$post, $layout ) {
-		$post['layout'][ (string) $layout->type ] = (string) $layout->data;
+		$post['layout'][(string) $layout->type] = (string) $layout->data;
 	}
 
 	/**
@@ -1325,11 +1325,11 @@ 
 				$name = (string) $c;
 			}
 
-			if ( ! isset( $post['tax_input'][ $taxonomy ] ) ) {
-				$post['tax_input'][ $taxonomy ] = array();
+			if ( ! isset( $post['tax_input'][$taxonomy] ) ) {
+				$post['tax_input'][$taxonomy] = array();
 			}
 
-			$post['tax_input'][ $taxonomy ][] = $name;
+			$post['tax_input'][$taxonomy][] = $name;
 			unset( $name );
 		}//end foreach
 	}
@@ -1473,7 +1473,7 @@ 
 
 		$message = '<ul>';
 		foreach ( $result as $type => $results ) {
-			if ( ! isset( $t_strings[ $type ] ) ) {
+			if ( ! isset( $t_strings[$type] ) ) {
 				// only print imported and updated
 				continue;
 			}
@@ -1485,7 +1485,7 @@ 
 			}
 
 			if ( ! empty( $s_message ) ) {
-				$message .= '<li><strong>' . $t_strings[ $type ] . ':</strong> ';
+				$message .= '<li><strong>' . $t_strings[$type] . ':</strong> ';
 				$message .= implode( ', ', $s_message );
 				$message .= '</li>';
 			}
@@ -1537,8 +1537,8 @@ 
 			'actions' => sprintf( _n( '%1$s Form Action', '%1$s Form Actions', $m, 'formidable' ), $m ),
 		);
 
-		if ( isset( $strings[ $type ] ) ) {
-			$s_message[] = $strings[ $type ];
+		if ( isset( $strings[$type] ) ) {
+			$s_message[] = $strings[$type];
 		} else {
 			$string = ' ' . $m . ' ' . ucfirst( $type );
 
@@ -1693,7 +1693,7 @@ 
 
 		foreach ( $options as $key => $option ) {
 			if ( is_array( $option ) && ! empty( $option['image'] ) ) {
-				$options[ $key ]['src'] = wp_get_attachment_url( $option['image'] );
+				$options[$key]['src'] = wp_get_attachment_url( $option['image'] );
 				$updated                = true;
 			}
 		}
@@ -1731,8 +1731,8 @@ 
 	 */
 	private static function remove_defaults( $defaults, &$saved ) {
 		foreach ( $saved as $key => $value ) {
-			if ( isset( $defaults[ $key ] ) && $defaults[ $key ] === $value ) {
-				unset( $saved[ $key ] );
+			if ( isset( $defaults[$key] ) && $defaults[$key] === $value ) {
+				unset( $saved[$key] );
 			}
 		}
 	}
@@ -1749,14 +1749,14 @@ 
 	 * @return void
 	 */
 	private static function remove_default_html( $html_name, $defaults, &$options ) {
-		if ( ! isset( $options[ $html_name ] ) || ! isset( $defaults[ $html_name ] ) ) {
+		if ( ! isset( $options[$html_name] ) || ! isset( $defaults[$html_name] ) ) {
 			return;
 		}
 
-		$old_html     = str_replace( "\r\n", "\n", $options[ $html_name ] );
-		$default_html = $defaults[ $html_name ];
+		$old_html     = str_replace( "\r\n", "\n", $options[$html_name] );
+		$default_html = $defaults[$html_name];
 		if ( $old_html == $default_html ) {
-			unset( $options[ $html_name ] );
+			unset( $options[$html_name] );
 
 			return;
 		}
@@ -1764,7 +1764,7 @@ 
 		// Account for some of the older field default HTML.
 		$default_html = str_replace( ' id="frm_desc_field_[key]"', '', $default_html );
 		if ( $old_html === $default_html ) {
-			unset( $options[ $html_name ] );
+			unset( $options[$html_name] );
 		}
 	}
 
@@ -1872,8 +1872,8 @@ 
 		);
 
 		foreach ( $post_settings as $post_setting ) {
-			if ( isset( $form_options[ $post_setting ] ) ) {
-				$new_action['post_content'][ $post_setting ] = $form_options[ $post_setting ];
+			if ( isset( $form_options[$post_setting] ) ) {
+				$new_action['post_content'][$post_setting] = $form_options[$post_setting];
 			}
 			unset( $post_setting );
 		}
@@ -1911,7 +1911,7 @@ 
 		if ( ! $exists ) {
 			// this isn't an email, but we need to use a class that will always be included
 			FrmDb::save_json_post( $new_action );
-			++$imported['imported']['actions'];
+			++ $imported['imported']['actions'];
 		}
 	}
 
@@ -1944,11 +1944,11 @@ 
 		foreach ( $post_content as $key => $setting ) {
 			if ( ! is_array( $setting ) && in_array( $key, $basic_fields ) ) {
 				// Replace old IDs with new IDs
-				$post_content[ $key ] = str_replace( $old, $new, $setting );
+				$post_content[$key] = str_replace( $old, $new, $setting );
 			} elseif ( is_array( $setting ) && in_array( $key, $array_fields ) ) {
 				foreach ( $setting as $k => $val ) {
 					// Replace old IDs with new IDs
-					$post_content[ $key ][ $k ] = str_replace( $old, $new, $val );
+					$post_content[$key][$k] = str_replace( $old, $new, $val );
 				}
 			}
 			unset( $key, $setting );
@@ -2016,7 +2016,7 @@ 
 
 			if ( empty( $exists ) ) {
 				FrmDb::save_json_post( $new_notification );
-				++$imported['imported']['actions'];
+				++ $imported['imported']['actions'];
 			}
 			unset( $new_notification );
 		}//end foreach
@@ -2037,8 +2037,8 @@ 
 	private static function remove_deprecated_notification_settings( $form_id, $form_options ) {
 		$delete_settings = array( 'notification', 'autoresponder', 'email_to' );
 		foreach ( $delete_settings as $index ) {
-			if ( isset( $form_options[ $index ] ) ) {
-				unset( $form_options[ $index ] );
+			if ( isset( $form_options[$index] ) ) {
+				unset( $form_options[$index] );
 			}
 		}
 		FrmForm::update( $form_id, array( 'options' => $form_options ) );
@@ -2108,12 +2108,12 @@ 
 			'reply_to_name' => '',
 		);
 		foreach ( $reply_fields as $f => $val ) {
-			if ( isset( $notification[ $f ] ) ) {
-				$atts[ $f ] = $notification[ $f ];
-				if ( 'custom' == $notification[ $f ] ) {
-					$atts[ $f ] = $notification[ 'cust_' . $f ];
-				} elseif ( is_numeric( $atts[ $f ] ) && ! empty( $atts[ $f ] ) ) {
-					$atts[ $f ] = '[' . $atts[ $f ] . ']';
+			if ( isset( $notification[$f] ) ) {
+				$atts[$f] = $notification[$f];
+				if ( 'custom' == $notification[$f] ) {
+					$atts[$f] = $notification['cust_' . $f];
+				} elseif ( is_numeric( $atts[$f] ) && ! empty( $atts[$f] ) ) {
+					$atts[$f] = '[' . $atts[$f] . ']';
 				}
 			}
 			unset( $f, $val );
@@ -2152,13 +2152,13 @@ 
 		foreach ( $atts['email_to'] as $key => $email_field ) {
 
 			if ( is_numeric( $email_field ) ) {
-				$atts['email_to'][ $key ] = '[' . $email_field . ']';
+				$atts['email_to'][$key] = '[' . $email_field . ']';
 			}
 
 			if ( strpos( $email_field, '|' ) ) {
 				$email_opt = explode( '|', $email_field );
 				if ( isset( $email_opt[0] ) ) {
-					$atts['email_to'][ $key ] = '[' . $email_opt[0] . ' show=' . $email_opt[1] . ']';
+					$atts['email_to'][$key] = '[' . $email_opt[0] . ' show=' . $email_opt[1] . ']';
 				}
 				unset( $email_opt );
 			}
@@ -2188,12 +2188,12 @@ 
 		// Add more fields to the new notification
 		$add_fields = array( 'email_message', 'email_subject', 'plain_text', 'inc_user_info', 'conditions' );
 		foreach ( $add_fields as $add_field ) {
-			if ( isset( $notification[ $add_field ] ) ) {
-				$new_notification['post_content'][ $add_field ] = $notification[ $add_field ];
+			if ( isset( $notification[$add_field] ) ) {
+				$new_notification['post_content'][$add_field] = $notification[$add_field];
 			} elseif ( in_array( $add_field, array( 'plain_text', 'inc_user_info' ) ) ) {
-				$new_notification['post_content'][ $add_field ] = 0;
+				$new_notification['post_content'][$add_field] = 0;
 			} else {
-				$new_notification['post_content'][ $add_field ] = '';
+				$new_notification['post_content'][$add_field] = '';
 			}
 			unset( $add_field );
 		}
@@ -2219,7 +2219,7 @@ 
 		if ( isset( $post_content['conditions'] ) && is_array( $post_content['conditions'] ) ) {
 			foreach ( $post_content['conditions'] as $email_key => $val ) {
 				if ( is_numeric( $email_key ) ) {
-					$post_content['conditions'][ $email_key ] = self::switch_action_field_ids( $val, array( 'hide_field' ) );
+					$post_content['conditions'][$email_key] = self::switch_action_field_ids( $val, array( 'hide_field' ) );
 				}
 				unset( $email_key, $val );
 			}