Strategy11 / formidable-forms

classes/views/styles/_section-fields.php

Spacing +27 added lines, -27 removed lines

@@ -1,10 +1,10 @@ 
 <div class="posttypediv">
 	<ul class="posttype-tabs add-menu-item-tabs">
 		<li <?php echo ( 'default' == $current_tab ? ' class="tabs"' : '' ); ?>>
-    		<a href="<?php echo esc_url('?page=formidable-styles&page-tab=default#tabs-panel-headings') ?>" class="nav-tab-link" data-type="tabs-panel-headings" ><?php _e( 'Headings', 'formidable' ) ?></a>
+    		<a href="<?php echo esc_url( '?page=formidable-styles&page-tab=default#tabs-panel-headings' ) ?>" class="nav-tab-link" data-type="tabs-panel-headings" ><?php _e( 'Headings', 'formidable' ) ?></a>
     	</li>
 		<li <?php echo ( 'collapse' == $current_tab ? ' class="tabs"' : '' ); ?>>
-			<a href="<?php echo esc_url('?page=formidable-styles&page-tab=collapse#page-collapse') ?>" class="nav-tab-link" data-type="tabs-panel-collapse" ><?php _e( 'Collapsible', 'formidable' ) ?></a>
+			<a href="<?php echo esc_url( '?page=formidable-styles&page-tab=collapse#page-collapse' ) ?>" class="nav-tab-link" data-type="tabs-panel-collapse" ><?php _e( 'Collapsible', 'formidable' ) ?></a>
 		</li>
 		<li <?php echo ( 'repeat' == $current_tab ? ' class="tabs"' : '' ); ?>>
 			<a href="?page=formidable-styles&page-tab=repeat#tabs-panel-repeat" class="nav-tab-link" data-type="tabs-panel-repeat"><?php _e( 'Repeatable', 'formidable' ) ?></a>
@@ -16,12 +16,12 @@ 
 	?>">
 	    <div class="field-group field-group-background">
         	<label><?php _e( 'Color', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('section_color') ) ?>" id="frm_section_color" class="hex" value="<?php echo esc_attr( $style->post_content['section_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'section_color' ) ) ?>" id="frm_section_color" class="hex" value="<?php echo esc_attr( $style->post_content['section_color'] ) ?>" />
         </div>
 
         <div class="field-group">
         	<label><?php _e( 'Weight', 'formidable' ) ?></label>
-        	<select name="<?php echo esc_attr( $frm_style->get_field_name('section_weight') ) ?>" id="frm_section_weight">
+        	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'section_weight' ) ) ?>" id="frm_section_weight">
 				<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
 				<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['section_weight'], $value ) ?>><?php echo $name ?></option>
 				<?php } ?>
@@ -30,54 +30,54 @@ 
 
         <div class="field-group">
         	<label><?php _e( 'Size', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('section_font_size') ) ?>" id="frm_section_font_size" value="<?php echo esc_attr( $style->post_content['section_font_size'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'section_font_size' ) ) ?>" id="frm_section_font_size" value="<?php echo esc_attr( $style->post_content['section_font_size'] ) ?>" />
         </div>
 
         <div class="field-group field-group-border frm-half">
         	<label><?php _e( 'Padding', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('section_pad') ) ?>" id="frm_section_pad" value="<?php echo esc_attr( $style->post_content['section_pad'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'section_pad' ) ) ?>" id="frm_section_pad" value="<?php echo esc_attr( $style->post_content['section_pad'] ) ?>" />
         </div>
 
         <div class="field-group frm-half">
     	    <label class="background"><?php _e( 'BG color', 'formidable' ) ?></label>
-    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('section_bg_color') ) ?>" id="frm_section_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['section_bg_color'] ) ?>" />
+    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'section_bg_color' ) ) ?>" id="frm_section_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['section_bg_color'] ) ?>" />
         </div>
 
         <div class="field-group field-group-border frm-half">
         	<label><?php _e( 'Top Margin', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('section_mar_top') ) ?>" id="frm_section_mar_top" value="<?php echo esc_attr( $style->post_content['section_mar_top'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'section_mar_top' ) ) ?>" id="frm_section_mar_top" value="<?php echo esc_attr( $style->post_content['section_mar_top'] ) ?>" />
         </div>
         <div class="field-group frm-half">
         	<label><?php _e( 'Bottom Margin', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('section_mar_bottom') ) ?>" id="frm_section_mar_bottom" value="<?php echo esc_attr( $style->post_content['section_mar_bottom'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'section_mar_bottom' ) ) ?>" id="frm_section_mar_bottom" value="<?php echo esc_attr( $style->post_content['section_mar_bottom'] ) ?>" />
         </div>
 
         <div class="field-group field-group-border">
             <label><?php _e( 'Border', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('section_border_color') ) ?>" id="frm_section_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['section_border_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'section_border_color' ) ) ?>" id="frm_section_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['section_border_color'] ) ?>" />
         </div>
         <div class="field-group">
         	<label><?php _e( 'Thickness', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('section_border_width') ) ?>" id="frm_section_border_width" value="<?php echo esc_attr( $style->post_content['section_border_width'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'section_border_width' ) ) ?>" id="frm_section_border_width" value="<?php echo esc_attr( $style->post_content['section_border_width'] ) ?>" />
         </div>
         <div class="field-group">
         	<label><?php _e( 'Style', 'formidable' ) ?></label>
-        	<select name="<?php echo esc_attr( $frm_style->get_field_name('section_border_style') ) ?>" id="frm_section_border_style">
-        	    <option value="solid" <?php selected($style->post_content['section_border_style'], 'solid') ?>><?php _e( 'solid', 'formidable' ) ?></option>
-        		<option value="dotted" <?php selected($style->post_content['section_border_style'], 'dotted') ?>><?php _e( 'dotted', 'formidable' ) ?></option>
-        		<option value="dashed" <?php selected($style->post_content['section_border_style'], 'dashed') ?>><?php _e( 'dashed', 'formidable' ) ?></option>
-        		<option value="double" <?php selected($style->post_content['section_border_style'], 'double') ?>><?php _e( 'double', 'formidable' ) ?></option>
+        	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'section_border_style' ) ) ?>" id="frm_section_border_style">
+        	    <option value="solid" <?php selected( $style->post_content['section_border_style'], 'solid' ) ?>><?php _e( 'solid', 'formidable' ) ?></option>
+        		<option value="dotted" <?php selected( $style->post_content['section_border_style'], 'dotted' ) ?>><?php _e( 'dotted', 'formidable' ) ?></option>
+        		<option value="dashed" <?php selected( $style->post_content['section_border_style'], 'dashed' ) ?>><?php _e( 'dashed', 'formidable' ) ?></option>
+        		<option value="double" <?php selected( $style->post_content['section_border_style'], 'double' ) ?>><?php _e( 'double', 'formidable' ) ?></option>
         	</select>
         </div>
 
         <div class="field-group field-group-border frm-half">
         	<label><?php _e( 'Border Position', 'formidable' ) ?></label>
-        	<select name="<?php echo esc_attr( $frm_style->get_field_name('section_border_loc') ) ?>" id="frm_section_border_loc">
-        	    <option value="-top" <?php selected($style->post_content['section_border_loc'], '-top') ?>><?php _e( 'top', 'formidable' ) ?></option>
-        		<option value="-bottom" <?php selected($style->post_content['section_border_loc'], '-bottom') ?>><?php _e( 'bottom', 'formidable' ) ?></option>
-        		<option value="-left" <?php selected($style->post_content['section_border_loc'], '-left') ?>><?php _e( 'left', 'formidable' ) ?></option>
-        		<option value="-right" <?php selected($style->post_content['section_border_loc'], '-right') ?>><?php _e( 'right', 'formidable' ) ?></option>
-        		<option value="" <?php selected($style->post_content['section_border_loc'], '') ?>><?php _e( 'all', 'formidable' ) ?></option>
+        	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'section_border_loc' ) ) ?>" id="frm_section_border_loc">
+        	    <option value="-top" <?php selected( $style->post_content['section_border_loc'], '-top' ) ?>><?php _e( 'top', 'formidable' ) ?></option>
+        		<option value="-bottom" <?php selected( $style->post_content['section_border_loc'], '-bottom' ) ?>><?php _e( 'bottom', 'formidable' ) ?></option>
+        		<option value="-left" <?php selected( $style->post_content['section_border_loc'], '-left' ) ?>><?php _e( 'left', 'formidable' ) ?></option>
+        		<option value="-right" <?php selected( $style->post_content['section_border_loc'], '-right' ) ?>><?php _e( 'right', 'formidable' ) ?></option>
+        		<option value="" <?php selected( $style->post_content['section_border_loc'], '' ) ?>><?php _e( 'all', 'formidable' ) ?></option>
         	</select>
         </div>
         <div class="clear"></div>
@@ -88,14 +88,14 @@ 
 	?>">
 	    <div class="field-group frm-half">
         	<label><?php _e( 'Icons', 'formidable' ) ?></label>
-            <?php FrmStylesHelper::bs_icon_select($style, $frm_style, 'arrow'); ?>
+            <?php FrmStylesHelper::bs_icon_select( $style, $frm_style, 'arrow' ); ?>
         </div>
 
         <div class="field-group frm-half">
         	<label><?php _e( 'Icon Position', 'formidable' ) ?></label>
-        	<select name="<?php echo esc_attr( $frm_style->get_field_name('collapse_pos') ) ?>" id="frm_collapse_pos">
-        	    <option value="after" <?php selected($style->post_content['collapse_pos'], 'after') ?>><?php _e( 'After Heading', 'formidable' ) ?></option>
-        	    <option value="before" <?php selected($style->post_content['collapse_pos'], 'before') ?>><?php _e( 'Before Heading', 'formidable' ) ?></option>
+        	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'collapse_pos' ) ) ?>" id="frm_collapse_pos">
+        	    <option value="after" <?php selected( $style->post_content['collapse_pos'], 'after' ) ?>><?php _e( 'After Heading', 'formidable' ) ?></option>
+        	    <option value="before" <?php selected( $style->post_content['collapse_pos'], 'before' ) ?>><?php _e( 'Before Heading', 'formidable' ) ?></option>
         	</select>
         </div>
         <div class="clear"></div>
