Strategy11 / formidable-forms

classes/models/FrmEntryMeta.php

Doc Comments +4 added lines

@@ -61,6 +61,9 @@ 
         return $wpdb->update( $wpdb->prefix .'frm_item_metas', array( 'meta_value' => $meta_value ), $where_values );
     }
 
+	/**
+	 * @param integer $entry_id
+	 */
 	public static function update_entry_metas( $entry_id, $values ) {
         global $wpdb;
 
@@ -286,6 +289,7 @@ 
      * @param string|array $where
      * @param string $order_by
      * @param string $limit
+     * @param boolean $unique
      */
 	private static function get_ids_query( $where, $order_by, $limit, $unique, $args, array &$query ) {
         global $wpdb;

Spacing +54 added lines, -54 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 );
 
@@ -49,13 +49,13 @@ 
 
         $values = $where_values = array( 'item_id' => $entry_id, 'field_id' => $field_id );
         $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 );
@@ -70,11 +70,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 );
 
-			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 );
@@ -85,13 +85,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;
         }
 
@@ -105,10 +105,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();
     }
@@ -116,7 +116,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 ) );
     }
 
 	/**
@@ -135,7 +135,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 );
 		}
@@ -153,14 +153,14 @@ 
 			$cached = FrmAppHelper::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';
@@ -168,14 +168,14 @@ 
         }
 
 		$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;
     }
 
 	public static function get_entry_metas( $entry_id ) {
-        _deprecated_function( __FUNCTION__, '1.07.10');
+        _deprecated_function( __FUNCTION__, '1.07.10' );
 
         global $wpdb;
 		return FrmDb::get_col( $wpdb->prefix . 'frm_item_metas', array( 'item_id' => $entry_id ), 'meta_value' );
@@ -186,22 +186,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 = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, 'get_col');
+        $values = FrmAppHelper::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 );
     }
 
     /**
@@ -218,8 +218,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 );
         }
@@ -229,7 +229,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;
     }
@@ -243,18 +243,18 @@ 
         $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' .
-            FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+            FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
 		$cache_key = 'all_' . maybe_serialize( $where ) . $order_by . $limit;
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
+        $results = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, ( $limit == ' LIMIT 1' ? 'get_row' : 'get_results' ) );
 
         if ( ! $results || ! $stripslashes ) {
             return $results;
         }
 
         foreach ( $results as $k => $result ) {
-			$results[ $k ]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
-            unset($k, $result);
+			$results[$k]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
+            unset( $k, $result );
         }
 
         return $results;
@@ -266,14 +266,14 @@ 
 			'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 );
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
+        $results = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, ( $limit == ' LIMIT 1' ? 'get_var' : 'get_col' ) );
 
         return $results;
     }
@@ -299,17 +299,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[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+            $query[] = FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
 			if ( $args['group_by'] ) {
 				$query[] = ' GROUP BY ' . sanitize_text_field( $args['group_by'] );
@@ -324,13 +324,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];
@@ -339,12 +339,12 @@ 
         }
 
 		// The query has already been prepared
-		$query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+		$query[] = FrmAppHelper::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;
         }
@@ -367,18 +367,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' . FrmAppHelper::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 );
 		FrmAppHelper::set_cache( $cache_key, $results, 'frm_entry' );
 
         return $results;

Indentation +178 added lines, -178 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 );
 
@@ -34,40 +34,40 @@ 
 			$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 );
@@ -91,39 +91,39 @@ 
 			}
 		}
 
-        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( 'item_id' => $entry_id, 'field_id' => $prev_values );
 		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
@@ -148,7 +148,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;
@@ -161,137 +161,137 @@ 
 
 		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( $entry_id ) {
-        _deprecated_function( __FUNCTION__, '1.07.10');
+		_deprecated_function( __FUNCTION__, '1.07.10');
 
-        global $wpdb;
+		global $wpdb;
 		return FrmDb::get_col( $wpdb->prefix . 'frm_item_metas', array( 'item_id' => $entry_id ), 'meta_value' );
-    }
+	}
 
-    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 = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, 'get_col');
+		$values = FrmAppHelper::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' .
-            FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+			FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
 
 		$cache_key = 'all_' . maybe_serialize( $where ) . $order_by . $limit;
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
+		$results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
 
-        if ( ! $results || ! $stripslashes ) {
-            return $results;
-        }
+		if ( ! $results || ! $stripslashes ) {
+			return $results;
+		}
 
-        foreach ( $results as $k => $result ) {
+		foreach ( $results as $k => $result ) {
 			$results[ $k ]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
-            unset($k, $result);
-        }
+			unset($k, $result);
+		}
 
-        return $results;
-    }
+		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 );
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
+		$results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
 
-        return $results;
-    }
+		return $results;
+	}
 
-    /**
-     * @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 );
@@ -305,89 +305,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[] = FrmAppHelper::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[] = FrmAppHelper::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[] = FrmAppHelper::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 .= '%';
-                    break;
-                    case 'day':
+					break;
+					case 'month':
+						$value .= '%';
+					break;
+					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' . FrmAppHelper::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);
 		FrmAppHelper::set_cache( $cache_key, $results, 'frm_entry' );
 
-        return $results;
-    }
+		return $results;
+	}
 }

classes/controllers/FrmHooksController.php

Spacing +2 added lines, -2 removed lines

@@ -143,8 +143,8 @@
         add_action( 'wp_ajax_frm_deauthorize', 'FrmAppController::deauthorize' );
 
 		// Addons Controller
-		add_action('wp_ajax_frm_addon_activate', 'FrmAddon::activate' );
-		add_action('wp_ajax_frm_addon_deactivate', 'FrmAddon::deactivate' );
+		add_action( 'wp_ajax_frm_addon_activate', 'FrmAddon::activate' );
+		add_action( 'wp_ajax_frm_addon_deactivate', 'FrmAddon::deactivate' );
 
         // Fields Controller
         add_action( 'wp_ajax_frm_load_field', 'FrmFieldsController::load_field' );

Indentation +140 added lines, -140 removed lines

@@ -1,90 +1,90 @@ 
 <?php
 
 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() {
-        if ( ! is_admin() ) {
-            add_filter( 'the_content', 'FrmAppController::page_route', 10 );
-        }
+		if ( ! is_admin() ) {
+			add_filter( 'the_content', 'FrmAppController::page_route', 10 );
+		}
 
-        add_action( 'plugins_loaded', 'FrmAppController::load_lang' );
-        add_filter( 'widget_text', 'FrmAppController::widget_text_filter', 8 );
+		add_action( 'plugins_loaded', 'FrmAppController::load_lang' );
+		add_filter( 'widget_text', 'FrmAppController::widget_text_filter', 8 );
 
-        // Entries controller
-        add_action( 'wp_loaded', 'FrmEntriesController::process_entry', 10, 0 );
-        add_filter( 'frm_redirect_url', 'FrmEntriesController::delete_entry_before_redirect', 50, 3 );
-        add_action( 'frm_after_entry_processed', 'FrmEntriesController::delete_entry_after_save', 100 );
-        add_filter( 'frmpro_fields_replace_shortcodes', 'FrmEntriesController::filter_shortcode_value', 10, 4 );
+		// Entries controller
+		add_action( 'wp_loaded', 'FrmEntriesController::process_entry', 10, 0 );
+		add_filter( 'frm_redirect_url', 'FrmEntriesController::delete_entry_before_redirect', 50, 3 );
+		add_action( 'frm_after_entry_processed', 'FrmEntriesController::delete_entry_after_save', 100 );
+		add_filter( 'frmpro_fields_replace_shortcodes', 'FrmEntriesController::filter_shortcode_value', 10, 4 );
 
-        // 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' );
+	}
 
 	public static function load_admin_hooks() {
-        add_action( 'admin_menu', 'FrmAppController::menu', 1 );
-        add_action( 'admin_enqueue_scripts', 'FrmAppController::load_wp_admin_style' );
-        add_action( 'admin_notices', 'FrmAppController::pro_get_started_headline' );
+		add_action( 'admin_menu', 'FrmAppController::menu', 1 );
+		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' );
 		register_activation_hook( FrmAppHelper::plugin_folder() . '/formidable.php', 'FrmAppController::activation_install' );
@@ -92,122 +92,122 @@ 
 		// Addons Controller
 		add_action( 'admin_menu', 'FrmAddonsController::menu', 100 );
 
-        // 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 );
+		// 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 );
 
-        // Fields Controller
-        add_filter( 'frm_display_field_options', 'FrmFieldsController::display_field_options' );
+		// Fields Controller
+		add_filter( 'frm_display_field_options', 'FrmFieldsController::display_field_options' );
 
-        // 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 );
+		// 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' );
+		// 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_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' );
 
-        // 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' );
 
-        // 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 );
+	}
 
 	public static function load_ajax_hooks() {
 		add_action( 'wp_ajax_frm_silent_upgrade', 'FrmAppController::ajax_install' );
 		add_action( 'wp_ajax_nopriv_frm_silent_upgrade', 'FrmAppController::ajax_install' );
 		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' );
 		add_action('wp_ajax_frm_addon_deactivate', 'FrmAddon::deactivate' );
 		add_action( 'wp_ajax_frm_fill_licenses', 'FrmAddonsController::get_licenses' );
 
-        // 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_field_name_in_place_edit', 'FrmFieldsController::edit_name' );
-        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_field_option_ipe', 'FrmFieldsController::edit_option' );
-        add_action( 'wp_ajax_frm_delete_field_option', 'FrmFieldsController::delete_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_field_name_in_place_edit', 'FrmFieldsController::edit_name' );
+		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_field_option_ipe', 'FrmFieldsController::edit_option' );
+		add_action( 'wp_ajax_frm_delete_field_option', 'FrmFieldsController::delete_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_create_from_template', 'FrmFormsController::_create_from_template' );
 		add_action( 'wp_ajax_frm_save_form', 'FrmFormsController::route' );
 		add_action( 'wp_ajax_frm_form_key_in_place_edit', 'FrmFormsController::edit_key' );
 		add_action( 'wp_ajax_frm_form_desc_in_place_edit', 'FrmFormsController::edit_description' );
-        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' );
-
-        // 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_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' );
+
+		// 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_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( 'init', 'FrmAppController::front_head' );
 		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' );
+	}
 }

classes/models/FrmEntryFormat.php

Indentation +7 added lines, -7 removed lines

@@ -126,19 +126,19 @@
 	}
 
 	/**
-	* Flatten multi-dimensional array for multi-file upload fields
-	* @since 2.0.9
-	*/
+	 * Flatten multi-dimensional array for multi-file upload fields
+	 * @since 2.0.9
+	 */
 	public static function flatten_multi_file_upload( $field, &$val ) {
 		if ( $field->type == 'file' && FrmField::is_option_true( $field, 'multiple' ) ) {
 			$val = FrmAppHelper::array_flatten( $val );
 		}
 	}
 
