Strategy11 / formidable-forms

classes/helpers/FrmCSVExportHelper.php

Braces +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-class FrmCSVExportHelper{
+class FrmCSVExportHelper {
 	protected static $separator        = ', ';
 	protected static $column_separator = ',';
 	protected static $line_break       = 'return';

Indentation +40 added lines, -40 removed lines

@@ -235,50 +235,50 @@ 
 			return $line;
 		}
 
-        $convmap = false;
+		$convmap = false;
 
 		switch ( self::$to_encoding ) {
-            case 'macintosh':
+			case 'macintosh':
 				// this map was derived from the differences between the MacRoman and UTF-8 Charsets
 				// Reference:
 				//   - http://www.alanwood.net/demos/macroman.html
-                $convmap = array(
-                    256, 304, 0, 0xffff,
-                    306, 337, 0, 0xffff,
-                    340, 375, 0, 0xffff,
-                    377, 401, 0, 0xffff,
-                    403, 709, 0, 0xffff,
-                    712, 727, 0, 0xffff,
-                    734, 936, 0, 0xffff,
-                    938, 959, 0, 0xffff,
-                    961, 8210, 0, 0xffff,
-                    8213, 8215, 0, 0xffff,
-                    8219, 8219, 0, 0xffff,
-                    8227, 8229, 0, 0xffff,
-                    8231, 8239, 0, 0xffff,
-                    8241, 8248, 0, 0xffff,
-                    8251, 8259, 0, 0xffff,
-                    8261, 8363, 0, 0xffff,
-                    8365, 8481, 0, 0xffff,
-                    8483, 8705, 0, 0xffff,
-                    8707, 8709, 0, 0xffff,
-                    8711, 8718, 0, 0xffff,
-                    8720, 8720, 0, 0xffff,
-                    8722, 8729, 0, 0xffff,
-                    8731, 8733, 0, 0xffff,
-                    8735, 8746, 0, 0xffff,
-                    8748, 8775, 0, 0xffff,
-                    8777, 8799, 0, 0xffff,
-                    8801, 8803, 0, 0xffff,
-                    8806, 9673, 0, 0xffff,
-                    9675, 63742, 0, 0xffff,
-                    63744, 64256, 0, 0xffff,
-                );
-            break;
-            case 'ISO-8859-1':
-                $convmap = array( 256, 10000, 0, 0xffff );
-            break;
-        }
+				$convmap = array(
+					256, 304, 0, 0xffff,
+					306, 337, 0, 0xffff,
+					340, 375, 0, 0xffff,
+					377, 401, 0, 0xffff,
+					403, 709, 0, 0xffff,
+					712, 727, 0, 0xffff,
+					734, 936, 0, 0xffff,
+					938, 959, 0, 0xffff,
+					961, 8210, 0, 0xffff,
+					8213, 8215, 0, 0xffff,
+					8219, 8219, 0, 0xffff,
+					8227, 8229, 0, 0xffff,
+					8231, 8239, 0, 0xffff,
+					8241, 8248, 0, 0xffff,
+					8251, 8259, 0, 0xffff,
+					8261, 8363, 0, 0xffff,
+					8365, 8481, 0, 0xffff,
+					8483, 8705, 0, 0xffff,
+					8707, 8709, 0, 0xffff,
+					8711, 8718, 0, 0xffff,
+					8720, 8720, 0, 0xffff,
+					8722, 8729, 0, 0xffff,
+					8731, 8733, 0, 0xffff,
+					8735, 8746, 0, 0xffff,
+					8748, 8775, 0, 0xffff,
+					8777, 8799, 0, 0xffff,
+					8801, 8803, 0, 0xffff,
+					8806, 9673, 0, 0xffff,
+					9675, 63742, 0, 0xffff,
+					63744, 64256, 0, 0xffff,
+				);
+			break;
+			case 'ISO-8859-1':
+				$convmap = array( 256, 10000, 0, 0xffff );
+			break;
+		}
 
 		if ( is_array( $convmap ) ) {
 			$line = mb_encode_numericentity( $line, $convmap, self::$charset );
@@ -289,7 +289,7 @@ 
 		}
 
 		return self::escape_csv( $line );
