Strategy11 / formidable-forms

classes/models/FrmEDD_SL_Plugin_Updater.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,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 ) {
 

Indentation +155 added lines, -155 removed lines

@@ -15,23 +15,23 @@ 
  * @version 1.6.3
  */
 class FrmEDD_SL_Plugin_Updater {
-    private $api_url   = '';
-    private $api_data  = array();
-    private $name      = '';
-    private $slug      = '';
-    private $version   = '';
-
-    /**
-     * Class constructor.
-     *
-     * @uses plugin_basename()
-     * @uses hook()
-     *
-     * @param string  $_api_url     The URL pointing to the custom API endpoint.
-     * @param string  $_plugin_file Path to the plugin file.
-     * @param array   $_api_data    Optional data to send with API calls.
-     */
-    public function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
+	private $api_url   = '';
+	private $api_data  = array();
+	private $name      = '';
+	private $slug      = '';
+	private $version   = '';
+
+	/**
+	 * Class constructor.
+	 *
+	 * @uses plugin_basename()
+	 * @uses hook()
+	 *
+	 * @param string  $_api_url     The URL pointing to the custom API endpoint.
+	 * @param string  $_plugin_file Path to the plugin file.
+	 * @param array   $_api_data    Optional data to send with API calls.
+	 */
+	public function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
 		global $frm_edd_plugin_data;
 
 		$this->api_url  = trailingslashit( $_api_url );
@@ -44,159 +44,159 @@ 
 
 		// Set up hooks.
 		$this->init();
-    }
-
-    /**
-     * Set up WordPress filters to hook into WP's update process.
-     *
-     * @uses add_filter()
-     *
-     * @return void
-     */
-    public function init() {
-        add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
-        add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
+	}
+
+	/**
+	 * Set up WordPress filters to hook into WP's update process.
+	 *
+	 * @uses add_filter()
+	 *
+	 * @return void
+	 */
+	public function init() {
+		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
+		add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
 		add_action( 'admin_init', array( $this, 'show_changelog' ) );
-    }
-
-    /**
-     * Check for Updates at the defined API endpoint and modify the update array.
-     *
-     * This function dives into the update API just when WordPress creates its update array,
-     * then adds a custom API call and injects the custom plugin data retrieved from the API.
-     * It is reassembled from parts of the native WordPress plugin update code.
-     * See wp-includes/update.php line 121 for the original wp_update_plugins() function.
-     *
-     * @uses api_request()
-     *
-     * @param array   $_transient_data Update array build by WordPress.
-     * @return array Modified update array with custom plugin data.
-     */
-    public function check_update( $_transient_data ) {
-
-        global $pagenow;
-
-        if ( ! is_object( $_transient_data ) ) {
-            $_transient_data = new stdClass;
-        }
+	}
+
+	/**
+	 * Check for Updates at the defined API endpoint and modify the update array.
+	 *
+	 * This function dives into the update API just when WordPress creates its update array,
+	 * then adds a custom API call and injects the custom plugin data retrieved from the API.
+	 * It is reassembled from parts of the native WordPress plugin update code.
+	 * See wp-includes/update.php line 121 for the original wp_update_plugins() function.
+	 *
+	 * @uses api_request()
+	 *
+	 * @param array   $_transient_data Update array build by WordPress.
+	 * @return array Modified update array with custom plugin data.
+	 */
+	public function check_update( $_transient_data ) {
+
+		global $pagenow;
+
+		if ( ! is_object( $_transient_data ) ) {
+			$_transient_data = new stdClass;
+		}
 
-        if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
+		if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
 
-            $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+			$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
 
-            if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
+			if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
 
-                if ( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+				if ( version_compare( $this->version, $version_info->new_version, '<' ) ) {
 
 					if ( empty( $version_info->plugin ) ) {
 						$version_info->plugin = $this->name;
 					}
 
-                    $_transient_data->response[ $this->name ] = $version_info;
-
-                }
-
-                $_transient_data->last_checked = time();
-                $_transient_data->checked[ $this->name ] = $this->version;
-
-            }
-        }
-
-        return $_transient_data;
-    }
-
-    /**
-     * Updates information on the "View version x.x details" page with custom data.
-     *
-     * @uses api_request()
-     *
-     * @param mixed   $_data
-     * @param string  $_action
-     * @param object  $_args
-     * @return object $_data
-     */
-    public function plugins_api_filter( $_data, $_action = '', $_args = null ) {
-
-        if ( $_action != 'plugin_information' ) {
+					$_transient_data->response[ $this->name ] = $version_info;
 
-            return $_data;
+				}
 
-        }
+				$_transient_data->last_checked = time();
+				$_transient_data->checked[ $this->name ] = $this->version;
 
-        if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
+			}
+		}
 
-            return $_data;
+		return $_transient_data;
+	}
 
-        }
+	/**
+	 * Updates information on the "View version x.x details" page with custom data.
+	 *
+	 * @uses api_request()
+	 *
+	 * @param mixed   $_data
+	 * @param string  $_action
+	 * @param object  $_args
+	 * @return object $_data
+	 */
+	public function plugins_api_filter( $_data, $_action = '', $_args = null ) {
 
-        $to_send = array(
-            'slug'   => $this->slug,
-            'is_ssl' => is_ssl(),
-            'fields' => array(
-                'banners' => false, // These will be supported soon hopefully
-                'reviews' => false,
-            ),
-        );
+		if ( $_action != 'plugin_information' ) {
 
-        $api_response = $this->api_request( 'plugin_information', $to_send );
+			return $_data;
 
-        if ( false !== $api_response ) {
-            $_data = $api_response;
-        }
+		}
 
-        return $_data;
-    }
+		if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
 
+			return $_data;
 
-    /**
-     * Disable SSL verification in order to prevent download update failures
-     *
-     * @param array   $args
-     * @param string  $url
-     * @return object $array
-     */
-    public function http_request_args( $args, $url ) {
-        // If it is an https request and we are performing a package download, disable ssl verification
-        if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
-            $args['sslverify'] = false;
-        }
-        return $args;
-    }
+		}
 
-    /**
-     * Calls the API and, if successfull, returns the object delivered by the API.
-     *
-     * @uses get_bloginfo()
-     * @uses wp_remote_post()
-     * @uses is_wp_error()
-     *
-     * @param string  $_action The requested action.
-     * @param array   $_data   Parameters for the API action.
-     * @return false|object
-     */
-    private function api_request( $_action, $_data ) {
+		$to_send = array(
+			'slug'   => $this->slug,
+			'is_ssl' => is_ssl(),
+			'fields' => array(
+				'banners' => false, // These will be supported soon hopefully
+				'reviews' => false,
+			),
+		);
 
-        global $wp_version;
+		$api_response = $this->api_request( 'plugin_information', $to_send );
 
-        $data = array_merge( $this->api_data, $_data );
+		if ( false !== $api_response ) {
+			$_data = $api_response;
+		}
 
-        if ( $data['slug'] != $this->slug ) {
-            return;
+		return $_data;
+	}
+
+
+	/**
+	 * Disable SSL verification in order to prevent download update failures
+	 *
+	 * @param array   $args
+	 * @param string  $url
+	 * @return object $array
+	 */
+	public function http_request_args( $args, $url ) {
+		// If it is an https request and we are performing a package download, disable ssl verification
+		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
+			$args['sslverify'] = false;
+		}
+		return $args;
+	}
+
+	/**
+	 * Calls the API and, if successfull, returns the object delivered by the API.
+	 *
+	 * @uses get_bloginfo()
+	 * @uses wp_remote_post()
+	 * @uses is_wp_error()
+	 *
+	 * @param string  $_action The requested action.
+	 * @param array   $_data   Parameters for the API action.
+	 * @return false|object
+	 */
+	private function api_request( $_action, $_data ) {
+
+		global $wp_version;
+
+		$data = array_merge( $this->api_data, $_data );
+
+		if ( $data['slug'] != $this->slug ) {
+			return;
 		}
 
-        if ( $this->api_url == home_url() ) {
-            return false; // Don't allow a plugin to ping itself
-        }
+		if ( $this->api_url == home_url() ) {
+			return false; // Don't allow a plugin to ping itself
+		}
 
-        $api_params = array(
-            'edd_action' => 'get_version',
-            'license'    => ! empty( $data['license'] ) ? $data['license'] : '',
-            'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
-            'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
-            'slug'       => $data['slug'],
-            'author'     => $data['author'],
-            'url'        => home_url(),
-        );
+		$api_params = array(
+			'edd_action' => 'get_version',
+			'license'    => ! empty( $data['license'] ) ? $data['license'] : '',
+			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
+			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
+			'slug'       => $data['slug'],
+			'author'     => $data['author'],
+			'url'        => home_url(),
+		);
 
 		$cache_key = 'edd_plugin_' . md5( sanitize_key( $api_params['license'] . $this->version ) . '_' . $api_params['edd_action'] );
 		$cached_response = get_transient( $cache_key );
@@ -205,24 +205,24 @@ 
 			return $cached_response;
 		}
 
-        $request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
+		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
 
-        if ( ! is_wp_error( $request ) ) {
-            $request = json_decode( wp_remote_retrieve_body( $request ) );
-        }
+		if ( ! is_wp_error( $request ) ) {
+			$request = json_decode( wp_remote_retrieve_body( $request ) );
+		}
 
-        if ( $request && isset( $request->sections ) ) {
-            $request->sections = maybe_unserialize( $request->sections );
+		if ( $request && isset( $request->sections ) ) {
+			$request->sections = maybe_unserialize( $request->sections );
 			set_transient( $cache_key, $request, DAY_IN_SECONDS );
-        } else {
-            $request = false;
+		} else {
+			$request = false;
 			set_transient( $cache_key, 0, DAY_IN_SECONDS );
-        }
+		}
 
-        return $request;
-    }
+		return $request;
+	}
 
-    public function show_changelog() {
+	public function show_changelog() {
 
 		global $frm_edd_plugin_data;
 
@@ -278,5 +278,5 @@ 
 		}
 
 		exit;
-    }
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
 		$this->slug     = basename( $_plugin_file, '.php' );
 		$this->version  = $_api_data['version'];
 
-		$frm_edd_plugin_data[ $this->slug ] = $this->api_data;
+		$frm_edd_plugin_data[$this->slug] = $this->api_data;
 
 		// Set up hooks.
 		$this->init();
@@ -80,7 +80,7 @@ 
             $_transient_data = new stdClass;
         }
 
-        if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
+        if ( empty( $_transient_data->response ) || empty( $_transient_data->response[$this->name] ) ) {
 
             $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
 
@@ -92,12 +92,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;
 
             }
         }
@@ -242,7 +242,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 );
 
@@ -273,7 +273,7 @@ 
 
 		}
 
-		if( ! empty( $version_info ) && isset( $version_info->sections['changelog'] ) ) {
+		if ( ! empty( $version_info ) && isset( $version_info->sections['changelog'] ) ) {
 			echo '<div style="background:#fff;padding:10px;">' . $version_info->sections['changelog'] . '</div>';
 		}
 

classes/views/shared/form-nav.php

Spacing +1 added lines, -1 removed lines

@@ -17,6 +17,6 @@
 </ul>
 
 <?php if ( $form && $title == 'show' ) { ?>
-    <input id="title" type="text" value="<?php echo esc_attr( $form->name == '' ? __( '(no title)') : $form->name ) ?>" readonly="readonly" disabled="disabled" />
+    <input id="title" type="text" value="<?php echo esc_attr( $form->name == '' ? __( '(no title)' ) : $form->name ) ?>" readonly="readonly" disabled="disabled" />
 <?php } ?>
 </div>

classes/views/addons/list.php

Spacing +4 added lines, -4 removed lines

@@ -7,16 +7,16 @@
 				continue;
 			}
 
-			if ( isset( $plugin_names[ $addon['info']['slug'] ] ) ) {
-				$installed = is_dir( WP_PLUGIN_DIR . '/' . $plugin_names[ $addon['info']['slug'] ] );
+			if ( isset( $plugin_names[$addon['info']['slug']] ) ) {
+				$installed = is_dir( WP_PLUGIN_DIR . '/' . $plugin_names[$addon['info']['slug']] );
 			} else {
-				$installed = isset( $installed_addons[ $addon['info']['slug'] ] ) || is_dir( WP_PLUGIN_DIR . '/formidable-' . $addon['info']['slug'] );
+				$installed = isset( $installed_addons[$addon['info']['slug']] ) || is_dir( WP_PLUGIN_DIR . '/formidable-' . $addon['info']['slug'] );
 			}
 			$has_thumbnail = ! empty( $addon['info']['thumbnail'] );
 			$addon['info']['link'] = $addon['info']['link'] . $append_affiliate;
 
 		?>
-			<div class="plugin-card <?php echo esc_attr( $has_thumbnail ? '' : 'frm-no-thumb') ?>">
+			<div class="plugin-card <?php echo esc_attr( $has_thumbnail ? '' : 'frm-no-thumb' ) ?>">
 				<div class="plugin-card-top">
 					<div class="name column-name">
 						<h3>

classes/controllers/FrmAppController.php

Indentation +168 added lines, -168 removed lines

@@ -3,14 +3,14 @@ 
 class FrmAppController {
 
 	public static function menu() {
-        FrmAppHelper::maybe_add_permissions();
-        if ( ! current_user_can( 'frm_view_forms' ) ) {
-            return;
-        }
+		FrmAppHelper::maybe_add_permissions();
+		if ( ! current_user_can( 'frm_view_forms' ) ) {
+			return;
+		}
 
-        $frm_settings = FrmAppHelper::get_settings();
-        add_menu_page( 'Formidable', $frm_settings->menu, 'frm_view_forms', 'formidable', 'FrmFormsController::route', FrmAppHelper::plugin_url() . '/images/form_16.png', self::get_menu_position() );
-    }
+		$frm_settings = FrmAppHelper::get_settings();
+		add_menu_page( 'Formidable', $frm_settings->menu, 'frm_view_forms', 'formidable', 'FrmFormsController::route', FrmAppHelper::plugin_url() . '/images/form_16.png', self::get_menu_position() );
+	}
 
 	private static function get_menu_position() {
 		$count = count( get_post_types( array( 'show_ui' => true, '_builtin' => false, 'show_in_menu' => true ) ) );
@@ -19,39 +19,39 @@ 
 		return $pos;
 	}
 
-    public static function load_wp_admin_style() {
-        FrmAppHelper::load_font_style();
-    }
+	public static function load_wp_admin_style() {
+		FrmAppHelper::load_font_style();
+	}
 
 	public static function get_form_nav( $form, $show_nav = false, $title = 'show' ) {
-        global $pagenow, $frm_vars;
+		global $pagenow, $frm_vars;
 
 		$show_nav = FrmAppHelper::get_param( 'show_nav', $show_nav, 'get', 'absint' );
-        if ( empty( $show_nav ) ) {
-            return;
-        }
+		if ( empty( $show_nav ) ) {
+			return;
+		}
 
 		$current_page = isset( $_GET['page'] ) ? FrmAppHelper::simple_get( 'page', 'sanitize_title' ) : FrmAppHelper::simple_get( 'post_type', 'sanitize_title', 'None' );
 		if ( $pagenow == 'post.php' || $pagenow == 'post-new.php' ) {
 			$current_page = 'frm_display';
 		}
 
-        if ( $form ) {
+		if ( $form ) {
 			FrmForm::maybe_get_form( $form );
 
-            if ( is_object( $form ) ) {
-                $id = $form->id;
-            }
-        }
+			if ( is_object( $form ) ) {
+				$id = $form->id;
+			}
+		}
 
-        if ( ! isset( $id ) ) {
-            $form = $id = false;
-        }
+		if ( ! isset( $id ) ) {
+			$form = $id = false;
+		}
 
 		$nav_items = self::get_form_nav_items( $id );
 
-        include( FrmAppHelper::plugin_path() . '/classes/views/shared/form-nav.php' );
-    }
+		include( FrmAppHelper::plugin_path() . '/classes/views/shared/form-nav.php' );
+	}
 
 	private static function get_form_nav_items( $id ) {
 		$nav_items = array(
@@ -82,26 +82,26 @@ 
 		return $nav_items;
 	}
 
-    // Adds a settings link to the plugins page
-    public static function settings_link( $links ) {
+	// Adds a settings link to the plugins page
+	public static function settings_link( $links ) {
 		$settings = '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-settings' ) ) . '">' . __( 'Settings', 'formidable' ) . '</a>';
-        array_unshift( $links, $settings );
+		array_unshift( $links, $settings );
 
-        return $links;
-    }
+		return $links;
+	}
 
-    public static function pro_get_started_headline() {
-        // Don't display this error as we're upgrading the thing, or if the user shouldn't see the message
-        if ( 'upgrade-plugin' == FrmAppHelper::simple_get( 'action', 'sanitize_title' ) || ! current_user_can( 'update_plugins' ) ) {
-            return;
-        }
+	public static function pro_get_started_headline() {
+		// Don't display this error as we're upgrading the thing, or if the user shouldn't see the message
+		if ( 'upgrade-plugin' == FrmAppHelper::simple_get( 'action', 'sanitize_title' ) || ! current_user_can( 'update_plugins' ) ) {
+			return;
+		}
 
 		if ( get_site_option( 'frmpro-authorized' ) && ! file_exists( FrmAppHelper::plugin_path() . '/pro/formidable-pro.php' ) ) {
-            FrmAppHelper::load_admin_wide_js();
+			FrmAppHelper::load_admin_wide_js();
 
-            // user is authorized, but running free version
-            $inst_install_url = 'https://formidablepro.com/knowledgebase/install-formidable-forms/';
-        ?>
+			// user is authorized, but running free version
+			$inst_install_url = 'https://formidablepro.com/knowledgebase/install-formidable-forms/';
+		?>
 <div class="error" class="frm_previous_install">
 		<?php
 		echo wp_kses_post( apply_filters( 'frm_pro_update_msg',
@@ -113,8 +113,8 @@ 
 		) ); ?>
 </div>
 <?php
-        }
-    }
+		}
+	}
 
 	/**
 	 * If there are CURL problems on this server, wp_remote_post won't work for installing
@@ -156,7 +156,7 @@ 
 		}
 	}
 
-    public static function admin_js() {
+	public static function admin_js() {
 		$version = FrmAppHelper::plugin_version();
 		FrmAppHelper::load_admin_wide_js( false );
 
@@ -167,7 +167,7 @@ 
 			'bootstrap_tooltip', 'bootstrap-multiselect',
 		), $version, true );
 		wp_register_style( 'formidable-admin', FrmAppHelper::plugin_url() . '/css/frm_admin.css', array(), $version );
-        wp_register_script( 'bootstrap_tooltip', FrmAppHelper::plugin_url() . '/js/bootstrap.min.js', array( 'jquery' ), '3.3.4' );
+		wp_register_script( 'bootstrap_tooltip', FrmAppHelper::plugin_url() . '/js/bootstrap.min.js', array( 'jquery' ), '3.3.4' );
 
 		// load multselect js
 		wp_register_script( 'bootstrap-multiselect', FrmAppHelper::plugin_url() . '/js/bootstrap-multiselect.js', array( 'jquery', 'bootstrap_tooltip' ), '0.9.8', true );
@@ -178,78 +178,78 @@ 
 		global $pagenow;
 		if ( strpos( $page, 'formidable' ) === 0 || ( $pagenow == 'edit.php' && $post_type == 'frm_display' ) ) {
 
-            wp_enqueue_script( 'admin-widgets' );
-            wp_enqueue_style( 'widgets' );
-            wp_enqueue_script( 'formidable' );
-            wp_enqueue_script( 'formidable_admin' );
+			wp_enqueue_script( 'admin-widgets' );
+			wp_enqueue_style( 'widgets' );
+			wp_enqueue_script( 'formidable' );
+			wp_enqueue_script( 'formidable_admin' );
 			FrmAppHelper::localize_script( 'admin' );
 
-            wp_enqueue_style( 'formidable-admin' );
-            add_thickbox();
+			wp_enqueue_style( 'formidable-admin' );
+			add_thickbox();
 
-            wp_register_script( 'formidable-editinplace', FrmAppHelper::plugin_url() . '/js/jquery/jquery.editinplace.packed.js', array( 'jquery' ), '2.3.0' );
+			wp_register_script( 'formidable-editinplace', FrmAppHelper::plugin_url() . '/js/jquery/jquery.editinplace.packed.js', array( 'jquery' ), '2.3.0' );
 
-        } else if ( $pagenow == 'post.php' || ( $pagenow == 'post-new.php' && $post_type == 'frm_display' ) ) {
-            if ( isset( $_REQUEST['post_type'] ) ) {
-                $post_type = sanitize_title( $_REQUEST['post_type'] );
+		} else if ( $pagenow == 'post.php' || ( $pagenow == 'post-new.php' && $post_type == 'frm_display' ) ) {
+			if ( isset( $_REQUEST['post_type'] ) ) {
+				$post_type = sanitize_title( $_REQUEST['post_type'] );
 			} else if ( isset( $_REQUEST['post'] ) && absint( $_REQUEST['post'] ) ) {
 				$post = get_post( absint( $_REQUEST['post'] ) );
-                if ( ! $post ) {
-                    return;
-                }
-                $post_type = $post->post_type;
-            } else {
-                return;
-            }
-
-            if ( $post_type == 'frm_display' ) {
-                wp_enqueue_script( 'jquery-ui-draggable' );
-                wp_enqueue_script( 'formidable_admin' );
-                wp_enqueue_style( 'formidable-admin' );
+				if ( ! $post ) {
+					return;
+				}
+				$post_type = $post->post_type;
+			} else {
+				return;
+			}
+
+			if ( $post_type == 'frm_display' ) {
+				wp_enqueue_script( 'jquery-ui-draggable' );
+				wp_enqueue_script( 'formidable_admin' );
+				wp_enqueue_style( 'formidable-admin' );
 				FrmAppHelper::localize_script( 'admin' );
-            }
-        } else if ( $pagenow == 'widgets.php' ) {
-            FrmAppHelper::load_admin_wide_js();
-        }
-    }
-
-    public static function wp_admin_body_class( $classes ) {
-        global $wp_version;
-        //we need this class everywhere in the admin for the menu
-        if ( version_compare( $wp_version, '3.7.2', '>' ) ) {
-            $classes .= ' frm_38_trigger';
-        }
-
-        return $classes;
-    }
-
-    public static function load_lang() {
-        load_plugin_textdomain( 'formidable', false, FrmAppHelper::plugin_folder() . '/languages/' );
-    }
-
-    /**
-     * Filter shortcodes in text widgets
-     */
-    public static function widget_text_filter( $content ) {
-    	$regex = '/\[\s*(formidable|display-frm-data|frm-stats|frm-graph|frm-entry-links|formresults|frm-search)\s+.*\]/';
-    	return preg_replace_callback( $regex, 'FrmAppHelper::widget_text_filter_callback', $content );
-    }
-
-    public static function widget_text_filter_callback( $matches ) {
-        _deprecated_function( __FUNCTION__, '2.0', 'FrmAppHelper::widget_text_filter_callback' );
-        return FrmAppHelper::widget_text_filter_callback( $matches );
-    }
-
-    public static function front_head() {
-        if ( is_multisite() ) {
-            $old_db_version = get_option( 'frm_db_version' );
-            $pro_db_version = FrmAppHelper::pro_is_installed() ? get_option( 'frmpro_db_version' ) : false;
-            if ( ( (int) $old_db_version < (int) FrmAppHelper::$db_version ) ||
-                ( FrmAppHelper::pro_is_installed() && (int) $pro_db_version < (int) FrmAppHelper::$pro_db_version ) ) {
-                self::install( $old_db_version );
-            }
-        }
-    }
+			}
+		} else if ( $pagenow == 'widgets.php' ) {
+			FrmAppHelper::load_admin_wide_js();
+		}
+	}
+
+	public static function wp_admin_body_class( $classes ) {
+		global $wp_version;
+		//we need this class everywhere in the admin for the menu
+		if ( version_compare( $wp_version, '3.7.2', '>' ) ) {
+			$classes .= ' frm_38_trigger';
+		}
+
+		return $classes;
+	}
+
+	public static function load_lang() {
+		load_plugin_textdomain( 'formidable', false, FrmAppHelper::plugin_folder() . '/languages/' );
+	}
+
+	/**
+	 * Filter shortcodes in text widgets
+	 */
+	public static function widget_text_filter( $content ) {
+		$regex = '/\[\s*(formidable|display-frm-data|frm-stats|frm-graph|frm-entry-links|formresults|frm-search)\s+.*\]/';
+		return preg_replace_callback( $regex, 'FrmAppHelper::widget_text_filter_callback', $content );
+	}
+
+	public static function widget_text_filter_callback( $matches ) {
+		_deprecated_function( __FUNCTION__, '2.0', 'FrmAppHelper::widget_text_filter_callback' );
+		return FrmAppHelper::widget_text_filter_callback( $matches );
+	}
+
+	public static function front_head() {
+		if ( is_multisite() ) {
+			$old_db_version = get_option( 'frm_db_version' );
+			$pro_db_version = FrmAppHelper::pro_is_installed() ? get_option( 'frmpro_db_version' ) : false;
+			if ( ( (int) $old_db_version < (int) FrmAppHelper::$db_version ) ||
+				( FrmAppHelper::pro_is_installed() && (int) $pro_db_version < (int) FrmAppHelper::$pro_db_version ) ) {
+				self::install( $old_db_version );
+			}
+		}
+	}
 
 	public static function localize_script( $location ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmAppHelper::localize_script' );
@@ -309,72 +309,72 @@ 
 		wp_die();
 	}
 
-    public static function activation_install() {
-        FrmAppHelper::delete_cache_and_transient( 'frm_plugin_version' );
-        FrmFormActionsController::actions_init();
-        self::install();
-    }
+	public static function activation_install() {
+		FrmAppHelper::delete_cache_and_transient( 'frm_plugin_version' );
+		FrmFormActionsController::actions_init();
+		self::install();
+	}
 
-    public static function install( $old_db_version = false ) {
-        $frmdb = new FrmDb();
-        $frmdb->upgrade( $old_db_version );
-    }
+	public static function install( $old_db_version = false ) {
+		$frmdb = new FrmDb();
+		$frmdb->upgrade( $old_db_version );
+	}
 
-    public static function uninstall() {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+	public static function uninstall() {
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        if ( current_user_can( 'administrator' ) ) {
-            $frmdb = new FrmDb();
-            $frmdb->uninstall();
+		if ( current_user_can( 'administrator' ) ) {
+			$frmdb = new FrmDb();
+			$frmdb->uninstall();
 
 			//disable the plugin and redirect after uninstall so the tables don't get added right back
 			deactivate_plugins( FrmAppHelper::plugin_folder() . '/formidable.php', false, false );
 			echo esc_url_raw( admin_url( 'plugins.php?deactivate=true' ) );
-        } else {
-            $frm_settings = FrmAppHelper::get_settings();
-            wp_die( $frm_settings->admin_permission );
-        }
-        wp_die();
-    }
-
-    public static function drop_tables( $tables ) {
-        global $wpdb;
-        $tables[] = $wpdb->prefix . 'frm_fields';
-        $tables[] = $wpdb->prefix . 'frm_forms';
-        $tables[] = $wpdb->prefix . 'frm_items';
-        $tables[] = $wpdb->prefix . 'frm_item_metas';
-        return $tables;
-    }
-
-    // Routes for wordpress pages -- we're just replacing content here folks.
-    public static function page_route( $content ) {
-        global $post;
-
-        $frm_settings = FrmAppHelper::get_settings();
-        if ( $post && $post->ID == $frm_settings->preview_page_id && isset( $_GET['form'] ) ) {
-            $content = FrmFormsController::page_preview();
-        }
-
-        return $content;
-    }
-
-    public static function deauthorize() {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
-
-        delete_option( 'frmpro-credentials' );
-        delete_option( 'frmpro-authorized' );
-        delete_site_option( 'frmpro-credentials' );
-        delete_site_option( 'frmpro-authorized' );
-        wp_die();
-    }
-
-    public static function get_form_shortcode( $atts ) {
-        _deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::get_form_shortcode()' );
-        return FrmFormsController::get_form_shortcode( $atts );
-    }
-
-    public static function get_postbox_class() {
-        _deprecated_function( __FUNCTION__, '2.0' );
-        return 'postbox-container';
-    }
+		} else {
+			$frm_settings = FrmAppHelper::get_settings();
+			wp_die( $frm_settings->admin_permission );
+		}
+		wp_die();
+	}
+
+	public static function drop_tables( $tables ) {
+		global $wpdb;
+		$tables[] = $wpdb->prefix . 'frm_fields';
+		$tables[] = $wpdb->prefix . 'frm_forms';
+		$tables[] = $wpdb->prefix . 'frm_items';
+		$tables[] = $wpdb->prefix . 'frm_item_metas';
+		return $tables;
+	}
+
+	// Routes for wordpress pages -- we're just replacing content here folks.
+	public static function page_route( $content ) {
+		global $post;
+
+		$frm_settings = FrmAppHelper::get_settings();
+		if ( $post && $post->ID == $frm_settings->preview_page_id && isset( $_GET['form'] ) ) {
+			$content = FrmFormsController::page_preview();
+		}
+
+		return $content;
+	}
+
+	public static function deauthorize() {
+		check_ajax_referer( 'frm_ajax', 'nonce' );
+
+		delete_option( 'frmpro-credentials' );
+		delete_option( 'frmpro-authorized' );
+		delete_site_option( 'frmpro-credentials' );
+		delete_site_option( 'frmpro-authorized' );
+		wp_die();
+	}
+
+	public static function get_form_shortcode( $atts ) {
+		_deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::get_form_shortcode()' );
+		return FrmFormsController::get_form_shortcode( $atts );
+	}
+
+	public static function get_postbox_class() {
+		_deprecated_function( __FUNCTION__, '2.0' );
+		return 'postbox-container';
+	}
 }

classes/views/shared/mb_adv_info.php

Indentation +67 added lines, -67 removed lines