-    /**
-     * Replace returns with HTML line breaks for display
-     * @since 2.0.9
-     */
+	/**
+	 * Replace returns with HTML line breaks for display
+	 * @since 2.0.9
+	 */
 	public static function textarea_display_value( $type, $plain_text, &$value ) {
 		if ( $type == 'textarea' && ! $plain_text ) {
 			$value = str_replace( array( "\r\n", "\r", "\n" ), ' <br/>', $value );

Spacing +17 added lines, -17 removed lines

@@ -37,20 +37,20 @@ 
 			$atts['id'] = $atts['entry']->id;
 		}
 
-		if ( ! $atts['fields'] || ! is_array($atts['fields']) ) {
+		if ( ! $atts['fields'] || ! is_array( $atts['fields'] ) ) {
 			$atts['fields'] = FrmField::get_all_for_form( $atts['form_id'], '', 'include' );
 		}
 
 		$values = array();
 		foreach ( $atts['fields'] as $f ) {
 			self::fill_entry_values( $atts, $f, $values );
-			unset($f);
+			unset( $f );
 		}
 
 		self::fill_entry_user_info( $atts, $values );
 
 		if ( $atts['format'] == 'json' ) {
-			return json_encode($values);
+			return json_encode( $values );
 		} else if ( $atts['format'] == 'array' ) {
 			return $values;
 		}
@@ -59,7 +59,7 @@ 
 		self::convert_entry_to_content( $values, $atts, $content );
 
 		if ( 'text' == $atts['format'] ) {
-			$content = implode('', $content);
+			$content = implode( '', $content );
 		}
 
 		if ( $atts['clickable'] ) {
@@ -82,7 +82,7 @@ 
 			'val' => '[' . $f->id . ']'
 		);
 
-		$values[ $f->id ] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $field_shortcodes, $f );
+		$values[$f->id] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $field_shortcodes, $f );
 	}
 
 	public static function fill_entry_values( $atts, $f, array &$values ) {
@@ -95,9 +95,9 @@ 
 			return;
 		}
 