@@ -106,7 +106,7 @@ 
 	?>">
 	    <div class="field-group frm-half">
         	<label><?php _e( 'Icons', 'formidable' ) ?></label>
-            <?php FrmStylesHelper::bs_icon_select($style, $frm_style, 'minus'); ?>
+            <?php FrmStylesHelper::bs_icon_select( $style, $frm_style, 'minus' ); ?>
         </div>
         <div class="clear"></div>
 	</div><!-- /.tabs-panel -->

classes/views/styles/custom_css.php

Indentation +6 added lines, -6 removed lines

@@ -17,14 +17,14 @@
         <textarea name="<?php echo esc_attr( $frm_style->get_field_name('custom_css') ) ?>" id="frm_custom_css_box" class="hide-if-js"><?php echo FrmAppHelper::esc_textarea($style->post_content['custom_css']) ?></textarea>
 
         <?php
-        foreach ( $style->post_content as $k => $v ) {
-            if ( $k == 'custom_css' ) {
-                continue;
-            }
-        ?>
+		foreach ( $style->post_content as $k => $v ) {
+			if ( $k == 'custom_css' ) {
+				continue;
+			}
+		?>
         <input type="hidden" value="<?php echo esc_attr($v) ?>" name="<?php echo esc_attr( $frm_style->get_field_name( $k ) ) ?>" />    
         <?php
-        } ?>
+		} ?>
 		<p class="button-controls"><input type="submit" name="nav-menu-locations" id="nav-menu-locations" class="button button-primary left" value="<?php esc_attr_e( 'Save Changes', 'formidable' ) ?>" /></p>
 
     </form>

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <div class="nav-menus-php">
 <div class="wrap">
-    <?php FrmStylesHelper::style_menu('custom_css'); ?>
+    <?php FrmStylesHelper::style_menu( 'custom_css' ); ?>
 
     <p><?php esc_html_e( 'You can add custom css here or in your theme style.css', 'formidable' ) ?></p>
 
@@ -8,13 +8,13 @@ 
 
 	<form method="post">
 	    <input type="hidden" name="ID" value="<?php echo esc_attr( $style->ID ) ?>" />
-        <input type="hidden" name="<?php echo esc_attr( $frm_style->get_field_name('post_title', '') ); ?>" value="<?php echo esc_attr( $style->post_title ) ?>" />
-        <input type="hidden" name="<?php echo esc_attr( $frm_style->get_field_name('menu_order', '') ); ?>" value="<?php echo esc_attr( $style->menu_order ) ?>" />
+        <input type="hidden" name="<?php echo esc_attr( $frm_style->get_field_name( 'post_title', '' ) ); ?>" value="<?php echo esc_attr( $style->post_title ) ?>" />
+        <input type="hidden" name="<?php echo esc_attr( $frm_style->get_field_name( 'menu_order', '' ) ); ?>" value="<?php echo esc_attr( $style->menu_order ) ?>" />
         <input type="hidden" name="style_name" value="frm_style_<?php echo esc_attr( $style->post_name ) ?>" />
 		<input type="hidden" name="frm_action" value="save_css" />
         <?php wp_nonce_field( 'frm_custom_css_nonce', 'frm_custom_css' ); ?>
 
-        <textarea name="<?php echo esc_attr( $frm_style->get_field_name('custom_css') ) ?>" id="frm_custom_css_box" class="hide-if-js"><?php echo FrmAppHelper::esc_textarea($style->post_content['custom_css']) ?></textarea>
+        <textarea name="<?php echo esc_attr( $frm_style->get_field_name( 'custom_css' ) ) ?>" id="frm_custom_css_box" class="hide-if-js"><?php echo FrmAppHelper::esc_textarea( $style->post_content['custom_css'] ) ?></textarea>
 
         <?php
         foreach ( $style->post_content as $k => $v ) {
@@ -22,7 +22,7 @@ 
                 continue;
             }
         ?>
-        <input type="hidden" value="<?php echo esc_attr($v) ?>" name="<?php echo esc_attr( $frm_style->get_field_name( $k ) ) ?>" />    
+        <input type="hidden" value="<?php echo esc_attr( $v ) ?>" name="<?php echo esc_attr( $frm_style->get_field_name( $k ) ) ?>" />    
         <?php
         } ?>
 		<p class="button-controls"><input type="submit" name="nav-menu-locations" id="nav-menu-locations" class="button button-primary left" value="<?php esc_attr_e( 'Save Changes', 'formidable' ) ?>" /></p>

classes/views/styles/manage.php

Indentation +9 added lines, -9 removed lines

@@ -19,14 +19,14 @@ 
 
 			<tbody class="menu-locations">
 			    <?php
-			    if ( $forms ) {
-			        foreach ( $forms as $form ) {
-			            $this_style = isset($form->options['custom_style']) ? (int) $form->options['custom_style'] : 1;
-			            if ( 1 == $this_style ) {
-			                // use the default style
-			                $this_style = $default_style->ID;
-			            }
-			        ?>
+				if ( $forms ) {
+					foreach ( $forms as $form ) {
+						$this_style = isset($form->options['custom_style']) ? (int) $form->options['custom_style'] : 1;
+						if ( 1 == $this_style ) {
+							// use the default style
+							$this_style = $default_style->ID;
+						}
+					?>
 				<tr id="menu-locations-row">
 					<td class="menu-location-title"><strong><?php echo empty($form->name) ? __( '(no title)') : $form->name ?></strong></td>
 					<td class="menu-location-menus">
@@ -41,7 +41,7 @@ 
 					</td><!-- .menu-location-menus -->
 				</tr><!-- #menu-locations-row -->
 				<?php
-				    }
+					}
 				} else {
 				?>
 				<tr>

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <div class="nav-menus-php">
 <div class="wrap">
-    <?php FrmStylesHelper::style_menu('manage'); ?>
+    <?php FrmStylesHelper::style_menu( 'manage' ); ?>
 
-	<p><?php printf(__( 'Easily change which template your forms are using by making changes below.', 'formidable' ), '<a href="?page=formidable-styles&frm_action=new_style">', '</a>'); ?></p>
+	<p><?php printf( __( 'Easily change which template your forms are using by making changes below.', 'formidable' ), '<a href="?page=formidable-styles&frm_action=new_style">', '</a>' ); ?></p>
 
 	<?php include( FrmAppHelper::plugin_path() . '/classes/views/shared/errors.php' ); ?>
 
@@ -21,14 +21,14 @@ 
 			    <?php
 			    if ( $forms ) {
 			        foreach ( $forms as $form ) {
-			            $this_style = isset($form->options['custom_style']) ? (int) $form->options['custom_style'] : 1;
+			            $this_style = isset( $form->options['custom_style'] ) ? (int) $form->options['custom_style'] : 1;
 			            if ( 1 == $this_style ) {
 			                // use the default style
 			                $this_style = $default_style->ID;
 			            }
 			        ?>
 				<tr id="menu-locations-row">
-					<td class="menu-location-title"><strong><?php echo empty($form->name) ? __( '(no title)') : $form->name ?></strong></td>
+					<td class="menu-location-title"><strong><?php echo empty( $form->name ) ? __( '(no title)' ) : $form->name ?></strong></td>
 					<td class="menu-location-menus">
 					    <input type="hidden" name="prev_style[<?php echo esc_attr( $form->id ) ?>]" value="<?php echo esc_attr( $this_style ) ?>" />
 					    <select name="style[<?php echo esc_attr( $form->id ) ?>]">
@@ -37,7 +37,7 @@ 
 									<?php echo esc_html( $s->post_title . ( empty( $s->menu_order ) ? '' : ' (' . __( 'default', 'formidable' ) . ')' ) ) ?>
 								</option>
          		            <?php } ?>
-         		            <option value="" <?php selected(0, $this_style) ?>><?php _e( 'Styling disabled', 'formidable' ) ?></option>
+         		            <option value="" <?php selected( 0, $this_style ) ?>><?php _e( 'Styling disabled', 'formidable' ) ?></option>
          		        </select>
 
 					</td><!-- .menu-location-menus -->

classes/views/xml/forms_xml.php

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! $item_ids ) {
-    return;
+	return;
 }
 
 // fetch 20 posts at a time rather than loading the entire table into memory
@@ -45,6 +45,6 @@ 
 <?php	} ?>
 	</form>
 <?php
-    	unset( $fields );
+		unset( $fields );
 	}
 }

Spacing +12 added lines, -12 removed lines

@@ -13,16 +13,16 @@ 
 ?>
 	<form>
 		<id><?php echo $form->id ?></id>
-		<form_key><?php echo FrmXMLHelper::cdata($form->form_key) ?></form_key>
-		<name><?php echo FrmXMLHelper::cdata($form->name) ?></name>
-		<description><?php echo FrmXMLHelper::cdata($form->description) ?></description>
+		<form_key><?php echo FrmXMLHelper::cdata( $form->form_key ) ?></form_key>
+		<name><?php echo FrmXMLHelper::cdata( $form->name ) ?></name>
+		<description><?php echo FrmXMLHelper::cdata( $form->description ) ?></description>
 		<created_at><?php echo $form->created_at ?></created_at>
 		<logged_in><?php echo $form->logged_in ?></logged_in>
 		<is_template><?php echo $form->is_template ?></is_template>
 		<default_template><?php echo $form->default_template ?></default_template>
 		<editable><?php echo $form->editable ?></editable>
