Strategy11 / formidable-forms

classes/views/frm-fields/show-build.php

Indentation +8 added lines, -8 removed lines

@@ -3,32 +3,32 @@
 <?php } else if ( $field['type'] == 'textarea' ) { ?>
     <textarea name="<?php echo esc_attr( $field_name ) ?>" <?php
 		echo ( FrmField::is_option_true( $field, 'size' ) ) ? esc_attr( 'style="width:' . $field['size'] . ( is_numeric( $field['size'] ) ? 'px' : '' ) . ';"' ) : '';
-    ?> rows="<?php echo esc_attr( $field['max'] ); ?>" id="<?php echo esc_attr( $html_id ) ?>" class="dyn_default_value"><?php echo FrmAppHelper::esc_textarea(force_balance_tags($field['default_value'])); ?></textarea>
+	?> rows="<?php echo esc_attr( $field['max'] ); ?>" id="<?php echo esc_attr( $html_id ) ?>" class="dyn_default_value"><?php echo FrmAppHelper::esc_textarea(force_balance_tags($field['default_value'])); ?></textarea>
 
 <?php
 
 } else if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
-    $field['default_value'] = maybe_unserialize($field['default_value']);
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+	$field['default_value'] = maybe_unserialize($field['default_value']);
+	if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
-    } else {
-        do_action('frm_add_multiple_opts_labels', $field); ?>
+	} else {
+		do_action('frm_add_multiple_opts_labels', $field); ?>
         <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts frm_clear<?php echo (count($field['options']) > 10) ? ' frm_field_opts_list' : ''; ?>">
 			<?php include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/radio.php' ); ?>
         </ul>
     <?php
-    }
+	}
 } else if ( $field['type'] == 'select' ) {
 	include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/dropdown-field.php' );
 } else if ( $field['type'] == 'captcha' ) {
 	if ( empty($frm_settings->pubkey) ) { ?>
     <div class="howto frm_no_captcha_text"><?php printf(__( 'Your captcha will not appear on your form until you %1$sset up%2$s the Site and Secret Keys', 'formidable' ), '<a href="?page=formidable-settings">', '</a>') ?></div>
     <?php
-    } ?>
+	} ?>
 	<img src="<?php echo esc_url( FrmAppHelper::plugin_url() . '/images/recaptcha.png' ) ?>" class="recaptcha_placeholder" alt="reCaptcha"/>
     <input type="hidden" name="<?php echo esc_attr( $field_name ) ?>" value="1" />
 <?php
 } else {
-    do_action( 'frm_display_added_fields', $field );
+	do_action( 'frm_display_added_fields', $field );
 	do_action( 'frm_display_added_' . $field['type'] . '_field', $field );
 }

Spacing +7 added lines, -7 removed lines

@@ -3,17 +3,17 @@ 
 <?php } else if ( $field['type'] == 'textarea' ) { ?>
     <textarea name="<?php echo esc_attr( $field_name ) ?>" <?php
 		echo ( FrmField::is_option_true( $field, 'size' ) ) ? esc_attr( 'style="width:' . $field['size'] . ( is_numeric( $field['size'] ) ? 'px' : '' ) . ';"' ) : '';
-    ?> rows="<?php echo esc_attr( $field['max'] ); ?>" id="<?php echo esc_attr( $html_id ) ?>" class="dyn_default_value"><?php echo FrmAppHelper::esc_textarea(force_balance_tags($field['default_value'])); ?></textarea>
+    ?> rows="<?php echo esc_attr( $field['max'] ); ?>" id="<?php echo esc_attr( $html_id ) ?>" class="dyn_default_value"><?php echo FrmAppHelper::esc_textarea( force_balance_tags( $field['default_value'] ) ); ?></textarea>
 
 <?php
 
 } else if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