-    }
+	}
 
 	/**
 	 * Escape a " in a csv with another "

Spacing +25 added lines, -25 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class FrmCSVExportHelper{
+class FrmCSVExportHelper {
 	protected static $separator        = ', ';
 	protected static $column_separator = ',';
 	protected static $line_break       = 'return';
@@ -63,7 +63,7 @@ 
 		header( 'Content-Description: File Transfer' );
 		header( 'Content-Disposition: attachment; filename="' . esc_attr( $filename ) . '"' );
 		header( 'Content-Type: text/csv; charset=' . self::$charset, true );
-		header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', mktime( date( 'H' ) + 2, date( 'i' ), date( 's' ), date( 'm' ), date( 'd' ), date('Y' ) ) ) . ' GMT' );
+		header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', mktime( date( 'H' ) + 2, date( 'i' ), date( 's' ), date( 'm' ), date( 'd' ), date( 'Y' ) ) ) . ' GMT' );
 		header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
 		header( 'Cache-Control: no-cache, must-revalidate' );
 		header( 'Pragma: no-cache' );
@@ -90,21 +90,21 @@ 
 		foreach ( self::$fields as $col ) {
 			$field_headings = array();
 			if ( isset( $col->field_options['separate_value'] ) && $col->field_options['separate_value'] && ! in_array( $col->type, array( 'user_id', 'file', 'data', 'date' ) ) ) {
-				$field_headings[ $col->id . '_label' ] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
+				$field_headings[$col->id . '_label'] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
 			}
 
-			$field_headings[ $col->id ] = strip_tags( $col->name );
+			$field_headings[$col->id] = strip_tags( $col->name );
 			$field_headings = apply_filters( 'frm_csv_field_columns', $field_headings, array( 'field' => $col ) );
 			$headings += $field_headings;
 		}
 
 		if ( self::$comment_count ) {
-			for ( $i = 0; $i < self::$comment_count; $i++ ) {
-				$headings[ 'comment' . $i ] = __( 'Comment', 'formidable' );
-				$headings[ 'comment_user_id' . $i ] = __( 'Comment User', 'formidable' );
-				$headings[ 'comment_created_at' . $i ] = __( 'Comment Date', 'formidable' );
+			for ( $i = 0; $i < self::$comment_count; $i ++ ) {
+				$headings['comment' . $i] = __( 'Comment', 'formidable' );
+				$headings['comment_user_id' . $i] = __( 'Comment User', 'formidable' );
+				$headings['comment_created_at' . $i] = __( 'Comment Date', 'formidable' );
 			}
-			unset($i);
+			unset( $i );
 		}
 
 		$headings['created_at'] = __( 'Timestamp', 'formidable' );
@@ -151,30 +151,30 @@ 
 					continue;
 				}
 
-				if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = array();
-				} else if ( ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
+				if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = array();
+				} else if ( ! is_array( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
 					// if the data is here, it should be an array but if this field has collected data
 					// both while inside and outside of the repeating section, it's possible this is a string
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = (array) $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ];
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = (array) $entries[self::$entry->parent_item_id]->metas[$meta_id];
 				}
 
 				//add the repeated values
-				$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ][] = $meta_value;
+				$entries[self::$entry->parent_item_id]->metas[$meta_id][] = $meta_value;
 			}
-			$entries[ self::$entry->parent_item_id ]->metas += self::$entry->metas;
+			$entries[self::$entry->parent_item_id]->metas += self::$entry->metas;
 		}
 
 		// add the embedded form id
-		if ( ! isset( $entries[ self::$entry->parent_item_id ]->embedded_fields ) ) {
-			$entries[ self::$entry->parent_item_id ]->embedded_fields = array();
+		if ( ! isset( $entries[self::$entry->parent_item_id]->embedded_fields ) ) {
+			$entries[self::$entry->parent_item_id]->embedded_fields = array();
 		}
-		$entries[ self::$entry->parent_item_id ]->embedded_fields[ self::$entry->id ] = self::$entry->form_id;
+		$entries[self::$entry->parent_item_id]->embedded_fields[self::$entry->id] = self::$entry->form_id;
 	}
 
 	private static function add_field_values_to_csv( &$row ) {
 		foreach ( self::$fields as $col ) {
-			$field_value = isset( self::$entry->metas[ $col->id ] ) ? self::$entry->metas[ $col->id ] : false;
+			$field_value = isset( self::$entry->metas[$col->id] ) ? self::$entry->metas[$col->id] : false;
 
 			$field_value = maybe_unserialize( $field_value );
 			self::add_array_values_to_columns( $row, compact( 'col', 'field_value' ) );
@@ -185,13 +185,13 @@ 
 				$sep_value = FrmEntriesHelper::display_value( $field_value, $col, array(
 					'type' => $col->type, 'post_id' => self::$entry->post_id, 'show_icon' => false,
 					'entry_id' => self::$entry->id, 'sep' => self::$separator,
-					'embedded_field_id' => ( isset( self::$entry->embedded_fields ) && isset( self::$entry->embedded_fields[ self::$entry->id ] ) ) ? 'form' . self::$entry->embedded_fields[ self::$entry->id ] : 0,
+					'embedded_field_id' => ( isset( self::$entry->embedded_fields ) && isset( self::$entry->embedded_fields[self::$entry->id] ) ) ? 'form' . self::$entry->embedded_fields[self::$entry->id] : 0,
 					) );
-				$row[ $col->id . '_label' ] = $sep_value;
+				$row[$col->id . '_label'] = $sep_value;
 				unset( $sep_value );
 			}
 
-			$row[ $col->id ] = $field_value;
+			$row[$col->id] = $field_value;
 
 			unset( $col, $field_value );
 		}
@@ -204,8 +204,8 @@ 
 		if ( is_array( $atts['field_value'] ) ) {
 			foreach ( $atts['field_value'] as $key => $sub_value ) {
 				$column_key = $atts['col']->id . '_' . $key;
-				if ( ! is_numeric( $key ) && isset( self::$headings[ $column_key ] ) ) {
-					$row[ $column_key ] = $sub_value;
+				if ( ! is_numeric( $key ) && isset( self::$headings[$column_key] ) ) {
+					$row[$column_key] = $sub_value;
 				}
 			}
 		}
@@ -226,7 +226,7 @@ 
 		$sep = '';
 
 		foreach ( self::$headings as $k => $heading ) {
-			$row = isset( $rows[ $k ] ) ? $rows[ $k ] : '';
+			$row = isset( $rows[$k] ) ? $rows[$k] : '';
 			if ( is_array( $row ) ) {
 				// implode the repeated field values
 				$row = implode( self::$separator, FrmAppHelper::array_flatten( $row, 'reset' ) );

classes/views/xml/import_form.php

Indentation +2 added lines, -2 removed lines

@@ -87,9 +87,9 @@
 								} else if ( $form->is_template ) {
 									echo ' ' . __( '(template)', 'formidable' );
 								}
-                        ?></option>
+						?></option>
                         <?php
-                        } ?>
+						} ?>
                         </select>
                         <p class="howto"><?php _e( 'Hold down the CTRL/Command button to select multiple forms', 'formidable' ); ?></p>
                     </td>

Spacing +5 added lines, -5 removed lines

@@ -10,16 +10,16 @@ 
     <div class="postbox ">
     <h3 class="hndle"><span><?php _e( 'Import', 'formidable' ) ?></span></h3>
     <div class="inside">
-        <p class="howto"><?php echo apply_filters('frm_upload_instructions1', __( 'Upload your Formidable XML file to import forms into this site. If your imported form key and creation date match a form on your site, that form will be updated.', 'formidable' )) ?></p>
+        <p class="howto"><?php echo apply_filters( 'frm_upload_instructions1', __( 'Upload your Formidable XML file to import forms into this site. If your imported form key and creation date match a form on your site, that form will be updated.', 'formidable' ) ) ?></p>
         <br/>
         <form enctype="multipart/form-data" method="post">
             <input type="hidden" name="frm_action" value="import_xml" />
-            <?php wp_nonce_field('import-xml-nonce', 'import-xml'); ?>
-            <p><label><?php echo apply_filters('frm_upload_instructions2', __( 'Choose a Formidable XML file', 'formidable' )) ?> (<?php printf(__( 'Maximum size: %s', 'formidable' ), ini_get('upload_max_filesize')) ?>)</label>
+            <?php wp_nonce_field( 'import-xml-nonce', 'import-xml' ); ?>
+            <p><label><?php echo apply_filters( 'frm_upload_instructions2', __( 'Choose a Formidable XML file', 'formidable' ) ) ?> (<?php printf( __( 'Maximum size: %s', 'formidable' ), ini_get( 'upload_max_filesize' ) ) ?>)</label>
             <input type="file" name="frm_import_file" size="25" />
             </p>
 
-            <?php do_action('frm_csv_opts', $forms) ?>
+            <?php do_action( 'frm_csv_opts', $forms ) ?>
 
             <p class="submit">
 				<input type="submit" value="<?php esc_attr_e( 'Upload file and import', 'formidable' ) ?>" class="button-primary" />
@@ -35,7 +35,7 @@ 
     <div class="inside with_frm_style">
 		<form method="post" action="<?php echo esc_url( admin_url( 'admin-ajax.php' ) ); ?>" id="frm_export_xml">
             <input type="hidden" name="action" value="frm_export_xml" />
-            <?php wp_nonce_field('export-xml-nonce', 'export-xml'); ?>
+            <?php wp_nonce_field( 'export-xml-nonce', 'export-xml' ); ?>
 
             <table class="form-table">
                 <tr class="form-field">

classes/models/FrmPointers.php

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	/**
 	 * Get the singleton instance of this class
 	 *
-	 * @return object
+	 * @return FrmPointers
 	 */
 	public static function get_instance() {
 		if ( ! ( self::$instance instanceof self ) ) {

Spacing +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
 	private function do_page_pointer( $page ) {
 		$selector = 'h2';
 
-		$pointer = call_user_func( array( $this, $this->admin_pages[ $page ] ) );
+		$pointer = call_user_func( array( $this, $this->admin_pages[$page] ) );
 
 		$opt_arr = array(
 			'content'      => $pointer['content'],

Indentation +16 added lines, -16 removed lines

@@ -243,16 +243,16 @@ 
 
 		return array(
 			'content'   => '<h3>' . __( 'Forms', 'formidable' ) . '</h3>'
-			               . '<p>' . __( 'All your forms will be listed on this page. Create your first form by clicking on the "Add New" button.', 'formidable' ) . '</p>'
-			               . '<p><strong>' . __( 'Subscribe to our Newsletter', 'formidable' ) . '</strong><br/>'
-			               . sprintf( __( 'If you would like to hear about new features and updates for %1$s, subscribe to our newsletter:', 'formidable' ), 'Formidable' ) . '</p>'
-			               . '<form target="_blank" action="//formidablepro.us1.list-manage.com/subscribe/post?u=a4a913790ffb892daacc6f271&amp;id=7e7df15967" method="post" selector="newsletter-form" accept-charset="' . esc_attr( get_bloginfo( 'charset' ) ) . '">'
-			               . '<p>'
-			               . '<input style="margin: 5px; color:#666" name="EMAIL" value="' . esc_attr( $current_user->user_email ) . '" selector="newsletter-email" placeholder="' . esc_attr__( 'Email', 'formidable' ) . '"/>'
+						   . '<p>' . __( 'All your forms will be listed on this page. Create your first form by clicking on the "Add New" button.', 'formidable' ) . '</p>'
+						   . '<p><strong>' . __( 'Subscribe to our Newsletter', 'formidable' ) . '</strong><br/>'
+						   . sprintf( __( 'If you would like to hear about new features and updates for %1$s, subscribe to our newsletter:', 'formidable' ), 'Formidable' ) . '</p>'
+						   . '<form target="_blank" action="//formidablepro.us1.list-manage.com/subscribe/post?u=a4a913790ffb892daacc6f271&amp;id=7e7df15967" method="post" selector="newsletter-form" accept-charset="' . esc_attr( get_bloginfo( 'charset' ) ) . '">'
+						   . '<p>'
+						   . '<input style="margin: 5px; color:#666" name="EMAIL" value="' . esc_attr( $current_user->user_email ) . '" selector="newsletter-email" placeholder="' . esc_attr__( 'Email', 'formidable' ) . '"/>'
 						   . '<input type="hidden" name="group[4505]" value="4" />'
-			               . '<button type="submit" class="button-primary">' . esc_html__( 'Subscribe', 'formidable' ) . '</button>'
-			               . '</p>'
-			               . '</form>',
+						   . '<button type="submit" class="button-primary">' . esc_html__( 'Subscribe', 'formidable' ) . '</button>'
+						   . '</p>'
+						   . '</form>',
 			'next_page' => 'entries',
 		);
 	}
@@ -265,7 +265,7 @@ 
 	private function entries_pointer() {
 		return array(
 			'content'   => '<h3>' . __( 'Entries', 'formidable' ) . '</h3>'
-			               . '<p>' . __( 'Each time one of your forms is submitted, an entry is created. You will find every form submission listed here so you will always have a backup if an email fails.', 'formidable' ) . '</p>',
+						   . '<p>' . __( 'Each time one of your forms is submitted, an entry is created. You will find every form submission listed here so you will always have a backup if an email fails.', 'formidable' ) . '</p>',
 			'prev_page' => '',
 			'next_page' => 'styles',
 			'selector'  => '.wp-list-table',
@@ -281,7 +281,7 @@ 
 	private function styles_pointer() {
 		return array(
 			'content'   => '<h3>' . __( 'Styles', 'formidable' ) . '</h3>'
-			               . '<p>' . __( 'Want to make changes to the way your forms look? Make all the changes you would like right here, and watch the sample form change before your eyes.', 'formidable' ) . '</p>',
+						   . '<p>' . __( 'Want to make changes to the way your forms look? Make all the changes you would like right here, and watch the sample form change before your eyes.', 'formidable' ) . '</p>',
 			'prev_page' => 'entries',
 			'next_page' => 'import',
 			'selector'  => '.general-style',
@@ -297,7 +297,7 @@ 
 	private function import_pointer() {
 		return array(
 			'content'   => '<h3>' . __( 'Import/Export', 'formidable' ) . '</h3>'
-			               . '<p>' . __( 'Import and export forms and styles when copying from one site to another or sharing with someone else. Your entries can be exported to a CSV as well. The Premium version also includes the option to import entries to your site from a CSV.', 'formidable' ) . '</p>',
+						   . '<p>' . __( 'Import and export forms and styles when copying from one site to another or sharing with someone else. Your entries can be exported to a CSV as well. The Premium version also includes the option to import entries to your site from a CSV.', 'formidable' ) . '</p>',
 			'prev_page' => 'styles',
 			'next_page' => 'settings',
 			'selector'  => '.inside.with_frm_style',
@@ -317,7 +317,7 @@ 
 				. __( 'Turn stylesheets and scripts off, set which user roles have access to change and create forms, setup your reCaptcha, and set default messages for new forms and fields.', 'formidable' )
 				. '<p><strong>' . __( 'Plugin Licenses', 'formidable' ) . '</strong><br/>'
 				. sprintf( __( 'Once you&#8217;ve purchased %1$s or any addons, you&#8217;ll have to enter a license key to get access to all of their powerful features. A Plugin Licenses tab will appear here for you to enter your license key.', 'formidable' ), 'Formidable Pro' )
-           	    . '</p>',
+		   		. '</p>',
 			'prev_page' => 'import',
 			'next_page' => 'addons',
 		);
@@ -331,10 +331,10 @@ 
 	private function addons_pointer() {
 		return array(
 			'content'   => '<h3>' . __( 'Addons', 'formidable' ) . '</h3>'
-			               . '<p>' . sprintf( __( 'The powerful functions of %1$s can be extended with %2$spremium plugins%3$s. You can read all about the Formidable Premium Plugins %2$shere%3$s.', 'formidable' ), 'Formidable', '<a target="_blank" href="' . esc_url( FrmAppHelper::make_affiliate_url( 'https://formidablepro.com/' ) ) . '">', '</a>' )
+						   . '<p>' . sprintf( __( 'The powerful functions of %1$s can be extended with %2$spremium plugins%3$s. You can read all about the Formidable Premium Plugins %2$shere%3$s.', 'formidable' ), 'Formidable', '<a target="_blank" href="' . esc_url( FrmAppHelper::make_affiliate_url( 'https://formidablepro.com/' ) ) . '">', '</a>' )
 						   . '</p>'
-			               . '<p><strong>' . __( 'Like this plugin?', 'formidable' ) . '</strong><br/>' . sprintf( __( 'So, we&#8217;ve come to the end of the tour. If you like the plugin, please %srate it 5 stars on WordPress.org%s!', 'formidable' ), '<a target="_blank" href="https://wordpress.org/plugins/formidable/">', '</a>' ) . '</p>'
-			               . '<p>' . sprintf( __( 'Thank you for using our plugin and good luck with your forms!<br/><br/>Best,<br/>Team Formidable - %1$sformidablepro.com%2$s', 'formidable' ), '<a target="_blank" href="' . esc_url( FrmAppHelper::make_affiliate_url( 'https://formidablepro.com/' ) ) . '">', '</a>' ) . '</p>',
+						   . '<p><strong>' . __( 'Like this plugin?', 'formidable' ) . '</strong><br/>' . sprintf( __( 'So, we&#8217;ve come to the end of the tour. If you like the plugin, please %srate it 5 stars on WordPress.org%s!', 'formidable' ), '<a target="_blank" href="https://wordpress.org/plugins/formidable/">', '</a>' ) . '</p>'
+						   . '<p>' . sprintf( __( 'Thank you for using our plugin and good luck with your forms!<br/><br/>Best,<br/>Team Formidable - %1$sformidablepro.com%2$s', 'formidable' ), '<a target="_blank" href="' . esc_url( FrmAppHelper::make_affiliate_url( 'https://formidablepro.com/' ) ) . '">', '</a>' ) . '</p>',
 			'prev_page' => 'settings',
 		);
 	}

classes/views/styles/_field-colors.php

Spacing +26 added lines, -26 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,34 +19,34 @@ 
 		?>">
 			<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>
 			<p class="frm_no_bottom_margin">
 				<label>
-					<input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name('remove_box_shadow') ) ?>" id="frm_remove_box_shadow" value="1" <?php checked($style->post_content['remove_box_shadow'], 1) ?> />
+					<input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name( 'remove_box_shadow' ) ) ?>" id="frm_remove_box_shadow" value="1" <?php checked( $style->post_content['remove_box_shadow'], 1 ) ?> />
 					<?php _e( 'Remove box shadow', 'formidable' ) ?>
 				</label>
 			</p>
@@ -57,16 +57,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_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>
 			<p class="frm_no_bottom_margin">
 				<label>
-					<input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name('remove_box_shadow_active') ) ?>" id="frm_remove_box_shadow_active" value="1" <?php checked($style->post_content['remove_box_shadow_active'], 1) ?> />
+					<input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name( 'remove_box_shadow_active' ) ) ?>" id="frm_remove_box_shadow_active" value="1" <?php checked( $style->post_content['remove_box_shadow_active'], 1 ) ?> />
 					<?php _e( 'Remove box shadow', 'formidable' ) ?>
 				</label>
 			</p>
@@ -77,28 +77,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>
 
@@ -110,16 +110,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-sizes.php

Spacing +8 added lines, -8 removed lines

@@ -1,42 +1,42 @@
 <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('field_font_size') ) ?>" id="frm_field_font_size" value="<?php echo esc_attr( $style->post_content['field_font_size'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'field_font_size' ) ) ?>" id="frm_field_font_size" value="<?php echo esc_attr( $style->post_content['field_font_size'] ) ?>" />
 </div>
 
 <div class="field-group clearfix frm-first-row">
 	<label><?php _e( 'Height', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('field_height') ) ?>" id="frm_field_height" value="<?php echo esc_attr( $style->post_content['field_height'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'field_height' ) ) ?>" id="frm_field_height" value="<?php echo esc_attr( $style->post_content['field_height'] ) ?>" />
 </div>
 
 <div class="field-group clearfix frm-first-row">
 	<label><?php _e( 'Width', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('field_width') ) ?>" id="frm_field_width" value="<?php echo esc_attr( $style->post_content['field_width'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'field_width' ) ) ?>" id="frm_field_width" value="<?php echo esc_attr( $style->post_content['field_width'] ) ?>" />
 </div>
 
 <div class="clear"></div>
 <p class="frm_no_bottom_margin">
-    <label><input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name('auto_width') ) ?>" id="frm_auto_width" value="1" <?php checked( $style->post_content['auto_width'], 1 ) ?> />
+    <label><input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name( 'auto_width' ) ) ?>" id="frm_auto_width" value="1" <?php checked( $style->post_content['auto_width'], 1 ) ?> />
 	<?php _e( 'Automatic Width for drop-down fields', 'formidable' ) ?></label>
 </p>
 
 <div class="field-group clearfix">
 	<label><?php _e( 'Padding', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('field_pad') ) ?>" id="frm_field_pad" value="<?php echo esc_attr( $style->post_content['field_pad'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'field_pad' ) ) ?>" id="frm_field_pad" value="<?php echo esc_attr( $style->post_content['field_pad'] ) ?>" />
 </div>
 
 <div class="field-group clearfix">
 	<label><?php _e( 'Margin', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('field_margin') ) ?>" id="frm_field_margin" value="<?php echo esc_attr( $style->post_content['field_margin'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'field_margin' ) ) ?>" id="frm_field_margin" value="<?php echo esc_attr( $style->post_content['field_margin'] ) ?>" />
 </div>
 
 <div class="field-group clearfix">
 	<label><?php _e( 'Corners', 'formidable' ) ?> <span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Formidable uses CSS3 border-radius for corner rounding, which is not currently supported by Internet Explorer.', 'formidable' ) ?>" ></span></label>
-	<input type="text" value="<?php echo esc_attr( $style->post_content['border_radius'] ) ?>" name="<?php echo esc_attr( $frm_style->get_field_name('border_radius') ) ?>" id="frm_border_radius" />
+	<input type="text" value="<?php echo esc_attr( $style->post_content['border_radius'] ) ?>" name="<?php echo esc_attr( $frm_style->get_field_name( 'border_radius' ) ) ?>" id="frm_border_radius" />
 </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('field_weight') ) ?>" id="frm_field_weight">
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'field_weight' ) ) ?>" id="frm_field_weight">
 		<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
 			<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['field_weight'], $value ) ?>><?php echo $name ?></option>
 		<?php } ?>

