Strategy11 / formidable-forms

classes/helpers/FrmFormsListHelper.php

Indentation +173 added lines, -173 removed lines

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

Spacing +31 added lines, -31 removed lines

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

classes/helpers/FrmEntriesListHelper.php

Indentation +68 added lines, -68 removed lines

@@ -6,46 +6,46 @@ 
 	protected $field;
 
 	public function prepare_items() {
-        global $wpdb, $per_page;
+		global $wpdb, $per_page;
 
 		$per_page = $this->get_items_per_page( 'formidable_page_formidable_entries_per_page' );
 
-        $form_id = $this->params['form'];
-        if ( ! $form_id ) {
-            $this->items = array();
-    		$this->set_pagination_args( array(
-    			'total_items' => 0,
+		$form_id = $this->params['form'];
+		if ( ! $form_id ) {
+			$this->items = array();
+			$this->set_pagination_args( array(
+				'total_items' => 0,
 				'per_page' => $per_page,
-    		) );
-            return;
-        }
+			) );
+			return;
+		}
 
 		$default_orderby = 'id';
 		$default_order = 'DESC';
 
-	    $s_query = array( 'it.form_id' => $form_id );
+		$s_query = array( 'it.form_id' => $form_id );
 
 		$s = isset( $_REQUEST['s'] ) ? stripslashes($_REQUEST['s']) : '';
 
-	    if ( $s != '' && FrmAppHelper::pro_is_installed() ) {
-	        $fid = isset( $_REQUEST['fid'] ) ? sanitize_title( $_REQUEST['fid'] ) : '';
-	        $s_query = FrmProEntriesHelper::get_search_str( $s_query, $s, $form_id, $fid);
-	    }
+		if ( $s != '' && FrmAppHelper::pro_is_installed() ) {
+			$fid = isset( $_REQUEST['fid'] ) ? sanitize_title( $_REQUEST['fid'] ) : '';
+			$s_query = FrmProEntriesHelper::get_search_str( $s_query, $s, $form_id, $fid);
+		}
 
-        $orderby = isset( $_REQUEST['orderby'] ) ? sanitize_title( $_REQUEST['orderby'] ) : $default_orderby;
-        if ( strpos($orderby, 'meta') !== false ) {
-            $order_field_type = FrmField::get_type( str_replace( 'meta_', '', $orderby ) );
+		$orderby = isset( $_REQUEST['orderby'] ) ? sanitize_title( $_REQUEST['orderby'] ) : $default_orderby;
+		if ( strpos($orderby, 'meta') !== false ) {
+			$order_field_type = FrmField::get_type( str_replace( 'meta_', '', $orderby ) );
 			$orderby .= in_array( $order_field_type, array( 'number', 'scale' ) ) ? ' +0 ' : '';
-        }
+		}
 
 		$order = isset( $_REQUEST['order'] ) ? sanitize_title( $_REQUEST['order'] ) : $default_order;
 		$order = ' ORDER BY ' . $orderby . ' ' . $order;
 
-        $page = $this->get_pagenum();
+		$page = $this->get_pagenum();
 		$start = (int) isset( $_REQUEST['start'] ) ? absint( $_REQUEST['start'] ) : ( ( $page - 1 ) * $per_page );
 
 		$this->items = FrmEntry::getAll( $s_query, $order, ' LIMIT ' . $start . ',' . $per_page, true, false );
-        $total_items = FrmEntry::getRecordCount($s_query);
+		$total_items = FrmEntry::getRecordCount($s_query);
 
 		$this->set_pagination_args( array(
 			'total_items' => $total_items,
@@ -54,17 +54,17 @@ 
 	}
 
 	public function no_items() {
-        $s = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
-	    if ( ! empty($s) ) {
-            _e( 'No Entries Found', 'formidable' );
-            return;
-        }
-
-        $form_id = $form = $this->params['form'];
-        if ( $form_id ) {
-            $form = FrmForm::getOne($form_id);
-        }
-        $colspan = $this->get_column_count();
+		$s = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
+		if ( ! empty($s) ) {
+			_e( 'No Entries Found', 'formidable' );
+			return;
+		}
+
+		$form_id = $form = $this->params['form'];
+		if ( $form_id ) {
+			$form = FrmForm::getOne($form_id);
+		}
+		$colspan = $this->get_column_count();
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/no_entries.php' );
 	}
@@ -74,12 +74,12 @@ 
 	}
 
 	/**
-	* Gets the name of the primary column in the Entries screen
-	*
-	* @since 2.0.14
-	*
-	* @return string $primary_column
-	*/
+	 * Gets the name of the primary column in the Entries screen
+	 *
+	 * @since 2.0.14
+	 *
+	 * @return string $primary_column
+	 */
 	protected function get_primary_column_name() {
 		$columns = get_column_headers( $this->screen );
 		$hidden = get_hidden_columns( $this->screen );
@@ -103,7 +103,7 @@ 
 
 		$this->get_actions( $actions, $item, $view_link );
 
-        $action_links = $this->row_actions( $actions );
+		$action_links = $this->row_actions( $actions );
 
 		// Set up the checkbox ( because the user is editable, otherwise its empty )
 		$checkbox = "<input type='checkbox' name='item-action[]' id='cb-item-action-{$item->id}' value='{$item->id}' />";
@@ -111,7 +111,7 @@ 
 		$r = "<tr id='item-action-{$item->id}'$style>";
 
 		list( $columns, $hidden, , $primary ) = $this->get_column_info();
-        $action_col = false;
+		$action_col = false;
 
 		foreach ( $columns as $column_name => $column_display_name ) {
 			$class = $column_name . ' column-' . $column_name;
@@ -123,8 +123,8 @@ 
 			if ( in_array( $column_name, $hidden ) ) {
 				$class .= ' frm_hidden';
 			} else if ( ! $action_col && ! in_array( $column_name, array( 'cb', 'id', 'form_id', 'post_id' ) ) ) {
-			    $action_col = $column_name;
-            }
+				$action_col = $column_name;
+			}
 
 			$attributes = 'class="' . esc_attr( $class ) . '"';
 			unset($class);
@@ -140,30 +140,30 @@ 
 				case 'ip':
 				case 'id':
 				case 'item_key':
-				    $val = $item->{$col_name};
-				    break;
+					$val = $item->{$col_name};
+					break;
 				case 'name':
 				case 'description':
-				    $val = FrmAppHelper::truncate(strip_tags($item->{$col_name}), 100);
-				    break;
+					$val = FrmAppHelper::truncate(strip_tags($item->{$col_name}), 100);
+					break;
 				case 'created_at':
 				case 'updated_at':
-				    $date = FrmAppHelper::get_formatted_time($item->{$col_name});
+					$date = FrmAppHelper::get_formatted_time($item->{$col_name});
 					$val = '<abbr title="' . esc_attr( FrmAppHelper::get_formatted_time( $item->{$col_name}, '', 'g:i:s A' ) ) . '">' . $date . '</abbr>';
 					break;
 				case 'is_draft':
-				    $val = empty($item->is_draft) ? __( 'No') : __( 'Yes');
-			        break;
+					$val = empty($item->is_draft) ? __( 'No') : __( 'Yes');
+					break;
 				case 'form_id':
-				    $val = FrmFormsHelper::edit_form_link($item->form_id);
-    				break;
+					$val = FrmFormsHelper::edit_form_link($item->form_id);
+					break;
 				case 'post_id':
-				    $val = FrmAppHelper::post_edit_link($item->post_id);
-				    break;
+					$val = FrmAppHelper::post_edit_link($item->post_id);
+					break;
 				case 'user_id':
-				    $user = get_userdata($item->user_id);
-				    $val = $user->user_login;
-				    break;
+					$user = get_userdata($item->user_id);
+					$val = $user->user_login;
+					break;
 				default:
 					$val = apply_filters( 'frm_entries_' . $col_name . '_column', false, compact( 'item' ) );
 					if ( $val === false ) {
@@ -173,15 +173,15 @@ 
 			}
 
 			if ( isset( $val ) ) {
-			    $r .= "<td $attributes>";
+				$r .= "<td $attributes>";
 				if ( $column_name == $action_col ) {
 					$edit_link = '?page=formidable-entries&frm_action=edit&id=' . $item->id;
 					$r .= '<a href="' . esc_url( isset( $actions['edit'] ) ? $edit_link : $view_link ) . '" class="row-title" >' . $val . '</a> ';
-			        $r .= $action_links;
+					$r .= $action_links;
 				} else {
-			        $r .= $val;
-			    }
-			    $r .= '</td>';
+					$r .= $val;
+				}
+				$r .= '</td>';
 			}
 			unset($val);
 		}
@@ -190,19 +190,19 @@ 
 		return $r;
 	}
 
-    /**
-     * @param string $view_link
-     */
-    private function get_actions( &$actions, $item, $view_link ) {
+	/**
+	 * @param string $view_link
+	 */
+	private function get_actions( &$actions, $item, $view_link ) {
 		$actions['view'] = '<a href="' . esc_url( $view_link ) . '">' . __( 'View', 'formidable' ) . '</a>';
 
-        if ( current_user_can('frm_delete_entries') ) {
+		if ( current_user_can('frm_delete_entries') ) {
 			$delete_link = '?page=formidable-entries&frm_action=destroy&id=' . $item->id . '&form=' . $this->params['form'];
 			$actions['delete'] = '<a href="' . esc_url( wp_nonce_url( $delete_link ) ) . '" class="submitdelete" onclick="return confirm(\'' . esc_attr( __( 'Are you sure you want to delete that?', 'formidable' ) ) . '\')">' . __( 'Delete' ) . '</a>';
-	    }
+		}
 
-        $actions = apply_filters('frm_row_actions', $actions, $item);
-    }
+		$actions = apply_filters('frm_row_actions', $actions, $item);
+	}
 
 	private function get_column_value( $item, &$val ) {
 		$col_name = $this->column_name;

Spacing +17 added lines, -17 removed lines

@@ -25,15 +25,15 @@ 
 
 	    $s_query = array( 'it.form_id' => $form_id );
 
-		$s = isset( $_REQUEST['s'] ) ? stripslashes($_REQUEST['s']) : '';
+		$s = isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '';
 
 	    if ( $s != '' && FrmAppHelper::pro_is_installed() ) {
 	        $fid = isset( $_REQUEST['fid'] ) ? sanitize_title( $_REQUEST['fid'] ) : '';
-	        $s_query = FrmProEntriesHelper::get_search_str( $s_query, $s, $form_id, $fid);
+	        $s_query = FrmProEntriesHelper::get_search_str( $s_query, $s, $form_id, $fid );
 	    }
 
         $orderby = isset( $_REQUEST['orderby'] ) ? sanitize_title( $_REQUEST['orderby'] ) : $default_orderby;
-        if ( strpos($orderby, 'meta') !== false ) {
+        if ( strpos( $orderby, 'meta' ) !== false ) {
             $order_field_type = FrmField::get_type( str_replace( 'meta_', '', $orderby ) );
 			$orderby .= in_array( $order_field_type, array( 'number', 'scale' ) ) ? ' +0 ' : '';
         }
@@ -45,7 +45,7 @@ 
 		$start = (int) isset( $_REQUEST['start'] ) ? absint( $_REQUEST['start'] ) : ( ( $page - 1 ) * $per_page );
 
 		$this->items = FrmEntry::getAll( $s_query, $order, ' LIMIT ' . $start . ',' . $per_page, true, false );
-        $total_items = FrmEntry::getRecordCount($s_query);
+        $total_items = FrmEntry::getRecordCount( $s_query );
 
 		$this->set_pagination_args( array(
 			'total_items' => $total_items,
@@ -55,14 +55,14 @@ 
 
 	public function no_items() {
         $s = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
-	    if ( ! empty($s) ) {
+	    if ( ! empty( $s ) ) {
             _e( 'No Entries Found', 'formidable' );
             return;
         }
 
         $form_id = $form = $this->params['form'];
         if ( $form_id ) {
-            $form = FrmForm::getOne($form_id);
+            $form = FrmForm::getOne( $form_id );
         }
         $colspan = $this->get_column_count();
 
@@ -110,7 +110,7 @@ 
 
 		$r = "<tr id='item-action-{$item->id}'$style>";
 
-		list( $columns, $hidden, , $primary ) = $this->get_column_info();
+		list( $columns, $hidden,, $primary ) = $this->get_column_info();
         $action_col = false;
 
 		foreach ( $columns as $column_name => $column_display_name ) {
@@ -127,7 +127,7 @@ 
             }
 
 			$attributes = 'class="' . esc_attr( $class ) . '"';
-			unset($class);
+			unset( $class );
 			$attributes .= ' data-colname="' . $column_display_name . '"';
 
 			$col_name = preg_replace( '/^(' . $this->params['form'] . '_)/', '', $column_name );
@@ -144,24 +144,24 @@ 
 				    break;
 				case 'name':
 				case 'description':
-				    $val = FrmAppHelper::truncate(strip_tags($item->{$col_name}), 100);
+				    $val = FrmAppHelper::truncate( strip_tags( $item->{$col_name}), 100 );
 				    break;
 				case 'created_at':
 				case 'updated_at':
-				    $date = FrmAppHelper::get_formatted_time($item->{$col_name});
+				    $date = FrmAppHelper::get_formatted_time( $item->{$col_name});
 					$val = '<abbr title="' . esc_attr( FrmAppHelper::get_formatted_time( $item->{$col_name}, '', 'g:i:s A' ) ) . '">' . $date . '</abbr>';
 					break;
 				case 'is_draft':
-				    $val = empty($item->is_draft) ? __( 'No') : __( 'Yes');
+				    $val = empty( $item->is_draft ) ? __( 'No' ) : __( 'Yes' );
 			        break;
 				case 'form_id':
-				    $val = FrmFormsHelper::edit_form_link($item->form_id);
+				    $val = FrmFormsHelper::edit_form_link( $item->form_id );
     				break;
 				case 'post_id':
-				    $val = FrmAppHelper::post_edit_link($item->post_id);
+				    $val = FrmAppHelper::post_edit_link( $item->post_id );
 				    break;
 				case 'user_id':
-				    $user = get_userdata($item->user_id);
+				    $user = get_userdata( $item->user_id );
 				    $val = $user->user_login;
 				    break;
 				default:
@@ -183,7 +183,7 @@ 
 			    }
 			    $r .= '</td>';
 			}
-			unset($val);
+			unset( $val );
 		}
 		$r .= '</tr>';
 
@@ -196,12 +196,12 @@ 
     private function get_actions( &$actions, $item, $view_link ) {
 		$actions['view'] = '<a href="' . esc_url( $view_link ) . '">' . __( 'View', 'formidable' ) . '</a>';
 
-        if ( current_user_can('frm_delete_entries') ) {
+        if ( current_user_can( 'frm_delete_entries' ) ) {
 			$delete_link = '?page=formidable-entries&frm_action=destroy&id=' . $item->id . '&form=' . $this->params['form'];
 			$actions['delete'] = '<a href="' . esc_url( wp_nonce_url( $delete_link ) ) . '" class="submitdelete" onclick="return confirm(\'' . esc_attr( __( 'Are you sure you want to delete that?', 'formidable' ) ) . '\')">' . __( 'Delete' ) . '</a>';
 	    }
 
-        $actions = apply_filters('frm_row_actions', $actions, $item);
+        $actions = apply_filters( 'frm_row_actions', $actions, $item );
     }
 
 	private function get_column_value( $item, &$val ) {

classes/helpers/FrmStylesHelper.php

Indentation +100 added lines, -100 removed lines

@@ -1,67 +1,67 @@ 
 <?php
 class FrmStylesHelper {
 
-    public static function jquery_themes() {
-        $themes = array(
-            'ui-lightness'  => 'UI Lightness',
-            'ui-darkness'   => 'UI Darkness',
-            'smoothness'    => 'Smoothness',
-            'start'         => 'Start',
-            'redmond'       => 'Redmond',
-            'sunny'         => 'Sunny',
-            'overcast'      => 'Overcast',
-            'le-frog'       => 'Le Frog',
-            'flick'         => 'Flick',
+	public static function jquery_themes() {
+		$themes = array(
+			'ui-lightness'  => 'UI Lightness',
+			'ui-darkness'   => 'UI Darkness',
+			'smoothness'    => 'Smoothness',
+			'start'         => 'Start',
+			'redmond'       => 'Redmond',
+			'sunny'         => 'Sunny',
+			'overcast'      => 'Overcast',
+			'le-frog'       => 'Le Frog',
+			'flick'         => 'Flick',
 			'pepper-grinder' => 'Pepper Grinder',
-            'eggplant'      => 'Eggplant',
-            'dark-hive'     => 'Dark Hive',
-            'cupertino'     => 'Cupertino',
-            'south-street'  => 'South Street',
-            'blitzer'       => 'Blitzer',
-            'humanity'      => 'Humanity',
-            'hot-sneaks'    => 'Hot Sneaks',
-            'excite-bike'   => 'Excite Bike',
-            'vader'         => 'Vader',
-            'dot-luv'       => 'Dot Luv',
-            'mint-choc'     => 'Mint Choc',
-            'black-tie'     => 'Black Tie',
-            'trontastic'    => 'Trontastic',
-            'swanky-purse'  => 'Swanky Purse',
-        );
-
-        $themes = apply_filters('frm_jquery_themes', $themes);
-        return $themes;
-    }
+			'eggplant'      => 'Eggplant',
+			'dark-hive'     => 'Dark Hive',
+			'cupertino'     => 'Cupertino',
+			'south-street'  => 'South Street',
+			'blitzer'       => 'Blitzer',
+			'humanity'      => 'Humanity',
+			'hot-sneaks'    => 'Hot Sneaks',
+			'excite-bike'   => 'Excite Bike',
+			'vader'         => 'Vader',
+			'dot-luv'       => 'Dot Luv',
+			'mint-choc'     => 'Mint Choc',
+			'black-tie'     => 'Black Tie',
+			'trontastic'    => 'Trontastic',
+			'swanky-purse'  => 'Swanky Purse',
+		);
+
+		$themes = apply_filters('frm_jquery_themes', $themes);
+		return $themes;
+	}
 
 	public static function jquery_css_url( $theme_css ) {
-        if ( $theme_css == -1 ) {
-            return;
-        }
-
-        if ( ! $theme_css || $theme_css == '' || $theme_css == 'ui-lightness' ) {
-            $css_file = FrmAppHelper::plugin_url() . '/css/ui-lightness/jquery-ui.css';
-        } else if ( preg_match('/^http.?:\/\/.*\..*$/', $theme_css) ) {
-            $css_file = $theme_css;
-        } else {
-            $uploads = self::get_upload_base();
+		if ( $theme_css == -1 ) {
+			return;
+		}
+
+		if ( ! $theme_css || $theme_css == '' || $theme_css == 'ui-lightness' ) {
+			$css_file = FrmAppHelper::plugin_url() . '/css/ui-lightness/jquery-ui.css';
+		} else if ( preg_match('/^http.?:\/\/.*\..*$/', $theme_css) ) {
+			$css_file = $theme_css;
+		} else {
+			$uploads = self::get_upload_base();
 			$file_path = '/formidable/css/' . $theme_css . '/jquery-ui.css';
-            if ( file_exists($uploads['basedir'] . $file_path) ) {
-                $css_file = $uploads['baseurl'] . $file_path;
-            } else {
+			if ( file_exists($uploads['basedir'] . $file_path) ) {
+				$css_file = $uploads['baseurl'] . $file_path;
+			} else {
 				$css_file = FrmAppHelper::jquery_ui_base_url() . '/themes/' . $theme_css . '/jquery-ui.min.css';
-            }
-        }
+			}
+		}
 
-        return $css_file;
-    }
+		return $css_file;
+	}
 
-    public static function enqueue_jquery_css() {
+	public static function enqueue_jquery_css() {
 		$form = self::get_form_for_page();
 		$theme_css = FrmStylesController::get_style_val( 'theme_css', $form );
-        if ( $theme_css != -1 ) {
-            wp_enqueue_style('jquery-theme', self::jquery_css_url($theme_css), array(), FrmAppHelper::plugin_version());
-        }
-    }
+		if ( $theme_css != -1 ) {
+			wp_enqueue_style('jquery-theme', self::jquery_css_url($theme_css), array(), FrmAppHelper::plugin_version());
+		}
+	}
 
 	public static function get_form_for_page() {
 		global $frm_vars;
@@ -77,14 +77,14 @@ 
 		return $form_id;
 	}
 
-    public static function get_upload_base() {
-        $uploads = wp_upload_dir();
-        if ( is_ssl() && ! preg_match('/^https:\/\/.*\..*$/', $uploads['baseurl']) ) {
-            $uploads['baseurl'] = str_replace('http://', 'https://', $uploads['baseurl']);
-        }
+	public static function get_upload_base() {
+		$uploads = wp_upload_dir();
+		if ( is_ssl() && ! preg_match('/^https:\/\/.*\..*$/', $uploads['baseurl']) ) {
+			$uploads['baseurl'] = str_replace('http://', 'https://', $uploads['baseurl']);
+		}
 
-        return $uploads;
-    }
+		return $uploads;
+	}
 
 	public static function style_menu( $active = '' ) {
 ?>
@@ -94,22 +94,22 @@ 
 			<a href="<?php echo esc_url( admin_url('admin.php?page=formidable-styles&frm_action=custom_css' ) ) ?>" class="nav-tab <?php echo ( 'custom_css' == $active ) ? 'nav-tab-active' : '' ?>"><?php _e( 'Custom CSS', 'formidable' ) ?></a>
         </h2>
 <?php
-    }
+	}
 
-    public static function minus_icons() {
-        return array(
+	public static function minus_icons() {
+		return array(
 			0 => array( '-' => '62e', '+' => '62f' ),
 			1 => array( '-' => '600', '+' => '602' ),
 			2 => array( '-' => '604', '+' => '603' ),
 			3 => array( '-' => '633', '+' => '632' ),
 			4 => array( '-' => '613', '+' => '60f' ),
-        );
-    }
+		);
+	}
 
-    public static function arrow_icons() {
-        $minus_icons = self::minus_icons();
+	public static function arrow_icons() {
+		$minus_icons = self::minus_icons();
 
-        return array(
+		return array(
 			6 => array( '-' => '62d', '+' => '62a' ),
 			0 => array( '-' => '60d', '+' => '609' ),
 			1 => array( '-' => '60e', '+' => '60c' ),
@@ -117,44 +117,44 @@ 
 			3 => array( '-' => '62b', '+' => '628' ),
 			4 => array( '-' => '62c', '+' => '629' ),
 			5 => array( '-' => '635', '+' => '634' ),
-            'p0' => $minus_icons[0],
-            'p1' => $minus_icons[1],
-            'p2' => $minus_icons[2],
-            'p3' => $minus_icons[3],
-            'p4' => $minus_icons[4],
-        );
-    }
-
-    /**
-     * @since 2.0
-     * @return The class for this icon
-     */
+			'p0' => $minus_icons[0],
+			'p1' => $minus_icons[1],
+			'p2' => $minus_icons[2],
+			'p3' => $minus_icons[3],
+			'p4' => $minus_icons[4],
+		);
+	}
+
+	/**
+	 * @since 2.0
+	 * @return The class for this icon
+	 */
 	public static function icon_key_to_class( $key, $icon = '+', $type = 'arrow' ) {
-        if ( 'arrow' == $type && is_numeric($key) ) {
-            //frm_arrowup6_icon
+		if ( 'arrow' == $type && is_numeric($key) ) {
+			//frm_arrowup6_icon
 			$arrow = array( '-' => 'down', '+' => 'up' );
 			$class = 'frm_arrow' . $arrow[ $icon ];
-        } else {
-            //frm_minus1_icon
-            $key = str_replace('p', '', $key);
+		} else {
+			//frm_minus1_icon
+			$key = str_replace('p', '', $key);
 			$plus = array( '-' => 'minus', '+' => 'plus' );
 			$class = 'frm_' . $plus[ $icon ];
-        }
+		}
 
-        if ( $key ) {
-            $class .= $key;
-        }
-        $class .= '_icon';
+		if ( $key ) {
+			$class .= $key;
+		}
+		$class .= '_icon';
 
-        return $class;
-    }
+		return $class;
+	}
 
 	public static function bs_icon_select( $style, $frm_style, $type = 'arrow' ) {
 		$function_name = $type . '_icons';
 		$icons = self::$function_name();
 		unset( $function_name );
 
-        $name = ( 'arrow' == $type ) ? 'collapse_icon' : 'repeat_icon';
+		$name = ( 'arrow' == $type ) ? 'collapse_icon' : 'repeat_icon';
 ?>
     	<select name="<?php echo esc_attr( $frm_style->get_field_name($name) ) ?>" id="frm_<?php echo esc_attr( $name ) ?>" class="frm_icon_font frm_multiselect hide-if-js">
             <?php foreach ( $icons as $key => $icon ) { ?>
@@ -187,22 +187,22 @@ 
             </ul>
         </div>
 <?php
-    }
+	}
 
 	public static function hex2rgb( $hex ) {
-        $hex = str_replace('#', '', $hex);
+		$hex = str_replace('#', '', $hex);
 
-        if ( strlen($hex) == 3 ) {
+		if ( strlen($hex) == 3 ) {
 			$r = hexdec( substr( $hex, 0, 1 ) . substr( $hex, 0, 1 ) );
 			$g = hexdec( substr( $hex, 1, 1 ) . substr( $hex, 1, 1 ) );
 			$b = hexdec( substr( $hex, 2, 1 ) . substr( $hex, 2, 1 ) );
-        } else {
+		} else {
 			$r = hexdec( substr( $hex, 0, 2 ) );
 			$g = hexdec( substr( $hex, 2, 2 ) );
 			$b = hexdec( substr( $hex, 4, 2 ) );
-        }
+		}
 		$rgb = array( $r, $g, $b );
-        return implode(',', $rgb); // returns the rgb values separated by commas
-        //return $rgb; // returns an array with the rgb values
-    }
+		return implode(',', $rgb); // returns the rgb values separated by commas
+		//return $rgb; // returns an array with the rgb values
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -29,7 +29,7 @@ 
             'swanky-purse'  => 'Swanky Purse',
         );
 
-        $themes = apply_filters('frm_jquery_themes', $themes);
+        $themes = apply_filters( 'frm_jquery_themes', $themes );
         return $themes;
     }
 
@@ -40,12 +40,12 @@ 
 
         if ( ! $theme_css || $theme_css == '' || $theme_css == 'ui-lightness' ) {
             $css_file = FrmAppHelper::plugin_url() . '/css/ui-lightness/jquery-ui.css';
-        } else if ( preg_match('/^http.?:\/\/.*\..*$/', $theme_css) ) {
+        } else if ( preg_match( '/^http.?:\/\/.*\..*$/', $theme_css ) ) {
             $css_file = $theme_css;
         } else {
             $uploads = self::get_upload_base();
 			$file_path = '/formidable/css/' . $theme_css . '/jquery-ui.css';
-            if ( file_exists($uploads['basedir'] . $file_path) ) {
+            if ( file_exists( $uploads['basedir'] . $file_path ) ) {
                 $css_file = $uploads['baseurl'] . $file_path;
             } else {
 				$css_file = FrmAppHelper::jquery_ui_base_url() . '/themes/' . $theme_css . '/jquery-ui.min.css';
@@ -59,7 +59,7 @@ 
 		$form = self::get_form_for_page();
 		$theme_css = FrmStylesController::get_style_val( 'theme_css', $form );
         if ( $theme_css != -1 ) {
-            wp_enqueue_style('jquery-theme', self::jquery_css_url($theme_css), array(), FrmAppHelper::plugin_version());
+            wp_enqueue_style( 'jquery-theme', self::jquery_css_url( $theme_css ), array(), FrmAppHelper::plugin_version() );
         }
     }
 
@@ -79,8 +79,8 @@ 
 
     public static function get_upload_base() {
         $uploads = wp_upload_dir();
-        if ( is_ssl() && ! preg_match('/^https:\/\/.*\..*$/', $uploads['baseurl']) ) {
-            $uploads['baseurl'] = str_replace('http://', 'https://', $uploads['baseurl']);
+        if ( is_ssl() && ! preg_match( '/^https:\/\/.*\..*$/', $uploads['baseurl'] ) ) {
+            $uploads['baseurl'] = str_replace( 'http://', 'https://', $uploads['baseurl'] );
         }
 
         return $uploads;
@@ -91,7 +91,7 @@ 
         <h2 class="nav-tab-wrapper">
 			<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-styles' ) ) ?>" class="nav-tab <?php echo ( '' == $active ) ? 'nav-tab-active' : '' ?>"><?php _e( 'Edit Styles', 'formidable' ) ?></a>
 			<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-styles&frm_action=manage' ) ) ?>" class="nav-tab <?php echo ( 'manage' == $active ) ? 'nav-tab-active' : '' ?>"><?php _e( 'Manage Form Styles', 'formidable' ) ?></a>
-			<a href="<?php echo esc_url( admin_url('admin.php?page=formidable-styles&frm_action=custom_css' ) ) ?>" class="nav-tab <?php echo ( 'custom_css' == $active ) ? 'nav-tab-active' : '' ?>"><?php _e( 'Custom CSS', 'formidable' ) ?></a>
+			<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-styles&frm_action=custom_css' ) ) ?>" class="nav-tab <?php echo ( 'custom_css' == $active ) ? 'nav-tab-active' : '' ?>"><?php _e( 'Custom CSS', 'formidable' ) ?></a>
         </h2>
 <?php
     }
@@ -130,15 +130,15 @@ 
      * @return The class for this icon
      */
 	public static function icon_key_to_class( $key, $icon = '+', $type = 'arrow' ) {
-        if ( 'arrow' == $type && is_numeric($key) ) {
+        if ( 'arrow' == $type && is_numeric( $key ) ) {
             //frm_arrowup6_icon
 			$arrow = array( '-' => 'down', '+' => 'up' );
-			$class = 'frm_arrow' . $arrow[ $icon ];
+			$class = 'frm_arrow' . $arrow[$icon];
         } else {
             //frm_minus1_icon
-            $key = str_replace('p', '', $key);
+            $key = str_replace( 'p', '', $key );
 			$plus = array( '-' => 'minus', '+' => 'plus' );
-			$class = 'frm_' . $plus[ $icon ];
+			$class = 'frm_' . $plus[$icon];
         }
 
         if ( $key ) {
@@ -156,9 +156,9 @@ 
 
         $name = ( 'arrow' == $type ) ? 'collapse_icon' : 'repeat_icon';
 ?>
-    	<select name="<?php echo esc_attr( $frm_style->get_field_name($name) ) ?>" id="frm_<?php echo esc_attr( $name ) ?>" class="frm_icon_font frm_multiselect hide-if-js">
+    	<select name="<?php echo esc_attr( $frm_style->get_field_name( $name ) ) ?>" id="frm_<?php echo esc_attr( $name ) ?>" class="frm_icon_font frm_multiselect hide-if-js">
             <?php foreach ( $icons as $key => $icon ) { ?>
-			<option value="<?php echo esc_attr( $key ) ?>" <?php selected( $style->post_content[ $name ], $key ) ?>>
+			<option value="<?php echo esc_attr( $key ) ?>" <?php selected( $style->post_content[$name], $key ) ?>>
 				<?php echo '&#xe' . $icon['+'] . '; &#xe' . $icon['-'] . ';'; ?>
             </option>
             <?php } ?>
@@ -166,8 +166,8 @@ 
 
         <div class="btn-group hide-if-no-js" id="frm_<?php echo esc_attr( $name ) ?>_select">
             <button class="multiselect dropdown-toggle btn btn-default" data-toggle="dropdown" type="button">
-				<i class="frm_icon_font <?php echo esc_attr( self::icon_key_to_class( $style->post_content[ $name ], '+', $type ) ) ?>"></i>
-				<i class="frm_icon_font <?php echo esc_attr( self::icon_key_to_class( $style->post_content[ $name ], '-', $type ) ) ?>"></i>
+				<i class="frm_icon_font <?php echo esc_attr( self::icon_key_to_class( $style->post_content[$name], '+', $type ) ) ?>"></i>
+				<i class="frm_icon_font <?php echo esc_attr( self::icon_key_to_class( $style->post_content[$name], '-', $type ) ) ?>"></i>
                 <b class="caret"></b>
             </button>
             <ul class="multiselect-container frm-dropdown-menu">
@@ -190,9 +190,9 @@ 
     }
 
 	public static function hex2rgb( $hex ) {
-        $hex = str_replace('#', '', $hex);
+        $hex = str_replace( '#', '', $hex );
 
-        if ( strlen($hex) == 3 ) {
+        if ( strlen( $hex ) == 3 ) {
 			$r = hexdec( substr( $hex, 0, 1 ) . substr( $hex, 0, 1 ) );
 			$g = hexdec( substr( $hex, 1, 1 ) . substr( $hex, 1, 1 ) );
 			$b = hexdec( substr( $hex, 2, 1 ) . substr( $hex, 2, 1 ) );
@@ -202,7 +202,7 @@ 
 			$b = hexdec( substr( $hex, 4, 2 ) );
         }
 		$rgb = array( $r, $g, $b );
-        return implode(',', $rgb); // returns the rgb values separated by commas
+        return implode( ',', $rgb ); // returns the rgb values separated by commas
         //return $rgb; // returns an array with the rgb values
     }
 }

css/_single_theme.css.php

Indentation +18 added lines, -18 removed lines

@@ -3,23 +3,23 @@ 
 if ( isset($_GET['frm_style_setting']) || isset($_GET['flat']) ) {
 	if ( isset( $_GET['frm_style_setting'] ) ) {
 		extract( $_GET['frm_style_setting']['post_content'] );
-    } else {
-        extract($_GET);
-    }
+	} else {
+		extract($_GET);
+	}
 
-    $important_style = isset($important_style) ? $important_style : 0;
-    $auto_width = isset($auto_width) ? $auto_width : 0;
-    $submit_style = isset($submit_style) ? $submit_style : 0;
+	$important_style = isset($important_style) ? $important_style : 0;
+	$auto_width = isset($auto_width) ? $auto_width : 0;
+	$submit_style = isset($submit_style) ? $submit_style : 0;
 
 	$style_name = FrmAppHelper::simple_get( 'style_name', 'sanitize_title' );
 	if ( ! empty( $style_name ) ) {
 		$style_class = $style_name . '.with_frm_style';
-    } else {
-        $style_class = 'with_frm_style';
-    }
+	} else {
+		$style_class = 'with_frm_style';
+	}
 } else {
 	$style_class = 'frm_style_' . $style->post_name . '.with_frm_style';
-    extract($style->post_content);
+	extract($style->post_content);
 }
 
 $important = empty($important_style) ? '' : ' !important';
@@ -40,7 +40,7 @@ 
 }
 
 if ( ! isset($collapse_icon) ) {
-    $collapse_icon = 0;
+	$collapse_icon = 0;
 }
 
 if ( ! isset( $center_form ) ) {
@@ -337,7 +337,7 @@ 
     color:#<?php echo esc_html( $text_color . $important ) ?>;
 	background-color:<?php echo esc_html( ( empty( $bg_color ) ? 'transparent' : '#' . $bg_color ) . $important ); ?>;
 <?php if ( ! empty($important) ) {
-    echo esc_html( 'background-image:none' . $important . ';' );
+	echo esc_html( 'background-image:none' . $important . ';' );
 }
 ?>
     border-color:#<?php echo esc_html( $border_color . $important ) ?>;
@@ -548,7 +548,7 @@ 
     color:#<?php echo esc_html( $submit_active_color . $important ) ?>;
 }
 <?php
-    }
+	}
 }
 ?>
 
