Strategy11 / formidable-forms

classes/views/styles/show.php

Indentation +2 added lines, -2 removed lines

@@ -64,8 +64,8 @@
 							<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-styles&frm_action=destroy&id=' . $style->ID ) ); ?>" id="frm_delete_style" class="submitdelete deletion" onclick="return confirm('<?php esc_attr_e( 'Are you sure you want to delete that style?', 'formidable' ) ?>')"><?php _e( 'Delete Style', 'formidable' ) ?></a>
 						    <?php } ?>
 						    <?php
-						    if ( $style->ID ) {
-							    echo '<span class="howto"><span>.frm_style_'. esc_attr( $style->post_name ) .'</span></span>';
+							if ( $style->ID ) {
+								echo '<span class="howto"><span>.frm_style_'. esc_attr( $style->post_name ) .'</span></span>';
 							} ?>
                             <div class="publishing-action">
                                 <input type="button" value="<?php esc_attr_e( 'Reset to Default', 'formidable' ) ?>" class="button-secondary frm_reset_style" />

Spacing +10 added lines, -10 removed lines

@@ -2,14 +2,14 @@ 
 <div class="wrap">
     <?php FrmStylesHelper::style_menu(); ?>
 
-	<?php include(FrmAppHelper::plugin_path() .'/classes/views/shared/errors.php'); ?>
+	<?php include( FrmAppHelper::plugin_path() . '/classes/views/shared/errors.php' ); ?>
 
 	<?php do_action( 'frm_style_switcher', $style, $styles ) ?>
 
 	<form id="frm_styling_form" action="" name="frm_styling_form" method="post">
 	    <input type="hidden" name="ID" value="<?php echo esc_attr( $style->ID ) ?>" />
 		<input type="hidden" name="frm_action" value="save" />
-        <textarea name="<?php echo esc_attr( $frm_style->get_field_name('custom_css') ) ?>" class="frm_hidden"><?php echo FrmAppHelper::esc_textarea( $style->post_content['custom_css'] ) ?></textarea>
+        <textarea name="<?php echo esc_attr( $frm_style->get_field_name( 'custom_css' ) ) ?>" class="frm_hidden"><?php echo FrmAppHelper::esc_textarea( $style->post_content['custom_css'] ) ?></textarea>
 		<?php wp_nonce_field( 'frm_style_nonce', 'frm_style' ); ?>
 
 	<div id="nav-menus-frame">
@@ -18,7 +18,7 @@ 
 
 		<div class="styling_settings">
 		    <input type="hidden" name="style_name" value="frm_style_<?php echo esc_attr( $style->post_name ) ?>" />
-			<?php FrmStylesController::do_accordion_sections( FrmStylesController::$screen, 'side', compact('style', 'frm_style') ); ?>
+			<?php FrmStylesController::do_accordion_sections( FrmStylesController::$screen, 'side', compact( 'style', 'frm_style' ) ); ?>
 		</div>
 
 	</div><!-- /#menu-settings-column -->
@@ -31,17 +31,17 @@ 
 						<div class="major-publishing-actions">
 							<label class="menu-name-label howto open-label" for="menu-name">
 								<span><?php _e( 'Style Name', 'formidable' ) ?></span>
-								<input id="menu-name" name="<?php echo esc_attr( $frm_style->get_field_name('post_title', '') ); ?>" type="text" class="menu-name regular-text menu-item-textbox" title="<?php esc_attr_e( 'Enter style name here', 'formidable' ) ?>" value="<?php echo esc_attr( $style->post_title ) ?>" />
+								<input id="menu-name" name="<?php echo esc_attr( $frm_style->get_field_name( 'post_title', '' ) ); ?>" type="text" class="menu-name regular-text menu-item-textbox" title="<?php esc_attr_e( 'Enter style name here', 'formidable' ) ?>" value="<?php echo esc_attr( $style->post_title ) ?>" />
 							</label>
 
-							<input name="prev_menu_order" type="hidden" value="<?php echo esc_attr($style->menu_order) ?>" />
+							<input name="prev_menu_order" type="hidden" value="<?php echo esc_attr( $style->menu_order ) ?>" />
 							<label class="menu-name-label howto open-label default-style-box" for="menu_order">
 							<span>
 							<?php if ( $style->menu_order ) { ?>
-							    <input name="<?php echo esc_attr( $frm_style->get_field_name('menu_order', '') ); ?>" type="hidden" value="1" />
-							    <input id="menu_order" disabled="disabled" type="checkbox" value="1" <?php checked($style->menu_order, 1) ?> />
+							    <input name="<?php echo esc_attr( $frm_style->get_field_name( 'menu_order', '' ) ); ?>" type="hidden" value="1" />
+							    <input id="menu_order" disabled="disabled" type="checkbox" value="1" <?php checked( $style->menu_order, 1 ) ?> />
 							<?php } else { ?>
-								<input id="menu_order" name="<?php echo esc_attr( $frm_style->get_field_name('menu_order', '') ); ?>" type="checkbox" value="1" <?php checked($style->menu_order, 1) ?> />
+								<input id="menu_order" name="<?php echo esc_attr( $frm_style->get_field_name( 'menu_order', '' ) ); ?>" type="checkbox" value="1" <?php checked( $style->menu_order, 1 ) ?> />
 							<?php } ?>
 							    <?php _e( 'Make default style', 'formidable' ) ?></span>
 							</label>
@@ -54,7 +54,7 @@ 
 					<div id="post-body">
 						<div id="post-body-content">
 
-							<?php include( dirname(__FILE__) .'/_sample_form.php') ?>
+							<?php include( dirname( __FILE__ ) . '/_sample_form.php' ) ?>
 
 						</div><!-- /#post-body-content -->
 					</div><!-- /#post-body -->
@@ -65,7 +65,7 @@ 
 						    <?php } ?>
 						    <?php
 						    if ( $style->ID ) {
-							    echo '<span class="howto"><span>.frm_style_'. esc_attr( $style->post_name ) .'</span></span>';
+							    echo '<span class="howto"><span>.frm_style_' . esc_attr( $style->post_name ) . '</span></span>';
 							} ?>
                             <div class="publishing-action">
                                 <input type="button" value="<?php esc_attr_e( 'Reset to Default', 'formidable' ) ?>" class="button-secondary frm_reset_style" />

classes/helpers/FrmListHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -179,7 +179,7 @@
 	 * @access public
 	 *
 	 * @param string $name Property to check if set.