classes/views/styles/_general.php

Spacing +15 added lines, -15 removed lines

@@ -1,59 +1,59 @@
 <p>
-    <label><input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name('center_form') ) ?>" id="frm_center_form" value="1" <?php checked($style->post_content['center_form'], 1) ?> />
+    <label><input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name( 'center_form' ) ) ?>" id="frm_center_form" value="1" <?php checked( $style->post_content['center_form'], 1 ) ?> />
 	    <?php _e( 'Center form on page', 'formidable' ) ?> <span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'This will center your form on the page where it is published if the form width is less than the available width on the page.', 'formidable' ) ?>" ></span>
 	</label>
 </p>
 
 <div class="field-group clearfix frm-first-row">
 	<label><?php _e( 'Alignment', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('form_align') ) ?>" id="frm_form_align">
-		<option value="left" <?php selected($style->post_content['form_align'], 'left') ?>><?php _e( 'left', 'formidable' ) ?></option>
-		<option value="right" <?php selected($style->post_content['form_align'], 'right') ?>><?php _e( 'right', 'formidable' ) ?></option>
-		<option value="center" <?php selected($style->post_content['form_align'], 'center') ?>><?php _e( 'center', 'formidable' ) ?></option>
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'form_align' ) ) ?>" id="frm_form_align">
+		<option value="left" <?php selected( $style->post_content['form_align'], 'left' ) ?>><?php _e( 'left', 'formidable' ) ?></option>
+		<option value="right" <?php selected( $style->post_content['form_align'], 'right' ) ?>><?php _e( 'right', 'formidable' ) ?></option>
+		<option value="center" <?php selected( $style->post_content['form_align'], 'center' ) ?>><?php _e( 'center', 'formidable' ) ?></option>
 	</select>
 </div>
 
 <div class="field-group clearfix frm-first-row">
 	<label><?php _e( 'Max Width', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('form_width') ) ?>" value="<?php echo esc_attr( $style->post_content['form_width'] ) ?>"/>
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'form_width' ) ) ?>" value="<?php echo esc_attr( $style->post_content['form_width'] ) ?>"/>
 </div>
 
 <div class="field-group clearfix frm-first-row">
 	<label><?php _e( 'Background', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('fieldset_bg_color') ) ?>" id="frm_fieldset_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['fieldset_bg_color'] ) ?>" size="4" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'fieldset_bg_color' ) ) ?>" id="frm_fieldset_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['fieldset_bg_color'] ) ?>" size="4" />
 </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('fieldset') ) ?>" id="frm_fieldset" value="<?php echo esc_attr( $style->post_content['fieldset'] ) ?>" size="4" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'fieldset' ) ) ?>" id="frm_fieldset" value="<?php echo esc_attr( $style->post_content['fieldset'] ) ?>" size="4" />
 </div>
 
 <div class="field-group clearfix">
 	<label><?php _e( 'Color', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('fieldset_color') ) ?>" id="frm_fieldset_color" class="hex" value="<?php echo esc_attr( $style->post_content['fieldset_color'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'fieldset_color' ) ) ?>" id="frm_fieldset_color" class="hex" value="<?php echo esc_attr( $style->post_content['fieldset_color'] ) ?>" />
 </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('fieldset_padding') ) ?>" id="frm_fieldset_padding" value="<?php echo esc_attr( $style->post_content['fieldset_padding'] ) ?>" size="4" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'fieldset_padding' ) ) ?>" id="frm_fieldset_padding" value="<?php echo esc_attr( $style->post_content['fieldset_padding'] ) ?>" size="4" />
 </div>
 
 <div id="frm_gen_font_box" class="field-group clearfix">
 	<label><?php _e( 'Font Family', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('font') ) ?>" id="frm_font" value="<?php echo esc_attr( $style->post_content['font'] ) ?>"  class="frm_full_width" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'font' ) ) ?>" id="frm_font" value="<?php echo esc_attr( $style->post_content['font'] ) ?>"  class="frm_full_width" />
 </div>
 
 <div class="field-group clearfix frm-half">
 	<label><?php _e( 'Direction', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('direction') ) ?>" id="frm_direction">