@@ -851,11 +851,11 @@ 
 
 .<?php echo esc_html( $style_class ) ?> .chosen-container-single .chosen-single div{
 <?php
-    // calculate the top position based on field padding
-    $top_pad = explode(' ', $field_pad);
-    $top_pad = reset($top_pad); // the top padding is listed first
-    $pad_unit = preg_replace('/[0-9]+/', '', $top_pad); //px, em, rem...
-    $top_margin = (int) str_replace($pad_unit, '', $top_pad) / 2;
+	// calculate the top position based on field padding
+	$top_pad = explode(' ', $field_pad);
+	$top_pad = reset($top_pad); // the top padding is listed first
+	$pad_unit = preg_replace('/[0-9]+/', '', $top_pad); //px, em, rem...
+	$top_margin = (int) str_replace($pad_unit, '', $top_pad) / 2;
 ?>
     top:<?php echo esc_html( $top_margin . $pad_unit . $important ) ?>;
 }

Spacing +18 added lines, -18 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 
-if ( isset($_GET['frm_style_setting']) || isset($_GET['flat']) ) {
+if ( isset( $_GET['frm_style_setting'] ) || isset( $_GET['flat'] ) ) {
 	if ( isset( $_GET['frm_style_setting'] ) ) {
 		extract( $_GET['frm_style_setting']['post_content'] );
     } else {
-        extract($_GET);
+        extract( $_GET );
     }
 
-    $important_style = isset($important_style) ? $important_style : 0;
-    $auto_width = isset($auto_width) ? $auto_width : 0;
-    $submit_style = isset($submit_style) ? $submit_style : 0;
+    $important_style = isset( $important_style ) ? $important_style : 0;
+    $auto_width = isset( $auto_width ) ? $auto_width : 0;
+    $submit_style = isset( $submit_style ) ? $submit_style : 0;
 
 	$style_name = FrmAppHelper::simple_get( 'style_name', 'sanitize_title' );
 	if ( ! empty( $style_name ) ) {
@@ -19,10 +19,10 @@ 
     }
 } else {
 	$style_class = 'frm_style_' . $style->post_name . '.with_frm_style';
-    extract($style->post_content);
+    extract( $style->post_content );
 }
 
-$important = empty($important_style) ? '' : ' !important';
+$important = empty( $important_style ) ? '' : ' !important';
 $label_margin = (int) $width + 10;
 
 $minus_icons = FrmStylesHelper::minus_icons();
@@ -41,7 +41,7 @@ 
 	$change_margin = 650 . 'px';
 }
 
-if ( ! isset($collapse_icon) ) {
+if ( ! isset( $collapse_icon ) ) {
     $collapse_icon = 0;
 }
 
@@ -150,11 +150,11 @@ 
 }
 
 .<?php echo esc_html( $style_class ) ?> .frm_icon_font.frm_minus_icon:before{
-	content:"\e<?php echo esc_html( isset( $minus_icons[ $repeat_icon ] ) ? $minus_icons[ $repeat_icon ]['-'] : $minus_icons[1]['-'] ) ?>";
+	content:"\e<?php echo esc_html( isset( $minus_icons[$repeat_icon] ) ? $minus_icons[$repeat_icon]['-'] : $minus_icons[1]['-'] ) ?>";
 }
 
 .<?php echo esc_html( $style_class ) ?> .frm_icon_font.frm_plus_icon:before{
-	content:"\e<?php echo esc_html( isset( $minus_icons[ $repeat_icon ] ) ? $minus_icons[ $repeat_icon ]['+'] : $minus_icons[1]['+'] ) ?>";
+	content:"\e<?php echo esc_html( isset( $minus_icons[$repeat_icon] ) ? $minus_icons[$repeat_icon]['+'] : $minus_icons[1]['+'] ) ?>";
 }
 
 .<?php echo esc_html( $style_class ) ?> .frm_icon_font.frm_minus_icon:before,
@@ -163,11 +163,11 @@ 
 }
 
 .<?php echo esc_html( $style_class ) ?> .frm_trigger.active .frm_icon_font.frm_arrow_icon:before{
-	content:"\e<?php echo esc_html( isset( $arrow_icons[ $collapse_icon ] ) ? $arrow_icons[ $collapse_icon ]['-'] : $arrow_icons[1]['-'] ) ?>";
+	content:"\e<?php echo esc_html( isset( $arrow_icons[$collapse_icon] ) ? $arrow_icons[$collapse_icon]['-'] : $arrow_icons[1]['-'] ) ?>";
 }
 
 .<?php echo esc_html( $style_class ) ?> .frm_trigger .frm_icon_font.frm_arrow_icon:before{
-	content:"\e<?php echo esc_html( isset( $arrow_icons[ $collapse_icon ] ) ? $arrow_icons[ $collapse_icon ]['+'] : $arrow_icons[1]['+'] ) ?>";
+	content:"\e<?php echo esc_html( isset( $arrow_icons[$collapse_icon] ) ? $arrow_icons[$collapse_icon]['+'] : $arrow_icons[1]['+'] ) ?>";
 }
 
 .<?php echo esc_html( $style_class ) ?> .form-field{
@@ -342,7 +342,7 @@ 
 .<?php echo esc_html( $style_class ) ?> .chosen-container-single .chosen-single{
     color:#<?php echo esc_html( $text_color . $important ) ?>;
 	background-color:<?php echo esc_html( ( empty( $bg_color ) ? 'transparent' : '#' . $bg_color ) . $important ); ?>;
-<?php if ( ! empty($important) ) {
+<?php if ( ! empty( $important ) ) {
     echo esc_html( 'background-image:none' . $important . ';' );
 }
 ?>
@@ -500,7 +500,7 @@ 
     line-height:normal<?php echo esc_html( $important ) ?>;
     text-align:center;
     background:#<?php echo esc_html( $submit_bg_color );
-	if ( ! empty($submit_bg_img) ) {
+	if ( ! empty( $submit_bg_img ) ) {
 		echo esc_html( ' url(' . $submit_bg_img . ')' );
 	}
 	echo esc_html( $important ); ?>;
@@ -861,10 +861,10 @@ 
 .<?php echo esc_html( $style_class ) ?> .chosen-container-single .chosen-single div{
 <?php
     // calculate the top position based on field padding
-    $top_pad = explode(' ', $field_pad);
-    $top_pad = reset($top_pad); // the top padding is listed first
-    $pad_unit = preg_replace('/[0-9]+/', '', $top_pad); //px, em, rem...
-    $top_margin = (int) str_replace($pad_unit, '', $top_pad) / 2;
+    $top_pad = explode( ' ', $field_pad );
+    $top_pad = reset( $top_pad ); // the top padding is listed first
+    $pad_unit = preg_replace( '/[0-9]+/', '', $top_pad ); //px, em, rem...
+    $top_margin = (int) str_replace( $pad_unit, '', $top_pad ) / 2;
 ?>
     top:<?php echo esc_html( $top_margin . $pad_unit . $important ) ?>;
 }

css/custom_theme.css.php

Indentation +7 added lines, -7 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 if ( ! isset($saving) ) {
-    header( 'Content-type: text/css' );
+	header( 'Content-type: text/css' );
 
-    if ( isset($css) && $css ) {
-        echo $css;
-        die();
-    }
+	if ( isset($css) && $css ) {
+		echo $css;
+		die();
+	}
 }
 
 if ( ! isset($frm_style) ) {
-    $frm_style = new FrmStyle();
+	$frm_style = new FrmStyle();
 }
 
 $styles = $frm_style->get_all();
@@ -187,7 +187,7 @@ 
 <?php
 foreach ( $styles as $style ) {
 	include( dirname( __FILE__ ) . '/_single_theme.css.php' );
-    unset($style);
+	unset($style);
 }
 ?>
 

Spacing +6 added lines, -6 removed lines

@@ -1,19 +1,19 @@ 
 <?php
-if ( ! isset($saving) ) {
+if ( ! isset( $saving ) ) {
     header( 'Content-type: text/css' );
 
-    if ( isset($css) && $css ) {
+    if ( isset( $css ) && $css ) {
         echo $css;
         die();
     }
 }
 
-if ( ! isset($frm_style) ) {
+if ( ! isset( $frm_style ) ) {
     $frm_style = new FrmStyle();
 }
 
 $styles = $frm_style->get_all();
-$default_style = $frm_style->get_default_style($styles);
+$default_style = $frm_style->get_default_style( $styles );
 $defaults = $default_style->post_content;
 ?>
 
@@ -194,7 +194,7 @@ 
 <?php
 foreach ( $styles as $style ) {
 	include( dirname( __FILE__ ) . '/_single_theme.css.php' );
-    unset($style);
+    unset( $style );
 }
 ?>
 
@@ -619,7 +619,7 @@ 
     overflow:hidden!important;
 }
 
-<?php include( dirname(__FILE__) . '/frm_grids.css' ); ?>
+<?php include( dirname( __FILE__ ) . '/frm_grids.css' ); ?>
 
 /* Left and right label styling for non-Formidable styling - very basic, not responsive */
 .frm_form_field.frm_left_container label.frm_primary_label{

classes/controllers/FrmEntriesController.php

Spacing +67 added lines, -67 removed lines

@@ -5,7 +5,7 @@ 
     public static function menu() {
 		FrmAppHelper::force_capability( 'frm_view_entries' );
 
-        add_submenu_page('formidable', 'Formidable | ' . __( 'Entries', 'formidable' ), __( 'Entries', 'formidable' ), 'frm_view_entries', 'formidable-entries', 'FrmEntriesController::route' );
+        add_submenu_page( 'formidable', 'Formidable | ' . __( 'Entries', 'formidable' ), __( 'Entries', 'formidable' ), 'frm_view_entries', 'formidable-entries', 'FrmEntriesController::route' );
 
 		if ( ! in_array( FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ), array( 'edit', 'show' ) ) ) {
 			$menu_name = FrmAppHelper::get_menu_name();
@@ -53,7 +53,7 @@ 
             'id'      => 'formidable-entries-tab',
             'title'   => __( 'Overview', 'formidable' ),
 			'content' => '<p>' . esc_html__( 'This screen provides access to all of your entries. You can customize the display of this screen to suit your workflow.', 'formidable' ) . '</p> <p>' . esc_html__( 'Hovering over a row in the entries list will display action links that allow you to manage your entry.', 'formidable' ) . '</p>',
-        ));
+        ) );
 
         $screen->set_help_sidebar(
 			'<p><strong>' . esc_html__( 'For more information:', 'formidable' ) . '</strong></p>' .
@@ -68,14 +68,14 @@ 
         global $frm_vars, $wpdb;
 		$form_id = FrmForm::get_current_form_id();
 
-		$columns[ $form_id . '_id' ] = 'ID';
-		$columns[ $form_id . '_item_key' ] = esc_html__( 'Entry Key', 'formidable' );
+		$columns[$form_id . '_id'] = 'ID';
+		$columns[$form_id . '_item_key'] = esc_html__( 'Entry Key', 'formidable' );
 
         if ( ! $form_id ) {
             return $columns;
         }
 
-        $form_cols = FrmField::get_all_for_form($form_id, '', 'include');
+        $form_cols = FrmField::get_all_for_form( $form_id, '', 'include' );
 
         foreach ( $form_cols as $form_col ) {
 			if ( FrmField::is_no_save_field( $form_col->type ) ) {
@@ -88,30 +88,30 @@ 
                 if ( $sub_form_cols ) {
                     foreach ( $sub_form_cols as $k => $sub_form_col ) {
 						if ( FrmField::is_no_save_field( $sub_form_col->type ) ) {
-                            unset( $sub_form_cols[ $k ] );
+                            unset( $sub_form_cols[$k] );
                             continue;
                         }
-						$columns[ $form_id . '_' . $sub_form_col->field_key . '-_-' . $form_col->id ] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
-                        unset($sub_form_col);
+						$columns[$form_id . '_' . $sub_form_col->field_key . '-_-' . $form_col->id] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
+                        unset( $sub_form_col );
                     }
                 }
-                unset($sub_form_cols);
+                unset( $sub_form_cols );
             } else {
                 $col_id = $form_col->field_key;
                 if ( $form_col->form_id != $form_id ) {
 					$col_id .= '-_-form' . $form_col->form_id;
                 }
 
-                if ( isset($form_col->field_options['separate_value']) && $form_col->field_options['separate_value'] ) {
-					$columns[ $form_id . '_frmsep_' . $col_id ] = FrmAppHelper::truncate( $form_col->name, 35 );
+                if ( isset( $form_col->field_options['separate_value'] ) && $form_col->field_options['separate_value'] ) {
+					$columns[$form_id . '_frmsep_' . $col_id] = FrmAppHelper::truncate( $form_col->name, 35 );
                 }
-				$columns[ $form_id . '_' . $col_id ] = FrmAppHelper::truncate( $form_col->name, 35 );
+				$columns[$form_id . '_' . $col_id] = FrmAppHelper::truncate( $form_col->name, 35 );
             }
         }
 
-		$columns[ $form_id . '_created_at' ] = __( 'Entry creation date', 'formidable' );
-		$columns[ $form_id . '_updated_at' ] = __( 'Entry update date', 'formidable' );
-		$columns[ $form_id . '_ip' ] = 'IP';
+		$columns[$form_id . '_created_at'] = __( 'Entry creation date', 'formidable' );
+		$columns[$form_id . '_updated_at'] = __( 'Entry update date', 'formidable' );
+		$columns[$form_id . '_ip'] = 'IP';
 
         $frm_vars['cols'] = $columns;
 
@@ -136,7 +136,7 @@ 
 
         global $frm_vars;
         //add a check so we don't create a loop
-        $frm_vars['prev_hidden_cols'] = ( isset($frm_vars['prev_hidden_cols']) && $frm_vars['prev_hidden_cols'] ) ? false : $prev_value;
+        $frm_vars['prev_hidden_cols'] = ( isset( $frm_vars['prev_hidden_cols'] ) && $frm_vars['prev_hidden_cols'] ) ? false : $prev_value;
 
         return $check;
     }
@@ -151,19 +151,19 @@ 
         }
 
         global $frm_vars;
-        if ( ! isset($frm_vars['prev_hidden_cols']) || ! $frm_vars['prev_hidden_cols'] ) {
+        if ( ! isset( $frm_vars['prev_hidden_cols'] ) || ! $frm_vars['prev_hidden_cols'] ) {
             return; //don't continue if there's no previous value
         }
 
         foreach ( $meta_value as $mk => $mv ) {
             //remove blank values
-            if ( empty( $mv )  ) {
-                unset( $meta_value[ $mk ] );
+            if ( empty( $mv ) ) {
+                unset( $meta_value[$mk] );
             }
         }
 
-        $cur_form_prefix = reset($meta_value);
-        $cur_form_prefix = explode('_', $cur_form_prefix);
+        $cur_form_prefix = reset( $meta_value );
+        $cur_form_prefix = explode( '_', $cur_form_prefix );
         $cur_form_prefix = $cur_form_prefix[0];
         $save = false;
 
@@ -182,7 +182,7 @@ 
 
             $meta_value[] = $prev_hidden;
             $save = true;
-            unset($form_prefix);
+            unset( $form_prefix );
         }
 
 		if ( $save ) {
@@ -214,7 +214,7 @@ 
 		foreach ( $fields as $field ) {
 			if ( $field->type != 'checkbox' && ( ! isset( $field->field_options['post_field'] ) || $field->field_options['post_field'] == '' ) ) {
 				// Can't sort on checkboxes because they are stored serialized, or post fields
-				$columns[ $form_id . '_' . $field->field_key ] = 'meta_' . $field->id;
+				$columns[$form_id . '_' . $field->field_key] = 'meta_' . $field->id;
 			}
 		}
 
@@ -237,7 +237,7 @@ 
                     break;
                 }
 
-                unset($form_prefix);
+                unset( $form_prefix );
             }
         }
 
@@ -245,36 +245,36 @@ 
 			return $result;
 		}
 
-        $i = isset($frm_vars['cols']) ? count($frm_vars['cols']) : 0;
+        $i = isset( $frm_vars['cols'] ) ? count( $frm_vars['cols'] ) : 0;
         $max_columns = 8;
         if ( $i <= $max_columns ) {
 			return $result;
 		}
 
         global $frm_vars;
-        if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] ) {
-            $frm_vars['current_form']->options = maybe_unserialize($frm_vars['current_form']->options);
+        if ( isset( $frm_vars['current_form'] ) && $frm_vars['current_form'] ) {
+            $frm_vars['current_form']->options = maybe_unserialize( $frm_vars['current_form']->options );
         }
 
-        if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] && isset($frm_vars['current_form']->options['hidden_cols']) && ! empty($frm_vars['current_form']->options['hidden_cols']) ) {
+        if ( isset( $frm_vars['current_form'] ) && $frm_vars['current_form'] && isset( $frm_vars['current_form']->options['hidden_cols'] ) && ! empty( $frm_vars['current_form']->options['hidden_cols'] ) ) {
             $result = $frm_vars['current_form']->options['hidden_cols'];
         } else {
             $cols = $frm_vars['cols'];
-            $cols = array_reverse($cols, true);
+            $cols = array_reverse( $cols, true );
 
 			$result[] = $form_id . '_id';
-            $i--;
+            $i --;
 
 			$result[] = $form_id . '_item_key';
-            $i--;
+            $i --;
 
 			foreach ( $cols as $col_key => $col ) {
                 if ( $i > $max_columns ) {
 					$result[] = $col_key;
 				}
                 //remove some columns by default
-                $i--;
-                unset($col_key, $col);
+                $i --;
+                unset( $col_key, $col );
             }
         }
 
@@ -311,14 +311,14 @@ 
         if ( $pagenum > $total_pages && $total_pages > 0 ) {
 			$url = add_query_arg( 'paged', $total_pages );
             if ( headers_sent() ) {
-                echo FrmAppHelper::js_redirect($url);
+                echo FrmAppHelper::js_redirect( $url );
             } else {
                 wp_redirect( esc_url_raw( $url ) );
             }
             die();
         }
 
-        if ( empty($message) && isset($_GET['import-message']) ) {
+        if ( empty( $message ) && isset( $_GET['import-message'] ) ) {
             $message = __( 'Your import is complete', 'formidable' );
         }
 
@@ -327,7 +327,7 @@ 
 
     /* Back End CRUD */
 	public static function show( $id = 0 ) {
-        FrmAppHelper::permission_check('frm_view_entries');
+        FrmAppHelper::permission_check( 'frm_view_entries' );
 
         if ( ! $id ) {
 			$id = FrmAppHelper::get_param( 'id', 0, 'get', 'absint' );
@@ -337,9 +337,9 @@ 
             }
         }
 
-        $entry = FrmEntry::getOne($id, true);
+        $entry = FrmEntry::getOne( $id, true );
 
-        $data = maybe_unserialize($entry->description);
+        $data = maybe_unserialize( $entry->description );
 		if ( ! is_array( $data ) || ! isset( $data['referrer'] ) ) {
 			$data = array( 'referrer' => $data );
 		}
@@ -351,11 +351,11 @@ 
     }
 
     public static function destroy() {
-        FrmAppHelper::permission_check('frm_delete_entries');
+        FrmAppHelper::permission_check( 'frm_delete_entries' );
 
 		$params = FrmForm::get_admin_params();
 
-        if ( isset($params['keep_post']) && $params['keep_post'] ) {
+        if ( isset( $params['keep_post'] ) && $params['keep_post'] ) {
             //unlink entry from post
             global $wpdb;
 			$wpdb->update( $wpdb->prefix . 'frm_items', array( 'post_id' => '' ), array( 'id' => $params['id'] ) );
@@ -433,9 +433,9 @@ 
         if ( ! isset( $frm_vars['form_params'] ) ) {
             $frm_vars['form_params'] = array();
         }
-		$frm_vars['form_params'][ $form->id ] = $params;
+		$frm_vars['form_params'][$form->id] = $params;
 
-		if ( isset( $frm_vars['created_entries'][ $form_id ] ) ) {
+		if ( isset( $frm_vars['created_entries'][$form_id] ) ) {
             return;
         }
 
@@ -450,13 +450,13 @@ 
 		 */
 		$errors = apply_filters( 'frm_entries_before_create', $errors, $form );
 
-		$frm_vars['created_entries'][ $form_id ] = array( 'errors' => $errors );
+		$frm_vars['created_entries'][$form_id] = array( 'errors' => $errors );
 
         if ( empty( $errors ) ) {
 			$_POST['frm_skip_cookie'] = 1;
             if ( $params['action'] == 'create' ) {
-				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) {
-					$frm_vars['created_entries'][ $form_id ]['entry_id'] = FrmEntry::create( $_POST );
+				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][$form_id]['entry_id'] ) ) {
+					$frm_vars['created_entries'][$form_id]['entry_id'] = FrmEntry::create( $_POST );
                 }
             }
 
@@ -491,28 +491,28 @@ 
 	}
 
     public static function &filter_email_value( $value, $meta, $entry, $atts = array() ) {
-        $field = FrmField::getOne($meta->field_id);
+        $field = FrmField::getOne( $meta->field_id );
         if ( ! $field ) {
             return $value;
         }
 
-        $value = self::filter_display_value($value, $field, $atts);
+        $value = self::filter_display_value( $value, $field, $atts );
         return $value;
     }
 
 	public static function &filter_shortcode_value( $value, $tag, $atts, $field ) {
-        $plain_text = add_filter('frm_plain_text_email', true);
+        $plain_text = add_filter( 'frm_plain_text_email', true );
 		FrmEntryFormat::textarea_display_value( $field->type, $plain_text, $value );
 
-        if ( isset($atts['show']) && $atts['show'] == 'value' ) {
+        if ( isset( $atts['show'] ) && $atts['show'] == 'value' ) {
             return $value;
         }
 
-        return self::filter_display_value($value, $field, $atts);
+        return self::filter_display_value( $value, $field, $atts );
     }
 
     public static function &filter_display_value( $value, $field, $atts = array() ) {
-        $saved_value = ( isset($atts['saved_value']) && $atts['saved_value'] ) ? true : false;
+        $saved_value = ( isset( $atts['saved_value'] ) && $atts['saved_value'] ) ? true : false;
 		if ( ! in_array( $field->type, array( 'radio', 'checkbox', 'radio', 'select' ) ) || ! FrmField::is_option_true( $field, 'separate_value' ) || $saved_value ) {
             return $value;
         }
@@ -520,29 +520,29 @@ 
         $f_values = $f_labels = array();
 
         foreach ( $field->options as $opt_key => $opt ) {
-            if ( ! is_array($opt) ) {
+            if ( ! is_array( $opt ) ) {
                 continue;
             }
 
-            $f_labels[ $opt_key ] = isset( $opt['label'] ) ? $opt['label'] : reset($opt);
-            $f_values[ $opt_key ] = isset( $opt['value'] ) ? $opt['value'] : $f_labels[ $opt_key ];
-            if ( $f_labels[ $opt_key ] == $f_values[ $opt_key ] ) {
-                unset( $f_values[ $opt_key ], $f_labels[ $opt_key ] );
+            $f_labels[$opt_key] = isset( $opt['label'] ) ? $opt['label'] : reset( $opt );
+            $f_values[$opt_key] = isset( $opt['value'] ) ? $opt['value'] : $f_labels[$opt_key];
+            if ( $f_labels[$opt_key] == $f_values[$opt_key] ) {
+                unset( $f_values[$opt_key], $f_labels[$opt_key] );
             }
-            unset($opt_key, $opt);
+            unset( $opt_key, $opt );
         }
 
-        if ( ! empty($f_values) ) {
+        if ( ! empty( $f_values ) ) {
             foreach ( (array) $value as $v_key => $val ) {
-                if ( in_array($val, $f_values) ) {
-                    $opt = array_search($val, $f_values);
-                    if ( is_array($value) ) {
-                        $value[ $v_key ] = $f_labels[ $opt ];
+                if ( in_array( $val, $f_values ) ) {
+                    $opt = array_search( $val, $f_values );
+                    if ( is_array( $value ) ) {
+                        $value[$v_key] = $f_labels[$opt];
                     } else {
-                        $value = $f_labels[ $opt ];
+                        $value = $f_labels[$opt];
                     }
                 }
-                unset($v_key, $val);
+                unset( $v_key, $val );
             }
         }
 
@@ -555,9 +555,9 @@ 
 	}
 
 	public static function entry_sidebar( $entry ) {
-        $data = maybe_unserialize($entry->description);
-        $date_format = get_option('date_format');
-        $time_format = get_option('time_format');
+        $data = maybe_unserialize( $entry->description );
+        $date_format = get_option( 'date_format' );
+        $time_format = get_option( 'time_format' );
 		if ( isset( $data['browser'] ) ) {
 			$browser = FrmEntryFormat::get_browser( $data['browser'] );
 		}

Indentation +335 added lines, -335 removed lines

@@ -2,201 +2,201 @@ 
 
 class FrmEntriesController {
 
-    public static function menu() {
+	public static function menu() {
 		FrmAppHelper::force_capability( 'frm_view_entries' );
 
-        add_submenu_page('formidable', 'Formidable | ' . __( 'Entries', 'formidable' ), __( 'Entries', 'formidable' ), 'frm_view_entries', 'formidable-entries', 'FrmEntriesController::route' );
+		add_submenu_page('formidable', 'Formidable | ' . __( 'Entries', 'formidable' ), __( 'Entries', 'formidable' ), 'frm_view_entries', 'formidable-entries', 'FrmEntriesController::route' );
 
 		if ( ! in_array( FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ), array( 'edit', 'show' ) ) ) {
 			$menu_name = FrmAppHelper::get_menu_name();
 			add_filter( 'manage_' . sanitize_title( $menu_name ) . '_page_formidable-entries_columns', 'FrmEntriesController::manage_columns' );
 			add_filter( 'get_user_option_manage' . sanitize_title( $menu_name ) . '_page_formidable-entriescolumnshidden', 'FrmEntriesController::hidden_columns' );
 			add_filter( 'manage_' . sanitize_title( $menu_name ) . '_page_formidable-entries_sortable_columns', 'FrmEntriesController::sortable_columns' );
-        }
-    }
+		}
+	}
 
-    /* Display in Back End */
-    public static function route() {
+	/* Display in Back End */
+	public static function route() {
 		$action = FrmAppHelper::get_param( 'frm_action', '', 'get', 'sanitize_title' );
 
-        switch ( $action ) {
-            case 'show':
-            case 'destroy':
-            case 'destroy_all':
-                return self::$action();
+		switch ( $action ) {
+			case 'show':
+			case 'destroy':
+			case 'destroy_all':
+				return self::$action();
 
-            default:
-                do_action( 'frm_entry_action_route', $action );
-                if ( apply_filters( 'frm_entry_stop_action_route', false, $action ) ) {
-                    return;
-                }
+			default:
+				do_action( 'frm_entry_action_route', $action );
+				if ( apply_filters( 'frm_entry_stop_action_route', false, $action ) ) {
+					return;
+				}
 
-                return self::display_list();
-        }
-    }
+				return self::display_list();
+		}
+	}
 
 	public static function contextual_help( $help, $screen_id, $screen ) {
-        // Only add to certain screens. add_help_tab was introduced in WordPress 3.3
-        if ( ! method_exists( $screen, 'add_help_tab' ) ) {
-            return $help;
-        }
+		// Only add to certain screens. add_help_tab was introduced in WordPress 3.3
+		if ( ! method_exists( $screen, 'add_help_tab' ) ) {
+			return $help;
+		}
 
 		$action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' );
 		$page = FrmAppHelper::simple_get( 'page', 'sanitize_title' );
 		if ( $page != 'formidable-entries' || ( ! empty( $action ) && $action != 'list' ) ) {
-            return $help;
-        }
+			return $help;
+		}
 
 		unset( $action, $page );
 
-        $screen->add_help_tab( array(
-            'id'      => 'formidable-entries-tab',
-            'title'   => __( 'Overview', 'formidable' ),
+		$screen->add_help_tab( array(
+			'id'      => 'formidable-entries-tab',
+			'title'   => __( 'Overview', 'formidable' ),
 			'content' => '<p>' . esc_html__( 'This screen provides access to all of your entries. You can customize the display of this screen to suit your workflow.', 'formidable' ) . '</p> <p>' . esc_html__( 'Hovering over a row in the entries list will display action links that allow you to manage your entry.', 'formidable' ) . '</p>',
-        ));
+		));
 
-        $screen->set_help_sidebar(
+		$screen->set_help_sidebar(
 			'<p><strong>' . esc_html__( 'For more information:', 'formidable' ) . '</strong></p>' .
 			'<p><a href="' . esc_url( FrmAppHelper::make_affiliate_url( 'http://formidablepro.com/knowledgebase/manage-entries-from-the-back-end/' ) ) . '" target="_blank">' . esc_html__( 'Documentation on Entries', 'formidable' ) . '</a></p>' .
 			'<p><a href="' . esc_url( FrmAppHelper::make_affiliate_url( 'http://formidablepro.com/help-desk/' ) ) . '" target="_blank">' . esc_html__( 'Support', 'formidable' ) . '</a></p>'
-    	);
+		);
 
-        return $help;
-    }
+		return $help;
+	}
 
 	public static function manage_columns( $columns ) {
-        global $frm_vars, $wpdb;
+		global $frm_vars, $wpdb;
 		$form_id = FrmForm::get_current_form_id();
 
 		$columns[ $form_id . '_id' ] = 'ID';
 		$columns[ $form_id . '_item_key' ] = esc_html__( 'Entry Key', 'formidable' );
 
-        if ( ! $form_id ) {
-            return $columns;
-        }
+		if ( ! $form_id ) {
+			return $columns;
+		}
 
-        $form_cols = FrmField::get_all_for_form($form_id, '', 'include');
+		$form_cols = FrmField::get_all_for_form($form_id, '', 'include');
 
-        foreach ( $form_cols as $form_col ) {
+		foreach ( $form_cols as $form_col ) {
 			if ( FrmField::is_no_save_field( $form_col->type ) ) {
-                continue;
-            }
+				continue;
+			}
 
-            if ( $form_col->type == 'form' && isset( $form_col->field_options['form_select'] ) && ! empty( $form_col->field_options['form_select'] ) ) {
+			if ( $form_col->type == 'form' && isset( $form_col->field_options['form_select'] ) && ! empty( $form_col->field_options['form_select'] ) ) {
 				$sub_form_cols = FrmField::get_all_for_form( $form_col->field_options['form_select'] );
 
-                if ( $sub_form_cols ) {
-                    foreach ( $sub_form_cols as $k => $sub_form_col ) {
+				if ( $sub_form_cols ) {
+					foreach ( $sub_form_cols as $k => $sub_form_col ) {
 						if ( FrmField::is_no_save_field( $sub_form_col->type ) ) {
-                            unset( $sub_form_cols[ $k ] );
-                            continue;
-                        }
+							unset( $sub_form_cols[ $k ] );
+							continue;
+						}
 						$columns[ $form_id . '_' . $sub_form_col->field_key . '-_-' . $form_col->id ] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
-                        unset($sub_form_col);
-                    }
-                }
-                unset($sub_form_cols);
-            } else {
-                $col_id = $form_col->field_key;
-                if ( $form_col->form_id != $form_id ) {
+						unset($sub_form_col);
+					}
+				}
+				unset($sub_form_cols);
+			} else {
+				$col_id = $form_col->field_key;
+				if ( $form_col->form_id != $form_id ) {
 					$col_id .= '-_-form' . $form_col->form_id;
-                }
+				}
 
-                if ( isset($form_col->field_options['separate_value']) && $form_col->field_options['separate_value'] ) {
+				if ( isset($form_col->field_options['separate_value']) && $form_col->field_options['separate_value'] ) {
 					$columns[ $form_id . '_frmsep_' . $col_id ] = FrmAppHelper::truncate( $form_col->name, 35 );
-                }
+				}
 				$columns[ $form_id . '_' . $col_id ] = FrmAppHelper::truncate( $form_col->name, 35 );
-            }
-        }
+			}
+		}
 
 		$columns[ $form_id . '_created_at' ] = __( 'Entry creation date', 'formidable' );
 		$columns[ $form_id . '_updated_at' ] = __( 'Entry update date', 'formidable' );
 		$columns[ $form_id . '_ip' ] = 'IP';
 
-        $frm_vars['cols'] = $columns;
+		$frm_vars['cols'] = $columns;
 
 		$action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' );
 		if ( FrmAppHelper::is_admin_page( 'formidable-entries' ) && in_array( $action, array( '', 'list', 'destroy' ) ) ) {
 			add_screen_option( 'per_page', array( 'label' => __( 'Entries', 'formidable' ), 'default' => 20, 'option' => 'formidable_page_formidable_entries_per_page' ) );
-        }
+		}
 
-        return $columns;
-    }
+		return $columns;
+	}
 
 	public static function check_hidden_cols( $check, $object_id, $meta_key, $meta_value, $prev_value ) {
 		$menu_name = FrmAppHelper::get_menu_name();
 		$this_page_name = 'manage' . sanitize_title( $menu_name ) . '_page_formidable-entriescolumnshidden';
 		if ( $meta_key != $this_page_name || $meta_value == $prev_value ) {
-            return $check;
-        }
+			return $check;
+		}
 
 		if ( empty( $prev_value ) ) {
 			$prev_value = get_metadata( 'user', $object_id, $meta_key, true );
 		}
 
-        global $frm_vars;
-        //add a check so we don't create a loop
-        $frm_vars['prev_hidden_cols'] = ( isset($frm_vars['prev_hidden_cols']) && $frm_vars['prev_hidden_cols'] ) ? false : $prev_value;
+		global $frm_vars;
+		//add a check so we don't create a loop
+		$frm_vars['prev_hidden_cols'] = ( isset($frm_vars['prev_hidden_cols']) && $frm_vars['prev_hidden_cols'] ) ? false : $prev_value;
 
-        return $check;
-    }
+		return $check;
+	}
 