@@ -42,51 +42,51 @@ 
 
 				if ( $f->type == 'data' ) {
 					//get all fields from linked form
-                    if ( isset($f->field_options['form_select']) && is_numeric($f->field_options['form_select']) ) {
-                        $linked_form = FrmDb::get_var( $wpdb->prefix .'frm_fields', array( 'id' => $f->field_options['form_select'] ), 'form_id' );
-                        if ( ! in_array( $linked_form, $linked_forms ) ) {
-                            $linked_forms[] = $linked_form;
+					if ( isset($f->field_options['form_select']) && is_numeric($f->field_options['form_select']) ) {
+						$linked_form = FrmDb::get_var( $wpdb->prefix .'frm_fields', array( 'id' => $f->field_options['form_select'] ), 'form_id' );
+						if ( ! in_array( $linked_form, $linked_forms ) ) {
+							$linked_forms[] = $linked_form;
 							$linked_fields = FrmField::getAll( array( 'fi.type not' => FrmField::no_save_fields(), 'fi.form_id' => $linked_form ) );
-                            $ldfe = '';
+							$ldfe = '';
 							if ( $linked_fields ) {
 								foreach ( $linked_fields as $linked_field ) {
-                                    FrmAppHelper::insert_opt_html( array( 'id' => $f->id . ' show=' . $linked_field->id, 'key' => $f->field_key . ' show=' . $linked_field->field_key, 'name' => $linked_field->name, 'type' => $linked_field->type ) );
-
-                                    $ldfe = $linked_field->id;
-                                    unset($linked_field);
-                                }
-                            }
-                        }
-                    }
-                    $dfe = $f->id;
-        	    }
-                unset($f);
-                }
-            } ?>
+									FrmAppHelper::insert_opt_html( array( 'id' => $f->id . ' show=' . $linked_field->id, 'key' => $f->field_key . ' show=' . $linked_field->field_key, 'name' => $linked_field->name, 'type' => $linked_field->type ) );
+
+									$ldfe = $linked_field->id;
+									unset($linked_field);
+								}
+							}
+						}
+					}
+					$dfe = $f->id;
+				}
+				unset($f);
+				}
+			} ?>
         </ul>
 
         <?php _e( 'Helpers', 'formidable' ) ?>:
         <ul class="frm_code_list">
         <?php
-        $col = 'one';
+		$col = 'one';
 		foreach ( $entry_shortcodes as $skey => $sname ) {
 			if ( empty( $skey ) ) {
-                 $col = 'one';
-                 echo '<li class="clear frm_block"></li>';
-                 continue;
-            }
-        ?>
+				 $col = 'one';
+				 echo '<li class="clear frm_block"></li>';
+				 continue;
+			}
+		?>
         <li class="frm_col_<?php echo esc_attr( $col ) ?>">
             <a href="javascript:void(0)" class="frmbutton button <?php
 			echo ( in_array( $skey, array( 'siteurl', 'sitename', 'entry_count' ) ) ) ? 'show_before_content show_after_content' : '';
-            echo ( strpos( $skey, 'default-' ) === 0 ) ? 'hide_frm_not_email_subject' : '';
-            ?> frm_insert_code" data-code="<?php echo esc_attr( $skey ) ?>"><?php echo esc_html( $sname ) ?></a>
+			echo ( strpos( $skey, 'default-' ) === 0 ) ? 'hide_frm_not_email_subject' : '';
+			?> frm_insert_code" data-code="<?php echo esc_attr( $skey ) ?>"><?php echo esc_html( $sname ) ?></a>
         </li>
         <?php
-            $col = ( $col == 'one' ) ? 'two' : 'one';
-            unset($skey, $sname);
-        }
-        ?>
+			$col = ( $col == 'one' ) ? 'two' : 'one';
+			unset($skey, $sname);
+		}
+		?>
         </ul>
 	</div>
 
@@ -99,11 +99,11 @@ 
 	    <ul class="alignleft"><li><?php _e( 'Fields from your form', 'formidable' ) ?>:</li></ul>
 	    <ul class="frm_code_list frm_full_width">
 		    <?php if ( ! empty( $fields ) ) {
-		        foreach ( $fields as $f ) {
+				foreach ( $fields as $f ) {
 					if ( FrmField::is_no_save_field( $f->type ) || ( $f->type == 'data' && ( ! isset( $f->field_options['data_type'] ) || $f->field_options['data_type'] == 'data' || $f->field_options['data_type'] == '' ) ) ) {
-                        continue;
-                }
-            ?>
+						continue;
+				}
+			?>
                 <li>
                     <a href="javascript:void(0)" class="frmids alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->id ) ?>]<?php esc_attr_e( 'Conditional text here', 'formidable' ) ?>[/if <?php echo esc_attr( $f->id ) ?>">[if <?php echo (int) $f->id ?>]</a>
                 	<a href="javascript:void(0)" class="frmkeys alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->field_key ) ?>]something[/if <?php echo esc_attr( $f->field_key ) ?>">[if <?php echo FrmAppHelper::truncate($f->field_key, 10) ?>]</a>
@@ -111,30 +111,30 @@ 
                 </li>
                 <?php
 
-                    if ( $f->type == 'user_id' ) {
-                        $uid = $f;
-                    } else if ( $f->type == 'file' ) {
-                        $file = $f;
-                    }
-        		    unset($f);
-		        }
-		    } ?>
+					if ( $f->type == 'user_id' ) {
+						$uid = $f;
+					} else if ( $f->type == 'file' ) {
+						$file = $f;
+					}
+					unset($f);
+				}
+			} ?>
         </ul>
 
         <p class="howto"><?php _e( 'Click a button below to insert sample logic into your view', 'formidable' ) ?></p>
         <ul class="frm_code_list">
         <?php
-        $col = 'one';
+		$col = 'one';
 		foreach ( $cond_shortcodes as $skey => $sname ) {
-	    ?>
+		?>
 	    <li class="frm_col_<?php echo esc_attr( $col ) ?>">
 	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="if 125 <?php echo esc_attr($skey) ?>][/if 125"><?php echo esc_html( $sname ) ?></a>
 	    </li>
 	    <?php
-	        $col = ( $col == 'one' ) ? 'two' : 'one';
-	        unset($skey, $sname);
-	    }
-        ?>
+			$col = ( $col == 'one' ) ? 'two' : 'one';
+			unset($skey, $sname);
+		}
+		?>
         </ul>
 	</div>
 	<?php } ?>
@@ -142,17 +142,17 @@ 
 	<div id="frm-adv-info-tab" class="tabs-panel">
 		<ul class="frm_code_list">
         <?php
-        $col = 'one';
+		$col = 'one';
 		foreach ( $adv_shortcodes as $skey => $sname ) {
-	    ?>
+		?>
 	    <li class="frm_col_<?php echo esc_attr( $col ) ?>">
 	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code <?php echo is_array( $sname ) ? 'frm_help' : ''; ?>" data-code="125 <?php echo esc_attr( $skey ) ?>" <?php echo is_array( $sname ) ? 'title="'. esc_attr( $sname['title'] ) .'"' : ''; ?>><?php echo is_array( $sname ) ? $sname['label'] : $sname; ?></a>
 	    </li>
 	    <?php
-	        $col = ($col == 'one') ? 'two' : 'one';
-	        unset($skey, $sname);
-	    }
-        ?>
+			$col = ($col == 'one') ? 'two' : 'one';
+			unset($skey, $sname);
+		}
+		?>
         <?php if ( isset($file) ) { ?>
         <li class="frm_col_<?php echo esc_attr( $col ) ?>">
 	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr($file->id) ?> size=thumbnail html=1"><?php _e( 'Image Size', 'formidable' ) ?></a>
@@ -169,8 +169,8 @@ 
         <div class="clear"></div>
         <?php
 
-        if ( isset($uid) && ! empty($user_fields) ) {
-            $col = 'one'; ?>
+		if ( isset($uid) && ! empty($user_fields) ) {
+			$col = 'one'; ?>
         <p class="howto"><?php _e( 'Insert user information', 'formidable' ) ?></p>
         <ul class="frm_code_list">
         <?php foreach ( $user_fields as $uk => $uf ) { ?>
@@ -178,14 +178,14 @@ 
 				<a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $uid->id . ' show="' . $uk . '"' ) ?>"><?php echo esc_html( $uf ) ?></a>
     	    </li>
         <?php
-            $col = ($col == 'one') ? 'two' : 'one';
-            unset($uf, $uk);
-        }
-        unset($uid); ?>
+			$col = ($col == 'one') ? 'two' : 'one';
+			unset($uf, $uk);
+		}
+		unset($uid); ?>
         </ul>
         <?php }
 
-        if ( isset($repeat_field) ) { ?>
+		if ( isset($repeat_field) ) { ?>
         <div class="clear"></div>
         <p class="howto"><?php _e( 'Repeating field options', 'formidable' ) ?></p>
             <ul class="frm_code_list">
@@ -194,9 +194,9 @@ 
         	    </li>
             </ul>
         <?php
-        }
+		}
 
-        if ( isset($dfe) ) { ?>
+		if ( isset($dfe) ) { ?>
 
         <div class="clear"></div>
         <p class="howto"><?php _e( 'Dynamic field options', 'formidable' ) ?></p>
@@ -215,8 +215,8 @@ 
 	</div>
 
     <?php
-    if ( $settings_tab ) {
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/mb_html_tab.php');
-    }
-    ?>
+	if ( $settings_tab ) {
+		include(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/mb_html_tab.php');
+	}
+	?>
 </div>

Spacing +27 added lines, -27 removed lines

@@ -42,8 +42,8 @@ 
 
 				if ( $f->type == 'data' ) {
 					//get all fields from linked form
-                    if ( isset($f->field_options['form_select']) && is_numeric($f->field_options['form_select']) ) {
-                        $linked_form = FrmDb::get_var( $wpdb->prefix .'frm_fields', array( 'id' => $f->field_options['form_select'] ), 'form_id' );
+                    if ( isset( $f->field_options['form_select'] ) && is_numeric( $f->field_options['form_select'] ) ) {
+                        $linked_form = FrmDb::get_var( $wpdb->prefix . 'frm_fields', array( 'id' => $f->field_options['form_select'] ), 'form_id' );
                         if ( ! in_array( $linked_form, $linked_forms ) ) {
                             $linked_forms[] = $linked_form;
 							$linked_fields = FrmField::getAll( array( 'fi.type not' => FrmField::no_save_fields(), 'fi.form_id' => $linked_form ) );
@@ -53,14 +53,14 @@ 
                                     FrmAppHelper::insert_opt_html( array( 'id' => $f->id . ' show=' . $linked_field->id, 'key' => $f->field_key . ' show=' . $linked_field->field_key, 'name' => $linked_field->name, 'type' => $linked_field->type ) );
 
                                     $ldfe = $linked_field->id;
-                                    unset($linked_field);
+                                    unset( $linked_field );
                                 }
                             }
                         }
                     }
                     $dfe = $f->id;
         	    }
-                unset($f);
+                unset( $f );
                 }
             } ?>
         </ul>
@@ -84,7 +84,7 @@ 
         </li>
         <?php
             $col = ( $col == 'one' ) ? 'two' : 'one';
-            unset($skey, $sname);
+            unset( $skey, $sname );
         }
         ?>
         </ul>
@@ -106,8 +106,8 @@ 
             ?>
                 <li>
                     <a href="javascript:void(0)" class="frmids alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->id ) ?>]<?php esc_attr_e( 'Conditional text here', 'formidable' ) ?>[/if <?php echo esc_attr( $f->id ) ?>">[if <?php echo (int) $f->id ?>]</a>
-                	<a href="javascript:void(0)" class="frmkeys alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->field_key ) ?>]something[/if <?php echo esc_attr( $f->field_key ) ?>">[if <?php echo FrmAppHelper::truncate($f->field_key, 10) ?>]</a>
-                	<a href="javascript:void(0)" class="frm_insert_code" data-code="<?php echo esc_attr($f->id) ?>"><?php echo FrmAppHelper::truncate($f->name, 60) ?></a>
+                	<a href="javascript:void(0)" class="frmkeys alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->field_key ) ?>]something[/if <?php echo esc_attr( $f->field_key ) ?>">[if <?php echo FrmAppHelper::truncate( $f->field_key, 10 ) ?>]</a>
+                	<a href="javascript:void(0)" class="frm_insert_code" data-code="<?php echo esc_attr( $f->id ) ?>"><?php echo FrmAppHelper::truncate( $f->name, 60 ) ?></a>
                 </li>
                 <?php
 
@@ -116,7 +116,7 @@ 
                     } else if ( $f->type == 'file' ) {
                         $file = $f;
                     }
-        		    unset($f);
+        		    unset( $f );
 		        }
 		    } ?>
         </ul>
@@ -128,11 +128,11 @@ 
 		foreach ( $cond_shortcodes as $skey => $sname ) {
 	    ?>
 	    <li class="frm_col_<?php echo esc_attr( $col ) ?>">
-	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="if 125 <?php echo esc_attr($skey) ?>][/if 125"><?php echo esc_html( $sname ) ?></a>
+	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="if 125 <?php echo esc_attr( $skey ) ?>][/if 125"><?php echo esc_html( $sname ) ?></a>
 	    </li>
 	    <?php
 	        $col = ( $col == 'one' ) ? 'two' : 'one';
-	        unset($skey, $sname);
+	        unset( $skey, $sname );
 	    }
         ?>
         </ul>
@@ -146,22 +146,22 @@ 
 		foreach ( $adv_shortcodes as $skey => $sname ) {
 	    ?>
 	    <li class="frm_col_<?php echo esc_attr( $col ) ?>">
-	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code <?php echo is_array( $sname ) ? 'frm_help' : ''; ?>" data-code="125 <?php echo esc_attr( $skey ) ?>" <?php echo is_array( $sname ) ? 'title="'. esc_attr( $sname['title'] ) .'"' : ''; ?>><?php echo is_array( $sname ) ? $sname['label'] : $sname; ?></a>
+	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code <?php echo is_array( $sname ) ? 'frm_help' : ''; ?>" data-code="125 <?php echo esc_attr( $skey ) ?>" <?php echo is_array( $sname ) ? 'title="' . esc_attr( $sname['title'] ) . '"' : ''; ?>><?php echo is_array( $sname ) ? $sname['label'] : $sname; ?></a>
 	    </li>
 	    <?php
-	        $col = ($col == 'one') ? 'two' : 'one';
-	        unset($skey, $sname);
+	        $col = ( $col == 'one' ) ? 'two' : 'one';
+	        unset( $skey, $sname );
 	    }
         ?>
-        <?php if ( isset($file) ) { ?>
+        <?php if ( isset( $file ) ) { ?>
         <li class="frm_col_<?php echo esc_attr( $col ) ?>">
-	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr($file->id) ?> size=thumbnail html=1"><?php _e( 'Image Size', 'formidable' ) ?></a>
+	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $file->id ) ?> size=thumbnail html=1"><?php _e( 'Image Size', 'formidable' ) ?></a>
 	    </li>
-	    <li class="frm_col_<?php echo $col = (($col == 'one') ? 'two' : 'one') ?>">
-	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr($file->id) ?> show=id"><?php _e( 'Image ID', 'formidable' ) ?></a>
+	    <li class="frm_col_<?php echo $col = ( ( $col == 'one' ) ? 'two' : 'one' ) ?>">
+	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $file->id ) ?> show=id"><?php _e( 'Image ID', 'formidable' ) ?></a>
 	    </li>
-	    <li class="frm_col_<?php echo $col = (($col == 'one') ? 'two' : 'one') ?>">
-	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr($file->id) ?> show=label"><?php _e( 'Image Name', 'formidable' ) ?></a>
+	    <li class="frm_col_<?php echo $col = ( ( $col == 'one' ) ? 'two' : 'one' ) ?>">
+	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $file->id ) ?> show=label"><?php _e( 'Image Name', 'formidable' ) ?></a>
 	    </li>
 	    <?php } ?>
         </ul>
@@ -169,7 +169,7 @@ 
         <div class="clear"></div>
         <?php
 
-        if ( isset($uid) && ! empty($user_fields) ) {
+        if ( isset( $uid ) && ! empty( $user_fields ) ) {
             $col = 'one'; ?>
         <p class="howto"><?php _e( 'Insert user information', 'formidable' ) ?></p>
         <ul class="frm_code_list">
@@ -178,14 +178,14 @@ 
 				<a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $uid->id . ' show="' . $uk . '"' ) ?>"><?php echo esc_html( $uf ) ?></a>
     	    </li>
         <?php
-            $col = ($col == 'one') ? 'two' : 'one';
-            unset($uf, $uk);
+            $col = ( $col == 'one' ) ? 'two' : 'one';
+            unset( $uf, $uk );
         }
-        unset($uid); ?>
+        unset( $uid ); ?>
         </ul>
         <?php }
 
-        if ( isset($repeat_field) ) { ?>
+        if ( isset( $repeat_field ) ) { ?>
         <div class="clear"></div>
         <p class="howto"><?php _e( 'Repeating field options', 'formidable' ) ?></p>
             <ul class="frm_code_list">
@@ -196,7 +196,7 @@ 
         <?php
         }
 
-        if ( isset($dfe) ) { ?>
+        if ( isset( $dfe ) ) { ?>
 
         <div class="clear"></div>
         <p class="howto"><?php _e( 'Dynamic field options', 'formidable' ) ?></p>
@@ -204,7 +204,7 @@ 
         	    <li class="frm_col_one">
 					<a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $dfe . ' show="created-at"' ) ?>"><?php _e( 'Creation Date', 'formidable' ) ?></a>
         	    </li>
-        	    <?php if ( isset($ldfe) ) { ?>
+        	    <?php if ( isset( $ldfe ) ) { ?>
         	    <li class="frm_col_two">
 					<a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $dfe . ' show="' . $ldfe . '"' ) ?>"><?php _e( 'Field From Entry', 'formidable' ) ?></a>
         	    </li>
@@ -216,7 +216,7 @@ 
 
     <?php
     if ( $settings_tab ) {
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/mb_html_tab.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/mb_html_tab.php' );
     }
     ?>
 </div>

classes/helpers/FrmCSVExportHelper.php

Braces +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-class FrmCSVExportHelper{
+class FrmCSVExportHelper {
 	protected static $separator        = ', ';
 	protected static $column_separator = ',';
 	protected static $line_break       = 'return';

Indentation +40 added lines, -40 removed lines

@@ -235,50 +235,50 @@ 
 			return $line;
 		}
 
-        $convmap = false;
+		$convmap = false;
 
 		switch ( self::$to_encoding ) {
-            case 'macintosh':
+			case 'macintosh':
 				// this map was derived from the differences between the MacRoman and UTF-8 Charsets
 				// Reference:
 				//   - http://www.alanwood.net/demos/macroman.html
-                $convmap = array(
-                    256, 304, 0, 0xffff,
-                    306, 337, 0, 0xffff,
-                    340, 375, 0, 0xffff,
-                    377, 401, 0, 0xffff,
-                    403, 709, 0, 0xffff,
-                    712, 727, 0, 0xffff,
-                    734, 936, 0, 0xffff,
-                    938, 959, 0, 0xffff,
-                    961, 8210, 0, 0xffff,
-                    8213, 8215, 0, 0xffff,
-                    8219, 8219, 0, 0xffff,
-                    8227, 8229, 0, 0xffff,
-                    8231, 8239, 0, 0xffff,
-                    8241, 8248, 0, 0xffff,
-                    8251, 8259, 0, 0xffff,
-                    8261, 8363, 0, 0xffff,
-                    8365, 8481, 0, 0xffff,
-                    8483, 8705, 0, 0xffff,
-                    8707, 8709, 0, 0xffff,
-                    8711, 8718, 0, 0xffff,
-                    8720, 8720, 0, 0xffff,
-                    8722, 8729, 0, 0xffff,
-                    8731, 8733, 0, 0xffff,
-                    8735, 8746, 0, 0xffff,
-                    8748, 8775, 0, 0xffff,
-                    8777, 8799, 0, 0xffff,
-                    8801, 8803, 0, 0xffff,
-                    8806, 9673, 0, 0xffff,
-                    9675, 63742, 0, 0xffff,
-                    63744, 64256, 0, 0xffff,
-                );
-            break;
-            case 'ISO-8859-1':
-                $convmap = array( 256, 10000, 0, 0xffff );
-            break;
-        }
+				$convmap = array(
+					256, 304, 0, 0xffff,
+					306, 337, 0, 0xffff,
+					340, 375, 0, 0xffff,
+					377, 401, 0, 0xffff,
+					403, 709, 0, 0xffff,
+					712, 727, 0, 0xffff,
+					734, 936, 0, 0xffff,
+					938, 959, 0, 0xffff,
+					961, 8210, 0, 0xffff,
+					8213, 8215, 0, 0xffff,
+					8219, 8219, 0, 0xffff,
+					8227, 8229, 0, 0xffff,
+					8231, 8239, 0, 0xffff,
+					8241, 8248, 0, 0xffff,
+					8251, 8259, 0, 0xffff,
+					8261, 8363, 0, 0xffff,
+					8365, 8481, 0, 0xffff,
+					8483, 8705, 0, 0xffff,
+					8707, 8709, 0, 0xffff,
+					8711, 8718, 0, 0xffff,
+					8720, 8720, 0, 0xffff,
+					8722, 8729, 0, 0xffff,
+					8731, 8733, 0, 0xffff,
+					8735, 8746, 0, 0xffff,
+					8748, 8775, 0, 0xffff,
+					8777, 8799, 0, 0xffff,
+					8801, 8803, 0, 0xffff,
+					8806, 9673, 0, 0xffff,
+					9675, 63742, 0, 0xffff,
+					63744, 64256, 0, 0xffff,
+				);
+			break;
+			case 'ISO-8859-1':
+				$convmap = array( 256, 10000, 0, 0xffff );
+			break;
+		}
 
 		if ( is_array( $convmap ) ) {
 			$line = mb_encode_numericentity( $line, $convmap, self::$charset );
@@ -289,7 +289,7 @@ 
 		}
 
 		return self::escape_csv( $line );
-    }
+	}
 
 	/**
 	 * Escape a " in a csv with another "

Spacing +25 added lines, -25 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class FrmCSVExportHelper{
+class FrmCSVExportHelper {
 	protected static $separator        = ', ';
 	protected static $column_separator = ',';
 	protected static $line_break       = 'return';
@@ -63,7 +63,7 @@ 
 		header( 'Content-Description: File Transfer' );
 		header( 'Content-Disposition: attachment; filename="' . esc_attr( $filename ) . '"' );
 		header( 'Content-Type: text/csv; charset=' . self::$charset, true );
-		header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', mktime( date( 'H' ) + 2, date( 'i' ), date( 's' ), date( 'm' ), date( 'd' ), date('Y' ) ) ) . ' GMT' );
+		header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', mktime( date( 'H' ) + 2, date( 'i' ), date( 's' ), date( 'm' ), date( 'd' ), date( 'Y' ) ) ) . ' GMT' );
 		header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
 		header( 'Cache-Control: no-cache, must-revalidate' );
 		header( 'Pragma: no-cache' );
@@ -87,19 +87,19 @@ 
 	private static function csv_headings( &$headings ) {
 		foreach ( self::$fields as $col ) {
 			if ( isset( $col->field_options['separate_value'] ) && $col->field_options['separate_value'] && ! in_array( $col->type, array( 'user_id', 'file', 'data', 'date' ) ) ) {
-				$headings[ $col->id . '_label' ] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
+				$headings[$col->id . '_label'] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
 			}
 
-			$headings[ $col->id ] = strip_tags( $col->name );
+			$headings[$col->id] = strip_tags( $col->name );
 		}
 
 		if ( self::$comment_count ) {
-			for ( $i = 0; $i < self::$comment_count; $i++ ) {
-				$headings[ 'comment' . $i ] = __( 'Comment', 'formidable' );
-				$headings[ 'comment_user_id' . $i ] = __( 'Comment User', 'formidable' );
-				$headings[ 'comment_created_at' . $i ] = __( 'Comment Date', 'formidable' );
+			for ( $i = 0; $i < self::$comment_count; $i ++ ) {
+				$headings['comment' . $i] = __( 'Comment', 'formidable' );
+				$headings['comment_user_id' . $i] = __( 'Comment User', 'formidable' );
+				$headings['comment_created_at' . $i] = __( 'Comment Date', 'formidable' );
 			}
-			unset($i);
+			unset( $i );
 		}
 
 		$headings['created_at'] = __( 'Timestamp', 'formidable' );
@@ -146,45 +146,45 @@ 
 					continue;
 				}
 
-				if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = array();
-				} else if ( ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
+				if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = array();
+				} else if ( ! is_array( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
 					// if the data is here, it should be an array but if this field has collected data
 					// both while inside and outside of the repeating section, it's possible this is a string
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = (array) $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ];
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = (array) $entries[self::$entry->parent_item_id]->metas[$meta_id];
 				}
 
 				//add the repeated values
-				$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ][] = $meta_value;
+				$entries[self::$entry->parent_item_id]->metas[$meta_id][] = $meta_value;
 			}
-			$entries[ self::$entry->parent_item_id ]->metas += self::$entry->metas;
+			$entries[self::$entry->parent_item_id]->metas += self::$entry->metas;
 		}
 
 		// add the embedded form id
-		if ( ! isset( $entries[ self::$entry->parent_item_id ]->embedded_fields ) ) {
-			$entries[ self::$entry->parent_item_id ]->embedded_fields = array();
+		if ( ! isset( $entries[self::$entry->parent_item_id]->embedded_fields ) ) {
+			$entries[self::$entry->parent_item_id]->embedded_fields = array();
 		}
-		$entries[ self::$entry->parent_item_id ]->embedded_fields[ self::$entry->id ] = self::$entry->form_id;
+		$entries[self::$entry->parent_item_id]->embedded_fields[self::$entry->id] = self::$entry->form_id;
 	}
 
 	private static function add_field_values_to_csv( &$row ) {
 		foreach ( self::$fields as $col ) {
-			$field_value = isset( self::$entry->metas[ $col->id ] ) ? self::$entry->metas[ $col->id ] : false;
+			$field_value = isset( self::$entry->metas[$col->id] ) ? self::$entry->metas[$col->id] : false;
 
 			$field_value = maybe_unserialize( $field_value );
-			$field_value = apply_filters( 'frm_csv_value', $field_value, array( 'field' => $col, 'entry' => self::$entry, 'separator' => self::$separator, ) );
+			$field_value = apply_filters( 'frm_csv_value', $field_value, array( 'field' => $col, 'entry' => self::$entry, 'separator' => self::$separator,) );
 
 			if ( isset( $col->field_options['separate_value'] ) && $col->field_options['separate_value'] ) {
 				$sep_value = FrmEntriesHelper::display_value( $field_value, $col, array(
 					'type' => $col->type, 'post_id' => self::$entry->post_id, 'show_icon' => false,
 					'entry_id' => self::$entry->id, 'sep' => self::$separator,
-					'embedded_field_id' => ( isset( self::$entry->embedded_fields ) && isset( self::$entry->embedded_fields[ self::$entry->id ] ) ) ? 'form' . self::$entry->embedded_fields[ self::$entry->id ] : 0,
+					'embedded_field_id' => ( isset( self::$entry->embedded_fields ) && isset( self::$entry->embedded_fields[self::$entry->id] ) ) ? 'form' . self::$entry->embedded_fields[self::$entry->id] : 0,
 					) );
-				$row[ $col->id . '_label' ] = $sep_value;
+				$row[$col->id . '_label'] = $sep_value;
 				unset( $sep_value );
 			}
 
-			$row[ $col->id ] = $field_value;
+			$row[$col->id] = $field_value;
 
 			unset( $col, $field_value );
 		}
@@ -205,9 +205,9 @@ 
 		$col_count = count( $rows );
 		$this_col = 0;
 		foreach ( $rows as $k => $row ) {
-			$this_col++;
+			$this_col ++;
 
-			if ( ! isset( self::$headings[ $k ] ) ) {
+			if ( ! isset( self::$headings[$k] ) ) {
 				// this column has been removed from the csv, so skip it
 				continue;
 			}

classes/views/xml/import_form.php

Indentation +2 added lines, -2 removed lines

@@ -87,9 +87,9 @@
 								} else if ( $form->is_template ) {
 									echo ' ' . __( '(template)', 'formidable' );
 								}
-                        ?></option>
+						?></option>
                         <?php
-                        } ?>
+						} ?>
                         </select>
                         <p class="howto"><?php _e( 'Hold down the CTRL/Command button to select multiple forms', 'formidable' ); ?></p>
                     </td>

Spacing +7 added lines, -7 removed lines

@@ -2,7 +2,7 @@ 
     <div class="frmicon icon32"><br/></div>
     <h2><?php _e( 'Import/Export', 'formidable' ); ?></h2>
 
-    <?php include(FrmAppHelper::plugin_path() .'/classes/views/shared/errors.php'); ?>
+    <?php include( FrmAppHelper::plugin_path() . '/classes/views/shared/errors.php' ); ?>
     <div id="poststuff" class="metabox-holder">
     <div id="post-body">
     <div id="post-body-content">
@@ -10,16 +10,16 @@ 
     <div class="postbox ">
     <h3 class="hndle"><span><?php _e( 'Import', 'formidable' ) ?></span></h3>
     <div class="inside">
-        <p class="howto"><?php echo apply_filters('frm_upload_instructions1', __( 'Upload your Formidable XML file to import forms into this site. If your imported form key and creation date match a form on your site, that form will be updated.', 'formidable' )) ?></p>
+        <p class="howto"><?php echo apply_filters( 'frm_upload_instructions1', __( 'Upload your Formidable XML file to import forms into this site. If your imported form key and creation date match a form on your site, that form will be updated.', 'formidable' ) ) ?></p>
         <br/>
         <form enctype="multipart/form-data" method="post">
             <input type="hidden" name="frm_action" value="import_xml" />
-            <?php wp_nonce_field('import-xml-nonce', 'import-xml'); ?>
-            <p><label><?php echo apply_filters('frm_upload_instructions2', __( 'Choose a Formidable XML file', 'formidable' )) ?> (<?php printf(__( 'Maximum size: %s', 'formidable' ), ini_get('upload_max_filesize')) ?>)</label>
+            <?php wp_nonce_field( 'import-xml-nonce', 'import-xml' ); ?>
+            <p><label><?php echo apply_filters( 'frm_upload_instructions2', __( 'Choose a Formidable XML file', 'formidable' ) ) ?> (<?php printf( __( 'Maximum size: %s', 'formidable' ), ini_get( 'upload_max_filesize' ) ) ?>)</label>
             <input type="file" name="frm_import_file" size="25" />
             </p>
 
-            <?php do_action('frm_csv_opts', $forms) ?>
+            <?php do_action( 'frm_csv_opts', $forms ) ?>
 
             <p class="submit">
 				<input type="submit" value="<?php esc_attr_e( 'Upload file and import', 'formidable' ) ?>" class="button-primary" />
@@ -34,7 +34,7 @@ 
     <div class="inside with_frm_style">
 		<form method="post" action="<?php echo esc_url( admin_url( 'admin-ajax.php' ) ); ?>" id="frm_export_xml">
             <input type="hidden" name="action" value="frm_export_xml" />
-            <?php wp_nonce_field('export-xml-nonce', 'export-xml'); ?>
+            <?php wp_nonce_field( 'export-xml-nonce', 'export-xml' ); ?>
 
             <table class="form-table">
                 <tr class="form-field">
@@ -42,7 +42,7 @@ 
                     <td>
                         <select name="format">
 						<?php foreach ( $export_format as $t => $type ) { ?>
-                            <option value="<?php echo esc_attr( $t ) ?>" data-support="<?php echo esc_attr( $type['support'] ) ?>" <?php echo isset( $type['count'] ) ? 'data-count="'. esc_attr( $type['count'] ) .'"' : ''; ?>><?php echo isset( $type['name'] ) ? $type['name'] : $t ?></option>
+                            <option value="<?php echo esc_attr( $t ) ?>" data-support="<?php echo esc_attr( $type['support'] ) ?>" <?php echo isset( $type['count'] ) ? 'data-count="' . esc_attr( $type['count'] ) . '"' : ''; ?>><?php echo isset( $type['name'] ) ? $type['name'] : $t ?></option>
                         <?php } ?>
                         </select>
 

classes/controllers/FrmXMLController.php

Indentation +195 added lines, -195 removed lines

@@ -2,110 +2,110 @@ 
 
 class FrmXMLController {
 
-    public static function menu() {
-        add_submenu_page('formidable', 'Formidable | '. __( 'Import/Export', 'formidable' ), __( 'Import/Export', 'formidable' ), 'frm_edit_forms', 'formidable-import', 'FrmXMLController::route');
-    }
+	public static function menu() {
+		add_submenu_page('formidable', 'Formidable | '. __( 'Import/Export', 'formidable' ), __( 'Import/Export', 'formidable' ), 'frm_edit_forms', 'formidable-import', 'FrmXMLController::route');
+	}
 
-    public static function add_default_templates() {
+	public static function add_default_templates() {
 		if ( ! function_exists( 'libxml_disable_entity_loader' ) ) {
-    		// XML import is not enabled on your server
-    		return;
-    	}
+			// XML import is not enabled on your server
+			return;
+		}
 
-        $set_err = libxml_use_internal_errors(true);
-        $loader = libxml_disable_entity_loader( true );
+		$set_err = libxml_use_internal_errors(true);
+		$loader = libxml_disable_entity_loader( true );
 
 		$files = apply_filters( 'frm_default_templates_files', array( FrmAppHelper::plugin_path() . '/classes/views/xml/default-templates.xml' ) );
 
-        foreach ( (array) $files as $file ) {
-            FrmXMLHelper::import_xml($file);
-            unset($file);
-        }
-        /*
+		foreach ( (array) $files as $file ) {
+			FrmXMLHelper::import_xml($file);
+			unset($file);
+		}
+		/*
         if(is_wp_error($result))
             $errors[] = $result->get_error_message();
         else if($result)
             $message = $result;
         */
 
-        unset( $files );
+		unset( $files );
 
-        libxml_use_internal_errors( $set_err );
-    	libxml_disable_entity_loader( $loader );
-    }
+		libxml_use_internal_errors( $set_err );
+		libxml_disable_entity_loader( $loader );
+	}
 