-		<option value="ltr" <?php selected($style->post_content['direction'], 'ltr') ?>><?php _e( 'Left to Right', 'formidable' ) ?></option>
-		<option value="rtl" <?php selected($style->post_content['direction'], 'rtl') ?>><?php _e( 'Right to Left', 'formidable' ) ?></option>
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'direction' ) ) ?>" id="frm_direction">
+		<option value="ltr" <?php selected( $style->post_content['direction'], 'ltr' ) ?>><?php _e( 'Left to Right', 'formidable' ) ?></option>
+		<option value="rtl" <?php selected( $style->post_content['direction'], 'rtl' ) ?>><?php _e( 'Right to Left', 'formidable' ) ?></option>
 	</select>
 </div>
 
 <div class="clear"></div>
 <p class="frm_no_bottom_margin">
-    <label><input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name('important_style') ) ?>" id="frm_important_style" value="1" <?php checked($style->post_content['important_style'], 1) ?> />
+    <label><input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name( 'important_style' ) ) ?>" id="frm_important_style" value="1" <?php checked( $style->post_content['important_style'], 1 ) ?> />
 	    <?php _e( 'Override theme styling', 'formidable' ) ?> <span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'This will add !important to many of the lines in the Formidable styling to make sure it will be used.', 'formidable' ) ?>" ></span>
 	</label>
 </p>

classes/controllers/FrmStylesController.php

Doc Comments +3 added lines

@@ -121,6 +121,9 @@
 		$stylesheet_urls['formidable'] = $url;
 	}
 
