gravityview / GravityView

future/includes/class-gv-field.php

Spacing +17 added lines, -17 removed lines

@@ -166,7 +166,7 @@ 
 	 * @return \GV\Field The field implementation from configuration (\GV\GF_Field, \GV\Internal_Field).
 	 */
 	public static function from_configuration( $configuration ) {
-		if ( empty( $configuration['id'] ) ) {
+		if ( empty( $configuration[ 'id' ] ) ) {
 			$field = new self();
 			gravityview()->log->error( 'Trying to get field from configuration without a field ID.', array( 'data' => $configuration ) );
 			$field->update_configuration( $configuration );
@@ -179,8 +179,8 @@ 
 		} else {
 			$trace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS );
 		}
-		$trace = $trace[1];
-		if ( $trace['function'] == 'from_configuration' && $trace['class'] == __CLASS__ ) {
+		$trace = $trace[ 1 ];
+		if ( $trace[ 'function' ] == 'from_configuration' && $trace[ 'class' ] == __CLASS__ ) {
 			$field = new self();
 			gravityview()->log->error( 'Infinite loop protection tripped. Returning default class here.' );
 			$field->update_configuration( $configuration );
@@ -188,7 +188,7 @@ 
 		}
 
 		/** @var \GV\GF_Field|\GV\Internal_Field $field_class Determine the field implementation to use, and try to use. */
-		$field_class = is_numeric( $configuration['id'] ) ? '\GV\GF_Field' : '\GV\Internal_Field';
+		$field_class = is_numeric( $configuration[ 'id' ] ) ? '\GV\GF_Field' : '\GV\Internal_Field';
 
 		/**
 		 * @filter `gravityview/field/class` Filter the field class about to be created from the configuration.
@@ -227,24 +227,24 @@ 
 	public function update_configuration( $configuration ) {
 		$configuration = wp_parse_args( $configuration, $this->as_configuration() );
 
-		if ( $this->ID != $configuration['id'] ) {
+		if ( $this->ID != $configuration[ 'id' ] ) {
 			/** Smelling trouble here... */
 			gravityview()->log->warning( 'ID is being changed for {field_class} instance, but implementation is not. Use ::from_configuration instead', array( 'field_class', __CLASS__ ) );
 		}
 
-		$this->ID = $configuration['id'];
-		$this->label = $configuration['label'];
-		$this->show_label = $configuration['show_label'] == '1';
-		$this->custom_label = $configuration['custom_label'];
-		$this->custom_class = $configuration['custom_class'];
-		$this->cap = $configuration['only_loggedin'] == '1' ? $configuration['only_loggedin_cap'] : '';
-		$this->search_filter = $configuration['search_filter'] == '1';
-		$this->show_as_link = $configuration['show_as_link'] == '1';
+		$this->ID = $configuration[ 'id' ];
+		$this->label = $configuration[ 'label' ];
+		$this->show_label = $configuration[ 'show_label' ] == '1';
+		$this->custom_label = $configuration[ 'custom_label' ];
+		$this->custom_class = $configuration[ 'custom_class' ];
+		$this->cap = $configuration[ 'only_loggedin' ] == '1' ? $configuration[ 'only_loggedin_cap' ] : '';
+		$this->search_filter = $configuration[ 'search_filter' ] == '1';
+		$this->show_as_link = $configuration[ 'show_as_link' ] == '1';
 
 		/** Shared among all field types (sort of). */
 		$shared_configuration_keys = array(
 			'id', 'label', 'show_label', 'custom_label', 'custom_class',
-			'only_loggedin' ,'only_loggedin_cap', 'search_filter', 'show_as_link',
+			'only_loggedin', 'only_loggedin_cap', 'search_filter', 'show_as_link',
 		);
 
 		/** Everything else goes into the properties for now. @todo subclasses! */
@@ -273,7 +273,7 @@ 
 
 		/** A custom label is available. */
 		if ( ! empty( $this->custom_label ) ) {
-			return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ? : null : null, $entry ? $entry->as_entry() : null );
+			return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ?: null : null, $entry ? $entry->as_entry() : null );
 		}
 
 		return '';
@@ -350,7 +350,7 @@ 
 	 * @return mixed|null The value for the given configuration key, null if doesn't exist.
 	 */
 	public function __get( $key ) {
-		switch( $key ) {
+		switch ( $key ) {
 			default:
 				if ( isset( $this->configuration[ $key ] ) ) {
 					return $this->configuration[ $key ];
@@ -368,7 +368,7 @@ 
 	 * @return boolean Whether this $key is set or not.
 	 */
 	public function __isset( $key ) {
-		switch( $key ) {
+		switch ( $key ) {
 			default:
 				return isset( $this->configuration[ $key ] );
 		}

future/includes/class-gv-collection-entry.php

Spacing +6 added lines, -6 removed lines

@@ -104,11 +104,11 @@ 
 
 		/** Call all lazy callbacks. */
 		foreach ( $this->callbacks as $callback ) {
-			if ( $callback[0] != 'count' ) {
+			if ( $callback[ 0 ] != 'count' ) {
 				continue;
 			}
 
-			$total += $callback[1]( $this->filters );
+			$total += $callback[ 1 ]( $this->filters );
 		}
 
 		if ( ! $total ) {
@@ -148,7 +148,7 @@ 
 
 		foreach ( $this->all() as $entry ) {
 			$entry = $entry->as_entry();
-			$result[] = Utils::get( $entry, $key, null );
+			$result[ ] = Utils::get( $entry, $key, null );
 		}
 
 		return $result;
@@ -206,11 +206,11 @@ 
 
 		/** Call all lazy callbacks. */
 		foreach ( $this->callbacks as $i => $callback ) {
-			if ( $callback[0] != 'fetch' ) {
+			if ( $callback[ 0 ] != 'fetch' ) {
 				continue;
 			}
 
-			$this->merge( $callback[1]( $this->filters, $this->sorts, $offset ) );
+			$this->merge( $callback[ 1 ]( $this->filters, $this->sorts, $offset ) );
 		}
 
 		$this->fetched = parent::count();
@@ -366,7 +366,7 @@ 
 			return;
 		}
 
-		$this->callbacks []= array( $type, $callback );
+		$this->callbacks [ ] = array( $type, $callback );
 	}
 
 	/**

includes/extensions/edit-entry/class-edit-entry-render.php

Spacing +230 added lines, -230 removed lines

@@ -123,16 +123,16 @@ 
 	function load() {
 
 		/** @define "GRAVITYVIEW_DIR" "../../../" */
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
 
 		// Don't display an embedded form when editing an entry
 		add_action( 'wp_head', array( $this, 'prevent_render_form' ) );
 		add_action( 'wp_footer', array( $this, 'prevent_render_form' ) );
 
 		// Stop Gravity Forms processing what is ours!
-		add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 );
+		add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 );
 
-		add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') );
+		add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) );
 
 		add_action( 'gravityview_edit_entry', array( $this, 'init' ), 10, 4 );
 
@@ -143,7 +143,7 @@ 
 		add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 );
 
 		// Add fields expected by GFFormDisplay::validate()
-		add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') );
+		add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) );
 
 		// Fix multiselect value for GF 2.2
 		add_filter( 'gravityview/edit_entry/field_value_multiselect', array( $this, 'fix_multiselect_value_serialization' ), 10, 3 );
@@ -160,8 +160,8 @@ 
 	 * @return void
 	 */
 	public function prevent_render_form() {
-		if( $this->is_edit_entry() ) {
-			if( 'wp_head' === current_filter() ) {
+		if ( $this->is_edit_entry() ) {
+			if ( 'wp_head' === current_filter() ) {
 				add_filter( 'gform_shortcode_form', '__return_empty_string' );
 			} else {
 				remove_filter( 'gform_shortcode_form', '__return_empty_string' );
@@ -176,14 +176,14 @@ 
 	 */
 	public function prevent_maybe_process_form() {
 
-	    if( ! $this->is_edit_entry_submission() ) {
+	    if ( ! $this->is_edit_entry_submission() ) {
 			return;
 		}
 
 		gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] Removing GFForms::maybe_process_form() action.' );
 
-		remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
-		remove_action( 'wp',  array( 'GFForms', 'maybe_process_form'), 9 );
+		remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 );
+		remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 );
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 */
 	public function is_edit_entry() {
 
-		$is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET['edit'] );
+		$is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET[ 'edit' ] );
 
 		return ( $is_edit_entry || $this->is_edit_entry_submission() );
 	}
@@ -203,7 +203,7 @@ 
 	 * @return boolean
 	 */
 	public function is_edit_entry_submission() {
-		return !empty( $_POST[ self::$nonce_field ] );
+		return ! empty( $_POST[ self::$nonce_field ] );
 	}
 
 	/**
@@ -216,16 +216,16 @@ 
 
 
 		$entries = $gravityview_view->getEntries();
-	    self::$original_entry = $entries[0];
-	    $this->entry = $entries[0];
+	    self::$original_entry = $entries[ 0 ];
+	    $this->entry = $entries[ 0 ];
 
 		self::$original_form = $gravityview_view->getForm();
 		$this->form = $gravityview_view->getForm();
-		$this->form_id = $this->entry['form_id'];
+		$this->form_id = $this->entry[ 'form_id' ];
 		$this->view_id = $gravityview_view->getViewId();
 		$this->post_id = \GV\Utils::get( $post, 'ID', null );
 
-		self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] );
+		self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] );
 	}
 
 
@@ -284,9 +284,9 @@ 
 	private function print_scripts() {
 		$gravityview_view = GravityView_View::getInstance();
 
-		wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
+		wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
 
-		GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false);
+		GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false );
 
 		wp_localize_script( 'gravityview-fe-view', 'gvGlobals', array( 'cookiepath' => COOKIEPATH ) );
 
@@ -302,19 +302,19 @@ 
 	 */
 	private function process_save( $gv_data ) {
 
-		if ( empty( $_POST ) || ! isset( $_POST['lid'] ) ) {
+		if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) {
 			return;
 		}
 
 		// Make sure the entry, view, and form IDs are all correct
 		$valid = $this->verify_nonce();
 
-		if ( !$valid ) {
+		if ( ! $valid ) {
 			gravityview()->log->error( 'Nonce validation failed.' );
 			return;
 		}
 
-		if ( $this->entry['id'] !== $_POST['lid'] ) {
+		if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) {
 			gravityview()->log->error( 'Entry ID did not match posted entry ID.' );
 			return;
 		}
@@ -325,7 +325,7 @@ 
 
 		$this->validate();
 
-		if( $this->is_valid ) {
+		if ( $this->is_valid ) {
 
 			gravityview()->log->debug( 'Submission is valid.' );
 
@@ -337,15 +337,15 @@ 
 			/**
 			 * @hack to avoid the capability validation of the method save_lead for GF 1.9+
 			 */
-			unset( $_GET['page'] );
+			unset( $_GET[ 'page' ] );
 
-			$date_created = $this->entry['date_created'];
+			$date_created = $this->entry[ 'date_created' ];
 
 			/**
 			 * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead()
 			 * @since 1.17.2
 			 */
-			unset( $this->entry['date_created'] );
+			unset( $this->entry[ 'date_created' ] );
 
 			/**
 			 * @action `gravityview/edit_entry/before_update` Perform an action after the entry has been updated using Edit Entry
@@ -355,14 +355,14 @@ 
 			 * @param GravityView_Edit_Entry_Render $this This object
 			 * @param GravityView_View_Data $gv_data The View data
 			 */
-			do_action( 'gravityview/edit_entry/before_update', $form, $this->entry['id'], $this, $gv_data );
+			do_action( 'gravityview/edit_entry/before_update', $form, $this->entry[ 'id' ], $this, $gv_data );
 
 			GFFormsModel::save_lead( $form, $this->entry );
 
 	        // Delete the values for hidden inputs
 	        $this->unset_hidden_field_values();
 			
-			$this->entry['date_created'] = $date_created;
+			$this->entry[ 'date_created' ] = $date_created;
 
 			// Process calculation fields
 			$this->update_calculation_fields();
@@ -384,7 +384,7 @@ 
 			 * @param GravityView_Edit_Entry_Render $this This object
 			 * @param GravityView_View_Data $gv_data The View data
 			 */
-			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this, $gv_data );
+			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this, $gv_data );
 
 		} else {
 			gravityview()->log->error( 'Submission is NOT valid.', array( 'entry' => $this->entry ) );
@@ -412,16 +412,16 @@ 
 		 */
 		$unset_hidden_field_values = apply_filters( 'gravityview/edit_entry/unset_hidden_field_values', true, $this );
 
-		if( ! $unset_hidden_field_values ) {
+		if ( ! $unset_hidden_field_values ) {
 			return;
 		}
 
 		if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
 			$entry_meta_table = GFFormsModel::get_entry_meta_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry[ 'id' ] ) );
 		} else {
 			$lead_detail_table = GFFormsModel::get_lead_details_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) );
 		}
 
 	    foreach ( $this->entry as $input_id => $field_value ) {
@@ -434,7 +434,7 @@ 
 
 				$empty_value = $field->get_value_save_entry(
 					is_array( $field->get_entry_inputs() ) ? array() : '',
-					$this->form, '', $this->entry['id'], $this->entry
+					$this->form, '', $this->entry[ 'id' ], $this->entry
 				);
 
 			    $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id );
@@ -504,7 +504,7 @@ 
 		}
 
 		/** No file is being uploaded. */
-		if ( empty( $_FILES[ $input_name ]['name'] ) ) {
+		if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) {
 			/** So return the original upload */
 			return $entry[ $input_id ];
 		}
@@ -522,11 +522,11 @@ 
 	 * @return mixed
 	 */
 	public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
-		if( ! $this->is_edit_entry() ) {
+		if ( ! $this->is_edit_entry() ) {
 			return $plupload_init;
 		}
 
-		$plupload_init['gf_vars']['max_files'] = 0;
+		$plupload_init[ 'gf_vars' ][ 'max_files' ] = 0;
 
 		return $plupload_init;
 	}
@@ -541,27 +541,27 @@ 
 		$form = $this->filter_conditional_logic( $this->form );
 
 	    /** @var GF_Field $field */
-		foreach( $form['fields'] as $k => &$field ) {
+		foreach ( $form[ 'fields' ] as $k => &$field ) {
 
 			/**
 			 * Remove the fields with calculation formulas before save to avoid conflicts with GF logic
 			 * @since 1.16.3
 			 * @var GF_Field $field
 			 */
-			if( $field->has_calculation() ) {
-				unset( $form['fields'][ $k ] );
+			if ( $field->has_calculation() ) {
+				unset( $form[ 'fields' ][ $k ] );
 			}
 
 			$field->adminOnly = false;
 
-			if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
-				foreach( $field->inputs as $key => $input ) {
-				    $field->inputs[ $key ][ 'id' ] = (string)$input['id'];
+			if ( isset( $field->inputs ) && is_array( $field->inputs ) ) {
+				foreach ( $field->inputs as $key => $input ) {
+				    $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ];
 				}
 			}
 		}
 
-		$form['fields'] = array_values( $form['fields'] );
+		$form[ 'fields' ] = array_values( $form[ 'fields' ] );
 
 		return $form;
 	}
@@ -573,14 +573,14 @@ 
 		$update = false;
 
 		// get the most up to date entry values
-		$entry = GFAPI::get_entry( $this->entry['id'] );
+		$entry = GFAPI::get_entry( $this->entry[ 'id' ] );
 
 		if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
 			$entry_meta_table = GFFormsModel::get_entry_meta_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry[ 'id' ] ) );
 		} else {
 			$lead_detail_table = GFFormsModel::get_lead_details_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry[ 'id' ] ) );
 		}
 
 
@@ -592,24 +592,24 @@ 
 				$inputs = $field->get_entry_inputs();
 				if ( is_array( $inputs ) ) {
 				    foreach ( $inputs as $input ) {
-						list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 );
+						list( $field_id, $input_id ) = rgexplode( '.', $input[ 'id' ], 2 );
 
 						if ( 'product' === $field->type ) {
-							$input_name = 'input_' . str_replace( '.', '_', $input['id'] );
+							$input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] );
 
 							// Only allow quantity to be set if it's allowed to be edited
 							if ( in_array( $field_id, $allowed_fields ) && $input_id == 3 ) {
 							} else { // otherwise set to what it previously was
-								$_POST[ $input_name ] = $entry[ $input['id'] ];
+								$_POST[ $input_name ] = $entry[ $input[ 'id' ] ];
 							}
 						} else {
 							// Set to what it previously was if it's not editable
 							if ( ! in_array( $field_id, $allowed_fields ) ) {
-								$_POST[ $input_name ] = $entry[ $input['id'] ];
+								$_POST[ $input_name ] = $entry[ $input[ 'id' ] ];
 							}
 						}
 
-						GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] );
+						GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input[ 'id' ] );
 				    }
 				} else {
 					// Set to what it previously was if it's not editable
@@ -649,19 +649,19 @@ 
 
 		$input_name = 'input_' . $field_id;
 
-		if ( !empty( $_FILES[ $input_name ]['name'] ) ) {
+		if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) {
 
 			// We have a new image
 
-			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] );
+			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] );
 
 			$ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
 	        $ary = stripslashes_deep( $ary );
 			$img_url = \GV\Utils::get( $ary, 0 );
 
-			$img_title       = count( $ary ) > 1 ? $ary[1] : '';
-			$img_caption     = count( $ary ) > 2 ? $ary[2] : '';
-			$img_description = count( $ary ) > 3 ? $ary[3] : '';
+			$img_title       = count( $ary ) > 1 ? $ary[ 1 ] : '';
+			$img_caption     = count( $ary ) > 2 ? $ary[ 2 ] : '';
+			$img_description = count( $ary ) > 3 ? $ary[ 3 ] : '';
 
 			$image_meta = array(
 				'post_excerpt' => $img_caption,
@@ -670,7 +670,7 @@ 
 
 			//adding title only if it is not empty. It will default to the file name if it is not in the array
 			if ( ! empty( $img_title ) ) {
-				$image_meta['post_title'] = $img_title;
+				$image_meta[ 'post_title' ] = $img_title;
 			}
 
 			/**
@@ -728,15 +728,15 @@ 
 	 */
 	private function maybe_update_post_fields( $form ) {
 
-		if( empty( $this->entry['post_id'] ) ) {
+		if ( empty( $this->entry[ 'post_id' ] ) ) {
 	        gravityview()->log->debug( 'This entry has no post fields. Continuing...' );
 			return;
 		}
 
-		$post_id = $this->entry['post_id'];
+		$post_id = $this->entry[ 'post_id' ];
 
 		// Security check
-		if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
+		if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
 			gravityview()->log->error( 'The current user does not have the ability to edit Post #{post_id}', array( 'post_id' => $post_id ) );
 			return;
 		}
@@ -749,25 +749,25 @@ 
 
 			$field = RGFormsModel::get_field( $form, $field_id );
 
-			if( ! $field ) {
+			if ( ! $field ) {
 				continue;
 			}
 
-			if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) {
+			if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) {
 
 				// Get the value of the field, including $_POSTed value
 				$value = RGFormsModel::get_field_value( $field );
 
 				// Use temporary entry variable, to make values available to fill_post_template() and update_post_image()
 				$entry_tmp = $this->entry;
-				$entry_tmp["{$field_id}"] = $value;
+				$entry_tmp[ "{$field_id}" ] = $value;
 
-				switch( $field->type ) {
+				switch ( $field->type ) {
 
 				    case 'post_title':
 				        $post_title = $value;
 				        if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) {
-				            $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
+				            $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp );
 				        }
 				        $updated_post->post_title = $post_title;
 				        $updated_post->post_name  = $post_title;
@@ -777,7 +777,7 @@ 
 				    case 'post_content':
 				        $post_content = $value;
 				        if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) {
-				            $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
+				            $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true );
 				        }
 				        $updated_post->post_content = $post_content;
 				        unset( $post_content );
@@ -795,11 +795,11 @@ 
 							$value = $value[ $field_id ];
 						}
 
