Strategy11 / formidable-forms

classes/models/FrmMigrate.php

Indentation +161 added lines, -161 removed lines

@@ -76,11 +76,11 @@ 
 		return $charset_collate;
 	}
 
-    private function create_tables() {
-        $charset_collate = $this->collation();
-        $sql = array();
+	private function create_tables() {
+		$charset_collate = $this->collation();
+		$sql = array();
 
-        /* Create/Upgrade Fields Table */
+		/* Create/Upgrade Fields Table */
 		$sql[] = 'CREATE TABLE ' . $this->fields . ' (
 				id BIGINT(20) NOT NULL auto_increment,
 				field_key varchar(100) default NULL,
@@ -99,7 +99,7 @@ 
                 UNIQUE KEY field_key (field_key)
         )';
 
-        /* Create/Upgrade Forms Table */
+		/* Create/Upgrade Forms Table */
 		$sql[] = 'CREATE TABLE ' . $this->forms . ' (
                 id int(11) NOT NULL auto_increment,
 				form_key varchar(100) default NULL,
@@ -117,7 +117,7 @@ 
                 UNIQUE KEY form_key (form_key)
         )';
 
-        /* Create/Upgrade Items Table */
+		/* Create/Upgrade Items Table */
 		$sql[] = 'CREATE TABLE ' . $this->entries . ' (
 				id BIGINT(20) NOT NULL auto_increment,
 				item_key varchar(100) default NULL,
@@ -140,7 +140,7 @@ 
                 UNIQUE KEY item_key (item_key)
         )';
 
-        /* Create/Upgrade Meta Table */
+		/* Create/Upgrade Meta Table */
 		$sql[] = 'CREATE TABLE ' . $this->entry_metas . ' (
 				id BIGINT(20) NOT NULL auto_increment,
 				meta_value longtext default NULL,
@@ -152,16 +152,16 @@ 
                 KEY item_id (item_id)
         )';
 
-        foreach ( $sql as $q ) {
+		foreach ( $sql as $q ) {
 			if ( function_exists( 'dbDelta' ) ) {
 				dbDelta( $q . $charset_collate . ';' );
 			} else {
 				global $wpdb;
 				$wpdb->query( $q . $charset_collate );
 			}
-            unset($q);
-        }
-    }
+			unset($q);
+		}
+	}
 
 	private function maybe_create_contact_form() {
 		$template_id = FrmForm::getIdByKey( 'contact' );
@@ -177,45 +177,45 @@ 
 		}
 	}
 
-    /**
-     * @param integer $frm_db_version
+	/**
+	 * @param integer $frm_db_version
 	 * @param int $old_db_version
-     */
+	 */
 	private function migrate_data( $frm_db_version, $old_db_version ) {
 		$migrations = array( 4, 6, 11, 16, 17, 23, 25 );
-        foreach ( $migrations as $migration ) {
-            if ( $frm_db_version >= $migration && $old_db_version < $migration ) {
+		foreach ( $migrations as $migration ) {
+			if ( $frm_db_version >= $migration && $old_db_version < $migration ) {
 				$function_name = 'migrate_to_' . $migration;
-                $this->$function_name();
-            }
-        }
-    }
+				$this->$function_name();
+			}
+		}
+	}
 
-    public function uninstall() {
+	public function uninstall() {
 		if ( ! current_user_can( 'administrator' ) ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            wp_die($frm_settings->admin_permission);
-        }
+			$frm_settings = FrmAppHelper::get_settings();
+			wp_die($frm_settings->admin_permission);
+		}
 
-        global $wpdb, $wp_roles;
+		global $wpdb, $wp_roles;
 
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->fields );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->forms );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entries );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entry_metas );
 
-        delete_option('frm_options');
-        delete_option('frm_db_version');
-
-        //delete roles
-        $frm_roles = FrmAppHelper::frm_capabilities();
-        $roles = get_editable_roles();
-        foreach ( $frm_roles as $frm_role => $frm_role_description ) {
-            foreach ( $roles as $role => $details ) {
-                $wp_roles->remove_cap( $role, $frm_role );
-                unset($role, $details);
-    		}
-    		unset($frm_role, $frm_role_description);
+		delete_option('frm_options');
+		delete_option('frm_db_version');
+
+		//delete roles
+		$frm_roles = FrmAppHelper::frm_capabilities();
+		$roles = get_editable_roles();
+		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
+			foreach ( $roles as $role => $details ) {
+				$wp_roles->remove_cap( $role, $frm_role );
+				unset($role, $details);
+			}
+			unset($frm_role, $frm_role_description);
 		}
 		unset($roles, $frm_roles);
 
@@ -239,9 +239,9 @@ 
 
 		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->options . ' WHERE option_name LIKE %s OR option_name LIKE %s', '_transient_timeout_frm_form_fields_%', '_transient_frm_form_fields_%' ) );
 
-        do_action('frm_after_uninstall');
-        return true;
-    }
+		do_action('frm_after_uninstall');
+		return true;
+	}
 
 	/**
 	 * Migrate old styling settings. If sites are using the old
@@ -280,14 +280,14 @@ 
 		}
 	}
 
-    /**
-     * Change field size from character to pixel -- Multiply by 9
-     */
-    private function migrate_to_17() {
-        global $wpdb;
+	/**
+	 * Change field size from character to pixel -- Multiply by 9
+	 */
+	private function migrate_to_17() {
+		global $wpdb;
 		$pixel_conversion = 9;
 
-        // Get query arguments
+		// Get query arguments
 		$field_types = array( 'textarea', 'text', 'number', 'email', 'url', 'rte', 'date', 'phone', 'password', 'image', 'tag', 'file' );
 		$query = array(
 			'type' => $field_types,
@@ -295,139 +295,139 @@ 
 			'field_options not like' => 's:4:"size";s:0:',
 		);
 
-        // Get results
+		// Get results
 		$fields = FrmDb::get_results( $this->fields, $query, 'id, field_options' );
 
-        $updated = 0;
-        foreach ( $fields as $f ) {
-            $f->field_options = maybe_unserialize($f->field_options);
-            if ( empty($f->field_options['size']) || ! is_numeric($f->field_options['size']) ) {
-                continue;
-            }
+		$updated = 0;
+		foreach ( $fields as $f ) {
+			$f->field_options = maybe_unserialize($f->field_options);
+			if ( empty($f->field_options['size']) || ! is_numeric($f->field_options['size']) ) {
+				continue;
+			}
 
 			$f->field_options['size'] = round( $pixel_conversion * (int) $f->field_options['size'] );
-            $f->field_options['size'] .= 'px';
-            $u = FrmField::update( $f->id, array( 'field_options' => $f->field_options ) );
-            if ( $u ) {
-                $updated++;
-            }
-            unset($f);
-        }
-
-        // Change the characters in widgets to pixels
-        $widgets = get_option('widget_frm_show_form');
-        if ( empty($widgets) ) {
-            return;
-        }
-
-        $widgets = maybe_unserialize($widgets);
-        foreach ( $widgets as $k => $widget ) {
-            if ( ! is_array($widget) || ! isset($widget['size']) ) {
-                continue;
-            }
+			$f->field_options['size'] .= 'px';
+			$u = FrmField::update( $f->id, array( 'field_options' => $f->field_options ) );
+			if ( $u ) {
+				$updated++;
+			}
+			unset($f);
+		}
+
+		// Change the characters in widgets to pixels
+		$widgets = get_option('widget_frm_show_form');
+		if ( empty($widgets) ) {
+			return;
+		}
+
+		$widgets = maybe_unserialize($widgets);
+		foreach ( $widgets as $k => $widget ) {
+			if ( ! is_array($widget) || ! isset($widget['size']) ) {
+				continue;
+			}
 			$size = round( $pixel_conversion * (int) $widget['size'] );
-            $size .= 'px';
+			$size .= 'px';
 			$widgets[ $k ]['size'] = $size;
-        }
-        update_option('widget_frm_show_form', $widgets);
-    }
-
-    /**
-     * Migrate post and email notification settings into actions
-     */
-    private function migrate_to_16() {
-        global $wpdb;
-
-        $forms = FrmDb::get_results( $this->forms, array(), 'id, options, is_template, default_template' );
-
-        /**
-        * Old email settings format:
-        * email_to: Email or field id
-        * also_email_to: array of fields ids
-        * reply_to: Email, field id, 'custom'
-        * cust_reply_to: string
-        * reply_to_name: field id, 'custom'
-        * cust_reply_to_name: string
-        * plain_text: 0|1
-        * email_message: string or ''
-        * email_subject: string or ''
-        * inc_user_info: 0|1
-        * update_email: 0, 1, 2
-        *
-        * Old autoresponder settings format:
-        * auto_responder: 0|1
-        * ar_email_message: string or ''
-        * ar_email_to: field id
-        * ar_plain_text: 0|1
-        * ar_reply_to_name: string
-        * ar_reply_to: string
-        * ar_email_subject: string
-        * ar_update_email: 0, 1, 2
-        *
-        * New email settings:
-        * post_content: json settings
-        * post_title: form id
-        * post_excerpt: message
-        *
-        */
-
-        foreach ( $forms as $form ) {
+		}
+		update_option('widget_frm_show_form', $widgets);
+	}
+
+	/**
+	 * Migrate post and email notification settings into actions
+	 */
+	private function migrate_to_16() {
+		global $wpdb;
+
+		$forms = FrmDb::get_results( $this->forms, array(), 'id, options, is_template, default_template' );
+
+		/**
+		 * Old email settings format:
+		 * email_to: Email or field id
+		 * also_email_to: array of fields ids
+		 * reply_to: Email, field id, 'custom'
+		 * cust_reply_to: string
+		 * reply_to_name: field id, 'custom'
+		 * cust_reply_to_name: string
+		 * plain_text: 0|1
+		 * email_message: string or ''
+		 * email_subject: string or ''
+		 * inc_user_info: 0|1
+		 * update_email: 0, 1, 2
+		 *
+		 * Old autoresponder settings format:
+		 * auto_responder: 0|1
+		 * ar_email_message: string or ''
+		 * ar_email_to: field id
+		 * ar_plain_text: 0|1
+		 * ar_reply_to_name: string
+		 * ar_reply_to: string
+		 * ar_email_subject: string
+		 * ar_update_email: 0, 1, 2
+		 *
+		 * New email settings:
+		 * post_content: json settings
+		 * post_title: form id
+		 * post_excerpt: message
+		 *
+		 */
+
+		foreach ( $forms as $form ) {
 			if ( $form->is_template && $form->default_template ) {
 				// don't migrate the default templates since the email will be added anyway
 				continue;
 			}
 
-            // Format form options
-            $form_options = maybe_unserialize($form->options);
+			// Format form options
+			$form_options = maybe_unserialize($form->options);
 
-            // Migrate settings to actions
-            FrmXMLHelper::migrate_form_settings_to_actions( $form_options, $form->id );
-        }
-    }
+			// Migrate settings to actions
+			FrmXMLHelper::migrate_form_settings_to_actions( $form_options, $form->id );
+		}
+	}
 
-    private function migrate_to_11() {
-        global $wpdb;
+	private function migrate_to_11() {
+		global $wpdb;
 
-        $forms = FrmDb::get_results( $this->forms, array(), 'id, options');
+		$forms = FrmDb::get_results( $this->forms, array(), 'id, options');
 
-        $sending = __( 'Sending', 'formidable' );
+		$sending = __( 'Sending', 'formidable' );
 		$img = FrmAppHelper::plugin_url() . '/images/ajax_loader.gif';
-        $old_default_html = <<<DEFAULT_HTML
+		$old_default_html = <<<DEFAULT_HTML
 <div class="frm_submit">
 [if back_button]<input type="submit" value="[back_label]" name="frm_prev_page" formnovalidate="formnovalidate" [back_hook] />[/if back_button]
 <input type="submit" value="[button_label]" [button_action] />
 <img class="frm_ajax_loading" src="$img" alt="$sending" style="visibility:hidden;" />
 </div>
 DEFAULT_HTML;
-        unset($sending, $img);
+		unset($sending, $img);
 
-        $new_default_html = FrmFormsHelper::get_default_html('submit');
-        $draft_link = FrmFormsHelper::get_draft_link();
+		$new_default_html = FrmFormsHelper::get_default_html('submit');
+		$draft_link = FrmFormsHelper::get_draft_link();
 		foreach ( $forms as $form ) {
-            $form->options = maybe_unserialize($form->options);
-            if ( ! isset($form->options['submit_html']) || empty($form->options['submit_html']) ) {
-                continue;
-            }
+			$form->options = maybe_unserialize($form->options);
+			if ( ! isset($form->options['submit_html']) || empty($form->options['submit_html']) ) {
+				continue;
+			}
 
-            if ( $form->options['submit_html'] != $new_default_html && $form->options['submit_html'] == $old_default_html ) {
-                $form->options['submit_html'] = $new_default_html;
+			if ( $form->options['submit_html'] != $new_default_html && $form->options['submit_html'] == $old_default_html ) {
+				$form->options['submit_html'] = $new_default_html;
 				$wpdb->update( $this->forms, array( 'options' => serialize( $form->options ) ), array( 'id' => $form->id ) );
 			} else if ( ! strpos( $form->options['submit_html'], 'save_draft' ) ) {
 				$form->options['submit_html'] = preg_replace( '~\<\/div\>(?!.*\<\/div\>)~', $draft_link . "\r\n</div>", $form->options['submit_html'] );
 				$wpdb->update( $this->forms, array( 'options' => serialize( $form->options ) ), array( 'id' => $form->id ) );
-            }
-            unset($form);
-        }
-        unset($forms);
-    }
+			}
+			unset($form);
+		}
+		unset($forms);
+	}
 
-    private function migrate_to_6() {
-        global $wpdb;
+	private function migrate_to_6() {
+		global $wpdb;
 
 		$no_save = array_merge( FrmField::no_save_fields(), array( 'form', 'hidden', 'user_id' ) );
 		$fields = FrmDb::get_results( $this->fields, array( 'type NOT' => $no_save ), 'id, field_options' );
 
-        $default_html = <<<DEFAULT_HTML
+		$default_html = <<<DEFAULT_HTML
 <div id="frm_field_[id]_container" class="form-field [required_class] [error_class]">
     <label class="frm_pos_[label_position]">[field_name]
         <span class="frm_required">[required_label]</span>
@@ -437,7 +437,7 @@ 
 </div>
 DEFAULT_HTML;
 
-        $old_default_html = <<<DEFAULT_HTML
+		$old_default_html = <<<DEFAULT_HTML
 <div id="frm_field_[id]_container" class="form-field [required_class] [error_class]">
     <label class="frm_pos_[label_position]">[field_name]
         <span class="frm_required">[required_label]</span>
@@ -447,24 +447,24 @@ 
 </div>
 DEFAULT_HTML;
 
-        $new_default_html = FrmFieldsHelper::get_default_html('text');
-        foreach ( $fields as $field ) {
-            $field->field_options = maybe_unserialize($field->field_options);
+		$new_default_html = FrmFieldsHelper::get_default_html('text');
+		foreach ( $fields as $field ) {
+			$field->field_options = maybe_unserialize($field->field_options);
 			$html = FrmField::get_option( $field, 'custom_html' );
 			if ( $html == $default_html || $html == $old_default_html ) {
-                $field->field_options['custom_html'] = $new_default_html;
+				$field->field_options['custom_html'] = $new_default_html;
 				$wpdb->update( $this->fields, array( 'field_options' => maybe_serialize( $field->field_options ) ), array( 'id' => $field->id ) );
-            }
-            unset($field);
-        }
-        unset($default_html, $old_default_html, $fields);
-    }
-
-    private function migrate_to_4() {
-        global $wpdb;
+			}
+			unset($field);
+		}
+		unset($default_html, $old_default_html, $fields);
+	}
+
+	private function migrate_to_4() {
+		global $wpdb;
 		$user_ids = FrmEntryMeta::getAll( array( 'fi.type' => 'user_id' ) );
-        foreach ( $user_ids as $user_id ) {
+		foreach ( $user_ids as $user_id ) {
 			$wpdb->update( $this->entries, array( 'user_id' => $user_id->meta_value ), array( 'id' => $user_id->item_id ) );
-        }
-    }
+		}
+	}
 }

classes/models/FrmForm.php

Indentation +306 added lines, -306 removed lines

@@ -1,176 +1,176 @@ 
 <?php
 if ( ! defined('ABSPATH') ) {
-    die('You are not allowed to call this page directly.');
+	die('You are not allowed to call this page directly.');
 }
 
 class FrmForm {
 
-    /**
-     * @return int|boolean id on success or false on failure
-     */
-    public static function create( $values ) {
-        global $wpdb;
+	/**
+	 * @return int|boolean id on success or false on failure
+	 */
+	public static function create( $values ) {
+		global $wpdb;
 
-        $new_values = array(
+		$new_values = array(
 			'form_key'      => FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key' ),
-            'name'          => $values['name'],
-            'description'   => $values['description'],
-            'status'        => isset($values['status']) ? $values['status'] : 'draft',
-            'logged_in'     => isset($values['logged_in']) ? $values['logged_in'] : 0,
-            'is_template'   => isset($values['is_template']) ? (int) $values['is_template'] : 0,
+			'name'          => $values['name'],
+			'description'   => $values['description'],
+			'status'        => isset($values['status']) ? $values['status'] : 'draft',
+			'logged_in'     => isset($values['logged_in']) ? $values['logged_in'] : 0,
+			'is_template'   => isset($values['is_template']) ? (int) $values['is_template'] : 0,
 			'parent_form_id' => isset( $values['parent_form_id'] ) ? absint( $values['parent_form_id'] ) : 0,
-            'editable'      => isset($values['editable']) ? (int) $values['editable'] : 0,
-            'default_template' => isset($values['default_template']) ? (int) $values['default_template'] : 0,
-            'created_at'    => isset($values['created_at']) ? $values['created_at'] : current_time('mysql', 1),
-        );
+			'editable'      => isset($values['editable']) ? (int) $values['editable'] : 0,
+			'default_template' => isset($values['default_template']) ? (int) $values['default_template'] : 0,
+			'created_at'    => isset($values['created_at']) ? $values['created_at'] : current_time('mysql', 1),
+		);
 
 		$options = isset( $values['options'] ) ? (array) $values['options'] : array();
 		FrmFormsHelper::fill_form_options( $options, $values );
 
-        $options['before_html'] = isset($values['options']['before_html']) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html('before');
-        $options['after_html'] = isset($values['options']['after_html']) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html('after');
-        $options['submit_html'] = isset($values['options']['submit_html']) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html('submit');
+		$options['before_html'] = isset($values['options']['before_html']) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html('before');
+		$options['after_html'] = isset($values['options']['after_html']) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html('after');
+		$options['submit_html'] = isset($values['options']['submit_html']) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html('submit');
 
-        $options = apply_filters('frm_form_options_before_update', $options, $values);
-        $new_values['options'] = serialize($options);
+		$options = apply_filters('frm_form_options_before_update', $options, $values);
+		$new_values['options'] = serialize($options);
 
-        //if(isset($values['id']) && is_numeric($values['id']))
-        //    $new_values['id'] = $values['id'];
+		//if(isset($values['id']) && is_numeric($values['id']))
+		//    $new_values['id'] = $values['id'];
 
 		$wpdb->insert( $wpdb->prefix . 'frm_forms', $new_values );
 
-        $id = $wpdb->insert_id;
+		$id = $wpdb->insert_id;
 
 		// Clear form caching
 		self::clear_form_cache();
 
-        return $id;
-    }
+		return $id;
+	}
 
-    /**
-     * @return int|boolean ID on success or false on failure
-     */
-    public static function duplicate( $id, $template = false, $copy_keys = false, $blog_id = false ) {
-        global $wpdb;
+	/**
+	 * @return int|boolean ID on success or false on failure
+	 */
+	public static function duplicate( $id, $template = false, $copy_keys = false, $blog_id = false ) {
+		global $wpdb;
 
-        $values = self::getOne( $id, $blog_id );
-        if ( ! $values ) {
-            return false;
-        }
+		$values = self::getOne( $id, $blog_id );
+		if ( ! $values ) {
+			return false;
+		}
 
-        $new_key = $copy_keys ? $values->form_key : '';
+		$new_key = $copy_keys ? $values->form_key : '';
 
-        $new_values = array(
+		$new_values = array(
 			'form_key'      => FrmAppHelper::get_unique_key( $new_key, $wpdb->prefix . 'frm_forms', 'form_key' ),
-            'name'          => $values->name,
-            'description'   => $values->description,
-            'status'        => $template ? 'published' : 'draft',
-            'logged_in'     => $values->logged_in ? $values->logged_in : 0,
-            'editable'      => $values->editable ? $values->editable : 0,
-            'created_at'    => current_time('mysql', 1),
-            'is_template'   => $template ? 1 : 0,
-        );
-
-        if ( $blog_id ) {
-            $new_values['status'] = 'published';
-            $new_options = maybe_unserialize($values->options);
-            $new_options['email_to'] = get_option('admin_email');
-            $new_options['copy'] = false;
-            $new_values['options'] = $new_options;
-        } else {
-            $new_values['options'] = $values->options;
-        }
-
-        if ( is_array($new_values['options']) ) {
-            $new_values['options'] = serialize($new_values['options']);
-        }
+			'name'          => $values->name,
+			'description'   => $values->description,
+			'status'        => $template ? 'published' : 'draft',
+			'logged_in'     => $values->logged_in ? $values->logged_in : 0,
+			'editable'      => $values->editable ? $values->editable : 0,
+			'created_at'    => current_time('mysql', 1),
+			'is_template'   => $template ? 1 : 0,
+		);
+
+		if ( $blog_id ) {
+			$new_values['status'] = 'published';
+			$new_options = maybe_unserialize($values->options);
+			$new_options['email_to'] = get_option('admin_email');
+			$new_options['copy'] = false;
+			$new_values['options'] = $new_options;
+		} else {
+			$new_values['options'] = $values->options;
+		}
+
+		if ( is_array($new_values['options']) ) {
+			$new_values['options'] = serialize($new_values['options']);
+		}
 
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_forms', $new_values );
 
-        if ( $query_results ) {
+		if ( $query_results ) {
 			// Clear form caching
 			self::clear_form_cache();
 
-            $form_id = $wpdb->insert_id;
-            FrmField::duplicate($id, $form_id, $copy_keys, $blog_id);
+			$form_id = $wpdb->insert_id;
+			FrmField::duplicate($id, $form_id, $copy_keys, $blog_id);
 
-            // update form settings after fields are created
+			// update form settings after fields are created
 			do_action( 'frm_after_duplicate_form', $form_id, $new_values, array( 'old_id' => $id ) );
-            return $form_id;
-        }
+			return $form_id;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
 	public static function after_duplicate( $form_id, $values ) {
 		$new_opts = maybe_unserialize( $values['options'] );
 		$values['options'] = $new_opts;
 
-        if ( isset($new_opts['success_msg']) ) {
-            $new_opts['success_msg'] = FrmFieldsHelper::switch_field_ids($new_opts['success_msg']);
-        }
+		if ( isset($new_opts['success_msg']) ) {
+			$new_opts['success_msg'] = FrmFieldsHelper::switch_field_ids($new_opts['success_msg']);
+		}
 
-        $new_opts = apply_filters('frm_after_duplicate_form_values', $new_opts, $form_id);
+		$new_opts = apply_filters('frm_after_duplicate_form_values', $new_opts, $form_id);
 
-        if ( $new_opts != $values['options'] ) {
-            global $wpdb;
+		if ( $new_opts != $values['options'] ) {
+			global $wpdb;
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => maybe_serialize( $new_opts ) ), array( 'id' => $form_id ) );
-        }
-    }
+		}
+	}
 
-    /**
-     * @return int|boolean
-     */
-    public static function update( $id, $values, $create_link = false ) {
-        global $wpdb;
+	/**
+	 * @return int|boolean
+	 */
+	public static function update( $id, $values, $create_link = false ) {
+		global $wpdb;
 
-        if ( ! isset( $values['status'] ) && ( $create_link || isset( $values['options'] ) || isset( $values['item_meta'] ) || isset( $values['field_options'] ) ) ) {
-            $values['status'] = 'published';
-        }
+		if ( ! isset( $values['status'] ) && ( $create_link || isset( $values['options'] ) || isset( $values['item_meta'] ) || isset( $values['field_options'] ) ) ) {
+			$values['status'] = 'published';
+		}
 
-        if ( isset($values['form_key']) ) {
+		if ( isset($values['form_key']) ) {
 			$values['form_key'] = FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key', $id );
-        }
+		}
 
 		$form_fields = array( 'form_key', 'name', 'description', 'status', 'parent_form_id' );
 
-        $new_values = self::set_update_options( array(), $values);
+		$new_values = self::set_update_options( array(), $values);
 
-        foreach ( $values as $value_key => $value ) {
+		foreach ( $values as $value_key => $value ) {
 			if ( $value_key && in_array( $value_key, $form_fields ) ) {
 				$new_values[ $value_key ] = $value;
-            }
-        }
+			}
+		}
 
-        if ( isset( $values['new_status'] ) && ! empty( $values['new_status'] ) ) {
-            $new_values['status'] = $values['new_status'];
-        }
+		if ( isset( $values['new_status'] ) && ! empty( $values['new_status'] ) ) {
+			$new_values['status'] = $values['new_status'];
+		}
 
-        if ( ! empty( $new_values ) ) {
+		if ( ! empty( $new_values ) ) {
 			$query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', $new_values, array( 'id' => $id ) );
-            if ( $query_results ) {
+			if ( $query_results ) {
 				self::clear_form_cache();
-            }
-        } else {
-            $query_results = true;
-        }
-        unset($new_values);
+			}
+		} else {
+			$query_results = true;
+		}
+		unset($new_values);
 
-        $values = self::update_fields($id, $values);
+		$values = self::update_fields($id, $values);
 
 		do_action( 'frm_update_form', $id, $values );
 		do_action( 'frm_update_form_' . $id, $values );
 
-        return $query_results;
-    }
+		return $query_results;
+	}
 
