Strategy11 / formidable-forms

classes/models/FrmUsage.php

Doc Comments +2 added lines

@@ -147,6 +147,7 @@ 
 	 * Include the permissions settings for each capability.
 	 *
 	 * @since 3.06.04
+	 * @param FrmSettings $settings_list
 	 * @return array
 	 */
 	private function messages( $settings_list ) {
@@ -173,6 +174,7 @@ 
 	 * Include the permissions settings for each capability.
 	 *
 	 * @since 3.06.04
+	 * @param FrmSettings $settings_list
 	 * @return array
 	 */
 	private function permissions( $settings_list ) {

Indentation +2 added lines, -2 removed lines

@@ -177,9 +177,9 @@
 	 */
 	private function permissions( $settings_list ) {
 		$permissions = array();
-        $frm_roles   = FrmAppHelper::frm_capabilities();
+		$frm_roles   = FrmAppHelper::frm_capabilities();
 
-        foreach ( $frm_roles as $frm_role => $frm_role_description ) {
+		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
 			if ( isset( $settings_list->$frm_role ) ) {
 				$permissions[ $frm_role ] = $settings_list->$frm_role;
 			}

Spacing +11 added lines, -11 removed lines

@@ -113,8 +113,8 @@ 
 	 * @return array
 	 */
 	private function settings() {
-		$settings_list  = FrmAppHelper::get_settings();
-		$settings      = array(
+		$settings_list = FrmAppHelper::get_settings();
+		$settings = array(
 			'messages'    => $this->messages( $settings_list ),
 			'permissions' => $this->permissions( $settings_list ),
 		);
@@ -136,7 +136,7 @@ 
 		
 		foreach ( $pass_settings as $setting ) {
 			if ( isset( $settings_list->$setting ) ) {
-				$settings[ $setting ] = $settings_list->$setting;
+				$settings[$setting] = $settings_list->$setting;
 			}
 		}
 
@@ -163,7 +163,7 @@ 
 
 		$message_settings = array();
 		foreach ( $messages as $message ) {
-			$message_settings[ $message ] = $settings_list->$message;
+			$message_settings[$message] = $settings_list->$message;
 		}
 
 		return $message_settings;
@@ -177,11 +177,11 @@ 
 	 */
 	private function permissions( $settings_list ) {
 		$permissions = array();
-        $frm_roles   = FrmAppHelper::frm_capabilities();
+        $frm_roles = FrmAppHelper::frm_capabilities();
 
         foreach ( $frm_roles as $frm_role => $frm_role_description ) {
 			if ( isset( $settings_list->$frm_role ) ) {
-				$permissions[ $frm_role ] = $settings_list->$frm_role;
+				$permissions[$frm_role] = $settings_list->$frm_role;
 			}
 		}
 
@@ -236,7 +236,7 @@ 
 		);
 
 		foreach ( $saved_forms as $form ) {
-			$forms[ $form->id ] = array(
+			$forms[$form->id] = array(
 				'id'          => $form->id,
 				'description' => $form->description,
 				'logged_in'   => $form->logged_in,
@@ -248,8 +248,8 @@ 
 			);
 
 			foreach ( $settings as $setting ) {
-				if ( isset( $form->options[ $setting ] ) ) {
-					$forms[ $form->id ][ $setting ] = $form->options[ $setting ];
+				if ( isset( $form->options[$setting] ) ) {
+					$forms[$form->id][$setting] = $form->options[$setting];
 				}
 			}
 		}
@@ -297,7 +297,7 @@ 
 	 * @return array
 	 */
 	private function fields() {
-		$args   = array(
+		$args = array(
 			'limit'    => 100,
 			'order_by' => 'id DESC',
 		);
@@ -319,7 +319,7 @@ 
 
 		$saved_actions = FrmDb::check_cache( serialize( $args ), 'frm_actions', $args, 'get_posts' );
 		foreach ( $saved_actions as $action ) {
-			$actions[ $action->ID ] = array(
+			$actions[$action->ID] = array(
 				'form_id'  => $action->menu_order,
 				'type'     => $action->post_excerpt,
 				'status'   => $action->post_status,

classes/models/FrmForm.php

Indentation +221 added lines, -221 removed lines

@@ -1,15 +1,15 @@ 
 <?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(
 			'form_key'      => FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key' ),
@@ -33,52 +33,52 @@ 
 		$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,
+			'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,
-        );
+			'is_template'   => $template ? 1 : 0,
+		);
 
-        if ( $blog_id ) {
-            $new_values['status'] = 'published';
+		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;
-        }
+			$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'] );
@@ -86,20 +86,20 @@ 
 
 		$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;
+			$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'] );
@@ -111,48 +111,48 @@ 
 
 		$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'] ) ) {
 			$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 );
 
-        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;
-        }
+			}
+		} else {
+			$query_results = true;
+		}
 		unset( $new_values );
 
 		$values = self::update_fields( $id, $values );
@@ -160,16 +160,16 @@ 
 		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;
-        }
+			return $new_values;
+		}
 
 		$options = isset( $values['options'] ) ? (array) $values['options'] : array();
 		FrmFormsHelper::fill_form_options( $options, $values );
@@ -183,17 +183,17 @@ 
 		$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;
-        }
+			return $values;
+		}
 
 		$all_fields = FrmField::get_all_for_form( $id );
 		if ( empty( $all_fields ) ) {
@@ -204,26 +204,26 @@ 
 			$values['item_meta'] = array();
 		}
 
-        $field_array = array();
-        $existing_keys = array_keys( $values['item_meta'] );
-        foreach ( $all_fields as $fid ) {
+		$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 );
 
-        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 {
+			} 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 ) {
@@ -242,7 +242,7 @@ 
 			foreach ( $update_options as $opt => $default ) {
 				$field->field_options[ $opt ] = isset( $values['field_options'][ $opt . '_' . $field_id ] ) ? $values['field_options'][ $opt . '_' . $field_id ] : $default;
 				self::sanitize_field_opt( $opt, $field->field_options[ $opt ] );
-            }
+			}
 
 			$field->field_options = apply_filters( 'frm_update_field_options', $field->field_options, $field, $values );
 			$default_value = maybe_serialize( $values['item_meta'][ $field_id ] );
@@ -257,11 +257,11 @@ 
 			FrmField::update( $field_id, $new_field );
 
 			FrmField::delete_form_transient( $field->form_id );
-        }
+		}
 		self::clear_form_cache();
 
-        return $values;
-    }
+		return $values;
+	}
 
 	private static function sanitize_field_opt( $opt, &$value ) {
 		if ( is_string( $value ) ) {
@@ -328,21 +328,21 @@ 
 		return apply_filters( 'frm_form_strings', $strings, $form );
 	}
 
-    /**
-     * @param string $status
-     * @return int|boolean
-     */
+	/**
+	 * @param string $status
+	 * @return int|boolean
+	 */
 	public static function set_status( $id, $status ) {
-        if ( 'trash' == $status ) {
+		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 ) ) {
 			$where = array(
@@ -354,33 +354,33 @@ 
 			array_unshift( $where['values'], $status );
 
 			$query_results = $wpdb->query( $wpdb->prepare( 'UPDATE ' . $wpdb->prefix . 'frm_forms SET status = %s ' . $where['where'], $where['values'] ) ); // WPCS: unprepared SQL ok.
-        } 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;
-        }
+		if ( ! $form ) {
+			return false;
+		}
 
-        $options = $form->options;
-        $options['trash_time'] = time();
+		$options = $form->options;
+		$options['trash_time'] = time();
 
 		global $wpdb;
 		$query_results = $wpdb->update(
@@ -405,39 +405,39 @@ 
 			)
 		);
 
-        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;
-        }
+		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 );
 		}
 
-        // 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' );
+		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
@@ -445,10 +445,10 @@ 
 
 			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
@@ -481,48 +481,48 @@ 
 		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 ) {
+		if ( $form ) {
 			$r = stripslashes( $form->name );
-            return $r;
-        }
+			return $r;
+		}
 
-        $query_key = is_numeric( $id ) ? 'id' : 'form_key';
-        $r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' );
+		$query_key = is_numeric( $id ) ? 'id' : 'form_key';
+		$r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' );
 		$r = stripslashes( $r );
 
-        return $r;
-    }
+		return $r;
+	}
 
-    /**
+	/**
 	 * @since 3.0
-     * @param string $key
-     * @return int form id
-     */
+	 * @param string $key
+	 * @return int form id
+	 */
 	public static function get_id_by_key( $key ) {
 		return (int) FrmDb::get_var( 'frm_forms', array( 'form_key' => sanitize_title( $key ) ) );
-    }
+	}
 
-    /**
+	/**
 	 * @since 3.0
-     * @param int $id
-     * @return string form key
-     */
+	 * @param int $id
+	 * @return string form key
+	 */
 	public static function get_key_by_id( $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
@@ -536,47 +536,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 ( $cache ) {
 				if ( isset( $cache->options ) ) {
 					$cache->options = maybe_unserialize( $cache->options );
-                }
+				}
 
 				return stripslashes_deep( $cache );
-            }
-        }
+			}
+		}
 
 		if ( is_numeric( $id ) ) {
-            $where = array( 'id' => $id );
-        } else {
-            $where = array( 'form_key' => $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 ) ) {
 			FrmDb::set_cache( $results->id, $results, 'frm_form' );
 			$results->options = maybe_unserialize( $results->options );
-        }
+		}
 		return stripslashes_deep( $results );