-    $field['default_value'] = maybe_unserialize($field['default_value']);
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+    $field['default_value'] = maybe_unserialize( $field['default_value'] );
+    if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' ) {
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
     } else {
-        do_action('frm_add_multiple_opts_labels', $field); ?>
-        <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts frm_clear<?php echo (count($field['options']) > 10) ? ' frm_field_opts_list' : ''; ?>">
+        do_action( 'frm_add_multiple_opts_labels', $field ); ?>
+        <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts frm_clear<?php echo ( count( $field['options'] ) > 10 ) ? ' frm_field_opts_list' : ''; ?>">
 			<?php include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/radio.php' ); ?>
         </ul>
     <?php
@@ -21,8 +21,8 @@ 
 } else if ( $field['type'] == 'select' ) {
 	include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/dropdown-field.php' );
 } else if ( $field['type'] == 'captcha' ) {
-	if ( empty($frm_settings->pubkey) ) { ?>
-    <div class="howto frm_no_captcha_text"><?php printf(__( 'Your captcha will not appear on your form until you %1$sset up%2$s the Site and Secret Keys', 'formidable' ), '<a href="?page=formidable-settings">', '</a>') ?></div>
+	if ( empty( $frm_settings->pubkey ) ) { ?>
+    <div class="howto frm_no_captcha_text"><?php printf( __( 'Your captcha will not appear on your form until you %1$sset up%2$s the Site and Secret Keys', 'formidable' ), '<a href="?page=formidable-settings">', '</a>' ) ?></div>
     <?php
     } ?>
 	<img src="<?php echo esc_url( FrmAppHelper::plugin_url() . '/images/recaptcha.png' ) ?>" class="recaptcha_placeholder" alt="reCaptcha"/>

classes/models/FrmField.php

Spacing +74 added lines, -74 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -8,7 +8,7 @@ 
 	static $transient_size = 200;
 
 	public static function field_selection() {
-		$fields = apply_filters('frm_available_fields', array(
+		$fields = apply_filters( 'frm_available_fields', array(
 			'text'      => __( 'Single Line Text', 'formidable' ),
 			'textarea'  => __( 'Paragraph Text', 'formidable' ),
 			'checkbox'  => __( 'Checkboxes', 'formidable' ),
@@ -17,13 +17,13 @@ 
 			'email'     => __( 'Email Address', 'formidable' ),
 			'url'       => __( 'Website/URL', 'formidable' ),
 			'captcha'   => __( 'reCAPTCHA', 'formidable' ),
-		));
+		) );
 
 		return $fields;
 	}
 
 	public static function pro_field_selection() {
-		return apply_filters('frm_pro_available_fields', array(
+		return apply_filters( 'frm_pro_available_fields', array(
 			'end_divider' => array(
 				'name'  => __( 'End Section', 'formidable' ),
 				'switch_from' => 'divider',
@@ -48,36 +48,36 @@ 
 			'tag'       => __( 'Tags', 'formidable' ),
 			'credit_card' => __( 'Credit Card', 'formidable' ),
 			'address'   => __( 'Address', 'formidable' ),
-		));
+		) );
 	}
 
     public static function create( $values, $return = true ) {
         global $wpdb, $frm_duplicate_ids;
 
         $new_values = array();
-        $key = isset($values['field_key']) ? $values['field_key'] : $values['name'];
+        $key = isset( $values['field_key'] ) ? $values['field_key'] : $values['name'];
 		$new_values['field_key'] = FrmAppHelper::get_unique_key( $key, $wpdb->prefix . 'frm_fields', 'field_key' );
 
 		foreach ( array( 'name', 'description', 'type', 'default_value' ) as $col ) {
-			$new_values[ $col ] = $values[ $col ];
+			$new_values[$col] = $values[$col];
         }
 
         $new_values['options'] = $values['options'];
 
-        $new_values['field_order'] = isset($values['field_order']) ? (int) $values['field_order'] : null;
-        $new_values['required'] = isset($values['required']) ? (int) $values['required'] : 0;
-        $new_values['form_id'] = isset($values['form_id']) ? (int) $values['form_id'] : null;
+        $new_values['field_order'] = isset( $values['field_order'] ) ? (int) $values['field_order'] : null;
+        $new_values['required'] = isset( $values['required'] ) ? (int) $values['required'] : 0;
+        $new_values['form_id'] = isset( $values['form_id'] ) ? (int) $values['form_id'] : null;
         $new_values['field_options'] = $values['field_options'];
-        $new_values['created_at'] = current_time('mysql', 1);
+        $new_values['created_at'] = current_time( 'mysql', 1 );
 
 		if ( isset( $values['id'] ) ) {
-			$frm_duplicate_ids[ $values['field_key'] ] = $new_values['field_key'];
-            $new_values = apply_filters('frm_duplicated_field', $new_values);
+			$frm_duplicate_ids[$values['field_key']] = $new_values['field_key'];
+            $new_values = apply_filters( 'frm_duplicated_field', $new_values );
         }
 
 		foreach ( $new_values as $k => $v ) {
             if ( is_array( $v ) ) {
-				$new_values[ $k ] = serialize( $v );
+				$new_values[$k] = serialize( $v );
 			}
             unset( $k, $v );
         }
@@ -98,7 +98,7 @@ 
 
 		if ( $query_results ) {
 			if ( isset( $values['id'] ) ) {
-				$frm_duplicate_ids[ $values['id'] ] = $new_id;
+				$frm_duplicate_ids[$values['id']] = $new_id;
 			}
 			return $new_id;
 		} else {
@@ -113,9 +113,9 @@ 
 		$fields = self::getAll( $where, 'field_order', '', $blog_id );
 
         foreach ( (array) $fields as $field ) {
-            $new_key = ($copy_keys) ? $field->field_key : '';
-            if ( $copy_keys && substr($field->field_key, -1) == 2 ) {
-                $new_key = rtrim($new_key, 2);
+            $new_key = ( $copy_keys ) ? $field->field_key : '';
+            if ( $copy_keys && substr( $field->field_key, -1 ) == 2 ) {
+                $new_key = rtrim( $new_key, 2 );
             }
 
             $values = array();
@@ -138,11 +138,11 @@ 
 				$values['form_id'] = $new_repeat_form_id;
 			}
 
-            $values = apply_filters('frm_duplicated_field', $values);
-            $new_id = self::create($values);
-            $frm_duplicate_ids[ $field->id ] = $new_id;
-            $frm_duplicate_ids[ $field->field_key ] = $new_id;
-            unset($field);
+            $values = apply_filters( 'frm_duplicated_field', $values );
+            $new_id = self::create( $values );
+            $frm_duplicate_ids[$field->id] = $new_id;
+            $frm_duplicate_ids[$field->field_key] = $new_id;
+            unset( $field );
         }
     }
 
@@ -155,7 +155,7 @@ 
 			$values['field_key'] = FrmAppHelper::get_unique_key( $values['field_key'], $wpdb->prefix . 'frm_fields', 'field_key', $id );
 		}
 
-        if ( isset($values['required']) ) {
+        if ( isset( $values['required'] ) ) {
             $values['required'] = (int) $values['required'];
         }
 
@@ -167,8 +167,8 @@ 
 
 		// serialize array values
 		foreach ( array( 'default_value', 'field_options', 'options' ) as $opt ) {
-			if ( isset( $values[ $opt ] ) && is_array( $values[ $opt ] ) ) {
-				$values[ $opt ] = serialize( $values[ $opt ] );
+			if ( isset( $values[$opt] ) && is_array( $values[$opt] ) ) {
+				$values[$opt] = serialize( $values[$opt] );
 			}
 		}
 
@@ -178,13 +178,13 @@ 
 		if ( isset( $values['form_id'] ) ) {
             $form_id = absint( $values['form_id'] );
 		} else {
-            $field = self::getOne($id);
+            $field = self::getOne( $id );
             if ( $field ) {
                 $form_id = $field->form_id;
             }
-            unset($field);
+            unset( $field );
         }
-        unset($values);
+        unset( $values );
 
 		if ( $query_results ) {
             wp_cache_delete( $id, 'frm_field' );
@@ -237,7 +237,7 @@ 
 
 		FrmAppHelper::cache_delete_group( 'frm_field' );
 
-        $form = FrmForm::getOne($form_id);
+        $form = FrmForm::getOne( $form_id );
         if ( $form && $form->parent_form_id ) {
             self::delete_form_transient( $form->parent_form_id );
         }
@@ -259,16 +259,16 @@ 
 
         global $wpdb;
 
-        $where = is_numeric($id) ? 'id=%d' : 'field_key=%s';
+        $where = is_numeric( $id ) ? 'id=%d' : 'field_key=%s';
 		$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->prefix . 'frm_fields WHERE ' . $where, $id );
 
         $results = FrmAppHelper::check_cache( $id, 'frm_field', $query, 'get_row', 0 );
 
-        if ( empty($results) ) {
+        if ( empty( $results ) ) {
             return $results;
         }
 
-        if ( is_numeric($id) ) {
+        if ( is_numeric( $id ) ) {
 			FrmAppHelper::set_cache( $results->field_key, $results, 'frm_field' );
         } else if ( $results ) {
 			FrmAppHelper::set_cache( $results->id, $results, 'frm_field' );
@@ -276,7 +276,7 @@ 
 
 		self::prepare_options( $results );
 
-        return stripslashes_deep($results);
+        return stripslashes_deep( $results );
     }
 
     /**
@@ -309,20 +309,20 @@ 
                     continue;
                 }
 
-				$fields[ $result->id ] = $result;
-                $count++;
+				$fields[$result->id] = $result;
+                $count ++;
                 if ( $limit == 1 ) {
                     $fields = $result;
                     break;
                 }
 
-                if ( ! empty($limit) && $count >= $limit ) {
+                if ( ! empty( $limit ) && $count >= $limit ) {
                     break;
                 }
 
-                unset($result);
+                unset( $result );
             }
-            return stripslashes_deep($fields);
+            return stripslashes_deep( $fields );
         }
 
         self::$use_cache = false;
@@ -331,7 +331,7 @@ 
 		self::maybe_include_repeating_fields( $inc_sub, $where );
 		$results = self::getAll( $where, 'field_order', $limit );
         self::$use_cache = true;
-        self::include_sub_fields($results, $inc_sub, $type);
+        self::include_sub_fields( $results, $inc_sub, $type );
 
         return $results;
     }
@@ -343,15 +343,15 @@ 
 
 		$results = self::get_fields_from_transients( $form_id, array( 'inc_embed' => $inc_embed, 'inc_repeat' => $inc_repeat ) );
 		if ( ! empty( $results ) ) {
-            if ( empty($limit) ) {
+            if ( empty( $limit ) ) {
 				return $results;
             }
 
             $fields = array();
             $count = 0;
             foreach ( $results as $result ) {
-				$fields[ $result->id ] = $result;
-                if ( ! empty($limit) && $count >= $limit ) {
+				$fields[$result->id] = $result;
+                if ( ! empty( $limit ) && $count >= $limit ) {
                     break;
                 }
             }
@@ -369,7 +369,7 @@ 
 
 		self::include_sub_fields( $results, $inc_embed, 'all' );
 
-        if ( empty($limit) ) {
+        if ( empty( $limit ) ) {
 			self::set_field_transient( $results, $form_id, 0, array( 'inc_embed' => $inc_embed, 'inc_repeat' => $inc_repeat ) );
         }
 
@@ -398,22 +398,22 @@ 
         $form_fields = $results;
 		$index_offset = 1;
         foreach ( $form_fields as $k => $field ) {
-            if ( 'form' != $field->type || ! isset($field->field_options['form_select']) ) {
+            if ( 'form' != $field->type || ! isset( $field->field_options['form_select'] ) ) {
                 continue;
             }
 
             if ( $type == 'all' ) {
                 $sub_fields = self::get_all_for_form( $field->field_options['form_select'] );
             } else {
-                $sub_fields = self::get_all_types_in_form($field->form_id, $type);
+                $sub_fields = self::get_all_types_in_form( $field->form_id, $type );
             }
 
-            if ( ! empty($sub_fields) ) {
+            if ( ! empty( $sub_fields ) ) {
 				$index = $k + $index_offset;
 				$index_offset += count( $sub_fields );
-				array_splice($results, $index, 0, $sub_fields);
+				array_splice( $results, $index, 0, $sub_fields );
             }
-            unset($field, $sub_fields);
+            unset( $field, $sub_fields );
         }
     }
 
@@ -421,9 +421,9 @@ 
 		$cache_key = maybe_serialize( $where ) . $order_by . 'l' . $limit . 'b' . $blog_id;
         if ( self::$use_cache ) {
             // make sure old cache doesn't get saved as a transient
-            $results = wp_cache_get($cache_key, 'frm_field');
+            $results = wp_cache_get( $cache_key, 'frm_field' );
             if ( false !== $results ) {
-                return stripslashes_deep($results);
+                return stripslashes_deep( $results );
             }
         }
 
@@ -448,16 +448,16 @@ 
 			$order_by = ' ORDER BY ' . $order_by;
 		}
 
-        $limit = FrmAppHelper::esc_limit($limit);
+        $limit = FrmAppHelper::esc_limit( $limit );
 
         $query = "SELECT fi.*, fr.name as form_name  FROM {$table_name} fi LEFT OUTER JOIN {$form_table_name} fr ON fi.form_id=fr.id";
         $query_type = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'row' : 'results';
 
-        if ( is_array($where) ) {
+        if ( is_array( $where ) ) {
             $results = FrmDb::get_var( $table_name . ' fi LEFT OUTER JOIN ' . $form_table_name . ' fr ON fi.form_id=fr.id', $where, 'fi.*, fr.name as form_name', array( 'order_by' => $order_by, 'limit' => $limit ), '', $query_type );
 		} else {
 			// if the query is not an array, then it 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;
 
 			$function_name = ( $query_type == 'row' ) ? 'get_row' : 'get_results';
 			$results = $wpdb->$function_name( $query );
@@ -480,9 +480,9 @@ 
 				FrmAppHelper::set_cache( $result->id, $result, 'frm_field' );
 				FrmAppHelper::set_cache( $result->field_key, $result, 'frm_field' );
 
-				$results[ $r_key ]->field_options = maybe_unserialize( $result->field_options );
-				$results[ $r_key ]->options = maybe_unserialize( $result->options );
-				$results[ $r_key ]->default_value = maybe_unserialize( $result->default_value );
+				$results[$r_key]->field_options = maybe_unserialize( $result->field_options );
+				$results[$r_key]->options = maybe_unserialize( $result->options );
+				$results[$r_key]->default_value = maybe_unserialize( $result->default_value );
 
 				unset( $r_key, $result );
 			}
@@ -501,8 +501,8 @@ 
 	private static function prepare_options( &$results ) {
 		$results->field_options = maybe_unserialize( $results->field_options );
 
-		$results->options = maybe_unserialize($results->options);
-		$results->default_value = maybe_unserialize($results->default_value);
+		$results->options = maybe_unserialize( $results->options );
+		$results->default_value = maybe_unserialize( $results->default_value );
 	}
 
 	/**
@@ -529,7 +529,7 @@ 
 
 			if ( count( $next_fields ) >= self::$transient_size ) {
 				// if this transient is full, check for another
-				$next++;
+				$next ++;
 				self::get_next_transient( $fields, $base_name, $next );
 			}
 		}
@@ -555,14 +555,14 @@ 
 				return;
 			}
 
-			$next++;
+			$next ++;
 		}
 	}
 
 	public static function getIds( $where = '', $order_by = '', $limit = '' ) {
 		_deprecated_function( __FUNCTION__, '2.0' );
         global $wpdb;
-        if ( ! empty($order_by) && ! strpos($order_by, 'ORDER BY') !== false ) {
+        if ( ! empty( $order_by ) && ! strpos( $order_by, 'ORDER BY' ) !== false ) {
 			$order_by = ' ORDER BY ' . $order_by;
         }
 
@@ -572,7 +572,7 @@ 
 
         $method = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'get_var' : 'get_col';
 		$cache_key = 'getIds_' . maybe_serialize( $where ) . $order_by . $limit;
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_field', $query, $method);
+        $results = FrmAppHelper::check_cache( $cache_key, 'frm_field', $query, $method );
 
         return $results;
     }
@@ -603,8 +603,8 @@ 
 			$is_multi_value_field = (
 				$field['type'] == 'checkbox' ||
 				$field['type'] == 'address' ||
-				( $field['type'] == 'data' && isset($field['data_type']) && $field['data_type'] == 'checkbox' ) ||
-				( $field['type'] == 'lookup' && isset($field['data_type']) && $field['data_type'] == 'checkbox' ) ||
+				( $field['type'] == 'data' && isset( $field['data_type'] ) && $field['data_type'] == 'checkbox' ) ||
+				( $field['type'] == 'lookup' && isset( $field['data_type'] ) && $field['data_type'] == 'checkbox' ) ||
 				self::is_multiple_select( $field )
 			);
 
@@ -629,9 +629,9 @@ 
 	 */
 	public static function is_multiple_select( $field ) {
 		if ( is_array( $field ) ) {
-			return self::is_option_true( $field, 'multiple' ) && ( ( $field['type'] == 'select' || ( $field['type'] == 'data' && isset( $field['data_type'] ) && $field['data_type'] == 'select') ) );
+			return self::is_option_true( $field, 'multiple' ) && ( ( $field['type'] == 'select' || ( $field['type'] == 'data' && isset( $field['data_type'] ) && $field['data_type'] == 'select' ) ) );
 		} else {
-			return self::is_option_true( $field, 'multiple' ) && ( ( $field->type == 'select' || ( $field->type == 'data' && isset($field->field_options['data_type'] ) && $field->field_options['data_type'] == 'select') ) );
+			return self::is_option_true( $field, 'multiple' ) && ( ( $field->type == 'select' || ( $field->type == 'data' && isset( $field->field_options['data_type'] ) && $field->field_options['data_type'] == 'select' ) ) );
 		}
 	}
 
@@ -678,23 +678,23 @@ 
 	}
 
 	public static function is_option_true_in_array( $field, $option ) {
-		return isset( $field[ $option ] ) && $field[ $option ];
+		return isset( $field[$option] ) && $field[$option];
 	}
 
 	public static function is_option_true_in_object( $field, $option ) {
-		return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ];
+		return isset( $field->field_options[$option] ) && $field->field_options[$option];
 	}
 
 	public static function is_option_empty_in_array( $field, $option ) {
-		return ! isset( $field[ $option ] ) || empty( $field[ $option ] );
+		return ! isset( $field[$option] ) || empty( $field[$option] );
 	}
 
 	public static function is_option_empty_in_object( $field, $option ) {
-		return ! isset( $field->field_options[ $option ] ) || empty( $field->field_options[ $option ] );
+		return ! isset( $field->field_options[$option] ) || empty( $field->field_options[$option] );
 	}
 
 	public static function is_option_value_in_object( $field, $option ) {
-		return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ] != '';
+		return isset( $field->field_options[$option] ) && $field->field_options[$option] != '';
 	}
 
 	/**
@@ -710,11 +710,11 @@ 
 	}
 
 	public static function get_option_in_array( $field, $option ) {
-		return $field[ $option ];
+		return $field[$option];
 	}
 
 	public static function get_option_in_object( $field, $option ) {
-		return isset( $field->field_options[ $option ] ) ? $field->field_options[ $option ] : '';
+		return isset( $field->field_options[$option] ) ? $field->field_options[$option] : '';
 	}
 
 	/**

Indentation +202 added lines, -202 removed lines

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

classes/models/FrmEDD_SL_Plugin_Updater.php

Doc Comments +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 	 * @uses api_request()
 	 *
 	 * @param array   $_transient_data Update array build by WordPress.
-	 * @return array Modified update array with custom plugin data.
+	 * @return stdClass Modified update array with custom plugin data.
 	 */
 	public function check_update( $_transient_data ) {
 

Spacing +5 added lines, -5 removed lines

@@ -43,7 +43,7 @@ 
 		$this->version     = $_api_data['version'];
 		$this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false;
 
-		$frm_edd_plugin_data[ $this->slug ] = $this->api_data;
+		$frm_edd_plugin_data[$this->slug] = $this->api_data;
 
 		// Set up hooks.
 		$this->init();
@@ -83,7 +83,7 @@ 
 			$_transient_data = new stdClass;
 		}
 
-		if ( ! empty( $_transient_data->response ) && ! empty( $_transient_data->response[ $this->name ] ) && false === $this->wp_override ) {
+		if ( ! empty( $_transient_data->response ) && ! empty( $_transient_data->response[$this->name] ) && false === $this->wp_override ) {
 			return $_transient_data;
 		}
 
@@ -97,12 +97,12 @@ 
 					$version_info->plugin = $this->name;
 				}
 
-				$_transient_data->response[ $this->name ] = $version_info;
+				$_transient_data->response[$this->name] = $version_info;
 
 			}
 
 			$_transient_data->last_checked = time();
-			$_transient_data->checked[ $this->name ] = $this->version;
+			$_transient_data->checked[$this->name] = $this->version;
 
 		}
 
@@ -245,7 +245,7 @@ 
 			wp_die( __( 'You do not have permission to install plugin updates', 'formidable' ), __( 'Error', 'formidable' ), array( 'response' => 403 ) );
 		}
 
-		$data         = $frm_edd_plugin_data[ $_REQUEST['slug'] ];
+		$data         = $frm_edd_plugin_data[$_REQUEST['slug']];
 		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_version_info' );
 		$version_info = get_transient( $cache_key );
 

classes/models/FrmSettings.php

Spacing +45 added lines, -45 removed lines

@@ -29,19 +29,19 @@ 
 	public $re_multi;
 
     public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
+        if ( ! defined( 'ABSPATH' ) ) {
+            die( 'You are not allowed to call this page directly.' );
         }
 
-        $settings = get_transient($this->option_name);
+        $settings = get_transient( $this->option_name );
 
-        if ( ! is_object($settings) ) {
-            $settings = $this->translate_settings($settings);
+        if ( ! is_object( $settings ) ) {
+            $settings = $this->translate_settings( $settings );
         }
 
         foreach ( $settings as $setting_name => $setting ) {
             $this->{$setting_name} = $setting;
-            unset($setting_name, $setting);
+            unset( $setting_name, $setting );
         }
 
         $this->set_default_options();
@@ -49,24 +49,24 @@ 
 
 	private function translate_settings( $settings ) {
         if ( $settings ) { //workaround for W3 total cache conflict
-            return unserialize(serialize($settings));
+            return unserialize( serialize( $settings ) );
         }
 
-        $settings = get_option($this->option_name);
-        if ( is_object($settings) ) {
-            set_transient($this->option_name, $settings);
+        $settings = get_option( $this->option_name );
+        if ( is_object( $settings ) ) {
+            set_transient( $this->option_name, $settings );
             return $settings;
         }
 
         // If unserializing didn't work
         if ( $settings ) { //workaround for W3 total cache conflict
-            $settings = unserialize(serialize($settings));
+            $settings = unserialize( serialize( $settings ) );
         } else {
             $settings = $this;
         }
 
-        update_option($this->option_name, $settings);
-        set_transient($this->option_name, $settings);
+        update_option( $this->option_name, $settings );
+        set_transient( $this->option_name, $settings );
 
         return $settings;
     }
@@ -101,8 +101,8 @@ 
 	private function set_default_options() {
         $this->fill_recaptcha_settings();
 
-        if ( ! isset($this->load_style) ) {
-            if ( ! isset($this->custom_style) ) {
+        if ( ! isset( $this->load_style ) ) {
+            if ( ! isset( $this->custom_style ) ) {
                 $this->custom_style = true;
             }
 
@@ -112,16 +112,16 @@ 
         $this->fill_with_defaults();
 
         if ( is_multisite() && is_admin() ) {
-            $mu_menu = get_site_option('frm_admin_menu_name');
-            if ( $mu_menu && ! empty($mu_menu) ) {
+            $mu_menu = get_site_option( 'frm_admin_menu_name' );
+            if ( $mu_menu && ! empty( $mu_menu ) ) {
                 $this->menu = $mu_menu;
                 $this->mu_menu = 1;
             }
         }
 
-        $frm_roles = FrmAppHelper::frm_capabilities('pro');
+        $frm_roles = FrmAppHelper::frm_capabilities( 'pro' );
         foreach ( $frm_roles as $frm_role => $frm_role_description ) {
-            if ( ! isset($this->$frm_role) ) {
+            if ( ! isset( $this->$frm_role ) ) {
                 $this->$frm_role = 'administrator';
             }
         }
@@ -131,9 +131,9 @@ 
         $settings = $this->default_options();
 
         foreach ( $settings as $setting => $default ) {
-			if ( isset( $params[ 'frm_' . $setting ] ) ) {
-				$this->{$setting} = $params[ 'frm_' . $setting ];
-            } else if ( ! isset($this->{$setting}) ) {
+			if ( isset( $params['frm_' . $setting] ) ) {
+				$this->{$setting} = $params['frm_' . $setting];
+            } else if ( ! isset( $this->{$setting}) ) {
                 $this->{$setting} = $default;
             }
 
@@ -141,7 +141,7 @@ 
 				$this->{$setting} = $default;
 			}
 
-            unset($setting, $default);
+            unset( $setting, $default );
         }
     }
 
@@ -149,23 +149,23 @@ 
         $privkey = '';
 		$re_lang = '';
 
-        if ( ! isset($this->pubkey) ) {
+        if ( ! isset( $this->pubkey ) ) {
             // get the options from the database
-            $recaptcha_opt = is_multisite() ? get_site_option('recaptcha') : get_option('recaptcha');
-            $this->pubkey = isset($recaptcha_opt['pubkey']) ? $recaptcha_opt['pubkey'] : '';
-            $privkey = isset($recaptcha_opt['privkey']) ? $recaptcha_opt['privkey'] : $privkey;
-            $re_lang = isset($recaptcha_opt['re_lang']) ? $recaptcha_opt['re_lang'] : $re_lang;
+            $recaptcha_opt = is_multisite() ? get_site_option( 'recaptcha' ) : get_option( 'recaptcha' );
+            $this->pubkey = isset( $recaptcha_opt['pubkey'] ) ? $recaptcha_opt['pubkey'] : '';
+            $privkey = isset( $recaptcha_opt['privkey'] ) ? $recaptcha_opt['privkey'] : $privkey;
+            $re_lang = isset( $recaptcha_opt['re_lang'] ) ? $recaptcha_opt['re_lang'] : $re_lang;
         }
 
-        if ( ! isset($this->re_msg) || empty($this->re_msg) ) {
+        if ( ! isset( $this->re_msg ) || empty( $this->re_msg ) ) {
             $this->re_msg = __( 'The reCAPTCHA was not entered correctly', 'formidable' );
         }
 
-        if ( ! isset($this->privkey) ) {
+        if ( ! isset( $this->privkey ) ) {
             $this->privkey = $privkey;
         }
 
-        if ( ! isset($this->re_lang) ) {
+        if ( ! isset( $this->re_lang ) ) {
             $this->re_lang = $re_lang;
         }
     }
@@ -176,24 +176,24 @@ 
     }
 
 	public function update( $params ) {
-        $this->fill_with_defaults($params);
-        $this->update_settings($params);
+        $this->fill_with_defaults( $params );
+        $this->update_settings( $params );
 
         if ( $this->mu_menu ) {
-            update_site_option('frm_admin_menu_name', $this->menu);
-        } else if ( current_user_can('administrator') ) {
-            update_site_option('frm_admin_menu_name', false);
+            update_site_option( 'frm_admin_menu_name', $this->menu );
+        } else if ( current_user_can( 'administrator' ) ) {
+            update_site_option( 'frm_admin_menu_name', false );
         }
 
-        $this->update_roles($params);
+        $this->update_roles( $params );
 
         do_action( 'frm_update_settings', $params );
     }
 
 	private function update_settings( $params ) {
-        $this->mu_menu = isset($params['frm_mu_menu']) ? $params['frm_mu_menu'] : 0;
+        $this->mu_menu = isset( $params['frm_mu_menu'] ) ? $params['frm_mu_menu'] : 0;
 
-        $this->pubkey = trim($params['frm_pubkey']);
+        $this->pubkey = trim( $params['frm_pubkey'] );
         $this->privkey = $params['frm_privkey'];
         $this->re_lang = $params['frm_re_lang'];
 		$this->re_multi = isset( $params['frm_re_multi'] ) ? $params['frm_re_multi'] : 0;
@@ -201,7 +201,7 @@ 
         $this->load_style = $params['frm_load_style'];
         $this->preview_page_id = (int) $params['frm-preview-page-id'];
 
-        $this->use_html = isset($params['frm_use_html']) ? $params['frm_use_html'] : 0;
+        $this->use_html = isset( $params['frm_use_html'] ) ? $params['frm_use_html'] : 0;
         //$this->custom_style = isset($params['frm_custom_style']) ? $params['frm_custom_style'] : 0;
 		$this->jquery_css = isset( $params['frm_jquery_css'] ) ? absint( $params['frm_jquery_css'] ) : 0;
 		$this->accordion_js = isset( $params['frm_accordion_js'] ) ? absint( $params['frm_accordion_js'] ) : 0;
@@ -213,7 +213,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 ) ) {
@@ -221,7 +221,7 @@ 
             }
 
             foreach ( $roles as $role => $details ) {
-                if ( in_array($role, $this->$frm_role) ) {
+                if ( in_array( $role, $this->$frm_role ) ) {
     			    $wp_roles->add_cap( $role, $frm_role );
     			} else {
     			    $wp_roles->remove_cap( $role, $frm_role );
@@ -233,10 +233,10 @@ 
 	public function store() {
         // Save the posted value in the database
 
-        update_option('frm_options', $this);
+        update_option( 'frm_options', $this );
 
-        delete_transient('frm_options');
-        set_transient('frm_options', $this);
+        delete_transient( 'frm_options' );
+        set_transient( 'frm_options', $this );
 
         do_action( 'frm_store_settings' );
     }

Braces +4 added lines, -2 removed lines

@@ -48,7 +48,8 @@ 
     }
 
 	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));
         }
 
@@ -59,7 +60,8 @@ 
         }
 
         // If unserializing didn't work
-        if ( $settings ) { //workaround for W3 total cache conflict
+        if ( $settings ) {
+//workaround for W3 total cache conflict
             $settings = unserialize(serialize($settings));
         } else {
             $settings = $this;

Indentation +181 added lines, -181 removed lines

@@ -1,242 +1,242 @@
 <?php
 
 class FrmSettings {
-    public $option_name = 'frm_options';
-    public $menu;
-    public $mu_menu;
-    public $preview_page_id;
-    public $use_html;
-    public $jquery_css;
-    public $accordion_js;
-
-    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_msg;
+	public $option_name = 'frm_options';
+	public $menu;
+	public $mu_menu;
+	public $preview_page_id;
+	public $use_html;
+	public $jquery_css;
+	public $accordion_js;
+
+	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_msg;
 	public $re_multi;
 
-    public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
-        }
+	public function __construct() {
+		if ( ! defined('ABSPATH') ) {
+			die('You are not allowed to call this page directly.');
+		}
 
-        $settings = get_transient($this->option_name);
+		$settings = get_transient($this->option_name);
 
-        if ( ! is_object($settings) ) {
-            $settings = $this->translate_settings($settings);
-        }
+		if ( ! is_object($settings) ) {
+			$settings = $this->translate_settings($settings);
+		}
 
-        foreach ( $settings as $setting_name => $setting ) {
-            $this->{$setting_name} = $setting;
-            unset($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();
+	}
 
 	private function translate_settings( $settings ) {
-        if ( $settings ) { //workaround for W3 total cache conflict
-            return unserialize(serialize($settings));
-        }
-
-        $settings = get_option($this->option_name);
-        if ( is_object($settings) ) {
-            set_transient($this->option_name, $settings);
-            return $settings;
-        }
-
-        // If unserializing didn't work
-        if ( $settings ) { //workaround for W3 total cache conflict
-            $settings = unserialize(serialize($settings));
-        } else {
-            $settings = $this;
-        }
-
-        update_option($this->option_name, $settings);
-        set_transient($this->option_name, $settings);
-
-        return $settings;
-    }
-
-    /**
-     * @return array
-     */
+		if ( $settings ) { //workaround for W3 total cache conflict
+			return unserialize(serialize($settings));
+		}
+
+		$settings = get_option($this->option_name);
+		if ( is_object($settings) ) {
+			set_transient($this->option_name, $settings);
+			return $settings;
+		}
+
+		// If unserializing didn't work
+		if ( $settings ) { //workaround for W3 total cache conflict
+			$settings = unserialize(serialize($settings));
+		} else {
+			$settings = $this;
+		}
+
+		update_option($this->option_name, $settings);
+		set_transient($this->option_name, $settings);
+
+		return $settings;
+	}
+
+	/**
+	 * @return array
+	 */
 	public function default_options() {
-        return array(
-            'menu'      => apply_filters( 'frm_default_menu', __( 'Forms', 'formidable' ) ),
-            'mu_menu'   => 0,
-            'preview_page_id' => 0,
-            'use_html'  => true,
-            'jquery_css' => false,
-            'accordion_js' => false,
+		return array(
+			'menu'      => apply_filters( 'frm_default_menu', __( 'Forms', 'formidable' ) ),
+			'mu_menu'   => 0,
+			'preview_page_id' => 0,
+			'use_html'  => true,
+			'jquery_css' => false,
+			'accordion_js' => false,
 
 			'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]',
+		);
+	}
 
 	private function set_default_options() {
-        $this->fill_recaptcha_settings();
-
-        if ( ! isset($this->load_style) ) {
-            if ( ! isset($this->custom_style) ) {
-                $this->custom_style = true;
-            }
-
-            $this->load_style = 'all';
-        }
-
-        $this->fill_with_defaults();
-
-        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;
-            }
-        }
-
-        $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->fill_recaptcha_settings();
+
+		if ( ! isset($this->load_style) ) {
+			if ( ! isset($this->custom_style) ) {
+				$this->custom_style = true;
+			}
+
+			$this->load_style = 'all';
+		}
+
+		$this->fill_with_defaults();
+
+		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;
+			}
+		}
+
+		$frm_roles = FrmAppHelper::frm_capabilities('pro');
+		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
+			if ( ! isset($this->$frm_role) ) {
+				$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 ];
-            } else if ( ! isset($this->{$setting}) ) {
-                $this->{$setting} = $default;
-            }
+			} else if ( ! isset($this->{$setting}) ) {
+				$this->{$setting} = $default;
+			}
 
 			if ( $setting == 'menu' && empty( $this->{$setting} ) ) {
 				$this->{$setting} = $default;
 			}
 
-            unset($setting, $default);
-        }
-    }
+			unset($setting, $default);
+		}
+	}
 
-    private function fill_recaptcha_settings() {
-        $privkey = '';
+	private function fill_recaptcha_settings() {
+		$privkey = '';
 		$re_lang = '';
 
-        if ( ! isset($this->pubkey) ) {
-            // get the options from the database
-            $recaptcha_opt = is_multisite() ? get_site_option('recaptcha') : get_option('recaptcha');
-            $this->pubkey = isset($recaptcha_opt['pubkey']) ? $recaptcha_opt['pubkey'] : '';
-            $privkey = isset($recaptcha_opt['privkey']) ? $recaptcha_opt['privkey'] : $privkey;
-            $re_lang = isset($recaptcha_opt['re_lang']) ? $recaptcha_opt['re_lang'] : $re_lang;
-        }
+		if ( ! isset($this->pubkey) ) {
+			// get the options from the database
+			$recaptcha_opt = is_multisite() ? get_site_option('recaptcha') : get_option('recaptcha');
+			$this->pubkey = isset($recaptcha_opt['pubkey']) ? $recaptcha_opt['pubkey'] : '';
+			$privkey = isset($recaptcha_opt['privkey']) ? $recaptcha_opt['privkey'] : $privkey;
+			$re_lang = isset($recaptcha_opt['re_lang']) ? $recaptcha_opt['re_lang'] : $re_lang;
+		}
 
-        if ( ! isset($this->re_msg) || empty($this->re_msg) ) {
-            $this->re_msg = __( 'The reCAPTCHA was not entered correctly', 'formidable' );
-        }
+		if ( ! isset($this->re_msg) || empty($this->re_msg) ) {
+			$this->re_msg = __( 'The reCAPTCHA was not entered correctly', 'formidable' );
+		}
 
-        if ( ! isset($this->privkey) ) {
-            $this->privkey = $privkey;
-        }
+		if ( ! isset($this->privkey) ) {
+			$this->privkey = $privkey;
+		}
 
-        if ( ! isset($this->re_lang) ) {
-            $this->re_lang = $re_lang;
-        }
-    }
+		if ( ! isset($this->re_lang) ) {
+			$this->re_lang = $re_lang;
+		}
+	}
 
-    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);
-        $this->update_settings($params);
+		$this->fill_with_defaults($params);
+		$this->update_settings($params);
 
-        if ( $this->mu_menu ) {
-            update_site_option('frm_admin_menu_name', $this->menu);
-        } else if ( current_user_can('administrator') ) {
-            update_site_option('frm_admin_menu_name', false);
-        }
+		if ( $this->mu_menu ) {
+			update_site_option('frm_admin_menu_name', $this->menu);
+		} else if ( current_user_can('administrator') ) {
+			update_site_option('frm_admin_menu_name', false);
+		}
 
-        $this->update_roles($params);
+		$this->update_roles($params);
 
-        do_action( 'frm_update_settings', $params );
-    }
+		do_action( 'frm_update_settings', $params );
+	}
 
 	private function update_settings( $params ) {
-        $this->mu_menu = isset($params['frm_mu_menu']) ? $params['frm_mu_menu'] : 0;
+		$this->mu_menu = isset($params['frm_mu_menu']) ? $params['frm_mu_menu'] : 0;
 
-        $this->pubkey = trim($params['frm_pubkey']);
-        $this->privkey = $params['frm_privkey'];
-        $this->re_lang = $params['frm_re_lang'];
+		$this->pubkey = trim($params['frm_pubkey']);
+		$this->privkey = $params['frm_privkey'];
+		$this->re_lang = $params['frm_re_lang'];
 		$this->re_multi = isset( $params['frm_re_multi'] ) ? $params['frm_re_multi'] : 0;
 
-        $this->load_style = $params['frm_load_style'];
-        $this->preview_page_id = (int) $params['frm-preview-page-id'];
+		$this->load_style = $params['frm_load_style'];
+		$this->preview_page_id = (int) $params['frm-preview-page-id'];
 
-        $this->use_html = isset($params['frm_use_html']) ? $params['frm_use_html'] : 0;
-        //$this->custom_style = isset($params['frm_custom_style']) ? $params['frm_custom_style'] : 0;
+		$this->use_html = isset($params['frm_use_html']) ? $params['frm_use_html'] : 0;
+		//$this->custom_style = isset($params['frm_custom_style']) ? $params['frm_custom_style'] : 0;
 		$this->jquery_css = isset( $params['frm_jquery_css'] ) ? absint( $params['frm_jquery_css'] ) : 0;
 		$this->accordion_js = isset( $params['frm_accordion_js'] ) ? absint( $params['frm_accordion_js'] ) : 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 ) {
-                if ( in_array($role, $this->$frm_role) ) {
-    			    $wp_roles->add_cap( $role, $frm_role );
-    			} else {
-    			    $wp_roles->remove_cap( $role, $frm_role );
-    			}
-    		}
+			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 );
+				}
+			}
 		}