-    /**
-     * @return array
-     */
+	/**
+	 * @return array
+	 */
 	public static function set_update_options( $new_values, $values ) {
-        if ( ! isset($values['options']) ) {
-            return $new_values;
-        }
+		if ( ! isset($values['options']) ) {
+			return $new_values;
+		}
 
 		$options = isset( $values['options'] ) ? (array) $values['options'] : array();
 		FrmFormsHelper::fill_form_options( $options, $values );
@@ -184,79 +184,79 @@ 
 		$new_values['options'] = serialize( $options );
 
 		return $new_values;
-    }
+	}
 
 
-    /**
-     * @return array
-     */
+	/**
+	 * @return array
+	 */
 	public static function update_fields( $id, $values ) {
 
-        if ( ! isset($values['item_meta']) && ! isset($values['field_options']) ) {
-            return $values;
-        }
+		if ( ! isset($values['item_meta']) && ! isset($values['field_options']) ) {
+			return $values;
+		}
 
-        $all_fields = FrmField::get_all_for_form($id);
-        if ( empty($all_fields) ) {
-            return $values;
-        }
+		$all_fields = FrmField::get_all_for_form($id);
+		if ( empty($all_fields) ) {
+			return $values;
+		}
 
-        if ( ! isset($values['item_meta']) ) {
-            $values['item_meta'] = array();
-        }
+		if ( ! isset($values['item_meta']) ) {
+			$values['item_meta'] = array();
+		}
 
-        $field_array = array();
-        $existing_keys = array_keys($values['item_meta']);
-        foreach ( $all_fields as $fid ) {
-            if ( ! in_array($fid->id, $existing_keys) && ( isset($values['frm_fields_submitted']) && in_array($fid->id, $values['frm_fields_submitted']) ) || isset($values['options']) ) {
+		$field_array = array();
+		$existing_keys = array_keys($values['item_meta']);
+		foreach ( $all_fields as $fid ) {
+			if ( ! in_array($fid->id, $existing_keys) && ( isset($values['frm_fields_submitted']) && in_array($fid->id, $values['frm_fields_submitted']) ) || isset($values['options']) ) {
 				$values['item_meta'][ $fid->id ] = '';
-            }
+			}
 			$field_array[ $fid->id ] = $fid;
-        }
-        unset($all_fields);
+		}
+		unset($all_fields);
 
-        foreach ( $values['item_meta'] as $field_id => $default_value ) {
+		foreach ( $values['item_meta'] as $field_id => $default_value ) {
 			if ( isset( $field_array[ $field_id ] ) ) {
 				$field = $field_array[ $field_id ];
-            } else {
-                $field = FrmField::getOne($field_id);
-            }
+			} else {
+				$field = FrmField::getOne($field_id);
+			}
 
-            if ( ! $field ) {
-                continue;
-            }
+			if ( ! $field ) {
+				continue;
+			}
 
 			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options'][ 'custom_html_' . $field_id ] ) );
 			if ( $is_settings_page ) {
-                //updating the settings page
+				//updating the settings page
 				if ( isset( $values['field_options'][ 'custom_html_' . $field_id ] ) ) {
 					$field->field_options['custom_html'] = isset( $values['field_options'][ 'custom_html_' . $field_id ] ) ? $values['field_options'][ 'custom_html_' . $field_id ] : ( isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type ) );
-                    $field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
+					$field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
 					FrmField::update( $field_id, array( 'field_options' => $field->field_options ) );
-                } else if ( $field->type == 'hidden' || $field->type == 'user_id' ) {
-                    $prev_opts = $field->field_options;
-                    $field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
-                    if ( $prev_opts != $field->field_options ) {
+				} else if ( $field->type == 'hidden' || $field->type == 'user_id' ) {
+					$prev_opts = $field->field_options;
+					$field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
+					if ( $prev_opts != $field->field_options ) {
 						FrmField::update( $field_id, array( 'field_options' => $field->field_options ) );
-                    }
-                    unset($prev_opts);
-                }
-            }
+					}
+					unset($prev_opts);
+				}
+			}
 
 			if ( $is_settings_page && ! defined( 'WP_IMPORTING' ) ) {
-                continue;
-            }
+				continue;
+			}
 
-            //updating the form
+			//updating the form
 			$update_options = FrmFieldsHelper::get_default_field_opts( $field->type, $field, true );
 			unset( $update_options['custom_html'] ); // don't check for POST html
 			$update_options = apply_filters( 'frm_field_options_to_update', $update_options );
 
 			foreach ( $update_options as $opt => $default ) {
 				$field->field_options[ $opt ] = isset( $values['field_options'][ $opt . '_' . $field_id ] ) ? trim( sanitize_text_field( $values['field_options'][ $opt . '_' . $field_id ] ) ) : $default;
-            }
+			}
 
-            $field->field_options = apply_filters('frm_update_field_options', $field->field_options, $field, $values);
+			$field->field_options = apply_filters('frm_update_field_options', $field->field_options, $field, $values);
 			$default_value = maybe_serialize( $values['item_meta'][ $field_id ] );
 
 			$new_field = array(
@@ -268,12 +268,12 @@ 
 
 			FrmField::update( $field_id, $new_field );
 
-            FrmField::delete_form_transient($field->form_id);
-        }
+			FrmField::delete_form_transient($field->form_id);
+		}
 		self::clear_form_cache();
 
-        return $values;
-    }
+		return $values;
+	}
 
 	private static function prepare_field_update_values( $field, $values, &$new_field ) {
 		$field_cols = array(
@@ -289,23 +289,23 @@ 
 		}
 	}
 
-    /**
-     * @param string $status
-     * @return int|boolean
-     */
+	/**
+	 * @param string $status
+	 * @return int|boolean
+	 */
 	public static function set_status( $id, $status ) {
-        if ( 'trash' == $status ) {
-            return self::trash($id);
-        }
+		if ( 'trash' == $status ) {
+			return self::trash($id);
+		}
 
 		$statuses  = array( 'published', 'draft', 'trash' );
-        if ( ! in_array( $status, $statuses ) ) {
-            return false;
-        }
+		if ( ! in_array( $status, $statuses ) ) {
+			return false;
+		}
 
-        global $wpdb;
+		global $wpdb;
 
-        if ( is_array($id) ) {
+		if ( is_array($id) ) {
 			$where = array(
 				'id' => $id,
 				'parent_form_id' => $id,
@@ -315,33 +315,33 @@ 
 			array_unshift( $where['values'], $status );
 
 			$query_results = $wpdb->query( $wpdb->prepare( 'UPDATE ' . $wpdb->prefix . 'frm_forms SET status = %s ' . $where['where'], $where['values'] ) );
-        } else {
+		} else {
 			$query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', array( 'status' => $status ), array( 'id' => $id ) );
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'status' => $status ), array( 'parent_form_id' => $id ) );
-        }
+		}
 
-        if ( $query_results ) {
+		if ( $query_results ) {
 			self::clear_form_cache();
-        }
+		}
 
-        return $query_results;
-    }
+		return $query_results;
+	}
 
-    /**
-     * @return int|boolean
-     */
+	/**
+	 * @return int|boolean
+	 */
 	public static function trash( $id ) {
-        if ( ! EMPTY_TRASH_DAYS ) {
-            return self::destroy( $id );
-        }
+		if ( ! EMPTY_TRASH_DAYS ) {
+			return self::destroy( $id );
+		}
 
-        $form = self::getOne($id);
-        if ( ! $form ) {
-            return false;
-        }
+		$form = self::getOne($id);
+		if ( ! $form ) {
+			return false;
+		}
 
-        $options = $form->options;
-        $options['trash_time'] = time();
+		$options = $form->options;
+		$options['trash_time'] = time();
 
 		global $wpdb;
 		$query_results = $wpdb->update(
@@ -366,50 +366,50 @@ 
 			)
 		);
 
-        if ( $query_results ) {
+		if ( $query_results ) {
 			self::clear_form_cache();
-        }
+		}
 
-        return $query_results;
-    }
+		return $query_results;
+	}
 
-    /**
-     * @return int|boolean
-     */
+	/**
+	 * @return int|boolean
+	 */
 	public static function destroy( $id ) {
-        global $wpdb;
+		global $wpdb;
 
-        $form = self::getOne($id);
-        if ( ! $form ) {
-            return false;
-        }
+		$form = self::getOne($id);
+		if ( ! $form ) {
+			return false;
+		}
 		$id = $form->id;
 
-        // Disconnect the entries from this form
+		// Disconnect the entries from this form
 		$entries = FrmDb::get_col( $wpdb->prefix . 'frm_items', array( 'form_id' => $id ) );
-        foreach ( $entries as $entry_id ) {
-            FrmEntry::destroy($entry_id);
-            unset($entry_id);
-        }
+		foreach ( $entries as $entry_id ) {
+			FrmEntry::destroy($entry_id);
+			unset($entry_id);
+		}
 
-        // Disconnect the fields from this form
+		// Disconnect the fields from this form
 		$wpdb->query( $wpdb->prepare( 'DELETE fi FROM ' . $wpdb->prefix . 'frm_fields AS fi LEFT JOIN ' . $wpdb->prefix . 'frm_forms fr ON (fi.form_id = fr.id) WHERE fi.form_id=%d OR parent_form_id=%d', $id, $id ) );
 
 		$query_results = $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_forms WHERE id=%d OR parent_form_id=%d', $id, $id ) );
-        if ( $query_results ) {
-            // Delete all form actions linked to this form
-            $action_control = FrmFormActionsController::get_form_actions( 'email' );
-            $action_control->destroy($id, 'all');
+		if ( $query_results ) {
+			// Delete all form actions linked to this form
+			$action_control = FrmFormActionsController::get_form_actions( 'email' );
+			$action_control->destroy($id, 'all');
 
 			// Clear form caching
 			self::clear_form_cache();
 
 			do_action( 'frm_destroy_form', $id );
 			do_action( 'frm_destroy_form_' . $id );
-        }
+		}
 
-        return $query_results;
-    }
+		return $query_results;
+	}
 
 	/**
 	 * Delete trashed forms based on how long they have been trashed
@@ -441,46 +441,46 @@ 
 		return $count;
 	}
 
-    /**
-     * @return string form name
-     */
-    public static function getName( $id ) {
+	/**
+	 * @return string form name
+	 */
+	public static function getName( $id ) {
 		$form = FrmDb::check_cache( $id, 'frm_form' );
-        if ( $form ) {
-            $r = stripslashes($form->name);
-            return $r;
-        }
-
-        $query_key = is_numeric( $id ) ? 'id' : 'form_key';
-        $r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' );
-        $r = stripslashes($r);
-
-        return $r;
-    }
-
-    /**
-     * @param string $key
-     * @return int form id
-     */
+		if ( $form ) {
+			$r = stripslashes($form->name);
+			return $r;
+		}
+
+		$query_key = is_numeric( $id ) ? 'id' : 'form_key';
+		$r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' );
+		$r = stripslashes($r);
+
+		return $r;
+	}
+
+	/**
+	 * @param string $key
+	 * @return int form id
+	 */
 	public static function getIdByKey( $key ) {
 		return (int) FrmDb::get_var( 'frm_forms', array( 'form_key' => sanitize_title( $key ) ) );
-    }
+	}
 
-    /**
-     * @param int $id
-     * @return string form key
-     */
+	/**
+	 * @param int $id
+	 * @return string form key
+	 */
 	public static function getKeyById( $id ) {
-        $id = (int) $id;
+		$id = (int) $id;
 		$cache = FrmDb::check_cache( $id, 'frm_form' );
-        if ( $cache ) {
-            return $cache->form_key;
-        }
+		if ( $cache ) {
+			return $cache->form_key;
+		}
 
-        $key = FrmDb::get_var( 'frm_forms', array( 'id' => $id ), 'form_key' );
+		$key = FrmDb::get_var( 'frm_forms', array( 'id' => $id ), 'form_key' );
 
-        return $key;
-    }
+		return $key;
+	}
 
 	/**
 	 * If $form is numeric, get the form object
@@ -493,47 +493,47 @@ 
 		}
 	}
 
-    /**
-     * @return object form
-     */
-    public static function getOne( $id, $blog_id = false ) {
-        global $wpdb;
+	/**
+	 * @return object form
+	 */
+	public static function getOne( $id, $blog_id = false ) {
+		global $wpdb;
 
-        if ( $blog_id && is_multisite() ) {
-            global $wpmuBaseTablePrefix;
+		if ( $blog_id && is_multisite() ) {
+			global $wpmuBaseTablePrefix;
 			$prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix . $blog_id . '_' : $wpdb->get_blog_prefix( $blog_id );
 
 			$table_name = $prefix . 'frm_forms';
-        } else {
+		} else {
 			$table_name = $wpdb->prefix . 'frm_forms';
-            $cache = wp_cache_get($id, 'frm_form');
-            if ( $cache ) {
-                if ( isset($cache->options) ) {
-                    $cache->options = maybe_unserialize($cache->options);
-                }
+			$cache = wp_cache_get($id, 'frm_form');
+			if ( $cache ) {
+				if ( isset($cache->options) ) {
+					$cache->options = maybe_unserialize($cache->options);
+				}
 
-                return stripslashes_deep($cache);
-            }
-        }
+				return stripslashes_deep($cache);
+			}
+		}
 
-        if ( is_numeric($id) ) {
-            $where = array( 'id' => $id );
-        } else {
-            $where = array( 'form_key' => $id );
-        }
+		if ( is_numeric($id) ) {
+			$where = array( 'id' => $id );
+		} else {
+			$where = array( 'form_key' => $id );
+		}
 
-        $results = FrmDb::get_row( $table_name, $where );
+		$results = FrmDb::get_row( $table_name, $where );
 
-        if ( isset($results->options) ) {
+		if ( isset($results->options) ) {
 			FrmDb::set_cache( $results->id, $results, 'frm_form' );
-            $results->options = maybe_unserialize($results->options);
-        }
-        return stripslashes_deep($results);
-    }
-
-    /**
-     * @return object|array of objects
-     */
+			$results->options = maybe_unserialize($results->options);
+		}
+		return stripslashes_deep($results);
+	}
+
+	/**
+	 * @return object|array of objects
+	 */
 	public static function getAll( $where = array(), $order_by = '', $limit = '' ) {
 		if ( is_array( $where ) && ! empty( $where ) ) {
 			$results = FrmDb::get_results( 'frm_forms', $where, '*', array(
@@ -560,8 +560,8 @@ 
 			$results = reset( $results );
 		}
 
-        return stripslashes_deep($results);
-    }
+		return stripslashes_deep($results);
+	}
 
 	/**
 	 * Get all published forms
@@ -579,18 +579,18 @@ 
 		return $forms;
 	}
 
-    /**
-     * @return int count of forms
-     */
-    public static function get_count() {
-    	global $wpdb;
+	/**
+	 * @return int count of forms
+	 */
+	public static function get_count() {
+		global $wpdb;
 
-    	$cache_key = 'frm_form_counts';
+		$cache_key = 'frm_form_counts';
 
-    	$counts = wp_cache_get( $cache_key, 'frm_form' );
-    	if ( false !== $counts ) {
-    	    return $counts;
-    	}
+		$counts = wp_cache_get( $cache_key, 'frm_form' );
+		if ( false !== $counts ) {
+			return $counts;
+		}
 
 		$results = (array) FrmDb::get_results( 'frm_forms', array(
 			'or' => 1,
@@ -599,31 +599,31 @@ 
 		), 'status, is_template' );
 
 		$statuses = array( 'published', 'draft', 'template', 'trash' );
-    	$counts = array_fill_keys( $statuses, 0 );
+		$counts = array_fill_keys( $statuses, 0 );
 
-    	foreach ( $results as $row ) {
-            if ( 'trash' != $row->status ) {
-    	        if ( $row->is_template ) {
+		foreach ( $results as $row ) {
+			if ( 'trash' != $row->status ) {
+				if ( $row->is_template ) {
 					$counts['template']++;
-    	        } else {
+				} else {
 					$counts['published']++;
-    	        }
-    	    } else {
+				}
+			} else {
 				$counts['trash']++;
-        	}
+			}
 
-    	    if ( 'draft' == $row->status ) {
+			if ( 'draft' == $row->status ) {
 				$counts['draft']++;
-    	    }
+			}
 
-    		unset($row);
-    	}
+			unset($row);
+		}
 
-    	$counts = (object) $counts;
+		$counts = (object) $counts;
 		FrmDb::set_cache( $cache_key, $counts, 'frm_form' );
 
-    	return $counts;
-    }
+		return $counts;
+	}
 
 	/**
 	 * Clear form caching
@@ -636,14 +636,14 @@ 
 		FrmDb::cache_delete_group( 'frm_form' );
 	}
 
-    /**
-     * @return array of errors
-     */
+	/**
+	 * @return array of errors
+	 */
 	public static function validate( $values ) {
-        $errors = array();
+		$errors = array();
 
-        return apply_filters('frm_validate_form', $errors, $values);
-    }
+		return apply_filters('frm_validate_form', $errors, $values);
+	}
 
 	public static function get_params( $form = null ) {
 		global $frm_vars;

Spacing +88 added lines, -88 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
-    die('You are not allowed to call this page directly.');
+if ( ! defined( 'ABSPATH' ) ) {
+    die( 'You are not allowed to call this page directly.' );
 }
 
 class FrmForm {
@@ -15,24 +15,24 @@ 
 			'form_key'      => FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key' ),
             'name'          => $values['name'],
             'description'   => $values['description'],
-            'status'        => isset($values['status']) ? $values['status'] : 'draft',
-            'logged_in'     => isset($values['logged_in']) ? $values['logged_in'] : 0,
-            'is_template'   => isset($values['is_template']) ? (int) $values['is_template'] : 0,
+            'status'        => isset( $values['status'] ) ? $values['status'] : 'draft',
+            'logged_in'     => isset( $values['logged_in'] ) ? $values['logged_in'] : 0,
+            'is_template'   => isset( $values['is_template'] ) ? (int) $values['is_template'] : 0,
 			'parent_form_id' => isset( $values['parent_form_id'] ) ? absint( $values['parent_form_id'] ) : 0,
-            'editable'      => isset($values['editable']) ? (int) $values['editable'] : 0,
-            'default_template' => isset($values['default_template']) ? (int) $values['default_template'] : 0,
-            'created_at'    => isset($values['created_at']) ? $values['created_at'] : current_time('mysql', 1),
+            'editable'      => isset( $values['editable'] ) ? (int) $values['editable'] : 0,
+            'default_template' => isset( $values['default_template'] ) ? (int) $values['default_template'] : 0,
+            'created_at'    => isset( $values['created_at'] ) ? $values['created_at'] : current_time( 'mysql', 1 ),
         );
 
 		$options = isset( $values['options'] ) ? (array) $values['options'] : array();
 		FrmFormsHelper::fill_form_options( $options, $values );
 
-        $options['before_html'] = isset($values['options']['before_html']) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html('before');
-        $options['after_html'] = isset($values['options']['after_html']) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html('after');
-        $options['submit_html'] = isset($values['options']['submit_html']) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html('submit');
+        $options['before_html'] = isset( $values['options']['before_html'] ) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html( 'before' );
+        $options['after_html'] = isset( $values['options']['after_html'] ) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html( 'after' );
+        $options['submit_html'] = isset( $values['options']['submit_html'] ) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html( 'submit' );
 
-        $options = apply_filters('frm_form_options_before_update', $options, $values);
-        $new_values['options'] = serialize($options);
+        $options = apply_filters( 'frm_form_options_before_update', $options, $values );
+        $new_values['options'] = serialize( $options );
 
         //if(isset($values['id']) && is_numeric($values['id']))
         //    $new_values['id'] = $values['id'];
@@ -67,22 +67,22 @@ 
             'status'        => $template ? 'published' : 'draft',
             'logged_in'     => $values->logged_in ? $values->logged_in : 0,
             'editable'      => $values->editable ? $values->editable : 0,
-            'created_at'    => current_time('mysql', 1),
+            'created_at'    => current_time( 'mysql', 1 ),
             'is_template'   => $template ? 1 : 0,
         );
 
         if ( $blog_id ) {
             $new_values['status'] = 'published';
-            $new_options = maybe_unserialize($values->options);
-            $new_options['email_to'] = get_option('admin_email');
+            $new_options = maybe_unserialize( $values->options );
+            $new_options['email_to'] = get_option( 'admin_email' );
             $new_options['copy'] = false;
             $new_values['options'] = $new_options;
         } else {
             $new_values['options'] = $values->options;
         }
 
