Strategy11 / formidable-forms

classes/helpers/FrmListHelper.php

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 +17 added lines, -17 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -275,8 +275,8 @@ 
 			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];
 		}
 	}
 
@@ -331,8 +331,8 @@ 
 	}
 
 	private function hidden_search_inputs( $param_name ) {
-		if ( ! empty( $_REQUEST[ $param_name ] ) ) {
-			echo '<input type="hidden" name="' . esc_attr( $param_name ) . '" value="' . esc_attr( $_REQUEST[ $param_name ] ) . '" />';
+		if ( ! empty( $_REQUEST[$param_name] ) ) {
+			echo '<input type="hidden" name="' . esc_attr( $param_name ) . '" value="' . esc_attr( $_REQUEST[$param_name] ) . '" />';
 		}
 	}
 
@@ -375,7 +375,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>';
@@ -436,7 +436,7 @@ 
 		foreach ( $this->_actions as $name => $title ) {
 			$class = 'edit' == $name ? ' class="hide-if-no-js"' : '';
 
-			echo "\t<option value='". esc_attr( $name ) ."'$class>$title</option>\n";
+			echo "\t<option value='" . esc_attr( $name ) . "'$class>$title</option>\n";
 		}
 
 		echo "</select>\n";
@@ -468,8 +468,8 @@ 
 
 	private static function get_bulk_action( $action_name ) {
 		$action = false;
-		if ( isset( $_REQUEST[ $action_name ] ) && -1 != sanitize_text_field( $_REQUEST[ $action_name ] ) ) {
-			$action = sanitize_text_field( $_REQUEST[ $action_name ] );
+		if ( isset( $_REQUEST[$action_name] ) && -1 != sanitize_text_field( $_REQUEST[$action_name] ) ) {
+			$action = sanitize_text_field( $_REQUEST[$action_name] );
 		}
 		return $action;
 	}
@@ -494,7 +494,7 @@ 
 
 		$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>";
 		}
@@ -760,7 +760,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();
 		}
 
@@ -774,7 +774,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;
 		}
 
@@ -796,7 +796,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;
@@ -829,7 +829,7 @@ 
 				$data[1] = false;
 			}
 
-			$sortable[ $id ] = $data;
+			$sortable[$id] = $data;
 		}
 
 		$primary = $this->get_primary_column_name();
@@ -884,7 +884,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-' . esc_attr( $cb_counter ) . '" type="checkbox" />';
-			$cb_counter++;
+			$cb_counter ++;
 		}
 
 		foreach ( $columns as $column_key => $column_display_name ) {
@@ -904,8 +904,8 @@ 
 				$class[] = 'column-primary';
 			}
 
-			if ( isset( $sortable[ $column_key ] ) ) {
-				list( $orderby, $desc_first ) = $sortable[ $column_key ];
+			if ( isset( $sortable[$column_key] ) ) {
+				list( $orderby, $desc_first ) = $sortable[$column_key];
 
 				if ( $current_orderby == $orderby ) {
 					$order = 'asc' == $current_order ? 'desc' : 'asc';

Braces +3 added lines, -2 removed lines

@@ -520,8 +520,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 ) ),

Doc Comments +6 added lines

@@ -253,6 +253,9 @@ 
 <?php
 	}
 
+	/**
+	 * @param string $param_name
+	 */
 	private function hidden_search_inputs( $param_name ) {
 		if ( ! empty( $_REQUEST[ $param_name ] ) ) {
 			echo '<input type="hidden" name="' . esc_attr( $param_name ) . '" value="' . esc_attr( $_REQUEST[ $param_name ] ) . '" />';
@@ -389,6 +392,9 @@ 
 		return $action;
 	}
 
+	/**
+	 * @param string $action_name
+	 */
 	private static function get_bulk_action( $action_name ) {
 		$action = false;
 		if ( isset( $_REQUEST[ $action_name ] ) && -1 != sanitize_text_field( $_REQUEST[ $action_name ] ) ) {

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 );
         }
     }
 }

classes/models/FrmAddon.php

Indentation +3 added lines, -3 removed lines

@@ -272,7 +272,7 @@
 		return $message;
 	}
 
-    public function manually_queue_update(){
-        set_site_transient( 'update_plugins', null );
-    }
+	public function manually_queue_update(){
+		set_site_transient( 'update_plugins', null );
+	}
 }

Spacing +17 added lines, -17 removed lines

