Strategy11 / formidable-forms

classes/helpers/FrmEntriesHelper.php

Spacing +21 added lines, -21 removed lines

@@ -111,10 +111,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;
 			}
 		}
@@ -144,7 +144,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 {
@@ -154,14 +154,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 );
@@ -179,7 +179,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 ) );
@@ -292,9 +292,9 @@ 
 			$value = $args['temp_value'];
 		}
 		if ( empty( $args['parent_field_id'] ) ) {
-			$_POST['item_meta'][ $field->id ] = $value;
+			$_POST['item_meta'][$field->id] = $value;
 		} else {
-			$_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;
 		}
 	}
 
@@ -302,9 +302,9 @@ 
 		$field_id = is_object( $field ) ? $field->id : $field;
 
 		if ( empty( $args['parent_field_id'] ) ) {
-			$value = isset( $_POST['item_meta'][ $field_id ] ) ? $_POST['item_meta'][ $field_id ] : '';
+			$value = isset( $_POST['item_meta'][$field_id] ) ? $_POST['item_meta'][$field_id] : '';
 		} else {
-			$value = isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] ) ? $_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] ) ? $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field_id] : '';
 		}
 		$value = wp_unslash( $value );
 		FrmAppHelper::sanitize_value( 'wp_kses_post', $value );
@@ -329,12 +329,12 @@ 
 		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;
 			$args['other']      = true;
-			$other_vals         = wp_unslash( $_POST['item_meta']['other'][ $field->id ] );
+			$other_vals         = wp_unslash( $_POST['item_meta']['other'][$field->id] );
 
 			// Set the validation value now
 			self::set_other_validation_val( $value, $other_vals, $field, $args );
@@ -356,12 +356,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 ] ) ) {
+		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;
 
-			$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] );
 
 			// Set the validation value now.
 			self::set_other_validation_val( $value, $other_vals, $field, $args );
@@ -398,25 +398,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/helpers/FrmXMLHelper.php

Spacing +75 added lines, -75 removed lines

@@ -116,7 +116,7 @@ 
 
 			if ( $term && is_array( $term ) ) {
 				$imported['imported']['terms'] ++;
-				$imported['terms'][ (int) $t->term_id ] = $term['term_id'];
+				$imported['terms'][(int) $t->term_id] = $term['term_id'];
 			}
 
 			unset( $term, $t );
@@ -172,7 +172,7 @@ 
 					}
 
 					// Keep track of whether this specific form was updated or not.
-					$imported['form_status'][ $form_id ] = 'imported';
+					$imported['form_status'][$form_id] = 'imported';
 					self::track_imported_child_forms( (int) $form_id, $form['parent_form_id'], $child_forms );
 				}
 			}
@@ -184,7 +184,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 );
@@ -243,15 +243,15 @@ 
 		}
 
 		// 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;
@@ -308,7 +308,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;
 		}
 	}
 
@@ -324,9 +324,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 ] ) && $imported_forms[ $old_parent_form_id ] != $old_parent_form_id ) {
+			if ( isset( $imported_forms[$old_parent_form_id] ) && $imported_forms[$old_parent_form_id] != $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 ) );
 			}
@@ -373,25 +373,25 @@ 
 
 			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'] ++;
 
-					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'] ] ) ) {
+				} elseif ( isset( $form_fields[$f['field_key']] ) ) {
 					// check for field to edit by field key
 					unset( $f['id'] );
 
-					FrmField::update( $form_fields[ $f['field_key'] ], $f );
+					FrmField::update( $form_fields[$f['field_key']], $f );
 					$imported['updated']['fields'] ++;
 
-					unset( $form_fields[ $form_fields[ $f['field_key'] ] ] ); //unset old field id
-					unset( $form_fields[ $f['field_key'] ] ); //unset old field key
+					unset( $form_fields[$form_fields[$f['field_key']]] ); //unset old field id
+					unset( $form_fields[$f['field_key']] ); //unset old field key
 				} else {
 					// if no matching field id or key in this form, create the field
 					self::create_imported_field( $f, $imported );
@@ -460,8 +460,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];
 				}
 			}
 		}
@@ -482,8 +482,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];
 			}
 		}
 	}
@@ -504,12 +504,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;
 		}
 	}
 
@@ -523,7 +523,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();
 		}
 
@@ -549,7 +549,7 @@ 
 				}
 
 				if ( $opt == $default_value ) {
-					unset( $options[ $opt_key ] );
+					unset( $options[$opt_key] );
 					break;
 				}
 			}