-		<options><?php echo FrmXMLHelper::prepare_form_options_for_export($form->options) ?></options>
-		<status><?php echo FrmXMLHelper::cdata($form->status) ?></status>
+		<options><?php echo FrmXMLHelper::prepare_form_options_for_export( $form->options ) ?></options>
+		<status><?php echo FrmXMLHelper::cdata( $form->status ) ?></status>
         <parent_form_id><?php echo $form->parent_form_id ?></parent_form_id>
 <?php
 
@@ -31,16 +31,16 @@ 
 		foreach ( $fields as $field ) { ?>
 		<field>
 		    <id><?php echo $field->id ?></id>
-            <field_key><?php echo FrmXMLHelper::cdata($field->field_key) ?></field_key>
-            <name><?php echo FrmXMLHelper::cdata($field->name) ?></name>
-            <description><?php echo FrmXMLHelper::cdata($field->description) ?></description>
-            <type><?php echo FrmXMLHelper::cdata($field->type) ?></type>
-            <default_value><?php echo FrmXMLHelper::cdata($field->default_value) ?></default_value>
+            <field_key><?php echo FrmXMLHelper::cdata( $field->field_key ) ?></field_key>
+            <name><?php echo FrmXMLHelper::cdata( $field->name ) ?></name>
+            <description><?php echo FrmXMLHelper::cdata( $field->description ) ?></description>
+            <type><?php echo FrmXMLHelper::cdata( $field->type ) ?></type>
+            <default_value><?php echo FrmXMLHelper::cdata( $field->default_value ) ?></default_value>
             <field_order><?php echo $field->field_order ?></field_order>
             <form_id><?php echo $field->form_id ?></form_id>
             <required><?php echo (bool) $field->required ?></required>
-            <options><?php echo FrmXMLHelper::cdata($field->options) ?></options>
-            <field_options><?php echo FrmXMLHelper::cdata($field->field_options) ?></field_options>
+            <options><?php echo FrmXMLHelper::cdata( $field->options ) ?></options>
+            <field_options><?php echo FrmXMLHelper::cdata( $field->field_options ) ?></field_options>
 		</field>
 <?php	} ?>
 	</form>

classes/views/xml/posts_xml.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 	}
 
     $frm_inc_tax[] = $term->term_id;
-    $label = ($term->taxonomy == 'category' || $term->taxonomy == 'tag') ? $term->taxonomy : 'term'; ?>
+    $label = ( $term->taxonomy == 'category' || $term->taxonomy == 'tag' ) ? $term->taxonomy : 'term'; ?>
 	<term><term_id><?php echo $term->term_id ?></term_id><term_taxonomy><?php echo $term->taxonomy; ?></term_taxonomy><?php
     if ( ! empty( $term->name ) ) {
         echo '<term_name>' . FrmXMLHelper::cdata( $term->name ) . '</term_name>';

Indentation +12 added lines, -12 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! $item_ids ) {
-    return;
+	return;
 }
 
 global $wp_query;
@@ -65,7 +65,7 @@ 
 }
 
 if ( empty( $taxonomies ) ) {
-    return;
+	return;
 }
 
 global $frm_inc_tax;
@@ -75,18 +75,18 @@ 
 
 foreach ( (array) $terms as $term ) {
 	if ( in_array( $term->term_id, $frm_inc_tax ) ) {
-        return;
+		return;
 	}
 
-    $frm_inc_tax[] = $term->term_id;
-    $label = ($term->taxonomy == 'category' || $term->taxonomy == 'tag') ? $term->taxonomy : 'term'; ?>
+	$frm_inc_tax[] = $term->term_id;
+	$label = ($term->taxonomy == 'category' || $term->taxonomy == 'tag') ? $term->taxonomy : 'term'; ?>
 	<term><term_id><?php echo esc_html( $term->term_id ) ?></term_id><term_taxonomy><?php echo esc_html( $term->taxonomy ); ?></term_taxonomy><?php
-    if ( ! empty( $term->name ) ) {
-        echo '<term_name>' . FrmXMLHelper::cdata( $term->name ) . '</term_name>';
-    }
-    if ( ! empty( $term->description ) ) {
-    ?><term_description><?php echo FrmXMLHelper::cdata( $term->description ) ?></term_description><?php
-    }
-    ?><term_slug><?php echo esc_html( $term->slug ); ?></term_slug></term>
+	if ( ! empty( $term->name ) ) {
+		echo '<term_name>' . FrmXMLHelper::cdata( $term->name ) . '</term_name>';
+	}
+	if ( ! empty( $term->description ) ) {
+	?><term_description><?php echo FrmXMLHelper::cdata( $term->description ) ?></term_description><?php
+	}
+	?><term_slug><?php echo esc_html( $term->slug ); ?></term_slug></term>
 <?php
 }

classes/widgets/FrmShowForm.php

Indentation +13 added lines, -13 removed lines