-		if ( $atts['entry'] && ! isset( $atts['entry']->metas[ $f->id ] ) ) {
+		if ( $atts['entry'] && ! isset( $atts['entry']->metas[$f->id] ) ) {
 			// In case include_blank is set
-			$atts['entry']->metas[ $f->id ] = '';
+			$atts['entry']->metas[$f->id] = '';
 
 			if ( FrmAppHelper::pro_is_installed() ) {
 				FrmProEntryMeta::add_post_value_to_entry( $f, $atts['entry'] );
@@ -107,7 +107,7 @@ 
 
 		$val = '';
 		if ( $atts['entry'] ) {
-			$prev_val = maybe_unserialize( $atts['entry']->metas[ $f->id ] );
+			$prev_val = maybe_unserialize( $atts['entry']->metas[$f->id] );
 			$meta = array( 'item_id' => $atts['id'], 'field_id' => $f->id, 'meta_value' => $prev_val, 'field_type' => $f->type );
 
 			//This filter applies to the default-message shortcode and frm-show-entry shortcode only
@@ -132,12 +132,12 @@ 
 		self::maybe_strip_html( $atts['plain_text'], $val );
 
 		if ( $atts['format'] != 'text' ) {
-			$values[ $f->field_key ] = $val;
+			$values[$f->field_key] = $val;
 			if ( isset( $prev_val ) && $prev_val != $val && $f->type != 'textarea' ) {
-				$values[ $f->field_key . '-value' ] = $prev_val;
+				$values[$f->field_key . '-value'] = $prev_val;
 			}
 		} else {
-			$values[ $f->id ] = array( 'label' => $f->name, 'val' => $val );
+			$values[$f->id] = array( 'label' => $f->name, 'val' => $val );
 		}
 	}
 
@@ -183,7 +183,7 @@ 
 			return;
 		}
 
-		$data  = self::get_entry_description_data( $atts );
+		$data = self::get_entry_description_data( $atts );
 
 		if ( $atts['default_email'] ) {
 			$atts['entry']->ip = '[ip]';
@@ -270,7 +270,7 @@ 
 		preg_match_all( $pattern, $u_agent, $matches ); // get the matching numbers
 
 		// see how many we have
-		$i = count($matches['browser']);
+		$i = count( $matches['browser'] );
 		if ( $i != 1 ) {
 			//we will have two since we are not using 'other' argument yet
 			//see if version is before or after the name
@@ -307,15 +307,15 @@ 
 
 			// merge defaults, global settings, and shortcode options
 			foreach ( $default_settings as $key => $setting ) {
-				if ( $atts[ $key ] != '' ) {
+				if ( $atts[$key] != '' ) {
 					continue;
 				}
 
-				$atts[ $key ] = $setting;
+				$atts[$key] = $setting;
 				unset( $key, $setting );
 			}
 
-			unset($default_settings);
+			unset( $default_settings );
 
 			$content[] = '<table cellspacing="0" style="font-size:' . $atts['font_size'] . ';line-height:135%; border-bottom:' . $atts['border_width'] . ' solid #' . $atts['border_color'] . ';"><tbody>' . "\r\n";
 			$atts['bg_color'] = ' style="background-color:#' . $atts['bg_color'] . ';"';
@@ -338,7 +338,7 @@ 
 				continue;
 			}
 
-			if ( $atts['default_email'] && is_numeric($id) ) {
+			if ( $atts['default_email'] && is_numeric( $id ) ) {
 				$content[] = '[if ' . $id . ']<tr style="[frm-alt-color]">';
 			} else {
 				$content[] = '<tr' . ( $odd ? $atts['bg_color'] : $bg_color_alt ) . '>';

classes/views/frm-entries/_sidebar-shared-pub.php

Indentation +2 added lines, -2 removed lines

@@ -1,12 +1,12 @@
 <?php
 if ( ! isset( $entry) ) {
-    $entry = $record;
+	$entry = $record;
 } ?>
 
 <div class="misc-pub-section curtime misc-pub-curtime">
     <span id="timestamp">
     <?php
-    $date_format = __( 'M j, Y @ G:i' );
+	$date_format = __( 'M j, Y @ G:i' );
 	printf( __( 'Published on: <b>%1$s</b>' ), FrmAppHelper::get_localized_date( $date_format, $entry->created_at ) ); ?>
     </span>
 </div>

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! isset( $entry) ) {
+if ( ! isset( $entry ) ) {
     $entry = $record;
 } ?>
 
@@ -18,4 +18,4 @@ 
 </div>
 <?php } ?>
 
-<?php do_action('frm_entry_shared_sidebar', $entry); ?>
+<?php do_action( 'frm_entry_shared_sidebar', $entry ); ?>

classes/views/frm-entries/form.php

Indentation +6 added lines, -6 removed lines

@@ -5,7 +5,7 @@ 
     </div>
 </div>
 <?php
-    return;
+	return;
 }
 
 global $frm_vars;
@@ -38,7 +38,7 @@ 
 		} else {
 			do_action( 'frm_show_other_field_type', $field, $form, array( 'action' => $form_action ) );
 		}
-    	do_action('frm_get_field_scripts', $field, $form, $form->id);
+		do_action('frm_get_field_scripts', $field, $form, $form->id);
 	}
 }
 
@@ -63,8 +63,8 @@ 
 
 // close open collapsible toggle div
 if ( isset($frm_vars['collapse_div']) && $frm_vars['collapse_div'] ) {
-    echo "</div>\n";
-    unset($frm_vars['collapse_div']);
+	echo "</div>\n";
+	unset($frm_vars['collapse_div']);
 }
 
 echo FrmFormsHelper::replace_shortcodes($values['after_html'], $form);
@@ -77,8 +77,8 @@ 
 }
 
 if ( FrmForm::show_submit( $form ) ) {
-    unset($values['fields']);
-    FrmFormsHelper::get_custom_submit($values['submit_html'], $form, $submit, $form_action, $values);
+	unset($values['fields']);
+	FrmFormsHelper::get_custom_submit($values['submit_html'], $form, $submit, $form_action, $values);
 }
 ?>
 </fieldset>

