Strategy11 / formidable-forms

classes/helpers/FrmXMLHelper.php

Indentation +596 added lines, -596 removed lines

@@ -23,30 +23,30 @@ 
 	}
 
 	public static function import_xml( $file ) {
-        $defaults = array(
-            'forms' => 0, 'fields' => 0, 'terms' => 0,
-            'posts' => 0, 'views' => 0, 'actions' => 0,
-            'styles' => 0,
-        );
-
-        $imported = array(
-            'imported' => $defaults,
+		$defaults = array(
+			'forms' => 0, 'fields' => 0, 'terms' => 0,
+			'posts' => 0, 'views' => 0, 'actions' => 0,
+			'styles' => 0,
+		);
+
+		$imported = array(
+			'imported' => $defaults,
 			'updated'  => $defaults,
 			'forms'    => array(),
 			'terms'    => array(),
-        );
+		);
 
-        unset($defaults);
+		unset($defaults);
 
 		if ( ! defined( 'WP_IMPORTING' ) ) {
-            define('WP_IMPORTING', true);
-        }
+			define('WP_IMPORTING', true);
+		}
 
 		if ( ! class_exists( 'DOMDocument' ) ) {
-            return new WP_Error( 'SimpleXML_parse_error', __( 'Your server does not have XML enabled', 'formidable' ), libxml_get_errors() );
-        }
+			return new WP_Error( 'SimpleXML_parse_error', __( 'Your server does not have XML enabled', 'formidable' ), libxml_get_errors() );
+		}
 
-        $dom = new DOMDocument;
+		$dom = new DOMDocument;
 		$success = $dom->loadXML( file_get_contents( $file ) );
 		if ( ! $success ) {
 			return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this XML file', 'formidable' ), libxml_get_errors() );
@@ -64,46 +64,46 @@ 
 			return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this XML file', 'formidable' ), libxml_get_errors() );
 		}
 
-        // add terms, forms (form and field ids), posts (post ids), and entries to db, in that order
+		// add terms, forms (form and field ids), posts (post ids), and entries to db, in that order
 		foreach ( array( 'term', 'form', 'view' ) as $item_type ) {
-            // grab cats, tags, and terms, or forms or posts
-            if ( isset($xml->{$item_type} ) ) {
+			// grab cats, tags, and terms, or forms or posts
+			if ( isset($xml->{$item_type} ) ) {
 				$function_name = 'import_xml_' . $item_type . 's';
 				$imported = self::$function_name( $xml->{$item_type}, $imported );
 				unset( $function_name, $xml->{$item_type} );
-            }
-        }
+			}
+		}
 
-	    $return = apply_filters('frm_importing_xml', $imported, $xml );
+		$return = apply_filters('frm_importing_xml', $imported, $xml );
 
-	    return $return;
-    }
+		return $return;
+	}
 
 	public static function import_xml_terms( $terms, $imported ) {
-        foreach ( $terms as $t ) {
+		foreach ( $terms as $t ) {
 			if ( term_exists((string) $t->term_slug, (string) $t->term_taxonomy) ) {
-			    continue;
+				continue;
 			}
 
 			$parent = self::get_term_parent_id( $t );
 
 			$term = wp_insert_term( (string) $t->term_name, (string) $t->term_taxonomy, array(
-                'slug'          => (string) $t->term_slug,
-                'description'   => (string) $t->term_description,
+				'slug'          => (string) $t->term_slug,
+				'description'   => (string) $t->term_description,
 				'parent'        => empty( $parent ) ? 0 : $parent,
-                'slug'          => (string) $t->term_slug,
-            ));
+				'slug'          => (string) $t->term_slug,
+			));
 
 			if ( $term && is_array( $term ) ) {
-                $imported['imported']['terms']++;
+				$imported['imported']['terms']++;
 				$imported['terms'][ (int) $t->term_id ] = $term['term_id'];
-            }
+			}
 
 			unset( $term, $t );
 		}
 
 		return $imported;
-    }
+	}
 
 	/**
 	 * @since 2.0.8
@@ -128,99 +128,99 @@ 
 		self::put_child_forms_first( $forms );
 
 		foreach ( $forms as $item ) {
-            $form = array(
-                'id'            => (int) $item->id,
-                'form_key'      => (string) $item->form_key,
-                'name'          => (string) $item->name,
-                'description'   => (string) $item->description,
-                'options'       => (string) $item->options,
-                'logged_in'     => (int) $item->logged_in,
-                'is_template'   => (int) $item->is_template,
-                'default_template' => (int) $item->default_template,
-                'editable'      => (int) $item->editable,
-                'status'        => (string) $item->status,
-                'parent_form_id' => isset($item->parent_form_id) ? (int) $item->parent_form_id : 0,
-                'created_at'    => date('Y-m-d H:i:s', strtotime((string) $item->created_at)),
-            );
-
-            $form['options'] = FrmAppHelper::maybe_json_decode($form['options']);
+			$form = array(
+				'id'            => (int) $item->id,
+				'form_key'      => (string) $item->form_key,
+				'name'          => (string) $item->name,
+				'description'   => (string) $item->description,
+				'options'       => (string) $item->options,
+				'logged_in'     => (int) $item->logged_in,
+				'is_template'   => (int) $item->is_template,
+				'default_template' => (int) $item->default_template,
+				'editable'      => (int) $item->editable,
+				'status'        => (string) $item->status,
+				'parent_form_id' => isset($item->parent_form_id) ? (int) $item->parent_form_id : 0,
+				'created_at'    => date('Y-m-d H:i:s', strtotime((string) $item->created_at)),
+			);
+
+			$form['options'] = FrmAppHelper::maybe_json_decode($form['options']);
 
 			self::update_custom_style_setting_on_import( $form );
 
-            // if template, allow to edit if form keys match, otherwise, creation date must also match
+			// if template, allow to edit if form keys match, otherwise, creation date must also match
 			$edit_query = array( 'form_key' => $form['form_key'], 'is_template' => $form['is_template'] );
-            if ( ! $form['is_template'] ) {
-                $edit_query['created_at'] = $form['created_at'];
-            }
+			if ( ! $form['is_template'] ) {
+				$edit_query['created_at'] = $form['created_at'];
+			}
 
-            $edit_query = apply_filters('frm_match_xml_form', $edit_query, $form);
+			$edit_query = apply_filters('frm_match_xml_form', $edit_query, $form);
 
-            $this_form = FrmForm::getAll($edit_query, '', 1);
-            unset($edit_query);
+			$this_form = FrmForm::getAll($edit_query, '', 1);
+			unset($edit_query);
 
-            if ( ! empty( $this_form ) ) {
-                $old_id = $form_id = $this_form->id;
-                FrmForm::update($form_id, $form );
-                $imported['updated']['forms']++;
-                // Keep track of whether this specific form was updated or not
+			if ( ! empty( $this_form ) ) {
+				$old_id = $form_id = $this_form->id;
+				FrmForm::update($form_id, $form );
+				$imported['updated']['forms']++;
+				// Keep track of whether this specific form was updated or not
 				$imported['form_status'][ $form_id ] = 'updated';
 
 				$form_fields = FrmField::get_all_for_form( $form_id, '', 'exclude', 'exclude' );
-                $old_fields = array();
-                foreach ( $form_fields as $f ) {
+				$old_fields = array();
+				foreach ( $form_fields as $f ) {
 					$old_fields[ $f->id ] = $f;
 					$old_fields[ $f->field_key ] = $f->id;
-                    unset($f);
-                }
-                $form_fields = $old_fields;
-                unset($old_fields);
-            } else {
-                $old_id = false;
-                //form does not exist, so create it
+					unset($f);
+				}
+				$form_fields = $old_fields;
+				unset($old_fields);
+			} else {
+				$old_id = false;
+				//form does not exist, so create it
 				$form_id = FrmForm::create( $form );
-                if ( $form_id ) {
-                    $imported['imported']['forms']++;
-                    // Keep track of whether this specific form was updated or not
+				if ( $form_id ) {
+					$imported['imported']['forms']++;
+					// Keep track of whether this specific form was updated or not
 					$imported['form_status'][ $form_id ] = 'imported';
 					self::track_imported_child_forms( (int) $form_id, $form['parent_form_id'], $child_forms );
-                }
-            }
+				}
+			}
 
-    		self::import_xml_fields( $item->field, $form_id, $this_form, $form_fields, $imported );
+			self::import_xml_fields( $item->field, $form_id, $this_form, $form_fields, $imported );
 
-    		// Delete any fields attached to this form that were not included in the template
-    		if ( isset( $form_fields ) && ! empty( $form_fields ) ) {
+			// Delete any fields attached to this form that were not included in the template
+			if ( isset( $form_fields ) && ! empty( $form_fields ) ) {
 				foreach ( $form_fields as $field ) {
-                    if ( is_object($field) ) {
-                        FrmField::destroy($field->id);
-                    }
-                    unset($field);
-                }
-                unset($form_fields);
-            }
-
-		    // Update field ids/keys to new ones
+					if ( is_object($field) ) {
+						FrmField::destroy($field->id);
+					}
+					unset($field);
+				}
+				unset($form_fields);
+			}
+
+			// 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;
 
-            // Send pre 2.0 form options through function that creates actions
-            self::migrate_form_settings_to_actions( $form['options'], $form_id, $imported, $switch = true );
+			// Send pre 2.0 form options through function that creates actions
+			self::migrate_form_settings_to_actions( $form['options'], $form_id, $imported, $switch = true );
 
-		    unset($form, $item);
+			unset($form, $item);
 		}
 
 		self::maybe_update_child_form_parent_id( $imported['forms'], $child_forms );
 
 		return $imported;
-    }
+	}
 
 	/**
-	* Put child forms first so they will be imported before parents
-	*
-	* @since 2.0.16
-	* @param array $forms
-	*/
+	 * Put child forms first so they will be imported before parents
+	 *
+	 * @since 2.0.16
+	 * @param array $forms
+	 */
 	private static function put_child_forms_first( &$forms ) {
 		$child_forms = array();
 		$regular_forms = array();
@@ -239,13 +239,13 @@ 
 	}
 
 	/**
-	* Keep track of all imported child forms
-	*
-	* @since 2.0.16
-	* @param int $form_id
-	* @param int $parent_form_id
-	* @param array $child_forms
-	*/
+	 * Keep track of all imported child forms
+	 *
+	 * @since 2.0.16
+	 * @param int $form_id
+	 * @param int $parent_form_id
+	 * @param array $child_forms
+	 */
 	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;
