Strategy11 / formidable-forms

classes/views/shared/head.php

Spacing +1 added lines, -1 removed lines

@@ -1,2 +1,2 @@
 <?php
-_deprecated_file( basename(__FILE__), '2.0', null, __( 'Use wp_enqueue_script and wp_enqueue_style.', 'formidable' ) );
+_deprecated_file( basename( __FILE__ ), '2.0', null, __( 'Use wp_enqueue_script and wp_enqueue_style.', 'formidable' ) );

classes/views/shared/mb_adv_info.php

Indentation +70 added lines, -70 removed lines

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

Spacing +28 added lines, -28 removed lines

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

classes/views/shared/update_message.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <div class="frm_update_msg <?php echo esc_attr( $class ) ?>">
  This plugin version does not give you access to <?php echo $features ?>.<br/>
- <a href="http://formidablepro.com/pricing/" target="_blank">Compare</a> our plans or enter your license number <a href="<?php echo esc_url( admin_url('admin.php?page=formidable-settings') ) ?>">here</a>
+ <a href="http://formidablepro.com/pricing/" target="_blank">Compare</a> our plans or enter your license number <a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-settings' ) ) ?>">here</a>
 </div>

classes/views/styles/_buttons.php

Spacing +22 added lines, -22 removed lines

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

classes/views/styles/_check-box-radio-fields.php

Spacing +9 added lines, -9 removed lines

@@ -1,26 +1,26 @@ 
 <div class="field-group clearfix frm-half frm-first-row">
 	<label><?php _e( 'Radio', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('radio_align') ) ?>" id="frm_radio_align">
-        <option value="block" <?php selected($style->post_content['radio_align'], 'block') ?>><?php _e( 'Multiple Rows' , 'formidable' ) ?></option>
-        <option value="inline" <?php selected($style->post_content['radio_align'], 'inline') ?>><?php _e( 'Single Row' , 'formidable' ) ?></option>
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'radio_align' ) ) ?>" id="frm_radio_align">
+        <option value="block" <?php selected( $style->post_content['radio_align'], 'block' ) ?>><?php _e( 'Multiple Rows', 'formidable' ) ?></option>
+        <option value="inline" <?php selected( $style->post_content['radio_align'], 'inline' ) ?>><?php _e( 'Single Row', 'formidable' ) ?></option>
 	</select>
 </div>
 
 <div class="field-group clearfix frm-half frm-first-row">
 	<label><?php _e( 'Check Box', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('check_align') ) ?>" id="frm_check_align">
-        <option value="block" <?php selected($style->post_content['check_align'], 'block') ?>><?php _e( 'Multiple Rows' , 'formidable' ) ?></option>
-        <option value="inline" <?php selected($style->post_content['check_align'], 'inline') ?>><?php _e( 'Single Row' , 'formidable' ) ?></option>
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'check_align' ) ) ?>" id="frm_check_align">
+        <option value="block" <?php selected( $style->post_content['check_align'], 'block' ) ?>><?php _e( 'Multiple Rows', 'formidable' ) ?></option>
+        <option value="inline" <?php selected( $style->post_content['check_align'], 'inline' ) ?>><?php _e( 'Single Row', 'formidable' ) ?></option>
 	</select>
 </div>
 
 <div class="field-group field-group-background clearfix">
 	<label><?php _e( 'Color', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('check_label_color') ) ?>" id="frm_check_label_color" class="hex" value="<?php echo esc_attr( $style->post_content['check_label_color'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'check_label_color' ) ) ?>" id="frm_check_label_color" class="hex" value="<?php echo esc_attr( $style->post_content['check_label_color'] ) ?>" />
 </div>
 <div class="field-group clearfix">
 	<label><?php _e( 'Weight', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('check_weight') ) ?>" id="frm_check_weight">
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'check_weight' ) ) ?>" id="frm_check_weight">
 		<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
 		<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['check_weight'], $value ) ?>><?php echo $name ?></option>
 		<?php } ?>