-	 * @return bool Whether the property is set.
+	 * @return boolean|null Whether the property is set.
 	 */
 	public function __isset( $name ) {
 		if ( in_array( $name, $this->compat_fields ) ) {

Indentation +7 added lines, -7 removed lines

@@ -67,10 +67,10 @@ 
 	protected $modes = array();
 
 	/**
-	*
-	* @var array
-	*/
-    protected $params;
+	 *
+	 * @var array
+	 */
+	protected $params;
 
 	/**
 	 * Stores the value returned by ->get_column_info()
@@ -87,10 +87,10 @@ 
 		'single_row_columns' );
 
 	/**
-	* Construct the table object
-	*/
+	 * Construct the table object
+	 */
 	public function __construct( $args ) {
-	    $args = wp_parse_args( $args, array(
+		$args = wp_parse_args( $args, array(
 			'params' => array(),
 			'plural' => '',
 			'singular' => '',

Spacing +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -104,7 +104,7 @@ 
 
 		add_filter( "manage_{$this->screen->id}_columns", array( $this, 'get_columns' ), 0 );
 
-		if ( !$args['plural'] )
+		if ( ! $args['plural'] )
 			$args['plural'] = $this->screen->base;
 
 		$args['plural'] = sanitize_key( $args['plural'] );
@@ -245,7 +245,7 @@ 
 			'per_page' => 0,
 		) );
 
-		if ( !$args['total_pages'] && $args['per_page'] > 0 )
+		if ( ! $args['total_pages'] && $args['per_page'] > 0 )
 			$args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
 
 		// Redirect if page number is invalid and headers are not already sent.
@@ -284,7 +284,7 @@ 
 	 * @return bool
 	 */
 	public function has_items() {
-		return !empty( $this->items );
+		return ! empty( $this->items );
 	}
 
 	/**
@@ -307,7 +307,7 @@ 
 	 * @param string $input_id The search input id
 	 */
 	public function search_box( $text, $input_id ) {
-		if ( empty( $_REQUEST['s'] ) && !$this->has_items() )
+		if ( empty( $_REQUEST['s'] ) && ! $this->has_items() )
 			return;
 
 		$input_id = $input_id . '-search-input';
@@ -324,7 +324,7 @@ 
 <p class="search-box">
 	<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 	<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
-	<?php submit_button( $text, 'button', '', false, array('id' => 'search-submit') ); ?>
+	<?php submit_button( $text, 'button', '', false, array( 'id' => 'search-submit' ) ); ?>
 </p>
 <?php
 	}
@@ -367,7 +367,7 @@ 
 
 		echo "<ul class='subsubsub'>\n";
 		foreach ( $views as $class => $view ) {
-			$views[ $class ] = "\t<li class='$class'>$view";
+			$views[$class] = "\t<li class='$class'>$view";
 		}
 		echo implode( " |</li>\n", $views ) . "</li>\n";
 		echo "</ul>";
@@ -471,12 +471,12 @@ 
 		$action_count = count( $actions );
 		$i = 0;
 
-		if ( !$action_count )
+		if ( ! $action_count )
 			return '';
 
 		$out = '<div class="' . ( $always_visible ? 'row-actions visible' : 'row-actions' ) . '">';
 		foreach ( $actions as $action => $link ) {
-			++$i;
+			++ $i;
 			( $i == $action_count ) ? $sep = '' : $sep = ' | ';
 			$out .= "<span class='$action'>$link$sep</span>";
 		}
@@ -532,7 +532,7 @@ 
 
 		$month_count = count( $months );
 
-		if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
+		if ( ! $month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
 			return;
 
 		$m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
@@ -748,7 +748,7 @@ 
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&lsaquo;</span>';
 		} else {
 			$page_links[] = sprintf( "<a class='prev-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-				esc_url( add_query_arg( 'paged', max( 1, $current-1 ), $current_url ) ),
+				esc_url( add_query_arg( 'paged', max( 1, $current - 1 ), $current_url ) ),
 				__( 'Previous page' ),
 				'&lsaquo;'
 			);
@@ -771,7 +771,7 @@ 
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&rsaquo;</span>';
 		} else {
 			$page_links[] = sprintf( "<a class='next-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-				esc_url( add_query_arg( 'paged', min( $total_pages, $current+1 ), $current_url ) ),
+				esc_url( add_query_arg( 'paged', min( $total_pages, $current + 1 ), $current_url ) ),
 				__( 'Next page' ),
 				'&rsaquo;'
 			);
@@ -834,7 +834,7 @@ 
 
 		// We need a primary defined so responsive views show something,
 		// so let's fall back to the first non-checkbox column.
-		foreach( $columns as $col => $column_name ) {
+		foreach ( $columns as $col => $column_name ) {
 			if ( 'cb' === $col ) {
 				continue;
 			}
@@ -860,7 +860,7 @@ 
 
 		// If the primary column doesn't exist fall back to the
 		// first non-checkbox column.
-		if ( ! isset( $columns[ $default ] ) ) {
+		if ( ! isset( $columns[$default] ) ) {
 			$default = FrmListHelper::get_default_primary_column_name();
 		}
 
@@ -874,7 +874,7 @@ 
 		 */
 		$column  = apply_filters( 'list_table_primary_column', $default, $this->screen->id );
 
-		if ( empty( $column ) || ! isset( $columns[ $column ] ) ) {
+		if ( empty( $column ) || ! isset( $columns[$column] ) ) {
 			$column = $default;
 		}
 
@@ -896,7 +896,7 @@ 
 			// In 4.3, we added a fourth argument for primary column.
 			$column_headers = array( array(), array(), array(), $this->get_primary_column_name() );
 			foreach ( $this->_column_headers as $key => $value ) {
-				$column_headers[ $key ] = $value;
+				$column_headers[$key] = $value;
 			}
 
 			return $column_headers;
@@ -924,7 +924,7 @@ 
 				continue;
 
 			$data = (array) $data;
-			if ( !isset( $data[1] ) )
+			if ( ! isset( $data[1] ) )
 				$data[1] = false;
 
 			$sortable[$id] = $data;
@@ -980,7 +980,7 @@ 
 			static $cb_counter = 1;
 			$columns['cb'] = '<label class="screen-reader-text" for="cb-select-all-' . $cb_counter . '">' . __( 'Select All' ) . '</label>'
 				. '<input id="cb-select-all-' . $cb_counter . '" type="checkbox" />';
-			$cb_counter++;
+			$cb_counter ++;
 		}
 
 		foreach ( $columns as $column_key => $column_display_name ) {
@@ -1019,7 +1019,7 @@ 
 			$scope = ( 'th' === $tag ) ? 'scope="col"' : '';
 			$id = $with_id ? "id='$column_key'" : '';
 
-			if ( !empty( $class ) )
+			if ( ! empty( $class ) )
 				$class = "class='" . join( ' ', $class ) . "'";
 
 			echo "<$tag $scope $id $class>$column_display_name</$tag>";

Braces +89 added lines, -62 removed lines

@@ -104,8 +104,9 @@ 
 
 		add_filter( "manage_{$this->screen->id}_columns", array( $this, 'get_columns' ), 0 );
 
-		if ( !$args['plural'] )
-			$args['plural'] = $this->screen->base;
+		if ( !$args['plural'] ) {
+					$args['plural'] = $this->screen->base;
+		}
 
 		$args['plural'] = sanitize_key( $args['plural'] );
 		$args['singular'] = sanitize_key( $args['singular'] );
@@ -245,8 +246,9 @@ 
 			'per_page' => 0,
 		) );
 
-		if ( !$args['total_pages'] && $args['per_page'] > 0 )
-			$args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
+		if ( !$args['total_pages'] && $args['per_page'] > 0 ) {
+					$args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
+		}
 
 		// Redirect if page number is invalid and headers are not already sent.
 		if ( ! headers_sent() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) && $args['total_pages'] > 0 && $this->get_pagenum() > $args['total_pages'] ) {
@@ -268,11 +270,13 @@ 
 	 * @return int Number of items that correspond to the given pagination argument.
 	 */
 	public function get_pagination_arg( $key ) {
-		if ( 'page' == $key )
-			return $this->get_pagenum();
+		if ( 'page' == $key ) {
+					return $this->get_pagenum();
+		}
 
-		if ( isset( $this->_pagination_args[$key] ) )
-			return $this->_pagination_args[$key];
+		if ( isset( $this->_pagination_args[$key] ) ) {
+					return $this->_pagination_args[$key];
+		}
 	}
 
 	/**
@@ -307,20 +311,25 @@ 
 	 * @param string $input_id The search input id
 	 */
 	public function search_box( $text, $input_id ) {
-		if ( empty( $_REQUEST['s'] ) && !$this->has_items() )
-			return;
+		if ( empty( $_REQUEST['s'] ) && !$this->has_items() ) {
+					return;
+		}
 
 		$input_id = $input_id . '-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) )
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
-		if ( ! empty( $_REQUEST['order'] ) )
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
-		if ( ! empty( $_REQUEST['post_mime_type'] ) )
-			echo '<input type="hidden" name="post_mime_type" value="' . esc_attr( $_REQUEST['post_mime_type'] ) . '" />';
-		if ( ! empty( $_REQUEST['detached'] ) )
-			echo '<input type="hidden" name="detached" value="' . esc_attr( $_REQUEST['detached'] ) . '" />';
-?>
+		if ( ! empty( $_REQUEST['orderby'] ) ) {
+					echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+		}
+		if ( ! empty( $_REQUEST['order'] ) ) {
+					echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+		}
+		if ( ! empty( $_REQUEST['post_mime_type'] ) ) {
+					echo '<input type="hidden" name="post_mime_type" value="' . esc_attr( $_REQUEST['post_mime_type'] ) . '" />';
+		}
+		if ( ! empty( $_REQUEST['detached'] ) ) {
+					echo '<input type="hidden" name="detached" value="' . esc_attr( $_REQUEST['detached'] ) . '" />';
+		}
+		?>
 <p class="search-box">
 	<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 	<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
@@ -362,8 +371,9 @@ 
 		 */
 		$views = apply_filters( "views_{$this->screen->id}", $views );
 
-		if ( empty( $views ) )
-			return;
+		if ( empty( $views ) ) {
+					return;
+		}
 
 		echo "<ul class='subsubsub'>\n";
 		foreach ( $views as $class => $view ) {
@@ -417,8 +427,9 @@ 
 			$two = '2';
 		}
 
-		if ( empty( $this->_actions ) )
-			return;
+		if ( empty( $this->_actions ) ) {
+					return;
+		}
 
 		echo "<label for='bulk-action-selector-" . esc_attr( $which ) . "' class='screen-reader-text'>" . __( 'Select bulk action' ) . "</label>";
 		echo "<select name='action$two' id='bulk-action-selector-" . esc_attr( $which ) . "'>\n";
@@ -445,14 +456,17 @@ 
 	 * @return string|false The action name or False if no action was selected
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['filter_action'] ) && ! empty( $_REQUEST['filter_action'] ) )
-			return false;
+		if ( isset( $_REQUEST['filter_action'] ) && ! empty( $_REQUEST['filter_action'] ) ) {
+					return false;
+		}
 
-		if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] )
-			return $_REQUEST['action'];
+		if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] ) {
+					return $_REQUEST['action'];
+		}
 
-		if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
-			return $_REQUEST['action2'];
+		if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] ) {
+					return $_REQUEST['action2'];
+		}
 
 		return false;
 	}