Spacing +17 added lines, -17 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( empty($values) || ! isset($values['fields']) || empty($values['fields']) ) { ?>
-<div class="frm_forms <?php echo FrmFormsHelper::get_form_style_class($form); ?>" id="frm_form_<?php echo esc_attr( $form->id ) ?>_container">
+if ( empty( $values ) || ! isset( $values['fields'] ) || empty( $values['fields'] ) ) { ?>
+<div class="frm_forms <?php echo FrmFormsHelper::get_form_style_class( $form ); ?>" id="frm_form_<?php echo esc_attr( $form->id ) ?>_container">
 	<div class="frm_error_style"><strong><?php _e( 'Oops!', 'formidable' ) ?></strong> <?php printf( __( 'You did not add any fields to your form. %1$sGo back%2$s and add some.', 'formidable' ), '<a href="' . esc_url( admin_url( '?page=formidable&frm_action=edit&id=' . $form->id ) ) . '">', '</a>' ) ?>
     </div>
 </div>
@@ -18,10 +18,10 @@ 
 <div class="frm_form_fields <?php echo esc_attr( apply_filters( 'frm_form_fields_class', '', $values ) ); ?>">
 <fieldset>
 <?php echo FrmFormsHelper::replace_shortcodes( $values['before_html'], $form, $title, $description ); ?>
-<input type="hidden" name="frm_action" value="<?php echo esc_attr($form_action) ?>" />
-<input type="hidden" name="form_id" value="<?php echo esc_attr($form->id) ?>" />
-<input type="hidden" name="frm_hide_fields_<?php echo esc_attr( $form->id ) ?>" id="frm_hide_fields_<?php echo esc_attr( $form->id ) ?>" value="<?php echo esc_attr($frm_hide_fields) ?>" />
-<input type="hidden" name="form_key" value="<?php echo esc_attr($form->form_key) ?>" />
+<input type="hidden" name="frm_action" value="<?php echo esc_attr( $form_action ) ?>" />
+<input type="hidden" name="form_id" value="<?php echo esc_attr( $form->id ) ?>" />
+<input type="hidden" name="frm_hide_fields_<?php echo esc_attr( $form->id ) ?>" id="frm_hide_fields_<?php echo esc_attr( $form->id ) ?>" value="<?php echo esc_attr( $frm_hide_fields ) ?>" />
+<input type="hidden" name="form_key" value="<?php echo esc_attr( $form->form_key ) ?>" />
 <input type="hidden" name="item_meta[0]" value="" />
 <?php wp_nonce_field( 'frm_submit_entry_nonce', 'frm_submit_entry_' . $form->id ); ?>
 
@@ -34,7 +34,7 @@ 
 		} else {
 			do_action( 'frm_show_other_field_type', $field, $form, array( 'action' => $form_action ) );
 		}
-    	do_action('frm_get_field_scripts', $field, $form, $form->id);
+    	do_action( 'frm_get_field_scripts', $field, $form, $form->id );
 	}
 }
 
@@ -42,13 +42,13 @@ 
 if ( FrmAppHelper::is_admin() ) { ?>
 <div class="frm_form_field form-field">
 <label class="frm_primary_label"><?php _e( 'Entry Key', 'formidable' ) ?></label>
-<input type="text" name="item_key" value="<?php echo esc_attr($values['item_key']) ?>" />
+<input type="text" name="item_key" value="<?php echo esc_attr( $values['item_key'] ) ?>" />
 </div>
 <?php } else { ?>
-<input type="hidden" name="item_key" value="<?php echo esc_attr($values['item_key']) ?>" />
+<input type="hidden" name="item_key" value="<?php echo esc_attr( $values['item_key'] ) ?>" />
 <?php }
 
-do_action('frm_entry_form', $form, $form_action, $errors);
+do_action( 'frm_entry_form', $form, $form_action, $errors );
 
 global $frm_vars;
 // close open section div
@@ -58,23 +58,23 @@ 
 }
 
 // close open collapsible toggle div
-if ( isset($frm_vars['collapse_div']) && $frm_vars['collapse_div'] ) {
+if ( isset( $frm_vars['collapse_div'] ) && $frm_vars['collapse_div'] ) {
     echo "</div>\n";
-    unset($frm_vars['collapse_div']);
+    unset( $frm_vars['collapse_div'] );
 }
 
-echo FrmFormsHelper::replace_shortcodes($values['after_html'], $form);
+echo FrmFormsHelper::replace_shortcodes( $values['after_html'], $form );
 
 
-if ( has_action('frm_entries_footer_scripts') ) { ?>
+if ( has_action( 'frm_entries_footer_scripts' ) ) { ?>
 <script type="text/javascript">
-<?php do_action('frm_entries_footer_scripts', $values['fields'], $form); ?>
+<?php do_action( 'frm_entries_footer_scripts', $values['fields'], $form ); ?>
 </script><?php
 }
 
 if ( FrmForm::show_submit( $form ) ) {
-    unset($values['fields']);
-    FrmFormsHelper::get_custom_submit($values['submit_html'], $form, $submit, $form_action, $values);
+    unset( $values['fields'] );
+    FrmFormsHelper::get_custom_submit( $values['submit_html'], $form, $submit, $form_action, $values );
 }
 ?>
 </fieldset>

classes/views/frm-entries/sidebar-shared.php

Indentation +7 added lines, -7 removed lines

@@ -66,18 +66,18 @@
         <?php } ?>
 
         <?php
-        foreach ( (array) $data as $k => $d ) {
+		foreach ( (array) $data as $k => $d ) {
 			if ( in_array( $k, array( 'browser', 'referrer' ) ) ) {
-                continue;
-            }
-        ?>
+				continue;
+			}
+		?>
         <div class="misc-pub-section">
 			<b><?php echo sanitize_text_field( ucfirst( str_replace( '-', ' ', $k ) ) ); ?></b>:
 			<?php echo wp_kses_post( implode( ', ', (array) $d ) ); ?>
         </div>
         <?php
-            unset($k, $d);
-        }
-        ?>
+			unset($k, $d);
+		}
+		?>
     </div>
 </div>

