gravityview / GravityView

includes/class-ajax.php

Spacing +68 added lines, -68 removed lines

@@ -36,7 +36,7 @@ 
 		 * Don't exit if we're running test suite.
 		 * @since 1.15
 		 */
-		if( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) {
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) {
 			return $mixed;
 		}
 
@@ -50,7 +50,7 @@ 
 	 * @return void
 	 */
 	function check_ajax_nonce() {
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxviews' ) ) {
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxviews' ) ) {
 			$this->_exit( false );
 		}
 	}
@@ -69,7 +69,7 @@ 
 		$context = rgpost( 'context' );
 
 		// Return markup for a single or multiple contexts
-		if( $context ) {
+		if ( $context ) {
 			$data = array(
 				esc_attr( $context ) => ''
 			);
@@ -113,17 +113,17 @@ 
 	function get_active_areas() {
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
+		if ( empty( $_POST[ 'template_id' ] ) ) {
 			$this->_exit( false );
 		}
 
 		ob_start();
-		do_action( 'gravityview_render_directory_active_areas', $_POST['template_id'], 'directory', '', true );
-		$response['directory'] = ob_get_clean();
+		do_action( 'gravityview_render_directory_active_areas', $_POST[ 'template_id' ], 'directory', '', true );
+		$response[ 'directory' ] = ob_get_clean();
 
 		ob_start();
-		do_action( 'gravityview_render_directory_active_areas',  $_POST['template_id'], 'single', '', true );
-		$response['single'] = ob_get_clean();
+		do_action( 'gravityview_render_directory_active_areas', $_POST[ 'template_id' ], 'single', '', true );
+		$response[ 'single' ] = ob_get_clean();
 
 		$response = array_map( 'gravityview_strip_whitespace', $response );
 
@@ -138,20 +138,20 @@ 
 
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
+		if ( empty( $_POST[ 'template_id' ] ) ) {
 			$this->_exit( false );
 		}
 
 		// get the fields xml config file for this specific preset
-		$preset_fields_path = apply_filters( 'gravityview_template_fieldsxml', array(), $_POST['template_id'] );
+		$preset_fields_path = apply_filters( 'gravityview_template_fieldsxml', array(), $_POST[ 'template_id' ] );
 		// import fields
-		if( !empty( $preset_fields_path ) ) {
+		if ( ! empty( $preset_fields_path ) ) {
 			$presets = $this->import_fields( $preset_fields_path );
 		} else {
 			$presets = array( 'widgets' => array(), 'fields' => array() );
 		}
 
-		$template_id = esc_attr( $_POST['template_id'] );
+		$template_id = esc_attr( $_POST[ 'template_id' ] );
 
 		// template areas
 		$template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' );
@@ -161,20 +161,20 @@ 
 		$default_widget_areas = \GV\Widget::get_default_widget_areas();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets['widgets'] );
-		$response['header'] = ob_get_clean();
+		do_action( 'gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets[ 'widgets' ] );
+		$response[ 'header' ] = ob_get_clean();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets['widgets'] );
-		$response['footer'] = ob_get_clean();
+		do_action( 'gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets[ 'widgets' ] );
+		$response[ 'footer' ] = ob_get_clean();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets['fields'] );
-		$response['directory'] = ob_get_clean();
+		do_action( 'gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets[ 'fields' ] );
+		$response[ 'directory' ] = ob_get_clean();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets['fields'] );
-		$response['single'] = ob_get_clean();
+		do_action( 'gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets[ 'fields' ] );
+		$response[ 'single' ] = ob_get_clean();
 
 		$response = array_map( 'gravityview_strip_whitespace', $response );
 
@@ -192,26 +192,26 @@ 
 
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
+		if ( empty( $_POST[ 'template_id' ] ) ) {
 			gravityview()->log->error( 'Cannot create preset form; the template_id is empty.' );
 			$this->_exit( false );
 		}
 
 		// get the xml for this specific template_id
-		$preset_form_xml_path = apply_filters( 'gravityview_template_formxml', '', $_POST['template_id'] );
+		$preset_form_xml_path = apply_filters( 'gravityview_template_formxml', '', $_POST[ 'template_id' ] );
 
 		// import form
 		$form = $this->import_form( $preset_form_xml_path );
 
 		// get the form ID
-		if( false === $form ) {
+		if ( false === $form ) {
 			// send error to user
-			gravityview()->log->error( 'Error importing form for template id: {template_id}', array( 'template_id' => (int) $_POST['template_id'] ) );
+			gravityview()->log->error( 'Error importing form for template id: {template_id}', array( 'template_id' => (int)$_POST[ 'template_id' ] ) );
 
 			$this->_exit( false );
 		}
 
-		$this->_exit( '<option value="'.esc_attr( $form['id'] ).'" selected="selected">'.esc_html( $form['title'] ).'</option>' );
+		$this->_exit( '<option value="' . esc_attr( $form[ 'id' ] ) . '" selected="selected">' . esc_html( $form[ 'title' ] ) . '</option>' );
 
 	}
 
@@ -225,7 +225,7 @@ 
 
 		gravityview()->log->debug( '[import_form] Import Preset Form. (File) {path}', array( 'path' => $xml_or_json_path ) );
 
-		if( empty( $xml_or_json_path ) || !class_exists('GFExport') || !file_exists( $xml_or_json_path ) ) {
+		if ( empty( $xml_or_json_path ) || ! class_exists( 'GFExport' ) || ! file_exists( $xml_or_json_path ) ) {
 			gravityview()->log->error( 'Class GFExport or file not found. file: {path}', array( 'path' => $xml_or_json_path ) );
 			return false;
 		}
@@ -237,13 +237,13 @@ 
 		gravityview()->log->debug( '[import_form] Importing form (Result) {count}', array( 'count' => $count ) );
 		gravityview()->log->debug( '[import_form] Importing form (Form) ', array( 'data' => $forms ) );
 
-		if( $count != 1 || empty( $forms[0]['id'] ) ) {
+		if ( $count != 1 || empty( $forms[ 0 ][ 'id' ] ) ) {
 			gravityview()->log->error( 'Form Import Failed!' );
 			return false;
 		}
 
 		// import success - return form id
-		return $forms[0];
+		return $forms[ 0 ];
 	}
 
 
@@ -257,7 +257,7 @@ 
 	function get_field_options() {
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template'] ) || empty( $_POST['area'] ) || empty( $_POST['field_id'] ) || empty( $_POST['field_type'] ) ) {
+		if ( empty( $_POST[ 'template' ] ) || empty( $_POST[ 'area' ] ) || empty( $_POST[ 'field_id' ] ) || empty( $_POST[ 'field_type' ] ) ) {
 			gravityview()->log->error( 'Required fields were not set in the $_POST request. ' );
 			$this->_exit( false );
 		}
@@ -269,11 +269,11 @@ 
 		$_post = array_map( 'esc_attr', $_post );
 
 		// The GF type of field: `product`, `name`, `creditcard`, `id`, `text`
-		$input_type = isset($_post['input_type']) ? esc_attr( $_post['input_type'] ) : NULL;
-		$context = isset($_post['context']) ? esc_attr( $_post['context'] ) : NULL;
+		$input_type = isset( $_post[ 'input_type' ] ) ? esc_attr( $_post[ 'input_type' ] ) : NULL;
+		$context = isset( $_post[ 'context' ] ) ? esc_attr( $_post[ 'context' ] ) : NULL;
 
-		$form_id = empty( $_post['form_id'] ) ? null : $_post['form_id'];
-		$response = GravityView_Render_Settings::render_field_options( $form_id, $_post['field_type'], $_post['template'], $_post['field_id'], $_post['field_label'], $_post['area'], $input_type, '', '', $context  );
+		$form_id = empty( $_post[ 'form_id' ] ) ? null : $_post[ 'form_id' ];
+		$response = GravityView_Render_Settings::render_field_options( $form_id, $_post[ 'field_type' ], $_post[ 'template' ], $_post[ 'field_id' ], $_post[ 'field_label' ], $_post[ 'area' ], $input_type, '', '', $context );
 
 		$response = gravityview_strip_whitespace( $response );
 
@@ -294,15 +294,15 @@ 
 		$form = '';
 
 		// if form id is set, use it, else, get form from preset
-		if( !empty( $_POST['form_id'] ) ) {
+		if ( ! empty( $_POST[ 'form_id' ] ) ) {
 
-			$form = (int) $_POST['form_id'];
+			$form = (int)$_POST[ 'form_id' ];
 
 		}
 		// get form from preset
-		elseif( !empty( $_POST['template_id'] ) ) {
+		elseif ( ! empty( $_POST[ 'template_id' ] ) ) {
 
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 
 		}
 
@@ -318,27 +318,27 @@ 
 	 * @param  string $template_id Preset template
 	 *
 	 */
-	static function pre_get_form_fields( $template_id = '') {
+	static function pre_get_form_fields( $template_id = '' ) {
 
-		if( empty( $template_id ) ) {
+		if ( empty( $template_id ) ) {
 			gravityview()->log->error( 'Template ID not set.' );
 			return false;
 		} else {
 			$form_file = apply_filters( 'gravityview_template_formxml', '', $template_id );
-			if( !file_exists( $form_file )  ) {
+			if ( ! file_exists( $form_file ) ) {
 				gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. File not found. file: {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
 				return false;
 			}
 		}
 
 		// Load xml parser (from GravityForms)
-		if( class_exists( 'GFCommon' ) ) {
+		if ( class_exists( 'GFCommon' ) ) {
 			$xml_parser = GFCommon::get_base_path() . '/xml.php';
 		} else {
 			$xml_parser = trailingslashit( WP_PLUGIN_DIR ) . 'gravityforms/xml.php';
 		}
 
-		if( file_exists( $xml_parser ) ) {
+		if ( file_exists( $xml_parser ) ) {
 			require_once( $xml_parser );
 		} else {
 			gravityview()->log->debug( ' - Gravity Forms XML Parser not found {path}.', array( 'path' => $xml_parser ) );
@@ -349,32 +349,32 @@ 
 		$xmlstr = file_get_contents( $form_file );
 
         $options = array(
-            "page" => array("unserialize_as_array" => true),
-            "form"=> array("unserialize_as_array" => true),
-            "field"=> array("unserialize_as_array" => true),
-            "rule"=> array("unserialize_as_array" => true),
-            "choice"=> array("unserialize_as_array" => true),
-            "input"=> array("unserialize_as_array" => true),
-            "routing_item"=> array("unserialize_as_array" => true),
-            "creditCard"=> array("unserialize_as_array" => true),
-            "routin"=> array("unserialize_as_array" => true),
-            "confirmation" => array("unserialize_as_array" => true),
-            "notification" => array("unserialize_as_array" => true)
+            "page" => array( "unserialize_as_array" => true ),
+            "form"=> array( "unserialize_as_array" => true ),
+            "field"=> array( "unserialize_as_array" => true ),
+            "rule"=> array( "unserialize_as_array" => true ),
+            "choice"=> array( "unserialize_as_array" => true ),
+            "input"=> array( "unserialize_as_array" => true ),
+            "routing_item"=> array( "unserialize_as_array" => true ),
+            "creditCard"=> array( "unserialize_as_array" => true ),
+            "routin"=> array( "unserialize_as_array" => true ),
+            "confirmation" => array( "unserialize_as_array" => true ),
+            "notification" => array( "unserialize_as_array" => true )
         );
 
-		$xml = new RGXML($options);
-        $forms = $xml->unserialize($xmlstr);
+		$xml = new RGXML( $options );
+        $forms = $xml->unserialize( $xmlstr );
 
-        if( !$forms ) {
+        if ( ! $forms ) {
         	gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. Error importing file. (File) {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
         	return false;
         }
 
-        if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
-        	$form = $forms[0];
+        if ( ! empty( $forms[ 0 ] ) && is_array( $forms[ 0 ] ) ) {
+        	$form = $forms[ 0 ];
         }
 
-        if( empty( $form ) ) {
+        if ( empty( $form ) ) {
         	gravityview()->log->error( '$form not set.', array( 'data' => $forms ) );
         	return false;
         }
@@ -393,38 +393,38 @@ 
 	 */
 	function import_fields( $file ) {
 
-		if( empty( $file ) || !file_exists(  $file ) ) {
+		if ( empty( $file ) || ! file_exists( $file ) ) {
 			gravityview()->log->error( 'Importing Preset Fields. File not found. (File) {path}', array( 'path' => $file ) );
 			return false;
 		}
 
-		if( !class_exists('WXR_Parser') ) {
+		if ( ! class_exists( 'WXR_Parser' ) ) {
 			include_once GRAVITYVIEW_DIR . 'includes/lib/xml-parsers/parsers.php';
 		}
 
 		$parser = new WXR_Parser();
 		$presets = $parser->parse( $file );
 
-		if(is_wp_error( $presets )) {
+		if ( is_wp_error( $presets ) ) {
 			gravityview()->log->error( 'Importing Preset Fields failed. Threw WP_Error.', array( 'data' => $presets ) );
 			return false;
 		}
 
-		if( empty( $presets['posts'][0]['postmeta'] ) && !is_array( $presets['posts'][0]['postmeta'] ) ) {
+		if ( empty( $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) && ! is_array( $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) ) {
 			gravityview()->log->error( 'Importing Preset Fields failed. Meta not found in file. {path}', array( 'path' => $file ) );
 			return false;
 		}
 
-		gravityview()->log->debug( '[import_fields] postmeta', array( 'data' => $presets['posts'][0]['postmeta'] ) );
+		gravityview()->log->debug( '[import_fields] postmeta', array( 'data' => $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) );
 
 		$fields = $widgets = array();
-		foreach( $presets['posts'][0]['postmeta'] as $meta ) {
-			switch ($meta['key']) {
+		foreach ( $presets[ 'posts' ][ 0 ][ 'postmeta' ] as $meta ) {
+			switch ( $meta[ 'key' ] ) {
 				case '_gravityview_directory_fields':
-					$fields = maybe_unserialize( $meta['value'] );
+					$fields = maybe_unserialize( $meta[ 'value' ] );
 					break;
 				case '_gravityview_directory_widgets':
-					$widgets = maybe_unserialize( $meta['value'] );
+					$widgets = maybe_unserialize( $meta[ 'value' ] );
 					break;
 			}
 		}

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

Spacing +244 added lines, -244 removed lines

@@ -135,7 +135,7 @@ 
 	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' ) );
@@ -145,7 +145,7 @@ 
 		add_action( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 );
 		add_action( 'admin_init', 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 );
 
@@ -156,7 +156,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 );
@@ -173,8 +173,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' );
@@ -189,17 +189,17 @@ 
 	 */
 	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 );
 
-		remove_action( 'admin_init',  array( 'GFForms', 'maybe_process_form'), 9 );
-		remove_action( 'admin_init',  array( 'RGForms', 'maybe_process_form'), 9 );
+		remove_action( 'admin_init', array( 'GFForms', 'maybe_process_form' ), 9 );
+		remove_action( 'admin_init', array( 'RGForms', 'maybe_process_form' ), 9 );
 	}
 
 	/**
@@ -210,7 +210,7 @@ 
 
 		$is_edit_entry =
 			( GravityView_frontend::is_single_entry() || ( ! empty( gravityview()->request->is_entry() ) ) )
-			&& ( ! empty( $_GET['edit'] ) );
+			&& ( ! empty( $_GET[ 'edit' ] ) );
 
 		return ( $is_edit_entry || $this->is_edit_entry_submission() );
 	}
@@ -221,7 +221,7 @@ 
 	 * @return boolean
 	 */
 	public function is_edit_entry_submission() {
-		return !empty( $_POST[ self::$nonce_field ] );
+		return ! empty( $_POST[ self::$nonce_field ] );
 	}
 
 	/**
@@ -234,16 +234,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' ] );
 	}
 
 
@@ -302,9 +302,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 ) );
 
@@ -320,19 +320,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;
 		}
@@ -343,7 +343,7 @@ 
 
 		$this->validate();
 
-		if( $this->is_valid ) {
+		if ( $this->is_valid ) {
 
 			gravityview()->log->debug( 'Submission is valid.' );
 
@@ -355,15 +355,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
@@ -373,14 +373,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();
@@ -405,7 +405,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 ) );
@@ -441,10 +441,10 @@ 
 
 		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 ) {
@@ -462,11 +462,11 @@ 
 
 				$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
 				);
 
 				if ( $field->has_calculation() ) {
-					$this->unset_hidden_calculations[] = $field->id; // Unset
+					$this->unset_hidden_calculations[ ] = $field->id; // Unset
 					$empty_value = '';
 				}
 
@@ -495,7 +495,7 @@ 
 	private function preset_approval_fields() {
 		$has_approved_field = false;
 
-		foreach ( self::$original_form['fields'] as $field ) {
+		foreach ( self::$original_form[ 'fields' ] as $field ) {
 			if ( $field->gravityview_approved ) {
 				$has_approved_field = true;
 				break;
@@ -508,7 +508,7 @@ 
 
 		$is_field_hidden = true;
 
-		foreach ( $this->form['fields'] as $field ) {
+		foreach ( $this->form[ 'fields' ] as $field ) {
 			if ( $field->gravityview_approved ) {
 				$is_field_hidden = false;
 				break;
@@ -533,7 +533,7 @@ 
 
 		remove_filter( 'gravityview/approve_entries/update_unapproved_meta', array( $this, 'prevent_update_unapproved_meta' ), 9 );
 
-		if ( ! $value = gform_get_meta( $entry['id'], 'is_approved' ) ) {
+		if ( ! $value = gform_get_meta( $entry[ 'id' ], 'is_approved' ) ) {
 
 			$value = GravityView_Entry_Approval_Status::UNAPPROVED;
 
@@ -598,7 +598,7 @@ 
 		}
 
 		/** No file is being uploaded. */
-		if ( empty( $_FILES[ $input_name ]['name'] ) ) {
+		if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) {
 			/** So return the original upload, with $value as backup (it can be empty during edit form rendering) */
 			return rgar( $entry, $input_id, $value );
 		}
@@ -616,11 +616,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;
 	}
@@ -635,27 +635,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;
 	}
@@ -667,14 +667,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' ] ) );
 		}
 
 
@@ -691,24 +691,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
@@ -748,19 +748,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,
@@ -769,7 +769,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;
 			}
 
 			/**
@@ -827,15 +827,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;
 		}
@@ -848,25 +848,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;
@@ -876,7 +876,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 );
@@ -894,11 +894,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;
@@ -910,7 +910,7 @@ 
 				}
 
 				// update entry after
-				$this->entry["{$field_id}"] = $value;
+				$this->entry[ "{$field_id}" ] = $value;
 
 				$update_entry = true;
 
@@ -919,11 +919,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 ) );
@@ -933,7 +933,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 {
@@ -967,7 +967,7 @@ 
 		$output = GFCommon::replace_variables( $output, $form, $entry, false, false, false );
 
 		// replace conditional shortcodes
-		if( $do_shortcode ) {
+		if ( $do_shortcode ) {
 			$output = do_shortcode( $output );
 		}
 
@@ -986,19 +986,19 @@ 
 	 */
 	private function after_update() {
 
-		do_action( 'gform_after_update_entry', self::$original_form, $this->entry['id'], self::$original_entry );
-		do_action( "gform_after_update_entry_{$this->form['id']}", self::$original_form, $this->entry['id'], self::$original_entry );
+		do_action( 'gform_after_update_entry', self::$original_form, $this->entry[ 'id' ], self::$original_entry );
+		do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", self::$original_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 );
 			}
 		}
 
@@ -1008,11 +1008,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;
@@ -1020,8 +1020,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;
@@ -1048,7 +1048,7 @@ 
 	public function edit_entry_form() {
 
 		$locking = new GravityView_Edit_Entry_Locking();
-		$locking->maybe_lock_object( $this->entry['id'] );
+		$locking->maybe_lock_object( $this->entry[ 'id' ] );
 
 		?>
 
@@ -1060,7 +1060,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
@@ -1076,7 +1076,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>
@@ -1142,18 +1142,18 @@ 
 				*/
 				$labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id );
 
-				$this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels['submit'];
+				$this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels[ 'submit' ];
 			}
 
 			$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' );
 
 			} elseif ( false === $this->is_paged_submitted ) {
 				// Paged form that hasn't been submitted on the last page yet
@@ -1166,7 +1166,7 @@ 
 				 * @param int $view_id View ID
 				 * @param array $entry Gravity Forms entry array
 				 */
-				$message = apply_filters( 'gravityview/edit_entry/page/success', $entry_updated_message , $this->view_id, $this->entry );
+				$message = apply_filters( 'gravityview/edit_entry/page/success', $entry_updated_message, $this->view_id, $this->entry );
 
 				echo GVCommon::generate_notice( $message );
 			} else {
@@ -1178,23 +1178,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;
 				}
 
@@ -1210,7 +1210,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 );
 			}
@@ -1234,8 +1234,8 @@ 
 		 */
 		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_next_button', array( $this, 'render_form_buttons' ) );
 		add_filter( 'gform_previous_button', array( $this, 'render_form_buttons' ) );
 		add_filter( 'gform_disable_view_counter', '__return_true' );
@@ -1244,14 +1244,14 @@ 
 		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' ] );
 
 		$this->show_next_button = false;
 		$this->show_previous_button = false;
 
 		// TODO: Verify multiple-page forms
 		if ( GFCommon::has_pages( $this->form ) && apply_filters( 'gravityview/features/paged-edit', false ) ) {
-			if ( intval( $page_number = \GV\Utils::_POST( 'gform_source_page_number_' . $this->form['id'], 0 ) ) ) {
+			if ( intval( $page_number = \GV\Utils::_POST( 'gform_source_page_number_' . $this->form[ 'id' ], 0 ) ) ) {
 
 				$labels = array(
 					'cancel'   => __( 'Cancel', 'gravityview' ),
@@ -1270,20 +1270,20 @@ 
 				*/
 				$labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id );
 
-				GFFormDisplay::$submission[ $this->form['id'] ][ 'form' ] = $this->form;
-				GFFormDisplay::$submission[ $this->form['id'] ][ 'is_valid' ] = true;
+				GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'form' ] = $this->form;
+				GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'is_valid' ] = true;
 
-				if ( \GV\Utils::_POST( 'save' ) === $labels['next'] ) {
+				if ( \GV\Utils::_POST( 'save' ) === $labels[ 'next' ] ) {
 					$last_page = \GFFormDisplay::get_max_page_number( $this->form );
 
 					while ( ++$page_number < $last_page && RGFormsModel::is_page_hidden( $this->form, $page_number, \GV\Utils::_POST( 'gform_field_values' ) ) ) {
 					} // Advance to next visible page
-				} elseif ( \GV\Utils::_POST( 'save' ) === $labels['previous'] ) {
+				} elseif ( \GV\Utils::_POST( 'save' ) === $labels[ 'previous' ] ) {
 					while ( --$page_number > 1 && RGFormsModel::is_page_hidden( $this->form, $page_number, \GV\Utils::_POST( 'gform_field_values' ) ) ) {
 					} // Advance to next visible page
 				}
 
-				GFFormDisplay::$submission[ $this->form['id'] ]['page_number'] = $page_number;
+				GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'page_number' ] = $page_number;
 			}
 
 			if ( ( $page_number = intval( $page_number ) ) < 2 ) {
@@ -1309,7 +1309,7 @@ 
 
 		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();
 
@@ -1337,7 +1337,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 );
 	}
 
 
@@ -1356,15 +1356,15 @@ 
 	 */
 	public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) {
 
-		if( $form['id'] != $this->form_id ) {
+		if ( $form[ 'id' ] != $this->form_id ) {
 			return $form;
 		}
 
 		// In case we have validated the form, use it to inject the validation results into the form render
-		if( isset( $this->form_after_validation ) && $this->form_after_validation['id'] === $form['id'] ) {
+		if ( isset( $this->form_after_validation ) && $this->form_after_validation[ 'id' ] === $form[ 'id' ] ) {
 			$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 );
@@ -1372,8 +1372,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 );
@@ -1396,31 +1396,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;
@@ -1444,8 +1444,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 )
@@ -1465,7 +1465,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 );
@@ -1474,7 +1474,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 ) );
 	    }
 
@@ -1499,7 +1499,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();
 
@@ -1508,10 +1508,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;
 				}
 
@@ -1519,7 +1519,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 {
 
@@ -1530,13 +1530,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 );
 			}
@@ -1564,7 +1564,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;
 	}
@@ -1581,12 +1581,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.
@@ -1594,7 +1594,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.
@@ -1608,26 +1608,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' => '' );
 
 				    }
 
@@ -1635,10 +1635,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 {
@@ -1656,8 +1656,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;
 			}
@@ -1694,7 +1694,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;
@@ -1702,14 +1702,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 );
 	}
 
 
@@ -1732,7 +1732,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 );
@@ -1745,22 +1745,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 );
 				        }
 