@@ -471,8 +485,9 @@ 
 		$action_count = count( $actions );
 		$i = 0;
 
-		if ( !$action_count )
-			return '';
+		if ( !$action_count ) {
+					return '';
+		}
 
 		$out = '<div class="' . ( $always_visible ? 'row-actions visible' : 'row-actions' ) . '">';
 		foreach ( $actions as $action => $link ) {
@@ -532,8 +547,9 @@ 
 
 		$month_count = count( $months );
 
-		if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
-			return;
+		if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) ) {
+					return;
+		}
 
 		$m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
 ?>
@@ -542,8 +558,9 @@ 
 			<option<?php selected( $m, 0 ); ?> value="0"><?php _e( 'All dates' ); ?></option>
 <?php
 		foreach ( $months as $arc_row ) {
-			if ( 0 == $arc_row->year )
-				continue;
+			if ( 0 == $arc_row->year ) {
+							continue;
+			}
 
 			$month = zeroise( $arc_row->month, 2 );
 			$year = $arc_row->year;
@@ -575,8 +592,9 @@ 
 <?php
 			foreach ( $this->modes as $mode => $title ) {
 				$classes = array( 'view-' . $mode );
-				if ( $current_mode == $mode )
-					$classes[] = 'current';
+				if ( $current_mode == $mode ) {
+									$classes[] = 'current';
+				}
 				printf(
 					"<a href='%s' class='%s' id='view-switch-$mode'><span class='screen-reader-text'>%s</span></a>\n",
 					esc_url( add_query_arg( 'mode', $mode ) ),
@@ -647,8 +665,9 @@ 
 	public function get_pagenum() {
 		$pagenum = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 0;
 
-		if ( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] )
-			$pagenum = $this->_pagination_args['total_pages'];
+		if ( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] ) {
+					$pagenum = $this->_pagination_args['total_pages'];
+		}
 
 		return max( 1, $pagenum );
 	}
@@ -665,8 +684,9 @@ 
 	 */
 	protected function get_items_per_page( $option, $default = 20 ) {
 		$per_page = (int) get_user_option( $option );
-		if ( empty( $per_page ) || $per_page < 1 )
-			$per_page = $default;
+		if ( empty( $per_page ) || $per_page < 1 ) {
+					$per_page = $default;
+		}
 
 		/**
 		 * Filter the number of items to be displayed on each page of the list table.
@@ -920,12 +940,14 @@ 
 
 		$sortable = array();
 		foreach ( $_sortable as $id => $data ) {
-			if ( empty( $data ) )
-				continue;
+			if ( empty( $data ) ) {
+							continue;
+			}
 
 			$data = (array) $data;
-			if ( !isset( $data[1] ) )
-				$data[1] = false;
+			if ( !isset( $data[1] ) ) {
+							$data[1] = false;
+			}
 
 			$sortable[$id] = $data;
 		}
@@ -966,15 +988,17 @@ 
 		$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
 		$current_url = remove_query_arg( 'paged', $current_url );
 
-		if ( isset( $_GET['orderby'] ) )
-			$current_orderby = $_GET['orderby'];
-		else
-			$current_orderby = '';
+		if ( isset( $_GET['orderby'] ) ) {
+					$current_orderby = $_GET['orderby'];
+		} else {
+					$current_orderby = '';
+		}
 
-		if ( isset( $_GET['order'] ) && 'desc' == $_GET['order'] )
-			$current_order = 'desc';
-		else
-			$current_order = 'asc';
+		if ( isset( $_GET['order'] ) && 'desc' == $_GET['order'] ) {
+					$current_order = 'desc';
+		} else {
+					$current_order = 'asc';
+		}
 
 		if ( ! empty( $columns['cb'] ) ) {
 			static $cb_counter = 1;
@@ -990,10 +1014,11 @@ 
 				$class[] = 'hidden';
 			}
 
-			if ( 'cb' == $column_key )
-				$class[] = 'check-column';
-			elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ) ) )
-				$class[] = 'num';
+			if ( 'cb' == $column_key ) {
+							$class[] = 'check-column';
+			} elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ) ) ) {
+							$class[] = 'num';
+			}
 
 			if ( $column_key === $primary ) {
 				$class[] = 'column-primary';
@@ -1019,8 +1044,9 @@ 
 			$scope = ( 'th' === $tag ) ? 'scope="col"' : '';
 			$id = $with_id ? "id='$column_key'" : '';
 
-			if ( !empty( $class ) )
-				$class = "class='" . join( ' ', $class ) . "'";
+			if ( !empty( $class ) ) {
+							$class = "class='" . join( ' ', $class ) . "'";
+			}
 
 			echo "<$tag $scope $id $class>$column_display_name</$tag>";
 		}
@@ -1082,9 +1108,10 @@ 
 	 * @param string $which
 	 */
 	protected function display_tablenav( $which ) {
-		if ( 'top' == $which )
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
-?>
+		if ( 'top' == $which ) {
+					wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+		}
+		?>
 	<div class="tablenav <?php echo esc_attr( $which ); ?>">
 
 		<div class="alignleft actions bulkactions">

classes/models/FrmEntryValidate.php

Indentation +162 added lines, -162 removed lines

@@ -1,26 +1,26 @@ 
 <?php
 
 class FrmEntryValidate {
-    public static function validate( $values, $exclude = false ) {
-        global $wpdb;
+	public static function validate( $values, $exclude = false ) {
+		global $wpdb;
 
-        FrmEntry::sanitize_entry_post( $values );
-        $errors = array();
+		FrmEntry::sanitize_entry_post( $values );
+		$errors = array();
 
-        if ( ! isset($values['form_id']) || ! isset($values['item_meta']) ) {
-            $errors['form'] = __( 'There was a problem with your submission. Please try again.', 'formidable' );
-            return $errors;
-        }
+		if ( ! isset($values['form_id']) || ! isset($values['item_meta']) ) {
+			$errors['form'] = __( 'There was a problem with your submission. Please try again.', 'formidable' );
+			return $errors;
+		}
 
 		if ( FrmAppHelper::is_admin() && is_user_logged_in() && ( ! isset( $values[ 'frm_submit_entry_' . $values['form_id'] ] ) || ! wp_verify_nonce( $values[ 'frm_submit_entry_' . $values['form_id'] ], 'frm_submit_entry_nonce' ) ) ) {
-            $errors['form'] = __( 'You do not have permission to do that', 'formidable' );
-        }
+			$errors['form'] = __( 'You do not have permission to do that', 'formidable' );
+		}
 
-        if ( ! isset($values['item_key']) || $values['item_key'] == '' ) {
-            $_POST['item_key'] = $values['item_key'] = FrmAppHelper::get_unique_key('', $wpdb->prefix .'frm_items', 'item_key');
-        }
+		if ( ! isset($values['item_key']) || $values['item_key'] == '' ) {
+			$_POST['item_key'] = $values['item_key'] = FrmAppHelper::get_unique_key('', $wpdb->prefix .'frm_items', 'item_key');
+		}
 
-        $where = apply_filters('frm_posted_field_ids', array( 'fi.form_id' => $values['form_id'] ) );
+		$where = apply_filters('frm_posted_field_ids', array( 'fi.form_id' => $values['form_id'] ) );
 		// Don't get subfields
 		$where['fr.parent_form_id'] = array( null, 0 );
 		// Don't get excluded fields (like file upload fields in the ajax validation)
@@ -28,46 +28,46 @@ 
 			$where['fi.type not'] = $exclude;
 		}
 
-        $posted_fields = FrmField::getAll($where, 'field_order');
+		$posted_fields = FrmField::getAll($where, 'field_order');
 
-        // Pass exclude value to validate_field function so it can be used for repeating sections
-        $args = array( 'exclude' => $exclude );
+		// Pass exclude value to validate_field function so it can be used for repeating sections
+		$args = array( 'exclude' => $exclude );
 
-        foreach ( $posted_fields as $posted_field ) {
-            self::validate_field($posted_field, $errors, $values, $args);
-            unset($posted_field);
-        }
+		foreach ( $posted_fields as $posted_field ) {
+			self::validate_field($posted_field, $errors, $values, $args);
+			unset($posted_field);
+		}
 
-        // check for spam
-        self::spam_check( $exclude, $values, $errors );
+		// check for spam
+		self::spam_check( $exclude, $values, $errors );
 
-        $errors = apply_filters( 'frm_validate_entry', $errors, $values, compact('exclude') );
+		$errors = apply_filters( 'frm_validate_entry', $errors, $values, compact('exclude') );
 
-        return $errors;
-    }
+		return $errors;
+	}
 
-    public static function validate_field( $posted_field, &$errors, $values, $args = array() ) {
-        $defaults = array(
-            'id'              => $posted_field->id,
-            'parent_field_id' => '', // the id of the repeat or embed form
-            'key_pointer'     => '', // the pointer in the posted array
-            'exclude'         => array(), // exclude these field types from validation
-        );
-        $args = wp_parse_args( $args, $defaults );
+	public static function validate_field( $posted_field, &$errors, $values, $args = array() ) {
+		$defaults = array(
+			'id'              => $posted_field->id,
+			'parent_field_id' => '', // the id of the repeat or embed form
+			'key_pointer'     => '', // the pointer in the posted array
+			'exclude'         => array(), // exclude these field types from validation
+		);
+		$args = wp_parse_args( $args, $defaults );
 
-        if ( empty($args['parent_field_id']) ) {
+		if ( empty($args['parent_field_id']) ) {
 			$value = isset( $values['item_meta'][ $args['id'] ] ) ? $values['item_meta'][ $args['id'] ] : '';
-        } else {
-            // value is from a nested form
-            $value = $values;
-        }
+		} else {
+			// value is from a nested form
+			$value = $values;
+		}
 
-        // Check for values in "Other" fields
-        FrmEntriesHelper::maybe_set_other_validation( $posted_field, $value, $args );
+		// Check for values in "Other" fields
+		FrmEntriesHelper::maybe_set_other_validation( $posted_field, $value, $args );
 
-        if ( isset($posted_field->field_options['default_blank']) && $posted_field->field_options['default_blank'] && $value == $posted_field->default_value ) {
-            $value = '';
-        }
+		if ( isset($posted_field->field_options['default_blank']) && $posted_field->field_options['default_blank'] && $value == $posted_field->default_value ) {
+			$value = '';
+		}
 
 		// Check for an array with only one value
 		// Don't reset values in "Other" fields because array keys need to be preserved
@@ -75,11 +75,11 @@ 
 			$value = reset($value);
 		}
 
-        if ( $posted_field->required == '1' && ! is_array( $value ) && trim( $value ) == '' ) {
+		if ( $posted_field->required == '1' && ! is_array( $value ) && trim( $value ) == '' ) {
 			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
-        } else if ( $posted_field->type == 'text' && ! isset( $_POST['item_name'] ) ) {
-            $_POST['item_name'] = $value;
-        }
+		} else if ( $posted_field->type == 'text' && ! isset( $_POST['item_name'] ) ) {
+			$_POST['item_name'] = $value;
+		}
 
 		if ( $value != '' ) {
 			self::validate_url_field( $errors, $posted_field, $value, $args );
@@ -88,41 +88,41 @@ 
 			self::validate_phone_field( $errors, $posted_field, $value, $args );
 		}
 
-        FrmEntriesHelper::set_posted_value($posted_field, $value, $args);
+		FrmEntriesHelper::set_posted_value($posted_field, $value, $args);
 
-        self::validate_recaptcha($errors, $posted_field, $args);
+		self::validate_recaptcha($errors, $posted_field, $args);
 
-        $errors = apply_filters('frm_validate_field_entry', $errors, $posted_field, $value, $args);
-    }
+		$errors = apply_filters('frm_validate_field_entry', $errors, $posted_field, $value, $args);
+	}
 
 	public static function validate_url_field( &$errors, $field, &$value, $args ) {
 		if ( $value == '' || ! in_array( $field->type, array( 'website', 'url', 'image' ) ) ) {
-            return;
-        }
-
-        if ( trim($value) == 'http://' ) {
-            $value = '';
-        } else {
-            $value = esc_url_raw( $value );
-            $value = preg_match('/^(https?|ftps?|mailto|news|feed|telnet):/is', $value) ? $value : 'http://'. $value;
-        }
-
-        //validate the url format
-        if ( ! preg_match('/^http(s)?:\/\/([\da-z\.-]+)\.([\da-z\.-]+)/i', $value) ) {
+			return;
+		}
+
+		if ( trim($value) == 'http://' ) {
+			$value = '';
+		} else {
+			$value = esc_url_raw( $value );
+			$value = preg_match('/^(https?|ftps?|mailto|news|feed|telnet):/is', $value) ? $value : 'http://'. $value;
+		}
+
+		//validate the url format
+		if ( ! preg_match('/^http(s)?:\/\/([\da-z\.-]+)\.([\da-z\.-]+)/i', $value) ) {
 			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
-        }
-    }
+		}
+	}
 
 	public static function validate_email_field( &$errors, $field, $value, $args ) {
-        if ( $value == '' || $field->type != 'email' ) {
-            return;
-        }
+		if ( $value == '' || $field->type != 'email' ) {
+			return;
+		}
 
-        //validate the email format
-        if ( ! is_email($value) ) {
+		//validate the email format
+		if ( ! is_email($value) ) {
 			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
-        }
-    }
+		}
+	}
 
 	public static function validate_number_field( &$errors, $field, $value, $args ) {
 		//validate the number format
@@ -199,9 +199,9 @@ 
 	}
 
 	public static function validate_recaptcha( &$errors, $field, $args ) {
-        if ( $field->type != 'captcha' || FrmAppHelper::is_admin() || apply_filters( 'frm_is_field_hidden', false, $field, stripslashes_deep( $_POST ) ) ) {
-            return;
-        }
+		if ( $field->type != 'captcha' || FrmAppHelper::is_admin() || apply_filters( 'frm_is_field_hidden', false, $field, stripslashes_deep( $_POST ) ) ) {
+			return;
+		}
 
 		$frm_settings = FrmAppHelper::get_settings();
 		if ( empty( $frm_settings->pubkey ) ) {
@@ -209,53 +209,53 @@ 
 			return;
 		}
 
-        if ( ! isset($_POST['g-recaptcha-response']) ) {
-            // If captcha is missing, check if it was already verified
+		if ( ! isset($_POST['g-recaptcha-response']) ) {
+			// If captcha is missing, check if it was already verified
 			if ( ! isset( $_POST['recaptcha_checked'] ) || ! wp_verify_nonce( $_POST['recaptcha_checked'], 'frm_ajax' ) ) {
-                // There was no captcha submitted
+				// There was no captcha submitted
 				$errors[ 'field' . $args['id'] ] = __( 'The captcha is missing from this form', 'formidable' );
-            }
-            return;
-        }
+			}
+			return;
+		}
 