+	/**
+	 * @param string $version
+	 */
 	private static function get_css_version( $css_key, $version ) {
 		if ( 'formidable' == $css_key ) {
 			$this_version = get_option( 'frm_last_style_update' );

Spacing +46 added lines, -46 removed lines

@@ -41,23 +41,23 @@ 
     }
 
     public static function menu() {
-		add_submenu_page('formidable', 'Formidable | ' . __( 'Styles', 'formidable' ), __( 'Styles', 'formidable' ), 'frm_change_settings', 'formidable-styles', 'FrmStylesController::route' );
+		add_submenu_page( 'formidable', 'Formidable | ' . __( 'Styles', 'formidable' ), __( 'Styles', 'formidable' ), 'frm_change_settings', 'formidable-styles', 'FrmStylesController::route' );
     }
 
     public static function admin_init() {
-        if ( ! FrmAppHelper::is_admin_page('formidable-styles') ) {
+        if ( ! FrmAppHelper::is_admin_page( 'formidable-styles' ) ) {
             return;
         }
 
         self::load_pro_hooks();
-        wp_enqueue_script('jquery-ui-datepicker');
+        wp_enqueue_script( 'jquery-ui-datepicker' );
 
         $version = FrmAppHelper::plugin_version();
 		wp_enqueue_script( 'jquery-frm-themepicker', FrmAppHelper::plugin_url() . '/js/jquery/jquery-ui-themepicker.js', array( 'jquery' ), $version );
 
-		wp_enqueue_style( 'frm-custom-theme', admin_url('admin-ajax.php?action=frmpro_css' ) );
+		wp_enqueue_style( 'frm-custom-theme', admin_url( 'admin-ajax.php?action=frmpro_css' ) );
 
-        $style = apply_filters('frm_style_head', false);
+        $style = apply_filters( 'frm_style_head', false );
         if ( $style ) {
 			wp_enqueue_style( 'frm-single-custom-theme', admin_url( 'admin-ajax.php?action=frmpro_load_css&flat=1' ) . '&' . http_build_query( $style->post_content ) );
         }
@@ -143,17 +143,17 @@ 
 	}
 
 	public static function new_style( $return = '' ) {
-        self::load_styler('default');
+        self::load_styler( 'default' );
     }
 
 	public static function duplicate() {
-		self::load_styler('default');
+		self::load_styler( 'default' );
 	}
 
 	public static function edit( $style_id = false, $message = '' ) {
         if ( ! $style_id ) {
 			$style_id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
-            if ( empty($style_id) ) {
+            if ( empty( $style_id ) ) {
                 $style_id = 'default';
             }
         }
@@ -161,12 +161,12 @@ 
         if ( 'default' == $style_id ) {
             $style = 'default';
         } else {
-            $frm_style = new FrmStyle($style_id);
+            $frm_style = new FrmStyle( $style_id );
             $style = $frm_style->get_one();
             $style = $style->ID;
         }
 
-        self::load_styler($style, $message);
+        self::load_styler( $style, $message );
     }
 
     public static function save() {
@@ -176,17 +176,17 @@ 
 		$style_nonce = FrmAppHelper::get_post_param( 'frm_style', '', 'sanitize_text_field' );
 
 		if ( $post_id !== false && wp_verify_nonce( $style_nonce, 'frm_style_nonce' ) ) {
-            $id = $frm_style->update($post_id);
-            if ( empty($post_id) && ! empty($id) ) {
+            $id = $frm_style->update( $post_id );
+            if ( empty( $post_id ) && ! empty( $id ) ) {
                 // set the post id to the new style so it will be loaded for editing
-                $post_id = reset($id);
+                $post_id = reset( $id );
             }
             // include the CSS that includes this style
 			echo '<link href="' . esc_url( admin_url( 'admin-ajax.php?action=frmpro_css' ) ) . '" type="text/css" rel="Stylesheet" class="frm-custom-theme" />';
             $message = __( 'Your styling settings have been saved.', 'formidable' );
         }
 
-        return self::edit($post_id, $message);
+        return self::edit( $post_id, $message );
     }
 
 	public static function load_styler( $style, $message = '' ) {
@@ -195,10 +195,10 @@ 
         $frm_style = new FrmStyle();
         $styles = $frm_style->get_all();
 
-        if ( is_numeric($style) ) {
-            $style = $styles[ $style ];
+        if ( is_numeric( $style ) ) {
+            $style = $styles[$style];
         } else if ( 'default' == $style ) {
-            $style = $frm_style->get_default_style($styles);
+            $style = $frm_style->get_default_style( $styles );
         }
 
         self::add_meta_boxes();
@@ -213,9 +213,9 @@ 
 	private static function manage( $message = '', $forms = array() ) {
         $frm_style = new FrmStyle();
         $styles = $frm_style->get_all();
-        $default_style = $frm_style->get_default_style($styles);
+        $default_style = $frm_style->get_default_style( $styles );
 
-        if ( empty($forms) ) {
+        if ( empty( $forms ) ) {
             $forms = FrmForm::get_published_forms();
         }
 
@@ -232,26 +232,26 @@ 
 
 		$forms = FrmForm::get_published_forms();
         foreach ( $forms as $form ) {
-            if ( $_POST['style'][ $form->id ] == $_POST['prev_style'][ $form->id ] ) {
+            if ( $_POST['style'][$form->id] == $_POST['prev_style'][$form->id] ) {
                 continue;
             }
 
-            $form->options['custom_style'] = $_POST['style'][ $form->id ];
+            $form->options['custom_style'] = $_POST['style'][$form->id];
 
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => maybe_serialize( $form->options ) ), array( 'id' => $form->id ) );
-            unset($form);
+            unset( $form );
         }
 
         $message = __( 'Your form styles have been saved.', 'formidable' );
-        return self::manage($message, $forms);
+        return self::manage( $message, $forms );
     }
 
     public static function custom_css( $message = '', $style = null ) {
-        wp_enqueue_style('codemirror', FrmAppHelper::plugin_url() . '/css/codemirror.css');
-        wp_enqueue_script('codemirror', FrmAppHelper::plugin_url() . '/js/codemirror/codemirror.js', array(), '4.7');
+        wp_enqueue_style( 'codemirror', FrmAppHelper::plugin_url() . '/css/codemirror.css' );
+        wp_enqueue_script( 'codemirror', FrmAppHelper::plugin_url() . '/js/codemirror/codemirror.js', array(), '4.7' );
         wp_enqueue_script( 'codemirror-css', FrmAppHelper::plugin_url() . '/js/codemirror/css.js', array( 'codemirror' ), '4.7' );
 
-        if ( ! isset($style) ) {
+        if ( ! isset( $style ) ) {
             $frm_style = new FrmStyle();
             $style = $frm_style->get_default_style();
         }
@@ -266,11 +266,11 @@ 
 		$post_id = FrmAppHelper::get_post_param( 'ID', false, 'sanitize_text_field' );
 		$nonce = FrmAppHelper::get_post_param( 'frm_custom_css', '', 'sanitize_text_field' );
 		if ( wp_verify_nonce( $nonce, 'frm_custom_css_nonce' ) ) {
-            $frm_style->update($post_id);
+            $frm_style->update( $post_id );
             $message = __( 'Your styling settings have been saved.', 'formidable' );
         }
 
-        return self::custom_css($message);
+        return self::custom_css( $message );
     }
 
     public static function route() {
@@ -299,7 +299,7 @@ 
     }
 
     public static function reset_styling() {
-		FrmAppHelper::permission_check('frm_change_settings');
+		FrmAppHelper::permission_check( 'frm_change_settings' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         $frm_style = new FrmStyle();
@@ -317,8 +317,8 @@ 
 
         // remove the # from the colors
         foreach ( $_GET['frm_style_setting']['post_content'] as $k => $v ) {
-            if ( ! is_array($v) && strpos($v, '#') === 0 ) {
-                $_GET['frm_style_setting']['post_content'][ $k ] = str_replace( '#', '', $v );
+            if ( ! is_array( $v ) && strpos( $v, '#' ) === 0 ) {
+                $_GET['frm_style_setting']['post_content'][$k] = str_replace( '#', '', $v );
             }
         }
 
@@ -348,18 +348,18 @@ 
 
         foreach ( $meta_boxes as $nicename => $name ) {
 			add_meta_box( $nicename . '-style', $name, 'FrmStylesController::include_style_section', self::$screen, 'side', 'default', $nicename );
-            unset($nicename, $name);
+            unset( $nicename, $name );
         }
     }
 
 	public static function include_style_section( $atts, $sec ) {
-        extract($atts);
+        extract( $atts );
 		$current_tab = FrmAppHelper::simple_get( 'page-tab', 'sanitize_title', 'default' );
 		include( FrmAppHelper::plugin_path() . '/classes/views/styles/_' . $sec['args'] . '.php' );
     }
 
     public static function load_css() {
-        header('Content-type: text/css');
+        header( 'Content-type: text/css' );
 
         $frm_style = new FrmStyle();
         $defaults = $frm_style->get_defaults();
@@ -423,7 +423,7 @@ 
             $style = 'default';
         }
 
-        $frm_style = new FrmStyle($style);
+        $frm_style = new FrmStyle( $style );
         $style = $frm_style->get_one();
 
         if ( $style ) {
@@ -437,14 +437,14 @@ 
      * @param string $val
      */
 	public static function get_style_val( $val, $form = 'default' ) {
-        $style = self::get_form_style($form);
-        if ( $style && isset( $style->post_content[ $val ] ) ) {
-            return $style->post_content[ $val ];
+        $style = self::get_form_style( $form );
+        if ( $style && isset( $style->post_content[$val] ) ) {
+            return $style->post_content[$val];
         }
     }
 
 	public static function show_entry_styles( $default_styles ) {
-        $frm_style = new FrmStyle('default');
+        $frm_style = new FrmStyle( 'default' );
         $style = $frm_style->get_one();
 
         if ( ! $style ) {
@@ -458,15 +458,15 @@ 
             } else if ( 'alt_bg_color' == $name ) {
                 $setting = 'bg_color_active';
             }
-            $default_styles[ $name ] = $style->post_content[ $setting ];
-            unset($name, $val);
+            $default_styles[$name] = $style->post_content[$setting];
+            unset( $name, $val );
         }
 
         return $default_styles;
     }
 
 	public static function &important_style( $important, $field ) {
-        $important = self::get_style_val('important_style', $field['form_id']);
+        $important = self::get_style_val( 'important_style', $field['form_id'] );
         return $important;
     }
 
@@ -492,18 +492,18 @@ 
     	$i = 0;
     	$first_open = false;
     	do {
-			if ( ! isset( $wp_meta_boxes ) || ! isset( $wp_meta_boxes[ $page ] ) || ! isset( $wp_meta_boxes[ $page ][ $context ] ) ) {
+			if ( ! isset( $wp_meta_boxes ) || ! isset( $wp_meta_boxes[$page] ) || ! isset( $wp_meta_boxes[$page][$context] ) ) {
 				break;
 			}
 
     		foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
-    			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
-    				foreach ( $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
+    			if ( isset( $wp_meta_boxes[$page][$context][$priority] ) ) {
+    				foreach ( $wp_meta_boxes[$page][$context][$priority] as $box ) {
     					if ( false == $box || ! $box['title'] ) {
     						continue;
 						}
 
-    					$i++;
+    					$i ++;
     					$hidden_class = in_array( $box['id'], $hidden ) ? 'hide-if-js' : '';
 
     					if ( ! $first_open && empty( $hidden_class ) ) {

Indentation +302 added lines, -302 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 
 class FrmStylesController {
-    public static $post_type = 'frm_styles';
-    public static $screen = 'formidable_page_formidable-styles';
-
-    public static function load_pro_hooks() {
-        if ( FrmAppHelper::pro_is_installed() ) {
-            FrmProStylesController::load_pro_hooks();
-        }
-    }
-
-    public static function register_post_types() {
-        register_post_type( self::$post_type, array(
-            'label' => __( 'Styles', 'formidable' ),
-            'public' => false,
-            'show_ui' => false,
-            'capability_type' => 'page',
+	public static $post_type = 'frm_styles';
+	public static $screen = 'formidable_page_formidable-styles';
+
+	public static function load_pro_hooks() {
+		if ( FrmAppHelper::pro_is_installed() ) {
+			FrmProStylesController::load_pro_hooks();
+		}
+	}
+
+	public static function register_post_types() {
+		register_post_type( self::$post_type, array(
+			'label' => __( 'Styles', 'formidable' ),
+			'public' => false,
+			'show_ui' => false,
+			'capability_type' => 'page',
 			'capabilities' => array(
 				'edit_post'		=> 'frm_change_settings',
 				'edit_posts'	=> 'frm_change_settings',
@@ -25,11 +25,11 @@ 
 				'delete_posts'	=> 'frm_change_settings',
 				'read_private_posts' => 'read_private_posts',
 			),
-            'supports' => array(
+			'supports' => array(
 				'title',
-            ),
-            'has_archive' => false,
-            'labels' => array(
+			),
+			'has_archive' => false,
+			'labels' => array(
 				'name' => __( 'Styles', 'formidable' ),
 				'singular_name' => __( 'Style', 'formidable' ),
 				'menu_name' => __( 'Style', 'formidable' ),
@@ -37,19 +37,19 @@ 
 				'add_new_item' => __( 'Create a New Style', 'formidable' ),
 				'edit_item'    => __( 'Edit Style', 'formidable' ),
 			),
-        ) );
-    }
+		) );
+	}
 
-    public static function menu() {
+	public static function menu() {
 		add_submenu_page('formidable', 'Formidable | ' . __( 'Styles', 'formidable' ), __( 'Styles', 'formidable' ), 'frm_change_settings', 'formidable-styles', 'FrmStylesController::route' );
-    }
+	}
 
-    public static function admin_init() {
-        if ( ! FrmAppHelper::is_admin_page('formidable-styles') ) {
-            return;
-        }
+	public static function admin_init() {
+		if ( ! FrmAppHelper::is_admin_page('formidable-styles') ) {
+			return;
+		}
 
-        self::load_pro_hooks();
+		self::load_pro_hooks();
 
 		$style_tab = FrmAppHelper::get_param( 'frm_action', '', 'get', 'sanitize_title' );
 		if ( $style_tab == 'manage' || $style_tab == 'custom_css' ) {
@@ -57,18 +57,18 @@ 
 			return;
 		}
 
-        wp_enqueue_script('jquery-ui-datepicker');
+		wp_enqueue_script('jquery-ui-datepicker');
 
-        $version = FrmAppHelper::plugin_version();
+		$version = FrmAppHelper::plugin_version();
 		wp_enqueue_script( 'jquery-frm-themepicker', FrmAppHelper::plugin_url() . '/js/jquery/jquery-ui-themepicker.js', array( 'jquery' ), $version );
 
 		wp_enqueue_style( 'frm-custom-theme', admin_url('admin-ajax.php?action=frmpro_css' ) );
 
-        $style = apply_filters('frm_style_head', false);
-        if ( $style ) {
+		$style = apply_filters('frm_style_head', false);
+		if ( $style ) {
 			wp_enqueue_style( 'frm-single-custom-theme', admin_url( 'admin-ajax.php?action=frmpro_load_css&flat=1' ) . '&' . http_build_query( $style->post_content ) );
-        }
-    }
+		}
+	}
 
 	public static function enqueue_css( $register = 'enqueue' ) {
 		global $frm_vars;
@@ -162,230 +162,230 @@ 
 	}
 
 	public static function new_style( $return = '' ) {
-        self::load_styler('default');
-    }
+		self::load_styler('default');
+	}
 
 	public static function duplicate() {
 		self::load_styler('default');
 	}
 
 	public static function edit( $style_id = false, $message = '' ) {
-        if ( ! $style_id ) {
+		if ( ! $style_id ) {
 			$style_id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
-            if ( empty($style_id) ) {
-                $style_id = 'default';
-            }
-        }
-
-        if ( 'default' == $style_id ) {
-            $style = 'default';
-        } else {
-            $frm_style = new FrmStyle($style_id);
-            $style = $frm_style->get_one();
-            $style = $style->ID;
-        }
-
-        self::load_styler($style, $message);
-    }
-
-    public static function save() {
-        $frm_style = new FrmStyle();
-        $message = '';
+			if ( empty($style_id) ) {
+				$style_id = 'default';
+			}
+		}
+
+		if ( 'default' == $style_id ) {
+			$style = 'default';
+		} else {
+			$frm_style = new FrmStyle($style_id);
+			$style = $frm_style->get_one();
+			$style = $style->ID;
+		}
+
+		self::load_styler($style, $message);
+	}
+
+	public static function save() {
+		$frm_style = new FrmStyle();
+		$message = '';
 		$post_id = FrmAppHelper::get_post_param( 'ID', false, 'sanitize_title' );
 		$style_nonce = FrmAppHelper::get_post_param( 'frm_style', '', 'sanitize_text_field' );
 
 		if ( $post_id !== false && wp_verify_nonce( $style_nonce, 'frm_style_nonce' ) ) {
-            $id = $frm_style->update($post_id);
-            if ( empty($post_id) && ! empty($id) ) {
-                // set the post id to the new style so it will be loaded for editing
-                $post_id = reset($id);
-            }
-            // include the CSS that includes this style
+			$id = $frm_style->update($post_id);
+			if ( empty($post_id) && ! empty($id) ) {
+				// set the post id to the new style so it will be loaded for editing
+				$post_id = reset($id);
+			}
+			// include the CSS that includes this style
 			echo '<link href="' . esc_url( admin_url( 'admin-ajax.php?action=frmpro_css' ) ) . '" type="text/css" rel="Stylesheet" class="frm-custom-theme" />';
-            $message = __( 'Your styling settings have been saved.', 'formidable' );
-        }
+			$message = __( 'Your styling settings have been saved.', 'formidable' );
+		}
 
-        return self::edit($post_id, $message);
-    }
+		return self::edit($post_id, $message);
+	}
 
 	public static function load_styler( $style, $message = '' ) {
-        global $frm_settings;
+		global $frm_settings;
 
-        $frm_style = new FrmStyle();
-        $styles = $frm_style->get_all();
+		$frm_style = new FrmStyle();
+		$styles = $frm_style->get_all();
 
-        if ( is_numeric($style) ) {
-            $style = $styles[ $style ];
-        } else if ( 'default' == $style ) {
-            $style = $frm_style->get_default_style($styles);
-        }
+		if ( is_numeric($style) ) {
+			$style = $styles[ $style ];
+		} else if ( 'default' == $style ) {
+			$style = $frm_style->get_default_style($styles);
+		}
 
-        self::add_meta_boxes();
+		self::add_meta_boxes();
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/styles/show.php' );
-    }
+	}
 
 	/**
 	 * @param string $message
 	 * @param array|object $forms
 	 */
 	private static function manage( $message = '', $forms = array() ) {
-        $frm_style = new FrmStyle();
-        $styles = $frm_style->get_all();
-        $default_style = $frm_style->get_default_style($styles);
+		$frm_style = new FrmStyle();
+		$styles = $frm_style->get_all();
+		$default_style = $frm_style->get_default_style($styles);
 
-        if ( empty($forms) ) {
-            $forms = FrmForm::get_published_forms();
-        }
+		if ( empty($forms) ) {
+			$forms = FrmForm::get_published_forms();
+		}
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/styles/manage.php' );
-    }
+	}
 
-    private static function manage_styles() {
+	private static function manage_styles() {
 		$style_nonce = FrmAppHelper::get_post_param( 'frm_manage_style', '', 'sanitize_text_field' );
 		if ( ! $_POST || ! isset( $_POST['style'] ) || ! wp_verify_nonce( $style_nonce, 'frm_manage_style_nonce' ) ) {
-            return self::manage();
-        }
+			return self::manage();
+		}
 
-        global $wpdb;
+		global $wpdb;
 
 		$forms = FrmForm::get_published_forms();
-        foreach ( $forms as $form ) {
-            if ( $_POST['style'][ $form->id ] == $_POST['prev_style'][ $form->id ] ) {
-                continue;
-            }
+		foreach ( $forms as $form ) {
+			if ( $_POST['style'][ $form->id ] == $_POST['prev_style'][ $form->id ] ) {
+				continue;
+			}
 
-            $form->options['custom_style'] = $_POST['style'][ $form->id ];
+			$form->options['custom_style'] = $_POST['style'][ $form->id ];
 
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => maybe_serialize( $form->options ) ), array( 'id' => $form->id ) );
-            unset($form);
-        }
+			unset($form);
+		}
 
-        $message = __( 'Your form styles have been saved.', 'formidable' );
-        return self::manage($message, $forms);
-    }
+		$message = __( 'Your form styles have been saved.', 'formidable' );
+		return self::manage($message, $forms);
+	}
 
-    public static function custom_css( $message = '', $style = null ) {
-        wp_enqueue_style('codemirror', FrmAppHelper::plugin_url() . '/css/codemirror.css');
-        wp_enqueue_script('codemirror', FrmAppHelper::plugin_url() . '/js/codemirror/codemirror.js', array(), '4.7');
-        wp_enqueue_script( 'codemirror-css', FrmAppHelper::plugin_url() . '/js/codemirror/css.js', array( 'codemirror' ), '4.7' );
+	public static function custom_css( $message = '', $style = null ) {
+		wp_enqueue_style('codemirror', FrmAppHelper::plugin_url() . '/css/codemirror.css');
+		wp_enqueue_script('codemirror', FrmAppHelper::plugin_url() . '/js/codemirror/codemirror.js', array(), '4.7');
+		wp_enqueue_script( 'codemirror-css', FrmAppHelper::plugin_url() . '/js/codemirror/css.js', array( 'codemirror' ), '4.7' );
 
-        if ( ! isset($style) ) {
-            $frm_style = new FrmStyle();
-            $style = $frm_style->get_default_style();
-        }
+		if ( ! isset($style) ) {
+			$frm_style = new FrmStyle();
+			$style = $frm_style->get_default_style();
+		}
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/styles/custom_css.php' );
-    }
+	}
 
-    public static function save_css() {
-        $frm_style = new FrmStyle();
+	public static function save_css() {
+		$frm_style = new FrmStyle();
 
-        $message = '';
+		$message = '';
 		$post_id = FrmAppHelper::get_post_param( 'ID', false, 'sanitize_text_field' );
 		$nonce = FrmAppHelper::get_post_param( 'frm_custom_css', '', 'sanitize_text_field' );
 		if ( wp_verify_nonce( $nonce, 'frm_custom_css_nonce' ) ) {
-            $frm_style->update($post_id);
-            $message = __( 'Your styling settings have been saved.', 'formidable' );
-        }
+			$frm_style->update($post_id);
+			$message = __( 'Your styling settings have been saved.', 'formidable' );
+		}
 
-        return self::custom_css($message);
-    }
+		return self::custom_css($message);
+	}
 
-    public static function route() {
+	public static function route() {
 		$action = FrmAppHelper::get_param( 'frm_action', '', 'get', 'sanitize_title' );
 
-        switch ( $action ) {
-            case 'edit':
-            case 'save':
-            case 'manage':
-            case 'manage_styles':
-            case 'custom_css':
-            case 'save_css':
+		switch ( $action ) {
+			case 'edit':
+			case 'save':
+			case 'manage':
+			case 'manage_styles':
+			case 'custom_css':
+			case 'save_css':
 				return self::$action();
-            default:
-            	do_action( 'frm_style_action_route', $action );
-            	if ( apply_filters( 'frm_style_stop_action_route', false, $action ) ) {
-                	return;
-            	}
+			default:
+				do_action( 'frm_style_action_route', $action );
+				if ( apply_filters( 'frm_style_stop_action_route', false, $action ) ) {
+					return;
+				}
 
-                if ( 'new_style' == $action || 'duplicate' == $action ) {
-                    return self::$action();
-                }
+				if ( 'new_style' == $action || 'duplicate' == $action ) {
+					return self::$action();
+				}
 
-                return self::edit();
-        }
-    }
+				return self::edit();
+		}
+	}
 
-    public static function reset_styling() {
+	public static function reset_styling() {
 		FrmAppHelper::permission_check('frm_change_settings');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        $frm_style = new FrmStyle();
-        $defaults = $frm_style->get_defaults();
+		$frm_style = new FrmStyle();
+		$defaults = $frm_style->get_defaults();
 
-        echo json_encode( $defaults );
-        wp_die();
-    }
+		echo json_encode( $defaults );
+		wp_die();
+	}
 
-    public static function change_styling() {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+	public static function change_styling() {
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        $frm_style = new FrmStyle();
-        $defaults = $frm_style->get_defaults();
+		$frm_style = new FrmStyle();
+		$defaults = $frm_style->get_defaults();
 
-        // remove the # from the colors
-        foreach ( $_GET['frm_style_setting']['post_content'] as $k => $v ) {
-            if ( ! is_array($v) && strpos($v, '#') === 0 ) {
-                $_GET['frm_style_setting']['post_content'][ $k ] = str_replace( '#', '', $v );
-            }
-        }
+		// remove the # from the colors
+		foreach ( $_GET['frm_style_setting']['post_content'] as $k => $v ) {
+			if ( ! is_array($v) && strpos($v, '#') === 0 ) {
+				$_GET['frm_style_setting']['post_content'][ $k ] = str_replace( '#', '', $v );
+			}
+		}
 
-        echo '<style type="text/css">';
+		echo '<style type="text/css">';
 		include( FrmAppHelper::plugin_path() . '/css/_single_theme.css.php' );
-        echo '</style>';
-        wp_die();
-    }
-
-    private static function add_meta_boxes() {
-
-        // setup meta boxes
-        $meta_boxes = array(
-            'general'           => __( 'General', 'formidable' ),
-            'form-title'        => __( 'Form Title', 'formidable' ),
-            'form-description'  => __( 'Form Description', 'formidable' ),
-            'field-labels'      => __( 'Field Labels', 'formidable' ),
-            'field-description' => __( 'Field Description', 'formidable' ),
-            'field-colors'      => __( 'Field Colors', 'formidable' ),
-            'field-sizes'       => __( 'Field Settings', 'formidable' ),
-            'check-box-radio-fields' => __( 'Check Box & Radio Fields', 'formidable' ),
-            'section-fields'    => __( 'Section Fields', 'formidable' ),
-            'date-fields'       => __( 'Date Fields', 'formidable' ),
-            'buttons'           => __( 'Buttons', 'formidable' ),
-            'form-messages'     => __( 'Form Messages', 'formidable' ),
-        );
-
-        foreach ( $meta_boxes as $nicename => $name ) {
+		echo '</style>';
+		wp_die();
+	}
+
+	private static function add_meta_boxes() {
+
+		// setup meta boxes
+		$meta_boxes = array(
+			'general'           => __( 'General', 'formidable' ),
+			'form-title'        => __( 'Form Title', 'formidable' ),
+			'form-description'  => __( 'Form Description', 'formidable' ),
+			'field-labels'      => __( 'Field Labels', 'formidable' ),
+			'field-description' => __( 'Field Description', 'formidable' ),
+			'field-colors'      => __( 'Field Colors', 'formidable' ),
+			'field-sizes'       => __( 'Field Settings', 'formidable' ),
+			'check-box-radio-fields' => __( 'Check Box & Radio Fields', 'formidable' ),
+			'section-fields'    => __( 'Section Fields', 'formidable' ),
+			'date-fields'       => __( 'Date Fields', 'formidable' ),
+			'buttons'           => __( 'Buttons', 'formidable' ),
+			'form-messages'     => __( 'Form Messages', 'formidable' ),
+		);
+
+		foreach ( $meta_boxes as $nicename => $name ) {
 			add_meta_box( $nicename . '-style', $name, 'FrmStylesController::include_style_section', self::$screen, 'side', 'default', $nicename );
-            unset($nicename, $name);
-        }
-    }
+			unset($nicename, $name);
+		}
+	}
 
 	public static function include_style_section( $atts, $sec ) {
-        extract($atts);
+		extract($atts);
 		$current_tab = FrmAppHelper::simple_get( 'page-tab', 'sanitize_title', 'default' );
 		include( FrmAppHelper::plugin_path() . '/classes/views/styles/_' . $sec['args'] . '.php' );
-    }
+	}
 
-    public static function load_css() {
-        header('Content-type: text/css');
+	public static function load_css() {
+		header('Content-type: text/css');
 
-        $frm_style = new FrmStyle();
-        $defaults = $frm_style->get_defaults();
+		$frm_style = new FrmStyle();
+		$defaults = $frm_style->get_defaults();
 
 		include( FrmAppHelper::plugin_path() . '/css/_single_theme.css.php' );
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function load_saved_css() {
 		$css = get_transient( 'frmpro_css' );
@@ -394,142 +394,142 @@ 
 		wp_die();
 	}
 
-    /**
-     * Check if the Formidable styling should be loaded,
-     * then enqueue it for the footer
-     * @since 2.0
-     */
-    public static function enqueue_style() {
-        global $frm_vars;
-
-        if ( isset( $frm_vars['css_loaded'] ) && $frm_vars['css_loaded'] ) {
-            // the CSS has already been loaded
-            return;
-        }
-
-        $frm_settings = FrmAppHelper::get_settings();
-        if ( $frm_settings->load_style != 'none' ) {
-            wp_enqueue_style( 'formidable' );
-            $frm_vars['css_loaded'] = true;
-        }
-    }
-
-    // Get the stylesheets for the form settings page
-    public static function get_style_opts() {
-        $frm_style = new FrmStyle();
-        $styles = $frm_style->get_all();
-
-        return $styles;
-    }
-
-    public static function get_form_style( $form = 'default' ) {
-        $style = FrmFormsHelper::get_form_style( $form );
-
-        if ( empty( $style ) || 1 == $style ) {
-            $style = 'default';
-        }
-
-        $frm_style = new FrmStyle( $style );
-        return $frm_style->get_one();
-    }
-
-    /**
-     * @param string $class
-     * @param string $style
-     */
+	/**
+	 * Check if the Formidable styling should be loaded,
+	 * then enqueue it for the footer
+	 * @since 2.0
+	 */
+	public static function enqueue_style() {
+		global $frm_vars;
+
+		if ( isset( $frm_vars['css_loaded'] ) && $frm_vars['css_loaded'] ) {
+			// the CSS has already been loaded
+			return;
+		}
+
+		$frm_settings = FrmAppHelper::get_settings();
+		if ( $frm_settings->load_style != 'none' ) {
+			wp_enqueue_style( 'formidable' );
+			$frm_vars['css_loaded'] = true;
+		}
+	}
+
+	// Get the stylesheets for the form settings page
+	public static function get_style_opts() {
+		$frm_style = new FrmStyle();
+		$styles = $frm_style->get_all();
+
+		return $styles;
+	}
+
+	public static function get_form_style( $form = 'default' ) {
+		$style = FrmFormsHelper::get_form_style( $form );
+
+		if ( empty( $style ) || 1 == $style ) {
+			$style = 'default';
+		}
+
+		$frm_style = new FrmStyle( $style );
+		return $frm_style->get_one();
+	}
+
+	/**
+	 * @param string $class
+	 * @param string $style
+	 */
 	public static function get_form_style_class( $class, $style ) {
-        if ( 1 == $style ) {
-            $style = 'default';
-        }
+		if ( 1 == $style ) {
+			$style = 'default';
+		}
 
-        $frm_style = new FrmStyle($style);
-        $style = $frm_style->get_one();
+		$frm_style = new FrmStyle($style);
+		$style = $frm_style->get_one();
 
-        if ( $style ) {
+		if ( $style ) {
 			$class .= ' frm_style_' . $style->post_name;
-        }
+		}
 
-        return $class;
-    }
+		return $class;
+	}
 
-    /**
-     * @param string $val
-     */
+	/**
+	 * @param string $val
+	 */
 	public static function get_style_val( $val, $form = 'default' ) {
-        $style = self::get_form_style($form);
-        if ( $style && isset( $style->post_content[ $val ] ) ) {
-            return $style->post_content[ $val ];
-        }
-    }
+		$style = self::get_form_style($form);
+		if ( $style && isset( $style->post_content[ $val ] ) ) {
+			return $style->post_content[ $val ];
+		}
+	}
 
 	public static function show_entry_styles( $default_styles ) {
-        $frm_style = new FrmStyle('default');
-        $style = $frm_style->get_one();
-
-        if ( ! $style ) {
-            return $default_styles;
-        }
-
-        foreach ( $default_styles as $name => $val ) {
-            $setting = $name;
-            if ( 'border_width' == $name ) {
-                $setting = 'field_border_width';
-            } else if ( 'alt_bg_color' == $name ) {
-                $setting = 'bg_color_active';
-            }
-            $default_styles[ $name ] = $style->post_content[ $setting ];
-            unset($name, $val);
-        }
-
-        return $default_styles;
-    }
+		$frm_style = new FrmStyle('default');
+		$style = $frm_style->get_one();
+
+		if ( ! $style ) {
+			return $default_styles;
+		}
+
+		foreach ( $default_styles as $name => $val ) {
+			$setting = $name;
+			if ( 'border_width' == $name ) {
+				$setting = 'field_border_width';
+			} else if ( 'alt_bg_color' == $name ) {
+				$setting = 'bg_color_active';
+			}
+			$default_styles[ $name ] = $style->post_content[ $setting ];
+			unset($name, $val);
+		}
+
+		return $default_styles;
+	}
 
 	public static function &important_style( $important, $field ) {
-        $important = self::get_style_val('important_style', $field['form_id']);
-        return $important;
-    }
+		$important = self::get_style_val('important_style', $field['form_id']);
+		return $important;
+	}
 
-    /**
-     * Fallback for WP < 3.6
-     */
-    public static function do_accordion_sections( $screen, $context, $object ) {
-        if ( function_exists( 'do_accordion_sections' ) ) {
-            return do_accordion_sections( $screen, $context, $object );
-        }
+	/**
+	 * Fallback for WP < 3.6
+	 */
+	public static function do_accordion_sections( $screen, $context, $object ) {
+		if ( function_exists( 'do_accordion_sections' ) ) {
+			return do_accordion_sections( $screen, $context, $object );
+		}
 
-    	global $wp_meta_boxes;
+		global $wp_meta_boxes;
 
-        $screen = 'formidable_page_formidable-styles';
-        $screen = convert_to_screen( $screen );
+		$screen = 'formidable_page_formidable-styles';
+		$screen = convert_to_screen( $screen );
 
-    	$page = $screen->id;
+		$page = $screen->id;
 
-    	$hidden = get_hidden_meta_boxes( $screen );
-    	?>
+		$hidden = get_hidden_meta_boxes( $screen );
+		?>
     	<div id="side-sortables" class="accordion-container">
     	<?php
-    	$i = 0;
-    	$first_open = false;
-    	do {
+		$i = 0;
+		$first_open = false;
+		do {
 			if ( ! isset( $wp_meta_boxes ) || ! isset( $wp_meta_boxes[ $page ] ) || ! isset( $wp_meta_boxes[ $page ][ $context ] ) ) {
 				break;
 			}
 
-    		foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
-    			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
-    				foreach ( $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
-    					if ( false == $box || ! $box['title'] ) {
-    						continue;
+			foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
+				if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
+					foreach ( $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
+						if ( false == $box || ! $box['title'] ) {
+							continue;
 						}
 
-    					$i++;
-    					$hidden_class = in_array( $box['id'], $hidden ) ? 'hide-if-js' : '';
+						$i++;
+						$hidden_class = in_array( $box['id'], $hidden ) ? 'hide-if-js' : '';
 
-    					if ( ! $first_open && empty( $hidden_class ) ) {
-    						$first_open = true;
-    					}
+						if ( ! $first_open && empty( $hidden_class ) ) {
+							$first_open = true;
+						}
 
-    					?>
+						?>
 						<div class="postbox <?php echo esc_attr( $box['id'] ); ?>">
 						<div class="handlediv" title="<?php esc_attr_e( 'Click to toggle', 'formidable' ) ?>"><br/></div>
                         <h3 class='hndle'><span><?php echo esc_html( $box['title'] ); ?></span></h3>
@@ -540,13 +540,13 @@ 
     						</div><!-- .accordion-section-content -->
     					</div><!-- .postbox -->
     					<?php
-    				}
-    			}
-    		}
-    	} while ( 0 );
-    	?>
+					}
+				}
+			}
+		} while ( 0 );
+		?>
     	</div><!-- .accordion-container -->
     	<?php
-    	return $i;
-    }
+		return $i;
+	}
 }

classes/views/addons/list.php

Spacing +3 added lines, -3 removed lines

@@ -7,10 +7,10 @@
 				continue;
 			}
 
-			if ( isset( $plugin_names[ $addon['info']['slug'] ] ) ) {
-				$installed = is_dir( WP_PLUGIN_DIR . '/' . $plugin_names[ $addon['info']['slug'] ] );
+			if ( isset( $plugin_names[$addon['info']['slug']] ) ) {
+				$installed = is_dir( WP_PLUGIN_DIR . '/' . $plugin_names[$addon['info']['slug']] );
 			} else {
-				$installed = isset( $installed_addons[ $addon['info']['slug'] ] ) || is_dir( WP_PLUGIN_DIR . '/formidable-' . $addon['info']['slug'] );
+				$installed = isset( $installed_addons[$addon['info']['slug']] ) || is_dir( WP_PLUGIN_DIR . '/formidable-' . $addon['info']['slug'] );
 			}
 			$has_thumbnail = ! empty( $addon['info']['thumbnail'] );
 			if ( $addon['info']['slug'] == 'formidable-pro' ) {

classes/views/addons/upgrade_to_pro.php

Spacing +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
 			<tr>
 				<th></th>
 			<?php foreach ( $pro['pricing'] as $name => $price ) {
-				$price_id++;
+				$price_id ++;
 				if ( $name == 'smallbusiness' ) {
 					$name = 'Small Business';
 				} ?>
@@ -50,9 +50,9 @@ 
 			<tr>
 				<th>Included AddOns</th>
 				<td>None</td>
-				<td><a href="<?php echo esc_url( FrmAppHelper::make_affiliate_url('https://formidablepro.com/pricing/#addon-lists') ) ?>" target="_blank">Basic Addons</a></td>
-				<td><a href="<?php echo esc_url( FrmAppHelper::make_affiliate_url('https://formidablepro.com/pricing/#addon-lists') ) ?>" target="_blank">Advanced Addons</a></td>
-				<td><a href="<?php echo esc_url( FrmAppHelper::make_affiliate_url('https://formidablepro.com/pricing/#addon-lists') ) ?>" target="_blank">Enterprise Addons</a></td>
+				<td><a href="<?php echo esc_url( FrmAppHelper::make_affiliate_url( 'https://formidablepro.com/pricing/#addon-lists' ) ) ?>" target="_blank">Basic Addons</a></td>
+				<td><a href="<?php echo esc_url( FrmAppHelper::make_affiliate_url( 'https://formidablepro.com/pricing/#addon-lists' ) ) ?>" target="_blank">Advanced Addons</a></td>
+				<td><a href="<?php echo esc_url( FrmAppHelper::make_affiliate_url( 'https://formidablepro.com/pricing/#addon-lists' ) ) ?>" target="_blank">Enterprise Addons</a></td>
 			</tr>
 		</tbody>
 	</table>