-    //add hidden columns back from other forms
+	//add hidden columns back from other forms
 	public static function update_hidden_cols( $meta_id, $object_id, $meta_key, $meta_value ) {
 		$menu_name = FrmAppHelper::get_menu_name();
 		$sanitized = sanitize_title( $menu_name );
 		$this_page_name = 'manage' . $sanitized . '_page_formidable-entriescolumnshidden';
 		if ( $meta_key != $this_page_name ) {
-            return;
-        }
-
-        global $frm_vars;
-        if ( ! isset($frm_vars['prev_hidden_cols']) || ! $frm_vars['prev_hidden_cols'] ) {
-            return; //don't continue if there's no previous value
-        }
-
-        foreach ( $meta_value as $mk => $mv ) {
-            //remove blank values
-            if ( empty( $mv )  ) {
-                unset( $meta_value[ $mk ] );
-            }
-        }
-
-        $cur_form_prefix = reset($meta_value);
-        $cur_form_prefix = explode('_', $cur_form_prefix);
-        $cur_form_prefix = $cur_form_prefix[0];
-        $save = false;
-
-        foreach ( (array) $frm_vars['prev_hidden_cols'] as $prev_hidden ) {
+			return;
+		}
+
+		global $frm_vars;
+		if ( ! isset($frm_vars['prev_hidden_cols']) || ! $frm_vars['prev_hidden_cols'] ) {
+			return; //don't continue if there's no previous value
+		}
+
+		foreach ( $meta_value as $mk => $mv ) {
+			//remove blank values
+			if ( empty( $mv )  ) {
+				unset( $meta_value[ $mk ] );
+			}
+		}
+
+		$cur_form_prefix = reset($meta_value);
+		$cur_form_prefix = explode('_', $cur_form_prefix);
+		$cur_form_prefix = $cur_form_prefix[0];
+		$save = false;
+
+		foreach ( (array) $frm_vars['prev_hidden_cols'] as $prev_hidden ) {
 			if ( empty( $prev_hidden ) || in_array( $prev_hidden, $meta_value ) ) {
-                //don't add blank cols or process included cols
-                continue;
-            }
+				//don't add blank cols or process included cols
+				continue;
+			}
 
 			$form_prefix = explode( '_', $prev_hidden );
-            $form_prefix = $form_prefix[0];
-            if ( $form_prefix == $cur_form_prefix ) {
-                //don't add back columns that are meant to be hidden
-                continue;
-            }
+			$form_prefix = $form_prefix[0];
+			if ( $form_prefix == $cur_form_prefix ) {
+				//don't add back columns that are meant to be hidden
+				continue;
+			}
 
-            $meta_value[] = $prev_hidden;
-            $save = true;
-            unset($form_prefix);
-        }
+			$meta_value[] = $prev_hidden;
+			$save = true;
+			unset($form_prefix);
+		}
 
 		if ( $save ) {
-            $user = wp_get_current_user();
+			$user = wp_get_current_user();
 			update_user_option( $user->ID, $this_page_name, $meta_value, true );
-        }
-    }
+		}
+	}
 
 	public static function save_per_page( $save, $option, $value ) {
-        if ( $option == 'formidable_page_formidable_entries_per_page' ) {
-            $save = (int) $value;
-        }
-        return $save;
-    }
+		if ( $option == 'formidable_page_formidable_entries_per_page' ) {
+			$save = (int) $value;
+		}
+		return $save;
+	}
 
 	public static function sortable_columns() {
 		$form_id = FrmForm::get_current_form_id();
@@ -222,122 +222,122 @@ 
 	}
 
 	public static function hidden_columns( $result ) {
-        global $frm_vars;
+		global $frm_vars;
 
 		$form_id = FrmForm::get_current_form_id();
 
-        $return = false;
-        foreach ( (array) $result as $r ) {
-            if ( ! empty( $r ) ) {
-                $form_prefix = explode( '_', $r );
-                $form_prefix = $form_prefix[0];
+		$return = false;
+		foreach ( (array) $result as $r ) {
+			if ( ! empty( $r ) ) {
+				$form_prefix = explode( '_', $r );
+				$form_prefix = $form_prefix[0];
 
-                if ( (int) $form_prefix == (int) $form_id ) {
-                    $return = true;
-                    break;
-                }
+				if ( (int) $form_prefix == (int) $form_id ) {
+					$return = true;
+					break;
+				}
 
-                unset($form_prefix);
-            }
-        }
+				unset($form_prefix);
+			}
+		}
 
-        if ( $return ) {
+		if ( $return ) {
 			return $result;
 		}
 
-        $i = isset($frm_vars['cols']) ? count($frm_vars['cols']) : 0;
-        $max_columns = 8;
-        if ( $i <= $max_columns ) {
+		$i = isset($frm_vars['cols']) ? count($frm_vars['cols']) : 0;
+		$max_columns = 8;
+		if ( $i <= $max_columns ) {
 			return $result;
 		}
 
-        global $frm_vars;
-        if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] ) {
-            $frm_vars['current_form']->options = maybe_unserialize($frm_vars['current_form']->options);
-        }
+		global $frm_vars;
+		if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] ) {
+			$frm_vars['current_form']->options = maybe_unserialize($frm_vars['current_form']->options);
+		}
 
-        if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] && isset($frm_vars['current_form']->options['hidden_cols']) && ! empty($frm_vars['current_form']->options['hidden_cols']) ) {
-            $result = $frm_vars['current_form']->options['hidden_cols'];
-        } else {
-            $cols = $frm_vars['cols'];
-            $cols = array_reverse($cols, true);
+		if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] && isset($frm_vars['current_form']->options['hidden_cols']) && ! empty($frm_vars['current_form']->options['hidden_cols']) ) {
+			$result = $frm_vars['current_form']->options['hidden_cols'];
+		} else {
+			$cols = $frm_vars['cols'];
+			$cols = array_reverse($cols, true);
 
 			$result[] = $form_id . '_id';
-            $i--;
+			$i--;
 
 			$result[] = $form_id . '_item_key';
-            $i--;
+			$i--;
 
 			foreach ( $cols as $col_key => $col ) {
-                if ( $i > $max_columns ) {
+				if ( $i > $max_columns ) {
 					$result[] = $col_key;
 				}
-                //remove some columns by default
-                $i--;
-                unset($col_key, $col);
-            }
-        }
+				//remove some columns by default
+				$i--;
+				unset($col_key, $col);
+			}
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
 	public static function display_list( $message = '', $errors = array() ) {
-        global $wpdb, $frm_vars;
+		global $wpdb, $frm_vars;
 
 		$form = FrmForm::get_current_form();
 		$params = FrmForm::get_admin_params( $form );
 
-        if ( $form ) {
-            $params['form'] = $form->id;
-            $frm_vars['current_form'] = $form;
+		if ( $form ) {
+			$params['form'] = $form->id;
+			$frm_vars['current_form'] = $form;
 
-	        if ( 'trash' == $form->status ) {
-	            $delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
-	            $time_to_delete = FrmAppHelper::human_time_diff( $delete_timestamp, ( isset( $form->options['trash_time'] ) ? ( $form->options['trash_time'] ) : time() ) );
-	            $errors['trash'] = sprintf( __( 'This form is in the trash and is scheduled to be deleted permanently in %s along with any entries.', 'formidable' ), $time_to_delete );
-	            unset( $time_to_delete, $delete_timestamp );
-	        }
+			if ( 'trash' == $form->status ) {
+				$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
+				$time_to_delete = FrmAppHelper::human_time_diff( $delete_timestamp, ( isset( $form->options['trash_time'] ) ? ( $form->options['trash_time'] ) : time() ) );
+				$errors['trash'] = sprintf( __( 'This form is in the trash and is scheduled to be deleted permanently in %s along with any entries.', 'formidable' ), $time_to_delete );
+				unset( $time_to_delete, $delete_timestamp );
+			}
 		}
 
-        $table_class = apply_filters( 'frm_entries_list_class', 'FrmEntriesListHelper' );
+		$table_class = apply_filters( 'frm_entries_list_class', 'FrmEntriesListHelper' );
 
-        $wp_list_table = new $table_class( array( 'params' => $params ) );
+		$wp_list_table = new $table_class( array( 'params' => $params ) );
 
-        $pagenum = $wp_list_table->get_pagenum();
+		$pagenum = $wp_list_table->get_pagenum();
 
-        $wp_list_table->prepare_items();
+		$wp_list_table->prepare_items();
 
-        $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-        if ( $pagenum > $total_pages && $total_pages > 0 ) {
+		$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+		if ( $pagenum > $total_pages && $total_pages > 0 ) {
 			$url = add_query_arg( 'paged', $total_pages );
-            if ( headers_sent() ) {
-                echo FrmAppHelper::js_redirect($url);
-            } else {
-                wp_redirect( esc_url_raw( $url ) );
-            }
-            die();
-        }
-
-        if ( empty($message) && isset($_GET['import-message']) ) {
-            $message = __( 'Your import is complete', 'formidable' );
-        }
+			if ( headers_sent() ) {
+				echo FrmAppHelper::js_redirect($url);
+			} else {
+				wp_redirect( esc_url_raw( $url ) );
+			}
+			die();
+		}
+
+		if ( empty($message) && isset($_GET['import-message']) ) {
+			$message = __( 'Your import is complete', 'formidable' );
+		}
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/list.php' );
-    }
+	}
 
-    /* Back End CRUD */
+	/* Back End CRUD */
 	public static function show( $id = 0 ) {
-        FrmAppHelper::permission_check('frm_view_entries');
+		FrmAppHelper::permission_check('frm_view_entries');
 
-        if ( ! $id ) {
+		if ( ! $id ) {
 			$id = FrmAppHelper::get_param( 'id', 0, 'get', 'absint' );
 
-            if ( ! $id ) {
+			if ( ! $id ) {
 				$id = FrmAppHelper::get_param( 'item_id', 0, 'get', 'absint' );
-            }
-        }
+			}
+		}
 
-        $entry = FrmEntry::getOne($id, true);
+		$entry = FrmEntry::getOne($id, true);
 		if ( ! $entry ) {
 			echo '<div id="form_show_entry_page" class="wrap">' .
 				__( 'You are trying to view an entry that does not exist.', 'formidable' ) .
@@ -345,109 +345,109 @@ 
 			return;
 		}
 
-        $data = maybe_unserialize($entry->description);
+		$data = maybe_unserialize($entry->description);
 		if ( ! is_array( $data ) || ! isset( $data['referrer'] ) ) {
 			$data = array( 'referrer' => $data );
 		}
 
 		$fields = FrmField::get_all_for_form( $entry->form_id, '', 'include' );
-        $to_emails = array();
+		$to_emails = array();
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/show.php' );
-    }
+	}
 
-    public static function destroy() {
-        FrmAppHelper::permission_check('frm_delete_entries');
+	public static function destroy() {
+		FrmAppHelper::permission_check('frm_delete_entries');
 
 		$params = FrmForm::get_admin_params();
 
-        if ( isset($params['keep_post']) && $params['keep_post'] ) {
-            //unlink entry from post
-            global $wpdb;
+		if ( isset($params['keep_post']) && $params['keep_post'] ) {
+			//unlink entry from post
+			global $wpdb;
 			$wpdb->update( $wpdb->prefix . 'frm_items', array( 'post_id' => '' ), array( 'id' => $params['id'] ) );
-        }
+		}
 
-        $message = '';
-        if ( FrmEntry::destroy( $params['id'] ) ) {
-            $message = __( 'Entry was Successfully Destroyed', 'formidable' );
-        }
+		$message = '';
+		if ( FrmEntry::destroy( $params['id'] ) ) {
+			$message = __( 'Entry was Successfully Destroyed', 'formidable' );
+		}
 
-        self::display_list( $message );
-    }
+		self::display_list( $message );
+	}
 
-    public static function destroy_all() {
-        if ( ! current_user_can( 'frm_delete_entries' ) ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            wp_die( $frm_settings->admin_permission );
-        }
+	public static function destroy_all() {
+		if ( ! current_user_can( 'frm_delete_entries' ) ) {
+			$frm_settings = FrmAppHelper::get_settings();
+			wp_die( $frm_settings->admin_permission );
+		}
 
-        global $wpdb;
+		global $wpdb;
 		$params = FrmForm::get_admin_params();
-        $message = '';
-        $errors = array();
-        $form_id = (int) $params['form'];
+		$message = '';
+		$errors = array();
+		$form_id = (int) $params['form'];
 
-        if ( $form_id ) {
-            $entry_ids = FrmDb::get_col( 'frm_items', array( 'form_id' => $form_id ) );
+		if ( $form_id ) {
+			$entry_ids = FrmDb::get_col( 'frm_items', array( 'form_id' => $form_id ) );
 			$action = FrmFormAction::get_action_for_form( $form_id, 'wppost', 1 );
 
-            if ( $action ) {
-                // this action takes a while, so only trigger it if there are posts to delete
-                foreach ( $entry_ids as $entry_id ) {
-                    do_action( 'frm_before_destroy_entry', $entry_id );
-                    unset( $entry_id );
-                }
-            }
-
-            $wpdb->query( $wpdb->prepare( "DELETE em.* FROM {$wpdb->prefix}frm_item_metas as em INNER JOIN {$wpdb->prefix}frm_items as e on (em.item_id=e.id) and form_id=%d", $form_id ) );
-            $results = $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}frm_items WHERE form_id=%d", $form_id ) );
-            if ( $results ) {
-                $message = __( 'Entries were Successfully Destroyed', 'formidable' );
-            }
-        } else {
-            $errors = __( 'No entries were specified', 'formidable' );
-        }
-
-        self::display_list( $message, $errors );
-    }
-
-    public static function show_form( $id = '', $key = '', $title = false, $description = false ) {
-        _deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::show_form()' );
-        return FrmFormsController::show_form( $id, $key, $title, $description );
-    }
-
-    public static function get_form( $filename, $form, $title, $description ) {
-        _deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::get_form()' );
-        return FrmFormsController::get_form( $form, $title, $description );
-    }
-
-    public static function process_entry( $errors = '', $ajax = false ) {
+			if ( $action ) {
+				// this action takes a while, so only trigger it if there are posts to delete
+				foreach ( $entry_ids as $entry_id ) {
+					do_action( 'frm_before_destroy_entry', $entry_id );
+					unset( $entry_id );
+				}
+			}
+
+			$wpdb->query( $wpdb->prepare( "DELETE em.* FROM {$wpdb->prefix}frm_item_metas as em INNER JOIN {$wpdb->prefix}frm_items as e on (em.item_id=e.id) and form_id=%d", $form_id ) );
+			$results = $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}frm_items WHERE form_id=%d", $form_id ) );
+			if ( $results ) {
+				$message = __( 'Entries were Successfully Destroyed', 'formidable' );
+			}
+		} else {
+			$errors = __( 'No entries were specified', 'formidable' );
+		}
+
+		self::display_list( $message, $errors );
+	}
+
+	public static function show_form( $id = '', $key = '', $title = false, $description = false ) {
+		_deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::show_form()' );
+		return FrmFormsController::show_form( $id, $key, $title, $description );
+	}
+
+	public static function get_form( $filename, $form, $title, $description ) {
+		_deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::get_form()' );
+		return FrmFormsController::get_form( $form, $title, $description );
+	}
+
+	public static function process_entry( $errors = '', $ajax = false ) {
 		$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
 		if ( FrmAppHelper::is_admin() || empty( $_POST ) || empty( $form_id ) || ! isset( $_POST['item_key'] ) ) {
-            return;
-        }
+			return;
+		}
 
-        global $frm_vars;
+		global $frm_vars;
 
 		$form = FrmForm::getOne( $form_id );
-        if ( ! $form ) {
-            return;
-        }
+		if ( ! $form ) {
+			return;
+		}
 
 		$params = FrmForm::get_params( $form );
 
-        if ( ! isset( $frm_vars['form_params'] ) ) {
-            $frm_vars['form_params'] = array();
-        }
+		if ( ! isset( $frm_vars['form_params'] ) ) {
+			$frm_vars['form_params'] = array();
+		}
 		$frm_vars['form_params'][ $form->id ] = $params;
 
 		if ( isset( $frm_vars['created_entries'][ $form_id ] ) ) {
-            return;
-        }
+			return;
+		}
 