-        if ( is_array($new_values['options']) ) {
-            $new_values['options'] = serialize($new_values['options']);
+        if ( is_array( $new_values['options'] ) ) {
+            $new_values['options'] = serialize( $new_values['options'] );
         }
 
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_forms', $new_values );
@@ -92,7 +92,7 @@ 
 			self::clear_form_cache();
 
             $form_id = $wpdb->insert_id;
-            FrmField::duplicate($id, $form_id, $copy_keys, $blog_id);
+            FrmField::duplicate( $id, $form_id, $copy_keys, $blog_id );
 
             // update form settings after fields are created
 			do_action( 'frm_after_duplicate_form', $form_id, $new_values, array( 'old_id' => $id ) );
@@ -106,11 +106,11 @@ 
 		$new_opts = maybe_unserialize( $values['options'] );
 		$values['options'] = $new_opts;
 
-        if ( isset($new_opts['success_msg']) ) {
-            $new_opts['success_msg'] = FrmFieldsHelper::switch_field_ids($new_opts['success_msg']);
+        if ( isset( $new_opts['success_msg'] ) ) {
+            $new_opts['success_msg'] = FrmFieldsHelper::switch_field_ids( $new_opts['success_msg'] );
         }
 
-        $new_opts = apply_filters('frm_after_duplicate_form_values', $new_opts, $form_id);
+        $new_opts = apply_filters( 'frm_after_duplicate_form_values', $new_opts, $form_id );
 
         if ( $new_opts != $values['options'] ) {
             global $wpdb;
@@ -128,17 +128,17 @@ 
             $values['status'] = 'published';
         }
 
-        if ( isset($values['form_key']) ) {
+        if ( isset( $values['form_key'] ) ) {
 			$values['form_key'] = FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key', $id );
         }
 
 		$form_fields = array( 'form_key', 'name', 'description', 'status', 'parent_form_id' );
 
-        $new_values = self::set_update_options( array(), $values);
+        $new_values = self::set_update_options( array(), $values );
 
         foreach ( $values as $value_key => $value ) {
 			if ( $value_key && in_array( $value_key, $form_fields ) ) {
-				$new_values[ $value_key ] = $value;
+				$new_values[$value_key] = $value;
             }
         }
 
@@ -154,9 +154,9 @@ 
         } else {
             $query_results = true;
         }
-        unset($new_values);
+        unset( $new_values );
 
-        $values = self::update_fields($id, $values);
+        $values = self::update_fields( $id, $values );
 
 		do_action( 'frm_update_form', $id, $values );
 		do_action( 'frm_update_form_' . $id, $values );
@@ -168,7 +168,7 @@ 
      * @return array
      */
 	public static function set_update_options( $new_values, $values ) {
-        if ( ! isset($values['options']) ) {
+        if ( ! isset( $values['options'] ) ) {
             return $new_values;
         }
 
@@ -192,54 +192,54 @@ 
      */
 	public static function update_fields( $id, $values ) {
 
-        if ( ! isset($values['item_meta']) && ! isset($values['field_options']) ) {
+        if ( ! isset( $values['item_meta'] ) && ! isset( $values['field_options'] ) ) {
             return $values;
         }
 
-        $all_fields = FrmField::get_all_for_form($id);
-        if ( empty($all_fields) ) {
+        $all_fields = FrmField::get_all_for_form( $id );
+        if ( empty( $all_fields ) ) {
             return $values;
         }
 
-        if ( ! isset($values['item_meta']) ) {
+        if ( ! isset( $values['item_meta'] ) ) {
             $values['item_meta'] = array();
         }
 
         $field_array = array();
-        $existing_keys = array_keys($values['item_meta']);
+        $existing_keys = array_keys( $values['item_meta'] );
         foreach ( $all_fields as $fid ) {
-            if ( ! in_array($fid->id, $existing_keys) && ( isset($values['frm_fields_submitted']) && in_array($fid->id, $values['frm_fields_submitted']) ) || isset($values['options']) ) {
-				$values['item_meta'][ $fid->id ] = '';
+            if ( ! in_array( $fid->id, $existing_keys ) && ( isset( $values['frm_fields_submitted'] ) && in_array( $fid->id, $values['frm_fields_submitted'] ) ) || isset( $values['options'] ) ) {
+				$values['item_meta'][$fid->id] = '';
             }
-			$field_array[ $fid->id ] = $fid;
+			$field_array[$fid->id] = $fid;
         }
-        unset($all_fields);
+        unset( $all_fields );
 
         foreach ( $values['item_meta'] as $field_id => $default_value ) {
-			if ( isset( $field_array[ $field_id ] ) ) {
-				$field = $field_array[ $field_id ];
+			if ( isset( $field_array[$field_id] ) ) {
+				$field = $field_array[$field_id];
             } else {
-                $field = FrmField::getOne($field_id);
+                $field = FrmField::getOne( $field_id );
             }
 
             if ( ! $field ) {
                 continue;
             }
 
-			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options'][ 'custom_html_' . $field_id ] ) );
+			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options']['custom_html_' . $field_id] ) );
 			if ( $is_settings_page ) {
                 //updating the settings page
-				if ( isset( $values['field_options'][ 'custom_html_' . $field_id ] ) ) {
-					$field->field_options['custom_html'] = isset( $values['field_options'][ 'custom_html_' . $field_id ] ) ? $values['field_options'][ 'custom_html_' . $field_id ] : ( isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type ) );
-                    $field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
+				if ( isset( $values['field_options']['custom_html_' . $field_id] ) ) {
+					$field->field_options['custom_html'] = isset( $values['field_options']['custom_html_' . $field_id] ) ? $values['field_options']['custom_html_' . $field_id] : ( isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type ) );
+                    $field->field_options = apply_filters( 'frm_update_form_field_options', $field->field_options, $field, $values );
 					FrmField::update( $field_id, array( 'field_options' => $field->field_options ) );
                 } else if ( $field->type == 'hidden' || $field->type == 'user_id' ) {
                     $prev_opts = $field->field_options;
-                    $field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
+                    $field->field_options = apply_filters( 'frm_update_form_field_options', $field->field_options, $field, $values );
                     if ( $prev_opts != $field->field_options ) {
 						FrmField::update( $field_id, array( 'field_options' => $field->field_options ) );
                     }
-                    unset($prev_opts);
+                    unset( $prev_opts );
                 }
             }
 
@@ -253,11 +253,11 @@ 
 			$update_options = apply_filters( 'frm_field_options_to_update', $update_options );
 
 			foreach ( $update_options as $opt => $default ) {
-				$field->field_options[ $opt ] = isset( $values['field_options'][ $opt . '_' . $field_id ] ) ? trim( sanitize_text_field( $values['field_options'][ $opt . '_' . $field_id ] ) ) : $default;
+				$field->field_options[$opt] = isset( $values['field_options'][$opt . '_' . $field_id] ) ? trim( sanitize_text_field( $values['field_options'][$opt . '_' . $field_id] ) ) : $default;
             }
 
-            $field->field_options = apply_filters('frm_update_field_options', $field->field_options, $field, $values);
-			$default_value = maybe_serialize( $values['item_meta'][ $field_id ] );
+            $field->field_options = apply_filters( 'frm_update_field_options', $field->field_options, $field, $values );
+			$default_value = maybe_serialize( $values['item_meta'][$field_id] );
 
 			$new_field = array(
 				'field_options' => $field->field_options,
@@ -268,7 +268,7 @@ 
 
 			FrmField::update( $field_id, $new_field );
 
-            FrmField::delete_form_transient($field->form_id);
+            FrmField::delete_form_transient( $field->form_id );
         }
 		self::clear_form_cache();
 
@@ -285,7 +285,7 @@ 
 		);
 		foreach ( $field_cols as $col => $default ) {
 			$default = ( $default === '' ) ? $field->{$col} : $default;
-			$new_field[ $col ] = isset( $values['field_options'][ $col . '_' . $field->id ] ) ? $values['field_options'][ $col . '_' . $field->id ] : $default;
+			$new_field[$col] = isset( $values['field_options'][$col . '_' . $field->id] ) ? $values['field_options'][$col . '_' . $field->id] : $default;
 		}
 	}
 
@@ -295,17 +295,17 @@ 
      */
 	public static function set_status( $id, $status ) {
         if ( 'trash' == $status ) {
-            return self::trash($id);
+            return self::trash( $id );
         }
 
-		$statuses  = array( 'published', 'draft', 'trash' );
+		$statuses = array( 'published', 'draft', 'trash' );
         if ( ! in_array( $status, $statuses ) ) {
             return false;
         }
 
         global $wpdb;
 
-        if ( is_array($id) ) {
+        if ( is_array( $id ) ) {
 			$where = array(
 				'id' => $id,
 				'parent_form_id' => $id,
@@ -335,7 +335,7 @@ 
             return self::destroy( $id );
         }
 
-        $form = self::getOne($id);
+        $form = self::getOne( $id );
         if ( ! $form ) {
             return false;
         }
@@ -379,7 +379,7 @@ 
 	public static function destroy( $id ) {
         global $wpdb;
 
-        $form = self::getOne($id);
+        $form = self::getOne( $id );
         if ( ! $form ) {
             return false;
         }
@@ -388,8 +388,8 @@ 
         // Disconnect the entries from this form
 		$entries = FrmDb::get_col( $wpdb->prefix . 'frm_items', array( 'form_id' => $id ) );
         foreach ( $entries as $entry_id ) {
-            FrmEntry::destroy($entry_id);
-            unset($entry_id);
+            FrmEntry::destroy( $entry_id );
+            unset( $entry_id );
         }
 
         // Disconnect the fields from this form
@@ -399,7 +399,7 @@ 
         if ( $query_results ) {
             // Delete all form actions linked to this form
             $action_control = FrmFormActionsController::get_form_actions( 'email' );
-            $action_control->destroy($id, 'all');
+            $action_control->destroy( $id, 'all' );
 
 			// Clear form caching
 			self::clear_form_cache();
@@ -433,7 +433,7 @@ 
 			$form->options = maybe_unserialize( $form->options );
 			if ( ! isset( $form->options['trash_time'] ) || $form->options['trash_time'] < $delete_timestamp ) {
 				self::destroy( $form->id );
-				$count++;
+				$count ++;
 			}
 
 			unset( $form );
@@ -447,13 +447,13 @@ 
     public static function getName( $id ) {
 		$form = FrmDb::check_cache( $id, 'frm_form' );
         if ( $form ) {
-            $r = stripslashes($form->name);
+            $r = stripslashes( $form->name );
             return $r;
         }
 
         $query_key = is_numeric( $id ) ? 'id' : 'form_key';
         $r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' );
-        $r = stripslashes($r);
+        $r = stripslashes( $r );
 
         return $r;
     }
@@ -506,17 +506,17 @@ 
 			$table_name = $prefix . 'frm_forms';
         } else {
 			$table_name = $wpdb->prefix . 'frm_forms';
-            $cache = wp_cache_get($id, 'frm_form');
+            $cache = wp_cache_get( $id, 'frm_form' );
             if ( $cache ) {
-                if ( isset($cache->options) ) {
-                    $cache->options = maybe_unserialize($cache->options);
+                if ( isset( $cache->options ) ) {
+                    $cache->options = maybe_unserialize( $cache->options );
                 }
 
-                return stripslashes_deep($cache);
+                return stripslashes_deep( $cache );
             }
         }
 
-        if ( is_numeric($id) ) {
+        if ( is_numeric( $id ) ) {
             $where = array( 'id' => $id );
         } else {
             $where = array( 'form_key' => $id );
@@ -524,11 +524,11 @@ 
 
         $results = FrmDb::get_row( $table_name, $where );
 
-        if ( isset($results->options) ) {
+        if ( isset( $results->options ) ) {
 			FrmDb::set_cache( $results->id, $results, 'frm_form' );
-            $results->options = maybe_unserialize($results->options);
+            $results->options = maybe_unserialize( $results->options );
         }
-        return stripslashes_deep($results);
+        return stripslashes_deep( $results );
     }
 
     /**
@@ -560,7 +560,7 @@ 
 			$results = reset( $results );
 		}
 
-        return stripslashes_deep($results);
+        return stripslashes_deep( $results );
     }
 
 	/**
@@ -604,19 +604,19 @@ 
     	foreach ( $results as $row ) {
             if ( 'trash' != $row->status ) {
     	        if ( $row->is_template ) {
-					$counts['template']++;
+					$counts['template'] ++;
     	        } else {
-					$counts['published']++;
+					$counts['published'] ++;
     	        }
     	    } else {
-				$counts['trash']++;
+				$counts['trash'] ++;
         	}
 
     	    if ( 'draft' == $row->status ) {
-				$counts['draft']++;
+				$counts['draft'] ++;
     	    }
 
-    		unset($row);
+    		unset( $row );
     	}
 
     	$counts = (object) $counts;
@@ -642,7 +642,7 @@ 
 	public static function validate( $values ) {
         $errors = array();
 
-        return apply_filters('frm_validate_form', $errors, $values);
+        return apply_filters( 'frm_validate_form', $errors, $values );
     }
 
 	public static function get_params( $form = null ) {
@@ -654,11 +654,11 @@ 
 			self::maybe_get_form( $form );
 		}
 
-		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][ $form->id ] ) ) {
-			return $frm_vars['form_params'][ $form->id ];
+		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][$form->id] ) ) {
+			return $frm_vars['form_params'][$form->id];
 		}
 
-		$action_var = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
+		$action_var = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
 		$action = apply_filters( 'frm_show_new_entry_page', FrmAppHelper::get_param( $action_var, 'new', 'get', 'sanitize_title' ), $form );
 
 		$default_values = array(
@@ -684,15 +684,15 @@ 
 			//if there are two forms on the same page, make sure not to submit both
 			foreach ( $default_values as $var => $default ) {
 				if ( $var == 'action' ) {
-					$values[ $var ] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
+					$values[$var] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
 				} else {
-					$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+					$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 				}
 				unset( $var, $default );
 			}
 		} else {
 			foreach ( $default_values as $var => $default ) {
-				$values[ $var ] = $default;
+				$values[$var] = $default;
 				unset( $var, $default );
 			}
 		}
@@ -716,7 +716,7 @@ 
 			'sdir'   => '',
 		);
 		foreach ( $defaults as $var => $default ) {
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+			$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 		}
 
 		return $values;
@@ -744,7 +744,7 @@ 
 			'keep_post' => '',
 		);
 		foreach ( $defaults as $var => $default ) {
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+			$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 		}
 
 		return $values;
@@ -801,7 +801,7 @@ 
 		$small_form = new stdClass();
 		foreach ( array( 'id', 'form_key', 'name' ) as $var ) {
 			$small_form->{$var} = $form->{$var};
-			unset($var);
+			unset( $var );
 		}
 
 		$frm_vars['forms_loaded'][] = $small_form;
@@ -811,7 +811,7 @@ 
 			$frm_vars['load_css'] = true;
 		}
 
-		return ( ( ! isset($frm_vars['css_loaded']) || ! $frm_vars['css_loaded'] ) && $global_load );
+		return ( ( ! isset( $frm_vars['css_loaded'] ) || ! $frm_vars['css_loaded'] ) && $global_load );
 	}
 
 	public static function show_submit( $form ) {
@@ -825,6 +825,6 @@ 
 	 */
 	public static function get_option( $atts ) {
 		$form = $atts['form'];
-		return isset( $form->options[ $atts['option'] ] ) ? $form->options[ $atts['option'] ] : $atts['default'];
+		return isset( $form->options[$atts['option']] ) ? $form->options[$atts['option']] : $atts['default'];
 	}
 }

classes/models/FrmCreateFile.php

Spacing +7 added lines, -7 removed lines

@@ -18,8 +18,8 @@ 
 		$this->file_name = $atts['file_name'];
 		$this->error_message = isset( $atts['error_message'] ) ? $atts['error_message'] : '';
 		$this->uploads = wp_upload_dir();
-		$this->chmod_dir = defined('FS_CHMOD_DIR') ? FS_CHMOD_DIR : ( fileperms( ABSPATH ) & 0777 | 0755 );
-		$this->chmod_file = defined('FS_CHMOD_FILE') ? FS_CHMOD_FILE : ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 );
+		$this->chmod_dir = defined( 'FS_CHMOD_DIR' ) ? FS_CHMOD_DIR : ( fileperms( ABSPATH ) & 0777 | 0755 );
+		$this->chmod_file = defined( 'FS_CHMOD_FILE' ) ? FS_CHMOD_FILE : ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 );
 	}
 
 	public function create_file( $file_content ) {
@@ -88,13 +88,13 @@ 
 			'username' => '',
 		) );
 
-		$credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : $credentials['hostname'];
-		$credentials['username'] = defined('FTP_USER') ? FTP_USER : $credentials['username'];
-		$credentials['password'] = defined('FTP_PASS') ? FTP_PASS : '';
+		$credentials['hostname'] = defined( 'FTP_HOST' ) ? FTP_HOST : $credentials['hostname'];
+		$credentials['username'] = defined( 'FTP_USER' ) ? FTP_USER : $credentials['username'];
+		$credentials['password'] = defined( 'FTP_PASS' ) ? FTP_PASS : '';
 
 		// Check to see if we are setting the public/private keys for ssh
-		$credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : '';
-		$credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : '';
+		$credentials['public_key'] = defined( 'FTP_PUBKEY' ) ? FTP_PUBKEY : '';
+		$credentials['private_key'] = defined( 'FTP_PRIKEY' ) ? FTP_PRIKEY : '';
 
 		// Sanitize the hostname, Some people might pass in odd-data:
 		$credentials['hostname'] = preg_replace( '|\w+://|', '', $credentials['hostname'] ); //Strip any schemes off

classes/models/FrmStyle.php

Indentation +263 added lines, -263 removed lines

@@ -7,46 +7,46 @@ 
 	 * @param int|string $id The id of the stylsheet or 'default'
 	 */
 	public function __construct( $id = 0 ) {
-        $this->id = $id;
-    }
+		$this->id = $id;
+	}
 
-    public function get_new() {
+	public function get_new() {
 		$this->id = 0;
 
-        $max_slug_value = 2147483647;
-        $min_slug_value = 37; // we want to have at least 2 characters in the slug
-        $key = base_convert( rand($min_slug_value, $max_slug_value), 10, 36 );
-
-        $style = array(
-            'post_type'     => FrmStylesController::$post_type,
-            'ID'            => '',
-            'post_title'    => __( 'New Style', 'formidable' ),
-            'post_name'     => $key,
-            'post_content'  => $this->get_defaults(),
-            'menu_order'    => '',
-            'post_status'   => 'publish',
-        );
+		$max_slug_value = 2147483647;
+		$min_slug_value = 37; // we want to have at least 2 characters in the slug
+		$key = base_convert( rand($min_slug_value, $max_slug_value), 10, 36 );
+
+		$style = array(
+			'post_type'     => FrmStylesController::$post_type,
+			'ID'            => '',
+			'post_title'    => __( 'New Style', 'formidable' ),
+			'post_name'     => $key,
+			'post_content'  => $this->get_defaults(),
+			'menu_order'    => '',
+			'post_status'   => 'publish',
+		);
 
-        return (object) $style;
-    }
+		return (object) $style;
+	}
 
 	public function save( $settings ) {
 		return FrmDb::save_settings( $settings, 'frm_styles' );
-    }
+	}
 
 	public function duplicate( $id ) {
-        // duplicating is a pro feature
-    }
+		// duplicating is a pro feature
+	}
 
-    public function update( $id = 'default' ) {
+	public function update( $id = 'default' ) {
  		$all_instances = $this->get_all();
 
  		if ( empty($id) ) {
- 		     $new_style = (array) $this->get_new();
- 		     $all_instances[] = $new_style;
+ 			 $new_style = (array) $this->get_new();
+ 			 $all_instances[] = $new_style;
  		}
 
-        $action_ids = array();
+		$action_ids = array();
 
  		foreach ( $all_instances as $number => $new_instance ) {
  			$new_instance = stripslashes_deep( (array) $new_instance);
@@ -54,46 +54,46 @@ 
  			if ( $id != $this->id || ! $_POST || ! isset($_POST['frm_style_setting']) ) {
 				$all_instances[ $number ] = $new_instance;
 
- 			    if ( $new_instance['menu_order'] && $_POST && empty($_POST['prev_menu_order']) && isset($_POST['frm_style_setting']['menu_order']) ) {
- 			        // this style was set to default, so remove default setting on previous default style
- 			        $new_instance['menu_order'] = 0;
- 			        $action_ids[] = $this->save($new_instance);
- 			    }
+ 				if ( $new_instance['menu_order'] && $_POST && empty($_POST['prev_menu_order']) && isset($_POST['frm_style_setting']['menu_order']) ) {
+ 					// this style was set to default, so remove default setting on previous default style
+ 					$new_instance['menu_order'] = 0;
+ 					$action_ids[] = $this->save($new_instance);
+ 				}
 
- 			    // don't continue if not saving this style
- 			    continue;
+ 				// don't continue if not saving this style
+ 				continue;
  			}
 
  			$new_instance['post_title'] = sanitize_text_field( $_POST['frm_style_setting']['post_title'] );
  			$new_instance['post_content'] = $_POST['frm_style_setting']['post_content'];
  			$new_instance['post_type']  = FrmStylesController::$post_type;
-            $new_instance['post_status']  = 'publish';
+			$new_instance['post_status']  = 'publish';
 			$new_instance['menu_order']  = isset( $_POST['frm_style_setting']['menu_order'] ) ? absint( $_POST['frm_style_setting']['menu_order'] ) : 0;
 
-            if ( empty($id) ) {
-                $new_instance['post_name'] = $new_instance['post_title'];
-            }
+			if ( empty($id) ) {
+				$new_instance['post_name'] = $new_instance['post_title'];
+			}
 
-            $default_settings = $this->get_defaults();
+			$default_settings = $this->get_defaults();
 
-            foreach ( $default_settings as $setting => $default ) {
+			foreach ( $default_settings as $setting => $default ) {
 				if ( ! isset( $new_instance['post_content'][ $setting ] ) ) {
 					$new_instance['post_content'][ $setting ] = $default;
 				}
 
 				if ( strpos( $setting, 'color' ) !== false || in_array( $setting, array( 'error_bg', 'error_border', 'error_text' ) ) ) {
-                    //if is a color
+					//if is a color
 					$new_instance['post_content'][ $setting ] = str_replace( '#', '', $new_instance['post_content'][ $setting ] );
 				} else if ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ) ) && ! isset( $new_instance['post_content'][ $setting ] ) ) {
 					$new_instance['post_content'][ $setting ] = 0;
-                } else if ( $setting == 'font' ) {
-                	$new_instance['post_content'][ $setting ] = $this->force_balanced_quotation( $new_instance['post_content'][ $setting ] );
-                }
-            }
+				} else if ( $setting == 'font' ) {
+					$new_instance['post_content'][ $setting ] = $this->force_balanced_quotation( $new_instance['post_content'][ $setting ] );
+				}
+			}
 
 			$all_instances[ $number ] = $new_instance;
 
-            $action_ids[] = $this->save($new_instance);
+			$action_ids[] = $this->save($new_instance);
 
  		}
 
@@ -102,16 +102,16 @@ 
  		return $action_ids;
  	}
 
-    /**
-     * Create static css file
-     */
+	/**
+	 * Create static css file
+	 */
 	public function save_settings() {
 		$filename = FrmAppHelper::plugin_path() . '/css/custom_theme.css.php';
 		update_option( 'frm_last_style_update', date('njGi') );
 
-        if ( ! is_file($filename) ) {
-            return;
-        }
+		if ( ! is_file($filename) ) {
+			return;
+		}
 
 		$this->clear_cache();
 
@@ -123,9 +123,9 @@ 
 		) );
 		$create_file->create_file( $css );
 
-        update_option('frmpro_css', $css);
+		update_option('frmpro_css', $css);
 
-        set_transient('frmpro_css', $css);
+		set_transient('frmpro_css', $css);
 	}
 
 	private function get_css_content( $filename ) {
@@ -134,10 +134,10 @@ 
 		$saving = true;
 		$frm_style = $this;
 
-        ob_start();
-        include( $filename );
+		ob_start();
+		include( $filename );
 		$css .= preg_replace( '/\/\*(.|\s)*?\*\//', '', str_replace( array( "\r\n", "\r", "\n", "\t", '    ' ), '', ob_get_contents() ) );
-        ob_end_clean();
+		ob_end_clean();
 
 		return $css;
 	}
@@ -157,269 +157,269 @@ 
 	}
 
 	public function destroy( $id ) {
-        return wp_delete_post($id);
-    }
+		return wp_delete_post($id);
+	}
 
-    public function get_one() {
-        if ( 'default' == $this->id ) {
-            $style = $this->get_default_style();
-            if ( $style ) {
-                $this->id = $style->ID;
-            } else {
-                $this->id = 0;
-            }
-            return $style;
-        }
+	public function get_one() {
+		if ( 'default' == $this->id ) {
+			$style = $this->get_default_style();
+			if ( $style ) {
+				$this->id = $style->ID;
+			} else {
+				$this->id = 0;
+			}
+			return $style;
+		}
 
-        $style = get_post($this->id);
+		$style = get_post($this->id);
 
-        if ( ! $style ) {
-            return $style;
-        }
+		if ( ! $style ) {
+			return $style;
+		}
 
-        $style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
+		$style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
 
-        $default_values = $this->get_defaults();
+		$default_values = $this->get_defaults();
 
-        // fill default values
-        $style->post_content = $this->override_defaults($style->post_content);
-        $style->post_content = wp_parse_args( $style->post_content, $default_values);
+		// fill default values
+		$style->post_content = $this->override_defaults($style->post_content);
+		$style->post_content = wp_parse_args( $style->post_content, $default_values);
 
-        return $style;
-    }
+		return $style;
+	}
 