@@ -8,14 +8,14 @@ 
 	}
 
 	public function widget( $args, $instance ) {
-        if ( empty($instance['title']) ) {
-            $title = FrmForm::getName( $instance['form'] );
-        } else {
-            $title = $instance['title'];
-        }
-        $title = apply_filters('widget_title', $title);
+		if ( empty($instance['title']) ) {
+			$title = FrmForm::getName( $instance['form'] );
+		} else {
+			$title = $instance['title'];
+		}
+		$title = apply_filters('widget_title', $title);
 
-        $instance['description'] = isset($instance['description']) ? $instance['description'] : false;
+		$instance['description'] = isset($instance['description']) ? $instance['description'] : false;
 
 		echo $args['before_widget'];
 
@@ -35,9 +35,9 @@ 
 	}
 
 	public function form( $instance ) {
-	    //Defaults
+		//Defaults
 		$instance = wp_parse_args( (array) $instance, array(
-		    'title' => false, 'form' => false, 'description' => false,
+			'title' => false, 'form' => false, 'description' => false,
 		) );
 ?>
 	<p><label for="<?php echo esc_attr( $this->get_field_id('title') ); ?>"><?php _e( 'Title', 'formidable' ) ?>:</label><br/>
@@ -45,10 +45,10 @@ 
 
 	<p><label for="<?php echo esc_attr( $this->get_field_id('form') ); ?>"><?php _e( 'Form', 'formidable' ) ?>:</label><br/>
 <?php
-	    FrmFormsHelper::forms_dropdown( $this->get_field_name('form'), $instance['form'], array(
-	        'blank' => false, 'field_id' => $this->get_field_id('form'),
-            'class' => 'widefat',
-	    ) );
+		FrmFormsHelper::forms_dropdown( $this->get_field_name('form'), $instance['form'], array(
+			'blank' => false, 'field_id' => $this->get_field_id('form'),
+			'class' => 'widefat',
+		) );
 ?>
 	</p>
 

Spacing +12 added lines, -12 removed lines

@@ -4,27 +4,27 @@ 
 
 	public function __construct() {
 		$widget_ops = array( 'description' => __( 'Display a Formidable Form', 'formidable' ) );
-		parent::__construct('frm_show_form', __( 'Formidable Form', 'formidable' ), $widget_ops);
+		parent::__construct( 'frm_show_form', __( 'Formidable Form', 'formidable' ), $widget_ops );
 	}
 
 	public function widget( $args, $instance ) {
-        if ( empty($instance['title']) ) {
+        if ( empty( $instance['title'] ) ) {
             $title = FrmForm::getName( $instance['form'] );
         } else {
             $title = $instance['title'];
         }
-        $title = apply_filters('widget_title', $title);
+        $title = apply_filters( 'widget_title', $title );
 
-        $instance['description'] = isset($instance['description']) ? $instance['description'] : false;
+        $instance['description'] = isset( $instance['description'] ) ? $instance['description'] : false;
 
 		echo $args['before_widget'];
 
 		echo '<div class="frm_form_widget">';
 		if ( $title ) {
-			echo $args['before_title'] . stripslashes($title) . $args['after_title'];
+			echo $args['before_title'] . stripslashes( $title ) . $args['after_title'];
 		}
 
-		echo FrmFormsController::show_form($instance['form'], '', false, $instance['description']);
+		echo FrmFormsController::show_form( $instance['form'], '', false, $instance['description'] );
 
 		echo '</div>';
 		echo $args['after_widget'];
@@ -40,19 +40,19 @@ 
 		    'title' => false, 'form' => false, 'description' => false,
 		) );
 ?>
-	<p><label for="<?php echo esc_attr( $this->get_field_id('title') ); ?>"><?php _e( 'Title', 'formidable' ) ?>:</label><br/>
-	<input type="text" class="widefat" id="<?php echo esc_attr( $this->get_field_id('title') ); ?>" name="<?php echo esc_attr( $this->get_field_name('title') ); ?>" value="<?php echo esc_attr( stripslashes($instance['title']) ); ?>" /></p>
+	<p><label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title', 'formidable' ) ?>:</label><br/>
+	<input type="text" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" value="<?php echo esc_attr( stripslashes( $instance['title'] ) ); ?>" /></p>
 
-	<p><label for="<?php echo esc_attr( $this->get_field_id('form') ); ?>"><?php _e( 'Form', 'formidable' ) ?>:</label><br/>
+	<p><label for="<?php echo esc_attr( $this->get_field_id( 'form' ) ); ?>"><?php _e( 'Form', 'formidable' ) ?>:</label><br/>
 <?php
-	    FrmFormsHelper::forms_dropdown( $this->get_field_name('form'), $instance['form'], array(
-	        'blank' => false, 'field_id' => $this->get_field_id('form'),
+	    FrmFormsHelper::forms_dropdown( $this->get_field_name( 'form' ), $instance['form'], array(
+	        'blank' => false, 'field_id' => $this->get_field_id( 'form' ),
             'class' => 'widefat',
 	    ) );
 ?>
 	</p>
 
-	<p><label for="<?php echo esc_attr( $this->get_field_id('description') ); ?>"><input class="checkbox" type="checkbox" <?php checked($instance['description'], true) ?> id="<?php echo esc_attr( $this->get_field_id('description') ); ?>" name="<?php echo esc_attr( $this->get_field_name('description') ); ?>" value="1" />
+	<p><label for="<?php echo esc_attr( $this->get_field_id( 'description' ) ); ?>"><input class="checkbox" type="checkbox" <?php checked( $instance['description'], true ) ?> id="<?php echo esc_attr( $this->get_field_id( 'description' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'description' ) ); ?>" value="1" />
 	<?php _e( 'Show Description', 'formidable' ) ?></label></p>
 <?php
 	}

deprecated.php

Indentation +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 // 2.0
 if ( ! isset($frm_vars['pro_is_installed']) ) {
-    $frm_vars['pro_is_installed'] = false;
+	$frm_vars['pro_is_installed'] = false;
 }
 
 // Instansiate Models

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 // 2.0
-if ( ! isset($frm_vars['pro_is_installed']) ) {
+if ( ! isset( $frm_vars['pro_is_installed'] ) ) {
     $frm_vars['pro_is_installed'] = false;
 }
 

classes/helpers/FrmFormActionsHelper.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 

classes/helpers/FrmFormsHelper.php

Doc Comments +3 added lines

@@ -375,6 +375,9 @@
         $reset_fields = true;
     }
 
+    /**
+     * @return string
+     */
     public static function replace_shortcodes( $html, $form, $title = false, $description = false, $values = array() ) {
 		foreach ( array( 'form_name' => $title, 'form_description' => $description, 'entry_key' => true ) as $code => $show ) {
             if ( $code == 'form_name' ) {

Indentation +266 added lines, -266 removed lines

@@ -19,38 +19,38 @@ 
 
 	public static function get_direct_link( $key, $form = false ) {
 		$target_url = esc_url( admin_url( 'admin-ajax.php?action=frm_forms_preview&form=' . $key ) );
-        $target_url = apply_filters('frm_direct_link', $target_url, $key, $form);
-
-        return $target_url;
-    }
-
-    public static function forms_dropdown( $field_name, $field_value = '', $args = array() ) {
-        $defaults = array(
-            'blank'     => true,
-            'field_id'  => false,
-            'onchange'  => false,
-            'exclude'   => false,
-            'class'     => '',
+		$target_url = apply_filters('frm_direct_link', $target_url, $key, $form);
+
+		return $target_url;
+	}
+
+	public static function forms_dropdown( $field_name, $field_value = '', $args = array() ) {
+		$defaults = array(
+			'blank'     => true,
+			'field_id'  => false,
+			'onchange'  => false,
+			'exclude'   => false,
+			'class'     => '',
 			'inc_children' => 'exclude',
-        );
-        $args = wp_parse_args( $args, $defaults );
+		);
+		$args = wp_parse_args( $args, $defaults );
 
-        if ( ! $args['field_id'] ) {
-            $args['field_id'] = $field_name;
-        }
+		if ( ! $args['field_id'] ) {
+			$args['field_id'] = $field_name;
+		}
 
 		$query = array();
-        if ( $args['exclude'] ) {
+		if ( $args['exclude'] ) {
 			$query['id !'] = $args['exclude'];
-        }
+		}
 
-        $where = apply_filters('frm_forms_dropdown', $query, $field_name);
+		$where = apply_filters('frm_forms_dropdown', $query, $field_name);
 		$forms = FrmForm::get_published_forms( $where, 999, $args['inc_children'] );
 		$add_html = array();
 		self::add_html_attr( $args['onchange'], 'onchange', $add_html );
 		self::add_html_attr( $args['class'], 'class', $add_html );
 
-        ?>
+		?>
 		<select name="<?php echo esc_attr( $field_name ); ?>" id="<?php echo esc_attr( $args['field_id'] ) ?>" <?php echo implode( ' ', $add_html ); ?>>
 		<?php if ( $args['blank'] ) { ?>
 			<option value=""><?php echo ( $args['blank'] == 1 ) ? ' ' : '- ' . esc_attr( $args['blank'] ) . ' -'; ?></option>
@@ -62,7 +62,7 @@ 
 		<?php } ?>
         </select>
         <?php
-    }
+	}
 
 	/**
 	 * @param string $class
@@ -77,7 +77,7 @@ 
 		}
 	}
 
-    public static function form_switcher() {
+	public static function form_switcher() {
 		$where = apply_filters( 'frm_forms_dropdown', array(), '' );
 		$forms = FrmForm::get_published_forms( $where );
 
@@ -86,32 +86,32 @@ 
 			unset( $args['form'] );
 		} else if ( isset( $_GET['form']) && ! isset( $_GET['id'] ) ) {
 			unset( $args['id'] );
-        }
+		}
 
 		$frm_action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' );
 		if ( FrmAppHelper::is_admin_page( 'formidable-entries' ) && in_array( $frm_action, array( 'edit', 'show', 'destroy_all' ) ) ) {
-            $args['frm_action'] = 'list';
-            $args['form'] = 0;
+			$args['frm_action'] = 'list';
+			$args['form'] = 0;
 		} else if ( FrmAppHelper::is_admin_page('formidable' ) && in_array( $frm_action, array( 'new', 'duplicate' ) ) ) {
-            $args['frm_action'] = 'edit';
+			$args['frm_action'] = 'edit';
 		} else if ( isset( $_GET['post'] ) ) {
-            $args['form'] = 0;
-            $base = admin_url('edit.php?post_type=frm_display');
-        }
+			$args['form'] = 0;
+			$base = admin_url('edit.php?post_type=frm_display');
+		}
 
-        ?>
+		?>
 		<li class="dropdown last" id="frm_bs_dropdown">
 			<a href="#" id="frm-navbarDrop" class="frm-dropdown-toggle" data-toggle="dropdown"><?php _e( 'Switch Form', 'formidable' ) ?> <b class="caret"></b></a>
 		    <ul class="frm-dropdown-menu frm-on-top" role="menu" aria-labelledby="frm-navbarDrop">
 			<?php
 			foreach ( $forms as $form ) {
 				if ( isset( $args['id'] ) ) {
-			        $args['id'] = $form->id;
+					$args['id'] = $form->id;
 				}
-			    if ( isset( $args['form'] ) ) {
-			        $args['form'] = $form->id;
+				if ( isset( $args['form'] ) ) {
+					$args['form'] = $form->id;
 				}
-                ?>
+				?>
 				<li><a href="<?php echo esc_url( isset( $base ) ? add_query_arg( $args, $base ) : add_query_arg( $args ) ); ?>" tabindex="-1"><?php echo esc_html( empty( $form->name ) ? __( '(no title)') : FrmAppHelper::truncate( $form->name, 60 ) ); ?></a></li>
 			<?php
 				unset( $form );
@@ -119,12 +119,12 @@ 
 			</ul>
 		</li>
         <?php
-    }
+	}
 
 	public static function get_sortable_classes( $col, $sort_col, $sort_dir ) {
-        echo ($sort_col == $col) ? 'sorted' : 'sortable';
-        echo ($sort_col == $col && $sort_dir == 'desc') ? ' asc' : ' desc';
-    }
+		echo ($sort_col == $col) ? 'sorted' : 'sortable';
+		echo ($sort_col == $col && $sort_dir == 'desc') ? ' asc' : ' desc';
+	}
 
 	/**
 	 * Get the invalid form error message
@@ -148,104 +148,104 @@ 
 		return $message;
 	}
 
-    /**
-     * Used when a form is created
-     */
-    public static function setup_new_vars( $values = array() ) {
-        global $wpdb;
+	/**
+	 * Used when a form is created
+	 */
+	public static function setup_new_vars( $values = array() ) {
+		global $wpdb;
 
-        if ( ! empty( $values ) ) {
-            $post_values = $values;
-        } else {
-            $values = array();
-            $post_values = isset($_POST) ? $_POST : array();
-        }
+		if ( ! empty( $values ) ) {
+			$post_values = $values;
+		} else {
+			$values = array();
+			$post_values = isset($_POST) ? $_POST : array();
+		}
 
 		foreach ( array( 'name' => '', 'description' => '' ) as $var => $default ) {
 			if ( ! isset( $values[ $var ] ) ) {
 				$values[ $var ] = FrmAppHelper::get_param( $var, $default );
-            }
-        }
+			}
+		}
 
-        $values['description'] = FrmAppHelper::use_wpautop($values['description']);
+		$values['description'] = FrmAppHelper::use_wpautop($values['description']);
 
 		foreach ( array( 'form_id' => '', 'logged_in' => '', 'editable' => '', 'default_template' => 0, 'is_template' => 0, 'status' => 'draft', 'parent_form_id' => 0 ) as $var => $default ) {
-            if ( ! isset( $values[ $var ] ) ) {
+			if ( ! isset( $values[ $var ] ) ) {
 				$values[ $var ] = FrmAppHelper::get_param( $var, $default );
-            }
-        }
+			}
+		}
 
-        if ( ! isset( $values['form_key'] ) ) {
+		if ( ! isset( $values['form_key'] ) ) {
 			$values['form_key'] = ( $post_values && isset( $post_values['form_key'] ) ) ? $post_values['form_key'] : FrmAppHelper::get_unique_key( '', $wpdb->prefix . 'frm_forms', 'form_key' );
-        }
+		}
 
 		$values = self::fill_default_opts( $values, false, $post_values );
 		$values['custom_style'] = FrmAppHelper::custom_style_value( $values, $post_values );
 
-        return apply_filters('frm_setup_new_form_vars', $values);
-    }
+		return apply_filters('frm_setup_new_form_vars', $values);
+	}
 
-    /**
-     * Used when editing a form
-     */
-    public static function setup_edit_vars( $values, $record, $post_values = array() ) {
+	/**
+	 * Used when editing a form
+	 */
+	public static function setup_edit_vars( $values, $record, $post_values = array() ) {
 		if ( empty( $post_values ) ) {
 			$post_values = stripslashes_deep( $_POST );
 		}
 
-        $values['form_key'] = isset($post_values['form_key']) ? $post_values['form_key'] : $record->form_key;
-        $values['default_template'] = isset($post_values['default_template']) ? $post_values['default_template'] : $record->default_template;
-        $values['is_template'] = isset($post_values['is_template']) ? $post_values['is_template'] : $record->is_template;
-        $values['status'] = $record->status;
+		$values['form_key'] = isset($post_values['form_key']) ? $post_values['form_key'] : $record->form_key;
+		$values['default_template'] = isset($post_values['default_template']) ? $post_values['default_template'] : $record->default_template;
+		$values['is_template'] = isset($post_values['is_template']) ? $post_values['is_template'] : $record->is_template;
+		$values['status'] = $record->status;
 
-        $values = self::fill_default_opts($values, $record, $post_values);
+		$values = self::fill_default_opts($values, $record, $post_values);
 
-        return apply_filters('frm_setup_edit_form_vars', $values);
-    }
+		return apply_filters('frm_setup_edit_form_vars', $values);
+	}
 
 	public static function fill_default_opts( $values, $record, $post_values ) {
 
-        $defaults = self::get_default_opts();
+		$defaults = self::get_default_opts();
 		foreach ( $defaults as $var => $default ) {
-            if ( is_array($default) ) {
-                if ( ! isset( $values[ $var ] ) ) {
+			if ( is_array($default) ) {
+				if ( ! isset( $values[ $var ] ) ) {
 					$values[ $var ] = ( $record && isset( $record->options[ $var ] ) ) ? $record->options[ $var ] : array();
-                }
+				}
 
-                foreach ( $default as $k => $v ) {
+				foreach ( $default as $k => $v ) {
 					$values[ $var ][ $k ] = ( $post_values && isset( $post_values[ $var ][ $k ] ) ) ? $post_values[ $var ][ $k ] : ( ( $record && isset( $record->options[ $var ] ) && isset( $record->options[ $var ][ $k ] ) ) ? $record->options[ $var ][ $k ] : $v);
 
-                    if ( is_array( $v ) ) {
-                        foreach ( $v as $k1 => $v1 ) {
+					if ( is_array( $v ) ) {
+						foreach ( $v as $k1 => $v1 ) {
 							$values[ $var ][ $k ][ $k1 ] = ( $post_values && isset( $post_values[ $var ][ $k ][ $k1 ] ) ) ? $post_values[ $var ][ $k ][ $k1 ] : ( ( $record && isset( $record->options[ $var ] ) && isset( $record->options[ $var ][ $k ] ) && isset( $record->options[ $var ][ $k ][ $k1 ] ) ) ? $record->options[ $var ][ $k ][ $k1 ] : $v1 );
-                            unset( $k1, $v1 );
-                        }
-                    }
+							unset( $k1, $v1 );
+						}
+					}
 
-                    unset($k, $v);
-                }
-            } else {
+					unset($k, $v);
+				}
+			} else {
 				$values[ $var ] = ( $post_values && isset( $post_values['options'][ $var ] ) ) ? $post_values['options'][ $var ] : ( ( $record && isset( $record->options[ $var ] ) ) ? $record->options[ $var ] : $default );
-            }
+			}
 
-            unset($var, $default);
-        }
+			unset($var, $default);
+		}
 
-        return $values;
-    }
+		return $values;
+	}
 
