Strategy11 / formidable-forms

classes/views/styles/_buttons.php

Spacing +22 added lines, -22 removed lines

@@ -1,6 +1,6 @@ 
 <p class="frm_no_top_margin">
 	<label for="frm_submit_style">
-		<input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name('submit_style') ) ?>" id="frm_submit_style" <?php checked( $style->post_content['submit_style'], 1 ) ?> value="1" />
+		<input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_style' ) ) ?>" id="frm_submit_style" <?php checked( $style->post_content['submit_style'], 1 ) ?> value="1" />
 		<?php esc_html_e( 'Disable submit button styling', 'formidable' ); ?>
 		<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Note: If disabled, you may not see the change take effect until you make 2 more styling changes or click "Update Options".', 'formidable' ) ?>"></span>
 	</label>
@@ -9,10 +9,10 @@ 
 <div class="posttypediv">
 	<ul class="posttype-tabs add-menu-item-tabs">
 		<li <?php echo ( 'default' == $current_tab ? ' class="tabs"' : '' ); ?>>
-    		<a href="<?php echo esc_url('?page=formidable-styles&page-tab=default#tabs-panel-button-default') ?>" class="nav-tab-link" data-type="tabs-panel-button-default" ><?php _e( 'Default', 'formidable' ) ?></a>
+    		<a href="<?php echo esc_url( '?page=formidable-styles&page-tab=default#tabs-panel-button-default' ) ?>" class="nav-tab-link" data-type="tabs-panel-button-default" ><?php _e( 'Default', 'formidable' ) ?></a>
     	</li>
 		<li <?php echo ( 'button-hover' == $current_tab ? ' class="tabs"' : '' ); ?>>
-			<a href="<?php echo esc_url('?page=formidable-styles&page-tab=button-hover#page-button-hover') ?>" class="nav-tab-link" data-type="tabs-panel-button-hover" ><?php _e( 'Hover', 'formidable' ) ?></a>
+			<a href="<?php echo esc_url( '?page=formidable-styles&page-tab=button-hover#page-button-hover' ) ?>" class="nav-tab-link" data-type="tabs-panel-button-hover" ><?php _e( 'Hover', 'formidable' ) ?></a>
 		</li>
 		<li <?php echo ( 'button-click' == $current_tab ? ' class="tabs"' : '' ); ?>>
 			<a href="?page=formidable-styles&page-tab=button-click#tabs-panel-button-click" class="nav-tab-link" data-type="tabs-panel-button-click"><?php _e( 'Click', 'formidable' ) ?></a>
@@ -24,22 +24,22 @@ 
 	?>">
 	    <div class="field-group field-group-border clearfix">
         	<label><?php _e( 'Size', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_font_size') ) ?>" id="frm_submit_font_size" value="<?php echo esc_attr( $style->post_content['submit_font_size'] ) ?>"  size="3" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_font_size' ) ) ?>" id="frm_submit_font_size" value="<?php echo esc_attr( $style->post_content['submit_font_size'] ) ?>"  size="3" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Width', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_width') ) ?>" id="frm_submit_width" value="<?php echo esc_attr( $style->post_content['submit_width'] ) ?>"  size="5" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_width' ) ) ?>" id="frm_submit_width" value="<?php echo esc_attr( $style->post_content['submit_width'] ) ?>"  size="5" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Height', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_height') ) ?>" id="frm_submit_height" value="<?php echo esc_attr( $style->post_content['submit_height'] ) ?>"  size="5" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_height' ) ) ?>" id="frm_submit_height" value="<?php echo esc_attr( $style->post_content['submit_height'] ) ?>"  size="5" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Weight', 'formidable' ) ?></label>
-        	<select name="<?php echo esc_attr( $frm_style->get_field_name('submit_weight') ) ?>" id="frm_submit_weight">
+        	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_weight' ) ) ?>" id="frm_submit_weight">
 				<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
 				<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['submit_weight'], $value ) ?>><?php echo esc_html( $name ) ?></option>
 				<?php } ?>
@@ -48,48 +48,48 @@ 
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Corners', 'formidable' ) ?></label>
-        	<input type="text" value="<?php echo esc_attr( $style->post_content['submit_border_radius'] ) ?>" name="<?php echo esc_attr( $frm_style->get_field_name('submit_border_radius') ) ?>" id="frm_submit_border_radius" size="4"/>
+        	<input type="text" value="<?php echo esc_attr( $style->post_content['submit_border_radius'] ) ?>" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_border_radius' ) ) ?>" id="frm_submit_border_radius" size="4"/>
         </div>
 
         <div class="field-group field-group-border clearfix">
         	<label><?php _e( 'BG Color', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_bg_color') ) ?>" id="frm_submit_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_bg_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_bg_color' ) ) ?>" id="frm_submit_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_bg_color'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Text', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_text_color') ) ?>" id="frm_submit_text_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_text_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_text_color' ) ) ?>" id="frm_submit_text_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_text_color'] ) ?>" />
         </div>
 
         <div class="field-group field-group-border clearfix">
         	<label><?php _e( 'Border', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_border_color') ) ?>" id="frm_submit_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_border_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_border_color' ) ) ?>" id="frm_submit_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_border_color'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Thickness', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_border_width') ) ?>" id="frm_submit_border_width" value="<?php echo esc_attr( $style->post_content['submit_border_width'] ) ?>" size="4" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_border_width' ) ) ?>" id="frm_submit_border_width" value="<?php echo esc_attr( $style->post_content['submit_border_width'] ) ?>" size="4" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Shadow', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_shadow_color') ) ?>" id="frm_submit_shadow_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_shadow_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_shadow_color' ) ) ?>" id="frm_submit_shadow_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_shadow_color'] ) ?>" />
         </div>
 
         <div class="clear"></div>
         <div class="field-group field-group-border frm-full">
         	<label><?php _e( 'BG Image', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_bg_img') ) ?>" id="frm_submit_bg_img" value="<?php echo esc_attr( $style->post_content['submit_bg_img'] ) ?>"  />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_bg_img' ) ) ?>" id="frm_submit_bg_img" value="<?php echo esc_attr( $style->post_content['submit_bg_img'] ) ?>"  />
         </div>
 
         <div class="field-group field-group-border clearfix">
         	<label><?php _e( 'Margin', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_margin') ) ?>" id="frm_submit_margin" value="<?php echo esc_attr( $style->post_content['submit_margin'] ) ?>" size="6" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_margin' ) ) ?>" id="frm_submit_margin" value="<?php echo esc_attr( $style->post_content['submit_margin'] ) ?>" size="6" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Padding', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_padding') ) ?>" id="frm_submit_padding" value="<?php echo esc_attr( $style->post_content['submit_padding'] ) ?>" size="6" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_padding' ) ) ?>" id="frm_submit_padding" value="<?php echo esc_attr( $style->post_content['submit_padding'] ) ?>" size="6" />
         </div>
         <div class="clear"></div>
 	</div><!-- /.tabs-panel -->
@@ -99,17 +99,17 @@ 
 	?>">
 	    <div class="field-group clearfix">
         	<label><?php _e( 'BG Color', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_hover_bg_color') ) ?>" id="frm_submit_hover_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_bg_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_hover_bg_color' ) ) ?>" id="frm_submit_hover_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_bg_color'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
     	    <label><?php _e( 'Text', 'formidable' ) ?></label>
-    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_hover_color') ) ?>" id="frm_submit_hover_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_color'] ) ?>" />
+    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_hover_color' ) ) ?>" id="frm_submit_hover_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_color'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
             <label><?php _e( 'Border', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_hover_border_color') ) ?>" id="frm_submit_hover_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_border_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_hover_border_color' ) ) ?>" id="frm_submit_hover_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_border_color'] ) ?>" />
         </div>
 
 	    <div class="clear"></div>
@@ -120,17 +120,17 @@ 
 	?>">
 	    <div class="field-group clearfix">
         	<label><?php _e( 'BG Color', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_active_bg_color') ) ?>" id="frm_submit_active_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_bg_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_active_bg_color' ) ) ?>" id="frm_submit_active_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_bg_color'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
     	    <label><?php _e( 'Text', 'formidable' ) ?></label>
-    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_active_color') ) ?>" id="frm_submit_active_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_color'] ) ?>" />
+    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_active_color' ) ) ?>" id="frm_submit_active_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_color'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
             <label><?php _e( 'Border', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_active_border_color') ) ?>" id="frm_submit_active_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_border_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_active_border_color' ) ) ?>" id="frm_submit_active_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_border_color'] ) ?>" />
         </div>
 
 	    <div class="clear"></div>

classes/views/styles/_field-description.php

Spacing +10 added lines, -10 removed lines

@@ -1,10 +1,10 @@ 
 <div class="field-group field-group-background clearfix frm-first-row">
 	<label><?php _e( 'Color', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('description_color') ) ?>" id="frm_description_color" class="hex" value="<?php echo esc_attr( $style->post_content['description_color'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'description_color' ) ) ?>" id="frm_description_color" class="hex" value="<?php echo esc_attr( $style->post_content['description_color'] ) ?>" />
 </div>
 <div class="field-group clearfix frm-first-row">
 	<label><?php _e( 'Weight', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('description_weight') ) ?>" id="frm_description_weight">
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'description_weight' ) ) ?>" id="frm_description_weight">
 		<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
 		<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['description_weight'], $value ) ?>><?php echo esc_html( $name ) ?></option>
 		<?php } ?>
@@ -12,25 +12,25 @@ 
 </div>
 <div class="field-group clearfix frm-first-row">
 	<label><?php _e( 'Style', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('description_style') ) ?>" id="frm_description_style">
