Strategy11 / formidable-forms

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

Indentation +17 added lines, -17 removed lines

@@ -4,12 +4,12 @@ 
 
 	public function __construct() {
 		$action_ops = array(
-		    'classes'   => 'frm_email_icon frm_icon_font',
-            'active'    => true,
+			'classes'   => 'frm_email_icon frm_icon_font',
+			'active'    => true,
 			'event'     => array( 'create' ),
-            'limit'     => 99,
-            'priority'  => 10,
-            'ajax_load' => false,
+			'limit'     => 99,
+			'priority'  => 10,
+			'ajax_load' => false,
 		);
 		$action_ops = apply_filters('frm_email_control_settings', $action_ops);
 
@@ -17,23 +17,23 @@ 
 	}
 
 	public function form( $form_action, $args = array() ) {
-	    extract($args);
+		extract($args);
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/_email_settings.php' );
 	}
 
 	public function get_defaults() {
-	    return array(
-            'email_to'      => '[admin_email]',
-            'cc'            => '',
-            'bcc'           => '',
-            'from'          => '[sitename] <[admin_email]>',
-            'reply_to'      => '',
-            'email_subject' => '',
-            'email_message' => '[default-message]',
-            'inc_user_info' => 0,
-            'plain_text'    => 0,
+		return array(
+			'email_to'      => '[admin_email]',
+			'cc'            => '',
+			'bcc'           => '',
+			'from'          => '[sitename] <[admin_email]>',
+			'reply_to'      => '',
+			'email_subject' => '',
+			'email_message' => '[default-message]',
+			'inc_user_info' => 0,
+			'plain_text'    => 0,
 			'event'         => array( 'create' ),
-	    );
+		);
 	}
 }

Spacing +3 added lines, -3 removed lines

@@ -11,13 +11,13 @@
             'priority'  => 10,
             'ajax_load' => false,
 		);
-		$action_ops = apply_filters('frm_email_control_settings', $action_ops);
+		$action_ops = apply_filters( 'frm_email_control_settings', $action_ops );
 
-		parent::__construct('email', __( 'Email Notification', 'formidable' ), $action_ops);
+		parent::__construct( 'email', __( 'Email Notification', 'formidable' ), $action_ops );
 	}
 
 	public function form( $form_action, $args = array() ) {
-	    extract($args);
+	    extract( $args );
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/_email_settings.php' );
 	}

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('Saving entries is disabled for this form', 'formidable' ) . '"></i>';
+						$val = '<i class="frm_icon_font frm_forbid_icon frm_bstooltip" title="' . esc_attr( 'Saving entries is disabled for this form', 'formidable' ) . '"></i>';
 			        } else {
-			            $text = FrmEntry::getRecordCount($item->id);
-						$val = current_user_can('frm_view_entries') ? '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-entries&form=' . $item->id ) ) . '">' . $text . '</a>' : $text;
-                        unset($text);
+			            $text = FrmEntry::getRecordCount( $item->id );
+						$val = current_user_can( 'frm_view_entries' ) ? '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-entries&form=' . $item->id ) ) . '">' . $text . '</a>' : $text;
+                        unset( $text );
                     }
 			        break;
                 case 'type':
@@ -272,12 +272,12 @@ 
                     break;
 			}
 
-			if ( isset($val) ) {
+			if ( isset( $val ) ) {
 			    $r .= "<td $attributes>";
 			    $r .= $val;
 			    $r .= '</td>';
 			}
-			unset($val);
+			unset( $val );
 		}
 		$r .= '</tr>';
 