@@ -28,5 +28,5 @@ 
 </div>
 <div class="field-group clearfix">
 	<label><?php _e( 'Size', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('check_font_size') ) ?>" id="frm_check_font_size" value="<?php echo esc_attr( $style->post_content['check_font_size'] ) ?>"  size="3" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'check_font_size' ) ) ?>" id="frm_check_font_size" value="<?php echo esc_attr( $style->post_content['check_font_size'] ) ?>"  size="3" />
 </div>

classes/views/styles/_date-fields.php

Indentation +7 added lines, -7 removed lines

@@ -2,19 +2,19 @@
 $jquery_themes = FrmStylesHelper::jquery_themes();
 
 $alt_img_name = array(
-    'ui-lightness'  => 'ui_light',
-    'ui-darkness'   => 'ui_dark',
-    'start'         => 'start_menu',
-    'redmond'       => 'windoze',
-    'vader'         => 'black_matte',
-    'mint-choc'     => 'mint_choco',
+	'ui-lightness'  => 'ui_light',
+	'ui-darkness'   => 'ui_dark',
+	'start'         => 'start_menu',
+	'redmond'       => 'windoze',
+	'vader'         => 'black_matte',
+	'mint-choc'     => 'mint_choco',
 );
 $theme_names = array_keys($jquery_themes);
 $theme_names = array_combine($theme_names, $theme_names);
 
 foreach ( $theme_names as $k => $v ) {
 	$theme_names[ $k ] = str_replace( '-', '_', $v );
-    unset($k, $v);
+	unset($k, $v);
 }
 
 $alt_img_name = array_merge($theme_names, $alt_img_name);

Spacing +12 added lines, -12 removed lines

@@ -9,32 +9,32 @@
     'vader'         => 'black_matte',
     'mint-choc'     => 'mint_choco',
 );
-$theme_names = array_keys($jquery_themes);
-$theme_names = array_combine($theme_names, $theme_names);
+$theme_names = array_keys( $jquery_themes );
+$theme_names = array_combine( $theme_names, $theme_names );
 
 foreach ( $theme_names as $k => $v ) {
-	$theme_names[ $k ] = str_replace( '-', '_', $v );
-    unset($k, $v);
+	$theme_names[$k] = str_replace( '-', '_', $v );
+    unset( $k, $v );
 }
 
-$alt_img_name = array_merge($theme_names, $alt_img_name);
-unset($theme_names);
+$alt_img_name = array_merge( $theme_names, $alt_img_name );
+unset( $theme_names );
 
 ?>
 
 <div class="field-group clearfix frm-half frm-first-row">
 	<label><?php _e( 'Theme', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('theme_selector') ) ?>">
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'theme_selector' ) ) ?>">
 	    <?php foreach ( $jquery_themes as $theme_name => $theme_title ) { ?>
-        <option value="<?php echo esc_attr( $theme_name ) ?>" id="90_<?php echo esc_attr( $alt_img_name[ $theme_name ] ); ?>" <?php selected($theme_title, $style->post_content['theme_name']) ?>><?php echo esc_html( $theme_title ) ?></option>
+        <option value="<?php echo esc_attr( $theme_name ) ?>" id="90_<?php echo esc_attr( $alt_img_name[$theme_name] ); ?>" <?php selected( $theme_title, $style->post_content['theme_name'] ) ?>><?php echo esc_html( $theme_title ) ?></option>
         <?php } ?>
-        <option value="-1" <?php selected('-1', $style->post_content['theme_name']) ?>>&mdash; <?php _e( 'None', 'formidable' ) ?> &mdash;</option>
+        <option value="-1" <?php selected( '-1', $style->post_content['theme_name'] ) ?>>&mdash; <?php _e( 'None', 'formidable' ) ?> &mdash;</option>
 	</select>
 </div>
 
 <div class="field-group clearfix frm-half frm-first-row frm_right_text">