-    public static function route() {
-        $action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
+	public static function route() {
+		$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
 		$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
 		if ( $action == 'import_xml' ) {
-            return self::import_xml();
+			return self::import_xml();
 		} else if ( $action == 'export_xml' ) {
-            return self::export_xml();
-        } else {
-            if ( apply_filters( 'frm_xml_route', true, $action ) ) {
-                return self::form();
-            }
-        }
-    }
-
-    public static function form( $errors = array(), $message = '' ) {
+			return self::export_xml();
+		} else {
+			if ( apply_filters( 'frm_xml_route', true, $action ) ) {
+				return self::form();
+			}
+		}
+	}
+
+	public static function form( $errors = array(), $message = '' ) {
 		$where = array(
 			'parent_form_id' => array( null, 0 ),
 			'status' => array( null, '', 'published' )
 		);
 		$forms = FrmForm::getAll( $where, 'name' );
 
-        $export_types = apply_filters( 'frm_xml_export_types',
-            array( 'forms' => __( 'Forms', 'formidable' ), 'items' => __( 'Entries', 'formidable' ) )
-        );
+		$export_types = apply_filters( 'frm_xml_export_types',
+			array( 'forms' => __( 'Forms', 'formidable' ), 'items' => __( 'Entries', 'formidable' ) )
+		);
 
-        $export_format = apply_filters( 'frm_export_formats', array(
-            'xml' => array( 'name' => 'XML', 'support' => 'forms', 'count' => 'multiple' ),
+		$export_format = apply_filters( 'frm_export_formats', array(
+			'xml' => array( 'name' => 'XML', 'support' => 'forms', 'count' => 'multiple' ),
 			'csv' => array( 'name' => 'CSV', 'support' => 'items', 'count' => 'single' ),
-        ) );
+		) );
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/xml/import_form.php');
-    }
+		include(FrmAppHelper::plugin_path() .'/classes/views/xml/import_form.php');
+	}
 
-    public static function import_xml() {
-        $errors = array();
-        $message = '';
+	public static function import_xml() {
+		$errors = array();
+		$message = '';
 
-        $permission_error = FrmAppHelper::permission_nonce_error('frm_edit_forms', 'import-xml', 'import-xml-nonce');
-        if ( $permission_error !== false ) {
-            $errors[] = $permission_error;
-            self::form($errors);
-            return;
-        }
+		$permission_error = FrmAppHelper::permission_nonce_error('frm_edit_forms', 'import-xml', 'import-xml-nonce');
+		if ( $permission_error !== false ) {
+			$errors[] = $permission_error;
+			self::form($errors);
+			return;
+		}
 
-        if ( ! isset($_FILES) || ! isset($_FILES['frm_import_file']) || empty($_FILES['frm_import_file']['name']) || (int) $_FILES['frm_import_file']['size'] < 1 ) {
-            $errors[] = __( 'Oops, you didn\'t select a file.', 'formidable' );
-            self::form($errors);
-            return;
-        }
+		if ( ! isset($_FILES) || ! isset($_FILES['frm_import_file']) || empty($_FILES['frm_import_file']['name']) || (int) $_FILES['frm_import_file']['size'] < 1 ) {
+			$errors[] = __( 'Oops, you didn\'t select a file.', 'formidable' );
+			self::form($errors);
+			return;
+		}
 
-        $file = $_FILES['frm_import_file']['tmp_name'];
+		$file = $_FILES['frm_import_file']['tmp_name'];
 
-        if ( ! is_uploaded_file( $file ) ) {
-            unset($file);
-            $errors[] = __( 'The file does not exist, please try again.', 'formidable' );
-            self::form($errors);
-            return;
-        }
+		if ( ! is_uploaded_file( $file ) ) {
+			unset($file);
+			$errors[] = __( 'The file does not exist, please try again.', 'formidable' );
+			self::form($errors);
+			return;
+		}
 
-        //add_filter('upload_mimes', 'FrmXMLController::allow_mime');
+		//add_filter('upload_mimes', 'FrmXMLController::allow_mime');
 
-        $export_format = apply_filters('frm_export_formats', array(
+		$export_format = apply_filters('frm_export_formats', array(
 			'xml' => array( 'name' => 'XML', 'support' => 'forms', 'count' => 'multiple' ),
 		) );
 
-        $file_type = strtolower(pathinfo($_FILES['frm_import_file']['name'], PATHINFO_EXTENSION));
-        if ( $file_type != 'xml' && isset( $export_format[ $file_type ] ) ) {
-            // allow other file types to be imported
-            do_action('frm_before_import_'. $file_type );
-            return;
-        }
-        unset($file_type);
+		$file_type = strtolower(pathinfo($_FILES['frm_import_file']['name'], PATHINFO_EXTENSION));
+		if ( $file_type != 'xml' && isset( $export_format[ $file_type ] ) ) {
+			// allow other file types to be imported
+			do_action('frm_before_import_'. $file_type );
+			return;
+		}
+		unset($file_type);
 
 		if ( ! function_exists( 'libxml_disable_entity_loader' ) ) {
 			$errors[] = __( 'XML import is not enabled on your server.', 'formidable' );
@@ -124,148 +124,148 @@ 
 		libxml_use_internal_errors( $set_err );
 		libxml_disable_entity_loader( $loader );
 
-        self::form($errors, $message);
-    }
+		self::form($errors, $message);
+	}
 
-    public static function export_xml() {
-        $error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'export-xml', 'export-xml-nonce' );
-        if ( ! empty($error) ) {
-            wp_die( $error );
-        }
+	public static function export_xml() {
+		$error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'export-xml', 'export-xml-nonce' );
+		if ( ! empty($error) ) {
+			wp_die( $error );
+		}
 
 		$ids = FrmAppHelper::get_post_param( 'frm_export_forms', array() );
 		$type = FrmAppHelper::get_post_param( 'type', array() );
 		$format = FrmAppHelper::get_post_param( 'format', 'xml', 'sanitize_title' );
 
-        if ( ! headers_sent() && ! $type ) {
-            wp_redirect( esc_url_raw( admin_url( 'admin.php?page=formidable-import' ) ) );
-            die();
-        }
+		if ( ! headers_sent() && ! $type ) {
+			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=formidable-import' ) ) );
+			die();
+		}
 
-        if ( $format == 'xml' ) {
-            self::generate_xml($type, compact('ids'));
+		if ( $format == 'xml' ) {
+			self::generate_xml($type, compact('ids'));
 		} if ( $format == 'csv' ) {
 			self::generate_csv( compact('ids') );
-        } else {
-            do_action('frm_export_format_'. $format, compact('ids'));
-        }
+		} else {
+			do_action('frm_export_format_'. $format, compact('ids'));
+		}
 
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function generate_xml( $type, $args = array() ) {
-    	global $wpdb;
-
-	    $type = (array) $type;
-        if ( in_array( 'items', $type) && ! in_array( 'forms', $type) ) {
-            // make sure the form is included if there are entries
-            $type[] = 'forms';
-        }
-
-	    if ( in_array( 'forms', $type) ) {
-            // include actions with forms
-	        $type[] = 'actions';
-	    }
-
-	    $tables = array(
-	        'items'     => $wpdb->prefix .'frm_items',
-	        'forms'     => $wpdb->prefix .'frm_forms',
-	        'posts'     => $wpdb->posts,
-	        'styles'    => $wpdb->posts,
-	        'actions'   => $wpdb->posts,
-	    );
+		global $wpdb;
+
+		$type = (array) $type;
+		if ( in_array( 'items', $type) && ! in_array( 'forms', $type) ) {
+			// make sure the form is included if there are entries
+			$type[] = 'forms';
+		}
+
+		if ( in_array( 'forms', $type) ) {
+			// include actions with forms
+			$type[] = 'actions';
+		}
+
+		$tables = array(
+			'items'     => $wpdb->prefix .'frm_items',
+			'forms'     => $wpdb->prefix .'frm_forms',
+			'posts'     => $wpdb->posts,
+			'styles'    => $wpdb->posts,
+			'actions'   => $wpdb->posts,
+		);
 
 		$defaults = array( 'ids' => false );
-	    $args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args( $args, $defaults );
 
-        $sitename = sanitize_key( get_bloginfo( 'name' ) );
+		$sitename = sanitize_key( get_bloginfo( 'name' ) );
 
-    	if ( ! empty( $sitename ) ) {
+		if ( ! empty( $sitename ) ) {
 			$sitename .= '.';
 		}
-    	$filename = $sitename . 'formidable.' . date( 'Y-m-d' ) . '.xml';
+		$filename = $sitename . 'formidable.' . date( 'Y-m-d' ) . '.xml';
 
-    	header( 'Content-Description: File Transfer' );
-    	header( 'Content-Disposition: attachment; filename=' . $filename );
-    	header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
+		header( 'Content-Description: File Transfer' );
+		header( 'Content-Disposition: attachment; filename=' . $filename );
+		header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
 
-        //make sure ids are numeric
-    	if ( is_array( $args['ids'] ) && ! empty( $args['ids'] ) ) {
-	        $args['ids'] = array_filter( $args['ids'], 'is_numeric' );
-	    }
+		//make sure ids are numeric
+		if ( is_array( $args['ids'] ) && ! empty( $args['ids'] ) ) {
+			$args['ids'] = array_filter( $args['ids'], 'is_numeric' );
+		}
 
-	    $records = array();
+		$records = array();
 
 		foreach ( $type as $tb_type ) {
-            $where = array();
+			$where = array();
 			$join = '';
-            $table = $tables[ $tb_type ];
+			$table = $tables[ $tb_type ];
 
-            $select = $table .'.id';
-            $query_vars = array();
+			$select = $table .'.id';
+			$query_vars = array();
 
-            switch ( $tb_type ) {
-                case 'forms':
-                    //add forms
-                    if ( $args['ids'] ) {
+			switch ( $tb_type ) {
+				case 'forms':
+					//add forms
+					if ( $args['ids'] ) {
 						$where[] = array( 'or' => 1, $table . '.id' => $args['ids'], $table .'.parent_form_id' => $args['ids'] );
-                	} else {
+					} else {
 						$where[ $table . '.status !' ] = 'draft';
-                	}
-                break;
-                case 'actions':
-                    $select = $table .'.ID';
+					}
+				break;
+				case 'actions':
+					$select = $table .'.ID';
 					$where['post_type'] = FrmFormActionsController::$action_post_type;
-                    if ( ! empty($args['ids']) ) {
+					if ( ! empty($args['ids']) ) {
 						$where['menu_order'] = $args['ids'];
-                    }
-                break;
-                case 'items':
-                    //$join = "INNER JOIN {$wpdb->prefix}frm_item_metas im ON ($table.id = im.item_id)";
-                    if ( $args['ids'] ) {
+					}
+				break;
+				case 'items':
+					//$join = "INNER JOIN {$wpdb->prefix}frm_item_metas im ON ($table.id = im.item_id)";
+					if ( $args['ids'] ) {
 						$where[ $table . '.form_id' ] = $args['ids'];
-                    }
-                break;
-                case 'styles':
-                    // Loop through all exported forms and get their selected style IDs
-                    $form_ids = $args['ids'];
-                    $style_ids = array();
-                    foreach ( $form_ids as $form_id ) {
-                        $form_data = FrmForm::getOne( $form_id );
-                        // For forms that have not been updated while running 2.0, check if custom_style is set
-                        if ( isset( $form_data->options['custom_style'] ) ) {
-                            $style_ids[] = $form_data->options['custom_style'];
-                        }
-                        unset( $form_id, $form_data );
-                    }
-                    $select = $table .'.ID';
-                    $where['post_type'] = 'frm_styles';
-
-                    // Only export selected styles
-                    if ( ! empty( $style_ids ) ) {
-                        $where['ID'] = $style_ids;
-                    }
-                break;
-                default:
-                    $select = $table .'.ID';
-                    $join = ' INNER JOIN ' . $wpdb->postmeta . ' pm ON (pm.post_id=' . $table . '.ID)';
-                    $where['pm.meta_key'] = 'frm_form_id';
-
-                    if ( empty($args['ids']) ) {
-                        $where['pm.meta_value >'] = 1;
-                    } else {
-                        $where['pm.meta_value'] = $args['ids'];
-                    }
-                break;
-            }
+					}
+				break;
+				case 'styles':
+					// Loop through all exported forms and get their selected style IDs
+					$form_ids = $args['ids'];
+					$style_ids = array();
+					foreach ( $form_ids as $form_id ) {
+						$form_data = FrmForm::getOne( $form_id );
+						// For forms that have not been updated while running 2.0, check if custom_style is set
+						if ( isset( $form_data->options['custom_style'] ) ) {
+							$style_ids[] = $form_data->options['custom_style'];
+						}
+						unset( $form_id, $form_data );
+					}
+					$select = $table .'.ID';
+					$where['post_type'] = 'frm_styles';
+
+					// Only export selected styles
+					if ( ! empty( $style_ids ) ) {
+						$where['ID'] = $style_ids;
+					}
+				break;
+				default:
+					$select = $table .'.ID';
+					$join = ' INNER JOIN ' . $wpdb->postmeta . ' pm ON (pm.post_id=' . $table . '.ID)';
+					$where['pm.meta_key'] = 'frm_form_id';
+
+					if ( empty($args['ids']) ) {
+						$where['pm.meta_value >'] = 1;
+					} else {
+						$where['pm.meta_value'] = $args['ids'];
+					}
+				break;
+			}
 
 			$records[ $tb_type ] = FrmDb::get_col( $table . $join, $where, $select );
-            unset($tb_type);
-        }
+			unset($tb_type);
+		}
 
 		echo '<?xml version="1.0" encoding="' . esc_attr( get_bloginfo('charset') ) . "\" ?>\n";
-        include(FrmAppHelper::plugin_path() .'/classes/views/xml/xml.php');
-    }
+		include(FrmAppHelper::plugin_path() .'/classes/views/xml/xml.php');
+	}
 
 
 	public static function generate_csv( $atts ) {
@@ -336,14 +336,14 @@ 
 	}
 
 	/**
-	* Get the fields that should be included in the CSV export
-	*
-	* @since 2.0.19
-	*
-	* @param int $form_id
-	* @param object $form
-	* @return array $csv_fields
-	*/
+	 * Get the fields that should be included in the CSV export
+	 *
+	 * @since 2.0.19
+	 *
+	 * @param int $form_id
+	 * @param object $form
+	 * @return array $csv_fields
+	 */
 	private static function get_fields_for_csv_export( $form_id, $form ) {
 		$csv_field_ids = apply_filters( 'frm_csv_field_ids', '', $form_id, array( 'form' => $form ) );
 
@@ -371,16 +371,16 @@ 
 	}
 
 	public static function allow_mime( $mimes ) {
-        if ( ! isset( $mimes['csv'] ) ) {
-            // allow csv files
-            $mimes['csv'] = 'text/csv';
-        }
-
-        if ( ! isset( $mimes['xml'] ) ) {
-            // allow xml
-            $mimes['xml'] = 'text/xml';
-        }
-
-        return $mimes;
-    }
+		if ( ! isset( $mimes['csv'] ) ) {
+			// allow csv files
+			$mimes['csv'] = 'text/csv';
+		}
+
+		if ( ! isset( $mimes['xml'] ) ) {
+			// allow xml
+			$mimes['xml'] = 'text/xml';
+		}
+
+		return $mimes;
+	}
 }

Spacing +46 added lines, -46 removed lines

@@ -3,7 +3,7 @@ 
 class FrmXMLController {
 
     public static function menu() {
-        add_submenu_page('formidable', 'Formidable | '. __( 'Import/Export', 'formidable' ), __( 'Import/Export', 'formidable' ), 'frm_edit_forms', 'formidable-import', 'FrmXMLController::route');
+        add_submenu_page( 'formidable', 'Formidable | ' . __( 'Import/Export', 'formidable' ), __( 'Import/Export', 'formidable' ), 'frm_edit_forms', 'formidable-import', 'FrmXMLController::route' );
     }
 
     public static function add_default_templates() {
@@ -12,14 +12,14 @@ 
     		return;
     	}
 
-        $set_err = libxml_use_internal_errors(true);
+        $set_err = libxml_use_internal_errors( true );
         $loader = libxml_disable_entity_loader( true );
 
 		$files = apply_filters( 'frm_default_templates_files', array( FrmAppHelper::plugin_path() . '/classes/views/xml/default-templates.xml' ) );
 
         foreach ( (array) $files as $file ) {
-            FrmXMLHelper::import_xml($file);
-            unset($file);
+            FrmXMLHelper::import_xml( $file );
+            unset( $file );
         }
         /*
         if(is_wp_error($result))
@@ -64,48 +64,48 @@ 
 			'csv' => array( 'name' => 'CSV', 'support' => 'items', 'count' => 'single' ),
         ) );
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/xml/import_form.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/xml/import_form.php' );
     }
 
     public static function import_xml() {
         $errors = array();
         $message = '';
 
-        $permission_error = FrmAppHelper::permission_nonce_error('frm_edit_forms', 'import-xml', 'import-xml-nonce');
+        $permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'import-xml', 'import-xml-nonce' );
         if ( $permission_error !== false ) {
             $errors[] = $permission_error;
-            self::form($errors);
+            self::form( $errors );
             return;
         }
 
-        if ( ! isset($_FILES) || ! isset($_FILES['frm_import_file']) || empty($_FILES['frm_import_file']['name']) || (int) $_FILES['frm_import_file']['size'] < 1 ) {
+        if ( ! isset( $_FILES ) || ! isset( $_FILES['frm_import_file'] ) || empty( $_FILES['frm_import_file']['name'] ) || (int) $_FILES['frm_import_file']['size'] < 1 ) {
             $errors[] = __( 'Oops, you didn\'t select a file.', 'formidable' );
-            self::form($errors);
+            self::form( $errors );
             return;
         }
 
         $file = $_FILES['frm_import_file']['tmp_name'];
 
         if ( ! is_uploaded_file( $file ) ) {
-            unset($file);
+            unset( $file );
             $errors[] = __( 'The file does not exist, please try again.', 'formidable' );
-            self::form($errors);
+            self::form( $errors );
             return;
         }
 
         //add_filter('upload_mimes', 'FrmXMLController::allow_mime');
 
-        $export_format = apply_filters('frm_export_formats', array(
+        $export_format = apply_filters( 'frm_export_formats', array(
 			'xml' => array( 'name' => 'XML', 'support' => 'forms', 'count' => 'multiple' ),
 		) );
 
-        $file_type = strtolower(pathinfo($_FILES['frm_import_file']['name'], PATHINFO_EXTENSION));
-        if ( $file_type != 'xml' && isset( $export_format[ $file_type ] ) ) {
+        $file_type = strtolower( pathinfo( $_FILES['frm_import_file']['name'], PATHINFO_EXTENSION ) );
+        if ( $file_type != 'xml' && isset( $export_format[$file_type] ) ) {
             // allow other file types to be imported
-            do_action('frm_before_import_'. $file_type );
+            do_action( 'frm_before_import_' . $file_type );
             return;
         }
-        unset($file_type);
+        unset( $file_type );
 
 		if ( ! function_exists( 'libxml_disable_entity_loader' ) ) {
 			$errors[] = __( 'XML import is not enabled on your server.', 'formidable' );
@@ -124,12 +124,12 @@ 
 		libxml_use_internal_errors( $set_err );
 		libxml_disable_entity_loader( $loader );
 
-        self::form($errors, $message);
+        self::form( $errors, $message );
     }
 
     public static function export_xml() {
         $error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'export-xml', 'export-xml-nonce' );
-        if ( ! empty($error) ) {
+        if ( ! empty( $error ) ) {
             wp_die( $error );
         }
 
@@ -143,11 +143,11 @@ 
         }
 
         if ( $format == 'xml' ) {
-            self::generate_xml($type, compact('ids'));
+            self::generate_xml( $type, compact( 'ids' ) );
 		} if ( $format == 'csv' ) {
-			self::generate_csv( compact('ids') );
+			self::generate_csv( compact( 'ids' ) );
         } else {
-            do_action('frm_export_format_'. $format, compact('ids'));
+            do_action( 'frm_export_format_' . $format, compact( 'ids' ) );
         }
 
         wp_die();
@@ -157,19 +157,19 @@ 
     	global $wpdb;
 
 	    $type = (array) $type;
-        if ( in_array( 'items', $type) && ! in_array( 'forms', $type) ) {
+        if ( in_array( 'items', $type ) && ! in_array( 'forms', $type ) ) {
             // make sure the form is included if there are entries
             $type[] = 'forms';
         }
 
-	    if ( in_array( 'forms', $type) ) {
+	    if ( in_array( 'forms', $type ) ) {
             // include actions with forms
 	        $type[] = 'actions';
 	    }
 
 	    $tables = array(
-	        'items'     => $wpdb->prefix .'frm_items',
-	        'forms'     => $wpdb->prefix .'frm_forms',
+	        'items'     => $wpdb->prefix . 'frm_items',
+	        'forms'     => $wpdb->prefix . 'frm_forms',
 	        'posts'     => $wpdb->posts,
 	        'styles'    => $wpdb->posts,
 	        'actions'   => $wpdb->posts,
@@ -199,31 +199,31 @@ 
 		foreach ( $type as $tb_type ) {
             $where = array();
 			$join = '';
-            $table = $tables[ $tb_type ];
+            $table = $tables[$tb_type];
 
-            $select = $table .'.id';
+            $select = $table . '.id';
             $query_vars = array();
 
             switch ( $tb_type ) {
                 case 'forms':
                     //add forms
                     if ( $args['ids'] ) {
-						$where[] = array( 'or' => 1, $table . '.id' => $args['ids'], $table .'.parent_form_id' => $args['ids'] );
+						$where[] = array( 'or' => 1, $table . '.id' => $args['ids'], $table . '.parent_form_id' => $args['ids'] );
                 	} else {
-						$where[ $table . '.status !' ] = 'draft';
+						$where[$table . '.status !'] = 'draft';
                 	}
                 break;
                 case 'actions':
-                    $select = $table .'.ID';
+                    $select = $table . '.ID';
 					$where['post_type'] = FrmFormActionsController::$action_post_type;
-                    if ( ! empty($args['ids']) ) {
+                    if ( ! empty( $args['ids'] ) ) {
 						$where['menu_order'] = $args['ids'];
                     }
                 break;
                 case 'items':
                     //$join = "INNER JOIN {$wpdb->prefix}frm_item_metas im ON ($table.id = im.item_id)";
                     if ( $args['ids'] ) {
-						$where[ $table . '.form_id' ] = $args['ids'];
+						$where[$table . '.form_id'] = $args['ids'];
                     }
                 break;
                 case 'styles':
@@ -238,7 +238,7 @@ 
                         }
                         unset( $form_id, $form_data );
                     }
-                    $select = $table .'.ID';
+                    $select = $table . '.ID';
                     $where['post_type'] = 'frm_styles';
 
                     // Only export selected styles
@@ -247,11 +247,11 @@ 
                     }
                 break;
                 default:
-                    $select = $table .'.ID';
+                    $select = $table . '.ID';
                     $join = ' INNER JOIN ' . $wpdb->postmeta . ' pm ON (pm.post_id=' . $table . '.ID)';
                     $where['pm.meta_key'] = 'frm_form_id';
 
-                    if ( empty($args['ids']) ) {
+                    if ( empty( $args['ids'] ) ) {
                         $where['pm.meta_value >'] = 1;
                     } else {
                         $where['pm.meta_value'] = $args['ids'];
@@ -259,12 +259,12 @@ 
                 break;
             }
 
-			$records[ $tb_type ] = FrmDb::get_col( $table . $join, $where, $select );
-            unset($tb_type);
+			$records[$tb_type] = FrmDb::get_col( $table . $join, $where, $select );
+            unset( $tb_type );
         }
 
-		echo '<?xml version="1.0" encoding="' . esc_attr( get_bloginfo('charset') ) . "\" ?>\n";
-        include(FrmAppHelper::plugin_path() .'/classes/views/xml/xml.php');
+		echo '<?xml version="1.0" encoding="' . esc_attr( get_bloginfo( 'charset' ) ) . "\" ?>\n";
+        include( FrmAppHelper::plugin_path() . '/classes/views/xml/xml.php' );
     }
 
 
@@ -289,11 +289,11 @@ 
 			$fid = FrmAppHelper::get_param( 'fid', '', 'get', 'sanitize_text_field' );
 		}
 
-		if ( ! ini_get('safe_mode') ) {
-			set_time_limit(0); //Remove time limit to execute this function
-			$mem_limit = str_replace('M', '', ini_get('memory_limit'));
+		if ( ! ini_get( 'safe_mode' ) ) {
+			set_time_limit( 0 ); //Remove time limit to execute this function
+			$mem_limit = str_replace( 'M', '', ini_get( 'memory_limit' ) );
 			if ( (int) $mem_limit < 256 ) {
-				ini_set('memory_limit', '256M');
+				ini_set( 'memory_limit', '256M' );
 			}
 		}
 
@@ -323,7 +323,7 @@ 
 		 */
 		$query = apply_filters( 'frm_csv_where', $query, compact( 'form_id', 'search', 'fid', 'item_id' ) );
 
-		$entry_ids = FrmDb::get_col( $wpdb->prefix .'frm_items it', $query );
+		$entry_ids = FrmDb::get_col( $wpdb->prefix . 'frm_items it', $query );
 		unset( $query );
 
 		if ( empty( $entry_ids ) ) {
@@ -353,7 +353,7 @@ 
 			if ( ! is_array( $csv_field_ids ) ) {
 				$csv_field_ids = explode( ',', $csv_field_ids );
 			}
-			if ( ! empty( $csv_field_ids ) )	{
+			if ( ! empty( $csv_field_ids ) ) {
 				$where['fi.id'] = $csv_field_ids;
 			}
 			$csv_fields = FrmField::getAll( $where, 'field_order' );
@@ -362,7 +362,7 @@ 
 			$no_export_fields = FrmField::no_save_fields();
 			foreach ( $csv_fields as $k => $f ) {
 				if ( in_array( $f->type, $no_export_fields ) ) {
-					unset( $csv_fields[ $k ] );
+					unset( $csv_fields[$k] );
 				}
 			}
 		}

Braces +1 added lines, -1 removed lines

@@ -353,7 +353,7 @@
 			if ( ! is_array( $csv_field_ids ) ) {
 				$csv_field_ids = explode( ',', $csv_field_ids );
 			}
-			if ( ! empty( $csv_field_ids ) )	{
+			if ( ! empty( $csv_field_ids ) ) {
 				$where['fi.id'] = $csv_field_ids;
 			}
 			$csv_fields = FrmField::getAll( $where, 'field_order' );

classes/helpers/FrmAppHelper.php

Doc Comments +12 added lines

@@ -57,6 +57,9 @@ 
         return get_option('blogname');
     }
 
+	/**
+	 * @param string $url
+	 */
 	public static function make_affiliate_url( $url ) {
 		$affiliate_id = apply_filters( 'frm_affiliate_link', '' );
 		$allowed_affiliates = array('Mojo');
@@ -752,6 +755,9 @@ 
 		return FrmFieldsHelper::prepare_other_input( $args, $other_opt, $checked );
     }
 
+	/**
+	 * @param string $function
+	 */
 	public static function recursive_function_map( $value, $function ) {
 		if ( is_array( $value ) ) {
 			$original_function = $function;
@@ -1179,6 +1185,9 @@ 
         return $sub . (($len < $original_len) ? $continue : '');
     }
 
+	/**
+	 * @param string[] $function_names
+	 */
 	public static function mb_function( $function_names, $args ) {
 		$mb_function_name = $function_names[0];
 		$function_name = $function_names[1];
@@ -1212,6 +1221,9 @@ 
         return $formatted;
     }
 
+	/**
+	 * @param string $time_format
+	 */
 	private static function add_time_to_date( $time_format, $date ) {
 		if ( empty( $time_format ) ) {
 			$time_format = get_option('time_format');

Indentation +1130 added lines, -1130 removed lines

@@ -12,50 +12,50 @@ 
 	 */
 	public static $plug_version = '2.0.19';
 
-    /**
-     * @since 1.07.02
-     *
-     * @param none
-     * @return string The version of this plugin
-     */
-    public static function plugin_version() {
-        return self::$plug_version;
-    }
-
-    public static function plugin_folder() {
-        return basename(self::plugin_path());
-    }
-
-    public static function plugin_path() {
-        return dirname(dirname(dirname(__FILE__)));
-    }
-
-    public static function plugin_url() {
-        //prevously FRM_URL constant
-        return plugins_url( '', self::plugin_path() .'/formidable.php' );
-    }
+	/**
+	 * @since 1.07.02
+	 *
+	 * @param none
+	 * @return string The version of this plugin
+	 */
+	public static function plugin_version() {
+		return self::$plug_version;
+	}
+
+	public static function plugin_folder() {
+		return basename(self::plugin_path());
+	}
+
+	public static function plugin_path() {
+		return dirname(dirname(dirname(__FILE__)));
+	}
+
+	public static function plugin_url() {
+		//prevously FRM_URL constant
+		return plugins_url( '', self::plugin_path() .'/formidable.php' );
+	}
 
 	public static function relative_plugin_url() {
 		return str_replace( array( 'https:', 'http:' ), '', self::plugin_url() );
 	}
 
-    /**
-     * @return string Site URL
-     */
-    public static function site_url() {
-        return site_url();
-    }
-
-    /**
-     * Get the name of this site
-     * Used for [sitename] shortcode
-     *
-     * @since 2.0
-     * @return string
-     */
-    public static function site_name() {
-        return get_option('blogname');
-    }
+	/**
+	 * @return string Site URL
+	 */
+	public static function site_url() {
+		return site_url();
+	}
+
+	/**
+	 * Get the name of this site
+	 * Used for [sitename] shortcode
+	 *
+	 * @since 2.0
+	 * @return string
+	 */
+	public static function site_name() {
+		return get_option('blogname');
+	}
 
 	public static function make_affiliate_url( $url ) {
 		$affiliate_id = apply_filters( 'frm_affiliate_link', '' );
@@ -66,78 +66,78 @@ 
 		return $url;
 	}
 
-    /**
-     * Get the Formidable settings
-     *
-     * @since 2.0
-     *
-     * @param None
-     * @return FrmSettings $frm_setings
-     */
-    public static function get_settings() {
-        global $frm_settings;
-        if ( empty($frm_settings) ) {
-            $frm_settings = new FrmSettings();
-        }
-        return $frm_settings;
-    }
-
-    /**
-     * Show a message in place of pro features
-     *
-     * @since 2.0
-     */
+	/**
+	 * Get the Formidable settings
+	 *
+	 * @since 2.0
+	 *
+	 * @param None
+	 * @return FrmSettings $frm_setings
+	 */
+	public static function get_settings() {
+		global $frm_settings;
+		if ( empty($frm_settings) ) {
+			$frm_settings = new FrmSettings();
+		}
+		return $frm_settings;
+	}
+
+	/**
+	 * Show a message in place of pro features
+	 *
+	 * @since 2.0
+	 */
 	public static function update_message( $features, $class = '' ) {
 		_deprecated_function( __FUNCTION__, '2.0.19' );
-    }
-
-    public static function pro_is_installed() {
-        return apply_filters('frm_pro_installed', false);
-    }
-
-    /**
-     * Check for certain page in Formidable settings
-     *
-     * @since 2.0
-     *
-     * @param string $page The name of the page to check
-     * @return boolean
-     */
+	}
+
+	public static function pro_is_installed() {
+		return apply_filters('frm_pro_installed', false);
+	}
+
+	/**
+	 * Check for certain page in Formidable settings
+	 *
+	 * @since 2.0
+	 *
+	 * @param string $page The name of the page to check
+	 * @return boolean
+	 */
 	public static function is_admin_page( $page = 'formidable' ) {
-        global $pagenow;
+		global $pagenow;
 		$get_page = self::simple_get( 'page', 'sanitize_title' );
-        if ( $pagenow ) {
+		if ( $pagenow ) {
 			return $pagenow == 'admin.php' && $get_page == $page;
-        }
+		}
 
 		return is_admin() && $get_page == $page;
-    }
-
-    /**
-     * Check for the form preview page
-     *
-     * @since 2.0
-     *
-     * @param None
-     * @return boolean
-     */
-    public static function is_preview_page() {
-        global $pagenow;
+	}
+
+	/**
+	 * Check for the form preview page
+	 *
+	 * @since 2.0
+	 *
+	 * @param None
+	 * @return boolean
+	 */
+	public static function is_preview_page() {
+		global $pagenow;
 		$action = FrmAppHelper::simple_get( 'action', 'sanitize_title' );
 		return $pagenow && $pagenow == 'admin-ajax.php' && $action == 'frm_forms_preview';
-    }
+	}
 
-    /**
-     * Check for ajax except the form preview page
-     *
-     * @since 2.0
-     *
-     * @param None
-     * @return boolean
-     */
-    public static function doing_ajax() {
-        return defined('DOING_AJAX') && DOING_AJAX && ! self::is_preview_page();
-    }
+	/**
+	 * Check for ajax except the form preview page
+	 *
+	 * @since 2.0
+	 *
+	 * @param None
+	 * @return boolean
+	 */
+	public static function doing_ajax() {
+		return defined('DOING_AJAX') && DOING_AJAX && ! self::is_preview_page();
+	}
 
 	/**
 	 * @since 2.0.8
@@ -147,101 +147,101 @@ 
 		return isset( $frm_vars['prevent_caching'] ) && $frm_vars['prevent_caching'];
 	}
 
-    /**
-     * Check if on an admin page
-     *
-     * @since 2.0
-     *
-     * @param None
-     * @return boolean
-     */
-    public static function is_admin() {
-        return is_admin() && ( ! defined('DOING_AJAX') || ! DOING_AJAX );
-    }
-
-    /**
-     * Check if value contains blank value or empty array
-     *
-     * @since 2.0
-     * @param $value - value to check
-     * @return boolean
-     */
-    public static function is_empty_value( $value, $empty = '' ) {
-        return ( is_array( $value ) && empty( $value ) ) || $value == $empty;
-    }
-
-    public static function is_not_empty_value( $value, $empty = '' ) {
-        return ! self::is_empty_value( $value, $empty );
-    }
-
-    /**
-     * Get any value from the $_SERVER
-     *
-     * @since 2.0
-     * @param string $value
-     * @return string
-     */
+	/**
+	 * Check if on an admin page
+	 *
+	 * @since 2.0
+	 *
+	 * @param None
+	 * @return boolean
+	 */
+	public static function is_admin() {
+		return is_admin() && ( ! defined('DOING_AJAX') || ! DOING_AJAX );
+	}
+
+	/**
+	 * Check if value contains blank value or empty array
+	 *
+	 * @since 2.0
+	 * @param $value - value to check
+	 * @return boolean
+	 */
+	public static function is_empty_value( $value, $empty = '' ) {
+		return ( is_array( $value ) && empty( $value ) ) || $value == $empty;
+	}
+
+	public static function is_not_empty_value( $value, $empty = '' ) {
+		return ! self::is_empty_value( $value, $empty );
+	}
+
+	/**
+	 * Get any value from the $_SERVER
+	 *
+	 * @since 2.0
+	 * @param string $value
+	 * @return string
+	 */
 	public static function get_server_value( $value ) {
-        return isset( $_SERVER[ $value ] ) ? wp_strip_all_tags( $_SERVER[ $value ] ) : '';
-    }
-
-    /**
-     * Check for the IP address in several places
-     * Used by [ip] shortcode
-     *
-     * @return string The IP address of the current user
-     */
-    public static function get_ip_address() {
+		return isset( $_SERVER[ $value ] ) ? wp_strip_all_tags( $_SERVER[ $value ] ) : '';
+	}
+
+	/**
+	 * Check for the IP address in several places
+	 * Used by [ip] shortcode
+	 *
+	 * @return string The IP address of the current user
+	 */
+	public static function get_ip_address() {
 		$ip = '';
-        foreach ( array(
-            'HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED', 'HTTP_X_CLUSTER_CLIENT_IP',
-            'HTTP_FORWARDED_FOR', 'HTTP_FORWARDED', 'REMOTE_ADDR',
-        ) as $key ) {
-            if ( ! isset( $_SERVER[ $key ] ) ) {
-                continue;
-            }
-
-            foreach ( explode( ',', $_SERVER[ $key ] ) as $ip ) {
-                $ip = trim($ip); // just to be safe
-
-                if ( filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) !== false ) {
-                    return $ip;
-                }
-            }
-        }
+		foreach ( array(
+			'HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED', 'HTTP_X_CLUSTER_CLIENT_IP',
+			'HTTP_FORWARDED_FOR', 'HTTP_FORWARDED', 'REMOTE_ADDR',
+		) as $key ) {
+			if ( ! isset( $_SERVER[ $key ] ) ) {
+				continue;
+			}
+
+			foreach ( explode( ',', $_SERVER[ $key ] ) as $ip ) {
+				$ip = trim($ip); // just to be safe
+
+				if ( filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) !== false ) {
+					return $ip;
+				}
+			}
+		}
 
 		return sanitize_text_field( $ip );
-    }
+	}
 