@@ -253,13 +253,13 @@ 
 	}
 
 	/**
-	* Update the parent_form_id on imported child forms
-	* Child forms are imported first so their parent_form_id will need to be updated after the parent is imported
-	*
-	* @since 2.0.6
-	* @param array $imported_forms
-	* @param array $child_forms
-	*/
+	 * Update the parent_form_id on imported child forms
+	 * Child forms are imported first so their parent_form_id will need to be updated after the parent is imported
+	 *
+	 * @since 2.0.6
+	 * @param array $imported_forms
+	 * @param array $child_forms
+	 */
 	private static function maybe_update_child_form_parent_id( $imported_forms, $child_forms ) {
 		foreach ( $child_forms as $child_form_id => $old_parent_form_id ) {
 
@@ -273,61 +273,61 @@ 
 	}
 
 	/**
-	* Import all fields for a form
-	* @since 2.0.13
-	*
-	* TODO: Cut down on params
-	*/
+	 * Import all fields for a form
+	 * @since 2.0.13
+	 *
+	 * TODO: Cut down on params
+	 */
 	private static function import_xml_fields( $xml_fields, $form_id, $this_form, &$form_fields, &$imported ) {
 		foreach ( $xml_fields as $field ) {
-		    $f = array(
-		        'id'            => (int) $field->id,
-		        'field_key'     => (string) $field->field_key,
-		        'name'          => (string) $field->name,
-		        'description'   => (string) $field->description,
-		        'type'          => (string) $field->type,
-		        'default_value' => FrmAppHelper::maybe_json_decode( (string) $field->default_value),
-		        'field_order'   => (int) $field->field_order,
-		        'form_id'       => (int) $form_id,
-		        'required'      => (int) $field->required,
-		        'options'       => FrmAppHelper::maybe_json_decode( (string) $field->options),
+			$f = array(
+				'id'            => (int) $field->id,
+				'field_key'     => (string) $field->field_key,
+				'name'          => (string) $field->name,
+				'description'   => (string) $field->description,
+				'type'          => (string) $field->type,
+				'default_value' => FrmAppHelper::maybe_json_decode( (string) $field->default_value),
+				'field_order'   => (int) $field->field_order,
+				'form_id'       => (int) $form_id,
+				'required'      => (int) $field->required,
+				'options'       => FrmAppHelper::maybe_json_decode( (string) $field->options),
 				'field_options' => FrmAppHelper::maybe_json_decode( (string) $field->field_options ),
-		    );
-
-		    if ( is_array($f['default_value']) && in_array($f['type'], array(
-		        'text', 'email', 'url', 'textarea',
-		        'number','phone', 'date', 'time',
-		        'hidden', 'password', 'tag', 'image',
-		    )) ) {
-		        if ( count($f['default_value']) === 1 ) {
-		            $f['default_value'] = '['. reset($f['default_value']) .']';
-		        } else {
-		            $f['default_value'] = reset($f['default_value']);
-		        }
-		    }
-
-		    $f = apply_filters('frm_duplicated_field', $f);
+			);
+
+			if ( is_array($f['default_value']) && in_array($f['type'], array(
+				'text', 'email', 'url', 'textarea',
+				'number','phone', 'date', 'time',
+				'hidden', 'password', 'tag', 'image',
+			)) ) {
+				if ( count($f['default_value']) === 1 ) {
+					$f['default_value'] = '['. reset($f['default_value']) .']';
+				} else {
+					$f['default_value'] = reset($f['default_value']);
+				}
+			}
+
+			$f = apply_filters('frm_duplicated_field', $f);
 
 			self::maybe_update_form_select( $f, $imported );
 
-		    if ( ! empty($this_form) ) {
-		        // check for field to edit by field id
+			if ( ! empty($this_form) ) {
+				// check for field to edit by field id
 				if ( isset( $form_fields[ $f['id'] ] ) ) {
-		            FrmField::update( $f['id'], $f );
-		            $imported['updated']['fields']++;
+					FrmField::update( $f['id'], $f );
+					$imported['updated']['fields']++;
 
 					unset( $form_fields[ $f['id'] ] );
 
-		            //unset old field key
+					//unset old field key
 					if ( isset( $form_fields[ $f['field_key'] ] ) ) {
 						unset( $form_fields[ $f['field_key'] ] );
 					}
 				} else if ( isset( $form_fields[ $f['field_key'] ] ) ) {
-		            // check for field to edit by field key
-		            unset($f['id']);
+					// check for field to edit by field key
+					unset($f['id']);
 
 					FrmField::update( $form_fields[ $f['field_key'] ], $f );
-		            $imported['updated']['fields']++;
+					$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
@@ -337,29 +337,29 @@ 
 						continue;
 					}
 
-		            // if no matching field id or key in this form, create the field
-		            $imported['imported']['fields']++;
-		        }
+					// if no matching field id or key in this form, create the field
+					$imported['imported']['fields']++;
+				}
 			} else {
 				$new_id = FrmField::create( $f );
 				if ( $new_id == false ) {
 					continue;
 				}
 
-	            $imported['imported']['fields']++;
-		    }
+				$imported['imported']['fields']++;
+			}
 
 			unset($field, $new_id);
 		}
 	}
 
 	/**
-	* Switch the form_select on a repeating field or embedded form if it needs to be switched
-	*
-	* @since 2.0.16
-	* @param array $f
-	* @param array $imported
-	*/
+	 * Switch the form_select on a repeating field or embedded form if it needs to be switched
+	 *
+	 * @since 2.0.16
+	 * @param array $f
+	 * @param array $imported
+	 */
 	private static function maybe_update_form_select( &$f, $imported ) {
 		if ( ! isset( $imported['forms'] ) ) {
 			return;
@@ -376,12 +376,12 @@ 
 	}
 
 	/**
-	* Updates the custom style setting on import
-	*
-	* @since 2.0.19
-	* @param array $form
-	*
-	*/
+	 * Updates the custom style setting on import
+	 *
+	 * @since 2.0.19
+	 * @param array $form
+	 *
+	 */
 	private static function update_custom_style_setting_on_import( &$form ) {
 		if ( is_numeric ( $form['options']['custom_style'] ) ) {
 			// Set to default
@@ -409,16 +409,16 @@ 
 	}
 
 	public static function import_xml_views( $views, $imported ) {
-        $imported['posts'] = array();
-        $form_action_type = FrmFormActionsController::$action_post_type;
+		$imported['posts'] = array();
+		$form_action_type = FrmFormActionsController::$action_post_type;
 
-        $post_types = array(
-            'frm_display' => 'views',
-            $form_action_type => 'actions',
-            'frm_styles'    => 'styles',
-        );
+		$post_types = array(
+			'frm_display' => 'views',
+			$form_action_type => 'actions',
+			'frm_styles'    => 'styles',
+		);
 
-        foreach ( $views as $item ) {
+		foreach ( $views as $item ) {
 			$post = array(
 				'post_title'    => (string) $item->title,
 				'post_name'     => (string) $item->post_name,
@@ -437,52 +437,52 @@ 
 				'post_date'     => (string) $item->post_date,
 				'post_date_gmt' => (string) $item->post_date_gmt,
 				'ping_status'   => (string) $item->ping_status,
-                'postmeta'      => array(),
-                'tax_input'     => array(),
+				'postmeta'      => array(),
+				'tax_input'     => array(),
 			);
 
-            $old_id = $post['post_id'];
-            self::populate_post($post, $item, $imported);
+			$old_id = $post['post_id'];
+			self::populate_post($post, $item, $imported);
 
 			unset($item);
 
 			$post_id = false;
-            if ( $post['post_type'] == $form_action_type ) {
-                $action_control = FrmFormActionsController::get_form_actions( $post['post_excerpt'] );
+			if ( $post['post_type'] == $form_action_type ) {
+				$action_control = FrmFormActionsController::get_form_actions( $post['post_excerpt'] );
 				if ( $action_control ) {
 					$post_id = $action_control->maybe_create_action( $post, $imported['form_status'] );
 				}
-                unset($action_control);
-            } else if ( $post['post_type'] == 'frm_styles' ) {
-                // Properly encode post content before inserting the post
-                $post['post_content'] = FrmAppHelper::maybe_json_decode( $post['post_content'] );
-                $post['post_content'] = FrmAppHelper::prepare_and_encode( $post['post_content'] );
-
-                // Create/update post now
-                $post_id = wp_insert_post( $post );
-            } else {
-                // Create/update post now
-                $post_id = wp_insert_post( $post );
-            }
-
-            if ( ! is_numeric($post_id) ) {
-                continue;
-            }
-
-            self::update_postmeta($post, $post_id);
-
-            $this_type = 'posts';
+				unset($action_control);
+			} else if ( $post['post_type'] == 'frm_styles' ) {
+				// Properly encode post content before inserting the post
+				$post['post_content'] = FrmAppHelper::maybe_json_decode( $post['post_content'] );
+				$post['post_content'] = FrmAppHelper::prepare_and_encode( $post['post_content'] );
+
+				// Create/update post now
+				$post_id = wp_insert_post( $post );
+			} else {
+				// Create/update post now
+				$post_id = wp_insert_post( $post );
+			}
+
+			if ( ! is_numeric($post_id) ) {
+				continue;
+			}
+
+			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['ID']) && $post_id == $post['ID'] ) {
-                $imported['updated'][ $this_type ]++;
-            } else {
-                $imported['imported'][ $this_type ]++;
-            }
+			if ( isset($post['ID']) && $post_id == $post['ID'] ) {
+				$imported['updated'][ $this_type ]++;
+			} else {
+				$imported['imported'][ $this_type ]++;
+			}
 
-            unset($post);
+			unset($post);
 
 			$imported['posts'][ (int) $old_id ] = $post_id;
 		}
@@ -490,157 +490,157 @@ 
 		self::maybe_update_stylesheet( $imported );
 
 		return $imported;
-    }
+	}
 
-    private static function populate_post( &$post, $item, $imported ) {
+	private static function populate_post( &$post, $item, $imported ) {
 		if ( isset($item->attachment_url) ) {
 			$post['attachment_url'] = (string) $item->attachment_url;
 		}
 
 		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'] ];
+			// update to new form id
+			$post['menu_order'] = $imported['forms'][ (int) $post['menu_order'] ];
 		}
 
 		foreach ( $item->postmeta as $meta ) {
-		    self::populate_postmeta($post, $meta, $imported);
+			self::populate_postmeta($post, $meta, $imported);
 			unset($meta);
 		}
 
-        self::populate_taxonomies($post, $item);
+		self::populate_taxonomies($post, $item);
 
-        self::maybe_editing_post($post);
-    }
+		self::maybe_editing_post($post);
+	}
 