-    }
+	}
 
-    /**
-     * @return object|array of objects
-     */
+	/**
+	 * @return object|array of objects
+	 */
 	public static function getAll( $where = array(), $order_by = '', $limit = '' ) {
 		if ( is_array( $where ) && ! empty( $where ) ) {
 			if ( isset( $where['is_template'] ) && $where['is_template'] && ! isset( $where['status'] ) ) {
@@ -606,7 +606,7 @@ 
 		}
 
 		return stripslashes_deep( $results );
-    }
+	}
 
 	/**
 	 * Get all published forms
@@ -625,18 +625,18 @@ 
 		return $forms;
 	}
 
-    /**
-     * @return object count of forms
-     */
-    public static function get_count() {
-    	global $wpdb;
+	/**
+	 * @return object 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',
@@ -649,31 +649,31 @@ 
 		);
 
 		$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 );
-    	}
+		}
 
-    	$counts = (object) $counts;
+		$counts = (object) $counts;
 		FrmDb::set_cache( $cache_key, $counts, 'frm_form' );
 
-    	return $counts;
-    }
+		return $counts;
+	}
 
 	/**
 	 * Clear form caching
@@ -686,14 +686,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 );
-    }
+	}
 
 	public static function get_params( $form = null ) {
 		global $frm_vars;

classes/models/FrmSettings.php

Indentation +111 added lines, -111 removed lines

@@ -1,33 +1,33 @@ 
 <?php
 
 class FrmSettings {
-    public $option_name = 'frm_options';
-    public $menu;
-    public $mu_menu;
-    public $use_html;
-    public $jquery_css;
-    public $accordion_js;
+	public $option_name = 'frm_options';
+	public $menu;
+	public $mu_menu;
+	public $use_html;
+	public $jquery_css;
+	public $accordion_js;
 	public $fade_form;
 	public $old_css;
 
-    public $success_msg;
-    public $blank_msg;
-    public $unique_msg;
-    public $invalid_msg;
-    public $failed_msg;
-    public $submit_value;
-    public $login_msg;
-    public $admin_permission;
-
-    public $email_to;
-    public $load_style;
-    public $custom_style;
-
-    public $pubkey;
-    public $privkey;
-    public $re_lang;
+	public $success_msg;
+	public $blank_msg;
+	public $unique_msg;
+	public $invalid_msg;
+	public $failed_msg;
+	public $submit_value;
+	public $login_msg;
+	public $admin_permission;
+
+	public $email_to;
+	public $load_style;
+	public $custom_style;
+
+	public $pubkey;
+	public $privkey;
+	public $re_lang;
 	public $re_type;
-    public $re_msg;
+	public $re_msg;
 	public $re_multi;
 
 	public $no_ips;
@@ -45,20 +45,20 @@ 
 			$settings = $this->translate_settings( $settings );
 		}
 
-        foreach ( $settings as $setting_name => $setting ) {
-            $this->{$setting_name} = $setting;
+		foreach ( $settings as $setting_name => $setting ) {
+			$this->{$setting_name} = $setting;
 			unset( $setting_name, $setting );
-        }
+		}
 
-        $this->set_default_options();
+		$this->set_default_options();
 
 		$this->maybe_filter_for_form( $args );
-    }
+	}
 
 	private function translate_settings( $settings ) {
-        if ( $settings ) { //workaround for W3 total cache conflict
+		if ( $settings ) { //workaround for W3 total cache conflict
 			return unserialize( serialize( $settings ) );
-        }
+		}
 
 		$settings = get_option( $this->option_name );
 		if ( is_object( $settings ) ) {
@@ -66,98 +66,98 @@ 
 			return $settings;
 		}
 
-        // If unserializing didn't work
-        if ( $settings ) { //workaround for W3 total cache conflict
+		// If unserializing didn't work
+		if ( $settings ) { //workaround for W3 total cache conflict
 			$settings = unserialize( serialize( $settings ) );
-        } else {
-            $settings = $this;
-        }
+		} else {
+			$settings = $this;
+		}
 
 		update_option( $this->option_name, $settings );
 		set_transient( $this->option_name, $settings );
 
-        return $settings;
-    }
+		return $settings;
+	}
 
-    /**
-     * @return array
-     */
+	/**
+	 * @return array
+	 */
 	public function default_options() {
-        return array(
-            'menu'      => apply_filters( 'frm_default_menu', 'Formidable' ),
-            'mu_menu'   => 0,
-            'use_html'  => true,
-            'jquery_css' => false,
-            'accordion_js' => false,
+		return array(
+			'menu'      => apply_filters( 'frm_default_menu', 'Formidable' ),
+			'mu_menu'   => 0,
+			'use_html'  => true,
+			'jquery_css' => false,
+			'accordion_js' => false,
 			'fade_form' => false,
 			'old_css'   => true,
 
 			're_multi'  => 0,
 
-            'success_msg' => __( 'Your responses were successfully submitted. Thank you!', 'formidable' ),
-            'blank_msg' => __( 'This field cannot be blank.', 'formidable' ),
-            'unique_msg' => __( 'This value must be unique.', 'formidable' ),
-            'invalid_msg' => __( 'There was a problem with your submission. Errors are marked below.', 'formidable' ),
-            'failed_msg' => __( 'We\'re sorry. It looks like you\'ve already submitted that.', 'formidable' ),
-            'submit_value' => __( 'Submit', 'formidable' ),
-            'login_msg' => __( 'You do not have permission to view this form.', 'formidable' ),
-            'admin_permission' => __( 'You do not have permission to do that', 'formidable' ),
+			'success_msg' => __( 'Your responses were successfully submitted. Thank you!', 'formidable' ),
+			'blank_msg' => __( 'This field cannot be blank.', 'formidable' ),
+			'unique_msg' => __( 'This value must be unique.', 'formidable' ),
+			'invalid_msg' => __( 'There was a problem with your submission. Errors are marked below.', 'formidable' ),
+			'failed_msg' => __( 'We\'re sorry. It looks like you\'ve already submitted that.', 'formidable' ),
+			'submit_value' => __( 'Submit', 'formidable' ),
+			'login_msg' => __( 'You do not have permission to view this form.', 'formidable' ),
+			'admin_permission' => __( 'You do not have permission to do that', 'formidable' ),
 
-            'email_to' => '[admin_email]',
+			'email_to' => '[admin_email]',
 			'no_ips'   => 0,
 			'tracking' => FrmAppHelper::pro_is_installed(),
-        );
-    }
+		);
+	}
 
 	private function set_default_options() {
-        $this->fill_recaptcha_settings();
+		$this->fill_recaptcha_settings();
 
 		if ( ! isset( $this->load_style ) ) {
 			if ( ! isset( $this->custom_style ) ) {
-                $this->custom_style = true;
-            }
+				$this->custom_style = true;
+			}
 
-            $this->load_style = 'all';
-        }
+			$this->load_style = 'all';
+		}
 
-        $this->fill_with_defaults();
+		$this->fill_with_defaults();
 
-        if ( is_multisite() && is_admin() ) {
+		if ( is_multisite() && is_admin() ) {
 			$mu_menu = get_site_option( 'frm_admin_menu_name' );
 			if ( $mu_menu && ! empty( $mu_menu ) ) {
-                $this->menu = $mu_menu;
-                $this->mu_menu = 1;
-            }
-        }
+				$this->menu = $mu_menu;
+				$this->mu_menu = 1;
+			}
+		}
 
 		$frm_roles = FrmAppHelper::frm_capabilities( 'pro' );
 		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
 			if ( ! isset( $this->$frm_role ) ) {
-                $this->$frm_role = 'administrator';
-            }
-        }
-    }
+				$this->$frm_role = 'administrator';
+			}
+		}
+	}
 
 	public function fill_with_defaults( $params = array() ) {
-        $settings = $this->default_options();
+		$settings = $this->default_options();
 
-        foreach ( $settings as $setting => $default ) {
+		foreach ( $settings as $setting => $default ) {
 			if ( isset( $params[ 'frm_' . $setting ] ) ) {
 				$this->{$setting} = $params[ 'frm_' . $setting ];
 			} elseif ( ! isset( $this->{$setting} ) ) {
-                $this->{$setting} = $default;
-            }
+				$this->{$setting} = $default;
+			}
 
 			if ( $setting == 'menu' && empty( $this->{$setting} ) ) {
 				$this->{$setting} = $default;
 			}
 
 			unset( $setting, $default );
-        }
-    }
+		}
+	}
 
-    private function fill_recaptcha_settings() {
-        $privkey = '';
+	private function fill_recaptcha_settings() {
+		$privkey = '';
 		$re_lang = '';
 
 		if ( ! isset( $this->pubkey ) ) {
@@ -169,21 +169,21 @@ 
 		}
 
 		if ( ! isset( $this->re_msg ) || empty( $this->re_msg ) ) {
-            $this->re_msg = __( 'The reCAPTCHA was not entered correctly', 'formidable' );
-        }
+			$this->re_msg = __( 'The reCAPTCHA was not entered correctly', 'formidable' );
+		}
 
 		if ( ! isset( $this->privkey ) ) {
-            $this->privkey = $privkey;
-        }
+			$this->privkey = $privkey;
+		}
 
 		if ( ! isset( $this->re_lang ) ) {
-            $this->re_lang = $re_lang;
-        }
+			$this->re_lang = $re_lang;
+		}
 
 		if ( ! isset( $this->re_type ) ) {
 			$this->re_type = '';
 		}