-		<option value="normal" <?php selected($style->post_content['description_style'], 'normal') ?>><?php _e( 'normal', 'formidable' ) ?></option>
-		<option value="italic" <?php selected($style->post_content['description_style'], 'italic') ?>><?php _e( 'italic', 'formidable' ) ?></option>
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'description_style' ) ) ?>" id="frm_description_style">
+		<option value="normal" <?php selected( $style->post_content['description_style'], 'normal' ) ?>><?php _e( 'normal', 'formidable' ) ?></option>
+		<option value="italic" <?php selected( $style->post_content['description_style'], 'italic' ) ?>><?php _e( 'italic', 'formidable' ) ?></option>
 	</select>
 </div>
 
 <div class="field-group clearfix">
 	<label><?php _e( 'Size', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('description_font_size') ) ?>" id="frm_description_font_size" value="<?php echo esc_attr( $style->post_content['description_font_size'] ) ?>"  size="3" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'description_font_size' ) ) ?>" id="frm_description_font_size" value="<?php echo esc_attr( $style->post_content['description_font_size'] ) ?>"  size="3" />
 </div>
 <div class="field-group clearfix">
 	<label><?php _e( 'Align', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('description_align') ) ?>" id="frm_description_align">
-		<option value="left" <?php selected($style->post_content['description_align'], 'left') ?>><?php _e( 'left', 'formidable' ) ?></option>
-		<option value="right" <?php selected($style->post_content['description_align'], 'right') ?>><?php _e( 'right', 'formidable' ) ?></option>
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'description_align' ) ) ?>" id="frm_description_align">
+		<option value="left" <?php selected( $style->post_content['description_align'], 'left' ) ?>><?php _e( 'left', 'formidable' ) ?></option>
+		<option value="right" <?php selected( $style->post_content['description_align'], 'right' ) ?>><?php _e( 'right', 'formidable' ) ?></option>
 	</select>
 </div>
 <div class="field-group clearfix">
 	<label><?php _e( 'Margin', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('description_margin') ) ?>" id="frm_description_margin" value="<?php echo esc_attr( $style->post_content['description_margin'] ) ?>"  size="3" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'description_margin' ) ) ?>" id="frm_description_margin" value="<?php echo esc_attr( $style->post_content['description_margin'] ) ?>"  size="3" />
 </div>
 <div class="clear"></div>

classes/models/FrmDb.php

Doc Comments +1 added lines, -1 removed lines

@@ -308,7 +308,7 @@
 	 *
 	 * @since 2.02.05
 	 * @param string $key
-	 * @param int|string $value
+	 * @param string $value
 	 * @param string $where
 	 */
     private static function add_query_placeholder( $key, $value, &$where ) {

Spacing +50 added lines, -50 removed lines

@@ -7,8 +7,8 @@ 
     var $entry_metas;
 
     public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
+        if ( ! defined( 'ABSPATH' ) ) {
+            die( 'You are not allowed to call this page directly.' );
         }
 
         global $wpdb;
@@ -24,7 +24,7 @@ 
         $frm_db_version = FrmAppHelper::$db_version;
         $old_db_version = (float) $old_db_version;
         if ( ! $old_db_version ) {
-            $old_db_version = get_option('frm_db_version');
+            $old_db_version = get_option( 'frm_db_version' );
         }
 
         if ( $frm_db_version != $old_db_version ) {
@@ -34,16 +34,16 @@ 
 			require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
             $this->create_tables();
-            $this->migrate_data($frm_db_version, $old_db_version);
+            $this->migrate_data( $frm_db_version, $old_db_version );
 
             /***** SAVE DB VERSION *****/
-            update_option('frm_db_version', $frm_db_version);
+            update_option( 'frm_db_version', $frm_db_version );
 
             /**** ADD/UPDATE DEFAULT TEMPLATES ****/
             FrmXMLController::add_default_templates();
         }
 
-        do_action('frm_after_install');
+        do_action( 'frm_after_install' );
 
         /**** update the styling settings ****/
 		if ( is_admin() && function_exists( 'get_filesystem_method' ) ) {
@@ -153,7 +153,7 @@ 
 				global $wpdb;
 				$wpdb->query( $q . $charset_collate );
 			}
-            unset($q);
+            unset( $q );
         }
     }
 
@@ -178,7 +178,7 @@ 
 	 * @param string $starts_with
      */
     public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