@@ -38,15 +38,15 @@ 
 	}
 
 	public function insert_installed_addon( $plugins ) {
-		$plugins[ $this->plugin_slug ] = $this;
+		$plugins[$this->plugin_slug] = $this;
 		return $plugins;
 	}
 
 	public static function get_addon( $plugin_slug ) {
 		$plugins = apply_filters( 'frm_installed_addons', array() );
 		$plugin = false;
-		if ( isset( $plugins[ $plugin_slug ] ) ) {
-			$plugin = $plugins[ $plugin_slug ];
+		if ( isset( $plugins[$plugin_slug] ) ) {
+			$plugin = $plugins[$plugin_slug];
 		}
 		return $plugin;
 	}
@@ -58,7 +58,7 @@ 
 		if ( empty( $license ) ) {
 			add_action( 'after_plugin_row_' . plugin_basename( $this->plugin_file ), array( $this, 'show_license_message' ), 10, 2 );
 		} else {
-			if ( ! class_exists('EDD_SL_Plugin_Updater') ) {
+			if ( ! class_exists( 'EDD_SL_Plugin_Updater' ) ) {
 				include( dirname( __FILE__ ) . '/EDD_SL_Plugin_Updater.php' );
 			}
 
@@ -98,32 +98,32 @@ 
 	public function show_license_message( $file, $plugin ) {
 		$wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
 		echo '<tr class="plugin-update-tr active"><td colspan="' . esc_attr( $wp_list_table->get_column_count() ) . '" class="plugin-update colspanchange"><div class="update-message">';
-		echo sprintf( __( 'Your %1$s license key is missing. Please add it on the %2$slicenses page%3$s.', 'formidable' ), $this->plugin_name, '<a href="' . esc_url( admin_url('admin.php?page=formidable-settings&t=licenses_settings' ) ) . '">', '</a>' );
+		echo sprintf( __( 'Your %1$s license key is missing. Please add it on the %2$slicenses page%3$s.', 'formidable' ), $this->plugin_name, '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-settings&t=licenses_settings' ) ) . '">', '</a>' );
 		$id = sanitize_title( $plugin['Name'] );
 		echo '<script type="text/javascript">var d = document.getElementById("' . esc_attr( $id ) . '");if ( d !== null ){ d.className = d.className + " update"; }</script>';
 		echo '</div></td></tr>';
 	}
 
 	public function clear_expired_download( $transient ) {
-		if ( ! is_object($transient) ) {
+		if ( ! is_object( $transient ) ) {
 			return $transient;
 		}
 
 		if ( $this->is_current_version( $transient ) ) {
 			//make sure it doesn't show there is an update if plugin is up-to-date
-			if ( isset( $transient->response[ $this->plugin_folder ] ) ) {
-				unset( $transient->response[ $this->plugin_folder ] );
+			if ( isset( $transient->response[$this->plugin_folder] ) ) {
+				unset( $transient->response[$this->plugin_folder] );
 			}
-		} else if ( isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) ) {
+		} else if ( isset( $transient->response ) && isset( $transient->response[$this->plugin_folder] ) ) {
 			$cache_key = 'edd_plugin_' . md5( sanitize_key( $this->license . $this->version ) . '_get_version' );
 			$version_info = get_transient( $cache_key );
 			if ( $version_info !== false ) {
-				$transient->response[ $this->plugin_folder ] = $version_info;
+				$transient->response[$this->plugin_folder] = $version_info;
 			} else if ( ! $this->has_been_cleared() ) {
 				// if the transient has expired, clear the update and trigger it again
 				$this->cleared_plugins();
 				$this->manually_queue_update();
-				unset( $transient->response[ $this->plugin_folder ] );
+				unset( $transient->response[$this->plugin_folder] );
 			}
 		}
 
@@ -131,7 +131,7 @@ 
 	}
 
 	private function is_current_version( $transient ) {
-		if ( empty( $transient->checked ) || ! isset( $transient->checked[ $this->plugin_folder ] ) ) {
+		if ( empty( $transient->checked ) || ! isset( $transient->checked[$this->plugin_folder] ) ) {
 			return false;
 		}
 
@@ -140,7 +140,7 @@ 
 			return true;
 		}
 
-		return isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) && $transient->checked[ $this->plugin_folder ] == $transient->response[ $this->plugin_folder ]->new_version;
+		return isset( $transient->response ) && isset( $transient->response[$this->plugin_folder] ) && $transient->checked[$this->plugin_folder] == $transient->response[$this->plugin_folder]->new_version;
 	}
 
 	private function has_been_cleared() {
@@ -250,9 +250,9 @@ 
 
 		$message = __( 'Your License Key was invalid', 'formidable' );
 		if ( is_wp_error( $resp ) ) {
-			$message = sprintf( __( 'You had an error communicating with Formidable Pro\'s API. %1$sClick here%2$s for more information.', 'formidable' ), '<a href="http://formidablepro.com/knowledgebase/why-cant-i-activate-formidable-pro/" target="_blank">', '</a>');
+			$message = sprintf( __( 'You had an error communicating with Formidable Pro\'s API. %1$sClick here%2$s for more information.', 'formidable' ), '<a href="http://formidablepro.com/knowledgebase/why-cant-i-activate-formidable-pro/" target="_blank">', '</a>' );
 			if ( is_wp_error( $resp ) ) {
-				$message .= ' '. $resp->get_error_message();
+				$message .= ' ' . $resp->get_error_message();
 			}
 		} else if ( $body == 'error' || is_wp_error( $body ) ) {
 			$message = __( 'You had an HTTP error connecting to Formidable Pro\'s API', 'formidable' );
@@ -265,14 +265,14 @@ 
 					$message = $json_res;
 				}
 			} else if ( isset( $resp['response'] ) && isset( $resp['response']['code'] ) ) {
-				$message = sprintf( __( 'There was a %1$s error: %2$s', 'formidable' ), $resp['response']['code'], $resp['response']['message'] .' '. $resp['body'] );
+				$message = sprintf( __( 'There was a %1$s error: %2$s', 'formidable' ), $resp['response']['code'], $resp['response']['message'] . ' ' . $resp['body'] );
 			}
 		}
 
 		return $message;
 	}
 
-    public function manually_queue_update(){
+    public function manually_queue_update() {
         set_site_transient( 'update_plugins', null );
     }
 }

Braces +1 added lines, -1 removed lines

@@ -272,7 +272,7 @@
 		return $message;
 	}
 
-    public function manually_queue_update(){
+    public function manually_queue_update() {
         set_site_transient( 'update_plugins', null );
     }
 }