Spacing +5 added lines, -5 removed lines

@@ -6,7 +6,7 @@ 
         <div class="misc-pub-section">
             <span class="dashicons dashicons-admin-post wp-media-buttons-icon"></span>
             <?php _e( 'Post', 'formidable' ) ?>:
-            <b><?php echo get_the_title($entry->post_id) ?></b>
+            <b><?php echo get_the_title( $entry->post_id ) ?></b>
 			<span>
 				<a href="<?php echo esc_url( admin_url( 'post.php?post=' . $entry->post_id . '&action=edit' ) ) ?>">
 					<?php _e( 'Edit', 'formidable' ) ?>
@@ -41,7 +41,7 @@ 
         <?php if ( $entry->updated_by && $entry->updated_by != $entry->user_id ) { ?>
         <div class="misc-pub-section">
             <span class="dashicons dashicons-admin-users wp-media-buttons-icon"></span>
-			<?php printf( __( 'Updated by: %1$s', 'formidable' ), FrmProFieldsHelper::get_display_name( $entry->updated_by,  'display_name', array( 'link' => true ) ) ); ?>
+			<?php printf( __( 'Updated by: %1$s', 'formidable' ), FrmProFieldsHelper::get_display_name( $entry->updated_by, 'display_name', array( 'link' => true ) ) ); ?>
         </div>
         <?php } ?>
         <?php } ?>
@@ -64,10 +64,10 @@ 
         </div>
         <?php } ?>
 
-        <?php if ( isset($data['referrer']) ) { ?>
+        <?php if ( isset( $data['referrer'] ) ) { ?>
         <div class="misc-pub-section">
             <b><?php _e( 'Referrer', 'formidable' ) ?></b>:<br/>
-			<?php echo wp_kses_post( str_replace( "\r\n", '<br/>', $data['referrer'] ) );  ?>
+			<?php echo wp_kses_post( str_replace( "\r\n", '<br/>', $data['referrer'] ) ); ?>
         </div>
         <?php } ?>
 
@@ -82,7 +82,7 @@ 
 			<?php echo wp_kses_post( implode( ', ', (array) $d ) ); ?>
         </div>
         <?php
-            unset($k, $d);
+            unset( $k, $d );
         }
         ?>
     </div>

classes/views/frm-form-actions/default_actions.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 class FrmDefPostAction extends FrmFormAction {
 	public function __construct() {
 		$action_ops = FrmFormAction::default_action_opts();
-	    $action_ops['classes'] = 'ab-icon frm_dashicon_font dashicons-before';
+		$action_ops['classes'] = 'ab-icon frm_dashicon_font dashicons-before';
 
 		parent::__construct( 'wppost', __( 'Create Post', 'formidable' ), $action_ops );
 	}

Spacing +6 added lines, -6 removed lines

@@ -12,7 +12,7 @@ 
 // add register action
 class FrmDefRegAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops = FrmFormAction::default_action_opts('frm_register_icon');
+		$action_ops = FrmFormAction::default_action_opts( 'frm_register_icon' );
 		parent::__construct( 'register', __( 'Register User', 'formidable' ), $action_ops );
 	}
 }
@@ -20,7 +20,7 @@ 
 // add paypal action
 class FrmDefPayPalAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops = FrmFormAction::default_action_opts('frm_paypal_icon');
+		$action_ops = FrmFormAction::default_action_opts( 'frm_paypal_icon' );
 		parent::__construct( 'paypal', __( 'Collect Payment', 'formidable' ), $action_ops );
 	}
 }
@@ -28,7 +28,7 @@ 
 // add aweber action
 class FrmDefAweberAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops = FrmFormAction::default_action_opts('frm_aweber_icon');
+		$action_ops = FrmFormAction::default_action_opts( 'frm_aweber_icon' );
 		parent::__construct( 'aweber', __( 'Aweber', 'formidable' ), $action_ops );
 	}
 }
@@ -36,7 +36,7 @@ 
 // add mailchimp action
 class FrmDefMlcmpAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops = FrmFormAction::default_action_opts('frm_mailchimp_icon');
+		$action_ops = FrmFormAction::default_action_opts( 'frm_mailchimp_icon' );
 		parent::__construct( 'mailchimp', __( 'MailChimp', 'formidable' ), $action_ops );
 	}
 }
@@ -44,7 +44,7 @@ 
 // add twilio action
 class FrmDefTwilioAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops = FrmFormAction::default_action_opts('frm_sms_icon');
+		$action_ops = FrmFormAction::default_action_opts( 'frm_sms_icon' );
 		parent::__construct( 'twilio', __( 'Twilio', 'formidable' ), $action_ops );
 	}
 }
@@ -52,7 +52,7 @@ 
 // add highrise action
 class FrmDefHrsAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops = FrmFormAction::default_action_opts('frm_highrise_icon');
+		$action_ops = FrmFormAction::default_action_opts( 'frm_highrise_icon' );
 		parent::__construct( 'highrise', __( 'Highrise', 'formidable' ), $action_ops );
 	}
 }

classes/views/frm-forms/_publish_box.php

Indentation +8 added lines, -8 removed lines

@@ -12,15 +12,15 @@ 
             <?php } ?>
             <div id="preview-action">
                 <?php