-        if ( empty($args) ) {
+        if ( empty( $args ) ) {
 			// add an arg to prevent prepare from failing
 			$args = array( 'where' => $starts_with . '1=%d', 'values' => array( 1 ) );
 			return;
@@ -238,8 +238,8 @@ 
     private static function interpret_array_to_sql( $key, $value, &$where, &$values ) {
 		$key = trim( $key );
 
-        if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false  ) {
-            $k = explode(' ', $key);
+        if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false ) {
+            $k = explode( ' ', $key );
             $where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
             $values[] = '%Y-%m-%d %H:%i:%s';
         } else {
@@ -252,7 +252,7 @@ 
         if ( is_array( $value ) ) {
             // translate array of values to "in"
 			if ( strpos( $lowercase_key, 'like' ) !== false ) {
-				$where = preg_replace('/' . $key . '$/', '', $where);
+				$where = preg_replace( '/' . $key . '$/', '', $where );
 				$where .= '(';
 				$start = true;
 				foreach ( $value as $v ) {
@@ -403,8 +403,8 @@ 
 		);
 
 		$where_is = strtolower( $where_is );
-		if ( isset( $switch_to[ $where_is ] ) ) {
-			return ' ' . $switch_to[ $where_is ];
+		if ( isset( $switch_to[$where_is] ) ) {
+			return ' ' . $switch_to[$where_is];
 		}
 
 		// > and < need a little more work since we don't want them switched to >= and <=
@@ -426,8 +426,8 @@ 
     private static function get_group_and_table_name( &$table, &$group ) {
 		global $wpdb, $wpmuBaseTablePrefix;
 
-        $table_parts = explode(' ', $table);
-        $group = reset($table_parts);
+        $table_parts = explode( ' ', $table );
+        $group = reset( $table_parts );
         $group = str_replace( $wpdb->prefix, '', $group );
 
 		$prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix : $wpdb->base_prefix;
@@ -442,7 +442,7 @@ 
     }
 
     private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
-        if ( ! is_array($args) ) {
+        if ( ! is_array( $args ) ) {
 			$args = array( 'order_by' => $args );
         }
 
@@ -457,16 +457,16 @@ 
         $temp_args = $args;
         foreach ( $temp_args as $k => $v ) {
             if ( $v == '' ) {
-				unset( $args[ $k ] );
+				unset( $args[$k] );
                 continue;
             }
 
             if ( $k == 'limit' ) {
-				$args[ $k ] = FrmAppHelper::esc_limit( $v );
+				$args[$k] = FrmAppHelper::esc_limit( $v );
             }
             $db_name = strtoupper( str_replace( '_', ' ', $k ) );
             if ( strpos( $v, $db_name ) === false ) {
-				$args[ $k ] = $db_name . ' ' . $v;
+				$args[$k] = $db_name . ' ' . $v;
             }
         }
 
@@ -493,7 +493,7 @@ 
 
 		$query = self::generate_query_string_from_pieces( $columns, $table, $where );
 
-		$cache_key = str_replace( array( ' ', ',' ), '_', trim( implode( '_', FrmAppHelper::array_flatten( $where ) ) . $columns . '_results_ARRAY_A' , ' WHERE' ) );
+		$cache_key = str_replace( array( ' ', ',' ), '_', trim( implode( '_', FrmAppHelper::array_flatten( $where ) ) . $columns . '_results_ARRAY_A', ' WHERE' ) );
 		$results = FrmAppHelper::check_cache( $cache_key, $group, $query, 'get_associative_results' );
 
 		return $results;
@@ -532,7 +532,7 @@ 
     public function uninstall() {
 		if ( ! current_user_can( 'administrator' ) ) {
             $frm_settings = FrmAppHelper::get_settings();
-            wp_die($frm_settings->admin_permission);
+            wp_die( $frm_settings->admin_permission );
         }
 
         global $wpdb, $wp_roles;
@@ -542,8 +542,8 @@ 
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entries );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entry_metas );
 
-        delete_option('frm_options');
-        delete_option('frm_db_version');
+        delete_option( 'frm_options' );
+        delete_option( 'frm_db_version' );
 
         //delete roles
         $frm_roles = FrmAppHelper::frm_capabilities();
@@ -551,11 +551,11 @@ 
         foreach ( $frm_roles as $frm_role => $frm_role_description ) {
             foreach ( $roles as $role => $details ) {
                 $wp_roles->remove_cap( $role, $frm_role );
-                unset($role, $details);
+                unset( $role, $details );
     		}
-    		unset($frm_role, $frm_role_description);
+    		unset( $frm_role, $frm_role_description );
 		}
-		unset($roles, $frm_roles);
+		unset( $roles, $frm_roles );
 
 		// delete actions, views, and styles
 
@@ -577,7 +577,7 @@ 
 
 		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->options . ' WHERE option_name LIKE %s OR option_name LIKE %s', '_transient_timeout_frm_form_fields_%', '_transient_frm_form_fields_%' ) );
 
-        do_action('frm_after_uninstall');
+        do_action( 'frm_after_uninstall' );
         return true;
     }
 
@@ -634,8 +634,8 @@ 
 
         $updated = 0;
         foreach ( $fields as $f ) {
-            $f->field_options = maybe_unserialize($f->field_options);
-            if ( empty($f->field_options['size']) || ! is_numeric($f->field_options['size']) ) {
+            $f->field_options = maybe_unserialize( $f->field_options );
+            if ( empty( $f->field_options['size'] ) || ! is_numeric( $f->field_options['size'] ) ) {
                 continue;
             }
 
@@ -643,27 +643,27 @@ 
             $f->field_options['size'] .= 'px';
             $u = FrmField::update( $f->id, array( 'field_options' => $f->field_options ) );
             if ( $u ) {
-                $updated++;
+                $updated ++;
             }
-            unset($f);
+            unset( $f );
         }
 
         // Change the characters in widgets to pixels
-        $widgets = get_option('widget_frm_show_form');
-        if ( empty($widgets) ) {
+        $widgets = get_option( 'widget_frm_show_form' );
+        if ( empty( $widgets ) ) {
             return;
         }
 
-        $widgets = maybe_unserialize($widgets);
+        $widgets = maybe_unserialize( $widgets );
         foreach ( $widgets as $k => $widget ) {
-            if ( ! is_array($widget) || ! isset($widget['size']) ) {
+            if ( ! is_array( $widget ) || ! isset( $widget['size'] ) ) {
                 continue;
             }
 			$size = round( $pixel_conversion * (int) $widget['size'] );
             $size .= 'px';
-			$widgets[ $k ]['size'] = $size;
+			$widgets[$k]['size'] = $size;
         }
-        update_option('widget_frm_show_form', $widgets);
+        update_option( 'widget_frm_show_form', $widgets );
     }
 
     /**
@@ -712,7 +712,7 @@ 
 			}
 
             // Format form options
-            $form_options = maybe_unserialize($form->options);
+            $form_options = maybe_unserialize( $form->options );
 
             // Migrate settings to actions
             FrmXMLHelper::migrate_form_settings_to_actions( $form_options, $form->id );
@@ -722,7 +722,7 @@ 
     private function migrate_to_11() {
         global $wpdb;
 
-        $forms = FrmDb::get_results( $this->forms, array(), 'id, options');
+        $forms = FrmDb::get_results( $this->forms, array(), 'id, options' );
 
         $sending = __( 'Sending', 'formidable' );
 		$img = FrmAppHelper::plugin_url() . '/images/ajax_loader.gif';
@@ -733,13 +733,13 @@ 
 <img class="frm_ajax_loading" src="$img" alt="$sending" style="visibility:hidden;" />
 </div>
 DEFAULT_HTML;
-        unset($sending, $img);
+        unset( $sending, $img );
 
-        $new_default_html = FrmFormsHelper::get_default_html('submit');
+        $new_default_html = FrmFormsHelper::get_default_html( 'submit' );
         $draft_link = FrmFormsHelper::get_draft_link();
 		foreach ( $forms as $form ) {
-            $form->options = maybe_unserialize($form->options);
-            if ( ! isset($form->options['submit_html']) || empty($form->options['submit_html']) ) {
+            $form->options = maybe_unserialize( $form->options );
+            if ( ! isset( $form->options['submit_html'] ) || empty( $form->options['submit_html'] ) ) {
                 continue;
             }
 
@@ -750,9 +750,9 @@ 
 				$form->options['submit_html'] = preg_replace( '~\<\/div\>(?!.*\<\/div\>)~', $draft_link . "\r\n</div>", $form->options['submit_html'] );
 				$wpdb->update( $this->forms, array( 'options' => serialize( $form->options ) ), array( 'id' => $form->id ) );
             }
-            unset($form);
+            unset( $form );
         }
-        unset($forms);
+        unset( $forms );
     }
 
     private function migrate_to_6() {
@@ -781,16 +781,16 @@ 
 </div>
 DEFAULT_HTML;
 
-        $new_default_html = FrmFieldsHelper::get_default_html('text');
+        $new_default_html = FrmFieldsHelper::get_default_html( 'text' );
         foreach ( $fields as $field ) {
-            $field->field_options = maybe_unserialize($field->field_options);
+            $field->field_options = maybe_unserialize( $field->field_options );
 			if ( ! FrmField::is_option_empty( $field, 'custom_html' ) || $field->field_options['custom_html'] == $default_html || $field->field_options['custom_html'] == $old_default_html ) {
                 $field->field_options['custom_html'] = $new_default_html;
 				$wpdb->update( $this->fields, array( 'field_options' => maybe_serialize( $field->field_options ) ), array( 'id' => $field->id ) );
             }
-            unset($field);
+            unset( $field );
         }
-        unset($default_html, $old_default_html, $fields);
+        unset( $default_html, $old_default_html, $fields );
     }
 
     private function migrate_to_4() {
@@ -808,6 +808,6 @@ 
 
 	public static function get_records( $table, $args = array(), $order_by = '', $limit = '', $fields = '*' ) {
 		_deprecated_function( __FUNCTION__, '2.0', 'FrmDb::get_results' );
-		return self::get_results( $table, $args, $fields, compact('order_by', 'limit') );
+		return self::get_results( $table, $args, $fields, compact( 'order_by', 'limit' ) );
 	}
 }

Indentation +340 added lines, -340 removed lines

@@ -1,66 +1,66 @@ 
 <?php
 
 class FrmDb {
-    var $fields;
-    var $forms;
-    var $entries;
-    var $entry_metas;
-
-    public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
-        }
-
-        global $wpdb;
-        $this->fields         = $wpdb->prefix . 'frm_fields';
-        $this->forms          = $wpdb->prefix . 'frm_forms';
-        $this->entries        = $wpdb->prefix . 'frm_items';
-        $this->entry_metas    = $wpdb->prefix . 'frm_item_metas';
-    }
-
-    public function upgrade( $old_db_version = false ) {
-	    do_action( 'frm_before_install' );
-
-        global $wpdb;
-        //$frm_db_version is the version of the database we're moving to
-        $frm_db_version = FrmAppHelper::$db_version;
-        $old_db_version = (float) $old_db_version;
-        if ( ! $old_db_version ) {
-            $old_db_version = get_option('frm_db_version');
-        }
-
-        if ( $frm_db_version != $old_db_version ) {
+	var $fields;
+	var $forms;
+	var $entries;
+	var $entry_metas;
+
+	public function __construct() {
+		if ( ! defined('ABSPATH') ) {
+			die('You are not allowed to call this page directly.');
+		}
+
+		global $wpdb;
+		$this->fields         = $wpdb->prefix . 'frm_fields';
+		$this->forms          = $wpdb->prefix . 'frm_forms';
+		$this->entries        = $wpdb->prefix . 'frm_items';
+		$this->entry_metas    = $wpdb->prefix . 'frm_item_metas';
+	}
+
+	public function upgrade( $old_db_version = false ) {
+		do_action( 'frm_before_install' );
+
+		global $wpdb;
+		//$frm_db_version is the version of the database we're moving to
+		$frm_db_version = FrmAppHelper::$db_version;
+		$old_db_version = (float) $old_db_version;
+		if ( ! $old_db_version ) {
+			$old_db_version = get_option('frm_db_version');
+		}
+
+		if ( $frm_db_version != $old_db_version ) {
 			// update rewrite rules for views and other custom post types
 			flush_rewrite_rules();
 
 			require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
-            $this->create_tables();
-            $this->migrate_data($frm_db_version, $old_db_version);
+			$this->create_tables();
+			$this->migrate_data($frm_db_version, $old_db_version);
 
-            /***** SAVE DB VERSION *****/
-            update_option('frm_db_version', $frm_db_version);
+			/***** SAVE DB VERSION *****/
+			update_option('frm_db_version', $frm_db_version);
 
-            /**** ADD/UPDATE DEFAULT TEMPLATES ****/
-            FrmXMLController::add_default_templates();
-        }
+			/**** ADD/UPDATE DEFAULT TEMPLATES ****/
+			FrmXMLController::add_default_templates();
+		}
 
-        do_action('frm_after_install');
+		do_action('frm_after_install');
 
-        /**** update the styling settings ****/
+		/**** update the styling settings ****/
 		if ( is_admin() && function_exists( 'get_filesystem_method' ) ) {
 			$frm_style = new FrmStyle();
 			$frm_style->update( 'default' );
 		}
-    }
+	}
 
-    public function collation() {
-        global $wpdb;
-        if ( ! $wpdb->has_cap( 'collation' ) ) {
-            return '';
-        }
+	public function collation() {
+		global $wpdb;
+		if ( ! $wpdb->has_cap( 'collation' ) ) {
+			return '';
+		}
 
-        $charset_collate = '';
+		$charset_collate = '';
 		if ( ! empty( $wpdb->charset ) ) {
 			$charset_collate .= ' DEFAULT CHARACTER SET ' . $wpdb->charset;
 		}
@@ -69,14 +69,14 @@ 
 			$charset_collate .= ' COLLATE ' . $wpdb->collate;
 		}
 
-        return $charset_collate;
-    }
+		return $charset_collate;
+	}
 
-    private function create_tables() {
-        $charset_collate = $this->collation();
-        $sql = array();
+	private function create_tables() {
+		$charset_collate = $this->collation();
+		$sql = array();
 
-        /* Create/Upgrade Fields Table */
+		/* Create/Upgrade Fields Table */
 		$sql[] = 'CREATE TABLE ' . $this->fields . ' (
                 id int(11) NOT NULL auto_increment,
 				field_key varchar(100) default NULL,
@@ -95,7 +95,7 @@ 
                 UNIQUE KEY field_key (field_key)
         )';
 
-        /* Create/Upgrade Forms Table */
+		/* Create/Upgrade Forms Table */
 		$sql[] = 'CREATE TABLE ' . $this->forms . ' (
                 id int(11) NOT NULL auto_increment,
 				form_key varchar(100) default NULL,
@@ -113,7 +113,7 @@ 
                 UNIQUE KEY form_key (form_key)
         )';
 