-    private static function populate_postmeta( &$post, $meta, $imported ) {
-        global $frm_duplicate_ids;
+	private static function populate_postmeta( &$post, $meta, $imported ) {
+		global $frm_duplicate_ids;
 
-	    $m = array(
+		$m = array(
 			'key'   => (string) $meta->meta_key,
 			'value' => (string) $meta->meta_value,
 		);
 
 		//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'] ];
+			$m['value'] = $imported['forms'][ (int) $m['value'] ];
 		} else {
-		    $m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
+			$m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
 
-		    if ( ! empty($frm_duplicate_ids) ) {
+			if ( ! empty($frm_duplicate_ids) ) {
 
-		        if ( $m['key'] == 'frm_dyncontent' ) {
-		            $m['value'] = FrmFieldsHelper::switch_field_ids($m['value']);
-    		    } else if ( $m['key'] == 'frm_options' ) {
+				if ( $m['key'] == 'frm_dyncontent' ) {
+					$m['value'] = FrmFieldsHelper::switch_field_ids($m['value']);
+				} else if ( $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 ] ];
-    		            }
-    		        }
-
-                    $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'] ];
-    		            } else if ( is_array( $m['value']['order_by'] ) ) {
-                            $check_dup_array[] = 'order_by';
-    		            }
-    		        }
-
-    		        if ( isset( $m['value']['where'] ) && ! empty( $m['value']['where'] ) ) {
-    		            $check_dup_array[] = 'where';
-    		        }
-
-                    foreach ( $check_dup_array as $check_k ) {
+						}
+					}
+
+					$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'] ];
+						} else if ( is_array( $m['value']['order_by'] ) ) {
+							$check_dup_array[] = 'order_by';
+						}
+					}
+
+					if ( isset( $m['value']['where'] ) && ! empty( $m['value']['where'] ) ) {
+						$check_dup_array[] = 'where';
+					}
+
+					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 ];
-		                    }
-		                    unset($mk, $mv);
-		                }
-                    }
-    		    }
-		    }
+							}
+							unset($mk, $mv);
+						}
+					}
+				}
+			}
 		}
 
 		if ( ! is_array($m['value']) ) {
-		    $m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
+			$m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
 		}
 
 		$post['postmeta'][ (string) $meta->meta_key ] = $m['value'];
-    }
-
-    /**
-     * Add terms to post
-     * @param array $post by reference
-     * @param object $item The XML object data
-     */
-    private static function populate_taxonomies( &$post, $item ) {
+	}
+
+	/**
+	 * Add terms to post
+	 * @param array $post by reference
+	 * @param object $item The XML object data
+	 */
+	private static function populate_taxonomies( &$post, $item ) {
 		foreach ( $item->category as $c ) {
 			$att = $c->attributes();
 			if ( ! isset( $att['nicename'] ) ) {
-                continue;
-            }
-
-		    $taxonomy = (string) $att['domain'];
-		    if ( is_taxonomy_hierarchical($taxonomy) ) {
-		        $name = (string) $att['nicename'];
-		        $h_term = get_term_by('slug', $name, $taxonomy);
-		        if ( $h_term ) {
-		            $name = $h_term->term_id;
-		        }
-		        unset($h_term);
-		    } else {
-		        $name = (string) $c;
-		    }
+				continue;
+			}
+
+			$taxonomy = (string) $att['domain'];
+			if ( is_taxonomy_hierarchical($taxonomy) ) {
+				$name = (string) $att['nicename'];
+				$h_term = get_term_by('slug', $name, $taxonomy);
+				if ( $h_term ) {
+					$name = $h_term->term_id;
+				}
+				unset($h_term);
+			} else {
+				$name = (string) $c;
+			}
 
 			if ( ! isset( $post['tax_input'][ $taxonomy ] ) ) {
 				$post['tax_input'][ $taxonomy ] = array();
 			}
 
 			$post['tax_input'][ $taxonomy ][] = $name;
-		    unset($name);
+			unset($name);
 		}
-    }
+	}
 
-    /**
-     * Edit post if the key and created time match
-     */
-    private static function maybe_editing_post( &$post ) {
+	/**
+	 * Edit post if the key and created time match
+	 */
+	private static function maybe_editing_post( &$post ) {
 		$match_by = array(
-		    'post_type'     => $post['post_type'],
-		    'name'          => $post['post_name'],
-		    'post_status'   => $post['post_status'],
-		    'posts_per_page' => 1,
+			'post_type'     => $post['post_type'],
+			'name'          => $post['post_name'],
+			'post_status'   => $post['post_status'],
+			'posts_per_page' => 1,
 		);
 
 		if ( in_array( $post['post_status'], array( 'trash', 'draft' ) ) ) {
-		    $match_by['include'] = $post['post_id'];
-		    unset($match_by['name']);
+			$match_by['include'] = $post['post_id'];
+			unset($match_by['name']);
 		}
 
 		$editing = get_posts($match_by);
 
-        if ( ! empty($editing) && current($editing)->post_date == $post['post_date'] ) {
-            // set the id of the post to edit
-            $post['ID'] = current($editing)->ID;
-        }
-    }
+		if ( ! empty($editing) && current($editing)->post_date == $post['post_date'] ) {
+			// set the id of the post to edit
+			$post['ID'] = current($editing)->ID;
+		}
+	}
 
-    private static function update_postmeta( &$post, $post_id ) {
-        foreach ( $post['postmeta'] as $k => $v ) {
-            if ( '_edit_last' == $k ) {
-                $v = FrmAppHelper::get_user_id_param($v);
-            } else if ( '_thumbnail_id' == $k && FrmAppHelper::pro_is_installed() ) {
-                //change the attachment ID
-                $v = FrmProXMLHelper::get_file_id($v);
-            }
+	private static function update_postmeta( &$post, $post_id ) {
+		foreach ( $post['postmeta'] as $k => $v ) {
+			if ( '_edit_last' == $k ) {
+				$v = FrmAppHelper::get_user_id_param($v);
+			} else if ( '_thumbnail_id' == $k && FrmAppHelper::pro_is_installed() ) {
+				//change the attachment ID
+				$v = FrmProXMLHelper::get_file_id($v);
+			}
 
-            update_post_meta($post_id, $k, $v);
+			update_post_meta($post_id, $k, $v);
 
-            unset($k, $v);
-        }
-    }
+			unset($k, $v);
+		}
+	}
 
 	private static function maybe_update_stylesheet( $imported ) {
 		if ( ( isset( $imported['imported']['styles'] ) && ! empty( $imported['imported']['styles'] ) ) || ( isset( $imported['updated']['styles'] ) && ! empty( $imported['updated']['styles'] ) ) ) {
@@ -651,72 +651,72 @@ 
 		}
 	}
 
-    /**
-     * @param string $message
-     */
+	/**
+	 * @param string $message
+	 */
 	public static function parse_message( $result, &$message, &$errors ) {
-        if ( is_wp_error($result) ) {
-            $errors[] = $result->get_error_message();
-        } else if ( ! $result ) {
-            return;
-        }
-
-        if ( ! is_array($result) ) {
-            $message = is_string( $result ) ? $result : print_r( $result, 1 );
-            return;
-        }
-
-        $t_strings = array(
-            'imported'  => __( 'Imported', 'formidable' ),
-            'updated'   => __( 'Updated', 'formidable' ),
-        );
-
-        $message = '<ul>';
-        foreach ( $result as $type => $results ) {
+		if ( is_wp_error($result) ) {
+			$errors[] = $result->get_error_message();
+		} else if ( ! $result ) {
+			return;
+		}
+
+		if ( ! is_array($result) ) {
+			$message = is_string( $result ) ? $result : print_r( $result, 1 );
+			return;
+		}
+
+		$t_strings = array(
+			'imported'  => __( 'Imported', 'formidable' ),
+			'updated'   => __( 'Updated', 'formidable' ),
+		);
+
+		$message = '<ul>';
+		foreach ( $result as $type => $results ) {
 			if ( ! isset( $t_strings[ $type ] ) ) {
-                // only print imported and updated
-                continue;
-            }
+				// only print imported and updated
+				continue;
+			}
 
-            $s_message = array();
-            foreach ( $results as $k => $m ) {
-                self::item_count_message($m, $k, $s_message);
-                unset($k, $m);
-            }
+			$s_message = array();
+			foreach ( $results as $k => $m ) {
+				self::item_count_message($m, $k, $s_message);
+				unset($k, $m);
+			}
 
-            if ( ! empty($s_message) ) {
+			if ( ! empty($s_message) ) {
 				$message .= '<li><strong>' . $t_strings[ $type ] . ':</strong> ';
-                $message .= implode(', ', $s_message);
-                $message .= '</li>';
-            }
-        }
-
-        if ( $message == '<ul>' ) {
-            $message = '';
-            $errors[] = __( 'Nothing was imported or updated', 'formidable' );
-        } else {
-            $message .= '</ul>';
-        }
-    }
+				$message .= implode(', ', $s_message);
+				$message .= '</li>';
+			}
+		}
+
+		if ( $message == '<ul>' ) {
+			$message = '';
+			$errors[] = __( 'Nothing was imported or updated', 'formidable' );
+		} else {
+			$message .= '</ul>';
+		}
+	}
 
 	public static function item_count_message( $m, $type, &$s_message ) {
-        if ( ! $m ) {
-            return;
-        }
-
-        $strings = array(
-            'forms'     => sprintf( _n( '%1$s Form', '%1$s Forms', $m, 'formidable' ), $m ),
-            'fields'    => sprintf( _n( '%1$s Field', '%1$s Fields', $m, 'formidable' ), $m ),
-            'items'     => sprintf( _n( '%1$s Entry', '%1$s Entries', $m, 'formidable' ), $m ),
-            'views'     => sprintf( _n( '%1$s View', '%1$s Views', $m, 'formidable' ), $m ),
-            'posts'     => sprintf( _n( '%1$s Post', '%1$s Posts', $m, 'formidable' ), $m ),
-            'styles'     => sprintf( _n( '%1$s Style', '%1$s Styles', $m, 'formidable' ), $m ),
-            'terms'     => sprintf( _n( '%1$s Term', '%1$s Terms', $m, 'formidable' ), $m ),
-            'actions'   => sprintf( _n( '%1$s Form Action', '%1$s Form Actions', $m, 'formidable' ), $m ),
-        );
+		if ( ! $m ) {
+			return;
+		}
+
+		$strings = array(
+			'forms'     => sprintf( _n( '%1$s Form', '%1$s Forms', $m, 'formidable' ), $m ),
+			'fields'    => sprintf( _n( '%1$s Field', '%1$s Fields', $m, 'formidable' ), $m ),
+			'items'     => sprintf( _n( '%1$s Entry', '%1$s Entries', $m, 'formidable' ), $m ),
+			'views'     => sprintf( _n( '%1$s View', '%1$s Views', $m, 'formidable' ), $m ),
+			'posts'     => sprintf( _n( '%1$s Post', '%1$s Posts', $m, 'formidable' ), $m ),
+			'styles'     => sprintf( _n( '%1$s Style', '%1$s Styles', $m, 'formidable' ), $m ),
+			'terms'     => sprintf( _n( '%1$s Term', '%1$s Terms', $m, 'formidable' ), $m ),
+			'actions'   => sprintf( _n( '%1$s Form Action', '%1$s Form Actions', $m, 'formidable' ), $m ),
+		);
 
 		$s_message[] = isset( $strings[ $type ] ) ? $strings[ $type ] : ' ' . $m . ' ' . ucfirst( $type );
-    }
+	}
 
 	/**
 	 * Prepare the form options for export
@@ -750,16 +750,16 @@ 
 	}
 
 	public static function cdata( $str ) {
-	    $str = maybe_unserialize($str);
-	    if ( is_array($str) ) {
-	        $str = json_encode($str);
+		$str = maybe_unserialize($str);
+		if ( is_array($str) ) {
+			$str = json_encode($str);
 		} else if ( seems_utf8( $str ) == false ) {
 			$str = utf8_encode( $str );
 		}
 
-        if ( is_numeric($str) ) {
-            return $str;
-        }
+		if ( is_numeric($str) ) {
+			return $str;
+		}
 
 		// $str = ent2ncr(esc_html($str));
 		$str = '<![CDATA[' . str_replace( ']]>', ']]]]><![CDATA[>', $str ) . ']]>';
@@ -767,58 +767,58 @@ 
 		return $str;
 	}
 
-    public static function migrate_form_settings_to_actions( $form_options, $form_id, &$imported = array(), $switch = false ) {
-        // Get post type
-        $post_type = FrmFormActionsController::$action_post_type;
-
-        // Set up imported index, if not set up yet
-        if ( ! isset( $imported['imported']['actions'] ) ) {
-            $imported['imported']['actions'] = 0;
-        }
-
-        // Migrate post settings to action
-        self::migrate_post_settings_to_action( $form_options, $form_id, $post_type, $imported, $switch );
-
-        // Migrate email settings to action
-        self::migrate_email_settings_to_action( $form_options, $form_id, $post_type, $imported, $switch );
-    }
-
-    /**
-    * Migrate post settings to form action
-    *
-    * @param string $post_type
-    */
-    private static function migrate_post_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
-        if ( ! isset($form_options['create_post']) || ! $form_options['create_post'] ) {
-            return;
-        }
-
-        $new_action = array(
-            'post_type'     => $post_type,
-            'post_excerpt'  => 'wppost',
+	public static function migrate_form_settings_to_actions( $form_options, $form_id, &$imported = array(), $switch = false ) {
+		// Get post type
+		$post_type = FrmFormActionsController::$action_post_type;
+
+		// Set up imported index, if not set up yet
+		if ( ! isset( $imported['imported']['actions'] ) ) {
+			$imported['imported']['actions'] = 0;
+		}
+
+		// Migrate post settings to action
+		self::migrate_post_settings_to_action( $form_options, $form_id, $post_type, $imported, $switch );
+
+		// Migrate email settings to action
+		self::migrate_email_settings_to_action( $form_options, $form_id, $post_type, $imported, $switch );
+	}
+
+	/**
+	 * Migrate post settings to form action
+	 *
+	 * @param string $post_type
+	 */
+	private static function migrate_post_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
+		if ( ! isset($form_options['create_post']) || ! $form_options['create_post'] ) {
+			return;
+		}
+
+		$new_action = array(
+			'post_type'     => $post_type,
+			'post_excerpt'  => 'wppost',
 			'post_title'    => __( 'Create Posts', 'formidable' ),
-            'menu_order'    => $form_id,
-            'post_status'   => 'publish',
-            'post_content'  => array(),
-            'post_name'     => $form_id .'_wppost_1',
-        );
-
-        $post_settings = array(
-            'post_type', 'post_category', 'post_content',
-            'post_excerpt', 'post_title', 'post_name', 'post_date',
+			'menu_order'    => $form_id,
+			'post_status'   => 'publish',
+			'post_content'  => array(),
+			'post_name'     => $form_id .'_wppost_1',
+		);
+
+		$post_settings = array(
+			'post_type', 'post_category', 'post_content',
+			'post_excerpt', 'post_title', 'post_name', 'post_date',
 			'post_status', 'post_custom_fields', 'post_password',
-        );
+		);
 