-				        if( ! empty( $field->customFieldTemplateEnabled ) ) {
+				        if ( ! empty( $field->customFieldTemplateEnabled ) ) {
 				            $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
 				        }
 
-						$value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry );
+						$value = $field->get_value_save_entry( $value, $form, '', $this->entry[ 'id' ], $this->entry );
 
 				        update_post_meta( $post_id, $field->postCustomFieldName, $value );
 				        break;
@@ -811,7 +811,7 @@ 
 				}
 
 				// update entry after
-				$this->entry["{$field_id}"] = $value;
+				$this->entry[ "{$field_id}" ] = $value;
 
 				$update_entry = true;
 
@@ -820,11 +820,11 @@ 
 
 		}
 
-		if( $update_entry ) {
+		if ( $update_entry ) {
 
 			$return_entry = GFAPI::update_entry( $this->entry );
 
-			if( is_wp_error( $return_entry ) ) {
+			if ( is_wp_error( $return_entry ) ) {
 				gravityview()->log->error( 'Updating the entry post fields failed', array( 'data' => array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) ) );
 			} else {
 				gravityview()->log->debug( 'Updating the entry post fields for post #{post_id} succeeded', array( 'post_id' => $post_id ) );
@@ -834,7 +834,7 @@ 
 
 		$return_post = wp_update_post( $updated_post, true );
 
-		if( is_wp_error( $return_post ) ) {
+		if ( is_wp_error( $return_post ) ) {
 			$return_post->add_data( $updated_post, '$updated_post' );
 			gravityview()->log->error( 'Updating the post content failed', array( 'data' => compact( 'updated_post', 'return_post' ) ) );
 		} else {
@@ -868,7 +868,7 @@ 
 		$output = GFCommon::replace_variables( $output, $form, $entry, false, false, false );
 
 		// replace conditional shortcodes
-		if( $do_shortcode ) {
+		if ( $do_shortcode ) {
 			$output = do_shortcode( $output );
 		}
 
@@ -887,19 +887,19 @@ 
 	 */
 	private function after_update() {
 
-		do_action( 'gform_after_update_entry', $this->form, $this->entry['id'], self::$original_entry );
-		do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'], self::$original_entry );
+		do_action( 'gform_after_update_entry', $this->form, $this->entry[ 'id' ], self::$original_entry );
+		do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", $this->form, $this->entry[ 'id' ], self::$original_entry );
 
 		// Re-define the entry now that we've updated it.
-		$entry = RGFormsModel::get_lead( $this->entry['id'] );
+		$entry = RGFormsModel::get_lead( $this->entry[ 'id' ] );
 
 		$entry = GFFormsModel::set_entry_meta( $entry, self::$original_form );
 
 		if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '<' ) ) {
 			// We need to clear the cache because Gravity Forms caches the field values, which
 			// we have just updated.
-			foreach ($this->form['fields'] as $key => $field) {
-				GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id );
+			foreach ( $this->form[ 'fields' ] as $key => $field ) {
+				GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id );
 			}
 		}
 
@@ -909,11 +909,11 @@ 
 		 * @since develop
 		 */
 		if ( $allowed_feeds = $this->view->settings->get( 'edit_feeds', array() ) ) {
-			$feeds = GFAPI::get_feeds( null, $entry['form_id'] );
+			$feeds = GFAPI::get_feeds( null, $entry[ 'form_id' ] );
 			if ( ! is_wp_error( $feeds ) ) {
 				$registered_feeds = array();
 				foreach ( GFAddOn::get_registered_addons() as $registered_feed ) {
-					if ( is_subclass_of( $registered_feed,  'GFFeedAddOn' ) ) {
+					if ( is_subclass_of( $registered_feed, 'GFFeedAddOn' ) ) {
 						if ( method_exists( $registered_feed, 'get_instance' ) ) {
 							$registered_feed = call_user_func( array( $registered_feed, 'get_instance' ) );
 							$registered_feeds[ $registered_feed->get_slug() ] = $registered_feed;
@@ -921,8 +921,8 @@ 
 					}
 				}
 				foreach ( $feeds as $feed ) {
-					if ( in_array( $feed['id'], $allowed_feeds ) ) {
-						if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed['addon_slug'] ) ) {
+					if ( in_array( $feed[ 'id' ], $allowed_feeds ) ) {
+						if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed[ 'addon_slug' ] ) ) {
 							$returned_entry = $feed_object->process_feed( $feed, $entry, self::$original_form );
 							if ( is_array( $returned_entry ) && rgar( $returned_entry, 'id' ) ) {
 								$entry = $returned_entry;
@@ -952,7 +952,7 @@ 
 
 		<div class="gv-edit-entry-wrapper"><?php
 
-			$javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this );
+			$javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this );
 
 			/**
 			 * Fixes weird wpautop() issue
@@ -968,7 +968,7 @@ 
 				     * @param string $edit_entry_title Modify the "Edit Entry" title
 				     * @param GravityView_Edit_Entry_Render $this This object
 				     */
-				    $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
+				    $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this );
 
 				    echo esc_attr( $edit_entry_title );
 			?></span>
@@ -1018,13 +1018,13 @@ 
 
 			$back_link = remove_query_arg( array( 'page', 'view', 'edit' ) );
 
-			if( ! $this->is_valid ){
+			if ( ! $this->is_valid ) {
 
 				// Keeping this compatible with Gravity Forms.
-				$validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>";
-				$message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form);
+				$validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>";
+				$message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form );
 
-				echo GVCommon::generate_notice( $message , 'gv-error' );
+				echo GVCommon::generate_notice( $message, 'gv-error' );
 
 			} else {
 				$view = \GV\View::by_id( $this->view_id );
@@ -1035,23 +1035,23 @@ 
 
                     case '0':
 	                    $redirect_url = $back_link;
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' );
+	                    $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', '</a>' );
                         break;
 
                     case '1':
 	                    $redirect_url = $directory_link = GravityView_API::directory_link();
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' );
+	                    $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' );
 	                    break;
 
                     case '2':
 	                    $redirect_url = $edit_redirect_url;
 	                    $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' );
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' );
+	                    $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' );
                         break;
 
                     case '':
                     default:
-					    $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' );
+					    $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . esc_url( $back_link ) . '">', '</a>' );
                         break;
 				}
 
@@ -1067,7 +1067,7 @@ 
 				 * @param array $entry Gravity Forms entry array
 				 * @param string $back_link URL to return to the original entry. @since 1.6
 				 */
-				$message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link );
+				$message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link );
 
 				echo GVCommon::generate_notice( $message );
 			}
@@ -1091,21 +1091,21 @@ 
 		 */
 		do_action( 'gravityview/edit-entry/render/before', $this );
 
-		add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 );
-		add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') );
+		add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 );
+		add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
 		add_filter( 'gform_disable_view_counter', '__return_true' );
 
 		add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 );
 		add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 );
 
 		// We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
-		unset( $_GET['page'] );
+		unset( $_GET[ 'page' ] );
 
 		// TODO: Verify multiple-page forms
 
 		ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic
 
-		$html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
+		$html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry );
 
 		ob_get_clean();
 
@@ -1131,7 +1131,7 @@ 
 	 * @return string
 	 */
 	public function render_form_buttons() {
-		return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this );
+		return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this );
 	}
 
 
@@ -1151,10 +1151,10 @@ 
 	public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) {
 
 		// In case we have validated the form, use it to inject the validation results into the form render
-		if( isset( $this->form_after_validation ) ) {
+		if ( isset( $this->form_after_validation ) ) {
 			$form = $this->form_after_validation;
 		} else {
-			$form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id );
+			$form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id );
 		}
 
 		$form = $this->filter_conditional_logic( $form );
@@ -1162,8 +1162,8 @@ 
 		$form = $this->prefill_conditional_logic( $form );
 
 		// for now we don't support Save and Continue feature.
-		if( ! self::$supports_save_and_continue ) {
-	        unset( $form['save'] );
+		if ( ! self::$supports_save_and_continue ) {
+	        unset( $form[ 'save' ] );
 		}
 
 		$form = $this->unselect_default_values( $form );
@@ -1186,31 +1186,31 @@ 
 	 */
 	public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
 
-		if( ! GFCommon::is_post_field( $field ) ) {
+		if ( ! GFCommon::is_post_field( $field ) ) {
 			return $field_content;
 		}
 
         $message = null;
 
         // First, make sure they have the capability to edit the post.
-        if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
+        if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) {
 
             /**
              * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
              * @param string $message The existing "You don't have permission..." text
              */
-            $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
+            $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don&rsquo;t have permission to edit this post.', 'gravityview' ) );
 
-        } elseif( null === get_post( $this->entry['post_id'] ) ) {
+        } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) {
             /**
              * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
              * @param string $message The existing "This field is not editable; the post no longer exists." text
              */
-            $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
+            $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) );
         }
 
-        if( $message ) {
-            $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
+        if ( $message ) {
+            $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
         }
 
         return $field_content;
@@ -1234,8 +1234,8 @@ 
 
 		// If the form has been submitted, then we don't need to pre-fill the values,
 		// Except for fileupload type and when a field input is overridden- run always!!
-		if(
-			( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) )
+		if (
+			( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) )
 			&& false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) )
 			&& ! GFCommon::is_product_field( $field->type )
 			|| ! empty( $field_content )
@@ -1255,7 +1255,7 @@ 
 	    $return = null;
 
 		/** @var GravityView_Field $gv_field */
-		if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
+		if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
 			$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
 		} else {
 	        $return = $field->get_field_input( $this->form, $field_value, $this->entry );
@@ -1264,7 +1264,7 @@ 
 	    // If there was output, it's an error
 	    $warnings = ob_get_clean();
 
-	    if( !empty( $warnings ) ) {
+	    if ( ! empty( $warnings ) ) {
 		    gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) );
 	    }
 
@@ -1289,7 +1289,7 @@ 
 		$override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field );
 
 		// We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs)
-		if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) {
+		if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) {
 
 			$field_value = array();
 
@@ -1298,10 +1298,10 @@ 
 
 			foreach ( (array)$field->inputs as $input ) {
 
-				$input_id = strval( $input['id'] );
+				$input_id = strval( $input[ 'id' ] );
 
 				if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) {
-				    $field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
+				    $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
 				    $allow_pre_populated = false;
 				}
 
@@ -1309,7 +1309,7 @@ 
 
 			$pre_value = $field->get_value_submission( array(), false );
 
-			$field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value;
+			$field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value;
 
 		} else {
 
@@ -1320,13 +1320,13 @@ 
 
 			// saved field entry value (if empty, fallback to the pre-populated value, if exists)
 			// or pre-populated value if not empty and set to override saved value
-			$field_value = isset( $this->entry[ $id ] ) && ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
+			$field_value = isset( $this->entry[ $id ] ) && ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
 
 			// in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs.
-			if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) {
+			if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) {
 				$categories = array();
 				foreach ( explode( ',', $field_value ) as $cat_string ) {
-				    $categories[] = GFCommon::format_post_category( $cat_string, true );
+				    $categories[ ] = GFCommon::format_post_category( $cat_string, true );
 				}
 				$field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
 			}
@@ -1354,7 +1354,7 @@ 
 	     * @param GF_Field $field Gravity Forms field object
 	     * @param GravityView_Edit_Entry_Render $this Current object
 	     */
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
+	    $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this );
 
 		return $field_value;
 	}
@@ -1371,12 +1371,12 @@ 
 	 */
 	public function gform_pre_validation( $form ) {
 
-		if( ! $this->verify_nonce() ) {
+		if ( ! $this->verify_nonce() ) {
 			return $form;
 		}
 
 		// Fix PHP warning regarding undefined index.
-		foreach ( $form['fields'] as &$field) {
+		foreach ( $form[ 'fields' ] as &$field ) {
 
 			// This is because we're doing admin form pretending to be front-end, so Gravity Forms
 			// expects certain field array items to be set.
@@ -1384,7 +1384,7 @@ 
 	            $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
 			}
 
-			switch( RGFormsModel::get_input_type( $field ) ) {
+			switch ( RGFormsModel::get_input_type( $field ) ) {
 
 				/**
 				 * this whole fileupload hack is because in the admin, Gravity Forms simply doesn't update any fileupload field if it's empty, but it DOES in the frontend.
@@ -1398,26 +1398,26 @@ 
 				    // Set the previous value
 				    $entry = $this->get_entry();
 
-				    $input_name = 'input_'.$field->id;
-				    $form_id = $form['id'];
+				    $input_name = 'input_' . $field->id;
+				    $form_id = $form[ 'id' ];
 
 				    $value = NULL;
 
 				    // Use the previous entry value as the default.
-				    if( isset( $entry[ $field->id ] ) ) {
+				    if ( isset( $entry[ $field->id ] ) ) {
 				        $value = $entry[ $field->id ];
 				    }
 
 				    // If this is a single upload file
-				    if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
-				        $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
-				        $value = $file_path['url'];
+				    if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) {
+				        $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] );
+				        $value = $file_path[ 'url' ];
 
 				    } else {
 
 				        // Fix PHP warning on line 1498 of form_display.php for post_image fields
 				        // Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
-				        $_FILES[ $input_name ] = array('name' => '', 'size' => '' );
+				        $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' );
 
 				    }
 
@@ -1425,10 +1425,10 @@ 
 
 				        // If there are fresh uploads, process and merge them.
 				        // Otherwise, use the passed values, which should be json-encoded array of URLs
-				        if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
+				        if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
 				            $value = empty( $value ) ? '[]' : $value;
 				            $value = stripslashes_deep( $value );
-				            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
+				            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() );
 				        }
 
 				    } else {
@@ -1446,8 +1446,8 @@ 
 
 				case 'number':
 				    // Fix "undefined index" issue at line 1286 in form_display.php
-				    if( !isset( $_POST['input_'.$field->id ] ) ) {
-				        $_POST['input_'.$field->id ] = NULL;
+				    if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) {
+				        $_POST[ 'input_' . $field->id ] = NULL;
 				    }
 				    break;
 			}
@@ -1484,7 +1484,7 @@ 
 		 * You can enter whatever you want!
 		 * We try validating, and customize the results using `self::custom_validation()`
 		 */
-		add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4);
+		add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 );
 
 		// Needed by the validate funtion
 		$failed_validation_page = NULL;
@@ -1492,14 +1492,14 @@ 
 
 		// Prevent entry limit from running when editing an entry, also
 		// prevent form scheduling from preventing editing
-		unset( $this->form['limitEntries'], $this->form['scheduleForm'] );
+		unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] );
 
 		// Hide fields depending on Edit Entry settings
-		$this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id );
+		$this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id );
 
 		$this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page );
 
-		remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 );
+		remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 );
 	}
 
 
@@ -1522,7 +1522,7 @@ 
 
 		$gv_valid = true;
 
-		foreach ( $validation_results['form']['fields'] as $key => &$field ) {
+		foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) {
 
 			$value = RGFormsModel::get_field_value( $field );
 			$field_type = RGFormsModel::get_input_type( $field );
@@ -1535,22 +1535,22 @@ 
 				case 'post_image':
 
 				    // in case nothing is uploaded but there are already files saved
-				    if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
+				    if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) {
 				        $field->failed_validation = false;
 				        unset( $field->validation_message );
 				    }
 
 				    // validate if multi file upload reached max number of files [maxFiles] => 2
-				    if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) {
+				    if ( \GV\Utils::get( $field, 'maxFiles' ) && \GV\Utils::get( $field, 'multipleFiles' ) ) {
 
 				        $input_name = 'input_' . $field->id;
 				        //uploaded
-				        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
+				        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array();
 
 				        //existent
 				        $entry = $this->get_entry();
 				        $value = NULL;
-				        if( isset( $entry[ $field->id ] ) ) {
+				        if ( isset( $entry[ $field->id ] ) ) {
 				            $value = json_decode( $entry[ $field->id ], true );
 				        }
 
@@ -1558,13 +1558,13 @@ 
 				        $count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) +
 						               ( is_array( $value ) ? count( $value ) : 0 );
 
-				        if( $count_files > $field->maxFiles ) {
+				        if ( $count_files > $field->maxFiles ) {
 				            $field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
 				            $field->failed_validation = 1;
 				            $gv_valid = false;
 
 				            // in case of error make sure the newest upload files are removed from the upload input
-				            GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
+				            GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null;
 				        }
 
 				    }
@@ -1575,7 +1575,7 @@ 
 			}
 
 			// This field has failed validation.
-			if( !empty( $field->failed_validation ) ) {
+			if ( ! empty( $field->failed_validation ) ) {
 
 				gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'data' => array( 'field' => $field, 'value' => $value ) ) );
 
@@ -1593,19 +1593,19 @@ 
 				}
 
 				// You can't continue inside a switch, so we do it after.