@@ -1768,13 +1768,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;
 				        }
 
 				    }
@@ -1785,7 +1785,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 ) ) );
 
@@ -1803,19 +1803,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;
 
@@ -1828,7 +1828,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;
@@ -1840,12 +1840,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;
 	}
@@ -1858,7 +1858,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() );
 		}
@@ -1890,10 +1890,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 );
@@ -1926,7 +1926,7 @@ 
 	 */
 	private function filter_fields( $fields, $configured_fields ) {
 
-		if( empty( $fields ) || !is_array( $fields ) ) {
+		if ( empty( $fields ) || ! is_array( $fields ) ) {
 			return $fields;
 		}
 
@@ -1943,12 +1943,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 ] );
 			}
 		}
@@ -1966,7 +1966,7 @@ 
 					continue; // Same
 				}
 
-				$out_fields[] = $field;
+				$out_fields[ ] = $field;
 			}
 
 			return array_values( $out_fields );
@@ -1977,8 +1977,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;
 				}
 
@@ -2001,14 +2001,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' ] );
 		}
 
 		/**
@@ -2046,16 +2046,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;
 		}
 
@@ -2076,7 +2076,7 @@ 
 	 */
 	private function unselect_default_values( $form ) {
 
-	    foreach ( $form['fields'] as &$field ) {
+	    foreach ( $form[ 'fields' ] as &$field ) {
 
 			if ( empty( $field->choices ) ) {
                 continue;
@@ -2084,7 +2084,7 @@ 
 
             foreach ( $field->choices as &$choice ) {
 				if ( \GV\Utils::get( $choice, 'isSelected' ) ) {
-					$choice['isSelected'] = false;
+					$choice[ 'isSelected' ] = false;
 				}
 			}
 		}
@@ -2109,22 +2109,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 {
@@ -2132,15 +2132,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;
 				                }
 				            }
 
@@ -2173,32 +2173,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 );
 						}
 					}
 				}