-    }
+	}
 
 	/**
 	 * Get values that may be shown on the front-end without an override in the form settings.
@@ -213,9 +213,9 @@ 
 		}
 	}
 
-    public function validate( $params, $errors ) {
-        return apply_filters( 'frm_validate_settings', $errors, $params );
-    }
+	public function validate( $params, $errors ) {
+		return apply_filters( 'frm_validate_settings', $errors, $params );
+	}
 
 	public function update( $params ) {
 		$this->fill_with_defaults( $params );
@@ -229,51 +229,51 @@ 
 
 		$this->update_roles( $params );
 
-        do_action( 'frm_update_settings', $params );
+		do_action( 'frm_update_settings', $params );
 
 		if ( function_exists( 'get_filesystem_method' ) ) {
 			// save styling settings in case fallback setting changes
 			$frm_style = new FrmStyle();
 			$frm_style->update( 'default' );
 		}
-    }
+	}
 
 	private function update_settings( $params ) {
 		$this->pubkey = trim( $params['frm_pubkey'] );
-        $this->privkey = $params['frm_privkey'];
+		$this->privkey = $params['frm_privkey'];
 		$this->re_type = $params['frm_re_type'];
-        $this->re_lang = $params['frm_re_lang'];
+		$this->re_lang = $params['frm_re_lang'];
 
-        $this->load_style = $params['frm_load_style'];
+		$this->load_style = $params['frm_load_style'];
 
 		$checkboxes = array( 'mu_menu', 're_multi', 'use_html', 'jquery_css', 'accordion_js', 'fade_form', 'old_css', 'no_ips', 'tracking' );
 		foreach ( $checkboxes as $set ) {
 			$this->$set = isset( $params[ 'frm_' . $set ] ) ? $params[ 'frm_' . $set ] : 0;
 		}
-    }
+	}
 
 	private function update_roles( $params ) {
-        global $wp_roles;
+		global $wp_roles;
 
-        $frm_roles = FrmAppHelper::frm_capabilities();
-        $roles = get_editable_roles();
-        foreach ( $frm_roles as $frm_role => $frm_role_description ) {
-            $this->$frm_role = (array) ( isset( $params[ $frm_role ] ) ? $params[ $frm_role ] : 'administrator' );
+		$frm_roles = FrmAppHelper::frm_capabilities();
+		$roles = get_editable_roles();
+		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
+			$this->$frm_role = (array) ( isset( $params[ $frm_role ] ) ? $params[ $frm_role ] : 'administrator' );
 
-            // Make sure administrators always have permissions
-            if ( ! in_array( 'administrator', $this->$frm_role ) ) {
+			// Make sure administrators always have permissions
+			if ( ! in_array( 'administrator', $this->$frm_role ) ) {
 				array_push( $this->$frm_role, 'administrator' );
-            }
+			}
 
-            foreach ( $roles as $role => $details ) {
+			foreach ( $roles as $role => $details ) {
 				if ( in_array( $role, $this->$frm_role ) ) {
-    			    $wp_roles->add_cap( $role, $frm_role );
-    			} else {
-    			    $wp_roles->remove_cap( $role, $frm_role );
-    			}
-    		}
+					$wp_roles->add_cap( $role, $frm_role );
+				} else {
+					$wp_roles->remove_cap( $role, $frm_role );
+				}
+			}
 		}
-    }
+	}
 
 	public function store() {
 		// Save the posted value in the database

Spacing +4 added lines, -4 removed lines

@@ -142,8 +142,8 @@ 
         $settings = $this->default_options();
 
         foreach ( $settings as $setting => $default ) {
-			if ( isset( $params[ 'frm_' . $setting ] ) ) {
-				$this->{$setting} = $params[ 'frm_' . $setting ];
+			if ( isset( $params['frm_' . $setting] ) ) {
+				$this->{$setting} = $params['frm_' . $setting];
 			} elseif ( ! isset( $this->{$setting} ) ) {
                 $this->{$setting} = $default;
             }
@@ -248,7 +248,7 @@ 
 
 		$checkboxes = array( 'mu_menu', 're_multi', 'use_html', 'jquery_css', 'accordion_js', 'fade_form', 'old_css', 'no_ips', 'tracking' );
 		foreach ( $checkboxes as $set ) {
-			$this->$set = isset( $params[ 'frm_' . $set ] ) ? $params[ 'frm_' . $set ] : 0;
+			$this->$set = isset( $params['frm_' . $set] ) ? $params['frm_' . $set] : 0;
 		}
     }
 
@@ -258,7 +258,7 @@ 
         $frm_roles = FrmAppHelper::frm_capabilities();
         $roles = get_editable_roles();
         foreach ( $frm_roles as $frm_role => $frm_role_description ) {
-            $this->$frm_role = (array) ( isset( $params[ $frm_role ] ) ? $params[ $frm_role ] : 'administrator' );
+            $this->$frm_role = (array) ( isset( $params[$frm_role] ) ? $params[$frm_role] : 'administrator' );
 
             // Make sure administrators always have permissions
             if ( ! in_array( 'administrator', $this->$frm_role ) ) {

classes/models/FrmEntry.php

Indentation +296 added lines, -296 removed lines

@@ -6,11 +6,11 @@ 
 class FrmEntry {
 
 	/**
-	* Create a new entry
-	*
-	* @param array $values
-	* @return int | boolean $entry_id
-	*/
+	 * Create a new entry
+	 *
+	 * @param array $values
+	 * @return int | boolean $entry_id
+	 */
 	public static function create( $values ) {
 		$entry_id = self::create_entry( $values, 'standard' );
 
@@ -18,12 +18,12 @@ 
 	}
 
 	/**
-	* Create a new entry with some differences depending on type
-	*
-	* @param array $values
-	* @param string $type
-	* @return int | boolean $entry_id
-	*/
+	 * Create a new entry with some differences depending on type
+	 *
+	 * @param array $values
+	 * @param string $type
+	 * @return int | boolean $entry_id
+	 */
 	private static function create_entry( $values, $type ) {
 		$new_values = self::before_insert_entry_in_database( $values, $type );
 
@@ -49,40 +49,40 @@ 
 			return false;
 		}
 
-        $check_val = $new_values;
+		$check_val = $new_values;
 		$check_val['created_at >'] = date( 'Y-m-d H:i:s', ( strtotime( $new_values['created_at'] ) - absint( $duplicate_entry_time ) ) );
 
 		unset( $check_val['created_at'], $check_val['updated_at'] );
 		unset( $check_val['is_draft'], $check_val['id'], $check_val['item_key'] );
 
-        if ( $new_values['item_key'] == $new_values['name'] ) {
+		if ( $new_values['item_key'] == $new_values['name'] ) {
 			unset( $check_val['name'] );
-        }
+		}
 
-        global $wpdb;
+		global $wpdb;
 		$entry_exists = FrmDb::get_col( $wpdb->prefix . 'frm_items', $check_val, 'id', array( 'order_by' => 'created_at DESC' ) );
 
 		if ( ! $entry_exists || empty( $entry_exists ) || ! isset( $values['item_meta'] ) ) {
-            return false;
-        }
+			return false;
+		}
 
-        $is_duplicate = false;
-        foreach ( $entry_exists as $entry_exist ) {
-            $is_duplicate = true;
+		$is_duplicate = false;
+		foreach ( $entry_exists as $entry_exist ) {
+			$is_duplicate = true;
 
 			// make sure it's a duplicate
 			$metas = FrmEntryMeta::get_entry_meta_info( $entry_exist );
-            $field_metas = array();
-            foreach ( $metas as $meta ) {
+			$field_metas = array();
+			foreach ( $metas as $meta ) {
 				$field_metas[ $meta->field_id ] = $meta->meta_value;
-            }
+			}
 
-            // If prev entry is empty and current entry is not, they are not duplicates
-            $filtered_vals = array_filter( $values['item_meta'] );
+			// If prev entry is empty and current entry is not, they are not duplicates
+			$filtered_vals = array_filter( $values['item_meta'] );
 			$field_metas   = array_filter( $field_metas );
-            if ( empty( $field_metas ) && ! empty( $filtered_vals ) ) {
-                return false;
-            }
+			if ( empty( $field_metas ) && ! empty( $filtered_vals ) ) {
+				return false;
+			}
 
 			// compare serialized values and not arrays
 			$new_meta = array_map( 'maybe_serialize', $filtered_vals );
@@ -99,20 +99,20 @@ 
 			}
 
 			$diff = array_diff_assoc( $field_metas, $new_meta );
-            foreach ( $diff as $field_id => $meta_value ) {
+			foreach ( $diff as $field_id => $meta_value ) {
 				if ( ! empty( $meta_value ) ) {
-                    $is_duplicate = false;
-                    continue;
-                }
-            }
+					$is_duplicate = false;
+					continue;
+				}
+			}
 
-            if ( $is_duplicate ) {
+			if ( $is_duplicate ) {
 				break;
-            }
-        }
+			}
+		}
 