-				if( empty( $field->failed_validation ) ) {
+				if ( empty( $field->failed_validation ) ) {
 				    continue;
 				}
 
 				// checks if the No Duplicates option is not validating entry against itself, since
 				// we're editing a stored entry, it would also assume it's a duplicate.
-				if( !empty( $field->noDuplicates ) ) {
+				if ( ! empty( $field->noDuplicates ) ) {
 
 				    $entry = $this->get_entry();
 
 				    // If the value of the entry is the same as the stored value
 				    // Then we can assume it's not a duplicate, it's the same.
-				    if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
+				    if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) {
 				        //if value submitted was not changed, then don't validate
 				        $field->failed_validation = false;
 
@@ -1618,7 +1618,7 @@ 
 				}
 
 				// if here then probably we are facing the validation 'At least one field must be filled out'
-				if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
+				if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) {
 				    unset( $field->validation_message );
 	                $field->validation_message = false;
 				    continue;
@@ -1630,12 +1630,12 @@ 
 
 		}
 
-		$validation_results['is_valid'] = $gv_valid;
+		$validation_results[ 'is_valid' ] = $gv_valid;
 
 		gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Validation results.', array( 'data' => $validation_results ) );
 
 		// We'll need this result when rendering the form ( on GFFormDisplay::get_form )
-		$this->form_after_validation = $validation_results['form'];
+		$this->form_after_validation = $validation_results[ 'form' ];
 
 		return $validation_results;
 	}
@@ -1648,7 +1648,7 @@ 
 	 */
 	public function get_entry() {
 
-		if( empty( $this->entry ) ) {
+		if ( empty( $this->entry ) ) {
 			// Get the database value of the entry that's being edited
 			$this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() );
 		}
@@ -1680,10 +1680,10 @@ 
 		}
 
 		// If edit tab not yet configured, show all fields
-		$edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL;
+		$edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL;
 
 		// Hide fields depending on admin settings
-		$fields = $this->filter_fields( $form['fields'], $edit_fields );
+		$fields = $this->filter_fields( $form[ 'fields' ], $edit_fields );
 
 	    // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
 	    $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
@@ -1716,7 +1716,7 @@ 
 	 */
 	private function filter_fields( $fields, $configured_fields ) {
 
-		if( empty( $fields ) || !is_array( $fields ) ) {
+		if ( empty( $fields ) || ! is_array( $fields ) ) {
 			return $fields;
 		}
 
@@ -1729,12 +1729,12 @@ 
 
 			// Remove the fields that have calculation properties and keep them to be used later
 			// @since 1.16.2
-			if( $field->has_calculation() ) {
-				$this->fields_with_calculation[] = $field;
+			if ( $field->has_calculation() ) {
+				$this->fields_with_calculation[ ] = $field;
 				// don't remove the calculation fields on form render.
 			}
 
-			if( in_array( $field->type, $field_type_blacklist ) ) {
+			if ( in_array( $field->type, $field_type_blacklist ) ) {
 				unset( $fields[ $key ] );
 			}
 		}
@@ -1752,7 +1752,7 @@ 
 					continue; // Same
 				}
 
-				$out_fields[] = $field;
+				$out_fields[ ] = $field;
 			}
 
 			return array_values( $out_fields );
@@ -1763,8 +1763,8 @@ 
 
 	        /** @var GF_Field $field */
 	        foreach ( $fields as $field ) {
-				if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
-				    $edit_fields[] = $this->merge_field_properties( $field, $configured_field );
+				if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
+				    $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field );
 				    break;
 				}
 
@@ -1787,14 +1787,14 @@ 
 
 		$return_field = $field;
 
-		if( empty( $field_setting['show_label'] ) ) {
+		if ( empty( $field_setting[ 'show_label' ] ) ) {
 			$return_field->label = '';
-		} elseif ( !empty( $field_setting['custom_label'] ) ) {
-			$return_field->label = $field_setting['custom_label'];
+		} elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) {
+			$return_field->label = $field_setting[ 'custom_label' ];
 		}
 
-		if( !empty( $field_setting['custom_class'] ) ) {
-			$return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] );
+		if ( ! empty( $field_setting[ 'custom_class' ] ) ) {
+			$return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] );
 		}
 
 		/**
@@ -1832,16 +1832,16 @@ 
 	     */
 	    $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
 