-        /* Create/Upgrade Items Table */
+		/* Create/Upgrade Items Table */
 		$sql[] = 'CREATE TABLE ' . $this->entries . ' (
                 id int(11) NOT NULL auto_increment,
 				item_key varchar(100) default NULL,
@@ -136,7 +136,7 @@ 
                 UNIQUE KEY item_key (item_key)
         )';
 
-        /* Create/Upgrade Meta Table */
+		/* Create/Upgrade Meta Table */
 		$sql[] = 'CREATE TABLE ' . $this->entry_metas . ' (
                 id int(11) NOT NULL auto_increment,
                 meta_value longtext default NULL,
@@ -148,43 +148,43 @@ 
                 KEY item_id (item_id)
         )';
 
-        foreach ( $sql as $q ) {
+		foreach ( $sql as $q ) {
 			if ( function_exists( 'dbDelta' ) ) {
 				dbDelta( $q . $charset_collate . ';' );
 			} else {
 				global $wpdb;
 				$wpdb->query( $q . $charset_collate );
 			}
-            unset($q);
-        }
-    }
+			unset($q);
+		}
+	}
 
-    /**
-     * @param integer $frm_db_version
+	/**
+	 * @param integer $frm_db_version
 	 * @param int $old_db_version
-     */
+	 */
 	private function migrate_data( $frm_db_version, $old_db_version ) {
 		$migrations = array( 4, 6, 11, 16, 17, 23, 25 );
-        foreach ( $migrations as $migration ) {
-            if ( $frm_db_version >= $migration && $old_db_version < $migration ) {
+		foreach ( $migrations as $migration ) {
+			if ( $frm_db_version >= $migration && $old_db_version < $migration ) {
 				$function_name = 'migrate_to_' . $migration;
-                $this->$function_name();
-            }
-        }
-    }
+				$this->$function_name();
+			}
+		}
+	}
 
-    /**
-     * Change array into format $wpdb->prepare can use
+	/**
+	 * Change array into format $wpdb->prepare can use
 	 *
 	 * @param array $args
 	 * @param string $starts_with
-     */
-    public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
-        if ( empty($args) ) {
+	 */
+	public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
+		if ( empty($args) ) {
 			// add an arg to prevent prepare from failing
 			$args = array( 'where' => $starts_with . '1=%d', 'values' => array( 1 ) );
 			return;
-        }
+		}
 
 		$where = '';
 		$values = array();
@@ -195,64 +195,64 @@ 
 		}
 
 		$args = compact( 'where', 'values' );
-    }
+	}
 
-    /**
+	/**
 	 * @param array $args
-     * @param string $base_where
-     * @param string $where
+	 * @param string $base_where
+	 * @param string $where
 	 * @param array $values
-     */
-    public static function parse_where_from_array( $args, $base_where, &$where, &$values ) {
-        $condition = ' AND';
-        if ( isset( $args['or'] ) ) {
-            $condition = ' OR';
-            unset( $args['or'] );
-        }
-
-        foreach ( $args as $key => $value ) {
-            $where .= empty( $where ) ? $base_where : $condition;
-            $array_inc_null = ( ! is_numeric( $key ) && is_array( $value ) && in_array( null, $value ) );
-            if ( is_numeric( $key ) || $array_inc_null ) {
-                $where .= ' ( ';
-                $nested_where = '';
-                if ( $array_inc_null ) {
-                    foreach ( $value as $val ) {
-                        self::parse_where_from_array( array( $key => $val, 'or' => 1 ), '', $nested_where, $values );
-                    }
-                } else {
-                    self::parse_where_from_array( $value, '', $nested_where, $values );
-                }
-                $where .= $nested_where;
-                $where .= ' ) ';
-            } else {
-                self::interpret_array_to_sql( $key, $value, $where, $values );
-            }
-        }
-    }
-
-    /**
-     * @param string $key
+	 */
+	public static function parse_where_from_array( $args, $base_where, &$where, &$values ) {
+		$condition = ' AND';
+		if ( isset( $args['or'] ) ) {
+			$condition = ' OR';
+			unset( $args['or'] );
+		}
+
+		foreach ( $args as $key => $value ) {
+			$where .= empty( $where ) ? $base_where : $condition;
+			$array_inc_null = ( ! is_numeric( $key ) && is_array( $value ) && in_array( null, $value ) );
+			if ( is_numeric( $key ) || $array_inc_null ) {
+				$where .= ' ( ';
+				$nested_where = '';
+				if ( $array_inc_null ) {
+					foreach ( $value as $val ) {
+						self::parse_where_from_array( array( $key => $val, 'or' => 1 ), '', $nested_where, $values );
+					}
+				} else {
+					self::parse_where_from_array( $value, '', $nested_where, $values );
+				}
+				$where .= $nested_where;
+				$where .= ' ) ';
+			} else {
+				self::interpret_array_to_sql( $key, $value, $where, $values );
+			}
+		}
+	}
+
+	/**
+	 * @param string $key
 	 * @param string|array $value
-     * @param string $where
+	 * @param string $where
 	 * @param array $values
-     */
-    private static function interpret_array_to_sql( $key, $value, &$where, &$values ) {
+	 */
+	private static function interpret_array_to_sql( $key, $value, &$where, &$values ) {
 		$key = trim( $key );
 
-        if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false  ) {
-            $k = explode(' ', $key);
-            $where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
-            $values[] = '%Y-%m-%d %H:%i:%s';
-        } else {
+		if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false  ) {
+			$k = explode(' ', $key);
+			$where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
+			$values[] = '%Y-%m-%d %H:%i:%s';
+		} else {
 			$where .= ' ' . $key;
-        }
+		}
 
 		$lowercase_key = explode( ' ', strtolower( $key ) );
 		$lowercase_key = end( $lowercase_key );
 