-    }
+	}
 
 	public function store() {
-        // Save the posted value in the database
+		// Save the posted value in the database
 
-        update_option('frm_options', $this);
+		update_option('frm_options', $this);
 
-        delete_transient('frm_options');
-        set_transient('frm_options', $this);
+		delete_transient('frm_options');
+		set_transient('frm_options', $this);
 
-        do_action( 'frm_store_settings' );
-    }
+		do_action( 'frm_store_settings' );
+	}
 }

classes/models/FrmFormAction.php

Indentation +229 added lines, -229 removed lines

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

Spacing +90 added lines, -90 removed lines

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

classes/views/frm-fields/single-option.php

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@ 
 <li id="frm_delete_field_<?php echo esc_attr( $field['id'] ); ?>-<?php echo esc_attr( $opt_key ) ?>_container" class="frm_single_option">
     <a href="javascript:void(0)" class="frm_single_visible_hover frm_icon_font frm_delete_icon" data-fid="<?php echo esc_attr( $field['id'] ); ?>"> </a>
     <?php if ( $field['type'] != 'select' ) { ?>
-        <input type="<?php echo esc_attr( $field['type'] ) ?>" name="<?php echo esc_attr( $field_name . ( $field['type'] == 'checkbox' ? '[]' : '' ) ); ?>" value="<?php echo esc_attr($field_val) ?>"<?php echo isset( $checked ) ? $checked : ''; ?>/>
+        <input type="<?php echo esc_attr( $field['type'] ) ?>" name="<?php echo esc_attr( $field_name . ( $field['type'] == 'checkbox' ? '[]' : '' ) ); ?>" value="<?php echo esc_attr( $field_val ) ?>"<?php echo isset( $checked ) ? $checked : ''; ?>/>
     <?php } ?>
 
-	<label class="frm_ipe_field_option field_<?php echo esc_attr( $field['id'] ) ?>_option <?php echo esc_attr( $field['separate_value'] ? 'frm_with_key' : '' ); ?>" id="<?php echo esc_attr( $html_id . '-' . $opt_key ) ?>"><?php echo ($opt == '') ? __( '(Blank)', 'formidable' ) : $opt ?></label>
+	<label class="frm_ipe_field_option field_<?php echo esc_attr( $field['id'] ) ?>_option <?php echo esc_attr( $field['separate_value'] ? 'frm_with_key' : '' ); ?>" id="<?php echo esc_attr( $html_id . '-' . $opt_key ) ?>"><?php echo ( $opt == '' ) ? __( '(Blank)', 'formidable' ) : $opt ?></label>
 	<input type="hidden" name="field_options[options_<?php echo esc_attr( $field['id'] ) ?>][<?php echo esc_attr( $opt_key ) ?>][label]" value="<?php echo esc_attr( $opt ) ?>" />
 
     <span class="frm_option_key field_<?php echo esc_attr( $field['id'] ) ?>_option_key<?php echo esc_attr( $field['separate_value'] ? '' : ' frm_hidden' ); ?>">
@@ -13,4 +13,4 @@ 
     </span>
 </li>
 <?php
-unset($field_val, $opt, $opt_key);
+unset( $field_val, $opt, $opt_key );

classes/controllers/FrmFormsController.php

Doc Comments +14 added lines

@@ -159,6 +159,9 @@ 
 		wp_die();
 	}
 
+	/**
+	 * @param string $field
+	 */
 	private static function edit_in_place_value( $field ) {
 		check_ajax_referer( 'frm_ajax', 'nonce' );
 		FrmAppHelper::permission_check('frm_edit_forms', 'hide');
@@ -203,6 +206,9 @@ 
         }
     }
 