-    public static function get_param( $param, $default = '', $src = 'get', $sanitize = '' ) {
-        if ( strpos($param, '[') ) {
-            $params = explode('[', $param);
-            $param = $params[0];
-        }
+	public static function get_param( $param, $default = '', $src = 'get', $sanitize = '' ) {
+		if ( strpos($param, '[') ) {
+			$params = explode('[', $param);
+			$param = $params[0];
+		}
 
 		if ( $src == 'get' ) {
-            $value = isset( $_POST[ $param ] ) ? stripslashes_deep( $_POST[ $param ] ) : ( isset( $_GET[ $param ] ) ? stripslashes_deep( $_GET[ $param ] ) : $default );
-            if ( ! isset( $_POST[ $param ] ) && isset( $_GET[ $param ] ) && ! is_array( $value ) ) {
-                $value = stripslashes_deep( htmlspecialchars_decode( urldecode( $_GET[ $param ] ) ) );
-            }
+			$value = isset( $_POST[ $param ] ) ? stripslashes_deep( $_POST[ $param ] ) : ( isset( $_GET[ $param ] ) ? stripslashes_deep( $_GET[ $param ] ) : $default );
+			if ( ! isset( $_POST[ $param ] ) && isset( $_GET[ $param ] ) && ! is_array( $value ) ) {
+				$value = stripslashes_deep( htmlspecialchars_decode( urldecode( $_GET[ $param ] ) ) );
+			}
 			self::sanitize_value( $sanitize, $value );
 		} else {
-            $value = self::get_simple_request( array( 'type' => $src, 'param' => $param, 'default' => $default, 'sanitize' => $sanitize ) );
-        }
+			$value = self::get_simple_request( array( 'type' => $src, 'param' => $param, 'default' => $default, 'sanitize' => $sanitize ) );
+		}
 
 		if ( isset( $params ) && is_array( $value ) && ! empty( $value ) ) {
-            foreach ( $params as $k => $p ) {
-                if ( ! $k || ! is_array($value) ) {
-                    continue;
-                }
+			foreach ( $params as $k => $p ) {
+				if ( ! $k || ! is_array($value) ) {
+					continue;
+				}
 
-                $p = trim($p, ']');
-                $value = isset( $value[ $p ] ) ? $value[ $p ] : $default;
-            }
-        }
+				$p = trim($p, ']');
+				$value = isset( $value[ $p ] ) ? $value[ $p ] : $default;
+			}
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 
 	/**
 	 *
@@ -262,7 +262,7 @@ 
 	 */
 	public static function simple_get( $param, $sanitize = 'sanitize_text_field', $default = '' ) {
 		return self::get_simple_request( array( 'type' => 'get', 'param' => $param, 'default' => $default, 'sanitize' => $sanitize ) );
-    }
+	}
 
 	/**
 	 * Get a GET/POST/REQUEST value and sanitize it
@@ -296,12 +296,12 @@ 
 	}
 
 	/**
-	* Preserve backslashes in a value, but make sure value doesn't get compounding slashes
-	*
-	* @since 2.0.8
-	* @param string $value
-	* @return string $value
-	*/
+	 * Preserve backslashes in a value, but make sure value doesn't get compounding slashes
+	 *
+	 * @since 2.0.8
+	 * @param string $value
+	 * @return string $value
+	 */
 	public static function preserve_backslashes( $value ) {
 		// If backslashes have already been added, don't add them again
 		if ( strpos( $value, '\\\\' ) === false ) {
@@ -320,14 +320,14 @@ 
 		}
 	}
 
-    public static function sanitize_request( $sanitize_method, &$values ) {
-        $temp_values = $values;
-        foreach ( $temp_values as $k => $val ) {
-            if ( isset( $sanitize_method[ $k ] ) ) {
+	public static function sanitize_request( $sanitize_method, &$values ) {
+		$temp_values = $values;
+		foreach ( $temp_values as $k => $val ) {
+			if ( isset( $sanitize_method[ $k ] ) ) {
 				$values[ $k ] = call_user_func( $sanitize_method[ $k ], $val );
-            }
-        }
-    }
+			}
+		}
+	}
 
 	public static function sanitize_array( &$values ) {
 		$temp_values = $values;
@@ -342,12 +342,12 @@ 
 	 */
 	public static function kses( $value, $allowed = array() ) {
 		$html = array(
-		    'a' => array(
+			'a' => array(
 				'href'  => array(),
 				'title' => array(),
 				'id'    => array(),
 				'class' => array(),
-		    ),
+			),
 		);
 
 		$allowed_html = array();
@@ -358,176 +358,176 @@ 
 		return wp_kses( $value, $allowed_html );
 	}
 
-    /**
-     * Used when switching the action for a bulk action
-     * @since 2.0
-     */
-    public static function remove_get_action() {
-        if ( ! isset($_GET) ) {
-            return;
-        }
+	/**
+	 * Used when switching the action for a bulk action
+	 * @since 2.0
+	 */
+	public static function remove_get_action() {
+		if ( ! isset($_GET) ) {
+			return;
+		}
 
-        $new_action = isset( $_GET['action'] ) ? sanitize_text_field( $_GET['action'] ) : ( isset( $_GET['action2'] ) ? sanitize_text_field( $_GET['action2'] ) : '' );
-        if ( ! empty( $new_action ) ) {
+		$new_action = isset( $_GET['action'] ) ? sanitize_text_field( $_GET['action'] ) : ( isset( $_GET['action2'] ) ? sanitize_text_field( $_GET['action2'] ) : '' );
+		if ( ! empty( $new_action ) ) {
 			$_SERVER['REQUEST_URI'] = str_replace( '&action=' . $new_action, '', FrmAppHelper::get_server_value( 'REQUEST_URI' ) );
-        }
-    }
-
-    /**
-     * Check the WP query for a parameter
-     *
-     * @since 2.0
-     * @return string|array
-     */
-    public static function get_query_var( $value, $param ) {
-        if ( $value != '' ) {
-            return $value;
-        }
-
-        global $wp_query;
-        if ( isset( $wp_query->query_vars[ $param ] ) ) {
-            $value = $wp_query->query_vars[ $param ];
-        }
-
-        return $value;
-    }
-
-    /**
-     * @param string $type
-     */
-    public static function trigger_hook_load( $type, $object = null ) {
-        // only load the form hooks once
-        $hooks_loaded = apply_filters('frm_'. $type .'_hooks_loaded', false, $object);
-        if ( ! $hooks_loaded ) {
-            do_action('frm_load_'. $type .'_hooks');
-        }
-    }
-
-    /**
-     * Check cache before fetching values and saving to cache
-     *
-     * @since 2.0
-     *
-     * @param string $cache_key The unique name for this cache
-     * @param string $group The name of the cache group
-     * @param string $query If blank, don't run a db call
-     * @param string $type The wpdb function to use with this query
-     * @return mixed $results The cache or query results
-     */
-    public static function check_cache( $cache_key, $group = '', $query = '', $type = 'get_var', $time = 300 ) {
-        $results = wp_cache_get($cache_key, $group);
-        if ( ! self::is_empty_value( $results, false ) || empty($query) ) {
-            return $results;
-        }
-
-        if ( 'get_posts' == $type ) {
-            $results = get_posts($query);
-        } else {
-            global $wpdb;
-            $results = $wpdb->{$type}($query);
-        }
+		}
+	}
+
+	/**
+	 * Check the WP query for a parameter
+	 *
+	 * @since 2.0
+	 * @return string|array
+	 */
+	public static function get_query_var( $value, $param ) {
+		if ( $value != '' ) {
+			return $value;
+		}
+
+		global $wp_query;
+		if ( isset( $wp_query->query_vars[ $param ] ) ) {
+			$value = $wp_query->query_vars[ $param ];
+		}
+
+		return $value;
+	}
+
+	/**
+	 * @param string $type
+	 */
+	public static function trigger_hook_load( $type, $object = null ) {
+		// only load the form hooks once
+		$hooks_loaded = apply_filters('frm_'. $type .'_hooks_loaded', false, $object);
+		if ( ! $hooks_loaded ) {
+			do_action('frm_load_'. $type .'_hooks');
+		}
+	}
+
+	/**
+	 * Check cache before fetching values and saving to cache
+	 *
+	 * @since 2.0
+	 *
+	 * @param string $cache_key The unique name for this cache
+	 * @param string $group The name of the cache group
+	 * @param string $query If blank, don't run a db call
+	 * @param string $type The wpdb function to use with this query
+	 * @return mixed $results The cache or query results
+	 */
+	public static function check_cache( $cache_key, $group = '', $query = '', $type = 'get_var', $time = 300 ) {
+		$results = wp_cache_get($cache_key, $group);
+		if ( ! self::is_empty_value( $results, false ) || empty($query) ) {
+			return $results;
+		}
+
+		if ( 'get_posts' == $type ) {
+			$results = get_posts($query);
+		} else {
+			global $wpdb;
+			$results = $wpdb->{$type}($query);
+		}
 
 		if ( ! self::prevent_caching() ) {
 			wp_cache_set( $cache_key, $results, $group, $time );
 		}
 
-        return $results;
-    }
+		return $results;
+	}
 
-    /**
-     * Data that should be stored for a long time can be stored in a transient.
-     * First check the cache, then check the transient
-     * @since 2.0
-     * @return mixed The cached value or false
-     */
+	/**
+	 * Data that should be stored for a long time can be stored in a transient.
+	 * First check the cache, then check the transient
+	 * @since 2.0
+	 * @return mixed The cached value or false
+	 */
 	public static function check_cache_and_transient( $cache_key ) {
-        // check caching layer first
-        $results = self::check_cache( $cache_key );
-        if ( $results ) {
-            return $results;
-        }
-
-        // then check the transient
-        $results = get_transient($cache_key);
-        if ( $results ) {
-            wp_cache_set($cache_key, $results);
-        }
-
-        return $results;
-    }
-
-    /**
-     * @since 2.0
-     * @param string $cache_key
-     */
+		// check caching layer first
+		$results = self::check_cache( $cache_key );
+		if ( $results ) {
+			return $results;
+		}
+
+		// then check the transient
+		$results = get_transient($cache_key);
+		if ( $results ) {
+			wp_cache_set($cache_key, $results);
+		}
+
+		return $results;
+	}
+
+	/**
+	 * @since 2.0
+	 * @param string $cache_key
+	 */
 	public static function delete_cache_and_transient( $cache_key ) {
-        delete_transient($cache_key);
-        wp_cache_delete($cache_key);
-    }
-
-    /**
-     * Delete all caching in a single group
-     *
-     * @since 2.0
-     *
-     * @param string $group The name of the cache group
-     * @return boolean True or False
-     */
+		delete_transient($cache_key);
+		wp_cache_delete($cache_key);
+	}
+
+	/**
+	 * Delete all caching in a single group
+	 *
+	 * @since 2.0
+	 *
+	 * @param string $group The name of the cache group
+	 * @return boolean True or False
+	 */
 	public static function cache_delete_group( $group ) {
-    	global $wp_object_cache;
-
-        if ( isset( $wp_object_cache->cache[ $group ] ) ) {
-            foreach ( $wp_object_cache->cache[ $group ] as $k => $v ) {
-                wp_cache_delete($k, $group);
-            }
-            return true;
-        }
-
-    	return false;
-    }
-
-    /**
-     * Check a value from a shortcode to see if true or false.
-     * True when value is 1, true, 'true', 'yes'
-     *
-     * @since 1.07.10
-     *
-     * @param string $value The value to compare
-     * @return boolean True or False
-     */
+		global $wp_object_cache;
+
+		if ( isset( $wp_object_cache->cache[ $group ] ) ) {
+			foreach ( $wp_object_cache->cache[ $group ] as $k => $v ) {
+				wp_cache_delete($k, $group);
+			}
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Check a value from a shortcode to see if true or false.
+	 * True when value is 1, true, 'true', 'yes'
+	 *
+	 * @since 1.07.10
+	 *
+	 * @param string $value The value to compare
+	 * @return boolean True or False
+	 */
 	public static function is_true( $value ) {
-        return ( true === $value || 1 == $value || 'true' == $value || 'yes' == $value );
-    }
+		return ( true === $value || 1 == $value || 'true' == $value || 'yes' == $value );
+	}
 
-    /**
-     * Used to filter shortcode in text widgets
-     */
-    public static function widget_text_filter_callback( $matches ) {
-        return do_shortcode( $matches[0] );
-    }
+	/**
+	 * Used to filter shortcode in text widgets
+	 */
+	public static function widget_text_filter_callback( $matches ) {
+		return do_shortcode( $matches[0] );
+	}
 
 	public static function load_scripts( $scripts ) {
-        _deprecated_function( __FUNCTION__, '2.0', 'wp_enqueue_script' );
-        foreach ( (array) $scripts as $s ) {
-            wp_enqueue_script($s);
-        }
-    }
+		_deprecated_function( __FUNCTION__, '2.0', 'wp_enqueue_script' );
+		foreach ( (array) $scripts as $s ) {
+			wp_enqueue_script($s);
+		}
+	}
 
 	public static function load_styles( $styles ) {
-        _deprecated_function( __FUNCTION__, '2.0', 'wp_enqueue_style' );
-        foreach ( (array) $styles as $s ) {
-            wp_enqueue_style($s);
-        }
-    }
+		_deprecated_function( __FUNCTION__, '2.0', 'wp_enqueue_style' );
+		foreach ( (array) $styles as $s ) {
+			wp_enqueue_style($s);
+		}
+	}
 
-    public static function get_pages() {
+	public static function get_pages() {
 		return get_posts( array( 'post_type' => 'page', 'post_status' => array( 'publish', 'private' ), 'numberposts' => -1, 'orderby' => 'title', 'order' => 'ASC' ) );
-    }
+	}
 
-    public static function wp_pages_dropdown( $field_name, $page_id, $truncate = false ) {
-        $pages = self::get_pages();
+	public static function wp_pages_dropdown( $field_name, $page_id, $truncate = false ) {
+		$pages = self::get_pages();
 		$selected = self::get_post_param( $field_name, $page_id, 'absint' );
-    ?>
+	?>
         <select name="<?php echo esc_attr($field_name); ?>" id="<?php echo esc_attr($field_name); ?>" class="frm-pages-dropdown">
             <option value=""> </option>
             <?php foreach ( $pages as $page ) { ?>
@@ -537,107 +537,107 @@ 
             <?php } ?>
         </select>
     <?php
-    }
+	}
 
 	public static function post_edit_link( $post_id ) {
-        $post = get_post($post_id);
-        if ( $post ) {
-            return '<a href="'. esc_url(admin_url('post.php') .'?post='. $post_id .'&action=edit') .'">'. self::truncate($post->post_title, 50) .'</a>';
-        }
-        return '';
-    }
+		$post = get_post($post_id);
+		if ( $post ) {
+			return '<a href="'. esc_url(admin_url('post.php') .'?post='. $post_id .'&action=edit') .'">'. self::truncate($post->post_title, 50) .'</a>';
+		}
+		return '';
+	}
 
 	public static function wp_roles_dropdown( $field_name, $capability, $multiple = 'single' ) {
-    ?>
+	?>
         <select name="<?php echo esc_attr($field_name); ?>" id="<?php echo esc_attr($field_name); ?>" <?php
-            echo ( 'multiple' == $multiple ) ? 'multiple="multiple"' : '';
-            ?> class="frm_multiselect">
+			echo ( 'multiple' == $multiple ) ? 'multiple="multiple"' : '';
+			?> class="frm_multiselect">
             <?php self::roles_options($capability); ?>
         </select>
     <?php
-    }
+	}
 
 	public static function roles_options( $capability ) {
-        global $frm_vars;
-        if ( isset($frm_vars['editable_roles']) ) {
-            $editable_roles = $frm_vars['editable_roles'];
-        } else {
-            $editable_roles = get_editable_roles();
-            $frm_vars['editable_roles'] = $editable_roles;
-        }
-
-        foreach ( $editable_roles as $role => $details ) {
-            $name = translate_user_role($details['name'] ); ?>
+		global $frm_vars;
+		if ( isset($frm_vars['editable_roles']) ) {
+			$editable_roles = $frm_vars['editable_roles'];
+		} else {
+			$editable_roles = get_editable_roles();
+			$frm_vars['editable_roles'] = $editable_roles;
+		}
+
+		foreach ( $editable_roles as $role => $details ) {
+			$name = translate_user_role($details['name'] ); ?>
         <option value="<?php echo esc_attr($role) ?>" <?php echo in_array($role, (array) $capability) ? ' selected="selected"' : ''; ?>><?php echo esc_attr($name) ?> </option>
 <?php
-            unset($role, $details);
-        }
-    }
+			unset($role, $details);
+		}
+	}
 
 	public static function frm_capabilities( $type = 'auto' ) {
-        $cap = array(
-            'frm_view_forms'        => __( 'View Forms and Templates', 'formidable' ),
-            'frm_edit_forms'        => __( 'Add/Edit Forms and Templates', 'formidable' ),
-            'frm_delete_forms'      => __( 'Delete Forms and Templates', 'formidable' ),
-            'frm_change_settings'   => __( 'Access this Settings Page', 'formidable' ),
-            'frm_view_entries'      => __( 'View Entries from Admin Area', 'formidable' ),
-            'frm_delete_entries'    => __( 'Delete Entries from Admin Area', 'formidable' ),
-        );
+		$cap = array(
+			'frm_view_forms'        => __( 'View Forms and Templates', 'formidable' ),
+			'frm_edit_forms'        => __( 'Add/Edit Forms and Templates', 'formidable' ),
+			'frm_delete_forms'      => __( 'Delete Forms and Templates', 'formidable' ),
+			'frm_change_settings'   => __( 'Access this Settings Page', 'formidable' ),
+			'frm_view_entries'      => __( 'View Entries from Admin Area', 'formidable' ),
+			'frm_delete_entries'    => __( 'Delete Entries from Admin Area', 'formidable' ),
+		);
 
 		if ( ! self::pro_is_installed() && 'pro' != $type ) {
-            return $cap;
-        }
+			return $cap;
+		}
 
-        $cap['frm_create_entries'] = __( 'Add Entries from Admin Area', 'formidable' );
-        $cap['frm_edit_entries'] = __( 'Edit Entries from Admin Area', 'formidable' );
-        $cap['frm_view_reports'] = __( 'View Reports', 'formidable' );
-        $cap['frm_edit_displays'] = __( 'Add/Edit Views', 'formidable' );
+		$cap['frm_create_entries'] = __( 'Add Entries from Admin Area', 'formidable' );
+		$cap['frm_edit_entries'] = __( 'Edit Entries from Admin Area', 'formidable' );
+		$cap['frm_view_reports'] = __( 'View Reports', 'formidable' );
+		$cap['frm_edit_displays'] = __( 'Add/Edit Views', 'formidable' );
 