-    public static function get_default_opts() {
-        $frm_settings = FrmAppHelper::get_settings();
+	public static function get_default_opts() {
+		$frm_settings = FrmAppHelper::get_settings();
 
-        return array(
-            'submit_value' => $frm_settings->submit_value, 'success_action' => 'message',
-            'success_msg' => $frm_settings->success_msg, 'show_form' => 0, 'akismet' => '',
-            'no_save' => 0, 'ajax_load' => 0, 'form_class' => '', 'custom_style' => 1,
-            'before_html' => self::get_default_html('before'),
-            'after_html' => '',
-            'submit_html' => self::get_default_html('submit'),
-        );
-    }
+		return array(
+			'submit_value' => $frm_settings->submit_value, 'success_action' => 'message',
+			'success_msg' => $frm_settings->success_msg, 'show_form' => 0, 'akismet' => '',
+			'no_save' => 0, 'ajax_load' => 0, 'form_class' => '', 'custom_style' => 1,
+			'before_html' => self::get_default_html('before'),
+			'after_html' => '',
+			'submit_html' => self::get_default_html('submit'),
+		);
+	}
 
 	/**
 	 * @param array $options
@@ -260,15 +260,15 @@ 
 		}
 	}
 
-    /**
-     * @param string $loc
-     */
+	/**
+	 * @param string $loc
+	 */
 	public static function get_default_html( $loc ) {
 		if ( $loc == 'submit' ) {
-            $sending = __( 'Sending', 'formidable' );
-            $draft_link = self::get_draft_link();
-            $img = '[frmurl]/images/ajax_loader.gif';
-            $default_html = <<<SUBMIT_HTML
+			$sending = __( 'Sending', 'formidable' );
+			$draft_link = self::get_draft_link();
+			$img = '[frmurl]/images/ajax_loader.gif';
+			$default_html = <<<SUBMIT_HTML
 <div class="frm_submit">
 [if back_button]<input type="button" value="[back_label]" name="frm_prev_page" formnovalidate="formnovalidate" class="frm_prev_page" [back_hook] />[/if back_button]
 <input type="submit" value="[button_label]" [button_action] />
@@ -277,49 +277,49 @@ 
 </div>
 SUBMIT_HTML;
 		} else if ( $loc == 'before' ) {
-            $default_html = <<<BEFORE_HTML
+			$default_html = <<<BEFORE_HTML
 <legend class="frm_hidden">[form_name]</legend>
 [if form_name]<h3 class="frm_form_title">[form_name]</h3>[/if form_name]
 [if form_description]<div class="frm_description">[form_description]</div>[/if form_description]
 BEFORE_HTML;
 		} else {
-            $default_html = '';
-        }
+			$default_html = '';
+		}
 
-        return $default_html;
-    }
+		return $default_html;
+	}
 
-    public static function get_draft_link() {
-        $link = '[if save_draft]<a href="#" class="frm_save_draft" [draft_hook]>[draft_label]</a>[/if save_draft]';
-        return $link;
-    }
+	public static function get_draft_link() {
+		$link = '[if save_draft]<a href="#" class="frm_save_draft" [draft_hook]>[draft_label]</a>[/if save_draft]';
+		return $link;
+	}
 
 	public static function get_custom_submit( $html, $form, $submit, $form_action, $values ) {
-        $button = self::replace_shortcodes($html, $form, $submit, $form_action, $values);
-        if ( ! strpos($button, '[button_action]') ) {
-            return;
-        }
+		$button = self::replace_shortcodes($html, $form, $submit, $form_action, $values);
+		if ( ! strpos($button, '[button_action]') ) {
+			return;
+		}
 
-        $button_parts = explode('[button_action]', $button);
-        echo $button_parts[0];
-        //echo ' id="frm_submit_"';
+		$button_parts = explode('[button_action]', $button);
+		echo $button_parts[0];
+		//echo ' id="frm_submit_"';
 
-        $classes = apply_filters('frm_submit_button_class', array(), $form);
-        if ( ! empty($classes) ) {
+		$classes = apply_filters('frm_submit_button_class', array(), $form);
+		if ( ! empty($classes) ) {
 			echo ' class="' . esc_attr( implode( ' ', $classes ) ) . '"';
-        }
-
-        do_action('frm_submit_button_action', $form, $form_action);
-        echo $button_parts[1];
-    }
-
-    /**
-     * Automatically add end section fields if they don't exist (2.0 migration)
-     * @since 2.0
-     *
-     * @param boolean $reset_fields
-     */
-    public static function auto_add_end_section_fields( $form, $fields, &$reset_fields ) {
+		}
+
+		do_action('frm_submit_button_action', $form, $form_action);
+		echo $button_parts[1];
+	}
+
+	/**
+	 * Automatically add end section fields if they don't exist (2.0 migration)
+	 * @since 2.0
+	 *
+	 * @param boolean $reset_fields
+	 */
+	public static function auto_add_end_section_fields( $form, $fields, &$reset_fields ) {
 		if ( empty( $fields ) ) {
 			return;
 		}
@@ -328,7 +328,7 @@ 
 		$open = $prev_order = false;
 		$add_order = 0;
 		$last_field = false;
-        foreach ( $fields as $field ) {
+		foreach ( $fields as $field ) {
 			if ( $prev_order === $field->field_order ) {
 				$add_order++;
 			}
@@ -339,48 +339,48 @@ 
 				FrmField::update( $field->id, array( 'field_order' => $field->field_order ) );
 			}
 
-            switch ( $field->type ) {
-                case 'divider':
-                    // create an end section if open
+			switch ( $field->type ) {
+				case 'divider':
+					// create an end section if open
 					self::maybe_create_end_section( $open, $reset_fields, $add_order, $end_section_values, $field, 'move' );
 
-                    // mark it open for the next end section
-                    $open = true;
-                break;
-                case 'break';
+					// mark it open for the next end section
+					$open = true;
+				break;
+				case 'break';
 					self::maybe_create_end_section( $open, $reset_fields, $add_order, $end_section_values, $field, 'move' );
-                break;
-                case 'end_divider':
-                    if ( ! $open ) {
-                        // the section isn't open, so this is an extra field that needs to be removed
-                        FrmField::destroy( $field->id );
-                        $reset_fields = true;
-                    }
-
-                    // There is already an end section here, so there is no need to create one
-                    $open = false;
-            }
+				break;
+				case 'end_divider':
+					if ( ! $open ) {
+						// the section isn't open, so this is an extra field that needs to be removed
+						FrmField::destroy( $field->id );
+						$reset_fields = true;
+					}
+
+					// There is already an end section here, so there is no need to create one
+					$open = false;
+			}
 			$prev_order = $field->field_order;
 
 			$last_field = $field;
 			unset( $field );
-        }
+		}
 
 		self::maybe_create_end_section( $open, $reset_fields, $add_order, $end_section_values, $last_field );