-    public function get_all( $orderby = 'title', $order = 'ASC', $limit = 99 ) {
-        $post_atts = array(
+	public function get_all( $orderby = 'title', $order = 'ASC', $limit = 99 ) {
+		$post_atts = array(
 			'post_type'   => FrmStylesController::$post_type,
 			'post_status' => 'publish',
 			'numberposts' => $limit,
 			'orderby'     => $orderby,
 			'order'       => $order,
-        );
+		);
 
 		$temp_styles = FrmDb::check_cache( serialize( $post_atts ), 'frm_styles', $post_atts, 'get_posts' );
 
-        if ( empty($temp_styles) ) {
-            global $wpdb;
-            // make sure there wasn't a conflict with the query
+		if ( empty($temp_styles) ) {
+			global $wpdb;
+			// make sure there wasn't a conflict with the query
 			$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->posts . ' WHERE post_type=%s AND post_status=%s ORDER BY post_title ASC LIMIT 99', FrmStylesController::$post_type, 'publish' );
-            $temp_styles = FrmDb::check_cache('frm_backup_style_check', 'frm_styles', $query, 'get_results');
+			$temp_styles = FrmDb::check_cache('frm_backup_style_check', 'frm_styles', $query, 'get_results');
 
-            if ( empty($temp_styles) ) {
-                // create a new style if there are none
-         		$new = $this->get_new();
+			if ( empty($temp_styles) ) {
+				// create a new style if there are none
+		 		$new = $this->get_new();
 				$new->post_title = __( 'Formidable Style', 'formidable' );
 				$new->post_name = $new->post_title;
-         		$new->menu_order = 1;
-         		$new = $this->save( (array) $new);
-         		$this->update('default');
-
-                $post_atts['include'] = $new;
-
-                $temp_styles = get_posts( $post_atts );
-            }
-        }
-
-        $default_values = $this->get_defaults();
-        $default_style = false;
-
-        $styles = array();
-        foreach ( $temp_styles as $style ) {
-            $this->id = $style->ID;
-            if ( $style->menu_order ) {
-                if ( $default_style ) {
-                    // only return one default
-                    $style->menu_order = 0;
-                } else {
-                    // check for a default style
-                    $default_style = $style->ID;
-                }
-            }
-
-            $style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
-
-            // fill default values
-            $style->post_content = $this->override_defaults($style->post_content);
-            $style->post_content = wp_parse_args( $style->post_content, $default_values);
+		 		$new->menu_order = 1;
+		 		$new = $this->save( (array) $new);
+		 		$this->update('default');
+
+				$post_atts['include'] = $new;
+
+				$temp_styles = get_posts( $post_atts );
+			}
+		}
+
+		$default_values = $this->get_defaults();
+		$default_style = false;
+
+		$styles = array();
+		foreach ( $temp_styles as $style ) {
+			$this->id = $style->ID;
+			if ( $style->menu_order ) {
+				if ( $default_style ) {
+					// only return one default
+					$style->menu_order = 0;
+				} else {
+					// check for a default style
+					$default_style = $style->ID;
+				}
+			}
+
+			$style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
+
+			// fill default values
+			$style->post_content = $this->override_defaults($style->post_content);
+			$style->post_content = wp_parse_args( $style->post_content, $default_values);
 
 			$styles[ $style->ID ] = $style;
-        }
+		}
 
-        if ( ! $default_style ) {
-            $default_style = reset($styles);
+		if ( ! $default_style ) {
+			$default_style = reset($styles);
 			$styles[ $default_style->ID ]->menu_order = 1;
-        }
+		}
 
-        return $styles;
-    }
+		return $styles;
+	}
 
 	public function get_default_style( $styles = null ) {
-        if ( ! isset($styles) ) {
+		if ( ! isset($styles) ) {
 			$styles = $this->get_all( 'menu_order', 'DESC', 1 );
-        }
+		}
 
-        foreach ( $styles as $style ) {
-            if ( $style->menu_order ) {
-                return $style;
-            }
-        }
-    }
+		foreach ( $styles as $style ) {
+			if ( $style->menu_order ) {
+				return $style;
+			}
+		}
+	}
 
 	public function override_defaults( $settings ) {
-	    if ( ! is_array($settings) ) {
-	        return $settings;
-	    }
+		if ( ! is_array($settings) ) {
+			return $settings;
+		}
 
 		$settings['line_height'] = ( ! isset( $settings['field_height'] ) || $settings['field_height'] == '' || $settings['field_height'] == 'auto' ) ? 'normal' : $settings['field_height'];
 
-	    if ( ! isset($settings['form_desc_size']) && isset($settings['description_font_size']) ) {
-	        $settings['form_desc_size'] = $settings['description_font_size'];
-	        $settings['form_desc_color'] = $settings['description_color'];
-	        $settings['title_color'] = $settings['label_color'];
-	    }
+		if ( ! isset($settings['form_desc_size']) && isset($settings['description_font_size']) ) {
+			$settings['form_desc_size'] = $settings['description_font_size'];
+			$settings['form_desc_color'] = $settings['description_color'];
+			$settings['title_color'] = $settings['label_color'];
+		}
 
-	    if ( ! isset($settings['section_color']) && isset($settings['label_color']) ) {
-	        $settings['section_color'] = $settings['label_color'];
-	        $settings['section_border_color'] = $settings['border_color'];
-	    }
+		if ( ! isset($settings['section_color']) && isset($settings['label_color']) ) {
+			$settings['section_color'] = $settings['label_color'];
+			$settings['section_border_color'] = $settings['border_color'];
+		}
 
-	    if ( ! isset($settings['submit_hover_bg_color']) && isset($settings['submit_bg_color']) ) {
-	        $settings['submit_hover_bg_color'] = $settings['submit_bg_color'];
-	        $settings['submit_hover_color'] = $settings['submit_text_color'];
-	        $settings['submit_hover_border_color'] = $settings['submit_border_color'];
+		if ( ! isset($settings['submit_hover_bg_color']) && isset($settings['submit_bg_color']) ) {
+			$settings['submit_hover_bg_color'] = $settings['submit_bg_color'];
+			$settings['submit_hover_color'] = $settings['submit_text_color'];
+			$settings['submit_hover_border_color'] = $settings['submit_border_color'];
 
-	        $settings['submit_active_bg_color'] = $settings['submit_bg_color'];
-	        $settings['submit_active_color'] = $settings['submit_text_color'];
-            $settings['submit_active_border_color'] = $settings['submit_border_color'];
-	    }
+			$settings['submit_active_bg_color'] = $settings['submit_bg_color'];
+			$settings['submit_active_color'] = $settings['submit_text_color'];
+			$settings['submit_active_border_color'] = $settings['submit_border_color'];
+		}
 
-	    return $settings;
+		return $settings;
 	}
 
 	public function get_defaults() {
-        return array(
-            'theme_css'         => 'ui-lightness',
-            'theme_name'        => 'UI Lightness',
+		return array(
+			'theme_css'         => 'ui-lightness',
+			'theme_name'        => 'UI Lightness',
 
 			'center_form'       => '',
-            'form_width'        => '100%',
-            'form_align'        => 'left',
-            'direction'         => is_rtl() ? 'rtl' : 'ltr',
-            'fieldset'          => '0px',
-            'fieldset_color'    => '000000',
-            'fieldset_padding'  => '0 0 15px 0',
-            'fieldset_bg_color' => '',
-
-            'title_size'        => '20px',
-            'title_color'       => '444444',
+			'form_width'        => '100%',
+			'form_align'        => 'left',
+			'direction'         => is_rtl() ? 'rtl' : 'ltr',
+			'fieldset'          => '0px',
+			'fieldset_color'    => '000000',
+			'fieldset_padding'  => '0 0 15px 0',
+			'fieldset_bg_color' => '',
+
+			'title_size'        => '20px',
+			'title_color'       => '444444',
 			'title_margin_top'  => '10px',
 			'title_margin_bottom' => '10px',
-            'form_desc_size'    => '14px',
-            'form_desc_color'   => '666666',
+			'form_desc_size'    => '14px',
+			'form_desc_color'   => '666666',
 			'form_desc_margin_top' => '10px',
 			'form_desc_margin_bottom' => '25px',
 
-            'font'              => '"Lucida Grande","Lucida Sans Unicode",Tahoma,sans-serif',
-            'font_size'         => '14px',
-            'label_color'       => '444444',
-            'weight'            => 'bold',
-            'position'          => 'none',
-            'align'             => 'left',
-            'width'             => '150px',
-            'required_color'    => 'B94A48',
-            'required_weight'   => 'bold',
-            'label_padding'     => '0 0 3px 0',
-
-            'description_font_size' => '12px',
-            'description_color' => '666666',
-            'description_weight' => 'normal',
-            'description_style' => 'normal',
-            'description_align' => 'left',
+			'font'              => '"Lucida Grande","Lucida Sans Unicode",Tahoma,sans-serif',
+			'font_size'         => '14px',
+			'label_color'       => '444444',
+			'weight'            => 'bold',
+			'position'          => 'none',
+			'align'             => 'left',
+			'width'             => '150px',
+			'required_color'    => 'B94A48',
+			'required_weight'   => 'bold',
+			'label_padding'     => '0 0 3px 0',
+
+			'description_font_size' => '12px',
+			'description_color' => '666666',
+			'description_weight' => 'normal',
+			'description_style' => 'normal',
+			'description_align' => 'left',
 			'description_margin' => '0',
 
-            'field_font_size'   => '14px',
-            'field_height'      => '32px',
-            'line_height'       => 'normal',
-            'field_width'       => '100%',
-            'auto_width'        => false,
-            'field_pad'         => '6px 10px',
-            'field_margin'      => '20px',
+			'field_font_size'   => '14px',
+			'field_height'      => '32px',
+			'line_height'       => 'normal',
+			'field_width'       => '100%',
+			'auto_width'        => false,
+			'field_pad'         => '6px 10px',
+			'field_margin'      => '20px',
 			'field_weight' => 'normal',
-            'text_color'        => '555555',
-            //'border_color_hv'   => 'cccccc',
-            'border_color'      => 'cccccc',
-            'field_border_width' => '1px',
-            'field_border_style' => 'solid',
-
-            'bg_color'          => 'ffffff',
-            //'bg_color_hv'       => 'ffffff',
+			'text_color'        => '555555',
+			//'border_color_hv'   => 'cccccc',
+			'border_color'      => 'cccccc',
+			'field_border_width' => '1px',
+			'field_border_style' => 'solid',
+
+			'bg_color'          => 'ffffff',
+			//'bg_color_hv'       => 'ffffff',
 			'remove_box_shadow' => '',
-            'bg_color_active'   => 'ffffff',
+			'bg_color_active'   => 'ffffff',
 			'border_color_active' => '66afe9',
 			'remove_box_shadow_active' => '',
-            'text_color_error'  => '444444',
-            'bg_color_error'    => 'ffffff',
+			'text_color_error'  => '444444',
+			'bg_color_error'    => 'ffffff',
 			'border_color_error' => 'B94A48',
 			'border_width_error' => '1px',
 			'border_style_error' => 'solid',
-            'bg_color_disabled' => 'ffffff',
-            'border_color_disabled' => 'E5E5E5',
-            'text_color_disabled' => 'A1A1A1',
-
-            'radio_align'       => 'block',
-            'check_align'       => 'block',
-            'check_font_size'   => '13px',
-            'check_label_color' => '444444',
-            'check_weight'      => 'normal',
-
-            'section_font_size' => '18px',
-            'section_color'     => '444444',
-            'section_weight'    => 'bold',
-            'section_pad'       => '15px 0 3px 0',
-            'section_mar_top'   => '15px',
+			'bg_color_disabled' => 'ffffff',
+			'border_color_disabled' => 'E5E5E5',
+			'text_color_disabled' => 'A1A1A1',
+
+			'radio_align'       => 'block',
+			'check_align'       => 'block',
+			'check_font_size'   => '13px',
+			'check_label_color' => '444444',
+			'check_weight'      => 'normal',
+
+			'section_font_size' => '18px',
+			'section_color'     => '444444',
+			'section_weight'    => 'bold',
+			'section_pad'       => '15px 0 3px 0',
+			'section_mar_top'   => '15px',
 			'section_mar_bottom' => '12px',
-            'section_bg_color'  => '',
-            'section_border_color' => 'e8e8e8',
-            'section_border_width' => '2px',
-            'section_border_style' => 'solid',
-            'section_border_loc' => '-top',
-            'collapse_icon'     => '6',
-            'collapse_pos'      => 'after',
-            'repeat_icon'       => '1',
-
-            'submit_style'      => false,
-            'submit_font_size'  => '14px',
-            'submit_width'      => 'auto',
-            'submit_height'     => 'auto',
-            'submit_bg_color'   => 'ffffff',
-            'submit_border_color' => 'cccccc',
-            'submit_border_width' => '1px',
-            'submit_text_color' => '444444',
-            'submit_weight'     => 'normal',
-            'submit_border_radius' => '4px',
-            'submit_bg_img'     => '',
-            'submit_margin'     => '10px',
-            'submit_padding'    => '6px 11px',
-            'submit_shadow_color' => 'eeeeee',
-            'submit_hover_bg_color' => 'efefef',
-            'submit_hover_color' => '444444',
-            'submit_hover_border_color' => 'cccccc',
-            'submit_active_bg_color' => 'efefef',
-            'submit_active_color' => '444444',
-            'submit_active_border_color' => 'cccccc',
-
-            'border_radius'     => '4px',
-            'error_bg'          => 'F2DEDE',
-            'error_border'      => 'EBCCD1',
-            'error_text'        => 'B94A48',
-            'error_font_size'   => '14px',
-
-            'success_bg_color'  => 'DFF0D8',
-            'success_border_color' => 'D6E9C6',
-            'success_text_color' => '468847',
-            'success_font_size' => '14px',
-
-            'important_style'   => false,
+			'section_bg_color'  => '',
+			'section_border_color' => 'e8e8e8',
+			'section_border_width' => '2px',
+			'section_border_style' => 'solid',
+			'section_border_loc' => '-top',
+			'collapse_icon'     => '6',
+			'collapse_pos'      => 'after',
+			'repeat_icon'       => '1',
+
+			'submit_style'      => false,
+			'submit_font_size'  => '14px',
+			'submit_width'      => 'auto',
+			'submit_height'     => 'auto',
+			'submit_bg_color'   => 'ffffff',
+			'submit_border_color' => 'cccccc',
+			'submit_border_width' => '1px',
+			'submit_text_color' => '444444',
+			'submit_weight'     => 'normal',
+			'submit_border_radius' => '4px',
+			'submit_bg_img'     => '',
+			'submit_margin'     => '10px',
+			'submit_padding'    => '6px 11px',
+			'submit_shadow_color' => 'eeeeee',
+			'submit_hover_bg_color' => 'efefef',
+			'submit_hover_color' => '444444',
+			'submit_hover_border_color' => 'cccccc',
+			'submit_active_bg_color' => 'efefef',
+			'submit_active_color' => '444444',
+			'submit_active_border_color' => 'cccccc',
+
+			'border_radius'     => '4px',
+			'error_bg'          => 'F2DEDE',
+			'error_border'      => 'EBCCD1',
+			'error_text'        => 'B94A48',
+			'error_font_size'   => '14px',
+
+			'success_bg_color'  => 'DFF0D8',
+			'success_border_color' => 'D6E9C6',
+			'success_text_color' => '468847',
+			'success_font_size' => '14px',
+
+			'important_style'   => false,
 
 			'progress_bg_color'     => 'dddddd',
 			'progress_active_color' => 'ffffff',
@@ -429,9 +429,9 @@ 
 			'progress_border_size'  => '2px',
 			'progress_size'         => '30px',
 
-            'custom_css'        => '',
-        );
-    }
+			'custom_css'        => '',
+		);
+	}
 
 	public function get_field_name( $field_name, $post_field = 'post_content' ) {
 		return 'frm_style_setting' . ( empty( $post_field ) ? '' : '[' . $post_field . ']' ) . '[' . $field_name . ']';

Spacing +42 added lines, -42 removed lines

@@ -15,7 +15,7 @@ 
 
         $max_slug_value = 2147483647;
         $min_slug_value = 37; // we want to have at least 2 characters in the slug
-        $key = base_convert( rand($min_slug_value, $max_slug_value), 10, 36 );
+        $key = base_convert( rand( $min_slug_value, $max_slug_value ), 10, 36 );
 
         $style = array(
             'post_type'     => FrmStylesController::$post_type,
@@ -41,7 +41,7 @@ 
     public function update( $id = 'default' ) {
  		$all_instances = $this->get_all();
 
- 		if ( empty($id) ) {
+ 		if ( empty( $id ) ) {
  		     $new_style = (array) $this->get_new();
  		     $all_instances[] = $new_style;
  		}
@@ -49,15 +49,15 @@ 
         $action_ids = array();
 
  		foreach ( $all_instances as $number => $new_instance ) {
- 			$new_instance = stripslashes_deep( (array) $new_instance);
+ 			$new_instance = stripslashes_deep( (array) $new_instance );
  			$this->id = $new_instance['ID'];
- 			if ( $id != $this->id || ! $_POST || ! isset($_POST['frm_style_setting']) ) {
-				$all_instances[ $number ] = $new_instance;
+ 			if ( $id != $this->id || ! $_POST || ! isset( $_POST['frm_style_setting'] ) ) {
+				$all_instances[$number] = $new_instance;
 
- 			    if ( $new_instance['menu_order'] && $_POST && empty($_POST['prev_menu_order']) && isset($_POST['frm_style_setting']['menu_order']) ) {
+ 			    if ( $new_instance['menu_order'] && $_POST && empty( $_POST['prev_menu_order'] ) && isset( $_POST['frm_style_setting']['menu_order'] ) ) {
  			        // this style was set to default, so remove default setting on previous default style
  			        $new_instance['menu_order'] = 0;
- 			        $action_ids[] = $this->save($new_instance);
+ 			        $action_ids[] = $this->save( $new_instance );
  			    }
 
  			    // don't continue if not saving this style
@@ -67,33 +67,33 @@ 
  			$new_instance['post_title'] = sanitize_text_field( $_POST['frm_style_setting']['post_title'] );
  			$new_instance['post_content'] = $_POST['frm_style_setting']['post_content'];
  			$new_instance['post_type']  = FrmStylesController::$post_type;
-            $new_instance['post_status']  = 'publish';
+            $new_instance['post_status'] = 'publish';
 			$new_instance['menu_order']  = isset( $_POST['frm_style_setting']['menu_order'] ) ? absint( $_POST['frm_style_setting']['menu_order'] ) : 0;
 
-            if ( empty($id) ) {
+            if ( empty( $id ) ) {
                 $new_instance['post_name'] = $new_instance['post_title'];
             }
 
             $default_settings = $this->get_defaults();
 
             foreach ( $default_settings as $setting => $default ) {
-				if ( ! isset( $new_instance['post_content'][ $setting ] ) ) {
-					$new_instance['post_content'][ $setting ] = $default;
+				if ( ! isset( $new_instance['post_content'][$setting] ) ) {
+					$new_instance['post_content'][$setting] = $default;
 				}
 
 				if ( strpos( $setting, 'color' ) !== false || in_array( $setting, array( 'error_bg', 'error_border', 'error_text' ) ) ) {
                     //if is a color
-					$new_instance['post_content'][ $setting ] = str_replace( '#', '', $new_instance['post_content'][ $setting ] );
-				} else if ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ) ) && ! isset( $new_instance['post_content'][ $setting ] ) ) {
-					$new_instance['post_content'][ $setting ] = 0;
+					$new_instance['post_content'][$setting] = str_replace( '#', '', $new_instance['post_content'][$setting] );
+				} else if ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ) ) && ! isset( $new_instance['post_content'][$setting] ) ) {
+					$new_instance['post_content'][$setting] = 0;
                 } else if ( $setting == 'font' ) {
-                	$new_instance['post_content'][ $setting ] = $this->force_balanced_quotation( $new_instance['post_content'][ $setting ] );
+                	$new_instance['post_content'][$setting] = $this->force_balanced_quotation( $new_instance['post_content'][$setting] );
                 }
             }
 
-			$all_instances[ $number ] = $new_instance;
+			$all_instances[$number] = $new_instance;
 
-            $action_ids[] = $this->save($new_instance);
+            $action_ids[] = $this->save( $new_instance );
 
  		}
 
@@ -107,9 +107,9 @@ 
      */
 	public function save_settings() {
 		$filename = FrmAppHelper::plugin_path() . '/css/custom_theme.css.php';
-		update_option( 'frm_last_style_update', date('njGi') );
+		update_option( 'frm_last_style_update', date( 'njGi' ) );
 
-        if ( ! is_file($filename) ) {
+        if ( ! is_file( $filename ) ) {
             return;
         }
 
@@ -123,9 +123,9 @@ 
 		) );
 		$create_file->create_file( $css );
 
-        update_option('frmpro_css', $css);
+        update_option( 'frmpro_css', $css );
 
-        set_transient('frmpro_css', $css);
+        set_transient( 'frmpro_css', $css );
 	}
 
 	private function get_css_content( $filename ) {
@@ -157,7 +157,7 @@ 
 	}
 
 	public function destroy( $id ) {
-        return wp_delete_post($id);
+        return wp_delete_post( $id );
     }
 
     public function get_one() {
@@ -171,19 +171,19 @@ 
             return $style;
         }
 
-        $style = get_post($this->id);
+        $style = get_post( $this->id );
 
         if ( ! $style ) {
             return $style;
         }
 
-        $style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
+        $style->post_content = FrmAppHelper::maybe_json_decode( $style->post_content );
 
         $default_values = $this->get_defaults();
 
         // fill default values
-        $style->post_content = $this->override_defaults($style->post_content);
-        $style->post_content = wp_parse_args( $style->post_content, $default_values);
+        $style->post_content = $this->override_defaults( $style->post_content );
+        $style->post_content = wp_parse_args( $style->post_content, $default_values );
 
         return $style;
     }
@@ -199,20 +199,20 @@ 
 
 		$temp_styles = FrmDb::check_cache( serialize( $post_atts ), 'frm_styles', $post_atts, 'get_posts' );
 
-        if ( empty($temp_styles) ) {
+        if ( empty( $temp_styles ) ) {
             global $wpdb;
             // make sure there wasn't a conflict with the query
 			$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->posts . ' WHERE post_type=%s AND post_status=%s ORDER BY post_title ASC LIMIT 99', FrmStylesController::$post_type, 'publish' );
-            $temp_styles = FrmDb::check_cache('frm_backup_style_check', 'frm_styles', $query, 'get_results');
+            $temp_styles = FrmDb::check_cache( 'frm_backup_style_check', 'frm_styles', $query, 'get_results' );
 
-            if ( empty($temp_styles) ) {
+            if ( empty( $temp_styles ) ) {
                 // create a new style if there are none
          		$new = $this->get_new();
 				$new->post_title = __( 'Formidable Style', 'formidable' );
 				$new->post_name = $new->post_title;
          		$new->menu_order = 1;
-         		$new = $this->save( (array) $new);
-         		$this->update('default');
+         		$new = $this->save( (array) $new );
+         		$this->update( 'default' );
 
                 $post_atts['include'] = $new;
 
@@ -236,25 +236,25 @@ 
                 }
             }
 
-            $style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
+            $style->post_content = FrmAppHelper::maybe_json_decode( $style->post_content );
 
             // fill default values
-            $style->post_content = $this->override_defaults($style->post_content);
-            $style->post_content = wp_parse_args( $style->post_content, $default_values);
+            $style->post_content = $this->override_defaults( $style->post_content );
+            $style->post_content = wp_parse_args( $style->post_content, $default_values );
 
-			$styles[ $style->ID ] = $style;
+			$styles[$style->ID] = $style;
         }
 
         if ( ! $default_style ) {
-            $default_style = reset($styles);
-			$styles[ $default_style->ID ]->menu_order = 1;
+            $default_style = reset( $styles );
+			$styles[$default_style->ID]->menu_order = 1;
         }
 
         return $styles;
     }
 
 	public function get_default_style( $styles = null ) {
-        if ( ! isset($styles) ) {
+        if ( ! isset( $styles ) ) {
 			$styles = $this->get_all( 'menu_order', 'DESC', 1 );
         }
 
@@ -266,24 +266,24 @@ 
     }
 
 	public function override_defaults( $settings ) {
-	    if ( ! is_array($settings) ) {
+	    if ( ! is_array( $settings ) ) {
 	        return $settings;
 	    }
 
 		$settings['line_height'] = ( ! isset( $settings['field_height'] ) || $settings['field_height'] == '' || $settings['field_height'] == 'auto' ) ? 'normal' : $settings['field_height'];
 
-	    if ( ! isset($settings['form_desc_size']) && isset($settings['description_font_size']) ) {
+	    if ( ! isset( $settings['form_desc_size'] ) && isset( $settings['description_font_size'] ) ) {
 	        $settings['form_desc_size'] = $settings['description_font_size'];
 	        $settings['form_desc_color'] = $settings['description_color'];
 	        $settings['title_color'] = $settings['label_color'];
 	    }
 
-	    if ( ! isset($settings['section_color']) && isset($settings['label_color']) ) {
+	    if ( ! isset( $settings['section_color'] ) && isset( $settings['label_color'] ) ) {
 	        $settings['section_color'] = $settings['label_color'];
 	        $settings['section_border_color'] = $settings['border_color'];
 	    }
 
-	    if ( ! isset($settings['submit_hover_bg_color']) && isset($settings['submit_bg_color']) ) {
+	    if ( ! isset( $settings['submit_hover_bg_color'] ) && isset( $settings['submit_bg_color'] ) ) {
 	        $settings['submit_hover_bg_color'] = $settings['submit_bg_color'];
 	        $settings['submit_hover_color'] = $settings['submit_text_color'];
 	        $settings['submit_hover_border_color'] = $settings['submit_border_color'];

classes/models/FrmFormAction.php

Indentation +226 added lines, -226 removed lines

@@ -29,7 +29,7 @@ 
 	}
 
 	/**
-     * Echo the settings update form
+	 * Echo the settings update form
 	 *
 	 * @param array $instance Current settings
 	 */
@@ -42,15 +42,15 @@ 
 	 * @return array of the default options
 	 */
 	public function get_defaults() {
-	    return array();
+		return array();
 	}
 
 	public function get_switch_fields() {
-	    return array();
+		return array();
 	}
 
 	public function migrate_values( $action, $form ) {
-	    return $action;
+		return $action;
 	}
 
 	// Functions you'll need to call.
@@ -69,24 +69,24 @@ 
 	 *   - height: currently not used but may be needed in the future
 	 */
 	public function __construct( $id_base, $name, $action_options = array(), $control_options = array() ) {
-	    if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
-        }
+		if ( ! defined('ABSPATH') ) {
+			die('You are not allowed to call this page directly.');
+		}
 
 		$this->id_base = strtolower($id_base);
 		$this->name = $name;
 		$this->option_name = 'frm_' . $this->id_base . '_action';
 
-        $default_options = array(
-            'classes'   => '',
-            'active'    => true,
+		$default_options = array(
+			'classes'   => '',
+			'active'    => true,
 			'event'     => array( 'create' ),
-            'limit'     => 1,
-            'force_event' => false,
-            'priority'  => 20,
-            'ajax_load' => true,
-            'tooltip'   => $name,
-        );
+			'limit'     => 1,
+			'force_event' => false,
+			'priority'  => 20,
+			'ajax_load' => true,
+			'tooltip'   => $name,
+		);
 
 		$action_options = apply_filters( 'frm_' . $id_base . '_action_options', $action_options );
 		$this->action_options = wp_parse_args( $action_options, $default_options );
@@ -135,132 +135,132 @@ 
 	}
 
 	public function prepare_new( $form_id = false ) {
-        if ( $form_id ) {
-            $this->form_id = $form_id;
-        }
-
-        $post_content = array();
-        $default_values = $this->get_global_defaults();
-
-        // fill default values
-        $post_content = wp_parse_args( $post_content, $default_values);
-
-        if ( ! isset($post_content['event']) && ! $this->action_options['force_event'] ) {
-            $post_content['event'] = array( reset($this->action_options['event']) );
-        }
-
-        $form_action = array(
-            'post_title'    => $this->name,
-            'post_content'  => $post_content,
-            'post_excerpt'  => $this->id_base,
-            'ID'            => '',
-            'post_status'   => 'publish',
-            'post_type'     => FrmFormActionsController::$action_post_type,
+		if ( $form_id ) {
+			$this->form_id = $form_id;
+		}
+
+		$post_content = array();
+		$default_values = $this->get_global_defaults();
+
+		// fill default values
+		$post_content = wp_parse_args( $post_content, $default_values);
+
+		if ( ! isset($post_content['event']) && ! $this->action_options['force_event'] ) {
+			$post_content['event'] = array( reset($this->action_options['event']) );
+		}
+
+		$form_action = array(
+			'post_title'    => $this->name,
+			'post_content'  => $post_content,
+			'post_excerpt'  => $this->id_base,
+			'ID'            => '',
+			'post_status'   => 'publish',
+			'post_type'     => FrmFormActionsController::$action_post_type,
 			'post_name'     => $this->form_id . '_' . $this->id_base . '_' . $this->number,
-            'menu_order'    => $this->form_id,
-        );
-        unset($post_content);
+			'menu_order'    => $this->form_id,
+		);
+		unset($post_content);
 
-        return (object) $form_action;
-    }
+		return (object) $form_action;
+	}
 
 	public function create( $form_id ) {
-        $this->form_id = $form_id;
+		$this->form_id = $form_id;
 
-        $action = $this->prepare_new();
+		$action = $this->prepare_new();
 
-        return $this->save_settings($action);
-    }
+		return $this->save_settings($action);
+	}
 
 	public function duplicate_form_actions( $form_id, $old_id ) {
-        if ( $form_id == $old_id ) {
-            // don't duplicate the actions if this is a template getting updated
-            return;
-        }
-
-        $this->form_id = $old_id;
-        $actions = $this->get_all( $old_id );
-
-        $this->form_id = $form_id;
-        foreach ( $actions as $action ) {
-            $this->duplicate_one($action, $form_id);
-            unset($action);
-        }
-    }
-
-    /* Check if imported action should be created or updated
+		if ( $form_id == $old_id ) {
+			// don't duplicate the actions if this is a template getting updated
+			return;
+		}
+
+		$this->form_id = $old_id;
+		$actions = $this->get_all( $old_id );
+
+		$this->form_id = $form_id;
+		foreach ( $actions as $action ) {
+			$this->duplicate_one($action, $form_id);
+			unset($action);
+		}
+	}
+
+	/* Check if imported action should be created or updated
     *
     * Since 2.0
     *
     * @param array $action
     * @return integer $post_id
     */
-    public function maybe_create_action( $action, $forms ) {
+	public function maybe_create_action( $action, $forms ) {
 		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && $forms[ $action['menu_order'] ] == 'updated' ) {
-            // Update action only
-            $action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] );
-            $post_id = $this->save_settings( $action );
-        } else {
-            // Create action
-            $action['post_content'] = FrmAppHelper::maybe_json_decode($action['post_content']);
-            $post_id = $this->duplicate_one( (object) $action, $action['menu_order']);
-        }
-        return $post_id;
-    }
+			// Update action only
+			$action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] );
+			$post_id = $this->save_settings( $action );
+		} else {
+			// Create action
+			$action['post_content'] = FrmAppHelper::maybe_json_decode($action['post_content']);
+			$post_id = $this->duplicate_one( (object) $action, $action['menu_order']);
+		}
+		return $post_id;
+	}
 
 	public function duplicate_one( $action, $form_id ) {
-        global $frm_duplicate_ids;
+		global $frm_duplicate_ids;
 
-        $action->menu_order = $form_id;
-        $switch = $this->get_global_switch_fields();
-        foreach ( (array) $action->post_content as $key => $val ) {
+		$action->menu_order = $form_id;
+		$switch = $this->get_global_switch_fields();
+		foreach ( (array) $action->post_content as $key => $val ) {
 			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[ $val ] ) ) {
 				$action->post_content[ $key ] = $frm_duplicate_ids[ $val ];
-            } else if ( ! is_array( $val ) ) {
+			} else if ( ! is_array( $val ) ) {
 				$action->post_content[ $key ] = FrmFieldsHelper::switch_field_ids( $val );
 			} else if ( isset( $switch[ $key ] ) && is_array( $switch[ $key ] ) ) {
-                // loop through each value if empty
+				// loop through each value if empty
 				if ( empty( $switch[ $key ] ) ) {
 					$switch[ $key ] = array_keys( $val );
 				}
 
 				foreach ( $switch[ $key ] as $subkey ) {
 					$action->post_content[ $key ] = $this->duplicate_array_walk( $action->post_content[ $key ], $subkey, $val );
-                }
-            }
+				}
+			}
 
-            unset($key, $val);
-        }
-        unset($action->ID);
+			unset($key, $val);
+		}
+		unset($action->ID);
 
-        return $this->save_settings($action);
-    }
+		return $this->save_settings($action);
+	}
 
 	private function duplicate_array_walk( $action, $subkey, $val ) {
-        global $frm_duplicate_ids;
+		global $frm_duplicate_ids;
 
-        if ( is_array($subkey) ) {
-            foreach ( $subkey as $subkey2 ) {
-                foreach ( (array) $val as $ck => $cv ) {
-                    if ( is_array($cv) ) {
+		if ( is_array($subkey) ) {
+			foreach ( $subkey as $subkey2 ) {
+				foreach ( (array) $val as $ck => $cv ) {
+					if ( is_array($cv) ) {
 						$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey2, $cv );
 					} else if ( isset( $cv[ $subkey ] ) && is_numeric( $cv[ $subkey ] ) && isset( $frm_duplicate_ids[ $cv[ $subkey ] ] ) ) {
 						$action[ $ck ][ $subkey ] = $frm_duplicate_ids[ $cv[ $subkey ] ];
-                    }
-                }
-            }
-        } else {
-            foreach ( (array) $val as $ck => $cv ) {
-                if ( is_array($cv) ) {
+					}
+				}
+			}
+		} else {
+			foreach ( (array) $val as $ck => $cv ) {
+				if ( is_array($cv) ) {
 					$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey, $cv );
 				} else if ( $ck == $subkey && isset( $frm_duplicate_ids[ $cv ] ) ) {
 					$action[ $ck ] = $frm_duplicate_ids[ $cv ];
-                }
-            }
-        }
+				}
+			}
+		}
 
-        return $action;
-    }
+		return $action;
+	}
 
 	/**
 	 * Deal with changed settings.
@@ -269,7 +269,7 @@ 
 	 *
 	 */
  	public function update_callback( $form_id ) {
-        $this->form_id = $form_id;
+		$this->form_id = $form_id;
 
  		$all_instances = $this->get_settings();
 
@@ -284,25 +284,25 @@ 
  			return;
  		}
 
-        $action_ids = array();
+		$action_ids = array();
 
  		foreach ( $settings as $number => $new_instance ) {
  			$this->_set($number);
 
  			if ( ! isset($new_instance['post_title']) ) {
- 			    // settings were never opened, so don't update
- 			    $action_ids[] = $new_instance['ID'];
-         		$this->updated = true;
-         		continue;
+ 				// settings were never opened, so don't update
+ 				$action_ids[] = $new_instance['ID'];
+		 		$this->updated = true;
+		 		continue;
  			}
 
 			$old_instance = isset( $all_instances[ $number ] ) ? $all_instances[ $number ] : array();
 
  			$new_instance['post_type']  = FrmFormActionsController::$action_post_type;
 			$new_instance['post_name']  = $this->form_id . '_' . $this->id_base . '_' . $this->number;
-            $new_instance['menu_order']   = $this->form_id;
-            $new_instance['post_status']  = 'publish';
-            $new_instance['post_date'] = isset( $old_instance->post_date ) ? $old_instance->post_date : '';
+			$new_instance['menu_order']   = $this->form_id;
+			$new_instance['post_status']  = 'publish';
+			$new_instance['post_date'] = isset( $old_instance->post_date ) ? $old_instance->post_date : '';
 
  			$instance = $this->update( $new_instance, $old_instance );
 
@@ -328,9 +328,9 @@ 
 				$all_instances[ $number ] = $instance;
 			}
 
-            $action_ids[] = $this->save_settings($instance);
+			$action_ids[] = $this->save_settings($instance);
 
-     		$this->updated = true;
+	 		$this->updated = true;
  		}
 
  		return $action_ids;
@@ -342,61 +342,61 @@ 
 	}
 
 	public function get_single_action( $id ) {
-	    $action = get_post($id);
+		$action = get_post($id);
 		if ( $action ) {
 			$action = $this->prepare_action( $action );
 			$this->_set( $id );
 		}
-	    return $action;
+		return $action;
 	}
 
 	public function get_one( $form_id ) {
-	    return $this->get_all($form_id, 1);
+		return $this->get_all($form_id, 1);
 	}
 