+    /**
+     * @return string
+     */
     public static function bulk_create_template( $ids ) {
         FrmAppHelper::permission_check( 'frm_edit_forms' );
 
@@ -698,6 +704,7 @@ 
 	/**
 	 * Get an array of the helper shortcodes to display in the customization panel
 	 * @since 2.0.6
+	 * @param boolean $settings_tab
 	 */
 	private static function get_shortcode_helpers( $settings_tab ) {
 		$entry_shortcodes = array(
@@ -771,6 +778,9 @@ 
         return $content;
     }
 
+	/**
+	 * @param boolean $entry
+	 */
 	private static function get_entry_by_param( &$entry ) {
 		if ( ! $entry || ! is_object( $entry ) ) {
 			if ( ! $entry || ! is_numeric( $entry ) ) {
@@ -1079,6 +1089,9 @@ 
 		return $form;
     }
 
+	/**
+	 * @param string $id
+	 */
 	private static function maybe_get_form_to_show( $id ) {
 		$form = false;
 
@@ -1253,6 +1266,7 @@ 
 
 	/**
 	 * @since 2.0.8
+	 * @param string $content
 	 */
 	private static function maybe_minimize_form( $atts, &$content ) {
 		// check if minimizing is turned on

Braces +2 added lines, -1 removed lines

@@ -1082,7 +1082,8 @@
 	private static function maybe_get_form_to_show( $id ) {
 		$form = false;
 
-		if ( ! empty( $id ) ) { // no form id or key set
+		if ( ! empty( $id ) ) {
+// no form id or key set
 			$form = FrmForm::getOne( $id );
 			if ( ! $form || $form->parent_form_id || $form->status == 'trash' ) {
 				$form = false;

Indentation +592 added lines, -592 removed lines

@@ -2,7 +2,7 @@ 
 
 class FrmFormsController {
 
-    public static function menu() {
+	public static function menu() {
 		$menu_label = __( 'Forms', 'formidable' );
 		if ( ! FrmAppHelper::pro_is_installed() ) {
 			$menu_label .= ' (Lite)';
@@ -10,7 +10,7 @@ 
 		add_submenu_page('formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
 
 		self::maybe_load_listing_hooks();
-    }
+	}
 
 	public static function maybe_load_listing_hooks() {
 		$action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' );
@@ -24,35 +24,35 @@ 
 		add_filter('manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
 	}
 
-    public static function head() {
-        wp_enqueue_script('formidable-editinplace');
+	public static function head() {
+		wp_enqueue_script('formidable-editinplace');
 
-        if ( wp_is_mobile() ) {
-    		wp_enqueue_script( 'jquery-touch-punch' );
-    	}
-    }
+		if ( wp_is_mobile() ) {
+			wp_enqueue_script( 'jquery-touch-punch' );
+		}
+	}
 
-    public static function register_widgets() {
-        require_once(FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php');
-        register_widget('FrmShowForm');
-    }
+	public static function register_widgets() {
+		require_once(FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php');
+		register_widget('FrmShowForm');
+	}
 
-    public static function list_form() {
-        FrmAppHelper::permission_check('frm_view_forms');
+	public static function list_form() {
+		FrmAppHelper::permission_check('frm_view_forms');
 
 		$params = FrmForm::list_page_params();
-        $errors = self::process_bulk_form_actions( array());
-        $errors = apply_filters('frm_admin_list_form_action', $errors);
+		$errors = self::process_bulk_form_actions( array());
+		$errors = apply_filters('frm_admin_list_form_action', $errors);
 
 		return self::display_forms_list( $params, '', $errors );
-    }
+	}
 
 	public static function new_form( $values = array() ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check('frm_edit_forms');
 
-        global $frm_vars;
+		global $frm_vars;
 
-        $action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
+		$action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
 		$action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[ $action ];
 
 		if ( $action == 'create' ) {
@@ -60,18 +60,18 @@ 
 			return;
 		} else if ( $action == 'new' ) {
 			$frm_field_selection = FrmField::field_selection();
-            $values = FrmFormsHelper::setup_new_vars($values);
-            $id = FrmForm::create( $values );
-            $form = FrmForm::getOne($id);
+			$values = FrmFormsHelper::setup_new_vars($values);
+			$id = FrmForm::create( $values );
+			$form = FrmForm::getOne($id);
 
 			self::create_default_email_action( $form );
 
 			$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
-            $values['id'] = $id;
+			$values['id'] = $id;
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
-        }
-    }
+		}
+	}
 
 	/**
 	 * Create the default email action
@@ -80,87 +80,87 @@ 
 	 *
 	 * @param object $form
 	 */
-    private static function create_default_email_action( $form ) {
-    	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
+	private static function create_default_email_action( $form ) {
+		$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
 
-	    if ( $create_email ) {
-		    $action_control = FrmFormActionsController::get_form_actions( 'email' );
-		    $action_control->create( $form->id );
-	    }
-    }
+		if ( $create_email ) {
+			$action_control = FrmFormActionsController::get_form_actions( 'email' );
+			$action_control->create( $form->id );
+		}
+	}
 
 	public static function create( $values = array() ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check('frm_edit_forms');
 
-        global $frm_vars;
-        if ( empty( $values ) ) {
-            $values = $_POST;
-        }
+		global $frm_vars;
+		if ( empty( $values ) ) {
+			$values = $_POST;
+		}
 
-        //Set radio button and checkbox meta equal to "other" value
-        if ( FrmAppHelper::pro_is_installed() ) {
-            $values = FrmProEntry::mod_other_vals( $values, 'back' );
-        }
+		//Set radio button and checkbox meta equal to "other" value
+		if ( FrmAppHelper::pro_is_installed() ) {
+			$values = FrmProEntry::mod_other_vals( $values, 'back' );
+		}
 
 		$id = isset($values['id']) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
-        if ( ! current_user_can( 'frm_edit_forms' ) || ( $_POST && ( ! isset( $values['frm_save_form'] ) || ! wp_verify_nonce( $values['frm_save_form'], 'frm_save_form_nonce' ) ) ) ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            $errors = array( 'form' => $frm_settings->admin_permission );
-        } else {
-            $errors = FrmForm::validate($values);
-        }
+		if ( ! current_user_can( 'frm_edit_forms' ) || ( $_POST && ( ! isset( $values['frm_save_form'] ) || ! wp_verify_nonce( $values['frm_save_form'], 'frm_save_form_nonce' ) ) ) ) {
+			$frm_settings = FrmAppHelper::get_settings();
+			$errors = array( 'form' => $frm_settings->admin_permission );
+		} else {
+			$errors = FrmForm::validate($values);
+		}
 
-        if ( count($errors) > 0 ) {
-            $hide_preview = true;
+		if ( count($errors) > 0 ) {
+			$hide_preview = true;
 			$frm_field_selection = FrmField::field_selection();
-            $form = FrmForm::getOne( $id );
-            $fields = FrmField::get_all_for_form($id);
+			$form = FrmForm::getOne( $id );
+			$fields = FrmField::get_all_for_form($id);
 
-            $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+			$values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
 			$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
-        } else {
-            FrmForm::update( $id, $values, true );
+		} else {
+			FrmForm::update( $id, $values, true );
 			$url = admin_url( 'admin.php?page=formidable&frm_action=settings&id=' . $id );
 			die( FrmAppHelper::js_redirect( $url ) );
-        }
-    }
+		}
+	}
 
-    public static function edit( $values = false ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+	public static function edit( $values = false ) {
+		FrmAppHelper::permission_check('frm_edit_forms');
 
 		$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
-        return self::get_edit_vars($id);
-    }
+		return self::get_edit_vars($id);
+	}
 
-    public static function settings( $id = false, $message = '' ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+	public static function settings( $id = false, $message = '' ) {
+		FrmAppHelper::permission_check('frm_edit_forms');
 
-        if ( ! $id || ! is_numeric($id) ) {
+		if ( ! $id || ! is_numeric($id) ) {
 			$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
-        }
+		}
 		return self::get_settings_vars( $id, array(), $message );
-    }
+	}
 
-    public static function update_settings() {
-        FrmAppHelper::permission_check('frm_edit_forms');
+	public static function update_settings() {
+		FrmAppHelper::permission_check('frm_edit_forms');
 
 		$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
-        $errors = FrmForm::validate($_POST);
-        if ( count($errors) > 0 ) {
-            return self::get_settings_vars($id, $errors);
-        }
+		$errors = FrmForm::validate($_POST);
+		if ( count($errors) > 0 ) {
+			return self::get_settings_vars($id, $errors);
+		}
 
-        do_action('frm_before_update_form_settings', $id);
+		do_action('frm_before_update_form_settings', $id);
 
 		FrmForm::update( $id, $_POST );
 
-        $message = __( 'Settings Successfully Updated', 'formidable' );
+		$message = __( 'Settings Successfully Updated', 'formidable' );
 		return self::get_settings_vars( $id, array(), $message );
-    }
+	}
 
 	public static function edit_key() {
 		$values = self::edit_in_place_value( 'form_key' );
@@ -190,43 +190,43 @@ 
 
 	public static function update( $values = array() ) {
 		if ( empty( $values ) ) {
-            $values = $_POST;
-        }
+			$values = $_POST;
+		}
 
-        //Set radio button and checkbox meta equal to "other" value
-        if ( FrmAppHelper::pro_is_installed() ) {
-            $values = FrmProEntry::mod_other_vals( $values, 'back' );
-        }
+		//Set radio button and checkbox meta equal to "other" value
+		if ( FrmAppHelper::pro_is_installed() ) {
+			$values = FrmProEntry::mod_other_vals( $values, 'back' );
+		}
 
-        $errors = FrmForm::validate( $values );
-        $permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
-        if ( $permission_error !== false ) {
-            $errors['form'] = $permission_error;
-        }
+		$errors = FrmForm::validate( $values );
+		$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
+		if ( $permission_error !== false ) {
+			$errors['form'] = $permission_error;
+		}
 
 		$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
 		if ( count( $errors ) > 0 ) {
-            return self::get_edit_vars( $id, $errors );
+			return self::get_edit_vars( $id, $errors );
 		} else {
-            FrmForm::update( $id, $values );
-            $message = __( 'Form was Successfully Updated', 'formidable' );
-            if ( defined( 'DOING_AJAX' ) ) {
+			FrmForm::update( $id, $values );
+			$message = __( 'Form was Successfully Updated', 'formidable' );
+			if ( defined( 'DOING_AJAX' ) ) {
 				wp_die( $message );
-            }
+			}
 			return self::get_edit_vars( $id, array(), $message );
-        }
-    }
+		}
+	}
 
-    public static function bulk_create_template( $ids ) {
-        FrmAppHelper::permission_check( 'frm_edit_forms' );
+	public static function bulk_create_template( $ids ) {
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-        foreach ( $ids as $id ) {
-            FrmForm::duplicate( $id, true, true );
-        }
+		foreach ( $ids as $id ) {
+			FrmForm::duplicate( $id, true, true );
+		}
 
-        return __( 'Form template was Successfully Created', 'formidable' );
-    }
+		return __( 'Form template was Successfully Created', 'formidable' );
+	}
 
 	/**
 	 * Redirect to the url for creating from a template
@@ -248,45 +248,45 @@ 
 		wp_die();
 	}
 
-    public static function duplicate() {
-        FrmAppHelper::permission_check('frm_edit_forms');
+	public static function duplicate() {
+		FrmAppHelper::permission_check('frm_edit_forms');
 
 		$params = FrmForm::list_page_params();
-        $form = FrmForm::duplicate( $params['id'], $params['template'], true );
-        $message = ($params['template']) ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
-        if ( $form ) {
+		$form = FrmForm::duplicate( $params['id'], $params['template'], true );
+		$message = ($params['template']) ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
+		if ( $form ) {
 			return self::get_edit_vars( $form, array(), $message, true );
-        } else {
-            return self::display_forms_list($params, __( 'There was a problem creating the new template.', 'formidable' ));
-        }
-    }
+		} else {
+			return self::display_forms_list($params, __( 'There was a problem creating the new template.', 'formidable' ));
+		}
+	}
 
-    public static function page_preview() {
+	public static function page_preview() {
 		$params = FrmForm::list_page_params();
-        if ( ! $params['form'] ) {
-            return;
-        }
-
-        $form = FrmForm::getOne( $params['form'] );
-        if ( ! $form ) {
-            return;
-        }
-        return self::show_form( $form->id, '', true, true );
-    }
-
-    public static function preview() {
-        do_action( 'frm_wp' );
-
-        global $frm_vars;
-        $frm_vars['preview'] = true;
-
-        if ( ! defined( 'ABSPATH' ) && ! defined( 'XMLRPC_REQUEST' ) ) {
-            global $wp;
-            $root = dirname( dirname( dirname( dirname( __FILE__ ) ) ) );
+		if ( ! $params['form'] ) {
+			return;
+		}
+
+		$form = FrmForm::getOne( $params['form'] );
+		if ( ! $form ) {
+			return;
+		}
+		return self::show_form( $form->id, '', true, true );
+	}
+
+	public static function preview() {
+		do_action( 'frm_wp' );
+
+		global $frm_vars;
+		$frm_vars['preview'] = true;
+
+		if ( ! defined( 'ABSPATH' ) && ! defined( 'XMLRPC_REQUEST' ) ) {
+			global $wp;
+			$root = dirname( dirname( dirname( dirname( __FILE__ ) ) ) );
 			include_once( $root . '/wp-config.php' );
-            $wp->init();
-            $wp->register_globals();
-        }
+			$wp->init();
+			$wp->register_globals();
+		}
 
 		header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
 
@@ -298,11 +298,11 @@ 
 		$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
 		if ( empty( $form ) ) {
 			$form = FrmForm::getAll( array(), '', 1 );
-        }
+		}
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php' );
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function register_pro_scripts() {
 		_deprecated_function( __FUNCTION__, '2.03', 'FrmProEntriesController::register_scripts' );
@@ -311,22 +311,22 @@ 
 		}
 	}
 
-    public static function untrash() {
+	public static function untrash() {
 		self::change_form_status( 'untrash' );
-    }
+	}
 
 	public static function bulk_untrash( $ids ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check('frm_edit_forms');
 
-        $count = FrmForm::set_status( $ids, 'published' );
+		$count = FrmForm::set_status( $ids, 'published' );
 
-        $message = sprintf(_n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
-        return $message;
-    }
+		$message = sprintf(_n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
+		return $message;
+	}
 
-    public static function trash() {
+	public static function trash() {
 		self::change_form_status( 'trash' );
-    }
+	}
 
 	/**
 	 * @param string $status
@@ -364,68 +364,68 @@ 
 	}
 
 	public static function bulk_trash( $ids ) {
-        FrmAppHelper::permission_check('frm_delete_forms');
+		FrmAppHelper::permission_check('frm_delete_forms');
 
-        $count = 0;
-        foreach ( $ids as $id ) {
-            if ( FrmForm::trash( $id ) ) {
-                $count++;
-            }
-        }
+		$count = 0;
+		foreach ( $ids as $id ) {
+			if ( FrmForm::trash( $id ) ) {
+				$count++;
+			}
+		}
 
-        $current_page = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
+		$current_page = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
 		$message = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">', '</a>' );
 
-        return $message;
-    }
+		return $message;
+	}
 
-    public static function destroy() {
-        FrmAppHelper::permission_check('frm_delete_forms');
+	public static function destroy() {
+		FrmAppHelper::permission_check('frm_delete_forms');
 
 		$params = FrmForm::list_page_params();
 
-        //check nonce url
-        check_admin_referer('destroy_form_' . $params['id']);
+		//check nonce url
+		check_admin_referer('destroy_form_' . $params['id']);
 
-        $count = 0;
-        if ( FrmForm::destroy( $params['id'] ) ) {
-            $count++;
-        }
+		$count = 0;
+		if ( FrmForm::destroy( $params['id'] ) ) {
+			$count++;
+		}
 
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+		$message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
 
 		self::display_forms_list( $params, $message );
-    }
+	}
 
 	public static function bulk_destroy( $ids ) {
-        FrmAppHelper::permission_check('frm_delete_forms');
+		FrmAppHelper::permission_check('frm_delete_forms');
 
-        $count = 0;
-        foreach ( $ids as $id ) {
-            $d = FrmForm::destroy( $id );
-            if ( $d ) {
-                $count++;
-            }
-        }
+		$count = 0;
+		foreach ( $ids as $id ) {
+			$d = FrmForm::destroy( $id );
+			if ( $d ) {
+				$count++;
+			}
+		}
 
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+		$message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
 
-        return $message;
-    }
+		return $message;
+	}
 
-    private static function delete_all() {
-        //check nonce url
-        $permission_error = FrmAppHelper::permission_nonce_error('frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable');
-        if ( $permission_error !== false ) {
+	private static function delete_all() {
+		//check nonce url
+		$permission_error = FrmAppHelper::permission_nonce_error('frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable');
+		if ( $permission_error !== false ) {
 			self::display_forms_list( array(), '', array( $permission_error ) );
-            return;
-        }
+			return;
+		}
 
 		$count = FrmForm::scheduled_delete( time() );
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+		$message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
 
 		self::display_forms_list( array(), $message );
-    }
+	}
 
 	public static function scheduled_delete( $delete_timestamp = '' ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmForm::scheduled_delete' );
@@ -433,11 +433,11 @@ 
 	}
 
 	/**
-	* Inserts Formidable button
-	* Hook exists since 2.5.0
-	*
-	* @since 2.0.15
-	*/
+	 * Inserts Formidable button
+	 * Hook exists since 2.5.0
+	 *
+	 * @since 2.0.15
+	 */
 	public static function insert_form_button() {
 		if ( current_user_can('frm_view_forms') ) {
 			$menu_name = FrmAppHelper::get_menu_name();
@@ -448,49 +448,49 @@ 
 		}
 	}
 
-    public static function insert_form_popup() {
+	public static function insert_form_popup() {
 		$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
 		if ( ! in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        FrmAppHelper::load_admin_wide_js();
+		FrmAppHelper::load_admin_wide_js();
 
-        $shortcodes = array(
+		$shortcodes = array(
 			'formidable' => array( 'name' => __( 'Form', 'formidable' ), 'label' => __( 'Insert a Form', 'formidable' ) ),
-        );
+		);
 
-        $shortcodes = apply_filters('frm_popup_shortcodes', $shortcodes);
+		$shortcodes = apply_filters('frm_popup_shortcodes', $shortcodes);
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php' );
-    }
+	}
 
-    public static function get_shortcode_opts() {
+	public static function get_shortcode_opts() {
 		FrmAppHelper::permission_check('frm_view_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
-        if ( empty($shortcode) ) {
-            wp_die();
-        }
+		if ( empty($shortcode) ) {
+			wp_die();
+		}
 
 		echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
 		echo '<input type="radio" name="frmsc" value="' . esc_attr( $shortcode ) . '" id="sc-' . esc_attr( $shortcode ) . '" class="frm_hidden" />';
 
-        $form_id = '';
-        $opts = array();
+		$form_id = '';
+		$opts = array();
 		switch ( $shortcode ) {
-            case 'formidable':
-                $opts = array(
+			case 'formidable':
+				$opts = array(
 					'form_id'       => 'id',
-                    //'key' => ',
+					//'key' => ',
 					'title'         => array( 'val' => 1, 'label' => __( 'Display form title', 'formidable' ) ),
 					'description'   => array( 'val' => 1, 'label' => __( 'Display form description', 'formidable' ) ),
 					'minimize'      => array( 'val' => 1, 'label' => __( 'Minimize form HTML', 'formidable' ) ),
-                );
-            break;
-        }
-        $opts = apply_filters('frm_sc_popup_opts', $opts, $shortcode);
+				);
+			break;
+		}
+		$opts = apply_filters('frm_sc_popup_opts', $opts, $shortcode);
 
 		if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
 			// allow other shortcodes to use the required form id option
@@ -500,61 +500,61 @@ 
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
 
-        echo '</div>';
+		echo '</div>';
 
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function display_forms_list( $params = array(), $message = '', $errors = array(), $deprecated_errors = array() ) {
-        FrmAppHelper::permission_check( 'frm_view_forms' );
+		FrmAppHelper::permission_check( 'frm_view_forms' );
 		if ( ! empty( $deprecated_errors ) ) {
 			$errors = $deprecated_errors;
 			_deprecated_argument( 'errors', '2.0.8' );
 		}
 
-        global $wpdb, $frm_vars;
+		global $wpdb, $frm_vars;
 
 		if ( empty( $params ) ) {
 			$params = FrmForm::list_page_params();
-        }
+		}
 
-        $wp_list_table = new FrmFormsListHelper( compact( 'params' ) );
+		$wp_list_table = new FrmFormsListHelper( compact( 'params' ) );
 
-        $pagenum = $wp_list_table->get_pagenum();
+		$pagenum = $wp_list_table->get_pagenum();
 
-        $wp_list_table->prepare_items();
+		$wp_list_table->prepare_items();
 
-        $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-        if ( $pagenum > $total_pages && $total_pages > 0 ) {
+		$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+		if ( $pagenum > $total_pages && $total_pages > 0 ) {
 			wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
-            die();
-        }
+			die();
+		}
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php' );
-    }
+	}
 
 	public static function get_columns( $columns ) {
-	    $columns['cb'] = '<input type="checkbox" />';
-	    $columns['id'] = 'ID';
+		$columns['cb'] = '<input type="checkbox" />';
+		$columns['id'] = 'ID';
 
-        $type = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : 'published';
+		$type = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : 'published';
 
-        if ( 'template' == $type ) {
-            $columns['name']        = __( 'Template Name', 'formidable' );
-            $columns['type']        = __( 'Type', 'formidable' );
-            $columns['form_key']    = __( 'Key', 'formidable' );
-        } else {
-            $columns['name']        = __( 'Form Title', 'formidable' );
-            $columns['entries']     = __( 'Entries', 'formidable' );
-            $columns['form_key']    = __( 'Key', 'formidable' );
-            $columns['shortcode']   = __( 'Shortcodes', 'formidable' );
-        }
+		if ( 'template' == $type ) {
+			$columns['name']        = __( 'Template Name', 'formidable' );
+			$columns['type']        = __( 'Type', 'formidable' );
+			$columns['form_key']    = __( 'Key', 'formidable' );
+		} else {
+			$columns['name']        = __( 'Form Title', 'formidable' );
+			$columns['entries']     = __( 'Entries', 'formidable' );
+			$columns['form_key']    = __( 'Key', 'formidable' );
+			$columns['shortcode']   = __( 'Shortcodes', 'formidable' );
+		}
 
-        $columns['created_at'] = __( 'Date', 'formidable' );
+		$columns['created_at'] = __( 'Date', 'formidable' );
 
 		add_screen_option( 'per_page', array( 'label' => __( 'Forms', 'formidable' ), 'default' => 20, 'option' => 'formidable_page_formidable_per_page' ) );
 
-        return $columns;
+		return $columns;
 	}
 
 	public static function get_sortable_columns() {
@@ -568,111 +568,111 @@ 
 	}
 
 	public static function hidden_columns( $result ) {
-        $return = false;
-        foreach ( (array) $result as $r ) {
-            if ( ! empty( $r ) ) {
-                $return = true;
-                break;
-            }
-        }
+		$return = false;
+		foreach ( (array) $result as $r ) {
+			if ( ! empty( $r ) ) {
+				$return = true;
+				break;
+			}
+		}
 
-        if ( $return ) {
-            return $result;
+		if ( $return ) {
+			return $result;
 		}
 
-        $type = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
+		$type = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
 
-        $result[] = 'created_at';
-        if ( $type == 'template' ) {
-            $result[] = 'id';
-            $result[] = 'form_key';
-        }
+		$result[] = 'created_at';
+		if ( $type == 'template' ) {
+			$result[] = 'id';
+			$result[] = 'form_key';
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
 	public static function save_per_page( $save, $option, $value ) {
-        if ( $option == 'formidable_page_formidable_per_page' ) {
-            $save = (int) $value;
-        }
-        return $save;
-    }
+		if ( $option == 'formidable_page_formidable_per_page' ) {
+			$save = (int) $value;
+		}
+		return $save;
+	}
 
 	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
-        global $frm_vars;
+		global $frm_vars;
 
-        $form = FrmForm::getOne( $id );
-        if ( ! $form ) {
-            wp_die( __( 'You are trying to edit a form that does not exist.', 'formidable' ) );
-        }
+		$form = FrmForm::getOne( $id );
+		if ( ! $form ) {
+			wp_die( __( 'You are trying to edit a form that does not exist.', 'formidable' ) );
+		}
 
-        if ( $form->parent_form_id ) {
+		if ( $form->parent_form_id ) {
 			wp_die( sprintf( __( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form->parent_form_id ) ) . '">', '</a>' ));
-        }
+		}
 
 		$frm_field_selection = FrmField::field_selection();
-        $fields = FrmField::get_all_for_form($form->id);
+		$fields = FrmField::get_all_for_form($form->id);
 
-        // Automatically add end section fields if they don't exist (2.0 migration)
-        $reset_fields = false;
-        FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
+		// Automatically add end section fields if they don't exist (2.0 migration)
+		$reset_fields = false;
+		FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
 
-        if ( $reset_fields ) {
-            $fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
-        }
+		if ( $reset_fields ) {
+			$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
+		}
 
-        unset($end_section_values, $last_order, $open, $reset_fields);
+		unset($end_section_values, $last_order, $open, $reset_fields);
 
 		$args = array( 'parent_form_id' => $form->id );
-        $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true, array(), $args );
+		$values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true, array(), $args );
 
-        $edit_message = __( 'Form was Successfully Updated', 'formidable' );
-        if ( $form->is_template && $message == $edit_message ) {
-            $message = __( 'Template was Successfully Updated', 'formidable' );
-        }
+		$edit_message = __( 'Form was Successfully Updated', 'formidable' );
+		if ( $form->is_template && $message == $edit_message ) {
+			$message = __( 'Template was Successfully Updated', 'formidable' );
+		}
 
 		$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
-        if ( $form->default_template ) {
-            wp_die(__( 'That template cannot be edited', 'formidable' ));
-        } else if ( defined('DOING_AJAX') ) {
-            wp_die();
-        } else if ( $create_link ) {
+		if ( $form->default_template ) {
+			wp_die(__( 'That template cannot be edited', 'formidable' ));
+		} else if ( defined('DOING_AJAX') ) {
+			wp_die();
+		} else if ( $create_link ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
-        } else {
+		} else {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
-        }
-    }
+		}
+	}
 
 	public static function get_settings_vars( $id, $errors = array(), $message = '' ) {
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-        global $frm_vars;
+		global $frm_vars;
 
-        $form = FrmForm::getOne( $id );
+		$form = FrmForm::getOne( $id );
 
-        $fields = FrmField::get_all_for_form($id);
-        $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+		$fields = FrmField::get_all_for_form($id);
+		$values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
 
-        if ( isset($values['default_template']) && $values['default_template'] ) {
-            wp_die(__( 'That template cannot be edited', 'formidable' ));
-        }
+		if ( isset($values['default_template']) && $values['default_template'] ) {
+			wp_die(__( 'That template cannot be edited', 'formidable' ));
+		}
 
-        $action_controls = FrmFormActionsController::get_form_actions();
+		$action_controls = FrmFormActionsController::get_form_actions();
 
-        $sections = apply_filters('frm_add_form_settings_section', array(), $values);
-        $pro_feature = FrmAppHelper::pro_is_installed() ? '' : ' class="pro_feature"';
+		$sections = apply_filters('frm_add_form_settings_section', array(), $values);
+		$pro_feature = FrmAppHelper::pro_is_installed() ? '' : ' class="pro_feature"';
 
-        $styles = apply_filters('frm_get_style_opts', array());
+		$styles = apply_filters('frm_get_style_opts', array());
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
-    }
+	}
 
-    public static function mb_tags_box( $form_id, $class = '' ) {
-        $fields = FrmField::get_all_for_form($form_id, '', 'include');
-        $linked_forms = array();
-        $col = 'one';
-        $settings_tab = FrmAppHelper::is_admin_page('formidable' ) ? true : false;
+	public static function mb_tags_box( $form_id, $class = '' ) {
+		$fields = FrmField::get_all_for_form($form_id, '', 'include');
+		$linked_forms = array();
+		$col = 'one';
+		$settings_tab = FrmAppHelper::is_admin_page('formidable' ) ? true : false;
 
 		$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
 		$adv_shortcodes = self::get_advanced_shortcodes();
@@ -680,7 +680,7 @@ 
 		$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
-    }
+	}
 
 	/**
 	 * Get an array of the options to display in the advanced tab
@@ -721,7 +721,7 @@ 
 			''          => '',
 			'siteurl'   => __( 'Site URL', 'formidable' ),
 			'sitename'  => __( 'Site Name', 'formidable' ),
-        );
+		);
 
 		if ( ! FrmAppHelper::pro_is_installed() ) {
 			unset( $entry_shortcodes['post_id'] );
@@ -748,39 +748,39 @@ 
 		return $entry_shortcodes;
 	}
 
-    // Insert the form class setting into the form
+	// Insert the form class setting into the form
 	public static function form_classes( $form ) {
-        if ( isset($form->options['form_class']) ) {
+		if ( isset($form->options['form_class']) ) {
 			echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
-        }
-    }
+		}
+	}
 
-    public static function get_email_html() {
+	public static function get_email_html() {
 		FrmAppHelper::permission_check('frm_view_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 		echo FrmEntryFormat::show_entry( array(
 			'form_id'       => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
-	        'default_email' => true,
+			'default_email' => true,
 			'plain_text'    => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
-	    ) );
-	    wp_die();
+		) );
+		wp_die();
 	}
 
-    public static function filter_content( $content, $form, $entry = false ) {
+	public static function filter_content( $content, $form, $entry = false ) {
 		self::get_entry_by_param( $entry );
-        if ( ! $entry ) {
-            return $content;
-        }
+		if ( ! $entry ) {
+			return $content;
+		}
 
-        if ( is_object( $form ) ) {
-            $form = $form->id;
-        }
+		if ( is_object( $form ) ) {
+			$form = $form->id;
+		}
 
-        $shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
-        $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
+		$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
+		$content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
 
-        return $content;
-    }
+		return $content;
+	}
 
 	private static function get_entry_by_param( &$entry ) {
 		if ( ! $entry || ! is_object( $entry ) ) {
@@ -792,282 +792,282 @@ 
 		}
 	}
 
-    public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
-        return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
-    }
+	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
+		return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
+	}
 
-    public static function process_bulk_form_actions( $errors ) {
-        if ( ! $_REQUEST ) {
-            return $errors;
-        }
+	public static function process_bulk_form_actions( $errors ) {
+		if ( ! $_REQUEST ) {
+			return $errors;
+		}
 
 		$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
-        if ( $bulkaction == -1 ) {
+		if ( $bulkaction == -1 ) {
 			$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
-        }
-
-        if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
-            FrmAppHelper::remove_get_action();
-
-            $bulkaction = str_replace( 'bulk_', '', $bulkaction );
-        }
-
-        $ids = FrmAppHelper::get_param( 'item-action', '' );
-        if ( empty( $ids ) ) {
-            $errors[] = __( 'No forms were specified', 'formidable' );
-            return $errors;
-        }
-
-        $permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
-        if ( $permission_error !== false ) {
-            $errors[] = $permission_error;
-            return $errors;
-        }
-
-        if ( ! is_array( $ids ) ) {
-            $ids = explode( ',', $ids );
-        }
-
-        switch ( $bulkaction ) {
-            case 'delete':
-                $message = self::bulk_destroy( $ids );
-            break;
-            case 'trash':
-                $message = self::bulk_trash( $ids );
-            break;
-            case 'untrash':
-                $message = self::bulk_untrash( $ids );
-            break;
-            case 'create_template':
-                $message = self::bulk_create_template( $ids );
-            break;
-        }
-
-        if ( isset( $message ) && ! empty( $message ) ) {
+		}
+
+		if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
+			FrmAppHelper::remove_get_action();
+
+			$bulkaction = str_replace( 'bulk_', '', $bulkaction );
+		}
+
+		$ids = FrmAppHelper::get_param( 'item-action', '' );
+		if ( empty( $ids ) ) {
+			$errors[] = __( 'No forms were specified', 'formidable' );
+			return $errors;
+		}
+
+		$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
+		if ( $permission_error !== false ) {
+			$errors[] = $permission_error;
+			return $errors;
+		}
+
+		if ( ! is_array( $ids ) ) {
+			$ids = explode( ',', $ids );
+		}
+
+		switch ( $bulkaction ) {
+			case 'delete':
+				$message = self::bulk_destroy( $ids );
+			break;
+			case 'trash':
+				$message = self::bulk_trash( $ids );
+			break;
+			case 'untrash':
+				$message = self::bulk_untrash( $ids );
+			break;
+			case 'create_template':
+				$message = self::bulk_create_template( $ids );
+			break;
+		}
+
+		if ( isset( $message ) && ! empty( $message ) ) {
 			echo '<div id="message" class="updated frm_msg_padding">' . FrmAppHelper::kses( $message, array( 'a' ) ) . '</div>';
-        }
+		}
 
-        return $errors;
-    }
+		return $errors;
+	}
 
-    public static function add_default_templates( $path, $default = true, $template = true ) {
-        _deprecated_function( __FUNCTION__, '1.07.05', 'FrmXMLController::add_default_templates()' );
+	public static function add_default_templates( $path, $default = true, $template = true ) {
+		_deprecated_function( __FUNCTION__, '1.07.05', 'FrmXMLController::add_default_templates()' );
 
-        $path = untrailingslashit(trim($path));
+		$path = untrailingslashit(trim($path));
 		$templates = glob( $path . '/*.php' );
 
 		for ( $i = count( $templates ) - 1; $i >= 0; $i-- ) {
 			$filename = str_replace( '.php', '', str_replace( $path . '/', '', $templates[ $i ] ) );
 			$template_query = array( 'form_key' => $filename );
-            if ( $template ) {
-                $template_query['is_template'] = 1;
-            }
-            if ( $default ) {
-                $template_query['default_template'] = 1;
-            }
+			if ( $template ) {
+				$template_query['is_template'] = 1;
+			}
+			if ( $default ) {
+				$template_query['default_template'] = 1;
+			}
 			$form = FrmForm::getAll( $template_query, '', 1 );
 
-            $values = FrmFormsHelper::setup_new_vars();
-            $values['form_key'] = $filename;
-            $values['is_template'] = $template;
-            $values['status'] = 'published';
-            if ( $default ) {
-                $values['default_template'] = 1;
-            }
-
-            include( $templates[ $i ] );
-
-            //get updated form
-            if ( isset($form) && ! empty($form) ) {
-                $old_id = $form->id;
-                $form = FrmForm::getOne($form->id);
-            } else {
-                $old_id = false;
+			$values = FrmFormsHelper::setup_new_vars();
+			$values['form_key'] = $filename;
+			$values['is_template'] = $template;
+			$values['status'] = 'published';
+			if ( $default ) {
+				$values['default_template'] = 1;
+			}
+
+			include( $templates[ $i ] );
+
+			//get updated form
+			if ( isset($form) && ! empty($form) ) {
+				$old_id = $form->id;
+				$form = FrmForm::getOne($form->id);
+			} else {
+				$old_id = false;
 				$form = FrmForm::getAll( $template_query, '', 1 );
-            }
+			}
 
-            if ( $form ) {
+			if ( $form ) {
 				do_action( 'frm_after_duplicate_form', $form->id, (array) $form, array( 'old_id' => $old_id ) );
-            }
-        }
-    }
+			}
+		}
+	}
 
-    public static function route() {
-        $action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
-        $vars = array();
+	public static function route() {
+		$action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
+		$vars = array();
 		if ( isset( $_POST['frm_compact_fields'] ) ) {
 			FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-            $json_vars = htmlspecialchars_decode(nl2br(stripslashes(str_replace('&quot;', '\\\"', $_POST['frm_compact_fields'] ))));
-            $json_vars = json_decode($json_vars, true);
-            if ( empty($json_vars) ) {
-                // json decoding failed so we should return an error message
+			$json_vars = htmlspecialchars_decode(nl2br(stripslashes(str_replace('&quot;', '\\\"', $_POST['frm_compact_fields'] ))));
+			$json_vars = json_decode($json_vars, true);
+			if ( empty($json_vars) ) {
+				// json decoding failed so we should return an error message
 				$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
-                if ( 'edit' == $action ) {
-                    $action = 'update';
-                }
-
-                add_filter('frm_validate_form', 'FrmFormsController::json_error');
-            } else {
-                $vars = FrmAppHelper::json_to_array($json_vars);
-                $action = $vars[ $action ];
+				if ( 'edit' == $action ) {
+					$action = 'update';
+				}
+
+				add_filter('frm_validate_form', 'FrmFormsController::json_error');
+			} else {
+				$vars = FrmAppHelper::json_to_array($json_vars);
+				$action = $vars[ $action ];
 				unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] );
 				$_REQUEST = array_merge( $_REQUEST, $vars );
 				$_POST = array_merge( $_POST, $_REQUEST );
-            }
-        } else {
+			}
+		} else {
 			$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
-    		if ( isset( $_REQUEST['delete_all'] ) ) {
-                // override the action for this page
-    			$action = 'delete_all';
-            }
-        }
+			if ( isset( $_REQUEST['delete_all'] ) ) {
+				// override the action for this page
+				$action = 'delete_all';
+			}
+		}
 
 		add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
-        FrmAppHelper::trigger_hook_load( 'form' );
-
-        switch ( $action ) {
-            case 'new':
-                return self::new_form($vars);
-            case 'create':
-            case 'edit':
-            case 'update':
-            case 'duplicate':
-            case 'trash':
-            case 'untrash':
-            case 'destroy':
-            case 'delete_all':
-            case 'settings':
-            case 'update_settings':
+		FrmAppHelper::trigger_hook_load( 'form' );
+
+		switch ( $action ) {
+			case 'new':
+				return self::new_form($vars);
+			case 'create':
+			case 'edit':
+			case 'update':
+			case 'duplicate':
+			case 'trash':
+			case 'untrash':
+			case 'destroy':
+			case 'delete_all':
+			case 'settings':
+			case 'update_settings':
 				return self::$action( $vars );
-            default:
+			default:
 				do_action( 'frm_form_action_' . $action );
 				if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
-                    return;
-                }
+					return;
+				}
 
 				$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
-                if ( $action == -1 ) {
+				if ( $action == -1 ) {
 					$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
-                }
+				}
 
-                if ( strpos($action, 'bulk_') === 0 ) {
-                    FrmAppHelper::remove_get_action();
-                    return self::list_form();
-                }
+				if ( strpos($action, 'bulk_') === 0 ) {
+					FrmAppHelper::remove_get_action();
+					return self::list_form();
+				}
 
-                return self::display_forms_list();
-        }
-    }
+				return self::display_forms_list();
+		}
+	}
 
-    public static function json_error( $errors ) {
-        $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
-        return $errors;
-    }
+	public static function json_error( $errors ) {
+		$errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
+		return $errors;
+	}
 
 
-    /* FRONT-END FORMS */
-    public static function admin_bar_css() {
+	/* FRONT-END FORMS */
+	public static function admin_bar_css() {
 		if ( is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
-            return;
-        }
+			return;
+		}
 
 		add_action( 'wp_before_admin_bar_render', 'FrmFormsController::admin_bar_configure' );
 		FrmAppHelper::load_font_style();
 	}
 
 	public static function admin_bar_configure() {
-        global $frm_vars;
-        if ( empty($frm_vars['forms_loaded']) ) {
-            return;
-        }
-
-        $actions = array();
-        foreach ( $frm_vars['forms_loaded'] as $form ) {
-            if ( is_object($form) ) {
-                $actions[ $form->id ] = $form->name;
-            }
-            unset($form);
-        }
-
-        if ( empty($actions) ) {
-            return;
-        }
-
-        asort($actions);
-
-        global $wp_admin_bar;
-
-        if ( count($actions) == 1 ) {
-            $wp_admin_bar->add_menu( array(
-                'title' => 'Edit Form',
+		global $frm_vars;
+		if ( empty($frm_vars['forms_loaded']) ) {
+			return;
+		}
+
+		$actions = array();
+		foreach ( $frm_vars['forms_loaded'] as $form ) {
+			if ( is_object($form) ) {
+				$actions[ $form->id ] = $form->name;
+			}
+			unset($form);
+		}
+
+		if ( empty($actions) ) {
+			return;
+		}
+
+		asort($actions);
+
+		global $wp_admin_bar;
+
+		if ( count($actions) == 1 ) {
+			$wp_admin_bar->add_menu( array(
+				'title' => 'Edit Form',
 				'href'  => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . current( array_keys( $actions ) ) ),
-                'id'    => 'frm-forms',
-            ) );
-        } else {
-            $wp_admin_bar->add_menu( array(
-        		'id'    => 'frm-forms',
-        		'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( 'Edit Forms', 'formidable' ) . '</span>',
+				'id'    => 'frm-forms',
+			) );
+		} else {
+			$wp_admin_bar->add_menu( array(
+				'id'    => 'frm-forms',
+				'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( 'Edit Forms', 'formidable' ) . '</span>',
 				'href'  => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . current( array_keys( $actions ) ) ),
-        		'meta'  => array(
+				'meta'  => array(
 					'title' => __( 'Edit Forms', 'formidable' ),
-        		),
-        	) );
+				),
+			) );
 
-        	foreach ( $actions as $form_id => $name ) {
+			foreach ( $actions as $form_id => $name ) {
 
-        		$wp_admin_bar->add_menu( array(
-        			'parent'    => 'frm-forms',
+				$wp_admin_bar->add_menu( array(
+					'parent'    => 'frm-forms',
 					'id'        => 'edit_form_' . $form_id,
-        			'title'     => empty($name) ? __( '(no title)') : $name,
+					'title'     => empty($name) ? __( '(no title)') : $name,
 					'href'      => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form_id ),
-        		) );
-        	}
-        }
-    }
+				) );
+			}
+		}
+	}
 
-    //formidable shortcode
+	//formidable shortcode
 	public static function get_form_shortcode( $atts ) {
-        global $frm_vars;
-        if ( isset($frm_vars['skip_shortcode']) && $frm_vars['skip_shortcode'] ) {
-            $sc = '[formidable';
+		global $frm_vars;
+		if ( isset($frm_vars['skip_shortcode']) && $frm_vars['skip_shortcode'] ) {
+			$sc = '[formidable';
 			if ( ! empty( $atts ) ) {
 				foreach ( $atts as $k => $v ) {
 					$sc .= ' ' . $k . '="' . esc_attr( $v ) . '"';
 				}
 			}
 			return $sc . ']';
-        }
-
-        $shortcode_atts = shortcode_atts( array(
-            'id' => '', 'key' => '', 'title' => false, 'description' => false,
-            'readonly' => false, 'entry_id' => false, 'fields' => array(),
-            'exclude_fields' => array(), 'minimize' => false,
-        ), $atts);
-        do_action('formidable_shortcode_atts', $shortcode_atts, $atts);
-
-        return self::show_form(
-            $shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'],
-            $shortcode_atts['description'], $atts
-        );
-    }
-
-    public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
-        if ( empty( $id ) ) {
-            $id = $key;
-        }
-
-        $form = self::maybe_get_form_to_show( $id );
-        if ( ! $form ) {
-            return __( 'Please select a valid form', 'formidable' );
-        }
+		}
+
+		$shortcode_atts = shortcode_atts( array(
+			'id' => '', 'key' => '', 'title' => false, 'description' => false,
+			'readonly' => false, 'entry_id' => false, 'fields' => array(),
+			'exclude_fields' => array(), 'minimize' => false,
+		), $atts);
+		do_action('formidable_shortcode_atts', $shortcode_atts, $atts);
+
+		return self::show_form(
+			$shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'],
+			$shortcode_atts['description'], $atts
+		);
+	}
+
+	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
+		if ( empty( $id ) ) {
+			$id = $key;
+		}
+
+		$form = self::maybe_get_form_to_show( $id );
+		if ( ! $form ) {
+			return __( 'Please select a valid form', 'formidable' );
+		}
 
 		add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
-        FrmAppHelper::trigger_hook_load( 'form', $form );
+		FrmAppHelper::trigger_hook_load( 'form', $form );
 
-        $form = apply_filters( 'frm_pre_display_form', $form );
+		$form = apply_filters( 'frm_pre_display_form', $form );
 
-        $frm_settings = FrmAppHelper::get_settings();
+		$frm_settings = FrmAppHelper::get_settings();
 
 		if ( self::is_viewable_draft_form( $form ) ) {
 			// don't show a draft form on a page
@@ -1088,7 +1088,7 @@ 
 		}
 
 		return $form;
-    }
+	}
 
 	private static function maybe_get_form_to_show( $id ) {
 		$form = false;
@@ -1117,99 +1117,99 @@ 
 		return $form->logged_in && get_current_user_id() && isset( $form->options['logged_in_role'] ) && $form->options['logged_in_role'] != '' && ! FrmAppHelper::user_has_permission( $form->options['logged_in_role'] );
 	}
 
-    public static function get_form( $form, $title, $description, $atts = array() ) {
-        ob_start();
+	public static function get_form( $form, $title, $description, $atts = array() ) {
+		ob_start();
 
-        self::get_form_contents( $form, $title, $description, $atts );
+		self::get_form_contents( $form, $title, $description, $atts );
 		self::enqueue_scripts( FrmForm::get_params( $form ) );
 
-        $contents = ob_get_contents();
-        ob_end_clean();
+		$contents = ob_get_contents();
+		ob_end_clean();
 
 		self::maybe_minimize_form( $atts, $contents );
 
-        return $contents;
-    }
+		return $contents;
+	}
 
 	public static function enqueue_scripts( $params ) {
 		do_action( 'frm_enqueue_form_scripts', $params );
 	}
 
 	public static function get_form_contents( $form, $title, $description, $atts ) {
-        global $frm_vars;
+		global $frm_vars;
 
-        $frm_settings = FrmAppHelper::get_settings();
+		$frm_settings = FrmAppHelper::get_settings();
 
-        $submit = isset($form->options['submit_value']) ? $form->options['submit_value'] : $frm_settings->submit_value;
+		$submit = isset($form->options['submit_value']) ? $form->options['submit_value'] : $frm_settings->submit_value;
 
-        $user_ID = get_current_user_id();
+		$user_ID = get_current_user_id();
 		$params = FrmForm::get_params( $form );
 		$message = '';
 		$errors = array();
 
-        if ( $params['posted_form_id'] == $form->id && $_POST ) {
-            $errors = isset( $frm_vars['created_entries'][ $form->id ] ) ? $frm_vars['created_entries'][ $form->id ]['errors'] : array();
-        }
+		if ( $params['posted_form_id'] == $form->id && $_POST ) {
+			$errors = isset( $frm_vars['created_entries'][ $form->id ] ) ? $frm_vars['created_entries'][ $form->id ]['errors'] : array();
+		}
 
 		$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
 		$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
 
-        if ( $params['action'] != 'create' || $params['posted_form_id'] != $form->id || ! $_POST ) {
-            do_action('frm_display_form_action', $params, $fields, $form, $title, $description);
-            if ( apply_filters('frm_continue_to_new', true, $form->id, $params['action']) ) {
-                $values = FrmEntriesHelper::setup_new_vars($fields, $form);
+		if ( $params['action'] != 'create' || $params['posted_form_id'] != $form->id || ! $_POST ) {
+			do_action('frm_display_form_action', $params, $fields, $form, $title, $description);
+			if ( apply_filters('frm_continue_to_new', true, $form->id, $params['action']) ) {
+				$values = FrmEntriesHelper::setup_new_vars($fields, $form);
 				include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
-            }
-            return;
-        }
+			}
+			return;
+		}
 
-        if ( ! empty($errors) ) {
-            $values = $fields ? FrmEntriesHelper::setup_new_vars($fields, $form) : array();
+		if ( ! empty($errors) ) {
+			$values = $fields ? FrmEntriesHelper::setup_new_vars($fields, $form) : array();
 			include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
-            return;
-        }
+			return;
+		}
 
-        do_action('frm_validate_form_creation', $params, $fields, $form, $title, $description);
-        if ( ! apply_filters('frm_continue_to_create', true, $form->id) ) {
-            return;
-        }
+		do_action('frm_validate_form_creation', $params, $fields, $form, $title, $description);
+		if ( ! apply_filters('frm_continue_to_create', true, $form->id) ) {
+			return;
+		}
 
-        $values = FrmEntriesHelper::setup_new_vars($fields, $form, true);
-        $created = self::just_created_entry( $form->id );
-        $conf_method = apply_filters('frm_success_filter', 'message', $form, 'create');
+		$values = FrmEntriesHelper::setup_new_vars($fields, $form, true);
+		$created = self::just_created_entry( $form->id );
+		$conf_method = apply_filters('frm_success_filter', 'message', $form, 'create');
 
-        if ( $created && is_numeric($created) && $conf_method != 'message' ) {
-            do_action('frm_success_action', $conf_method, $form, $form->options, $created);
+		if ( $created && is_numeric($created) && $conf_method != 'message' ) {
+			do_action('frm_success_action', $conf_method, $form, $form->options, $created);
 			do_action( 'frm_after_entry_processed', array( 'entry_id' => $created, 'form' => $form ) );
-            return;
-        }
+			return;
+		}
 
-        if ( $created && is_numeric($created) ) {
-            $message = isset($form->options['success_msg']) ? $form->options['success_msg'] : $frm_settings->success_msg;
-            $class = 'frm_message';
-        } else {
-            $message = $frm_settings->failed_msg;
-            $class = FrmFormsHelper::form_error_class();
-        }
+		if ( $created && is_numeric($created) ) {
+			$message = isset($form->options['success_msg']) ? $form->options['success_msg'] : $frm_settings->success_msg;
+			$class = 'frm_message';
+		} else {
+			$message = $frm_settings->failed_msg;
+			$class = FrmFormsHelper::form_error_class();
+		}
 
 		$message = FrmFormsHelper::get_success_message( array(
 			'message' => $message, 'form' => $form,
 			'entry_id' => $created, 'class' => $class,
 		) );
-        $message = apply_filters('frm_main_feedback', $message, $form, $created);
+		$message = apply_filters('frm_main_feedback', $message, $form, $created);
 
-        if ( ! isset($form->options['show_form']) || $form->options['show_form'] ) {
+		if ( ! isset($form->options['show_form']) || $form->options['show_form'] ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
-        } else {
-            global $frm_vars;
+		} else {
+			global $frm_vars;
 			self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
 
 			$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
 			include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' );
-        }
+		}
 
 		do_action( 'frm_after_entry_processed', array( 'entry_id' => $created, 'form' => $form ) );
-    }
+	}
 
 	/**
 	 * @since 2.2.7
@@ -1246,10 +1246,10 @@ 
 	}
 
 	public static function defer_script_loading( $tag, $handle ) {
-	    if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
-	        $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
+		if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
+			$tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
 		}
-	    return $tag;
+		return $tag;
 	}
 
 	public static function footer_js( $location = 'footer' ) {

Spacing +119 added lines, -119 removed lines

@@ -7,7 +7,7 @@ 
 		if ( ! FrmAppHelper::pro_is_installed() ) {
 			$menu_label .= ' (Lite)';
 		}
-		add_submenu_page('formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
+		add_submenu_page( 'formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
 
 		self::maybe_load_listing_hooks();
     }
@@ -18,14 +18,14 @@ 
 			return;
 		}
 
-		add_filter('get_user_option_managetoplevel_page_formidablecolumnshidden', 'FrmFormsController::hidden_columns' );
+		add_filter( 'get_user_option_managetoplevel_page_formidablecolumnshidden', 'FrmFormsController::hidden_columns' );
 
-		add_filter('manage_toplevel_page_formidable_columns', 'FrmFormsController::get_columns', 0 );
-		add_filter('manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
+		add_filter( 'manage_toplevel_page_formidable_columns', 'FrmFormsController::get_columns', 0 );
+		add_filter( 'manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
 	}
 
     public static function head() {
-        wp_enqueue_script('formidable-editinplace');
+        wp_enqueue_script( 'formidable-editinplace' );
 
         if ( wp_is_mobile() ) {
     		wp_enqueue_script( 'jquery-touch-punch' );
@@ -33,36 +33,36 @@ 
     }
 
     public static function register_widgets() {
-        require_once(FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php');
-        register_widget('FrmShowForm');
+        require_once( FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php' );
+        register_widget( 'FrmShowForm' );
     }
 
     public static function list_form() {
-        FrmAppHelper::permission_check('frm_view_forms');
+        FrmAppHelper::permission_check( 'frm_view_forms' );
 
 		$params = FrmForm::list_page_params();
-        $errors = self::process_bulk_form_actions( array());
-        $errors = apply_filters('frm_admin_list_form_action', $errors);
+        $errors = self::process_bulk_form_actions( array() );
+        $errors = apply_filters( 'frm_admin_list_form_action', $errors );
 
 		return self::display_forms_list( $params, '', $errors );
     }
 
 	public static function new_form( $values = array() ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
         global $frm_vars;
 
-        $action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
-		$action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[ $action ];
+        $action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
+		$action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[$action];
 
 		if ( $action == 'create' ) {
-			self::create($values);
+			self::create( $values );
 			return;
 		} else if ( $action == 'new' ) {
 			$frm_field_selection = FrmField::field_selection();
-            $values = FrmFormsHelper::setup_new_vars($values);
+            $values = FrmFormsHelper::setup_new_vars( $values );
             $id = FrmForm::create( $values );
-            $form = FrmForm::getOne($id);
+            $form = FrmForm::getOne( $id );
 
 			self::create_default_email_action( $form );
 
@@ -90,7 +90,7 @@ 
     }
 
 	public static function create( $values = array() ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
         global $frm_vars;
         if ( empty( $values ) ) {
@@ -102,22 +102,22 @@ 
             $values = FrmProEntry::mod_other_vals( $values, 'back' );
         }
 
-		$id = isset($values['id']) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
+		$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
         if ( ! current_user_can( 'frm_edit_forms' ) || ( $_POST && ( ! isset( $values['frm_save_form'] ) || ! wp_verify_nonce( $values['frm_save_form'], 'frm_save_form_nonce' ) ) ) ) {
             $frm_settings = FrmAppHelper::get_settings();
             $errors = array( 'form' => $frm_settings->admin_permission );
         } else {
-            $errors = FrmForm::validate($values);
+            $errors = FrmForm::validate( $values );
         }
 
-        if ( count($errors) > 0 ) {
+        if ( count( $errors ) > 0 ) {
             $hide_preview = true;
 			$frm_field_selection = FrmField::field_selection();
             $form = FrmForm::getOne( $id );
-            $fields = FrmField::get_all_for_form($id);
+            $fields = FrmField::get_all_for_form( $id );
 
-            $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+            $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
 			$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
@@ -129,32 +129,32 @@ 
     }
 
     public static function edit( $values = false ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
 		$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
-        return self::get_edit_vars($id);
+        return self::get_edit_vars( $id );
     }
 
     public static function settings( $id = false, $message = '' ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-        if ( ! $id || ! is_numeric($id) ) {
+        if ( ! $id || ! is_numeric( $id ) ) {
 			$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
         }
 		return self::get_settings_vars( $id, array(), $message );
     }
 
     public static function update_settings() {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
 		$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
-        $errors = FrmForm::validate($_POST);
-        if ( count($errors) > 0 ) {
-            return self::get_settings_vars($id, $errors);
+        $errors = FrmForm::validate( $_POST );
+        if ( count( $errors ) > 0 ) {
+            return self::get_settings_vars( $id, $errors );
         }
 
-        do_action('frm_before_update_form_settings', $id);
+        do_action( 'frm_before_update_form_settings', $id );
 
 		FrmForm::update( $id, $_POST );
 
@@ -176,7 +176,7 @@ 
 
 	private static function edit_in_place_value( $field ) {
 		check_ajax_referer( 'frm_ajax', 'nonce' );
-		FrmAppHelper::permission_check('frm_edit_forms', 'hide');
+		FrmAppHelper::permission_check( 'frm_edit_forms', 'hide' );
 
 		$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
 		$value = FrmAppHelper::get_post_param( 'update_value', '', 'wp_filter_post_kses' );
@@ -234,7 +234,7 @@ 
 	 * @since 2.0
 	 */
 	public static function _create_from_template() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
 		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$current_form = FrmAppHelper::get_param( 'this_form', '', 'get', 'absint' );
