Strategy11 / formidable-forms

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;
@@ -404,7 +404,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;
 		}
 	}
 
@@ -419,9 +419,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 );
 			}
@@ -451,34 +451,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 );
@@ -518,7 +518,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.
@@ -529,7 +529,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 ) {
@@ -625,8 +625,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];
 				}
 			}
 		}
@@ -647,8 +647,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];
 			}
 		}
 	}
@@ -669,12 +669,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;
 		}
 	}
 
@@ -688,7 +688,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();
 		}
 
@@ -714,7 +714,7 @@ 
 				}
 
 				if ( $opt == $default_value ) {
-					unset( $options[ $opt_key ] );
+					unset( $options[$opt_key] );
 					break;
 				}
 			}
@@ -741,7 +741,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 );
 		}
 	}
@@ -770,10 +770,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;
 			}
 		}
 
@@ -950,8 +950,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 );
@@ -962,27 +962,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 );
@@ -1143,9 +1143,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
@@ -1182,8 +1182,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'] );
 
@@ -1194,23 +1194,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']];
 							}
 						}
 					}
@@ -1218,8 +1218,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];
 								}
 							}
 						}
@@ -1227,8 +1227,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';
 						}
@@ -1239,9 +1239,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 );
 						}
@@ -1254,11 +1254,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;
 	}
 
 	/**
@@ -1286,11 +1286,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
 	}
@@ -1430,7 +1430,7 @@ 
 
 		$message = '<ul>';
 		foreach ( $result as $type => $results ) {
-			if ( ! isset( $t_strings[ $type ] ) ) {
+			if ( ! isset( $t_strings[$type] ) ) {
 				// only print imported and updated
 				continue;
 			}
@@ -1442,7 +1442,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>';
 			}
@@ -1494,8 +1494,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 );
 
@@ -1643,7 +1643,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;
 			}
 		}
@@ -1672,8 +1672,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] );
 			}
 		}
 	}
@@ -1684,14 +1684,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;
 		}
@@ -1699,7 +1699,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] );
 		}
 	}
 
@@ -1790,8 +1790,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 );
 		}
@@ -1829,7 +1829,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'];
 		}
 	}
 
@@ -1862,11 +1862,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 );
@@ -1923,7 +1923,7 @@ 
 
 			if ( empty( $exists ) ) {
 				FrmDb::save_json_post( $new_notification );
-				++$imported['imported']['actions'];
+				++ $imported['imported']['actions'];
 			}
 			unset( $new_notification );
 		}//end foreach
@@ -1942,8 +1942,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 ) );
@@ -1996,12 +1996,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 );
@@ -2032,13 +2032,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 );
 			}
@@ -2059,12 +2059,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 );
 		}
@@ -2088,7 +2088,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 );
 			}