@@ -290,18 +290,18 @@ 
      */
     private function get_actions( &$actions, $item, $edit_link, $duplicate_link ) {
 		if ( 'trash' == $this->status ) {
-			if ( current_user_can('frm_edit_forms') ) {
+			if ( current_user_can( 'frm_edit_forms' ) ) {
 				$actions['restore'] = FrmFormsHelper::delete_trash_link( $item->id, $item->status, 'short' );
 			}
 
-		    if ( current_user_can('frm_delete_forms') ) {
+		    if ( current_user_can( 'frm_delete_forms' ) ) {
 				$trash_url = wp_nonce_url( '?page=formidable&form_status=trash&frm_action=destroy&id=' . $item->id, 'destroy_form_' . $item->id );
 				$actions['trash'] = '<a href="' . esc_url( $trash_url ) . '" class="submitdelete" onclick="return confirm(\'' . __( 'Are you sure you want to permanently delete that?', 'formidable' ) . '\')">' . __( 'Delete Permanently' ) . '</a>';
     		}
             return;
 		}
 
-		if ( current_user_can('frm_edit_forms') ) {
+		if ( current_user_can( 'frm_edit_forms' ) ) {
             if ( ! $item->is_template || ! $item->default_template ) {
 				$actions['frm_edit'] = '<a href="' . esc_url( $edit_link ) . '">' . __( 'Edit' ) . '</a>';
             }
@@ -323,7 +323,7 @@ 
 			unset( $actions['trash'] );
 		}
 
-		$actions['view'] = '<a href="' . esc_url( FrmFormsHelper::get_direct_link( $item->form_key, $item ) ) . '" target="_blank">' . __( 'Preview') . '</a>';
+		$actions['view'] = '<a href="' . esc_url( FrmFormsHelper::get_direct_link( $item->form_key, $item ) ) . '" target="_blank">' . __( 'Preview' ) . '</a>';
     }
 
     /**
@@ -331,8 +331,8 @@ 
      */
 	private function get_form_name( $item, $actions, $edit_link, $mode = 'list' ) {
         $form_name = $item->name;
-        if ( trim($form_name) == '' ) {
-            $form_name = __( '(no title)');
+        if ( trim( $form_name ) == '' ) {
+            $form_name = __( '(no title)' );
         }
 		$form_name = FrmAppHelper::kses( $form_name );
 		if ( 'excerpt' != $mode ) {
@@ -369,7 +369,7 @@ 
     private function add_form_description( $item, &$val ) {
         global $mode;
         if ( 'excerpt' == $mode ) {
-            $val .= FrmAppHelper::truncate(strip_tags($item->description), 50);
+            $val .= FrmAppHelper::truncate( strip_tags( $item->description ), 50 );
         }
     }
 }

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/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="normal"<?php selected($field['captcha_size'], 'normal'); ?>><?php _e( 'Normal', 'formidable' ) ?></option>
-                        <option value="compact"<?php selected($field['captcha_size'], 'compact'); ?>><?php _e( 'Compact', 'formidable' ) ?></option>
+                        <option value="normal"<?php selected( $field['captcha_size'], 'normal' ); ?>><?php _e( 'Normal', '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/models/FrmStyle.php

Doc Comments +4 added lines, -1 removed lines

@@ -4,7 +4,7 @@ 
 	public $id = 0; // the id of the post
 
 	/**
-	 * @param int|string $id The id of the stylsheet or 'default'
+	 * @param integer $id The id of the stylsheet or 'default'
 	 */
 	public function __construct( $id = 0 ) {
         $this->id = $id;
@@ -120,6 +120,9 @@ 
         set_transient('frmpro_css', $css);
 	}
 
+	/**
+	 * @param string $filename
+	 */
 	private function get_css_content( $filename ) {
 		$css = '/* ' . __( 'WARNING: Any changes made to this file will be lost when your Formidable settings are updated', 'formidable' ) . ' */' . "\n";
 

Indentation +275 added lines, -275 removed lines

@@ -1,52 +1,52 @@ 
 <?php
 class FrmStyle {
-    public $number = false;	// Unique ID number of the current instance.
+	public $number = false;	// Unique ID number of the current instance.
 	public $id = 0; // the id of the post
 
 	/**
 	 * @param int|string $id The id of the stylsheet or 'default'
 	 */
 	public function __construct( $id = 0 ) {
-        $this->id = $id;
-    }
+		$this->id = $id;
+	}
 
-    public function get_new() {
+	public function get_new() {
 		$this->id = 0;
 
-        $max_slug_value = pow(36, 6);
-        $min_slug_value = 37; // we want to have at least 2 characters in the slug
-        $key = base_convert( rand($min_slug_value, $max_slug_value), 10, 36 );
-
-        $style = array(
-            'post_type'     => FrmStylesController::$post_type,
-            'ID'            => '',
-            'post_title'    => __( 'New Style', 'formidable' ),
-            'post_name'     => $key,
-            'post_content'  => $this->get_defaults(),
-            'menu_order'    => '',
-            'post_status'   => 'publish',
-        );
+		$max_slug_value = pow(36, 6);
+		$min_slug_value = 37; // we want to have at least 2 characters in the slug
+		$key = base_convert( rand($min_slug_value, $max_slug_value), 10, 36 );
+
+		$style = array(
+			'post_type'     => FrmStylesController::$post_type,
+			'ID'            => '',
+			'post_title'    => __( 'New Style', 'formidable' ),
+			'post_name'     => $key,
+			'post_content'  => $this->get_defaults(),
+			'menu_order'    => '',
+			'post_status'   => 'publish',
+		);
 
-        return (object) $style;
-    }
+		return (object) $style;
+	}
 
 	public function save( $settings ) {
 		return FrmAppHelper::save_settings( $settings, 'frm_styles' );
-    }
+	}
 
 	public function duplicate( $id ) {
-        // duplicating is a pro feature
-    }
+		// duplicating is a pro feature
+	}
 
-    public function update( $id = 'default' ) {
+	public function update( $id = 'default' ) {
  		$all_instances = $this->get_all();
 
  		if ( empty($id) ) {
- 		     $new_style = (array) $this->get_new();
- 		     $all_instances[] = $new_style;
+ 			 $new_style = (array) $this->get_new();
+ 			 $all_instances[] = $new_style;
  		}
 
-        $action_ids = array();
+		$action_ids = array();
 
  		foreach ( $all_instances as $number => $new_instance ) {
  			$new_instance = stripslashes_deep( (array) $new_instance);
@@ -54,42 +54,42 @@ 
  			if ( $id != $this->id || ! $_POST || ! isset($_POST['frm_style_setting']) ) {
 				$all_instances[ $number ] = $new_instance;
 
- 			    if ( $new_instance['menu_order'] && $_POST && empty($_POST['prev_menu_order']) && isset($_POST['frm_style_setting']['menu_order']) ) {
- 			        // this style was set to default, so remove default setting on previous default style
- 			        $new_instance['menu_order'] = 0;
- 			        $action_ids[] = $this->save($new_instance);
- 			    }
+ 				if ( $new_instance['menu_order'] && $_POST && empty($_POST['prev_menu_order']) && isset($_POST['frm_style_setting']['menu_order']) ) {
+ 					// this style was set to default, so remove default setting on previous default style
+ 					$new_instance['menu_order'] = 0;
+ 					$action_ids[] = $this->save($new_instance);
+ 				}
 
- 			    // don't continue if not saving this style
- 			    continue;
+ 				// don't continue if not saving this style
+ 				continue;
  			}
 
  			$new_instance['post_title'] = sanitize_text_field( $_POST['frm_style_setting']['post_title'] );
  			$new_instance['post_content'] = $_POST['frm_style_setting']['post_content'];
  			$new_instance['post_type']  = FrmStylesController::$post_type;
-            $new_instance['post_status']  = 'publish';
+			$new_instance['post_status']  = 'publish';
 			$new_instance['menu_order']  = isset( $_POST['frm_style_setting']['menu_order'] ) ? absint( $_POST['frm_style_setting']['menu_order'] ) : 0;
 
-            if ( empty($id) ) {
-                $new_instance['post_name'] = $new_instance['post_title'];
-            }
+			if ( empty($id) ) {
+				$new_instance['post_name'] = $new_instance['post_title'];
+			}
 
-            $default_settings = $this->get_defaults();
+			$default_settings = $this->get_defaults();
 
-            foreach ( $default_settings as $setting => $default ) {
+			foreach ( $default_settings as $setting => $default ) {
 				if ( strpos( $setting, 'color' ) !== false || in_array( $setting, array( 'error_bg', 'error_border', 'error_text' ) ) ) {
-                    //if is a color
+					//if is a color
 					$new_instance['post_content'][ $setting ] = str_replace( '#', '', $new_instance['post_content'][ $setting ] );
 				} else if ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ) ) && ! isset( $new_instance['post_content'][ $setting ] ) ) {
 					$new_instance['post_content'][ $setting ] = 0;
-                } else if ( $setting == 'font' ) {
-                	$new_instance['post_content'][ $setting ] = $this->force_balanced_quotation( $new_instance['post_content'][ $setting ] );
-                }
-            }
+				} else if ( $setting == 'font' ) {
+					$new_instance['post_content'][ $setting ] = $this->force_balanced_quotation( $new_instance['post_content'][ $setting ] );
+				}
+			}
 
 			$all_instances[ $number ] = $new_instance;
 
-            $action_ids[] = $this->save($new_instance);
+			$action_ids[] = $this->save($new_instance);
 
  		}
 
@@ -98,27 +98,27 @@ 
  		return $action_ids;
  	}
 
-    /**
-     * Create static css file
-     */
+	/**
+	 * Create static css file
+	 */
 	public function save_settings() {
 		$filename = FrmAppHelper::plugin_path() . '/css/custom_theme.css.php';
 		update_option( 'frm_last_style_update', date('njGi') );
 
-        if ( ! is_file($filename) ) {
-            return;
-        }
+		if ( ! is_file($filename) ) {
+			return;
+		}
 
 		$css = $this->get_css_content( $filename );
 
 		$create_file = new FrmCreateFile( array( 'folder_name' => 'formidable/css', 'file_name' => 'formidablepro.css' ) );
 		$create_file->create_file( $css );
 
-        update_option('frmpro_css', $css);
+		update_option('frmpro_css', $css);
 
 		$this->clear_cache();
 
-        set_transient('frmpro_css', $css);
+		set_transient('frmpro_css', $css);
 	}
 
 	private function get_css_content( $filename ) {
@@ -127,10 +127,10 @@ 
 		$saving = true;
 		$frm_style = $this;
 
-        ob_start();
-        include( $filename );
+		ob_start();
+		include( $filename );
 		$css .= preg_replace( '/\/\*(.|\s)*?\*\//', '', str_replace( array( "\r\n", "\r", "\n", "\t", '    ' ), '', ob_get_contents() ) );
-        ob_end_clean();
+		ob_end_clean();
 
 		return $css;
 	}
@@ -150,272 +150,272 @@ 
 	}
 
 	public function destroy( $id ) {
-        return wp_delete_post($id);
-    }
+		return wp_delete_post($id);
+	}
 