@@ -249,15 +249,15 @@ 
 	}
 
     public static function duplicate() {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
 		$params = FrmForm::list_page_params();
         $form = FrmForm::duplicate( $params['id'], $params['template'], true );
-        $message = ($params['template']) ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
+        $message = ( $params['template'] ) ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
         if ( $form ) {
 			return self::get_edit_vars( $form, array(), $message, true );
         } else {
-            return self::display_forms_list($params, __( 'There was a problem creating the new template.', 'formidable' ));
+            return self::display_forms_list( $params, __( 'There was a problem creating the new template.', 'formidable' ) );
         }
     }
 
@@ -316,11 +316,11 @@ 
     }
 
 	public static function bulk_untrash( $ids ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
         $count = FrmForm::set_status( $ids, 'published' );
 
-        $message = sprintf(_n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
+        $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
         return $message;
     }
 
@@ -339,11 +339,11 @@ 
 			'trash'   => array( 'permission' => 'frm_delete_forms', 'new_status' => 'trash' ),
 		);
 
-		if ( ! isset( $available_status[ $status ] ) ) {
+		if ( ! isset( $available_status[$status] ) ) {
 			return;
 		}
 
-		FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
+		FrmAppHelper::permission_check( $available_status[$status]['permission'] );
 
 		$params = FrmForm::list_page_params();
 
@@ -351,25 +351,25 @@ 
 		check_admin_referer( $status . '_form_' . $params['id'] );
 
 		$count = 0;
-		if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
-			$count++;
+		if ( FrmForm::set_status( $params['id'], $available_status[$status]['new_status'] ) ) {
+			$count ++;
 		}
 
-		$available_status['untrash']['message'] = sprintf(_n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
+		$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
 		$available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . ( isset( $_REQUEST['form_type'] ) ? sanitize_title( $_REQUEST['form_type'] ) : '' ) . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' );
 
-		$message = $available_status[ $status ]['message'];
+		$message = $available_status[$status]['message'];
 
 		self::display_forms_list( $params, $message );
 	}
 
 	public static function bulk_trash( $ids ) {
-        FrmAppHelper::permission_check('frm_delete_forms');
+        FrmAppHelper::permission_check( 'frm_delete_forms' );
 
         $count = 0;
         foreach ( $ids as $id ) {
             if ( FrmForm::trash( $id ) ) {
-                $count++;
+                $count ++;
             }
         }
 
@@ -380,49 +380,49 @@ 
     }
 
     public static function destroy() {
-        FrmAppHelper::permission_check('frm_delete_forms');
+        FrmAppHelper::permission_check( 'frm_delete_forms' );
 
 		$params = FrmForm::list_page_params();
 
         //check nonce url
-        check_admin_referer('destroy_form_' . $params['id']);
+        check_admin_referer( 'destroy_form_' . $params['id'] );
 
         $count = 0;
         if ( FrmForm::destroy( $params['id'] ) ) {
-            $count++;
+            $count ++;
         }
 
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+        $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
 
 		self::display_forms_list( $params, $message );
     }
 
 	public static function bulk_destroy( $ids ) {
-        FrmAppHelper::permission_check('frm_delete_forms');
+        FrmAppHelper::permission_check( 'frm_delete_forms' );
 
         $count = 0;
         foreach ( $ids as $id ) {
             $d = FrmForm::destroy( $id );
             if ( $d ) {
-                $count++;
+                $count ++;
             }
         }
 
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+        $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
 
         return $message;
     }
 
     private static function delete_all() {
         //check nonce url
-        $permission_error = FrmAppHelper::permission_nonce_error('frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable');
+        $permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
         if ( $permission_error !== false ) {
 			self::display_forms_list( array(), '', array( $permission_error ) );
             return;
         }
 
 		$count = FrmForm::scheduled_delete( time() );
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+        $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
 
 		self::display_forms_list( array(), $message );
     }
@@ -439,7 +439,7 @@ 
 	* @since 2.0.15
 	*/
 	public static function insert_form_button() {
-		if ( current_user_can('frm_view_forms') ) {
+		if ( current_user_can( 'frm_view_forms' ) ) {
 			$menu_name = FrmAppHelper::get_menu_name();
 			$content = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">
 				<span class="frm-buttons-icon wp-media-buttons-icon"></span> ' .
@@ -460,17 +460,17 @@ 
 			'formidable' => array( 'name' => __( 'Form', 'formidable' ), 'label' => __( 'Insert a Form', 'formidable' ) ),
         );
 
-        $shortcodes = apply_filters('frm_popup_shortcodes', $shortcodes);
+        $shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php' );
     }
 
     public static function get_shortcode_opts() {
-		FrmAppHelper::permission_check('frm_view_forms');
+		FrmAppHelper::permission_check( 'frm_view_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
-        if ( empty($shortcode) ) {
+        if ( empty( $shortcode ) ) {
             wp_die();
         }
 
@@ -490,7 +490,7 @@ 
                 );
             break;
         }
-        $opts = apply_filters('frm_sc_popup_opts', $opts, $shortcode);
+        $opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
 
 		if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
 			// allow other shortcodes to use the required form id option
@@ -607,11 +607,11 @@ 
         }
 
         if ( $form->parent_form_id ) {
-			wp_die( sprintf( __( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form->parent_form_id ) ) . '">', '</a>' ));
+			wp_die( sprintf( __( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form->parent_form_id ) ) . '">', '</a>' ) );
         }
 
 		$frm_field_selection = FrmField::field_selection();