@@ -704,17 +704,17 @@ 
 			self::update_postmeta( $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'][ (int) $old_id ] = $post_id;
+			$imported['posts'][(int) $old_id] = $post_id;
 
 			do_action( 'frm_after_import_view', $post_id, $post );
 
@@ -731,9 +731,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
@@ -760,8 +760,8 @@ 
 		);
 
 		//switch old form and field ids to new ones
-		if ( $m['key'] == 'frm_form_id' && isset( $imported['forms'][ (int) $m['value'] ] ) ) {
-			$m['value'] = $imported['forms'][ (int) $m['value'] ];
+		if ( $m['key'] == 'frm_form_id' && isset( $imported['forms'][(int) $m['value']] ) ) {
+			$m['value'] = $imported['forms'][(int) $m['value']];
 		} else {
 			$m['value'] = FrmAppHelper::maybe_json_decode( $m['value'] );
 
@@ -772,15 +772,15 @@ 
 				} elseif ( $m['key'] == 'frm_options' ) {
 
 					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]];
 						}
 					}
 
 					$check_dup_array = array();
 					if ( isset( $m['value']['order_by'] ) && ! 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';
 						}
@@ -791,9 +791,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 );
 						}
@@ -806,7 +806,7 @@ 
 			$m['value'] = FrmAppHelper::maybe_json_decode( $m['value'] );
 		}
 
-		$post['postmeta'][ (string) $meta->meta_key ] = $m['value'];
+		$post['postmeta'][(string) $meta->meta_key] = $m['value'];
 	}
 
 	/**
@@ -834,11 +834,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 );
 		}
 	}
@@ -937,7 +937,7 @@ 
 
 		$message = '<ul>';
 		foreach ( $result as $type => $results ) {
-			if ( ! isset( $t_strings[ $type ] ) ) {
+			if ( ! isset( $t_strings[$type] ) ) {
 				// only print imported and updated
 				continue;
 			}
@@ -949,7 +949,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>';
 			}
@@ -989,7 +989,7 @@ 
 			'actions' => sprintf( _n( '%1$s Form Action', '%1$s Form Actions', $m, 'formidable' ), $m ),
 		);
 
-		$s_message[] = isset( $strings[ $type ] ) ? $strings[ $type ] : ' ' . $m . ' ' . ucfirst( $type );
+		$s_message[] = isset( $strings[$type] ) ? $strings[$type] : ' ' . $m . ' ' . ucfirst( $type );
 	}
 
 	/**
@@ -1120,10 +1120,10 @@ 
 		$array_defaults = array_filter( $defaults, 'is_array' );
 		foreach ( $array_defaults as $d => $default ) {
 			// compare array defaults
-			if ( $default == $saved[ $d ] ) {
-				unset( $saved[ $d ] );
+			if ( $default == $saved[$d] ) {
+				unset( $saved[$d] );
 			}
-			unset( $defaults[ $d ] );
+			unset( $defaults[$d] );
 		}
 		$saved = array_diff_assoc( (array) $saved, $defaults );
 	}
@@ -1134,14 +1134,14 @@ 
 	 * @since 3.06
 	 */
 	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;
 		}
@@ -1149,7 +1149,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] );
 		}
 	}
 
@@ -1235,8 +1235,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 );
 		}
@@ -1306,11 +1306,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 );
@@ -1386,8 +1386,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 ) );
@@ -1440,12 +1440,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 );
@@ -1476,13 +1476,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 );
 			}
@@ -1503,12 +1503,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 );
 		}
@@ -1532,7 +1532,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 );
 			}

classes/controllers/FrmSettingsController.php

Spacing +3 added lines, -3 removed lines

@@ -115,7 +115,7 @@ 
 				$section['function'] = $original;
 			}
 
-			$sections[ $key ] = $section;
+			$sections[$key] = $section;
 		}
 
 		return $sections;
@@ -127,11 +127,11 @@ 
 
 		$section  = FrmAppHelper::get_post_param( 'tab', '', 'sanitize_text_field' );
 		$sections = self::get_settings_tabs();
-		if ( ! isset( $sections[ $section ] ) ) {
+		if ( ! isset( $sections[$section] ) ) {
 			wp_die();
 		}
 
-		$section = $sections[ $section ];
+		$section = $sections[$section];
 
 		if ( isset( $section['class'] ) ) {
 			call_user_func( array( $section['class'], $section['function'] ) );

classes/controllers/FrmEntriesController.php

Spacing +23 added lines, -23 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 );
@@ -497,7 +497,7 @@ 
 		$entry_query = $wpdb->prepare( "DELETE FROM {$wpdb->prefix}frm_items WHERE form_id=%d", $form_id );
 
 		if ( ! empty( $form_ids ) ) {
-			$form_query  = ' OR form_id in (' . $form_ids . ')';
+			$form_query = ' OR form_id in (' . $form_ids . ')';
 			$meta_query  .= $form_query;
 			$entry_query .= $form_query;
 		}
@@ -545,9 +545,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;
 		}
 