-        if ( is_array( $value ) ) {
-            // translate array of values to "in"
+		if ( is_array( $value ) ) {
+			// translate array of values to "in"
 			if ( strpos( $lowercase_key, 'like' ) !== false ) {
 				$where = preg_replace('/' . $key . '$/', '', $where);
 				$where .= '(';
@@ -270,7 +270,7 @@ 
 				$where .= ' in (' . FrmAppHelper::prepare_array_values( $value, '%s' ) . ')';
 				$values = array_merge( $values, $value );
 			}
-        } else if ( strpos( $lowercase_key, 'like' ) !== false ) {
+		} else if ( strpos( $lowercase_key, 'like' ) !== false ) {
 			/**
 			 * Allow string to start or end with the value
 			 * If the key is like% then skip the first % for starts with
@@ -289,9 +289,9 @@ 
 			$where .= ' %s';
 			$values[] = $start . FrmAppHelper::esc_like( $value ) . $end;
 
-        } else if ( $value === null ) {
-            $where .= ' IS NULL';
-        } else {
+		} else if ( $value === null ) {
+			$where .= ' IS NULL';
+		} else {
 			// allow a - to prevent = from being added
 			if ( substr( $key, -1 ) == '-' ) {
 				$where = rtrim( $where, '-' );
@@ -301,9 +301,9 @@ 
 
 			self::add_query_placeholder( $key, $value, $where );
 
-            $values[] = $value;
-        }
-    }
+			$values[] = $value;
+		}
+	}
 
 	/**
 	 * Add %d, or %s to query
@@ -313,7 +313,7 @@ 
 	 * @param int|string $value
 	 * @param string $where
 	 */
-    private static function add_query_placeholder( $key, $value, &$where ) {
+	private static function add_query_placeholder( $key, $value, &$where ) {
 		if ( is_numeric( $value ) && strpos( $key, 'meta_value' ) === false ) {
 			$where .= '%d';
 		} else {
@@ -321,16 +321,16 @@ 
 		}
 	}
 
-    /**
-     * @param string $table
+	/**
+	 * @param string $table
 	 * @param array $where
 	 * @param array $args
 	 * @return int
-     */
-    public static function get_count( $table, $where = array(), $args = array() ) {
-        $count = self::get_var( $table, $where, 'COUNT(*)', $args );
-        return $count;
-    }
+	 */
+	public static function get_count( $table, $where = array(), $args = array() ) {
+		$count = self::get_var( $table, $where, 'COUNT(*)', $args );
+		return $count;
+	}
 
 	/**
 	 * @param string $table
@@ -341,56 +341,56 @@ 
 	 * @param string $type
 	 * @return array|null|string|object
 	 */
-    public static function get_var( $table, $where = array(), $field = 'id', $args = array(), $limit = '', $type = 'var' ) {
-        $group = '';
-        self::get_group_and_table_name( $table, $group );
+	public static function get_var( $table, $where = array(), $field = 'id', $args = array(), $limit = '', $type = 'var' ) {
+		$group = '';
+		self::get_group_and_table_name( $table, $group );
 		self::convert_options_to_array( $args, '', $limit );
 
 		$query = self::generate_query_string_from_pieces( $field, $table, $where, $args );
 
 		$cache_key = str_replace( array( ' ', ',' ), '_', trim( implode( '_', FrmAppHelper::array_flatten( $where ) ) . implode( '_', $args ) . $field . '_' . $type, ' WHERE' ) );
 		$results = FrmAppHelper::check_cache( $cache_key, $group, $query, 'get_' . $type );
-        return $results;
-    }
+		return $results;
+	}
 
-    /**
-     * @param string $table
-     * @param array $where
+	/**
+	 * @param string $table
+	 * @param array $where
 	 * @param string $field
 	 * @param array $args
 	 * @param string $limit
 	 * @return mixed
-     */
-    public static function get_col( $table, $where = array(), $field = 'id', $args = array(), $limit = '' ) {
-        return self::get_var( $table, $where, $field, $args, $limit, 'col' );
-    }
-
-    /**
-     * @since 2.0
-     * @param string $table
+	 */
+	public static function get_col( $table, $where = array(), $field = 'id', $args = array(), $limit = '' ) {
+		return self::get_var( $table, $where, $field, $args, $limit, 'col' );
+	}
+
+	/**
+	 * @since 2.0
+	 * @param string $table
 	 * @param array $where
 	 * @param string $fields
 	 * @param array $args
 	 * @return mixed
-     */
-    public static function get_row( $table, $where = array(), $fields = '*', $args = array() ) {
-        $args['limit'] = 1;
-        return self::get_var( $table, $where, $fields, $args, '', 'row' );
-    }
-
-    /**
-     * Prepare a key/value array before DB call
+	 */
+	public static function get_row( $table, $where = array(), $fields = '*', $args = array() ) {
+		$args['limit'] = 1;
+		return self::get_var( $table, $where, $fields, $args, '', 'row' );
+	}
+
+	/**
+	 * Prepare a key/value array before DB call
 	 *
-     * @since 2.0
-     * @param string $table
+	 * @since 2.0
+	 * @param string $table
 	 * @param array $where
 	 * @param string $fields
 	 * @param array $args
 	 * @return mixed
-     */
-    public static function get_results( $table, $where = array(), $fields = '*', $args = array() ) {
-        return self::get_var( $table, $where, $fields, $args, '', 'results' );
-    }
+	 */
+	public static function get_results( $table, $where = array(), $fields = '*', $args = array() ) {
+		return self::get_var( $table, $where, $fields, $args, '', 'results' );
+	}
 
 	/**
 	 * Check for like, not like, in, not in, =, !=, >, <, <=, >=
@@ -427,59 +427,59 @@ 
 		return '';
 	}
 
-    /**
-     * Get 'frm_forms' from wp_frm_forms or a longer table param that includes a join
-     * Also add the wpdb->prefix to the table if it's missing
-     *
-     * @param string $table
-     * @param string $group
-     */
-    private static function get_group_and_table_name( &$table, &$group ) {
+	/**
+	 * Get 'frm_forms' from wp_frm_forms or a longer table param that includes a join
+	 * Also add the wpdb->prefix to the table if it's missing
+	 *
+	 * @param string $table
+	 * @param string $group
+	 */
+	private static function get_group_and_table_name( &$table, &$group ) {
 		global $wpdb, $wpmuBaseTablePrefix;
 
-        $table_parts = explode(' ', $table);
-        $group = reset($table_parts);
-        $group = str_replace( $wpdb->prefix, '', $group );
+		$table_parts = explode(' ', $table);
+		$group = reset($table_parts);
+		$group = str_replace( $wpdb->prefix, '', $group );
 
 		$prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix : $wpdb->base_prefix;
 		$group = str_replace( $prefix, '', $group );
 
-        if ( $group == $table ) {
-            $table = $wpdb->prefix . $table;
-        }
+		if ( $group == $table ) {
+			$table = $wpdb->prefix . $table;
+		}
 
 		// switch to singular group name
 		$group = rtrim( $group, 's' );
-    }
+	}
 
-    private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
-        if ( ! is_array($args) ) {
+	private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
+		if ( ! is_array($args) ) {
 			$args = array( 'order_by' => $args );
-        }
+		}
 
-        if ( ! empty( $order_by ) ) {
-            $args['order_by'] = $order_by;
-        }
+		if ( ! empty( $order_by ) ) {
+			$args['order_by'] = $order_by;
+		}
 
-        if ( ! empty( $limit ) ) {
-            $args['limit'] = $limit;
-        }
+		if ( ! empty( $limit ) ) {
+			$args['limit'] = $limit;
+		}
 
-        $temp_args = $args;
-        foreach ( $temp_args as $k => $v ) {
-            if ( $v == '' ) {
+		$temp_args = $args;
+		foreach ( $temp_args as $k => $v ) {
+			if ( $v == '' ) {
 				unset( $args[ $k ] );
-                continue;
-            }
+				continue;
+			}
 
-            if ( $k == 'limit' ) {
+			if ( $k == 'limit' ) {
 				$args[ $k ] = FrmAppHelper::esc_limit( $v );
-            }
-            $db_name = strtoupper( str_replace( '_', ' ', $k ) );
-            if ( strpos( $v, $db_name ) === false ) {
+			}
+			$db_name = strtoupper( str_replace( '_', ' ', $k ) );
+			if ( strpos( $v, $db_name ) === false ) {
 				$args[ $k ] = $db_name . ' ' . $v;
-            }
-        }
+			}
+		}
 
 		// Make sure LIMIT is the last argument
 		if ( isset( $args['order_by'] ) && isset( $args['limit'] ) ) {
@@ -487,7 +487,7 @@ 
 			unset( $args['limit'] );
 			$args['limit'] = $temp_limit;
 		}
-    }
+	}
 
 	/**
 	 * Get the associative array results for the given columns, table, and where query
@@ -540,31 +540,31 @@ 
 		return $query;
 	}
 
-    public function uninstall() {
+	public function uninstall() {
 		if ( ! current_user_can( 'administrator' ) ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            wp_die($frm_settings->admin_permission);
-        }
+			$frm_settings = FrmAppHelper::get_settings();
+			wp_die($frm_settings->admin_permission);
+		}
 
-        global $wpdb, $wp_roles;
+		global $wpdb, $wp_roles;
 
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->fields );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->forms );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entries );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entry_metas );
 
-        delete_option('frm_options');
-        delete_option('frm_db_version');
+		delete_option('frm_options');
+		delete_option('frm_db_version');
 
-        //delete roles
-        $frm_roles = FrmAppHelper::frm_capabilities();
-        $roles = get_editable_roles();
-        foreach ( $frm_roles as $frm_role => $frm_role_description ) {
-            foreach ( $roles as $role => $details ) {
-                $wp_roles->remove_cap( $role, $frm_role );
-                unset($role, $details);
-    		}
-    		unset($frm_role, $frm_role_description);
+		//delete roles
+		$frm_roles = FrmAppHelper::frm_capabilities();
+		$roles = get_editable_roles();
+		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
+			foreach ( $roles as $role => $details ) {
+				$wp_roles->remove_cap( $role, $frm_role );
+				unset($role, $details);
+			}
+			unset($frm_role, $frm_role_description);
 		}
 		unset($roles, $frm_roles);
 
@@ -588,9 +588,9 @@ 
 
 		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->options . ' WHERE option_name LIKE %s OR option_name LIKE %s', '_transient_timeout_frm_form_fields_%', '_transient_frm_form_fields_%' ) );
 
-        do_action('frm_after_uninstall');
-        return true;
-    }
+		do_action('frm_after_uninstall');
+		return true;
+	}
 
 	/**
 	 * Migrate old styling settings. If sites are using the old
@@ -629,150 +629,150 @@ 
 		}
 	}
 
-    /**
-     * Change field size from character to pixel -- Multiply by 9
-     */
-    private function migrate_to_17() {
-        global $wpdb;
+	/**
+	 * Change field size from character to pixel -- Multiply by 9
+	 */
+	private function migrate_to_17() {
+		global $wpdb;
 		$pixel_conversion = 9;
 
-        // Get query arguments
+		// Get query arguments
 		$field_types = array( 'textarea', 'text', 'number', 'email', 'url', 'rte', 'date', 'phone', 'password', 'image', 'tag', 'file' );
 		$query = array( 'type' => $field_types, 'field_options like' => 's:4:"size";', 'field_options not like' => 's:4:"size";s:0:' );
 
-        // Get results
+		// Get results
 		$fields = FrmDb::get_results( $this->fields, $query, 'id, field_options' );
 
-        $updated = 0;
-        foreach ( $fields as $f ) {
-            $f->field_options = maybe_unserialize($f->field_options);
-            if ( empty($f->field_options['size']) || ! is_numeric($f->field_options['size']) ) {
-                continue;
-            }
+		$updated = 0;
+		foreach ( $fields as $f ) {
+			$f->field_options = maybe_unserialize($f->field_options);
+			if ( empty($f->field_options['size']) || ! is_numeric($f->field_options['size']) ) {
+				continue;
+			}
 
 			$f->field_options['size'] = round( $pixel_conversion * (int) $f->field_options['size'] );
-            $f->field_options['size'] .= 'px';
-            $u = FrmField::update( $f->id, array( 'field_options' => $f->field_options ) );
-            if ( $u ) {
-                $updated++;
-            }
-            unset($f);
-        }
-
-        // Change the characters in widgets to pixels
-        $widgets = get_option('widget_frm_show_form');
-        if ( empty($widgets) ) {
-            return;
-        }
-
-        $widgets = maybe_unserialize($widgets);
-        foreach ( $widgets as $k => $widget ) {
-            if ( ! is_array($widget) || ! isset($widget['size']) ) {
-                continue;
-            }
+			$f->field_options['size'] .= 'px';
+			$u = FrmField::update( $f->id, array( 'field_options' => $f->field_options ) );
+			if ( $u ) {
+				$updated++;
+			}
+			unset($f);
+		}
+
+		// Change the characters in widgets to pixels
+		$widgets = get_option('widget_frm_show_form');
+		if ( empty($widgets) ) {
+			return;
+		}
+
+		$widgets = maybe_unserialize($widgets);
+		foreach ( $widgets as $k => $widget ) {
+			if ( ! is_array($widget) || ! isset($widget['size']) ) {
+				continue;
+			}
 			$size = round( $pixel_conversion * (int) $widget['size'] );
-            $size .= 'px';
+			$size .= 'px';
 			$widgets[ $k ]['size'] = $size;
-        }
-        update_option('widget_frm_show_form', $widgets);
-    }
-
-    /**
-     * Migrate post and email notification settings into actions
-     */
-    private function migrate_to_16() {
-        global $wpdb;
-
-        $forms = FrmDb::get_results( $this->forms, array(), 'id, options, is_template, default_template' );
-
-        /**
-        * Old email settings format:
-        * email_to: Email or field id
-        * also_email_to: array of fields ids
-        * reply_to: Email, field id, 'custom'
-        * cust_reply_to: string
-        * reply_to_name: field id, 'custom'
-        * cust_reply_to_name: string
-        * plain_text: 0|1
-        * email_message: string or ''
-        * email_subject: string or ''
-        * inc_user_info: 0|1
-        * update_email: 0, 1, 2
-        *
-        * Old autoresponder settings format:
-        * auto_responder: 0|1
-        * ar_email_message: string or ''
-        * ar_email_to: field id
-        * ar_plain_text: 0|1
-        * ar_reply_to_name: string
-        * ar_reply_to: string
-        * ar_email_subject: string
-        * ar_update_email: 0, 1, 2
-        *
-        * New email settings:
-        * post_content: json settings
-        * post_title: form id
-        * post_excerpt: message
-        *
-        */
-
-        foreach ( $forms as $form ) {
+		}
+		update_option('widget_frm_show_form', $widgets);
+	}
+
+	/**
+	 * Migrate post and email notification settings into actions
+	 */
+	private function migrate_to_16() {
+		global $wpdb;
+
+		$forms = FrmDb::get_results( $this->forms, array(), 'id, options, is_template, default_template' );
+
+		/**
+		 * Old email settings format:
+		 * email_to: Email or field id
+		 * also_email_to: array of fields ids
+		 * reply_to: Email, field id, 'custom'
+		 * cust_reply_to: string
+		 * reply_to_name: field id, 'custom'
+		 * cust_reply_to_name: string
+		 * plain_text: 0|1
+		 * email_message: string or ''
+		 * email_subject: string or ''
+		 * inc_user_info: 0|1
+		 * update_email: 0, 1, 2
+		 *
+		 * Old autoresponder settings format:
+		 * auto_responder: 0|1
+		 * ar_email_message: string or ''
+		 * ar_email_to: field id
+		 * ar_plain_text: 0|1
+		 * ar_reply_to_name: string
+		 * ar_reply_to: string
+		 * ar_email_subject: string
+		 * ar_update_email: 0, 1, 2
+		 *
+		 * New email settings:
+		 * post_content: json settings
+		 * post_title: form id
+		 * post_excerpt: message
+		 *
+		 */
+
+		foreach ( $forms as $form ) {
 			if ( $form->is_template && $form->default_template ) {
 				// don't migrate the default templates since the email will be added anyway
 				continue;
 			}
 
-            // Format form options
-            $form_options = maybe_unserialize($form->options);
+			// Format form options
+			$form_options = maybe_unserialize($form->options);
 
-            // Migrate settings to actions
-            FrmXMLHelper::migrate_form_settings_to_actions( $form_options, $form->id );
-        }
-    }
+			// Migrate settings to actions
+			FrmXMLHelper::migrate_form_settings_to_actions( $form_options, $form->id );
+		}
+	}
 
-    private function migrate_to_11() {
-        global $wpdb;
+	private function migrate_to_11() {
+		global $wpdb;
 
-        $forms = FrmDb::get_results( $this->forms, array(), 'id, options');
+		$forms = FrmDb::get_results( $this->forms, array(), 'id, options');
 
-        $sending = __( 'Sending', 'formidable' );
+		$sending = __( 'Sending', 'formidable' );
 		$img = FrmAppHelper::plugin_url() . '/images/ajax_loader.gif';
-        $old_default_html = <<<DEFAULT_HTML
+		$old_default_html = <<<DEFAULT_HTML
 <div class="frm_submit">
 [if back_button]<input type="submit" value="[back_label]" name="frm_prev_page" formnovalidate="formnovalidate" [back_hook] />[/if back_button]
 <input type="submit" value="[button_label]" [button_action] />
 <img class="frm_ajax_loading" src="$img" alt="$sending" style="visibility:hidden;" />
 </div>
 DEFAULT_HTML;
-        unset($sending, $img);
+		unset($sending, $img);
 
-        $new_default_html = FrmFormsHelper::get_default_html('submit');
-        $draft_link = FrmFormsHelper::get_draft_link();
+		$new_default_html = FrmFormsHelper::get_default_html('submit');
+		$draft_link = FrmFormsHelper::get_draft_link();
 		foreach ( $forms as $form ) {
-            $form->options = maybe_unserialize($form->options);
-            if ( ! isset($form->options['submit_html']) || empty($form->options['submit_html']) ) {
-                continue;
-            }
+			$form->options = maybe_unserialize($form->options);
+			if ( ! isset($form->options['submit_html']) || empty($form->options['submit_html']) ) {
+				continue;
+			}
 
-            if ( $form->options['submit_html'] != $new_default_html && $form->options['submit_html'] == $old_default_html ) {
-                $form->options['submit_html'] = $new_default_html;
+			if ( $form->options['submit_html'] != $new_default_html && $form->options['submit_html'] == $old_default_html ) {
+				$form->options['submit_html'] = $new_default_html;
 				$wpdb->update( $this->forms, array( 'options' => serialize( $form->options ) ), array( 'id' => $form->id ) );
 			} else if ( ! strpos( $form->options['submit_html'], 'save_draft' ) ) {
 				$form->options['submit_html'] = preg_replace( '~\<\/div\>(?!.*\<\/div\>)~', $draft_link . "\r\n</div>", $form->options['submit_html'] );
 				$wpdb->update( $this->forms, array( 'options' => serialize( $form->options ) ), array( 'id' => $form->id ) );
-            }
-            unset($form);
-        }
-        unset($forms);
-    }
+			}
+			unset($form);
+		}
+		unset($forms);
+	}
 