-    public function get_one() {
-        if ( 'default' == $this->id ) {
-            $style = $this->get_default_style();
-            if ( $style ) {
-                $this->id = $style->ID;
-            } else {
-                $this->id = 0;
-            }
-            return $style;
-        }
+	public function get_one() {
+		if ( 'default' == $this->id ) {
+			$style = $this->get_default_style();
+			if ( $style ) {
+				$this->id = $style->ID;
+			} else {
+				$this->id = 0;
+			}
+			return $style;
+		}
 
-        $style = get_post($this->id);
+		$style = get_post($this->id);
 
-        if ( ! $style ) {
-            return $style;
-        }
+		if ( ! $style ) {
+			return $style;
+		}
 
-        $style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
+		$style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
 
-        $default_values = $this->get_defaults();
+		$default_values = $this->get_defaults();
 
-        // fill default values
-        $style->post_content = $this->override_defaults($style->post_content);
-        $style->post_content = wp_parse_args( $style->post_content, $default_values);
+		// fill default values
+		$style->post_content = $this->override_defaults($style->post_content);
+		$style->post_content = wp_parse_args( $style->post_content, $default_values);
 
-        return $style;
-    }
+		return $style;
+	}
 
-    public function get_all( $orderby = 'title', $order = 'ASC', $limit = 99 ) {
-        $post_atts = array(
+	public function get_all( $orderby = 'title', $order = 'ASC', $limit = 99 ) {
+		$post_atts = array(
 			'post_type'   => FrmStylesController::$post_type,
 			'post_status' => 'publish',
 			'numberposts' => $limit,
 			'orderby'     => $orderby,
 			'order'       => $order,
-        );
+		);
 
-        $temp_styles = FrmAppHelper::check_cache(serialize($post_atts), 'frm_styles', $post_atts, 'get_posts');
+		$temp_styles = FrmAppHelper::check_cache(serialize($post_atts), 'frm_styles', $post_atts, 'get_posts');
 
-        if ( empty($temp_styles) ) {
-            global $wpdb;
-            // make sure there wasn't a conflict with the query
+		if ( empty($temp_styles) ) {
+			global $wpdb;
+			// make sure there wasn't a conflict with the query
 			$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->posts . ' WHERE post_type=%s AND post_status=%s ORDER BY post_title ASC LIMIT 99', FrmStylesController::$post_type, 'publish' );
-            $temp_styles = FrmAppHelper::check_cache('frm_backup_style_check', 'frm_styles', $query, 'get_results');
-
-            if ( empty($temp_styles) ) {
-                // create a new style if there are none
-         		$new = $this->get_new();
-         		$new->post_title = $new->post_name = __( 'Formidable Style', 'formidable' );
-         		$new->menu_order = 1;
-         		$new = $this->save( (array) $new);
-         		$this->update('default');
-
-                $post_atts['include'] = $new;
-
-                $temp_styles = get_posts( $post_atts );
-            }
-        }
-
-        $default_values = $this->get_defaults();
-        $default_style = false;
-
-        $styles = array();
-        foreach ( $temp_styles as $style ) {
-            $this->id = $style->ID;
-            if ( $style->menu_order ) {
-                if ( $default_style ) {
-                    // only return one default
-                    $style->menu_order = 0;
-                } else {
-                    // check for a default style
-                    $default_style = $style->ID;
-                }
-            }
-
-            $style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
-
-            // fill default values
-            $style->post_content = $this->override_defaults($style->post_content);
-            $style->post_content = wp_parse_args( $style->post_content, $default_values);
+			$temp_styles = FrmAppHelper::check_cache('frm_backup_style_check', 'frm_styles', $query, 'get_results');
+
+			if ( empty($temp_styles) ) {
+				// create a new style if there are none
+		 		$new = $this->get_new();
+		 		$new->post_title = $new->post_name = __( 'Formidable Style', 'formidable' );
+		 		$new->menu_order = 1;
+		 		$new = $this->save( (array) $new);
+		 		$this->update('default');
+
+				$post_atts['include'] = $new;
+
+				$temp_styles = get_posts( $post_atts );
+			}
+		}
+
+		$default_values = $this->get_defaults();
+		$default_style = false;
+
+		$styles = array();
+		foreach ( $temp_styles as $style ) {
+			$this->id = $style->ID;
+			if ( $style->menu_order ) {
+				if ( $default_style ) {
+					// only return one default
+					$style->menu_order = 0;
+				} else {
+					// check for a default style
+					$default_style = $style->ID;
+				}
+			}
+
+			$style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
+
+			// fill default values
+			$style->post_content = $this->override_defaults($style->post_content);
+			$style->post_content = wp_parse_args( $style->post_content, $default_values);
 
 			$styles[ $style->ID ] = $style;
-        }
+		}
 
-        if ( ! $default_style ) {
-            $default_style = reset($styles);
+		if ( ! $default_style ) {
+			$default_style = reset($styles);
 			$styles[ $default_style->ID ]->menu_order = 1;
-        }
+		}
 
-        return $styles;
-    }
+		return $styles;
+	}
 
 	public function get_default_style( $styles = null ) {
-        if ( ! isset($styles) ) {
+		if ( ! isset($styles) ) {
 			$styles = $this->get_all( 'menu_order', 'DESC', 1 );
-        }
+		}
 
-        foreach ( $styles as $style ) {
-            if ( $style->menu_order ) {
-                return $style;
-            }
-        }
-    }
+		foreach ( $styles as $style ) {
+			if ( $style->menu_order ) {
+				return $style;
+			}
+		}
+	}
 
 	public function override_defaults( $settings ) {
-	    if ( ! is_array($settings) ) {
-	        return $settings;
-	    }
-
-	    $settings['line_height'] = ( ! isset($settings['field_height']) || $settings['field_height'] == '' || $settings['field_height'] == 'auto') ? 'normal' : $settings['field_height'];
-
-	    if ( ! isset($settings['form_desc_size']) && isset($settings['description_font_size']) ) {
-	        $settings['form_desc_size'] = $settings['description_font_size'];
-	        $settings['form_desc_color'] = $settings['description_color'];
-	        $settings['title_color'] = $settings['label_color'];
-	    }
-
-	    if ( ! isset($settings['section_color']) && isset($settings['label_color']) ) {
-	        $settings['section_color'] = $settings['label_color'];
-	        $settings['section_border_color'] = $settings['border_color'];
-	    }
-
-	    if ( ! isset($settings['submit_hover_bg_color']) && isset($settings['submit_bg_color']) ) {
-	        $settings['submit_hover_bg_color'] = $settings['submit_bg_color'];
-	        $settings['submit_hover_color'] = $settings['submit_text_color'];
-	        $settings['submit_hover_border_color'] = $settings['submit_border_color'];
-
-	        $settings['submit_active_bg_color'] = $settings['submit_bg_color'];
-	        $settings['submit_active_color'] = $settings['submit_text_color'];
-            $settings['submit_active_border_color'] = $settings['submit_border_color'];
-	    }
-
-	    return $settings;
+		if ( ! is_array($settings) ) {
+			return $settings;
+		}
+
+		$settings['line_height'] = ( ! isset($settings['field_height']) || $settings['field_height'] == '' || $settings['field_height'] == 'auto') ? 'normal' : $settings['field_height'];
+
+		if ( ! isset($settings['form_desc_size']) && isset($settings['description_font_size']) ) {
+			$settings['form_desc_size'] = $settings['description_font_size'];
+			$settings['form_desc_color'] = $settings['description_color'];
+			$settings['title_color'] = $settings['label_color'];
+		}
+
+		if ( ! isset($settings['section_color']) && isset($settings['label_color']) ) {
+			$settings['section_color'] = $settings['label_color'];
+			$settings['section_border_color'] = $settings['border_color'];
+		}
+
+		if ( ! isset($settings['submit_hover_bg_color']) && isset($settings['submit_bg_color']) ) {
+			$settings['submit_hover_bg_color'] = $settings['submit_bg_color'];
+			$settings['submit_hover_color'] = $settings['submit_text_color'];
+			$settings['submit_hover_border_color'] = $settings['submit_border_color'];
+
+			$settings['submit_active_bg_color'] = $settings['submit_bg_color'];
+			$settings['submit_active_color'] = $settings['submit_text_color'];
+			$settings['submit_active_border_color'] = $settings['submit_border_color'];
+		}
+
+		return $settings;
 	}
 
 	public function get_defaults() {
-        return array(
-            'theme_css'         => 'ui-lightness',
-            'theme_name'        => 'UI Lightness',
+		return array(
+			'theme_css'         => 'ui-lightness',
+			'theme_name'        => 'UI Lightness',
 
 			'center_form'		=> '',
-            'form_width'        => '100%',
-            'form_align'        => 'left',
-            'direction'         => is_rtl() ? 'rtl' : 'ltr',
-            'fieldset'          => '0px',
-            'fieldset_color'    => '000000',
-            'fieldset_padding'  => '0 0 15px 0',
-            'fieldset_bg_color' => '',
-
-            'title_size'        => '20px',
-            'title_color'       => '444444',
+			'form_width'        => '100%',
+			'form_align'        => 'left',
+			'direction'         => is_rtl() ? 'rtl' : 'ltr',
+			'fieldset'          => '0px',
+			'fieldset_color'    => '000000',
+			'fieldset_padding'  => '0 0 15px 0',
+			'fieldset_bg_color' => '',
+
+			'title_size'        => '20px',
+			'title_color'       => '444444',
 			'title_margin_top'  => '10px',
 			'title_margin_bottom' => '10px',
-            'form_desc_size'    => '14px',
-            'form_desc_color'   => '666666',
+			'form_desc_size'    => '14px',
+			'form_desc_color'   => '666666',
 			'form_desc_margin_top' => '10px',
 			'form_desc_margin_bottom' => '25px',
 
-            'font'              => '"Lucida Grande","Lucida Sans Unicode",Tahoma,sans-serif',
-            'font_size'         => '14px',
-            'label_color'       => '444444',
-            'weight'            => 'bold',
-            'position'          => 'none',
-            'align'             => 'left',
-            'width'             => '150px',
-            'required_color'    => 'B94A48',
-            'required_weight'   => 'bold',
-            'label_padding'     => '0 0 3px 0',
-
-            'description_font_size' => '12px',
-            'description_color' => '666666',
-            'description_weight' => 'normal',
-            'description_style' => 'normal',
-            'description_align' => 'left',
+			'font'              => '"Lucida Grande","Lucida Sans Unicode",Tahoma,sans-serif',
+			'font_size'         => '14px',
+			'label_color'       => '444444',
+			'weight'            => 'bold',
+			'position'          => 'none',
+			'align'             => 'left',
+			'width'             => '150px',
+			'required_color'    => 'B94A48',
+			'required_weight'   => 'bold',
+			'label_padding'     => '0 0 3px 0',
+
+			'description_font_size' => '12px',
+			'description_color' => '666666',
+			'description_weight' => 'normal',
+			'description_style' => 'normal',
+			'description_align' => 'left',
 			'description_margin' => '0',
 
-            'field_font_size'   => '14px',
-            'field_height' 		=> '32px',
-            'line_height'		=> 'normal',
-            'field_width'       => '100%',
-            'auto_width'        => false,
-            'field_pad'         => '6px 10px',
-            'field_margin'      => '20px',
+			'field_font_size'   => '14px',
+			'field_height' 		=> '32px',
+			'line_height'		=> 'normal',
+			'field_width'       => '100%',
+			'auto_width'        => false,
+			'field_pad'         => '6px 10px',
+			'field_margin'      => '20px',
 			'field_weight' => 'normal',
-            'text_color'        => '555555',
-            //'border_color_hv'   => 'cccccc',
-            'border_color'      => 'cccccc',
-            'field_border_width' => '1px',
-            'field_border_style' => 'solid',
-
-            'bg_color'          => 'ffffff',
-            //'bg_color_hv'       => 'ffffff',
+			'text_color'        => '555555',
+			//'border_color_hv'   => 'cccccc',
+			'border_color'      => 'cccccc',
+			'field_border_width' => '1px',
+			'field_border_style' => 'solid',
+
+			'bg_color'          => 'ffffff',
+			//'bg_color_hv'       => 'ffffff',
 			'remove_box_shadow' => '',
-            'bg_color_active'   => 'ffffff',
+			'bg_color_active'   => 'ffffff',
 			'border_color_active' => '66afe9',
 			'remove_box_shadow_active' => '',
-            'text_color_error'  => '444444',
-            'bg_color_error'    => 'ffffff',
+			'text_color_error'  => '444444',
+			'bg_color_error'    => 'ffffff',
 			'border_color_error' => 'B94A48',
 			'border_width_error' => '1px',
 			'border_style_error' => 'solid',
-            'bg_color_disabled' => 'ffffff',
-            'border_color_disabled' => 'E5E5E5',
-            'text_color_disabled' => 'A1A1A1',
-
-            'radio_align'       => 'block',
-            'check_align'       => 'block',
-            'check_font_size'   => '13px',
-            'check_label_color' => '444444',
-            'check_weight'      => 'normal',
-
-            'section_font_size' => '18px',
-            'section_color'     => '444444',
-            'section_weight'    => 'bold',
-            'section_pad'       => '15px 0 3px 0',
-            'section_mar_top'   => '15px',
+			'bg_color_disabled' => 'ffffff',
+			'border_color_disabled' => 'E5E5E5',
+			'text_color_disabled' => 'A1A1A1',
+
+			'radio_align'       => 'block',
+			'check_align'       => 'block',
+			'check_font_size'   => '13px',
+			'check_label_color' => '444444',
+			'check_weight'      => 'normal',
+
+			'section_font_size' => '18px',
+			'section_color'     => '444444',
+			'section_weight'    => 'bold',
+			'section_pad'       => '15px 0 3px 0',
+			'section_mar_top'   => '15px',
 			'section_mar_bottom' => '12px',
-            'section_bg_color'  => '',
-            'section_border_color' => 'e8e8e8',
-            'section_border_width' => '2px',
-            'section_border_style' => 'solid',
-            'section_border_loc' => '-top',
-            'collapse_icon'     => '6',
-            'collapse_pos'      => 'after',
-            'repeat_icon'       => '1',
-
-            'submit_style'      => false,
-            'submit_font_size'  => '14px',
-            'submit_width'      => 'auto',
-            'submit_height'     => 'auto',
-            'submit_bg_color'   => 'ffffff',
-            'submit_border_color' => 'cccccc',
-            'submit_border_width' => '1px',
-            'submit_text_color' => '444444',
-            'submit_weight'     => 'normal',
-            'submit_border_radius' => '4px',
-            'submit_bg_img'     => '',
-            'submit_margin'     => '10px',
-            'submit_padding'    => '6px 11px',
-            'submit_shadow_color' => 'eeeeee',
-            'submit_hover_bg_color' => 'efefef',
-            'submit_hover_color' => '444444',
-            'submit_hover_border_color' => 'cccccc',
-            'submit_active_bg_color' => 'efefef',
-            'submit_active_color' => '444444',
-            'submit_active_border_color' => 'cccccc',
-
-            'border_radius'     => '4px',
-            'error_bg'          => 'F2DEDE',
-            'error_border'      => 'EBCCD1',
-            'error_text'        => 'B94A48',
-            'error_font_size'   => '14px',
-
-            'success_bg_color'  => 'DFF0D8',
-            'success_border_color' => 'D6E9C6',
-            'success_text_color' => '468847',
-            'success_font_size' => '14px',
-
-            'important_style'   => false,
-
-            'custom_css'        => '',
-        );
-    }
+			'section_bg_color'  => '',
+			'section_border_color' => 'e8e8e8',
+			'section_border_width' => '2px',
+			'section_border_style' => 'solid',
+			'section_border_loc' => '-top',
+			'collapse_icon'     => '6',
+			'collapse_pos'      => 'after',
+			'repeat_icon'       => '1',
+
+			'submit_style'      => false,
+			'submit_font_size'  => '14px',
+			'submit_width'      => 'auto',
+			'submit_height'     => 'auto',
+			'submit_bg_color'   => 'ffffff',
+			'submit_border_color' => 'cccccc',
+			'submit_border_width' => '1px',
+			'submit_text_color' => '444444',
+			'submit_weight'     => 'normal',
+			'submit_border_radius' => '4px',
+			'submit_bg_img'     => '',
+			'submit_margin'     => '10px',
+			'submit_padding'    => '6px 11px',
+			'submit_shadow_color' => 'eeeeee',
+			'submit_hover_bg_color' => 'efefef',
+			'submit_hover_color' => '444444',
+			'submit_hover_border_color' => 'cccccc',
+			'submit_active_bg_color' => 'efefef',
+			'submit_active_color' => '444444',
+			'submit_active_border_color' => 'cccccc',
+
+			'border_radius'     => '4px',
+			'error_bg'          => 'F2DEDE',
+			'error_border'      => 'EBCCD1',
+			'error_text'        => 'B94A48',
+			'error_font_size'   => '14px',
+
+			'success_bg_color'  => 'DFF0D8',
+			'success_border_color' => 'D6E9C6',
+			'success_text_color' => '468847',
+			'success_font_size' => '14px',
+
+			'important_style'   => false,
+
+			'custom_css'        => '',
+		);
+	}
 
 	public function get_field_name( $field_name, $post_field = 'post_content' ) {
 		return 'frm_style_setting' . ( empty( $post_field ) ? '' : '[' . $post_field . ']' ) . '[' . $field_name . ']';

Spacing +44 added lines, -44 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 class FrmStyle {
-    public $number = false;	// Unique ID number of the current instance.
+    public $number = false; // Unique ID number of the current instance.
 	public $id = 0; // the id of the post
 
 	/**
@@ -13,9 +13,9 @@ 
     public function get_new() {
 		$this->id = 0;
 
-        $max_slug_value = pow(36, 6);
+        $max_slug_value = pow( 36, 6 );
         $min_slug_value = 37; // we want to have at least 2 characters in the slug
-        $key = base_convert( rand($min_slug_value, $max_slug_value), 10, 36 );
+        $key = base_convert( rand( $min_slug_value, $max_slug_value ), 10, 36 );
 
         $style = array(
             'post_type'     => FrmStylesController::$post_type,
@@ -41,7 +41,7 @@ 
     public function update( $id = 'default' ) {
  		$all_instances = $this->get_all();
 
- 		if ( empty($id) ) {
+ 		if ( empty( $id ) ) {
  		     $new_style = (array) $this->get_new();
  		     $all_instances[] = $new_style;
  		}
@@ -49,15 +49,15 @@ 
         $action_ids = array();
 
  		foreach ( $all_instances as $number => $new_instance ) {
- 			$new_instance = stripslashes_deep( (array) $new_instance);
+ 			$new_instance = stripslashes_deep( (array) $new_instance );
  			$this->id = $new_instance['ID'];
- 			if ( $id != $this->id || ! $_POST || ! isset($_POST['frm_style_setting']) ) {
-				$all_instances[ $number ] = $new_instance;
+ 			if ( $id != $this->id || ! $_POST || ! isset( $_POST['frm_style_setting'] ) ) {
+				$all_instances[$number] = $new_instance;
 
- 			    if ( $new_instance['menu_order'] && $_POST && empty($_POST['prev_menu_order']) && isset($_POST['frm_style_setting']['menu_order']) ) {
+ 			    if ( $new_instance['menu_order'] && $_POST && empty( $_POST['prev_menu_order'] ) && isset( $_POST['frm_style_setting']['menu_order'] ) ) {
  			        // this style was set to default, so remove default setting on previous default style
  			        $new_instance['menu_order'] = 0;
- 			        $action_ids[] = $this->save($new_instance);
+ 			        $action_ids[] = $this->save( $new_instance );
  			    }
 
  			    // don't continue if not saving this style
@@ -67,10 +67,10 @@ 
  			$new_instance['post_title'] = sanitize_text_field( $_POST['frm_style_setting']['post_title'] );
  			$new_instance['post_content'] = $_POST['frm_style_setting']['post_content'];
  			$new_instance['post_type']  = FrmStylesController::$post_type;
-            $new_instance['post_status']  = 'publish';
+            $new_instance['post_status'] = 'publish';
 			$new_instance['menu_order']  = isset( $_POST['frm_style_setting']['menu_order'] ) ? absint( $_POST['frm_style_setting']['menu_order'] ) : 0;
 
-            if ( empty($id) ) {
+            if ( empty( $id ) ) {
                 $new_instance['post_name'] = $new_instance['post_title'];
             }
 
@@ -79,17 +79,17 @@ 
             foreach ( $default_settings as $setting => $default ) {
 				if ( strpos( $setting, 'color' ) !== false || in_array( $setting, array( 'error_bg', 'error_border', 'error_text' ) ) ) {
                     //if is a color
-					$new_instance['post_content'][ $setting ] = str_replace( '#', '', $new_instance['post_content'][ $setting ] );
-				} else if ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ) ) && ! isset( $new_instance['post_content'][ $setting ] ) ) {
-					$new_instance['post_content'][ $setting ] = 0;
+					$new_instance['post_content'][$setting] = str_replace( '#', '', $new_instance['post_content'][$setting] );
+				} else if ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ) ) && ! isset( $new_instance['post_content'][$setting] ) ) {
+					$new_instance['post_content'][$setting] = 0;
                 } else if ( $setting == 'font' ) {
-                	$new_instance['post_content'][ $setting ] = $this->force_balanced_quotation( $new_instance['post_content'][ $setting ] );
+                	$new_instance['post_content'][$setting] = $this->force_balanced_quotation( $new_instance['post_content'][$setting] );
                 }
             }
 
-			$all_instances[ $number ] = $new_instance;
+			$all_instances[$number] = $new_instance;
 
-            $action_ids[] = $this->save($new_instance);
+            $action_ids[] = $this->save( $new_instance );
 
  		}
 
@@ -103,9 +103,9 @@ 
      */
 	public function save_settings() {
 		$filename = FrmAppHelper::plugin_path() . '/css/custom_theme.css.php';
-		update_option( 'frm_last_style_update', date('njGi') );
+		update_option( 'frm_last_style_update', date( 'njGi' ) );
 
-        if ( ! is_file($filename) ) {
+        if ( ! is_file( $filename ) ) {
             return;
         }
 
@@ -114,11 +114,11 @@ 
 		$create_file = new FrmCreateFile( array( 'folder_name' => 'formidable/css', 'file_name' => 'formidablepro.css' ) );
 		$create_file->create_file( $css );
 
-        update_option('frmpro_css', $css);
+        update_option( 'frmpro_css', $css );
 
 		$this->clear_cache();
 
-        set_transient('frmpro_css', $css);
+        set_transient( 'frmpro_css', $css );
 	}
 
 	private function get_css_content( $filename ) {
@@ -150,7 +150,7 @@ 
 	}
 
 	public function destroy( $id ) {
-        return wp_delete_post($id);
+        return wp_delete_post( $id );
     }
 
     public function get_one() {
@@ -164,19 +164,19 @@ 
             return $style;
         }
 
-        $style = get_post($this->id);
+        $style = get_post( $this->id );
 
         if ( ! $style ) {
             return $style;
         }
 
-        $style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
+        $style->post_content = FrmAppHelper::maybe_json_decode( $style->post_content );
 
         $default_values = $this->get_defaults();
 
         // fill default values
-        $style->post_content = $this->override_defaults($style->post_content);
-        $style->post_content = wp_parse_args( $style->post_content, $default_values);
+        $style->post_content = $this->override_defaults( $style->post_content );
+        $style->post_content = wp_parse_args( $style->post_content, $default_values );
 
         return $style;
     }
@@ -190,21 +190,21 @@ 
 			'order'       => $order,
         );
 
-        $temp_styles = FrmAppHelper::check_cache(serialize($post_atts), 'frm_styles', $post_atts, 'get_posts');
+        $temp_styles = FrmAppHelper::check_cache( serialize( $post_atts ), 'frm_styles', $post_atts, 'get_posts' );
 
-        if ( empty($temp_styles) ) {
+        if ( empty( $temp_styles ) ) {
             global $wpdb;
             // make sure there wasn't a conflict with the query
 			$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->posts . ' WHERE post_type=%s AND post_status=%s ORDER BY post_title ASC LIMIT 99', FrmStylesController::$post_type, 'publish' );
-            $temp_styles = FrmAppHelper::check_cache('frm_backup_style_check', 'frm_styles', $query, 'get_results');
+            $temp_styles = FrmAppHelper::check_cache( 'frm_backup_style_check', 'frm_styles', $query, 'get_results' );
 
-            if ( empty($temp_styles) ) {
+            if ( empty( $temp_styles ) ) {
                 // create a new style if there are none
          		$new = $this->get_new();
          		$new->post_title = $new->post_name = __( 'Formidable Style', 'formidable' );
          		$new->menu_order = 1;
-         		$new = $this->save( (array) $new);
-         		$this->update('default');
+         		$new = $this->save( (array) $new );
+         		$this->update( 'default' );
 
                 $post_atts['include'] = $new;
 
@@ -228,25 +228,25 @@ 
                 }
             }
 
-            $style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
+            $style->post_content = FrmAppHelper::maybe_json_decode( $style->post_content );
 
             // fill default values
-            $style->post_content = $this->override_defaults($style->post_content);
-            $style->post_content = wp_parse_args( $style->post_content, $default_values);
+            $style->post_content = $this->override_defaults( $style->post_content );
+            $style->post_content = wp_parse_args( $style->post_content, $default_values );
 
-			$styles[ $style->ID ] = $style;
+			$styles[$style->ID] = $style;
         }
 
         if ( ! $default_style ) {
-            $default_style = reset($styles);
-			$styles[ $default_style->ID ]->menu_order = 1;
+            $default_style = reset( $styles );
+			$styles[$default_style->ID]->menu_order = 1;
         }
 
         return $styles;
     }
 
 	public function get_default_style( $styles = null ) {
-        if ( ! isset($styles) ) {
+        if ( ! isset( $styles ) ) {
 			$styles = $this->get_all( 'menu_order', 'DESC', 1 );
         }
 
@@ -258,24 +258,24 @@ 
     }
 
 	public function override_defaults( $settings ) {
-	    if ( ! is_array($settings) ) {
+	    if ( ! is_array( $settings ) ) {
 	        return $settings;
 	    }
 
-	    $settings['line_height'] = ( ! isset($settings['field_height']) || $settings['field_height'] == '' || $settings['field_height'] == 'auto') ? 'normal' : $settings['field_height'];
+	    $settings['line_height'] = ( ! isset( $settings['field_height'] ) || $settings['field_height'] == '' || $settings['field_height'] == 'auto' ) ? 'normal' : $settings['field_height'];
 
-	    if ( ! isset($settings['form_desc_size']) && isset($settings['description_font_size']) ) {
+	    if ( ! isset( $settings['form_desc_size'] ) && isset( $settings['description_font_size'] ) ) {
 	        $settings['form_desc_size'] = $settings['description_font_size'];
 	        $settings['form_desc_color'] = $settings['description_color'];
 	        $settings['title_color'] = $settings['label_color'];
 	    }
 
-	    if ( ! isset($settings['section_color']) && isset($settings['label_color']) ) {
+	    if ( ! isset( $settings['section_color'] ) && isset( $settings['label_color'] ) ) {
 	        $settings['section_color'] = $settings['label_color'];
 	        $settings['section_border_color'] = $settings['border_color'];
 	    }
 
-	    if ( ! isset($settings['submit_hover_bg_color']) && isset($settings['submit_bg_color']) ) {
+	    if ( ! isset( $settings['submit_hover_bg_color'] ) && isset( $settings['submit_bg_color'] ) ) {
 	        $settings['submit_hover_bg_color'] = $settings['submit_bg_color'];
 	        $settings['submit_hover_color'] = $settings['submit_text_color'];
 	        $settings['submit_hover_border_color'] = $settings['submit_border_color'];

classes/models/FrmCreateFile.php

Spacing +7 added lines, -7 removed lines

@@ -18,8 +18,8 @@ 
 		$this->file_name = $atts['file_name'];
 		$this->error_message = isset( $atts['error_message'] ) ? $atts['error_message'] : '';
 		$this->uploads = wp_upload_dir();
-		$this->chmod_dir = defined('FS_CHMOD_DIR') ? FS_CHMOD_DIR : ( fileperms( ABSPATH ) & 0777 | 0755 );
-		$this->chmod_file = defined('FS_CHMOD_FILE') ? FS_CHMOD_FILE : ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 );
+		$this->chmod_dir = defined( 'FS_CHMOD_DIR' ) ? FS_CHMOD_DIR : ( fileperms( ABSPATH ) & 0777 | 0755 );
+		$this->chmod_file = defined( 'FS_CHMOD_FILE' ) ? FS_CHMOD_FILE : ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 );
 	}
 
 	public function create_file( $file_content ) {
@@ -85,13 +85,13 @@ 
 	private function get_ftp_creds( $type ) {
 		$credentials = get_option( 'ftp_credentials', array( 'hostname' => '', 'username' => '' ) );
 
-		$credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : $credentials['hostname'];
-		$credentials['username'] = defined('FTP_USER') ? FTP_USER : $credentials['username'];
-		$credentials['password'] = defined('FTP_PASS') ? FTP_PASS : '';
+		$credentials['hostname'] = defined( 'FTP_HOST' ) ? FTP_HOST : $credentials['hostname'];
+		$credentials['username'] = defined( 'FTP_USER' ) ? FTP_USER : $credentials['username'];
+		$credentials['password'] = defined( 'FTP_PASS' ) ? FTP_PASS : '';
 
 		// Check to see if we are setting the public/private keys for ssh
-		$credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : '';
-		$credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : '';
+		$credentials['public_key'] = defined( 'FTP_PUBKEY' ) ? FTP_PUBKEY : '';
+		$credentials['private_key'] = defined( 'FTP_PRIKEY' ) ? FTP_PRIKEY : '';
 
 		// Sanitize the hostname, Some people might pass in odd-data:
 		$credentials['hostname'] = preg_replace( '|\w+://|', '', $credentials['hostname'] ); //Strip any schemes off