@@ -563,16 +563,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;
 				}
 			}

classes/controllers/FrmFormActionsController.php

Spacing +17 added lines, -17 removed lines

@@ -98,19 +98,19 @@ 
 		}
 
 		foreach ( $action_controls as $action ) {
-			if ( isset( $groups[ $action->id_base ] ) || in_array( $action->id_base, $grouped ) ) {
+			if ( isset( $groups[$action->id_base] ) || in_array( $action->id_base, $grouped ) ) {
 				continue;
 			}
 
 			$this_group = $action->action_options['group'];
-			if ( ! isset( $groups[ $this_group ] ) ) {
+			if ( ! isset( $groups[$this_group] ) ) {
 				$this_group = 'misc';
 			}
 
-			if ( ! isset( $groups[ $this_group ]['actions'] ) ) {
-				$groups[ $this_group ]['actions'] = array();
+			if ( ! isset( $groups[$this_group]['actions'] ) ) {
+				$groups[$this_group]['actions'] = array();
 			}
-			$groups[ $this_group ]['actions'][] = $action->id_base;
+			$groups[$this_group]['actions'][] = $action->id_base;
 
 			unset( $action );
 		}
@@ -241,7 +241,7 @@ 
 				return $a;
 			}
 
-			$actions[ $a->id_base ] = $a;
+			$actions[$a->id_base] = $a;
 		}
 
 		return $actions;
@@ -272,16 +272,16 @@ 
 		$action_map = array();
 
 		foreach ( $action_controls as $key => $control ) {
-			$action_map[ $control->id_base ] = $key;
+			$action_map[$control->id_base] = $key;
 		}
 
 		foreach ( $form_actions as $action ) {
-			if ( ! isset( $action_map[ $action->post_excerpt ] ) ) {
+			if ( ! isset( $action_map[$action->post_excerpt] ) ) {
 				// don't try and show settings if action no longer exists
 				continue;
 			}
 
-			self::action_control( $action, $form, $action->ID, $action_controls[ $action_map[ $action->post_excerpt ] ], $values );
+			self::action_control( $action, $form, $action->ID, $action_controls[$action_map[$action->post_excerpt]], $values );
 		}
 	}
 
@@ -489,8 +489,8 @@ 
 			}
 
 			// Store actions so they can be triggered with the correct priority.
-			$stored_actions[ $action->ID ]  = $action;
-			$action_priority[ $action->ID ] = $link_settings[ $action->post_excerpt ]->action_options['priority'];
+			$stored_actions[$action->ID]  = $action;
+			$action_priority[$action->ID] = $link_settings[$action->post_excerpt]->action_options['priority'];
 
 			unset( $action );
 		}
@@ -502,7 +502,7 @@ 
 			new FrmNotification();
 
 			foreach ( $action_priority as $action_id => $priority ) {
-				$action = $stored_actions[ $action_id ];
+				$action = $stored_actions[$action_id];
 				do_action( 'frm_trigger_' . $action->post_excerpt . '_action', $action, $entry, $form, $event );
 				do_action( 'frm_trigger_' . $action->post_excerpt . '_' . $event . '_action', $action, $entry, $form );
 
@@ -549,12 +549,12 @@ 
 	}
 
 	public function register( $action_class ) {
-		$this->actions[ $action_class ] = new $action_class();
+		$this->actions[$action_class] = new $action_class();
 	}
 
 	public function unregister( $action_class ) {
-		if ( isset( $this->actions[ $action_class ] ) ) {
-			unset( $this->actions[ $action_class ] );
+		if ( isset( $this->actions[$action_class] ) ) {
+			unset( $this->actions[$action_class] );
 		}
 	}
 
@@ -563,8 +563,8 @@ 
 
 		foreach ( $keys as $key ) {
 			// don't register new action if old action with the same id is already registered
-			if ( ! isset( $this->actions[ $key ] ) ) {
-				$this->actions[ $key ]->_register();
+			if ( ! isset( $this->actions[$key] ) ) {
+				$this->actions[$key]->_register();
 			}
 		}
 	}

css/_single_theme.css.php

Spacing +4 added lines, -4 removed lines

@@ -85,11 +85,11 @@ 
 }
 
 .<?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,
@@ -99,12 +99,12 @@ 
 }
 
 .<?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]['-'] ); ?>";
 	color:<?php echo esc_html( $section_color . $important ); ?>;
 }
 
 .<?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]['+'] ); ?>";
 	color:<?php echo esc_html( $section_color . $important ); ?>;
 }