-        if ( $errors == '' && ! $ajax ) {
+		if ( $errors == '' && ! $ajax ) {
 			$errors = FrmEntryValidate::validate( $_POST );
-        }
+		}
 
 		/**
 		 * Use this filter to add trigger actions and add errors after
@@ -458,102 +458,102 @@ 
 
 		$frm_vars['created_entries'][ $form_id ] = array( 'errors' => $errors );
 
-        if ( empty( $errors ) ) {
+		if ( empty( $errors ) ) {
 			$_POST['frm_skip_cookie'] = 1;
-            if ( $params['action'] == 'create' ) {
+			if ( $params['action'] == 'create' ) {
 				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) {
 					$frm_vars['created_entries'][ $form_id ]['entry_id'] = FrmEntry::create( $_POST );
-                }
-            }
+				}
+			}
 
-            do_action( 'frm_process_entry', $params, $errors, $form, array( 'ajax' => $ajax ) );
+			do_action( 'frm_process_entry', $params, $errors, $form, array( 'ajax' => $ajax ) );
 			unset( $_POST['frm_skip_cookie'] );
-        }
-    }
-
-    public static function delete_entry_before_redirect( $url, $form, $atts ) {
-        self::_delete_entry( $atts['id'], $form );
-        return $url;
-    }
-
-    //Delete entry if not redirected
-    public static function delete_entry_after_save( $atts ) {
-        self::_delete_entry( $atts['entry_id'], $atts['form'] );
-    }
-
-    private static function _delete_entry( $entry_id, $form ) {
-        if ( ! $form ) {
-            return;
-        }
-
-        $form->options = maybe_unserialize( $form->options );
-        if ( isset( $form->options['no_save'] ) && $form->options['no_save'] ) {
-            FrmEntry::destroy( $entry_id );
-        }
-    }
+		}
+	}
+
+	public static function delete_entry_before_redirect( $url, $form, $atts ) {
+		self::_delete_entry( $atts['id'], $form );
+		return $url;
+	}
+
+	//Delete entry if not redirected
+	public static function delete_entry_after_save( $atts ) {
+		self::_delete_entry( $atts['entry_id'], $atts['form'] );
+	}
+
+	private static function _delete_entry( $entry_id, $form ) {
+		if ( ! $form ) {
+			return;
+		}
+
+		$form->options = maybe_unserialize( $form->options );
+		if ( isset( $form->options['no_save'] ) && $form->options['no_save'] ) {
+			FrmEntry::destroy( $entry_id );
+		}
+	}
 
 	public static function show_entry_shortcode( $atts ) {
 		return FrmEntryFormat::show_entry( $atts );
 	}
 
-    public static function &filter_email_value( $value, $meta, $entry, $atts = array() ) {
-        $field = FrmField::getOne($meta->field_id);
-        if ( ! $field ) {
-            return $value;
-        }
+	public static function &filter_email_value( $value, $meta, $entry, $atts = array() ) {
+		$field = FrmField::getOne($meta->field_id);
+		if ( ! $field ) {
+			return $value;
+		}
 
-        $value = self::filter_display_value($value, $field, $atts);
-        return $value;
-    }
+		$value = self::filter_display_value($value, $field, $atts);
+		return $value;
+	}
 
 	public static function &filter_shortcode_value( $value, $tag, $atts, $field ) {
-        $plain_text = add_filter('frm_plain_text_email', true);
+		$plain_text = add_filter('frm_plain_text_email', true);
 		FrmEntryFormat::textarea_display_value( $field->type, $plain_text, $value );
 
-        if ( isset($atts['show']) && $atts['show'] == 'value' ) {
-            return $value;
-        }
+		if ( isset($atts['show']) && $atts['show'] == 'value' ) {
+			return $value;
+		}
 
-        return self::filter_display_value($value, $field, $atts);
-    }
+		return self::filter_display_value($value, $field, $atts);
+	}
 
-    public static function &filter_display_value( $value, $field, $atts = array() ) {
-        $saved_value = ( isset($atts['saved_value']) && $atts['saved_value'] ) ? true : false;
+	public static function &filter_display_value( $value, $field, $atts = array() ) {
+		$saved_value = ( isset($atts['saved_value']) && $atts['saved_value'] ) ? true : false;
 		if ( ! in_array( $field->type, array( 'radio', 'checkbox', 'radio', 'select' ) ) || ! FrmField::is_option_true( $field, 'separate_value' ) || $saved_value ) {
-            return $value;
-        }
-
-        $f_values = $f_labels = array();
-
-        foreach ( $field->options as $opt_key => $opt ) {
-            if ( ! is_array($opt) ) {
-                continue;
-            }
-
-            $f_labels[ $opt_key ] = isset( $opt['label'] ) ? $opt['label'] : reset($opt);
-            $f_values[ $opt_key ] = isset( $opt['value'] ) ? $opt['value'] : $f_labels[ $opt_key ];
-            if ( $f_labels[ $opt_key ] == $f_values[ $opt_key ] ) {
-                unset( $f_values[ $opt_key ], $f_labels[ $opt_key ] );
-            }
-            unset($opt_key, $opt);
-        }
-
-        if ( ! empty($f_values) ) {
-            foreach ( (array) $value as $v_key => $val ) {
-                if ( in_array($val, $f_values) ) {
-                    $opt = array_search($val, $f_values);
-                    if ( is_array($value) ) {
-                        $value[ $v_key ] = $f_labels[ $opt ];
-                    } else {
-                        $value = $f_labels[ $opt ];
-                    }
-                }
-                unset($v_key, $val);
-            }
-        }
-
-        return $value;
-    }
+			return $value;
+		}
+
+		$f_values = $f_labels = array();
+
+		foreach ( $field->options as $opt_key => $opt ) {
+			if ( ! is_array($opt) ) {
+				continue;
+			}
+
+			$f_labels[ $opt_key ] = isset( $opt['label'] ) ? $opt['label'] : reset($opt);
+			$f_values[ $opt_key ] = isset( $opt['value'] ) ? $opt['value'] : $f_labels[ $opt_key ];
+			if ( $f_labels[ $opt_key ] == $f_values[ $opt_key ] ) {
+				unset( $f_values[ $opt_key ], $f_labels[ $opt_key ] );
+			}
+			unset($opt_key, $opt);
+		}
+
+		if ( ! empty($f_values) ) {
+			foreach ( (array) $value as $v_key => $val ) {
+				if ( in_array($val, $f_values) ) {
+					$opt = array_search($val, $f_values);
+					if ( is_array($value) ) {
+						$value[ $v_key ] = $f_labels[ $opt ];
+					} else {
+						$value = $f_labels[ $opt ];
+					}
+				}
+				unset($v_key, $val);
+			}
+		}
+
+		return $value;
+	}
 
 	public static function get_params( $form = null ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmForm::get_params' );
@@ -561,13 +561,13 @@ 
 	}
 
 	public static function entry_sidebar( $entry ) {
-        $data = maybe_unserialize($entry->description);
-        $date_format = get_option('date_format');
-        $time_format = get_option('time_format');
+		$data = maybe_unserialize($entry->description);
+		$date_format = get_option('date_format');
+		$time_format = get_option('time_format');
 		if ( isset( $data['browser'] ) ) {
 			$browser = FrmEntryFormat::get_browser( $data['browser'] );
 		}
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/sidebar-shared.php' );
-    }
+	}
 }

classes/views/frm-forms/add_field.php

Indentation +30 added lines, -30 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
 $display = apply_filters('frm_display_field_options', array(
-    'type' => $field['type'], 'field_data' => $field,
-    'required' => true, 'unique' => false, 'read_only' => false,
-    'description' => true, 'options' => true, 'label_position' => true,
-    'invalid' => false, 'size' => false, 'clear_on_focus' => false,
-    'default_blank' => true, 'css' => true, 'conf_field' => false,
+	'type' => $field['type'], 'field_data' => $field,
+	'required' => true, 'unique' => false, 'read_only' => false,
+	'description' => true, 'options' => true, 'label_position' => true,
+	'invalid' => false, 'size' => false, 'clear_on_focus' => false,
+	'default_blank' => true, 'css' => true, 'conf_field' => false,
 	'max' => true, 'captcha_size' => false,
 ));
 
@@ -25,19 +25,19 @@ 
 $frm_settings = FrmAppHelper::get_settings();
 
 if ( ! isset( $frm_all_field_selection ) ) {
-    if ( isset($frm_field_selection) && isset($pro_field_selection) ) {
-        $frm_all_field_selection = array_merge($frm_field_selection, $pro_field_selection);
-    } else {
+	if ( isset($frm_field_selection) && isset($pro_field_selection) ) {
+		$frm_all_field_selection = array_merge($frm_field_selection, $pro_field_selection);
+	} else {
 		$pro_field_selection = FrmField::pro_field_selection();
 		$frm_all_field_selection = array_merge( FrmField::field_selection(), $pro_field_selection );
-    }
+	}
 }
 
 $disabled_fields = FrmAppHelper::pro_is_installed() ? array() : $pro_field_selection;
 
 
 if ( ! isset( $ajax ) ) {
-    $li_classes .= ' ui-state-default widgets-holder-wrap'; ?>
+	$li_classes .= ' ui-state-default widgets-holder-wrap'; ?>
 <li id="frm_field_id_<?php echo esc_attr( $field['id'] ); ?>" class="<?php echo esc_attr( $li_classes ) ?>" data-fid="<?php echo esc_attr( $field['id'] ) ?>" data-formid="<?php echo ( 'divider' == $field['type'] ) ? esc_attr( $field['form_select'] ) : esc_attr( $field['form_id'] ); ?>">
 <?php
 }
@@ -59,7 +59,7 @@ 
     </span>
     <?php }
 
-    ?>
+	?>
     <label class="<?php echo ( $field['type'] == 'end_divider' ) ? '' : 'frm_ipe_field_label'; ?> frm_primary_label <?php echo ( $field['type'] == 'break' ) ? 'button': ''; ?>" id="field_label_<?php echo esc_attr( $field['id'] ); ?>"><?php echo ( $field['name'] == '' ) ? __( '(no label)', 'formidable' ) : force_balance_tags( $field['name'] ); ?></label>
 
 
@@ -105,7 +105,7 @@ 
 if ( in_array( $field['type'], array( 'select', 'radio', 'checkbox' ) ) ) { ?>
     <div class="frm-show-click frm_small_top_margin"><?php
 
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+	if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
 		echo '<p class="howto">' . FrmFieldsHelper::get_term_link( $field['taxonomy'] ) . '</p>';
 	} else if ( ! isset( $field['post_field'] ) || ! in_array( $field['post_field'], array( 'post_category' ) ) ) {
 ?>
@@ -117,16 +117,16 @@ 
 				<a href="javascript:void(0);" id="other_button_<?php echo esc_attr( $field['id'] ); ?>" data-opttype="other" data-ftype="<?php echo esc_attr( $field['type'] ) ?>" class="button frm_cb_button frm_add_opt<?php echo ( in_array( $field['type'], array( 'radio', 'select' ) ) && $field['other'] == true ? ' frm_hidden' : '' ); ?>"><?php _e( 'Add "Other"', 'formidable' ) ?></a>
                 <input type="hidden" value="<?php echo esc_attr( $field['other'] ); ?>" id="other_input_<?php echo esc_attr( $field['id'] ); ?>" name="field_options[other_<?php echo esc_attr( $field['id'] ); ?>]">
             <?php
-            }
+			}
 
-            if ( ! isset($field['post_field']) || $field['post_field'] != 'post_category' ) { ?>
+			if ( ! isset($field['post_field']) || $field['post_field'] != 'post_category' ) { ?>
 			<a href="<?php echo esc_url( admin_url( 'admin-ajax.php?action=frm_import_choices&field_id=' . $field['id'] . '&TB_iframe=1' ) ) ?>" title="<?php echo esc_attr( FrmAppHelper::truncate( strip_tags( str_replace( '"', '&quot;', $field['name'] ) ), 20 ) . ' ' . __( 'Field Choices', 'formidable' ) ); ?>" class="thickbox frm_orange">
 				<?php _e( 'Bulk Edit Options', 'formidable' ) ?>
 			</a>
             <?php } ?>
         </div>
 <?php
-    }
+	}
 ?>
     </div>
 <?php
@@ -158,28 +158,28 @@ 
 				if ( $display['required'] ) { ?>
                     <label for="frm_req_field_<?php echo esc_attr( $field['id'] ) ?>" class="frm_inline_label"><input type="checkbox" id="frm_req_field_<?php echo esc_attr( $field['id'] ) ?>" class="frm_req_field" name="field_options[required_<?php echo esc_attr( $field['id'] ) ?>]" value="1" <?php echo $field['required'] ? 'checked="checked"': ''; ?> /> <?php _e( 'Required', 'formidable' ) ?></label>
                 <?php
-                }
+				}
 
 				if ( $display['unique'] ) {
-                    if ( ! isset( $field['unique'] ) ) {
-                        $field['unique'] = false;
-                    }
-                ?>
+					if ( ! isset( $field['unique'] ) ) {
+						$field['unique'] = false;
+					}
+				?>
                 <label for="frm_uniq_field_<?php echo esc_attr( $field['id'] ) ?>" class="frm_inline_label frm_help" title="<?php esc_attr_e( 'Unique: Do not allow the same response multiple times. For example, if one user enters \'Joe\', then no one else will be allowed to enter the same name.', 'formidable' ) ?>"><input type="checkbox" name="field_options[unique_<?php echo esc_attr( $field['id'] ) ?>]" id="frm_uniq_field_<?php echo esc_attr( $field['id'] ) ?>" value="1" <?php checked( $field['unique'], 1 ); ?> class="frm_mark_unique" /> <?php _e( 'Unique', 'formidable' ) ?></label>
                 <?php
-                }
+				}
 
 				if ( $display['read_only'] ) {
-                    if ( ! isset( $field['read_only'] ) ) {
-                        $field['read_only'] = false;
+					if ( ! isset( $field['read_only'] ) ) {
+						$field['read_only'] = false;
 					}
-                ?>
+				?>
                 <label for="frm_read_only_field_<?php echo esc_attr( $field['id'] ) ?>" class="frm_inline_label frm_help" title="<?php esc_attr_e( 'Read Only: Show this field but do not allow the field value to be edited from the front-end.', 'formidable' ) ?>" ><input type="checkbox" id="frm_read_only_field_<?php echo esc_attr( $field['id'] ) ?>" name="field_options[read_only_<?php echo esc_attr( $field['id'] ) ?>]" value="1" <?php echo $field['read_only'] ? ' checked="checked"' : ''; ?>/> <?php _e( 'Read Only', 'formidable' ) ?></label>
                 <?php }
 
-                do_action('frm_field_options_form_top', $field, $display, $values);
+				do_action('frm_field_options_form_top', $field, $display, $values);
 
-                ?>
+				?>
                 <?php
 				if ( $display['required'] ) { ?>
                 <div class="frm_required_details<?php echo esc_attr( $field['id'] . ( $field['required'] ? '' : ' frm_hidden' ) ); ?>">
@@ -265,7 +265,7 @@ 
 				do_action( 'frm_' . $field['type'] . '_field_options_form', $field, $display, $values );
 				do_action( 'frm_field_options_form', $field, $display, $values );
 
-                if ( $display['required'] || $display['invalid'] || $display['unique'] || $display['conf_field'] ) { ?>
+				if ( $display['required'] || $display['invalid'] || $display['unique'] || $display['conf_field'] ) { ?>
 					<tr class="frm_validation_msg <?php echo ($display['invalid'] || $field['required'] || FrmField::is_option_true( $field, 'unique' ) || FrmField::is_option_true( $field, 'conf_field' ) ) ? '' : 'frm_hidden'; ?>">
 					<td colspan="2">
                     <div class="menu-settings">
@@ -278,7 +278,7 @@ 
                             <input type="text" name="field_options[blank_<?php echo esc_attr( $field['id'] ) ?>]" value="<?php echo esc_attr( $field['blank'] ); ?>" />
                         </p>
                         <?php
-                        }
+						}
 
 						if ( $display['invalid'] ) { ?>
                             <p><label><?php _e( 'Invalid Format', 'formidable' ) ?></label>
@@ -293,7 +293,7 @@ 
                             <input type="text" name="field_options[unique_msg_<?php echo esc_attr( $field['id'] ) ?>]" value="<?php echo esc_attr( $field['unique_msg'] ); ?>" />
                         </p>
                         <?php
-                        }
+						}
 
 						if ( $display['conf_field'] ) { ?>
                         <p class="frm_conf_details<?php echo esc_attr( $field['id'] . ( $field['conf_field'] ? '' : ' frm_hidden' ) ); ?>">
@@ -301,7 +301,7 @@ 
                             <input type="text" name="field_options[conf_msg_<?php echo esc_attr( $field['id'] ) ?>]" value="<?php echo esc_attr( $field['conf_msg'] ); ?>" />
                         </p>
                         <?php
-                        } ?>
+						} ?>
                     </div>
                     </div>
                     </td>

Spacing +30 added lines, -30 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 
-$display = apply_filters('frm_display_field_options', array(
+$display = apply_filters( 'frm_display_field_options', array(
     'type' => $field['type'], 'field_data' => $field,
     'required' => true, 'unique' => false, 'read_only' => false,
     'description' => true, 'options' => true, 'label_position' => true,
     'invalid' => false, 'size' => false, 'clear_on_focus' => false,
     'default_blank' => true, 'css' => true, 'conf_field' => false,
 	'max' => true, 'captcha_size' => false,
-));
+) );
 
 $li_classes = 'form-field edit_form_item frm_field_box frm_top_container frm_not_divider edit_field_type_' . $display['type'];
-$li_classes = apply_filters('frm_build_field_class', $li_classes, $field );
+$li_classes = apply_filters( 'frm_build_field_class', $li_classes, $field );
 
 if ( isset( $values ) && isset( $values['ajax_load'] ) && $values['ajax_load'] && isset( $count ) && $count > 10 && ! in_array( $field['type'], array( 'divider', 'end_divider' ) ) ) {
 ?>
 <li id="frm_field_id_<?php echo esc_attr( $field['id'] ); ?>" class="<?php echo esc_attr( $li_classes ) ?> frm_field_loading" data-fid="<?php echo esc_attr( $field['id'] ) ?>" data-formid="<?php echo esc_attr( 'divider' == $field['type'] ? $field['form_select'] : $field['form_id'] ); ?>" data-ftype="<?php echo esc_attr( $display['type'] ) ?>">
 <img src="<?php echo FrmAppHelper::plugin_url() ?>/images/ajax_loader.gif" alt="<?php esc_attr_e( 'Loading', 'formidable' ) ?>" />
-<span class="frm_hidden_fdata frm_hidden"><?php echo htmlspecialchars(json_encode($field)) ?></span>
+<span class="frm_hidden_fdata frm_hidden"><?php echo htmlspecialchars( json_encode( $field ) ) ?></span>
 </li>
 <?php
    return;
@@ -25,8 +25,8 @@ 
 $frm_settings = FrmAppHelper::get_settings();
 
 if ( ! isset( $frm_all_field_selection ) ) {
-    if ( isset($frm_field_selection) && isset($pro_field_selection) ) {
-        $frm_all_field_selection = array_merge($frm_field_selection, $pro_field_selection);
+    if ( isset( $frm_field_selection ) && isset( $pro_field_selection ) ) {
+        $frm_all_field_selection = array_merge( $frm_field_selection, $pro_field_selection );
     } else {
 		$pro_field_selection = FrmField::pro_field_selection();
 		$frm_all_field_selection = array_merge( FrmField::field_selection(), $pro_field_selection );
@@ -51,8 +51,8 @@ 
     <a href="javascript:void(0);" class="frm_bstooltip alignright frm-show-hover frm-move frm-hover-icon frm_icon_font frm_move_icon" title="<?php esc_attr_e( 'Move Field', 'formidable' ) ?>"> </a>
     <a href="#" class="frm_bstooltip alignright frm-show-hover frm-hover-icon frm_icon_font frm_delete_icon frm_delete_field" title="<?php esc_attr_e( 'Delete Field', 'formidable' ) ?>"> </a>
     <a href="#" class="frm_bstooltip alignright frm-show-hover frm-hover-icon frm_icon_font frm_duplicate_icon" title="<?php ( $field['type'] == 'divider' ) ? esc_attr_e( 'Duplicate Section', 'formidable' ) : esc_attr_e( 'Duplicate Field', 'formidable' ) ?>"> </a>
-    <input type="hidden" name="frm_fields_submitted[]" value="<?php echo esc_attr($field['id']) ?>" />
-    <?php do_action('frm_extra_field_actions', $field['id']); ?>
+    <input type="hidden" name="frm_fields_submitted[]" value="<?php echo esc_attr( $field['id'] ) ?>" />
+    <?php do_action( 'frm_extra_field_actions', $field['id'] ); ?>
     <?php if ( $display['required'] ) { ?>
     <span id="require_field_<?php echo esc_attr( $field['id'] ); ?>">
 		<a href="javascript:void(0);" class="frm_req_field frm_action_icon frm_required_icon frm_icon_font alignleft frm_required<?php echo (int) $field['required'] ?>" id="req_field_<?php echo esc_attr( $field['id'] ); ?>" title="Click to Mark as <?php echo FrmField::is_required( $field ) ? 'not ' : ''; ?>Required"></a>
@@ -60,7 +60,7 @@ 
     <?php }
 
     ?>
-    <label class="<?php echo ( $field['type'] == 'end_divider' ) ? '' : 'frm_ipe_field_label'; ?> frm_primary_label <?php echo ( $field['type'] == 'break' ) ? 'button': ''; ?>" id="field_label_<?php echo esc_attr( $field['id'] ); ?>"><?php echo ( $field['name'] == '' ) ? __( '(no label)', 'formidable' ) : force_balance_tags( $field['name'] ); ?></label>
+    <label class="<?php echo ( $field['type'] == 'end_divider' ) ? '' : 'frm_ipe_field_label'; ?> frm_primary_label <?php echo ( $field['type'] == 'break' ) ? 'button' : ''; ?>" id="field_label_<?php echo esc_attr( $field['id'] ); ?>"><?php echo ( $field['name'] == '' ) ? __( '(no label)', 'formidable' ) : force_balance_tags( $field['name'] ); ?></label>
 
 
 <div id="field_<?php echo esc_attr( $field['id'] ) ?>_inner_container" class="frm_inner_field_container">
@@ -78,7 +78,7 @@ 
 </div>
 <?php
 if ( $display['description'] ) { ?>
-    <div class="frm_ipe_field_desc description <?php echo ($field['description'] == '') ? 'frm-show-click' : '' ?>" id="field_description_<?php echo esc_attr( $field['id'] ); ?>"><?php echo ($field['description'] == '') ? __( '(Click to add description)', 'formidable' ) : force_balance_tags( $field['description'] ); ?></div>
+    <div class="frm_ipe_field_desc description <?php echo ( $field['description'] == '' ) ? 'frm-show-click' : '' ?>" id="field_description_<?php echo esc_attr( $field['id'] ); ?>"><?php echo ( $field['description'] == '' ) ? __( '(Click to add description)', 'formidable' ) : force_balance_tags( $field['description'] ); ?></div>
     <input type="hidden" name="field_options[description_<?php echo esc_attr( $field['id'] ) ?>]" value="<?php echo esc_attr( $field['description'] ); ?>" />
 
 <?php } ?>
@@ -90,8 +90,8 @@ 
 		<div class="frm_form_fields">
 			<input type="text" id="conf_field_<?php echo esc_attr( $field['field_key'] ) ?>" name="field_options[conf_input_<?php echo esc_attr( $field['id'] ) ?>]" value="<?php echo esc_attr( $field['conf_input'] ); ?>" class="dyn_default_value" />
 		</div>
-    	<div id="conf_field_description_<?php echo esc_attr( $field['id'] ) ?>" class="frm_ipe_field_conf_desc description <?php echo ($field['conf_desc'] == '') ? 'frm-show-click' : '' ?>"><?php
-			echo ($field['conf_desc'] == '') ? __( '(Click to add description)', 'formidable' ) : force_balance_tags($field['conf_desc']); ?></div>
+    	<div id="conf_field_description_<?php echo esc_attr( $field['id'] ) ?>" class="frm_ipe_field_conf_desc description <?php echo ( $field['conf_desc'] == '' ) ? 'frm-show-click' : '' ?>"><?php
+			echo ( $field['conf_desc'] == '' ) ? __( '(Click to add description)', 'formidable' ) : force_balance_tags( $field['conf_desc'] ); ?></div>
     	<input type="hidden" name="field_options[conf_desc_<?php echo esc_attr( $field['id'] ) ?>]" value="<?php echo esc_attr( $field['conf_desc'] ); ?>" />
 </div>
 	<?php if ( $display['clear_on_focus'] ) { ?>
@@ -106,7 +106,7 @@ 
 if ( in_array( $field['type'], array( 'select', 'radio', 'checkbox' ) ) ) { ?>
     <div class="frm-show-click frm_small_top_margin"><?php
 
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+    if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' ) {
 		echo '<p class="howto">' . FrmFieldsHelper::get_term_link( $field['taxonomy'] ) . '</p>';
 	} else if ( ! isset( $field['post_field'] ) || ! in_array( $field['post_field'], array( 'post_category' ) ) ) {
 ?>
@@ -120,7 +120,7 @@ 
             <?php
             }
 
-            if ( ! isset($field['post_field']) || $field['post_field'] != 'post_category' ) { ?>
+            if ( ! isset( $field['post_field'] ) || $field['post_field'] != 'post_category' ) { ?>
 			<a href="<?php echo esc_url( admin_url( 'admin-ajax.php?action=frm_import_choices&field_id=' . $field['id'] . '&TB_iframe=1' ) ) ?>" title="<?php echo esc_attr( FrmAppHelper::truncate( strip_tags( str_replace( '"', '&quot;', $field['name'] ) ), 20 ) . ' ' . __( 'Field Choices', 'formidable' ) ); ?>" class="thickbox frm_orange">
 				<?php _e( 'Bulk Edit Options', 'formidable' ) ?>
 			</a>
@@ -133,7 +133,7 @@ 
 <?php
 }
 
-do_action('frm_before_field_options', $field);
+do_action( 'frm_before_field_options', $field );
 
 if ( $display['options'] ) { ?>
     <div class="widget">
@@ -143,13 +143,13 @@ 
         </div>
     	<div class="widget-inside">
             <table class="form-table frm_clear_none">
-                <?php $field_types = FrmFieldsHelper::get_field_types($field['type']); ?>
+                <?php $field_types = FrmFieldsHelper::get_field_types( $field['type'] ); ?>
 				<tr><td class="frm_150_width"><label><?php _e( 'Field Type', 'formidable' ) ?></label></td>
                     <td>
-                <select <?php if ( count($field_types) == 1 ) { ?>disabled="disabled"<?php } else { ?>name="field_options[type_<?php echo esc_attr( $field['id'] ) ?>]"<?php } ?>>
+                <select <?php if ( count( $field_types ) == 1 ) { ?>disabled="disabled"<?php } else { ?>name="field_options[type_<?php echo esc_attr( $field['id'] ) ?>]"<?php } ?>>
                     <?php
 					foreach ( $field_types as $fkey => $ftype ) { ?>
-                        <option value="<?php echo esc_attr( $fkey ) ?>" <?php echo ( $fkey == $field['type'] ) ? ' selected="selected"' : ''; ?> <?php echo array_key_exists($fkey, $disabled_fields ) ? 'disabled="disabled"' : '';  ?>><?php echo is_array($ftype) ? $ftype['name'] : $ftype ?> </option>
+                        <option value="<?php echo esc_attr( $fkey ) ?>" <?php echo ( $fkey == $field['type'] ) ? ' selected="selected"' : ''; ?> <?php echo array_key_exists( $fkey, $disabled_fields ) ? 'disabled="disabled"' : ''; ?>><?php echo is_array( $ftype ) ? $ftype['name'] : $ftype ?> </option>
                     <?php
 						unset( $fkey, $ftype );
 					} ?>
@@ -184,7 +184,7 @@ 
 				</label>
                 <?php }
 
-                do_action('frm_field_options_form_top', $field, $display, $values);
+                do_action( 'frm_field_options_form_top', $field, $display, $values );
 
                 ?>
                 <?php
@@ -221,13 +221,13 @@ 
 				if ( $display['label_position'] ) { ?>
                     <tr><td class="frm_150_width"><label><?php _e( 'Label Position', 'formidable' ) ?></label></td>
                         <td><select name="field_options[label_<?php echo esc_attr( $field['id'] ) ?>]">
-                            <option value=""<?php selected($field['label'], ''); ?>><?php _e( 'Default', 'formidable' ) ?></option>
-                            <option value="top"<?php selected($field['label'], 'top'); ?>><?php _e( 'Top', 'formidable' ) ?></option>
-                            <option value="left"<?php selected($field['label'], 'left'); ?>><?php _e( 'Left', 'formidable' ) ?></option>
-                            <option value="right"<?php selected($field['label'], 'right'); ?>><?php _e( 'Right', 'formidable' ) ?></option>
-                            <option value="inline"<?php selected($field['label'], 'inline'); ?>><?php _e( 'Inline (left without a set width)', 'formidable' ) ?></option>
-                            <option value="none"<?php selected($field['label'], 'none'); ?>><?php _e( 'None', 'formidable' ) ?></option>
-                            <option value="hidden"<?php selected($field['label'], 'hidden'); ?>><?php _e( 'Hidden (but leave the space)', 'formidable' ) ?></option>
+                            <option value=""<?php selected( $field['label'], '' ); ?>><?php _e( 'Default', 'formidable' ) ?></option>
+                            <option value="top"<?php selected( $field['label'], 'top' ); ?>><?php _e( 'Top', 'formidable' ) ?></option>
+                            <option value="left"<?php selected( $field['label'], 'left' ); ?>><?php _e( 'Left', 'formidable' ) ?></option>
+                            <option value="right"<?php selected( $field['label'], 'right' ); ?>><?php _e( 'Right', 'formidable' ) ?></option>
+                            <option value="inline"<?php selected( $field['label'], 'inline' ); ?>><?php _e( 'Inline (left without a set width)', 'formidable' ) ?></option>
+                            <option value="none"<?php selected( $field['label'], 'none' ); ?>><?php _e( 'None', 'formidable' ) ?></option>
+                            <option value="hidden"<?php selected( $field['label'], 'hidden' ); ?>><?php _e( 'Hidden (but leave the space)', 'formidable' ) ?></option>
                         </select>
                         </td>
                     </tr>
@@ -250,8 +250,8 @@ 
 					<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Set the size of the captcha field. The compact option is best if your form is in a small area.', 'formidable' ) ?>" ></span>
                     </td>
                     <td><select name="field_options[captcha_size_<?php echo esc_attr( $field['id'] ) ?>]">
-                        <option value="default"<?php selected($field['captcha_size'], 'default'); ?>><?php _e( 'Default', 'formidable' ) ?></option>
-                        <option value="compact"<?php selected($field['captcha_size'], 'compact'); ?>><?php _e( 'Compact', 'formidable' ) ?></option>
+                        <option value="default"<?php selected( $field['captcha_size'], 'default' ); ?>><?php _e( 'Default', 'formidable' ) ?></option>
+                        <option value="compact"<?php selected( $field['captcha_size'], 'compact' ); ?>><?php _e( 'Compact', 'formidable' ) ?></option>
                     </select>
                     </td>
                 </tr>
@@ -273,7 +273,7 @@ 
 				do_action( 'frm_field_options_form', $field, $display, $values );
 
                 if ( $display['required'] || $display['invalid'] || $display['unique'] || $display['conf_field'] ) { ?>
-					<tr class="frm_validation_msg <?php echo ($display['invalid'] || $field['required'] || FrmField::is_option_true( $field, 'unique' ) || FrmField::is_option_true( $field, 'conf_field' ) ) ? '' : 'frm_hidden'; ?>">
+					<tr class="frm_validation_msg <?php echo ( $display['invalid'] || $field['required'] || FrmField::is_option_true( $field, 'unique' ) || FrmField::is_option_true( $field, 'conf_field' ) ) ? '' : 'frm_hidden'; ?>">
 					<td colspan="2">
                     <div class="menu-settings">
                     <h3 class="frm_no_bg"><?php _e( 'Validation', 'formidable' ) ?></h3>
@@ -337,4 +337,4 @@ 
 <?php
 }
 
-unset($display);
+unset( $display );

classes/helpers/FrmXMLHelper.php

Spacing +166 added lines, -166 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -36,10 +36,10 @@ 
 			'terms'    => array(),
         );
 
-        unset($defaults);
+        unset( $defaults );
 
 		if ( ! defined( 'WP_IMPORTING' ) ) {
-            define('WP_IMPORTING', true);
+            define( 'WP_IMPORTING', true );
         }
 
 		if ( ! class_exists( 'DOMDocument' ) ) {
@@ -52,7 +52,7 @@ 
 			return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this XML file', 'formidable' ), libxml_get_errors() );
 		}
 
-		if ( ! function_exists('simplexml_import_dom') ) {
+		if ( ! function_exists( 'simplexml_import_dom' ) ) {
 			return new WP_Error( 'SimpleXML_parse_error', __( 'Your server is missing the simplexml_import_dom function', 'formidable' ), libxml_get_errors() );
 		}
 
@@ -67,21 +67,21 @@ 
         // add terms, forms (form and field ids), posts (post ids), and entries to db, in that order
 		foreach ( array( 'term', 'form', 'view' ) as $item_type ) {
             // grab cats, tags, and terms, or forms or posts
-            if ( isset($xml->{$item_type} ) ) {
+            if ( isset( $xml->{$item_type} ) ) {
 				$function_name = 'import_xml_' . $item_type . 's';
 				$imported = self::$function_name( $xml->{$item_type}, $imported );
 				unset( $function_name, $xml->{$item_type} );
             }
         }
 
-	    $return = apply_filters('frm_importing_xml', $imported, $xml );
+	    $return = apply_filters( 'frm_importing_xml', $imported, $xml );
 
 	    return $return;
     }
 
 	public static function import_xml_terms( $terms, $imported ) {
         foreach ( $terms as $t ) {
-			if ( term_exists((string) $t->term_slug, (string) $t->term_taxonomy) ) {
+			if ( term_exists( (string) $t->term_slug, (string) $t->term_taxonomy ) ) {
 			    continue;
 			}
 
@@ -91,11 +91,11 @@ 
                 'slug'          => (string) $t->term_slug,
                 'description'   => (string) $t->term_description,
 				'parent'        => empty( $parent ) ? 0 : $parent,
-            ));
+            ) );
 
 			if ( $term && is_array( $term ) ) {
-                $imported['imported']['terms']++;
-				$imported['terms'][ (int) $t->term_id ] = $term['term_id'];
+                $imported['imported']['terms'] ++;
+				$imported['terms'][(int) $t->term_id] = $term['term_id'];
             }
 
 			unset( $term, $t );
@@ -138,11 +138,11 @@ 
                 'default_template' => (int) $item->default_template,
                 'editable'      => (int) $item->editable,
                 'status'        => (string) $item->status,
-                'parent_form_id' => isset($item->parent_form_id) ? (int) $item->parent_form_id : 0,
-                'created_at'    => date('Y-m-d H:i:s', strtotime((string) $item->created_at)),
+                'parent_form_id' => isset( $item->parent_form_id ) ? (int) $item->parent_form_id : 0,
+                'created_at'    => date( 'Y-m-d H:i:s', strtotime( (string) $item->created_at ) ),
             );
 
-            $form['options'] = FrmAppHelper::maybe_json_decode($form['options']);
+            $form['options'] = FrmAppHelper::maybe_json_decode( $form['options'] );
 
 			self::update_custom_style_setting_on_import( $form );
 
@@ -152,35 +152,35 @@ 
                 $edit_query['created_at'] = $form['created_at'];
             }
 
-            $edit_query = apply_filters('frm_match_xml_form', $edit_query, $form);
+            $edit_query = apply_filters( 'frm_match_xml_form', $edit_query, $form );
 
-            $this_form = FrmForm::getAll($edit_query, '', 1);
-            unset($edit_query);
+            $this_form = FrmForm::getAll( $edit_query, '', 1 );
+            unset( $edit_query );
 
             if ( ! empty( $this_form ) ) {
                 $old_id = $form_id = $this_form->id;
-                FrmForm::update($form_id, $form );
-                $imported['updated']['forms']++;
+                FrmForm::update( $form_id, $form );
+                $imported['updated']['forms'] ++;
                 // Keep track of whether this specific form was updated or not
-				$imported['form_status'][ $form_id ] = 'updated';
+				$imported['form_status'][$form_id] = 'updated';
 
 				$form_fields = FrmField::get_all_for_form( $form_id, '', 'exclude', 'exclude' );
                 $old_fields = array();
                 foreach ( $form_fields as $f ) {
-					$old_fields[ $f->id ] = $f;
-					$old_fields[ $f->field_key ] = $f->id;
-                    unset($f);
+					$old_fields[$f->id] = $f;
+					$old_fields[$f->field_key] = $f->id;
+                    unset( $f );
                 }
                 $form_fields = $old_fields;
-                unset($old_fields);
+                unset( $old_fields );
             } else {
                 $old_id = false;
                 //form does not exist, so create it
 				$form_id = FrmForm::create( $form );
                 if ( $form_id ) {
-                    $imported['imported']['forms']++;
+                    $imported['imported']['forms'] ++;
                     // Keep track of whether this specific form was updated or not
-					$imported['form_status'][ $form_id ] = 'imported';
+					$imported['form_status'][$form_id] = 'imported';
 					self::track_imported_child_forms( (int) $form_id, $form['parent_form_id'], $child_forms );
                 }
             }
@@ -190,23 +190,23 @@ 
     		// Delete any fields attached to this form that were not included in the template
     		if ( isset( $form_fields ) && ! empty( $form_fields ) ) {
 				foreach ( $form_fields as $field ) {
-                    if ( is_object($field) ) {
-                        FrmField::destroy($field->id);
+                    if ( is_object( $field ) ) {
+                        FrmField::destroy( $field->id );
                     }
-                    unset($field);
+                    unset( $field );
                 }
-                unset($form_fields);
+                unset( $form_fields );
             }
 
 		    // Update field ids/keys to new ones
 			do_action( 'frm_after_duplicate_form', $form_id, $form, array( 'old_id' => $old_id ) );
 
-			$imported['forms'][ (int) $item->id ] = $form_id;
+			$imported['forms'][(int) $item->id] = $form_id;
 
             // Send pre 2.0 form options through function that creates actions
             self::migrate_form_settings_to_actions( $form['options'], $form_id, $imported, $switch = true );
 
-		    unset($form, $item);
+		    unset( $form, $item );
 		}
 
 		self::maybe_update_child_form_parent_id( $imported['forms'], $child_forms );
@@ -225,7 +225,7 @@ 
 		$regular_forms = array();
 
 		foreach ( $forms as $form ) {
-			$parent_form_id = isset( $form->parent_form_id) ? (int) $form->parent_form_id : 0;
+			$parent_form_id = isset( $form->parent_form_id ) ? (int) $form->parent_form_id : 0;
 
 			if ( $parent_form_id ) {
 				$child_forms[] = $form;
@@ -247,7 +247,7 @@ 
 	*/
 	private static function track_imported_child_forms( $form_id, $parent_form_id, &$child_forms ) {
 		if ( $parent_form_id ) {
-			$child_forms[ $form_id ] = $parent_form_id;
+			$child_forms[$form_id] = $parent_form_id;
 		}
 	}
 