-        return $cap;
-    }
+		return $cap;
+	}
 
 	public static function user_has_permission( $needed_role ) {
-        if ( $needed_role == '-1' ) {
-            return false;
+		if ( $needed_role == '-1' ) {
+			return false;
 		}
 
-        // $needed_role will be equal to blank if "Logged-in users" is selected
-        if ( ( $needed_role == '' && is_user_logged_in() ) || current_user_can( $needed_role ) ) {
-            return true;
-        }
+		// $needed_role will be equal to blank if "Logged-in users" is selected
+		if ( ( $needed_role == '' && is_user_logged_in() ) || current_user_can( $needed_role ) ) {
+			return true;
+		}
 
-        $roles = array( 'administrator', 'editor', 'author', 'contributor', 'subscriber' );
-        foreach ( $roles as $role ) {
+		$roles = array( 'administrator', 'editor', 'author', 'contributor', 'subscriber' );
+		foreach ( $roles as $role ) {
 			if ( current_user_can( $role ) ) {
-        		return true;
+				return true;
 			}
-        	if ( $role == $needed_role ) {
-        		break;
+			if ( $role == $needed_role ) {
+				break;
 			}
-        }
-        return false;
-    }
-
-    /**
-     * Make sure administrators can see Formidable menu
-     *
-     * @since 2.0
-     */
-    public static function maybe_add_permissions() {
+		}
+		return false;
+	}
+
+	/**
+	 * Make sure administrators can see Formidable menu
+	 *
+	 * @since 2.0
+	 */
+	public static function maybe_add_permissions() {
 		self::force_capability( 'frm_view_entries' );
 
-        if ( ! current_user_can('administrator') || current_user_can('frm_view_forms') ) {
-            return;
-        }
+		if ( ! current_user_can('administrator') || current_user_can('frm_view_forms') ) {
+			return;
+		}
 
 		$user_id = get_current_user_id();
 		$user = new WP_User( $user_id );
-        $frm_roles = self::frm_capabilities();
-        foreach ( $frm_roles as $frm_role => $frm_role_description ) {
+		$frm_roles = self::frm_capabilities();
+		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
 			$user->add_cap( $frm_role );
-            unset($frm_role, $frm_role_description);
-        }
-    }
+			unset($frm_role, $frm_role_description);
+		}
+	}
 
 	/**
 	 * Make sure admins have permission to see the menu items
@@ -653,28 +653,28 @@ 
 		}
 	}
 
-    /**
-     * Check if the user has permision for action.
-     * Return permission message and stop the action if no permission
-     * @since 2.0
-     * @param string $permission
-     */
+	/**
+	 * Check if the user has permision for action.
+	 * Return permission message and stop the action if no permission
+	 * @since 2.0
+	 * @param string $permission
+	 */
 	public static function permission_check( $permission, $show_message = 'show' ) {
-        $permission_error = self::permission_nonce_error($permission);
-        if ( $permission_error !== false ) {
-            if ( 'hide' == $show_message ) {
-                $permission_error = '';
-            }
-            wp_die($permission_error);
-        }
-    }
-
-    /**
-     * Check user permission and nonce
-     * @since 2.0
-     * @param string $permission
-     * @return false|string The permission message or false if allowed
-     */
+		$permission_error = self::permission_nonce_error($permission);
+		if ( $permission_error !== false ) {
+			if ( 'hide' == $show_message ) {
+				$permission_error = '';
+			}
+			wp_die($permission_error);
+		}
+	}
+
+	/**
+	 * Check user permission and nonce
+	 * @since 2.0
+	 * @param string $permission
+	 * @return false|string The permission message or false if allowed
+	 */
 	public static function permission_nonce_error( $permission, $nonce_name = '', $nonce = '' ) {
 		if ( ! empty( $permission ) && ! current_user_can( $permission ) && ! current_user_can( 'administrator' ) ) {
 			$frm_settings = self::get_settings();
@@ -682,75 +682,75 @@ 
 		}
 
 		$error = false;
-        if ( empty($nonce_name) ) {
-            return $error;
-        }
+		if ( empty($nonce_name) ) {
+			return $error;
+		}
 
-        if ( $_REQUEST && ( ! isset( $_REQUEST[ $nonce_name ] ) || ! wp_verify_nonce( $_REQUEST[ $nonce_name ], $nonce ) ) ) {
-            $frm_settings = self::get_settings();
-            $error = $frm_settings->admin_permission;
-        }
+		if ( $_REQUEST && ( ! isset( $_REQUEST[ $nonce_name ] ) || ! wp_verify_nonce( $_REQUEST[ $nonce_name ], $nonce ) ) ) {
+			$frm_settings = self::get_settings();
+			$error = $frm_settings->admin_permission;
+		}
 
-        return $error;
-    }
+		return $error;
+	}
 
-    public static function checked( $values, $current ) {
+	public static function checked( $values, $current ) {
 		if ( self::check_selected( $values, $current ) ) {
-            echo ' checked="checked"';
+			echo ' checked="checked"';
 		}
-    }
+	}
 
 	public static function check_selected( $values, $current ) {
-        $values = self::recursive_function_map( $values, 'trim' );
-        $current = trim($current);
-
-        return ( is_array($values) && in_array($current, $values) ) || ( ! is_array($values) && $values == $current );
-    }
-
-    /**
-    * Check if current field option is an "other" option
-    *
-    * @since 2.0
-    *
-    * @param string $opt_key
-    * @return boolean Returns true if current field option is an "Other" option
-    */
-    public static function is_other_opt( $opt_key ) {
-        _deprecated_function( __FUNCTION__, '2.0.6', 'FrmFieldsHelper::is_other_opt' );
-        return FrmFieldsHelper::is_other_opt( $opt_key );
-    }
-
-    /**
-    * Get value that belongs in "Other" text box
-    *
-    * @since 2.0
-    *
-    * @param string $opt_key
-    * @param array $field
-    * @return string $other_val
-    */
-    public static function get_other_val( $opt_key, $field, $parent = false, $pointer = false ) {
+		$values = self::recursive_function_map( $values, 'trim' );
+		$current = trim($current);
+
+		return ( is_array($values) && in_array($current, $values) ) || ( ! is_array($values) && $values == $current );
+	}
+
+	/**
+	 * Check if current field option is an "other" option
+	 *
+	 * @since 2.0
+	 *
+	 * @param string $opt_key
+	 * @return boolean Returns true if current field option is an "Other" option
+	 */
+	public static function is_other_opt( $opt_key ) {
+		_deprecated_function( __FUNCTION__, '2.0.6', 'FrmFieldsHelper::is_other_opt' );
+		return FrmFieldsHelper::is_other_opt( $opt_key );
+	}
+
+	/**
+	 * Get value that belongs in "Other" text box
+	 *
+	 * @since 2.0
+	 *
+	 * @param string $opt_key
+	 * @param array $field
+	 * @return string $other_val
+	 */
+	public static function get_other_val( $opt_key, $field, $parent = false, $pointer = false ) {
 		_deprecated_function( __FUNCTION__, '2.0.6', 'FrmFieldsHelper::get_other_val' );
 		return FrmFieldsHelper::get_other_val( compact( 'opt_key', 'field', 'parent', 'pointer' ) );
-    }
-
-    /**
-    * Check if there is a saved value for the "Other" text field. If so, set it as the $other_val.
-    * Intended for front-end use
-    *
-    * @since 2.0
-    *
-    * @param array $field
-    * @param boolean $other_opt
-    * @param string $checked
-    * @param array $args should include opt_key and field name
-    * @return string $other_val
-    */
-    public static function prepare_other_input( $field, &$other_opt, &$checked, $args = array() ) {
+	}
+
+	/**
+	 * Check if there is a saved value for the "Other" text field. If so, set it as the $other_val.
+	 * Intended for front-end use
+	 *
+	 * @since 2.0
+	 *
+	 * @param array $field
+	 * @param boolean $other_opt
+	 * @param string $checked
+	 * @param array $args should include opt_key and field name
+	 * @return string $other_val
+	 */
+	public static function prepare_other_input( $field, &$other_opt, &$checked, $args = array() ) {
 		_deprecated_function( __FUNCTION__, '2.0.6', 'FrmFieldsHelper::prepare_other_input' );
 		$args['field'] = $field;
 		return FrmFieldsHelper::prepare_other_input( $args, $other_opt, $checked );
-    }
+	}
 
 	public static function recursive_function_map( $value, $function ) {
 		if ( is_array( $value ) ) {
@@ -780,334 +780,334 @@ 
 		return (bool) count( array_filter( array_keys( $array ), 'is_string' ) );
 	}
 
-    /**
-     * Flatten a multi-dimensional array
-     */
+	/**
+	 * Flatten a multi-dimensional array
+	 */
 	public static function array_flatten( $array, $keys = 'keep' ) {
-        $return = array();
-        foreach ( $array as $key => $value ) {
-            if ( is_array($value) ) {
+		$return = array();
+		foreach ( $array as $key => $value ) {
+			if ( is_array($value) ) {
 				$return = array_merge( $return, self::array_flatten( $value, $keys ) );
-            } else {
+			} else {
 				if ( $keys == 'keep' ) {
 					$return[ $key ] = $value;
 				} else {
 					$return[] = $value;
 				}
-            }
-        }
-        return $return;
-    }
-
-    public static function esc_textarea( $text ) {
-        $safe_text = str_replace('&quot;', '"', $text);
-        $safe_text = htmlspecialchars( $safe_text, ENT_NOQUOTES );
-    	return apply_filters( 'esc_textarea', $safe_text, $text );
-    }
-
-    /**
-     * Add auto paragraphs to text areas
-     * @since 2.0
-     */
+			}
+		}
+		return $return;
+	}
+
+	public static function esc_textarea( $text ) {
+		$safe_text = str_replace('&quot;', '"', $text);
+		$safe_text = htmlspecialchars( $safe_text, ENT_NOQUOTES );
+		return apply_filters( 'esc_textarea', $safe_text, $text );
+	}
+
+	/**
+	 * Add auto paragraphs to text areas
+	 * @since 2.0
+	 */
 	public static function use_wpautop( $content ) {
-        if ( apply_filters('frm_use_wpautop', true) ) {
-            $content = wpautop(str_replace( '<br>', '<br />', $content));
-        }
-        return $content;
-    }
+		if ( apply_filters('frm_use_wpautop', true) ) {
+			$content = wpautop(str_replace( '<br>', '<br />', $content));
+		}
+		return $content;
+	}
 
 	public static function replace_quotes( $val ) {
-        //Replace double quotes
+		//Replace double quotes
 		$val = str_replace( array( '&#8220;', '&#8221;', '&#8243;' ), '"', $val );
-        //Replace single quotes
-        $val = str_replace( array( '&#8216;', '&#8217;', '&#8242;', '&prime;', '&rsquo;', '&lsquo;' ), "'", $val );
-        return $val;
-    }
-
-    /**
-     * @since 2.0
-     * @return string The base Google APIS url for the current version of jQuery UI
-     */
-    public static function jquery_ui_base_url() {
-        $url = 'http'. ( is_ssl() ? 's' : '' ) .'://ajax.googleapis.com/ajax/libs/jqueryui/'. self::script_version('jquery-ui-core');
-        $url = apply_filters('frm_jquery_ui_base_url', $url);
-        return $url;
-    }
-
-    /**
-     * @param string $handle
-     */
+		//Replace single quotes
+		$val = str_replace( array( '&#8216;', '&#8217;', '&#8242;', '&prime;', '&rsquo;', '&lsquo;' ), "'", $val );
+		return $val;
+	}
+
+	/**
+	 * @since 2.0
+	 * @return string The base Google APIS url for the current version of jQuery UI
+	 */
+	public static function jquery_ui_base_url() {
+		$url = 'http'. ( is_ssl() ? 's' : '' ) .'://ajax.googleapis.com/ajax/libs/jqueryui/'. self::script_version('jquery-ui-core');
+		$url = apply_filters('frm_jquery_ui_base_url', $url);
+		return $url;
+	}
+
+	/**
+	 * @param string $handle
+	 */
 	public static function script_version( $handle ) {
-        global $wp_scripts;
-    	if ( ! $wp_scripts ) {
-    	    return false;
-    	}
+		global $wp_scripts;
+		if ( ! $wp_scripts ) {
+			return false;
+		}
 
-        $ver = 0;
+		$ver = 0;
 
-        if ( ! isset( $wp_scripts->registered[ $handle ] ) ) {
-            return $ver;
-        }
+		if ( ! isset( $wp_scripts->registered[ $handle ] ) ) {
+			return $ver;
+		}
 
-        $query = $wp_scripts->registered[ $handle ];
-    	if ( is_object( $query ) ) {
-    	    $ver = $query->ver;
-    	}
+		$query = $wp_scripts->registered[ $handle ];
+		if ( is_object( $query ) ) {
+			$ver = $query->ver;
+		}
 
-    	return $ver;
-    }
+		return $ver;
+	}
 
 	public static function js_redirect( $url ) {
 		return '<script type="text/javascript">window.location="' . esc_url_raw( $url ) . '"</script>';
-    }
+	}
 
 	public static function get_user_id_param( $user_id ) {
-        if ( ! $user_id || empty($user_id) || is_numeric($user_id) ) {
-            return $user_id;
-        }
+		if ( ! $user_id || empty($user_id) || is_numeric($user_id) ) {
+			return $user_id;
+		}
 
 		if ( $user_id == 'current' ) {
-            $user_ID = get_current_user_id();
-            $user_id = $user_ID;
+			$user_ID = get_current_user_id();
+			$user_id = $user_ID;
 		} else {
-            if ( is_email($user_id) ) {
-                $user = get_user_by('email', $user_id);
-            } else {
-                $user = get_user_by('login', $user_id);
-            }
+			if ( is_email($user_id) ) {
+				$user = get_user_by('email', $user_id);
+			} else {
+				$user = get_user_by('login', $user_id);
+			}
 
-            if ( $user ) {
-                $user_id = $user->ID;
-            }
-            unset($user);
-        }
+			if ( $user ) {
+				$user_id = $user->ID;
+			}
+			unset($user);
+		}
 
-        return $user_id;
-    }
+		return $user_id;
+	}
 
 	public static function get_file_contents( $filename, $atts = array() ) {
-        if ( ! is_file($filename) ) {
-            return false;
-        }
-
-        extract($atts);
-        ob_start();
-        include($filename);
-        $contents = ob_get_contents();
-        ob_end_clean();
-        return $contents;
-    }
-
-    /**
-     * @param string $table_name
-     * @param string $column
-     */
-    public static function get_unique_key( $name = '', $table_name, $column, $id = 0, $num_chars = 6 ) {
-        global $wpdb;
-
-        $key = '';
-
-        if ( ! empty( $name ) ) {
-            $key = sanitize_key($name);
-        }
+		if ( ! is_file($filename) ) {
+			return false;
+		}
+
+		extract($atts);
+		ob_start();
+		include($filename);
+		$contents = ob_get_contents();
+		ob_end_clean();
+		return $contents;
+	}
+
+	/**
+	 * @param string $table_name
+	 * @param string $column
+	 */
+	public static function get_unique_key( $name = '', $table_name, $column, $id = 0, $num_chars = 6 ) {
+		global $wpdb;
+
+		$key = '';
+
+		if ( ! empty( $name ) ) {
+			$key = sanitize_key($name);
+		}
 
 		if ( empty( $key ) ) {
-            $max_slug_value = pow(36, $num_chars);
-            $min_slug_value = 37; // we want to have at least 2 characters in the slug
-            $key = base_convert( rand($min_slug_value, $max_slug_value), 10, 36 );
-        }
+			$max_slug_value = pow(36, $num_chars);
+			$min_slug_value = 37; // we want to have at least 2 characters in the slug
+			$key = base_convert( rand($min_slug_value, $max_slug_value), 10, 36 );
+		}
 
 		if ( is_numeric($key) || in_array( $key, array( 'id', 'key', 'created-at', 'detaillink', 'editlink', 'siteurl', 'evenodd' ) ) ) {
-            $key = $key .'a';
-        }
+			$key = $key .'a';
+		}
 
 		$key_check = FrmDb::get_var( $table_name, array( $column => $key, 'ID !' => $id ), $column );
 
-        if ( $key_check || is_numeric($key_check) ) {
-            $suffix = 2;
+		if ( $key_check || is_numeric($key_check) ) {
+			$suffix = 2;
 			do {
 				$alt_post_name = substr( $key, 0, 200 - ( strlen( $suffix ) + 1 ) ) . $suffix;
 				$key_check = FrmDb::get_var( $table_name, array( $column => $alt_post_name, 'ID !' => $id ), $column );
 				$suffix++;
 			} while ($key_check || is_numeric($key_check));
 			$key = $alt_post_name;
-        }
-        return $key;
-    }
-
-    /**
-     * Editing a Form or Entry
-     * @param string $table
-     * @return bool|array
-     */
-    public static function setup_edit_vars( $record, $table, $fields = '', $default = false, $post_values = array(), $args = array() ) {
-        if ( ! $record ) {
-            return false;
-        }
-
-        global $frm_vars;
-
-        if ( empty($post_values) ) {
-            $post_values = stripslashes_deep($_POST);
-        }
+		}
+		return $key;
+	}
+
+	/**
+	 * Editing a Form or Entry
+	 * @param string $table
+	 * @return bool|array
+	 */
+	public static function setup_edit_vars( $record, $table, $fields = '', $default = false, $post_values = array(), $args = array() ) {
+		if ( ! $record ) {
+			return false;
+		}
+
+		global $frm_vars;
+
+		if ( empty($post_values) ) {
+			$post_values = stripslashes_deep($_POST);
+		}
 
 		$values = array( 'id' => $record->id, 'fields' => array() );
 
 		foreach ( array( 'name', 'description' ) as $var ) {
-            $default_val = isset($record->{$var}) ? $record->{$var} : '';
-            $values[ $var ] = self::get_param( $var, $default_val );
-            unset($var, $default_val);
-        }
-
-        $values['description'] = self::use_wpautop($values['description']);
-        $frm_settings = self::get_settings();
-        $is_form_builder = self::is_admin_page('formidable' );
-
-        foreach ( (array) $fields as $field ) {
-            // Make sure to filter default values (for placeholder text), but not on the form builder page
-            if ( ! $is_form_builder ) {
-                $field->default_value = apply_filters('frm_get_default_value', $field->default_value, $field, true );
-            }
+			$default_val = isset($record->{$var}) ? $record->{$var} : '';
+			$values[ $var ] = self::get_param( $var, $default_val );
+			unset($var, $default_val);
+		}
+
+		$values['description'] = self::use_wpautop($values['description']);
+		$frm_settings = self::get_settings();
+		$is_form_builder = self::is_admin_page('formidable' );
+
+		foreach ( (array) $fields as $field ) {
+			// Make sure to filter default values (for placeholder text), but not on the form builder page
+			if ( ! $is_form_builder ) {
+				$field->default_value = apply_filters('frm_get_default_value', $field->default_value, $field, true );
+			}
 			$parent_form_id = isset( $args['parent_form_id'] ) ? $args['parent_form_id'] : $field->form_id;
 			self::fill_field_defaults($field, $record, $values, compact('default', 'post_values', 'frm_settings', 'parent_form_id' ) );
-        }
+		}
 
-        self::fill_form_opts($record, $table, $post_values, $values);
+		self::fill_form_opts($record, $table, $post_values, $values);
 
-        if ( $table == 'entries' ) {
-            $values = FrmEntriesHelper::setup_edit_vars( $values, $record );
-        } else if ( $table == 'forms' ) {
-            $values = FrmFormsHelper::setup_edit_vars( $values, $record, $post_values );
-        }
+		if ( $table == 'entries' ) {
+			$values = FrmEntriesHelper::setup_edit_vars( $values, $record );
+		} else if ( $table == 'forms' ) {
+			$values = FrmFormsHelper::setup_edit_vars( $values, $record, $post_values );
+		}
 
-        return $values;
-    }
+		return $values;
+	}
 
 	private static function fill_field_defaults( $field, $record, array &$values, $args ) {
-        $post_values = $args['post_values'];
-
-        if ( $args['default'] ) {
-            $meta_value = $field->default_value;
-        } else {
-            if ( $record->post_id && self::pro_is_installed() && isset($field->field_options['post_field']) && $field->field_options['post_field'] ) {
-                if ( ! isset($field->field_options['custom_field']) ) {
-                    $field->field_options['custom_field'] = '';
-                }
+		$post_values = $args['post_values'];
+
+		if ( $args['default'] ) {
+			$meta_value = $field->default_value;
+		} else {
+			if ( $record->post_id && self::pro_is_installed() && isset($field->field_options['post_field']) && $field->field_options['post_field'] ) {
+				if ( ! isset($field->field_options['custom_field']) ) {
+					$field->field_options['custom_field'] = '';
+				}
 				$meta_value = FrmProEntryMetaHelper::get_post_value( $record->post_id, $field->field_options['post_field'], $field->field_options['custom_field'], array( 'truncate' => false, 'type' => $field->type, 'form_id' => $field->form_id, 'field' => $field ) );
-            } else {
+			} else {
 				$meta_value = FrmEntryMeta::get_meta_value( $record, $field->id );
-            }
-        }
-
-        $field_type = isset( $post_values['field_options'][ 'type_'. $field->id ] ) ? $post_values['field_options'][ 'type_'. $field->id ] : $field->type;
-        $new_value = isset( $post_values['item_meta'][ $field->id ] ) ? maybe_unserialize( $post_values['item_meta'][ $field->id ] ) : $meta_value;
-
-        $field_array = array(
-            'id'            => $field->id,
-            'value'         => $new_value,
-            'default_value' => $field->default_value,
-            'name'          => $field->name,
-            'description'   => $field->description,
-            'type'          => apply_filters('frm_field_type', $field_type, $field, $new_value),
-            'options'       => $field->options,
-            'required'      => $field->required,
-            'field_key'     => $field->field_key,
-            'field_order'   => $field->field_order,
-            'form_id'       => $field->form_id,
+			}
+		}
+
+		$field_type = isset( $post_values['field_options'][ 'type_'. $field->id ] ) ? $post_values['field_options'][ 'type_'. $field->id ] : $field->type;
+		$new_value = isset( $post_values['item_meta'][ $field->id ] ) ? maybe_unserialize( $post_values['item_meta'][ $field->id ] ) : $meta_value;
+
+		$field_array = array(
+			'id'            => $field->id,
+			'value'         => $new_value,
+			'default_value' => $field->default_value,
+			'name'          => $field->name,
+			'description'   => $field->description,
+			'type'          => apply_filters('frm_field_type', $field_type, $field, $new_value),
+			'options'       => $field->options,
+			'required'      => $field->required,
+			'field_key'     => $field->field_key,
+			'field_order'   => $field->field_order,
+			'form_id'       => $field->form_id,
 			'parent_form_id' => $args['parent_form_id'],
-        );
+		);
 
-        $args['field_type'] = $field_type;
-        self::fill_field_opts($field, $field_array, $args);
+		$args['field_type'] = $field_type;
+		self::fill_field_opts($field, $field_array, $args);
 
-        $field_array = apply_filters('frm_setup_edit_fields_vars', $field_array, $field, $values['id']);
+		$field_array = apply_filters('frm_setup_edit_fields_vars', $field_array, $field, $values['id']);
 
-        if ( ! isset($field_array['unique']) || ! $field_array['unique'] ) {
-            $field_array['unique_msg'] = '';
-        }
+		if ( ! isset($field_array['unique']) || ! $field_array['unique'] ) {
+			$field_array['unique_msg'] = '';
+		}
 
-        $field_array = array_merge( $field->field_options, $field_array );
+		$field_array = array_merge( $field->field_options, $field_array );
 
-        $values['fields'][ $field->id ] = $field_array;
-    }
+		$values['fields'][ $field->id ] = $field_array;
+	}
 
 	private static function fill_field_opts( $field, array &$field_array, $args ) {
-        $post_values = $args['post_values'];
-        $opt_defaults = FrmFieldsHelper::get_default_field_opts($field_array['type'], $field, true);
-
-        foreach ( $opt_defaults as $opt => $default_opt ) {
-            $field_array[ $opt ] = ( $post_values && isset( $post_values['field_options'][ $opt .'_'. $field->id ] ) ) ? maybe_unserialize( $post_values['field_options'][ $opt .'_'. $field->id ] ) : ( isset( $field->field_options[ $opt ] ) ? $field->field_options[ $opt ] : $default_opt );
-            if ( $opt == 'blank' && $field_array[ $opt ] == '' ) {
-                $field_array[ $opt ] = $args['frm_settings']->blank_msg;
-            } else if ( $opt == 'invalid' && $field_array[ $opt ] == '' ) {
-                if ( $args['field_type'] == 'captcha' ) {
-                    $field_array[ $opt ] = $args['frm_settings']->re_msg;
-                } else {
-                    $field_array[ $opt ] = sprintf( __( '%s is invalid', 'formidable' ), $field_array['name'] );
-                }
-            }
-        }
-
-        if ( $field_array['custom_html'] == '' ) {
-            $field_array['custom_html'] = FrmFieldsHelper::get_default_html($args['field_type']);
-        }
-    }
-
-    /**
-     * @param string $table
-     */
+		$post_values = $args['post_values'];
+		$opt_defaults = FrmFieldsHelper::get_default_field_opts($field_array['type'], $field, true);
+
+		foreach ( $opt_defaults as $opt => $default_opt ) {
+			$field_array[ $opt ] = ( $post_values && isset( $post_values['field_options'][ $opt .'_'. $field->id ] ) ) ? maybe_unserialize( $post_values['field_options'][ $opt .'_'. $field->id ] ) : ( isset( $field->field_options[ $opt ] ) ? $field->field_options[ $opt ] : $default_opt );
+			if ( $opt == 'blank' && $field_array[ $opt ] == '' ) {
+				$field_array[ $opt ] = $args['frm_settings']->blank_msg;
+			} else if ( $opt == 'invalid' && $field_array[ $opt ] == '' ) {
+				if ( $args['field_type'] == 'captcha' ) {
+					$field_array[ $opt ] = $args['frm_settings']->re_msg;
+				} else {
+					$field_array[ $opt ] = sprintf( __( '%s is invalid', 'formidable' ), $field_array['name'] );
+				}
+			}
+		}
+
+		if ( $field_array['custom_html'] == '' ) {
+			$field_array['custom_html'] = FrmFieldsHelper::get_default_html($args['field_type']);
+		}
+	}
+
+	/**
+	 * @param string $table
+	 */
 	private static function fill_form_opts( $record, $table, $post_values, array &$values ) {
-        if ( $table == 'entries' ) {
-            $form = $record->form_id;
+		if ( $table == 'entries' ) {
+			$form = $record->form_id;
 			FrmForm::maybe_get_form( $form );
-        } else {
-            $form = $record;
-        }
+		} else {
+			$form = $record;
+		}
 
-        if ( ! $form ) {
-            return;
-        }
+		if ( ! $form ) {
+			return;
+		}
 
-        $values['form_name'] = isset($record->form_id) ? $form->name : '';
+		$values['form_name'] = isset($record->form_id) ? $form->name : '';
 		$values['parent_form_id'] = isset( $record->form_id ) ? $form->parent_form_id : 0;
 
-        if ( ! is_array($form->options) ) {
-            return;
-        }
+		if ( ! is_array($form->options) ) {
+			return;
+		}
 
-        foreach ( $form->options as $opt => $value ) {
-            $values[ $opt ] = isset( $post_values[ $opt ] ) ? maybe_unserialize( $post_values[ $opt ] ) : $value;
-        }
+		foreach ( $form->options as $opt => $value ) {
+			$values[ $opt ] = isset( $post_values[ $opt ] ) ? maybe_unserialize( $post_values[ $opt ] ) : $value;
+		}
 
-        self::fill_form_defaults($post_values, $values);
-    }
+		self::fill_form_defaults($post_values, $values);
+	}
 
-    /**
-     * Set to POST value or default
-     */
+	/**
+	 * Set to POST value or default
+	 */
 	private static function fill_form_defaults( $post_values, array &$values ) {
-        $form_defaults = FrmFormsHelper::get_default_opts();
+		$form_defaults = FrmFormsHelper::get_default_opts();
 
-        foreach ( $form_defaults as $opt => $default ) {
-            if ( ! isset( $values[ $opt ] ) || $values[ $opt ] == '' ) {
+		foreach ( $form_defaults as $opt => $default ) {
+			if ( ! isset( $values[ $opt ] ) || $values[ $opt ] == '' ) {
 				$values[ $opt ] = ( $post_values && isset( $post_values['options'][ $opt ] ) ) ? $post_values['options'][ $opt ] : $default;
-            }
+			}
 
-            unset($opt, $defaut);
-        }
+			unset($opt, $defaut);
+		}
 
-        if ( ! isset($values['custom_style']) ) {
-            $frm_settings = self::get_settings();
+		if ( ! isset($values['custom_style']) ) {
+			$frm_settings = self::get_settings();
 			$values['custom_style'] = ( $post_values && isset( $post_values['options']['custom_style'] ) ) ? absint( $_POST['options']['custom_style'] ) : ( $frm_settings->load_style != 'none' );
-        }
+		}
 
 		foreach ( array( 'before', 'after', 'submit' ) as $h ) {
-            if ( ! isset( $values[ $h .'_html' ] ) ) {
-                $values[ $h .'_html' ] = ( isset( $post_values['options'][ $h .'_html' ] ) ? $post_values['options'][ $h .'_html' ] : FrmFormsHelper::get_default_html( $h ) );
-            }
-            unset($h);
-        }
-    }
+			if ( ! isset( $values[ $h .'_html' ] ) ) {
+				$values[ $h .'_html' ] = ( isset( $post_values['options'][ $h .'_html' ] ) ? $post_values['options'][ $h .'_html' ] : FrmFormsHelper::get_default_html( $h ) );
+			}
+			unset($h);
+		}
+	}
 
 	public static function get_meta_value( $field_id, $entry ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmEntryMeta::get_meta_value' );
@@ -1115,69 +1115,69 @@ 
 	}
 
 	public static function insert_opt_html( $args ) {
-        $class = '';
-        if ( in_array( $args['type'], array( 'email', 'user_id', 'hidden', 'select', 'radio', 'checkbox', 'phone', 'text' ) ) ) {
-            $class .= 'show_frm_not_email_to';
-        }
-    ?>
+		$class = '';
+		if ( in_array( $args['type'], array( 'email', 'user_id', 'hidden', 'select', 'radio', 'checkbox', 'phone', 'text' ) ) ) {
+			$class .= 'show_frm_not_email_to';
+		}
+	?>
 <li>
     <a href="javascript:void(0)" class="frmids frm_insert_code alignright <?php echo esc_attr($class) ?>" data-code="<?php echo esc_attr($args['id']) ?>" >[<?php echo esc_attr( $args['id'] ) ?>]</a>
     <a href="javascript:void(0)" class="frmkeys frm_insert_code alignright <?php echo esc_attr($class) ?>" data-code="<?php echo esc_attr($args['key']) ?>" >[<?php echo esc_attr( self::truncate($args['key'], 10) ) ?>]</a>
     <a href="javascript:void(0)" class="frm_insert_code <?php echo esc_attr( $class ) ?>" data-code="<?php echo esc_attr($args['id']) ?>" ><?php echo esc_attr( self::truncate($args['name'], 60) ) ?></a>
 </li>
     <?php
-    }
+	}
 