-                if ( ! isset($hide_preview) || ! $hide_preview ) {
+				if ( ! isset($hide_preview) || ! $hide_preview ) {
 
-                    if ( isset($values['form_key']) ) {
-                        $frm_settings = FrmAppHelper::get_settings();
-                        if ( empty($frm_settings->preview_page_id) ) { ?>
+					if ( isset($values['form_key']) ) {
+						$frm_settings = FrmAppHelper::get_settings();
+						if ( empty($frm_settings->preview_page_id) ) { ?>
                     <a href="<?php echo esc_url( FrmFormsHelper::get_direct_link($values['form_key']) ); ?>" class="preview button" target="wp-frm-preview-<?php echo esc_attr( $id ) ?>"><?php _e( 'Preview', 'formidable' ) ?></a>
                 <?php
-                        } else {
-                ?>
+						} else {
+				?>
                     <div class="preview dropdown">
                         <a href="#" id="frm-previewDrop" class="frm-dropdown-toggle button" data-toggle="dropdown"><?php _e( 'Preview', 'formidable' ) ?> <b class="caret"></b></a>
 
@@ -30,8 +30,8 @@ 
                     	</ul>
                     </div>
                 <?php   }
-                    }
-                } ?>
+					}
+				} ?>
             </div>
             <?php if ( 'draft' == $values['status'] ) { ?>
             <div class="clear"></div>

Spacing +17 added lines, -17 removed lines

@@ -6,18 +6,18 @@ 
         <div id="minor-publishing-actions">
             <?php if ( 'draft' == $values['status'] ) { ?>
             <div id="save-action">
-        	    <input type="button" value="<?php esc_html_e( 'Save Draft', 'formidable' ); ?>" class="frm_submit_form frm_submit_<?php echo ( isset($values['ajax_load']) && $values['ajax_load'] ) ? '': 'no_'; ?>ajax button-secondary button-large" id="save-post" />
+        	    <input type="button" value="<?php esc_html_e( 'Save Draft', 'formidable' ); ?>" class="frm_submit_form frm_submit_<?php echo ( isset( $values['ajax_load'] ) && $values['ajax_load'] ) ? '' : 'no_'; ?>ajax button-secondary button-large" id="save-post" />
         	    <span class="spinner"></span>
             </div>
             <?php } ?>
             <div id="preview-action">
                 <?php
-                if ( ! isset($hide_preview) || ! $hide_preview ) {
+                if ( ! isset( $hide_preview ) || ! $hide_preview ) {
 
-                    if ( isset($values['form_key']) ) {
+                    if ( isset( $values['form_key'] ) ) {
                         $frm_settings = FrmAppHelper::get_settings();
-                        if ( empty($frm_settings->preview_page_id) ) { ?>
-                    <a href="<?php echo esc_url( FrmFormsHelper::get_direct_link($values['form_key']) ); ?>" class="preview button" target="wp-frm-preview-<?php echo esc_attr( $id ) ?>"><?php _e( 'Preview', 'formidable' ) ?></a>
+                        if ( empty( $frm_settings->preview_page_id ) ) { ?>
+                    <a href="<?php echo esc_url( FrmFormsHelper::get_direct_link( $values['form_key'] ) ); ?>" class="preview button" target="wp-frm-preview-<?php echo esc_attr( $id ) ?>"><?php _e( 'Preview', 'formidable' ) ?></a>
                 <?php
                         } else {
                 ?>
@@ -25,8 +25,8 @@ 
                         <a href="#" id="frm-previewDrop" class="frm-dropdown-toggle button" data-toggle="dropdown"><?php _e( 'Preview', 'formidable' ) ?> <b class="caret"></b></a>
 
                         <ul class="frm-dropdown-menu pull-right" role="menu" aria-labelledby="frm-previewDrop">
-                            <li><a href="<?php echo esc_url( FrmFormsHelper::get_direct_link($values['form_key']) ); ?>" target="_blank"><?php _e( 'On Blank Page', 'formidable' ) ?></a></li>
-                            <li><a href="<?php echo esc_url( add_query_arg('form', $values['form_key'], get_permalink( $frm_settings->preview_page_id )) ) ?>" target="_blank"><?php _e( 'In Theme', 'formidable' ) ?></a></li>
+                            <li><a href="<?php echo esc_url( FrmFormsHelper::get_direct_link( $values['form_key'] ) ); ?>" target="_blank"><?php _e( 'On Blank Page', 'formidable' ) ?></a></li>
+                            <li><a href="<?php echo esc_url( add_query_arg( 'form', $values['form_key'], get_permalink( $frm_settings->preview_page_id ) ) ) ?>" target="_blank"><?php _e( 'In Theme', 'formidable' ) ?></a></li>
                     	</ul>
                     </div>
                 <?php   }
@@ -62,24 +62,24 @@ 
 
 
             <div class="misc-pub-section misc-pub-post-status"><label for="post_status"><?php _e( 'Status', 'formidable' ) ?>:</label>
-                <span id="form-status-display"><?php echo FrmFormsHelper::status_nice_name($values['status']); ?></span>
+                <span id="form-status-display"><?php echo FrmFormsHelper::status_nice_name( $values['status'] ); ?></span>
 				<?php if ( 'draft' != $values['status'] && ( ! isset( $_GET['frm_action'] ) || 'settings' != FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ) ) ) { ?>
-                <a href="#post_status" class="edit-form-status hide-if-no-js" data-slidedown="form-status-select"><span aria-hidden="true"><?php _e( 'Edit') ?></span> <span class="screen-reader-text"><?php _e( 'Edit status') ?></span></a>
+                <a href="#post_status" class="edit-form-status hide-if-no-js" data-slidedown="form-status-select"><span aria-hidden="true"><?php _e( 'Edit' ) ?></span> <span class="screen-reader-text"><?php _e( 'Edit status' ) ?></span></a>
 
                 <div id="form-status-select" class="frm_hidden">
                     <select name="frm_change_status" id="form_change_status">
-                        <option value="published" <?php selected($values['status'], 'published') ?>><?php _e( 'Published' ) ?></option>
-                        <option value="draft" <?php selected($values['status'], 'draft') ?>><?php _e( 'Draft' ) ?></option>
+                        <option value="published" <?php selected( $values['status'], 'published' ) ?>><?php _e( 'Published' ) ?></option>
+                        <option value="draft" <?php selected( $values['status'], 'draft' ) ?>><?php _e( 'Draft' ) ?></option>
                     </select>
-                    <a href="#post_status" class="save-form-status hide-if-no-js button"><?php _e( 'OK') ?></a>
-                    <a href="#post_status" class="cancel-form-status hide-if-no-js button-cancel" data-slideup="form-status-select"><?php _e( 'Cancel') ?></a>
+                    <a href="#post_status" class="save-form-status hide-if-no-js button"><?php _e( 'OK' ) ?></a>
+                    <a href="#post_status" class="cancel-form-status hide-if-no-js button-cancel" data-slideup="form-status-select"><?php _e( 'Cancel' ) ?></a>
                 </div>
                 <?php } ?>
             </div><!-- .misc-pub-section -->
 
-            <?php if ( has_action('frm_settings_buttons') ) { ?>
+            <?php if ( has_action( 'frm_settings_buttons' ) ) { ?>
             <div class="misc-pub-section">
-                <?php do_action('frm_settings_buttons', $values); ?>
+                <?php do_action( 'frm_settings_buttons', $values ); ?>
                 <div class="clear"></div>
             </div>
             <?php } ?>
@@ -90,7 +90,7 @@ 
 
     <div id="major-publishing-actions">
         <div id="delete-action">
-            <?php echo FrmFormsHelper::delete_trash_link($id, $values['status']); ?>
+            <?php echo FrmFormsHelper::delete_trash_link( $id, $values['status'] ); ?>
         </div>
 
 		<div id="publishing-action">
@@ -98,7 +98,7 @@ 
 			<?php if ( 'settings' == FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ) ) { ?>
 			<input type="button" value="<?php esc_attr_e( 'Update', 'formidable' ); ?>" class="frm_submit_form frm_submit_settings_btn button-primary button-large" id="frm_submit_side_top" />
             <?php } else { ?>
-    	    <input type="button" value="<?php echo isset($button) ? esc_attr($button) : __( 'Update', 'formidable' ); ?>" class="frm_submit_form frm_submit_<?php echo ( isset($values['ajax_load']) && $values['ajax_load'] ) ? '': 'no_'; ?>ajax button-primary button-large" id="frm_submit_side_top" />
+    	    <input type="button" value="<?php echo isset( $button ) ? esc_attr( $button ) : __( 'Update', 'formidable' ); ?>" class="frm_submit_form frm_submit_<?php echo ( isset( $values['ajax_load'] ) && $values['ajax_load'] ) ? '' : 'no_'; ?>ajax button-primary button-large" id="frm_submit_side_top" />
     	    <?php } ?>
 		</div>
 

classes/views/frm-forms/add_field_links.php

Indentation +31 added lines, -31 removed lines

@@ -62,16 +62,16 @@ 
                 	</ul>
                 </li>
 <?php
-                } else {
-                    $field_label = $field_type;
-                    ?>
+				} else {
+					$field_label = $field_type;
+					?>
                     <li class="frmbutton button <?php echo esc_attr( $col_class .' '. $no_allow_class .' frm_t'. $field_key ) ?>" id="<?php echo esc_attr( $field_key ) ?>"><?php echo apply_filters( 'frmpro_field_links', $field_label, $id, $field_key ) ?></li>
                     <?php
-                }
+				}
 
-                $col_class = empty($col_class) ? 'frm_col_one' : '';
-                unset($field_key, $field_type, $field_label);
-            } ?>
+				$col_class = empty($col_class) ? 'frm_col_one' : '';
+				unset($field_key, $field_type, $field_label);
+			} ?>
             </ul>
             <div class="clear"></div>
         </div>
@@ -81,33 +81,33 @@ 
 			<p class="howto"><?php _e( 'Add classes in the "CSS layout classes" field option', 'formidable' ) ?></p>
     	    <ul class="frm_code_list">
     	    <?php $classes = array(
-                    'frm_first'     => array(
-                        'label' => __( 'First', 'formidable' ),
-                        'title' => __( 'Add this to the first field in each row along with a width. ie frm_first frm_third', 'formidable' ),
-                    ),
-                    'frm_half'      => __( '1/2', 'formidable' ),
-                    'frm_third'     => __( '1/3', 'formidable' ),
-                    'frm_two_thirds' => __( '2/3', 'formidable' ),
-    	            'frm_fourth'    => __( '1/4', 'formidable' ),
+					'frm_first'     => array(
+						'label' => __( 'First', 'formidable' ),
+						'title' => __( 'Add this to the first field in each row along with a width. ie frm_first frm_third', 'formidable' ),
+					),
+					'frm_half'      => __( '1/2', 'formidable' ),
+					'frm_third'     => __( '1/3', 'formidable' ),
+					'frm_two_thirds' => __( '2/3', 'formidable' ),
+					'frm_fourth'    => __( '1/4', 'formidable' ),
 					'frm_three_fourths' => __( '3/4', 'formidable' ),
-                    'frm_fifth'     => __( '1/5', 'formidable' ),
+					'frm_fifth'     => __( '1/5', 'formidable' ),
 					'frm_two_fifths' => __( '2/5', 'formidable' ),
-                    'frm_sixth'     => __( '1/6', 'formidable' ),
-                    'frm_seventh'   => __( '1/7', 'formidable' ),
+					'frm_sixth'     => __( '1/6', 'formidable' ),
+					'frm_seventh'   => __( '1/7', 'formidable' ),
 					'frm_eighth'    => __( '1/8', 'formidable' ),
 					'frm_alignright' => __( 'Right', 'formidable' ),
-    	            'frm_inline'    => array(
-                        'label' => __( 'Inline', 'formidable' ),
+					'frm_inline'    => array(
+						'label' => __( 'Inline', 'formidable' ),
 						'title' => __( 'Align fields in a row without a specific width.', 'formidable' ),
-                    ),
+					),
 
-    	            'frm_full' => array(
-                        'label' => __( '100% width', 'formidable' ),
+					'frm_full' => array(
+						'label' => __( '100% width', 'formidable' ),
 						'title' => __( 'Force the field to fill the full space with 100% width.', 'formidable' ),
-                    ),
-    	            'frm_grid_first' => __( 'First Grid Row', 'formidable' ),
-    	            'frm_grid' => __( 'Even Grid Row', 'formidable' ),
-    	            'frm_grid_odd' => __( 'Odd Grid Row', 'formidable' ),
+					),
+					'frm_grid_first' => __( 'First Grid Row', 'formidable' ),
+					'frm_grid' => __( 'Even Grid Row', 'formidable' ),
+					'frm_grid_odd' => __( 'Odd Grid Row', 'formidable' ),
 					'frm_two_col' => array( 'label' => __( '2 Col Options', 'formidable' ), 'title' => __( 'Put your radio button or checkbox options into two columns.', 'formidable' ) ),
 					'frm_three_col' => array( 'label' => __( '3 Col Options', 'formidable' ), 'title' => __( 'Put your radio button or checkbox options into three columns.', 'formidable' ) ),
 					'frm_four_col' => array( 'label' => __( '4 Col Options', 'formidable' ), 'title' => __( 'Put your radio button or checkbox options into four columns.', 'formidable' ) ),
@@ -115,7 +115,7 @@ 
 					'frm_scroll_box' => array( 'label' => __( 'Scroll Box', 'formidable' ), 'title' => __( 'If you have many checkbox or radio button options, you may add this class to allow your user to easily scroll through the options.', 'formidable' ) ),
 					'frm_text_block' => array( 'label' => __( 'Align Option Text', 'formidable' ), 'title' => __( 'If you have a large amount of text in a checkbox or radio button field, use this class to align all the text in a block.', 'formidable' ) ),
 					'frm_capitalize' => array( 'label' => __( 'Capitalize', 'formidable' ), 'title' => __( 'Automatically capitalize the first letter in each word.', 'formidable' ) ),
-    	        );
+				);
 
 $classes = apply_filters( 'frm_layout_classes', $classes );
 $col = 'one';
@@ -132,11 +132,11 @@ 
 	} ?>>
 <?php
 	if ( empty( $d ) ) {
-    	echo $c;
+		echo $c;
 	} else if ( ! is_array( $d ) ) {
-    	echo $d;
+		echo $d;
 	} else if ( isset( $d['label'] ) ) {
-    	echo $d['label'];
+		echo $d['label'];
 	}
 ?>
                     </a>