-    private function migrate_to_6() {
-        global $wpdb;
+	private function migrate_to_6() {
+		global $wpdb;
 
 		$no_save = array_merge( FrmField::no_save_fields(), array( 'form', 'hidden', 'user_id' ) );
 		$fields = FrmDb::get_results( $this->fields, array( 'type NOT' => $no_save ), 'id, field_options' );
 
-        $default_html = <<<DEFAULT_HTML
+		$default_html = <<<DEFAULT_HTML
 <div id="frm_field_[id]_container" class="form-field [required_class] [error_class]">
     <label class="frm_pos_[label_position]">[field_name]
         <span class="frm_required">[required_label]</span>
@@ -782,7 +782,7 @@ 
 </div>
 DEFAULT_HTML;
 
-        $old_default_html = <<<DEFAULT_HTML
+		$old_default_html = <<<DEFAULT_HTML
 <div id="frm_field_[id]_container" class="form-field [required_class] [error_class]">
     <label class="frm_pos_[label_position]">[field_name]
         <span class="frm_required">[required_label]</span>
@@ -792,25 +792,25 @@ 
 </div>
 DEFAULT_HTML;
 
-        $new_default_html = FrmFieldsHelper::get_default_html('text');
-        foreach ( $fields as $field ) {
-            $field->field_options = maybe_unserialize($field->field_options);
+		$new_default_html = FrmFieldsHelper::get_default_html('text');
+		foreach ( $fields as $field ) {
+			$field->field_options = maybe_unserialize($field->field_options);
 			if ( ! FrmField::is_option_empty( $field, 'custom_html' ) || $field->field_options['custom_html'] == $default_html || $field->field_options['custom_html'] == $old_default_html ) {
-                $field->field_options['custom_html'] = $new_default_html;
+				$field->field_options['custom_html'] = $new_default_html;
 				$wpdb->update( $this->fields, array( 'field_options' => maybe_serialize( $field->field_options ) ), array( 'id' => $field->id ) );
-            }
-            unset($field);
-        }
-        unset($default_html, $old_default_html, $fields);
-    }
-
-    private function migrate_to_4() {
-        global $wpdb;
+			}
+			unset($field);
+		}
+		unset($default_html, $old_default_html, $fields);
+	}
+
+	private function migrate_to_4() {
+		global $wpdb;
 		$user_ids = FrmEntryMeta::getAll( array( 'fi.type' => 'user_id' ) );
-        foreach ( $user_ids as $user_id ) {
+		foreach ( $user_ids as $user_id ) {
 			$wpdb->update( $this->entries, array( 'user_id' => $user_id->meta_value ), array( 'id' => $user_id->item_id ) );
-        }
-    }
+		}
+	}
 
 	public static function get_one_record( $table, $args = array(), $fields = '*', $order_by = '' ) {
 		_deprecated_function( __FUNCTION__, '2.0', 'FrmDb::get_row' );

classes/controllers/FrmXMLController.php

Indentation +172 added lines, -172 removed lines

@@ -2,109 +2,109 @@ 
 
 class FrmXMLController {
 
-    public static function menu() {
+	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(
 			'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' );
-    }
+	}
 
-    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
+		$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);
+			return;
+		}
+		unset($file_type);
 
 		if ( ! function_exists( 'libxml_disable_entity_loader' ) ) {
 			$errors[] = __( 'XML import is not enabled on your server.', 'formidable' );
@@ -123,145 +123,145 @@ 
 		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 {
+		} else {
 			do_action( 'frm_export_format_' . $format, compact('ids') );
-        }
+		}
 
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function generate_xml( $type, $args = array() ) {
-    	global $wpdb;
+		global $wpdb;
 
-	    self::prepare_types_array( $type );
+		self::prepare_types_array( $type );
 
-	    $tables = array(
+		$tables = array(
 			'items'     => $wpdb->prefix . 'frm_items',
 			'forms'     => $wpdb->prefix . 'frm_forms',
-	        'posts'     => $wpdb->posts,
-	        'styles'    => $wpdb->posts,
-	        'actions'   => $wpdb->posts,
-	    );
+			'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();
+			$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':
+					}
+				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
+					}
+				break;
+				case 'styles':
+					// Loop through all exported forms and get their selected style IDs
 					$frm_style = new FrmStyle();
 					$default_style = $frm_style->get_default_style();
