Strategy11 / formidable-forms

classes/helpers/FrmCSVExportHelper.php

Spacing +24 added lines, -24 removed lines

@@ -37,7 +37,7 @@ 
 		self::print_file_headers( $filename );
 		unset( $filename );
 
-		$comment_count       = FrmDb::get_count(
+		$comment_count = FrmDb::get_count(
 			'frm_item_metas',
 			array(
 				'item_id'         => $atts['entry_ids'],
@@ -103,7 +103,7 @@ 
 	private static function prepare_csv_headings() {
 		$headings = array();
 		self::csv_headings( $headings );
-		$headings       = apply_filters(
+		$headings = apply_filters(
 			'frm_csv_columns',
 			$headings,
 			self::$form_id,
@@ -121,10 +121,10 @@ 
 			$field_headings = array();
 			$separate_values = array( 'user_id', 'file', 'data', 'date' );
 			if ( isset( $col->field_options['separate_value'] ) && $col->field_options['separate_value'] && ! in_array( $col->type, $separate_values, true ) ) {
-				$field_headings[ $col->id . '_label' ] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
+				$field_headings[$col->id . '_label'] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
 			}
 
-			$field_headings[ $col->id ] = strip_tags( $col->name );
+			$field_headings[$col->id] = strip_tags( $col->name );
 			$field_headings             = apply_filters(
 				'frm_csv_field_columns',
 				$field_headings,
@@ -138,9 +138,9 @@ 
 
 		if ( self::$comment_count ) {
 			for ( $i = 0; $i < self::$comment_count; $i ++ ) {
-				$headings[ 'comment' . $i ]            = __( 'Comment', 'formidable' );
-				$headings[ 'comment_user_id' . $i ]    = __( 'Comment User', 'formidable' );
-				$headings[ 'comment_created_at' . $i ] = __( 'Comment Date', 'formidable' );
+				$headings['comment' . $i]            = __( 'Comment', 'formidable' );
+				$headings['comment_user_id' . $i]    = __( 'Comment User', 'formidable' );
+				$headings['comment_created_at' . $i] = __( 'Comment Date', 'formidable' );
 			}
 			unset( $i );
 		}
@@ -164,7 +164,7 @@ 
 
 	private static function prepare_next_csv_rows( $next_set ) {
 		// order by parent_item_id so children will be first
-		$where   = array(
+		$where = array(
 			'or'             => 1,
 			'id'             => $next_set,
 			'parent_item_id' => $next_set,
@@ -209,30 +209,30 @@ 
 					continue;
 				}
 
-				if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = array();
-				} elseif ( ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
+				if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = array();
+				} elseif ( ! is_array( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
 					// if the data is here, it should be an array but if this field has collected data
 					// both while inside and outside of the repeating section, it's possible this is a string
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = (array) $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ];
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = (array) $entries[self::$entry->parent_item_id]->metas[$meta_id];
 				}
 
 				//add the repeated values
-				$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ][] = $meta_value;
+				$entries[self::$entry->parent_item_id]->metas[$meta_id][] = $meta_value;
 			}
-			$entries[ self::$entry->parent_item_id ]->metas += self::$entry->metas;
+			$entries[self::$entry->parent_item_id]->metas += self::$entry->metas;
 		}
 
 		// add the embedded form id
-		if ( ! isset( $entries[ self::$entry->parent_item_id ]->embedded_fields ) ) {
-			$entries[ self::$entry->parent_item_id ]->embedded_fields = array();
+		if ( ! isset( $entries[self::$entry->parent_item_id]->embedded_fields ) ) {
+			$entries[self::$entry->parent_item_id]->embedded_fields = array();
 		}
-		$entries[ self::$entry->parent_item_id ]->embedded_fields[ self::$entry->id ] = self::$entry->form_id;
+		$entries[self::$entry->parent_item_id]->embedded_fields[self::$entry->id] = self::$entry->form_id;
 	}
 
 	private static function add_field_values_to_csv( &$row ) {
 		foreach ( self::$fields as $col ) {
-			$field_value = isset( self::$entry->metas[ $col->id ] ) ? self::$entry->metas[ $col->id ] : false;
+			$field_value = isset( self::$entry->metas[$col->id] ) ? self::$entry->metas[$col->id] : false;
 
 			FrmAppHelper::unserialize_or_decode( $field_value );
 			self::add_array_values_to_columns( $row, compact( 'col', 'field_value' ) );
@@ -257,15 +257,15 @@ 
 						'show_icon'         => false,
 						'entry_id'          => self::$entry->id,
 						'sep'               => self::$separator,
-						'embedded_field_id' => ( isset( self::$entry->embedded_fields ) && isset( self::$entry->embedded_fields[ self::$entry->id ] ) ) ? 'form' . self::$entry->embedded_fields[ self::$entry->id ] : 0,
+						'embedded_field_id' => ( isset( self::$entry->embedded_fields ) && isset( self::$entry->embedded_fields[self::$entry->id] ) ) ? 'form' . self::$entry->embedded_fields[self::$entry->id] : 0,
 					)
 				);
 
-				$row[ $col->id . '_label' ] = $sep_value;
+				$row[$col->id . '_label'] = $sep_value;
 				unset( $sep_value );
 			}
 
-			$row[ $col->id ] = $field_value;
+			$row[$col->id] = $field_value;
 
 			unset( $col, $field_value );
 		}
@@ -278,8 +278,8 @@ 
 		if ( is_array( $atts['field_value'] ) ) {
 			foreach ( $atts['field_value'] as $key => $sub_value ) {
 				$column_key = $atts['col']->id . '_' . $key;
-				if ( ! is_numeric( $key ) && isset( self::$headings[ $column_key ] ) ) {
-					$row[ $column_key ] = $sub_value;
+				if ( ! is_numeric( $key ) && isset( self::$headings[$column_key] ) ) {
+					$row[$column_key] = $sub_value;
 				}
 			}
 		}
@@ -303,7 +303,7 @@ 
 		$sep = '';
 
 		foreach ( self::$headings as $k => $heading ) {
-			$row = isset( $rows[ $k ] ) ? $rows[ $k ] : '';
+			$row = isset( $rows[$k] ) ? $rows[$k] : '';
 			if ( is_array( $row ) ) {
 				// implode the repeated field values
 				$row = implode( self::$separator, FrmAppHelper::array_flatten( $row, 'reset' ) );

classes/helpers/FrmEntriesHelper.php

Doc Comments +3 added lines

@@ -136,6 +136,9 @@
 		return apply_filters( 'frm_setup_edit_entry_vars', $values, $record );
 	}
 
+	/**
+	 * @param string $message
+	 */
 	public static function replace_default_message( $message, $atts ) {
 		if ( strpos( $message, '[default-message' ) === false &&
 			strpos( $message, '[default_message' ) === false &&

Spacing +28 added lines, -28 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() ) {
 			FrmProEntriesHelper::get_dynamic_list_values( $field, $entry, $field_value );
@@ -185,7 +185,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 ) );
@@ -299,7 +299,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 );
 		}
@@ -311,20 +311,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 ) {
@@ -355,10 +355,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;
 	}
@@ -389,7 +389,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;
@@ -397,7 +397,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
@@ -420,13 +420,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.
@@ -464,25 +464,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/FrmEmail.php

Spacing +6 added lines, -6 removed lines

@@ -85,7 +85,7 @@ 
 		$to = $this->prepare_email_setting( $this->settings['email_to'], $user_id_args );
 		$to = $this->explode_emails( $to );
 
-		$where  = array(
+		$where = array(
 			'it.field_id !' => 0,
 			'it.item_id'    => $this->entry->id,
 		);
@@ -95,7 +95,7 @@ 
 			'entry'     => $this->entry,
 			'form'      => $this->form,
 		);
-		$to     = apply_filters( 'frm_to_email', $to, $values, $this->form->id, $args );
+		$to = apply_filters( 'frm_to_email', $to, $values, $this->form->id, $args );
 
 		$this->to = array_unique( (array) $to );
 
@@ -298,7 +298,7 @@ 
 
 		// Add the user info if it isn't already included
 		if ( $this->include_user_info && $prev_mail_body === $mail_body ) {
-			$data      = $this->entry->description;
+			$data = $this->entry->description;
 			$mail_body .= "\r\n\r\n" . __( 'User Information', 'formidable' ) . "\r\n";
 			$this->maybe_add_ip( $mail_body );
 			$mail_body .= __( 'User-Agent (Browser/OS)', 'formidable' ) . ': ' . FrmEntriesHelper::get_browser( $data['browser'] ) . "\r\n";
@@ -563,12 +563,12 @@ 
 					$name = trim( str_replace( $email, '', $val ) );
 				} else {
 					// If user enters a name without an email
-					unset( $recipients[ $key ] );
+					unset( $recipients[$key] );
 					continue;
 				}
 			}
 
-			$recipients[ $key ] = $this->format_from_email( $name, $email );
+			$recipients[$key] = $this->format_from_email( $name, $email );
 		}
 
 		return $recipients;