@@ -2206,21 +2206,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?
@@ -2230,16 +2230,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;
 
@@ -2256,7 +2256,7 @@ 
 	 */
 	public function manage_conditional_logic( $has_conditional_logic, $form ) {
 
-		if( ! $this->is_edit_entry() ) {
+		if ( ! $this->is_edit_entry() ) {
 			return $has_conditional_logic;
 		}
 
@@ -2288,44 +2288,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 );
 
@@ -2333,10 +2333,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 ) );
@@ -2356,17 +2356,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 ) );
@@ -2387,14 +2387,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;
@@ -2408,17 +2408,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 );
 		}
 
 		/**

future/includes/class-gv-view.php

Spacing +79 added lines, -80 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 );
 		}
 	}
@@ -308,13 +308,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' );
 			}
@@ -325,7 +325,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' );
 				}
@@ -348,7 +348,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' );
 				}
@@ -359,7 +359,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' );
 					}
@@ -534,7 +534,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;
@@ -624,13 +624,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 );
 					}
 				}
@@ -685,7 +685,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,
 			) );
 		}
 
@@ -924,11 +924,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' ] );
 				}
 			}
 
@@ -937,31 +937,30 @@ 
 			 */
 			$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 ( ! is_array( $parameters ) ) {
 				$parameters = array();
 			}
 