-                    $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'] ) ) {
+					$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'] ) ) {
 							if ( $form_data->options['custom_style'] == 1 ) {
 								$style_ids[] = $default_style->ID;
 							} else {
 								$style_ids[] = $form_data->options['custom_style'];
 							}
-                        }
-                        unset( $form_id, $form_data );
-                    }
+						}
+						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:
+					$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;
-            }
+					$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' );
-    }
+	}
 
 	private static function prepare_types_array( &$type ) {
 		$type = (array) $type;
@@ -342,14 +342,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 ) {
 		// Phase frm_csv_field_ids out by 2.01.05
 		$csv_field_ids = apply_filters( 'frm_csv_field_ids', '', $form_id, array( 'form' => $form ) );
@@ -379,16 +379,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 +30 added lines, -30 removed lines

@@ -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))
@@ -70,41 +70,41 @@ 
         $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 );
             return;
         }
-        unset($file_type);
+        unset( $file_type );
 
 		if ( ! function_exists( 'libxml_disable_entity_loader' ) ) {
 			$errors[] = __( 'XML import is not enabled on your server.', 'formidable' );
@@ -123,12 +123,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 );
         }
 
@@ -142,11 +142,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();
@@ -189,7 +189,7 @@ 
 		foreach ( $type as $tb_type ) {
             $where = array();
 			$join = '';
-            $table = $tables[ $tb_type ];
+            $table = $tables[$tb_type];
 
 			$select = $table . '.id';
             $query_vars = array();
@@ -200,20 +200,20 @@ 
                     if ( $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';
 					$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':
@@ -247,7 +247,7 @@ 
                     $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'];
@@ -255,11 +255,11 @@ 
                 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";
+		echo '<?xml version="1.0" encoding="' . esc_attr( get_bloginfo( 'charset' ) ) . "\" ?>\n";
 		include( FrmAppHelper::plugin_path() . '/classes/views/xml/xml.php' );
     }
 
@@ -297,10 +297,10 @@ 
 			$fid = FrmAppHelper::get_param( 'fid', '', 'get', 'sanitize_text_field' );
 		}
 
-		set_time_limit(0); //Remove time limit to execute this function
-		$mem_limit = str_replace('M', '', ini_get('memory_limit'));
+		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' );
 		}
 
 		global $wpdb;
@@ -370,7 +370,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] );
 				}
 			}
 		}

classes/views/frm-fields/input.php

Indentation +58 added lines, -58 removed lines

@@ -10,41 +10,41 @@ 
 <?php
 
 } else if ( $field['type'] == 'radio' ) {
-    $read_only = false;
+	$read_only = false;
 	if ( FrmField::is_read_only( $field ) && ! FrmAppHelper::is_admin() ) {
-        $read_only = true; ?>
+		$read_only = true; ?>
 <input type="hidden" value="<?php echo esc_attr( $field['value'] ) ?>" name="<?php echo esc_attr( $field_name ) ?>" />
 <?php
-    }
+	}
 
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+	if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
-    } else if ( is_array($field['options']) ) {
-        foreach ( $field['options'] as $opt_key => $opt ) {
+	} else if ( is_array($field['options']) ) {
+		foreach ( $field['options'] as $opt_key => $opt ) {
 			if ( isset( $atts ) && isset( $atts['opt'] ) && ( $atts['opt'] != $opt_key ) ) {
-                continue;
-            }
+				continue;
+			}
 
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field); ?>
+			$field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
+			$opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field); ?>
 			<div class="<?php echo esc_attr( apply_filters( 'frm_radio_class', 'frm_radio', $field, $field_val ) ) ?>"><?php
 
 			if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
 				?><label for="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
-            }
-            $checked = FrmAppHelper::check_selected($field['value'], $field_val) ? 'checked="checked" ' : ' ';
+			}
+			$checked = FrmAppHelper::check_selected($field['value'], $field_val) ? 'checked="checked" ' : ' ';
 
-            $other_opt = false;
-            $other_args = FrmFieldsHelper::prepare_other_input( compact( 'field_name', 'opt_key', 'field' ), $other_opt, $checked );
-            ?>
+			$other_opt = false;
+			$other_args = FrmFieldsHelper::prepare_other_input( compact( 'field_name', 'opt_key', 'field' ), $other_opt, $checked );
+			?>
             <input type="radio" name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id . '-' . $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php
-            echo $checked;
-            do_action('frm_field_input_html', $field);
+			echo $checked;
+			do_action('frm_field_input_html', $field);
 ?>/><?php
 
 			if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
 				echo ' ' . $opt . '</label>';
-            }
+			}
 
 			FrmFieldsHelper::include_other_input( array(
 				'other_opt' => $other_opt, 'read_only' => $read_only,
@@ -53,58 +53,58 @@ 
 				'html_id' => $html_id, 'opt_key' => $opt_key,
 			) );
 
-            unset( $other_opt, $other_args );
+			unset( $other_opt, $other_args );
 ?></div>
 <?php
-        }
-    }
+		}
+	}
 } else if ( $field['type'] == 'select' ) {
 	include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/front-end/dropdown-field.php' );
 } else if ( $field['type'] == 'checkbox' ) {
-    $checked_values = $field['value'];
-    $read_only = false;
+	$checked_values = $field['value'];
+	$read_only = false;
 
 	if ( FrmField::is_read_only( $field ) && ! FrmAppHelper::is_admin() ) {
-        $read_only = true;
-        if ( $checked_values ) {
-            foreach ( (array) $checked_values as $checked_value ) { ?>
+		$read_only = true;
+		if ( $checked_values ) {
+			foreach ( (array) $checked_values as $checked_value ) { ?>
 <input type="hidden" value="<?php echo esc_attr( $checked_value ) ?>" name="<?php echo esc_attr( $field_name ) ?>[]" />
 <?php
-            }
-        } else { ?>
+			}
+		} else { ?>
 <input type="hidden" value="" name="<?php echo esc_attr( $field_name ) ?>[]" />
 <?php
-        }
-    }
+		}
+	}
 
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+	if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
-    } else if ( $field['options'] ) {
-        foreach ( $field['options'] as $opt_key => $opt ) {
-            if ( isset($atts) && isset($atts['opt']) && ($atts['opt'] != $opt_key) ) {
-                continue;
-            }
-
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
-            $checked = FrmAppHelper::check_selected($checked_values, $field_val) ? ' checked="checked"' : '';
-
-            // Check if other opt, and get values for other field if needed
-            $other_opt = false;
+	} else if ( $field['options'] ) {
+		foreach ( $field['options'] as $opt_key => $opt ) {
+			if ( isset($atts) && isset($atts['opt']) && ($atts['opt'] != $opt_key) ) {
+				continue;
+			}
+
+			$field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
+			$opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+			$checked = FrmAppHelper::check_selected($checked_values, $field_val) ? ' checked="checked"' : '';
+
+			// Check if other opt, and get values for other field if needed
+			$other_opt = false;
 			$other_args = FrmFieldsHelper::prepare_other_input( compact( 'field', 'field_name', 'opt_key' ), $other_opt, $checked );
 
-            ?>
+			?>
 			<div class="<?php echo esc_attr( apply_filters( 'frm_checkbox_class', 'frm_checkbox', $field, $field_val ) ) ?>" id="frm_checkbox_<?php echo esc_attr( $field['id'] ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
 
-            if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
-                ?><label for="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
-            }
+			if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
+				?><label for="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
+			}
 
-            ?><input type="checkbox" name="<?php echo esc_attr( $field_name ) ?>[<?php echo ( $other_opt ? esc_attr( $opt_key ) : '' ) ?>]" id="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php echo $checked ?> <?php do_action('frm_field_input_html', $field) ?> /><?php
+			?><input type="checkbox" name="<?php echo esc_attr( $field_name ) ?>[<?php echo ( $other_opt ? esc_attr( $opt_key ) : '' ) ?>]" id="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php echo $checked ?> <?php do_action('frm_field_input_html', $field) ?> /><?php
 
-            if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
+			if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
 				echo ' ' . $opt . '</label>';
-            }
+			}
 
 			FrmFieldsHelper::include_other_input( array(
 				'other_opt' => $other_opt, 'read_only' => $read_only,
@@ -113,17 +113,17 @@ 
 				'html_id' => $html_id, 'opt_key' => $opt_key,
 			) );
 
-            unset( $other_opt, $other_args, $checked );
+			unset( $other_opt, $other_args, $checked );
 
-            ?></div>
+			?></div>
 <?php