-    public static function get_us_states() {
-        _deprecated_function( __FUNCTION__, '2.0', 'FrmFieldsHelper::get_us_states' );
-        return FrmFieldsHelper::get_us_states();
-    }
+	public static function get_us_states() {
+		_deprecated_function( __FUNCTION__, '2.0', 'FrmFieldsHelper::get_us_states' );
+		return FrmFieldsHelper::get_us_states();
+	}
 
-    public static function get_countries() {
-        _deprecated_function( __FUNCTION__, '2.0', 'FrmFieldsHelper::get_countries' );
-        return FrmFieldsHelper::get_countries();
-    }
+	public static function get_countries() {
+		_deprecated_function( __FUNCTION__, '2.0', 'FrmFieldsHelper::get_countries' );
+		return FrmFieldsHelper::get_countries();
+	}
 
 	public static function truncate( $str, $length, $minword = 3, $continue = '...' ) {
-        if ( is_array( $str ) ) {
-            return;
+		if ( is_array( $str ) ) {
+			return;
 		}
 
-        $length = (int) $length;
+		$length = (int) $length;
 		$str = wp_strip_all_tags( $str );
 		$original_len = self::mb_function( array( 'mb_strlen', 'strlen' ), array( $str ) );
 
 		if ( $length == 0 ) {
-            return '';
-        } else if ( $length <= 10 ) {
+			return '';
+		} else if ( $length <= 10 ) {
 			$sub = self::mb_function( array( 'mb_substr', 'substr' ), array( $str, 0, $length ) );
-            return $sub . (($length < $original_len) ? $continue : '');
-        }
+			return $sub . (($length < $original_len) ? $continue : '');
+		}
 
-        $sub = '';
-        $len = 0;
+		$sub = '';
+		$len = 0;
 
 		$words = self::mb_function( array( 'mb_split', 'explode' ), array( ' ', $str ) );
 
 		foreach ( $words as $word ) {
-            $part = (($sub != '') ? ' ' : '') . $word;
+			$part = (($sub != '') ? ' ' : '') . $word;
 			$total_len = self::mb_function( array( 'mb_strlen', 'strlen' ), array( $sub . $part ) );
-            if ( $total_len > $length && str_word_count($sub) ) {
-                break;
-            }
+			if ( $total_len > $length && str_word_count($sub) ) {
+				break;
+			}
 
-            $sub .= $part;
+			$sub .= $part;
 			$len += self::mb_function( array( 'mb_strlen', 'strlen' ), array( $part ) );
 
-            if ( str_word_count($sub) > $minword && $total_len >= $length ) {
-                break;
-            }
+			if ( str_word_count($sub) > $minword && $total_len >= $length ) {
+				break;
+			}
 
-            unset($total_len, $word);
-        }
+			unset($total_len, $word);
+		}
 
-        return $sub . (($len < $original_len) ? $continue : '');
-    }
+		return $sub . (($len < $original_len) ? $continue : '');
+	}
 
 	public static function mb_function( $function_names, $args ) {
 		$mb_function_name = $function_names[0];
@@ -1189,18 +1189,18 @@ 
 	}
 
 	public static function get_formatted_time( $date, $date_format = '', $time_format = '' ) {
-        if ( empty($date) ) {
-            return $date;
-        }
+		if ( empty($date) ) {
+			return $date;
+		}
 
-        if ( empty($date_format) ) {
-            $date_format = get_option('date_format');
-        }
+		if ( empty($date_format) ) {
+			$date_format = get_option('date_format');
+		}
 
-        if ( preg_match('/^\d{1-2}\/\d{1-2}\/\d{4}$/', $date) && self::pro_is_installed() ) {
-            $frmpro_settings = new FrmProSettings();
-            $date = FrmProAppHelper::convert_date($date, $frmpro_settings->date_format, 'Y-m-d');
-        }
+		if ( preg_match('/^\d{1-2}\/\d{1-2}\/\d{4}$/', $date) && self::pro_is_installed() ) {
+			$frmpro_settings = new FrmProSettings();
+			$date = FrmProAppHelper::convert_date($date, $frmpro_settings->date_format, 'Y-m-d');
+		}
 
 		$formatted = self::get_localized_date( $date_format, $date );
 
@@ -1209,8 +1209,8 @@ 
 			$formatted .= self::add_time_to_date( $time_format, $date );
 		}
 
-        return $formatted;
-    }
+		return $formatted;
+	}
 
 	private static function add_time_to_date( $time_format, $date ) {
 		if ( empty( $time_format ) ) {
@@ -1287,61 +1287,61 @@ 
 		);
 	}
 
-    /**
-     * Added for < WP 4.0 compatability
-     *
-     * @since 1.07.10
-     *
-     * @param string $term The value to escape
-     * @return string The escaped value
-     */
+	/**
+	 * Added for < WP 4.0 compatability
+	 *
+	 * @since 1.07.10
+	 *
+	 * @param string $term The value to escape
+	 * @return string The escaped value
+	 */
 	public static function esc_like( $term ) {
-        global $wpdb;
-        if ( method_exists($wpdb, 'esc_like') ) {
+		global $wpdb;
+		if ( method_exists($wpdb, 'esc_like') ) {
 			// WP 4.0
-            $term = $wpdb->esc_like( $term );
-        } else {
-            $term = like_escape( $term );
-        }
+			$term = $wpdb->esc_like( $term );
+		} else {
+			$term = like_escape( $term );
+		}
 
-        return $term;
-    }
+		return $term;
+	}
 
-    /**
-     * @param string $order_query
-     */
+	/**
+	 * @param string $order_query
+	 */
 	public static function esc_order( $order_query ) {
-        if ( empty($order_query) ) {
-            return '';
-        }
-
-        // remove ORDER BY before santizing
-        $order_query = strtolower($order_query);
-        if ( strpos($order_query, 'order by') !== false ) {
-            $order_query = str_replace('order by', '', $order_query);
-        }
-
-        $order_query = explode(' ', trim($order_query));
-
-        $order_fields = array(
-            'id', 'form_key', 'name', 'description',
-            'parent_form_id', 'logged_in', 'is_template',
-            'default_template', 'status', 'created_at',
-        );
-
-        $order = trim(trim(reset($order_query), ','));
-        if ( ! in_array($order, $order_fields) ) {
-            return '';
-        }
-
-        $order_by = '';
-        if ( count($order_query) > 1 ) {
+		if ( empty($order_query) ) {
+			return '';
+		}
+
+		// remove ORDER BY before santizing
+		$order_query = strtolower($order_query);
+		if ( strpos($order_query, 'order by') !== false ) {
+			$order_query = str_replace('order by', '', $order_query);
+		}
+
+		$order_query = explode(' ', trim($order_query));
+
+		$order_fields = array(
+			'id', 'form_key', 'name', 'description',
+			'parent_form_id', 'logged_in', 'is_template',
+			'default_template', 'status', 'created_at',
+		);
+
+		$order = trim(trim(reset($order_query), ','));
+		if ( ! in_array($order, $order_fields) ) {
+			return '';
+		}
+
+		$order_by = '';
+		if ( count($order_query) > 1 ) {
 			$order_by = end( $order_query );
 			self::esc_order_by( $order_by );
-        }
+		}
 
-        return ' ORDER BY '. $order . ' '. $order_by;
-    }
+		return ' ORDER BY '. $order . ' '. $order_by;
+	}
 
 	/**
 	 * Make sure this is ordering by either ASC or DESC
@@ -1353,183 +1353,183 @@ 
 		}
 	}
 
-    /**
-     * @param string $limit
-     */
+	/**
+	 * @param string $limit
+	 */
 	public static function esc_limit( $limit ) {
-        if ( empty($limit) ) {
-            return '';
-        }
-
-        $limit = trim(str_replace(' limit', '', strtolower($limit)));
-        if ( is_numeric($limit) ) {
-            return ' LIMIT '. $limit;
-        }
-
-        $limit = explode(',', trim($limit));
-        foreach ( $limit as $k => $l ) {
-            if ( is_numeric( $l ) ) {
-                $limit[ $k ] = $l;
-            }
-        }
-
-        $limit = implode(',', $limit);
-        return ' LIMIT '. $limit;
-    }
-
-    /**
-     * Get an array of values ready to go through $wpdb->prepare
-     * @since 2.0
-     */
-    public static function prepare_array_values( $array, $type = '%s' ) {
-        $placeholders = array_fill(0, count($array), $type);
-        return implode(', ', $placeholders);
-    }
-
-    public static function prepend_and_or_where( $starts_with = ' WHERE ', $where = '' ) {
-        if ( empty($where) ) {
-            return '';
-        }
+		if ( empty($limit) ) {
+			return '';
+		}
+
+		$limit = trim(str_replace(' limit', '', strtolower($limit)));
+		if ( is_numeric($limit) ) {
+			return ' LIMIT '. $limit;
+		}
+
+		$limit = explode(',', trim($limit));
+		foreach ( $limit as $k => $l ) {
+			if ( is_numeric( $l ) ) {
+				$limit[ $k ] = $l;
+			}
+		}
+
+		$limit = implode(',', $limit);
+		return ' LIMIT '. $limit;
+	}
+
+	/**
+	 * Get an array of values ready to go through $wpdb->prepare
+	 * @since 2.0
+	 */
+	public static function prepare_array_values( $array, $type = '%s' ) {
+		$placeholders = array_fill(0, count($array), $type);
+		return implode(', ', $placeholders);
+	}
+
+	public static function prepend_and_or_where( $starts_with = ' WHERE ', $where = '' ) {
+		if ( empty($where) ) {
+			return '';
+		}
 
 		if ( is_array( $where ) ) {
-            global $wpdb;
-            FrmDb::get_where_clause_and_values( $where, $starts_with );
+			global $wpdb;
+			FrmDb::get_where_clause_and_values( $where, $starts_with );
 			$where = $wpdb->prepare( $where['where'], $where['values'] );
 		} else {
-            $where = $starts_with . $where;
-        }
+			$where = $starts_with . $where;
+		}
 
-        return $where;
-    }
+		return $where;
+	}
 
-    // Pagination Methods
+	// Pagination Methods
 
-    /**
-     * @param integer $current_p
-     */
+	/**
+	 * @param integer $current_p
+	 */
 	public static function get_last_record_num( $r_count, $current_p, $p_size ) {
 		return ( ( $r_count < ( $current_p * $p_size ) ) ? $r_count : ( $current_p * $p_size ) );
 	}
 
-    /**
-     * @param integer $current_p
-     */
-    public static function get_first_record_num( $r_count, $current_p, $p_size ) {
-        if ( $current_p == 1 ) {
-            return 1;
-        } else {
-            return ( self::get_last_record_num( $r_count, ( $current_p - 1 ), $p_size ) + 1 );
-        }
-    }
-
-    /**
-     * @param string $table_name
-     */
-    public static function &getRecordCount( $where = '', $table_name ) {
-        _deprecated_function( __FUNCTION__, '2.0', 'FrmDb::get_count' );
-        $count = FrmDb::get_count( $table_name, $where );
-        return $count;
-    }
-
-    public static function get_referer_info() {
-        _deprecated_function( __FUNCTION__, '2.0', 'FrmAppHelper::get_server_value' );
-        return self::get_server_value('HTTP_REFERER');
-    }
+	/**
+	 * @param integer $current_p
+	 */
+	public static function get_first_record_num( $r_count, $current_p, $p_size ) {
+		if ( $current_p == 1 ) {
+			return 1;
+		} else {
+			return ( self::get_last_record_num( $r_count, ( $current_p - 1 ), $p_size ) + 1 );
+		}
+	}
+
+	/**
+	 * @param string $table_name
+	 */
+	public static function &getRecordCount( $where = '', $table_name ) {
+		_deprecated_function( __FUNCTION__, '2.0', 'FrmDb::get_count' );
+		$count = FrmDb::get_count( $table_name, $where );
+		return $count;
+	}
+
+	public static function get_referer_info() {
+		_deprecated_function( __FUNCTION__, '2.0', 'FrmAppHelper::get_server_value' );
+		return self::get_server_value('HTTP_REFERER');
+	}
 
 	/**
 	 * @return array
 	 */
 	public static function json_to_array( $json_vars ) {
-        $vars = array();
-        foreach ( $json_vars as $jv ) {
-            $jv_name = explode('[', $jv['name']);
-            $last = count($jv_name) - 1;
-            foreach ( $jv_name as $p => $n ) {
-                $name = trim($n, ']');
-                if ( ! isset($l1) ) {
-                    $l1 = $name;
-                }
-
-                if ( ! isset($l2) ) {
-                    $l2 = $name;
-                }
-
-                if ( ! isset($l3) ) {
-                    $l3 = $name;
-                }
-
-                $this_val = ( $p == $last ) ? $jv['value'] : array();
-
-                switch ( $p ) {
-                    case 0:
-                        $l1 = $name;
-                        self::add_value_to_array( $name, $l1, $this_val, $vars );
-                    break;
-
-                    case 1:
-                        $l2 = $name;
-                        self::add_value_to_array( $name, $l2, $this_val, $vars[ $l1 ] );
-                    break;
-
-                    case 2:
-                        $l3 = $name;
-                        self::add_value_to_array( $name, $l3, $this_val, $vars[ $l1 ][ $l2 ] );
-                    break;
-
-                    case 3:
-                        $l4 = $name;
-                        self::add_value_to_array( $name, $l4, $this_val, $vars[ $l1 ][ $l2 ][ $l3 ] );
-                    break;
-                }
-
-                unset($this_val, $n);
-            }
-
-            unset($last, $jv);
-        }
-
-        return $vars;
-    }
-
-    /**
-     * @param string $name
-     * @param string $l1
-     */
-    public static function add_value_to_array( $name, $l1, $val, &$vars ) {
-        if ( $name == '' ) {
-            $vars[] = $val;
-        } else if ( ! isset( $vars[ $l1 ] ) ) {
-            $vars[ $l1 ] = $val;
-        }
-    }
+		$vars = array();
+		foreach ( $json_vars as $jv ) {
+			$jv_name = explode('[', $jv['name']);
+			$last = count($jv_name) - 1;
+			foreach ( $jv_name as $p => $n ) {
+				$name = trim($n, ']');
+				if ( ! isset($l1) ) {
+					$l1 = $name;
+				}
+
+				if ( ! isset($l2) ) {
+					$l2 = $name;
+				}
+
+				if ( ! isset($l3) ) {
+					$l3 = $name;
+				}
+
+				$this_val = ( $p == $last ) ? $jv['value'] : array();
+
+				switch ( $p ) {
+					case 0:
+						$l1 = $name;
+						self::add_value_to_array( $name, $l1, $this_val, $vars );
+					break;
+
+					case 1:
+						$l2 = $name;
+						self::add_value_to_array( $name, $l2, $this_val, $vars[ $l1 ] );
+					break;
+
+					case 2:
+						$l3 = $name;
+						self::add_value_to_array( $name, $l3, $this_val, $vars[ $l1 ][ $l2 ] );
+					break;
+
+					case 3:
+						$l4 = $name;
+						self::add_value_to_array( $name, $l4, $this_val, $vars[ $l1 ][ $l2 ][ $l3 ] );
+					break;
+				}
+
+				unset($this_val, $n);
+			}
+
+			unset($last, $jv);
+		}
+
+		return $vars;
+	}
+
+	/**
+	 * @param string $name
+	 * @param string $l1
+	 */
+	public static function add_value_to_array( $name, $l1, $val, &$vars ) {
+		if ( $name == '' ) {
+			$vars[] = $val;
+		} else if ( ! isset( $vars[ $l1 ] ) ) {
+			$vars[ $l1 ] = $val;
+		}
+	}
 
 	public static function maybe_add_tooltip( $name, $class = 'closed', $form_name = '' ) {
-        $tooltips = array(
-            'action_title'  => __( 'Give this action a label for easy reference.', 'formidable' ),
-            'email_to'      => __( 'Add one or more recipient addresses separated by a ",".  FORMAT: Name <name@email.com> or name@email.com.  [admin_email] is the address set in WP General Settings.', 'formidable' ),
-            'cc'            => __( 'Add CC addresses separated by a ",".  FORMAT: Name <name@email.com> or name@email.com.', 'formidable' ),
-            'bcc'           => __( 'Add BCC addresses separated by a ",".  FORMAT: Name <name@email.com> or name@email.com.', 'formidable' ),
-            'reply_to'      => __( 'If you would like a different reply to address than the "from" address, add a single address here.  FORMAT: Name <name@email.com> or name@email.com.', 'formidable' ),
-            'from'          => __( 'Enter the name and/or email address of the sender. FORMAT: John Bates <john@example.com> or john@example.com.', 'formidable' ),
-            'email_subject' => esc_attr( sprintf( __( 'If you leave the subject blank, the default will be used: %1$s Form submitted on %2$s', 'formidable' ), $form_name, self::site_name() ) ),
-        );
-
-        if ( ! isset( $tooltips[ $name ] ) ) {
-            return;
-        }
-
-        if ( 'open' == $class ) {
-            echo ' frm_help"';
-        } else {
-            echo ' class="frm_help"';
-        }
-
-        echo ' title="'. esc_attr( $tooltips[ $name ] );
-
-        if ( 'open' != $class ) {
-            echo '"';
-        }
-    }
+		$tooltips = array(
+			'action_title'  => __( 'Give this action a label for easy reference.', 'formidable' ),
+			'email_to'      => __( 'Add one or more recipient addresses separated by a ",".  FORMAT: Name <name@email.com> or name@email.com.  [admin_email] is the address set in WP General Settings.', 'formidable' ),
+			'cc'            => __( 'Add CC addresses separated by a ",".  FORMAT: Name <name@email.com> or name@email.com.', 'formidable' ),
+			'bcc'           => __( 'Add BCC addresses separated by a ",".  FORMAT: Name <name@email.com> or name@email.com.', 'formidable' ),
+			'reply_to'      => __( 'If you would like a different reply to address than the "from" address, add a single address here.  FORMAT: Name <name@email.com> or name@email.com.', 'formidable' ),
+			'from'          => __( 'Enter the name and/or email address of the sender. FORMAT: John Bates <john@example.com> or john@example.com.', 'formidable' ),
+			'email_subject' => esc_attr( sprintf( __( 'If you leave the subject blank, the default will be used: %1$s Form submitted on %2$s', 'formidable' ), $form_name, self::site_name() ) ),
+		);
+
+		if ( ! isset( $tooltips[ $name ] ) ) {
+			return;
+		}
+
+		if ( 'open' == $class ) {
+			echo ' frm_help"';
+		} else {
+			echo ' class="frm_help"';
+		}
+
+		echo ' title="'. esc_attr( $tooltips[ $name ] );
+
+		if ( 'open' != $class ) {
+			echo '"';
+		}
+	}
 
 	/**
 	 * Add the current_page class to that page in the form nav
@@ -1545,35 +1545,35 @@ 
 		}
 	}
 
-    /**
-     * Prepare and json_encode post content
-     *
-     * @since 2.0
-     *
-     * @param array $post_content
-     * @return string $post_content ( json encoded array )
-     */
-    public static function prepare_and_encode( $post_content ) {
-        //Loop through array to strip slashes and add only the needed ones
+	/**
+	 * Prepare and json_encode post content
+	 *
+	 * @since 2.0
+	 *
+	 * @param array $post_content
+	 * @return string $post_content ( json encoded array )
+	 */
+	public static function prepare_and_encode( $post_content ) {
+		//Loop through array to strip slashes and add only the needed ones
 		foreach ( $post_content as $key => $val ) {
 			// Replace problematic characters (like &quot;)
 			$val = str_replace( '&quot;', '"', $val );
 
 			self::prepare_action_slashes( $val, $key, $post_content );
-            unset( $key, $val );
-        }
+			unset( $key, $val );
+		}
 
-        // json_encode the array
-        $post_content = json_encode( $post_content );
+		// json_encode the array
+		$post_content = json_encode( $post_content );
 
-	    // add extra slashes for \r\n since WP strips them
+		// add extra slashes for \r\n since WP strips them
 		$post_content = str_replace( array( '\\r', '\\n', '\\u', '\\t' ), array( '\\\\r', '\\\\n', '\\\\u', '\\\\t' ), $post_content );
 
-        // allow for &quot
-	    $post_content = str_replace( '&quot;', '\\"', $post_content );
+		// allow for &quot
+		$post_content = str_replace( '&quot;', '\\"', $post_content );
 
-        return $post_content;
-    }
+		return $post_content;
+	}
 
 	private static function prepare_action_slashes( $val, $key, &$post_content ) {
 		if ( ! isset( $post_content[ $key ] ) ) {
@@ -1641,64 +1641,64 @@ 
 	}
 
 	public static function maybe_json_decode( $string ) {
-        if ( is_array($string) ) {
-            return $string;
-        }
+		if ( is_array($string) ) {
+			return $string;
+		}
 
-        $new_string = json_decode($string, true);
-        if ( function_exists('json_last_error') ) {
+		$new_string = json_decode($string, true);
+		if ( function_exists('json_last_error') ) {
 			// php 5.3+
-            if ( json_last_error() == JSON_ERROR_NONE ) {
-                $string = $new_string;
-            }
-        } else if ( isset($new_string) ) {
+			if ( json_last_error() == JSON_ERROR_NONE ) {
+				$string = $new_string;
+			}
+		} else if ( isset($new_string) ) {
 			// php < 5.3 fallback
-            $string = $new_string;
-        }
-        return $string;
-    }
-
-    /**
-     * @since 1.07.10
-     *
-     * @param string $post_type The name of the post type that may need to be highlighted
-     * @return echo The javascript to open and highlight the Formidable menu
-     */
+			$string = $new_string;
+		}
+		return $string;
+	}
+
+	/**
+	 * @since 1.07.10
+	 *
+	 * @param string $post_type The name of the post type that may need to be highlighted
+	 * @return echo The javascript to open and highlight the Formidable menu
+	 */
 	public static function maybe_highlight_menu( $post_type ) {
-        global $post, $pagenow;
+		global $post, $pagenow;
 
-        if ( isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != $post_type ) {
-            return;
-        }
+		if ( isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != $post_type ) {
+			return;
+		}
 
-        if ( is_object($post) && $post->post_type != $post_type ) {
-            return;
-        }
+		if ( is_object($post) && $post->post_type != $post_type ) {
+			return;
+		}
 
-        self::load_admin_wide_js();
-        echo '<script type="text/javascript">jQuery(document).ready(function(){frmSelectSubnav();});</script>';
-    }
+		self::load_admin_wide_js();
+		echo '<script type="text/javascript">jQuery(document).ready(function(){frmSelectSubnav();});</script>';
+	}
 
-    /**
-     * Load the JS file on non-Formidable pages in the admin area
-     * @since 2.0
-     */
+	/**
+	 * Load the JS file on non-Formidable pages in the admin area
+	 * @since 2.0
+	 */
 	public static function load_admin_wide_js( $load = true ) {
-        $version = FrmAppHelper::plugin_version();
+		$version = FrmAppHelper::plugin_version();
 		wp_register_script( 'formidable_admin_global', FrmAppHelper::plugin_url() . '/js/formidable_admin_global.js', array( 'jquery' ), $version );
 
-        wp_localize_script( 'formidable_admin_global', 'frmGlobal', array(
+		wp_localize_script( 'formidable_admin_global', 'frmGlobal', array(
 			'updating_msg' => __( 'Please wait while your site updates.', 'formidable' ),
-            'deauthorize'  => __( 'Are you sure you want to deauthorize Formidable Forms on this site?', 'formidable' ),
+			'deauthorize'  => __( 'Are you sure you want to deauthorize Formidable Forms on this site?', 'formidable' ),
 			'url'          => FrmAppHelper::plugin_url(),
 			'loading'      => __( 'Loading&hellip;' ),
 			'nonce'        => wp_create_nonce( 'frm_ajax' ),
-        ) );
+		) );
 
 		if ( $load ) {
 			wp_enqueue_script( 'formidable_admin_global' );
 		}
-    }
+	}
 
 	/**
 	 * @since 2.0.9
@@ -1707,9 +1707,9 @@ 
 		wp_enqueue_style( 'frm_fonts', self::plugin_url() . '/css/frm_fonts.css', array(), self::plugin_version() );
 	}
 
-    /**
-     * @param string $location
-     */
+	/**
+	 * @param string $location
+	 */
 	public static function localize_script( $location ) {
 		$ajax_url = admin_url( 'admin-ajax.php', is_ssl() ? 'admin' : 'http' );
 		$ajax_url = apply_filters( 'frm_ajax_url', $ajax_url );
@@ -1759,81 +1759,81 @@ 
 		}
 	}
 