-        $arg_array = array(
-            'body'      => array(
+		$arg_array = array(
+			'body'      => array(
 				'secret'   => $frm_settings->privkey,
 				'response' => $_POST['g-recaptcha-response'],
 				'remoteip' => FrmAppHelper::get_ip_address(),
 			),
 		);
-        $resp = wp_remote_post( 'https://www.google.com/recaptcha/api/siteverify', $arg_array );
-        $response = json_decode(wp_remote_retrieve_body( $resp ), true);
+		$resp = wp_remote_post( 'https://www.google.com/recaptcha/api/siteverify', $arg_array );
+		$response = json_decode(wp_remote_retrieve_body( $resp ), true);
 
-        if ( isset( $response['success'] ) && ! $response['success'] ) {
-            // What happens when the CAPTCHA was entered incorrectly
+		if ( isset( $response['success'] ) && ! $response['success'] ) {
+			// What happens when the CAPTCHA was entered incorrectly
 			$errors[ 'field' . $args['id'] ] = ( ! isset( $field->field_options['invalid'] ) || $field->field_options['invalid'] == '' ) ? $frm_settings->re_msg : $field->field_options['invalid'];
-        }
-    }
-
-    /**
-     * check for spam
-     * @param boolean $exclude
-     * @param array $values
-     * @param array $errors by reference
-     */
-    public static function spam_check( $exclude, $values, &$errors ) {
-        if ( ! empty( $exclude ) || ! isset( $values['item_meta'] ) || empty( $values['item_meta'] ) || ! empty( $errors ) ) {
-            // only check spam if there are no other errors
-            return;
-        }
-
-        if ( self::is_akismet_spam( $values ) ) {
+		}
+	}
+
+	/**
+	 * check for spam
+	 * @param boolean $exclude
+	 * @param array $values
+	 * @param array $errors by reference
+	 */
+	public static function spam_check( $exclude, $values, &$errors ) {
+		if ( ! empty( $exclude ) || ! isset( $values['item_meta'] ) || empty( $values['item_meta'] ) || ! empty( $errors ) ) {
+			// only check spam if there are no other errors
+			return;
+		}
+
+		if ( self::is_akismet_spam( $values ) ) {
 			if ( self::is_akismet_enabled_for_user( $values['form_id'] ) ) {
 				$errors['spam'] = __( 'Your entry appears to be spam!', 'formidable' );
 			}
-	    }
+		}
 
-    	if ( self::blacklist_check( $values ) ) {
-            $errors['spam'] = __( 'Your entry appears to be spam!', 'formidable' );
-    	}
-    }
+		if ( self::blacklist_check( $values ) ) {
+			$errors['spam'] = __( 'Your entry appears to be spam!', 'formidable' );
+		}
+	}
 
 	private static function is_akismet_spam( $values ) {
 		global $wpcom_api_key;
@@ -267,54 +267,54 @@ 
 		return ( isset( $form->options['akismet'] ) && ! empty( $form->options['akismet'] ) && ( $form->options['akismet'] != 'logged' || ! is_user_logged_in() ) );
 	}
 