-    public static function get_action_for_form( $form_id, $type = 'all', $limit = 99 ) {
-        $action_controls = FrmFormActionsController::get_form_actions( $type );
-        if ( empty($action_controls) ) {
-            // don't continue if there are no available actions
-            return array();
-        }
+	public static function get_action_for_form( $form_id, $type = 'all', $limit = 99 ) {
+		$action_controls = FrmFormActionsController::get_form_actions( $type );
+		if ( empty($action_controls) ) {
+			// don't continue if there are no available actions
+			return array();
+		}
 
 		$limit = apply_filters( 'frm_form_action_limit', $limit, compact( 'type', 'form_id' ) );
 
-        if ( 'all' != $type ) {
-            return $action_controls->get_all( $form_id, $limit );
-        }
+		if ( 'all' != $type ) {
+			return $action_controls->get_all( $form_id, $limit );
+		}
 
 		$args = self::action_args( $form_id, $limit );
 		$actions = FrmDb::check_cache( serialize( $args ), 'frm_actions', $args, 'get_posts' );
 
-        if ( ! $actions ) {
-            return array();
-        }
+		if ( ! $actions ) {
+			return array();
+		}
 
-        $settings = array();
-        foreach ( $actions as $action ) {
+		$settings = array();
+		foreach ( $actions as $action ) {
 			// some plugins/themes are formatting the post_excerpt
 			$action->post_excerpt = sanitize_title( $action->post_excerpt );
 
 			if ( ! isset( $action_controls[ $action->post_excerpt ] ) ) {
-                continue;
-            }
+				continue;
+			}
 
-            $action = $action_controls[ $action->post_excerpt ]->prepare_action( $action );
+			$action = $action_controls[ $action->post_excerpt ]->prepare_action( $action );
 			$settings[ $action->ID ] = $action;
 
 			if ( count( $settings ) >= $limit ) {
 				break;
 			}
-        }
+		}
 
-        if ( 1 === $limit ) {
-            $settings = reset($settings);
-        }
+		if ( 1 === $limit ) {
+			$settings = reset($settings);
+		}
 
-        return $settings;
-    }
+		return $settings;
+	}
 
 	/**
 	 * @param int $action_id
@@ -419,45 +419,45 @@ 
 	}
 
 	public function get_all( $form_id = false, $limit = 99 ) {
-	    if ( $form_id ) {
-	        $this->form_id = $form_id;
-	    }
+		if ( $form_id ) {
+			$this->form_id = $form_id;
+		}
 
-	    $type = $this->id_base;
+		$type = $this->id_base;
 
-	    global $frm_vars;
-	    $frm_vars['action_type'] = $type;
+		global $frm_vars;
+		$frm_vars['action_type'] = $type;
 
 		add_filter( 'posts_where', 'FrmFormActionsController::limit_by_type' );
 		$query = self::action_args( $form_id, $limit );
-        $query['post_status']      = 'any';
-        $query['suppress_filters'] = false;
+		$query['post_status']      = 'any';
+		$query['suppress_filters'] = false;
 
 		$actions = FrmDb::check_cache( serialize( $query ) . '_type_' . $type, 'frm_actions', $query, 'get_posts' );
-        unset($query);
+		unset($query);
 
 		remove_filter( 'posts_where', 'FrmFormActionsController::limit_by_type' );
 
-        if ( empty($actions) ) {
-            return array();
-        }
+		if ( empty($actions) ) {
+			return array();
+		}
 
-        $settings = array();
-        foreach ( $actions as $action ) {
-            if ( count($settings) >= $limit ) {
-                continue;
-            }
+		$settings = array();
+		foreach ( $actions as $action ) {
+			if ( count($settings) >= $limit ) {
+				continue;
+			}
 
-            $action = $this->prepare_action($action);
+			$action = $this->prepare_action($action);
 
 			$settings[ $action->ID ] = $action;
-        }
+		}
 
-        if ( 1 === $limit ) {
-            $settings = reset($settings);
-        }
+		if ( 1 === $limit ) {
+			$settings = reset($settings);
+		}
 
-        return $settings;
+		return $settings;
 	}
 
 	public static function action_args( $form_id = 0, $limit = 99 ) {
@@ -480,45 +480,45 @@ 
 		$action->post_content = (array) FrmAppHelper::maybe_json_decode($action->post_content);
 		$action->post_excerpt = sanitize_title( $action->post_excerpt );
 
-        $default_values = $this->get_global_defaults();
+		$default_values = $this->get_global_defaults();
 
-        // fill default values
-        $action->post_content += $default_values;
+		// fill default values
+		$action->post_content += $default_values;
 
-        foreach ( $default_values as $k => $vals ) {
-            if ( is_array($vals) && ! empty($vals) ) {
+		foreach ( $default_values as $k => $vals ) {
+			if ( is_array($vals) && ! empty($vals) ) {
 				if ( 'event' == $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[ $k ] ) ) {
-                    continue;
-                }
+					continue;
+				}
 				$action->post_content[ $k ] = wp_parse_args( $action->post_content[ $k ], $vals );
-            }
-        }
+			}
+		}
 
-        if ( ! is_array($action->post_content['event']) ) {
-            $action->post_content['event'] = explode(',', $action->post_content['event']);
-        }
+		if ( ! is_array($action->post_content['event']) ) {
+			$action->post_content['event'] = explode(',', $action->post_content['event']);
+		}
 
-        return $action;
+		return $action;
 	}
 
 	public function destroy( $form_id = false, $type = 'default' ) {
-	    global $wpdb;
+		global $wpdb;
 
-	    $this->form_id = $form_id;
+		$this->form_id = $form_id;
 
-	    $query = array( 'post_type' => FrmFormActionsController::$action_post_type );
-	    if ( $form_id ) {
-	        $query['menu_order'] = $form_id;
-	    }
-	    if ( 'all' != $type ) {
-	        $query['post_excerpt'] = $this->id_base;
-	    }
+		$query = array( 'post_type' => FrmFormActionsController::$action_post_type );
+		if ( $form_id ) {
+			$query['menu_order'] = $form_id;
+		}
+		if ( 'all' != $type ) {
+			$query['post_excerpt'] = $this->id_base;
+		}
 
-        $post_ids = FrmDb::get_col( $wpdb->posts, $query, 'ID' );
+		$post_ids = FrmDb::get_col( $wpdb->posts, $query, 'ID' );
 
-        foreach ( $post_ids as $id ) {
-            wp_delete_post($id);
-        }
+		foreach ( $post_ids as $id ) {
+			wp_delete_post($id);
+		}
 		self::clear_cache();
 	}
 
@@ -536,69 +536,69 @@ 
 	}
 
 	public function get_global_defaults() {
-	    $defaults = $this->get_defaults();
+		$defaults = $this->get_defaults();
 
-	    if ( ! isset($defaults['event']) ) {
+		if ( ! isset($defaults['event']) ) {
 			$defaults['event'] = array( 'create' );
-	    }
+		}
 
-	    if ( ! isset($defaults['conditions']) ) {
-	        $defaults['conditions'] = array(
-                'send_stop' => '',
-                'any_all'   => '',
-            );
-        }
+		if ( ! isset($defaults['conditions']) ) {
+			$defaults['conditions'] = array(
+				'send_stop' => '',
+				'any_all'   => '',
+			);
+		}
 
-        return $defaults;
+		return $defaults;
 	}
 
 	public function get_global_switch_fields() {
-	    $switch = $this->get_switch_fields();
+		$switch = $this->get_switch_fields();
 		$switch['conditions'] = array( 'hide_field' );
-	    return $switch;
+		return $switch;
 	}
 
 	/**
 	 * Migrate settings from form->options into new action.
 	 */
 	public function migrate_to_2( $form, $update = 'update' ) {
-        $action = $this->prepare_new($form->id);
-        $form->options = maybe_unserialize($form->options);
+		$action = $this->prepare_new($form->id);
+		$form->options = maybe_unserialize($form->options);
 
-        // fill with existing options
-        foreach ( $action->post_content as $name => $val ) {
+		// fill with existing options
+		foreach ( $action->post_content as $name => $val ) {
 			if ( isset( $form->options[ $name ] ) ) {
 				$action->post_content[ $name ] = $form->options[ $name ];
 				unset( $form->options[ $name ] );
-            }
-        }
+			}
+		}
 
-        $action = $this->migrate_values($action, $form);
+		$action = $this->migrate_values($action, $form);
 
-        // check if action already exists
-        $post_id = get_posts( array(
-            'name'          => $action->post_name,
-            'post_type'     => FrmFormActionsController::$action_post_type,
-            'post_status'   => $action->post_status,
-            'numberposts'   => 1,
-        ) );
+		// check if action already exists
+		$post_id = get_posts( array(
+			'name'          => $action->post_name,
+			'post_type'     => FrmFormActionsController::$action_post_type,
+			'post_status'   => $action->post_status,
+			'numberposts'   => 1,
+		) );
 
-        if ( empty($post_id) ) {
-            // create action now
-            $post_id = $this->save_settings($action);
-        }
+		if ( empty($post_id) ) {
+			// create action now
+			$post_id = $this->save_settings($action);
+		}
 
-        if ( $post_id && 'update' == $update ) {
-            global $wpdb;
-            $form->options = maybe_serialize($form->options);
+		if ( $post_id && 'update' == $update ) {
+			global $wpdb;
+			$form->options = maybe_serialize($form->options);
 
-            // update form options
+			// update form options
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => $form->options ), array( 'id' => $form->id ) );
-	        FrmForm::clear_form_cache();
-        }
+			FrmForm::clear_form_cache();
+		}
 
-        return $post_id;
-    }
+		return $post_id;
+	}
 
 	public static function action_conditions_met( $action, $entry ) {
 		$notification = $action->post_content;

Spacing +85 added lines, -85 removed lines

@@ -2,15 +2,15 @@ 
 
 class FrmFormAction {
 
-	public $id_base;         // Root id for all actions of this type.
-	public $name;            // Name for this action type.
+	public $id_base; // Root id for all actions of this type.
+	public $name; // Name for this action type.
 	public $option_name;
-	public $action_options;  // Option array passed to wp_register_sidebar_widget()
+	public $action_options; // Option array passed to wp_register_sidebar_widget()
 	public $control_options; // Option array passed to wp_register_widget_control()
 
-	public $form_id;         // The ID of the form to evaluate
-	public $number = false;  // Unique ID number of the current instance.
-	public $id = '';         // Unique ID string of the current instance (id_base-number)
+	public $form_id; // The ID of the form to evaluate
+	public $number = false; // Unique ID number of the current instance.
+	public $id = ''; // Unique ID string of the current instance (id_base-number)
 	public $updated = false; // Set true when we update the data after a POST submit - makes sure we don't do it twice.
 
 	// Member functions that you must over-ride.
@@ -69,11 +69,11 @@ 
 	 *   - height: currently not used but may be needed in the future
 	 */
 	public function __construct( $id_base, $name, $action_options = array(), $control_options = array() ) {
-	    if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
+	    if ( ! defined( 'ABSPATH' ) ) {
+            die( 'You are not allowed to call this page directly.' );
         }
 
-		$this->id_base = strtolower($id_base);
+		$this->id_base = strtolower( $id_base );
 		$this->name = $name;
 		$this->option_name = 'frm_' . $this->id_base . '_action';
 
@@ -143,10 +143,10 @@ 
         $default_values = $this->get_global_defaults();
 
         // fill default values
-        $post_content = wp_parse_args( $post_content, $default_values);
+        $post_content = wp_parse_args( $post_content, $default_values );
 
-        if ( ! isset($post_content['event']) && ! $this->action_options['force_event'] ) {
-            $post_content['event'] = array( reset($this->action_options['event']) );
+        if ( ! isset( $post_content['event'] ) && ! $this->action_options['force_event'] ) {
+            $post_content['event'] = array( reset( $this->action_options['event'] ) );
         }
 
         $form_action = array(
@@ -159,7 +159,7 @@ 
 			'post_name'     => $this->form_id . '_' . $this->id_base . '_' . $this->number,
             'menu_order'    => $this->form_id,
         );
-        unset($post_content);
+        unset( $post_content );
 
         return (object) $form_action;
     }
@@ -169,7 +169,7 @@ 
 
         $action = $this->prepare_new();
 
-        return $this->save_settings($action);
+        return $this->save_settings( $action );
     }
 
 	public function duplicate_form_actions( $form_id, $old_id ) {
@@ -183,8 +183,8 @@ 
 
         $this->form_id = $form_id;
         foreach ( $actions as $action ) {
-            $this->duplicate_one($action, $form_id);
-            unset($action);
+            $this->duplicate_one( $action, $form_id );
+            unset( $action );
         }
     }
 
@@ -196,14 +196,14 @@ 
     * @return integer $post_id
     */
     public function maybe_create_action( $action, $forms ) {
-		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && $forms[ $action['menu_order'] ] == 'updated' ) {
+		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && $forms[$action['menu_order']] == 'updated' ) {
             // Update action only
             $action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] );
             $post_id = $this->save_settings( $action );
         } else {
             // Create action
-            $action['post_content'] = FrmAppHelper::maybe_json_decode($action['post_content']);
-            $post_id = $this->duplicate_one( (object) $action, $action['menu_order']);
+            $action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] );
+            $post_id = $this->duplicate_one( (object) $action, $action['menu_order'] );
         }
         return $post_id;
     }