@@ -709,7 +709,7 @@ 
 				);
 
 				// Remove phone number from to addresses
-				unset( $this->to[ $key ] );
+				unset( $this->to[$key] );
 			}
 		}
 	}

classes/models/FrmFormAction.php

Spacing +44 added lines, -44 removed lines

@@ -2,15 +2,15 @@ 
 
 class FrmFormAction {
 
-	public $id_base;         // Root id for all actions of this type.
-	public $name;            // Name for this action type.
+	public $id_base; // Root id for all actions of this type.
+	public $name; // Name for this action type.
 	public $option_name;
-	public $action_options;  // Option array passed to wp_register_sidebar_widget()
+	public $action_options; // Option array passed to wp_register_sidebar_widget()
 	public $control_options; // Option array passed to wp_register_widget_control()
 
-	public $form_id;         // The ID of the form to evaluate
-	public $number = false;  // Unique ID number of the current instance.
-	public $id = '';         // Unique ID string of the current instance (id_base-number)
+	public $form_id; // The ID of the form to evaluate
+	public $number = false; // Unique ID number of the current instance.
+	public $id = ''; // Unique ID string of the current instance (id_base-number)
 	public $updated = false; // Set true when we update the data after a POST submit - makes sure we don't do it twice.
 
 	// Member functions that you must over-ride.
@@ -133,9 +133,9 @@ 
 		$groups = FrmFormActionsController::form_action_groups();
 		$group  = 'misc';
 
-		if ( isset( $action_options['group'] ) && isset( $groups[ $action_options['group'] ] ) ) {
+		if ( isset( $action_options['group'] ) && isset( $groups[$action_options['group']] ) ) {
 			$group = $action_options['group'];
-		} elseif ( isset( $groups[ $this->id_base ] ) ) {
+		} elseif ( isset( $groups[$this->id_base] ) ) {
 			$group = $this->id_base;
 		} else {
 			foreach ( $groups as $name => $check_group ) {
@@ -146,8 +146,8 @@ 
 			}
 		}
 
-		$groups[ $group ]['id'] = $group;
-		return $groups[ $group ];
+		$groups[$group]['id'] = $group;
+		return $groups[$group];
 	}
 
 	/**
@@ -249,7 +249,7 @@ 
 	 * @return integer $post_id
 	 */
 	public function maybe_create_action( $action, $forms ) {
-		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && isset( $forms[ $action['menu_order'] ] ) && $forms[ $action['menu_order'] ] == 'updated' ) {
+		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && isset( $forms[$action['menu_order']] ) && $forms[$action['menu_order']] == 'updated' ) {
 			// Update action only
 			$action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] );
 			$post_id                = $this->save_settings( $action );