-        return $is_duplicate;
-    }
+		return $is_duplicate;
+	}
 
 	/**
 	 * Determine if an entry needs to be checked as a possible duplicate
@@ -157,32 +157,32 @@ 
 		$new_values['updated_at'] = $new_values['created_at'];
 
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_items', $new_values );
-        if ( ! $query_results ) {
-            return false;
-        }
+		if ( ! $query_results ) {
+			return false;
+		}
 
-        $entry_id = $wpdb->insert_id;
+		$entry_id = $wpdb->insert_id;
 
-        global $frm_vars;
+		global $frm_vars;
 		if ( ! isset( $frm_vars['saved_entries'] ) ) {
-            $frm_vars['saved_entries'] = array();
-        }
-        $frm_vars['saved_entries'][] = (int) $entry_id;
+			$frm_vars['saved_entries'] = array();
+		}
+		$frm_vars['saved_entries'][] = (int) $entry_id;
 
 		FrmEntryMeta::duplicate_entry_metas( $id, $entry_id );
 		self::clear_cache();
 
 		do_action( 'frm_after_duplicate_entry', $entry_id, $new_values['form_id'], array( 'old_id' => $id ) );
-        return $entry_id;
-    }
+		return $entry_id;
+	}
 
 	/**
-	* Update an entry (not via XML)
-	*
-	* @param int $id
-	* @param array $values
-	* @return boolean|int $update_results
-	*/
+	 * Update an entry (not via XML)
+	 *
+	 * @param int $id
+	 * @param array $values
+	 * @return boolean|int $update_results
+	 */
 	public static function update( $id, $values ) {
 		$update_results = self::update_entry( $id, $values, 'standard' );
 
@@ -190,14 +190,14 @@ 
 	}
 
 	/**
-	* Update an entry with some differences depending on the update type
-	*
-	* @since 2.0.16
-	*
-	* @param int $id
-	* @param array $values
-	* @return boolean|int $query_results
-	*/
+	 * Update an entry with some differences depending on the update type
+	 *
+	 * @since 2.0.16
+	 *
+	 * @param int $id
+	 * @param array $values
+	 * @return boolean|int $query_results
+	 */
 	private static function update_entry( $id, $values, $update_type ) {
 		global $wpdb;
 
@@ -216,14 +216,14 @@ 
 	}
 
 	public static function destroy( $id ) {
-        global $wpdb;
-        $id = (int) $id;
+		global $wpdb;
+		$id = (int) $id;
 
 		$entry = self::getOne( $id );
-        if ( ! $entry ) {
-            $result = false;
-            return $result;
-        }
+		if ( ! $entry ) {
+			$result = false;
+			return $result;
+		}
 
 		do_action( 'frm_before_destroy_entry', $id, $entry );
 
@@ -232,18 +232,18 @@ 
 
 		self::clear_cache();
 
-        return $result;
-    }
+		return $result;
+	}
 
 	public static function update_form( $id, $value, $form_id ) {
-        global $wpdb;
+		global $wpdb;
 		$form_id = isset( $value ) ? $form_id : null;
 		$result = $wpdb->update( $wpdb->prefix . 'frm_items', array( 'form_id' => $form_id ), array( 'id' => $id ) );
 		if ( $result ) {
 			self::clear_cache();
 		}
-        return $result;
-    }
+		return $result;
+	}
 
 	/**
 	 * Clear entry caching
@@ -287,19 +287,19 @@ 
 	}
 
 	public static function getOne( $id, $meta = false ) {
-        global $wpdb;
+		global $wpdb;
 
-        $query = "SELECT it.*, fr.name as form_name, fr.form_key as form_key FROM {$wpdb->prefix}frm_items it
+		$query = "SELECT it.*, fr.name as form_name, fr.form_key as form_key FROM {$wpdb->prefix}frm_items it
                   LEFT OUTER JOIN {$wpdb->prefix}frm_forms fr ON it.form_id=fr.id WHERE ";
 
 		$query .= is_numeric( $id ) ? 'it.id=%d' : 'it.item_key=%s';
-        $query_args = array( $id );
-        $query = $wpdb->prepare( $query, $query_args ); // WPCS: unprepared SQL ok.
+		$query_args = array( $id );
+		$query = $wpdb->prepare( $query, $query_args ); // WPCS: unprepared SQL ok.
 
-        if ( ! $meta ) {
+		if ( ! $meta ) {
 			$entry = FrmDb::check_cache( $id . '_nometa', 'frm_entry', $query, 'get_row' );
 			return stripslashes_deep( $entry );
-        }
+		}
 
 		$entry = FrmDb::check_cache( $id, 'frm_entry' );
 		if ( $entry !== false ) {
@@ -310,14 +310,14 @@ 
 		$entry = self::get_meta( $entry );
 
 		return stripslashes_deep( $entry );
-    }
+	}
 
 	public static function get_meta( $entry ) {
-        if ( ! $entry ) {
-            return $entry;
-        }
+		if ( ! $entry ) {
+			return $entry;
+		}
 
-        global $wpdb;
+		global $wpdb;
 		$metas = FrmDb::get_results(
 			$wpdb->prefix . 'frm_item_metas m LEFT JOIN ' . $wpdb->prefix . 'frm_fields f ON m.field_id=f.id',
 			array(
@@ -327,56 +327,56 @@ 
 			'field_id, meta_value, field_key, item_id'
 		);
 
-        $entry->metas = array();
+		$entry->metas = array();
 
 		$include_key = apply_filters( 'frm_include_meta_keys', false, array( 'form_id' => $entry->form_id ) );
-        foreach ( $metas as $meta_val ) {
-            if ( $meta_val->item_id == $entry->id ) {
+		foreach ( $metas as $meta_val ) {
+			if ( $meta_val->item_id == $entry->id ) {
 				$entry->metas[ $meta_val->field_id ] = maybe_unserialize( $meta_val->meta_value );
 				if ( $include_key ) {
 					$entry->metas[ $meta_val->field_key ] = $entry->metas[ $meta_val->field_id ];
 				}
-                 continue;
-            }
+				 continue;
+			}
 
-            // include sub entries in an array
+			// include sub entries in an array
 			if ( ! isset( $entry_metas[ $meta_val->field_id ] ) ) {
 				$entry->metas[ $meta_val->field_id ] = array();
-            }
+			}
 
 			$entry->metas[ $meta_val->field_id ][] = maybe_unserialize( $meta_val->meta_value );
 
 			unset( $meta_val );
-        }
+		}
 		unset( $metas );
 
 		FrmDb::set_cache( $entry->id, $entry, 'frm_entry' );
 
-        return $entry;
-    }
+		return $entry;
+	}
 
-    /**
-     * @param string $id
-     */
+	/**
+	 * @param string $id
+	 */
 	public static function exists( $id ) {
-        global $wpdb;
+		global $wpdb;
 
-        if ( FrmDb::check_cache( $id, 'frm_entry' ) ) {
-            $exists = true;
-            return $exists;
-        }
+		if ( FrmDb::check_cache( $id, 'frm_entry' ) ) {
+			$exists = true;
+			return $exists;
+		}
 
 		if ( is_numeric( $id ) ) {
-            $where = array( 'id' => $id );
-        } else {
-            $where = array( 'item_key' => $id );
-        }
+			$where = array( 'id' => $id );
+		} else {
+			$where = array( 'item_key' => $id );
+		}
 		$id = FrmDb::get_var( $wpdb->prefix . 'frm_items', $where );
 
 		return ( $id && $id > 0 );
-    }
+	}
 
-    public static function getAll( $where, $order_by = '', $limit = '', $meta = false, $inc_form = true ) {
+	public static function getAll( $where, $order_by = '', $limit = '', $meta = false, $inc_form = true ) {
 		global $wpdb;
 
 		$limit = FrmDb::esc_limit( $limit );
@@ -384,21 +384,21 @@ 
 		$cache_key = maybe_serialize( $where ) . $order_by . $limit . $inc_form;
 		$entries = wp_cache_get( $cache_key, 'frm_entry' );
 
-        if ( false === $entries ) {
-            $fields = 'it.id, it.item_key, it.name, it.ip, it.form_id, it.post_id, it.user_id, it.parent_item_id, it.updated_by, it.created_at, it.updated_at, it.is_draft';
+		if ( false === $entries ) {
+			$fields = 'it.id, it.item_key, it.name, it.ip, it.form_id, it.post_id, it.user_id, it.parent_item_id, it.updated_by, it.created_at, it.updated_at, it.is_draft';
 			$table = $wpdb->prefix . 'frm_items it ';
 
-            if ( $inc_form ) {
-                $fields = 'it.*, fr.name as form_name,fr.form_key as form_key';
-                $table .= 'LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id ';
-            }
+			if ( $inc_form ) {
+				$fields = 'it.*, fr.name as form_name,fr.form_key as form_key';
+				$table .= 'LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id ';
+			}
 
-            if ( preg_match( '/ meta_([0-9]+)/', $order_by, $order_matches ) ) {
-    		    // sort by a requested field
-                $field_id = (int) $order_matches[1];
+			if ( preg_match( '/ meta_([0-9]+)/', $order_by, $order_matches ) ) {
+				// sort by a requested field
+				$field_id = (int) $order_matches[1];
 				$fields .= ', (SELECT meta_value FROM ' . $wpdb->prefix . 'frm_item_metas WHERE field_id = ' . $field_id . ' AND item_id = it.id) as meta_' . $field_id;
 				unset( $order_matches, $field_id );
-		    }
+			}
 
 			// prepare the query
 			$query = 'SELECT ' . $fields . ' FROM ' . $table . FrmDb::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
@@ -407,45 +407,45 @@ 
 			unset( $query );
 
 			FrmDb::set_cache( $cache_key, $entries, 'frm_entry' );
-        }
+		}
 
-        if ( ! $meta || ! $entries ) {
+		if ( ! $meta || ! $entries ) {
 			return stripslashes_deep( $entries );
-        }
+		}
 		unset( $meta );
 
 		if ( ! is_array( $where ) && preg_match( '/^it\.form_id=\d+$/', $where ) ) {
 			$where = array( 'it.form_id' => substr( $where, 11 ) );
-        }
+		}
 
-        $meta_where = array( 'field_id !' => 0 );
+		$meta_where = array( 'field_id !' => 0 );
 		if ( $limit == '' && is_array( $where ) && count( $where ) == 1 && isset( $where['it.form_id'] ) ) {
-            $meta_where['fi.form_id'] = $where['it.form_id'];
-        } else {
-            $meta_where['item_id'] = array_keys( $entries );
-        }
+			$meta_where['fi.form_id'] = $where['it.form_id'];
+		} else {
+			$meta_where['item_id'] = array_keys( $entries );
+		}
 