-    /**
-     * @since 1.07.10
-     *
-     * @param float $min_version The version the add-on requires
-     * @return echo The message on the plugins listing page
-     */
+	/**
+	 * @since 1.07.10
+	 *
+	 * @param float $min_version The version the add-on requires
+	 * @return echo The message on the plugins listing page
+	 */
 	public static function min_version_notice( $min_version ) {
-        $frm_version = self::plugin_version();
+		$frm_version = self::plugin_version();
 
-        // check if Formidable meets minimum requirements
-        if ( version_compare($frm_version, $min_version, '>=') ) {
-            return;
-        }
+		// check if Formidable meets minimum requirements
+		if ( version_compare($frm_version, $min_version, '>=') ) {
+			return;
+		}
 
-        $wp_list_table = _get_list_table('WP_Plugins_List_Table');
+		$wp_list_table = _get_list_table('WP_Plugins_List_Table');
 		echo '<tr class="plugin-update-tr active"><th colspan="' . absint( $wp_list_table->get_column_count() ) . '" class="check-column plugin-update colspanchange"><div class="update-message">' .
-        __( 'You are running an outdated version of Formidable. This plugin may not work correctly if you do not update Formidable.', 'formidable' ) .
-        '</div></td></tr>';
-    }
-
-    public static function locales( $type = 'date' ) {
-        $locales = array(
-            'en' => __( 'English', 'formidable' ),    '' => __( 'English/Western', 'formidable' ),
-            'af' => __( 'Afrikaans', 'formidable' ),  'sq' => __( 'Albanian', 'formidable' ),
-            'ar' => __( 'Arabic', 'formidable' ),     'hy' => __( 'Armenian', 'formidable' ),
-            'az' => __( 'Azerbaijani', 'formidable' ), 'eu' => __( 'Basque', 'formidable' ),
-            'bs' => __( 'Bosnian', 'formidable' ),    'bg' => __( 'Bulgarian', 'formidable' ),
-            'ca' => __( 'Catalan', 'formidable' ),    'zh-HK' => __( 'Chinese Hong Kong', 'formidable' ),
-            'zh-CN' => __( 'Chinese Simplified', 'formidable' ), 'zh-TW' => __( 'Chinese Traditional', 'formidable' ),
-            'hr' => __( 'Croatian', 'formidable' ),   'cs' => __( 'Czech', 'formidable' ),
-            'da' => __( 'Danish', 'formidable' ),     'nl' => __( 'Dutch', 'formidable' ),
-            'en-GB' => __( 'English/UK', 'formidable' ), 'eo' => __( 'Esperanto', 'formidable' ),
-            'et' => __( 'Estonian', 'formidable' ),   'fo' => __( 'Faroese', 'formidable' ),
-            'fa' => __( 'Farsi/Persian', 'formidable' ), 'fil' => __( 'Filipino', 'formidable' ),
-            'fi' => __( 'Finnish', 'formidable' ),    'fr' => __( 'French', 'formidable' ),
-            'fr-CA' => __( 'French/Canadian', 'formidable' ), 'fr-CH' => __( 'French/Swiss', 'formidable' ),
-            'de' => __( 'German', 'formidable' ),     'de-AT' => __( 'German/Austria', 'formidable' ),
-            'de-CH' => __( 'German/Switzerland', 'formidable' ), 'el' => __( 'Greek', 'formidable' ),
-            'he' => __( 'Hebrew', 'formidable' ),     'iw' => __( 'Hebrew', 'formidable' ),
-            'hi' => __( 'Hindi', 'formidable' ),      'hu' => __( 'Hungarian', 'formidable' ),
-            'is' => __( 'Icelandic', 'formidable' ),  'id' => __( 'Indonesian', 'formidable' ),
-            'it' => __( 'Italian', 'formidable' ),    'ja' => __( 'Japanese', 'formidable' ),
-            'ko' => __( 'Korean', 'formidable' ),     'lv' => __( 'Latvian', 'formidable' ),
-            'lt' => __( 'Lithuanian', 'formidable' ), 'ms' => __( 'Malaysian', 'formidable' ),
-            'no' => __( 'Norwegian', 'formidable' ),  'pl' => __( 'Polish', 'formidable' ),
-            'pt' => __( 'Portuguese', 'formidable' ), 'pt-BR' => __( 'Portuguese/Brazilian', 'formidable' ),
-            'pt-PT' => __( 'Portuguese/Portugal', 'formidable' ), 'ro' => __( 'Romanian', 'formidable' ),
-            'ru' => __( 'Russian', 'formidable' ),    'sr' => __( 'Serbian', 'formidable' ),
-            'sr-SR' => __( 'Serbian', 'formidable' ), 'sk' => __( 'Slovak', 'formidable' ),
-            'sl' => __( 'Slovenian', 'formidable' ),  'es' => __( 'Spanish', 'formidable' ),
-            'es-419' => __( 'Spanish/Latin America', 'formidable' ), 'sv' => __( 'Swedish', 'formidable' ),
-            'ta' => __( 'Tamil', 'formidable' ),      'th' => __( 'Thai', 'formidable' ),
-            'tu' => __( 'Turkish', 'formidable' ),    'tr' => __( 'Turkish', 'formidable' ),
-            'uk' => __( 'Ukranian', 'formidable' ),   'vi' => __( 'Vietnamese', 'formidable' ),
-        );
-
-        if ( $type == 'captcha' ) {
-            // remove the languages unavailable for the captcha
-            $unset = array(
-                '', 'af', 'sq', 'hy', 'az', 'eu', 'bs',
-                'zh-HK', 'eo', 'et', 'fo', 'fr-CH',
-                'he', 'is', 'ms', 'sr-SR', 'ta', 'tu',
-            );
-        } else {
-            // remove the languages unavailable for the datepicker
-            $unset = array(
-                'en', 'fil', 'fr-CA', 'de-AT', 'de-AT',
-                'de-CH', 'iw', 'hi', 'pt', 'pt-PT',
-                'es-419', 'tr',
-            );
-        }
-
-        $locales = array_diff_key($locales, array_flip($unset));
-        $locales = apply_filters('frm_locales', $locales);
-
-        return $locales;
-    }
+		__( 'You are running an outdated version of Formidable. This plugin may not work correctly if you do not update Formidable.', 'formidable' ) .
+		'</div></td></tr>';
+	}
+
+	public static function locales( $type = 'date' ) {
+		$locales = array(
+			'en' => __( 'English', 'formidable' ),    '' => __( 'English/Western', 'formidable' ),
+			'af' => __( 'Afrikaans', 'formidable' ),  'sq' => __( 'Albanian', 'formidable' ),
+			'ar' => __( 'Arabic', 'formidable' ),     'hy' => __( 'Armenian', 'formidable' ),
+			'az' => __( 'Azerbaijani', 'formidable' ), 'eu' => __( 'Basque', 'formidable' ),
+			'bs' => __( 'Bosnian', 'formidable' ),    'bg' => __( 'Bulgarian', 'formidable' ),
+			'ca' => __( 'Catalan', 'formidable' ),    'zh-HK' => __( 'Chinese Hong Kong', 'formidable' ),
+			'zh-CN' => __( 'Chinese Simplified', 'formidable' ), 'zh-TW' => __( 'Chinese Traditional', 'formidable' ),
+			'hr' => __( 'Croatian', 'formidable' ),   'cs' => __( 'Czech', 'formidable' ),
+			'da' => __( 'Danish', 'formidable' ),     'nl' => __( 'Dutch', 'formidable' ),
+			'en-GB' => __( 'English/UK', 'formidable' ), 'eo' => __( 'Esperanto', 'formidable' ),
+			'et' => __( 'Estonian', 'formidable' ),   'fo' => __( 'Faroese', 'formidable' ),
+			'fa' => __( 'Farsi/Persian', 'formidable' ), 'fil' => __( 'Filipino', 'formidable' ),
+			'fi' => __( 'Finnish', 'formidable' ),    'fr' => __( 'French', 'formidable' ),
+			'fr-CA' => __( 'French/Canadian', 'formidable' ), 'fr-CH' => __( 'French/Swiss', 'formidable' ),
+			'de' => __( 'German', 'formidable' ),     'de-AT' => __( 'German/Austria', 'formidable' ),
+			'de-CH' => __( 'German/Switzerland', 'formidable' ), 'el' => __( 'Greek', 'formidable' ),
+			'he' => __( 'Hebrew', 'formidable' ),     'iw' => __( 'Hebrew', 'formidable' ),
+			'hi' => __( 'Hindi', 'formidable' ),      'hu' => __( 'Hungarian', 'formidable' ),
+			'is' => __( 'Icelandic', 'formidable' ),  'id' => __( 'Indonesian', 'formidable' ),
+			'it' => __( 'Italian', 'formidable' ),    'ja' => __( 'Japanese', 'formidable' ),
+			'ko' => __( 'Korean', 'formidable' ),     'lv' => __( 'Latvian', 'formidable' ),
+			'lt' => __( 'Lithuanian', 'formidable' ), 'ms' => __( 'Malaysian', 'formidable' ),
+			'no' => __( 'Norwegian', 'formidable' ),  'pl' => __( 'Polish', 'formidable' ),
+			'pt' => __( 'Portuguese', 'formidable' ), 'pt-BR' => __( 'Portuguese/Brazilian', 'formidable' ),
+			'pt-PT' => __( 'Portuguese/Portugal', 'formidable' ), 'ro' => __( 'Romanian', 'formidable' ),
+			'ru' => __( 'Russian', 'formidable' ),    'sr' => __( 'Serbian', 'formidable' ),
+			'sr-SR' => __( 'Serbian', 'formidable' ), 'sk' => __( 'Slovak', 'formidable' ),
+			'sl' => __( 'Slovenian', 'formidable' ),  'es' => __( 'Spanish', 'formidable' ),
+			'es-419' => __( 'Spanish/Latin America', 'formidable' ), 'sv' => __( 'Swedish', 'formidable' ),
+			'ta' => __( 'Tamil', 'formidable' ),      'th' => __( 'Thai', 'formidable' ),
+			'tu' => __( 'Turkish', 'formidable' ),    'tr' => __( 'Turkish', 'formidable' ),
+			'uk' => __( 'Ukranian', 'formidable' ),   'vi' => __( 'Vietnamese', 'formidable' ),
+		);
+
+		if ( $type == 'captcha' ) {
+			// remove the languages unavailable for the captcha
+			$unset = array(
+				'', 'af', 'sq', 'hy', 'az', 'eu', 'bs',
+				'zh-HK', 'eo', 'et', 'fo', 'fr-CH',
+				'he', 'is', 'ms', 'sr-SR', 'ta', 'tu',
+			);
+		} else {
+			// remove the languages unavailable for the datepicker
+			$unset = array(
+				'en', 'fil', 'fr-CA', 'de-AT', 'de-AT',
+				'de-CH', 'iw', 'hi', 'pt', 'pt-PT',
+				'es-419', 'tr',
+			);
+		}
+
+		$locales = array_diff_key($locales, array_flip($unset));
+		$locales = apply_filters('frm_locales', $locales);
+
+		return $locales;
+	}
 }