-        foreach ( $post_settings as $post_setting ) {
+		foreach ( $post_settings as $post_setting ) {
 			if ( isset( $form_options[ $post_setting ] ) ) {
 				$new_action['post_content'][ $post_setting ] = $form_options[ $post_setting ];
-            }
-            unset($post_setting);
-        }
+			}
+			unset($post_setting);
+		}
 
 		$new_action['event'] = array( 'create', 'update' );
 
-        if ( $switch ) {
+		if ( $switch ) {
 			// Fields with string or int saved
 			$basic_fields = array( 'post_title', 'post_content', 'post_excerpt', 'post_password', 'post_date', 'post_status' );
 
@@ -826,22 +826,22 @@ 
 			$array_fields = array( 'post_category', 'post_custom_fields' );
 
 			$new_action['post_content'] = self::switch_action_field_ids( $new_action['post_content'], $basic_fields, $array_fields );
-        }
-        $new_action['post_content'] = json_encode($new_action['post_content']);
+		}
+		$new_action['post_content'] = json_encode($new_action['post_content']);
 
-        $exists = get_posts( array(
-            'name'          => $new_action['post_name'],
-            'post_type'     => $new_action['post_type'],
-            'post_status'   => $new_action['post_status'],
-            'numberposts'   => 1,
-        ) );
+		$exists = get_posts( array(
+			'name'          => $new_action['post_name'],
+			'post_type'     => $new_action['post_type'],
+			'post_status'   => $new_action['post_status'],
+			'numberposts'   => 1,
+		) );
 
-        if ( ! $exists ) {
+		if ( ! $exists ) {
 			// this isn't an email, but we need to use a class that will always be included
 			FrmAppHelper::save_json_post( $new_action );
-            $imported['imported']['actions']++;
-        }
-    }
+			$imported['imported']['actions']++;
+		}
+	}
 
 	/**
 	 * Switch old field IDs for new field IDs in emails and post
@@ -854,211 +854,211 @@ 
 	 * @return string $post_content - new field IDs
 	 */
 	private static function switch_action_field_ids( $post_content, $basic_fields, $array_fields = array() ) {
-        global $frm_duplicate_ids;
+		global $frm_duplicate_ids;
 
-        // If there aren't IDs that were switched, end now
-        if ( ! $frm_duplicate_ids ) {
-            return;
-        }
+		// If there aren't IDs that were switched, end now
+		if ( ! $frm_duplicate_ids ) {
+			return;
+		}
 
-        // Get old IDs
-        $old = array_keys( $frm_duplicate_ids );
+		// Get old IDs
+		$old = array_keys( $frm_duplicate_ids );
 
-        // Get new IDs
-        $new = array_values( $frm_duplicate_ids );
+		// Get new IDs
+		$new = array_values( $frm_duplicate_ids );
 
-        // Do a str_replace with each item to set the new IDs
-        foreach ( $post_content as $key => $setting ) {
-            if ( ! is_array( $setting ) && in_array( $key, $basic_fields ) ) {
-                // Replace old IDs with new IDs
+		// Do a str_replace with each item to set the new IDs
+		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 );
-            } else if ( is_array( $setting ) && in_array( $key, $array_fields ) ) {
-                foreach ( $setting as $k => $val ) {
-                    // Replace old IDs with new IDs
+			} else if ( 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 );
-                }
-            }
-            unset( $key, $setting );
-        }
-        return $post_content;
-    }
-
-    private static function migrate_email_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
-        // No old notifications or autoresponders to carry over
+				}
+			}
+			unset( $key, $setting );
+		}
+		return $post_content;
+	}
+
+	private static function migrate_email_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
+		// No old notifications or autoresponders to carry over
 		if ( ! isset( $form_options['auto_responder'] ) && ! isset( $form_options['notification'] ) && ! isset( $form_options['email_to'] ) ) {
-            return;
-        }
+			return;
+		}
 
-        // Initialize notifications array
-        $notifications = array();
+		// Initialize notifications array
+		$notifications = array();
 
-        // Migrate regular notifications
-        self::migrate_notifications_to_action( $form_options, $form_id, $notifications );
+		// Migrate regular notifications
+		self::migrate_notifications_to_action( $form_options, $form_id, $notifications );
 
-        // Migrate autoresponders
-        self::migrate_autoresponder_to_action( $form_options, $form_id, $notifications );
+		// Migrate autoresponders
+		self::migrate_autoresponder_to_action( $form_options, $form_id, $notifications );
 
-        if (  empty( $notifications ) ) {
-            return;
-        }
+		if (  empty( $notifications ) ) {
+			return;
+		}
 
-        foreach ( $notifications as $new_notification ) {
-            $new_notification['post_type']      = $post_type;
-            $new_notification['post_excerpt']   = 'email';
+		foreach ( $notifications as $new_notification ) {
+			$new_notification['post_type']      = $post_type;
+			$new_notification['post_excerpt']   = 'email';
 			$new_notification['post_title']     = __( 'Email Notification', 'formidable' );
-            $new_notification['menu_order']     = $form_id;
-            $new_notification['post_status']    = 'publish';
+			$new_notification['menu_order']     = $form_id;
+			$new_notification['post_status']    = 'publish';
 
-            // Switch field IDs and keys, if needed
-            if ( $switch ) {
+			// Switch field IDs and keys, if needed
+			if ( $switch ) {
 
 				// Switch field IDs in email conditional logic
 				self::switch_email_contition_field_ids( $new_notification['post_content'] );
 
 				// Switch all other field IDs in email
-                $new_notification['post_content'] = FrmFieldsHelper::switch_field_ids( $new_notification['post_content'] );
-            }
-            $new_notification['post_content']   = FrmAppHelper::prepare_and_encode( $new_notification['post_content'] );
-
-            $exists = get_posts( array(
-                'name'          => $new_notification['post_name'],
-                'post_type'     => $new_notification['post_type'],
-                'post_status'   => $new_notification['post_status'],
-                'numberposts'   => 1,
-            ) );
-
-            if ( empty($exists) ) {
+				$new_notification['post_content'] = FrmFieldsHelper::switch_field_ids( $new_notification['post_content'] );
+			}
+			$new_notification['post_content']   = FrmAppHelper::prepare_and_encode( $new_notification['post_content'] );
+
+			$exists = get_posts( array(
+				'name'          => $new_notification['post_name'],
+				'post_type'     => $new_notification['post_type'],
+				'post_status'   => $new_notification['post_status'],
+				'numberposts'   => 1,
+			) );
+
+			if ( empty($exists) ) {
 				FrmAppHelper::save_json_post( $new_notification );
-                $imported['imported']['actions']++;
-            }
-            unset($new_notification);
-        }
-    }
-
-    private static function migrate_notifications_to_action( $form_options, $form_id, &$notifications ) {
-        if ( ! isset( $form_options['notification'] ) && isset( $form_options['email_to'] ) && ! empty( $form_options['email_to'] ) ) {
-            // add old settings into notification array
+				$imported['imported']['actions']++;
+			}
+			unset($new_notification);
+		}
+	}
+
+	private static function migrate_notifications_to_action( $form_options, $form_id, &$notifications ) {
+		if ( ! isset( $form_options['notification'] ) && isset( $form_options['email_to'] ) && ! empty( $form_options['email_to'] ) ) {
+			// add old settings into notification array
 			$form_options['notification'] = array( 0 => $form_options );
-        } else if ( isset( $form_options['notification']['email_to'] ) ) {
-            // make sure it's in the correct format
+		} else if ( isset( $form_options['notification']['email_to'] ) ) {
+			// make sure it's in the correct format
 			$form_options['notification'] = array( 0 => $form_options['notification'] );
-        }
+		}
 