-    <img id="frm_show_cal" src="//jqueryui.com/resources/images/themeGallery/theme_90_<?php echo esc_attr( $alt_img_name[ $style->post_content['theme_css'] ] ) ?>.png" alt="" />
-	<input type="hidden" value="<?php echo esc_attr($style->post_content['theme_css']) ?>" id="frm_theme_css" name="<?php echo esc_attr( $frm_style->get_field_name('theme_css') ) ?>" />
-    <input type="hidden" value="<?php echo esc_attr($style->post_content['theme_name']) ?>" id="frm_theme_name" name="<?php echo esc_attr( $frm_style->get_field_name('theme_name') ) ?>" />
+    <img id="frm_show_cal" src="//jqueryui.com/resources/images/themeGallery/theme_90_<?php echo esc_attr( $alt_img_name[$style->post_content['theme_css']] ) ?>.png" alt="" />
+	<input type="hidden" value="<?php echo esc_attr( $style->post_content['theme_css'] ) ?>" id="frm_theme_css" name="<?php echo esc_attr( $frm_style->get_field_name( 'theme_css' ) ) ?>" />
+    <input type="hidden" value="<?php echo esc_attr( $style->post_content['theme_name'] ) ?>" id="frm_theme_name" name="<?php echo esc_attr( $frm_style->get_field_name( 'theme_name' ) ) ?>" />
 </div>
 <div class="clear"></div>

classes/views/styles/_field-colors.php

Spacing +24 added lines, -24 removed lines

@@ -4,7 +4,7 @@ 
 				<a href="?page=formidable-styles&page-tab=default#tabs-panel-default-color" class="nav-tab-link" data-type="tabs-panel-default-color"><?php _e( 'Default', 'formidable' ) ?></a>
 			</li>
 			<li <?php echo ( 'active-color' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a href="<?php echo esc_url('?page=formidable-styles&page-tab=active-color#page-active-color') ?>" class="nav-tab-link" data-type="tabs-panel-active-color"><?php _e( 'Active', 'formidable' ) ?></a>
+				<a href="<?php echo esc_url( '?page=formidable-styles&page-tab=active-color#page-active-color' ) ?>" class="nav-tab-link" data-type="tabs-panel-active-color"><?php _e( 'Active', 'formidable' ) ?></a>
 			</li>
 			<li <?php echo ( 'active-error' == $current_tab ? ' class="tabs"' : '' ); ?>>
 				<a href="?page=formidable-styles&page-tab=active-error#tabs-panel-active-error" class="nav-tab-link" data-type="tabs-panel-active-error"><?php _e( 'Error', 'formidable' ) ?></a>
@@ -19,28 +19,28 @@ 
 		?>">
 			<div class="field-group field-group-border clearfix">
             	<label class="background"><?php _e( 'BG color', 'formidable' ) ?></label>
-            	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('bg_color') ) ?>" id="frm_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['bg_color'] ) ?>" />
+            	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'bg_color' ) ) ?>" id="frm_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['bg_color'] ) ?>" />
             </div>
             <div class="field-group clearfix">
             	<label><?php _e( 'Text', 'formidable' ) ?></label>
-            	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('text_color') ) ?>" id="frm_text_color" class="hex" value="<?php echo esc_attr( $style->post_content['text_color'] ) ?>" />
+            	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'text_color' ) ) ?>" id="frm_text_color" class="hex" value="<?php echo esc_attr( $style->post_content['text_color'] ) ?>" />
             </div>
 
             <div class="field-group field-group-border clearfix">
             	<label><?php _e( 'Border', 'formidable' ) ?></label>
-            	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('border_color') ) ?>" id="frm_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['border_color'] ) ?>" />
+            	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'border_color' ) ) ?>" id="frm_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['border_color'] ) ?>" />
             </div>
             <div class="field-group clearfix">
             	<label><?php _e( 'Thickness', 'formidable' ) ?></label>
-            	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('field_border_width') ) ?>" id="frm_field_border_width" value="<?php echo esc_attr( $style->post_content['field_border_width'] ) ?>" size="4" />
+            	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'field_border_width' ) ) ?>" id="frm_field_border_width" value="<?php echo esc_attr( $style->post_content['field_border_width'] ) ?>" size="4" />
             </div>
             <div class="field-group clearfix">
 				<label><?php _e( 'Style', 'formidable' ) ?></label>