-	    if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
-			foreach( $fields as $k => $field ) {
-				if( $field->adminOnly ) {
+	    if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) {
+			foreach ( $fields as $k => $field ) {
+				if ( $field->adminOnly ) {
 				    unset( $fields[ $k ] );
 				}
 			}
 			return array_values( $fields );
 		}
 
-	    foreach( $fields as &$field ) {
+	    foreach ( $fields as &$field ) {
 		    $field->adminOnly = false;
 		}
 
@@ -1862,7 +1862,7 @@ 
 	 */
 	private function unselect_default_values( $form ) {
 
-	    foreach ( $form['fields'] as &$field ) {
+	    foreach ( $form[ 'fields' ] as &$field ) {
 
 			if ( empty( $field->choices ) ) {
                 continue;
@@ -1870,7 +1870,7 @@ 
 
             foreach ( $field->choices as &$choice ) {
 				if ( \GV\Utils::get( $choice, 'isSelected' ) ) {
-					$choice['isSelected'] = false;
+					$choice[ 'isSelected' ] = false;
 				}
 			}
 		}
@@ -1895,22 +1895,22 @@ 
 	 */
 	function prefill_conditional_logic( $form ) {
 
-		if( ! GFFormDisplay::has_conditional_logic( $form ) ) {
+		if ( ! GFFormDisplay::has_conditional_logic( $form ) ) {
 			return $form;
 		}
 
 		// Have Conditional Logic pre-fill fields as if the data were default values
 		/** @var GF_Field $field */
-		foreach ( $form['fields'] as &$field ) {
+		foreach ( $form[ 'fields' ] as &$field ) {
 
-			if( 'checkbox' === $field->type ) {
+			if ( 'checkbox' === $field->type ) {
 				foreach ( $field->get_entry_inputs() as $key => $input ) {
-				    $input_id = $input['id'];
+				    $input_id = $input[ 'id' ];
 				    $choice = $field->choices[ $key ];
 				    $value = \GV\Utils::get( $this->entry, $input_id );
 				    $match = RGFormsModel::choice_value_match( $field, $choice, $value );
-				    if( $match ) {
-				        $field->choices[ $key ]['isSelected'] = true;
+				    if ( $match ) {
+				        $field->choices[ $key ][ 'isSelected' ] = true;
 				    }
 				}
 			} else {
@@ -1918,15 +1918,15 @@ 
 				// We need to run through each field to set the default values
 				foreach ( $this->entry as $field_id => $field_value ) {
 
-				    if( floatval( $field_id ) === floatval( $field->id ) ) {
+				    if ( floatval( $field_id ) === floatval( $field->id ) ) {
 
-				        if( 'list' === $field->type ) {
+				        if ( 'list' === $field->type ) {
 				            $list_rows = maybe_unserialize( $field_value );
 
 				            $list_field_value = array();
-				            foreach ( (array) $list_rows as $row ) {
-				                foreach ( (array) $row as $column ) {
-				                    $list_field_value[] = $column;
+				            foreach ( (array)$list_rows as $row ) {
+				                foreach ( (array)$row as $column ) {
+				                    $list_field_value[ ] = $column;
 				                }
 				            }
 
@@ -1959,32 +1959,32 @@ 
 		 * @see https://github.com/gravityview/GravityView/issues/840
 		 * @since develop
 		 */
-		$the_form = GFAPI::get_form( $form['id'] );
+		$the_form = GFAPI::get_form( $form[ 'id' ] );
 		$editable_ids = array();
-		foreach ( $form['fields'] as $field ) {
-			$editable_ids[] = $field['id']; // wp_list_pluck is destructive in this context
+		foreach ( $form[ 'fields' ] as $field ) {
+			$editable_ids[ ] = $field[ 'id' ]; // wp_list_pluck is destructive in this context
 		}
 		$remove_conditions_rule = array();
-		foreach ( $the_form['fields'] as $field ) {
-			if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic['rules'] ) ) {
-				foreach ( $field->conditionalLogic['rules'] as $i => $rule ) {
-					if ( ! in_array( $rule['fieldId'], $editable_ids ) ) {
+		foreach ( $the_form[ 'fields' ] as $field ) {
+			if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic[ 'rules' ] ) ) {
+				foreach ( $field->conditionalLogic[ 'rules' ] as $i => $rule ) {
+					if ( ! in_array( $rule[ 'fieldId' ], $editable_ids ) ) {
 						/**
 						 * This conditional field is not editable in this View.
 						 * We need to remove the rule, but only if it matches.
 						 */
-						if ( $_field = GFAPI::get_field( $the_form, $rule['fieldId'] ) ) {
+						if ( $_field = GFAPI::get_field( $the_form, $rule[ 'fieldId' ] ) ) {
 							$value = $_field->get_value_export( $this->entry );
-						} elseif ( isset( $this->entry[ $rule['fieldId'] ] ) ) {
-							$value = $this->entry[ $rule['fieldId'] ];
+						} elseif ( isset( $this->entry[ $rule[ 'fieldId' ] ] ) ) {
+							$value = $this->entry[ $rule[ 'fieldId' ] ];
 						} else {
-							$value = gform_get_meta( $this->entry['id'], $rule['fieldId'] );
+							$value = gform_get_meta( $this->entry[ 'id' ], $rule[ 'fieldId' ] );
 						}
 
-						$match = GFFormsModel::matches_operation( $value, $rule['value'], $rule['operator'] );
+						$match = GFFormsModel::matches_operation( $value, $rule[ 'value' ], $rule[ 'operator' ] );
 						
 						if ( $match ) {
-							$remove_conditions_rule[] = array( $field['id'], $i );
+							$remove_conditions_rule[ ] = array( $field[ 'id' ], $i );
 						}
 					}
 				}
@@ -1992,21 +1992,21 @@ 
 		}
 
 		if ( $remove_conditions_rule ) {
-			foreach ( $form['fields'] as &$field ) {
+			foreach ( $form[ 'fields' ] as &$field ) {
 				foreach ( $remove_conditions_rule as $_remove_conditions_r ) {
 
 				    list( $rule_field_id, $rule_i ) = $_remove_conditions_r;
 
-					if ( $field['id'] == $rule_field_id ) {
-						unset( $field->conditionalLogic['rules'][ $rule_i ] );
-						gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field['id'] ) );
+					if ( $field[ 'id' ] == $rule_field_id ) {
+						unset( $field->conditionalLogic[ 'rules' ][ $rule_i ] );
+						gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field[ 'id' ] ) );
 					}
 				}
 			}
 		}
 
 		/** Normalize the indices... */
-		$form['fields'] = array_values( $form['fields'] );
+		$form[ 'fields' ] = array_values( $form[ 'fields' ] );
 
 		/**
 		 * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields?
@@ -2016,16 +2016,16 @@ 
 		 */
 		$use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form );
 
-		if( $use_conditional_logic ) {
+		if ( $use_conditional_logic ) {
 			return $form;
 		}
 
-		foreach( $form['fields'] as &$field ) {
+		foreach ( $form[ 'fields' ] as &$field ) {
 			/* @var GF_Field $field */
 			$field->conditionalLogic = null;
 		}
 
-		unset( $form['button']['conditionalLogic'] );
+		unset( $form[ 'button' ][ 'conditionalLogic' ] );
 
 		return $form;
 
@@ -2042,7 +2042,7 @@ 
 	 */
 	public function manage_conditional_logic( $has_conditional_logic, $form ) {
 
-		if( ! $this->is_edit_entry() ) {
+		if ( ! $this->is_edit_entry() ) {
 			return $has_conditional_logic;
 		}
 
@@ -2074,44 +2074,44 @@ 
 		 *  2. There are two entries embedded using oEmbed
 		 *  3. One of the entries has just been saved
 		 */
-		if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) {
+		if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) {
 
 			$error = true;
 
 		}
 
-		if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) {
+		if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) {
 
 			$error = true;
 
-		} elseif( ! $this->verify_nonce() ) {
+		} elseif ( ! $this->verify_nonce() ) {
 
 			/**
 			 * If the Entry is embedded, there may be two entries on the same page.
 			 * If that's the case, and one is being edited, the other should fail gracefully and not display an error.
 			 */
-			if( GravityView_oEmbed::getInstance()->get_entry_id() ) {
+			if ( GravityView_oEmbed::getInstance()->get_entry_id() ) {
 				$error = true;
 			} else {
-				$error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview');
+				$error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' );
 			}
 
 		}
 
-		if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
-			$error = __( 'You do not have permission to edit this entry.', 'gravityview');
+		if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
+			$error = __( 'You do not have permission to edit this entry.', 'gravityview' );
 		}
 
-		if( $this->entry['status'] === 'trash' ) {
-			$error = __('You cannot edit the entry; it is in the trash.', 'gravityview' );
+		if ( $this->entry[ 'status' ] === 'trash' ) {
+			$error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' );
 		}
 
 		// No errors; everything's fine here!
-		if( empty( $error ) ) {
+		if ( empty( $error ) ) {
 			return true;
 		}
 
-		if( $echo && $error !== true ) {
+		if ( $echo && $error !== true ) {
 
 	        $error = esc_html( $error );
 
@@ -2119,10 +2119,10 @@ 
 	         * @since 1.9
 	         */
 	        if ( ! empty( $this->entry ) ) {
-		        $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) );
+		        $error .= ' ' . gravityview_get_link( '#', _x( 'Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) );
 	        }
 
-			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
+			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' );
 		}
 
 		gravityview()->log->error( '{error}', array( 'error' => $error ) );
@@ -2142,17 +2142,17 @@ 
 
 		$error = NULL;
 
-		if( ! $this->check_user_cap_edit_field( $field ) ) {
-			$error = __( 'You do not have permission to edit this field.', 'gravityview');
+		if ( ! $this->check_user_cap_edit_field( $field ) ) {
+			$error = __( 'You do not have permission to edit this field.', 'gravityview' );
 		}
 
 		// No errors; everything's fine here!
-		if( empty( $error ) ) {
+		if ( empty( $error ) ) {
 			return true;
 		}
 
-		if( $echo ) {
-			echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error');
+		if ( $echo ) {
+			echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' );
 		}
 
 		gravityview()->log->error( '{error}', array( 'error' => $error ) );
@@ -2173,14 +2173,14 @@ 
 	private function check_user_cap_edit_field( $field ) {
 
 		// If they can edit any entries (as defined in Gravity Forms), we're good.
-		if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
 			return true;
 		}
 
-		$field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false;
+		$field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false;
 
-		if( $field_cap ) {
-			return GVCommon::has_cap( $field['allow_edit_cap'] );
+		if ( $field_cap ) {
+			return GVCommon::has_cap( $field[ 'allow_edit_cap' ] );
 		}
 
 		return false;
@@ -2194,17 +2194,17 @@ 
 	public function verify_nonce() {
 
 		// Verify form submitted for editing single
-		if( $this->is_edit_entry_submission() ) {
+		if ( $this->is_edit_entry_submission() ) {
 			$valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
 		}
 
 		// Verify
-		else if( ! $this->is_edit_entry() ) {
+		else if ( ! $this->is_edit_entry() ) {
 			$valid = false;
 		}
 
 		else {
-			$valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
+			$valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key );
 		}
 
 		/**

includes/class-common.php

Spacing +134 added lines, -134 removed lines

@@ -125,8 +125,8 @@ 
 
 		$form = false;
 
-		if( $entry ) {
-			$form = GFAPI::get_form( $entry['form_id'] );
+		if ( $entry ) {
+			$form = GFAPI::get_form( $entry[ 'form_id' ] );
 		}
 
 		return $form;
@@ -202,7 +202,7 @@ 
 			}
 		}
 
-		return (bool) $has_transaction_data;
+		return (bool)$has_transaction_data;
 	}
 
 	/**
@@ -240,7 +240,7 @@ 
 
 		$results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging );
 
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
+		$result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null;
 
 		return $result;
 	}
@@ -257,10 +257,10 @@ 
 	 *
 	 * @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms
 	 */
-	public static function get_forms(  $active = true, $trash = false ) {
+	public static function get_forms( $active = true, $trash = false ) {
 		$forms = array();
 		if ( class_exists( 'GFAPI' ) ) {
-			if( 'any' === $active ) {
+			if ( 'any' === $active ) {
 				$active_forms = GFAPI::get_forms( true, $trash );
 				$inactive_forms = GFAPI::get_forms( false, $trash );
 				$forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) );
@@ -291,9 +291,9 @@ 
 		$has_post_fields = false;
 
 		if ( $form ) {
-			foreach ( $form['fields'] as $field ) {
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
-					$fields["{$field['id']}"] = array(
+			foreach ( $form[ 'fields' ] as $field ) {
+				if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) {
+					$fields[ "{$field[ 'id' ]}" ] = array(
 						'label' => \GV\Utils::get( $field, 'label' ),
 						'parent' => null,
 						'type' => \GV\Utils::get( $field, 'type' ),
@@ -302,10 +302,10 @@ 
 					);
 				}
 
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
-					foreach ( $field['inputs'] as $input ) {
+				if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) {
+					foreach ( $field[ 'inputs' ] as $input ) {
 
-						if( ! empty( $input['isHidden'] ) ) {
+						if ( ! empty( $input[ 'isHidden' ] ) ) {
 							continue;
 						}
 
@@ -313,10 +313,10 @@ 
                          * @hack
                          * In case of email/email confirmation, the input for email has the same id as the parent field
                          */
-						if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
+						if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) {
                             continue;
                         }
-						$fields["{$input['id']}"] = array(
+						$fields[ "{$input[ 'id' ]}" ] = array(
 							'label' => \GV\Utils::get( $input, 'label' ),
 							'customLabel' => \GV\Utils::get( $input, 'customLabel' ),
 							'parent' => $field,
@@ -328,7 +328,7 @@ 
 				}
 
 
-				if( GFCommon::is_product_field( $field['type'] ) ){
+				if ( GFCommon::is_product_field( $field[ 'type' ] ) ) {
 					$has_product_fields = true;
 				}
 
@@ -342,7 +342,7 @@ 
 		 * @since 1.7
 		 */
 		if ( $has_post_fields ) {
-			$fields['post_id'] = array(
+			$fields[ 'post_id' ] = array(
 				'label' => __( 'Post ID', 'gravityview' ),
 				'type' => 'post_id',
 			);
@@ -355,11 +355,11 @@ 
 			foreach ( $payment_fields as $payment_field ) {
 
 				// Either the field exists ($fields['shipping']) or the form explicitly contains a `shipping` field with numeric key
-				if( isset( $fields["{$payment_field->name}"] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
+				if ( isset( $fields[ "{$payment_field->name}" ] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
 					continue;
 				}
 
-				$fields["{$payment_field->name}"] = array(
+				$fields[ "{$payment_field->name}" ] = array(
 					'label' => $payment_field->label,
 					'desc' => $payment_field->description,
 					'type' => $payment_field->name,
@@ -391,9 +391,9 @@ 
 
 		$fields = array();
 
-		foreach ( $extra_fields as $key => $field ){
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
+		foreach ( $extra_fields as $key => $field ) {
+			if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) {
+				$fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' );
 			}
 		}
 
@@ -433,33 +433,33 @@ 
 			'search_criteria' => null,
 			'sorting' => null,
 			'paging' => null,
-			'cache' => (isset( $passed_criteria['cache'] ) ? (bool) $passed_criteria['cache'] : true),
+			'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? (bool)$passed_criteria[ 'cache' ] : true ),
 			'context_view_id' => null,
 		);
 
 		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
 
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) ) {
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
+		if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+			foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) {
 
 				if ( ! is_array( $filter ) ) {
 					continue;
 				}
 
 				// By default, we want searches to be wildcard for each field.
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
+				$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
 
 				/**
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
 				 * @param string $operator Existing search operator
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
 				 */
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
+				$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter );
 			}
 
 			// don't send just the [mode] without any field filter.
-			if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) {
-				unset( $criteria['search_criteria']['field_filters']['mode'] );
+			if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+				unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] );
 			}
 
 		}
@@ -470,33 +470,33 @@ 
 		 * Prepare date formats to be in Gravity Forms DB format;
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
 		 */
-		foreach ( array('start_date', 'end_date' ) as $key ) {
+		foreach ( array( 'start_date', 'end_date' ) as $key ) {
 
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
+			if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) {
 
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
-				$date = date_create( $criteria['search_criteria'][ $key ] );
+				$date = date_create( $criteria[ 'search_criteria' ][ $key ] );
 
 				if ( $date ) {
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
+					$criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' );
 				} else {
-					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria['search_criteria'][ $key ] ) );
+					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria[ 'search_criteria' ][ $key ] ) );
 
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
-					unset( $criteria['search_criteria'][ $key ] );
+					unset( $criteria[ 'search_criteria' ][ $key ] );
 				}
 			}
 		}
 
-		if ( empty( $criteria['context_view_id'] ) ) {
+		if ( empty( $criteria[ 'context_view_id' ] ) ) {
 			// Calculate the context view id and send it to the advanced filter
 			if ( GravityView_frontend::getInstance()->getSingleEntry() ) {
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
 			} else if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance() && GravityView_View_Data::getInstance()->has_multiple_views() ) {
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
 			} else if ( 'delete' === GFForms::get( 'action' ) ) {
-				$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null;
+				$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null;
 			}
 		}
 
@@ -506,7 +506,7 @@ 
 		 * @param array $form_ids Forms to search
 		 * @param int $view_id ID of the view being used to search
 		 */
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
+		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] );
 
 		return (array)$criteria;
 	}
@@ -541,7 +541,7 @@ 
 		/** Reduce # of database calls */
 		add_filter( 'gform_is_encrypted_field', '__return_false' );
 
-		if ( ! empty( $criteria['cache'] ) ) {
+		if ( ! empty( $criteria[ 'cache' ] ) ) {
 
 			$Cache = new GravityView_Cache( $form_ids, $criteria );
 
@@ -549,7 +549,7 @@ 
 
 				// Still update the total count when using cached results
 				if ( ! is_null( $total ) ) {
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
+					$total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] );
 				}
 
 				$return = $entries;
@@ -571,9 +571,9 @@ 
 			$entries = apply_filters_ref_array( 'gravityview_before_get_entries', array( null, $criteria, $passed_criteria, &$total ) );
 
 			// No entries returned from gravityview_before_get_entries
-			if( is_null( $entries ) ) {
+			if ( is_null( $entries ) ) {
 
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
+				$entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total );
 
 				if ( is_wp_error( $entries ) ) {
 					gravityview()->log->error( '{error}', array( 'error' => $entries->get_error_message(), 'data' => $entries ) );
@@ -584,7 +584,7 @@ 
 				}
 			}
 
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
 
 				// Cache results
 				$Cache->set( $entries, 'entries' );
@@ -693,12 +693,12 @@ 
 		 */
 		$check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry );
 
-		if( $check_entry_display ) {
+		if ( $check_entry_display ) {
 			// Is the entry allowed
 			$entry = self::check_entry_display( $entry );
 		}
 
-		if( is_wp_error( $entry ) ) {
+		if ( is_wp_error( $entry ) ) {
 			gravityview()->log->error( '{error}', array( 'error' => $entry->get_error_message() ) );
 			return false;
 		}
@@ -732,12 +732,12 @@ 
 
 		$value = false;
 
-		if( 'context' === $val1 ) {
+		if ( 'context' === $val1 ) {
 
 			$matching_contexts = array( $val2 );
 
 			// We allow for non-standard contexts.
-			switch( $val2 ) {
+			switch ( $val2 ) {
 				// Check for either single or edit
 				case 'singular':
 					$matching_contexts = array( 'single', 'edit' );
@@ -780,18 +780,18 @@ 
 				$json_val_1 = json_decode( $val1, true );
 				$json_val_2 = json_decode( $val2, true );
 
-				if( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
+				if ( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
 
 					$json_in = false;
-					$json_val_1 = $json_val_1 ? (array) $json_val_1 : array( $val1 );
-					$json_val_2 = $json_val_2 ? (array) $json_val_2 : array( $val2 );
+					$json_val_1 = $json_val_1 ? (array)$json_val_1 : array( $val1 );
+					$json_val_2 = $json_val_2 ? (array)$json_val_2 : array( $val2 );
 
 					// For JSON, we want to compare as "in" or "not in" rather than "contains"
 					foreach ( $json_val_1 as $item_1 ) {
 						foreach ( $json_val_2 as $item_2 ) {
 							$json_in = self::matches_operation( $item_1, $item_2, 'is' );
 
-							if( $json_in ) {
+							if ( $json_in ) {
 								break 2;
 							}
 						}
@@ -843,10 +843,10 @@ 
 	public static function check_entry_display( $entry, $view = null ) {
 
 		if ( ! $entry || is_wp_error( $entry ) ) {
-			return new WP_Error('entry_not_found', 'Entry was not found.', $entry );
+			return new WP_Error( 'entry_not_found', 'Entry was not found.', $entry );
 		}
 
-		if ( empty( $entry['form_id'] ) ) {
+		if ( empty( $entry[ 'form_id' ] ) ) {
 			return new WP_Error( 'form_id_not_set', '[apply_filters_to_entry] Entry is empty!', $entry );
 		}
 
@@ -854,8 +854,8 @@ 
 			$view_form_id = $view->form->ID;
 
 			if ( $view->joins ) {
-				if ( in_array( (int)$entry['form_id'], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) {
-					$view_form_id = $entry['form_id'];
+				if ( in_array( (int)$entry[ 'form_id' ], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) {
+					$view_form_id = $entry[ 'form_id' ];
 				}
 			}
 
@@ -863,13 +863,13 @@ 
 			 * Check whether the entry is in the entries subset by running a modified query.
 			 */
 			add_action( 'gravityview/view/query', $entry_subset_callback = function( &$query, $view, $request ) use ( $entry, $view_form_id ) {
-				$_tmp_query       = new \GF_Query( $view_form_id, array(
+				$_tmp_query = new \GF_Query( $view_form_id, array(
 					'field_filters' => array(
 						'mode' => 'all',
 						array(
 							'key' => 'id',
 							'operation' => 'is',
-							'value' => $entry['id']
+							'value' => $entry[ 'id' ]
 						)
 					)
 				) );
@@ -879,14 +879,14 @@ 
 				/** @var \GF_Query $query */
 				$query_parts      = $query->_introspect();
 
-				$query->where( \GF_Query_Condition::_and( $_tmp_query_parts['where'], $query_parts['where'] ) );
+				$query->where( \GF_Query_Condition::_and( $_tmp_query_parts[ 'where' ], $query_parts[ 'where' ] ) );
 
 			}, 10, 3 );
 
 			// Prevent page offset from being applied to the single entry query; it's used to return to the referring page number
 			add_filter( 'gravityview_search_criteria', $remove_pagenum = function( $criteria ) {
 
-				$criteria['paging'] = array(
+				$criteria[ 'paging' ] = array(
 					'offset' => 0,
 					'page_size' => 25
 				);
@@ -905,20 +905,20 @@ 
 			}
 
 			// This entry is on a View with joins
-			if ( $entries[0]->is_multi() ) {
+			if ( $entries[ 0 ]->is_multi() ) {
 
 				$multi_entry_ids = array();
 
-				foreach ( $entries[0]->entries as $multi_entry ) {
-					$multi_entry_ids[] = (int) $multi_entry->ID;
+				foreach ( $entries[ 0 ]->entries as $multi_entry ) {
+					$multi_entry_ids[ ] = (int)$multi_entry->ID;
 				}
 
-				if ( ! in_array( (int) $entry['id'], $multi_entry_ids, true ) ) {
+				if ( ! in_array( (int)$entry[ 'id' ], $multi_entry_ids, true ) ) {
 					remove_action( 'gravityview/view/query', $entry_subset_callback );
 					return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' );
 				}
 
-			} elseif ( (int) $entries[0]->ID !== (int) $entry['id'] ) {
+			} elseif ( (int)$entries[ 0 ]->ID !== (int)$entry[ 'id' ] ) {
 				remove_action( 'gravityview/view/query', $entry_subset_callback );
 				return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' );
 			}
@@ -931,59 +931,59 @@ 
 			'context_view_id' => $view ? $view->ID : null,
 		) );
 
-		if ( empty( $criteria['search_criteria'] ) || ! is_array( $criteria['search_criteria'] ) ) {
+		if ( empty( $criteria[ 'search_criteria' ] ) || ! is_array( $criteria[ 'search_criteria' ] ) ) {
 			gravityview()->log->debug( '[apply_filters_to_entry] Entry approved! No search criteria found:', array( 'data' => $criteria ) );
 			return $entry;
 		}
 
 		// Make sure the current View is connected to the same form as the Entry
-		if( ! empty( $criteria['context_view_id'] ) ) {
-			$context_view_id = intval( $criteria['context_view_id'] );
+		if ( ! empty( $criteria[ 'context_view_id' ] ) ) {
+			$context_view_id = intval( $criteria[ 'context_view_id' ] );
 			$context_form_id = gravityview_get_form_id( $context_view_id );
-			if( intval( $context_form_id ) !== intval( $entry['form_id'] ) ) {
-				return new WP_Error( 'view_id_not_match', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry['form_id'] ), $criteria['context_view_id'] );
+			if ( intval( $context_form_id ) !== intval( $entry[ 'form_id' ] ) ) {
+				return new WP_Error( 'view_id_not_match', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry[ 'form_id' ] ), $criteria[ 'context_view_id' ] );
 			}
 		}
 
-		$search_criteria = $criteria['search_criteria'];
+		$search_criteria = $criteria[ 'search_criteria' ];
 
 		// check entry status
-		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria['status'] != $entry['status'] ) {
-			return new WP_Error( 'status_not_valid', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status'] ), $search_criteria );
+		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria[ 'status' ] != $entry[ 'status' ] ) {
+			return new WP_Error( 'status_not_valid', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry[ 'status' ] ), $search_criteria );
 		}
 
 		// check entry date
 		// @todo: Does it make sense to apply the Date create filters to the single entry?
 
 		// field_filters
-		if ( empty( $search_criteria['field_filters'] ) || ! is_array( $search_criteria['field_filters'] ) ) {
+		if ( empty( $search_criteria[ 'field_filters' ] ) || ! is_array( $search_criteria[ 'field_filters' ] ) ) {
 			gravityview()->log->debug( '[apply_filters_to_entry] Entry approved! No field filters criteria found:', array( 'data' => $search_criteria ) );
 			return $entry;
 		}
 
-		$filters = $search_criteria['field_filters'];
+		$filters = $search_criteria[ 'field_filters' ];
 
-		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters['mode'] ) : 'all';
+		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters[ 'mode' ] ) : 'all';
 
-		$mode = $mode ? : 'all'; // If mode is an empty string, assume it's 'all'
+		$mode = $mode ?: 'all'; // If mode is an empty string, assume it's 'all'
 
 		// Prevent the mode from being processed below
-		unset( $filters['mode'] );
+		unset( $filters[ 'mode' ] );
 
-		$form = self::get_form( $entry['form_id'] );
+		$form = self::get_form( $entry[ 'form_id' ] );
 
 		foreach ( $filters as $filter ) {
-			$operator = isset( $filter['operator'] ) ? strtolower( $filter['operator'] ) : 'is';
+			$operator = isset( $filter[ 'operator' ] ) ? strtolower( $filter[ 'operator' ] ) : 'is';
 
-			if ( ! isset( $filter['key'] ) ) {
+			if ( ! isset( $filter[ 'key' ] ) ) {
 				gravityview()->log->debug( '[apply_filters_to_entry] Filter key not set, any field mode', array( 'filter' => $filter ) );
 				/**
 				 * This is a cross-field search. Let's start digging'.
 				 */
 				foreach ( \GV\Utils::get( $form, 'fields', array() ) as $field ) {
 					$field_value = GFFormsModel::get_lead_field_value( $entry, $field );
-					if ( $is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field ) ) {
-						if ( 'any' === $mode) {
+					if ( $is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter[ 'value' ], $operator, $field ) ) {
+						if ( 'any' === $mode ) {
 							return $entry; // All good here
 						} // mode === 'all'
 						continue 2; // Next filter
@@ -992,13 +992,13 @@ 
 				}
 
 				if ( 'all' === $mode ) {
-					return new WP_Error('failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a subcriterium for any field in ALL mode', $filter );
+					return new WP_Error( 'failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a subcriterium for any field in ALL mode', $filter );
 				}
 
 				continue;
 			}
 
-			$k = $filter['key'];
+			$k = $filter[ 'key' ];
 
 			$field = self::get_field( $form, $k );
 
@@ -1006,12 +1006,12 @@ 
 				$field_value = isset( $entry[ $k ] ) ? $entry[ $k ] : null;
 				$field = $k;
 			} else {
-				$field_value  = GFFormsModel::get_lead_field_value( $entry, $field );
+				$field_value = GFFormsModel::get_lead_field_value( $entry, $field );
 				 // If it's a complex field, then fetch the input's value, if exists at the current key. Otherwise, let GF handle it
 				$field_value = ( is_array( $field_value ) && isset( $field_value[ $k ] ) ) ? \GV\Utils::get( $field_value, $k ) : $field_value;
 			}
 
-			$is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field );
+			$is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter[ 'value' ], $operator, $field );
 
 			// Any match is all we need to know
 			if ( $is_value_match && 'any' === $mode ) {
@@ -1020,7 +1020,7 @@ 
 
 			// Any failed match is a total fail
 			if ( ! $is_value_match && 'all' === $mode ) {
-				return new WP_Error('failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a criterium for ALL mode', $filter );
+				return new WP_Error( 'failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a criterium for ALL mode', $filter );
 			}
 		}
 
@@ -1030,7 +1030,7 @@ 
 			gravityview()->log->debug( '[apply_filters_to_entry] Entry approved: all conditions were met' );
 			return $entry;
 		} else {
-			return new WP_Error('failed_any_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters );
+			return new WP_Error( 'failed_any_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters );
 		}
 
 	}
@@ -1071,18 +1071,18 @@ 
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
 		 * @see GFCommon::format_date() for original code
 		 */
-		$date_gmt_time   = mysql2date( 'G', $date_string );
+		$date_gmt_time = mysql2date( 'G', $date_string );
 		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
 
-		$format  = \GV\Utils::get( $atts, 'format' );
-		$is_human  = ! empty( $atts['human'] );
-		$is_diff  = ! empty( $atts['diff'] );
-		$is_raw = ! empty( $atts['raw'] );
-		$is_timestamp = ! empty( $atts['timestamp'] );
-		$include_time = ! empty( $atts['time'] );
+		$format = \GV\Utils::get( $atts, 'format' );
+		$is_human = ! empty( $atts[ 'human' ] );
+		$is_diff = ! empty( $atts[ 'diff' ] );
+		$is_raw = ! empty( $atts[ 'raw' ] );
+		$is_timestamp = ! empty( $atts[ 'timestamp' ] );
+		$include_time = ! empty( $atts[ 'time' ] );
 
 		// If we're using time diff, we want to have a different default format
-		if( empty( $format ) ) {
+		if ( empty( $format ) ) {
 			/* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */
 			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
 		}
@@ -1090,7 +1090,7 @@ 
 		// If raw was specified, don't modify the stored value
 		if ( $is_raw ) {
 			$formatted_date = $date_string;
-		} elseif( $is_timestamp ) {
+		} elseif ( $is_timestamp ) {
 			$formatted_date = $date_local_timestamp;
 		} elseif ( $is_diff ) {
 			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
@@ -1124,7 +1124,7 @@ 
 
 		$label = \GV\Utils::get( $field, 'label' );
 
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
 			$label = GFFormsModel::get_choice_text( $field, $field_value, $field_id );
 		}
 
@@ -1152,7 +1152,7 @@ 
 			$form = GFAPI::get_form( $form );
 		}
 
-		if ( class_exists( 'GFFormsModel' ) ){
+		if ( class_exists( 'GFFormsModel' ) ) {
 			return GFFormsModel::get_field( $form, $field_id );
 		} else {
 			return null;
@@ -1199,19 +1199,19 @@ 
 			$shortcodes = array();
 
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
-			if ( empty( $matches ) ){
+			if ( empty( $matches ) ) {
 				return false;
 			}
 
 			foreach ( $matches as $shortcode ) {
-				if ( $tag === $shortcode[2] ) {
+				if ( $tag === $shortcode[ 2 ] ) {
 
 					// Changed this to $shortcode instead of true so we get the parsed atts.
-					$shortcodes[] = $shortcode;
+					$shortcodes[ ] = $shortcode;
 
-				} else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) {
-					foreach( $results as $result ) {
-						$shortcodes[] = $result;
+				} else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
+					foreach ( $results as $result ) {
+						$shortcodes[ ] = $result;
 					}
 				}
 			}
@@ -1243,7 +1243,7 @@ 
 			'post_type'      => 'gravityview',
 			'posts_per_page' => 100,
 			'meta_key'       => '_gravityview_form_id',
-			'meta_value'     => (int) $form_id,
+			'meta_value'     => (int)$form_id,
 		);
 		$args     = wp_parse_args( $args, $defaults );
 		$views    = get_posts( $args );
@@ -1255,21 +1255,21 @@ 
 
 			$data = unserialize( $view->meta_value );
 
-			if( ! $data || ! is_array( $data ) ) {
+			if ( ! $data || ! is_array( $data ) ) {
 				continue;
 			}
 
 			foreach ( $data as $datum ) {
-				if ( ! empty( $datum[2] ) && (int) $datum[2] === (int) $form_id ) {
-					$joined_forms[] = $view->post_id;
+				if ( ! empty( $datum[ 2 ] ) && (int)$datum[ 2 ] === (int)$form_id ) {
+					$joined_forms[ ] = $view->post_id;
 				}
 			}
 		}
 
 		if ( $joined_forms ) {
-			$joined_args  = array(
+			$joined_args = array(
 				'post_type'      => 'gravityview',
-				'posts_per_page' => $args['posts_per_page'],
+				'posts_per_page' => $args[ 'posts_per_page' ],
 				'post__in'       => $joined_forms,
 			);
 			$views = array_merge( $views, get_posts( $joined_args ) );
@@ -1425,7 +1425,7 @@ 
 
 		$directory_widgets = wp_parse_args( $view_widgets, $defaults );
 
-		if( $json_decode ) {
+		if ( $json_decode ) {
 			$directory_widgets = gv_map_deep( $directory_widgets, 'gv_maybe_json_decode' );
 		}
 
@@ -1441,7 +1441,7 @@ 
 	 * @return string         html
 	 */
 	public static function get_sortable_fields( $formid, $current = '' ) {
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>';
+		$output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default', 'gravityview' ) . '</option>';
 
 		if ( empty( $formid ) ) {
 			return $output;
@@ -1454,11 +1454,11 @@ 
 			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null );
 
 			foreach ( $fields as $id => $field ) {
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 					continue;
 				}
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>';
 			}
 		}
 
@@ -1493,16 +1493,16 @@ 
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
 
 		// TODO: Convert to using array_filter
-		foreach( $fields as $id => $field ) {
+		foreach ( $fields as $id => $field ) {
 
-			if( in_array( $field['type'], $blacklist_field_types ) ) {
+			if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 				unset( $fields[ $id ] );
 			}
 
 			/**
 			 * Merge time subfields.
 			 */
-			if ( 'time' === $field['type'] && ! empty( $field['parent'] ) ) {
+			if ( 'time' === $field[ 'type' ] && ! empty( $field[ 'parent' ] ) ) {
 				$fields[ intval( $id ) ] = array(
 					'label' => \GV\Utils::get( $field, 'parent/label' ),
 					'parent' => null,
@@ -1552,14 +1552,14 @@ 
 	 * @param  int|array  $field field key or field array
 	 * @return boolean
 	 */
-	public static function is_field_numeric(  $form = null, $field = '' ) {
+	public static function is_field_numeric( $form = null, $field = '' ) {
 
 		if ( ! is_array( $form ) && ! is_array( $field ) ) {
 			$form = self::get_form( $form );
 		}
 
 		// If entry meta, it's a string. Otherwise, numeric
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
+		if ( ! is_numeric( $field ) && is_string( $field ) ) {
 			$type = $field;
 		} else {
 			$type = self::get_field_type( $form, $field );
@@ -1573,9 +1573,9 @@ 
 		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
 
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
-			if( true === $gv_field->is_numeric ) {
-				$numeric_types[] = $gv_field->is_numeric;
+		if ( $gv_field = GravityView_Fields::get( $type ) ) {
+			if ( true === $gv_field->is_numeric ) {
+				$numeric_types[ ] = $gv_field->is_numeric;
 			}
 		}
 
@@ -1725,18 +1725,18 @@ 
 		$final_atts = array_filter( $final_atts );
 
 		// If the href wasn't passed as an attribute, use the value passed to the function
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
-			$final_atts['href'] = $href;
+		if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) {
+			$final_atts[ 'href' ] = $href;
 		}
 
-		$final_atts['href'] = esc_url_raw( $href );
+		$final_atts[ 'href' ] = esc_url_raw( $href );
 
 		/**
 		 * Fix potential security issue with target=_blank
 		 * @see https://dev.to/ben/the-targetblank-vulnerability-by-example
 		 */
-		if( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
-			$final_atts['rel'] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
+		if ( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
+			$final_atts[ 'rel' ] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
 		}
 
 		// Sort the attributes alphabetically, to help testing
@@ -1748,7 +1748,7 @@ 
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
 		}
 
-		if( '' !== $output ) {
+		if ( '' !== $output ) {
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
 		}
 
@@ -1775,7 +1775,7 @@ 
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
 			} else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) {
-				$merged[] = $value;
+				$merged[ ] = $value;
 			} else {
 				$merged[ $key ] = $value;
 			}
@@ -1808,7 +1808,7 @@ 
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
 		 */
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
+		$get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
 
 		return get_users( $get_users_settings );
 	}
@@ -1828,11 +1828,11 @@ 
     public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
 
     	// If $cap is defined, only show notice if user has capability
-    	if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
+    	if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
     		return '';
 	    }
 
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
     }
 
 	/**

future/includes/class-gv-view.php

Spacing +76 added lines, -77 removed lines

@@ -125,7 +125,7 @@ 
 		$supports = array( 'title', 'revisions' );
 
 		if ( $is_hierarchical ) {
-			$supports[] = 'page-attributes';
+			$supports[ ] = 'page-attributes';
 		}
 
 		/**
@@ -227,11 +227,11 @@ 
 		$rule = array( sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' );
 
 		add_filter( 'query_vars', function( $query_vars ) { 
-			$query_vars[] = 'csv';
+			$query_vars[ ] = 'csv';
 			return $query_vars;
 		} );
 
-		if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[0] ] ) ) {
+		if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[ 0 ] ] ) ) {
 			call_user_func_array( 'add_rewrite_rule', $rule );
 		}
 	}
@@ -300,13 +300,13 @@ 
 			return $content;
 		}
 
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
 		/**
 		 * Editing a single entry.
 		 */
 		if ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) {
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
@@ -317,7 +317,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -340,7 +340,7 @@ 
 
 			foreach ( $entryset as $e ) {
 
-				if ( 'active' !== $e['status'] ) {
+				if ( 'active' !== $e[ 'status' ] ) {
 					gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -351,7 +351,7 @@ 
 				}
 
 				if ( $show_only_approved && ! $is_admin_and_can_view ) {
-					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 						gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) );
 						return __( 'You are not allowed to view this content.', 'gravityview' );
 					}
@@ -526,7 +526,7 @@ 
 			$join_column    = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field::by_id( $join_column );
 			$join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field::by_id( $join_on_column );
 
-			$joins [] = new Join( $join, $join_column, $join_on, $join_on_column );
+			$joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column );
 		}
 
 		return $joins;
@@ -621,13 +621,13 @@ 
 			}
 
 			foreach ( $_fields as $field ) {
-				if ( ! empty( $field['unions'] ) ) {
-					foreach ( $field['unions'] as $form_id => $field_id ) {
+				if ( ! empty( $field[ 'unions' ] ) ) {
+					foreach ( $field[ 'unions' ] as $form_id => $field_id ) {
 						if ( ! isset( $unions[ $form_id ] ) ) {
 							$unions[ $form_id ] = array();
 						}
 
-						$unions[ $form_id ][ $field['id'] ] =
+						$unions[ $form_id ][ $field[ 'id' ] ] =
 							is_numeric( $field_id ) ? \GV\GF_Field::by_id( \GV\GF_Form::by_id( $form_id ), $field_id ) : \GV\Internal_Field::by_id( $field_id );
 					}
 				}
@@ -676,7 +676,7 @@ 
 		if ( ! $view->form ) {
 			gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array(
 				'view_id' => $view->ID,
-				'form_id' => $view->_gravityview_form_id ? : 0,
+				'form_id' => $view->_gravityview_form_id ?: 0,
 			) );
 		}
 
@@ -915,11 +915,11 @@ 
 			 * Remove multiple sorting before calling legacy filters.
 			 * This allows us to fake it till we make it.
 			 */
-			if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) {
+			if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) {
 				$has_multisort = true;
-				$parameters['sort_field'] = reset( $parameters['sort_field'] );
-				if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) {
-					$parameters['sort_direction'] = reset( $parameters['sort_direction'] );
+				$parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] );
+				if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) {
+					$parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] );
 				}
 			}
 
@@ -927,34 +927,33 @@ 
 			 * @todo: Stop using _frontend and use something like $request->get_search_criteria() instead
 			 */
 			$parameters = \GravityView_frontend::get_view_entries_parameters( $parameters, $this->form->ID );
-			$parameters['context_view_id'] = $this->ID;
+			$parameters[ 'context_view_id' ] = $this->ID;
 			$parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID );
 
 			if ( $request instanceof REST\Request ) {
 				$atts = $this->settings->as_atts();
 				$paging_parameters = wp_parse_args( $request->get_paging(), array(
-						'paging' => array( 'page_size' => $atts['page_size'] ),
+						'paging' => array( 'page_size' => $atts[ 'page_size' ] ),
 					) );
-				$parameters['paging'] = $paging_parameters['paging'];
+				$parameters[ 'paging' ] = $paging_parameters[ 'paging' ];
 			}
 
-			$page = Utils::get( $parameters['paging'], 'current_page' ) ?
-				: ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 );
+			$page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 );
 
 			/**
 			 * Cleanup duplicate field_filter parameters to simplify the query.
 			 */
 			$unique_field_filters = array();
-			foreach ( $parameters['search_criteria']['field_filters'] as $key => $filter ) {
+			foreach ( $parameters[ 'search_criteria' ][ 'field_filters' ] as $key => $filter ) {
 				if ( 'mode' === $key ) {
-					$unique_field_filters['mode'] = $filter;
+					$unique_field_filters[ 'mode' ] = $filter;
 				} else if ( ! in_array( $filter, $unique_field_filters ) ) {
-					$unique_field_filters[] = $filter;
+					$unique_field_filters[ ] = $filter;
 				}
 			}
-			$parameters['search_criteria']['field_filters'] = $unique_field_filters;
+			$parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters;
 
-			if ( ! empty( $parameters['search_criteria']['field_filters'] ) ) {
+			if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) {
 				gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' );
 			}
 
@@ -963,7 +962,7 @@ 
 				$query_class = $this->get_query_class();
 
 				/** @var \GF_Query $query */
-				$query = new $query_class( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] );
+				$query = new $query_class( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] );
 
 				/**
 				 * Apply multisort.
@@ -974,15 +973,15 @@ 
 					$view_setting_sort_field_ids = \GV\Utils::get( $atts, 'sort_field', array() );
 					$view_setting_sort_directions = \GV\Utils::get( $atts, 'sort_direction', array() );
 
-					$has_sort_query_param = ! empty( $_GET['sort'] ) && is_array( $_GET['sort'] );
+					$has_sort_query_param = ! empty( $_GET[ 'sort' ] ) && is_array( $_GET[ 'sort' ] );
 
-					if( $has_sort_query_param ) {
-						$has_sort_query_param = array_filter( array_values( $_GET['sort'] ) );
+					if ( $has_sort_query_param ) {
+						$has_sort_query_param = array_filter( array_values( $_GET[ 'sort' ] ) );
 					}
 
 					if ( $this->settings->get( 'sort_columns' ) && $has_sort_query_param ) {
-						$sort_field_ids = array_keys( $_GET['sort'] );
-						$sort_directions = array_values( $_GET['sort'] );
+						$sort_field_ids = array_keys( $_GET[ 'sort' ] );
+						$sort_directions = array_values( $_GET[ 'sort' ] );
 					} else {
 						$sort_field_ids = $view_setting_sort_field_ids;
 						$sort_directions = $view_setting_sort_directions;
@@ -990,7 +989,7 @@ 
 
 					$skip_first = false;
 
-					foreach ( (array) $sort_field_ids as $key => $sort_field_id ) {
+					foreach ( (array)$sort_field_ids as $key => $sort_field_id ) {
 
 						if ( ! $skip_first && ! $has_sort_query_param ) {
 							$skip_first = true; // Skip the first one, it's already in the query
@@ -1020,15 +1019,15 @@ 
 
 					$merged_time = false;
 
-					foreach ( $q['order'] as $oid => $order ) {
-						if ( $order[0] instanceof \GF_Query_Column ) {
-							$column = $order[0];
-						} else if ( $order[0] instanceof \GF_Query_Call ) {
-							if ( count( $order[0]->columns ) != 1 || ! $order[0]->columns[0] instanceof \GF_Query_Column ) {
+					foreach ( $q[ 'order' ] as $oid => $order ) {
+						if ( $order[ 0 ] instanceof \GF_Query_Column ) {
+							$column = $order[ 0 ];
+						} else if ( $order[ 0 ] instanceof \GF_Query_Call ) {
+							if ( count( $order[ 0 ]->columns ) != 1 || ! $order[ 0 ]->columns[ 0 ] instanceof \GF_Query_Column ) {
 								$orders[ $oid ] = $order;
 								continue; // Need something that resembles a single sort
 							}
-							$column = $order[0]->columns[0];
+							$column = $order[ 0 ]->columns[ 0 ];
 						}
 
 						if ( ( ! $field = \GFAPI::get_field( $column->source, $column->field_id ) ) || $field->type !== 'time' ) {
@@ -1042,7 +1041,7 @@ 
 
 						$orders[ $oid ] = array(
 							new \GV\Mocks\GF_Query_Call_TIMESORT( 'timesort', array( $column, $sql ) ),
-							$order[1] // Mock it!
+							$order[ 1 ] // Mock it!
 						);
 
 						$merged_time = true;
@@ -1053,15 +1052,15 @@ 
 						 * ORDER again.
 						 */
 						if ( ! empty( $orders ) && $_orders = $query->_order_generate( $orders ) ) {
-							$sql['order'] = 'ORDER BY ' . implode( ', ', $_orders );
+							$sql[ 'order' ] = 'ORDER BY ' . implode( ', ', $_orders );
 						}
 					}
 
 					return $sql;
 				} );
 
-				$query->limit( $parameters['paging']['page_size'] )
-					->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) );
+				$query->limit( $parameters[ 'paging' ][ 'page_size' ] )
+					->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) );
 
 				/**
 				 * Any joins?
@@ -1084,7 +1083,7 @@ 
 
 							$query_parameters = $query->_introspect();
 
-							$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );
+							$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
 						}
 
 						/**
@@ -1118,7 +1117,7 @@ 
 						}
 
 						$q = $query->_introspect();
-						$query->where( \GF_Query_Condition::_and( $q['where'], $condition ) );
+						$query->where( \GF_Query_Condition::_and( $q[ 'where' ], $condition ) );
 
 						if ( $this->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
 
@@ -1143,7 +1142,7 @@ 
 
 							$query_parameters = $query->_introspect();
 
-							$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );
+							$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
 						}
 					}
 				
@@ -1167,7 +1166,7 @@ 
 							$conditions = array();
 
 							foreach ( $condition->expressions as $_condition ) {
-								$conditions[] = $recurse( $_condition, $fields, $recurse );
+								$conditions[ ] = $recurse( $_condition, $fields, $recurse );
 							}
 
 							return call_user_func_array(
@@ -1196,10 +1195,10 @@ 
 						$q = new $query_class( $form_id );
 
 						// Copy the WHERE clauses but substitute the field_ids to the respective ones
-						$q->where( $where_union_substitute( $query_parameters['where'], $fields, $where_union_substitute ) );
+						$q->where( $where_union_substitute( $query_parameters[ 'where' ], $fields, $where_union_substitute ) );
 
 						// Copy the ORDER clause and substitute the field_ids to the respective ones
-						foreach ( $query_parameters['order'] as $order ) {
+						foreach ( $query_parameters[ 'order' ] as $order ) {
 							list( $column, $_order ) = $order;
 
 							if ( $column && $column instanceof \GF_Query_Column ) {
@@ -1213,15 +1212,15 @@ 
 
 						add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( &$unions_sql ) {
 							// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
-							$select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] );
+							$select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );
 
 							// Record the SQL
-							$unions_sql[] = array(
+							$unions_sql[ ] = array(
 								// Remove columns, we'll rebuild them
 								'select'  => preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $select ),
-								'from'    => $sql['from'],
-								'join'    => $sql['join'],
-								'where'   => $sql['where'],
+								'from'    => $sql[ 'from' ],
+								'join'    => $sql[ 'join' ],
+								'where'   => $sql[ 'where' ],
 								// Remove order and limit
 							);
 
@@ -1238,11 +1237,11 @@ 
 
 					add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( $unions_sql ) {
 						// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
-						$sql['select'] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] );
+						$sql[ 'select' ] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );
 
 						// Remove columns, we'll rebuild them
-						preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match );
-						$sql['select'] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql['select'] );
+						preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql[ 'select' ], $select_match );
+						$sql[ 'select' ] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql[ 'select' ] );
 
 						$unions = array();
 
@@ -1253,30 +1252,30 @@ 
 						};
 
 						// Add all the order columns into the selects, so we can order by the whole union group
-						preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches );
+						preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql[ 'order' ], $order_matches );
 						
 						$columns = array(
-							sprintf( '%s AS %s', $select_match[1], $column_to_alias( $select_match[1] ) )
+							sprintf( '%s AS %s', $select_match[ 1 ], $column_to_alias( $select_match[ 1 ] ) )
 						);
 
 						foreach ( array_slice( $order_matches, 1 ) as $match ) {
-							$columns[] = sprintf( '%s AS %s', $match[0], $column_to_alias( $match[0] ) );
+							$columns[ ] = sprintf( '%s AS %s', $match[ 0 ], $column_to_alias( $match[ 0 ] ) );
 
 							// Rewrite the order columns to the shared aliases
-							$sql['order'] = str_replace( $match[0], $column_to_alias( $match[0] ), $sql['order'] );
+							$sql[ 'order' ] = str_replace( $match[ 0 ], $column_to_alias( $match[ 0 ] ), $sql[ 'order' ] );
 						}
 
 						$columns = array_unique( $columns );
 
 						// Add the columns to every UNION
 						foreach ( $unions_sql as $union_sql ) {
-							$union_sql['select'] .= implode( ', ', $columns );
-							$unions []= implode( ' ', $union_sql );
+							$union_sql[ 'select' ] .= implode( ', ', $columns );
+							$unions [ ] = implode( ' ', $union_sql );
 						}
 
 						// Add the columns to the main SELECT, but only grab the entry id column
-						$sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql['select'] . implode( ', ', $columns );
-						$sql['order'] = implode( ' ', $unions ) . ') AS u ' . $sql['order'];
+						$sql[ 'select' ] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql[ 'select' ] . implode( ', ', $columns );
+						$sql[ 'order' ] = implode( ' ', $unions ) . ') AS u ' . $sql[ 'order' ];
 
 						return $sql;
 					} );
@@ -1321,20 +1320,20 @@ 
 				} );
 			} else {
 				$entries = $this->form->entries
-					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) )
+					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) )
 					->offset( $this->settings->get( 'offset' ) )
-					->limit( $parameters['paging']['page_size'] )
+					->limit( $parameters[ 'paging' ][ 'page_size' ] )
 					->page( $page );
 
-				if ( ! empty( $parameters['sorting'] ) && is_array( $parameters['sorting'] && ! isset( $parameters['sorting']['key'] ) ) ) {
+				if ( ! empty( $parameters[ 'sorting' ] ) && is_array( $parameters[ 'sorting' ] && ! isset( $parameters[ 'sorting' ][ 'key' ] ) ) ) {
 					// Pluck off multisort arrays
-					$parameters['sorting'] = $parameters['sorting'][0];
+					$parameters[ 'sorting' ] = $parameters[ 'sorting' ][ 0 ];
 				}
 
-				if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) {
+				if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) {
 					$field = new \GV\Field();
-					$field->ID = $parameters['sorting']['key'];
-					$direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
+					$field->ID = $parameters[ 'sorting' ][ 'key' ];
+					$direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
 					$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) );
 				}
 			}
@@ -1409,7 +1408,7 @@ 
 		$allowed = $headers = array();
 
 		foreach ( $view->fields->by_position( "directory_*" )->by_visible()->all() as $id => $field ) {
-			$allowed[] = $field;
+			$allowed[ ] = $field;
 		}
 
 		$renderer = new Field_Renderer();
@@ -1431,17 +1430,17 @@ 
 			} );
 
 			foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) {
-				$allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
+				$allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
 			}
 
 			foreach ( $allowed as $field ) {
 				$source = is_numeric( $field->ID ) ? $view->form : new \GV\Internal_Source();
 
-				$return[] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' );
+				$return[ ] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' );
 
 				if ( ! $headers_done ) {
 					$label = $field->get_label( $view, $source, $entry );
-					$headers[] = $label ? $label : $field->ID;
+					$headers[ ] = $label ? $label : $field->ID;
 				}
 			}
 

includes/helper-functions.php

Spacing +52 added lines, -52 removed lines

@@ -32,19 +32,19 @@ 
 	// If there's an overriding CSS file in the current template folder, use it.
 	$template_css_path = trailingslashit( get_stylesheet_directory() ) . 'gravityview/css/' . $css_file;
 
-	if( file_exists( $template_css_path ) ) {
+	if ( file_exists( $template_css_path ) ) {
 		$path = trailingslashit( get_stylesheet_directory_uri() ) . 'gravityview/css/' . $css_file;
 		gravityview()->log->debug( 'Stylesheet override ({css_file})', array( 'css_file' => esc_attr( $css_file ) ) );
 	} else {
 		// Default: use GravityView CSS file
 
 		// If no path is provided, assume default plugin templates CSS folder
-		if( '' === $dir_path ) {
+		if ( '' === $dir_path ) {
 			$dir_path = GRAVITYVIEW_DIR . 'templates/css/';
 		}
 		
 		// plugins_url() expects a path to a file, not directory. We append a file to be stripped.
-		$path = plugins_url( $css_file, trailingslashit( $dir_path )  . 'stripped-by-plugin_basename.php' );
+		$path = plugins_url( $css_file, trailingslashit( $dir_path ) . 'stripped-by-plugin_basename.php' );
 	}
 
 	return $path;
@@ -82,9 +82,9 @@ 
 
 	$parsed_permalink = parse_url( get_permalink( $id ) );
 
-	$permalink_args =  isset( $parsed_permalink['query'] ) ? $parsed_permalink['query'] : false;
+	$permalink_args = isset( $parsed_permalink[ 'query' ] ) ? $parsed_permalink[ 'query' ] : false;
 
-	if( empty( $permalink_args ) ) {
+	if ( empty( $permalink_args ) ) {
 		return array();
 	}
 
@@ -109,15 +109,15 @@ 
 function gv_selected( $value, $current, $echo = true, $type = 'selected' ) {
 
 	$output = '';
-	if( is_array( $current ) ) {
-		if( in_array( $value, $current ) ) {
+	if ( is_array( $current ) ) {
+		if ( in_array( $value, $current ) ) {
 			$output = __checked_selected_helper( true, true, false, $type );
 		}
 	} else {
 		$output = __checked_selected_helper( $value, $current, false, $type );
 	}
 
-	if( $echo ) {
+	if ( $echo ) {
 		echo $output;
 	}
 
@@ -125,7 +125,7 @@ 
 }
 
 
-if( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
+if ( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
 
 	/**
 	 * sanitize_html_class doesn't handle spaces (multiple classes). We remedy that.
@@ -171,7 +171,7 @@ 
  */
 function gravityview_strip_whitespace( $string ) {
 	$string = normalize_whitespace( $string );
-	return preg_replace('/[\r\n\t ]+/', ' ', $string );
+	return preg_replace( '/[\r\n\t ]+/', ' ', $string );
 }
 
 /**
@@ -185,7 +185,7 @@ 
  * @return string Included file contents
  */
 function gravityview_ob_include( $file_path, $object = NULL ) {
-	if( ! file_exists( $file_path ) ) {
+	if ( ! file_exists( $file_path ) ) {
 		gravityview()->log->error( 'File path does not exist. {path}', array( 'path' => $file_path ) );
 		return '';
 	}
@@ -209,15 +209,15 @@ 
 
 	$width = $height * 0.7586206897;
 
-	if( function_exists('is_rtl') && is_rtl() ) {
-		$style = 'margin:10px 10px 10px 0; height='. $height .'px; width: '. $width .'px;';
+	if ( function_exists( 'is_rtl' ) && is_rtl() ) {
+		$style = 'margin:10px 10px 10px 0; height=' . $height . 'px; width: ' . $width . 'px;';
 		$css_class = is_string( $css_class ) ? $css_class : 'alignright';
 	} else {
-		$style = 'margin:10px 10px 10px 0; height='. $height .'px; width: '. $width .'px;';
+		$style = 'margin:10px 10px 10px 0; height=' . $height . 'px; width: ' . $width . 'px;';
 		$css_class = is_string( $css_class ) ? $css_class : 'alignleft';
 	}
 
-	return '<img src="'. esc_url( plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) ) .'" class="'. gravityview_sanitize_html_class( $css_class ).'" height="'.intval( $height ).'" width="'.round( $width, 2 ).'" alt="The GravityView Astronaut Says:" style="'.$style.'" />';
+	return '<img src="' . esc_url( plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) ) . '" class="' . gravityview_sanitize_html_class( $css_class ) . '" height="' . intval( $height ) . '" width="' . round( $width, 2 ) . '" alt="The GravityView Astronaut Says:" style="' . $style . '" />';
 }
 
 /**
@@ -241,9 +241,9 @@ 
 function gravityview_number_format( $number, $decimals = '', $separator = true ) {
 	global $wp_locale;
 
-	if( '' === $decimals ) {
+	if ( '' === $decimals ) {
 
-		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format['decimal_point'] : '.';
+		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format[ 'decimal_point' ] : '.';
 
 		/**
 		 * Calculate the position of the decimal point in the number
@@ -276,7 +276,7 @@ 
 	$parts = parse_url( $value );
 
 	// No domain? Strange...show the original text.
-	if( empty( $parts['host'] ) ) {
+	if ( empty( $parts[ 'host' ] ) ) {
 		return $value;
 	}
 
@@ -289,16 +289,16 @@ 
 	 * @param boolean $enable Whether to strip the scheme. Return false to show scheme. (default: true)\n
 	 * If true: `http://example.com => example.com`
 	 */
-	if( false === apply_filters('gravityview_anchor_text_striphttp', true) ) {
+	if ( false === apply_filters( 'gravityview_anchor_text_striphttp', true ) ) {
 
-		if( isset( $parts['scheme'] ) ) {
-			$return .= $parts['scheme'];
+		if ( isset( $parts[ 'scheme' ] ) ) {
+			$return .= $parts[ 'scheme' ];
 		}
 
 	}
 
 	// The domain, which may contain a subdomain
-	$domain = $parts['host'];
+	$domain = $parts[ 'host' ];
 
 	/**
 	 * @filter `gravityview_anchor_text_stripwww` Strip www from the domain?
@@ -306,10 +306,10 @@ 
 	 * @param boolean $enable Whether to strip www. Return false to show www. (default: true)\n
 	 * If true: `www.example.com => example.com`
 	 */
-	$strip_www = apply_filters('gravityview_anchor_text_stripwww', true );
+	$strip_www = apply_filters( 'gravityview_anchor_text_stripwww', true );
 
-	if( $strip_www ) {
-		$domain = str_replace('www.', '', $domain );
+	if ( $strip_www ) {
+		$domain = str_replace( 'www.', '', $domain );
 	}
 
 	/**
@@ -319,11 +319,11 @@ 
 	 * If true: `http://demo.example.com => example.com` \n
 	 * If false: `http://demo.example.com => demo.example.com`
 	 */
-	$strip_subdomains = apply_filters('gravityview_anchor_text_nosubdomain', true);
+	$strip_subdomains = apply_filters( 'gravityview_anchor_text_nosubdomain', true );
 
-	if( $strip_subdomains ) {
+	if ( $strip_subdomains ) {
 
-		$domain = _gravityview_strip_subdomain( $parts['host'] );
+		$domain = _gravityview_strip_subdomain( $parts[ 'host' ] );
 
 	}
 
@@ -337,12 +337,12 @@ 
 	 * If true: `http://example.com/sub/directory/page.html => example.com`  \n
 	 * If false: `http://example.com/sub/directory/page.html => example.com/sub/directory/page.html`
 	 */
-	$root_only = apply_filters('gravityview_anchor_text_rootonly', true);
+	$root_only = apply_filters( 'gravityview_anchor_text_rootonly', true );
 
-	if( empty( $root_only ) ) {
+	if ( empty( $root_only ) ) {
 
-		if( isset( $parts['path'] ) ) {
-			$return .= $parts['path'];
+		if ( isset( $parts[ 'path' ] ) ) {
+			$return .= $parts[ 'path' ];
 		}
 	}
 
@@ -352,12 +352,12 @@ 
 	 * @param boolean $enable Whether to enable "root only". Return false to show full path. (default: true)\n
 	 * If true: `http://example.com/?query=example => example.com`
 	 */
-	$strip_query_string = apply_filters('gravityview_anchor_text_noquerystring', true );
+	$strip_query_string = apply_filters( 'gravityview_anchor_text_noquerystring', true );
 
-	if( empty( $strip_query_string ) ) {
+	if ( empty( $strip_query_string ) ) {
 
-		if( isset( $parts['query'] ) ) {
-			$return .= '?'.$parts['query'];
+		if ( isset( $parts[ 'query' ] ) ) {
+			$return .= '?' . $parts[ 'query' ];
 		}
 
 	}
@@ -374,8 +374,8 @@ 
  */
 function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) {
 
-	if( preg_match("/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
-		return $matches['domain'];
+	if ( preg_match( "/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
+		return $matches[ 'domain' ];
 	} else {
 		return $string_maybe_has_subdomain;
 	}
@@ -444,7 +444,7 @@ 
 
 		if ( in_array( $value, array( 'yes', 'true' ), true ) ) {
 			$value = true;
-		} else if( in_array( $value, array( 'no', 'false' ), true ) ) {
+		} else if ( in_array( $value, array( 'no', 'false' ), true ) ) {
 			$value = false;
 		}
 	}
@@ -473,7 +473,7 @@ 
  */
 function gv_maybe_json_decode( $value, $assoc = false, $depth = 512, $options = 0 ) {
 
-	if( ! is_string( $value ) ) {
+	if ( ! is_string( $value ) ) {
 		return $value;
 	}
 
@@ -484,12 +484,12 @@ 
 	}
 
 	// There was a JSON error (PHP 5.3+)
-	if( function_exists('json_last_error') && JSON_ERROR_NONE !== json_last_error() ) {
+	if ( function_exists( 'json_last_error' ) && JSON_ERROR_NONE !== json_last_error() ) {
 		return $value;
 	}
 
 	// It wasn't JSON (PHP < 5.3 fallback)
-	if( is_null( $decoded ) ) {
+	if ( is_null( $decoded ) ) {
 		return $value;
 	}
 
@@ -512,7 +512,7 @@ 
 
 	// Use the original function, if exists.
 	// Requires WP 4.4+
-	if( function_exists( 'map_deep') ) {
+	if ( function_exists( 'map_deep' ) ) {
 		return map_deep( $value, $callback );
 	}
 
@@ -577,7 +577,7 @@ 
 
 	$exploded = explode( '.', "{$field_id}" );
 
-	return isset( $exploded[1] ) ? intval( $exploded[1] ) : false;
+	return isset( $exploded[ 1 ] ) ? intval( $exploded[ 1 ] ) : false;
 }
 
 /**
@@ -618,13 +618,13 @@ 
 	 */
 	$args = apply_filters( 'gravityview_get_terms_choices_args', $args );
 
-	$terms = get_terms( $args['taxonomy'], $args );
+	$terms = get_terms( $args[ 'taxonomy' ], $args );
 
 	$choices = array();
 
 	if ( is_array( $terms ) ) {
 		foreach ( $terms as $term_id => $term_name ) {
-			$choices[] = array(
+			$choices[ ] = array(
 				'text'  => $term_name,
 				'value' => $term_id
 			);
@@ -648,21 +648,21 @@ 
 function _gravityview_process_posted_fields() {
 	$fields = array();
 
-	if( !empty( $_POST['gv_fields'] ) ) {
-		if ( ! is_array( $_POST['gv_fields'] ) ) {
+	if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
+		if ( ! is_array( $_POST[ 'gv_fields' ] ) ) {
 
 			// We are not using parse_str() due to max_input_vars limitation with large View configurations
 			$fields_holder = array();
-			GVCommon::gv_parse_str( stripslashes( $_POST['gv_fields'] ), $fields_holder );
+			GVCommon::gv_parse_str( stripslashes( $_POST[ 'gv_fields' ] ), $fields_holder );
 
-			if ( isset( $fields_holder['fields'] ) ) {
-				$fields = $fields_holder['fields'];
+			if ( isset( $fields_holder[ 'fields' ] ) ) {
+				$fields = $fields_holder[ 'fields' ];
 			} else {
 				gravityview()->log->error( 'No `fields` key was found after parsing $fields string', array( 'data' => $fields_holder ) );
 			}
 
 		} else {
-			$fields = $_POST['gv_fields'];
+			$fields = $_POST[ 'gv_fields' ];
 		}
 	}
 

includes/widgets/search-widget/class-search-widget.php

Spacing +164 added lines, -164 removed lines

@@ -64,7 +64,7 @@ 
 				'type' => 'radio',
 				'full_width' => true,
 				'label' => esc_html__( 'Search Mode', 'gravityview' ),
-				'desc' => __('Should search results match all search fields, or any?', 'gravityview'),
+				'desc' => __( 'Should search results match all search fields, or any?', 'gravityview' ),
 				'value' => 'any',
 				'class' => 'hide-if-js',
 				'options' => array(
@@ -86,7 +86,7 @@ 
 
 			// admin - add scripts - run at 1100 to make sure GravityView_Admin_Views::add_scripts_and_styles() runs first at 999
 			add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 1100 );
-			add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
+			add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
 			add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
 
 			// ajax - get the searchable fields
@@ -230,7 +230,7 @@ 
 		$script_min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 		$script_source = empty( $script_min ) ? '/source' : '';
 
-		wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js'.$script_source.'/admin-search-widget'.$script_min.'.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), \GV\Plugin::$version );
+		wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js' . $script_source . '/admin-search-widget' . $script_min . '.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), \GV\Plugin::$version );
 
 		wp_localize_script( 'gravityview_searchwidget_admin', 'gvSearchVar', array(
 			'nonce' => wp_create_nonce( 'gravityview_ajaxsearchwidget' ),
@@ -252,7 +252,7 @@ 
 	 * @return array Scripts allowed in no-conflict mode, plus the search widget script
 	 */
 	public function register_no_conflict( $allowed ) {
-		$allowed[] = 'gravityview_searchwidget_admin';
+		$allowed[ ] = 'gravityview_searchwidget_admin';
 		return $allowed;
 	}
 
@@ -265,24 +265,24 @@ 
 	 */
 	public static function get_searchable_fields() {
 
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxsearchwidget' ) ) {
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxsearchwidget' ) ) {
 			exit( '0' );
 		}
 
 		$form = '';
 
 		// Fetch the form for the current View
-		if ( ! empty( $_POST['view_id'] ) ) {
+		if ( ! empty( $_POST[ 'view_id' ] ) ) {
 
-			$form = gravityview_get_form_id( $_POST['view_id'] );
+			$form = gravityview_get_form_id( $_POST[ 'view_id' ] );
 
-		} elseif ( ! empty( $_POST['formid'] ) ) {
+		} elseif ( ! empty( $_POST[ 'formid' ] ) ) {
 
-			$form = (int) $_POST['formid'];
+			$form = (int)$_POST[ 'formid' ];
 
-		} elseif ( ! empty( $_POST['template_id'] ) && class_exists( 'GravityView_Ajax' ) ) {
+		} elseif ( ! empty( $_POST[ 'template_id' ] ) && class_exists( 'GravityView_Ajax' ) ) {
 
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 
 		}
 
@@ -332,14 +332,14 @@ 
 		);
 
 		if ( gravityview()->plugin->supports( \GV\Plugin::FEATURE_GFQUERY ) ) {
-			$custom_fields['is_approved'] = array(
+			$custom_fields[ 'is_approved' ] = array(
 				'text' => esc_html__( 'Approval Status', 'gravityview' ),
 				'type' => 'multi',
 			);
 		}
 
-		foreach( $custom_fields as $custom_field_key => $custom_field ) {
-			$output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field['type'], self::get_field_label( array('field' => $custom_field_key ) ), $custom_field['text'] );
+		foreach ( $custom_fields as $custom_field_key => $custom_field ) {
+			$output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field[ 'type' ], self::get_field_label( array( 'field' => $custom_field_key ) ), $custom_field[ 'text' ] );
 		}
 
 		// Get fields with sub-inputs and no parent
@@ -361,13 +361,13 @@ 
 
 			foreach ( $fields as $id => $field ) {
 
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 					continue;
 				}
 
-				$types = self::get_search_input_types( $id, $field['type'] );
+				$types = self::get_search_input_types( $id, $field[ 'type' ] );
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'data-inputtypes="'. esc_attr( $types ) .'">'. esc_html( $field['label'] ) .'</option>';
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . 'data-inputtypes="' . esc_attr( $types ) . '">' . esc_html( $field[ 'label' ] ) . '</option>';
 			}
 		}
 
@@ -390,7 +390,7 @@ 
 	public static function get_search_input_types( $field_id = '', $field_type = null ) {
 
 		// @todo - This needs to be improved - many fields have . including products and addresses
-		if ( false !== strpos( (string) $field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) {
+		if ( false !== strpos( (string)$field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) {
 			$input_type = 'boolean'; // on/off checkbox
 		} elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) {
 			$input_type = 'multi'; //multiselect
@@ -436,19 +436,19 @@ 
 			$post_id = 0;
 
 			// We're in the WordPress Widget context, and an overriding post ID has been set.
-			if ( ! empty( $widget_args['post_id'] ) ) {
-				$post_id = absint( $widget_args['post_id'] );
+			if ( ! empty( $widget_args[ 'post_id' ] ) ) {
+				$post_id = absint( $widget_args[ 'post_id' ] );
 			}
 			// We're in the WordPress Widget context, and the base View ID should be used
-			else if ( ! empty( $widget_args['view_id'] ) ) {
-				$post_id = absint( $widget_args['view_id'] );
+			else if ( ! empty( $widget_args[ 'view_id' ] ) ) {
+				$post_id = absint( $widget_args[ 'view_id' ] );
 			}
 
 			$args = gravityview_get_permalink_query_args( $post_id );
 
 			// Add hidden fields to the search form
 			foreach ( $args as $key => $value ) {
-				$search_fields[] = array(
+				$search_fields[ ] = array(
 					'name'  => $key,
 					'input' => 'hidden',
 					'value' => $value,
@@ -487,28 +487,28 @@ 
 		/**
 		 * Include the sidebar Widgets.
 		 */
-		$widgets = (array) get_option( 'widget_gravityview_search', array() );
+		$widgets = (array)get_option( 'widget_gravityview_search', array() );
 
 		foreach ( $widgets as $widget ) {
-			if ( ! empty( $widget['view_id'] ) && $widget['view_id'] == $view->ID ) {
-				if( $_fields = json_decode( $widget['search_fields'], true ) ) {
+			if ( ! empty( $widget[ 'view_id' ] ) && $widget[ 'view_id' ] == $view->ID ) {
+				if ( $_fields = json_decode( $widget[ 'search_fields' ], true ) ) {
 					foreach ( $_fields as $field ) {
-						if ( empty( $field['form_id'] ) ) {
-							$field['form_id'] = $view->form ? $view->form->ID : 0;
+						if ( empty( $field[ 'form_id' ] ) ) {
+							$field[ 'form_id' ] = $view->form ? $view->form->ID : 0;
 						}
-						$searchable_fields[] = $with_full_field ? $field : $field['field'];
+						$searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ];
 					}
 				}
 			}
 		}
 
 		foreach ( $view->widgets->by_id( $this->get_widget_id() )->all() as $widget ) {
-			if( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) {
+			if ( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) {
 				foreach ( $_fields as $field ) {
-					if ( empty( $field['form_id'] ) ) {
-						$field['form_id'] = $view->form ? $view->form->ID : 0;
+					if ( empty( $field[ 'form_id' ] ) ) {
+						$field[ 'form_id' ] = $view->form ? $view->form->ID : 0;
 					}
-					$searchable_fields[] = $with_full_field ? $field : $field['field'];
+					$searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ];
 				}
 			}
 		}
@@ -538,7 +538,7 @@ 
 			return $search_criteria; // Return the original criteria, GF_Query modification kicks in later
 		}
 
-		if( 'post' === $this->search_method ) {
+		if ( 'post' === $this->search_method ) {
 			$get = $_POST;
 		} else {
 			$get = $_GET;
@@ -557,15 +557,15 @@ 
 		$get = gv_map_deep( $get, 'rawurldecode' );
 
 		// Make sure array key is set up
-		$search_criteria['field_filters'] = \GV\Utils::get( $search_criteria, 'field_filters', array() );
+		$search_criteria[ 'field_filters' ] = \GV\Utils::get( $search_criteria, 'field_filters', array() );
 
 		$searchable_fields = $this->get_view_searchable_fields( $view );
 		$searchable_field_objects = $this->get_view_searchable_fields( $view, true );
 
 		// add free search
-		if ( isset( $get['gv_search'] ) && '' !== $get['gv_search'] && in_array( 'search_all', $searchable_fields ) ) {
+		if ( isset( $get[ 'gv_search' ] ) && '' !== $get[ 'gv_search' ] && in_array( 'search_all', $searchable_fields ) ) {
 
-			$search_all_value = trim( $get['gv_search'] );
+			$search_all_value = trim( $get[ 'gv_search' ] );
 
 			/**
 			 * @filter `gravityview/search-all-split-words` Search for each word separately or the whole phrase?
@@ -590,7 +590,7 @@ 
 			}
 
 			foreach ( $words as $word ) {
-				$search_criteria['field_filters'][] = array(
+				$search_criteria[ 'field_filters' ][ ] = array(
 					'key' => null, // The field ID to search
 					'value' => $word, // The value to search
 					'operator' => 'contains', // What to search in. Options: `is` or `contains`
@@ -603,14 +603,14 @@ 
 			/**
 			 * Get and normalize the dates according to the input format.
 			 */
-			if ( $curr_start = ! empty( $get['gv_start'] ) ? $get['gv_start'] : '' ) {
-				if( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) {
+			if ( $curr_start = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_start' ] : '' ) {
+				if ( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) {
 					$curr_start = $curr_start_date->format( 'Y-m-d' );
 				}
 			}
 
-			if ( $curr_end = ! empty( $get['gv_start'] ) ? ( ! empty( $get['gv_end'] ) ? $get['gv_end'] : '' ) : '' ) {
-				if( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) {
+			if ( $curr_end = ! empty( $get[ 'gv_start' ] ) ? ( ! empty( $get[ 'gv_end' ] ) ? $get[ 'gv_end' ] : '' ) : '' ) {
+				if ( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) {
 					$curr_end = $curr_end_date->format( 'Y-m-d' );
 				}
 			}
@@ -645,22 +645,22 @@ 
 			 */
 			if ( ! empty( $curr_start ) ) {
 				$curr_start = date( 'Y-m-d H:i:s', strtotime( $curr_start ) );
-				$search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
+				$search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
 			}
 
 			if ( ! empty( $curr_end ) ) {
 				// Fast-forward 24 hour on the end time
 				$curr_end = date( 'Y-m-d H:i:s', strtotime( $curr_end ) + DAY_IN_SECONDS );
-				$search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
-				if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056
-					$search_criteria['end_date'] = date( 'Y-m-d H:i:s', strtotime( $search_criteria['end_date'] ) - 1 );
+				$search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
+				if ( strpos( $search_criteria[ 'end_date' ], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056
+					$search_criteria[ 'end_date' ] = date( 'Y-m-d H:i:s', strtotime( $search_criteria[ 'end_date' ] ) - 1 );
 				}
 			}
 		}
 
 		// search for a specific entry ID
 		if ( ! empty( $get[ 'gv_id' ] ) && in_array( 'entry_id', $searchable_fields ) ) {
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => 'id',
 				'value' => absint( $get[ 'gv_id' ] ),
 				'operator' => $this->get_operator( $get, 'gv_id', array( '=' ), '=' ),
@@ -669,20 +669,20 @@ 
 
 		// search for a specific Created_by ID
 		if ( ! empty( $get[ 'gv_by' ] ) && in_array( 'created_by', $searchable_fields ) ) {
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => 'created_by',
-				'value' => $get['gv_by'],
+				'value' => $get[ 'gv_by' ],
 				'operator' => $this->get_operator( $get, 'gv_by', array( '=' ), '=' ),
 			);
 		}
 
 		// Get search mode passed in URL
-		$mode = isset( $get['mode'] ) && in_array( $get['mode'], array( 'any', 'all' ) ) ?  $get['mode'] : 'any';
+		$mode = isset( $get[ 'mode' ] ) && in_array( $get[ 'mode' ], array( 'any', 'all' ) ) ? $get[ 'mode' ] : 'any';
 
 		// get the other search filters
 		foreach ( $get as $key => $value ) {
 
-			if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[0], false, false ) ) ) {
+			if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[ 0 ], false, false ) ) ) {
 				continue; // Not a filter, or empty
 			}
 
@@ -696,19 +696,19 @@ 
 				continue;
 			}
 
-			if ( ! isset( $filter['operator'] ) ) {
-				$filter['operator'] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' );
+			if ( ! isset( $filter[ 'operator' ] ) ) {
+				$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' );
 			}
 
-			if ( isset( $filter[0]['value'] ) ) {
-				$search_criteria['field_filters'] = array_merge( $search_criteria['field_filters'], $filter );
+			if ( isset( $filter[ 0 ][ 'value' ] ) ) {
+				$search_criteria[ 'field_filters' ] = array_merge( $search_criteria[ 'field_filters' ], $filter );
 
 				// if date range type, set search mode to ALL
-				if ( ! empty( $filter[0]['operator'] ) && in_array( $filter[0]['operator'], array( '>=', '<=', '>', '<' ) ) ) {
+				if ( ! empty( $filter[ 0 ][ 'operator' ] ) && in_array( $filter[ 0 ][ 'operator' ], array( '>=', '<=', '>', '<' ) ) ) {
 					$mode = 'all';
 				}
-			} elseif( !empty( $filter ) ) {
-				$search_criteria['field_filters'][] = $filter;
+			} elseif ( ! empty( $filter ) ) {
+				$search_criteria[ 'field_filters' ][ ] = $filter;
 			}
 		}
 
@@ -717,7 +717,7 @@ 
 		 * @since 1.5.1
 		 * @param[out,in] string $mode Search mode (`any` vs `all`)
 		 */
-		$search_criteria['field_filters']['mode'] = apply_filters( 'gravityview/search/mode', $mode );
+		$search_criteria[ 'field_filters' ][ 'mode' ] = apply_filters( 'gravityview/search/mode', $mode );
 
 		gravityview()->log->debug( 'Returned Search Criteria: ', array( 'data' => $search_criteria ) );
 
@@ -751,19 +751,19 @@ 
 
 		$query_class = $view->get_query_class();
 
-		if ( empty( $search_criteria['field_filters'] ) ) {
+		if ( empty( $search_criteria[ 'field_filters' ] ) ) {
 			return;
 		}
 
 		$widgets = $view->widgets->by_id( $this->widget_id );
 		if ( $widgets->count() ) {
 			$widgets = $widgets->all();
-			$widget  = $widgets[0];
+			$widget  = $widgets[ 0 ];
 
 			$search_fields = json_decode( $widget->configuration->get( 'search_fields' ), true );
 
-			foreach ( (array) $search_fields as $search_field ) {
-				if ( 'created_by' === $search_field['field'] && 'input_text' === $search_field['input'] ) {
+			foreach ( (array)$search_fields as $search_field ) {
+				if ( 'created_by' === $search_field[ 'field' ] && 'input_text' === $search_field[ 'input' ] ) {
 					$created_by_text_mode = true;
 				}
 			}
@@ -772,7 +772,7 @@ 
 		$extra_conditions = array();
 		$mode = 'any';
 
-		foreach ( $search_criteria['field_filters'] as &$filter ) {
+		foreach ( $search_criteria[ 'field_filters' ] as &$filter ) {
 			if ( ! is_array( $filter ) ) {
 				if ( in_array( strtolower( $filter ), array( 'any', 'all' ) ) ) {
 					$mode = $filter;
@@ -781,13 +781,13 @@ 
 			}
 
 			// Construct a manual query for unapproved statuses
-			if ( 'is_approved' === $filter['key'] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array) $filter['value'] ) ) {
-				$_tmp_query       = new $query_class( $view->form->ID, array(
+			if ( 'is_approved' === $filter[ 'key' ] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array)$filter[ 'value' ] ) ) {
+				$_tmp_query = new $query_class( $view->form->ID, array(
 					'field_filters' => array(
 						array(
 							'operator' => 'in',
 							'key'      => 'is_approved',
-							'value'    => (array) $filter['value'],
+							'value'    => (array)$filter[ 'value' ],
 						),
 						array(
 							'operator' => 'is',
@@ -799,30 +799,30 @@ 
 				) );
 				$_tmp_query_parts = $_tmp_query->_introspect();
 
-				$extra_conditions[] = $_tmp_query_parts['where'];
+				$extra_conditions[ ] = $_tmp_query_parts[ 'where' ];
 
 				$filter = false;
 				continue;
 			}
 
 			// Construct manual query for text mode creator search
-			if ( 'created_by' === $filter['key'] && ! empty( $created_by_text_mode ) ) {
-				$extra_conditions[] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view );
+			if ( 'created_by' === $filter[ 'key' ] && ! empty( $created_by_text_mode ) ) {
+				$extra_conditions[ ] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view );
 				$filter = false;
 				continue;
 			}
 
 			// By default, we want searches to be wildcard for each field.
-			$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
+			$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
 
 			// For multichoice, let's have an in (OR) search.
-			if ( is_array( $filter['value'] ) ) {
-				$filter['operator'] = 'in'; // @todo what about in contains (OR LIKE chains)?
+			if ( is_array( $filter[ 'value' ] ) ) {
+				$filter[ 'operator' ] = 'in'; // @todo what about in contains (OR LIKE chains)?
 			}
 
 			// Default form with joins functionality
-			if ( empty( $filter['form_id'] ) ) {
-				$filter['form_id'] = $view->form ? $view->form->ID : 0;
+			if ( empty( $filter[ 'form_id' ] ) ) {
+				$filter[ 'form_id' ] = $view->form ? $view->form->ID : 0;
 			}
 
 			/**
@@ -832,28 +832,28 @@ 
 			 * @since develop
 			 * @param \GV\View $view The View we're operating on.
 			 */
-			$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter, $view );
+			$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter, $view );
 		}
 
-		if ( ! empty( $search_criteria['start_date'] ) || ! empty( $search_criteria['end_date'] ) ) {
+		if ( ! empty( $search_criteria[ 'start_date' ] ) || ! empty( $search_criteria[ 'end_date' ] ) ) {
 			$date_criteria = array();
 
-			if ( isset( $search_criteria['start_date'] ) ) {
-				$date_criteria['start_date'] = $search_criteria['start_date'];
+			if ( isset( $search_criteria[ 'start_date' ] ) ) {
+				$date_criteria[ 'start_date' ] = $search_criteria[ 'start_date' ];
 			}
 
-			if ( isset( $search_criteria['end_date'] ) ) {
-				$date_criteria['end_date'] = $search_criteria['end_date'];
+			if ( isset( $search_criteria[ 'end_date' ] ) ) {
+				$date_criteria[ 'end_date' ] = $search_criteria[ 'end_date' ];
 			}
 
 			$_tmp_query         = new $query_class( $view->form->ID, $date_criteria );
 			$_tmp_query_parts   = $_tmp_query->_introspect();
-			$extra_conditions[] = $_tmp_query_parts['where'];
+			$extra_conditions[ ] = $_tmp_query_parts[ 'where' ];
 		}
 
 		$search_conditions = array();
 
-		if ( $filters = array_filter( $search_criteria['field_filters'] ) ) {
+		if ( $filters = array_filter( $search_criteria[ 'field_filters' ] ) ) {
 
 			foreach ( $filters as $filter ) {
 				if ( ! is_array( $filter ) ) {
@@ -866,12 +866,12 @@ 
 				 * code by reusing what's inside GF_Query already as they
 				 * take care of many small things like forcing numeric, etc.
 				 */
-				$_tmp_query       = new $query_class( $filter['form_id'], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) );
+				$_tmp_query       = new $query_class( $filter[ 'form_id' ], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) );
 				$_tmp_query_parts = $_tmp_query->_introspect();
-				$search_condition = $_tmp_query_parts['where'];
+				$search_condition = $_tmp_query_parts[ 'where' ];
 
-				if ( empty( $filter['key'] ) && $search_condition->expressions ) {
-					$search_conditions[] = $search_condition;
+				if ( empty( $filter[ 'key' ] ) && $search_condition->expressions ) {
+					$search_conditions[ ] = $search_condition;
 				} else {
 					$left = $search_condition->left;
 					$alias = $query->_alias( $left->field_id, $left->source, $left->is_entry_column() ? 't' : 'm' );
@@ -882,21 +882,21 @@ 
 							$join = $_join->join;
 
 							// Join
-							$search_conditions[] = new GF_Query_Condition(
+							$search_conditions[ ] = new GF_Query_Condition(
 								new GF_Query_Column( GF_Query_Column::META, $join->ID, $query->_alias( GF_Query_Column::META, $join->ID, 'm' ) ),
 								$search_condition->operator,
 								$search_condition->right
 							);
 
 							// On
-							$search_conditions[] = new GF_Query_Condition(
+							$search_conditions[ ] = new GF_Query_Condition(
 								new GF_Query_Column( GF_Query_Column::META, $on->ID, $query->_alias( GF_Query_Column::META, $on->ID, 'm' ) ),
 								$search_condition->operator,
 								$search_condition->right
 							);
 						}
 					} else {
-						$search_conditions[] = new GF_Query_Condition(
+						$search_conditions[ ] = new GF_Query_Condition(
 							new GF_Query_Column( $left->field_id, $left->source, $alias ),
 							$search_condition->operator,
 							$search_condition->right
@@ -918,7 +918,7 @@ 
 		/**
 		 * Combine the parts as a new WHERE clause.
 		 */
-		$where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts['where'] ), $search_conditions, $extra_conditions ) );
+		$where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts[ 'where' ] ), $search_conditions, $extra_conditions ) );
 		$query->where( $where );
 	}
 
@@ -941,7 +941,7 @@ 
 		$field_id = str_replace( 'filter_', '', $key );
 
 		// calculates field_id, removing 'filter_' and for '_' for advanced fields ( like name or checkbox )
-		if ( preg_match('/^[0-9_]+$/ism', $field_id ) ) {
+		if ( preg_match( '/^[0-9_]+$/ism', $field_id ) ) {
 			$field_id = str_replace( '_', '.', $field_id );
 		}
 
@@ -998,7 +998,7 @@ 
 			// form is in searchable fields
 			$found = false;
 			foreach ( $searchable_fields as $field ) {
-				if ( $field_id == $field['field'] && $form->ID == $field['form_id'] ) {
+				if ( $field_id == $field[ 'field' ] && $form->ID == $field[ 'form_id' ] ) {
 					$found = true;
 					break;
 				}
@@ -1034,7 +1034,7 @@ 
 
 			case 'select':
 			case 'radio':
-				$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
+				$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
 				break;
 
 			case 'post_category':
@@ -1048,7 +1048,7 @@ 
 
 				foreach ( $value as $val ) {
 					$cat = get_term( $val, 'category' );
-					$filter[] = array(
+					$filter[ ] = array(
 						'key'      => $field_id,
 						'value'    => esc_attr( $cat->name ) . ':' . $val,
 						'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ),
@@ -1067,7 +1067,7 @@ 
 				$filter = array();
 
 				foreach ( $value as $val ) {
-					$filter[] = array( 'key' => $field_id, 'value' => $val );
+					$filter[ ] = array( 'key' => $field_id, 'value' => $val );
 				}
 
 				break;
@@ -1076,9 +1076,9 @@ 
 				// convert checkbox on/off into the correct search filter
 				if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field->inputs ) && ! empty( $form_field->choices ) ) {
 					foreach ( $form_field->inputs as $k => $input ) {
-						if ( $input['id'] == $field_id ) {
-							$filter['value'] = $form_field->choices[ $k ]['value'];
-							$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
+						if ( $input[ 'id' ] == $field_id ) {
+							$filter[ 'value' ] = $form_field->choices[ $k ][ 'value' ];
+							$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
 							break;
 						}
 					}
@@ -1088,7 +1088,7 @@ 
 					$filter = array();
 
 					foreach ( $value as $val ) {
-						$filter[] = array(
+						$filter[ ] = array(
 							'key'      => $field_id,
 							'value'    => $val,
 							'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ),
@@ -1109,9 +1109,9 @@ 
 					foreach ( $words as $word ) {
 						if ( ! empty( $word ) && strlen( $word ) > 1 ) {
 							// Keep the same key for each filter
-							$filter['value'] = $word;
+							$filter[ 'value' ] = $word;
 							// Add a search for the value
-							$filters[] = $filter;
+							$filters[ ] = $filter;
 						}
 					}
 
@@ -1125,19 +1125,19 @@ 
 
 					foreach ( $searchable_fields as $searchable_field ) {
 
-						if( $form_field->ID !== $searchable_field['field'] ) {
+						if ( $form_field->ID !== $searchable_field[ 'field' ] ) {
 							continue;
 						}
 
 						// Only exact-match dropdowns, not text search
-						if( in_array( $searchable_field['input'], array( 'text', 'search' ), true ) ) {
+						if ( in_array( $searchable_field[ 'input' ], array( 'text', 'search' ), true ) ) {
 							continue;
 						}
 
 						$input_id = gravityview_get_input_id_from_id( $form_field->ID );
 
 						if ( 4 === $input_id ) {
-							$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
+							$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
 						};
 					}
 				}
@@ -1164,12 +1164,12 @@ 
 						 * @since 1.16.3
 						 * Safeguard until GF implements '<=' operator
 						 */
-						if( !GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) {
+						if ( ! GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) {
 							$operator = '<';
 							$date = date( 'Y-m-d', strtotime( self::get_formatted_date( $date, 'Y-m-d', $date_format ) . ' +1 day' ) );
 						}
 
-						$filter[] = array(
+						$filter[ ] = array(
 							'key'      => $field_id,
 							'value'    => self::get_formatted_date( $date, 'Y-m-d', $date_format ),
 							'operator' => $this->get_operator( $get, $key, array( $operator ), $operator ),
@@ -1177,8 +1177,8 @@ 
 					}
 				} else {
 					$date = $value;
-					$filter['value'] = self::get_formatted_date( $date, 'Y-m-d', $date_format );
-					$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
+					$filter[ 'value' ] = self::get_formatted_date( $date, 'Y-m-d', $date_format );
+					$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
 				}
 
 				break;
@@ -1209,7 +1209,7 @@ 
 			'ymd_dot' => 'Y.m.d',
 		);
 
-		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){
+		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) {
 			$format = $datepicker[ $field->dateFormat ];
 		}
 
@@ -1246,7 +1246,7 @@ 
 	public function add_template_path( $file_paths ) {
 
 		// Index 100 is the default GravityView template path.
-		$file_paths[102] = self::$file . 'templates/';
+		$file_paths[ 102 ] = self::$file . 'templates/';
 
 		return $file_paths;
 	}
@@ -1265,7 +1265,7 @@ 
 		$has_date = false;
 
 		foreach ( $search_fields as $k => $field ) {
-			if ( in_array( $field['input'], array( 'date', 'date_range', 'entry_date' ) ) ) {
+			if ( in_array( $field[ 'input' ], array( 'date', 'date_range', 'entry_date' ) ) ) {
 				$has_date = true;
 				break;
 			}
@@ -1292,7 +1292,7 @@ 
 		}
 
 		// get configured search fields
-		$search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : '';
+		$search_fields = ! empty( $widget_args[ 'search_fields' ] ) ? json_decode( $widget_args[ 'search_fields' ], true ) : '';
 
 		if ( empty( $search_fields ) || ! is_array( $search_fields ) ) {
 			gravityview()->log->debug( 'No search fields configured for widget:', array( 'data' => $widget_args ) );
@@ -1308,40 +1308,40 @@ 
 
 			$updated_field = $this->get_search_filter_details( $updated_field );
 
-			switch ( $field['field'] ) {
+			switch ( $field[ 'field' ] ) {
 
 				case 'search_all':
-					$updated_field['key'] = 'search_all';
-					$updated_field['input'] = 'search_all';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_search' );
+					$updated_field[ 'key' ] = 'search_all';
+					$updated_field[ 'input' ] = 'search_all';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_search' );
 					break;
 
 				case 'entry_date':
-					$updated_field['key'] = 'entry_date';
-					$updated_field['input'] = 'entry_date';
-					$updated_field['value'] = array(
+					$updated_field[ 'key' ] = 'entry_date';
+					$updated_field[ 'input' ] = 'entry_date';
+					$updated_field[ 'value' ] = array(
 						'start' => $this->rgget_or_rgpost( 'gv_start' ),
 						'end' => $this->rgget_or_rgpost( 'gv_end' ),
 					);
 					break;
 
 				case 'entry_id':
-					$updated_field['key'] = 'entry_id';
-					$updated_field['input'] = 'entry_id';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_id' );
+					$updated_field[ 'key' ] = 'entry_id';
+					$updated_field[ 'input' ] = 'entry_id';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_id' );
 					break;
 
 				case 'created_by':
-					$updated_field['key'] = 'created_by';
-					$updated_field['name'] = 'gv_by';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_by' );
-					$updated_field['choices'] = self::get_created_by_choices( $view );
+					$updated_field[ 'key' ] = 'created_by';
+					$updated_field[ 'name' ] = 'gv_by';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_by' );
+					$updated_field[ 'choices' ] = self::get_created_by_choices( $view );
 					break;
 				
 				case 'is_approved':
-					$updated_field['key'] = 'is_approved';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'filter_is_approved' );
-					$updated_field['choices'] = self::get_is_approved_choices();
+					$updated_field[ 'key' ] = 'is_approved';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'filter_is_approved' );
+					$updated_field[ 'choices' ] = self::get_is_approved_choices();
 					break;
 			}
 
@@ -1360,16 +1360,16 @@ 
 		 */
 		$gravityview_view->search_fields = apply_filters( 'gravityview_widget_search_filters', $search_fields, $this, $widget_args, $context );
 
-		$gravityview_view->search_layout = ! empty( $widget_args['search_layout'] ) ? $widget_args['search_layout'] : 'horizontal';
+		$gravityview_view->search_layout = ! empty( $widget_args[ 'search_layout' ] ) ? $widget_args[ 'search_layout' ] : 'horizontal';
 
 		/** @since 1.14 */
-		$gravityview_view->search_mode = ! empty( $widget_args['search_mode'] ) ? $widget_args['search_mode'] : 'any';
+		$gravityview_view->search_mode = ! empty( $widget_args[ 'search_mode' ] ) ? $widget_args[ 'search_mode' ] : 'any';
 
-		$custom_class = ! empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
+		$custom_class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
 
 		$gravityview_view->search_class = self::get_search_class( $custom_class );
 
-		$gravityview_view->search_clear = ! empty( $widget_args['search_clear'] ) ? $widget_args['search_clear'] : false;
+		$gravityview_view->search_clear = ! empty( $widget_args[ 'search_clear' ] ) ? $widget_args[ 'search_clear' ] : false;
 
 		if ( $this->has_date_field( $search_fields ) ) {
 			// enqueue datepicker stuff only if needed!
@@ -1391,10 +1391,10 @@ 
 	public static function get_search_class( $custom_class = '' ) {
 		$gravityview_view = GravityView_View::getInstance();
 
-		$search_class = 'gv-search-'.$gravityview_view->search_layout;
+		$search_class = 'gv-search-' . $gravityview_view->search_layout;
 
-		if ( ! empty( $custom_class )  ) {
-			$search_class .= ' '.$custom_class;
+		if ( ! empty( $custom_class ) ) {
+			$search_class .= ' ' . $custom_class;
 		}
 
 		/**
@@ -1438,9 +1438,9 @@ 
 
 		if ( ! $label ) {
 
-			$label = isset( $form_field['label'] ) ? $form_field['label'] : '';
+			$label = isset( $form_field[ 'label' ] ) ? $form_field[ 'label' ] : '';
 
-			switch( $field['field'] ) {
+			switch ( $field[ 'field' ] ) {
 				case 'search_all':
 					$label = __( 'Search Entries:', 'gravityview' );
 					break;
@@ -1452,10 +1452,10 @@ 
 					break;
 				default:
 					// If this is a field input, not a field
-					if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) {
+					if ( strpos( $field[ 'field' ], '.' ) > 0 && ! empty( $form_field[ 'inputs' ] ) ) {
 
 						// Get the label for the field in question, which returns an array
-						$items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) );
+						$items = wp_list_filter( $form_field[ 'inputs' ], array( 'id' => $field[ 'field' ] ) );
 
 						// Get the item with the `label` key
 						$values = wp_list_pluck( $items, 'label' );
@@ -1494,32 +1494,32 @@ 
 		$form = $gravityview_view->getForm();
 
 		// for advanced field ids (eg, first name / last name )
-		$name = 'filter_' . str_replace( '.', '_', $field['field'] );
+		$name = 'filter_' . str_replace( '.', '_', $field[ 'field' ] );
 
 		// get searched value from $_GET/$_POST (string or array)
 		$value = $this->rgget_or_rgpost( $name );
 
 		// get form field details
-		$form_field = gravityview_get_field( $form, $field['field'] );
+		$form_field = gravityview_get_field( $form, $field[ 'field' ] );
 
 		$filter = array(
-			'key' => $field['field'],
+			'key' => $field[ 'field' ],
 			'name' => $name,
 			'label' => self::get_field_label( $field, $form_field ),
-			'input' => $field['input'],
+			'input' => $field[ 'input' ],
 			'value' => $value,
-			'type' => $form_field['type'],
+			'type' => $form_field[ 'type' ],
 		);
 
 		// collect choices
-		if ( 'post_category' === $form_field['type'] && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) {
-			$filter['choices'] = gravityview_get_terms_choices();
-		} elseif ( ! empty( $form_field['choices'] ) ) {
-			$filter['choices'] = $form_field['choices'];
+		if ( 'post_category' === $form_field[ 'type' ] && ! empty( $form_field[ 'displayAllCategories' ] ) && empty( $form_field[ 'choices' ] ) ) {
+			$filter[ 'choices' ] = gravityview_get_terms_choices();
+		} elseif ( ! empty( $form_field[ 'choices' ] ) ) {
+			$filter[ 'choices' ] = $form_field[ 'choices' ];
 		}
 
-		if ( 'date_range' === $field['input'] && empty( $value ) ) {
-			$filter['value'] = array( 'start' => '', 'end' => '' );
+		if ( 'date_range' === $field[ 'input' ] && empty( $value ) ) {
+			$filter[ 'value' ] = array( 'start' => '', 'end' => '' );
 		}
 
 		return $filter;
@@ -1554,7 +1554,7 @@ 
 			 * @param \GV\View $view The view.
 			 */
 			$text = apply_filters( 'gravityview/search/created_by/text', $user->display_name, $user, $view );
-			$choices[] = array(
+			$choices[ ] = array(
 				'value' => $user->ID,
 				'text' => $text,
 			);
@@ -1574,9 +1574,9 @@ 
 
 		$choices = array();
 		foreach ( GravityView_Entry_Approval_Status::get_all() as $status ) {
-			$choices[] = array(
-				'value' => $status['value'],
-				'text' => $status['label'],
+			$choices[ ] = array(
+				'value' => $status[ 'value' ],
+				'text' => $status[ 'label' ],
 			);
 		}
 
@@ -1628,7 +1628,7 @@ 
 	 */
 	public function add_datepicker_js_dependency( $js_dependencies ) {
 
-		$js_dependencies[] = 'jquery-ui-datepicker';
+		$js_dependencies[ ] = 'jquery-ui-datepicker';
 
 		return $js_dependencies;
 	}
@@ -1672,7 +1672,7 @@ 
 			'isRTL'             => is_rtl(),
 		), $view_data );
 
-		$localizations['datepicker'] = $datepicker_settings;
+		$localizations[ 'datepicker' ] = $datepicker_settings;
 
 		return $localizations;
 
@@ -1699,7 +1699,7 @@ 
 	 * @return void
 	 */
 	private function maybe_enqueue_flexibility() {
-		if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/MSIE [8-9]/', $_SERVER['HTTP_USER_AGENT'] ) ) {
+		if ( isset( $_SERVER[ 'HTTP_USER_AGENT' ] ) && preg_match( '/MSIE [8-9]/', $_SERVER[ 'HTTP_USER_AGENT' ] ) ) {
 			wp_enqueue_script( 'gv-flexibility' );
 		}
 	}
@@ -1721,7 +1721,7 @@ 
 		add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 );
 
 		$scheme = is_ssl() ? 'https://' : 'http://';
-		wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
+		wp_enqueue_style( 'jquery-ui-datepicker', $scheme . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
 
 		/**
 		 * @filter `gravityview_search_datepicker_class`
@@ -1800,7 +1800,7 @@ 
 	public function add_preview_inputs() {
 		global $wp;
 
-		if ( ! is_preview() || ! current_user_can( 'publish_gravityviews') ) {
+		if ( ! is_preview() || ! current_user_can( 'publish_gravityviews' ) ) {
 			return;
 		}
 
@@ -1852,7 +1852,7 @@ 
  */
 class GravityView_Widget_Search_Author_GF_Query_Condition extends \GF_Query_Condition {
 	public function __construct( $filter, $view ) {
-		$this->value = $filter['value'];
+		$this->value = $filter[ 'value' ];
 		$this->view = $view;
 	}
 
@@ -1884,11 +1884,11 @@ 
 		$conditions = array();
 
 		foreach ( $user_fields as $user_field ) {
-			$conditions[] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) .  '%' );
+			$conditions[ ] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) . '%' );
 		}
 
 		foreach ( $user_meta_fields as $meta_field ) {
-			$conditions[] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) .  '%' );
+			$conditions[ ] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) . '%' );
 		}
 
 		$conditions = '(' . implode( ' OR ', $conditions ) . ')';

includes/widgets/class-gravityview-widget-page-size.php

Spacing +13 added lines, -13 removed lines

@@ -47,7 +47,7 @@ 
 		$default_size = 25;
 
 		if ( $context instanceof \GV\Template_Context ) {
-			$default_size = (int) $context->view->settings->get( 'page_size' );
+			$default_size = (int)$context->view->settings->get( 'page_size' );
 		}
 
 		$sizes = array( 10, 25, $default_size, 50, 100 );
@@ -58,7 +58,7 @@ 
 
 		$page_sizes = array();
 		foreach ( $sizes as $size ) {
-			$page_sizes [] = array(
+			$page_sizes [ ] = array(
 				'value' => $size,
 				'text'  => $size
 			);
@@ -83,11 +83,11 @@ 
 	 */
 	public function render_frontend( $widget_args, $content = '', $context = null ) {
 
-		if( ! $this->pre_render_frontend() ) {
+		if ( ! $this->pre_render_frontend() ) {
 			return;
 		}
 
-		$page_size = (int) \GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) );
+		$page_size = (int)\GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) );
 
 		$settings = shortcode_atts( array(
 			'label'   => __( 'Page Size', 'gravityview' ),
@@ -106,20 +106,20 @@ 
         <div class="gv-widget-page-size">
             <form method="get" action="<?php echo esc_url( add_query_arg( array() ) ); ?>" onchange="this.submit();">
                 <div>
-                    <?php if( ! empty( $settings['label'] ) ) { ?>
-                    <label for="gv-page_size"><?php echo esc_html( $settings['label'] ); ?></label>
+                    <?php if ( ! empty( $settings[ 'label' ] ) ) { ?>
+                    <label for="gv-page_size"><?php echo esc_html( $settings[ 'label' ] ); ?></label>
                     <?php } ?>
                     <select name="page_size" id="gv-page_size">
-                        <option value=""><?php echo esc_html( $settings['default_choice_text'] ); ?></option>
+                        <option value=""><?php echo esc_html( $settings[ 'default_choice_text' ] ); ?></option>
 						<?php
-						foreach ( $settings['choices'] as $choice ) { ?>
-                            <option value='<?php echo esc_attr( $choice['value'] ); ?>'<?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
+						foreach ( $settings[ 'choices' ] as $choice ) { ?>
+                            <option value='<?php echo esc_attr( $choice[ 'value' ] ); ?>'<?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
 						<?php } ?>
                     </select>
                     <input type="submit" value="Submit" style="visibility: hidden; position: absolute;" /><?php
-                    if( ! empty( $_GET ) ) {
+                    if ( ! empty( $_GET ) ) {
                         $get = $_GET;
-                        unset( $get['page_size'] );
+                        unset( $get[ 'page_size' ] );
 	                    foreach ( $get as $key => $value ) {
 							if ( is_array( $value ) ) {
 								foreach ( $value as $_key => $_value ) {
@@ -158,7 +158,7 @@ 
 		}
 
 		// Already overridden
-		if ( (int) $page_size === (int) $view->settings->get( 'page_size' ) ) {
+		if ( (int)$page_size === (int)$view->settings->get( 'page_size' ) ) {
 			return;
 		}
 
@@ -166,7 +166,7 @@ 
 			'view' => $view,
 		) );
 
-		if ( ! in_array( (int) $page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) {
+		if ( ! in_array( (int)$page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) {
 			gravityview()->log->warning( 'The passed page size is not allowed: {page_size}. Not modifying result.', array( 'page_size' => $page_size ) );
 			return;
 		}

includes/widgets/search-widget/templates/search-field-submit.php

Spacing +2 added lines, -2 removed lines

@@ -12,9 +12,9 @@
 	// Output the Clear button, if enabled
 	GravityView_Widget_Search::the_clear_search_button();
 
-	if ( isset( $_GET['page_size'] ) ) {
+	if ( isset( $_GET[ 'page_size' ] ) ) {
 		?>
-		<input type="hidden" name="page_size" value="<?php echo esc_attr( $_GET['page_size'] ); ?>" />
+		<input type="hidden" name="page_size" value="<?php echo esc_attr( $_GET[ 'page_size' ] ); ?>" />
 		<?php
 	}