@@ -268,18 +268,18 @@ 
 		$action->menu_order = $form_id;
 		$switch             = $this->get_global_switch_fields();
 		foreach ( (array) $action->post_content as $key => $val ) {
-			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[ $val ] ) ) {
-				$action->post_content[ $key ] = $frm_duplicate_ids[ $val ];
+			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[$val] ) ) {
+				$action->post_content[$key] = $frm_duplicate_ids[$val];
 			} elseif ( ! is_array( $val ) ) {
-				$action->post_content[ $key ] = FrmFieldsHelper::switch_field_ids( $val );
-			} elseif ( isset( $switch[ $key ] ) && is_array( $switch[ $key ] ) ) {
+				$action->post_content[$key] = FrmFieldsHelper::switch_field_ids( $val );
+			} elseif ( isset( $switch[$key] ) && is_array( $switch[$key] ) ) {
 				// loop through each value if empty
-				if ( empty( $switch[ $key ] ) ) {
-					$switch[ $key ] = array_keys( $val );
+				if ( empty( $switch[$key] ) ) {
+					$switch[$key] = array_keys( $val );
 				}
 
-				foreach ( $switch[ $key ] as $subkey ) {
-					$action->post_content[ $key ] = $this->duplicate_array_walk( $action->post_content[ $key ], $subkey, $val );
+				foreach ( $switch[$key] as $subkey ) {
+					$action->post_content[$key] = $this->duplicate_array_walk( $action->post_content[$key], $subkey, $val );
 				}
 			}
 
@@ -297,20 +297,20 @@ 
 			foreach ( $subkey as $subkey2 ) {
 				foreach ( (array) $val as $ck => $cv ) {
 					if ( is_array( $cv ) ) {
-						$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey2, $cv );
-					} elseif ( isset( $cv[ $subkey ] ) && is_numeric( $cv[ $subkey ] ) && isset( $frm_duplicate_ids[ $cv[ $subkey ] ] ) ) {
-						$action[ $ck ][ $subkey ] = $frm_duplicate_ids[ $cv[ $subkey ] ];
+						$action[$ck] = $this->duplicate_array_walk( $action[$ck], $subkey2, $cv );
+					} elseif ( isset( $cv[$subkey] ) && is_numeric( $cv[$subkey] ) && isset( $frm_duplicate_ids[$cv[$subkey]] ) ) {
+						$action[$ck][$subkey] = $frm_duplicate_ids[$cv[$subkey]];
 					}
 				}
 			}
 		} else {
 			foreach ( (array) $val as $ck => $cv ) {
 				if ( is_array( $cv ) ) {
-					$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey, $cv );
-				} elseif ( $ck == $subkey && isset( $frm_duplicate_ids[ $cv ] ) ) {
-					$action[ $ck ] = $frm_duplicate_ids[ $cv ];
+					$action[$ck] = $this->duplicate_array_walk( $action[$ck], $subkey, $cv );
+				} elseif ( $ck == $subkey && isset( $frm_duplicate_ids[$cv] ) ) {
+					$action[$ck] = $frm_duplicate_ids[$cv];
 				} elseif ( $ck == $subkey ) {
-					$action[ $ck ] = FrmFieldsHelper::switch_field_ids( $action[ $ck ] );
+					$action[$ck] = FrmFieldsHelper::switch_field_ids( $action[$ck] );
 				}
 			}
 		}