-            	<select name="<?php echo esc_attr( $frm_style->get_field_name('field_border_style') ) ?>" id="frm_field_border_style">
-            	    <option value="solid" <?php selected($style->post_content['field_border_style'], 'solid') ?>><?php _e( 'solid', 'formidable' ) ?></option>
-            		<option value="dotted" <?php selected($style->post_content['field_border_style'], 'dotted') ?>><?php _e( 'dotted', 'formidable' ) ?></option>
-            		<option value="dashed" <?php selected($style->post_content['field_border_style'], 'dashed') ?>><?php _e( 'dashed', 'formidable' ) ?></option>
-            		<option value="double" <?php selected($style->post_content['field_border_style'], 'double') ?>><?php _e( 'double', 'formidable' ) ?></option>
+            	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'field_border_style' ) ) ?>" id="frm_field_border_style">
+            	    <option value="solid" <?php selected( $style->post_content['field_border_style'], 'solid' ) ?>><?php _e( 'solid', 'formidable' ) ?></option>
+            		<option value="dotted" <?php selected( $style->post_content['field_border_style'], 'dotted' ) ?>><?php _e( 'dotted', 'formidable' ) ?></option>
+            		<option value="dashed" <?php selected( $style->post_content['field_border_style'], 'dashed' ) ?>><?php _e( 'dashed', 'formidable' ) ?></option>
+            		<option value="double" <?php selected( $style->post_content['field_border_style'], 'double' ) ?>><?php _e( 'double', 'formidable' ) ?></option>
             	</select>
             </div>
             <div class="clear"></div>
@@ -51,11 +51,11 @@ 
 		?>">
             <div class="field-group field-group-border clearfix">
             	<label class="background"><?php _e( 'BG color', 'formidable' ) ?></label>
-            	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('bg_color_active') ) ?>" id="frm_bg_color_active" class="hex" value="<?php echo esc_attr( $style->post_content['bg_color_active'] ) ?>" />
+            	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'bg_color_active' ) ) ?>" id="frm_bg_color_active" class="hex" value="<?php echo esc_attr( $style->post_content['bg_color_active'] ) ?>" />
             </div>
             <div class="field-group clearfix">
             	<label><?php _e( 'Border', 'formidable' ) ?></label>
-            	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('border_color_active') ) ?>" id="frm_border_color_active" class="hex" value="<?php echo esc_attr( $style->post_content['border_color_active'] ) ?>" />
+            	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'border_color_active' ) ) ?>" id="frm_border_color_active" class="hex" value="<?php echo esc_attr( $style->post_content['border_color_active'] ) ?>" />
             </div>
             <div class="clear"></div>
 		</div><!-- /.tabs-panel -->
@@ -65,28 +65,28 @@ 
 		?>">
 		    <div class="field-group field-group-border clearfix">
         	    <label class="background"><?php _e( 'BG color', 'formidable' ) ?></label>
-        	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('bg_color_error') ) ?>" id="frm_bg_color_error" class="hex" value="<?php echo esc_attr( $style->post_content['bg_color_error'] ) ?>" />
+        	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'bg_color_error' ) ) ?>" id="frm_bg_color_error" class="hex" value="<?php echo esc_attr( $style->post_content['bg_color_error'] ) ?>" />
             </div>
             <div class="field-group clearfix">
         	    <label><?php _e( 'Text', 'formidable' ) ?></label>
-        	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('text_color_error') ) ?>" id="frm_text_color_error" class="hex" value="<?php echo esc_attr( $style->post_content['text_color_error'] ) ?>" />
+        	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'text_color_error' ) ) ?>" id="frm_text_color_error" class="hex" value="<?php echo esc_attr( $style->post_content['text_color_error'] ) ?>" />
             </div>
 
             <div class="field-group field-group-border clearfix">
                 <label><?php _e( 'Border', 'formidable' ) ?></label>
-            	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('border_color_error') ) ?>" id="frm_border_color_error" class="hex" value="<?php echo esc_attr( $style->post_content['border_color_error'] ) ?>" />
+            	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'border_color_error' ) ) ?>" id="frm_border_color_error" class="hex" value="<?php echo esc_attr( $style->post_content['border_color_error'] ) ?>" />
             </div>
             <div class="field-group clearfix">
             	<label><?php _e( 'Thickness', 'formidable' ) ?></label>