-    public static function blacklist_check( $values ) {
-        if ( ! apply_filters('frm_check_blacklist', true, $values) ) {
-            return false;
-        }
+	public static function blacklist_check( $values ) {
+		if ( ! apply_filters('frm_check_blacklist', true, $values) ) {
+			return false;
+		}
 
-    	$mod_keys = trim( get_option( 'blacklist_keys' ) );
+		$mod_keys = trim( get_option( 'blacklist_keys' ) );
 
-    	if ( empty( $mod_keys ) ) {
-    		return false;
-    	}
+		if ( empty( $mod_keys ) ) {
+			return false;
+		}
 
-    	$content = FrmEntriesHelper::entry_array_to_string($values);
+		$content = FrmEntriesHelper::entry_array_to_string($values);
 
 		if ( empty($content) ) {
-		    return false;
+			return false;
 		}
 
-    	$words = explode( "\n", $mod_keys );
+		$words = explode( "\n", $mod_keys );
 
-    	foreach ( (array) $words as $word ) {
-    		$word = trim( $word );
+		foreach ( (array) $words as $word ) {
+			$word = trim( $word );
 
-    		if ( empty($word) ) {
-    			continue;
-    		}
+			if ( empty($word) ) {
+				continue;
+			}
 
-    		if ( preg_match('#' . preg_quote( $word, '#' ) . '#', $content) ) {
-    			return true;
-    		}
-    	}
+			if ( preg_match('#' . preg_quote( $word, '#' ) . '#', $content) ) {
+				return true;
+			}
+		}
 
-    	return false;
-    }
+		return false;
+	}
 