@@ -214,47 +214,47 @@ 
         $action->menu_order = $form_id;
         $switch = $this->get_global_switch_fields();
         foreach ( (array) $action->post_content as $key => $val ) {
-			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[ $val ] ) ) {
-				$action->post_content[ $key ] = $frm_duplicate_ids[ $val ];
+			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[$val] ) ) {
+				$action->post_content[$key] = $frm_duplicate_ids[$val];
             } else if ( ! is_array( $val ) ) {
-				$action->post_content[ $key ] = FrmFieldsHelper::switch_field_ids( $val );
-			} else if ( isset( $switch[ $key ] ) && is_array( $switch[ $key ] ) ) {
+				$action->post_content[$key] = FrmFieldsHelper::switch_field_ids( $val );
+			} else if ( isset( $switch[$key] ) && is_array( $switch[$key] ) ) {
                 // loop through each value if empty
-				if ( empty( $switch[ $key ] ) ) {
-					$switch[ $key ] = array_keys( $val );
+				if ( empty( $switch[$key] ) ) {
+					$switch[$key] = array_keys( $val );
 				}
 
-				foreach ( $switch[ $key ] as $subkey ) {
-					$action->post_content[ $key ] = $this->duplicate_array_walk( $action->post_content[ $key ], $subkey, $val );
+				foreach ( $switch[$key] as $subkey ) {
+					$action->post_content[$key] = $this->duplicate_array_walk( $action->post_content[$key], $subkey, $val );
                 }
             }
 
-            unset($key, $val);
+            unset( $key, $val );
         }
-        unset($action->ID);
+        unset( $action->ID );
 
-        return $this->save_settings($action);
+        return $this->save_settings( $action );
     }
 
 	private function duplicate_array_walk( $action, $subkey, $val ) {
         global $frm_duplicate_ids;
 
-        if ( is_array($subkey) ) {
+        if ( is_array( $subkey ) ) {
             foreach ( $subkey as $subkey2 ) {
                 foreach ( (array) $val as $ck => $cv ) {
-                    if ( is_array($cv) ) {
-						$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey2, $cv );
-					} else if ( isset( $cv[ $subkey ] ) && is_numeric( $cv[ $subkey ] ) && isset( $frm_duplicate_ids[ $cv[ $subkey ] ] ) ) {
-						$action[ $ck ][ $subkey ] = $frm_duplicate_ids[ $cv[ $subkey ] ];
+                    if ( is_array( $cv ) ) {
+						$action[$ck] = $this->duplicate_array_walk( $action[$ck], $subkey2, $cv );
+					} else if ( isset( $cv[$subkey] ) && is_numeric( $cv[$subkey] ) && isset( $frm_duplicate_ids[$cv[$subkey]] ) ) {
+						$action[$ck][$subkey] = $frm_duplicate_ids[$cv[$subkey]];
                     }
                 }
             }
         } else {
             foreach ( (array) $val as $ck => $cv ) {
-                if ( is_array($cv) ) {
-					$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey, $cv );
-				} else if ( $ck == $subkey && isset( $frm_duplicate_ids[ $cv ] ) ) {
-					$action[ $ck ] = $frm_duplicate_ids[ $cv ];
+                if ( is_array( $cv ) ) {
+					$action[$ck] = $this->duplicate_array_walk( $action[$ck], $subkey, $cv );
+				} else if ( $ck == $subkey && isset( $frm_duplicate_ids[$cv] ) ) {
+					$action[$ck] = $frm_duplicate_ids[$cv];
                 }
             }
         }
@@ -278,8 +278,8 @@ 
  			return;
  		}
 
-		if ( isset( $_POST[ $this->option_name ] ) && is_array( $_POST[ $this->option_name ] ) ) {
-			$settings = $_POST[ $this->option_name ];
+		if ( isset( $_POST[$this->option_name] ) && is_array( $_POST[$this->option_name] ) ) {
+			$settings = $_POST[$this->option_name];
  		} else {
  			return;
  		}
@@ -287,19 +287,19 @@ 
         $action_ids = array();
 
  		foreach ( $settings as $number => $new_instance ) {
- 			$this->_set($number);
+ 			$this->_set( $number );
 
- 			if ( ! isset($new_instance['post_title']) ) {
+ 			if ( ! isset( $new_instance['post_title'] ) ) {
  			    // settings were never opened, so don't update
  			    $action_ids[] = $new_instance['ID'];
          		$this->updated = true;
          		continue;
  			}
 
-			$old_instance = isset( $all_instances[ $number ] ) ? $all_instances[ $number ] : array();
+			$old_instance = isset( $all_instances[$number] ) ? $all_instances[$number] : array();
 
- 			$new_instance['post_type']  = FrmFormActionsController::$action_post_type;
-			$new_instance['post_name']  = $this->form_id . '_' . $this->id_base . '_' . $this->number;
+ 			$new_instance['post_type'] = FrmFormActionsController::$action_post_type;
+			$new_instance['post_name'] = $this->form_id . '_' . $this->id_base . '_' . $this->number;
             $new_instance['menu_order']   = $this->form_id;
             $new_instance['post_status']  = 'publish';
             $new_instance['post_date'] = isset( $old_instance->post_date ) ? $old_instance->post_date : '';
@@ -321,14 +321,14 @@ 
 			 */
 			$instance = apply_filters( 'frm_action_update_callback', $instance, $new_instance, $old_instance, $this );
 
-			$instance['post_content'] = apply_filters('frm_before_save_action', $instance['post_content'], $instance, $new_instance, $old_instance, $this);
+			$instance['post_content'] = apply_filters( 'frm_before_save_action', $instance['post_content'], $instance, $new_instance, $old_instance, $this );
 			$instance['post_content'] = apply_filters( 'frm_before_save_' . $this->id_base . '_action', $new_instance['post_content'], $instance, $new_instance, $old_instance, $this );
 
 			if ( false !== $instance ) {
-				$all_instances[ $number ] = $instance;
+				$all_instances[$number] = $instance;
 			}
 
-            $action_ids[] = $this->save_settings($instance);
+            $action_ids[] = $this->save_settings( $instance );
 
      		$this->updated = true;
  		}
@@ -342,7 +342,7 @@ 
 	}
 
 	public function get_single_action( $id ) {
-	    $action = get_post($id);
+	    $action = get_post( $id );
 		if ( $action ) {
 			$action = $this->prepare_action( $action );
 			$this->_set( $id );
@@ -351,12 +351,12 @@ 
 	}
 
 	public function get_one( $form_id ) {
-	    return $this->get_all($form_id, 1);
+	    return $this->get_all( $form_id, 1 );
 	}
 
     public static function get_action_for_form( $form_id, $type = 'all', $limit = 99 ) {
         $action_controls = FrmFormActionsController::get_form_actions( $type );
-        if ( empty($action_controls) ) {
+        if ( empty( $action_controls ) ) {
             // don't continue if there are no available actions
             return array();
         }
@@ -379,12 +379,12 @@ 
 			// some plugins/themes are formatting the post_excerpt
 			$action->post_excerpt = sanitize_title( $action->post_excerpt );
 
-			if ( ! isset( $action_controls[ $action->post_excerpt ] ) ) {
+			if ( ! isset( $action_controls[$action->post_excerpt] ) ) {
                 continue;
             }
 
-            $action = $action_controls[ $action->post_excerpt ]->prepare_action( $action );
-			$settings[ $action->ID ] = $action;
+            $action = $action_controls[$action->post_excerpt]->prepare_action( $action );
+			$settings[$action->ID] = $action;
 
 			if ( count( $settings ) >= $limit ) {
 				break;
@@ -392,7 +392,7 @@ 
         }
 
         if ( 1 === $limit ) {
-            $settings = reset($settings);
+            $settings = reset( $settings );
         }
 
         return $settings;
@@ -434,27 +434,27 @@ 
         $query['suppress_filters'] = false;
 
 		$actions = FrmDb::check_cache( serialize( $query ) . '_type_' . $type, 'frm_actions', $query, 'get_posts' );
-        unset($query);
+        unset( $query );
 
 		remove_filter( 'posts_where', 'FrmFormActionsController::limit_by_type' );
 
-        if ( empty($actions) ) {
+        if ( empty( $actions ) ) {
             return array();
         }
 
         $settings = array();
         foreach ( $actions as $action ) {
-            if ( count($settings) >= $limit ) {
+            if ( count( $settings ) >= $limit ) {
                 continue;
             }
 
-            $action = $this->prepare_action($action);
+            $action = $this->prepare_action( $action );
 
-			$settings[ $action->ID ] = $action;
+			$settings[$action->ID] = $action;
         }
 
         if ( 1 === $limit ) {
-            $settings = reset($settings);
+            $settings = reset( $settings );
         }
 
         return $settings;
@@ -477,7 +477,7 @@ 
 	}
 
 	public function prepare_action( $action ) {
-		$action->post_content = (array) FrmAppHelper::maybe_json_decode($action->post_content);
+		$action->post_content = (array) FrmAppHelper::maybe_json_decode( $action->post_content );
 		$action->post_excerpt = sanitize_title( $action->post_excerpt );
 
         $default_values = $this->get_global_defaults();
@@ -486,16 +486,16 @@ 
         $action->post_content += $default_values;
 
         foreach ( $default_values as $k => $vals ) {
-            if ( is_array($vals) && ! empty($vals) ) {
-				if ( 'event' == $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[ $k ] ) ) {
+            if ( is_array( $vals ) && ! empty( $vals ) ) {
+				if ( 'event' == $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[$k] ) ) {
                     continue;
                 }
-				$action->post_content[ $k ] = wp_parse_args( $action->post_content[ $k ], $vals );
+				$action->post_content[$k] = wp_parse_args( $action->post_content[$k], $vals );
             }
         }
 
-        if ( ! is_array($action->post_content['event']) ) {
-            $action->post_content['event'] = explode(',', $action->post_content['event']);
+        if ( ! is_array( $action->post_content['event'] ) ) {
+            $action->post_content['event'] = explode( ',', $action->post_content['event'] );
         }
 
         return $action;
@@ -517,7 +517,7 @@ 
         $post_ids = FrmDb::get_col( $wpdb->posts, $query, 'ID' );
 
         foreach ( $post_ids as $id ) {
-            wp_delete_post($id);
+            wp_delete_post( $id );
         }
 		self::clear_cache();
 	}
@@ -538,11 +538,11 @@ 
 	public function get_global_defaults() {
 	    $defaults = $this->get_defaults();
 
-	    if ( ! isset($defaults['event']) ) {
+	    if ( ! isset( $defaults['event'] ) ) {
 			$defaults['event'] = array( 'create' );
 	    }
 
-	    if ( ! isset($defaults['conditions']) ) {
+	    if ( ! isset( $defaults['conditions'] ) ) {
 	        $defaults['conditions'] = array(
                 'send_stop' => '',
                 'any_all'   => '',
@@ -562,18 +562,18 @@ 
 	 * Migrate settings from form->options into new action.
 	 */
 	public function migrate_to_2( $form, $update = 'update' ) {
-        $action = $this->prepare_new($form->id);
-        $form->options = maybe_unserialize($form->options);
+        $action = $this->prepare_new( $form->id );
+        $form->options = maybe_unserialize( $form->options );
 
         // fill with existing options
         foreach ( $action->post_content as $name => $val ) {
-			if ( isset( $form->options[ $name ] ) ) {
-				$action->post_content[ $name ] = $form->options[ $name ];
-				unset( $form->options[ $name ] );
+			if ( isset( $form->options[$name] ) ) {
+				$action->post_content[$name] = $form->options[$name];
+				unset( $form->options[$name] );
             }
         }
 
-        $action = $this->migrate_values($action, $form);
+        $action = $this->migrate_values( $action, $form );
 
         // check if action already exists
         $post_id = get_posts( array(
@@ -583,14 +583,14 @@ 
             'numberposts'   => 1,
         ) );
 
-        if ( empty($post_id) ) {
+        if ( empty( $post_id ) ) {
             // create action now
-            $post_id = $this->save_settings($action);
+            $post_id = $this->save_settings( $action );
         }
 
         if ( $post_id && 'update' == $update ) {
             global $wpdb;
-            $form->options = maybe_serialize($form->options);
+            $form->options = maybe_serialize( $form->options );
 
             // update form options
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => $form->options ), array( 'id' => $form->id ) );
@@ -622,18 +622,18 @@ 
 
 			$observed_value = self::get_value_from_entry( $entry, $condition['hide_field'] );
 
-			$stop = FrmFieldsHelper::value_meets_condition($observed_value, $condition['hide_field_cond'], $condition['hide_opt']);
+			$stop = FrmFieldsHelper::value_meets_condition( $observed_value, $condition['hide_field_cond'], $condition['hide_opt'] );
 
 			if ( $notification['conditions']['send_stop'] == 'send' ) {
 				$stop = $stop ? false : true;
 			}
 
-			$met[ $stop ] = $stop;
+			$met[$stop] = $stop;
 		}
 
 		if ( $notification['conditions']['any_all'] == 'all' && ! empty( $met ) && isset( $met[0] ) && isset( $met[1] ) ) {
 			$stop = ( $notification['conditions']['send_stop'] == 'send' );
-		} else if ( $notification['conditions']['any_all'] == 'any' && $notification['conditions']['send_stop'] == 'send' && isset($met[0]) ) {
+		} else if ( $notification['conditions']['any_all'] == 'any' && $notification['conditions']['send_stop'] == 'send' && isset( $met[0] ) ) {
 			$stop = false;
 		}
 
@@ -668,8 +668,8 @@ 
 	private static function get_value_from_entry( $entry, $field_id ) {
 		$observed_value = '';
 
-		if ( isset( $entry->metas[ $field_id ] ) ) {
-			$observed_value = $entry->metas[ $field_id ];
+		if ( isset( $entry->metas[$field_id] ) ) {
+			$observed_value = $entry->metas[$field_id];
 		} else if ( $entry->post_id && FrmAppHelper::pro_is_installed() ) {
 			$field = FrmField::getOne( $field_id );
 			$observed_value = FrmProEntryMetaHelper::get_post_or_meta_value( $entry, $field, array(

classes/models/FrmEntryMeta.php

Indentation +163 added lines, -163 removed lines

@@ -5,25 +5,25 @@ 
 
 class FrmEntryMeta {
 
-    /**
-     * @param string $meta_key
-     */
+	/**
+	 * @param string $meta_key
+	 */
 	public static function add_entry_meta( $entry_id, $field_id, $meta_key = null, $meta_value ) {
-        global $wpdb;
+		global $wpdb;
 
-        if ( FrmAppHelper::is_empty_value( $meta_value ) ) {
-            // don't save blank fields
-            return 0;
-        }
+		if ( FrmAppHelper::is_empty_value( $meta_value ) ) {
+			// don't save blank fields
+			return 0;
+		}
 
-        $new_values = array(
+		$new_values = array(
 			'meta_value'    => is_array( $meta_value ) ? serialize( array_filter( $meta_value, 'FrmAppHelper::is_not_empty_value' ) ) : trim( $meta_value ),
-            'item_id'       => $entry_id,
-            'field_id'      => $field_id,
-            'created_at'    => current_time('mysql', 1),
-        );
+			'item_id'       => $entry_id,
+			'field_id'      => $field_id,
+			'created_at'    => current_time('mysql', 1),
+		);
 
-        $new_values = apply_filters('frm_add_entry_meta', $new_values);
+		$new_values = apply_filters('frm_add_entry_meta', $new_values);
 
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_item_metas', $new_values );
 
@@ -35,46 +35,46 @@ 
 			$id = 0;
 		}
 
-        return $id;
-    }
+		return $id;
+	}
 
-    /**
-     * @param string $meta_key
-     */
+	/**
+	 * @param string $meta_key
+	 */
 	public static function update_entry_meta( $entry_id, $field_id, $meta_key = null, $meta_value ) {
-        if ( ! $field_id ) {
-            return false;
-        }
+		if ( ! $field_id ) {
+			return false;
+		}
 
-        global $wpdb;
+		global $wpdb;
 
 		$values = array(
 			'item_id'  => $entry_id,
 			'field_id' => $field_id,
 		);
 		$where_values = $values;
-        $values['meta_value'] = $meta_value;
-        $values = apply_filters('frm_update_entry_meta', $values);
+		$values['meta_value'] = $meta_value;
+		$values = apply_filters('frm_update_entry_meta', $values);
 		if ( is_array($values['meta_value']) ) {
 			$values['meta_value'] = array_filter( $values['meta_value'], 'FrmAppHelper::is_not_empty_value' );
 		}
-        $meta_value = maybe_serialize($values['meta_value']);
+		$meta_value = maybe_serialize($values['meta_value']);
 
-        wp_cache_delete( $entry_id, 'frm_entry');
+		wp_cache_delete( $entry_id, 'frm_entry');
 		self::clear_cache();
 
 		return $wpdb->update( $wpdb->prefix . 'frm_item_metas', array( 'meta_value' => $meta_value ), $where_values );
-    }
+	}
 
 	public static function update_entry_metas( $entry_id, $values ) {
-        global $wpdb;
+		global $wpdb;
 
 		$prev_values = FrmDb::get_col( $wpdb->prefix . 'frm_item_metas', array(
 			'item_id'    => $entry_id,
 			'field_id !' => 0,
 		), 'field_id' );
 
-        foreach ( $values as $field_id => $meta_value ) {
+		foreach ( $values as $field_id => $meta_value ) {
 			$field = false;
 			if ( ! empty( $field_id ) ) {
 				$field = FrmField::getOne( $field_id );
@@ -98,15 +98,15 @@ 
 			}
 		}
 
-        if ( empty($prev_values) ) {
-            return;
-        }
+		if ( empty($prev_values) ) {
+			return;
+		}
 
-        $prev_values = array_diff($prev_values, array_keys($values));
+		$prev_values = array_diff($prev_values, array_keys($values));
 
-        if ( empty($prev_values) ) {
-            return;
-        }
+		if ( empty($prev_values) ) {
+			return;
+		}
 
 		// prepare the query
 		$where = array(
@@ -115,25 +115,25 @@ 
 		);
 		FrmDb::get_where_clause_and_values( $where );
 
-        // Delete any leftovers
-        $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas ' . $where['where'], $where['values'] ) );
+		// Delete any leftovers
+		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas ' . $where['where'], $where['values'] ) );
 		self::clear_cache();
-    }
+	}
 
 	public static function duplicate_entry_metas( $old_id, $new_id ) {
-        $metas = self::get_entry_meta_info($old_id);
-        foreach ( $metas as $meta ) {
-            self::add_entry_meta($new_id, $meta->field_id, null, $meta->meta_value);
-            unset($meta);
-        }
+		$metas = self::get_entry_meta_info($old_id);
+		foreach ( $metas as $meta ) {
+			self::add_entry_meta($new_id, $meta->field_id, null, $meta->meta_value);
+			unset($meta);
+		}
 		self::clear_cache();
-    }
+	}
 
 	public static function delete_entry_meta( $entry_id, $field_id ) {
-        global $wpdb;
+		global $wpdb;
 		self::clear_cache();
-        return $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id));
-    }
+		return $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id));
+	}
 
 	/**
 	 * Clear entry meta caching
@@ -158,7 +158,7 @@ 
 	}
 
 	public static function get_entry_meta_by_field( $entry_id, $field_id ) {
-        global $wpdb;
+		global $wpdb;
 
 		if ( is_object( $entry_id ) ) {
 			$entry = $entry_id;
@@ -171,93 +171,93 @@ 
 
 		if ( $cached && isset( $cached->metas ) && isset( $cached->metas[ $field_id ] ) ) {
 			$result = $cached->metas[ $field_id ];
-            return stripslashes_deep($result);
-        }
+			return stripslashes_deep($result);
+		}
 
 		$get_table = $wpdb->prefix . 'frm_item_metas';
 		$query = array( 'item_id' => $entry_id );
-        if ( is_numeric($field_id) ) {
+		if ( is_numeric($field_id) ) {
 			$query['field_id'] = $field_id;
-        } else {
+		} else {
 			$get_table .= ' it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id';
 			$query['fi.field_key'] = $field_id;
-        }
+		}
 
 		$result = FrmDb::get_var( $get_table, $query, 'meta_value' );
-        $result = maybe_unserialize($result);
-        $result = stripslashes_deep($result);
+		$result = maybe_unserialize($result);
+		$result = stripslashes_deep($result);
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public static function get_entry_metas_for_field( $field_id, $order = '', $limit = '', $args = array() ) {
+	public static function get_entry_metas_for_field( $field_id, $order = '', $limit = '', $args = array() ) {
 		$defaults = array(
 			'value'    => false,
 			'unique'   => false,
 			'stripslashes' => true,
 			'is_draft' => false,
 		);
-        $args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args( $args, $defaults );
 
-        $query = array();
-        self::meta_field_query($field_id, $order, $limit, $args, $query);
-        $query = implode(' ', $query);
+		$query = array();
+		self::meta_field_query($field_id, $order, $limit, $args, $query);
+		$query = implode(' ', $query);
 
 		$cache_key = 'entry_metas_for_field_' . $field_id . $order . $limit . maybe_serialize( $args );
-        $values = FrmDb::check_cache($cache_key, 'frm_entry', $query, 'get_col');
+		$values = FrmDb::check_cache($cache_key, 'frm_entry', $query, 'get_col');
 
-        if ( ! $args['stripslashes'] ) {
-            return $values;
-        }
+		if ( ! $args['stripslashes'] ) {
+			return $values;
+		}
 
 		foreach ( $values as $k => $v ) {
 			$values[ $k ] = maybe_unserialize( $v );
-            unset($k, $v);
-        }
+			unset($k, $v);
+		}
 
-        return stripslashes_deep($values);
-    }
+		return stripslashes_deep($values);
+	}
 
-    /**
-     * @param string $order
-     * @param string $limit
-     */
+	/**
+	 * @param string $order
+	 * @param string $limit
+	 */
 	private static function meta_field_query( $field_id, $order, $limit, $args, array &$query ) {
-        global $wpdb;
-        $query[] = 'SELECT';
-        $query[] = $args['unique'] ? 'DISTINCT(em.meta_value)' : 'em.meta_value';
+		global $wpdb;
+		$query[] = 'SELECT';
+		$query[] = $args['unique'] ? 'DISTINCT(em.meta_value)' : 'em.meta_value';
 		$query[] = 'FROM ' . $wpdb->prefix . 'frm_item_metas em ';
 
-        if ( ! $args['is_draft'] ) {
+		if ( ! $args['is_draft'] ) {
 			$query[] = 'INNER JOIN ' . $wpdb->prefix . 'frm_items e ON (e.id=em.item_id)';
-        }
+		}
 
-        if ( is_numeric($field_id) ) {
-            $query[] = $wpdb->prepare('WHERE em.field_id=%d', $field_id);
-        } else {
+		if ( is_numeric($field_id) ) {
+			$query[] = $wpdb->prepare('WHERE em.field_id=%d', $field_id);
+		} else {
 			$query[] = $wpdb->prepare( 'LEFT JOIN ' . $wpdb->prefix . 'frm_fields fi ON (em.field_id = fi.id) WHERE fi.field_key=%s', $field_id );
-        }
+		}
 
-        if ( ! $args['is_draft'] ) {
-            $query[] = 'AND e.is_draft=0';
-        }
+		if ( ! $args['is_draft'] ) {
+			$query[] = 'AND e.is_draft=0';
+		}
 
-        if ( $args['value'] ) {
-            $query[] = $wpdb->prepare(' AND meta_value=%s', $args['value']);
-        }
-        $query[] = $order . $limit;
-    }
+		if ( $args['value'] ) {
+			$query[] = $wpdb->prepare(' AND meta_value=%s', $args['value']);
+		}
+		$query[] = $order . $limit;
+	}
 
 	public static function get_entry_meta_info( $entry_id ) {
 		return FrmDb::get_results( 'frm_item_metas', array( 'item_id' => $entry_id ) );
-    }
+	}
 
 	public static function getAll( $where = array(), $order_by = '', $limit = '', $stripslashes = false ) {
-        global $wpdb;
-        $query = 'SELECT it.*, fi.type as field_type, fi.field_key as field_key,
+		global $wpdb;
+		$query = 'SELECT it.*, fi.type as field_type, fi.field_key as field_key,
             fi.required as required, fi.form_id as field_form_id, fi.name as field_name, fi.options as fi_options
 			FROM ' . $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id' .
-            FrmDb::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+			FrmDb::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
 
 		$cache_key = 'all_' . maybe_serialize( $where ) . $order_by . $limit;
 		$results = FrmDb::check_cache( $cache_key, 'frm_entry', $query, ( $limit == ' LIMIT 1' ? 'get_row' : 'get_results' ) );
@@ -272,32 +272,32 @@ 
 		}
 
 		return $results;
-    }
+	}
 
-    public static function getEntryIds( $where = array(), $order_by = '', $limit = '', $unique = true, $args = array() ) {
+	public static function getEntryIds( $where = array(), $order_by = '', $limit = '', $unique = true, $args = array() ) {
 		$defaults = array(
 			'is_draft' => false,
 			'user_id'  => '',
 			'group_by' => '',
 		);
-        $args = wp_parse_args($args, $defaults);
+		$args = wp_parse_args($args, $defaults);
 
-        $query = array();
-        self::get_ids_query($where, $order_by, $limit, $unique, $args, $query );
-        $query = implode(' ', $query);
+		$query = array();
+		self::get_ids_query($where, $order_by, $limit, $unique, $args, $query );
+		$query = implode(' ', $query);
 
 		$cache_key = 'ids_' . maybe_serialize( $where ) . $order_by . 'l' . $limit . 'u' . $unique . maybe_serialize( $args );
 		return FrmDb::check_cache( $cache_key, 'frm_entry', $query, ( $limit == ' LIMIT 1' ? 'get_var' : 'get_col' ) );
-    }
+	}
 
-    /**
-     * @param string|array $where
-     * @param string $order_by
-     * @param string $limit
-     */
+	/**
+	 * @param string|array $where
+	 * @param string $order_by
+	 * @param string $limit
+	 */
 	private static function get_ids_query( $where, $order_by, $limit, $unique, $args, array &$query ) {
-        global $wpdb;
-        $query[] = 'SELECT';
+		global $wpdb;
+		$query[] = 'SELECT';
 
 		$defaults = array( 'return_parent_id' => false );
 		$args = array_merge( $defaults, $args );
@@ -311,89 +311,89 @@ 
 		$query[] = 'FROM ' . $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id';
 
 		$query[] = 'INNER JOIN ' . $wpdb->prefix . 'frm_items e ON (e.id=it.item_id)';
-        if ( is_array($where) ) {
-            if ( ! $args['is_draft'] ) {
-                $where['e.is_draft'] = 0;
-            } else if ( $args['is_draft'] == 1 ) {
-                $where['e.is_draft'] = 1;
-            }
-
-            if ( ! empty($args['user_id']) ) {
-                $where['e.user_id'] = $args['user_id'];
-            }
-            $query[] = FrmDb::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+		if ( is_array($where) ) {
+			if ( ! $args['is_draft'] ) {
+				$where['e.is_draft'] = 0;
+			} else if ( $args['is_draft'] == 1 ) {
+				$where['e.is_draft'] = 1;
+			}
+
+			if ( ! empty($args['user_id']) ) {
+				$where['e.user_id'] = $args['user_id'];
+			}
+			$query[] = FrmDb::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
 
 			if ( $args['group_by'] ) {
 				$query[] = ' GROUP BY ' . sanitize_text_field( $args['group_by'] );
 			}
-            return;
-        }
+			return;
+		}
 
 		$draft_where = '';
 		$user_where = '';
-        if ( ! $args['is_draft'] ) {
+		if ( ! $args['is_draft'] ) {
 			$draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 0 );
-        } else if ( $args['is_draft'] == 1 ) {
+		} else if ( $args['is_draft'] == 1 ) {
 			$draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 1 );
-        }
+		}
 
-        if ( ! empty($args['user_id']) ) {
-            $user_where = $wpdb->prepare(' AND e.user_id=%d', $args['user_id']);
-        }
+		if ( ! empty($args['user_id']) ) {
+			$user_where = $wpdb->prepare(' AND e.user_id=%d', $args['user_id']);
+		}
 
-        if ( strpos($where, ' GROUP BY ') ) {
-            // don't inject WHERE filtering after GROUP BY
-            $parts = explode(' GROUP BY ', $where);
-            $where = $parts[0];
-            $where .= $draft_where . $user_where;
+		if ( strpos($where, ' GROUP BY ') ) {
+			// don't inject WHERE filtering after GROUP BY
+			$parts = explode(' GROUP BY ', $where);
+			$where = $parts[0];
+			$where .= $draft_where . $user_where;
 			$where .= ' GROUP BY ' . $parts[1];
-        } else {
-            $where .= $draft_where . $user_where;
-        }
+		} else {
+			$where .= $draft_where . $user_where;
+		}
 
 		// The query has already been prepared
 		$query[] = FrmDb::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
-    }
+	}
 
-    public static function search_entry_metas( $search, $field_id = '', $operator ) {
+	public static function search_entry_metas( $search, $field_id = '', $operator ) {
 		$cache_key = 'search_' . maybe_serialize( $search ) . $field_id . $operator;
-        $results = wp_cache_get($cache_key, 'frm_entry');
-        if ( false !== $results ) {
-            return $results;
-        }
+		$results = wp_cache_get($cache_key, 'frm_entry');
+		if ( false !== $results ) {
+			return $results;
+		}
 
-        global $wpdb;
+		global $wpdb;
 		if ( is_array( $search ) ) {
-            $where = '';
+			$where = '';
 			foreach ( $search as $field => $value ) {
 				if ( $value <= 0 || ! in_array( $field, array( 'year', 'month', 'day' ) ) ) {
-                    continue;
-                }
+					continue;
+				}
 
-                switch ( $field ) {
-                    case 'year':
+				switch ( $field ) {
+					case 'year':
 						$value = '%' . $value;
 						break;
-                    case 'month':
-                        $value .= '%';
+					case 'month':
+						$value .= '%';
 						break;
-                    case 'day':
+					case 'day':
 						$value = '%' . $value . '%';
-                }
+				}
 				$where .= $wpdb->prepare(' meta_value ' . $operator . ' %s and', $value );
-            }
-            $where .= $wpdb->prepare(' field_id=%d', $field_id);
+			}
+			$where .= $wpdb->prepare(' field_id=%d', $field_id);
 			$query = 'SELECT DISTINCT item_id FROM ' . $wpdb->prefix . 'frm_item_metas' . FrmDb::prepend_and_or_where( ' WHERE ', $where );
-        } else {
+		} else {
 			if ( $operator == 'LIKE' ) {
-                $search = '%' . $search . '%';
+				$search = '%' . $search . '%';
 			}
-            $query = $wpdb->prepare("SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id);
-        }
+			$query = $wpdb->prepare("SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id);
+		}
 
-        $results = $wpdb->get_col($query, 0);
+		$results = $wpdb->get_col($query, 0);
 		FrmDb::set_cache( $cache_key, $results, 'frm_entry' );
 
-        return $results;
-    }
+		return $results;
+	}
 }

Spacing +50 added lines, -50 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -20,10 +20,10 @@ 
 			'meta_value'    => is_array( $meta_value ) ? serialize( array_filter( $meta_value, 'FrmAppHelper::is_not_empty_value' ) ) : trim( $meta_value ),
             'item_id'       => $entry_id,
             'field_id'      => $field_id,
-            'created_at'    => current_time('mysql', 1),
+            'created_at'    => current_time( 'mysql', 1 ),
         );
 
-        $new_values = apply_filters('frm_add_entry_meta', $new_values);
+        $new_values = apply_filters( 'frm_add_entry_meta', $new_values );
 
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_item_metas', $new_values );
 
@@ -54,13 +54,13 @@ 
 		);
 		$where_values = $values;
         $values['meta_value'] = $meta_value;
-        $values = apply_filters('frm_update_entry_meta', $values);
-		if ( is_array($values['meta_value']) ) {
+        $values = apply_filters( 'frm_update_entry_meta', $values );
+		if ( is_array( $values['meta_value'] ) ) {
 			$values['meta_value'] = array_filter( $values['meta_value'], 'FrmAppHelper::is_not_empty_value' );
 		}
-        $meta_value = maybe_serialize($values['meta_value']);
+        $meta_value = maybe_serialize( $values['meta_value'] );
 
-        wp_cache_delete( $entry_id, 'frm_entry');
+        wp_cache_delete( $entry_id, 'frm_entry' );
 		self::clear_cache();
 
 		return $wpdb->update( $wpdb->prefix . 'frm_item_metas', array( 'meta_value' => $meta_value ), $where_values );
@@ -83,11 +83,11 @@ 
 			// set the value for the file upload field and add new tags (in Pro version)
 			$meta_value = apply_filters( 'frm_prepare_data_before_db', $meta_value, $field_id, $entry_id, compact( 'field' ) );
 
-			if ( $prev_values && in_array($field_id, $prev_values) ) {
+			if ( $prev_values && in_array( $field_id, $prev_values ) ) {
 
 				if ( ( is_array( $meta_value ) && empty( $meta_value ) ) || ( ! is_array( $meta_value ) && trim( $meta_value ) == '' ) ) {
 					// remove blank fields
-					unset( $values[ $field_id ] );
+					unset( $values[$field_id] );
 				} else {
 					// if value exists, then update it
 					self::update_entry_meta( $entry_id, $field_id, '', $meta_value );
@@ -98,13 +98,13 @@ 
 			}
 		}
 
-        if ( empty($prev_values) ) {
+        if ( empty( $prev_values ) ) {
             return;
         }
 
-        $prev_values = array_diff($prev_values, array_keys($values));
+        $prev_values = array_diff( $prev_values, array_keys( $values ) );
 
-        if ( empty($prev_values) ) {
+        if ( empty( $prev_values ) ) {
             return;
         }
 
@@ -121,10 +121,10 @@ 
     }
 
 	public static function duplicate_entry_metas( $old_id, $new_id ) {
-        $metas = self::get_entry_meta_info($old_id);
+        $metas = self::get_entry_meta_info( $old_id );
         foreach ( $metas as $meta ) {
-            self::add_entry_meta($new_id, $meta->field_id, null, $meta->meta_value);
-            unset($meta);
+            self::add_entry_meta( $new_id, $meta->field_id, null, $meta->meta_value );
+            unset( $meta );
         }
 		self::clear_cache();
     }
@@ -132,7 +132,7 @@ 
 	public static function delete_entry_meta( $entry_id, $field_id ) {
         global $wpdb;
 		self::clear_cache();
-        return $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id));
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id ) );
     }
 
 	/**
@@ -151,7 +151,7 @@ 
 	 */
 	public static function get_meta_value( $entry, $field_id ) {
 		if ( isset( $entry->metas ) ) {
-			return isset( $entry->metas[ $field_id ] ) ? $entry->metas[ $field_id ] : false;
+			return isset( $entry->metas[$field_id] ) ? $entry->metas[$field_id] : false;
 		} else {
 			return self::get_entry_meta_by_field( $entry->id, $field_id );
 		}
@@ -169,14 +169,14 @@ 
 			$cached = FrmDb::check_cache( $entry_id, 'frm_entry' );
 		}
 