-            	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('border_width_error') ) ?>" id="frm_border_width_error" value="<?php echo esc_attr( $style->post_content['border_width_error'] ) ?>" size="4" />
+            	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'border_width_error' ) ) ?>" id="frm_border_width_error" value="<?php echo esc_attr( $style->post_content['border_width_error'] ) ?>" size="4" />
             </div>
             <div class="field-group clearfix">
             	<label><?php _e( 'Style', 'formidable' ) ?></label>
-            	<select name="<?php echo esc_attr( $frm_style->get_field_name('border_style_error') ) ?>" id="frm_border_style_error">
-            	    <option value="solid" <?php selected($style->post_content['border_style_error'], 'solid') ?>><?php _e( 'solid', 'formidable' ) ?></option>
-            		<option value="dotted" <?php selected($style->post_content['border_style_error'], 'dotted') ?>><?php _e( 'dotted', 'formidable' ) ?></option>
-            		<option value="dashed" <?php selected($style->post_content['border_style_error'], 'dashed') ?>><?php _e( 'dashed', 'formidable' ) ?></option>
-            		<option value="double" <?php selected($style->post_content['border_style_error'], 'double') ?>><?php _e( 'double', 'formidable' ) ?></option>
+            	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'border_style_error' ) ) ?>" id="frm_border_style_error">
+            	    <option value="solid" <?php selected( $style->post_content['border_style_error'], 'solid' ) ?>><?php _e( 'solid', 'formidable' ) ?></option>
+            		<option value="dotted" <?php selected( $style->post_content['border_style_error'], 'dotted' ) ?>><?php _e( 'dotted', 'formidable' ) ?></option>
+            		<option value="dashed" <?php selected( $style->post_content['border_style_error'], 'dashed' ) ?>><?php _e( 'dashed', 'formidable' ) ?></option>
+            		<option value="double" <?php selected( $style->post_content['border_style_error'], 'double' ) ?>><?php _e( 'double', 'formidable' ) ?></option>
             	</select>
             </div>
 
@@ -98,16 +98,16 @@ 
 		?>">
 		    <div class="field-group field-group-border clearfix">
         	    <label class="background"><?php _e( 'BG color', 'formidable' ) ?></label>
-        	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('bg_color_disabled') ) ?>" id="frm_bg_color_disabled" class="hex" value="<?php echo esc_attr( $style->post_content['bg_color_disabled'] ) ?>" />
+        	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'bg_color_disabled' ) ) ?>" id="frm_bg_color_disabled" class="hex" value="<?php echo esc_attr( $style->post_content['bg_color_disabled'] ) ?>" />
             </div>
             <div class="field-group clearfix">
         	    <label><?php _e( 'Text', 'formidable' ) ?></label>
-        	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('text_color_disabled') ) ?>" id="frm_text_color_disabled" class="hex" value="<?php echo esc_attr( $style->post_content['text_color_disabled'] ) ?>" />
+        	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'text_color_disabled' ) ) ?>" id="frm_text_color_disabled" class="hex" value="<?php echo esc_attr( $style->post_content['text_color_disabled'] ) ?>" />
             </div>
 
             <div class="field-group clearfix">
                 <label><?php _e( 'Border', 'formidable' ) ?></label>
-            	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('border_color_disabled') ) ?>" id="frm_border_color_disabled" class="hex" value="<?php echo esc_attr( $style->post_content['border_color_disabled'] ) ?>" />
+            	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'border_color_disabled' ) ) ?>" id="frm_border_color_disabled" class="hex" value="<?php echo esc_attr( $style->post_content['border_color_disabled'] ) ?>" />
             </div>
             <div class="clear"></div>
 		</div><!-- /.tabs-panel -->

classes/views/styles/_field-description.php

Spacing +9 added lines, -9 removed lines

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

classes/views/styles/_field-labels.php

Spacing +12 added lines, -12 removed lines