-			if ( ! is_array( $parameters['search_criteria'] ) ) {
-				$parameters['search_criteria'] = array();
+			if ( ! is_array( $parameters[ 'search_criteria' ] ) ) {
+				$parameters[ 'search_criteria' ] = array();
 			}
 
-			if ( ( ! isset( $parameters['search_criteria']['field_filters'] ) ) || ( ! is_array( $parameters['search_criteria']['field_filters'] ) ) ) {
-				$parameters['search_criteria']['field_filters'] = array();
+			if ( ( ! isset( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) || ( ! is_array( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) ) {
+				$parameters[ 'search_criteria' ][ 'field_filters' ] = array();
 			}
 
 			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' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 );
+			$page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 );
 
 			/**
 			 * Cleanup duplicate field_filter parameters to simplify the query.
@@ -969,14 +968,14 @@ 
 			$unique_field_filters = array();
 			foreach ( Utils::get( $parameters, 'search_criteria/field_filters', array() ) 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.' );
 			}
 
@@ -985,7 +984,7 @@ 
 				$query_class = $this->get_query_class();
 
 				/** @var \GF_Query $query */
-				$query = new $query_class( $this->form->ID, $parameters['search_criteria'], Utils::get( $parameters, 'sorting' ) );
+				$query = new $query_class( $this->form->ID, $parameters[ 'search_criteria' ], Utils::get( $parameters, 'sorting' ) );
 
 				/**
 				 * Apply multisort.
@@ -996,15 +995,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;
@@ -1012,7 +1011,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
@@ -1042,15 +1041,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' ) {
@@ -1064,7 +1063,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;
@@ -1075,15 +1074,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?
@@ -1106,7 +1105,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 ) );
 						}
 
 						/**
@@ -1140,7 +1139,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 ) {
 
@@ -1165,7 +1164,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 ) );
 						}
 					}
 				
@@ -1189,7 +1188,7 @@ 
 							$conditions = array();
 
 							foreach ( $condition->expressions as $_condition ) {
-								$conditions[] = $recurse( $_condition, $fields, $recurse );
+								$conditions[ ] = $recurse( $_condition, $fields, $recurse );
 							}
 
 							return call_user_func_array(
@@ -1218,10 +1217,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 ) {
@@ -1235,15 +1234,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
 							);
 
@@ -1260,11 +1259,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();
 
@@ -1275,30 +1274,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;
 					} );
@@ -1343,20 +1342,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 ) );
 				}
 			}
@@ -1431,7 +1430,7 @@ 
 		$allowed = $headers = array();
 
 		foreach ( $view->fields->by_position( "directory_*" )->by_visible( $view )->all() as $id => $field ) {
-			$allowed[] = $field;
+			$allowed[ ] = $field;
 		}
 
 		$renderer = new Field_Renderer();
@@ -1453,17 +1452,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;
 				}
 			}