-		if ( $cached && isset( $cached->metas ) && isset( $cached->metas[ $field_id ] ) ) {
-			$result = $cached->metas[ $field_id ];
-            return stripslashes_deep($result);
+		if ( $cached && isset( $cached->metas ) && isset( $cached->metas[$field_id] ) ) {
+			$result = $cached->metas[$field_id];
+            return stripslashes_deep( $result );
         }
 
 		$get_table = $wpdb->prefix . 'frm_item_metas';
 		$query = array( 'item_id' => $entry_id );
-        if ( is_numeric($field_id) ) {
+        if ( is_numeric( $field_id ) ) {
 			$query['field_id'] = $field_id;
         } else {
 			$get_table .= ' it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id';
@@ -184,8 +184,8 @@ 
         }
 
 		$result = FrmDb::get_var( $get_table, $query, 'meta_value' );
-        $result = maybe_unserialize($result);
-        $result = stripslashes_deep($result);
+        $result = maybe_unserialize( $result );
+        $result = stripslashes_deep( $result );
 
         return $result;
     }
@@ -200,22 +200,22 @@ 
         $args = wp_parse_args( $args, $defaults );
 
         $query = array();
-        self::meta_field_query($field_id, $order, $limit, $args, $query);
-        $query = implode(' ', $query);
+        self::meta_field_query( $field_id, $order, $limit, $args, $query );
+        $query = implode( ' ', $query );
 
 		$cache_key = 'entry_metas_for_field_' . $field_id . $order . $limit . maybe_serialize( $args );
-        $values = FrmDb::check_cache($cache_key, 'frm_entry', $query, 'get_col');
+        $values = FrmDb::check_cache( $cache_key, 'frm_entry', $query, 'get_col' );
 
         if ( ! $args['stripslashes'] ) {
             return $values;
         }
 
 		foreach ( $values as $k => $v ) {
-			$values[ $k ] = maybe_unserialize( $v );
-            unset($k, $v);
+			$values[$k] = maybe_unserialize( $v );
+            unset( $k, $v );
         }
 
-        return stripslashes_deep($values);
+        return stripslashes_deep( $values );
     }
 
     /**
@@ -232,8 +232,8 @@ 
 			$query[] = 'INNER JOIN ' . $wpdb->prefix . 'frm_items e ON (e.id=em.item_id)';
         }
 
-        if ( is_numeric($field_id) ) {
-            $query[] = $wpdb->prepare('WHERE em.field_id=%d', $field_id);
+        if ( is_numeric( $field_id ) ) {
+            $query[] = $wpdb->prepare( 'WHERE em.field_id=%d', $field_id );
         } else {
 			$query[] = $wpdb->prepare( 'LEFT JOIN ' . $wpdb->prefix . 'frm_fields fi ON (em.field_id = fi.id) WHERE fi.field_key=%s', $field_id );
         }
@@ -243,7 +243,7 @@ 
         }
 
         if ( $args['value'] ) {
-            $query[] = $wpdb->prepare(' AND meta_value=%s', $args['value']);
+            $query[] = $wpdb->prepare( ' AND meta_value=%s', $args['value'] );
         }
         $query[] = $order . $limit;
     }
@@ -257,7 +257,7 @@ 
         $query = 'SELECT it.*, fi.type as field_type, fi.field_key as field_key,
             fi.required as required, fi.form_id as field_form_id, fi.name as field_name, fi.options as fi_options
 			FROM ' . $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id' .
-            FrmDb::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+            FrmDb::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
 		$cache_key = 'all_' . maybe_serialize( $where ) . $order_by . $limit;
 		$results = FrmDb::check_cache( $cache_key, 'frm_entry', $query, ( $limit == ' LIMIT 1' ? 'get_row' : 'get_results' ) );
@@ -267,7 +267,7 @@ 
 		}
 
 		foreach ( $results as $k => $result ) {
-			$results[ $k ]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
+			$results[$k]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
 			unset( $k, $result );
 		}
 
@@ -280,11 +280,11 @@ 
 			'user_id'  => '',
 			'group_by' => '',
 		);
-        $args = wp_parse_args($args, $defaults);
+        $args = wp_parse_args( $args, $defaults );
 
         $query = array();
-        self::get_ids_query($where, $order_by, $limit, $unique, $args, $query );
-        $query = implode(' ', $query);
+        self::get_ids_query( $where, $order_by, $limit, $unique, $args, $query );
+        $query = implode( ' ', $query );
 
 		$cache_key = 'ids_' . maybe_serialize( $where ) . $order_by . 'l' . $limit . 'u' . $unique . maybe_serialize( $args );
 		return FrmDb::check_cache( $cache_key, 'frm_entry', $query, ( $limit == ' LIMIT 1' ? 'get_var' : 'get_col' ) );
@@ -311,17 +311,17 @@ 
 		$query[] = 'FROM ' . $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id';
 
 		$query[] = 'INNER JOIN ' . $wpdb->prefix . 'frm_items e ON (e.id=it.item_id)';
-        if ( is_array($where) ) {
+        if ( is_array( $where ) ) {
             if ( ! $args['is_draft'] ) {
                 $where['e.is_draft'] = 0;
             } else if ( $args['is_draft'] == 1 ) {
                 $where['e.is_draft'] = 1;
             }
 
-            if ( ! empty($args['user_id']) ) {
+            if ( ! empty( $args['user_id'] ) ) {
                 $where['e.user_id'] = $args['user_id'];
             }
-            $query[] = FrmDb::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+            $query[] = FrmDb::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
 			if ( $args['group_by'] ) {
 				$query[] = ' GROUP BY ' . sanitize_text_field( $args['group_by'] );
@@ -337,13 +337,13 @@ 
 			$draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 1 );
         }
 
-        if ( ! empty($args['user_id']) ) {
-            $user_where = $wpdb->prepare(' AND e.user_id=%d', $args['user_id']);
+        if ( ! empty( $args['user_id'] ) ) {
+            $user_where = $wpdb->prepare( ' AND e.user_id=%d', $args['user_id'] );
         }
 
-        if ( strpos($where, ' GROUP BY ') ) {
+        if ( strpos( $where, ' GROUP BY ' ) ) {
             // don't inject WHERE filtering after GROUP BY
-            $parts = explode(' GROUP BY ', $where);
+            $parts = explode( ' GROUP BY ', $where );
             $where = $parts[0];
             $where .= $draft_where . $user_where;
 			$where .= ' GROUP BY ' . $parts[1];
@@ -352,12 +352,12 @@ 
         }
 
 		// The query has already been prepared
-		$query[] = FrmDb::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+		$query[] = FrmDb::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
     }
 
     public static function search_entry_metas( $search, $field_id = '', $operator ) {
 		$cache_key = 'search_' . maybe_serialize( $search ) . $field_id . $operator;
-        $results = wp_cache_get($cache_key, 'frm_entry');
+        $results = wp_cache_get( $cache_key, 'frm_entry' );
         if ( false !== $results ) {
             return $results;
         }
@@ -380,18 +380,18 @@ 
                     case 'day':
 						$value = '%' . $value . '%';
                 }
-				$where .= $wpdb->prepare(' meta_value ' . $operator . ' %s and', $value );
+				$where .= $wpdb->prepare( ' meta_value ' . $operator . ' %s and', $value );
             }
-            $where .= $wpdb->prepare(' field_id=%d', $field_id);
+            $where .= $wpdb->prepare( ' field_id=%d', $field_id );
 			$query = 'SELECT DISTINCT item_id FROM ' . $wpdb->prefix . 'frm_item_metas' . FrmDb::prepend_and_or_where( ' WHERE ', $where );
         } else {
 			if ( $operator == 'LIKE' ) {
                 $search = '%' . $search . '%';
 			}
-            $query = $wpdb->prepare("SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id);
+            $query = $wpdb->prepare( "SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id );
         }
 
-        $results = $wpdb->get_col($query, 0);
+        $results = $wpdb->get_col( $query, 0 );
 		FrmDb::set_cache( $cache_key, $results, 'frm_entry' );
 
         return $results;

classes/models/FrmField.php

Indentation +188 added lines, -188 removed lines

@@ -5,7 +5,7 @@ 
 
 class FrmField {
 
-    static $use_cache = true;
+	static $use_cache = true;
 	static $transient_size = 200;
 
 	public static function field_selection() {
@@ -52,39 +52,39 @@ 
 		));
 	}
 
-    public static function create( $values, $return = true ) {
-        global $wpdb, $frm_duplicate_ids;
+	public static function create( $values, $return = true ) {
+		global $wpdb, $frm_duplicate_ids;
 
-        $new_values = array();
-        $key = isset($values['field_key']) ? $values['field_key'] : $values['name'];
+		$new_values = array();
+		$key = isset($values['field_key']) ? $values['field_key'] : $values['name'];
 		$new_values['field_key'] = FrmAppHelper::get_unique_key( $key, $wpdb->prefix . 'frm_fields', 'field_key' );
 
 		foreach ( array( 'name', 'description', 'type', 'default_value' ) as $col ) {
 			$new_values[ $col ] = $values[ $col ];
-        }
+		}
 
-        $new_values['options'] = $values['options'];
+		$new_values['options'] = $values['options'];
 
-        $new_values['field_order'] = isset($values['field_order']) ? (int) $values['field_order'] : null;
-        $new_values['required'] = isset($values['required']) ? (int) $values['required'] : 0;
-        $new_values['form_id'] = isset($values['form_id']) ? (int) $values['form_id'] : null;
-        $new_values['field_options'] = $values['field_options'];
-        $new_values['created_at'] = current_time('mysql', 1);
+		$new_values['field_order'] = isset($values['field_order']) ? (int) $values['field_order'] : null;
+		$new_values['required'] = isset($values['required']) ? (int) $values['required'] : 0;
+		$new_values['form_id'] = isset($values['form_id']) ? (int) $values['form_id'] : null;
+		$new_values['field_options'] = $values['field_options'];
+		$new_values['created_at'] = current_time('mysql', 1);
 
 		if ( isset( $values['id'] ) ) {
 			$frm_duplicate_ids[ $values['field_key'] ] = $new_values['field_key'];
-            $new_values = apply_filters('frm_duplicated_field', $new_values);
-        }
+			$new_values = apply_filters('frm_duplicated_field', $new_values);
+		}
 
 		foreach ( $new_values as $k => $v ) {
-            if ( is_array( $v ) ) {
+			if ( is_array( $v ) ) {
 				$new_values[ $k ] = serialize( $v );
 			}
-            unset( $k, $v );
-        }
+			unset( $k, $v );
+		}
 
-        //if(isset($values['id']) and is_numeric($values['id']))
-        //    $new_values['id'] = $values['id'];
+		//if(isset($values['id']) and is_numeric($values['id']))
+		//    $new_values['id'] = $values['id'];
 
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_fields', $new_values );
 		$new_id = 0;
@@ -105,10 +105,10 @@ 
 		} else {
 			return false;
 		}
-    }
+	}
 
-    public static function duplicate( $old_form_id, $form_id, $copy_keys = false, $blog_id = false ) {
-        global $frm_duplicate_ids;
+	public static function duplicate( $old_form_id, $form_id, $copy_keys = false, $blog_id = false ) {
+		global $frm_duplicate_ids;
 
 		$where = array( array(
 			'or' => 1,
@@ -117,14 +117,14 @@ 
 		) );
 		$fields = self::getAll( $where, 'field_order', '', $blog_id );
 
-        foreach ( (array) $fields as $field ) {
+		foreach ( (array) $fields as $field ) {
 			$new_key = $copy_keys ? $field->field_key : '';
-            if ( $copy_keys && substr($field->field_key, -1) == 2 ) {
-                $new_key = rtrim($new_key, 2);
-            }
+			if ( $copy_keys && substr($field->field_key, -1) == 2 ) {
+				$new_key = rtrim($new_key, 2);
+			}
 
-            $values = array();
-            FrmFieldsHelper::fill_field( $values, $field, $form_id, $new_key );
+			$values = array();
+			FrmFieldsHelper::fill_field( $values, $field, $form_id, $new_key );
 
 			// If this is a repeating section, create new form
 			if ( self::is_repeating_field( $field ) ) {
@@ -146,16 +146,16 @@ 
 				$values['form_id'] = $new_repeat_form_id;
 			}
 
-            $values = apply_filters('frm_duplicated_field', $values);
-            $new_id = self::create($values);
-            $frm_duplicate_ids[ $field->id ] = $new_id;
-            $frm_duplicate_ids[ $field->field_key ] = $new_id;
-            unset($field);
-        }
-    }
+			$values = apply_filters('frm_duplicated_field', $values);
+			$new_id = self::create($values);
+			$frm_duplicate_ids[ $field->id ] = $new_id;
+			$frm_duplicate_ids[ $field->field_key ] = $new_id;
+			unset($field);
+		}
+	}
 
 	public static function update( $id, $values ) {
-        global $wpdb;
+		global $wpdb;
 
 		$id = absint( $id );
 
@@ -163,9 +163,9 @@ 
 			$values['field_key'] = FrmAppHelper::get_unique_key( $values['field_key'], $wpdb->prefix . 'frm_fields', 'field_key', $id );
 		}
 
-        if ( isset($values['required']) ) {
-            $values['required'] = (int) $values['required'];
-        }
+		if ( isset($values['required']) ) {
+			$values['required'] = (int) $values['required'];
+		}
 
 		self::preserve_format_option_backslashes( $values );
 
@@ -187,41 +187,41 @@ 
 
 		$query_results = $wpdb->update( $wpdb->prefix . 'frm_fields', $values, array( 'id' => $id ) );
 
-        $form_id = 0;
+		$form_id = 0;
 		if ( isset( $values['form_id'] ) ) {
-            $form_id = absint( $values['form_id'] );
+			$form_id = absint( $values['form_id'] );
 		} else {
-            $field = self::getOne($id);
-            if ( $field ) {
-                $form_id = $field->form_id;
-            }
-            unset($field);
-        }
-        unset($values);
+			$field = self::getOne($id);
+			if ( $field ) {
+				$form_id = $field->form_id;
+			}
+			unset($field);
+		}
+		unset($values);
 
 		if ( $query_results ) {
-            wp_cache_delete( $id, 'frm_field' );
-            if ( $form_id ) {
-                self::delete_form_transient( $form_id );
-            }
-        }
+			wp_cache_delete( $id, 'frm_field' );
+			if ( $form_id ) {
+				self::delete_form_transient( $form_id );
+			}
+		}
 
-        return $query_results;
-    }
+		return $query_results;
+	}
 
 	/**
-	* Keep backslashes in the phone format option
-	*
-	* @since 2.0.8
-	* @param $values array - pass by reference
-	*/
+	 * Keep backslashes in the phone format option
+	 *
+	 * @since 2.0.8
+	 * @param $values array - pass by reference
+	 */
 	private static function preserve_format_option_backslashes( &$values ) {
 		if ( isset( $values['field_options']['format'] ) ) {
 			$values['field_options']['format'] = FrmAppHelper::preserve_backslashes( $values['field_options']['format'] );
 		}
 	}
 
-    public static function destroy( $id ) {
+	public static function destroy( $id ) {
 		global $wpdb;
 
 		do_action( 'frm_before_destroy_field', $id );
@@ -236,7 +236,7 @@ 
 
 		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas WHERE field_id=%d', $id ) );
 		return $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_fields WHERE id=%d', $id ) );
-    }
+	}
 
 	public static function delete_form_transient( $form_id ) {
 		$form_id = absint( $form_id );
@@ -250,11 +250,11 @@ 
 
 		FrmDb::cache_delete_group( 'frm_field' );
 
-        $form = FrmForm::getOne($form_id);
-        if ( $form && $form->parent_form_id && $form->parent_form_id != $form_id ) {
-            self::delete_form_transient( $form->parent_form_id );
-        }
-    }
+		$form = FrmForm::getOne($form_id);
+		if ( $form && $form->parent_form_id && $form->parent_form_id != $form_id ) {
+			self::delete_form_transient( $form->parent_form_id );
+		}
+	}
 
 	/**
 	 * If $field is numeric, get the field object
@@ -270,83 +270,83 @@ 
 			return null;
 		}
 
-        global $wpdb;
+		global $wpdb;
 
-        $where = is_numeric($id) ? 'id=%d' : 'field_key=%s';
+		$where = is_numeric($id) ? 'id=%d' : 'field_key=%s';
 		$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->prefix . 'frm_fields WHERE ' . $where, $id );
 
-        $results = FrmDb::check_cache( $id, 'frm_field', $query, 'get_row', 0 );
+		$results = FrmDb::check_cache( $id, 'frm_field', $query, 'get_row', 0 );
 
-        if ( empty($results) ) {
-            return $results;
-        }
+		if ( empty($results) ) {
+			return $results;
+		}
 
-        if ( is_numeric($id) ) {
+		if ( is_numeric($id) ) {
 			FrmDb::set_cache( $results->field_key, $results, 'frm_field' );
-        } else if ( $results ) {
+		} else if ( $results ) {
 			FrmDb::set_cache( $results->id, $results, 'frm_field' );
-        }
+		}
 
 		self::prepare_options( $results );
 
-        return stripslashes_deep($results);
-    }
+		return stripslashes_deep($results);
+	}
 
-    /**
-     * Get the field type by key or id
-     * @param int|string The field id or key
+	/**
+	 * Get the field type by key or id
+	 * @param int|string The field id or key
 	 * @param mixed $col The name of the column in the fields database table
-     */
-    public static function get_type( $id, $col = 'type' ) {
-        $field = FrmDb::check_cache( $id, 'frm_field' );
-        if ( $field ) {
-            $type = $field->{$col};
-        } else {
+	 */
+	public static function get_type( $id, $col = 'type' ) {
+		$field = FrmDb::check_cache( $id, 'frm_field' );
+		if ( $field ) {
+			$type = $field->{$col};
+		} else {
 			$where = array(
 				'or'        => 1,
 				'id'        => $id,
 				'field_key' => $id,
 			);
 			$type = FrmDb::get_var( 'frm_fields', $where, $col );
-        }
+		}
 
-        return $type;
-    }
+		return $type;
+	}
 
 	public static function get_all_types_in_form( $form_id, $type, $limit = '', $inc_sub = 'exclude' ) {
-        if ( ! $form_id ) {
-            return array();
-        }
+		if ( ! $form_id ) {
+			return array();
+		}
 
 		$results = self::get_fields_from_transients( $form_id, array(
 			'inc_embed'  => $inc_sub,
 			'inc_repeat' => $inc_sub,
 		) );
 		if ( ! empty( $results ) ) {
-            $fields = array();
-            $count = 0;
-            foreach ( $results as $result ) {
-                if ( $type != $result->type ) {
-                    continue;
-                }
+			$fields = array();
+			$count = 0;
+			foreach ( $results as $result ) {
+				if ( $type != $result->type ) {
+					continue;
+				}
 
 				$fields[ $result->id ] = $result;
-                $count++;
-                if ( $limit == 1 ) {
-                    $fields = $result;
-                    break;
-                }
+				$count++;
+				if ( $limit == 1 ) {
+					$fields = $result;
+					break;
+				}
 
-                if ( ! empty($limit) && $count >= $limit ) {
-                    break;
-                }
+				if ( ! empty($limit) && $count >= $limit ) {
+					break;
+				}
 
-                unset($result);
-            }
-            return stripslashes_deep($fields);
-        }
+				unset($result);
+			}
+			return stripslashes_deep($fields);
+		}
 
-        self::$use_cache = false;
+		self::$use_cache = false;
 
 		$where = array(
 			'fi.form_id' => (int) $form_id,
@@ -354,64 +354,64 @@ 
 		);
 		self::maybe_include_repeating_fields( $inc_sub, $where );
 		$results = self::getAll( $where, 'field_order', $limit );
-        self::$use_cache = true;
-        self::include_sub_fields($results, $inc_sub, $type);
+		self::$use_cache = true;
+		self::include_sub_fields($results, $inc_sub, $type);
 
-        return $results;
-    }
+		return $results;
+	}
 
 	public static function get_all_for_form( $form_id, $limit = '', $inc_embed = 'exclude', $inc_repeat = 'include' ) {
-        if ( ! (int) $form_id ) {
-            return array();
-        }
+		if ( ! (int) $form_id ) {
+			return array();
+		}
 
 		$results = self::get_fields_from_transients( $form_id, array(
 			'inc_embed'  => $inc_embed,
 			'inc_repeat' => $inc_repeat,
 		) );
 		if ( ! empty( $results ) ) {
-            if ( empty($limit) ) {
+			if ( empty($limit) ) {
 				return $results;
-            }
+			}
 
-            $fields = array();
-            $count = 0;
-            foreach ( $results as $result ) {
+			$fields = array();
+			$count = 0;
+			foreach ( $results as $result ) {
 				$fields[ $result->id ] = $result;
-                if ( ! empty($limit) && $count >= $limit ) {
-                    break;
-                }
-            }
+				if ( ! empty($limit) && $count >= $limit ) {
+					break;
+				}
+			}
 
 			return $fields;
-        }
+		}
 
-        self::$use_cache = false;
+		self::$use_cache = false;
 
 		$where = array( 'fi.form_id' => absint( $form_id ) );
 		self::maybe_include_repeating_fields( $inc_repeat, $where );
 		$results = self::getAll( $where, 'field_order', $limit );
 
-        self::$use_cache = true;
+		self::$use_cache = true;
 
 		self::include_sub_fields( $results, $inc_embed, 'all' );
 
-        if ( empty($limit) ) {
+		if ( empty($limit) ) {
 			self::set_field_transient( $results, $form_id, 0, array(
 				'inc_embed'  => $inc_embed,
 				'inc_repeat' => $inc_repeat,
 			) );
-        }
+		}
 
 		return $results;
-    }
+	}
 
 	/**
-	* If repeating fields should be included, adjust $where accordingly
-	*
-	* @param string $inc_repeat
-	* @param array $where - pass by reference
-	*/
+	 * If repeating fields should be included, adjust $where accordingly
+	 *
+	 * @param string $inc_repeat
+	 * @param array $where - pass by reference
+	 */
 	private static function maybe_include_repeating_fields( $inc_repeat, &$where ) {
 		if ( $inc_repeat == 'include' ) {
 			$form_id = $where['fi.form_id'];
@@ -426,57 +426,57 @@ 
 
 	public static function include_sub_fields( &$results, $inc_embed, $type = 'all' ) {
 		if ( 'include' != $inc_embed || empty( $results ) ) {
-            return;
-        }
+			return;
+		}
 
-        $form_fields = $results;
+		$form_fields = $results;
 		$index_offset = 1;
-        foreach ( $form_fields as $k => $field ) {
-            if ( 'form' != $field->type || ! isset($field->field_options['form_select']) ) {
-                continue;
-            }
-
-            if ( $type == 'all' ) {
-                $sub_fields = self::get_all_for_form( $field->field_options['form_select'] );
-            } else {
-                $sub_fields = self::get_all_types_in_form($field->form_id, $type);
-            }
-
-            if ( ! empty($sub_fields) ) {
+		foreach ( $form_fields as $k => $field ) {
+			if ( 'form' != $field->type || ! isset($field->field_options['form_select']) ) {
+				continue;
+			}
+
+			if ( $type == 'all' ) {
+				$sub_fields = self::get_all_for_form( $field->field_options['form_select'] );
+			} else {
+				$sub_fields = self::get_all_types_in_form($field->form_id, $type);
+			}
+
+			if ( ! empty($sub_fields) ) {
 				$index = $k + $index_offset;
 				$index_offset += count( $sub_fields );
 				array_splice($results, $index, 0, $sub_fields);
-            }
-            unset($field, $sub_fields);
-        }
-    }
+			}
+			unset($field, $sub_fields);
+		}
+	}
 
 	public static function getAll( $where = array(), $order_by = '', $limit = '', $blog_id = false ) {
 		$cache_key = maybe_serialize( $where ) . $order_by . 'l' . $limit . 'b' . $blog_id;
-        if ( self::$use_cache ) {
-            // make sure old cache doesn't get saved as a transient
-            $results = wp_cache_get($cache_key, 'frm_field');
-            if ( false !== $results ) {
-                return stripslashes_deep($results);
-            }
-        }
-
-        global $wpdb;
-
-        if ( $blog_id && is_multisite() ) {
-            global $wpmuBaseTablePrefix;
-            if ( $wpmuBaseTablePrefix ) {
+		if ( self::$use_cache ) {
+			// make sure old cache doesn't get saved as a transient
+			$results = wp_cache_get($cache_key, 'frm_field');
+			if ( false !== $results ) {
+				return stripslashes_deep($results);
+			}
+		}
+
+		global $wpdb;
+
+		if ( $blog_id && is_multisite() ) {
+			global $wpmuBaseTablePrefix;
+			if ( $wpmuBaseTablePrefix ) {
 				$prefix = $wpmuBaseTablePrefix . $blog_id . '_';
-            } else {
-                $prefix = $wpdb->get_blog_prefix( $blog_id );
-            }
+			} else {
+				$prefix = $wpdb->get_blog_prefix( $blog_id );
+			}
 
 			$table_name = $prefix . 'frm_fields';
 			$form_table_name = $prefix . 'frm_forms';
 		} else {
 			$table_name = $wpdb->prefix . 'frm_fields';
 			$form_table_name = $wpdb->prefix . 'frm_forms';
-        }
+		}
 
 		if ( ! empty( $order_by ) && strpos( $order_by, 'ORDER BY' ) === false ) {
 			$order_by = ' ORDER BY ' . $order_by;
@@ -484,8 +484,8 @@ 
 
 		$limit = FrmDb::esc_limit( $limit );
 
-        $query = "SELECT fi.*, fr.name as form_name  FROM {$table_name} fi LEFT OUTER JOIN {$form_table_name} fr ON fi.form_id=fr.id";
-        $query_type = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'row' : 'results';
+		$query = "SELECT fi.*, fr.name as form_name  FROM {$table_name} fi LEFT OUTER JOIN {$form_table_name} fr ON fi.form_id=fr.id";
+		$query_type = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'row' : 'results';
 
 		if ( is_array( $where ) ) {
 			$args = array(
@@ -499,8 +499,8 @@ 
 
 			$function_name = ( $query_type == 'row' ) ? 'get_row' : 'get_results';
 			$results = $wpdb->$function_name( $query );
-        }
-        unset( $where );
+		}
+		unset( $where );
 
 		self::format_field_results( $results );
 
@@ -733,8 +733,8 @@ 
 	}
 
 	/**
-	* @since 2.0.09
-	*/
+	 * @since 2.0.09
+	 */
 	public static function is_repeating_field( $field ) {
 		if ( is_array( $field ) ) {
 			$is_repeating_field = ( 'divider' == $field['type'] );
@@ -744,14 +744,14 @@ 
 		return ( $is_repeating_field && self::is_option_true( $field, 'repeat' ) );
 	}
 
-    /**
-     * @param string $key
-     * @return int field id
-     */
+	/**
+	 * @param string $key
+	 * @return int field id
+	 */
 	public static function get_id_by_key( $key ) {
-        $id = FrmDb::get_var( 'frm_fields', array( 'field_key' => sanitize_title( $key ) ) );
-        return $id;
-    }
+		$id = FrmDb::get_var( 'frm_fields', array( 'field_key' => sanitize_title( $key ) ) );
+		return $id;
+	}
 
 	/**
 	 * @param string $id

Spacing +65 added lines, -65 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -9,7 +9,7 @@ 
 	static $transient_size = 200;
 
 	public static function field_selection() {
-		$fields = apply_filters('frm_available_fields', array(
+		$fields = apply_filters( 'frm_available_fields', array(
 			'text'      => __( 'Single Line Text', 'formidable' ),
 			'textarea'  => __( 'Paragraph Text', 'formidable' ),
 			'checkbox'  => __( 'Checkboxes', 'formidable' ),
@@ -18,13 +18,13 @@ 
 			'email'     => __( 'Email Address', 'formidable' ),
 			'url'       => __( 'Website/URL', 'formidable' ),
 			'captcha'   => __( 'reCAPTCHA', 'formidable' ),
-		));
+		) );
 
 		return $fields;
 	}
 
 	public static function pro_field_selection() {
-		return apply_filters('frm_pro_available_fields', array(
+		return apply_filters( 'frm_pro_available_fields', array(
 			'end_divider' => array(
 				'name'  => __( 'End Section', 'formidable' ),
 				'switch_from' => 'divider',
@@ -49,36 +49,36 @@ 
 			'tag'       => __( 'Tags', 'formidable' ),
 			'credit_card' => __( 'Credit Card', 'formidable' ),
 			'address'   => __( 'Address', 'formidable' ),
-		));
+		) );
 	}
 
     public static function create( $values, $return = true ) {
         global $wpdb, $frm_duplicate_ids;
 
         $new_values = array();
-        $key = isset($values['field_key']) ? $values['field_key'] : $values['name'];
+        $key = isset( $values['field_key'] ) ? $values['field_key'] : $values['name'];
 		$new_values['field_key'] = FrmAppHelper::get_unique_key( $key, $wpdb->prefix . 'frm_fields', 'field_key' );
 
 		foreach ( array( 'name', 'description', 'type', 'default_value' ) as $col ) {
-			$new_values[ $col ] = $values[ $col ];
+			$new_values[$col] = $values[$col];
         }
 
         $new_values['options'] = $values['options'];
 
-        $new_values['field_order'] = isset($values['field_order']) ? (int) $values['field_order'] : null;
-        $new_values['required'] = isset($values['required']) ? (int) $values['required'] : 0;
-        $new_values['form_id'] = isset($values['form_id']) ? (int) $values['form_id'] : null;
+        $new_values['field_order'] = isset( $values['field_order'] ) ? (int) $values['field_order'] : null;
+        $new_values['required'] = isset( $values['required'] ) ? (int) $values['required'] : 0;
+        $new_values['form_id'] = isset( $values['form_id'] ) ? (int) $values['form_id'] : null;
         $new_values['field_options'] = $values['field_options'];
-        $new_values['created_at'] = current_time('mysql', 1);
+        $new_values['created_at'] = current_time( 'mysql', 1 );
 
 		if ( isset( $values['id'] ) ) {
-			$frm_duplicate_ids[ $values['field_key'] ] = $new_values['field_key'];
-            $new_values = apply_filters('frm_duplicated_field', $new_values);
+			$frm_duplicate_ids[$values['field_key']] = $new_values['field_key'];
+            $new_values = apply_filters( 'frm_duplicated_field', $new_values );
         }
 
 		foreach ( $new_values as $k => $v ) {
             if ( is_array( $v ) ) {
-				$new_values[ $k ] = serialize( $v );
+				$new_values[$k] = serialize( $v );
 			}
             unset( $k, $v );
         }
@@ -99,7 +99,7 @@ 
 
 		if ( $query_results ) {
 			if ( isset( $values['id'] ) ) {
-				$frm_duplicate_ids[ $values['id'] ] = $new_id;
+				$frm_duplicate_ids[$values['id']] = $new_id;
 			}
 			return $new_id;
 		} else {
@@ -119,8 +119,8 @@ 
 
         foreach ( (array) $fields as $field ) {
 			$new_key = $copy_keys ? $field->field_key : '';
-            if ( $copy_keys && substr($field->field_key, -1) == 2 ) {
-                $new_key = rtrim($new_key, 2);
+            if ( $copy_keys && substr( $field->field_key, -1 ) == 2 ) {
+                $new_key = rtrim( $new_key, 2 );
             }
 
             $values = array();
@@ -146,11 +146,11 @@ 
 				$values['form_id'] = $new_repeat_form_id;
 			}
 
-            $values = apply_filters('frm_duplicated_field', $values);
-            $new_id = self::create($values);
-            $frm_duplicate_ids[ $field->id ] = $new_id;
-            $frm_duplicate_ids[ $field->field_key ] = $new_id;
-            unset($field);
+            $values = apply_filters( 'frm_duplicated_field', $values );
+            $new_id = self::create( $values );
+            $frm_duplicate_ids[$field->id] = $new_id;
+            $frm_duplicate_ids[$field->field_key] = $new_id;
+            unset( $field );
         }
     }
 
@@ -163,7 +163,7 @@ 
 			$values['field_key'] = FrmAppHelper::get_unique_key( $values['field_key'], $wpdb->prefix . 'frm_fields', 'field_key', $id );
 		}
 
-        if ( isset($values['required']) ) {
+        if ( isset( $values['required'] ) ) {
             $values['required'] = (int) $values['required'];
         }
 
@@ -180,8 +180,8 @@ 
 
 		// serialize array values
 		foreach ( array( 'default_value', 'field_options', 'options' ) as $opt ) {
-			if ( isset( $values[ $opt ] ) && is_array( $values[ $opt ] ) ) {
-				$values[ $opt ] = serialize( $values[ $opt ] );
+			if ( isset( $values[$opt] ) && is_array( $values[$opt] ) ) {
+				$values[$opt] = serialize( $values[$opt] );
 			}
 		}
 
@@ -191,13 +191,13 @@ 
 		if ( isset( $values['form_id'] ) ) {
             $form_id = absint( $values['form_id'] );
 		} else {
-            $field = self::getOne($id);
+            $field = self::getOne( $id );
             if ( $field ) {
                 $form_id = $field->form_id;
             }
-            unset($field);
+            unset( $field );
         }
-        unset($values);
+        unset( $values );
 
 		if ( $query_results ) {
             wp_cache_delete( $id, 'frm_field' );
@@ -250,7 +250,7 @@ 
 
 		FrmDb::cache_delete_group( 'frm_field' );
 
-        $form = FrmForm::getOne($form_id);
+        $form = FrmForm::getOne( $form_id );
         if ( $form && $form->parent_form_id && $form->parent_form_id != $form_id ) {
             self::delete_form_transient( $form->parent_form_id );
         }
@@ -272,16 +272,16 @@ 
 
         global $wpdb;
 
-        $where = is_numeric($id) ? 'id=%d' : 'field_key=%s';
+        $where = is_numeric( $id ) ? 'id=%d' : 'field_key=%s';
 		$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->prefix . 'frm_fields WHERE ' . $where, $id );
 
         $results = FrmDb::check_cache( $id, 'frm_field', $query, 'get_row', 0 );
 
-        if ( empty($results) ) {
+        if ( empty( $results ) ) {
             return $results;
         }
 
-        if ( is_numeric($id) ) {
+        if ( is_numeric( $id ) ) {
 			FrmDb::set_cache( $results->field_key, $results, 'frm_field' );
         } else if ( $results ) {
 			FrmDb::set_cache( $results->id, $results, 'frm_field' );
@@ -289,7 +289,7 @@ 
 
 		self::prepare_options( $results );
 
-        return stripslashes_deep($results);
+        return stripslashes_deep( $results );
     }
 
     /**
@@ -330,20 +330,20 @@ 
                     continue;
                 }
 
-				$fields[ $result->id ] = $result;
-                $count++;
+				$fields[$result->id] = $result;
+                $count ++;
                 if ( $limit == 1 ) {
                     $fields = $result;
                     break;
                 }
 
-                if ( ! empty($limit) && $count >= $limit ) {
+                if ( ! empty( $limit ) && $count >= $limit ) {
                     break;
                 }
 
-                unset($result);
+                unset( $result );
             }
-            return stripslashes_deep($fields);
+            return stripslashes_deep( $fields );
         }
 
         self::$use_cache = false;
@@ -355,7 +355,7 @@ 
 		self::maybe_include_repeating_fields( $inc_sub, $where );
 		$results = self::getAll( $where, 'field_order', $limit );
         self::$use_cache = true;
-        self::include_sub_fields($results, $inc_sub, $type);
+        self::include_sub_fields( $results, $inc_sub, $type );
 
         return $results;
     }
@@ -370,15 +370,15 @@ 
 			'inc_repeat' => $inc_repeat,
 		) );
 		if ( ! empty( $results ) ) {
-            if ( empty($limit) ) {
+            if ( empty( $limit ) ) {
 				return $results;
             }
 
             $fields = array();
             $count = 0;
             foreach ( $results as $result ) {
-				$fields[ $result->id ] = $result;
-                if ( ! empty($limit) && $count >= $limit ) {
+				$fields[$result->id] = $result;
+                if ( ! empty( $limit ) && $count >= $limit ) {
                     break;
                 }
             }
@@ -396,7 +396,7 @@ 
 
 		self::include_sub_fields( $results, $inc_embed, 'all' );
 
-        if ( empty($limit) ) {
+        if ( empty( $limit ) ) {
 			self::set_field_transient( $results, $form_id, 0, array(
 				'inc_embed'  => $inc_embed,
 				'inc_repeat' => $inc_repeat,
@@ -432,22 +432,22 @@ 
         $form_fields = $results;
 		$index_offset = 1;
         foreach ( $form_fields as $k => $field ) {
-            if ( 'form' != $field->type || ! isset($field->field_options['form_select']) ) {
+            if ( 'form' != $field->type || ! isset( $field->field_options['form_select'] ) ) {
                 continue;
             }
 
             if ( $type == 'all' ) {
                 $sub_fields = self::get_all_for_form( $field->field_options['form_select'] );
             } else {
-                $sub_fields = self::get_all_types_in_form($field->form_id, $type);
+                $sub_fields = self::get_all_types_in_form( $field->form_id, $type );
             }
 
-            if ( ! empty($sub_fields) ) {
+            if ( ! empty( $sub_fields ) ) {
 				$index = $k + $index_offset;
 				$index_offset += count( $sub_fields );
-				array_splice($results, $index, 0, $sub_fields);
+				array_splice( $results, $index, 0, $sub_fields );
             }
-            unset($field, $sub_fields);
+            unset( $field, $sub_fields );
         }
     }
 
@@ -455,9 +455,9 @@ 
 		$cache_key = maybe_serialize( $where ) . $order_by . 'l' . $limit . 'b' . $blog_id;
         if ( self::$use_cache ) {
             // make sure old cache doesn't get saved as a transient
-            $results = wp_cache_get($cache_key, 'frm_field');
+            $results = wp_cache_get( $cache_key, 'frm_field' );
             if ( false !== $results ) {
-                return stripslashes_deep($results);
+                return stripslashes_deep( $results );
             }
         }
 
@@ -495,7 +495,7 @@ 
 			$results = FrmDb::get_var( $table_name . ' fi LEFT OUTER JOIN ' . $form_table_name . ' fr ON fi.form_id=fr.id', $where, 'fi.*, fr.name as form_name', $args, '', $query_type );
 		} else {
 			// if the query is not an array, then it has already been prepared
-			$query .= FrmDb::prepend_and_or_where(' WHERE ', $where ) . $order_by . $limit;
+			$query .= FrmDb::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
 			$function_name = ( $query_type == 'row' ) ? 'get_row' : 'get_results';
 			$results = $wpdb->$function_name( $query );
@@ -518,9 +518,9 @@ 
 				FrmDb::set_cache( $result->id, $result, 'frm_field' );
 				FrmDb::set_cache( $result->field_key, $result, 'frm_field' );
 
-				$results[ $r_key ]->field_options = maybe_unserialize( $result->field_options );
-				$results[ $r_key ]->options = maybe_unserialize( $result->options );
-				$results[ $r_key ]->default_value = maybe_unserialize( $result->default_value );
+				$results[$r_key]->field_options = maybe_unserialize( $result->field_options );
+				$results[$r_key]->options = maybe_unserialize( $result->options );
+				$results[$r_key]->default_value = maybe_unserialize( $result->default_value );
 
 				unset( $r_key, $result );
 			}
@@ -539,8 +539,8 @@ 
 	private static function prepare_options( &$results ) {
 		$results->field_options = maybe_unserialize( $results->field_options );
 
-		$results->options = maybe_unserialize($results->options);
-		$results->default_value = maybe_unserialize($results->default_value);
+		$results->options = maybe_unserialize( $results->options );
+		$results->default_value = maybe_unserialize( $results->default_value );
 	}
 
 	/**
@@ -567,7 +567,7 @@ 
 
 			if ( count( $next_fields ) >= self::$transient_size ) {
 				// if this transient is full, check for another
-				$next++;
+				$next ++;
 				self::get_next_transient( $fields, $base_name, $next );
 			}
 		}
@@ -593,7 +593,7 @@ 
 				return;
 			}
 
-			$next++;
+			$next ++;
 		}
 	}
 
@@ -693,23 +693,23 @@ 
 	}
 
 	public static function is_option_true_in_array( $field, $option ) {
-		return isset( $field[ $option ] ) && $field[ $option ];
+		return isset( $field[$option] ) && $field[$option];
 	}
 
 	public static function is_option_true_in_object( $field, $option ) {
-		return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ];
+		return isset( $field->field_options[$option] ) && $field->field_options[$option];
 	}
 
 	public static function is_option_empty_in_array( $field, $option ) {
-		return ! isset( $field[ $option ] ) || empty( $field[ $option ] );
+		return ! isset( $field[$option] ) || empty( $field[$option] );
 	}
 
 	public static function is_option_empty_in_object( $field, $option ) {
-		return ! isset( $field->field_options[ $option ] ) || empty( $field->field_options[ $option ] );
+		return ! isset( $field->field_options[$option] ) || empty( $field->field_options[$option] );
 	}
 
 	public static function is_option_value_in_object( $field, $option ) {
-		return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ] != '';
+		return isset( $field->field_options[$option] ) && $field->field_options[$option] != '';
 	}
 
 	/**
@@ -725,11 +725,11 @@ 
 	}
 
 	public static function get_option_in_array( $field, $option ) {
-		return isset( $field[ $option ] ) ? $field[ $option ] : '';
+		return isset( $field[$option] ) ? $field[$option] : '';
 	}
 
 	public static function get_option_in_object( $field, $option ) {
-		return isset( $field->field_options[ $option ] ) ? $field->field_options[ $option ] : '';
+		return isset( $field->field_options[$option] ) ? $field->field_options[$option] : '';
 	}
 
 	/**

classes/models/FrmDb.php

Indentation +162 added lines, -162 removed lines

@@ -1,39 +1,39 @@ 
 <?php
 
 class FrmDb {
-    public $fields;
-    public $forms;
-    public $entries;
-    public $entry_metas;
-
-    public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
-        }
+	public $fields;
+	public $forms;
+	public $entries;
+	public $entry_metas;
+
+	public function __construct() {
+		if ( ! defined('ABSPATH') ) {
+			die('You are not allowed to call this page directly.');
+		}
 
 		_deprecated_function( __METHOD__, '2.05.06', 'FrmMigrate' );
-        global $wpdb;
-        $this->fields         = $wpdb->prefix . 'frm_fields';
-        $this->forms          = $wpdb->prefix . 'frm_forms';
-        $this->entries        = $wpdb->prefix . 'frm_items';
-        $this->entry_metas    = $wpdb->prefix . 'frm_item_metas';
-    }
-
-    /**
-     * Change array into format $wpdb->prepare can use
+		global $wpdb;
+		$this->fields         = $wpdb->prefix . 'frm_fields';
+		$this->forms          = $wpdb->prefix . 'frm_forms';
+		$this->entries        = $wpdb->prefix . 'frm_items';
+		$this->entry_metas    = $wpdb->prefix . 'frm_item_metas';
+	}
+
+	/**
+	 * Change array into format $wpdb->prepare can use
 	 *
 	 * @param array $args
 	 * @param string $starts_with
-     */
-    public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
-        if ( empty($args) ) {
+	 */
+	public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
+		if ( empty($args) ) {
 			// add an arg to prevent prepare from failing
 			$args = array(
 				'where' => $starts_with . '1=%d',
 				'values' => array( 1 ),
 			);
 			return;
-        }
+		}
 
 		$where = '';
 		$values = array();
@@ -44,20 +44,20 @@ 
 		}
 
 		$args = compact( 'where', 'values' );