-    }
+	}
 
 	/**
 	 * Create end section field if it doesn't exist. This is for migration from < 2.0
 	 * Fix any ordering that may be messed up
 	 */
 	public static function maybe_create_end_section( &$open, &$reset_fields, &$add_order, $end_section_values, $field, $move = 'no' ) {
-        if ( ! $open ) {
-            return;
-        }
+		if ( ! $open ) {
+			return;
+		}
 
 		$end_section_values['field_order'] = $field->field_order + 1;
 
-        FrmField::create( $end_section_values );
+		FrmField::create( $end_section_values );
 
 		if ( $move == 'move' ) {
 			// bump the order of current field unless we're at the end of the form
@@ -388,39 +388,39 @@ 
 		}
 
 		$add_order += 2;
-        $open = false;
-        $reset_fields = true;
-    }
+		$open = false;
+		$reset_fields = true;
+	}
 
-    public static function replace_shortcodes( $html, $form, $title = false, $description = false, $values = array() ) {
+	public static function replace_shortcodes( $html, $form, $title = false, $description = false, $values = array() ) {
 		foreach ( array( 'form_name' => $title, 'form_description' => $description, 'entry_key' => true ) as $code => $show ) {
-            if ( $code == 'form_name' ) {
-                $replace_with = $form->name;
-            } else if ( $code == 'form_description' ) {
-                $replace_with = FrmAppHelper::use_wpautop($form->description);
-            } else if ( $code == 'entry_key' && isset($_GET) && isset($_GET['entry']) ) {
-                $replace_with = FrmAppHelper::simple_get( 'entry' );
-            } else {
-                $replace_with = '';
-            }
+			if ( $code == 'form_name' ) {
+				$replace_with = $form->name;
+			} else if ( $code == 'form_description' ) {
+				$replace_with = FrmAppHelper::use_wpautop($form->description);
+			} else if ( $code == 'entry_key' && isset($_GET) && isset($_GET['entry']) ) {
+				$replace_with = FrmAppHelper::simple_get( 'entry' );
+			} else {
+				$replace_with = '';
+			}
 
-            FrmFieldsHelper::remove_inline_conditions( ( FrmAppHelper::is_true($show) && $replace_with != '' ), $code, $replace_with, $html );
-        }
+			FrmFieldsHelper::remove_inline_conditions( ( FrmAppHelper::is_true($show) && $replace_with != '' ), $code, $replace_with, $html );
+		}
 
-        //replace [form_key]
-        $html = str_replace('[form_key]', $form->form_key, $html);
+		//replace [form_key]
+		$html = str_replace('[form_key]', $form->form_key, $html);
 
-        //replace [frmurl]
-        $html = str_replace('[frmurl]', FrmFieldsHelper::dynamic_default_values( 'frmurl' ), $html);
+		//replace [frmurl]
+		$html = str_replace('[frmurl]', FrmFieldsHelper::dynamic_default_values( 'frmurl' ), $html);
 
 		if ( strpos( $html, '[button_label]' ) ) {
 			add_filter( 'frm_submit_button', 'FrmFormsHelper::submit_button_label', 1 );
 			$submit_label = apply_filters( 'frm_submit_button', $title, $form );
 			$submit_label = esc_attr( do_shortcode( $submit_label ) );
 			$html = str_replace( '[button_label]', $submit_label, $html );
-        }
+		}
 
-        $html = apply_filters('frm_form_replace_shortcodes', $html, $form, $values);
+		$html = apply_filters('frm_form_replace_shortcodes', $html, $form, $values);
 
 		if ( strpos( $html, '[if back_button]' ) ) {
 			$html = preg_replace( '/(\[if\s+back_button\])(.*?)(\[\/if\s+back_button\])/mis', '', $html );
@@ -434,32 +434,32 @@ 
 			$html = do_shortcode( $html );
 		}
 
-        return $html;
-    }
+		return $html;
+	}
 
 	public static function submit_button_label( $submit ) {
-        if ( ! $submit || empty($submit) ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            $submit = $frm_settings->submit_value;
-        }
+		if ( ! $submit || empty($submit) ) {
+			$frm_settings = FrmAppHelper::get_settings();
+			$submit = $frm_settings->submit_value;
+		}
 
-        return $submit;
-    }
+		return $submit;
+	}
 
 	public static function get_form_style_class( $form = false ) {
-        $style = self::get_form_style($form);
-        $class = ' with_frm_style';
-
-        if ( empty($style) ) {
-            if ( FrmAppHelper::is_admin_page('formidable-entries') ) {
-                return $class;
-            } else {
-                return;
-            }
-        }
-
-        //If submit button needs to be inline or centered
-        if ( is_object($form) ) {
+		$style = self::get_form_style($form);
+		$class = ' with_frm_style';
+
+		if ( empty($style) ) {
+			if ( FrmAppHelper::is_admin_page('formidable-entries') ) {
+				return $class;
+			} else {
+				return;
+			}
+		}
+
+		//If submit button needs to be inline or centered
+		if ( is_object($form) ) {
 			$form = $form->options;
 		}
 
@@ -471,17 +471,17 @@ 
 			$class .= ' frm_center_submit';
 		}
 
-        $class = apply_filters('frm_add_form_style_class', $class, $style);
+		$class = apply_filters('frm_add_form_style_class', $class, $style);
 
-        return $class;
-    }
+		return $class;
+	}
 