-        if ( isset( $form_options['notification'] ) && is_array($form_options['notification']) ) {
-            foreach ( $form_options['notification'] as $email_key => $notification ) {
+		if ( isset( $form_options['notification'] ) && is_array($form_options['notification']) ) {
+			foreach ( $form_options['notification'] as $email_key => $notification ) {
 
-                $atts = array( 'email_to' => '', 'reply_to' => '', 'reply_to_name' => '', 'event' => '', 'form_id' => $form_id, 'email_key' => $email_key );
+				$atts = array( 'email_to' => '', 'reply_to' => '', 'reply_to_name' => '', 'event' => '', 'form_id' => $form_id, 'email_key' => $email_key );
 
-                // Format the email data
-                self::format_email_data( $atts, $notification );
+				// Format the email data
+				self::format_email_data( $atts, $notification );
 
 				if ( isset( $notification['twilio'] ) && $notification['twilio'] ) {
 					do_action( 'frm_create_twilio_action', $atts, $notification );
 				}
 
-                // Setup the new notification
-                $new_notification = array();
-                self::setup_new_notification( $new_notification, $notification, $atts );
+				// Setup the new notification
+				$new_notification = array();
+				self::setup_new_notification( $new_notification, $notification, $atts );
 
-                $notifications[] = $new_notification;
-            }
-        }
-    }
+				$notifications[] = $new_notification;
+			}
+		}
+	}
 
-    private static function format_email_data( &$atts, $notification ) {
-        // Format email_to
-        self::format_email_to_data( $atts, $notification );
+	private static function format_email_data( &$atts, $notification ) {
+		// Format email_to
+		self::format_email_to_data( $atts, $notification );
 
-        // Format the reply to email and name
-        $reply_fields = array( 'reply_to' => '', 'reply_to_name' => '' );
-        foreach ( $reply_fields as $f => $val ) {
+		// Format the reply to email and name
+		$reply_fields = array( 'reply_to' => '', '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 ];
 				} else if ( is_numeric( $atts[ $f ] ) && ! empty( $atts[ $f ] ) ) {
 					$atts[ $f ] = '[' . $atts[ $f ] . ']';
-                }
-            }
-            unset( $f, $val );
-        }
+				}
+			}
+			unset( $f, $val );
+		}
 
-        // Format event
+		// Format event
 		$atts['event'] = array( 'create' );
-        if ( isset( $notification['update_email'] ) && 1 == $notification['update_email'] ) {
-            $atts['event'][] = 'update';
-        } else if ( isset($notification['update_email']) && 2 == $notification['update_email'] ) {
+		if ( isset( $notification['update_email'] ) && 1 == $notification['update_email'] ) {
+			$atts['event'][] = 'update';
+		} else if ( isset($notification['update_email']) && 2 == $notification['update_email'] ) {
 			$atts['event'] = array( 'update' );
-        }
-    }
+		}
+	}
 
-    private static function format_email_to_data( &$atts, $notification ) {
-        if ( isset( $notification['email_to'] ) ) {
+	private static function format_email_to_data( &$atts, $notification ) {
+		if ( isset( $notification['email_to'] ) ) {
 			$atts['email_to'] = preg_split( '/ (,|;) /', $notification['email_to'] );
-        } else {
-            $atts['email_to'] = array();
-        }
+		} else {
+			$atts['email_to'] = array();
+		}
 
-        if ( isset( $notification['also_email_to'] ) ) {
-            $email_fields = (array) $notification['also_email_to'];
-            $atts['email_to'] = array_merge( $email_fields, $atts['email_to'] );
-            unset( $email_fields );
-        }
+		if ( isset( $notification['also_email_to'] ) ) {
+			$email_fields = (array) $notification['also_email_to'];
+			$atts['email_to'] = array_merge( $email_fields, $atts['email_to'] );
+			unset( $email_fields );
+		}
 
-        foreach ( $atts['email_to'] as $key => $email_field ) {
+		foreach ( $atts['email_to'] as $key => $email_field ) {
 
-            if ( is_numeric( $email_field ) ) {
+			if ( is_numeric( $email_field ) ) {
 				$atts['email_to'][ $key ] = '[' . $email_field . ']';
-            }
+			}
 
-            if ( strpos( $email_field, '|') ) {
-                $email_opt = explode( '|', $email_field );
-                if ( isset( $email_opt[0] ) ) {
+			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] . ']';
-                }
-                unset( $email_opt );
-            }
-        }
-        $atts['email_to'] = implode(', ', $atts['email_to']);
-    }
-
-    private static function setup_new_notification( &$new_notification, $notification, $atts ) {
-        // Set up new notification
-        $new_notification = array(
-            'post_content'  => array(
-                'email_to'      => $atts['email_to'],
-                'event'         => $atts['event'],
-            ),
-            'post_name'         => $atts['form_id'] .'_email_'. $atts['email_key'],
-        );
-
-        // 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 ) {
+				}
+				unset( $email_opt );
+			}
+		}
+		$atts['email_to'] = implode(', ', $atts['email_to']);
+	}
+
+	private static function setup_new_notification( &$new_notification, $notification, $atts ) {
+		// Set up new notification
+		$new_notification = array(
+			'post_content'  => array(
+				'email_to'      => $atts['email_to'],
+				'event'         => $atts['event'],
+			),
+			'post_name'         => $atts['form_id'] .'_email_'. $atts['email_key'],
+		);
+
+		// 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 ];
-            } else if ( in_array( $add_field, array( 'plain_text', 'inc_user_info' ) ) ) {
+			} else if ( in_array( $add_field, array( 'plain_text', 'inc_user_info' ) ) ) {
 				$new_notification['post_content'][ $add_field ] = 0;
-            } else {
+			} else {
 				$new_notification['post_content'][ $add_field ] = '';
-            }
-            unset( $add_field );
-        }
+			}
+			unset( $add_field );
+		}
 
 		// Set reply to
 		$new_notification['post_content']['reply_to'] = $atts['reply_to'];
 
-        // Set from
+		// Set from
 		if ( ! empty( $atts['reply_to'] ) || ! empty( $atts['reply_to_name'] ) ) {
-            $new_notification['post_content']['from'] = ( empty($atts['reply_to_name']) ? '[sitename]' : $atts['reply_to_name'] ) .' <'. ( empty($atts['reply_to']) ? '[admin_email]' : $atts['reply_to'] ) .'>';
-        }
-    }
+			$new_notification['post_content']['from'] = ( empty($atts['reply_to_name']) ? '[sitename]' : $atts['reply_to_name'] ) .' <'. ( empty($atts['reply_to']) ? '[admin_email]' : $atts['reply_to'] ) .'>';
+		}
+	}
 
 	/**
-	* Switch field IDs in pre-2.0 email conditional logic
-	*
-	* @param $post_content array, pass by reference
-	*/
+	 * Switch field IDs in pre-2.0 email conditional logic
+	 *
+	 * @param $post_content array, pass by reference
+	 */
 	private static function switch_email_contition_field_ids( &$post_content ) {
 		// Switch field IDs in conditional logic
 		if ( isset( $post_content['conditions'] ) && is_array( $post_content['conditions'] ) ) {
@@ -1071,48 +1071,48 @@ 
 		}
 	}
 
-    private static function migrate_autoresponder_to_action( $form_options, $form_id, &$notifications ) {
-        if ( isset($form_options['auto_responder']) && $form_options['auto_responder'] && isset($form_options['ar_email_message']) && $form_options['ar_email_message'] ) {
-            // migrate autoresponder
-
-            $email_field = isset($form_options['ar_email_to']) ? $form_options['ar_email_to'] : 0;
-            if ( strpos($email_field, '|') ) {
-                // data from entries field
-                $email_field = explode('|', $email_field);
-                if ( isset($email_field[1]) ) {
-                    $email_field = $email_field[1];
-                }
-            }
-            if ( is_numeric($email_field) && ! empty($email_field) ) {
-                $email_field = '['. $email_field .']';
-            }
-
-            $notification = $form_options;
-            $new_notification2 = array(
-                'post_content'  => array(
-                    'email_message' => $notification['ar_email_message'],
-                    'email_subject' => isset($notification['ar_email_subject']) ? $notification['ar_email_subject'] : '',
-                    'email_to'      => $email_field,
-                    'plain_text'    => isset($notification['ar_plain_text']) ? $notification['ar_plain_text'] : 0,
-                    'inc_user_info' => 0,
-                ),
-                'post_name'     => $form_id .'_email_'. count( $notifications ),
-            );
-
-            $reply_to = isset($notification['ar_reply_to']) ? $notification['ar_reply_to'] : '';
-            $reply_to_name = isset($notification['ar_reply_to_name']) ? $notification['ar_reply_to_name'] : '';
+	private static function migrate_autoresponder_to_action( $form_options, $form_id, &$notifications ) {
+		if ( isset($form_options['auto_responder']) && $form_options['auto_responder'] && isset($form_options['ar_email_message']) && $form_options['ar_email_message'] ) {
+			// migrate autoresponder
+
+			$email_field = isset($form_options['ar_email_to']) ? $form_options['ar_email_to'] : 0;
+			if ( strpos($email_field, '|') ) {
+				// data from entries field
+				$email_field = explode('|', $email_field);
+				if ( isset($email_field[1]) ) {
+					$email_field = $email_field[1];
+				}
+			}
+			if ( is_numeric($email_field) && ! empty($email_field) ) {
+				$email_field = '['. $email_field .']';
+			}
+
+			$notification = $form_options;
+			$new_notification2 = array(
+				'post_content'  => array(
+					'email_message' => $notification['ar_email_message'],
+					'email_subject' => isset($notification['ar_email_subject']) ? $notification['ar_email_subject'] : '',
+					'email_to'      => $email_field,
+					'plain_text'    => isset($notification['ar_plain_text']) ? $notification['ar_plain_text'] : 0,
+					'inc_user_info' => 0,
+				),
+				'post_name'     => $form_id .'_email_'. count( $notifications ),
+			);
+
+			$reply_to = isset($notification['ar_reply_to']) ? $notification['ar_reply_to'] : '';
+			$reply_to_name = isset($notification['ar_reply_to_name']) ? $notification['ar_reply_to_name'] : '';
 
 			if ( ! empty( $reply_to ) ) {
 				$new_notification2['post_content']['reply_to'] = $reply_to;
 			}
 
 			if ( ! empty( $reply_to ) || ! empty( $reply_to_name ) ) {
-                $new_notification2['post_content']['from'] = ( empty($reply_to_name) ? '[sitename]' : $reply_to_name ) .' <'. ( empty($reply_to) ? '[admin_email]' : $reply_to ) .'>';
+				$new_notification2['post_content']['from'] = ( empty($reply_to_name) ? '[sitename]' : $reply_to_name ) .' <'. ( empty($reply_to) ? '[admin_email]' : $reply_to ) .'>';
 			}
 
-            $notifications[] = $new_notification2;
-            unset( $new_notification2 );
-        }
-    }
+			$notifications[] = $new_notification2;
+			unset( $new_notification2 );
+		}
+	}
 }
 