@@ -262,9 +262,9 @@ 
 	private static function maybe_update_child_form_parent_id( $imported_forms, $child_forms ) {
 		foreach ( $child_forms as $child_form_id => $old_parent_form_id ) {
 
-			if ( isset( $imported_forms[ $old_parent_form_id ] ) && $imported_forms[ $old_parent_form_id ] != $old_parent_form_id ) {
+			if ( isset( $imported_forms[$old_parent_form_id] ) && $imported_forms[$old_parent_form_id] != $old_parent_form_id ) {
 				// Update all children with this old parent_form_id
-				$new_parent_form_id = (int) $imported_forms[ $old_parent_form_id ];
+				$new_parent_form_id = (int) $imported_forms[$old_parent_form_id];
 
 				FrmForm::update( $child_form_id, array( 'parent_form_id' => $new_parent_form_id ) );
 			}
@@ -287,23 +287,23 @@ 
 		        'name'          => (string) $field->name,
 		        'description'   => (string) $field->description,
 		        'type'          => (string) $field->type,
-		        'default_value' => FrmAppHelper::maybe_json_decode( (string) $field->default_value),
+		        'default_value' => FrmAppHelper::maybe_json_decode( (string) $field->default_value ),
 		        'field_order'   => (int) $field->field_order,
 		        'form_id'       => (int) $form_id,
 		        'required'      => (int) $field->required,
-		        'options'       => FrmAppHelper::maybe_json_decode( (string) $field->options),
+		        'options'       => FrmAppHelper::maybe_json_decode( (string) $field->options ),
 				'field_options' => FrmAppHelper::maybe_json_decode( (string) $field->field_options ),
 		    );
 
-		    if ( is_array($f['default_value']) && in_array($f['type'], array(
+		    if ( is_array( $f['default_value'] ) && in_array( $f['type'], array(
 		        'text', 'email', 'url', 'textarea',
-		        'number','phone', 'date', 'time',
+		        'number', 'phone', 'date', 'time',
 		        'hidden', 'password', 'tag', 'image',
-		    )) ) {
-		        if ( count($f['default_value']) === 1 ) {
+		    ) ) ) {
+		        if ( count( $f['default_value'] ) === 1 ) {
 					$f['default_value'] = '[' . reset( $f['default_value'] ) . ']';
 		        } else {
-		            $f['default_value'] = reset($f['default_value']);
+		            $f['default_value'] = reset( $f['default_value'] );
 		        }
 		    }
 
@@ -311,27 +311,27 @@ 
 			self::maybe_update_form_select( $f, $imported );
 			self::maybe_update_get_values_form_setting( $imported, $f );
 
-			if ( ! empty($this_form) ) {
+			if ( ! empty( $this_form ) ) {
 				// check for field to edit by field id
-				if ( isset( $form_fields[ $f['id'] ] ) ) {
+				if ( isset( $form_fields[$f['id']] ) ) {
 					FrmField::update( $f['id'], $f );
-					$imported['updated']['fields']++;
+					$imported['updated']['fields'] ++;
 
-					unset( $form_fields[ $f['id'] ] );
+					unset( $form_fields[$f['id']] );
 
 					//unset old field key
-					if ( isset( $form_fields[ $f['field_key'] ] ) ) {
-						unset( $form_fields[ $f['field_key'] ] );
+					if ( isset( $form_fields[$f['field_key']] ) ) {
+						unset( $form_fields[$f['field_key']] );
 					}
-				} else if ( isset( $form_fields[ $f['field_key'] ] ) ) {
+				} else if ( isset( $form_fields[$f['field_key']] ) ) {
 					// check for field to edit by field key
-					unset($f['id']);
+					unset( $f['id'] );
 
-					FrmField::update( $form_fields[ $f['field_key'] ], $f );
-					$imported['updated']['fields']++;
+					FrmField::update( $form_fields[$f['field_key']], $f );
+					$imported['updated']['fields'] ++;
 
-					unset( $form_fields[ $form_fields[ $f['field_key'] ] ] ); //unset old field id
-					unset( $form_fields[ $f['field_key'] ] ); //unset old field key
+					unset( $form_fields[$form_fields[$f['field_key']]] ); //unset old field id
+					unset( $form_fields[$f['field_key']] ); //unset old field key
 				} else {
 					// if no matching field id or key in this form, create the field
 					self::create_imported_field( $f, $imported );
@@ -382,8 +382,8 @@ 
 		if ( $f['type'] == 'form' || ( $f['type'] == 'divider' && FrmField::is_option_true( $f['field_options'], 'repeat' ) ) ) {
 			if ( FrmField::is_option_true( $f['field_options'], 'form_select' ) ) {
 				$form_select = $f['field_options']['form_select'];
-				if ( isset( $imported['forms'][ $form_select ] ) ) {
-					$f['field_options']['form_select'] = $imported['forms'][ $form_select ];
+				if ( isset( $imported['forms'][$form_select] ) ) {
+					$f['field_options']['form_select'] = $imported['forms'][$form_select];
 				}
 			}
 		}
@@ -403,8 +403,8 @@ 
 
 		if ( FrmField::is_option_true_in_array( $f['field_options'], 'get_values_form' ) ) {
 			$old_form = $f['field_options']['get_values_form'];
-			if ( isset( $imported['forms'][ $old_form ] ) ) {
-				$f['field_options']['get_values_form'] = $imported['forms'][ $old_form ];
+			if ( isset( $imported['forms'][$old_form] ) ) {
+				$f['field_options']['get_values_form'] = $imported['forms'][$old_form];
 			}
 		}
 	}
@@ -419,7 +419,7 @@ 
 	private static function create_imported_field( $f, &$imported ) {
 		$new_id = FrmField::create( $f );
 		if ( $new_id != false ) {
-			$imported['imported']['fields']++;
+			$imported['imported']['fields'] ++;
 			do_action( 'frm_after_field_is_imported', $f, $new_id );
 		}
 	}
@@ -481,8 +481,8 @@ 
 				'post_id'       => (int) $item->post_id,
 				'post_parent'   => (int) $item->post_parent,
 				'menu_order'    => (int) $item->menu_order,
-				'post_content'  => FrmFieldsHelper::switch_field_ids((string) $item->content),
-				'post_excerpt'  => FrmFieldsHelper::switch_field_ids((string) $item->excerpt),
+				'post_content'  => FrmFieldsHelper::switch_field_ids( (string) $item->content ),
+				'post_excerpt'  => FrmFieldsHelper::switch_field_ids( (string) $item->excerpt ),
 				'is_sticky'     => (string) $item->is_sticky,
 				'comment_status' => (string) $item->comment_status,
 				'post_date'     => (string) $item->post_date,
@@ -493,9 +493,9 @@ 
 			);
 
             $old_id = $post['post_id'];
-            self::populate_post($post, $item, $imported);
+            self::populate_post( $post, $item, $imported );
 
-			unset($item);
+			unset( $item );
 
 			$post_id = false;
             if ( $post['post_type'] == $form_action_type ) {
@@ -503,7 +503,7 @@ 
 				if ( $action_control && is_object( $action_control ) ) {
 					$post_id = $action_control->maybe_create_action( $post, $imported['form_status'] );
 				}
-                unset($action_control);
+                unset( $action_control );
             } else if ( $post['post_type'] == 'frm_styles' ) {
                 // Properly encode post content before inserting the post
                 $post['post_content'] = FrmAppHelper::maybe_json_decode( $post['post_content'] );
@@ -516,26 +516,26 @@ 
                 $post_id = wp_insert_post( $post );
             }
 
-            if ( ! is_numeric($post_id) ) {
+            if ( ! is_numeric( $post_id ) ) {
                 continue;
             }
 
-            self::update_postmeta($post, $post_id);
+            self::update_postmeta( $post, $post_id );
 
             $this_type = 'posts';
-			if ( isset( $post_types[ $post['post_type'] ] ) ) {
-				$this_type = $post_types[ $post['post_type'] ];
+			if ( isset( $post_types[$post['post_type']] ) ) {
+				$this_type = $post_types[$post['post_type']];
             }
 
-            if ( isset($post['ID']) && $post_id == $post['ID'] ) {
-                $imported['updated'][ $this_type ]++;
+            if ( isset( $post['ID'] ) && $post_id == $post['ID'] ) {
+                $imported['updated'][$this_type] ++;
             } else {
-                $imported['imported'][ $this_type ]++;
+                $imported['imported'][$this_type] ++;
             }
 
-            unset($post);
+            unset( $post );
 
-			$imported['posts'][ (int) $old_id ] = $post_id;
+			$imported['posts'][(int) $old_id] = $post_id;
 		}
 
 		self::maybe_update_stylesheet( $imported );
@@ -544,23 +544,23 @@ 
     }
 
     private static function populate_post( &$post, $item, $imported ) {
-		if ( isset($item->attachment_url) ) {
+		if ( isset( $item->attachment_url ) ) {
 			$post['attachment_url'] = (string) $item->attachment_url;
 		}
 
-		if ( $post['post_type'] == FrmFormActionsController::$action_post_type && isset( $imported['forms'][ (int) $post['menu_order'] ] ) ) {
+		if ( $post['post_type'] == FrmFormActionsController::$action_post_type && isset( $imported['forms'][(int) $post['menu_order']] ) ) {
 		    // update to new form id
-		    $post['menu_order'] = $imported['forms'][ (int) $post['menu_order'] ];
+		    $post['menu_order'] = $imported['forms'][(int) $post['menu_order']];
 		}
 
 		foreach ( $item->postmeta as $meta ) {
-		    self::populate_postmeta($post, $meta, $imported);
-			unset($meta);
+		    self::populate_postmeta( $post, $meta, $imported );
+			unset( $meta );
 		}
 
-        self::populate_taxonomies($post, $item);
+        self::populate_taxonomies( $post, $item );
 
-        self::maybe_editing_post($post);
+        self::maybe_editing_post( $post );
     }
 
     private static function populate_postmeta( &$post, $meta, $imported ) {
@@ -572,27 +572,27 @@ 
 		);
 
 		//switch old form and field ids to new ones
-		if ( $m['key'] == 'frm_form_id' && isset($imported['forms'][ (int) $m['value'] ]) ) {
-		    $m['value'] = $imported['forms'][ (int) $m['value'] ];
+		if ( $m['key'] == 'frm_form_id' && isset( $imported['forms'][(int) $m['value']] ) ) {
+		    $m['value'] = $imported['forms'][(int) $m['value']];
 		} else {
-		    $m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
+		    $m['value'] = FrmAppHelper::maybe_json_decode( $m['value'] );
 
-		    if ( ! empty($frm_duplicate_ids) ) {
+		    if ( ! empty( $frm_duplicate_ids ) ) {
 
 		        if ( $m['key'] == 'frm_dyncontent' ) {
-		            $m['value'] = FrmFieldsHelper::switch_field_ids($m['value']);
+		            $m['value'] = FrmFieldsHelper::switch_field_ids( $m['value'] );
     		    } else if ( $m['key'] == 'frm_options' ) {
 
 					foreach ( array( 'date_field_id', 'edate_field_id' ) as $setting_name ) {
-						if ( isset( $m['value'][ $setting_name ] ) && is_numeric( $m['value'][ $setting_name ] ) && isset( $frm_duplicate_ids[ $m['value'][ $setting_name ] ] ) ) {
-							$m['value'][ $setting_name ] = $frm_duplicate_ids[ $m['value'][ $setting_name ] ];
+						if ( isset( $m['value'][$setting_name] ) && is_numeric( $m['value'][$setting_name] ) && isset( $frm_duplicate_ids[$m['value'][$setting_name]] ) ) {
+							$m['value'][$setting_name] = $frm_duplicate_ids[$m['value'][$setting_name]];
     		            }
     		        }
 
                     $check_dup_array = array();
     		        if ( isset( $m['value']['order_by'] ) && ! empty( $m['value']['order_by'] ) ) {
-    		            if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[ $m['value']['order_by'] ] ) ) {
-    		                $m['value']['order_by'] = $frm_duplicate_ids[ $m['value']['order_by'] ];
+    		            if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[$m['value']['order_by']] ) ) {
+    		                $m['value']['order_by'] = $frm_duplicate_ids[$m['value']['order_by']];
     		            } else if ( is_array( $m['value']['order_by'] ) ) {
                             $check_dup_array[] = 'order_by';
     		            }
@@ -603,22 +603,22 @@ 
     		        }
 
                     foreach ( $check_dup_array as $check_k ) {
-						foreach ( (array) $m['value'][ $check_k ] as $mk => $mv ) {
-							if ( isset( $frm_duplicate_ids[ $mv ] ) ) {
-								$m['value'][ $check_k ][ $mk ] = $frm_duplicate_ids[ $mv ];
+						foreach ( (array) $m['value'][$check_k] as $mk => $mv ) {
+							if ( isset( $frm_duplicate_ids[$mv] ) ) {
+								$m['value'][$check_k][$mk] = $frm_duplicate_ids[$mv];
 		                    }
-		                    unset($mk, $mv);
+		                    unset( $mk, $mv );
 		                }
                     }
     		    }
 		    }
 		}
 
-		if ( ! is_array($m['value']) ) {
-		    $m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
+		if ( ! is_array( $m['value'] ) ) {
+		    $m['value'] = FrmAppHelper::maybe_json_decode( $m['value'] );
 		}
 
-		$post['postmeta'][ (string) $meta->meta_key ] = $m['value'];
+		$post['postmeta'][(string) $meta->meta_key] = $m['value'];
     }
 
     /**
@@ -634,23 +634,23 @@ 
             }
 
 		    $taxonomy = (string) $att['domain'];
-		    if ( is_taxonomy_hierarchical($taxonomy) ) {
+		    if ( is_taxonomy_hierarchical( $taxonomy ) ) {
 		        $name = (string) $att['nicename'];
-		        $h_term = get_term_by('slug', $name, $taxonomy);
+		        $h_term = get_term_by( 'slug', $name, $taxonomy );
 		        if ( $h_term ) {
 		            $name = $h_term->term_id;
 		        }
-		        unset($h_term);
+		        unset( $h_term );
 		    } else {
 		        $name = (string) $c;
 		    }
 
-			if ( ! isset( $post['tax_input'][ $taxonomy ] ) ) {
-				$post['tax_input'][ $taxonomy ] = array();
+			if ( ! isset( $post['tax_input'][$taxonomy] ) ) {
+				$post['tax_input'][$taxonomy] = array();
 			}
 
-			$post['tax_input'][ $taxonomy ][] = $name;
-		    unset($name);
+			$post['tax_input'][$taxonomy][] = $name;
+		    unset( $name );
 		}
     }
 
@@ -667,29 +667,29 @@ 
 
 		if ( in_array( $post['post_status'], array( 'trash', 'draft' ) ) ) {
 		    $match_by['include'] = $post['post_id'];
-		    unset($match_by['name']);
+		    unset( $match_by['name'] );
 		}
 
-		$editing = get_posts($match_by);
+		$editing = get_posts( $match_by );
 
-        if ( ! empty($editing) && current($editing)->post_date == $post['post_date'] ) {
+        if ( ! empty( $editing ) && current( $editing )->post_date == $post['post_date'] ) {
             // set the id of the post to edit
-            $post['ID'] = current($editing)->ID;
+            $post['ID'] = current( $editing )->ID;
         }
     }
 
     private static function update_postmeta( &$post, $post_id ) {
         foreach ( $post['postmeta'] as $k => $v ) {
             if ( '_edit_last' == $k ) {
-                $v = FrmAppHelper::get_user_id_param($v);
+                $v = FrmAppHelper::get_user_id_param( $v );
             } else if ( '_thumbnail_id' == $k && FrmAppHelper::pro_is_installed() ) {
                 //change the attachment ID
-                $v = FrmProXMLHelper::get_file_id($v);
+                $v = FrmProXMLHelper::get_file_id( $v );
             }
 
-            update_post_meta($post_id, $k, $v);
+            update_post_meta( $post_id, $k, $v );
 
-            unset($k, $v);
+            unset( $k, $v );
         }
     }
 
@@ -706,13 +706,13 @@ 
      * @param string $message
      */
 	public static function parse_message( $result, &$message, &$errors ) {
-        if ( is_wp_error($result) ) {
+        if ( is_wp_error( $result ) ) {
             $errors[] = $result->get_error_message();
         } else if ( ! $result ) {
             return;
         }
 
-        if ( ! is_array($result) ) {
+        if ( ! is_array( $result ) ) {
             $message = is_string( $result ) ? $result : print_r( $result, 1 );
             return;
         }
@@ -724,20 +724,20 @@ 
 
         $message = '<ul>';
         foreach ( $result as $type => $results ) {
-			if ( ! isset( $t_strings[ $type ] ) ) {
+			if ( ! isset( $t_strings[$type] ) ) {
                 // only print imported and updated
                 continue;
             }
 
             $s_message = array();
             foreach ( $results as $k => $m ) {
-                self::item_count_message($m, $k, $s_message);
-                unset($k, $m);
+                self::item_count_message( $m, $k, $s_message );
+                unset( $k, $m );
             }
 
-            if ( ! empty($s_message) ) {
-				$message .= '<li><strong>' . $t_strings[ $type ] . ':</strong> ';
-                $message .= implode(', ', $s_message);
+            if ( ! empty( $s_message ) ) {
+				$message .= '<li><strong>' . $t_strings[$type] . ':</strong> ';
+                $message .= implode( ', ', $s_message );
                 $message .= '</li>';
             }
         }
@@ -766,7 +766,7 @@ 
             'actions'   => sprintf( _n( '%1$s Form Action', '%1$s Form Actions', $m, 'formidable' ), $m ),
         );
 
-		$s_message[] = isset( $strings[ $type ] ) ? $strings[ $type ] : ' ' . $m . ' ' . ucfirst( $type );
+		$s_message[] = isset( $strings[$type] ) ? $strings[$type] : ' ' . $m . ' ' . ucfirst( $type );
     }
 
 	/**
@@ -798,14 +798,14 @@ 
 	}
 
 	public static function cdata( $str ) {
-	    $str = maybe_unserialize($str);
-	    if ( is_array($str) ) {
-	        $str = json_encode($str);
+	    $str = maybe_unserialize( $str );
+	    if ( is_array( $str ) ) {
+	        $str = json_encode( $str );
 		} else if ( seems_utf8( $str ) == false ) {
 			$str = utf8_encode( $str );
 		}
 
-        if ( is_numeric($str) ) {
+        if ( is_numeric( $str ) ) {
             return $str;
         }
 
@@ -850,7 +850,7 @@ 
     * @param string $post_type
     */
     private static function migrate_post_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
-        if ( ! isset($form_options['create_post']) || ! $form_options['create_post'] ) {
+        if ( ! isset( $form_options['create_post'] ) || ! $form_options['create_post'] ) {
             return;
         }
 
@@ -871,10 +871,10 @@ 
         );
 
         foreach ( $post_settings as $post_setting ) {
-			if ( isset( $form_options[ $post_setting ] ) ) {
-				$new_action['post_content'][ $post_setting ] = $form_options[ $post_setting ];
+			if ( isset( $form_options[$post_setting] ) ) {
+				$new_action['post_content'][$post_setting] = $form_options[$post_setting];
             }
-            unset($post_setting);
+            unset( $post_setting );
         }
 
 		$new_action['event'] = array( 'create', 'update' );
@@ -888,7 +888,7 @@ 
 
 			$new_action['post_content'] = self::switch_action_field_ids( $new_action['post_content'], $basic_fields, $array_fields );
         }
-        $new_action['post_content'] = json_encode($new_action['post_content']);
+        $new_action['post_content'] = json_encode( $new_action['post_content'] );
 
         $exists = get_posts( array(
             'name'          => $new_action['post_name'],
@@ -900,7 +900,7 @@ 
         if ( ! $exists ) {
 			// this isn't an email, but we need to use a class that will always be included
 			FrmAppHelper::save_json_post( $new_action );
-            $imported['imported']['actions']++;
+            $imported['imported']['actions'] ++;
         }
     }
 
@@ -932,11 +932,11 @@ 
         foreach ( $post_content as $key => $setting ) {
             if ( ! is_array( $setting ) && in_array( $key, $basic_fields ) ) {
                 // Replace old IDs with new IDs
-				$post_content[ $key ] = str_replace( $old, $new, $setting );
+				$post_content[$key] = str_replace( $old, $new, $setting );
             } else if ( is_array( $setting ) && in_array( $key, $array_fields ) ) {
                 foreach ( $setting as $k => $val ) {
                     // Replace old IDs with new IDs
-					$post_content[ $key ][ $k ] = str_replace( $old, $new, $val );
+					$post_content[$key][$k] = str_replace( $old, $new, $val );
                 }
             }
             unset( $key, $setting );
@@ -959,14 +959,14 @@ 
         // Migrate autoresponders
         self::migrate_autoresponder_to_action( $form_options, $form_id, $notifications );
 
-        if (  empty( $notifications ) ) {
+        if ( empty( $notifications ) ) {
             return;
         }
 
         foreach ( $notifications as $new_notification ) {
             $new_notification['post_type']      = $post_type;
             $new_notification['post_excerpt']   = 'email';
-			$new_notification['post_title']     = __( 'Email Notification', 'formidable' );
+			$new_notification['post_title'] = __( 'Email Notification', 'formidable' );
             $new_notification['menu_order']     = $form_id;
             $new_notification['post_status']    = 'publish';
 
@@ -979,7 +979,7 @@ 
 				// Switch all other field IDs in email
                 $new_notification['post_content'] = FrmFieldsHelper::switch_field_ids( $new_notification['post_content'] );
             }
-            $new_notification['post_content']   = FrmAppHelper::prepare_and_encode( $new_notification['post_content'] );
+            $new_notification['post_content'] = FrmAppHelper::prepare_and_encode( $new_notification['post_content'] );
 
             $exists = get_posts( array(
                 'name'          => $new_notification['post_name'],
@@ -988,11 +988,11 @@ 
                 'numberposts'   => 1,
             ) );
 
-            if ( empty($exists) ) {
+            if ( empty( $exists ) ) {
 				FrmAppHelper::save_json_post( $new_notification );
-                $imported['imported']['actions']++;
+                $imported['imported']['actions'] ++;
             }
-            unset($new_notification);
+            unset( $new_notification );
         }
     }
 
@@ -1005,7 +1005,7 @@ 
 			$form_options['notification'] = array( 0 => $form_options['notification'] );
         }
 
-        if ( isset( $form_options['notification'] ) && is_array($form_options['notification']) ) {
+        if ( isset( $form_options['notification'] ) && is_array( $form_options['notification'] ) ) {
             foreach ( $form_options['notification'] as $email_key => $notification ) {
 
                 $atts = array( 'email_to' => '', 'reply_to' => '', 'reply_to_name' => '', 'event' => '', 'form_id' => $form_id, 'email_key' => $email_key );
@@ -1033,12 +1033,12 @@ 
         // Format the reply to email and name
         $reply_fields = array( 'reply_to' => '', 'reply_to_name' => '' );
         foreach ( $reply_fields as $f => $val ) {
-			if ( isset( $notification[ $f ] ) ) {
-				$atts[ $f ] = $notification[ $f ];
-				if ( 'custom' == $notification[ $f ] ) {
-					$atts[ $f ] = $notification[ 'cust_' . $f ];
-				} else if ( is_numeric( $atts[ $f ] ) && ! empty( $atts[ $f ] ) ) {
-					$atts[ $f ] = '[' . $atts[ $f ] . ']';
+			if ( isset( $notification[$f] ) ) {
+				$atts[$f] = $notification[$f];
+				if ( 'custom' == $notification[$f] ) {
+					$atts[$f] = $notification['cust_' . $f];
+				} else if ( is_numeric( $atts[$f] ) && ! empty( $atts[$f] ) ) {
+					$atts[$f] = '[' . $atts[$f] . ']';
                 }
             }
             unset( $f, $val );
@@ -1048,7 +1048,7 @@ 
 		$atts['event'] = array( 'create' );
         if ( isset( $notification['update_email'] ) && 1 == $notification['update_email'] ) {
             $atts['event'][] = 'update';
-        } else if ( isset($notification['update_email']) && 2 == $notification['update_email'] ) {
+        } else if ( isset( $notification['update_email'] ) && 2 == $notification['update_email'] ) {
 			$atts['event'] = array( 'update' );
         }
     }
@@ -1069,18 +1069,18 @@ 
         foreach ( $atts['email_to'] as $key => $email_field ) {
 
             if ( is_numeric( $email_field ) ) {
-				$atts['email_to'][ $key ] = '[' . $email_field . ']';
+				$atts['email_to'][$key] = '[' . $email_field . ']';
             }
 
-            if ( strpos( $email_field, '|') ) {
+            if ( strpos( $email_field, '|' ) ) {
                 $email_opt = explode( '|', $email_field );
                 if ( isset( $email_opt[0] ) ) {
-					$atts['email_to'][ $key ] = '[' . $email_opt[0] . ' show=' . $email_opt[1] . ']';
+					$atts['email_to'][$key] = '[' . $email_opt[0] . ' show=' . $email_opt[1] . ']';
                 }
                 unset( $email_opt );
             }
         }
-        $atts['email_to'] = implode(', ', $atts['email_to']);
+        $atts['email_to'] = implode( ', ', $atts['email_to'] );
     }
 
     private static function setup_new_notification( &$new_notification, $notification, $atts ) {
@@ -1096,12 +1096,12 @@ 
         // Add more fields to the new notification
         $add_fields = array( 'email_message', 'email_subject', 'plain_text', 'inc_user_info', 'conditions' );
         foreach ( $add_fields as $add_field ) {
-			if ( isset( $notification[ $add_field ] ) ) {
-				$new_notification['post_content'][ $add_field ] = $notification[ $add_field ];
+			if ( isset( $notification[$add_field] ) ) {
+				$new_notification['post_content'][$add_field] = $notification[$add_field];
             } else if ( in_array( $add_field, array( 'plain_text', 'inc_user_info' ) ) ) {
-				$new_notification['post_content'][ $add_field ] = 0;
+				$new_notification['post_content'][$add_field] = 0;
             } else {
-				$new_notification['post_content'][ $add_field ] = '';
+				$new_notification['post_content'][$add_field] = '';
             }
             unset( $add_field );
         }
@@ -1125,26 +1125,26 @@ 
 		if ( isset( $post_content['conditions'] ) && is_array( $post_content['conditions'] ) ) {
 			foreach ( $post_content['conditions'] as $email_key => $val ) {
 				if ( is_numeric( $email_key ) ) {
-					$post_content['conditions'][ $email_key ] = self::switch_action_field_ids( $val, array( 'hide_field' ) );
+					$post_content['conditions'][$email_key] = self::switch_action_field_ids( $val, array( 'hide_field' ) );
 				}
-				unset( $email_key, $val);
+				unset( $email_key, $val );
 			}
 		}
 	}
 
     private static function migrate_autoresponder_to_action( $form_options, $form_id, &$notifications ) {
-        if ( isset($form_options['auto_responder']) && $form_options['auto_responder'] && isset($form_options['ar_email_message']) && $form_options['ar_email_message'] ) {
+        if ( isset( $form_options['auto_responder'] ) && $form_options['auto_responder'] && isset( $form_options['ar_email_message'] ) && $form_options['ar_email_message'] ) {
             // migrate autoresponder
 
-            $email_field = isset($form_options['ar_email_to']) ? $form_options['ar_email_to'] : 0;
-            if ( strpos($email_field, '|') ) {
+            $email_field = isset( $form_options['ar_email_to'] ) ? $form_options['ar_email_to'] : 0;
+            if ( strpos( $email_field, '|' ) ) {
                 // data from entries field
-                $email_field = explode('|', $email_field);
-                if ( isset($email_field[1]) ) {
+                $email_field = explode( '|', $email_field );
+                if ( isset( $email_field[1] ) ) {
                     $email_field = $email_field[1];
                 }
             }
-            if ( is_numeric($email_field) && ! empty($email_field) ) {
+            if ( is_numeric( $email_field ) && ! empty( $email_field ) ) {
 				$email_field = '[' . $email_field . ']';
             }
 
@@ -1152,16 +1152,16 @@ 
             $new_notification2 = array(
                 'post_content'  => array(
                     'email_message' => $notification['ar_email_message'],
-                    'email_subject' => isset($notification['ar_email_subject']) ? $notification['ar_email_subject'] : '',
+                    'email_subject' => isset( $notification['ar_email_subject'] ) ? $notification['ar_email_subject'] : '',
                     'email_to'      => $email_field,
-                    'plain_text'    => isset($notification['ar_plain_text']) ? $notification['ar_plain_text'] : 0,
+                    'plain_text'    => isset( $notification['ar_plain_text'] ) ? $notification['ar_plain_text'] : 0,
                     'inc_user_info' => 0,
                 ),
 				'post_name'     => $form_id . '_email_' . count( $notifications ),
             );
 
-            $reply_to = isset($notification['ar_reply_to']) ? $notification['ar_reply_to'] : '';
-            $reply_to_name = isset($notification['ar_reply_to_name']) ? $notification['ar_reply_to_name'] : '';
+            $reply_to = isset( $notification['ar_reply_to'] ) ? $notification['ar_reply_to'] : '';
+            $reply_to_name = isset( $notification['ar_reply_to_name'] ) ? $notification['ar_reply_to_name'] : '';
 
 			if ( ! empty( $reply_to ) ) {
 				$new_notification2['post_content']['reply_to'] = $reply_to;

Indentation +571 added lines, -571 removed lines

@@ -23,30 +23,30 @@ 
 	}
 
 	public static function import_xml( $file ) {
-        $defaults = array(
-            'forms' => 0, 'fields' => 0, 'terms' => 0,
-            'posts' => 0, 'views' => 0, 'actions' => 0,
-            'styles' => 0,
-        );
-
-        $imported = array(
-            'imported' => $defaults,
+		$defaults = array(
+			'forms' => 0, 'fields' => 0, 'terms' => 0,
+			'posts' => 0, 'views' => 0, 'actions' => 0,
+			'styles' => 0,
+		);
+
+		$imported = array(
+			'imported' => $defaults,
 			'updated'  => $defaults,
 			'forms'    => array(),
 			'terms'    => array(),
-        );
+		);
 
-        unset($defaults);
+		unset($defaults);
 
 		if ( ! defined( 'WP_IMPORTING' ) ) {
-            define('WP_IMPORTING', true);
-        }
+			define('WP_IMPORTING', true);
+		}
 
 		if ( ! class_exists( 'DOMDocument' ) ) {
-            return new WP_Error( 'SimpleXML_parse_error', __( 'Your server does not have XML enabled', 'formidable' ), libxml_get_errors() );
-        }
+			return new WP_Error( 'SimpleXML_parse_error', __( 'Your server does not have XML enabled', 'formidable' ), libxml_get_errors() );
+		}
 
-        $dom = new DOMDocument;
+		$dom = new DOMDocument;
 		$success = $dom->loadXML( file_get_contents( $file ) );
 		if ( ! $success ) {
 			return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this XML file', 'formidable' ), libxml_get_errors() );
@@ -64,45 +64,45 @@ 
 			return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this XML file', 'formidable' ), libxml_get_errors() );
 		}
 
-        // add terms, forms (form and field ids), posts (post ids), and entries to db, in that order
+		// add terms, forms (form and field ids), posts (post ids), and entries to db, in that order
 		foreach ( array( 'term', 'form', 'view' ) as $item_type ) {
-            // grab cats, tags, and terms, or forms or posts
-            if ( isset($xml->{$item_type} ) ) {
+			// grab cats, tags, and terms, or forms or posts
+			if ( isset($xml->{$item_type} ) ) {
 				$function_name = 'import_xml_' . $item_type . 's';
 				$imported = self::$function_name( $xml->{$item_type}, $imported );
 				unset( $function_name, $xml->{$item_type} );
-            }
-        }
+			}
+		}
 
-	    $return = apply_filters('frm_importing_xml', $imported, $xml );
+		$return = apply_filters('frm_importing_xml', $imported, $xml );
 
-	    return $return;
-    }
+		return $return;
+	}
 
 	public static function import_xml_terms( $terms, $imported ) {
-        foreach ( $terms as $t ) {
+		foreach ( $terms as $t ) {
 			if ( term_exists((string) $t->term_slug, (string) $t->term_taxonomy) ) {
-			    continue;
+				continue;
 			}
 
 			$parent = self::get_term_parent_id( $t );
 
 			$term = wp_insert_term( (string) $t->term_name, (string) $t->term_taxonomy, array(
-                'slug'          => (string) $t->term_slug,
-                'description'   => (string) $t->term_description,
+				'slug'          => (string) $t->term_slug,
+				'description'   => (string) $t->term_description,
 				'parent'        => empty( $parent ) ? 0 : $parent,
-            ));
+			));
 
 			if ( $term && is_array( $term ) ) {
-                $imported['imported']['terms']++;
+				$imported['imported']['terms']++;
 				$imported['terms'][ (int) $t->term_id ] = $term['term_id'];
-            }
+			}
 
 			unset( $term, $t );
 		}
 
 		return $imported;
-    }
+	}
 
 	/**
 	 * @since 2.0.8
@@ -127,99 +127,99 @@ 
 		self::put_child_forms_first( $forms );
 
 		foreach ( $forms as $item ) {
-            $form = array(
-                'id'            => (int) $item->id,
-                'form_key'      => (string) $item->form_key,
-                'name'          => (string) $item->name,
-                'description'   => (string) $item->description,
-                'options'       => (string) $item->options,
-                'logged_in'     => (int) $item->logged_in,
-                'is_template'   => (int) $item->is_template,
-                'default_template' => (int) $item->default_template,
-                'editable'      => (int) $item->editable,
-                'status'        => (string) $item->status,
-                'parent_form_id' => isset($item->parent_form_id) ? (int) $item->parent_form_id : 0,
-                'created_at'    => date('Y-m-d H:i:s', strtotime((string) $item->created_at)),
-            );
-
-            $form['options'] = FrmAppHelper::maybe_json_decode($form['options']);
+			$form = array(
+				'id'            => (int) $item->id,
+				'form_key'      => (string) $item->form_key,
+				'name'          => (string) $item->name,
+				'description'   => (string) $item->description,
+				'options'       => (string) $item->options,
+				'logged_in'     => (int) $item->logged_in,
+				'is_template'   => (int) $item->is_template,
+				'default_template' => (int) $item->default_template,
+				'editable'      => (int) $item->editable,
+				'status'        => (string) $item->status,
+				'parent_form_id' => isset($item->parent_form_id) ? (int) $item->parent_form_id : 0,
+				'created_at'    => date('Y-m-d H:i:s', strtotime((string) $item->created_at)),
+			);
+
+			$form['options'] = FrmAppHelper::maybe_json_decode($form['options']);
 
 			self::update_custom_style_setting_on_import( $form );
 
-            // if template, allow to edit if form keys match, otherwise, creation date must also match
+			// if template, allow to edit if form keys match, otherwise, creation date must also match
 			$edit_query = array( 'form_key' => $form['form_key'], 'is_template' => $form['is_template'] );
-            if ( ! $form['is_template'] ) {
-                $edit_query['created_at'] = $form['created_at'];
-            }
+			if ( ! $form['is_template'] ) {
+				$edit_query['created_at'] = $form['created_at'];
+			}
 
-            $edit_query = apply_filters('frm_match_xml_form', $edit_query, $form);
+			$edit_query = apply_filters('frm_match_xml_form', $edit_query, $form);
 
-            $this_form = FrmForm::getAll($edit_query, '', 1);
-            unset($edit_query);
+			$this_form = FrmForm::getAll($edit_query, '', 1);
+			unset($edit_query);
 
-            if ( ! empty( $this_form ) ) {
-                $old_id = $form_id = $this_form->id;
-                FrmForm::update($form_id, $form );
-                $imported['updated']['forms']++;
-                // Keep track of whether this specific form was updated or not
+			if ( ! empty( $this_form ) ) {
+				$old_id = $form_id = $this_form->id;
+				FrmForm::update($form_id, $form );
+				$imported['updated']['forms']++;
+				// Keep track of whether this specific form was updated or not
 				$imported['form_status'][ $form_id ] = 'updated';
 
 				$form_fields = FrmField::get_all_for_form( $form_id, '', 'exclude', 'exclude' );
-                $old_fields = array();
-                foreach ( $form_fields as $f ) {
+				$old_fields = array();
+				foreach ( $form_fields as $f ) {
 					$old_fields[ $f->id ] = $f;
 					$old_fields[ $f->field_key ] = $f->id;
-                    unset($f);
-                }
-                $form_fields = $old_fields;
-                unset($old_fields);
-            } else {
-                $old_id = false;
-                //form does not exist, so create it
+					unset($f);
+				}
+				$form_fields = $old_fields;
+				unset($old_fields);
+			} else {
+				$old_id = false;
+				//form does not exist, so create it
 				$form_id = FrmForm::create( $form );
-                if ( $form_id ) {
-                    $imported['imported']['forms']++;
-                    // Keep track of whether this specific form was updated or not
+				if ( $form_id ) {
+					$imported['imported']['forms']++;
+					// Keep track of whether this specific form was updated or not
 					$imported['form_status'][ $form_id ] = 'imported';
 					self::track_imported_child_forms( (int) $form_id, $form['parent_form_id'], $child_forms );
-                }
-            }
+				}
+			}
 
-    		self::import_xml_fields( $item->field, $form_id, $this_form, $form_fields, $imported );
+			self::import_xml_fields( $item->field, $form_id, $this_form, $form_fields, $imported );
 
-    		// Delete any fields attached to this form that were not included in the template
-    		if ( isset( $form_fields ) && ! empty( $form_fields ) ) {
+			// Delete any fields attached to this form that were not included in the template
+			if ( isset( $form_fields ) && ! empty( $form_fields ) ) {
 				foreach ( $form_fields as $field ) {
-                    if ( is_object($field) ) {
-                        FrmField::destroy($field->id);
-                    }
-                    unset($field);
-                }
-                unset($form_fields);
-            }
-
-		    // Update field ids/keys to new ones
+					if ( is_object($field) ) {
+						FrmField::destroy($field->id);
+					}
+					unset($field);
+				}
+				unset($form_fields);
+			}
+
+			// Update field ids/keys to new ones
 			do_action( 'frm_after_duplicate_form', $form_id, $form, array( 'old_id' => $old_id ) );
 
 			$imported['forms'][ (int) $item->id ] = $form_id;
 
-            // Send pre 2.0 form options through function that creates actions
-            self::migrate_form_settings_to_actions( $form['options'], $form_id, $imported, $switch = true );
+			// Send pre 2.0 form options through function that creates actions
+			self::migrate_form_settings_to_actions( $form['options'], $form_id, $imported, $switch = true );
 
-		    unset($form, $item);
+			unset($form, $item);
 		}
 
 		self::maybe_update_child_form_parent_id( $imported['forms'], $child_forms );
 
 		return $imported;
-    }
+	}
 
 	/**
-	* Put child forms first so they will be imported before parents
-	*
-	* @since 2.0.16
-	* @param array $forms
-	*/
+	 * Put child forms first so they will be imported before parents
+	 *
+	 * @since 2.0.16
+	 * @param array $forms
+	 */
 	private static function put_child_forms_first( &$forms ) {
 		$child_forms = array();
 		$regular_forms = array();
@@ -238,13 +238,13 @@ 
 	}
 
 	/**
-	* Keep track of all imported child forms
-	*
-	* @since 2.0.16
-	* @param int $form_id
-	* @param int $parent_form_id
-	* @param array $child_forms
-	*/
+	 * Keep track of all imported child forms
+	 *
+	 * @since 2.0.16
+	 * @param int $form_id
+	 * @param int $parent_form_id
+	 * @param array $child_forms
+	 */
 	private static function track_imported_child_forms( $form_id, $parent_form_id, &$child_forms ) {
 		if ( $parent_form_id ) {
 			$child_forms[ $form_id ] = $parent_form_id;
@@ -252,13 +252,13 @@ 
 	}
 
 	/**
-	* Update the parent_form_id on imported child forms
-	* Child forms are imported first so their parent_form_id will need to be updated after the parent is imported
-	*
-	* @since 2.0.6
-	* @param array $imported_forms
-	* @param array $child_forms
-	*/
+	 * Update the parent_form_id on imported child forms
+	 * Child forms are imported first so their parent_form_id will need to be updated after the parent is imported
+	 *
+	 * @since 2.0.6
+	 * @param array $imported_forms
+	 * @param array $child_forms
+	 */
 	private static function maybe_update_child_form_parent_id( $imported_forms, $child_forms ) {
 		foreach ( $child_forms as $child_form_id => $old_parent_form_id ) {
 
@@ -272,40 +272,40 @@ 
 	}
 
 	/**
-	* Import all fields for a form
-	* @since 2.0.13
-	*
-	* TODO: Cut down on params
-	*/
+	 * Import all fields for a form
+	 * @since 2.0.13
+	 *
+	 * TODO: Cut down on params
+	 */
 	private static function import_xml_fields( $xml_fields, $form_id, $this_form, &$form_fields, &$imported ) {
 		$in_section = 0;
 
 		foreach ( $xml_fields as $field ) {
-		    $f = array(
-		        'id'            => (int) $field->id,
-		        'field_key'     => (string) $field->field_key,
-		        'name'          => (string) $field->name,
-		        'description'   => (string) $field->description,
-		        'type'          => (string) $field->type,
-		        'default_value' => FrmAppHelper::maybe_json_decode( (string) $field->default_value),
-		        'field_order'   => (int) $field->field_order,
-		        'form_id'       => (int) $form_id,
-		        'required'      => (int) $field->required,
-		        'options'       => FrmAppHelper::maybe_json_decode( (string) $field->options),
+			$f = array(
+				'id'            => (int) $field->id,
+				'field_key'     => (string) $field->field_key,
+				'name'          => (string) $field->name,
+				'description'   => (string) $field->description,
+				'type'          => (string) $field->type,
+				'default_value' => FrmAppHelper::maybe_json_decode( (string) $field->default_value),
+				'field_order'   => (int) $field->field_order,
+				'form_id'       => (int) $form_id,
+				'required'      => (int) $field->required,
+				'options'       => FrmAppHelper::maybe_json_decode( (string) $field->options),
 				'field_options' => FrmAppHelper::maybe_json_decode( (string) $field->field_options ),
-		    );
-
-		    if ( is_array($f['default_value']) && in_array($f['type'], array(
-		        'text', 'email', 'url', 'textarea',
-		        'number','phone', 'date', 'time',
-		        'hidden', 'password', 'tag', 'image',
-		    )) ) {
-		        if ( count($f['default_value']) === 1 ) {
+			);
+
+			if ( is_array($f['default_value']) && in_array($f['type'], array(
+				'text', 'email', 'url', 'textarea',
+				'number','phone', 'date', 'time',
+				'hidden', 'password', 'tag', 'image',
+			)) ) {
+				if ( count($f['default_value']) === 1 ) {
 					$f['default_value'] = '[' . reset( $f['default_value'] ) . ']';
-		        } else {
-		            $f['default_value'] = reset($f['default_value']);
-		        }
-		    }
+				} else {
+					$f['default_value'] = reset($f['default_value']);
+				}
+			}
 
 			self::maybe_update_in_section_variable( $in_section, $f );
 			self::maybe_update_form_select( $f, $imported );
@@ -368,12 +368,12 @@ 
 	}
 
 	/**
-	* Switch the form_select on a repeating field or embedded form if it needs to be switched
-	*
-	* @since 2.0.16
-	* @param array $f
-	* @param array $imported
-	*/
+	 * Switch the form_select on a repeating field or embedded form if it needs to be switched
+	 *
+	 * @since 2.0.16
+	 * @param array $f
+	 * @param array $imported
+	 */
 	private static function maybe_update_form_select( &$f, $imported ) {
 		if ( ! isset( $imported['forms'] ) ) {
 			return;
@@ -425,13 +425,13 @@ 
 	}
 
 	/**
-	* Updates the custom style setting on import
-	* Convert the post slug to an ID
-	*
-	* @since 2.0.19
-	* @param array $form
-	*
-	*/
+	 * Updates the custom style setting on import
+	 * Convert the post slug to an ID
+	 *
+	 * @since 2.0.19
+	 * @param array $form
+	 *
+	 */
 	private static function update_custom_style_setting_on_import( &$form ) {
 		if ( ! isset( $form['options']['custom_style'] ) ) {
 			return;
@@ -485,16 +485,16 @@ 
 	}
 
 	public static function import_xml_views( $views, $imported ) {
-        $imported['posts'] = array();
-        $form_action_type = FrmFormActionsController::$action_post_type;
+		$imported['posts'] = array();
+		$form_action_type = FrmFormActionsController::$action_post_type;
 
-        $post_types = array(
-            'frm_display' => 'views',
-            $form_action_type => 'actions',
-            'frm_styles'    => 'styles',
-        );
+		$post_types = array(
+			'frm_display' => 'views',
+			$form_action_type => 'actions',
+			'frm_styles'    => 'styles',
+		);
 
-        foreach ( $views as $item ) {
+		foreach ( $views as $item ) {
 			$post = array(
 				'post_title'    => (string) $item->title,
 				'post_name'     => (string) $item->post_name,
@@ -513,52 +513,52 @@ 
 				'post_date'     => (string) $item->post_date,
 				'post_date_gmt' => (string) $item->post_date_gmt,
 				'ping_status'   => (string) $item->ping_status,
-                'postmeta'      => array(),
-                'tax_input'     => array(),
+				'postmeta'      => array(),
+				'tax_input'     => array(),
 			);
 
-            $old_id = $post['post_id'];
-            self::populate_post($post, $item, $imported);
+			$old_id = $post['post_id'];
+			self::populate_post($post, $item, $imported);
 
 			unset($item);
 
 			$post_id = false;
-            if ( $post['post_type'] == $form_action_type ) {
-                $action_control = FrmFormActionsController::get_form_actions( $post['post_excerpt'] );
+			if ( $post['post_type'] == $form_action_type ) {
+				$action_control = FrmFormActionsController::get_form_actions( $post['post_excerpt'] );
 				if ( $action_control && is_object( $action_control ) ) {
 					$post_id = $action_control->maybe_create_action( $post, $imported['form_status'] );
 				}
-                unset($action_control);
-            } else if ( $post['post_type'] == 'frm_styles' ) {
-                // Properly encode post content before inserting the post
-                $post['post_content'] = FrmAppHelper::maybe_json_decode( $post['post_content'] );
-                $post['post_content'] = FrmAppHelper::prepare_and_encode( $post['post_content'] );
-
-                // Create/update post now
-                $post_id = wp_insert_post( $post );
-            } else {
-                // Create/update post now
-                $post_id = wp_insert_post( $post );
-            }
-
-            if ( ! is_numeric($post_id) ) {
-                continue;
-            }
-
-            self::update_postmeta($post, $post_id);
-
-            $this_type = 'posts';
+				unset($action_control);
+			} else if ( $post['post_type'] == 'frm_styles' ) {
+				// Properly encode post content before inserting the post
+				$post['post_content'] = FrmAppHelper::maybe_json_decode( $post['post_content'] );
+				$post['post_content'] = FrmAppHelper::prepare_and_encode( $post['post_content'] );
+
+				// Create/update post now
+				$post_id = wp_insert_post( $post );
+			} else {
+				// Create/update post now
+				$post_id = wp_insert_post( $post );
+			}
+
+			if ( ! is_numeric($post_id) ) {
+				continue;
+			}
+
+			self::update_postmeta($post, $post_id);
+
+			$this_type = 'posts';
 			if ( isset( $post_types[ $post['post_type'] ] ) ) {
 				$this_type = $post_types[ $post['post_type'] ];
-            }
+			}
 
-            if ( isset($post['ID']) && $post_id == $post['ID'] ) {
-                $imported['updated'][ $this_type ]++;
-            } else {
-                $imported['imported'][ $this_type ]++;
-            }
+			if ( isset($post['ID']) && $post_id == $post['ID'] ) {
+				$imported['updated'][ $this_type ]++;
+			} else {
+				$imported['imported'][ $this_type ]++;
+			}
 
-            unset($post);
+			unset($post);
 
 			$imported['posts'][ (int) $old_id ] = $post_id;
 		}
@@ -566,16 +566,16 @@ 
 		self::maybe_update_stylesheet( $imported );
 
 		return $imported;
-    }
+	}
 
-    private static function populate_post( &$post, $item, $imported ) {
+	private static function populate_post( &$post, $item, $imported ) {
 		if ( isset($item->attachment_url) ) {
 			$post['attachment_url'] = (string) $item->attachment_url;
 		}
 
 		if ( $post['post_type'] == FrmFormActionsController::$action_post_type && isset( $imported['forms'][ (int) $post['menu_order'] ] ) ) {
-		    // update to new form id
-		    $post['menu_order'] = $imported['forms'][ (int) $post['menu_order'] ];
+			// update to new form id
+			$post['menu_order'] = $imported['forms'][ (int) $post['menu_order'] ];
 		}
 
 		// Don't allow default styles to take over a site's default style
@@ -584,144 +584,144 @@ 
 		}
 
 		foreach ( $item->postmeta as $meta ) {
-		    self::populate_postmeta($post, $meta, $imported);
+			self::populate_postmeta($post, $meta, $imported);
 			unset($meta);
 		}
 
-        self::populate_taxonomies($post, $item);
+		self::populate_taxonomies($post, $item);
 
-        self::maybe_editing_post($post);
-    }
+		self::maybe_editing_post($post);
+	}
 
-    private static function populate_postmeta( &$post, $meta, $imported ) {
-        global $frm_duplicate_ids;
+	private static function populate_postmeta( &$post, $meta, $imported ) {
+		global $frm_duplicate_ids;
 
-	    $m = array(
+		$m = array(
 			'key'   => (string) $meta->meta_key,
 			'value' => (string) $meta->meta_value,
 		);
 
 		//switch old form and field ids to new ones
 		if ( $m['key'] == 'frm_form_id' && isset($imported['forms'][ (int) $m['value'] ]) ) {
-		    $m['value'] = $imported['forms'][ (int) $m['value'] ];
+			$m['value'] = $imported['forms'][ (int) $m['value'] ];
 		} else {
-		    $m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
+			$m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
 
-		    if ( ! empty($frm_duplicate_ids) ) {
+			if ( ! empty($frm_duplicate_ids) ) {
 
-		        if ( $m['key'] == 'frm_dyncontent' ) {
-		            $m['value'] = FrmFieldsHelper::switch_field_ids($m['value']);
-    		    } else if ( $m['key'] == 'frm_options' ) {
+				if ( $m['key'] == 'frm_dyncontent' ) {
+					$m['value'] = FrmFieldsHelper::switch_field_ids($m['value']);
+				} else if ( $m['key'] == 'frm_options' ) {
 
 					foreach ( array( 'date_field_id', 'edate_field_id' ) as $setting_name ) {
 						if ( isset( $m['value'][ $setting_name ] ) && is_numeric( $m['value'][ $setting_name ] ) && isset( $frm_duplicate_ids[ $m['value'][ $setting_name ] ] ) ) {
 							$m['value'][ $setting_name ] = $frm_duplicate_ids[ $m['value'][ $setting_name ] ];
-    		            }
-    		        }
-
-                    $check_dup_array = array();
-    		        if ( isset( $m['value']['order_by'] ) && ! empty( $m['value']['order_by'] ) ) {
-    		            if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[ $m['value']['order_by'] ] ) ) {
-    		                $m['value']['order_by'] = $frm_duplicate_ids[ $m['value']['order_by'] ];
-    		            } else if ( is_array( $m['value']['order_by'] ) ) {
-                            $check_dup_array[] = 'order_by';
-    		            }
-    		        }
-
-    		        if ( isset( $m['value']['where'] ) && ! empty( $m['value']['where'] ) ) {
-    		            $check_dup_array[] = 'where';
-    		        }
-
-                    foreach ( $check_dup_array as $check_k ) {
+						}
+					}
+
+					$check_dup_array = array();
+					if ( isset( $m['value']['order_by'] ) && ! empty( $m['value']['order_by'] ) ) {
+						if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[ $m['value']['order_by'] ] ) ) {
+							$m['value']['order_by'] = $frm_duplicate_ids[ $m['value']['order_by'] ];
+						} else if ( is_array( $m['value']['order_by'] ) ) {
+							$check_dup_array[] = 'order_by';
+						}
+					}
+
+					if ( isset( $m['value']['where'] ) && ! empty( $m['value']['where'] ) ) {
+						$check_dup_array[] = 'where';
+					}
+
+					foreach ( $check_dup_array as $check_k ) {
 						foreach ( (array) $m['value'][ $check_k ] as $mk => $mv ) {
 							if ( isset( $frm_duplicate_ids[ $mv ] ) ) {
 								$m['value'][ $check_k ][ $mk ] = $frm_duplicate_ids[ $mv ];
-		                    }
-		                    unset($mk, $mv);
-		                }
-                    }
-    		    }
-		    }
+							}
+							unset($mk, $mv);
+						}
+					}
+				}
+			}
 		}
 
 		if ( ! is_array($m['value']) ) {
-		    $m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
+			$m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
 		}
 
 		$post['postmeta'][ (string) $meta->meta_key ] = $m['value'];
-    }
-
-    /**
-     * Add terms to post
-     * @param array $post by reference
-     * @param object $item The XML object data
-     */
-    private static function populate_taxonomies( &$post, $item ) {
+	}
+
+	/**
+	 * Add terms to post
+	 * @param array $post by reference
+	 * @param object $item The XML object data
+	 */
+	private static function populate_taxonomies( &$post, $item ) {
 		foreach ( $item->category as $c ) {
 			$att = $c->attributes();
 			if ( ! isset( $att['nicename'] ) ) {
-                continue;
-            }
-
-		    $taxonomy = (string) $att['domain'];
-		    if ( is_taxonomy_hierarchical($taxonomy) ) {
-		        $name = (string) $att['nicename'];
-		        $h_term = get_term_by('slug', $name, $taxonomy);
-		        if ( $h_term ) {
-		            $name = $h_term->term_id;
-		        }
-		        unset($h_term);
-		    } else {
-		        $name = (string) $c;
-		    }
+				continue;
+			}
+
+			$taxonomy = (string) $att['domain'];
+			if ( is_taxonomy_hierarchical($taxonomy) ) {
+				$name = (string) $att['nicename'];
+				$h_term = get_term_by('slug', $name, $taxonomy);
+				if ( $h_term ) {
+					$name = $h_term->term_id;
+				}
+				unset($h_term);
+			} else {
+				$name = (string) $c;
+			}
 
 			if ( ! isset( $post['tax_input'][ $taxonomy ] ) ) {
 				$post['tax_input'][ $taxonomy ] = array();
 			}
 
 			$post['tax_input'][ $taxonomy ][] = $name;
-		    unset($name);
+			unset($name);
 		}
-    }
+	}
 
-    /**
-     * Edit post if the key and created time match
-     */
-    private static function maybe_editing_post( &$post ) {
+	/**
+	 * Edit post if the key and created time match
+	 */
+	private static function maybe_editing_post( &$post ) {
 		$match_by = array(
-		    'post_type'     => $post['post_type'],
-		    'name'          => $post['post_name'],
-		    'post_status'   => $post['post_status'],
-		    'posts_per_page' => 1,
+			'post_type'     => $post['post_type'],
+			'name'          => $post['post_name'],
+			'post_status'   => $post['post_status'],
+			'posts_per_page' => 1,
 		);
 
 		if ( in_array( $post['post_status'], array( 'trash', 'draft' ) ) ) {
-		    $match_by['include'] = $post['post_id'];
-		    unset($match_by['name']);
+			$match_by['include'] = $post['post_id'];
+			unset($match_by['name']);
 		}
 
 		$editing = get_posts($match_by);
 
-        if ( ! empty($editing) && current($editing)->post_date == $post['post_date'] ) {
-            // set the id of the post to edit
-            $post['ID'] = current($editing)->ID;
-        }
-    }
+		if ( ! empty($editing) && current($editing)->post_date == $post['post_date'] ) {
+			// set the id of the post to edit
+			$post['ID'] = current($editing)->ID;
+		}
+	}
 
-    private static function update_postmeta( &$post, $post_id ) {
-        foreach ( $post['postmeta'] as $k => $v ) {
-            if ( '_edit_last' == $k ) {
-                $v = FrmAppHelper::get_user_id_param($v);
-            } else if ( '_thumbnail_id' == $k && FrmAppHelper::pro_is_installed() ) {
-                //change the attachment ID
-                $v = FrmProXMLHelper::get_file_id($v);
-            }
+	private static function update_postmeta( &$post, $post_id ) {
+		foreach ( $post['postmeta'] as $k => $v ) {
+			if ( '_edit_last' == $k ) {
+				$v = FrmAppHelper::get_user_id_param($v);
+			} else if ( '_thumbnail_id' == $k && FrmAppHelper::pro_is_installed() ) {
+				//change the attachment ID
+				$v = FrmProXMLHelper::get_file_id($v);
+			}
 
-            update_post_meta($post_id, $k, $v);
+			update_post_meta($post_id, $k, $v);
 
-            unset($k, $v);
-        }
-    }
+			unset($k, $v);
+		}
+	}
 
 	private static function maybe_update_stylesheet( $imported ) {
 		$new_styles = isset( $imported['imported']['styles'] ) && ! empty( $imported['imported']['styles'] );
@@ -737,72 +737,72 @@ 
 		}
 	}
 
-    /**
-     * @param string $message
-     */
+	/**
+	 * @param string $message
+	 */
 	public static function parse_message( $result, &$message, &$errors ) {
-        if ( is_wp_error($result) ) {
-            $errors[] = $result->get_error_message();
-        } else if ( ! $result ) {
-            return;
-        }
-
-        if ( ! is_array($result) ) {
-            $message = is_string( $result ) ? $result : print_r( $result, 1 );
-            return;
-        }
-
-        $t_strings = array(
-            'imported'  => __( 'Imported', 'formidable' ),
-            'updated'   => __( 'Updated', 'formidable' ),
-        );
-
-        $message = '<ul>';
-        foreach ( $result as $type => $results ) {
+		if ( is_wp_error($result) ) {
+			$errors[] = $result->get_error_message();
+		} else if ( ! $result ) {
+			return;
+		}
+
+		if ( ! is_array($result) ) {
+			$message = is_string( $result ) ? $result : print_r( $result, 1 );
+			return;
+		}
+
+		$t_strings = array(
+			'imported'  => __( 'Imported', 'formidable' ),
+			'updated'   => __( 'Updated', 'formidable' ),
+		);
+
+		$message = '<ul>';
+		foreach ( $result as $type => $results ) {
 			if ( ! isset( $t_strings[ $type ] ) ) {
-                // only print imported and updated
-                continue;
-            }
+				// only print imported and updated
+				continue;
+			}
 
-            $s_message = array();
-            foreach ( $results as $k => $m ) {
-                self::item_count_message($m, $k, $s_message);
-                unset($k, $m);
-            }
+			$s_message = array();
+			foreach ( $results as $k => $m ) {
+				self::item_count_message($m, $k, $s_message);
+				unset($k, $m);
+			}
 
-            if ( ! empty($s_message) ) {
+			if ( ! empty($s_message) ) {
 				$message .= '<li><strong>' . $t_strings[ $type ] . ':</strong> ';
-                $message .= implode(', ', $s_message);
-                $message .= '</li>';
-            }
-        }
-
-        if ( $message == '<ul>' ) {
-            $message = '';
-            $errors[] = __( 'Nothing was imported or updated', 'formidable' );
-        } else {
-            $message .= '</ul>';
-        }
-    }
+				$message .= implode(', ', $s_message);
+				$message .= '</li>';
+			}
+		}
+
+		if ( $message == '<ul>' ) {
+			$message = '';
+			$errors[] = __( 'Nothing was imported or updated', 'formidable' );
+		} else {
+			$message .= '</ul>';
+		}
+	}
 
 	public static function item_count_message( $m, $type, &$s_message ) {
-        if ( ! $m ) {
-            return;
-        }
-
-        $strings = array(
-            'forms'     => sprintf( _n( '%1$s Form', '%1$s Forms', $m, 'formidable' ), $m ),
-            'fields'    => sprintf( _n( '%1$s Field', '%1$s Fields', $m, 'formidable' ), $m ),
-            'items'     => sprintf( _n( '%1$s Entry', '%1$s Entries', $m, 'formidable' ), $m ),
-            'views'     => sprintf( _n( '%1$s View', '%1$s Views', $m, 'formidable' ), $m ),
-            'posts'     => sprintf( _n( '%1$s Post', '%1$s Posts', $m, 'formidable' ), $m ),
-            'styles'     => sprintf( _n( '%1$s Style', '%1$s Styles', $m, 'formidable' ), $m ),
-            'terms'     => sprintf( _n( '%1$s Term', '%1$s Terms', $m, 'formidable' ), $m ),
-            'actions'   => sprintf( _n( '%1$s Form Action', '%1$s Form Actions', $m, 'formidable' ), $m ),
-        );
+		if ( ! $m ) {
+			return;
+		}
+
+		$strings = array(
+			'forms'     => sprintf( _n( '%1$s Form', '%1$s Forms', $m, 'formidable' ), $m ),
+			'fields'    => sprintf( _n( '%1$s Field', '%1$s Fields', $m, 'formidable' ), $m ),
+			'items'     => sprintf( _n( '%1$s Entry', '%1$s Entries', $m, 'formidable' ), $m ),
+			'views'     => sprintf( _n( '%1$s View', '%1$s Views', $m, 'formidable' ), $m ),
+			'posts'     => sprintf( _n( '%1$s Post', '%1$s Posts', $m, 'formidable' ), $m ),
+			'styles'     => sprintf( _n( '%1$s Style', '%1$s Styles', $m, 'formidable' ), $m ),
+			'terms'     => sprintf( _n( '%1$s Term', '%1$s Terms', $m, 'formidable' ), $m ),
+			'actions'   => sprintf( _n( '%1$s Form Action', '%1$s Form Actions', $m, 'formidable' ), $m ),
+		);
 
 		$s_message[] = isset( $strings[ $type ] ) ? $strings[ $type ] : ' ' . $m . ' ' . ucfirst( $type );
-    }
+	}
 
 	/**
 	 * Prepare the form options for export
@@ -833,16 +833,16 @@ 
 	}
 
 	public static function cdata( $str ) {
-	    $str = maybe_unserialize($str);
-	    if ( is_array($str) ) {
-	        $str = json_encode($str);
+		$str = maybe_unserialize($str);
+		if ( is_array($str) ) {
+			$str = json_encode($str);
 		} else if ( seems_utf8( $str ) == false ) {
 			$str = utf8_encode( $str );
 		}
 
-        if ( is_numeric($str) ) {
-            return $str;
-        }
+		if ( is_numeric($str) ) {
+			return $str;
+		}
 
 		self::remove_invalid_characters_from_xml( $str );
 
@@ -863,58 +863,58 @@ 
 		$str = str_replace( '\x1F', '', $str );
 	}
 
-    public static function migrate_form_settings_to_actions( $form_options, $form_id, &$imported = array(), $switch = false ) {
-        // Get post type
-        $post_type = FrmFormActionsController::$action_post_type;
-
-        // Set up imported index, if not set up yet
-        if ( ! isset( $imported['imported']['actions'] ) ) {
-            $imported['imported']['actions'] = 0;
-        }
-
-        // Migrate post settings to action
-        self::migrate_post_settings_to_action( $form_options, $form_id, $post_type, $imported, $switch );
-
-        // Migrate email settings to action
-        self::migrate_email_settings_to_action( $form_options, $form_id, $post_type, $imported, $switch );
-    }
-
-    /**
-    * Migrate post settings to form action
-    *
-    * @param string $post_type
-    */
-    private static function migrate_post_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
-        if ( ! isset($form_options['create_post']) || ! $form_options['create_post'] ) {
-            return;
-        }
-
-        $new_action = array(
-            'post_type'     => $post_type,
-            'post_excerpt'  => 'wppost',
+	public static function migrate_form_settings_to_actions( $form_options, $form_id, &$imported = array(), $switch = false ) {
+		// Get post type
+		$post_type = FrmFormActionsController::$action_post_type;
+
+		// Set up imported index, if not set up yet
+		if ( ! isset( $imported['imported']['actions'] ) ) {
+			$imported['imported']['actions'] = 0;
+		}
+
+		// Migrate post settings to action
+		self::migrate_post_settings_to_action( $form_options, $form_id, $post_type, $imported, $switch );
+
+		// Migrate email settings to action
+		self::migrate_email_settings_to_action( $form_options, $form_id, $post_type, $imported, $switch );
+	}
+
+	/**
+	 * Migrate post settings to form action
+	 *
+	 * @param string $post_type
+	 */
+	private static function migrate_post_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
+		if ( ! isset($form_options['create_post']) || ! $form_options['create_post'] ) {
+			return;
+		}
+
+		$new_action = array(
+			'post_type'     => $post_type,
+			'post_excerpt'  => 'wppost',
 			'post_title'    => __( 'Create Posts', 'formidable' ),
-            'menu_order'    => $form_id,
-            'post_status'   => 'publish',
-            'post_content'  => array(),
+			'menu_order'    => $form_id,
+			'post_status'   => 'publish',
+			'post_content'  => array(),
 			'post_name'     => $form_id . '_wppost_1',
-        );
+		);
 
-        $post_settings = array(
-            'post_type', 'post_category', 'post_content',
-            'post_excerpt', 'post_title', 'post_name', 'post_date',
+		$post_settings = array(
+			'post_type', 'post_category', 'post_content',
+			'post_excerpt', 'post_title', 'post_name', 'post_date',
 			'post_status', 'post_custom_fields', 'post_password',
-        );
+		);
 
-        foreach ( $post_settings as $post_setting ) {
+		foreach ( $post_settings as $post_setting ) {
 			if ( isset( $form_options[ $post_setting ] ) ) {
 				$new_action['post_content'][ $post_setting ] = $form_options[ $post_setting ];
-            }
-            unset($post_setting);
-        }
+			}
+			unset($post_setting);
+		}
 
 		$new_action['event'] = array( 'create', 'update' );
 
-        if ( $switch ) {
+		if ( $switch ) {
 			// Fields with string or int saved
 			$basic_fields = array( 'post_title', 'post_content', 'post_excerpt', 'post_password', 'post_date', 'post_status' );
 
@@ -922,22 +922,22 @@ 
 			$array_fields = array( 'post_category', 'post_custom_fields' );
 
 			$new_action['post_content'] = self::switch_action_field_ids( $new_action['post_content'], $basic_fields, $array_fields );
-        }
-        $new_action['post_content'] = json_encode($new_action['post_content']);
+		}
+		$new_action['post_content'] = json_encode($new_action['post_content']);
 
-        $exists = get_posts( array(
-            'name'          => $new_action['post_name'],
-            'post_type'     => $new_action['post_type'],
-            'post_status'   => $new_action['post_status'],
-            'numberposts'   => 1,
-        ) );
+		$exists = get_posts( array(
+			'name'          => $new_action['post_name'],
+			'post_type'     => $new_action['post_type'],
+			'post_status'   => $new_action['post_status'],
+			'numberposts'   => 1,
+		) );
 
-        if ( ! $exists ) {
+		if ( ! $exists ) {
 			// this isn't an email, but we need to use a class that will always be included
 			FrmAppHelper::save_json_post( $new_action );
-            $imported['imported']['actions']++;
-        }
-    }
+			$imported['imported']['actions']++;
+		}
+	}
 
 	/**
 	 * Switch old field IDs for new field IDs in emails and post
@@ -950,211 +950,211 @@ 
 	 * @return string $post_content - new field IDs
 	 */
 	private static function switch_action_field_ids( $post_content, $basic_fields, $array_fields = array() ) {
-        global $frm_duplicate_ids;
+		global $frm_duplicate_ids;
 
-        // If there aren't IDs that were switched, end now
-        if ( ! $frm_duplicate_ids ) {
-            return;
-        }
+		// If there aren't IDs that were switched, end now
+		if ( ! $frm_duplicate_ids ) {
+			return;
+		}
 
-        // Get old IDs
-        $old = array_keys( $frm_duplicate_ids );
+		// Get old IDs
+		$old = array_keys( $frm_duplicate_ids );
 
-        // Get new IDs
-        $new = array_values( $frm_duplicate_ids );
+		// Get new IDs
+		$new = array_values( $frm_duplicate_ids );
 
-        // Do a str_replace with each item to set the new IDs
-        foreach ( $post_content as $key => $setting ) {
-            if ( ! is_array( $setting ) && in_array( $key, $basic_fields ) ) {
-                // Replace old IDs with new IDs
+		// Do a str_replace with each item to set the new IDs
+		foreach ( $post_content as $key => $setting ) {
+			if ( ! is_array( $setting ) && in_array( $key, $basic_fields ) ) {
+				// Replace old IDs with new IDs
 				$post_content[ $key ] = str_replace( $old, $new, $setting );
-            } else if ( is_array( $setting ) && in_array( $key, $array_fields ) ) {
-                foreach ( $setting as $k => $val ) {
-                    // Replace old IDs with new IDs
+			} else if ( is_array( $setting ) && in_array( $key, $array_fields ) ) {
+				foreach ( $setting as $k => $val ) {
+					// Replace old IDs with new IDs
 					$post_content[ $key ][ $k ] = str_replace( $old, $new, $val );
-                }
-            }
-            unset( $key, $setting );
-        }
-        return $post_content;
-    }
-
-    private static function migrate_email_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
-        // No old notifications or autoresponders to carry over
+				}
+			}
+			unset( $key, $setting );
+		}
+		return $post_content;
+	}
+
+	private static function migrate_email_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
+		// No old notifications or autoresponders to carry over
 		if ( ! isset( $form_options['auto_responder'] ) && ! isset( $form_options['notification'] ) && ! isset( $form_options['email_to'] ) ) {
-            return;
-        }
+			return;
+		}
 
-        // Initialize notifications array
-        $notifications = array();
+		// Initialize notifications array
+		$notifications = array();
 
-        // Migrate regular notifications
-        self::migrate_notifications_to_action( $form_options, $form_id, $notifications );
+		// Migrate regular notifications
+		self::migrate_notifications_to_action( $form_options, $form_id, $notifications );
 
-        // Migrate autoresponders
-        self::migrate_autoresponder_to_action( $form_options, $form_id, $notifications );
+		// Migrate autoresponders
+		self::migrate_autoresponder_to_action( $form_options, $form_id, $notifications );
 
-        if (  empty( $notifications ) ) {
-            return;
-        }
+		if (  empty( $notifications ) ) {
+			return;
+		}
 
-        foreach ( $notifications as $new_notification ) {
-            $new_notification['post_type']      = $post_type;
-            $new_notification['post_excerpt']   = 'email';
+		foreach ( $notifications as $new_notification ) {
+			$new_notification['post_type']      = $post_type;
+			$new_notification['post_excerpt']   = 'email';
 			$new_notification['post_title']     = __( 'Email Notification', 'formidable' );
-            $new_notification['menu_order']     = $form_id;
-            $new_notification['post_status']    = 'publish';
+			$new_notification['menu_order']     = $form_id;
+			$new_notification['post_status']    = 'publish';
 
-            // Switch field IDs and keys, if needed
-            if ( $switch ) {
+			// Switch field IDs and keys, if needed
+			if ( $switch ) {
 
 				// Switch field IDs in email conditional logic
 				self::switch_email_contition_field_ids( $new_notification['post_content'] );
 
 				// Switch all other field IDs in email
-                $new_notification['post_content'] = FrmFieldsHelper::switch_field_ids( $new_notification['post_content'] );
-            }
-            $new_notification['post_content']   = FrmAppHelper::prepare_and_encode( $new_notification['post_content'] );
-
-            $exists = get_posts( array(
-                'name'          => $new_notification['post_name'],
-                'post_type'     => $new_notification['post_type'],
-                'post_status'   => $new_notification['post_status'],
-                'numberposts'   => 1,
-            ) );
-
-            if ( empty($exists) ) {
+				$new_notification['post_content'] = FrmFieldsHelper::switch_field_ids( $new_notification['post_content'] );
+			}
+			$new_notification['post_content']   = FrmAppHelper::prepare_and_encode( $new_notification['post_content'] );
+
+			$exists = get_posts( array(
+				'name'          => $new_notification['post_name'],
+				'post_type'     => $new_notification['post_type'],
+				'post_status'   => $new_notification['post_status'],
+				'numberposts'   => 1,
+			) );
+
+			if ( empty($exists) ) {
 				FrmAppHelper::save_json_post( $new_notification );
-                $imported['imported']['actions']++;
-            }
-            unset($new_notification);
-        }
-    }
-
-    private static function migrate_notifications_to_action( $form_options, $form_id, &$notifications ) {
-        if ( ! isset( $form_options['notification'] ) && isset( $form_options['email_to'] ) && ! empty( $form_options['email_to'] ) ) {
-            // add old settings into notification array
+				$imported['imported']['actions']++;
+			}
+			unset($new_notification);
+		}
+	}
+
+	private static function migrate_notifications_to_action( $form_options, $form_id, &$notifications ) {
+		if ( ! isset( $form_options['notification'] ) && isset( $form_options['email_to'] ) && ! empty( $form_options['email_to'] ) ) {
+			// add old settings into notification array
 			$form_options['notification'] = array( 0 => $form_options );
-        } else if ( isset( $form_options['notification']['email_to'] ) ) {
-            // make sure it's in the correct format
+		} else if ( isset( $form_options['notification']['email_to'] ) ) {
+			// make sure it's in the correct format
 			$form_options['notification'] = array( 0 => $form_options['notification'] );
-        }
+		}
 
-        if ( isset( $form_options['notification'] ) && is_array($form_options['notification']) ) {
-            foreach ( $form_options['notification'] as $email_key => $notification ) {
+		if ( isset( $form_options['notification'] ) && is_array($form_options['notification']) ) {
+			foreach ( $form_options['notification'] as $email_key => $notification ) {
 
-                $atts = array( 'email_to' => '', 'reply_to' => '', 'reply_to_name' => '', 'event' => '', 'form_id' => $form_id, 'email_key' => $email_key );
+				$atts = array( 'email_to' => '', 'reply_to' => '', 'reply_to_name' => '', 'event' => '', 'form_id' => $form_id, 'email_key' => $email_key );
 
-                // Format the email data
-                self::format_email_data( $atts, $notification );
+				// Format the email data
+				self::format_email_data( $atts, $notification );
 
 				if ( isset( $notification['twilio'] ) && $notification['twilio'] ) {
 					do_action( 'frm_create_twilio_action', $atts, $notification );
 				}
 
-                // Setup the new notification
-                $new_notification = array();
-                self::setup_new_notification( $new_notification, $notification, $atts );
+				// Setup the new notification
+				$new_notification = array();
+				self::setup_new_notification( $new_notification, $notification, $atts );
 
-                $notifications[] = $new_notification;
-            }
-        }
-    }
+				$notifications[] = $new_notification;
+			}
+		}
+	}
 
-    private static function format_email_data( &$atts, $notification ) {
-        // Format email_to
-        self::format_email_to_data( $atts, $notification );
+	private static function format_email_data( &$atts, $notification ) {
+		// Format email_to
+		self::format_email_to_data( $atts, $notification );
 
-        // Format the reply to email and name
-        $reply_fields = array( 'reply_to' => '', 'reply_to_name' => '' );
-        foreach ( $reply_fields as $f => $val ) {
+		// Format the reply to email and name
+		$reply_fields = array( 'reply_to' => '', 'reply_to_name' => '' );
+		foreach ( $reply_fields as $f => $val ) {
 			if ( isset( $notification[ $f ] ) ) {
 				$atts[ $f ] = $notification[ $f ];
 				if ( 'custom' == $notification[ $f ] ) {
 					$atts[ $f ] = $notification[ 'cust_' . $f ];
 				} else if ( is_numeric( $atts[ $f ] ) && ! empty( $atts[ $f ] ) ) {
 					$atts[ $f ] = '[' . $atts[ $f ] . ']';
-                }
-            }
-            unset( $f, $val );
-        }
+				}
+			}
+			unset( $f, $val );
+		}
 
-        // Format event
+		// Format event
 		$atts['event'] = array( 'create' );
-        if ( isset( $notification['update_email'] ) && 1 == $notification['update_email'] ) {
-            $atts['event'][] = 'update';
-        } else if ( isset($notification['update_email']) && 2 == $notification['update_email'] ) {
+		if ( isset( $notification['update_email'] ) && 1 == $notification['update_email'] ) {
+			$atts['event'][] = 'update';
+		} else if ( isset($notification['update_email']) && 2 == $notification['update_email'] ) {
 			$atts['event'] = array( 'update' );
-        }
-    }
+		}
+	}
 
-    private static function format_email_to_data( &$atts, $notification ) {
-        if ( isset( $notification['email_to'] ) ) {
+	private static function format_email_to_data( &$atts, $notification ) {
+		if ( isset( $notification['email_to'] ) ) {
 			$atts['email_to'] = preg_split( '/ (,|;) /', $notification['email_to'] );
-        } else {
-            $atts['email_to'] = array();
-        }
+		} else {
+			$atts['email_to'] = array();
+		}
 
-        if ( isset( $notification['also_email_to'] ) ) {
-            $email_fields = (array) $notification['also_email_to'];
-            $atts['email_to'] = array_merge( $email_fields, $atts['email_to'] );
-            unset( $email_fields );
-        }
+		if ( isset( $notification['also_email_to'] ) ) {
+			$email_fields = (array) $notification['also_email_to'];
+			$atts['email_to'] = array_merge( $email_fields, $atts['email_to'] );
+			unset( $email_fields );
+		}
 
-        foreach ( $atts['email_to'] as $key => $email_field ) {
+		foreach ( $atts['email_to'] as $key => $email_field ) {
 
-            if ( is_numeric( $email_field ) ) {
+			if ( is_numeric( $email_field ) ) {
 				$atts['email_to'][ $key ] = '[' . $email_field . ']';
-            }
+			}
 
-            if ( strpos( $email_field, '|') ) {
-                $email_opt = explode( '|', $email_field );
-                if ( isset( $email_opt[0] ) ) {
+			if ( strpos( $email_field, '|') ) {
+				$email_opt = explode( '|', $email_field );
+				if ( isset( $email_opt[0] ) ) {
 					$atts['email_to'][ $key ] = '[' . $email_opt[0] . ' show=' . $email_opt[1] . ']';
-                }
-                unset( $email_opt );
-            }
-        }
-        $atts['email_to'] = implode(', ', $atts['email_to']);
-    }
-
-    private static function setup_new_notification( &$new_notification, $notification, $atts ) {
-        // Set up new notification
-        $new_notification = array(
-            'post_content'  => array(
-                'email_to'      => $atts['email_to'],
-                'event'         => $atts['event'],
-            ),
+				}
+				unset( $email_opt );
+			}
+		}
+		$atts['email_to'] = implode(', ', $atts['email_to']);
+	}
+
+	private static function setup_new_notification( &$new_notification, $notification, $atts ) {
+		// Set up new notification
+		$new_notification = array(
+			'post_content'  => array(
+				'email_to'      => $atts['email_to'],
+				'event'         => $atts['event'],
+			),
 			'post_name'         => $atts['form_id'] . '_email_' . $atts['email_key'],
-        );
+		);
 
-        // Add more fields to the new notification
-        $add_fields = array( 'email_message', 'email_subject', 'plain_text', 'inc_user_info', 'conditions' );
-        foreach ( $add_fields as $add_field ) {
+		// Add more fields to the new notification
+		$add_fields = array( 'email_message', 'email_subject', 'plain_text', 'inc_user_info', 'conditions' );
+		foreach ( $add_fields as $add_field ) {
 			if ( isset( $notification[ $add_field ] ) ) {
 				$new_notification['post_content'][ $add_field ] = $notification[ $add_field ];
-            } else if ( in_array( $add_field, array( 'plain_text', 'inc_user_info' ) ) ) {
+			} else if ( in_array( $add_field, array( 'plain_text', 'inc_user_info' ) ) ) {
 				$new_notification['post_content'][ $add_field ] = 0;
-            } else {
+			} else {
 				$new_notification['post_content'][ $add_field ] = '';
-            }
-            unset( $add_field );
-        }
+			}
+			unset( $add_field );
+		}
 
 		// Set reply to
 		$new_notification['post_content']['reply_to'] = $atts['reply_to'];
 
-        // Set from
+		// Set from
 		if ( ! empty( $atts['reply_to'] ) || ! empty( $atts['reply_to_name'] ) ) {
 			$new_notification['post_content']['from'] = ( empty( $atts['reply_to_name'] ) ? '[sitename]' : $atts['reply_to_name'] ) . ' <' . ( empty( $atts['reply_to'] ) ? '[admin_email]' : $atts['reply_to'] ) . '>';
-        }
-    }
+		}
+	}
 
 	/**
-	* Switch field IDs in pre-2.0 email conditional logic
-	*
-	* @param $post_content array, pass by reference
-	*/
+	 * Switch field IDs in pre-2.0 email conditional logic
+	 *
+	 * @param $post_content array, pass by reference
+	 */
 	private static function switch_email_contition_field_ids( &$post_content ) {
 		// Switch field IDs in conditional logic
 		if ( isset( $post_content['conditions'] ) && is_array( $post_content['conditions'] ) ) {
@@ -1167,36 +1167,36 @@ 
 		}
 	}
 
-    private static function migrate_autoresponder_to_action( $form_options, $form_id, &$notifications ) {
-        if ( isset($form_options['auto_responder']) && $form_options['auto_responder'] && isset($form_options['ar_email_message']) && $form_options['ar_email_message'] ) {
-            // migrate autoresponder
-
-            $email_field = isset($form_options['ar_email_to']) ? $form_options['ar_email_to'] : 0;
-            if ( strpos($email_field, '|') ) {
-                // data from entries field
-                $email_field = explode('|', $email_field);
-                if ( isset($email_field[1]) ) {
-                    $email_field = $email_field[1];
-                }
-            }
-            if ( is_numeric($email_field) && ! empty($email_field) ) {
+	private static function migrate_autoresponder_to_action( $form_options, $form_id, &$notifications ) {
+		if ( isset($form_options['auto_responder']) && $form_options['auto_responder'] && isset($form_options['ar_email_message']) && $form_options['ar_email_message'] ) {
+			// migrate autoresponder
+
+			$email_field = isset($form_options['ar_email_to']) ? $form_options['ar_email_to'] : 0;
+			if ( strpos($email_field, '|') ) {
+				// data from entries field
+				$email_field = explode('|', $email_field);
+				if ( isset($email_field[1]) ) {
+					$email_field = $email_field[1];
+				}
+			}
+			if ( is_numeric($email_field) && ! empty($email_field) ) {
 				$email_field = '[' . $email_field . ']';
-            }
-
-            $notification = $form_options;
-            $new_notification2 = array(
-                'post_content'  => array(
-                    'email_message' => $notification['ar_email_message'],
-                    'email_subject' => isset($notification['ar_email_subject']) ? $notification['ar_email_subject'] : '',
-                    'email_to'      => $email_field,
-                    'plain_text'    => isset($notification['ar_plain_text']) ? $notification['ar_plain_text'] : 0,
-                    'inc_user_info' => 0,
-                ),
+			}
+
+			$notification = $form_options;
+			$new_notification2 = array(
+				'post_content'  => array(
+					'email_message' => $notification['ar_email_message'],
+					'email_subject' => isset($notification['ar_email_subject']) ? $notification['ar_email_subject'] : '',
+					'email_to'      => $email_field,
+					'plain_text'    => isset($notification['ar_plain_text']) ? $notification['ar_plain_text'] : 0,
+					'inc_user_info' => 0,
+				),
 				'post_name'     => $form_id . '_email_' . count( $notifications ),
-            );
+			);
 
-            $reply_to = isset($notification['ar_reply_to']) ? $notification['ar_reply_to'] : '';
-            $reply_to_name = isset($notification['ar_reply_to_name']) ? $notification['ar_reply_to_name'] : '';
+			$reply_to = isset($notification['ar_reply_to']) ? $notification['ar_reply_to'] : '';
+			$reply_to_name = isset($notification['ar_reply_to_name']) ? $notification['ar_reply_to_name'] : '';
 
 			if ( ! empty( $reply_to ) ) {
 				$new_notification2['post_content']['reply_to'] = $reply_to;
@@ -1206,9 +1206,9 @@ 
 				$new_notification2['post_content']['from'] = ( empty( $reply_to_name ) ? '[sitename]' : $reply_to_name ) . ' <' . ( empty( $reply_to ) ? '[admin_email]' : $reply_to ) . '>';
 			}
 
-            $notifications[] = $new_notification2;
-            unset( $new_notification2 );
-        }
-    }
+			$notifications[] = $new_notification2;
+			unset( $new_notification2 );
+		}
+	}
 }
 

classes/helpers/FrmEntriesHelper.php

Indentation +297 added lines, -297 removed lines

@@ -5,69 +5,69 @@ 
 
 class FrmEntriesHelper {
 
-    public static function setup_new_vars( $fields, $form = '', $reset = false, $args = array() ) {
-        $values = array();
+	public static function setup_new_vars( $fields, $form = '', $reset = false, $args = array() ) {
+		$values = array();
 		foreach ( array( 'name' => '', 'description' => '', 'item_key' => '' ) as $var => $default ) {
 			$values[ $var ] = FrmAppHelper::get_post_param( $var, $default, 'wp_kses_post' );
-        }
-
-        $values['fields'] = array();
-        if ( empty($fields) ) {
-            return apply_filters('frm_setup_new_entry', $values);
-        }
-
-        foreach ( (array) $fields as $field ) {
-            $new_value = self::get_field_value_for_new_entry( $field, $reset, $args );
-
-            $field_array = array(
-                'id' => $field->id,
-                'value' => $new_value,
-                'default_value' => $field->default_value,
-                'name' => $field->name,
-                'description' => $field->description,
-                'type' => apply_filters('frm_field_type', $field->type, $field, $new_value),
-                'options' => $field->options,
-                'required' => $field->required,
-                'field_key' => $field->field_key,
-                'field_order' => $field->field_order,
-                'form_id' => $field->form_id,
+		}
+
+		$values['fields'] = array();
+		if ( empty($fields) ) {
+			return apply_filters('frm_setup_new_entry', $values);
+		}
+
+		foreach ( (array) $fields as $field ) {
+			$new_value = self::get_field_value_for_new_entry( $field, $reset, $args );
+
+			$field_array = array(
+				'id' => $field->id,
+				'value' => $new_value,
+				'default_value' => $field->default_value,
+				'name' => $field->name,
+				'description' => $field->description,
+				'type' => apply_filters('frm_field_type', $field->type, $field, $new_value),
+				'options' => $field->options,
+				'required' => $field->required,
+				'field_key' => $field->field_key,
+				'field_order' => $field->field_order,
+				'form_id' => $field->form_id,
 				'parent_form_id' => isset( $args['parent_form_id'] ) ? $args['parent_form_id'] : $field->form_id,
-	            'reset_value' => $reset,
+				'reset_value' => $reset,
 				'in_embed_form' => isset( $args['in_embed_form'] ) ? $args['in_embed_form'] : '0',
-            );
+			);
 
-            $opt_defaults = FrmFieldsHelper::get_default_field_opts($field_array['type'], $field, true);
-            $opt_defaults['required_indicator'] = '';
+			$opt_defaults = FrmFieldsHelper::get_default_field_opts($field_array['type'], $field, true);
+			$opt_defaults['required_indicator'] = '';
 			$opt_defaults['original_type'] = $field->type;
 
 			foreach ( $opt_defaults as $opt => $default_opt ) {
-                $field_array[ $opt ] = ( isset( $field->field_options[ $opt ] ) && $field->field_options[ $opt ] != '' ) ? $field->field_options[ $opt ] : $default_opt;
-                unset($opt, $default_opt);
-            }
+				$field_array[ $opt ] = ( isset( $field->field_options[ $opt ] ) && $field->field_options[ $opt ] != '' ) ? $field->field_options[ $opt ] : $default_opt;
+				unset($opt, $default_opt);
+			}
 
-            unset($opt_defaults);
+			unset($opt_defaults);
 
-            if ( $field_array['custom_html'] == '' ) {
-                $field_array['custom_html'] = FrmFieldsHelper::get_default_html($field->type);
-            }
+			if ( $field_array['custom_html'] == '' ) {
+				$field_array['custom_html'] = FrmFieldsHelper::get_default_html($field->type);
+			}
 
-            $field_array = apply_filters('frm_setup_new_fields_vars', $field_array, $field, $args );
-            $field_array = array_merge( $field->field_options, $field_array );
+			$field_array = apply_filters('frm_setup_new_fields_vars', $field_array, $field, $args );
+			$field_array = array_merge( $field->field_options, $field_array );
 
-            $values['fields'][] = $field_array;
+			$values['fields'][] = $field_array;
 
-            if ( ! $form || ! isset($form->id) ) {
-                $form = FrmForm::getOne($field->form_id);
-            }
-        }
+			if ( ! $form || ! isset($form->id) ) {
+				$form = FrmForm::getOne($field->form_id);
+			}
+		}
 
-        $form->options = maybe_unserialize($form->options);
-        if ( is_array($form->options) ) {
-            foreach ( $form->options as $opt => $value ) {
-                $values[ $opt ] = FrmAppHelper::get_post_param( $opt, $value );
-                unset($opt, $value);
-            }
-        }
+		$form->options = maybe_unserialize($form->options);
+		if ( is_array($form->options) ) {
+			foreach ( $form->options as $opt => $value ) {
+				$values[ $opt ] = FrmAppHelper::get_post_param( $opt, $value );
+				unset($opt, $value);
+			}
+		}
 
 		$form_defaults = FrmFormsHelper::get_default_opts();
 
@@ -77,19 +77,19 @@ 
 		$values = array_merge( $form_defaults, $values );
 
 		return apply_filters( 'frm_setup_new_entry', $values );
-    }
+	}
 
 	/**
-	* Set the value for each field
-	* This function is used when the form is first loaded and on all page turns *for a new entry*
-	*
-	* @since 2.0.13
-	*
-	* @param object $field - this is passed by reference since it is an object
-	* @param boolean $reset
-	* @param array $args
-	* @return string|array $new_value
-	*/
+	 * Set the value for each field
+	 * This function is used when the form is first loaded and on all page turns *for a new entry*
+	 *
+	 * @since 2.0.13
+	 *
+	 * @param object $field - this is passed by reference since it is an object
+	 * @param boolean $reset
+	 * @param array $args
+	 * @return string|array $new_value
+	 */
 	private static function get_field_value_for_new_entry( $field, $reset, $args ) {
 		//If checkbox, multi-select dropdown, or checkbox data from entries field, the value should be an array
 		$return_array = FrmField::is_field_with_multiple_values( $field );
@@ -115,13 +115,13 @@ 
 	}
 
 	/**
-	* Check if a field has a posted value
-	*
-	* @since 2.01.0
-	* @param object $field
-	* @param array $args
-	* @return boolean $value_is_posted
-	*/
+	 * Check if a field has a posted value
+	 *
+	 * @since 2.01.0
+	 * @param object $field
+	 * @param array $args
+	 * @return boolean $value_is_posted
+	 */
 	public static function value_is_posted( $field, $args ) {
 		$value_is_posted = false;
 		if ( $_POST ) {
@@ -139,15 +139,15 @@ 
 
 	public static function setup_edit_vars( $values, $record ) {
 		$values['item_key'] = FrmAppHelper::get_post_param( 'item_key', $record->item_key, 'sanitize_title' );
-        $values['form_id'] = $record->form_id;
-        $values['is_draft'] = $record->is_draft;
-        return apply_filters('frm_setup_edit_entry_vars', $values, $record);
-    }
+		$values['form_id'] = $record->form_id;
+		$values['is_draft'] = $record->is_draft;
+		return apply_filters('frm_setup_edit_entry_vars', $values, $record);
+	}
 
-    public static function get_admin_params( $form = null ) {
+	public static function get_admin_params( $form = null ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmForm::get_admin_params' );
 		return FrmForm::set_current_form( $form );
-    }
+	}
 
 	public static function set_current_form( $form_id ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmForm::set_current_form' );
@@ -159,284 +159,284 @@ 
 		return FrmForm::get_current_form( $form_id );
 	}
 
-    public static function get_current_form_id() {
+	public static function get_current_form_id() {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmForm::get_current_form_id' );
 		return FrmForm::get_current_form_id();
-    }
+	}
 
-    public static function maybe_get_entry( &$entry ) {
+	public static function maybe_get_entry( &$entry ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmEntry::maybe_get_entry' );
 		FrmEntry::maybe_get_entry( $entry );
-    }
+	}
 
 	public static function replace_default_message( $message, $atts ) {
-        if ( strpos($message, '[default-message') === false &&
-            strpos($message, '[default_message') === false &&
-            ! empty( $message ) ) {
-            return $message;
-        }
-
-        if ( empty($message) ) {
-            $message = '[default-message]';
-        }
-
-        preg_match_all("/\[(default-message|default_message)\b(.*?)(?:(\/))?\]/s", $message, $shortcodes, PREG_PATTERN_ORDER);
-
-        foreach ( $shortcodes[0] as $short_key => $tag ) {
-            $add_atts = shortcode_parse_atts( $shortcodes[2][ $short_key ] );
-            if ( $add_atts ) {
-                $this_atts = array_merge($atts, $add_atts);
-            } else {
-                $this_atts = $atts;
-            }
+		if ( strpos($message, '[default-message') === false &&
+			strpos($message, '[default_message') === false &&
+			! empty( $message ) ) {
+			return $message;
+		}
+
+		if ( empty($message) ) {
+			$message = '[default-message]';
+		}
+
+		preg_match_all("/\[(default-message|default_message)\b(.*?)(?:(\/))?\]/s", $message, $shortcodes, PREG_PATTERN_ORDER);
+
+		foreach ( $shortcodes[0] as $short_key => $tag ) {
+			$add_atts = shortcode_parse_atts( $shortcodes[2][ $short_key ] );
+			if ( $add_atts ) {
+				$this_atts = array_merge($atts, $add_atts);
+			} else {
+				$this_atts = $atts;
+			}
 
 			$default = FrmEntryFormat::show_entry( $this_atts );
 
-            // Add the default message
-            $message = str_replace( $shortcodes[0][ $short_key ], $default, $message );
-        }
+			// Add the default message
+			$message = str_replace( $shortcodes[0][ $short_key ], $default, $message );
+		}
 
-        return $message;
-    }
+		return $message;
+	}
 
 	public static function prepare_display_value( $entry, $field, $atts ) {
 		$field_value = isset( $entry->metas[ $field->id ] ) ? $entry->metas[ $field->id ] : false;
 
-        if ( FrmAppHelper::pro_is_installed() ) {
+		if ( FrmAppHelper::pro_is_installed() ) {
 			FrmProEntriesHelper::get_dynamic_list_values( $field, $entry, $field_value );
-        }
+		}
 
-        if ( $field->form_id == $entry->form_id || empty($atts['embedded_field_id']) ) {
-            return self::display_value($field_value, $field, $atts);
-        }
+		if ( $field->form_id == $entry->form_id || empty($atts['embedded_field_id']) ) {
+			return self::display_value($field_value, $field, $atts);
+		}
 
-        // this is an embeded form
-        $val = '';
+		// this is an embeded form
+		$val = '';
 
-	    if ( strpos($atts['embedded_field_id'], 'form') === 0 ) {
-            //this is a repeating section
+		if ( strpos($atts['embedded_field_id'], 'form') === 0 ) {
+			//this is a repeating section
 			$child_entries = FrmEntry::getAll( array( 'it.parent_item_id' => $entry->id ) );
-        } else {
-            // get all values for this field
-	        $child_values = isset( $entry->metas[ $atts['embedded_field_id'] ] ) ? $entry->metas[ $atts['embedded_field_id'] ] : false;
+		} else {
+			// get all values for this field
+			$child_values = isset( $entry->metas[ $atts['embedded_field_id'] ] ) ? $entry->metas[ $atts['embedded_field_id'] ] : false;
 
-            if ( $child_values ) {
-	            $child_entries = FrmEntry::getAll( array( 'it.id' => (array) $child_values ) );
-	        }
-	    }
+			if ( $child_values ) {
+				$child_entries = FrmEntry::getAll( array( 'it.id' => (array) $child_values ) );
+			}
+		}
 
-	    $field_value = array();
+		$field_value = array();
 
-        if ( ! isset($child_entries) || ! $child_entries || ! FrmAppHelper::pro_is_installed() ) {
-            return $val;
-        }
+		if ( ! isset($child_entries) || ! $child_entries || ! FrmAppHelper::pro_is_installed() ) {
+			return $val;
+		}
 
-        foreach ( $child_entries as $child_entry ) {
-            $atts['item_id'] = $child_entry->id;
-            $atts['post_id'] = $child_entry->post_id;
+		foreach ( $child_entries as $child_entry ) {
+			$atts['item_id'] = $child_entry->id;
+			$atts['post_id'] = $child_entry->post_id;
 
-            // get the value for this field -- check for post values as well
-            $entry_val = FrmProEntryMetaHelper::get_post_or_meta_value($child_entry, $field);
+			// get the value for this field -- check for post values as well
+			$entry_val = FrmProEntryMetaHelper::get_post_or_meta_value($child_entry, $field);
 
-            if ( $entry_val ) {
-                // foreach entry get display_value
-                $field_value[] = self::display_value($entry_val, $field, $atts);
-            }
+			if ( $entry_val ) {
+				// foreach entry get display_value
+				$field_value[] = self::display_value($entry_val, $field, $atts);
+			}
 
-            unset($child_entry);
-        }
+			unset($child_entry);
+		}
 
-        $val = implode(', ', (array) $field_value );
+		$val = implode(', ', (array) $field_value );
 		$val = wp_kses_post( $val );
 
-        return $val;
-    }
+		return $val;
+	}
 