-    /**
-     * @param string|boolean $form
-     *
-     * @return string
-     */
-    public static function get_form_style( $form ) {
+	/**
+	 * @param string|boolean $form
+	 *
+	 * @return string
+	 */
+	public static function get_form_style( $form ) {
 		$style = 1;
 		if ( empty( $form ) || 'default' == 'form' ) {
 			return $style;
@@ -501,7 +501,7 @@ 
 		$style = ( $form && is_object( $form ) && isset( $form->options['custom_style'] ) ) ? $form->options['custom_style'] : $style;
 
 		return $style;
-    }
+	}
 
 	/**
 	 * Display the validation error messages when an entry is submitted
@@ -556,74 +556,74 @@ 
 	}
 
 	public static function get_scroll_js( $form_id ) {
-        ?><script type="text/javascript">document.addEventListener('DOMContentLoaded',function(){frmFrontForm.scrollMsg(<?php echo (int) $form_id ?>);})</script><?php
-    }
+		?><script type="text/javascript">document.addEventListener('DOMContentLoaded',function(){frmFrontForm.scrollMsg(<?php echo (int) $form_id ?>);})</script><?php
+	}
 
 	public static function edit_form_link( $form_id ) {
-        if ( is_object($form_id) ) {
-            $form = $form_id;
-            $name = $form->name;
-            $form_id = $form->id;
-        } else {
-            $name = FrmForm::getName($form_id);
-        }
-
-        if ( $form_id ) {
+		if ( is_object($form_id) ) {
+			$form = $form_id;
+			$name = $form->name;
+			$form_id = $form->id;
+		} else {
+			$name = FrmForm::getName($form_id);
+		}
+
+		if ( $form_id ) {
 			$val = '<a href="' . esc_url( admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form_id ) ) . '">' . ( '' == $name ? __( '(no title)' ) : FrmAppHelper::truncate( $name, 40 ) ) . '</a>';
-	    } else {
-	        $val = '';
-	    }
+		} else {
+			$val = '';
+		}
 
-	    return $val;
+		return $val;
 	}
 
 	public static function delete_trash_link( $id, $status, $length = 'long' ) {
-        $link = '';
-        $labels = array(
-            'restore' => array(
-                'long'  => __( 'Restore from Trash', 'formidable' ),
-                'short' => __( 'Restore', 'formidable' ),
-            ),
-            'trash' => array(
-                'long'  => __( 'Move to Trash', 'formidable' ),
-                'short' => __( 'Trash', 'formidable' ),
-            ),
-            'delete' => array(
-                'long'  => __( 'Delete Permanently', 'formidable' ),
-                'short' => __( 'Delete', 'formidable' ),
-            ),
-        );
-
-        $current_page = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
+		$link = '';
+		$labels = array(
+			'restore' => array(
+				'long'  => __( 'Restore from Trash', 'formidable' ),
+				'short' => __( 'Restore', 'formidable' ),
+			),
+			'trash' => array(
+				'long'  => __( 'Move to Trash', 'formidable' ),
+				'short' => __( 'Trash', 'formidable' ),
+			),
+			'delete' => array(
+				'long'  => __( 'Delete Permanently', 'formidable' ),
+				'short' => __( 'Delete', 'formidable' ),
+			),
+		);
+
+		$current_page = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
 		$base_url = '?page=formidable&form_type=' . $current_page . '&id=' . $id;
-        if ( 'trash' == $status ) {
+		if ( 'trash' == $status ) {
 			$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=untrash', 'untrash_form_' . $id ) ) . '" class="submitdelete deletion">' . $labels['restore'][ $length ] . '</a>';
-        } else if ( current_user_can('frm_delete_forms') ) {
-            if ( EMPTY_TRASH_DAYS ) {
+		} else if ( current_user_can('frm_delete_forms') ) {
+			if ( EMPTY_TRASH_DAYS ) {
 				$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=trash', 'trash_form_' . $id ) ) . '" class="submitdelete deletion">' . $labels['trash'][ $length ] . '</a>';
-            } else {
+			} else {
 				$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=destroy', 'destroy_form_' . $id ) ) . '" class="submitdelete deletion" onclick="return confirm(\'' . esc_attr( __( 'Are you sure you want to delete this form and all its entries?', 'formidable' ) ) . '\')">' . $labels['delete'][ $length ] . '</a>';
-            }
-        }
+			}
+		}
 
-        return $link;
-    }
+		return $link;
+	}
 
 	public static function status_nice_name( $status ) {
-        $nice_names = array(
-            'draft'     => __( 'Draft', 'formidable' ),
-            'trash'     => __( 'Trash', 'formidable' ),
-            'publish'   => __( 'Published', 'formidable' ),
-        );
-
-        if ( ! in_array($status, array_keys($nice_names)) ) {
-            $status = 'publish';
-        }
+		$nice_names = array(
+			'draft'     => __( 'Draft', 'formidable' ),
+			'trash'     => __( 'Trash', 'formidable' ),
+			'publish'   => __( 'Published', 'formidable' ),
+		);
+
+		if ( ! in_array($status, array_keys($nice_names)) ) {
+			$status = 'publish';
+		}
 
 		$name = $nice_names[ $status ];
 
-        return $name;
-    }
+		return $name;
+	}
 
 	public static function get_params() {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmForm::list_page_params' );

Spacing +61 added lines, -61 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -19,7 +19,7 @@ 
 
 	public static function get_direct_link( $key, $form = false ) {
 		$target_url = esc_url( admin_url( 'admin-ajax.php?action=frm_forms_preview&form=' . $key ) );
-        $target_url = apply_filters('frm_direct_link', $target_url, $key, $form);
+        $target_url = apply_filters( 'frm_direct_link', $target_url, $key, $form );
 
         return $target_url;
     }
@@ -44,7 +44,7 @@ 
 			$query['id !'] = $args['exclude'];
         }
 
-        $where = apply_filters('frm_forms_dropdown', $query, $field_name);
+        $where = apply_filters( 'frm_forms_dropdown', $query, $field_name );
 		$forms = FrmForm::get_published_forms( $where, 999, $args['inc_children'] );
 		$add_html = array();
 		self::add_html_attr( $args['onchange'], 'onchange', $add_html );
@@ -57,7 +57,7 @@ 
 		<?php } ?>
 		<?php foreach ( $forms as $form ) { ?>
 			<option value="<?php echo esc_attr( $form->id ); ?>" <?php selected( $field_value, $form->id ); ?>><?php
-				echo ( '' == $form->name ) ? esc_html__( '(no title)', 'formidable' ) : esc_html( FrmAppHelper::truncate( $form->name, 50 ) ) . ( $form->parent_form_id ? esc_html__( ' (child)', 'formidable' ) : '' ) ;
+				echo ( '' == $form->name ) ? esc_html__( '(no title)', 'formidable' ) : esc_html( FrmAppHelper::truncate( $form->name, 50 ) ) . ( $form->parent_form_id ? esc_html__( ' (child)', 'formidable' ) : '' );
 			?></option>
 		<?php } ?>
         </select>
@@ -73,7 +73,7 @@ 
 	 */
 	public static function add_html_attr( $class, $param, &$add_html ) {
 		if ( ! empty( $class ) ) {
-			$add_html[ $param ] = sanitize_title( $param ) . '="' . esc_attr( trim( sanitize_text_field( $class ) ) ) . '"';
+			$add_html[$param] = sanitize_title( $param ) . '="' . esc_attr( trim( sanitize_text_field( $class ) ) ) . '"';
 		}
 	}
 
@@ -84,7 +84,7 @@ 
 		$args = array( 'id' => 0, 'form' => 0 );
 		if ( isset( $_GET['id'] ) && ! isset( $_GET['form'] ) ) {
 			unset( $args['form'] );
-		} else if ( isset( $_GET['form']) && ! isset( $_GET['id'] ) ) {
+		} else if ( isset( $_GET['form'] ) && ! isset( $_GET['id'] ) ) {
 			unset( $args['id'] );
         }
 
@@ -92,11 +92,11 @@ 
 		if ( FrmAppHelper::is_admin_page( 'formidable-entries' ) && in_array( $frm_action, array( 'edit', 'show', 'destroy_all' ) ) ) {
             $args['frm_action'] = 'list';
             $args['form'] = 0;
-		} else if ( FrmAppHelper::is_admin_page('formidable' ) && in_array( $frm_action, array( 'new', 'duplicate' ) ) ) {
+		} else if ( FrmAppHelper::is_admin_page( 'formidable' ) && in_array( $frm_action, array( 'new', 'duplicate' ) ) ) {
             $args['frm_action'] = 'edit';
 		} else if ( isset( $_GET['post'] ) ) {
             $args['form'] = 0;
-            $base = admin_url('edit.php?post_type=frm_display');
+            $base = admin_url( 'edit.php?post_type=frm_display' );
         }
 
         ?>
@@ -112,7 +112,7 @@ 
 			        $args['form'] = $form->id;
 				}
                 ?>
-				<li><a href="<?php echo esc_url( isset( $base ) ? add_query_arg( $args, $base ) : add_query_arg( $args ) ); ?>" tabindex="-1"><?php echo esc_html( empty( $form->name ) ? __( '(no title)') : FrmAppHelper::truncate( $form->name, 60 ) ); ?></a></li>
+				<li><a href="<?php echo esc_url( isset( $base ) ? add_query_arg( $args, $base ) : add_query_arg( $args ) ); ?>" tabindex="-1"><?php echo esc_html( empty( $form->name ) ? __( '(no title)' ) : FrmAppHelper::truncate( $form->name, 60 ) ); ?></a></li>
 			<?php
 				unset( $form );
 			} ?>