-        $metas = FrmDb::get_results( $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON (it.field_id = fi.id)', $meta_where, 'item_id, meta_value, field_id, field_key, form_id' );
+		$metas = FrmDb::get_results( $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON (it.field_id = fi.id)', $meta_where, 'item_id, meta_value, field_id, field_key, form_id' );
 
-        unset( $meta_where );
+		unset( $meta_where );
 
-        if ( ! $metas ) {
+		if ( ! $metas ) {
 			return stripslashes_deep( $entries );
-        }
+		}
 
-        foreach ( $metas as $m_key => $meta_val ) {
-            if ( ! isset( $entries[ $meta_val->item_id ] ) ) {
-                continue;
-            }
+		foreach ( $metas as $m_key => $meta_val ) {
+			if ( ! isset( $entries[ $meta_val->item_id ] ) ) {
+				continue;
+			}
 
-            if ( ! isset( $entries[ $meta_val->item_id ]->metas ) ) {
+			if ( ! isset( $entries[ $meta_val->item_id ]->metas ) ) {
 				$entries[ $meta_val->item_id ]->metas = array();
-            }
+			}
 
 			$entries[ $meta_val->item_id ]->metas[ $meta_val->field_id ] = maybe_unserialize( $meta_val->meta_value );
 
 			unset( $m_key, $meta_val );
-        }
+		}
 
 		if ( ! FrmAppHelper::prevent_caching() ) {
 			foreach ( $entries as $entry ) {
@@ -455,33 +455,33 @@ 
 		}
 
 		return stripslashes_deep( $entries );
-    }
+	}
 
-    // Pagination Methods
+	// Pagination Methods
 	/**
 	 * @param int|array|string If int, use the form id.
 	 */
-    public static function getRecordCount( $where = '' ) {
-        global $wpdb;
+	public static function getRecordCount( $where = '' ) {
+		global $wpdb;
 		$table_join = $wpdb->prefix . 'frm_items it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id';
 
 		if ( is_numeric( $where ) ) {
-            $table_join = 'frm_items';
-            $where = array( 'form_id' => $where );
-        }
+			$table_join = 'frm_items';
+			$where = array( 'form_id' => $where );
+		}
 
-        if ( is_array( $where ) ) {
-            $count = FrmDb::get_count( $table_join, $where );
-        } else {
+		if ( is_array( $where ) ) {
+			$count = FrmDb::get_count( $table_join, $where );
+		} else {
 			$cache_key = 'count_' . maybe_serialize( $where );
 			$query = 'SELECT COUNT(*) FROM ' . $table_join . FrmDb::prepend_and_or_where( ' WHERE ', $where );
 			$count = FrmDb::check_cache( $cache_key, 'frm_entry', $query, 'get_var' );
-        }
+		}
 
-        return $count;
-    }
+		return $count;
+	}
 