-    /**
-     * Check entries for spam
-     *
-     * @return boolean true if is spam
-     */
-    public static function akismet( $values ) {
-	    $content = FrmEntriesHelper::entry_array_to_string( $values );
+	/**
+	 * Check entries for spam
+	 *
+	 * @return boolean true if is spam
+	 */
+	public static function akismet( $values ) {
+		$content = FrmEntriesHelper::entry_array_to_string( $values );
 
 		if ( empty( $content ) ) {
-		    return false;
+			return false;
 		}
 
-        $datas = array();
-        self::parse_akismet_array( $datas, $content );
+		$datas = array();
+		self::parse_akismet_array( $datas, $content );
 
 		$query_string = '';
 		foreach ( $datas as $key => $data ) {
@@ -322,35 +322,35 @@ 
 			unset( $key, $data );
 		}
 
-        $response = Akismet::http_post($query_string, 'comment-check');
+		$response = Akismet::http_post($query_string, 'comment-check');
 
 		return ( is_array( $response ) && $response[1] == 'true' );
-    }
-
-    /**
-     * @since 2.0
-     * @param string $content
-     */
-    private  static function parse_akismet_array( &$datas, $content ) {
-        $datas['blog'] = FrmAppHelper::site_url();
-        $datas['user_ip'] = preg_replace( '/[^0-9., ]/', '', FrmAppHelper::get_ip_address() );
+	}
+
+	/**
+	 * @since 2.0
+	 * @param string $content
+	 */
+	private  static function parse_akismet_array( &$datas, $content ) {
+		$datas['blog'] = FrmAppHelper::site_url();
+		$datas['user_ip'] = preg_replace( '/[^0-9., ]/', '', FrmAppHelper::get_ip_address() );
 		$datas['user_agent'] = FrmAppHelper::get_server_value( 'HTTP_USER_AGENT' );
 		$datas['referrer'] = isset( $_SERVER['HTTP_REFERER'] ) ? FrmAppHelper::get_server_value( 'HTTP_REFERER' ) : false;
-        $datas['comment_type'] = 'formidable';
-        $datas['comment_content'] = $content;
+		$datas['comment_type'] = 'formidable';
+		$datas['comment_content'] = $content;
 
-        if ( $permalink = get_permalink() ) {
-            $datas['permalink'] = $permalink;
-        }
+		if ( $permalink = get_permalink() ) {
+			$datas['permalink'] = $permalink;
+		}
 
-        foreach ( $_SERVER as $key => $value ) {
+		foreach ( $_SERVER as $key => $value ) {
 			if ( ! in_array( $key, array( 'HTTP_COOKIE', 'HTTP_COOKIE2', 'PHP_AUTH_PW' ) ) && is_string( $value ) ) {
 				$datas[ $key ] = wp_strip_all_tags( $value );
-            } else {
+			} else {
 				$datas[ $key ] = '';
-            }
+			}
 
-            unset($key, $value);
-        }
-    }
+			unset($key, $value);
+		}
+	}
 }