@@ -122,8 +122,8 @@ 
     }
 
 	public static function get_sortable_classes( $col, $sort_col, $sort_dir ) {
-        echo ($sort_col == $col) ? 'sorted' : 'sortable';
-        echo ($sort_col == $col && $sort_dir == 'desc') ? ' asc' : ' desc';
+        echo ( $sort_col == $col ) ? 'sorted' : 'sortable';
+        echo ( $sort_col == $col && $sort_dir == 'desc' ) ? ' asc' : ' desc';
     }
 
 	/**
@@ -158,20 +158,20 @@ 
             $post_values = $values;
         } else {
             $values = array();
-            $post_values = isset($_POST) ? $_POST : array();
+            $post_values = isset( $_POST ) ? $_POST : array();
         }
 
 		foreach ( array( 'name' => '', 'description' => '' ) as $var => $default ) {
-			if ( ! isset( $values[ $var ] ) ) {
-				$values[ $var ] = FrmAppHelper::get_param( $var, $default );
+			if ( ! isset( $values[$var] ) ) {
+				$values[$var] = FrmAppHelper::get_param( $var, $default );
             }
         }
 
-        $values['description'] = FrmAppHelper::use_wpautop($values['description']);
+        $values['description'] = FrmAppHelper::use_wpautop( $values['description'] );
 
 		foreach ( array( 'form_id' => '', 'logged_in' => '', 'editable' => '', 'default_template' => 0, 'is_template' => 0, 'status' => 'draft', 'parent_form_id' => 0 ) as $var => $default ) {
-            if ( ! isset( $values[ $var ] ) ) {
-				$values[ $var ] = FrmAppHelper::get_param( $var, $default );
+            if ( ! isset( $values[$var] ) ) {
+				$values[$var] = FrmAppHelper::get_param( $var, $default );
             }
         }
 
@@ -182,7 +182,7 @@ 
 		$values = self::fill_default_opts( $values, false, $post_values );
 		$values['custom_style'] = FrmAppHelper::custom_style_value( $values, $post_values );
 
-        return apply_filters('frm_setup_new_form_vars', $values);
+        return apply_filters( 'frm_setup_new_form_vars', $values );
     }
 
     /**
@@ -193,42 +193,42 @@ 
 			$post_values = stripslashes_deep( $_POST );
 		}
 
-        $values['form_key'] = isset($post_values['form_key']) ? $post_values['form_key'] : $record->form_key;
-        $values['default_template'] = isset($post_values['default_template']) ? $post_values['default_template'] : $record->default_template;
-        $values['is_template'] = isset($post_values['is_template']) ? $post_values['is_template'] : $record->is_template;
+        $values['form_key'] = isset( $post_values['form_key'] ) ? $post_values['form_key'] : $record->form_key;
+        $values['default_template'] = isset( $post_values['default_template'] ) ? $post_values['default_template'] : $record->default_template;
+        $values['is_template'] = isset( $post_values['is_template'] ) ? $post_values['is_template'] : $record->is_template;
         $values['status'] = $record->status;
 
-        $values = self::fill_default_opts($values, $record, $post_values);
+        $values = self::fill_default_opts( $values, $record, $post_values );
 
-        return apply_filters('frm_setup_edit_form_vars', $values);
+        return apply_filters( 'frm_setup_edit_form_vars', $values );
     }
 
 	public static function fill_default_opts( $values, $record, $post_values ) {
 
         $defaults = self::get_default_opts();
 		foreach ( $defaults as $var => $default ) {
-            if ( is_array($default) ) {
-                if ( ! isset( $values[ $var ] ) ) {
-					$values[ $var ] = ( $record && isset( $record->options[ $var ] ) ) ? $record->options[ $var ] : array();
+            if ( is_array( $default ) ) {
+                if ( ! isset( $values[$var] ) ) {
+					$values[$var] = ( $record && isset( $record->options[$var] ) ) ? $record->options[$var] : array();
                 }
 
                 foreach ( $default as $k => $v ) {
-					$values[ $var ][ $k ] = ( $post_values && isset( $post_values[ $var ][ $k ] ) ) ? $post_values[ $var ][ $k ] : ( ( $record && isset( $record->options[ $var ] ) && isset( $record->options[ $var ][ $k ] ) ) ? $record->options[ $var ][ $k ] : $v);
+					$values[$var][$k] = ( $post_values && isset( $post_values[$var][$k] ) ) ? $post_values[$var][$k] : ( ( $record && isset( $record->options[$var] ) && isset( $record->options[$var][$k] ) ) ? $record->options[$var][$k] : $v );
 
                     if ( is_array( $v ) ) {
                         foreach ( $v as $k1 => $v1 ) {
-							$values[ $var ][ $k ][ $k1 ] = ( $post_values && isset( $post_values[ $var ][ $k ][ $k1 ] ) ) ? $post_values[ $var ][ $k ][ $k1 ] : ( ( $record && isset( $record->options[ $var ] ) && isset( $record->options[ $var ][ $k ] ) && isset( $record->options[ $var ][ $k ][ $k1 ] ) ) ? $record->options[ $var ][ $k ][ $k1 ] : $v1 );
+							$values[$var][$k][$k1] = ( $post_values && isset( $post_values[$var][$k][$k1] ) ) ? $post_values[$var][$k][$k1] : ( ( $record && isset( $record->options[$var] ) && isset( $record->options[$var][$k] ) && isset( $record->options[$var][$k][$k1] ) ) ? $record->options[$var][$k][$k1] : $v1 );
                             unset( $k1, $v1 );
                         }
                     }
 
-                    unset($k, $v);
+                    unset( $k, $v );
                 }
             } else {
-				$values[ $var ] = ( $post_values && isset( $post_values['options'][ $var ] ) ) ? $post_values['options'][ $var ] : ( ( $record && isset( $record->options[ $var ] ) ) ? $record->options[ $var ] : $default );
+				$values[$var] = ( $post_values && isset( $post_values['options'][$var] ) ) ? $post_values['options'][$var] : ( ( $record && isset( $record->options[$var] ) ) ? $record->options[$var] : $default );
             }
 
-            unset($var, $default);
+            unset( $var, $default );
         }
 
         return $values;
@@ -241,9 +241,9 @@ 
             'submit_value' => $frm_settings->submit_value, 'success_action' => 'message',
             'success_msg' => $frm_settings->success_msg, 'show_form' => 0, 'akismet' => '',
             'no_save' => 0, 'ajax_load' => 0, 'form_class' => '', 'custom_style' => 1,
-            'before_html' => self::get_default_html('before'),
+            'before_html' => self::get_default_html( 'before' ),
             'after_html' => '',
-            'submit_html' => self::get_default_html('submit'),
+            'submit_html' => self::get_default_html( 'submit' ),
         );
     }
 
@@ -255,7 +255,7 @@ 
 	public static function fill_form_options( &$options, $values ) {
 		$defaults = self::get_default_opts();
 		foreach ( $defaults as $var => $default ) {
-			$options[ $var ] = isset( $values['options'][ $var ] ) ? $values['options'][ $var ] : $default;
+			$options[$var] = isset( $values['options'][$var] ) ? $values['options'][$var] : $default;
 			unset( $var, $default );
 		}
 	}
@@ -295,21 +295,21 @@ 
     }
 
 	public static function get_custom_submit( $html, $form, $submit, $form_action, $values ) {
-        $button = self::replace_shortcodes($html, $form, $submit, $form_action, $values);
-        if ( ! strpos($button, '[button_action]') ) {
+        $button = self::replace_shortcodes( $html, $form, $submit, $form_action, $values );
+        if ( ! strpos( $button, '[button_action]' ) ) {
             return;
         }
 
-        $button_parts = explode('[button_action]', $button);
+        $button_parts = explode( '[button_action]', $button );
         echo $button_parts[0];
         //echo ' id="frm_submit_"';
 
-        $classes = apply_filters('frm_submit_button_class', array(), $form);
-        if ( ! empty($classes) ) {
+        $classes = apply_filters( 'frm_submit_button_class', array(), $form );
+        if ( ! empty( $classes ) ) {
 			echo ' class="' . esc_attr( implode( ' ', $classes ) ) . '"';
         }
 
-        do_action('frm_submit_button_action', $form, $form_action);
+        do_action( 'frm_submit_button_action', $form, $form_action );
         echo $button_parts[1];
     }
 
@@ -330,7 +330,7 @@ 
 		$last_field = false;
         foreach ( $fields as $field ) {
 			if ( $prev_order === $field->field_order ) {
-				$add_order++;
+				$add_order ++;
 			}
 
 			if ( $add_order ) {
@@ -397,21 +397,21 @@ 
             if ( $code == 'form_name' ) {
                 $replace_with = $form->name;
             } else if ( $code == 'form_description' ) {
-                $replace_with = FrmAppHelper::use_wpautop($form->description);
-            } else if ( $code == 'entry_key' && isset($_GET) && isset($_GET['entry']) ) {
+                $replace_with = FrmAppHelper::use_wpautop( $form->description );
+            } else if ( $code == 'entry_key' && isset( $_GET ) && isset( $_GET['entry'] ) ) {
                 $replace_with = FrmAppHelper::simple_get( 'entry' );
             } else {
                 $replace_with = '';
             }
 
-            FrmFieldsHelper::remove_inline_conditions( ( FrmAppHelper::is_true($show) && $replace_with != '' ), $code, $replace_with, $html );
+            FrmFieldsHelper::remove_inline_conditions( ( FrmAppHelper::is_true( $show ) && $replace_with != '' ), $code, $replace_with, $html );
         }
 
         //replace [form_key]
-        $html = str_replace('[form_key]', $form->form_key, $html);
+        $html = str_replace( '[form_key]', $form->form_key, $html );
 
         //replace [frmurl]
-        $html = str_replace('[frmurl]', FrmFieldsHelper::dynamic_default_values( 'frmurl' ), $html);
+        $html = str_replace( '[frmurl]', FrmFieldsHelper::dynamic_default_values( 'frmurl' ), $html );
 
 		if ( strpos( $html, '[button_label]' ) ) {
 			add_filter( 'frm_submit_button', 'FrmFormsHelper::submit_button_label', 1 );
@@ -420,7 +420,7 @@ 
 			$html = str_replace( '[button_label]', $submit_label, $html );
         }
 
-        $html = apply_filters('frm_form_replace_shortcodes', $html, $form, $values);
+        $html = apply_filters( 'frm_form_replace_shortcodes', $html, $form, $values );
 
 		if ( strpos( $html, '[if back_button]' ) ) {
 			$html = preg_replace( '/(\[if\s+back_button\])(.*?)(\[\/if\s+back_button\])/mis', '', $html );
@@ -438,7 +438,7 @@ 
     }
 
 	public static function submit_button_label( $submit ) {
-        if ( ! $submit || empty($submit) ) {
+        if ( ! $submit || empty( $submit ) ) {
             $frm_settings = FrmAppHelper::get_settings();
             $submit = $frm_settings->submit_value;
         }
@@ -447,11 +447,11 @@ 
     }
 
 	public static function get_form_style_class( $form = false ) {
-        $style = self::get_form_style($form);
+        $style = self::get_form_style( $form );
         $class = ' with_frm_style';
 
-        if ( empty($style) ) {
-            if ( FrmAppHelper::is_admin_page('formidable-entries') ) {
+        if ( empty( $style ) ) {
+            if ( FrmAppHelper::is_admin_page( 'formidable-entries' ) ) {
                 return $class;
             } else {
                 return;
@@ -459,7 +459,7 @@ 
         }
 
         //If submit button needs to be inline or centered
-        if ( is_object($form) ) {
+        if ( is_object( $form ) ) {
 			$form = $form->options;
 		}
 
@@ -471,7 +471,7 @@ 
 			$class .= ' frm_center_submit';
 		}
 
-        $class = apply_filters('frm_add_form_style_class', $class, $style);
+        $class = apply_filters( 'frm_add_form_style_class', $class, $style );
 
         return $class;
     }
@@ -560,12 +560,12 @@ 
     }
 
 	public static function edit_form_link( $form_id ) {
-        if ( is_object($form_id) ) {
+        if ( is_object( $form_id ) ) {
             $form = $form_id;
             $name = $form->name;
             $form_id = $form->id;
         } else {
-            $name = FrmForm::getName($form_id);
+            $name = FrmForm::getName( $form_id );
         }
 
         if ( $form_id ) {
@@ -597,12 +597,12 @@ 
         $current_page = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
 		$base_url = '?page=formidable&form_type=' . $current_page . '&id=' . $id;
         if ( 'trash' == $status ) {
-			$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=untrash', 'untrash_form_' . $id ) ) . '" class="submitdelete deletion">' . $labels['restore'][ $length ] . '</a>';
-        } else if ( current_user_can('frm_delete_forms') ) {
+			$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=untrash', 'untrash_form_' . $id ) ) . '" class="submitdelete deletion">' . $labels['restore'][$length] . '</a>';
+        } else if ( current_user_can( 'frm_delete_forms' ) ) {
             if ( EMPTY_TRASH_DAYS ) {
-				$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=trash', 'trash_form_' . $id ) ) . '" class="submitdelete deletion">' . $labels['trash'][ $length ] . '</a>';
+				$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=trash', 'trash_form_' . $id ) ) . '" class="submitdelete deletion">' . $labels['trash'][$length] . '</a>';
             } else {
-				$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=destroy', 'destroy_form_' . $id ) ) . '" class="submitdelete deletion" onclick="return confirm(\'' . esc_attr( __( 'Are you sure you want to delete this form and all its entries?', 'formidable' ) ) . '\')">' . $labels['delete'][ $length ] . '</a>';
+				$link = '<a href="' . esc_url( wp_nonce_url( $base_url . '&frm_action=destroy', 'destroy_form_' . $id ) ) . '" class="submitdelete deletion" onclick="return confirm(\'' . esc_attr( __( 'Are you sure you want to delete this form and all its entries?', 'formidable' ) ) . '\')">' . $labels['delete'][$length] . '</a>';
             }
         }
 
@@ -616,11 +616,11 @@ 
             'publish'   => __( 'Published', 'formidable' ),
         );
 
-        if ( ! in_array($status, array_keys($nice_names)) ) {
+        if ( ! in_array( $status, array_keys( $nice_names ) ) ) {
             $status = 'publish';
         }
 
-		$name = $nice_names[ $status ];
+		$name = $nice_names[$status];
 
         return $name;
     }