-    public static function getPageCount( $p_size, $where = '' ) {
+	public static function getPageCount( $p_size, $where = '' ) {
 		$p_size = (int) $p_size;
 		$count = 1;
 		if ( $p_size ) {
@@ -492,16 +492,16 @@ 
 		}
 
 		return $count;
-    }
+	}
 
 	/**
-	* Prepare the data before inserting it into the database
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @param string $type
-	* @return array $new_values
-	*/
+	 * Prepare the data before inserting it into the database
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @param string $type
+	 * @return array $new_values
+	 */
 	private static function before_insert_entry_in_database( &$values, $type ) {
 
 		self::sanitize_entry_post( $values );
@@ -516,13 +516,13 @@ 
 	}
 
 	/**
-	* Create an entry and perform after create actions
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @param array $new_values
-	* @return boolean|int $entry_id
-	*/
+	 * Create an entry and perform after create actions
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @param array $new_values
+	 * @return boolean|int $entry_id
+	 */
 	private static function continue_to_create_entry( $values, $new_values ) {
 		$entry_id = self::insert_entry_into_database( $new_values );
 		if ( ! $entry_id ) {
@@ -534,37 +534,37 @@ 
 		return $entry_id;
 	}
 
-    /**
-     * Sanitize the POST values before we use them
-     *
-     * @since 2.0
-     * @param array $values The POST values by reference
-     */
-    public static function sanitize_entry_post( &$values ) {
-        $sanitize_method = array(
-            'form_id'       => 'absint',
-            'frm_action'    => 'sanitize_title',
-            'form_key'      => 'sanitize_title',
-            'item_key'      => 'sanitize_title',
-            'item_name'     => 'sanitize_text_field',
-            'frm_saving_draft' => 'absint',
-            'is_draft'      => 'absint',
-            'post_id'       => 'absint',
-            'parent_item_id' => 'absint',
-            'created_at'    => 'sanitize_text_field',
-            'updated_at'    => 'sanitize_text_field',
-        );
-
-        FrmAppHelper::sanitize_request( $sanitize_method, $values );
-    }
-
-	/**
-	* Prepare the new values for inserting into the database
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return array $new_values
-	*/
+	/**
+	 * Sanitize the POST values before we use them
+	 *
+	 * @since 2.0
+	 * @param array $values The POST values by reference
+	 */
+	public static function sanitize_entry_post( &$values ) {
+		$sanitize_method = array(
+			'form_id'       => 'absint',
+			'frm_action'    => 'sanitize_title',
+			'form_key'      => 'sanitize_title',
+			'item_key'      => 'sanitize_title',
+			'item_name'     => 'sanitize_text_field',
+			'frm_saving_draft' => 'absint',
+			'is_draft'      => 'absint',
+			'post_id'       => 'absint',
+			'parent_item_id' => 'absint',
+			'created_at'    => 'sanitize_text_field',
+			'updated_at'    => 'sanitize_text_field',
+		);
+
+		FrmAppHelper::sanitize_request( $sanitize_method, $values );
+	}
+
+	/**
+	 * Prepare the new values for inserting into the database
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return array $new_values
+	 */
 	private static function package_entry_data( &$values ) {
 		global $wpdb;
 
@@ -617,34 +617,34 @@ 
 	}
 
 	/**
-	* Get the is_draft value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return int
-	*/
+	 * Get the is_draft value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return int
+	 */
 	private static function get_is_draft_value( $values ) {
 		return ( ( isset( $values['frm_saving_draft'] ) && $values['frm_saving_draft'] == 1 ) || ( isset( $values['is_draft'] ) && $values['is_draft'] == 1 ) ) ? 1 : 0;
 	}
 
 	/**
-	* Get the created_at value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return string
-	*/
+	 * Get the created_at value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return string
+	 */
 	private static function get_created_at( $values ) {
 		return self::get_entry_value( $values, 'created_at', current_time( 'mysql', 1 ) );
 	}
 
 	/**
-	* Get the updated_at value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return string
-	*/
+	 * Get the updated_at value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return string
+	 */
 	private static function get_updated_at( $values ) {
 		if ( isset( $values['updated_at'] ) ) {
 			$updated_at = $values['updated_at'];
@@ -656,12 +656,12 @@ 
 	}
 
 	/**
-	* Get the description value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return string
-	*/
+	 * Get the description value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return string
+	 */
 	private static function get_entry_description( $values ) {
 		if ( isset( $values['description'] ) && ! empty( $values['description'] ) ) {
 			$description = maybe_serialize( $values['description'] );
@@ -678,12 +678,12 @@ 
 	}
 
 	/**
-	* Get the user_id value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return int
-	*/
+	 * Get the user_id value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return int
+	 */
 	private static function get_entry_user_id( $values ) {
 		if ( isset( $values['frm_user_id'] ) && ( is_numeric( $values['frm_user_id'] ) || FrmAppHelper::is_admin() ) ) {
 			$user_id = $values['frm_user_id'];
@@ -696,12 +696,12 @@ 
 	}
 
 	/**
-	* Insert new entry into the database
-	*
-	* @since 2.0.16
-	* @param array $new_values
-	* @return int | boolean $entry_id
-	*/
+	 * Insert new entry into the database
+	 *
+	 * @since 2.0.16
+	 * @param array $new_values
+	 * @return int | boolean $entry_id
+	 */
 	private static function insert_entry_into_database( $new_values ) {
 		global $wpdb;
 
@@ -717,11 +717,11 @@ 
 	}
 
 	/**
-	* Add the new entry to global $frm_vars
-	*
-	* @since 2.0.16
-	* @param int $entry_id
-	*/
+	 * Add the new entry to global $frm_vars
+	 *
+	 * @since 2.0.16
+	 * @param int $entry_id
+	 */
 	private static function add_new_entry_to_frm_vars( $entry_id ) {
 		global $frm_vars;
 
@@ -733,12 +733,12 @@ 
 	}
 
 	/**
-	* Add entry metas, if there are any
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @param int $entry_id
-	*/
+	 * Add entry metas, if there are any
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @param int $entry_id
+	 */
 	private static function maybe_add_entry_metas( $values, $entry_id ) {
 		if ( isset( $values['item_meta'] ) ) {
 			FrmEntryMeta::update_entry_metas( $entry_id, $values['item_meta'] );
@@ -746,12 +746,12 @@ 
 	}
 
 	/**
-	* Trigger frm_after_create_entry hooks
-	*
-	* @since 2.0.16
-	* @param int $entry_id
-	* @param array $new_values
-	*/
+	 * Trigger frm_after_create_entry hooks
+	 *
+	 * @since 2.0.16
+	 * @param int $entry_id
+	 * @param array $new_values
+	 */
 	private static function after_entry_created_actions( $entry_id, $values, $new_values ) {
 		// this is a child entry
 		$is_child = isset( $values['parent_form_id'] ) && isset( $values['parent_nonce'] ) && ! empty( $values['parent_form_id'] ) && wp_verify_nonce( $values['parent_nonce'], 'parent' );
@@ -761,13 +761,13 @@ 
 	}
 
 	/**
-	* Actions to perform immediately after an entry is inserted in the frm_items database
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @param array $new_values
-	* @param int $entry_id
-	*/
+	 * Actions to perform immediately after an entry is inserted in the frm_items database
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @param array $new_values
+	 * @param int $entry_id
+	 */
 	private static function after_insert_entry_in_database( $values, $new_values, $entry_id ) {
 
 		self::add_new_entry_to_frm_vars( $entry_id );
@@ -780,14 +780,14 @@ 
 	}
 
 	/**
-	* Perform some actions right before updating an entry
-	*
-	* @since 2.0.16
-	* @param int $id
-	* @param array $values
-	* @param string $update_type
-	* @return boolean $update
-	*/
+	 * Perform some actions right before updating an entry
+	 *
+	 * @since 2.0.16
+	 * @param int $id
+	 * @param array $values
+	 * @param string $update_type
+	 * @return boolean $update
+	 */
 	private static function before_update_entry( $id, &$values, $update_type ) {
 		$update = true;
 
@@ -805,13 +805,13 @@ 
 	}
 
 	/**
-	* Package the entry data for updating
-	*
-	* @since 2.0.16
-	* @param int $id
-	* @param array $values
-	* @return array $new_values
-	*/
+	 * Package the entry data for updating
+	 *
+	 * @since 2.0.16
+	 * @param int $id
+	 * @param array $values
+	 * @return array $new_values
+	 */
 	private static function package_entry_to_update( $id, $values ) {
 		global $wpdb;
 
@@ -845,14 +845,14 @@ 
 	}
 
 	/**
-	* Perform some actions right after updating an entry
-	*
-	* @since 2.0.16
-	* @param boolean|int $query_results
-	* @param int $id
-	* @param array $values
-	* @param array $new_values
-	*/
+	 * Perform some actions right after updating an entry
+	 *
+	 * @since 2.0.16
+	 * @param boolean|int $query_results
+	 * @param int $id
+	 * @param array $values
+	 * @param array $new_values
+	 */
 	private static function after_update_entry( $query_results, $id, $values, $new_values ) {
 		if ( $query_results ) {
 			self::clear_cache();
@@ -874,13 +874,13 @@ 
 	}
 
 	/**
-	* Create entry from an XML import
-	* Certain actions aren't necessary when importing (like saving sub entries, checking for duplicates, etc.)
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return int | boolean $entry_id
-	*/
+	 * Create entry from an XML import
+	 * Certain actions aren't necessary when importing (like saving sub entries, checking for duplicates, etc.)
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return int | boolean $entry_id
+	 */
 	public static function create_entry_from_xml( $values ) {
 		$entry_id = self::create_entry( $values, 'xml' );
 
@@ -888,14 +888,14 @@ 
 	}
 
 	/**
-	* Update entry from an XML import
-	* Certain actions aren't necessary when importing (like saving sub entries and modifying other vals)
-	*
-	* @since 2.0.16
-	* @param int $id
-	* @param array $values
-	* @return int | boolean $updated
-	*/
+	 * Update entry from an XML import
+	 * Certain actions aren't necessary when importing (like saving sub entries and modifying other vals)
+	 *
+	 * @since 2.0.16
+	 * @param int $id
+	 * @param array $values
+	 * @return int | boolean $updated
+	 */
 	public static function update_entry_from_xml( $id, $values ) {
 		$updated = self::update_entry( $id, $values, 'xml' );
 

classes/models/FrmMigrate.php

Indentation +74 added lines, -74 removed lines

@@ -74,11 +74,11 @@ 
 		return $wpdb->get_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,
@@ -97,7 +97,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,
@@ -115,7 +115,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,
@@ -138,7 +138,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,
@@ -150,7 +150,7 @@ 
                 KEY item_id (item_id)
         )';
 
-        foreach ( $sql as $q ) {
+		foreach ( $sql as $q ) {
 			if ( function_exists( 'dbDelta' ) ) {
 				dbDelta( $q . $charset_collate . ';' );
 			} else {
@@ -158,8 +158,8 @@ 
 				$wpdb->query( $q . $charset_collate ); // WPCS: unprepared SQL ok.
 			}
 			unset( $q );
-        }
-    }
+		}
+	}
 
 	private function maybe_create_contact_form() {
 		$form_exists = FrmForm::get_id_by_key( 'contact-form' );
@@ -215,13 +215,13 @@ 
 		}
 	}
 
-    public function uninstall() {
+	public function uninstall() {
 		if ( ! current_user_can( 'administrator' ) ) {
-            $frm_settings = FrmAppHelper::get_settings();
+			$frm_settings = FrmAppHelper::get_settings();
 			wp_die( esc_html( $frm_settings->admin_permission ) );
-        }
+		}
 
-        global $wpdb, $wp_roles;
+		global $wpdb, $wp_roles;
 
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->fields ); // WPCS: unprepared SQL ok.
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->forms ); // WPCS: unprepared SQL ok.
@@ -234,12 +234,12 @@ 
 		delete_option( 'frm_lite_settings_upgrade' );
 		delete_option( 'frm-usage-uuid' );
 
-        //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 );
+		//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 );
@@ -267,8 +267,8 @@ 
 		$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;
-    }
+		return true;
+	}
 
 	/**
 	 * Delete uneeded default templates
@@ -450,42 +450,42 @@ 
 		$size .= 'px';
 	}
 
-    /**
-     * Migrate post and email notification settings into actions
-     */
-    private function migrate_to_16() {
-        $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 ) {
+	/**
+	 * Migrate post and email notification settings into actions
+	 */
+	private function migrate_to_16() {
+		$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;
@@ -494,19 +494,19 @@ 
 			// 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' );
 
-        $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] />
@@ -516,21 +516,21 @@ 
 		unset( $sending, $img );
 
 		$new_default_html = FrmFormsHelper::get_default_html( 'submit' );
-        $draft_link = FrmFormsHelper::get_draft_link();
+		$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;
-            }
+				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 );
-        }
-    }
+		}
+	}
 }

classes/controllers/FrmHooksController.php

Indentation +131 added lines, -131 removed lines