Spacing +43 added lines, -43 removed lines

@@ -7,20 +7,20 @@ 
         FrmEntry::sanitize_entry_post( $values );
         $errors = array();
 
-        if ( ! isset($values['form_id']) || ! isset($values['item_meta']) ) {
+        if ( ! isset( $values['form_id'] ) || ! isset( $values['item_meta'] ) ) {
             $errors['form'] = __( 'There was a problem with your submission. Please try again.', 'formidable' );
             return $errors;
         }
 
-		if ( FrmAppHelper::is_admin() && is_user_logged_in() && ( ! isset( $values[ 'frm_submit_entry_' . $values['form_id'] ] ) || ! wp_verify_nonce( $values[ 'frm_submit_entry_' . $values['form_id'] ], 'frm_submit_entry_nonce' ) ) ) {
+		if ( FrmAppHelper::is_admin() && is_user_logged_in() && ( ! isset( $values['frm_submit_entry_' . $values['form_id']] ) || ! wp_verify_nonce( $values['frm_submit_entry_' . $values['form_id']], 'frm_submit_entry_nonce' ) ) ) {
             $errors['form'] = __( 'You do not have permission to do that', 'formidable' );
         }
 
-        if ( ! isset($values['item_key']) || $values['item_key'] == '' ) {
-            $_POST['item_key'] = $values['item_key'] = FrmAppHelper::get_unique_key('', $wpdb->prefix .'frm_items', 'item_key');
+        if ( ! isset( $values['item_key'] ) || $values['item_key'] == '' ) {
+            $_POST['item_key'] = $values['item_key'] = FrmAppHelper::get_unique_key( '', $wpdb->prefix . 'frm_items', 'item_key' );
         }
 
-        $where = apply_filters('frm_posted_field_ids', array( 'fi.form_id' => $values['form_id'] ) );
+        $where = apply_filters( 'frm_posted_field_ids', array( 'fi.form_id' => $values['form_id'] ) );
 		// Don't get subfields
 		$where['fr.parent_form_id'] = array( null, 0 );
 		// Don't get excluded fields (like file upload fields in the ajax validation)
@@ -28,20 +28,20 @@ 
 			$where['fi.type not'] = $exclude;
 		}
 
-        $posted_fields = FrmField::getAll($where, 'field_order');
+        $posted_fields = FrmField::getAll( $where, 'field_order' );
 
         // Pass exclude value to validate_field function so it can be used for repeating sections
         $args = array( 'exclude' => $exclude );
 
         foreach ( $posted_fields as $posted_field ) {
-            self::validate_field($posted_field, $errors, $values, $args);
-            unset($posted_field);
+            self::validate_field( $posted_field, $errors, $values, $args );
+            unset( $posted_field );
         }
 
         // check for spam
         self::spam_check( $exclude, $values, $errors );
 
-        $errors = apply_filters( 'frm_validate_entry', $errors, $values, compact('exclude') );
+        $errors = apply_filters( 'frm_validate_entry', $errors, $values, compact( 'exclude' ) );
 
         return $errors;
     }
@@ -55,8 +55,8 @@ 
         );
         $args = wp_parse_args( $args, $defaults );
 