Spacing +8 added lines, -8 removed lines

@@ -17,7 +17,7 @@ 
         <ul id="category-tabs" class="category-tabs frm-category-tabs">
     		<li class="tabs" ><a href="#frm-insert-fields" id="frm_insert_fields_tab"><?php _e( 'Fields', 'formidable' ); ?></a></li>
     		<li class="hide-if-no-js"><a href="#frm-layout-classes" id="frm_layout_classes_tab" class="frm_help" title="<?php esc_attr_e( 'Open the Field Options and click on the CSS Layout Classes option to enable this tab', 'formidable' ) ?>"><?php _e( 'Layout', 'formidable' ); ?></a></li>
-<?php do_action('frm_extra_form_instruction_tabs'); ?>
+<?php do_action( 'frm_extra_form_instruction_tabs' ); ?>
     	</ul>
 
     	<div id="frm-insert-fields" class="tabs-panel">
@@ -78,13 +78,13 @@ 
                     <?php
                 }
 
-                $col_class = empty($col_class) ? 'frm_col_one' : '';
-                unset($field_key, $field_type, $field_label);
+                $col_class = empty( $col_class ) ? 'frm_col_one' : '';
+                unset( $field_key, $field_type, $field_label );
             } ?>
             </ul>
             <div class="clear"></div>
         </div>