@@ -1,10 +1,10 @@ 
 <div class="field-group field-group-background clearfix frm-first-row">
 	<label><?php _e( 'Color', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('label_color') ) ?>" id="frm_label_color" class="hex" value="<?php echo esc_attr( $style->post_content['label_color'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'label_color' ) ) ?>" id="frm_label_color" class="hex" value="<?php echo esc_attr( $style->post_content['label_color'] ) ?>" />
 </div>
 <div class="field-group clearfix frm-first-row">
 	<label><?php _e( 'Weight', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('weight') ) ?>" id="frm_weight">
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'weight' ) ) ?>" id="frm_weight">
 		<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
 		<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['weight'], $value ) ?>><?php echo $name ?></option>
 		<?php } ?>
@@ -12,45 +12,45 @@ 
 </div>
 <div class="field-group clearfix frm-first-row">
 	<label><?php _e( 'Size', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('font_size') ) ?>" id="frm_font_size" value="<?php echo esc_attr($style->post_content['font_size']) ?>"  size="3" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'font_size' ) ) ?>" id="frm_font_size" value="<?php echo esc_attr( $style->post_content['font_size'] ) ?>"  size="3" />
 </div>
 
 <div class="field-group clearfix frm_clear">
 	<label><?php _e( 'Position', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('position') ) ?>" id="frm_position">
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'position' ) ) ?>" id="frm_position">
 	    <?php foreach ( array( 'none' => __( 'top', 'formidable' ), 'left' => __( 'left', 'formidable' ), 'right' => __( 'right', 'formidable' ), 'no_label' => __( 'none', 'formidable' ) ) as $pos => $pos_label ) { ?>
-	        <option value="<?php echo esc_attr( $pos ) ?>" <?php selected($style->post_content['position'], $pos) ?>><?php echo $pos_label ?></option>
+	        <option value="<?php echo esc_attr( $pos ) ?>" <?php selected( $style->post_content['position'], $pos ) ?>><?php echo $pos_label ?></option>
 	    <?php } ?>
 	</select>
 </div>
 
 <div class="field-group clearfix">
 	<label><?php _e( 'Align', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('align') ) ?>" id="frm_align">
-		<option value="left" <?php selected($style->post_content['align'], 'left') ?>><?php _e( 'left', 'formidable' ) ?></option>
-		<option value="right" <?php selected($style->post_content['align'], 'right') ?>><?php _e( 'right', 'formidable' ) ?></option>
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'align' ) ) ?>" id="frm_align">
+		<option value="left" <?php selected( $style->post_content['align'], 'left' ) ?>><?php _e( 'left', 'formidable' ) ?></option>
+		<option value="right" <?php selected( $style->post_content['align'], 'right' ) ?>><?php _e( 'right', 'formidable' ) ?></option>
 	</select>
 </div>
 
 <div class="field-group clearfix">
 	<label><?php _e( 'Width', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('width') ) ?>" id="frm_width" value="<?php echo esc_attr( $style->post_content['width'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'width' ) ) ?>" id="frm_width" value="<?php echo esc_attr( $style->post_content['width'] ) ?>" />
 </div>
 
 <div class="field-group clearfix frm_clear">
 	<label><?php _e( 'Padding', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('label_padding') ) ?>" id="frm_label_padding" value="<?php echo esc_attr( $style->post_content['label_padding'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'label_padding' ) ) ?>" id="frm_label_padding" value="<?php echo esc_attr( $style->post_content['label_padding'] ) ?>" />
 </div>
 
 <div class="clear"></div>
 <h3><?php _e( 'Required Indicator', 'formidable' ) ?></h3>
 <div class="field-group field-group-border clearfix after-h3">
 	<label class="background"><?php _e( 'Color', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('required_color') ) ?>" id="frm_required_color" class="hex" value="<?php echo esc_attr( $style->post_content['required_color'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'required_color' ) ) ?>" id="frm_required_color" class="hex" value="<?php echo esc_attr( $style->post_content['required_color'] ) ?>" />
 </div>
 <div class="field-group clearfix after-h3">
 	<label><?php _e( 'Weight', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('required_weight') ) ?>" id="frm_required_weight">
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'required_weight' ) ) ?>" id="frm_required_weight">
 		<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
 		<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['required_weight'], $value ) ?>><?php echo $name ?></option>
 		<?php } ?>