-    /**
-     * Prepare the saved value for display
-     * @return string
-     */
+	/**
+	 * Prepare the saved value for display
+	 * @return string
+	 */
 	public static function display_value( $value, $field, $atts = array() ) {
 
-        $defaults = array(
-            'type' => '', 'html' => false, 'show_filename' => true,
-            'truncate' => false, 'sep' => ', ', 'post_id' => 0,
-            'form_id' => $field->form_id, 'field' => $field, 'keepjs' => 0,
+		$defaults = array(
+			'type' => '', 'html' => false, 'show_filename' => true,
+			'truncate' => false, 'sep' => ', ', 'post_id' => 0,
+			'form_id' => $field->form_id, 'field' => $field, 'keepjs' => 0,
 			'return_array' => false,
-        );
+		);
 
-        $atts = wp_parse_args( $atts, $defaults );
-        $atts = apply_filters('frm_display_value_atts', $atts, $field, $value);
+		$atts = wp_parse_args( $atts, $defaults );
+		$atts = apply_filters('frm_display_value_atts', $atts, $field, $value);
 
-        if ( ! isset($field->field_options['post_field']) ) {
-            $field->field_options['post_field'] = '';
-        }
+		if ( ! isset($field->field_options['post_field']) ) {
+			$field->field_options['post_field'] = '';
+		}
 
-        if ( ! isset($field->field_options['custom_field']) ) {
-            $field->field_options['custom_field'] = '';
-        }
+		if ( ! isset($field->field_options['custom_field']) ) {
+			$field->field_options['custom_field'] = '';
+		}
 
-        if ( FrmAppHelper::pro_is_installed() && $atts['post_id'] && ( $field->field_options['post_field'] || $atts['type'] == 'tag' ) ) {
-            $atts['pre_truncate'] = $atts['truncate'];
-            $atts['truncate'] = true;
-            $atts['exclude_cat'] = isset($field->field_options['exclude_cat']) ? $field->field_options['exclude_cat'] : 0;
+		if ( FrmAppHelper::pro_is_installed() && $atts['post_id'] && ( $field->field_options['post_field'] || $atts['type'] == 'tag' ) ) {
+			$atts['pre_truncate'] = $atts['truncate'];
+			$atts['truncate'] = true;
+			$atts['exclude_cat'] = isset($field->field_options['exclude_cat']) ? $field->field_options['exclude_cat'] : 0;
 
-            $value = FrmProEntryMetaHelper::get_post_value($atts['post_id'], $field->field_options['post_field'], $field->field_options['custom_field'], $atts);
-            $atts['truncate'] = $atts['pre_truncate'];
-        }
+			$value = FrmProEntryMetaHelper::get_post_value($atts['post_id'], $field->field_options['post_field'], $field->field_options['custom_field'], $atts);
+			$atts['truncate'] = $atts['pre_truncate'];
+		}
 
-        if ( $value == '' ) {
-            return $value;
-        }
+		if ( $value == '' ) {
+			return $value;
+		}
 
-        $value = apply_filters('frm_display_value_custom', maybe_unserialize($value), $field, $atts);
+		$value = apply_filters('frm_display_value_custom', maybe_unserialize($value), $field, $atts);
 		$value = apply_filters( 'frm_display_' . $field->type . '_value_custom', $value, compact( 'field', 'atts' ) );
 
-        $new_value = '';
+		$new_value = '';
 
-        if ( is_array($value) && $atts['type'] != 'file' ) {
-            foreach ( $value as $val ) {
-                if ( is_array($val) ) {
+		if ( is_array($value) && $atts['type'] != 'file' ) {
+			foreach ( $value as $val ) {
+				if ( is_array($val) ) {
 					//TODO: add options for display (li or ,)
-                    $new_value .= implode($atts['sep'], $val);
-                    if ( $atts['type'] != 'data' ) {
-                        $new_value .= '<br/>';
-                    }
-                }
-                unset($val);
-            }
-        }
-
-        if ( ! empty($new_value) ) {
-            $value = $new_value;
-        } else if ( is_array($value) && $atts['type'] != 'file' && ! $atts['return_array'] ) {
-            $value = implode($atts['sep'], $value);
-        }
-
-        if ( $atts['truncate'] && $atts['type'] != 'image' ) {
-            $value = FrmAppHelper::truncate($value, 50);
-        }
+					$new_value .= implode($atts['sep'], $val);
+					if ( $atts['type'] != 'data' ) {
+						$new_value .= '<br/>';
+					}
+				}
+				unset($val);
+			}
+		}
+
+		if ( ! empty($new_value) ) {
+			$value = $new_value;
+		} else if ( is_array($value) && $atts['type'] != 'file' && ! $atts['return_array'] ) {
+			$value = implode($atts['sep'], $value);
+		}
+
+		if ( $atts['truncate'] && $atts['type'] != 'image' ) {
+			$value = FrmAppHelper::truncate($value, 50);
+		}
 
 		if ( ! $atts['keepjs'] && ! is_array( $value ) ) {
 			$value = wp_kses_post( $value );
 		}
 
-        return apply_filters('frm_display_value', $value, $field, $atts);
-    }
+		return apply_filters('frm_display_value', $value, $field, $atts);
+	}
 
 	public static function set_posted_value( $field, $value, $args ) {
-        // If validating a field with "other" opt, set back to prev value now
-        if ( isset( $args['other'] ) && $args['other'] ) {
-            $value = $args['temp_value'];
-        }
-        if ( empty($args['parent_field_id']) ) {
-            $_POST['item_meta'][ $field->id ] = $value;
-        } else {
-            $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field->id ] = $value;
-        }
-    }
+		// If validating a field with "other" opt, set back to prev value now
+		if ( isset( $args['other'] ) && $args['other'] ) {
+			$value = $args['temp_value'];
+		}
+		if ( empty($args['parent_field_id']) ) {
+			$_POST['item_meta'][ $field->id ] = $value;
+		} else {
+			$_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field->id ] = $value;
+		}
+	}
 
 	public static function get_posted_value( $field, &$value, $args ) {
 		$field_id = is_object( $field ) ? $field->id : $field;
 
-        if ( empty($args['parent_field_id']) ) {
-            $value = isset( $_POST['item_meta'][ $field_id ] ) ? $_POST['item_meta'][ $field_id ] : '';
-        } else {
-            $value = isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] ) ? $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] : '';
-        }
+		if ( empty($args['parent_field_id']) ) {
+			$value = isset( $_POST['item_meta'][ $field_id ] ) ? $_POST['item_meta'][ $field_id ] : '';
+		} else {
+			$value = isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] ) ? $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] : '';
+		}
 		FrmAppHelper::sanitize_value( 'wp_kses_post', $value );
 		$value = stripslashes_deep( $value );