-    	<?php do_action('frm_extra_form_instructions'); ?>
+    	<?php do_action( 'frm_extra_form_instructions' ); ?>
 
     	<div id="frm-layout-classes" class="tabs-panel">
 			<p class="howto"><?php _e( 'Add classes in the "CSS layout classes" field option', 'formidable' ) ?></p>
@@ -135,9 +135,9 @@ 
                     <a href="javascript:void(0);" class="frmbutton frm_insert_code button show_frm_classes<?php
 	if ( ! empty( $title ) ) {
 		echo ' frm_help';
-	} ?>" data-code="<?php echo esc_attr($c) ?>" <?php
+	} ?>" data-code="<?php echo esc_attr( $c ) ?>" <?php
 	if ( ! empty( $title ) ) {
-		?>title="<?php echo esc_attr($title); ?>"<?php
+		?>title="<?php echo esc_attr( $title ); ?>"<?php
 	} ?>>
 <?php
 	if ( empty( $d ) ) {
@@ -162,14 +162,14 @@ 
 
     <div class="submitbox" id="major-publishing-actions">
         <div id="delete-action">
-            <?php echo FrmFormsHelper::delete_trash_link($id, $values['status']); ?>
+            <?php echo FrmFormsHelper::delete_trash_link( $id, $values['status'] ); ?>
         </div>
 
         <div id="publishing-action">
             <form method="post" id="frm_js_build_form">
             <span class="spinner"></span>
 		    <input type="hidden" id="frm_compact_fields" name="frm_compact_fields" value="" />
-    	    <input type="button" value="<?php echo esc_attr($button) ?>" class="frm_submit_form frm_submit_<?php echo ( isset($values['ajax_load']) && $values['ajax_load'] ) ? '': 'no_'; ?>ajax button-primary button-large" id="frm_submit_side" />
+    	    <input type="button" value="<?php echo esc_attr( $button ) ?>" class="frm_submit_form frm_submit_<?php echo ( isset( $values['ajax_load'] ) && $values['ajax_load'] ) ? '' : 'no_'; ?>ajax button-primary button-large" id="frm_submit_side" />
     	    </form>
 		</div>
         <div class="clear"></div>