-        if ( empty($args['parent_field_id']) ) {
-			$value = isset( $values['item_meta'][ $args['id'] ] ) ? $values['item_meta'][ $args['id'] ] : '';
+        if ( empty( $args['parent_field_id'] ) ) {
+			$value = isset( $values['item_meta'][$args['id']] ) ? $values['item_meta'][$args['id']] : '';
         } else {
             // value is from a nested form
             $value = $values;
@@ -65,18 +65,18 @@ 
         // Check for values in "Other" fields
         FrmEntriesHelper::maybe_set_other_validation( $posted_field, $value, $args );
 
-        if ( isset($posted_field->field_options['default_blank']) && $posted_field->field_options['default_blank'] && $value == $posted_field->default_value ) {
+        if ( isset( $posted_field->field_options['default_blank'] ) && $posted_field->field_options['default_blank'] && $value == $posted_field->default_value ) {
             $value = '';
         }
 
 		// Check for an array with only one value
 		// Don't reset values in "Other" fields because array keys need to be preserved
-		if ( is_array($value) && count( $value ) == 1 && $args['other'] !== true ) {
-			$value = reset($value);
+		if ( is_array( $value ) && count( $value ) == 1 && $args['other'] !== true ) {
+			$value = reset( $value );
 		}
 
         if ( $posted_field->required == '1' && ! is_array( $value ) && trim( $value ) == '' ) {
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
         } else if ( $posted_field->type == 'text' && ! isset( $_POST['item_name'] ) ) {
             $_POST['item_name'] = $value;
         }
@@ -88,11 +88,11 @@ 
 			self::validate_phone_field( $errors, $posted_field, $value, $args );
 		}
 
-        FrmEntriesHelper::set_posted_value($posted_field, $value, $args);
+        FrmEntriesHelper::set_posted_value( $posted_field, $value, $args );
 
-        self::validate_recaptcha($errors, $posted_field, $args);
+        self::validate_recaptcha( $errors, $posted_field, $args );
 
-        $errors = apply_filters('frm_validate_field_entry', $errors, $posted_field, $value, $args);
+        $errors = apply_filters( 'frm_validate_field_entry', $errors, $posted_field, $value, $args );
     }
 
 	public static function validate_url_field( &$errors, $field, &$value, $args ) {
@@ -100,16 +100,16 @@ 
             return;
         }
 
-        if ( trim($value) == 'http://' ) {
+        if ( trim( $value ) == 'http://' ) {
             $value = '';
         } else {
             $value = esc_url_raw( $value );
-            $value = preg_match('/^(https?|ftps?|mailto|news|feed|telnet):/is', $value) ? $value : 'http://'. $value;
+            $value = preg_match( '/^(https?|ftps?|mailto|news|feed|telnet):/is', $value ) ? $value : 'http://' . $value;
         }
 
         //validate the url format
-        if ( ! preg_match('/^http(s)?:\/\/([\da-z\.-]+)\.([\da-z\.-]+)/i', $value) ) {
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
+        if ( ! preg_match( '/^http(s)?:\/\/([\da-z\.-]+)\.([\da-z\.-]+)/i', $value ) ) {
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
         }
     }
 
@@ -119,8 +119,8 @@ 
         }
 
         //validate the email format
-        if ( ! is_email($value) ) {
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
+        if ( ! is_email( $value ) ) {
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
         }
     }
 
@@ -130,8 +130,8 @@ 
 			return;
 		}
 
-		if ( ! is_numeric( $value) ) {
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
+		if ( ! is_numeric( $value ) ) {
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
 		}
 
 		// validate number settings
@@ -141,9 +141,9 @@ 
 			if ( $frm_settings->use_html && isset( $field->field_options['minnum'] ) && isset( $field->field_options['maxnum'] ) ) {
 				//minnum maxnum
 				if ( (float) $value < $field->field_options['minnum'] ) {
-					$errors[ 'field' . $args['id'] ] = __( 'Please select a higher number', 'formidable' );
+					$errors['field' . $args['id']] = __( 'Please select a higher number', 'formidable' );
 				} else if ( (float) $value > $field->field_options['maxnum'] ) {
-					$errors[ 'field' . $args['id'] ] = __( 'Please select a lower number', 'formidable' );
+					$errors['field' . $args['id']] = __( 'Please select a lower number', 'formidable' );
 				}
 			}
 		}
@@ -157,7 +157,7 @@ 
 		$pattern = self::phone_format( $field );
 
 		if ( ! preg_match( $pattern, $value ) ) {
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
 		}
 	}
 
@@ -209,11 +209,11 @@ 
 			return;
 		}
 
-        if ( ! isset($_POST['g-recaptcha-response']) ) {
+        if ( ! isset( $_POST['g-recaptcha-response'] ) ) {
             // If captcha is missing, check if it was already verified
 			if ( ! isset( $_POST['recaptcha_checked'] ) || ! wp_verify_nonce( $_POST['recaptcha_checked'], 'frm_ajax' ) ) {
                 // There was no captcha submitted
-				$errors[ 'field' . $args['id'] ] = __( 'The captcha is missing from this form', 'formidable' );
+				$errors['field' . $args['id']] = __( 'The captcha is missing from this form', 'formidable' );
             }
             return;
         }
@@ -226,11 +226,11 @@ 
 			),
 		);
         $resp = wp_remote_post( 'https://www.google.com/recaptcha/api/siteverify', $arg_array );
-        $response = json_decode(wp_remote_retrieve_body( $resp ), true);
+        $response = json_decode( wp_remote_retrieve_body( $resp ), true );
 
         if ( isset( $response['success'] ) && ! $response['success'] ) {
             // What happens when the CAPTCHA was entered incorrectly
-			$errors[ 'field' . $args['id'] ] = ( ! isset( $field->field_options['invalid'] ) || $field->field_options['invalid'] == '' ) ? $frm_settings->re_msg : $field->field_options['invalid'];
+			$errors['field' . $args['id']] = ( ! isset( $field->field_options['invalid'] ) || $field->field_options['invalid'] == '' ) ? $frm_settings->re_msg : $field->field_options['invalid'];
         }
     }
 
@@ -259,7 +259,7 @@ 
 
 	private static function is_akismet_spam( $values ) {
 		global $wpcom_api_key;
-		return ( is_callable('Akismet::http_post') && ( get_option('wordpress_api_key') || $wpcom_api_key ) && self::akismet( $values ) );
+		return ( is_callable( 'Akismet::http_post' ) && ( get_option( 'wordpress_api_key' ) || $wpcom_api_key ) && self::akismet( $values ) );
 	}
 
 	private static function is_akismet_enabled_for_user( $form_id ) {
@@ -268,7 +268,7 @@ 
 	}
 
     public static function blacklist_check( $values ) {
-        if ( ! apply_filters('frm_check_blacklist', true, $values) ) {
+        if ( ! apply_filters( 'frm_check_blacklist', true, $values ) ) {
             return false;
         }
 
@@ -278,9 +278,9 @@ 
     		return false;
     	}
 
-    	$content = FrmEntriesHelper::entry_array_to_string($values);
+    	$content = FrmEntriesHelper::entry_array_to_string( $values );
 
-		if ( empty($content) ) {
+		if ( empty( $content ) ) {
 		    return false;
 		}
 
@@ -289,11 +289,11 @@ 
     	foreach ( (array) $words as $word ) {
     		$word = trim( $word );
 
-    		if ( empty($word) ) {
+    		if ( empty( $word ) ) {
     			continue;
     		}
 
-    		if ( preg_match('#' . preg_quote( $word, '#' ) . '#', $content) ) {
+    		if ( preg_match( '#' . preg_quote( $word, '#' ) . '#', $content ) ) {
     			return true;
     		}
     	}
@@ -322,7 +322,7 @@ 
 			unset( $key, $data );
 		}
 
-        $response = Akismet::http_post($query_string, 'comment-check');
+        $response = Akismet::http_post( $query_string, 'comment-check' );
 
 		return ( is_array( $response ) && $response[1] == 'true' );
     }
@@ -345,12 +345,12 @@ 
 
         foreach ( $_SERVER as $key => $value ) {
 			if ( ! in_array( $key, array( 'HTTP_COOKIE', 'HTTP_COOKIE2', 'PHP_AUTH_PW' ) ) && is_string( $value ) ) {
-				$datas[ $key ] = wp_strip_all_tags( $value );
+				$datas[$key] = wp_strip_all_tags( $value );
             } else {
-				$datas[ $key ] = '';
+				$datas[$key] = '';
             }
 
-            unset($key, $value);
+            unset( $key, $value );
         }
     }
 }