-    }
+	}
 
-    /**
+	/**
 	 * @param array $args
-     * @param string $base_where
-     * @param string $where
+	 * @param string $base_where
+	 * @param string $where
 	 * @param array $values
-     */
-    public static function parse_where_from_array( $args, $base_where, &$where, &$values ) {
-        $condition = ' AND';
-        if ( isset( $args['or'] ) ) {
-            $condition = ' OR';
-            unset( $args['or'] );
-        }
+	 */
+	public static function parse_where_from_array( $args, $base_where, &$where, &$values ) {
+		$condition = ' AND';
+		if ( isset( $args['or'] ) ) {
+			$condition = ' OR';
+			unset( $args['or'] );
+		}
 
 		foreach ( $args as $key => $value ) {
 			$where .= empty( $where ) ? $base_where : $condition;
@@ -84,28 +84,28 @@ 
 		}
 	}
 
-    /**
-     * @param string $key
+	/**
+	 * @param string $key
 	 * @param string|array $value
-     * @param string $where
+	 * @param string $where
 	 * @param array $values
-     */
-    private static function interpret_array_to_sql( $key, $value, &$where, &$values ) {
+	 */
+	private static function interpret_array_to_sql( $key, $value, &$where, &$values ) {
 		$key = trim( $key );
 
 		if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false ) {
-            $k = explode(' ', $key);
-            $where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
-            $values[] = '%Y-%m-%d %H:%i:%s';
-        } else {
+			$k = explode(' ', $key);
+			$where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
+			$values[] = '%Y-%m-%d %H:%i:%s';
+		} else {
 			$where .= ' ' . $key;
-        }
+		}
 
 		$lowercase_key = explode( ' ', strtolower( $key ) );
 		$lowercase_key = end( $lowercase_key );
 
-        if ( is_array( $value ) ) {
-            // translate array of values to "in"
+		if ( is_array( $value ) ) {
+			// translate array of values to "in"
 			if ( strpos( $lowercase_key, 'like' ) !== false ) {
 				$where = preg_replace('/' . $key . '$/', '', $where);
 				$where .= '(';
@@ -123,7 +123,7 @@ 
 				$where .= ' in (' . self::prepare_array_values( $value, '%s' ) . ')';
 				$values = array_merge( $values, $value );
 			}
-        } else if ( strpos( $lowercase_key, 'like' ) !== false ) {
+		} else if ( strpos( $lowercase_key, 'like' ) !== false ) {
 			/**
 			 * Allow string to start or end with the value
 			 * If the key is like% then skip the first % for starts with
@@ -143,9 +143,9 @@ 
 			$where .= ' %s';
 			$values[] = $start . self::esc_like( $value ) . $end;
 
-        } else if ( $value === null ) {
-            $where .= ' IS NULL';
-        } else {
+		} else if ( $value === null ) {
+			$where .= ' IS NULL';
+		} else {
 			// allow a - to prevent = from being added
 			if ( substr( $key, -1 ) == '-' ) {
 				$where = rtrim( $where, '-' );
@@ -155,9 +155,9 @@ 
 
 			self::add_query_placeholder( $key, $value, $where );
 
-            $values[] = $value;
-        }
-    }
+			$values[] = $value;
+		}
+	}
 
 	/**
 	 * Add %d, or %s to query
@@ -167,7 +167,7 @@ 
 	 * @param int|string $value
 	 * @param string $where
 	 */
-    private static function add_query_placeholder( $key, $value, &$where ) {
+	private static function add_query_placeholder( $key, $value, &$where ) {
 		if ( is_numeric( $value ) && ( strpos( $key, 'meta_value' ) === false || strpos( $key, '+0' ) !== false ) ) {
 			$where .= '%d';
 		} else {
@@ -175,16 +175,16 @@ 
 		}
 	}
 
-    /**
-     * @param string $table
+	/**
+	 * @param string $table
 	 * @param array $where
 	 * @param array $args
 	 * @return int
-     */
-    public static function get_count( $table, $where = array(), $args = array() ) {
-        $count = self::get_var( $table, $where, 'COUNT(*)', $args );
-        return $count;
-    }
+	 */
+	public static function get_count( $table, $where = array(), $args = array() ) {
+		$count = self::get_var( $table, $where, 'COUNT(*)', $args );
+		return $count;
+	}
 
 	/**
 	 * @param string $table
@@ -195,17 +195,17 @@ 
 	 * @param string $type
 	 * @return array|null|string|object
 	 */
-    public static function get_var( $table, $where = array(), $field = 'id', $args = array(), $limit = '', $type = 'var' ) {
-        $group = '';
-        self::get_group_and_table_name( $table, $group );
+	public static function get_var( $table, $where = array(), $field = 'id', $args = array(), $limit = '', $type = 'var' ) {
+		$group = '';
+		self::get_group_and_table_name( $table, $group );
 		self::convert_options_to_array( $args, '', $limit );
 
 		$query = self::generate_query_string_from_pieces( $field, $table, $where, $args );
 
 		$cache_key = self::generate_cache_key( $where, $args, $field, $type );
 		$results = self::check_cache( $cache_key, $group, $query, 'get_' . $type );
-        return $results;
-    }
+		return $results;
+	}
 
 	/**
 	 * Generate a cache key from the where query, field, type, and other arguments
@@ -231,44 +231,44 @@ 
 		return $cache_key;
 	}
 
-    /**
-     * @param string $table
-     * @param array $where
+	/**
+	 * @param string $table
+	 * @param array $where
 	 * @param string $field
 	 * @param array $args
 	 * @param string $limit
 	 * @return mixed
-     */
-    public static function get_col( $table, $where = array(), $field = 'id', $args = array(), $limit = '' ) {
-        return self::get_var( $table, $where, $field, $args, $limit, 'col' );
-    }
-
-    /**
-     * @since 2.0
-     * @param string $table
+	 */
+	public static function get_col( $table, $where = array(), $field = 'id', $args = array(), $limit = '' ) {
+		return self::get_var( $table, $where, $field, $args, $limit, 'col' );
+	}
+
+	/**
+	 * @since 2.0
+	 * @param string $table
 	 * @param array $where
 	 * @param string $fields
 	 * @param array $args
 	 * @return mixed
-     */
-    public static function get_row( $table, $where = array(), $fields = '*', $args = array() ) {
-        $args['limit'] = 1;
-        return self::get_var( $table, $where, $fields, $args, '', 'row' );
-    }
-
-    /**
-     * Prepare a key/value array before DB call
+	 */
+	public static function get_row( $table, $where = array(), $fields = '*', $args = array() ) {
+		$args['limit'] = 1;
+		return self::get_var( $table, $where, $fields, $args, '', 'row' );
+	}
+
+	/**
+	 * Prepare a key/value array before DB call
 	 *
-     * @since 2.0
-     * @param string $table
+	 * @since 2.0
+	 * @param string $table
 	 * @param array $where
 	 * @param string $fields
 	 * @param array $args
 	 * @return mixed
-     */
-    public static function get_results( $table, $where = array(), $fields = '*', $args = array() ) {
-        return self::get_var( $table, $where, $fields, $args, '', 'results' );
-    }
+	 */
+	public static function get_results( $table, $where = array(), $fields = '*', $args = array() ) {
+		return self::get_var( $table, $where, $fields, $args, '', 'results' );
+	}
 
 	/**
 	 * Check for like, not like, in, not in, =, !=, >, <, <=, >=
@@ -305,56 +305,56 @@ 
 		return '';
 	}
 
-    /**
-     * Get 'frm_forms' from wp_frm_forms or a longer table param that includes a join
-     * Also add the wpdb->prefix to the table if it's missing
-     *
-     * @param string $table
-     * @param string $group
-     */
-    private static function get_group_and_table_name( &$table, &$group ) {
+	/**
+	 * Get 'frm_forms' from wp_frm_forms or a longer table param that includes a join
+	 * Also add the wpdb->prefix to the table if it's missing
+	 *
+	 * @param string $table
+	 * @param string $group
+	 */
+	private static function get_group_and_table_name( &$table, &$group ) {
 		global $wpdb, $wpmuBaseTablePrefix;
 
-        $table_parts = explode(' ', $table);
-        $group = reset($table_parts);
-        $group = str_replace( $wpdb->prefix, '', $group );
+		$table_parts = explode(' ', $table);
+		$group = reset($table_parts);
+		$group = str_replace( $wpdb->prefix, '', $group );
 
 		$prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix : $wpdb->base_prefix;
 		$group = str_replace( $prefix, '', $group );
 
-        if ( $group == $table ) {
-            $table = $wpdb->prefix . $table;
-        }
+		if ( $group == $table ) {
+			$table = $wpdb->prefix . $table;
+		}
 
 		// switch to singular group name
 		$group = rtrim( $group, 's' );
-    }
+	}
 
-    private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
-        if ( ! is_array($args) ) {
+	private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
+		if ( ! is_array($args) ) {
 			$args = array( 'order_by' => $args );
-        }
+		}
 
-        if ( ! empty( $order_by ) ) {
-            $args['order_by'] = $order_by;
-        }
+		if ( ! empty( $order_by ) ) {
+			$args['order_by'] = $order_by;
+		}
 
-        if ( ! empty( $limit ) ) {
-            $args['limit'] = $limit;
-        }
+		if ( ! empty( $limit ) ) {
+			$args['limit'] = $limit;
+		}
 
-        $temp_args = $args;
-        foreach ( $temp_args as $k => $v ) {
-            if ( $v == '' ) {
+		$temp_args = $args;
+		foreach ( $temp_args as $k => $v ) {
+			if ( $v == '' ) {
 				unset( $args[ $k ] );
-                continue;
-            }
+				continue;
+			}
 
-            $db_name = strtoupper( str_replace( '_', ' ', $k ) );
-            if ( strpos( $v, $db_name ) === false ) {
+			$db_name = strtoupper( str_replace( '_', ' ', $k ) );
+			if ( strpos( $v, $db_name ) === false ) {
 				$args[ $k ] = $db_name . ' ' . $v;
-            }
-        }
+			}
+		}
 
 		// Make sure LIMIT is the last argument
 		if ( isset( $args['order_by'] ) && isset( $args['limit'] ) ) {
@@ -362,7 +362,7 @@ 
 			unset( $args['limit'] );
 			$args['limit'] = $temp_limit;
 		}
-    }
+	}
 
 	/**
 	 * Get the associative array results for the given columns, table, and where query
@@ -434,25 +434,25 @@ 
 		}
 	}
 
-    /**
-     * Added for < WP 4.0 compatability
-     *
-     * @since 2.05.06
-     *
-     * @param string $term The value to escape
-     * @return string The escaped value
-     */
+	/**
+	 * Added for < WP 4.0 compatability
+	 *
+	 * @since 2.05.06
+	 *
+	 * @param string $term The value to escape
+	 * @return string The escaped value
+	 */
 	public static function esc_like( $term ) {
-        global $wpdb;
-        if ( method_exists( $wpdb, 'esc_like' ) ) {
+		global $wpdb;
+		if ( method_exists( $wpdb, 'esc_like' ) ) {
 			// WP 4.0
-            $term = $wpdb->esc_like( $term );
-        } else {
-            $term = like_escape( $term );
-        }
+			$term = $wpdb->esc_like( $term );
+		} else {
+			$term = like_escape( $term );
+		}
 
-        return $term;
-    }
+		return $term;
+	}
 
 	/**
 	 * @since 2.05.06
@@ -522,10 +522,10 @@ 
 		return ' LIMIT ' . $limit;
 	}
 
-    /**
-     * Get an array of values ready to go through $wpdb->prepare
-     * @since 2.05.06
-     */
+	/**
+	 * Get an array of values ready to go through $wpdb->prepare
+	 * @since 2.05.06
+	 */
 	public static function prepare_array_values( $array, $type = '%s' ) {
 		$placeholders = array_fill( 0, count( $array ), $type );
 		return implode( ', ', $placeholders );
@@ -596,17 +596,17 @@ 
 		return $post;
 	}
 
-    /**
-     * Check cache before fetching values and saving to cache
-     *
-     * @since 2.05.06
-     *
-     * @param string $cache_key The unique name for this cache
-     * @param string $group The name of the cache group
-     * @param string $query If blank, don't run a db call
-     * @param string $type The wpdb function to use with this query
-     * @return mixed $results The cache or query results
-     */
+	/**
+	 * Check cache before fetching values and saving to cache
+	 *
+	 * @since 2.05.06
+	 *
+	 * @param string $cache_key The unique name for this cache
+	 * @param string $group The name of the cache group
+	 * @param string $query If blank, don't run a db call
+	 * @param string $type The wpdb function to use with this query
+	 * @return mixed $results The cache or query results
+	 */
 	public static function check_cache( $cache_key, $group = '', $query = '', $type = 'get_var', $time = 300 ) {
 		$results = wp_cache_get( $cache_key, $group );
 		if ( ! FrmAppHelper::is_empty_value( $results, false ) || empty( $query ) ) {
@@ -670,13 +670,13 @@ 
 		wp_cache_delete( $cache_key, $group );
 	}
 
-    /**
-     * Delete all caching in a single group
-     *
-     * @since 2.05.06
-     *
-     * @param string $group The name of the cache group
-     */
+	/**
+	 * Delete all caching in a single group
+	 *
+	 * @since 2.05.06
+	 *
+	 * @param string $group The name of the cache group
+	 */
 	public static function cache_delete_group( $group ) {
 		$cached_keys = self::get_group_cached_keys( $group );
 

Spacing +18 added lines, -18 removed lines

@@ -7,8 +7,8 @@ 
     public $entry_metas;
 
     public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
+        if ( ! defined( 'ABSPATH' ) ) {
+            die( 'You are not allowed to call this page directly.' );
         }
 
 		_deprecated_function( __METHOD__, '2.05.06', 'FrmMigrate' );
@@ -26,7 +26,7 @@ 
 	 * @param string $starts_with
      */
     public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
-        if ( empty($args) ) {
+        if ( empty( $args ) ) {
 			// add an arg to prevent prepare from failing
 			$args = array(
 				'where' => $starts_with . '1=%d',
@@ -94,7 +94,7 @@ 
 		$key = trim( $key );
 
 		if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false ) {
-            $k = explode(' ', $key);
+            $k = explode( ' ', $key );
             $where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
             $values[] = '%Y-%m-%d %H:%i:%s';
         } else {
@@ -107,7 +107,7 @@ 
         if ( is_array( $value ) ) {
             // translate array of values to "in"
 			if ( strpos( $lowercase_key, 'like' ) !== false ) {
-				$where = preg_replace('/' . $key . '$/', '', $where);
+				$where = preg_replace( '/' . $key . '$/', '', $where );
 				$where .= '(';
 				$start = true;
 				foreach ( $value as $v ) {
@@ -292,8 +292,8 @@ 
 		);
 
 		$where_is = strtolower( $where_is );
-		if ( isset( $switch_to[ $where_is ] ) ) {
-			return ' ' . $switch_to[ $where_is ];
+		if ( isset( $switch_to[$where_is] ) ) {
+			return ' ' . $switch_to[$where_is];
 		}
 
 		// > and < need a little more work since we don't want them switched to >= and <=
@@ -315,8 +315,8 @@ 
     private static function get_group_and_table_name( &$table, &$group ) {
 		global $wpdb, $wpmuBaseTablePrefix;
 
-        $table_parts = explode(' ', $table);
-        $group = reset($table_parts);
+        $table_parts = explode( ' ', $table );
+        $group = reset( $table_parts );
         $group = str_replace( $wpdb->prefix, '', $group );
 
 		$prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix : $wpdb->base_prefix;
@@ -331,7 +331,7 @@ 
     }
 
     private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
-        if ( ! is_array($args) ) {
+        if ( ! is_array( $args ) ) {
 			$args = array( 'order_by' => $args );
         }
 
@@ -346,13 +346,13 @@ 
         $temp_args = $args;
         foreach ( $temp_args as $k => $v ) {
             if ( $v == '' ) {
-				unset( $args[ $k ] );
+				unset( $args[$k] );
                 continue;
             }
 
             $db_name = strtoupper( str_replace( '_', ' ', $k ) );
             if ( strpos( $v, $db_name ) === false ) {
-				$args[ $k ] = $db_name . ' ' . $v;
+				$args[$k] = $db_name . ' ' . $v;
             }
         }
 
@@ -423,13 +423,13 @@ 
 	private static function esc_query_args( &$args ) {
 		foreach ( $args as $param => $value ) {
 			if ( $param == 'order_by' ) {
-				$args[ $param ] = self::esc_order( $value );
+				$args[$param] = self::esc_order( $value );
 			} elseif ( $param == 'limit' ) {
-				$args[ $param ] = self::esc_limit( $value );
+				$args[$param] = self::esc_limit( $value );
 			}
 
-			if ( $args[ $param ] == '' ) {
-				unset( $args[ $param ] );
+			if ( $args[$param] == '' ) {
+				unset( $args[$param] );
 			}
 		}
 	}
@@ -514,7 +514,7 @@ 
 		$limit = explode( ',', trim( $limit ) );
 		foreach ( $limit as $k => $l ) {
 			if ( is_numeric( $l ) ) {
-				$limit[ $k ] = $l;
+				$limit[$k] = $l;
 			}
 		}
 
@@ -645,7 +645,7 @@ 
 	 */
 	public static function add_key_to_group_cache( $key, $group ) {
 		$cached = self::get_group_cached_keys( $group );
-		$cached[ $key ] = $key;
+		$cached[$key] = $key;
 		wp_cache_set( 'cached_keys', $cached, $group, 300 );
 	}
 

classes/models/FrmEntryValues.php

Spacing +5 added lines, -5 removed lines

@@ -154,12 +154,12 @@ 
 	 * @return array
 	 */
 	private function prepare_array_property( $index, $atts ) {
-		if ( isset( $atts[ $index ] ) && ! empty( $atts[ $index ] ) ) {
+		if ( isset( $atts[$index] ) && ! empty( $atts[$index] ) ) {
 
-			if ( is_array( $atts[ $index ] ) ) {
-				$property = $atts[ $index ];
+			if ( is_array( $atts[$index] ) ) {
+				$property = $atts[$index];
 			} else {
-				$property = explode( ',', $atts[ $index ] );
+				$property = explode( ',', $atts[$index] );
 			}
 		} else {
 			$property = array();
@@ -292,6 +292,6 @@ 
 	 * @param stdClass $field
 	 */
 	protected function add_field_values( $field ) {
-		$this->field_values[ $field->id ] = new FrmFieldValue( $field, $this->entry, array( 'source' => $this->source ) );
+		$this->field_values[$field->id] = new FrmFieldValue( $field, $this->entry, array( 'source' => $this->source ) );
 	}
 }