Spacing +178 added lines, -178 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -11,7 +11,7 @@ 
 				echo "\n" . $padding;
 				$tag = ( is_numeric( $ok ) ? 'key:' : '' ) . $ok;
 				echo '<' . $tag . '>';
-				self::get_xml_values( $ov, $padding .'    ' );
+				self::get_xml_values( $ov, $padding . '    ' );
 				if ( is_array( $ov ) ) {
 					echo "\n" . $padding;
 				}
@@ -36,10 +36,10 @@ 
 			'terms'    => array(),
         );
 
-        unset($defaults);
+        unset( $defaults );
 
 		if ( ! defined( 'WP_IMPORTING' ) ) {
-            define('WP_IMPORTING', true);
+            define( 'WP_IMPORTING', true );
         }
 
 		if ( ! class_exists( 'DOMDocument' ) ) {
@@ -52,7 +52,7 @@ 
 			return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this XML file', 'formidable' ), libxml_get_errors() );
 		}
 
-		if ( ! function_exists('simplexml_import_dom') ) {
+		if ( ! function_exists( 'simplexml_import_dom' ) ) {
 			return new WP_Error( 'SimpleXML_parse_error', __( 'Your server is missing the simplexml_import_dom function', 'formidable' ), libxml_get_errors() );
 		}
 
@@ -67,21 +67,21 @@ 
         // add terms, forms (form and field ids), posts (post ids), and entries to db, in that order
 		foreach ( array( 'term', 'form', 'view' ) as $item_type ) {
             // grab cats, tags, and terms, or forms or posts
-            if ( isset($xml->{$item_type} ) ) {
+            if ( isset( $xml->{$item_type} ) ) {
 				$function_name = 'import_xml_' . $item_type . 's';
 				$imported = self::$function_name( $xml->{$item_type}, $imported );
 				unset( $function_name, $xml->{$item_type} );
             }
         }
 
-	    $return = apply_filters('frm_importing_xml', $imported, $xml );
+	    $return = apply_filters( 'frm_importing_xml', $imported, $xml );
 
 	    return $return;
     }
 
 	public static function import_xml_terms( $terms, $imported ) {
         foreach ( $terms as $t ) {
-			if ( term_exists((string) $t->term_slug, (string) $t->term_taxonomy) ) {
+			if ( term_exists( (string) $t->term_slug, (string) $t->term_taxonomy ) ) {
 			    continue;
 			}
 
@@ -92,11 +92,11 @@ 
                 'description'   => (string) $t->term_description,
 				'parent'        => empty( $parent ) ? 0 : $parent,
                 'slug'          => (string) $t->term_slug,
-            ));
+            ) );
 
 			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 );
@@ -139,11 +139,11 @@ 
                 'default_template' => (int) $item->default_template,
                 'editable'      => (int) $item->editable,
                 'status'        => (string) $item->status,
-                'parent_form_id' => isset($item->parent_form_id) ? (int) $item->parent_form_id : 0,
-                'created_at'    => date('Y-m-d H:i:s', strtotime((string) $item->created_at)),
+                'parent_form_id' => isset( $item->parent_form_id ) ? (int) $item->parent_form_id : 0,
+                'created_at'    => date( 'Y-m-d H:i:s', strtotime( (string) $item->created_at ) ),
             );
 
-            $form['options'] = FrmAppHelper::maybe_json_decode($form['options']);
+            $form['options'] = FrmAppHelper::maybe_json_decode( $form['options'] );
 
 			self::update_custom_style_setting_on_import( $form );
 
@@ -153,35 +153,35 @@ 
                 $edit_query['created_at'] = $form['created_at'];
             }
 
-            $edit_query = apply_filters('frm_match_xml_form', $edit_query, $form);
+            $edit_query = apply_filters( 'frm_match_xml_form', $edit_query, $form );
 
-            $this_form = FrmForm::getAll($edit_query, '', 1);
-            unset($edit_query);
+            $this_form = FrmForm::getAll( $edit_query, '', 1 );
+            unset( $edit_query );
 
             if ( ! empty( $this_form ) ) {
                 $old_id = $form_id = $this_form->id;
-                FrmForm::update($form_id, $form );
-                $imported['updated']['forms']++;
+                FrmForm::update( $form_id, $form );
+                $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';
 
 				$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;
-                    unset($f);
+					$old_fields[$f->id] = $f;
+					$old_fields[$f->field_key] = $f->id;
+                    unset( $f );
                 }
                 $form_fields = $old_fields;
-                unset($old_fields);
+                unset( $old_fields );
             } else {
                 $old_id = false;
                 //form does not exist, so create it
 				$form_id = FrmForm::create( $form );
                 if ( $form_id ) {
-                    $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';
 					self::track_imported_child_forms( (int) $form_id, $form['parent_form_id'], $child_forms );
                 }
             }
@@ -191,23 +191,23 @@ 
     		// Delete any fields attached to this form that were not included in the template
     		if ( isset( $form_fields ) && ! empty( $form_fields ) ) {
 				foreach ( $form_fields as $field ) {
-                    if ( is_object($field) ) {
-                        FrmField::destroy($field->id);
+                    if ( is_object( $field ) ) {
+                        FrmField::destroy( $field->id );
                     }
-                    unset($field);
+                    unset( $field );
                 }
-                unset($form_fields);
+                unset( $form_fields );
             }
 
 		    // 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, $switch = true );
 
-		    unset($form, $item);
+		    unset( $form, $item );
 		}
 
 		self::maybe_update_child_form_parent_id( $imported['forms'], $child_forms );
@@ -226,7 +226,7 @@ 
 		$regular_forms = array();
 
 		foreach ( $forms as $form ) {
-			$parent_form_id = isset( $form->parent_form_id) ? (int) $form->parent_form_id : 0;
+			$parent_form_id = isset( $form->parent_form_id ) ? (int) $form->parent_form_id : 0;
 
 			if ( $parent_form_id ) {
 				$child_forms[] = $form;
@@ -248,7 +248,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;
 		}
 	}
 
@@ -263,9 +263,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 ) );
 			}
@@ -286,51 +286,51 @@ 
 		        'name'          => (string) $field->name,
 		        'description'   => (string) $field->description,
 		        'type'          => (string) $field->type,
-		        'default_value' => FrmAppHelper::maybe_json_decode( (string) $field->default_value),
+		        'default_value' => FrmAppHelper::maybe_json_decode( (string) $field->default_value ),
 		        'field_order'   => (int) $field->field_order,
 		        'form_id'       => (int) $form_id,
 		        'required'      => (int) $field->required,
-		        'options'       => FrmAppHelper::maybe_json_decode( (string) $field->options),
+		        'options'       => FrmAppHelper::maybe_json_decode( (string) $field->options ),
 				'field_options' => FrmAppHelper::maybe_json_decode( (string) $field->field_options ),
 		    );
 
-		    if ( is_array($f['default_value']) && in_array($f['type'], array(
+		    if ( is_array( $f['default_value'] ) && in_array( $f['type'], array(
 		        'text', 'email', 'url', 'textarea',
-		        'number','phone', 'date', 'time',
+		        'number', 'phone', 'date', 'time',
 		        'hidden', 'password', 'tag', 'image',
-		    )) ) {
-		        if ( count($f['default_value']) === 1 ) {
-		            $f['default_value'] = '['. reset($f['default_value']) .']';
+		    ) ) ) {
+		        if ( count( $f['default_value'] ) === 1 ) {
+		            $f['default_value'] = '[' . reset( $f['default_value'] ) . ']';
 		        } else {
-		            $f['default_value'] = reset($f['default_value']);
+		            $f['default_value'] = reset( $f['default_value'] );
 		        }
 		    }
 
-		    $f = apply_filters('frm_duplicated_field', $f);
+		    $f = apply_filters( 'frm_duplicated_field', $f );
 
 			self::maybe_update_form_select( $f, $imported );
 
-		    if ( ! empty($this_form) ) {
+		    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']] );
 					}
-				} else if ( isset( $form_fields[ $f['field_key'] ] ) ) {
+				} else if ( isset( $form_fields[$f['field_key']] ) ) {
 		            // check for field to edit by field key
-		            unset($f['id']);
+		            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'] ++;
 
-					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 {
 					$new_id = FrmField::create( $f );
 					if ( $new_id == false ) {
@@ -338,7 +338,7 @@ 
 					}
 
 		            // if no matching field id or key in this form, create the field
-		            $imported['imported']['fields']++;
+		            $imported['imported']['fields'] ++;
 		        }
 			} else {
 				$new_id = FrmField::create( $f );
@@ -346,10 +346,10 @@ 
 					continue;
 				}
 
-	            $imported['imported']['fields']++;
+	            $imported['imported']['fields'] ++;
 		    }
 
-			unset($field, $new_id);
+			unset( $field, $new_id );
 		}
 	}
 
@@ -368,8 +368,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 = $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];
 				}
 			}
 		}