-    }
-
-    /**
-    * Check if field has an "Other" option and if any other values are posted
-    *
-    * @since 2.0
-    *
-    * @param object $field
-    * @param string|array $value
-    * @param array $args
-    */
-    public static function maybe_set_other_validation( $field, &$value, &$args ) {
-        $args['other'] = false;
-        if ( ! $value || empty( $value ) || ! FrmAppHelper::pro_is_installed() ) {
-            return;
-        }
-
-        // Get other value for fields in repeating section
-        self::set_other_repeating_vals( $field, $value, $args );
-
-        // Check if there are any posted "Other" values
+	}
+
+	/**
+	 * Check if field has an "Other" option and if any other values are posted
+	 *
+	 * @since 2.0
+	 *
+	 * @param object $field
+	 * @param string|array $value
+	 * @param array $args
+	 */
+	public static function maybe_set_other_validation( $field, &$value, &$args ) {
+		$args['other'] = false;
+		if ( ! $value || empty( $value ) || ! FrmAppHelper::pro_is_installed() ) {
+			return;
+		}
+
+		// Get other value for fields in repeating section
+		self::set_other_repeating_vals( $field, $value, $args );
+
+		// Check if there are any posted "Other" values
 		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta']['other'][ $field->id ] ) ) {
 
-            // Save original value
-            $args['temp_value'] = $value;
-            $args['other'] = true;
-            $other_vals = stripslashes_deep( $_POST['item_meta']['other'][ $field->id ] );
-
-            // Set the validation value now
-            self::set_other_validation_val( $value, $other_vals, $field, $args );
-        }
-    }
-
-    /**
-    * Sets radio or checkbox value equal to "other" value if it is set - FOR REPEATING SECTIONS
-    *
-    * @since 2.0
-    *
-    * @param object $field
-    * @param string|array $value
-    * @param array $args
-    */
-    public static function set_other_repeating_vals( $field, &$value, &$args ) {
-        if ( ! $args['parent_field_id'] ) {
-            return;
-        }
-
-        // Check if there are any other posted "other" values for this field
+			// Save original value
+			$args['temp_value'] = $value;
+			$args['other'] = true;
+			$other_vals = stripslashes_deep( $_POST['item_meta']['other'][ $field->id ] );
+
+			// Set the validation value now
+			self::set_other_validation_val( $value, $other_vals, $field, $args );
+		}
+	}
+
+	/**
+	 * Sets radio or checkbox value equal to "other" value if it is set - FOR REPEATING SECTIONS
+	 *
+	 * @since 2.0
+	 *
+	 * @param object $field
+	 * @param string|array $value
+	 * @param array $args
+	 */
+	public static function set_other_repeating_vals( $field, &$value, &$args ) {
+		if ( ! $args['parent_field_id'] ) {
+			return;
+		}
+
+		// Check if there are any other posted "other" values for this field
 		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ]['other'][ $field->id ] ) ) {
-            // Save original value
-            $args['temp_value'] = $value;
-            $args['other'] = true;
-
-            $other_vals = $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ]['other'][ $field->id ];
-
-            // Set the validation value now
-            self::set_other_validation_val( $value, $other_vals, $field, $args );
-        }
-    }
-
-    /**
-    * Modify value used for validation
-    * This function essentially removes the "Other" radio or checkbox value from the $value being validated.
-    * It also adds any text from the free text fields to the value
-    *
-    * Needs to accommodate for times when other opt is selected, but no other free text is entered
-    *
-    * @since 2.0
-    *
-    * @param string|array $value
-    * @param string|array $other_vals (usually of posted values)
-    * @param object $field
-    * @param array $args
-    */
-    public static function set_other_validation_val( &$value, $other_vals, $field, &$args ) {
-        // Checkboxes and multi-select dropdowns
-        if ( is_array( $value ) && $field->type == 'checkbox' ) {
-            // Combine "Other" values with checked values. "Other" values will override checked box values.
-            $value = array_merge( $value, $other_vals );
-            $value = array_filter( $value );
-            if ( count( $value ) == 0 ) {
-                $value = '';
-            }
-        } else {
+			// Save original value
+			$args['temp_value'] = $value;
+			$args['other'] = true;
+
+			$other_vals = $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ]['other'][ $field->id ];
+
+			// Set the validation value now
+			self::set_other_validation_val( $value, $other_vals, $field, $args );
+		}
+	}
+
+	/**
+	 * Modify value used for validation
+	 * This function essentially removes the "Other" radio or checkbox value from the $value being validated.
+	 * It also adds any text from the free text fields to the value
+	 *
+	 * Needs to accommodate for times when other opt is selected, but no other free text is entered
+	 *
+	 * @since 2.0
+	 *
+	 * @param string|array $value
+	 * @param string|array $other_vals (usually of posted values)
+	 * @param object $field
+	 * @param array $args
+	 */
+	public static function set_other_validation_val( &$value, $other_vals, $field, &$args ) {
+		// Checkboxes and multi-select dropdowns
+		if ( is_array( $value ) && $field->type == 'checkbox' ) {
+			// Combine "Other" values with checked values. "Other" values will override checked box values.
+			$value = array_merge( $value, $other_vals );
+			$value = array_filter( $value );
+			if ( count( $value ) == 0 ) {
+				$value = '';
+			}
+		} else {
 			// Radio and dropdowns
-            $other_key = array_filter( array_keys($field->options), 'is_string');
-            $other_key = reset( $other_key );
+			$other_key = array_filter( array_keys($field->options), 'is_string');
+			$other_key = reset( $other_key );
 
-            // Multi-select dropdown
-            if ( is_array( $value ) ) {
-                $o_key = array_search( $field->options[ $other_key ], $value );
+			// Multi-select dropdown
+			if ( is_array( $value ) ) {
+				$o_key = array_search( $field->options[ $other_key ], $value );
 
 				if ( $o_key !== false ) {
 					// Modify the original value so other key will be preserved
@@ -451,20 +451,20 @@ 
 					$args['temp_value'] = $value;
 					$value[ $other_key ] = reset( $other_vals );
 				}
-            } else if ( $field->options[ $other_key ] == $value ) {
-                $value = $other_vals;
-            }
-        }
-    }
+			} else if ( $field->options[ $other_key ] == $value ) {
+				$value = $other_vals;
+			}
+		}
+	}
 
 	public static function enqueue_scripts( $params ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmFormsController::enqueue_scripts' );
 		FrmFormsController::enqueue_scripts( $params );
 	}
 