@@ -2,92 +2,92 @@ 
 
 class FrmHooksController {
 
-    /**
-     * Trigger plugin-wide hook loading
-     */
-    public static function trigger_load_hook( $hooks = 'load_hooks' ) {
-        $controllers = apply_filters( 'frm_load_controllers', array( 'FrmHooksController' ) );
-
-        $trigger_hooks = $hooks;
-        $hooks = (array) $hooks;
-
-        if ( 'load_hooks' == $trigger_hooks ) {
-            if ( is_admin() ) {
-                $hooks[] = 'load_admin_hooks';
-                if ( defined( 'DOING_AJAX' ) ) {
-                    $hooks[] = 'load_ajax_hooks';
-                    $hooks[] = 'load_form_hooks';
-                }
-            }
-
-            if ( is_multisite() ) {
-                $hooks[] = 'load_multisite_hooks';
-            }
-        } else {
-            // Make sure the hooks are only triggered once
-            add_filter( 'frm' . str_replace( 'load', '', $trigger_hooks ) . '_loaded', '__return_true' );
-        }
-        unset( $trigger_hooks );
-
-        // Instansiate Controllers
-        foreach ( $controllers as $c ) {
-            foreach ( $hooks as $hook ) {
+	/**
+	 * Trigger plugin-wide hook loading
+	 */
+	public static function trigger_load_hook( $hooks = 'load_hooks' ) {
+		$controllers = apply_filters( 'frm_load_controllers', array( 'FrmHooksController' ) );
+
+		$trigger_hooks = $hooks;
+		$hooks = (array) $hooks;
+
+		if ( 'load_hooks' == $trigger_hooks ) {
+			if ( is_admin() ) {
+				$hooks[] = 'load_admin_hooks';
+				if ( defined( 'DOING_AJAX' ) ) {
+					$hooks[] = 'load_ajax_hooks';
+					$hooks[] = 'load_form_hooks';
+				}
+			}
+
+			if ( is_multisite() ) {
+				$hooks[] = 'load_multisite_hooks';
+			}
+		} else {
+			// Make sure the hooks are only triggered once
+			add_filter( 'frm' . str_replace( 'load', '', $trigger_hooks ) . '_loaded', '__return_true' );
+		}
+		unset( $trigger_hooks );
+
+		// Instansiate Controllers
+		foreach ( $controllers as $c ) {
+			foreach ( $hooks as $hook ) {
 				call_user_func( array( $c, $hook ) );
 				unset( $hook );
-            }
+			}
 			unset( $c );
-        }
+		}
 
-    }
+	}
 
-    public static function trigger_load_form_hooks() {
-        self::trigger_load_hook( 'load_form_hooks' );
-    }
+	public static function trigger_load_form_hooks() {
+		self::trigger_load_hook( 'load_form_hooks' );
+	}
 
 	public static function load_hooks() {
 		add_action( 'rest_api_init', 'FrmAppController::create_rest_routes', 0 );
-        add_action( 'plugins_loaded', 'FrmAppController::load_lang' );
+		add_action( 'plugins_loaded', 'FrmAppController::load_lang' );
 		add_filter( 'widget_text', 'do_shortcode' );
 
-        // Entries controller
-        add_action( 'wp_loaded', 'FrmEntriesController::process_entry', 10, 0 );
-        add_action( 'frm_after_entry_processed', 'FrmEntriesController::delete_entry_after_save', 100 );
+		// Entries controller
+		add_action( 'wp_loaded', 'FrmEntriesController::process_entry', 10, 0 );
+		add_action( 'frm_after_entry_processed', 'FrmEntriesController::delete_entry_after_save', 100 );
 
-        // Form Actions Controller
-        add_action( 'init', 'FrmFormActionsController::register_post_types', 1 );
+		// Form Actions Controller
+		add_action( 'init', 'FrmFormActionsController::register_post_types', 1 );
 		add_action( 'frm_after_create_entry', 'FrmFormActionsController::trigger_create_actions', 20, 3 );
 
-        // Forms Controller
-        add_action( 'widgets_init', 'FrmFormsController::register_widgets' );
+		// Forms Controller
+		add_action( 'widgets_init', 'FrmFormsController::register_widgets' );
 		add_action( 'init', 'FrmFormsController::front_head' );
-        add_filter( 'frm_content', 'FrmFormsController::filter_content', 10, 3 );
-        add_filter( 'frm_replace_content_shortcodes', 'FrmFormsController::replace_content_shortcodes', 20, 3 );
-        add_action( 'admin_bar_init', 'FrmFormsController::admin_bar_css' );
+		add_filter( 'frm_content', 'FrmFormsController::filter_content', 10, 3 );
+		add_filter( 'frm_replace_content_shortcodes', 'FrmFormsController::replace_content_shortcodes', 20, 3 );
+		add_action( 'admin_bar_init', 'FrmFormsController::admin_bar_css' );
 		add_action( 'wp_footer', 'FrmFormsController::footer_js', 1, 0 );
 
 		add_action( 'wp_scheduled_delete', 'FrmForm::scheduled_delete' );
 
-        // Form Shortcodes
-        add_shortcode( 'formidable', 'FrmFormsController::get_form_shortcode' );
+		// Form Shortcodes
+		add_shortcode( 'formidable', 'FrmFormsController::get_form_shortcode' );
 
-        // Styles Controller
-        add_action( 'init', 'FrmStylesController::register_post_types', 0 );
-        add_filter( 'frm_get_style_opts', 'FrmStylesController::get_style_opts' );
-        add_filter( 'frm_add_form_style_class', 'FrmStylesController::get_form_style_class', 10, 2 );
-        add_filter( 'frm_show_entry_styles', 'FrmStylesController::show_entry_styles' );
+		// Styles Controller
+		add_action( 'init', 'FrmStylesController::register_post_types', 0 );
+		add_filter( 'frm_get_style_opts', 'FrmStylesController::get_style_opts' );
+		add_filter( 'frm_add_form_style_class', 'FrmStylesController::get_form_style_class', 10, 2 );
+		add_filter( 'frm_show_entry_styles', 'FrmStylesController::show_entry_styles' );
 
 		//Simple Blocks Controller
 		add_action( 'init', 'FrmSimpleBlocksController::register_simple_form_block' );
 
 		add_filter( 'cron_schedules', 'FrmUsageController::add_schedules' );
 		add_action( 'formidable_send_usage', 'FrmUsageController::send_snapshot' );
-    }
+	}
 
 	public static function load_admin_hooks() {
-        add_action( 'admin_menu', 'FrmAppController::menu', 1 );
+		add_action( 'admin_menu', 'FrmAppController::menu', 1 );
 		add_filter( 'admin_body_class', 'FrmAppController::add_admin_class', 999 );
-        add_action( 'admin_enqueue_scripts', 'FrmAppController::load_wp_admin_style' );
-        add_action( 'admin_notices', 'FrmAppController::pro_get_started_headline' );
+		add_action( 'admin_enqueue_scripts', 'FrmAppController::load_wp_admin_style' );
+		add_action( 'admin_notices', 'FrmAppController::pro_get_started_headline' );
 		add_action( 'admin_init', 'FrmAppController::admin_init', 11 );
 		add_filter( 'plugin_action_links_' . FrmAppHelper::plugin_folder() . '/formidable.php', 'FrmAppController::settings_link' );
 		add_filter( 'admin_footer_text', 'FrmAppController::set_footer_text' );
@@ -98,54 +98,54 @@ 
 		add_action( 'admin_menu', 'FrmAddonsController::menu', 100 );
 		add_filter( 'pre_set_site_transient_update_plugins', 'FrmAddonsController::check_update' );
 
-        // Entries Controller
-        add_action( 'admin_menu', 'FrmEntriesController::menu', 12 );
-        add_filter( 'contextual_help', 'FrmEntriesController::contextual_help', 10, 3 );
-        add_filter( 'set-screen-option', 'FrmEntriesController::save_per_page', 10, 3 );
-        add_filter( 'update_user_metadata', 'FrmEntriesController::check_hidden_cols', 10, 5 );
-        add_action( 'updated_user_meta', 'FrmEntriesController::update_hidden_cols', 10, 4 );
-
-        // Form Actions Controller
-        if ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
-            add_action( 'frm_before_update_form_settings', 'FrmFormActionsController::update_settings' );
-        }
-        add_action( 'frm_after_duplicate_form', 'FrmFormActionsController::duplicate_form_actions', 20, 3 );
-
-        // Forms Controller
-        add_action( 'admin_menu', 'FrmFormsController::menu', 10 );
-        add_action( 'admin_head-toplevel_page_formidable', 'FrmFormsController::head' );
-
-        add_filter( 'set-screen-option', 'FrmFormsController::save_per_page', 10, 3 );
-        add_action( 'admin_footer', 'FrmFormsController::insert_form_popup' );
+		// Entries Controller
+		add_action( 'admin_menu', 'FrmEntriesController::menu', 12 );
+		add_filter( 'contextual_help', 'FrmEntriesController::contextual_help', 10, 3 );
+		add_filter( 'set-screen-option', 'FrmEntriesController::save_per_page', 10, 3 );
+		add_filter( 'update_user_metadata', 'FrmEntriesController::check_hidden_cols', 10, 5 );
+		add_action( 'updated_user_meta', 'FrmEntriesController::update_hidden_cols', 10, 4 );
+
+		// Form Actions Controller
+		if ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
+			add_action( 'frm_before_update_form_settings', 'FrmFormActionsController::update_settings' );
+		}
+		add_action( 'frm_after_duplicate_form', 'FrmFormActionsController::duplicate_form_actions', 20, 3 );
+
+		// Forms Controller
+		add_action( 'admin_menu', 'FrmFormsController::menu', 10 );
+		add_action( 'admin_head-toplevel_page_formidable', 'FrmFormsController::head' );
+
+		add_filter( 'set-screen-option', 'FrmFormsController::save_per_page', 10, 3 );
+		add_action( 'admin_footer', 'FrmFormsController::insert_form_popup' );
 		add_action( 'media_buttons', 'FrmFormsController::insert_form_button' );
 		add_action( 'et_pb_admin_excluded_shortcodes', 'FrmFormsController::prevent_divi_conflict' );
 
-        // Forms Model
-        add_action( 'frm_after_duplicate_form', 'FrmForm::after_duplicate', 10, 2 );
+		// Forms Model
+		add_action( 'frm_after_duplicate_form', 'FrmForm::after_duplicate', 10, 2 );
 