-        $fields = FrmField::get_all_for_form($form->id);
+        $fields = FrmField::get_all_for_form( $form->id );
 
         // Automatically add end section fields if they don't exist (2.0 migration)
         $reset_fields = false;
@@ -621,7 +621,7 @@ 
             $fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
         }
 
-        unset($end_section_values, $last_order, $open, $reset_fields);
+        unset( $end_section_values, $last_order, $open, $reset_fields );
 
 		$args = array( 'parent_form_id' => $form->id );
         $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true, array(), $args );
@@ -634,8 +634,8 @@ 
 		$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
         if ( $form->default_template ) {
-            wp_die(__( 'That template cannot be edited', 'formidable' ));
-        } else if ( defined('DOING_AJAX') ) {
+            wp_die( __( 'That template cannot be edited', 'formidable' ) );
+        } else if ( defined( 'DOING_AJAX' ) ) {
             wp_die();
         } else if ( $create_link ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
@@ -651,28 +651,28 @@ 
 
         $form = FrmForm::getOne( $id );
 
-        $fields = FrmField::get_all_for_form($id);
-        $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+        $fields = FrmField::get_all_for_form( $id );
+        $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
 
-        if ( isset($values['default_template']) && $values['default_template'] ) {
-            wp_die(__( 'That template cannot be edited', 'formidable' ));
+        if ( isset( $values['default_template'] ) && $values['default_template'] ) {
+            wp_die( __( 'That template cannot be edited', 'formidable' ) );
         }
 
         $action_controls = FrmFormActionsController::get_form_actions();
 
-        $sections = apply_filters('frm_add_form_settings_section', array(), $values);
+        $sections = apply_filters( 'frm_add_form_settings_section', array(), $values );
         $pro_feature = FrmAppHelper::pro_is_installed() ? '' : ' class="pro_feature"';
 
-        $styles = apply_filters('frm_get_style_opts', array());
+        $styles = apply_filters( 'frm_get_style_opts', array() );
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
     }
 
     public static function mb_tags_box( $form_id, $class = '' ) {
-        $fields = FrmField::get_all_for_form($form_id, '', 'include');
+        $fields = FrmField::get_all_for_form( $form_id, '', 'include' );
         $linked_forms = array();
         $col = 'one';
-        $settings_tab = FrmAppHelper::is_admin_page('formidable' ) ? true : false;
+        $settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
 
 		$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
 		$adv_shortcodes = self::get_advanced_shortcodes();
@@ -750,13 +750,13 @@ 
 
     // Insert the form class setting into the form
 	public static function form_classes( $form ) {
-        if ( isset($form->options['form_class']) ) {
+        if ( isset( $form->options['form_class'] ) ) {
 			echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
         }
     }
 
     public static function get_email_html() {
-		FrmAppHelper::permission_check('frm_view_forms');
+		FrmAppHelper::permission_check( 'frm_view_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 		echo FrmEntryFormat::show_entry( array(
 			'form_id'       => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
@@ -853,11 +853,11 @@ 
     public static function add_default_templates( $path, $default = true, $template = true ) {
         _deprecated_function( __FUNCTION__, '1.07.05', 'FrmXMLController::add_default_templates()' );
 
-        $path = untrailingslashit(trim($path));
+        $path = untrailingslashit( trim( $path ) );
 		$templates = glob( $path . '/*.php' );
 
-		for ( $i = count( $templates ) - 1; $i >= 0; $i-- ) {
-			$filename = str_replace( '.php', '', str_replace( $path . '/', '', $templates[ $i ] ) );
+		for ( $i = count( $templates ) - 1; $i >= 0; $i -- ) {
+			$filename = str_replace( '.php', '', str_replace( $path . '/', '', $templates[$i] ) );
 			$template_query = array( 'form_key' => $filename );
             if ( $template ) {
                 $template_query['is_template'] = 1;
@@ -875,12 +875,12 @@ 
                 $values['default_template'] = 1;
             }
 
-            include( $templates[ $i ] );
+            include( $templates[$i] );
 
             //get updated form
-            if ( isset($form) && ! empty($form) ) {
+            if ( isset( $form ) && ! empty( $form ) ) {
                 $old_id = $form->id;
-                $form = FrmForm::getOne($form->id);
+                $form = FrmForm::getOne( $form->id );
             } else {
                 $old_id = false;
 				$form = FrmForm::getAll( $template_query, '', 1 );
@@ -893,24 +893,24 @@ 
     }
 
     public static function route() {
-        $action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
+        $action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
         $vars = array();
 		if ( isset( $_POST['frm_compact_fields'] ) ) {
 			FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-            $json_vars = htmlspecialchars_decode(nl2br(stripslashes(str_replace('&quot;', '\\\"', $_POST['frm_compact_fields'] ))));
-            $json_vars = json_decode($json_vars, true);
-            if ( empty($json_vars) ) {
+            $json_vars = htmlspecialchars_decode( nl2br( stripslashes( str_replace( '&quot;', '\\\"', $_POST['frm_compact_fields'] ) ) ) );
+            $json_vars = json_decode( $json_vars, true );
+            if ( empty( $json_vars ) ) {
                 // json decoding failed so we should return an error message
 				$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
                 if ( 'edit' == $action ) {
                     $action = 'update';
                 }
 
-                add_filter('frm_validate_form', 'FrmFormsController::json_error');
+                add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
             } else {
-                $vars = FrmAppHelper::json_to_array($json_vars);
-                $action = $vars[ $action ];
+                $vars = FrmAppHelper::json_to_array( $json_vars );
+                $action = $vars[$action];
 				unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] );
 				$_REQUEST = array_merge( $_REQUEST, $vars );
 				$_POST = array_merge( $_POST, $_REQUEST );
@@ -928,7 +928,7 @@ 
 
         switch ( $action ) {
             case 'new':
-                return self::new_form($vars);
+                return self::new_form( $vars );
             case 'create':
             case 'edit':
             case 'update':
@@ -951,7 +951,7 @@ 
 					$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
                 }
 
-                if ( strpos($action, 'bulk_') === 0 ) {
+                if ( strpos( $action, 'bulk_' ) === 0 ) {
                     FrmAppHelper::remove_get_action();
                     return self::list_form();
                 }
@@ -978,27 +978,27 @@ 
 
 	public static function admin_bar_configure() {
         global $frm_vars;
-        if ( empty($frm_vars['forms_loaded']) ) {
+        if ( empty( $frm_vars['forms_loaded'] ) ) {
             return;
         }
 
         $actions = array();
         foreach ( $frm_vars['forms_loaded'] as $form ) {
-            if ( is_object($form) ) {
-                $actions[ $form->id ] = $form->name;
+            if ( is_object( $form ) ) {
+                $actions[$form->id] = $form->name;
             }
-            unset($form);
+            unset( $form );
         }
 
-        if ( empty($actions) ) {
+        if ( empty( $actions ) ) {
             return;
         }
 
-        asort($actions);
+        asort( $actions );
 
         global $wp_admin_bar;
 
-        if ( count($actions) == 1 ) {
+        if ( count( $actions ) == 1 ) {
             $wp_admin_bar->add_menu( array(
                 'title' => 'Edit Form',
 				'href'  => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . current( array_keys( $actions ) ) ),
@@ -1019,7 +1019,7 @@ 
         		$wp_admin_bar->add_menu( array(
         			'parent'    => 'frm-forms',
 					'id'        => 'edit_form_' . $form_id,
-        			'title'     => empty($name) ? __( '(no title)') : $name,
+        			'title'     => empty( $name ) ? __( '(no title)' ) : $name,
 					'href'      => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form_id ),
         		) );
         	}
@@ -1029,7 +1029,7 @@ 
     //formidable shortcode
 	public static function get_form_shortcode( $atts ) {
         global $frm_vars;
-        if ( isset($frm_vars['skip_shortcode']) && $frm_vars['skip_shortcode'] ) {
+        if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
             $sc = '[formidable';
 			if ( ! empty( $atts ) ) {
 				foreach ( $atts as $k => $v ) {
@@ -1043,8 +1043,8 @@ 
             'id' => '', 'key' => '', 'title' => false, 'description' => false,
             'readonly' => false, 'entry_id' => false, 'fields' => array(),
             'exclude_fields' => array(), 'minimize' => false,
-        ), $atts);
-        do_action('formidable_shortcode_atts', $shortcode_atts, $atts);
+        ), $atts );
+        do_action( 'formidable_shortcode_atts', $shortcode_atts, $atts );
 
         return self::show_form(
             $shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'],
@@ -1140,7 +1140,7 @@ 
 
         $frm_settings = FrmAppHelper::get_settings();
 
-        $submit = isset($form->options['submit_value']) ? $form->options['submit_value'] : $frm_settings->submit_value;
+        $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
 
         $user_ID = get_current_user_id();
 		$params = FrmForm::get_params( $form );
@@ -1148,44 +1148,44 @@ 
 		$errors = array();
 
         if ( $params['posted_form_id'] == $form->id && $_POST ) {
-            $errors = isset( $frm_vars['created_entries'][ $form->id ] ) ? $frm_vars['created_entries'][ $form->id ]['errors'] : array();
+            $errors = isset( $frm_vars['created_entries'][$form->id] ) ? $frm_vars['created_entries'][$form->id]['errors'] : array();
         }
 
 		$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
 		$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
 
         if ( $params['action'] != 'create' || $params['posted_form_id'] != $form->id || ! $_POST ) {
-            do_action('frm_display_form_action', $params, $fields, $form, $title, $description);
-            if ( apply_filters('frm_continue_to_new', true, $form->id, $params['action']) ) {
-                $values = FrmEntriesHelper::setup_new_vars($fields, $form);
+            do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
+            if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
+                $values = FrmEntriesHelper::setup_new_vars( $fields, $form );
 				include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
             }
             return;
         }
 
-        if ( ! empty($errors) ) {
-            $values = $fields ? FrmEntriesHelper::setup_new_vars($fields, $form) : array();
+        if ( ! empty( $errors ) ) {
+            $values = $fields ? FrmEntriesHelper::setup_new_vars( $fields, $form ) : array();
 			include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
             return;
         }
 
-        do_action('frm_validate_form_creation', $params, $fields, $form, $title, $description);
-        if ( ! apply_filters('frm_continue_to_create', true, $form->id) ) {
+        do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
+        if ( ! apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
             return;
         }
 
-        $values = FrmEntriesHelper::setup_new_vars($fields, $form, true);
+        $values = FrmEntriesHelper::setup_new_vars( $fields, $form, true );
         $created = self::just_created_entry( $form->id );
-        $conf_method = apply_filters('frm_success_filter', 'message', $form, 'create');
+        $conf_method = apply_filters( 'frm_success_filter', 'message', $form, 'create' );
 
-        if ( $created && is_numeric($created) && $conf_method != 'message' ) {
-            do_action('frm_success_action', $conf_method, $form, $form->options, $created);
+        if ( $created && is_numeric( $created ) && $conf_method != 'message' ) {
+            do_action( 'frm_success_action', $conf_method, $form, $form->options, $created );
 			do_action( 'frm_after_entry_processed', array( 'entry_id' => $created, 'form' => $form ) );
             return;
         }
 
-        if ( $created && is_numeric($created) ) {
-            $message = isset($form->options['success_msg']) ? $form->options['success_msg'] : $frm_settings->success_msg;
+        if ( $created && is_numeric( $created ) ) {
+            $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg;
             $class = 'frm_message';
         } else {
             $message = $frm_settings->failed_msg;
@@ -1196,9 +1196,9 @@ 
 			'message' => $message, 'form' => $form,
 			'entry_id' => $created, 'class' => $class,
 		) );
-        $message = apply_filters('frm_main_feedback', $message, $form, $created);
+        $message = apply_filters( 'frm_main_feedback', $message, $form, $created );
 
-        if ( ! isset($form->options['show_form']) || $form->options['show_form'] ) {
+        if ( ! isset( $form->options['show_form'] ) || $form->options['show_form'] ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
         } else {
             global $frm_vars;
@@ -1216,7 +1216,7 @@ 
 	 */
 	public static function just_created_entry( $form_id ) {
 		global $frm_vars;
-		return ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0;
+		return ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][$form_id] ) && isset( $frm_vars['created_entries'][$form_id]['entry_id'] ) ) ? $frm_vars['created_entries'][$form_id]['entry_id'] : 0;
 	}
 
 	public static function front_head() {

classes/helpers/FrmFormsListHelper.php

Spacing +31 added lines, -31 removed lines

@@ -26,7 +26,7 @@ 
 		$page = $this->get_pagenum();
 		$per_page = $this->get_items_per_page( 'formidable_page_formidable_per_page' );
 
-		$start = ( isset( $_REQUEST['start'] ) ) ? $_REQUEST['start'] : (( $page - 1 ) * $per_page);
+		$start = ( isset( $_REQUEST['start'] ) ) ? $_REQUEST['start'] : ( ( $page - 1 ) * $per_page );
 
         $s_query = array();
         $s_query[] = array( 'or' => 1, 'parent_form_id' => null, 'parent_form_id <' => 1 );
@@ -48,15 +48,15 @@ 
 		        break;
 		}
 
-        $s = isset( $_REQUEST['s'] ) ? stripslashes($_REQUEST['s']) : '';
+        $s = isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '';
 	    if ( $s != '' ) {
-	        preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches);
-		    $search_terms = array_map('trim', $matches[0]);
+	        preg_match_all( '/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches );
+		    $search_terms = array_map( 'trim', $matches[0] );
 	        foreach ( (array) $search_terms as $term ) {
                 $s_query[] = array(
                     'or'    => true, 'name LIKE' => $term, 'description LIKE' => $term, 'created_at LIKE' => $term,
                 );
-	            unset($term);
+	            unset( $term );
             }
 	    }
 
@@ -74,7 +74,7 @@ 
             _e( 'No Templates Found.', 'formidable' ) ?>
             <br/><br/><?php _e( 'To add a new template:', 'formidable' ) ?>
 			<ol><li><?php printf( __( 'Create a new %1$sform%2$s.', 'formidable' ), '<a href="' . esc_url( admin_url( 'admin?page=formidable&frm_action=new' ) ) . '"', '</a>' ) ?></li>
-                <li><?php printf(__( 'After your form is created, go to Formidable -> %1$sForms%2$s.', 'formidable' ), '<a href="?page=formidable">', '</a>') ?></li>
+                <li><?php printf( __( 'After your form is created, go to Formidable -> %1$sForms%2$s.', 'formidable' ), '<a href="?page=formidable">', '</a>' ) ?></li>
                 <li><?php _e( 'Place your mouse over the name of the form you just created, and click the "Create Template" link.', 'formidable' ) ?></li>
             </ol>
 <?php   } else {
@@ -91,17 +91,17 @@ 
 	    }
 
 	    if ( 'trash' == $this->status ) {
-	        if ( current_user_can('frm_edit_forms') ) {
+	        if ( current_user_can( 'frm_edit_forms' ) ) {
 	            $actions['bulk_untrash'] = __( 'Restore', 'formidable' );
 	        }
 
-	        if ( current_user_can('frm_delete_forms') ) {
+	        if ( current_user_can( 'frm_delete_forms' ) ) {
 	            $actions['bulk_delete'] = __( 'Delete Permanently', 'formidable' );
 	        }
-	    } else if ( EMPTY_TRASH_DAYS && current_user_can('frm_delete_forms') ) {
+	    } else if ( EMPTY_TRASH_DAYS && current_user_can( 'frm_delete_forms' ) ) {
 	        $actions['bulk_trash'] = __( 'Move to Trash', 'formidable' );
-	    } else if ( current_user_can('frm_delete_forms') ) {
-	        $actions['bulk_delete'] = __( 'Delete');
+	    } else if ( current_user_can( 'frm_delete_forms' ) ) {
+	        $actions['bulk_delete'] = __( 'Delete' );
 	    }
 
         return $actions;
@@ -112,7 +112,7 @@ 
             return;
         }
 
-        if ( 'trash' == $this->status && current_user_can('frm_delete_forms') ) {
+        if ( 'trash' == $this->status && current_user_can( 'frm_delete_forms' ) ) {
 ?>
             <div class="alignleft actions frm_visible_overflow">
 			<?php submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false ); ?>
@@ -128,7 +128,7 @@ 
 		$where = apply_filters( 'frm_forms_dropdown', array(), '' );
 		$forms = FrmForm::get_published_forms( $where );
 
-        $base = admin_url('admin.php?page=formidable&form_type=template');
+        $base = admin_url( 'admin.php?page=formidable&form_type=template' );
         $args = array(
             'frm_action'    => 'duplicate',
             'template'      => true,
@@ -148,7 +148,7 @@ 
 		        $args['id'] = $form->id; ?>
 			<li><a href="<?php echo esc_url( add_query_arg( $args, $base ) ); ?>" tabindex="-1"><?php echo esc_html( empty( $form->name ) ? __( '(no title)' ) : FrmAppHelper::truncate( $form->name, 33 ) ); ?></a></li>
 			<?php
-			    unset($form);
+			    unset( $form );
 			}
         }
         ?>
@@ -180,10 +180,10 @@ 
     		}
 
     		if ( $counts->{$status} || 'published' == $status ) {
-				$links[ $status ] = '<a href="' . esc_url( '?page=formidable&form_type=' . $status ) . '" ' . $class . '>' . sprintf( __( '%1$s <span class="count">(%2$s)</span>', 'formidable' ), $name, number_format_i18n( $counts->{$status} ) ) . '</a>';
+				$links[$status] = '<a href="' . esc_url( '?page=formidable&form_type=' . $status ) . '" ' . $class . '>' . sprintf( __( '%1$s <span class="count">(%2$s)</span>', 'formidable' ), $name, number_format_i18n( $counts->{$status} ) ) . '</a>';
 		    }
 
-		    unset($status, $name);
+		    unset( $status, $name );
 	    }
 
 		return $links;
@@ -207,7 +207,7 @@ 
 		$edit_link = '?page=formidable&frm_action=edit&id=' . $item->id;
 		$duplicate_link = '?page=formidable&frm_action=duplicate&id=' . $item->id;
 
-        $this->get_actions($actions, $item, $edit_link, $duplicate_link);
+        $this->get_actions( $actions, $item, $edit_link, $duplicate_link );
 
         $action_links = $this->row_actions( $actions );
 
@@ -249,7 +249,7 @@ 
 
 				    break;
 				case 'created_at':
-				    $date = date($format, strtotime($item->created_at));
+				    $date = date( $format, strtotime( $item->created_at ) );
 					$val = '<abbr title="' . esc_attr( date( 'Y/m/d g:i:s A', strtotime( $item->created_at ) ) ) . '">' . $date . '</abbr>';
 					break;
 				case 'shortcode':
@@ -260,11 +260,11 @@ 
 			        break;
 			    case 'entries':
 					if ( isset( $item->options['no_save'] ) && $item->options['no_save'] ) {
-						$val = '<i class="frm_icon_font frm_forbid_icon frm_bstooltip" title="' . esc_attr('Saving entries is disabled for this form', 'formidable' ) . '"></i>';
+						$val = '<i class="frm_icon_font frm_forbid_icon frm_bstooltip" title="' . esc_attr( 'Saving entries is disabled for this form', 'formidable' ) . '"></i>';
 			        } else {
-			            $text = FrmEntry::getRecordCount($item->id);
-						$val = current_user_can('frm_view_entries') ? '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-entries&form=' . $item->id ) ) . '">' . $text . '</a>' : $text;
-                        unset($text);
+			            $text = FrmEntry::getRecordCount( $item->id );
+						$val = current_user_can( 'frm_view_entries' ) ? '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-entries&form=' . $item->id ) ) . '">' . $text . '</a>' : $text;
+                        unset( $text );
                     }
 			        break;
                 case 'type':
@@ -272,12 +272,12 @@ 
                     break;
 			}
 
-			if ( isset($val) ) {
+			if ( isset( $val ) ) {
 			    $r .= "<td $attributes>";
 			    $r .= $val;
 			    $r .= '</td>';
 			}
-			unset($val);
+			unset( $val );
 		}
 		$r .= '</tr>';
 
@@ -290,18 +290,18 @@ 
      */
     private function get_actions( &$actions, $item, $edit_link, $duplicate_link ) {
 		if ( 'trash' == $this->status ) {
-			if ( current_user_can('frm_edit_forms') ) {
+			if ( current_user_can( 'frm_edit_forms' ) ) {
 				$actions['restore'] = FrmFormsHelper::delete_trash_link( $item->id, $item->status, 'short' );
 			}
 
-		    if ( current_user_can('frm_delete_forms') ) {
+		    if ( current_user_can( 'frm_delete_forms' ) ) {
 				$trash_url = wp_nonce_url( '?page=formidable&form_status=trash&frm_action=destroy&id=' . $item->id, 'destroy_form_' . $item->id );
 				$actions['trash'] = '<a href="' . esc_url( $trash_url ) . '" class="submitdelete" onclick="return confirm(\'' . __( 'Are you sure you want to permanently delete that?', 'formidable' ) . '\')">' . __( 'Delete Permanently' ) . '</a>';
     		}
             return;
 		}
 
-		if ( current_user_can('frm_edit_forms') ) {
+		if ( current_user_can( 'frm_edit_forms' ) ) {
             if ( ! $item->is_template || ! $item->default_template ) {
 				$actions['frm_edit'] = '<a href="' . esc_url( $edit_link ) . '">' . __( 'Edit' ) . '</a>';
             }
@@ -323,7 +323,7 @@ 
 			unset( $actions['trash'] );
 		}
 
-		$actions['view'] = '<a href="' . esc_url( FrmFormsHelper::get_direct_link( $item->form_key, $item ) ) . '" target="_blank">' . __( 'Preview') . '</a>';
+		$actions['view'] = '<a href="' . esc_url( FrmFormsHelper::get_direct_link( $item->form_key, $item ) ) . '" target="_blank">' . __( 'Preview' ) . '</a>';
     }
 
     /**
@@ -331,8 +331,8 @@ 
      */
 	private function get_form_name( $item, $actions, $edit_link, $mode = 'list' ) {
         $form_name = $item->name;
-        if ( trim($form_name) == '' ) {
-            $form_name = __( '(no title)');
+        if ( trim( $form_name ) == '' ) {
+            $form_name = __( '(no title)' );
         }
 		$form_name = FrmAppHelper::kses( $form_name );
 		if ( 'excerpt' != $mode ) {
@@ -369,7 +369,7 @@ 
     private function add_form_description( $item, &$val ) {
         global $mode;
         if ( 'excerpt' == $mode ) {
-            $val .= FrmAppHelper::truncate(strip_tags($item->description), 50);
+            $val .= FrmAppHelper::truncate( strip_tags( $item->description ), 50 );
         }
     }
 }

Indentation +172 added lines, -172 removed lines

@@ -13,14 +13,14 @@ 
 	}
 
 	public function prepare_items() {
-	    global $wpdb, $per_page, $mode;
+		global $wpdb, $per_page, $mode;
 
-	    $mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
+		$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
 
 		$default_orderby = 'name';
 		$default_order = 'ASC';
 
-        $orderby = ( isset( $_REQUEST['orderby'] ) ) ? $_REQUEST['orderby'] : $default_orderby;
+		$orderby = ( isset( $_REQUEST['orderby'] ) ) ? $_REQUEST['orderby'] : $default_orderby;
 		$order = ( isset( $_REQUEST['order'] ) ) ? $_REQUEST['order'] : $default_order;
 
 		$page = $this->get_pagenum();
@@ -28,40 +28,40 @@ 
 
 		$start = ( isset( $_REQUEST['start'] ) ) ? $_REQUEST['start'] : (( $page - 1 ) * $per_page);
 
-        $s_query = array();
-        $s_query[] = array( 'or' => 1, 'parent_form_id' => null, 'parent_form_id <' => 1 );
+		$s_query = array();
+		$s_query[] = array( 'or' => 1, 'parent_form_id' => null, 'parent_form_id <' => 1 );
 		switch ( $this->status ) {
-		    case 'template':
-                $s_query['is_template'] = 1;
-                $s_query['status !'] = 'trash';
-		        break;
-		    case 'draft':
-                $s_query['is_template'] = 0;
-                $s_query['status'] = 'draft';
-		        break;
-		    case 'trash':
-                $s_query['status'] = 'trash';
-		        break;
-		    default:
-                $s_query['is_template'] = 0;
-                $s_query['status !'] = 'trash';
-		        break;
+			case 'template':
+				$s_query['is_template'] = 1;
+				$s_query['status !'] = 'trash';
+				break;
+			case 'draft':
+				$s_query['is_template'] = 0;
+				$s_query['status'] = 'draft';
+				break;
+			case 'trash':
+				$s_query['status'] = 'trash';
+				break;
+			default:
+				$s_query['is_template'] = 0;
+				$s_query['status !'] = 'trash';
+				break;
 		}
 
-        $s = isset( $_REQUEST['s'] ) ? stripslashes($_REQUEST['s']) : '';
-	    if ( $s != '' ) {
-	        preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches);
-		    $search_terms = array_map('trim', $matches[0]);
-	        foreach ( (array) $search_terms as $term ) {
-                $s_query[] = array(
-                    'or'    => true, 'name LIKE' => $term, 'description LIKE' => $term, 'created_at LIKE' => $term,
-                );
-	            unset($term);
-            }
-	    }
+		$s = isset( $_REQUEST['s'] ) ? stripslashes($_REQUEST['s']) : '';
+		if ( $s != '' ) {
+			preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches);
+			$search_terms = array_map('trim', $matches[0]);
+			foreach ( (array) $search_terms as $term ) {
+				$s_query[] = array(
+					'or'    => true, 'name LIKE' => $term, 'description LIKE' => $term, 'created_at LIKE' => $term,
+				);
+				unset($term);
+			}
+		}
 
 		$this->items = FrmForm::getAll( $s_query, $orderby . ' ' . $order, $start . ',' . $per_page );
-        $total_items = FrmDb::get_count( 'frm_forms', $s_query );
+		$total_items = FrmDb::get_count( 'frm_forms', $s_query );
 
 		$this->set_pagination_args( array(
 			'total_items' => $total_items,
@@ -70,69 +70,69 @@ 
 	}
 
 	public function no_items() {
-	    if ( 'template' == $this->status ) {
-            _e( 'No Templates Found.', 'formidable' ) ?>
+		if ( 'template' == $this->status ) {
+			_e( 'No Templates Found.', 'formidable' ) ?>
             <br/><br/><?php _e( 'To add a new template:', 'formidable' ) ?>
 			<ol><li><?php printf( __( 'Create a new %1$sform%2$s.', 'formidable' ), '<a href="' . esc_url( admin_url( 'admin?page=formidable&frm_action=new' ) ) . '"', '</a>' ) ?></li>
                 <li><?php printf(__( 'After your form is created, go to Formidable -> %1$sForms%2$s.', 'formidable' ), '<a href="?page=formidable">', '</a>') ?></li>
                 <li><?php _e( 'Place your mouse over the name of the form you just created, and click the "Create Template" link.', 'formidable' ) ?></li>
             </ol>
 <?php   } else {
-            _e( 'No Forms Found.', 'formidable' ) ?>
+			_e( 'No Forms Found.', 'formidable' ) ?>
             <a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable&frm_action=new' ) ) ?>"><?php _e( 'Add New', 'formidable' ); ?></a>
 <?php   }
 	}
 
 	public function get_bulk_actions() {
-	    $actions = array();
+		$actions = array();
 
 		if ( in_array( $this->status, array( '', 'published' ) ) ) {
-	        $actions['bulk_create_template'] = __( 'Create Template', 'formidable' );
-	    }
-
-	    if ( 'trash' == $this->status ) {
-	        if ( current_user_can('frm_edit_forms') ) {
-	            $actions['bulk_untrash'] = __( 'Restore', 'formidable' );
-	        }
-
-	        if ( current_user_can('frm_delete_forms') ) {
-	            $actions['bulk_delete'] = __( 'Delete Permanently', 'formidable' );
-	        }
-	    } else if ( EMPTY_TRASH_DAYS && current_user_can('frm_delete_forms') ) {
-	        $actions['bulk_trash'] = __( 'Move to Trash', 'formidable' );
-	    } else if ( current_user_can('frm_delete_forms') ) {
-	        $actions['bulk_delete'] = __( 'Delete');
-	    }
-
-        return $actions;
-    }
+			$actions['bulk_create_template'] = __( 'Create Template', 'formidable' );
+		}
+
+		if ( 'trash' == $this->status ) {
+			if ( current_user_can('frm_edit_forms') ) {
+				$actions['bulk_untrash'] = __( 'Restore', 'formidable' );
+			}
+
+			if ( current_user_can('frm_delete_forms') ) {
+				$actions['bulk_delete'] = __( 'Delete Permanently', 'formidable' );
+			}
+		} else if ( EMPTY_TRASH_DAYS && current_user_can('frm_delete_forms') ) {
+			$actions['bulk_trash'] = __( 'Move to Trash', 'formidable' );
+		} else if ( current_user_can('frm_delete_forms') ) {
+			$actions['bulk_delete'] = __( 'Delete');
+		}
+
+		return $actions;
+	}
 
 	public function extra_tablenav( $which ) {
-        if ( 'top' != $which ) {
-            return;
-        }
+		if ( 'top' != $which ) {
+			return;
+		}
 
-        if ( 'trash' == $this->status && current_user_can('frm_delete_forms') ) {
+		if ( 'trash' == $this->status && current_user_can('frm_delete_forms') ) {
 ?>
             <div class="alignleft actions frm_visible_overflow">
 			<?php submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false ); ?>
             </div>
 <?php
-            return;
-        }
+			return;
+		}
 
-        if ( 'template' != $this->status ) {
-            return;
-        }
+		if ( 'template' != $this->status ) {
+			return;
+		}
 
 		$where = apply_filters( 'frm_forms_dropdown', array(), '' );
 		$forms = FrmForm::get_published_forms( $where );
 
-        $base = admin_url('admin.php?page=formidable&form_type=template');
-        $args = array(
-            'frm_action'    => 'duplicate',
-            'template'      => true,
-        );
+		$base = admin_url('admin.php?page=formidable&form_type=template');
+		$args = array(
+			'frm_action'    => 'duplicate',
+			'template'      => true,
+		);
 
 ?>
     <div class="alignleft actions frm_visible_overflow">
@@ -140,18 +140,18 @@ 
         <a href="#" id="frm-templateDrop" class="frm-dropdown-toggle button" data-toggle="dropdown"><?php _e( 'Create New Template', 'formidable' ) ?> <b class="caret"></b></a>
 		<ul class="frm-dropdown-menu" role="menu" aria-labelledby="frm-templateDrop">
 		<?php
-        if ( empty( $forms ) ) { ?>
+		if ( empty( $forms ) ) { ?>
             <li class="frm_dropdown_li"><?php _e( 'You have not created any forms yet. <br/>You must create a form before you can make a template.', 'formidable' ) ?></li>
         <?php
-        } else {
-            foreach ( $forms as $form ) {
-		        $args['id'] = $form->id; ?>
+		} else {
+			foreach ( $forms as $form ) {
+				$args['id'] = $form->id; ?>
 			<li><a href="<?php echo esc_url( add_query_arg( $args, $base ) ); ?>" tabindex="-1"><?php echo esc_html( empty( $form->name ) ? __( '(no title)' ) : FrmAppHelper::truncate( $form->name, 33 ) ); ?></a></li>
 			<?php
-			    unset($form);
+				unset($form);
 			}
-        }
-        ?>
+		}
+		?>
 		</ul>
 	</div>
 	</div>
@@ -161,30 +161,30 @@ 
 	public function get_views() {
 
 		$statuses = array(
-		    'published' => __( 'My Forms', 'formidable' ),
-		    'template'  => __( 'Templates', 'formidable' ),
-		    'draft'     => __( 'Drafts', 'formidable' ),
-		    'trash'     => __( 'Trash', 'formidable' ),
+			'published' => __( 'My Forms', 'formidable' ),
+			'template'  => __( 'Templates', 'formidable' ),
+			'draft'     => __( 'Drafts', 'formidable' ),
+			'trash'     => __( 'Trash', 'formidable' ),
 		);
 
-	    $links = array();
-	    $counts = FrmForm::get_count();
-        $form_type = isset( $_REQUEST['form_type'] ) ? sanitize_text_field( $_REQUEST['form_type'] ) : 'published';
+		$links = array();
+		$counts = FrmForm::get_count();
+		$form_type = isset( $_REQUEST['form_type'] ) ? sanitize_text_field( $_REQUEST['form_type'] ) : 'published';
 
-	    foreach ( $statuses as $status => $name ) {
+		foreach ( $statuses as $status => $name ) {
 
-	        if ( $status == $form_type ) {
-    			$class = ' class="current"';
-    		} else {
-    		    $class = '';
-    		}
+			if ( $status == $form_type ) {
+				$class = ' class="current"';
+			} else {
+				$class = '';
+			}
 
-    		if ( $counts->{$status} || 'published' == $status ) {
+			if ( $counts->{$status} || 'published' == $status ) {
 				$links[ $status ] = '<a href="' . esc_url( '?page=formidable&form_type=' . $status ) . '" ' . $class . '>' . sprintf( __( '%1$s <span class="count">(%2$s)</span>', 'formidable' ), $name, number_format_i18n( $counts->{$status} ) ) . '</a>';
-		    }
+			}
 
-		    unset($status, $name);
-	    }
+			unset($status, $name);
+		}
 
 		return $links;
 	}
@@ -200,16 +200,16 @@ 
 	}
 
 	public function single_row( $item, $style = '' ) {
-	    global $frm_vars, $mode;
+		global $frm_vars, $mode;
 
 		// Set up the hover actions for this user
 		$actions = array();
 		$edit_link = '?page=formidable&frm_action=edit&id=' . $item->id;
 		$duplicate_link = '?page=formidable&frm_action=duplicate&id=' . $item->id;
 
-        $this->get_actions($actions, $item, $edit_link, $duplicate_link);
+		$this->get_actions($actions, $item, $edit_link, $duplicate_link);
 
-        $action_links = $this->row_actions( $actions );
+		$action_links = $this->row_actions( $actions );
 
 		// Set up the checkbox ( because the user is editable, otherwise its empty )
 		$checkbox = '<input type="checkbox" name="item-action[]" id="cb-item-action-' . absint( $item->id ) . '" value="' . esc_attr( $item->id ) . '" />';
@@ -218,9 +218,9 @@ 
 
 		list( $columns, $hidden ) = $this->get_column_info();
 
-        $format = 'Y/m/d';
-        if ( 'list' != $mode ) {
-            $format .= ' \<\b\r \/\> g:i:s a';
+		$format = 'Y/m/d';
+		if ( 'list' != $mode ) {
+			$format .= ' \<\b\r \/\> g:i:s a';
 		}
 
 		foreach ( $columns as $column_name => $column_display_name ) {
@@ -228,7 +228,7 @@ 
 
 			$style = '';
 			if ( in_array( $column_name, $hidden ) ) {
-                $class .= ' frm_hidden';
+				$class .= ' frm_hidden';
 			}
 
 			$class = 'class="' . esc_attr( $class ) . '"';
@@ -241,41 +241,41 @@ 
 					break;
 				case 'id':
 				case 'form_key':
-				    $val = $item->{$column_name};
-				    break;
+					$val = $item->{$column_name};
+					break;
 				case 'name':
-				    $val = $this->get_form_name( $item, $actions, $edit_link, $mode );
-			        $val .= $action_links;
+					$val = $this->get_form_name( $item, $actions, $edit_link, $mode );
+					$val .= $action_links;
 
-				    break;
+					break;
 				case 'created_at':
-				    $date = date($format, strtotime($item->created_at));
+					$date = date($format, strtotime($item->created_at));
 					$val = '<abbr title="' . esc_attr( date( 'Y/m/d g:i:s A', strtotime( $item->created_at ) ) ) . '">' . $date . '</abbr>';
 					break;
 				case 'shortcode':
 					$val = '<input type="text" readonly="readonly" class="frm_select_box" value="' . esc_attr( '[formidable id=' . $item->id . ']' ) . '" /><br/>';
-				    if ( 'excerpt' == $mode ) {
+					if ( 'excerpt' == $mode ) {
 						$val .= '<input type="text" readonly="readonly" class="frm_select_box" value="' . esc_attr( '[formidable key=' . $item->form_key . ']' ) . '" />';
-				    }
-			        break;
-			    case 'entries':
+					}
+					break;
+				case 'entries':
 					if ( isset( $item->options['no_save'] ) && $item->options['no_save'] ) {
 						$val = '<i class="frm_icon_font frm_forbid_icon frm_bstooltip" title="' . esc_attr('Saving entries is disabled for this form', 'formidable' ) . '"></i>';
-			        } else {
-			            $text = FrmEntry::getRecordCount($item->id);
+					} else {
+						$text = FrmEntry::getRecordCount($item->id);
 						$val = current_user_can('frm_view_entries') ? '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-entries&form=' . $item->id ) ) . '">' . $text . '</a>' : $text;
-                        unset($text);
-                    }
-			        break;
-                case 'type':
-                    $val = ( $item->is_template && $item->default_template ) ? __( 'Default', 'formidable' ) : __( 'Custom', 'formidable' );
-                    break;
+						unset($text);
+					}
+					break;
+				case 'type':
+					$val = ( $item->is_template && $item->default_template ) ? __( 'Default', 'formidable' ) : __( 'Custom', 'formidable' );
+					break;
 			}
 
 			if ( isset($val) ) {
-			    $r .= "<td $attributes>";
-			    $r .= $val;
-			    $r .= '</td>';
+				$r .= "<td $attributes>";
+				$r .= $val;
+				$r .= '</td>';
 			}
 			unset($val);
 		}
@@ -284,38 +284,38 @@ 
 		return $r;
 	}
 
-    /**
-     * @param string $edit_link
-     * @param string $duplicate_link
-     */
-    private function get_actions( &$actions, $item, $edit_link, $duplicate_link ) {
+	/**
+	 * @param string $edit_link
+	 * @param string $duplicate_link
+	 */
+	private function get_actions( &$actions, $item, $edit_link, $duplicate_link ) {
 		if ( 'trash' == $this->status ) {
 			if ( current_user_can('frm_edit_forms') ) {
 				$actions['restore'] = FrmFormsHelper::delete_trash_link( $item->id, $item->status, 'short' );
 			}
 
-		    if ( current_user_can('frm_delete_forms') ) {
+			if ( current_user_can('frm_delete_forms') ) {
 				$trash_url = wp_nonce_url( '?page=formidable&form_status=trash&frm_action=destroy&id=' . $item->id, 'destroy_form_' . $item->id );
 				$actions['trash'] = '<a href="' . esc_url( $trash_url ) . '" class="submitdelete" onclick="return confirm(\'' . __( 'Are you sure you want to permanently delete that?', 'formidable' ) . '\')">' . __( 'Delete Permanently' ) . '</a>';
-    		}
-            return;
+			}
+			return;
 		}
 
 		if ( current_user_can('frm_edit_forms') ) {
-            if ( ! $item->is_template || ! $item->default_template ) {
+			if ( ! $item->is_template || ! $item->default_template ) {
 				$actions['frm_edit'] = '<a href="' . esc_url( $edit_link ) . '">' . __( 'Edit' ) . '</a>';
-            }
+			}
 
-		    if ( $item->is_template ) {
+			if ( $item->is_template ) {
 				$actions['frm_duplicate'] = '<a href="' . esc_url( wp_nonce_url( $duplicate_link ) ) . '">' . __( 'Create Form from Template', 'formidable' ) . '</a>';
-            } else {
+			} else {
 				$actions['frm_settings'] = '<a href="' . esc_url( '?page=formidable&frm_action=settings&id=' . $item->id ) . '">' . __( 'Settings', 'formidable' ) . '</a>';
 
-    		    if ( FrmAppHelper::pro_is_installed() ) {
+				if ( FrmAppHelper::pro_is_installed() ) {
 					$actions['duplicate'] = '<a href="' . esc_url( wp_nonce_url( $duplicate_link ) ) . '">' . __( 'Duplicate', 'formidable' ) . '</a>';
-        	    }
-        	}
-        }
+				}
+			}
+		}
 
 		$actions['trash'] = FrmFormsHelper::delete_trash_link( $item->id, $item->status, 'short' );
 		if ( empty( $actions['trash'] ) ) {
@@ -324,52 +324,52 @@ 
 		}
 
 		$actions['view'] = '<a href="' . esc_url( FrmFormsHelper::get_direct_link( $item->form_key, $item ) ) . '" target="_blank">' . __( 'Preview') . '</a>';
-    }
+	}
 
-    /**
-     * @param string $edit_link
-     */
+	/**
+	 * @param string $edit_link
+	 */
 	private function get_form_name( $item, $actions, $edit_link, $mode = 'list' ) {
-        $form_name = $item->name;
-        if ( trim($form_name) == '' ) {
-            $form_name = __( '(no title)');
-        }
+		$form_name = $item->name;
+		if ( trim($form_name) == '' ) {
+			$form_name = __( '(no title)');
+		}
 		$form_name = FrmAppHelper::kses( $form_name );
 		if ( 'excerpt' != $mode ) {
 			$form_name = FrmAppHelper::truncate( $form_name, 50 );
 		}
 
-        $val = '<strong>';
-        if ( 'trash' == $this->status ) {
-            $val .= $form_name;
-        } else {
+		$val = '<strong>';
+		if ( 'trash' == $this->status ) {
+			$val .= $form_name;
+		} else {
 			$val .= '<a href="' . esc_url( isset( $actions['frm_edit'] ) ? $edit_link : FrmFormsHelper::get_direct_link( $item->form_key, $item ) ) . '" class="row-title">' . FrmAppHelper::kses( $form_name ) . '</a> ';
-        }
+		}
 
-        $this->add_draft_label( $item, $val );
-        $val .= '</strong>';
+		$this->add_draft_label( $item, $val );
+		$val .= '</strong>';
 
-        $this->add_form_description( $item, $val );
+		$this->add_form_description( $item, $val );
 
-        return $val;
-    }
+		return $val;
+	}
 
-    /**
-     * @param string $val
-     */
-    private function add_draft_label( $item, &$val ) {
-        if ( 'draft' == $item->status && 'draft' != $this->status ) {
+	/**
+	 * @param string $val
+	 */
+	private function add_draft_label( $item, &$val ) {
+		if ( 'draft' == $item->status && 'draft' != $this->status ) {
 			$val .= ' - <span class="post-state">' . __( 'Draft', 'formidable' ) . '</span>';
-        }
-    }
-
-    /**
-     * @param string $val
-     */
-    private function add_form_description( $item, &$val ) {
-        global $mode;
-        if ( 'excerpt' == $mode ) {
-            $val .= FrmAppHelper::truncate(strip_tags($item->description), 50);
-        }
-    }
+		}
+	}
+
+	/**
+	 * @param string $val
+	 */
+	private function add_form_description( $item, &$val ) {
+		global $mode;
+		if ( 'excerpt' == $mode ) {
+			$val .= FrmAppHelper::truncate(strip_tags($item->description), 50);
+		}
+	}
 }

classes/models/FrmAntiSpam.php

Indentation +10 added lines, -10 removed lines

@@ -11,7 +11,7 @@ 
 
 		/* Check if logged in */
 		if ( is_user_logged_in() ) {
-		    return $response;
+			return $response;
 		}
 
 		/* Honeypot */
@@ -65,10 +65,10 @@ 
 	}
 
 	/**
-	* Check for form submission time
-	*
-	* @return  boolean    TRUE if the action time is less than 5 seconds
-	*/
+	 * Check for form submission time
+	 *
+	 * @return  boolean    TRUE if the action time is less than 5 seconds
+	 */
 
 	private static function _is_shortest_time() {
 		$too_short = false;
@@ -124,11 +124,11 @@ 
 	}
 
 	/**
-	* Check for an IPv6 address
-	*
-	* @param   string   $ip  IP to validate
-	* @return  boolean       TRUE if IPv6
-	*/
+	 * Check for an IPv6 address
+	 *
+	 * @param   string   $ip  IP to validate
+	 * @return  boolean       TRUE if IPv6
+	 */
 
 	private static function _is_ipv6( $ip ) {
 		if ( function_exists('filter_var') ) {

Doc Comments +9 added lines

@@ -98,6 +98,9 @@ 
 		return (bool) preg_match( '/\[url[=\]].*\[\/url\]/is', $body );
 	}
 	
+	/**
+	 * @param string $client_ip
+	 */
 	private static function _is_fake_ip( $client_ip, $client_host = false ) {
 		/* Remote Host */
 		$host_by_ip = gethostbyaddr( $client_ip );
@@ -159,6 +162,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $ip
+	 */
 	private static function _cut_ip( $ip, $cut_end = true ) {
 		$separator = ( self::_is_ipv4( $ip ) ? '.' : ':' );
 		$part = ( $cut_end ? strrchr( $ip, $separator ) : strstr( $ip, $separator ) );
@@ -252,6 +258,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $ip
+	 */
 	private static function _is_dnsbl_spam( $ip ) {
 
 		$response = wp_safe_remote_request(

Spacing +6 added lines, -6 removed lines

@@ -138,7 +138,7 @@ 
 	*/
 
 	private static function _is_ipv6( $ip ) {
-		if ( function_exists('filter_var') ) {
+		if ( function_exists( 'filter_var' ) ) {
 			return filter_var( $ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6 ) !== false;
 		} else {
 			return ! self::_is_ipv4( $ip );
@@ -152,7 +152,7 @@ 
 	 * @return  integer       TRUE if IPv4
 	 */
 	private static function _is_ipv4( $ip ) {
-		if ( function_exists('filter_var') ) {
+		if ( function_exists( 'filter_var' ) ) {
 			return filter_var( $ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 ) !== false;
 		} else {
 			return preg_match( '/^\d{1,3}(\.\d{1,3}){3,3}$/', $ip );
@@ -220,15 +220,15 @@ 
 				}
 
 				/* Ignore non utf-8 chars */
-				$comment[ $field ] = ( function_exists('iconv') ? iconv( 'utf-8', 'utf-8//TRANSLIT', $comment[ $field ] ) : $comment[ $field ] );
+				$comment[$field] = ( function_exists( 'iconv' ) ? iconv( 'utf-8', 'utf-8//TRANSLIT', $comment[$field] ) : $comment[$field] );
 
-				if ( empty( $comment[ $field ] ) ) {
+				if ( empty( $comment[$field] ) ) {
 					continue;
 				}
 
 				/* Perform regex */
-				if ( preg_match( '/' . $regexp . '/isu', $comment[ $field ] ) ) {
-					$hits[ $field ] = true;
+				if ( preg_match( '/' . $regexp . '/isu', $comment[$field] ) ) {
+					$hits[$field] = true;
 				}
 			}