-    // Add submitted values to a string for spam checking
+	// Add submitted values to a string for spam checking
 	public static function entry_array_to_string( $values ) {
-        $content = '';
+		$content = '';
 		foreach ( $values['item_meta'] as $val ) {
 			if ( $content != '' ) {
 				$content .= "\n\n";
@@ -472,14 +472,14 @@ 
 
 			if ( is_array($val) ) {
 				$val = FrmAppHelper::array_flatten( $val );
-			    $val = implode(',', $val);
+				$val = implode(',', $val);
 			}
 
 			$content .= $val;
 		}
 
 		return $content;
-    }
+	}
 
 	public static function fill_entry_values( $atts, $f, array &$values ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmEntryFormat::fill_entry_values' );

Spacing +73 added lines, -73 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -8,12 +8,12 @@ 
     public static function setup_new_vars( $fields, $form = '', $reset = false, $args = array() ) {
         $values = array();
 		foreach ( array( 'name' => '', 'description' => '', 'item_key' => '' ) as $var => $default ) {
-			$values[ $var ] = FrmAppHelper::get_post_param( $var, $default, 'wp_kses_post' );
+			$values[$var] = FrmAppHelper::get_post_param( $var, $default, 'wp_kses_post' );
         }
 
         $values['fields'] = array();
-        if ( empty($fields) ) {
-            return apply_filters('frm_setup_new_entry', $values);
+        if ( empty( $fields ) ) {
+            return apply_filters( 'frm_setup_new_entry', $values );
         }
 
         foreach ( (array) $fields as $field ) {
@@ -25,7 +25,7 @@ 
                 'default_value' => $field->default_value,
                 'name' => $field->name,
                 'description' => $field->description,
-                'type' => apply_filters('frm_field_type', $field->type, $field, $new_value),
+                'type' => apply_filters( 'frm_field_type', $field->type, $field, $new_value ),
                 'options' => $field->options,
                 'required' => $field->required,
                 'field_key' => $field->field_key,
@@ -36,43 +36,43 @@ 
 				'in_embed_form' => isset( $args['in_embed_form'] ) ? $args['in_embed_form'] : '0',
             );
 
-            $opt_defaults = FrmFieldsHelper::get_default_field_opts($field_array['type'], $field, true);
+            $opt_defaults = FrmFieldsHelper::get_default_field_opts( $field_array['type'], $field, true );
             $opt_defaults['required_indicator'] = '';
 			$opt_defaults['original_type'] = $field->type;
 
 			foreach ( $opt_defaults as $opt => $default_opt ) {
-                $field_array[ $opt ] = ( isset( $field->field_options[ $opt ] ) && $field->field_options[ $opt ] != '' ) ? $field->field_options[ $opt ] : $default_opt;
-                unset($opt, $default_opt);
+                $field_array[$opt] = ( isset( $field->field_options[$opt] ) && $field->field_options[$opt] != '' ) ? $field->field_options[$opt] : $default_opt;
+                unset( $opt, $default_opt );
             }
 
-            unset($opt_defaults);
+            unset( $opt_defaults );
 
             if ( $field_array['custom_html'] == '' ) {
-                $field_array['custom_html'] = FrmFieldsHelper::get_default_html($field->type);
+                $field_array['custom_html'] = FrmFieldsHelper::get_default_html( $field->type );
             }
 
-            $field_array = apply_filters('frm_setup_new_fields_vars', $field_array, $field, $args );
+            $field_array = apply_filters( 'frm_setup_new_fields_vars', $field_array, $field, $args );
             $field_array = array_merge( $field->field_options, $field_array );
 
             $values['fields'][] = $field_array;
 
-            if ( ! $form || ! isset($form->id) ) {
-                $form = FrmForm::getOne($field->form_id);
+            if ( ! $form || ! isset( $form->id ) ) {
+                $form = FrmForm::getOne( $field->form_id );
             }
         }
 
-        $form->options = maybe_unserialize($form->options);
-        if ( is_array($form->options) ) {
+        $form->options = maybe_unserialize( $form->options );
+        if ( is_array( $form->options ) ) {
             foreach ( $form->options as $opt => $value ) {
-                $values[ $opt ] = FrmAppHelper::get_post_param( $opt, $value );
-                unset($opt, $value);
+                $values[$opt] = FrmAppHelper::get_post_param( $opt, $value );
+                unset( $opt, $value );
             }
         }
 
 		$form_defaults = FrmFormsHelper::get_default_opts();
 
 		$frm_settings = FrmAppHelper::get_settings();
-		$form_defaults['custom_style']  = ( $frm_settings->load_style != 'none' );
+		$form_defaults['custom_style'] = ( $frm_settings->load_style != 'none' );
 
 		$values = array_merge( $form_defaults, $values );
 
@@ -95,7 +95,7 @@ 
 		$return_array = FrmField::is_field_with_multiple_values( $field );
 
 		// Do any shortcodes in default value and allow customization of default value
-		$field->default_value = apply_filters('frm_get_default_value', $field->default_value, $field, true, $return_array);
+		$field->default_value = apply_filters( 'frm_get_default_value', $field->default_value, $field, true, $return_array );
 		// Calls FrmProFieldsHelper::get_default_value
 
 		$new_value = $field->default_value;
@@ -108,7 +108,7 @@ 
 		}
 
 		if ( ! is_array( $new_value ) ) {
-			$new_value = str_replace('"', '&quot;', $new_value);
+			$new_value = str_replace( '"', '&quot;', $new_value );
 		}
 
 		return $new_value;
@@ -127,10 +127,10 @@ 
 		if ( $_POST ) {
 			$repeating = isset( $args['repeating'] ) && $args['repeating'];
 			if ( $repeating ) {
-				if ( isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field->id ] ) ) {
+				if ( isset( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field->id] ) ) {
 					$value_is_posted = true;
 				}
-			} else if ( isset( $_POST['item_meta'][ $field->id ] ) ) {
+			} else if ( isset( $_POST['item_meta'][$field->id] ) ) {
 				$value_is_posted = true;
 			}
 		}
@@ -141,7 +141,7 @@ 
 		$values['item_key'] = FrmAppHelper::get_post_param( 'item_key', $record->item_key, 'sanitize_title' );
         $values['form_id'] = $record->form_id;
         $values['is_draft'] = $record->is_draft;
-        return apply_filters('frm_setup_edit_entry_vars', $values, $record);
+        return apply_filters( 'frm_setup_edit_entry_vars', $values, $record );
     }
 
     public static function get_admin_params( $form = null ) {
@@ -170,22 +170,22 @@ 
     }
 
 	public static function replace_default_message( $message, $atts ) {
-        if ( strpos($message, '[default-message') === false &&
-            strpos($message, '[default_message') === false &&
+        if ( strpos( $message, '[default-message' ) === false &&
+            strpos( $message, '[default_message' ) === false &&
             ! empty( $message ) ) {
             return $message;
         }
 
-        if ( empty($message) ) {
+        if ( empty( $message ) ) {
             $message = '[default-message]';
         }
 
-        preg_match_all("/\[(default-message|default_message)\b(.*?)(?:(\/))?\]/s", $message, $shortcodes, PREG_PATTERN_ORDER);
+        preg_match_all( "/\[(default-message|default_message)\b(.*?)(?:(\/))?\]/s", $message, $shortcodes, PREG_PATTERN_ORDER );
 
         foreach ( $shortcodes[0] as $short_key => $tag ) {
-            $add_atts = shortcode_parse_atts( $shortcodes[2][ $short_key ] );
+            $add_atts = shortcode_parse_atts( $shortcodes[2][$short_key] );
             if ( $add_atts ) {
-                $this_atts = array_merge($atts, $add_atts);
+                $this_atts = array_merge( $atts, $add_atts );
             } else {
                 $this_atts = $atts;
             }
@@ -193,32 +193,32 @@ 
 			$default = FrmEntryFormat::show_entry( $this_atts );
 
             // Add the default message
-            $message = str_replace( $shortcodes[0][ $short_key ], $default, $message );
+            $message = str_replace( $shortcodes[0][$short_key], $default, $message );
         }
 
         return $message;
     }
 
 	public static function prepare_display_value( $entry, $field, $atts ) {
-		$field_value = isset( $entry->metas[ $field->id ] ) ? $entry->metas[ $field->id ] : false;
+		$field_value = isset( $entry->metas[$field->id] ) ? $entry->metas[$field->id] : false;
 
         if ( FrmAppHelper::pro_is_installed() ) {
 			FrmProEntriesHelper::get_dynamic_list_values( $field, $entry, $field_value );
         }
 
-        if ( $field->form_id == $entry->form_id || empty($atts['embedded_field_id']) ) {
-            return self::display_value($field_value, $field, $atts);
+        if ( $field->form_id == $entry->form_id || empty( $atts['embedded_field_id'] ) ) {
+            return self::display_value( $field_value, $field, $atts );
         }
 
         // this is an embeded form
         $val = '';
 
-	    if ( strpos($atts['embedded_field_id'], 'form') === 0 ) {
+	    if ( strpos( $atts['embedded_field_id'], 'form' ) === 0 ) {
             //this is a repeating section
 			$child_entries = FrmEntry::getAll( array( 'it.parent_item_id' => $entry->id ) );
         } else {
             // get all values for this field
-	        $child_values = isset( $entry->metas[ $atts['embedded_field_id'] ] ) ? $entry->metas[ $atts['embedded_field_id'] ] : false;
+	        $child_values = isset( $entry->metas[$atts['embedded_field_id']] ) ? $entry->metas[$atts['embedded_field_id']] : false;
 
             if ( $child_values ) {
 	            $child_entries = FrmEntry::getAll( array( 'it.id' => (array) $child_values ) );
@@ -227,7 +227,7 @@ 
 
 	    $field_value = array();
 
-        if ( ! isset($child_entries) || ! $child_entries || ! FrmAppHelper::pro_is_installed() ) {
+        if ( ! isset( $child_entries ) || ! $child_entries || ! FrmAppHelper::pro_is_installed() ) {
             return $val;
         }
 
@@ -236,17 +236,17 @@ 
             $atts['post_id'] = $child_entry->post_id;
 
             // get the value for this field -- check for post values as well
-            $entry_val = FrmProEntryMetaHelper::get_post_or_meta_value($child_entry, $field);
+            $entry_val = FrmProEntryMetaHelper::get_post_or_meta_value( $child_entry, $field );
 
             if ( $entry_val ) {
                 // foreach entry get display_value
-                $field_value[] = self::display_value($entry_val, $field, $atts);
+                $field_value[] = self::display_value( $entry_val, $field, $atts );
             }
 
-            unset($child_entry);
+            unset( $child_entry );
         }
 
-        $val = implode(', ', (array) $field_value );
+        $val = implode( ', ', (array) $field_value );
 		$val = wp_kses_post( $val );
 
         return $val;
@@ -266,22 +266,22 @@ 
         );
 
         $atts = wp_parse_args( $atts, $defaults );
-        $atts = apply_filters('frm_display_value_atts', $atts, $field, $value);
+        $atts = apply_filters( 'frm_display_value_atts', $atts, $field, $value );
 
-        if ( ! isset($field->field_options['post_field']) ) {
+        if ( ! isset( $field->field_options['post_field'] ) ) {
             $field->field_options['post_field'] = '';
         }
 
-        if ( ! isset($field->field_options['custom_field']) ) {
+        if ( ! isset( $field->field_options['custom_field'] ) ) {
             $field->field_options['custom_field'] = '';
         }
 
         if ( FrmAppHelper::pro_is_installed() && $atts['post_id'] && ( $field->field_options['post_field'] || $atts['type'] == 'tag' ) ) {
             $atts['pre_truncate'] = $atts['truncate'];
             $atts['truncate'] = true;
-            $atts['exclude_cat'] = isset($field->field_options['exclude_cat']) ? $field->field_options['exclude_cat'] : 0;
+            $atts['exclude_cat'] = isset( $field->field_options['exclude_cat'] ) ? $field->field_options['exclude_cat'] : 0;
 
-            $value = FrmProEntryMetaHelper::get_post_value($atts['post_id'], $field->field_options['post_field'], $field->field_options['custom_field'], $atts);
+            $value = FrmProEntryMetaHelper::get_post_value( $atts['post_id'], $field->field_options['post_field'], $field->field_options['custom_field'], $atts );
             $atts['truncate'] = $atts['pre_truncate'];
         }
 
@@ -289,39 +289,39 @@ 
             return $value;
         }
 
-        $value = apply_filters('frm_display_value_custom', maybe_unserialize($value), $field, $atts);
+        $value = apply_filters( 'frm_display_value_custom', maybe_unserialize( $value ), $field, $atts );
 		$value = apply_filters( 'frm_display_' . $field->type . '_value_custom', $value, compact( 'field', 'atts' ) );
 
         $new_value = '';
 
-        if ( is_array($value) && $atts['type'] != 'file' ) {
+        if ( is_array( $value ) && $atts['type'] != 'file' ) {
             foreach ( $value as $val ) {
-                if ( is_array($val) ) {
+                if ( is_array( $val ) ) {
 					//TODO: add options for display (li or ,)
-                    $new_value .= implode($atts['sep'], $val);
+                    $new_value .= implode( $atts['sep'], $val );
                     if ( $atts['type'] != 'data' ) {
                         $new_value .= '<br/>';
                     }
                 }
-                unset($val);
+                unset( $val );
             }
         }
 
-        if ( ! empty($new_value) ) {
+        if ( ! empty( $new_value ) ) {
             $value = $new_value;
-        } else if ( is_array($value) && $atts['type'] != 'file' && ! $atts['return_array'] ) {
-            $value = implode($atts['sep'], $value);
+        } else if ( is_array( $value ) && $atts['type'] != 'file' && ! $atts['return_array'] ) {
+            $value = implode( $atts['sep'], $value );
         }
 
         if ( $atts['truncate'] && $atts['type'] != 'image' ) {
-            $value = FrmAppHelper::truncate($value, 50);
+            $value = FrmAppHelper::truncate( $value, 50 );
         }
 
 		if ( ! $atts['keepjs'] && ! is_array( $value ) ) {
 			$value = wp_kses_post( $value );
 		}
 
-        return apply_filters('frm_display_value', $value, $field, $atts);
+        return apply_filters( 'frm_display_value', $value, $field, $atts );
     }
 
 	public static function set_posted_value( $field, $value, $args ) {
@@ -329,20 +329,20 @@ 
         if ( isset( $args['other'] ) && $args['other'] ) {
             $value = $args['temp_value'];
         }
-        if ( empty($args['parent_field_id']) ) {
-            $_POST['item_meta'][ $field->id ] = $value;
+        if ( empty( $args['parent_field_id'] ) ) {
+            $_POST['item_meta'][$field->id] = $value;
         } else {
-            $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field->id ] = $value;
+            $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field->id] = $value;
         }
     }
 
 	public static function get_posted_value( $field, &$value, $args ) {
 		$field_id = is_object( $field ) ? $field->id : $field;
 
-        if ( empty($args['parent_field_id']) ) {
-            $value = isset( $_POST['item_meta'][ $field_id ] ) ? $_POST['item_meta'][ $field_id ] : '';
+        if ( empty( $args['parent_field_id'] ) ) {
+            $value = isset( $_POST['item_meta'][$field_id] ) ? $_POST['item_meta'][$field_id] : '';
         } else {
-            $value = isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] ) ? $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] : '';
+            $value = isset( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field_id] ) ? $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field_id] : '';
         }
 		FrmAppHelper::sanitize_value( 'wp_kses_post', $value );
 		$value = stripslashes_deep( $value );
@@ -367,12 +367,12 @@ 
         self::set_other_repeating_vals( $field, $value, $args );
 
         // Check if there are any posted "Other" values
-		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta']['other'][ $field->id ] ) ) {
+		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta']['other'][$field->id] ) ) {
 
             // Save original value
             $args['temp_value'] = $value;
             $args['other'] = true;
-            $other_vals = stripslashes_deep( $_POST['item_meta']['other'][ $field->id ] );
+            $other_vals = stripslashes_deep( $_POST['item_meta']['other'][$field->id] );
 
             // Set the validation value now
             self::set_other_validation_val( $value, $other_vals, $field, $args );
@@ -394,12 +394,12 @@ 
         }
 
         // Check if there are any other posted "other" values for this field
-		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ]['other'][ $field->id ] ) ) {
+		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']]['other'][$field->id] ) ) {
             // Save original value
             $args['temp_value'] = $value;
             $args['other'] = true;
 
-            $other_vals = $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ]['other'][ $field->id ];
+            $other_vals = $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']]['other'][$field->id];
 
             // Set the validation value now
             self::set_other_validation_val( $value, $other_vals, $field, $args );
@@ -431,27 +431,27 @@ 
             }
         } else {
 			// Radio and dropdowns
-            $other_key = array_filter( array_keys($field->options), 'is_string');
+            $other_key = array_filter( array_keys( $field->options ), 'is_string' );
             $other_key = reset( $other_key );
 
             // Multi-select dropdown
             if ( is_array( $value ) ) {
-                $o_key = array_search( $field->options[ $other_key ], $value );
+                $o_key = array_search( $field->options[$other_key], $value );
 
 				if ( $o_key !== false ) {
 					// Modify the original value so other key will be preserved
-					$value[ $other_key ] = $value[ $o_key ];
+					$value[$other_key] = $value[$o_key];
 
 					// By default, the array keys will be numeric for multi-select dropdowns
 					// If going backwards and forwards between pages, the array key will match the other key
 					if ( $o_key != $other_key ) {
-						unset( $value[ $o_key ] );
+						unset( $value[$o_key] );
 					}
 
 					$args['temp_value'] = $value;
-					$value[ $other_key ] = reset( $other_vals );
+					$value[$other_key] = reset( $other_vals );
 				}
-            } else if ( $field->options[ $other_key ] == $value ) {
+            } else if ( $field->options[$other_key] == $value ) {
                 $value = $other_vals;
             }
         }
@@ -470,9 +470,9 @@ 
 				$content .= "\n\n";
 			}
 
-			if ( is_array($val) ) {
+			if ( is_array( $val ) ) {
 				$val = FrmAppHelper::array_flatten( $val );
-			    $val = implode(',', $val);
+			    $val = implode( ',', $val );
 			}
 
 			$content .= $val;