-        }
-    }
+		}
+	}
 } else if ( $field['type'] == 'captcha' && ! FrmAppHelper::is_admin() ) {
-    $frm_settings = FrmAppHelper::get_settings();
-    if ( ! empty($frm_settings->pubkey) ) {
-        FrmFieldsHelper::display_recaptcha($field);
-    }
+	$frm_settings = FrmAppHelper::get_settings();
+	if ( ! empty($frm_settings->pubkey) ) {
+		FrmFieldsHelper::display_recaptcha($field);
+	}
 } else {
 	do_action( 'frm_form_fields', $field, $field_name, compact( 'errors', 'html_id' ) );
 	do_action( 'frm_form_field_' . $field['type'], $field, $field_name, compact( 'errors', 'html_id' ) );

Spacing +17 added lines, -17 removed lines

@@ -1,12 +1,12 @@ 
 <?php if ( in_array( $field['type'], array( 'email', 'url', 'text' ) ) ) { ?>
-<input type="<?php echo ( $frm_settings->use_html || $field['type'] == 'password' ) ? $field['type'] : 'text'; ?>" id="<?php echo esc_attr( $html_id ) ?>" name="<?php echo esc_attr( $field_name ) ?>" value="<?php echo esc_attr( $field['value'] ) ?>" <?php do_action('frm_field_input_html', $field) ?>/>
+<input type="<?php echo ( $frm_settings->use_html || $field['type'] == 'password' ) ? $field['type'] : 'text'; ?>" id="<?php echo esc_attr( $html_id ) ?>" name="<?php echo esc_attr( $field_name ) ?>" value="<?php echo esc_attr( $field['value'] ) ?>" <?php do_action( 'frm_field_input_html', $field ) ?>/>
 <?php } else if ( $field['type'] == 'textarea' ) { ?>
 <textarea name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" <?php
 if ( $field['max'] ) {
 	echo 'rows="' . esc_attr( $field['max'] ) . '" ';
 }
-do_action('frm_field_input_html', $field);
-?>><?php echo FrmAppHelper::esc_textarea($field['value']) ?></textarea>
+do_action( 'frm_field_input_html', $field );
+?>><?php echo FrmAppHelper::esc_textarea( $field['value'] ) ?></textarea>
 <?php
 
 } else if ( $field['type'] == 'radio' ) {
@@ -17,29 +17,29 @@ 
 <?php
     }
 
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+    if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' ) {
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
-    } else if ( is_array($field['options']) ) {
+    } else if ( is_array( $field['options'] ) ) {
         foreach ( $field['options'] as $opt_key => $opt ) {
 			if ( isset( $atts ) && isset( $atts['opt'] ) && ( $atts['opt'] != $opt_key ) ) {
                 continue;
             }
 
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field); ?>
+            $field_val = apply_filters( 'frm_field_value_saved', $opt, $opt_key, $field );
+            $opt = apply_filters( 'frm_field_label_seen', $opt, $opt_key, $field ); ?>
 			<div class="<?php echo esc_attr( apply_filters( 'frm_radio_class', 'frm_radio', $field, $field_val ) ) ?>"><?php
 
 			if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
 				?><label for="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
             }
-            $checked = FrmAppHelper::check_selected($field['value'], $field_val) ? 'checked="checked" ' : ' ';
+            $checked = FrmAppHelper::check_selected( $field['value'], $field_val ) ? 'checked="checked" ' : ' ';
 
             $other_opt = false;
             $other_args = FrmFieldsHelper::prepare_other_input( compact( 'field_name', 'opt_key', 'field' ), $other_opt, $checked );
             ?>
             <input type="radio" name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id . '-' . $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php
             echo $checked;
-            do_action('frm_field_input_html', $field);
+            do_action( 'frm_field_input_html', $field );
 ?>/><?php
 
 			if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
@@ -77,17 +77,17 @@ 
         }
     }
 
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+    if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' ) {
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
     } else if ( $field['options'] ) {
         foreach ( $field['options'] as $opt_key => $opt ) {
-            if ( isset($atts) && isset($atts['opt']) && ($atts['opt'] != $opt_key) ) {
+            if ( isset( $atts ) && isset( $atts['opt'] ) && ( $atts['opt'] != $opt_key ) ) {
                 continue;
             }
 
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
-            $checked = FrmAppHelper::check_selected($checked_values, $field_val) ? ' checked="checked"' : '';
+            $field_val = apply_filters( 'frm_field_value_saved', $opt, $opt_key, $field );
+            $opt = apply_filters( 'frm_field_label_seen', $opt, $opt_key, $field );
+            $checked = FrmAppHelper::check_selected( $checked_values, $field_val ) ? ' checked="checked"' : '';
 
             // Check if other opt, and get values for other field if needed
             $other_opt = false;
@@ -100,7 +100,7 @@ 
                 ?><label for="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
             }
 
-            ?><input type="checkbox" name="<?php echo esc_attr( $field_name ) ?>[<?php echo ( $other_opt ? esc_attr( $opt_key ) : '' ) ?>]" id="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php echo $checked ?> <?php do_action('frm_field_input_html', $field) ?> /><?php
+            ?><input type="checkbox" name="<?php echo esc_attr( $field_name ) ?>[<?php echo ( $other_opt ? esc_attr( $opt_key ) : '' ) ?>]" id="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php echo $checked ?> <?php do_action( 'frm_field_input_html', $field ) ?> /><?php
 
             if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
 				echo ' ' . $opt . '</label>';
@@ -121,8 +121,8 @@ 
     }
 } else if ( $field['type'] == 'captcha' && ! FrmAppHelper::is_admin() ) {
     $frm_settings = FrmAppHelper::get_settings();
-    if ( ! empty($frm_settings->pubkey) ) {
-        FrmFieldsHelper::display_recaptcha($field);
+    if ( ! empty( $frm_settings->pubkey ) ) {
+        FrmFieldsHelper::display_recaptcha( $field );
     }
 } else {
 	do_action( 'frm_form_fields', $field, $field_name, compact( 'errors', 'html_id' ) );

classes/views/frm-fields/front-end/dropdown-field.php

Spacing +4 added lines, -4 removed lines

@@ -1,17 +1,17 @@ 
 <?php
 
 $read_only = false;
-if ( isset($field['post_field']) && $field['post_field'] == 'post_category' && FrmAppHelper::pro_is_installed() ) {
+if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' && FrmAppHelper::pro_is_installed() ) {
 	echo FrmProPost::get_category_dropdown( $field, array( 'location' => 'front', 'name' => $field_name, 'id' => $html_id ) );
 } else {
 	if ( FrmAppHelper::pro_is_installed() && FrmField::is_read_only( $field ) ) {
 		$read_only = true;
 
 		echo FrmProDropdownFieldsController::get_hidden_fields_with_readonly_values( $field, $field_name, $html_id ); ?>
-		<select <?php do_action('frm_field_input_html', $field) ?>> <?php
+		<select <?php do_action( 'frm_field_input_html', $field ) ?>> <?php
 
 	} else { ?>
-		<select name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" <?php do_action('frm_field_input_html', $field) ?>>
+		<select name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" <?php do_action( 'frm_field_input_html', $field ) ?>>
 	<?php   }
 
 	$other_opt = $other_checked = false;
@@ -26,7 +26,7 @@ 
 			}
 		}
 		?>
-		<option value="<?php echo esc_attr($field_val) ?>" <?php echo $selected ? ' selected="selected"' : ''; ?><?php echo ( FrmFieldsHelper::is_other_opt( $opt_key ) ) ? ' class="frm_other_trigger"' : '';?>><?php echo esc_html( $opt == '' ? ' ' : $opt ); ?></option>
+		<option value="<?php echo esc_attr( $field_val ) ?>" <?php echo $selected ? ' selected="selected"' : ''; ?><?php echo ( FrmFieldsHelper::is_other_opt( $opt_key ) ) ? ' class="frm_other_trigger"' : ''; ?>><?php echo esc_html( $opt == '' ? ' ' : $opt ); ?></option>
 		<?php
 	} ?>
 	</select>

classes/views/frm-fields/back-end/dropdown-field.php

Spacing +6 added lines, -6 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 
-if ( isset($field['post_field']) && $field['post_field'] == 'post_category' && FrmAppHelper::pro_is_installed() ) {
+if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' && FrmAppHelper::pro_is_installed() ) {
 	echo FrmProPost::get_category_dropdown( $field, array( 'name' => $field_name, 'id' => 'placeholder_id', 'location' => 'form_builder' ) );
 } else { ?>
 	<select name="<?php echo esc_attr( $field_name ) . ( FrmField::is_option_true( $field, 'multiple' ) ? '[]' : '' ); ?>" <?php
 	echo FrmField::is_option_true( $field, 'size' ) ? 'class="auto_width"' : '';
 	echo FrmField::is_option_true( $field, 'multiple' ) ? ' multiple="multiple"' : ''; ?> >
 		<?php foreach ( $field['options'] as $opt_key => $opt ) {
-			$field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-			$opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+			$field_val = apply_filters( 'frm_field_value_saved', $opt, $opt_key, $field );
+			$opt = apply_filters( 'frm_field_label_seen', $opt, $opt_key, $field );
 			$selected = ( $field['default_value'] == $field_val || FrmFieldsHelper::get_other_val( array( 'opt_key', 'field' ) ) ) ? ' selected="selected"' : ''; ?>
 			<option value="<?php echo esc_attr( $field_val ) ?>"<?php echo $selected ?>><?php echo esc_html( $opt ) ?> </option>
 		<?php } ?>
@@ -26,9 +26,9 @@ 
 	<?php
 
 	if ( ! isset( $field['post_field'] ) || ! in_array( $field['post_field'], array( 'post_category' ) ) ) { ?>
-		<?php do_action('frm_add_multiple_opts_labels', $field); ?>
-		<ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts<?php echo ( count($field['options']) > 10 ) ? ' frm_field_opts_list' : ''; ?>">
-			<?php FrmFieldsHelper::show_single_option($field); ?>
+		<?php do_action( 'frm_add_multiple_opts_labels', $field ); ?>
+		<ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts<?php echo ( count( $field['options'] ) > 10 ) ? ' frm_field_opts_list' : ''; ?>">
+			<?php FrmFieldsHelper::show_single_option( $field ); ?>
 		</ul>
 		<?php
 	} ?>

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

Indentation +8 added lines, -8 removed lines

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

Spacing +7 added lines, -7 removed lines

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

classes/models/FrmField.php

Spacing +74 added lines, -74 removed lines

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

Indentation +202 added lines, -202 removed lines

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