-        // Settings Controller
-        add_action( 'admin_menu', 'FrmSettingsController::menu', 45 );
-        add_action( 'frm_before_settings', 'FrmSettingsController::license_box' );
+		// Settings Controller
+		add_action( 'admin_menu', 'FrmSettingsController::menu', 45 );
+		add_action( 'frm_before_settings', 'FrmSettingsController::license_box' );
 		add_action( 'frm_after_settings', 'FrmSettingsController::settings_cta' );
 		add_action( 'wp_ajax_frm_settings_tab', 'FrmSettingsController::load_settings_tab' );
 
-        // Styles Controller
-        add_action( 'admin_menu', 'FrmStylesController::menu', 14 );
-        add_action( 'admin_init', 'FrmStylesController::admin_init' );
+		// Styles Controller
+		add_action( 'admin_menu', 'FrmStylesController::menu', 14 );
+		add_action( 'admin_init', 'FrmStylesController::admin_init' );
 
-        // XML Controller
-        add_action( 'admin_menu', 'FrmXMLController::menu', 41 );
+		// XML Controller
+		add_action( 'admin_menu', 'FrmXMLController::menu', 41 );
 
 		// Simple Blocks Controller
 		add_action( 'enqueue_block_editor_assets', 'FrmSimpleBlocksController::block_editor_assets' );
 
 		add_action( 'admin_init', 'FrmUsageController::schedule_send' );
-    }
+	}
 
 	public static function load_ajax_hooks() {
 		add_action( 'wp_ajax_frm_install', 'FrmAppController::ajax_install' );
-        add_action( 'wp_ajax_frm_uninstall', 'FrmAppController::uninstall' );
-        add_action( 'wp_ajax_frm_deauthorize', 'FrmAppController::deauthorize' );
+		add_action( 'wp_ajax_frm_uninstall', 'FrmAppController::uninstall' );
+		add_action( 'wp_ajax_frm_deauthorize', 'FrmAppController::deauthorize' );
 
 		// Addons
 		add_action( 'wp_ajax_frm_addon_activate', 'FrmAddon::activate' );
@@ -153,70 +153,70 @@ 
 		add_action( 'wp_ajax_frm_install_addon', 'FrmAddonsController::ajax_install_addon' );
 		add_action( 'wp_ajax_frm_activate_addon', 'FrmAddonsController::ajax_activate_addon' );
 
-        // Fields Controller
-        add_action( 'wp_ajax_frm_load_field', 'FrmFieldsController::load_field' );
-        add_action( 'wp_ajax_frm_insert_field', 'FrmFieldsController::create' );
-        add_action( 'wp_ajax_frm_update_ajax_option', 'FrmFieldsController::update_ajax_option' );
-        add_action( 'wp_ajax_frm_duplicate_field', 'FrmFieldsController::duplicate' );
-        add_action( 'wp_ajax_frm_delete_field', 'FrmFieldsController::destroy' );
-        add_action( 'wp_ajax_frm_add_field_option', 'FrmFieldsController::add_option' );
-        add_action( 'wp_ajax_frm_import_choices', 'FrmFieldsController::import_choices' );
-        add_action( 'wp_ajax_frm_import_options', 'FrmFieldsController::import_options' );
-        add_action( 'wp_ajax_frm_update_field_order', 'FrmFieldsController::update_order' );
-
-        // Form Actions Controller
-        add_action( 'wp_ajax_frm_add_form_action', 'FrmFormActionsController::add_form_action' );
-        add_action( 'wp_ajax_frm_form_action_fill', 'FrmFormActionsController::fill_action' );
-
-        // Forms Controller
+		// Fields Controller
+		add_action( 'wp_ajax_frm_load_field', 'FrmFieldsController::load_field' );
+		add_action( 'wp_ajax_frm_insert_field', 'FrmFieldsController::create' );
+		add_action( 'wp_ajax_frm_update_ajax_option', 'FrmFieldsController::update_ajax_option' );
+		add_action( 'wp_ajax_frm_duplicate_field', 'FrmFieldsController::duplicate' );
+		add_action( 'wp_ajax_frm_delete_field', 'FrmFieldsController::destroy' );
+		add_action( 'wp_ajax_frm_add_field_option', 'FrmFieldsController::add_option' );
+		add_action( 'wp_ajax_frm_import_choices', 'FrmFieldsController::import_choices' );
+		add_action( 'wp_ajax_frm_import_options', 'FrmFieldsController::import_options' );
+		add_action( 'wp_ajax_frm_update_field_order', 'FrmFieldsController::update_order' );
+
+		// Form Actions Controller
+		add_action( 'wp_ajax_frm_add_form_action', 'FrmFormActionsController::add_form_action' );
+		add_action( 'wp_ajax_frm_form_action_fill', 'FrmFormActionsController::fill_action' );
+
+		// Forms Controller
 		add_action( 'wp_ajax_frm_save_form', 'FrmFormsController::route' );
-        add_action( 'wp_ajax_frm_get_default_html', 'FrmFormsController::get_email_html' );
-        add_action( 'wp_ajax_frm_get_shortcode_opts', 'FrmFormsController::get_shortcode_opts' );
-        add_action( 'wp_ajax_frm_forms_preview', 'FrmFormsController::preview' );
-        add_action( 'wp_ajax_nopriv_frm_forms_preview', 'FrmFormsController::preview' );
+		add_action( 'wp_ajax_frm_get_default_html', 'FrmFormsController::get_email_html' );
+		add_action( 'wp_ajax_frm_get_shortcode_opts', 'FrmFormsController::get_shortcode_opts' );
+		add_action( 'wp_ajax_frm_forms_preview', 'FrmFormsController::preview' );
+		add_action( 'wp_ajax_nopriv_frm_forms_preview', 'FrmFormsController::preview' );
 		add_action( 'wp_ajax_frm_forms_trash', 'FrmFormsController::ajax_trash' );
 		add_action( 'wp_ajax_frm_build_template', 'FrmFormsController::build_template' );
 
 		// Settings
 		add_action( 'wp_ajax_frm_lite_settings_upgrade', 'FrmSettingsController::settings_cta_dismiss' );
 
-        // Styles Controller
-        add_action( 'wp_ajax_frm_settings_reset', 'FrmStylesController::reset_styling' );
-        add_action( 'wp_ajax_frm_change_styling', 'FrmStylesController::change_styling' );
-        add_action( 'wp_ajax_frmpro_load_css', 'FrmStylesController::load_css' );
-        add_action( 'wp_ajax_nopriv_frmpro_load_css', 'FrmStylesController::load_css' );
+		// Styles Controller
+		add_action( 'wp_ajax_frm_settings_reset', 'FrmStylesController::reset_styling' );
+		add_action( 'wp_ajax_frm_change_styling', 'FrmStylesController::change_styling' );
+		add_action( 'wp_ajax_frmpro_load_css', 'FrmStylesController::load_css' );
+		add_action( 'wp_ajax_nopriv_frmpro_load_css', 'FrmStylesController::load_css' );
 		add_action( 'wp_ajax_frmpro_css', 'FrmStylesController::load_saved_css' );
 		add_action( 'wp_ajax_nopriv_frmpro_css', 'FrmStylesController::load_saved_css' );
 
-        // XML Controller
+		// XML Controller
 		add_action( 'wp_ajax_frm_install_template', 'FrmXMLController::install_template' );
 		add_action( 'wp_ajax_frm_entries_csv', 'FrmXMLController::csv' );
 		add_action( 'wp_ajax_nopriv_frm_entries_csv', 'FrmXMLController::csv' );
-        add_action( 'wp_ajax_frm_export_xml', 'FrmXMLController::export_xml' );
-    }
+		add_action( 'wp_ajax_frm_export_xml', 'FrmXMLController::export_xml' );
+	}
 
 	public static function load_form_hooks() {
-        // Fields Controller
-        add_filter( 'frm_field_type', 'FrmFieldsController::change_type' );
-        add_action( 'frm_field_input_html', 'FrmFieldsController::input_html' );
-        add_filter( 'frm_field_value_saved', 'FrmFieldsController::check_value', 50, 3 );
-        add_filter( 'frm_field_label_seen', 'FrmFieldsController::check_label' );
+		// Fields Controller
+		add_filter( 'frm_field_type', 'FrmFieldsController::change_type' );
+		add_action( 'frm_field_input_html', 'FrmFieldsController::input_html' );
+		add_filter( 'frm_field_value_saved', 'FrmFieldsController::check_value', 50, 3 );
+		add_filter( 'frm_field_label_seen', 'FrmFieldsController::check_label' );
 
 		// Forms Controller
 		add_filter( 'frm_form_classes', 'FrmFormsController::form_classes' );
 
-        // Styles Controller
-        add_filter( 'frm_use_important_width', 'FrmStylesController::important_style', 10, 2 );
-    }
+		// Styles Controller
+		add_filter( 'frm_use_important_width', 'FrmStylesController::important_style', 10, 2 );
+	}
 
 	public static function load_view_hooks() {
-        // Hooks go here when a view is loaded
-    }
+		// Hooks go here when a view is loaded
+	}
 
 	public static function load_multisite_hooks() {
 		add_action( 'wpmu_upgrade_site', 'FrmAppController::network_upgrade_site' );
 
-        // drop tables when mu site is deleted
-        add_filter( 'wpmu_drop_tables', 'FrmAppController::drop_tables' );
-    }
+		// drop tables when mu site is deleted
+		add_filter( 'wpmu_drop_tables', 'FrmAppController::drop_tables' );
+	}
 }