@@ -333,10 +333,10 @@ 
 			return;
 		}
 
-		if ( isset( $_POST[ $this->option_name ] ) && is_array( $_POST[ $this->option_name ] ) ) {
+		if ( isset( $_POST[$this->option_name] ) && is_array( $_POST[$this->option_name] ) ) {
 			// Sanitizing removes scripts and <email> type of values.
 			// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-			$settings = wp_unslash( $_POST[ $this->option_name ] );
+			$settings = wp_unslash( $_POST[$this->option_name] );
 		} else {
 			return;
 		}
@@ -346,7 +346,7 @@ 
 		foreach ( $settings as $number => $new_instance ) {
 			$this->_set( $number );
 
-			$old_instance = isset( $all_instances[ $number ] ) ? $all_instances[ $number ] : array();
+			$old_instance = isset( $all_instances[$number] ) ? $all_instances[$number] : array();
 
 			if ( ! isset( $new_instance['post_status'] ) ) {
 				$new_instance['post_status'] = 'draft';
@@ -386,7 +386,7 @@ 
 			$instance['post_content'] = apply_filters( 'frm_before_save_' . $this->id_base . '_action', $new_instance['post_content'], $instance, $new_instance, $old_instance, $this );
 
 			if ( false !== $instance ) {
-				$all_instances[ $number ] = $instance;
+				$all_instances[$number] = $instance;
 			}
 
 			$action_ids[] = $this->save_settings( $instance );
@@ -462,12 +462,12 @@ 
 			// some plugins/themes are formatting the post_excerpt
 			$action->post_excerpt = sanitize_title( $action->post_excerpt );
 
-			if ( ! isset( $action_controls[ $action->post_excerpt ] ) ) {
+			if ( ! isset( $action_controls[$action->post_excerpt] ) ) {
 				continue;
 			}
 
-			$action                  = $action_controls[ $action->post_excerpt ]->prepare_action( $action );
-			$settings[ $action->ID ] = $action;
+			$action                  = $action_controls[$action->post_excerpt]->prepare_action( $action );
+			$settings[$action->ID] = $action;
 
 			if ( count( $settings ) >= $limit ) {
 				break;
@@ -497,7 +497,7 @@ 
 			'limit'       => 99,
 			'post_status' => $default_status,
 		);
-		$args     = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args( $args, $defaults );
 	}
 
 	/**
@@ -558,7 +558,7 @@ 
 
 			$action = $this->prepare_action( $action );
 
-			$settings[ $action->ID ] = $action;
+			$settings[$action->ID] = $action;
 		}
 
 		if ( 1 === $limit ) {
@@ -595,10 +595,10 @@ 
 
 		foreach ( $default_values as $k => $vals ) {
 			if ( is_array( $vals ) && ! empty( $vals ) ) {
-				if ( 'event' == $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[ $k ] ) ) {
+				if ( 'event' == $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[$k] ) ) {
 					continue;
 				}
-				$action->post_content[ $k ] = wp_parse_args( $action->post_content[ $k ], $vals );
+				$action->post_content[$k] = wp_parse_args( $action->post_content[$k], $vals );
 			}
 		}
 
@@ -671,14 +671,14 @@ 
 	 * Migrate settings from form->options into new action.
 	 */
 	public function migrate_to_2( $form, $update = 'update' ) {
-		$action        = $this->prepare_new( $form->id );
+		$action = $this->prepare_new( $form->id );
 		FrmAppHelper::unserialize_or_decode( $form->options );
 
 		// fill with existing options
 		foreach ( $action->post_content as $name => $val ) {
-			if ( isset( $form->options[ $name ] ) ) {
-				$action->post_content[ $name ] = $form->options[ $name ];
-				unset( $form->options[ $name ] );
+			if ( isset( $form->options[$name] ) ) {
+				$action->post_content[$name] = $form->options[$name];
+				unset( $form->options[$name] );
 			}
 		}
 
@@ -739,7 +739,7 @@ 
 				$stop = $stop ? false : true;
 			}
 
-			$met[ $stop ] = $stop;
+			$met[$stop] = $stop;
 		}
 
 		if ( $notification['conditions']['any_all'] == 'all' && ! empty( $met ) && isset( $met[0] ) && isset( $met[1] ) ) {
@@ -781,8 +781,8 @@ 
 	private static function get_value_from_entry( $entry, $field_id ) {
 		$observed_value = '';
 
-		if ( isset( $entry->metas[ $field_id ] ) ) {
-			$observed_value = $entry->metas[ $field_id ];
+		if ( isset( $entry->metas[$field_id] ) ) {
+			$observed_value = $entry->metas[$field_id];
 		} elseif ( $entry->post_id && FrmAppHelper::pro_is_installed() ) {
 			$field          = FrmField::getOne( $field_id );
 			$observed_value = FrmProEntryMetaHelper::get_post_or_meta_value(

classes/controllers/FrmEntriesController.php

Spacing +22 added lines, -22 removed lines

@@ -65,19 +65,19 @@ 
 		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' ] = __( 'Form', 'formidable' );
-			$columns[ $form_id . '_name' ]    = __( 'Entry Name', 'formidable' );
-			$columns[ $form_id . '_user_id' ] = __( 'Created By', 'formidable' );
+			$columns[$form_id . '_form_id'] = __( 'Form', 'formidable' );
+			$columns[$form_id . '_name']    = __( 'Entry Name', 'formidable' );
+			$columns[$form_id . '_user_id'] = __( 'Created By', 'formidable' );
 		}
 
-		$columns[ $form_id . '_created_at' ] = __( 'Entry creation date', 'formidable' );
-		$columns[ $form_id . '_updated_at' ] = __( 'Entry update date', '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;
@@ -125,10 +125,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 );
 		}
 	}
@@ -145,15 +145,15 @@ 
 		$has_separate_value = ! FrmField::is_option_empty( $field, 'separate_value' );
 		$is_post_status     = FrmField::is_option_true( $field, 'post_field' ) && $field->field_options['post_field'] == 'post_status';
 		if ( $has_separate_value && ! $is_post_status ) {
-			$columns[ $form_id . '_frmsep_' . $col_id ] = FrmAppHelper::truncate( $field->name, 35 );
+			$columns[$form_id . '_frmsep_' . $col_id] = FrmAppHelper::truncate( $field->name, 35 );
 		}
 
-		$columns[ $form_id . '_' . $col_id ] = FrmAppHelper::truncate( $field->name, 35 );
+		$columns[$form_id . '_' . $col_id] = FrmAppHelper::truncate( $field->name, 35 );
 	}
 
 	private static function maybe_add_ip_col( $form_id, &$columns ) {
 		if ( FrmAppHelper::ips_saved() ) {
-			$columns[ $form_id . '_ip' ] = 'IP';
+			$columns[$form_id . '_ip'] = 'IP';
 		}
 	}
 
@@ -191,7 +191,7 @@ 
 		foreach ( $meta_value as $mk => $mv ) {
 			// Remove blank values.
 			if ( empty( $mv ) ) {
-				unset( $meta_value[ $mk ] );
+				unset( $meta_value[$mk] );
 			}
 		}
 
@@ -268,7 +268,7 @@ 
 		foreach ( $fields as $field ) {
 			if ( $field->type != 'checkbox' && ( ! isset( $field->field_options['post_field'] ) || $field->field_options['post_field'] == '' ) ) {
 				// Can't sort on checkboxes because they are stored serialized, or post fields
-				$columns[ $form_id . '_' . $field->field_key ] = 'meta_' . $field->id;
+				$columns[$form_id . '_' . $field->field_key] = 'meta_' . $field->id;
 			}
 		}
 
@@ -332,7 +332,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'];
 
@@ -343,7 +343,7 @@ 
 
 			if ( empty( $result ) || ! in_array( $col_key, $result, true ) ) {
 				$result[] = $col_key;
-				$i--;
+				$i --;
 			}
 
 			unset( $col_key, $col );
@@ -476,9 +476,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;
 		}
 
@@ -494,16 +494,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 );
+				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 );
 
-					$params['id'] = $frm_vars['created_entries'][ $form_id ]['entry_id'];
+					$params['id'] = $frm_vars['created_entries'][$form_id]['entry_id'];
 					$do_success   = true;
 				}
 			}