@@ -383,7 +383,7 @@ 
 	*
 	*/
 	private static function update_custom_style_setting_on_import( &$form ) {
-		if ( is_numeric ( $form['options']['custom_style'] ) ) {
+		if ( is_numeric( $form['options']['custom_style'] ) ) {
 			// Set to default
 			$form['options']['custom_style'] = 1;
 		} else {
@@ -396,7 +396,7 @@ 
 					$wpdb->prefix . 'posts
 				WHERE
 					post_name=%s';
-			$query = $wpdb->prepare($raw_query, $form['options']['custom_style']);
+			$query = $wpdb->prepare( $raw_query, $form['options']['custom_style'] );
 			$style_id = $wpdb->get_var( $query );
 			if ( $style_id ) {
 				$form['options']['custom_style'] = $style_id;
@@ -430,8 +430,8 @@ 
 				'post_id'       => (int) $item->post_id,
 				'post_parent'   => (int) $item->post_parent,
 				'menu_order'    => (int) $item->menu_order,
-				'post_content'  => FrmFieldsHelper::switch_field_ids((string) $item->content),
-				'post_excerpt'  => FrmFieldsHelper::switch_field_ids((string) $item->excerpt),
+				'post_content'  => FrmFieldsHelper::switch_field_ids( (string) $item->content ),
+				'post_excerpt'  => FrmFieldsHelper::switch_field_ids( (string) $item->excerpt ),
 				'is_sticky'     => (string) $item->is_sticky,
 				'comment_status' => (string) $item->comment_status,
 				'post_date'     => (string) $item->post_date,
@@ -442,9 +442,9 @@ 
 			);
 
             $old_id = $post['post_id'];
-            self::populate_post($post, $item, $imported);
+            self::populate_post( $post, $item, $imported );
 
-			unset($item);
+			unset( $item );
 
 			$post_id = false;
             if ( $post['post_type'] == $form_action_type ) {
@@ -452,7 +452,7 @@ 
 				if ( $action_control ) {
 					$post_id = $action_control->maybe_create_action( $post, $imported['form_status'] );
 				}
-                unset($action_control);
+                unset( $action_control );
             } else if ( $post['post_type'] == 'frm_styles' ) {
                 // Properly encode post content before inserting the post
                 $post['post_content'] = FrmAppHelper::maybe_json_decode( $post['post_content'] );
@@ -465,26 +465,26 @@ 
                 $post_id = wp_insert_post( $post );
             }
 
-            if ( ! is_numeric($post_id) ) {
+            if ( ! is_numeric( $post_id ) ) {
                 continue;
             }
 
-            self::update_postmeta($post, $post_id);
+            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 ]++;
+            if ( isset( $post['ID'] ) && $post_id == $post['ID'] ) {
+                $imported['updated'][$this_type] ++;
             } else {
-                $imported['imported'][ $this_type ]++;
+                $imported['imported'][$this_type] ++;
             }
 
-            unset($post);
+            unset( $post );
 
-			$imported['posts'][ (int) $old_id ] = $post_id;
+			$imported['posts'][(int) $old_id] = $post_id;
 		}
 
 		self::maybe_update_stylesheet( $imported );
@@ -493,23 +493,23 @@ 
     }
 
     private static function populate_post( &$post, $item, $imported ) {
-		if ( isset($item->attachment_url) ) {
+		if ( isset( $item->attachment_url ) ) {
 			$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']];
 		}
 
 		foreach ( $item->postmeta as $meta ) {
-		    self::populate_postmeta($post, $meta, $imported);
-			unset($meta);
+		    self::populate_postmeta( $post, $meta, $imported );
+			unset( $meta );
 		}
 
-        self::populate_taxonomies($post, $item);
+        self::populate_taxonomies( $post, $item );
 
-        self::maybe_editing_post($post);
+        self::maybe_editing_post( $post );
     }
 
     private static function populate_postmeta( &$post, $meta, $imported ) {
@@ -521,27 +521,27 @@ 
 		);
 
 		//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']);
+		    $m['value'] = FrmAppHelper::maybe_json_decode( $m['value'] );
 
-		    if ( ! empty($frm_duplicate_ids) ) {
+		    if ( ! empty( $frm_duplicate_ids ) ) {
 
 		        if ( $m['key'] == 'frm_dyncontent' ) {
-		            $m['value'] = FrmFieldsHelper::switch_field_ids($m['value']);
+		            $m['value'] = FrmFieldsHelper::switch_field_ids( $m['value'] );
     		    } else if ( $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']];
     		            } else if ( is_array( $m['value']['order_by'] ) ) {
                             $check_dup_array[] = 'order_by';
     		            }
@@ -552,22 +552,22 @@ 
     		        }
 
                     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);
+		                    unset( $mk, $mv );
 		                }
                     }
     		    }
 		    }
 		}
 
-		if ( ! is_array($m['value']) ) {
-		    $m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
+		if ( ! is_array( $m['value'] ) ) {
+		    $m['value'] = FrmAppHelper::maybe_json_decode( $m['value'] );
 		}
 
-		$post['postmeta'][ (string) $meta->meta_key ] = $m['value'];
+		$post['postmeta'][(string) $meta->meta_key] = $m['value'];
     }
 
     /**
@@ -583,23 +583,23 @@ 
             }
 
 		    $taxonomy = (string) $att['domain'];
-		    if ( is_taxonomy_hierarchical($taxonomy) ) {
+		    if ( is_taxonomy_hierarchical( $taxonomy ) ) {
 		        $name = (string) $att['nicename'];
-		        $h_term = get_term_by('slug', $name, $taxonomy);
+		        $h_term = get_term_by( 'slug', $name, $taxonomy );
 		        if ( $h_term ) {
 		            $name = $h_term->term_id;
 		        }
-		        unset($h_term);
+		        unset( $h_term );
 		    } else {
 		        $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;
-		    unset($name);
+			$post['tax_input'][$taxonomy][] = $name;
+		    unset( $name );
 		}
     }
 
@@ -616,29 +616,29 @@ 
 
 		if ( in_array( $post['post_status'], array( 'trash', 'draft' ) ) ) {
 		    $match_by['include'] = $post['post_id'];
-		    unset($match_by['name']);
+		    unset( $match_by['name'] );
 		}
 
-		$editing = get_posts($match_by);
+		$editing = get_posts( $match_by );
 
-        if ( ! empty($editing) && current($editing)->post_date == $post['post_date'] ) {
+        if ( ! empty( $editing ) && current( $editing )->post_date == $post['post_date'] ) {
             // set the id of the post to edit
-            $post['ID'] = current($editing)->ID;
+            $post['ID'] = current( $editing )->ID;
         }
     }
 
     private static function update_postmeta( &$post, $post_id ) {
         foreach ( $post['postmeta'] as $k => $v ) {
             if ( '_edit_last' == $k ) {
-                $v = FrmAppHelper::get_user_id_param($v);
+                $v = FrmAppHelper::get_user_id_param( $v );
             } else if ( '_thumbnail_id' == $k && FrmAppHelper::pro_is_installed() ) {
                 //change the attachment ID
-                $v = FrmProXMLHelper::get_file_id($v);
+                $v = FrmProXMLHelper::get_file_id( $v );
             }
 
-            update_post_meta($post_id, $k, $v);
+            update_post_meta( $post_id, $k, $v );
 
-            unset($k, $v);
+            unset( $k, $v );
         }
     }
 
@@ -655,13 +655,13 @@ 
      * @param string $message
      */
 	public static function parse_message( $result, &$message, &$errors ) {
-        if ( is_wp_error($result) ) {
+        if ( is_wp_error( $result ) ) {
             $errors[] = $result->get_error_message();
         } else if ( ! $result ) {
             return;
         }
 
-        if ( ! is_array($result) ) {
+        if ( ! is_array( $result ) ) {
             $message = is_string( $result ) ? $result : print_r( $result, 1 );
             return;
         }
@@ -673,20 +673,20 @@ 
 
         $message = '<ul>';
         foreach ( $result as $type => $results ) {
-			if ( ! isset( $t_strings[ $type ] ) ) {
+			if ( ! isset( $t_strings[$type] ) ) {
                 // only print imported and updated
                 continue;
             }
 
             $s_message = array();
             foreach ( $results as $k => $m ) {
-                self::item_count_message($m, $k, $s_message);
-                unset($k, $m);
+                self::item_count_message( $m, $k, $s_message );
+                unset( $k, $m );
             }
 
-            if ( ! empty($s_message) ) {
-				$message .= '<li><strong>' . $t_strings[ $type ] . ':</strong> ';
-                $message .= implode(', ', $s_message);
+            if ( ! empty( $s_message ) ) {
+				$message .= '<li><strong>' . $t_strings[$type] . ':</strong> ';
+                $message .= implode( ', ', $s_message );
                 $message .= '</li>';
             }
         }
@@ -715,7 +715,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 );
     }
 
 	/**
@@ -726,7 +726,7 @@ 
 	 * @return string
 	 */
 	public static function prepare_form_options_for_export( $options ) {
-		$options = maybe_unserialize ( $options );
+		$options = maybe_unserialize( $options );
 		// Change custom_style to the post_name instead of ID
 		if ( isset( $options['custom_style'] ) && $options['custom_style'] !== 1 ) {
 			global $wpdb;
@@ -750,14 +750,14 @@ 
 	}
 
 	public static function cdata( $str ) {
-	    $str = maybe_unserialize($str);
-	    if ( is_array($str) ) {
-	        $str = json_encode($str);
+	    $str = maybe_unserialize( $str );
+	    if ( is_array( $str ) ) {
+	        $str = json_encode( $str );
 		} else if ( seems_utf8( $str ) == false ) {
 			$str = utf8_encode( $str );
 		}
 
-        if ( is_numeric($str) ) {
+        if ( is_numeric( $str ) ) {
             return $str;
         }
 
@@ -789,7 +789,7 @@ 
     * @param string $post_type
     */
     private static function migrate_post_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
-        if ( ! isset($form_options['create_post']) || ! $form_options['create_post'] ) {
+        if ( ! isset( $form_options['create_post'] ) || ! $form_options['create_post'] ) {
             return;
         }
 
@@ -800,7 +800,7 @@ 
             'menu_order'    => $form_id,
             'post_status'   => 'publish',
             'post_content'  => array(),
-            'post_name'     => $form_id .'_wppost_1',
+            'post_name'     => $form_id . '_wppost_1',
         );
 
         $post_settings = array(
@@ -810,10 +810,10 @@ 
         );
 
         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);
+            unset( $post_setting );
         }
 
 		$new_action['event'] = array( 'create', 'update' );
@@ -827,7 +827,7 @@ 
 
 			$new_action['post_content'] = self::switch_action_field_ids( $new_action['post_content'], $basic_fields, $array_fields );
         }
-        $new_action['post_content'] = json_encode($new_action['post_content']);
+        $new_action['post_content'] = json_encode( $new_action['post_content'] );
 
         $exists = get_posts( array(
             'name'          => $new_action['post_name'],
@@ -839,7 +839,7 @@ 
         if ( ! $exists ) {
 			// this isn't an email, but we need to use a class that will always be included
 			FrmAppHelper::save_json_post( $new_action );
-            $imported['imported']['actions']++;
+            $imported['imported']['actions'] ++;
         }
     }
 
@@ -871,11 +871,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 );
             } else if ( 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 );
@@ -898,14 +898,14 @@ 
         // Migrate autoresponders
         self::migrate_autoresponder_to_action( $form_options, $form_id, $notifications );
 
-        if (  empty( $notifications ) ) {
+        if ( empty( $notifications ) ) {
             return;
         }
 
         foreach ( $notifications as $new_notification ) {
             $new_notification['post_type']      = $post_type;
             $new_notification['post_excerpt']   = 'email';
-			$new_notification['post_title']     = __( 'Email Notification', 'formidable' );
+			$new_notification['post_title'] = __( 'Email Notification', 'formidable' );
             $new_notification['menu_order']     = $form_id;
             $new_notification['post_status']    = 'publish';
 
@@ -918,7 +918,7 @@ 
 				// Switch all other field IDs in email
                 $new_notification['post_content'] = FrmFieldsHelper::switch_field_ids( $new_notification['post_content'] );
             }
-            $new_notification['post_content']   = FrmAppHelper::prepare_and_encode( $new_notification['post_content'] );
+            $new_notification['post_content'] = FrmAppHelper::prepare_and_encode( $new_notification['post_content'] );
 
             $exists = get_posts( array(
                 'name'          => $new_notification['post_name'],
@@ -927,11 +927,11 @@ 
                 'numberposts'   => 1,
             ) );
 
-            if ( empty($exists) ) {
+            if ( empty( $exists ) ) {
 				FrmAppHelper::save_json_post( $new_notification );
-                $imported['imported']['actions']++;
+                $imported['imported']['actions'] ++;
             }
-            unset($new_notification);
+            unset( $new_notification );
         }
     }
 
@@ -944,7 +944,7 @@ 
 			$form_options['notification'] = array( 0 => $form_options['notification'] );
         }
 
-        if ( isset( $form_options['notification'] ) && is_array($form_options['notification']) ) {
+        if ( isset( $form_options['notification'] ) && is_array( $form_options['notification'] ) ) {
             foreach ( $form_options['notification'] as $email_key => $notification ) {
 
                 $atts = array( 'email_to' => '', 'reply_to' => '', 'reply_to_name' => '', 'event' => '', 'form_id' => $form_id, 'email_key' => $email_key );
@@ -972,12 +972,12 @@ 
         // Format the reply to email and name
         $reply_fields = array( 'reply_to' => '', '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 ];
-				} else if ( 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];
+				} else if ( is_numeric( $atts[$f] ) && ! empty( $atts[$f] ) ) {
+					$atts[$f] = '[' . $atts[$f] . ']';
                 }
             }
             unset( $f, $val );
@@ -987,7 +987,7 @@ 
 		$atts['event'] = array( 'create' );
         if ( isset( $notification['update_email'] ) && 1 == $notification['update_email'] ) {
             $atts['event'][] = 'update';
-        } else if ( isset($notification['update_email']) && 2 == $notification['update_email'] ) {
+        } else if ( isset( $notification['update_email'] ) && 2 == $notification['update_email'] ) {
 			$atts['event'] = array( 'update' );
         }
     }
@@ -1008,18 +1008,18 @@ 
         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, '|') ) {
+            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 );
             }
         }