Spacing +224 added lines, -224 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -23,16 +23,16 @@ 
     }
 
     public static function plugin_folder() {
-        return basename(self::plugin_path());
+        return basename( self::plugin_path() );
     }
 
     public static function plugin_path() {
-        return dirname(dirname(dirname(__FILE__)));
+        return dirname( dirname( dirname( __FILE__ ) ) );
     }
 
     public static function plugin_url() {
         //prevously FRM_URL constant
-        return plugins_url( '', self::plugin_path() .'/formidable.php' );
+        return plugins_url( '', self::plugin_path() . '/formidable.php' );
     }
 
 	public static function relative_plugin_url() {
@@ -54,12 +54,12 @@ 
      * @return string
      */
     public static function site_name() {
-        return get_option('blogname');
+        return get_option( 'blogname' );
     }
 
 	public static function make_affiliate_url( $url ) {
 		$affiliate_id = apply_filters( 'frm_affiliate_link', '' );
-		$allowed_affiliates = array('Mojo');
+		$allowed_affiliates = array( 'Mojo' );
 		if ( in_array( $affiliate_id, $allowed_affiliates ) ) {
 			$url .= '?aff=' . $affiliate_id;
 		}
@@ -76,7 +76,7 @@ 
      */
     public static function get_settings() {
         global $frm_settings;
-        if ( empty($frm_settings) ) {
+        if ( empty( $frm_settings ) ) {
             $frm_settings = new FrmSettings();
         }
         return $frm_settings;
@@ -92,7 +92,7 @@ 
     }
 
     public static function pro_is_installed() {
-        return apply_filters('frm_pro_installed', false);
+        return apply_filters( 'frm_pro_installed', false );
     }
 
     /**
@@ -136,7 +136,7 @@ 
      * @return boolean
      */
     public static function doing_ajax() {
-        return defined('DOING_AJAX') && DOING_AJAX && ! self::is_preview_page();
+        return defined( 'DOING_AJAX' ) && DOING_AJAX && ! self::is_preview_page();
     }
 
 	/**
@@ -156,7 +156,7 @@ 
      * @return boolean
      */
     public static function is_admin() {
-        return is_admin() && ( ! defined('DOING_AJAX') || ! DOING_AJAX );
+        return is_admin() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX );
     }
 
     /**
@@ -182,7 +182,7 @@ 
      * @return string
      */
 	public static function get_server_value( $value ) {
-        return isset( $_SERVER[ $value ] ) ? wp_strip_all_tags( $_SERVER[ $value ] ) : '';
+        return isset( $_SERVER[$value] ) ? wp_strip_all_tags( $_SERVER[$value] ) : '';
     }
 
     /**
@@ -197,14 +197,14 @@ 
             'HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED', 'HTTP_X_CLUSTER_CLIENT_IP',
             'HTTP_FORWARDED_FOR', 'HTTP_FORWARDED', 'REMOTE_ADDR',
         ) as $key ) {
-            if ( ! isset( $_SERVER[ $key ] ) ) {
+            if ( ! isset( $_SERVER[$key] ) ) {
                 continue;
             }
 
-            foreach ( explode( ',', $_SERVER[ $key ] ) as $ip ) {
-                $ip = trim($ip); // just to be safe
+            foreach ( explode( ',', $_SERVER[$key] ) as $ip ) {
+                $ip = trim( $ip ); // just to be safe
 
-                if ( filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) !== false ) {
+                if ( filter_var( $ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE ) !== false ) {
                     return $ip;
                 }
             }
@@ -214,15 +214,15 @@ 
     }
 
     public static function get_param( $param, $default = '', $src = 'get', $sanitize = '' ) {
-        if ( strpos($param, '[') ) {
-            $params = explode('[', $param);
+        if ( strpos( $param, '[' ) ) {
+            $params = explode( '[', $param );
             $param = $params[0];
         }
 
 		if ( $src == 'get' ) {
-            $value = isset( $_POST[ $param ] ) ? stripslashes_deep( $_POST[ $param ] ) : ( isset( $_GET[ $param ] ) ? stripslashes_deep( $_GET[ $param ] ) : $default );
-            if ( ! isset( $_POST[ $param ] ) && isset( $_GET[ $param ] ) && ! is_array( $value ) ) {
-                $value = stripslashes_deep( htmlspecialchars_decode( urldecode( $_GET[ $param ] ) ) );
+            $value = isset( $_POST[$param] ) ? stripslashes_deep( $_POST[$param] ) : ( isset( $_GET[$param] ) ? stripslashes_deep( $_GET[$param] ) : $default );
+            if ( ! isset( $_POST[$param] ) && isset( $_GET[$param] ) && ! is_array( $value ) ) {
+                $value = stripslashes_deep( htmlspecialchars_decode( urldecode( $_GET[$param] ) ) );
             }
 			self::sanitize_value( $sanitize, $value );
 		} else {
@@ -231,12 +231,12 @@ 
 
 		if ( isset( $params ) && is_array( $value ) && ! empty( $value ) ) {
             foreach ( $params as $k => $p ) {
-                if ( ! $k || ! is_array($value) ) {
+                if ( ! $k || ! is_array( $value ) ) {
                     continue;
                 }
 
-                $p = trim($p, ']');
-                $value = isset( $value[ $p ] ) ? $value[ $p ] : $default;
+                $p = trim( $p, ']' );
+                $value = isset( $value[$p] ) ? $value[$p] : $default;
             }
         }
 
@@ -278,16 +278,16 @@ 
 
 		$value = $args['default'];
 		if ( $args['type'] == 'get' ) {
-			if ( $_GET && isset( $_GET[ $args['param'] ] ) ) {
-				$value = $_GET[ $args['param'] ];
+			if ( $_GET && isset( $_GET[$args['param']] ) ) {
+				$value = $_GET[$args['param']];
 			}
 		} else if ( $args['type'] == 'post' ) {
-			if ( isset( $_POST[ $args['param'] ] ) ) {
-				$value = stripslashes_deep( maybe_unserialize( $_POST[ $args['param'] ] ) );
+			if ( isset( $_POST[$args['param']] ) ) {
+				$value = stripslashes_deep( maybe_unserialize( $_POST[$args['param']] ) );
 			}
 		} else {
-			if ( isset( $_REQUEST[ $args['param'] ] ) ) {
-				$value = $_REQUEST[ $args['param'] ];
+			if ( isset( $_REQUEST[$args['param']] ) ) {
+				$value = $_REQUEST[$args['param']];
 			}
 		}
 
@@ -323,8 +323,8 @@ 
     public static function sanitize_request( $sanitize_method, &$values ) {
         $temp_values = $values;
         foreach ( $temp_values as $k => $val ) {
-            if ( isset( $sanitize_method[ $k ] ) ) {
-				$values[ $k ] = call_user_func( $sanitize_method[ $k ], $val );
+            if ( isset( $sanitize_method[$k] ) ) {
+				$values[$k] = call_user_func( $sanitize_method[$k], $val );
             }
         }
     }
@@ -332,7 +332,7 @@ 
 	public static function sanitize_array( &$values ) {
 		$temp_values = $values;
 		foreach ( $temp_values as $k => $val ) {
-			$values[ $k ] = wp_kses_post( $val );
+			$values[$k] = wp_kses_post( $val );
 		}
 	}
 
@@ -352,7 +352,7 @@ 
 
 		$allowed_html = array();
 		foreach ( $allowed as $a ) {
-			$allowed_html[ $a ] = isset( $html[ $a ] ) ? $html[ $a ] : array();
+			$allowed_html[$a] = isset( $html[$a] ) ? $html[$a] : array();
 		}
 
 		return wp_kses( $value, $allowed_html );
@@ -363,7 +363,7 @@ 
      * @since 2.0
      */
     public static function remove_get_action() {
-        if ( ! isset($_GET) ) {
+        if ( ! isset( $_GET ) ) {
             return;
         }
 
@@ -385,8 +385,8 @@ 
         }
 
         global $wp_query;
-        if ( isset( $wp_query->query_vars[ $param ] ) ) {
-            $value = $wp_query->query_vars[ $param ];
+        if ( isset( $wp_query->query_vars[$param] ) ) {
+            $value = $wp_query->query_vars[$param];
         }
 
         return $value;
@@ -397,9 +397,9 @@ 
      */
     public static function trigger_hook_load( $type, $object = null ) {
         // only load the form hooks once
-        $hooks_loaded = apply_filters('frm_'. $type .'_hooks_loaded', false, $object);
+        $hooks_loaded = apply_filters( 'frm_' . $type . '_hooks_loaded', false, $object );
         if ( ! $hooks_loaded ) {
-            do_action('frm_load_'. $type .'_hooks');
+            do_action( 'frm_load_' . $type . '_hooks' );
         }
     }
 
@@ -415,16 +415,16 @@ 
      * @return mixed $results The cache or query results
      */
     public static function check_cache( $cache_key, $group = '', $query = '', $type = 'get_var', $time = 300 ) {
-        $results = wp_cache_get($cache_key, $group);
-        if ( ! self::is_empty_value( $results, false ) || empty($query) ) {
+        $results = wp_cache_get( $cache_key, $group );
+        if ( ! self::is_empty_value( $results, false ) || empty( $query ) ) {
             return $results;
         }
 
         if ( 'get_posts' == $type ) {
-            $results = get_posts($query);
+            $results = get_posts( $query );
         } else {
             global $wpdb;
-            $results = $wpdb->{$type}($query);
+            $results = $wpdb->{$type}( $query );
         }
 
 		if ( ! self::prevent_caching() ) {
@@ -448,9 +448,9 @@ 
         }
 
         // then check the transient
-        $results = get_transient($cache_key);
+        $results = get_transient( $cache_key );
         if ( $results ) {
-            wp_cache_set($cache_key, $results);
+            wp_cache_set( $cache_key, $results );
         }
 
         return $results;
@@ -461,8 +461,8 @@ 
      * @param string $cache_key
      */
 	public static function delete_cache_and_transient( $cache_key ) {
-        delete_transient($cache_key);
-        wp_cache_delete($cache_key);
+        delete_transient( $cache_key );
+        wp_cache_delete( $cache_key );
     }
 
     /**
@@ -476,9 +476,9 @@ 
 	public static function cache_delete_group( $group ) {
     	global $wp_object_cache;
 
-        if ( isset( $wp_object_cache->cache[ $group ] ) ) {
-            foreach ( $wp_object_cache->cache[ $group ] as $k => $v ) {
-                wp_cache_delete($k, $group);
+        if ( isset( $wp_object_cache->cache[$group] ) ) {
+            foreach ( $wp_object_cache->cache[$group] as $k => $v ) {
+                wp_cache_delete( $k, $group );
             }
             return true;
         }
@@ -509,29 +509,29 @@ 
 	public static function load_scripts( $scripts ) {
         _deprecated_function( __FUNCTION__, '2.0', 'wp_enqueue_script' );
         foreach ( (array) $scripts as $s ) {
-            wp_enqueue_script($s);
+            wp_enqueue_script( $s );
         }
     }
 
 	public static function load_styles( $styles ) {
         _deprecated_function( __FUNCTION__, '2.0', 'wp_enqueue_style' );
         foreach ( (array) $styles as $s ) {
-            wp_enqueue_style($s);
+            wp_enqueue_style( $s );
         }
     }
 
     public static function get_pages() {
-		return get_posts( array( 'post_type' => 'page', 'post_status' => array( 'publish', 'private' ), 'numberposts' => -1, 'orderby' => 'title', 'order' => 'ASC' ) );
+		return get_posts( array( 'post_type' => 'page', 'post_status' => array( 'publish', 'private' ), 'numberposts' => - 1, 'orderby' => 'title', 'order' => 'ASC' ) );
     }
 
     public static function wp_pages_dropdown( $field_name, $page_id, $truncate = false ) {
         $pages = self::get_pages();
 		$selected = self::get_post_param( $field_name, $page_id, 'absint' );
     ?>
-        <select name="<?php echo esc_attr($field_name); ?>" id="<?php echo esc_attr($field_name); ?>" class="frm-pages-dropdown">
+        <select name="<?php echo esc_attr( $field_name ); ?>" id="<?php echo esc_attr( $field_name ); ?>" class="frm-pages-dropdown">
             <option value=""> </option>
             <?php foreach ( $pages as $page ) { ?>
-				<option value="<?php echo esc_attr($page->ID); ?>" <?php selected( $selected, $page->ID ) ?>>
+				<option value="<?php echo esc_attr( $page->ID ); ?>" <?php selected( $selected, $page->ID ) ?>>
 					<?php echo esc_html( $truncate ? self::truncate( $page->post_title, $truncate ) : $page->post_title ); ?>
 				</option>
             <?php } ?>
@@ -540,26 +540,26 @@ 
     }
 
 	public static function post_edit_link( $post_id ) {
-        $post = get_post($post_id);
+        $post = get_post( $post_id );
         if ( $post ) {
-            return '<a href="'. esc_url(admin_url('post.php') .'?post='. $post_id .'&action=edit') .'">'. self::truncate($post->post_title, 50) .'</a>';
+            return '<a href="' . esc_url( admin_url( 'post.php' ) . '?post=' . $post_id . '&action=edit' ) . '">' . self::truncate( $post->post_title, 50 ) . '</a>';
         }
         return '';
     }
 
 	public static function wp_roles_dropdown( $field_name, $capability, $multiple = 'single' ) {
     ?>
-        <select name="<?php echo esc_attr($field_name); ?>" id="<?php echo esc_attr($field_name); ?>" <?php
+        <select name="<?php echo esc_attr( $field_name ); ?>" id="<?php echo esc_attr( $field_name ); ?>" <?php
             echo ( 'multiple' == $multiple ) ? 'multiple="multiple"' : '';
             ?> class="frm_multiselect">
-            <?php self::roles_options($capability); ?>
+            <?php self::roles_options( $capability ); ?>
         </select>
     <?php
     }
 
 	public static function roles_options( $capability ) {
         global $frm_vars;
-        if ( isset($frm_vars['editable_roles']) ) {
+        if ( isset( $frm_vars['editable_roles'] ) ) {
             $editable_roles = $frm_vars['editable_roles'];
         } else {
             $editable_roles = get_editable_roles();
@@ -567,10 +567,10 @@ 
         }
 
         foreach ( $editable_roles as $role => $details ) {
-            $name = translate_user_role($details['name'] ); ?>
-        <option value="<?php echo esc_attr($role) ?>" <?php echo in_array($role, (array) $capability) ? ' selected="selected"' : ''; ?>><?php echo esc_attr($name) ?> </option>
+            $name = translate_user_role( $details['name'] ); ?>
+        <option value="<?php echo esc_attr( $role ) ?>" <?php echo in_array( $role, (array) $capability ) ? ' selected="selected"' : ''; ?>><?php echo esc_attr( $name ) ?> </option>
 <?php
-            unset($role, $details);
+            unset( $role, $details );
         }
     }
 
@@ -626,7 +626,7 @@ 
     public static function maybe_add_permissions() {
 		self::force_capability( 'frm_view_entries' );
 
-        if ( ! current_user_can('administrator') || current_user_can('frm_view_forms') ) {
+        if ( ! current_user_can( 'administrator' ) || current_user_can( 'frm_view_forms' ) ) {
             return;
         }
 
@@ -635,7 +635,7 @@ 
         $frm_roles = self::frm_capabilities();
         foreach ( $frm_roles as $frm_role => $frm_role_description ) {
 			$user->add_cap( $frm_role );
-            unset($frm_role, $frm_role_description);
+            unset( $frm_role, $frm_role_description );
         }
     }
 
@@ -660,12 +660,12 @@ 
      * @param string $permission
      */
 	public static function permission_check( $permission, $show_message = 'show' ) {
-        $permission_error = self::permission_nonce_error($permission);
+        $permission_error = self::permission_nonce_error( $permission );
         if ( $permission_error !== false ) {
             if ( 'hide' == $show_message ) {
                 $permission_error = '';
             }
-            wp_die($permission_error);
+            wp_die( $permission_error );
         }
     }
 
@@ -682,11 +682,11 @@ 
 		}
 
 		$error = false;
-        if ( empty($nonce_name) ) {
+        if ( empty( $nonce_name ) ) {
             return $error;
         }
 
-        if ( $_REQUEST && ( ! isset( $_REQUEST[ $nonce_name ] ) || ! wp_verify_nonce( $_REQUEST[ $nonce_name ], $nonce ) ) ) {
+        if ( $_REQUEST && ( ! isset( $_REQUEST[$nonce_name] ) || ! wp_verify_nonce( $_REQUEST[$nonce_name], $nonce ) ) ) {
             $frm_settings = self::get_settings();
             $error = $frm_settings->admin_permission;
         }
@@ -702,9 +702,9 @@ 
 
 	public static function check_selected( $values, $current ) {
         $values = self::recursive_function_map( $values, 'trim' );
-        $current = trim($current);
+        $current = trim( $current );
 
-        return ( is_array($values) && in_array($current, $values) ) || ( ! is_array($values) && $values == $current );
+        return ( is_array( $values ) && in_array( $current, $values ) ) || ( ! is_array( $values ) && $values == $current );
     }
 
     /**
@@ -765,7 +765,7 @@ 
 			} else {
 				foreach ( $value as $k => $v ) {
 					if ( ! is_array( $v ) ) {
-						$value[ $k ] = call_user_func( $original_function, $v );
+						$value[$k] = call_user_func( $original_function, $v );
 					}
 				}
 			}
@@ -786,11 +786,11 @@ 
 	public static function array_flatten( $array, $keys = 'keep' ) {
         $return = array();
         foreach ( $array as $key => $value ) {
-            if ( is_array($value) ) {
+            if ( is_array( $value ) ) {
 				$return = array_merge( $return, self::array_flatten( $value, $keys ) );
             } else {
 				if ( $keys == 'keep' ) {
-					$return[ $key ] = $value;
+					$return[$key] = $value;
 				} else {
 					$return[] = $value;
 				}
@@ -800,7 +800,7 @@ 
     }
 
     public static function esc_textarea( $text ) {
-        $safe_text = str_replace('&quot;', '"', $text);
+        $safe_text = str_replace( '&quot;', '"', $text );
         $safe_text = htmlspecialchars( $safe_text, ENT_NOQUOTES );
     	return apply_filters( 'esc_textarea', $safe_text, $text );
     }
@@ -810,8 +810,8 @@ 
      * @since 2.0
      */
 	public static function use_wpautop( $content ) {
-        if ( apply_filters('frm_use_wpautop', true) ) {
-            $content = wpautop(str_replace( '<br>', '<br />', $content));
+        if ( apply_filters( 'frm_use_wpautop', true ) ) {
+            $content = wpautop( str_replace( '<br>', '<br />', $content ) );
         }
         return $content;
     }
@@ -829,8 +829,8 @@ 
      * @return string The base Google APIS url for the current version of jQuery UI
      */
     public static function jquery_ui_base_url() {
-        $url = 'http'. ( is_ssl() ? 's' : '' ) .'://ajax.googleapis.com/ajax/libs/jqueryui/'. self::script_version('jquery-ui-core');
-        $url = apply_filters('frm_jquery_ui_base_url', $url);
+        $url = 'http' . ( is_ssl() ? 's' : '' ) . '://ajax.googleapis.com/ajax/libs/jqueryui/' . self::script_version( 'jquery-ui-core' );
+        $url = apply_filters( 'frm_jquery_ui_base_url', $url );
         return $url;
     }
 
@@ -845,11 +845,11 @@ 
 
         $ver = 0;
 
-        if ( ! isset( $wp_scripts->registered[ $handle ] ) ) {
+        if ( ! isset( $wp_scripts->registered[$handle] ) ) {
             return $ver;
         }
 
-        $query = $wp_scripts->registered[ $handle ];
+        $query = $wp_scripts->registered[$handle];
     	if ( is_object( $query ) ) {
     	    $ver = $query->ver;
     	}
@@ -862,7 +862,7 @@ 
     }
 
 	public static function get_user_id_param( $user_id ) {
-        if ( ! $user_id || empty($user_id) || is_numeric($user_id) ) {
+        if ( ! $user_id || empty( $user_id ) || is_numeric( $user_id ) ) {
             return $user_id;
         }
 
@@ -870,29 +870,29 @@ 
             $user_ID = get_current_user_id();
             $user_id = $user_ID;
 		} else {
-            if ( is_email($user_id) ) {
-                $user = get_user_by('email', $user_id);
+            if ( is_email( $user_id ) ) {
+                $user = get_user_by( 'email', $user_id );
             } else {
-                $user = get_user_by('login', $user_id);
+                $user = get_user_by( 'login', $user_id );
             }
 
             if ( $user ) {
                 $user_id = $user->ID;
             }
-            unset($user);
+            unset( $user );
         }
 
         return $user_id;
     }
 
 	public static function get_file_contents( $filename, $atts = array() ) {
-        if ( ! is_file($filename) ) {
+        if ( ! is_file( $filename ) ) {
             return false;
         }
 
-        extract($atts);
+        extract( $atts );
         ob_start();
-        include($filename);
+        include( $filename );
         $contents = ob_get_contents();
         ob_end_clean();
         return $contents;
@@ -908,28 +908,28 @@ 
         $key = '';
 
         if ( ! empty( $name ) ) {
-            $key = sanitize_key($name);
+            $key = sanitize_key( $name );
         }
 
 		if ( empty( $key ) ) {
-            $max_slug_value = pow(36, $num_chars);
+            $max_slug_value = pow( 36, $num_chars );
             $min_slug_value = 37; // we want to have at least 2 characters in the slug
-            $key = base_convert( rand($min_slug_value, $max_slug_value), 10, 36 );
+            $key = base_convert( rand( $min_slug_value, $max_slug_value ), 10, 36 );
         }
 
-		if ( is_numeric($key) || in_array( $key, array( 'id', 'key', 'created-at', 'detaillink', 'editlink', 'siteurl', 'evenodd' ) ) ) {
-            $key = $key .'a';
+		if ( is_numeric( $key ) || in_array( $key, array( 'id', 'key', 'created-at', 'detaillink', 'editlink', 'siteurl', 'evenodd' ) ) ) {
+            $key = $key . 'a';
         }
 
 		$key_check = FrmDb::get_var( $table_name, array( $column => $key, 'ID !' => $id ), $column );
 
-        if ( $key_check || is_numeric($key_check) ) {
+        if ( $key_check || is_numeric( $key_check ) ) {
             $suffix = 2;
 			do {
 				$alt_post_name = substr( $key, 0, 200 - ( strlen( $suffix ) + 1 ) ) . $suffix;
 				$key_check = FrmDb::get_var( $table_name, array( $column => $alt_post_name, 'ID !' => $id ), $column );
-				$suffix++;
-			} while ($key_check || is_numeric($key_check));
+				$suffix ++;
+			} while ( $key_check || is_numeric( $key_check ) );
 			$key = $alt_post_name;
         }
         return $key;
@@ -947,32 +947,32 @@ 
 
         global $frm_vars;
 
-        if ( empty($post_values) ) {
-            $post_values = stripslashes_deep($_POST);
+        if ( empty( $post_values ) ) {
+            $post_values = stripslashes_deep( $_POST );
         }
 
 		$values = array( 'id' => $record->id, 'fields' => array() );
 
 		foreach ( array( 'name', 'description' ) as $var ) {
-            $default_val = isset($record->{$var}) ? $record->{$var} : '';
-            $values[ $var ] = self::get_param( $var, $default_val );
-            unset($var, $default_val);
+            $default_val = isset( $record->{$var}) ? $record->{$var} : '';
+            $values[$var] = self::get_param( $var, $default_val );
+            unset( $var, $default_val );
         }
 
-        $values['description'] = self::use_wpautop($values['description']);
+        $values['description'] = self::use_wpautop( $values['description'] );
         $frm_settings = self::get_settings();
-        $is_form_builder = self::is_admin_page('formidable' );
+        $is_form_builder = self::is_admin_page( 'formidable' );
 
         foreach ( (array) $fields as $field ) {
             // Make sure to filter default values (for placeholder text), but not on the form builder page
             if ( ! $is_form_builder ) {
-                $field->default_value = apply_filters('frm_get_default_value', $field->default_value, $field, true );
+                $field->default_value = apply_filters( 'frm_get_default_value', $field->default_value, $field, true );
             }
 			$parent_form_id = isset( $args['parent_form_id'] ) ? $args['parent_form_id'] : $field->form_id;
-			self::fill_field_defaults($field, $record, $values, compact('default', 'post_values', 'frm_settings', 'parent_form_id' ) );
+			self::fill_field_defaults( $field, $record, $values, compact( 'default', 'post_values', 'frm_settings', 'parent_form_id' ) );
         }
 
-        self::fill_form_opts($record, $table, $post_values, $values);
+        self::fill_form_opts( $record, $table, $post_values, $values );
 
         if ( $table == 'entries' ) {
             $values = FrmEntriesHelper::setup_edit_vars( $values, $record );
@@ -989,8 +989,8 @@ 
         if ( $args['default'] ) {
             $meta_value = $field->default_value;
         } else {
-            if ( $record->post_id && self::pro_is_installed() && isset($field->field_options['post_field']) && $field->field_options['post_field'] ) {
-                if ( ! isset($field->field_options['custom_field']) ) {
+            if ( $record->post_id && self::pro_is_installed() && isset( $field->field_options['post_field'] ) && $field->field_options['post_field'] ) {
+                if ( ! isset( $field->field_options['custom_field'] ) ) {
                     $field->field_options['custom_field'] = '';
                 }
 				$meta_value = FrmProEntryMetaHelper::get_post_value( $record->post_id, $field->field_options['post_field'], $field->field_options['custom_field'], array( 'truncate' => false, 'type' => $field->type, 'form_id' => $field->form_id, 'field' => $field ) );
@@ -999,8 +999,8 @@ 
             }
         }
 
-        $field_type = isset( $post_values['field_options'][ 'type_'. $field->id ] ) ? $post_values['field_options'][ 'type_'. $field->id ] : $field->type;
-        $new_value = isset( $post_values['item_meta'][ $field->id ] ) ? maybe_unserialize( $post_values['item_meta'][ $field->id ] ) : $meta_value;
+        $field_type = isset( $post_values['field_options']['type_' . $field->id] ) ? $post_values['field_options']['type_' . $field->id] : $field->type;
+        $new_value = isset( $post_values['item_meta'][$field->id] ) ? maybe_unserialize( $post_values['item_meta'][$field->id] ) : $meta_value;
 
         $field_array = array(
             'id'            => $field->id,
@@ -1008,7 +1008,7 @@ 
             'default_value' => $field->default_value,
             'name'          => $field->name,
             'description'   => $field->description,
-            'type'          => apply_filters('frm_field_type', $field_type, $field, $new_value),
+            'type'          => apply_filters( 'frm_field_type', $field_type, $field, $new_value ),
             'options'       => $field->options,
             'required'      => $field->required,
             'field_key'     => $field->field_key,
@@ -1018,38 +1018,38 @@ 
         );
 
         $args['field_type'] = $field_type;
-        self::fill_field_opts($field, $field_array, $args);
+        self::fill_field_opts( $field, $field_array, $args );
 
-        $field_array = apply_filters('frm_setup_edit_fields_vars', $field_array, $field, $values['id']);
+        $field_array = apply_filters( 'frm_setup_edit_fields_vars', $field_array, $field, $values['id'] );
 
-        if ( ! isset($field_array['unique']) || ! $field_array['unique'] ) {
+        if ( ! isset( $field_array['unique'] ) || ! $field_array['unique'] ) {
             $field_array['unique_msg'] = '';
         }
 
         $field_array = array_merge( $field->field_options, $field_array );
 
-        $values['fields'][ $field->id ] = $field_array;
+        $values['fields'][$field->id] = $field_array;
     }
 
 	private static function fill_field_opts( $field, array &$field_array, $args ) {
         $post_values = $args['post_values'];
-        $opt_defaults = FrmFieldsHelper::get_default_field_opts($field_array['type'], $field, true);
+        $opt_defaults = FrmFieldsHelper::get_default_field_opts( $field_array['type'], $field, true );
 
         foreach ( $opt_defaults as $opt => $default_opt ) {
-            $field_array[ $opt ] = ( $post_values && isset( $post_values['field_options'][ $opt .'_'. $field->id ] ) ) ? maybe_unserialize( $post_values['field_options'][ $opt .'_'. $field->id ] ) : ( isset( $field->field_options[ $opt ] ) ? $field->field_options[ $opt ] : $default_opt );
-            if ( $opt == 'blank' && $field_array[ $opt ] == '' ) {
-                $field_array[ $opt ] = $args['frm_settings']->blank_msg;
-            } else if ( $opt == 'invalid' && $field_array[ $opt ] == '' ) {
+            $field_array[$opt] = ( $post_values && isset( $post_values['field_options'][$opt . '_' . $field->id] ) ) ? maybe_unserialize( $post_values['field_options'][$opt . '_' . $field->id] ) : ( isset( $field->field_options[$opt] ) ? $field->field_options[$opt] : $default_opt );
+            if ( $opt == 'blank' && $field_array[$opt] == '' ) {
+                $field_array[$opt] = $args['frm_settings']->blank_msg;
+            } else if ( $opt == 'invalid' && $field_array[$opt] == '' ) {
                 if ( $args['field_type'] == 'captcha' ) {
-                    $field_array[ $opt ] = $args['frm_settings']->re_msg;
+                    $field_array[$opt] = $args['frm_settings']->re_msg;
                 } else {
-                    $field_array[ $opt ] = sprintf( __( '%s is invalid', 'formidable' ), $field_array['name'] );
+                    $field_array[$opt] = sprintf( __( '%s is invalid', 'formidable' ), $field_array['name'] );
                 }
             }
         }
 
         if ( $field_array['custom_html'] == '' ) {
-            $field_array['custom_html'] = FrmFieldsHelper::get_default_html($args['field_type']);
+            $field_array['custom_html'] = FrmFieldsHelper::get_default_html( $args['field_type'] );
         }
     }
 
@@ -1068,18 +1068,18 @@ 
             return;
         }
 
-        $values['form_name'] = isset($record->form_id) ? $form->name : '';
+        $values['form_name'] = isset( $record->form_id ) ? $form->name : '';
 		$values['parent_form_id'] = isset( $record->form_id ) ? $form->parent_form_id : 0;
 
-        if ( ! is_array($form->options) ) {
+        if ( ! is_array( $form->options ) ) {
             return;
         }
 
         foreach ( $form->options as $opt => $value ) {
-            $values[ $opt ] = isset( $post_values[ $opt ] ) ? maybe_unserialize( $post_values[ $opt ] ) : $value;
+            $values[$opt] = isset( $post_values[$opt] ) ? maybe_unserialize( $post_values[$opt] ) : $value;
         }
 
-        self::fill_form_defaults($post_values, $values);
+        self::fill_form_defaults( $post_values, $values );
     }
 
     /**
@@ -1089,23 +1089,23 @@ 
         $form_defaults = FrmFormsHelper::get_default_opts();
 
         foreach ( $form_defaults as $opt => $default ) {
-            if ( ! isset( $values[ $opt ] ) || $values[ $opt ] == '' ) {
-				$values[ $opt ] = ( $post_values && isset( $post_values['options'][ $opt ] ) ) ? $post_values['options'][ $opt ] : $default;
+            if ( ! isset( $values[$opt] ) || $values[$opt] == '' ) {
+				$values[$opt] = ( $post_values && isset( $post_values['options'][$opt] ) ) ? $post_values['options'][$opt] : $default;
             }
 
-            unset($opt, $defaut);
+            unset( $opt, $defaut );
         }
 
-        if ( ! isset($values['custom_style']) ) {
+        if ( ! isset( $values['custom_style'] ) ) {
             $frm_settings = self::get_settings();
 			$values['custom_style'] = ( $post_values && isset( $post_values['options']['custom_style'] ) ) ? absint( $_POST['options']['custom_style'] ) : ( $frm_settings->load_style != 'none' );
         }
 
 		foreach ( array( 'before', 'after', 'submit' ) as $h ) {
-            if ( ! isset( $values[ $h .'_html' ] ) ) {
-                $values[ $h .'_html' ] = ( isset( $post_values['options'][ $h .'_html' ] ) ? $post_values['options'][ $h .'_html' ] : FrmFormsHelper::get_default_html( $h ) );
+            if ( ! isset( $values[$h . '_html'] ) ) {
+                $values[$h . '_html'] = ( isset( $post_values['options'][$h . '_html'] ) ? $post_values['options'][$h . '_html'] : FrmFormsHelper::get_default_html( $h ) );
             }
-            unset($h);
+            unset( $h );
         }
     }
 
@@ -1121,9 +1121,9 @@ 
         }
     ?>
 <li>
-    <a href="javascript:void(0)" class="frmids frm_insert_code alignright <?php echo esc_attr($class) ?>" data-code="<?php echo esc_attr($args['id']) ?>" >[<?php echo esc_attr( $args['id'] ) ?>]</a>
-    <a href="javascript:void(0)" class="frmkeys frm_insert_code alignright <?php echo esc_attr($class) ?>" data-code="<?php echo esc_attr($args['key']) ?>" >[<?php echo esc_attr( self::truncate($args['key'], 10) ) ?>]</a>
-    <a href="javascript:void(0)" class="frm_insert_code <?php echo esc_attr( $class ) ?>" data-code="<?php echo esc_attr($args['id']) ?>" ><?php echo esc_attr( self::truncate($args['name'], 60) ) ?></a>
+    <a href="javascript:void(0)" class="frmids frm_insert_code alignright <?php echo esc_attr( $class ) ?>" data-code="<?php echo esc_attr( $args['id'] ) ?>" >[<?php echo esc_attr( $args['id'] ) ?>]</a>
+    <a href="javascript:void(0)" class="frmkeys frm_insert_code alignright <?php echo esc_attr( $class ) ?>" data-code="<?php echo esc_attr( $args['key'] ) ?>" >[<?php echo esc_attr( self::truncate( $args['key'], 10 ) ) ?>]</a>
+    <a href="javascript:void(0)" class="frm_insert_code <?php echo esc_attr( $class ) ?>" data-code="<?php echo esc_attr( $args['id'] ) ?>" ><?php echo esc_attr( self::truncate( $args['name'], 60 ) ) ?></a>
 </li>
     <?php
     }
@@ -1151,7 +1151,7 @@ 
             return '';
         } else if ( $length <= 10 ) {
 			$sub = self::mb_function( array( 'mb_substr', 'substr' ), array( $str, 0, $length ) );
-            return $sub . (($length < $original_len) ? $continue : '');
+            return $sub . ( ( $length < $original_len ) ? $continue : '' );
         }
 
         $sub = '';
@@ -1160,23 +1160,23 @@ 
 		$words = self::mb_function( array( 'mb_split', 'explode' ), array( ' ', $str ) );
 
 		foreach ( $words as $word ) {
-            $part = (($sub != '') ? ' ' : '') . $word;
+            $part = ( ( $sub != '' ) ? ' ' : '' ) . $word;
 			$total_len = self::mb_function( array( 'mb_strlen', 'strlen' ), array( $sub . $part ) );
-            if ( $total_len > $length && str_word_count($sub) ) {
+            if ( $total_len > $length && str_word_count( $sub ) ) {
                 break;
             }
 
             $sub .= $part;
 			$len += self::mb_function( array( 'mb_strlen', 'strlen' ), array( $part ) );
 
-            if ( str_word_count($sub) > $minword && $total_len >= $length ) {
+            if ( str_word_count( $sub ) > $minword && $total_len >= $length ) {
                 break;
             }
 
-            unset($total_len, $word);
+            unset( $total_len, $word );
         }
 
-        return $sub . (($len < $original_len) ? $continue : '');
+        return $sub . ( ( $len < $original_len ) ? $continue : '' );
     }
 
 	public static function mb_function( $function_names, $args ) {
@@ -1189,17 +1189,17 @@ 
 	}
 
 	public static function get_formatted_time( $date, $date_format = '', $time_format = '' ) {
-        if ( empty($date) ) {
+        if ( empty( $date ) ) {
             return $date;
         }
 
-        if ( empty($date_format) ) {
-            $date_format = get_option('date_format');
+        if ( empty( $date_format ) ) {
+            $date_format = get_option( 'date_format' );
         }
 
-        if ( preg_match('/^\d{1-2}\/\d{1-2}\/\d{4}$/', $date) && self::pro_is_installed() ) {
+        if ( preg_match( '/^\d{1-2}\/\d{1-2}\/\d{4}$/', $date ) && self::pro_is_installed() ) {
             $frmpro_settings = new FrmProSettings();
-            $date = FrmProAppHelper::convert_date($date, $frmpro_settings->date_format, 'Y-m-d');
+            $date = FrmProAppHelper::convert_date( $date, $frmpro_settings->date_format, 'Y-m-d' );
         }
 
 		$formatted = self::get_localized_date( $date_format, $date );
@@ -1214,7 +1214,7 @@ 
 
 	private static function add_time_to_date( $time_format, $date ) {
 		if ( empty( $time_format ) ) {
-			$time_format = get_option('time_format');
+			$time_format = get_option( 'time_format' );
 		}
 
 		$trimmed_format = trim( $time_format );
@@ -1260,10 +1260,10 @@ 
 		$time_strings = self::get_time_strings();
 
 		foreach ( $time_strings as $k => $v ) {
-			if ( $diff[ $k ] ) {
-				$time_strings[ $k ] = $diff[ $k ] . ' ' . ( $diff[ $k ] > 1 ? $v[1] : $v[0] );
+			if ( $diff[$k] ) {
+				$time_strings[$k] = $diff[$k] . ' ' . ( $diff[$k] > 1 ? $v[1] : $v[0] );
 			} else {
-				unset( $time_strings[ $k ] );
+				unset( $time_strings[$k] );
 			}
 		}
 
@@ -1301,7 +1301,7 @@ 
      */
 	public static function esc_like( $term ) {
         global $wpdb;
-        if ( method_exists($wpdb, 'esc_like') ) {
+        if ( method_exists( $wpdb, 'esc_like' ) ) {
 			// WP 4.0
             $term = $wpdb->esc_like( $term );
         } else {
@@ -1315,17 +1315,17 @@ 
      * @param string $order_query
      */
 	public static function esc_order( $order_query ) {
-        if ( empty($order_query) ) {
+        if ( empty( $order_query ) ) {
             return '';
         }
 
         // remove ORDER BY before santizing
-        $order_query = strtolower($order_query);
-        if ( strpos($order_query, 'order by') !== false ) {
-            $order_query = str_replace('order by', '', $order_query);
+        $order_query = strtolower( $order_query );
+        if ( strpos( $order_query, 'order by' ) !== false ) {
+            $order_query = str_replace( 'order by', '', $order_query );
         }
 
-        $order_query = explode(' ', trim($order_query));
+        $order_query = explode( ' ', trim( $order_query ) );
 
         $order_fields = array(
             'id', 'form_key', 'name', 'description',
@@ -1333,18 +1333,18 @@ 
             'default_template', 'status', 'created_at',
         );
 
-        $order = trim(trim(reset($order_query), ','));
-        if ( ! in_array($order, $order_fields) ) {
+        $order = trim( trim( reset( $order_query ), ',' ) );
+        if ( ! in_array( $order, $order_fields ) ) {
             return '';
         }
 
         $order_by = '';
-        if ( count($order_query) > 1 ) {
+        if ( count( $order_query ) > 1 ) {
 			$order_by = end( $order_query );
 			self::esc_order_by( $order_by );
         }
 
-        return ' ORDER BY '. $order . ' '. $order_by;
+        return ' ORDER BY ' . $order . ' ' . $order_by;
     }
 
 	/**
@@ -1361,24 +1361,24 @@ 
      * @param string $limit
      */
 	public static function esc_limit( $limit ) {
-        if ( empty($limit) ) {
+        if ( empty( $limit ) ) {
             return '';
         }
 
-        $limit = trim(str_replace(' limit', '', strtolower($limit)));
-        if ( is_numeric($limit) ) {
-            return ' LIMIT '. $limit;
+        $limit = trim( str_replace( ' limit', '', strtolower( $limit ) ) );
+        if ( is_numeric( $limit ) ) {
+            return ' LIMIT ' . $limit;
         }
 
-        $limit = explode(',', trim($limit));
+        $limit = explode( ',', trim( $limit ) );
         foreach ( $limit as $k => $l ) {
             if ( is_numeric( $l ) ) {
-                $limit[ $k ] = $l;
+                $limit[$k] = $l;
             }
         }
 
-        $limit = implode(',', $limit);
-        return ' LIMIT '. $limit;
+        $limit = implode( ',', $limit );
+        return ' LIMIT ' . $limit;
     }
 
     /**
@@ -1386,12 +1386,12 @@ 
      * @since 2.0
      */
     public static function prepare_array_values( $array, $type = '%s' ) {
-        $placeholders = array_fill(0, count($array), $type);
-        return implode(', ', $placeholders);
+        $placeholders = array_fill( 0, count( $array ), $type );
+        return implode( ', ', $placeholders );
     }
 
     public static function prepend_and_or_where( $starts_with = ' WHERE ', $where = '' ) {
-        if ( empty($where) ) {
+        if ( empty( $where ) ) {
             return '';
         }
 
@@ -1437,7 +1437,7 @@ 
 
     public static function get_referer_info() {
         _deprecated_function( __FUNCTION__, '2.0', 'FrmAppHelper::get_server_value' );
-        return self::get_server_value('HTTP_REFERER');
+        return self::get_server_value( 'HTTP_REFERER' );
     }
 
 	/**
@@ -1446,19 +1446,19 @@ 
 	public static function json_to_array( $json_vars ) {
         $vars = array();
         foreach ( $json_vars as $jv ) {
-            $jv_name = explode('[', $jv['name']);
-            $last = count($jv_name) - 1;
+            $jv_name = explode( '[', $jv['name'] );
+            $last = count( $jv_name ) - 1;
             foreach ( $jv_name as $p => $n ) {
-                $name = trim($n, ']');
-                if ( ! isset($l1) ) {
+                $name = trim( $n, ']' );
+                if ( ! isset( $l1 ) ) {
                     $l1 = $name;
                 }
 
-                if ( ! isset($l2) ) {
+                if ( ! isset( $l2 ) ) {
                     $l2 = $name;
                 }
 
-                if ( ! isset($l3) ) {
+                if ( ! isset( $l3 ) ) {
                     $l3 = $name;
                 }
 
@@ -1472,24 +1472,24 @@ 
 
                     case 1:
                         $l2 = $name;
-                        self::add_value_to_array( $name, $l2, $this_val, $vars[ $l1 ] );
+                        self::add_value_to_array( $name, $l2, $this_val, $vars[$l1] );
                     break;
 
                     case 2:
                         $l3 = $name;
-                        self::add_value_to_array( $name, $l3, $this_val, $vars[ $l1 ][ $l2 ] );
+                        self::add_value_to_array( $name, $l3, $this_val, $vars[$l1][$l2] );
                     break;
 
                     case 3:
                         $l4 = $name;
-                        self::add_value_to_array( $name, $l4, $this_val, $vars[ $l1 ][ $l2 ][ $l3 ] );
+                        self::add_value_to_array( $name, $l4, $this_val, $vars[$l1][$l2][$l3] );
                     break;
                 }
 
-                unset($this_val, $n);
+                unset( $this_val, $n );
             }
 
-            unset($last, $jv);
+            unset( $last, $jv );
         }
 
         return $vars;
@@ -1502,8 +1502,8 @@ 
     public static function add_value_to_array( $name, $l1, $val, &$vars ) {
         if ( $name == '' ) {
             $vars[] = $val;
-        } else if ( ! isset( $vars[ $l1 ] ) ) {
-            $vars[ $l1 ] = $val;
+        } else if ( ! isset( $vars[$l1] ) ) {
+            $vars[$l1] = $val;
         }
     }
 
@@ -1518,7 +1518,7 @@ 
             'email_subject' => esc_attr( sprintf( __( 'If you leave the subject blank, the default will be used: %1$s Form submitted on %2$s', 'formidable' ), $form_name, self::site_name() ) ),
         );
 
-        if ( ! isset( $tooltips[ $name ] ) ) {
+        if ( ! isset( $tooltips[$name] ) ) {
             return;
         }
 
@@ -1528,7 +1528,7 @@ 
             echo ' class="frm_help"';
         }
 
-        echo ' title="'. esc_attr( $tooltips[ $name ] );
+        echo ' title="' . esc_attr( $tooltips[$name] );
 
         if ( 'open' != $class ) {
             echo '"';
@@ -1580,13 +1580,13 @@ 
     }
 
 	private static function prepare_action_slashes( $val, $key, &$post_content ) {
-		if ( ! isset( $post_content[ $key ] ) ) {
+		if ( ! isset( $post_content[$key] ) ) {
 			return;
 		}
 
 		if ( is_array( $val ) ) {
 			foreach ( $val as $k1 => $v1 ) {
-				self::prepare_action_slashes( $v1, $k1, $post_content[ $key ] );
+				self::prepare_action_slashes( $v1, $k1, $post_content[$key] );
 				unset( $k1, $v1 );
 			}
 		} else {
@@ -1594,7 +1594,7 @@ 
 			$val = stripslashes( $val );
 
 			// Add backslashes before double quotes and forward slashes only
-			$post_content[ $key ] = addcslashes( $val, '"\\/' );
+			$post_content[$key] = addcslashes( $val, '"\\/' );
 		}
 	}
 
@@ -1611,7 +1611,7 @@ 
 		$settings['post_content'] = FrmAppHelper::prepare_and_encode( $settings['post_content'] );
 
 		if ( empty( $settings['ID'] ) ) {
-			unset( $settings['ID']);
+			unset( $settings['ID'] );
 		}
 
 		// delete all caches for this group
@@ -1645,17 +1645,17 @@ 
 	}
 
 	public static function maybe_json_decode( $string ) {
-        if ( is_array($string) ) {
+        if ( is_array( $string ) ) {
             return $string;
         }
 
-        $new_string = json_decode($string, true);
-        if ( function_exists('json_last_error') ) {
+        $new_string = json_decode( $string, true );
+        if ( function_exists( 'json_last_error' ) ) {
 			// php 5.3+
             if ( json_last_error() == JSON_ERROR_NONE ) {
                 $string = $new_string;
             }
-        } else if ( isset($new_string) ) {
+        } else if ( isset( $new_string ) ) {
 			// php < 5.3 fallback
             $string = $new_string;
         }
@@ -1671,11 +1671,11 @@ 
 	public static function maybe_highlight_menu( $post_type ) {
         global $post, $pagenow;
 
-        if ( isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != $post_type ) {
+        if ( isset( $_REQUEST['post_type'] ) && $_REQUEST['post_type'] != $post_type ) {
             return;
         }
 
-        if ( is_object($post) && $post->post_type != $post_type ) {
+        if ( is_object( $post ) && $post->post_type != $post_type ) {
             return;
         }
 
@@ -1773,11 +1773,11 @@ 
         $frm_version = self::plugin_version();
 
         // check if Formidable meets minimum requirements
-        if ( version_compare($frm_version, $min_version, '>=') ) {
+        if ( version_compare( $frm_version, $min_version, '>=' ) ) {
             return;
         }
 
-        $wp_list_table = _get_list_table('WP_Plugins_List_Table');
+        $wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
 		echo '<tr class="plugin-update-tr active"><th colspan="' . absint( $wp_list_table->get_column_count() ) . '" class="check-column plugin-update colspanchange"><div class="update-message">' .
         __( 'You are running an outdated version of Formidable. This plugin may not work correctly if you do not update Formidable.', 'formidable' ) .
         '</div></td></tr>';
@@ -1785,38 +1785,38 @@ 
 
     public static function locales( $type = 'date' ) {
         $locales = array(
-            'en' => __( 'English', 'formidable' ),    '' => __( 'English/Western', 'formidable' ),
-            'af' => __( 'Afrikaans', 'formidable' ),  'sq' => __( 'Albanian', 'formidable' ),
-            'ar' => __( 'Arabic', 'formidable' ),     'hy' => __( 'Armenian', 'formidable' ),
+            'en' => __( 'English', 'formidable' ), '' => __( 'English/Western', 'formidable' ),
+            'af' => __( 'Afrikaans', 'formidable' ), 'sq' => __( 'Albanian', 'formidable' ),
+            'ar' => __( 'Arabic', 'formidable' ), 'hy' => __( 'Armenian', 'formidable' ),
             'az' => __( 'Azerbaijani', 'formidable' ), 'eu' => __( 'Basque', 'formidable' ),
-            'bs' => __( 'Bosnian', 'formidable' ),    'bg' => __( 'Bulgarian', 'formidable' ),
-            'ca' => __( 'Catalan', 'formidable' ),    'zh-HK' => __( 'Chinese Hong Kong', 'formidable' ),
+            'bs' => __( 'Bosnian', 'formidable' ), 'bg' => __( 'Bulgarian', 'formidable' ),
+            'ca' => __( 'Catalan', 'formidable' ), 'zh-HK' => __( 'Chinese Hong Kong', 'formidable' ),
             'zh-CN' => __( 'Chinese Simplified', 'formidable' ), 'zh-TW' => __( 'Chinese Traditional', 'formidable' ),
-            'hr' => __( 'Croatian', 'formidable' ),   'cs' => __( 'Czech', 'formidable' ),
-            'da' => __( 'Danish', 'formidable' ),     'nl' => __( 'Dutch', 'formidable' ),
+            'hr' => __( 'Croatian', 'formidable' ), 'cs' => __( 'Czech', 'formidable' ),
+            'da' => __( 'Danish', 'formidable' ), 'nl' => __( 'Dutch', 'formidable' ),
             'en-GB' => __( 'English/UK', 'formidable' ), 'eo' => __( 'Esperanto', 'formidable' ),
-            'et' => __( 'Estonian', 'formidable' ),   'fo' => __( 'Faroese', 'formidable' ),
+            'et' => __( 'Estonian', 'formidable' ), 'fo' => __( 'Faroese', 'formidable' ),
             'fa' => __( 'Farsi/Persian', 'formidable' ), 'fil' => __( 'Filipino', 'formidable' ),
-            'fi' => __( 'Finnish', 'formidable' ),    'fr' => __( 'French', 'formidable' ),
+            'fi' => __( 'Finnish', 'formidable' ), 'fr' => __( 'French', 'formidable' ),
             'fr-CA' => __( 'French/Canadian', 'formidable' ), 'fr-CH' => __( 'French/Swiss', 'formidable' ),
-            'de' => __( 'German', 'formidable' ),     'de-AT' => __( 'German/Austria', 'formidable' ),
+            'de' => __( 'German', 'formidable' ), 'de-AT' => __( 'German/Austria', 'formidable' ),
             'de-CH' => __( 'German/Switzerland', 'formidable' ), 'el' => __( 'Greek', 'formidable' ),
-            'he' => __( 'Hebrew', 'formidable' ),     'iw' => __( 'Hebrew', 'formidable' ),
-            'hi' => __( 'Hindi', 'formidable' ),      'hu' => __( 'Hungarian', 'formidable' ),
-            'is' => __( 'Icelandic', 'formidable' ),  'id' => __( 'Indonesian', 'formidable' ),
-            'it' => __( 'Italian', 'formidable' ),    'ja' => __( 'Japanese', 'formidable' ),
-            'ko' => __( 'Korean', 'formidable' ),     'lv' => __( 'Latvian', 'formidable' ),
+            'he' => __( 'Hebrew', 'formidable' ), 'iw' => __( 'Hebrew', 'formidable' ),
+            'hi' => __( 'Hindi', 'formidable' ), 'hu' => __( 'Hungarian', 'formidable' ),
+            'is' => __( 'Icelandic', 'formidable' ), 'id' => __( 'Indonesian', 'formidable' ),
+            'it' => __( 'Italian', 'formidable' ), 'ja' => __( 'Japanese', 'formidable' ),
+            'ko' => __( 'Korean', 'formidable' ), 'lv' => __( 'Latvian', 'formidable' ),
             'lt' => __( 'Lithuanian', 'formidable' ), 'ms' => __( 'Malaysian', 'formidable' ),
-            'no' => __( 'Norwegian', 'formidable' ),  'pl' => __( 'Polish', 'formidable' ),
+            'no' => __( 'Norwegian', 'formidable' ), 'pl' => __( 'Polish', 'formidable' ),
             'pt' => __( 'Portuguese', 'formidable' ), 'pt-BR' => __( 'Portuguese/Brazilian', 'formidable' ),
             'pt-PT' => __( 'Portuguese/Portugal', 'formidable' ), 'ro' => __( 'Romanian', 'formidable' ),
-            'ru' => __( 'Russian', 'formidable' ),    'sr' => __( 'Serbian', 'formidable' ),
+            'ru' => __( 'Russian', 'formidable' ), 'sr' => __( 'Serbian', 'formidable' ),
             'sr-SR' => __( 'Serbian', 'formidable' ), 'sk' => __( 'Slovak', 'formidable' ),
-            'sl' => __( 'Slovenian', 'formidable' ),  'es' => __( 'Spanish', 'formidable' ),
+            'sl' => __( 'Slovenian', 'formidable' ), 'es' => __( 'Spanish', 'formidable' ),
             'es-419' => __( 'Spanish/Latin America', 'formidable' ), 'sv' => __( 'Swedish', 'formidable' ),
-            'ta' => __( 'Tamil', 'formidable' ),      'th' => __( 'Thai', 'formidable' ),
-            'tu' => __( 'Turkish', 'formidable' ),    'tr' => __( 'Turkish', 'formidable' ),
-            'uk' => __( 'Ukranian', 'formidable' ),   'vi' => __( 'Vietnamese', 'formidable' ),
+            'ta' => __( 'Tamil', 'formidable' ), 'th' => __( 'Thai', 'formidable' ),
+            'tu' => __( 'Turkish', 'formidable' ), 'tr' => __( 'Turkish', 'formidable' ),
+            'uk' => __( 'Ukranian', 'formidable' ), 'vi' => __( 'Vietnamese', 'formidable' ),
         );
 
         if ( $type == 'captcha' ) {
@@ -1835,8 +1835,8 @@ 
             );
         }
 
-        $locales = array_diff_key($locales, array_flip($unset));
-        $locales = apply_filters('frm_locales', $locales);
+        $locales = array_diff_key( $locales, array_flip( $unset ) );
+        $locales = apply_filters( 'frm_locales', $locales );
 
         return $locales;
     }