-        $atts['email_to'] = implode(', ', $atts['email_to']);
+        $atts['email_to'] = implode( ', ', $atts['email_to'] );
     }
 
     private static function setup_new_notification( &$new_notification, $notification, $atts ) {
@@ -1029,18 +1029,18 @@ 
                 'email_to'      => $atts['email_to'],
                 'event'         => $atts['event'],
             ),
-            'post_name'         => $atts['form_id'] .'_email_'. $atts['email_key'],
+            'post_name'         => $atts['form_id'] . '_email_' . $atts['email_key'],
         );
 
         // 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];
             } else if ( 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 );
         }
@@ -1050,7 +1050,7 @@ 
 
         // Set from
 		if ( ! empty( $atts['reply_to'] ) || ! empty( $atts['reply_to_name'] ) ) {
-            $new_notification['post_content']['from'] = ( empty($atts['reply_to_name']) ? '[sitename]' : $atts['reply_to_name'] ) .' <'. ( empty($atts['reply_to']) ? '[admin_email]' : $atts['reply_to'] ) .'>';
+            $new_notification['post_content']['from'] = ( empty( $atts['reply_to_name'] ) ? '[sitename]' : $atts['reply_to_name'] ) . ' <' . ( empty( $atts['reply_to'] ) ? '[admin_email]' : $atts['reply_to'] ) . '>';
         }
     }
 
@@ -1064,50 +1064,50 @@ 
 		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);
+				unset( $email_key, $val );
 			}
 		}
 	}
 
     private static function migrate_autoresponder_to_action( $form_options, $form_id, &$notifications ) {
-        if ( isset($form_options['auto_responder']) && $form_options['auto_responder'] && isset($form_options['ar_email_message']) && $form_options['ar_email_message'] ) {
+        if ( isset( $form_options['auto_responder'] ) && $form_options['auto_responder'] && isset( $form_options['ar_email_message'] ) && $form_options['ar_email_message'] ) {
             // migrate autoresponder
 
-            $email_field = isset($form_options['ar_email_to']) ? $form_options['ar_email_to'] : 0;
-            if ( strpos($email_field, '|') ) {
+            $email_field = isset( $form_options['ar_email_to'] ) ? $form_options['ar_email_to'] : 0;
+            if ( strpos( $email_field, '|' ) ) {
                 // data from entries field
-                $email_field = explode('|', $email_field);
-                if ( isset($email_field[1]) ) {
+                $email_field = explode( '|', $email_field );
+                if ( isset( $email_field[1] ) ) {
                     $email_field = $email_field[1];
                 }
             }
-            if ( is_numeric($email_field) && ! empty($email_field) ) {
-                $email_field = '['. $email_field .']';
+            if ( is_numeric( $email_field ) && ! empty( $email_field ) ) {
+                $email_field = '[' . $email_field . ']';
             }
 
             $notification = $form_options;
             $new_notification2 = array(
                 'post_content'  => array(
                     'email_message' => $notification['ar_email_message'],
-                    'email_subject' => isset($notification['ar_email_subject']) ? $notification['ar_email_subject'] : '',
+                    'email_subject' => isset( $notification['ar_email_subject'] ) ? $notification['ar_email_subject'] : '',
                     'email_to'      => $email_field,
-                    'plain_text'    => isset($notification['ar_plain_text']) ? $notification['ar_plain_text'] : 0,
+                    'plain_text'    => isset( $notification['ar_plain_text'] ) ? $notification['ar_plain_text'] : 0,
                     'inc_user_info' => 0,
                 ),
-                'post_name'     => $form_id .'_email_'. count( $notifications ),
+                'post_name'     => $form_id . '_email_' . count( $notifications ),
             );
 
-            $reply_to = isset($notification['ar_reply_to']) ? $notification['ar_reply_to'] : '';
-            $reply_to_name = isset($notification['ar_reply_to_name']) ? $notification['ar_reply_to_name'] : '';
+            $reply_to = isset( $notification['ar_reply_to'] ) ? $notification['ar_reply_to'] : '';
+            $reply_to_name = isset( $notification['ar_reply_to_name'] ) ? $notification['ar_reply_to_name'] : '';
 
 			if ( ! empty( $reply_to ) ) {
 				$new_notification2['post_content']['reply_to'] = $reply_to;
 			}
 
 			if ( ! empty( $reply_to ) || ! empty( $reply_to_name ) ) {
-                $new_notification2['post_content']['from'] = ( empty($reply_to_name) ? '[sitename]' : $reply_to_name ) .' <'. ( empty($reply_to) ? '[admin_email]' : $reply_to ) .'>';
+                $new_notification2['post_content']['from'] = ( empty( $reply_to_name ) ? '[sitename]' : $reply_to_name ) . ' <' . ( empty( $reply_to ) ? '[admin_email]' : $reply_to ) . '>';
 			}
 
             $notifications[] = $new_notification2;

classes/views/xml/forms_xml.php

Spacing +12 added lines, -12 removed lines

@@ -13,16 +13,16 @@ 
 ?>
 	<form>
 		<id><?php echo $form->id ?></id>
-		<form_key><?php echo FrmXMLHelper::cdata($form->form_key) ?></form_key>
-		<name><?php echo FrmXMLHelper::cdata($form->name) ?></name>
-		<description><?php echo FrmXMLHelper::cdata($form->description) ?></description>
+		<form_key><?php echo FrmXMLHelper::cdata( $form->form_key ) ?></form_key>
+		<name><?php echo FrmXMLHelper::cdata( $form->name ) ?></name>
+		<description><?php echo FrmXMLHelper::cdata( $form->description ) ?></description>
 		<created_at><?php echo $form->created_at ?></created_at>
 		<logged_in><?php echo $form->logged_in ?></logged_in>
 		<is_template><?php echo $form->is_template ?></is_template>
 		<default_template><?php echo $form->default_template ?></default_template>
 		<editable><?php echo $form->editable ?></editable>
-		<options><?php echo FrmXMLHelper::prepare_form_options_for_export($form->options) ?></options>
-		<status><?php echo FrmXMLHelper::cdata($form->status) ?></status>
+		<options><?php echo FrmXMLHelper::prepare_form_options_for_export( $form->options ) ?></options>
+		<status><?php echo FrmXMLHelper::cdata( $form->status ) ?></status>
         <parent_form_id><?php echo $form->parent_form_id ?></parent_form_id>
 <?php
 
@@ -31,16 +31,16 @@ 
 		foreach ( $fields as $field ) { ?>
 		<field>
 		    <id><?php echo $field->id ?></id>
-            <field_key><?php echo FrmXMLHelper::cdata($field->field_key) ?></field_key>
-            <name><?php echo FrmXMLHelper::cdata($field->name) ?></name>
-            <description><?php echo FrmXMLHelper::cdata($field->description) ?></description>
-            <type><?php echo FrmXMLHelper::cdata($field->type) ?></type>
-            <default_value><?php echo FrmXMLHelper::cdata($field->default_value) ?></default_value>
+            <field_key><?php echo FrmXMLHelper::cdata( $field->field_key ) ?></field_key>
+            <name><?php echo FrmXMLHelper::cdata( $field->name ) ?></name>
+            <description><?php echo FrmXMLHelper::cdata( $field->description ) ?></description>
+            <type><?php echo FrmXMLHelper::cdata( $field->type ) ?></type>
+            <default_value><?php echo FrmXMLHelper::cdata( $field->default_value ) ?></default_value>
             <field_order><?php echo $field->field_order ?></field_order>
             <form_id><?php echo $field->form_id ?></form_id>
             <required><?php echo (bool) $field->required ?></required>
-            <options><?php echo FrmXMLHelper::cdata($field->options) ?></options>
-            <field_options><?php echo FrmXMLHelper::cdata($field->field_options) ?></field_options>
+            <options><?php echo FrmXMLHelper::cdata( $field->options ) ?></options>
+            <field_options><?php echo FrmXMLHelper::cdata( $field->field_options ) ?></field_options>
 		</field>
 <?php	} ?>
 	</form>