gravityview / GravityView

includes/fields/class-gravityview-field-post-excerpt.php

Spacing +3 added lines, -3 removed lines

@@ -22,13 +22,13 @@
 
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
-		unset( $field_options['show_as_link'] );
+		unset( $field_options[ 'show_as_link' ] );
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
-		$this->add_field_support('dynamic_data', $field_options );
+		$this->add_field_support( 'dynamic_data', $field_options );
 
 		return $field_options;
 	}

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

Braces +2 added lines, -4 removed lines

@@ -942,7 +942,7 @@ 
 
 			$back_link = esc_url( 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>";
@@ -1996,9 +1996,7 @@ 
 		// Verify
 		else if( ! $this->is_edit_entry() ) {
 			$valid = false;
-		}
-
-		else {
+		} else {
 			$valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
 		}
 

Spacing +232 added lines, -232 removed lines

@@ -106,16 +106,16 @@ 
 	function load() {
 
 		/** @define "GRAVITYVIEW_DIR" "../../../" */
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
 
 		// Don't display an embedded form when editing an entry
 		add_action( 'wp_head', array( $this, 'prevent_render_form' ) );
 		add_action( 'wp_footer', array( $this, 'prevent_render_form' ) );
 
 		// Stop Gravity Forms processing what is ours!
-		add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 );
+		add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 );
 
-		add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') );
+		add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) );
 
 		add_action( 'gravityview_edit_entry', array( $this, 'init' ) );
 
@@ -126,7 +126,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 );
@@ -143,8 +143,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' );
@@ -159,13 +159,13 @@ 
 	 */
 	public function prevent_maybe_process_form() {
 
-		if( ! empty( $_POST ) ) {
+		if ( ! empty( $_POST ) ) {
 			do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 		}
 
-		if( $this->is_edit_entry_submission() ) {
-			remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
-			remove_action( 'wp',  array( 'GFForms', 'maybe_process_form'), 9 );
+		if ( $this->is_edit_entry_submission() ) {
+			remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 );
+			remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 );
 		}
 	}
 
@@ -175,7 +175,7 @@ 
 	 */
 	public function is_edit_entry() {
 
-		$is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET['edit'] );
+		$is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET[ 'edit' ] );
 
 		return ( $is_edit_entry || $this->is_edit_entry_submission() );
 	}
@@ -186,7 +186,7 @@ 
 	 * @return boolean
 	 */
 	public function is_edit_entry_submission() {
-		return !empty( $_POST[ self::$nonce_field ] );
+		return ! empty( $_POST[ self::$nonce_field ] );
 	}
 
 	/**
@@ -197,15 +197,15 @@ 
 
 
 		$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 = $gravityview_view->getFormId();
 		$this->view_id = $gravityview_view->getViewId();
 
-		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' ] );
 	}
 
 
@@ -226,14 +226,14 @@ 
 
 		// Multiple Views embedded, don't proceed if nonce fails
 		$multiple_views = defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? gravityview()->views->count() > 1 : $gv_data->has_multiple_views();
-		if( $multiple_views && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
-			do_action('gravityview_log_error', __METHOD__ . ': Nonce validation failed for the Edit Entry request; returning' );
+		if ( $multiple_views && ! wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ) ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ': Nonce validation failed for the Edit Entry request; returning' );
 			return;
 		}
 
 		// Sorry, you're not allowed here.
-		if( false === $this->user_can_edit_entry( true ) ) {
-			do_action('gravityview_log_error', __METHOD__ . ': User is not allowed to edit this entry; returning', $this->entry );
+		if ( false === $this->user_can_edit_entry( true ) ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ': User is not allowed to edit this entry; returning', $this->entry );
 			return;
 		}
 
@@ -253,9 +253,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 );
 
 		// Sack is required for images
 		wp_print_scripts( array( 'sack', 'gform_gravityforms' ) );
@@ -267,32 +267,32 @@ 
 	 */
 	private function process_save() {
 
-		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 ) {
-			do_action('gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
+		if ( ! $valid ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
 			return;
 		}
 
-		if( $this->entry['id'] !== $_POST['lid'] ) {
-			do_action('gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
+		if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
 			return;
 		}
 
-		do_action('gravityview_log_debug', __METHOD__ . ': $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+		do_action( 'gravityview_log_debug', __METHOD__ . ': $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 
 		$this->process_save_process_files( $this->form_id );
 
 		$this->validate();
 
-		if( $this->is_valid ) {
+		if ( $this->is_valid ) {
 
-			do_action('gravityview_log_debug', __METHOD__ . ': Submission is valid.' );
+			do_action( 'gravityview_log_debug', __METHOD__ . ': Submission is valid.' );
 
 			/**
 			 * @hack This step is needed to unset the adminOnly from form fields, to add the calculation fields
@@ -302,22 +302,22 @@ 
 			/**
 			 * @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' ] );
 
 			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();
@@ -337,10 +337,10 @@ 
 			 * @param string $entry_id Numeric ID of the entry that was updated
 			 * @param GravityView_Edit_Entry_Render $this This object
 			 */
-			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this );
+			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this );
 
 		} else {
-			do_action('gravityview_log_error', __METHOD__ . ': Submission is NOT valid.', $this->entry );
+			do_action( 'gravityview_log_error', __METHOD__ . ': Submission is NOT valid.', $this->entry );
 		}
 
 	} // process_save
@@ -359,10 +359,10 @@ 
 
 		if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
 			$entry_meta_table = GFFormsModel::get_entry_meta_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value 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 id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) );
 		}
 
 		foreach ( $this->entry as $input_id => $field_value ) {
@@ -443,7 +443,7 @@ 
 		}
 
 		/** No file is being uploaded. */
-		if ( empty( $_FILES[ $input_name ]['name'] ) ) {
+		if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) {
 			/** So return the original upload */
 			return $entry[ $input_id ];
 		}
@@ -461,11 +461,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;
 	}
@@ -480,22 +480,22 @@ 
 		$form = $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' ];
 				}
 			}
 		}
@@ -509,21 +509,21 @@ 
 		$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( !empty( $this->fields_with_calculation ) ) {
+		if ( ! empty( $this->fields_with_calculation ) ) {
 			$update = true;
 			foreach ( $this->fields_with_calculation as $calc_field ) {
 				$inputs = $calc_field->get_entry_inputs();
 				if ( is_array( $inputs ) ) {
 					foreach ( $inputs as $input ) {
-						$input_name = 'input_' . str_replace( '.', '_', $input['id'] );
+						$input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] );
 						list( $prefix, $field_id, $input_id ) = rgexplode( '_', $input_name, 3 );
 
 						switch ( $input_id ) {
 							case 1:
 								/** Never void the labels. */
-								$value = $entry[ $input['id'] ];
+								$value = $entry[ $input[ 'id' ] ];
 								break;
 							case 2:
 								/** Always recalcualte the final price. */
@@ -531,25 +531,25 @@ 
 								break;
 							case 3:
 								/** Fetch the quantity form the request. */
-								$value = rgpost( $input_name, $entry[ $input['id'] ] );
+								$value = rgpost( $input_name, $entry[ $input[ 'id' ] ] );
 								break;
 						}
 
-						$entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, $value, $input_name, $entry['id'], $entry );
+						$entry[ strval( $input[ 'id' ] ) ] = RGFormsModel::prepare_value( $form, $calc_field, $value, $input_name, $entry[ 'id' ], $entry );
 					}
 				} else {
-					$input_name = 'input_' . str_replace( '.', '_', $calc_field->id);
-					$entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
+					$input_name = 'input_' . str_replace( '.', '_', $calc_field->id );
+					$entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry );
 				}
 			}
 
 		}
 
-		if( $update ) {
+		if ( $update ) {
 
 			$return_entry = GFAPI::update_entry( $entry );
 
-			if( is_wp_error( $return_entry ) ) {
+			if ( is_wp_error( $return_entry ) ) {
 				do_action( 'gravityview_log_error', 'Updating the entry calculation fields failed', $return_entry );
 			} else {
 				do_action( 'gravityview_log_debug', 'Updating the entry calculation fields succeeded' );
@@ -580,18 +580,18 @@ 
 
 		$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();
 			$img_url = rgar( $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,
@@ -600,7 +600,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;
 			}
 
 			/**
@@ -615,13 +615,13 @@ 
 				set_post_thumbnail( $post_id, $media_id );
 			}
 
-		} elseif ( !empty( $_POST[ $input_name ] ) && is_array( $value ) ) {
+		} elseif ( ! empty( $_POST[ $input_name ] ) && is_array( $value ) ) {
 
 			$img_url = $_POST[ $input_name ];
 
-			$img_title	   = rgar( $_POST, $input_name.'_1' );
-			$img_caption	 = rgar( $_POST, $input_name .'_4' );
-			$img_description = rgar( $_POST, $input_name .'_7' );
+			$img_title	   = rgar( $_POST, $input_name . '_1' );
+			$img_caption	 = rgar( $_POST, $input_name . '_4' );
+			$img_description = rgar( $_POST, $input_name . '_7' );
 
 			$value = ! empty( $img_url ) ? $img_url . "|:|" . $img_title . "|:|" . $img_caption . "|:|" . $img_description : '';
 
@@ -659,16 +659,16 @@ 
 	 */
 	private function maybe_update_post_fields( $form ) {
 
-		if( empty( $this->entry['post_id'] ) ) {
+		if ( empty( $this->entry[ 'post_id' ] ) ) {
 			do_action( 'gravityview_log_debug', __METHOD__ . ': 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 ) ) {
-			do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #'.$post_id );
+		if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
+			do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #' . $post_id );
 			return;
 		}
 
@@ -680,25 +680,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( rgar( $form, 'postTitleTemplateEnabled' ) ) {
-							$post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
+						if ( rgar( $form, 'postTitleTemplateEnabled' ) ) {
+							$post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp );
 						}
 						$updated_post->post_title = $post_title;
 						$updated_post->post_name  = $post_title;
@@ -707,8 +707,8 @@ 
 
 					case 'post_content':
 						$post_content = $value;
-						if( rgar( $form, 'postContentTemplateEnabled' ) ) {
-							$post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
+						if ( rgar( $form, 'postContentTemplateEnabled' ) ) {
+							$post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true );
 						}
 						$updated_post->post_content = $post_content;
 						unset( $post_content );
@@ -726,12 +726,12 @@ 
 							$value = $value[ $field_id ];
 						}
 
-						if( ! empty( $field->customFieldTemplateEnabled ) ) {
+						if ( ! empty( $field->customFieldTemplateEnabled ) ) {
 							$value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
 						}
 
 						if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) {
-							$value = function_exists('wp_json_encode') ? wp_json_encode( $value ) : json_encode( $value );
+							$value = function_exists( 'wp_json_encode' ) ? wp_json_encode( $value ) : json_encode( $value );
 						}
 
 						update_post_meta( $post_id, $field->postCustomFieldName, $value );
@@ -744,7 +744,7 @@ 
 				}
 
 				// update entry after
-				$this->entry["{$field_id}"] = $value;
+				$this->entry[ "{$field_id}" ] = $value;
 
 				$update_entry = true;
 
@@ -753,25 +753,25 @@ 
 
 		}
 
-		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 ) ) {
 			   do_action( 'gravityview_log_error', 'Updating the entry post fields failed', array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) );
 			} else {
-				do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded' );
+				do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #' . $post_id . ' succeeded' );
 			}
 
 		}
 
 		$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' );
 			do_action( 'gravityview_log_error', 'Updating the post content failed', compact( 'updated_post', 'return_post' ) );
 		} else {
-			do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded', $updated_post );
+			do_action( 'gravityview_log_debug', 'Updating the post content for post #' . $post_id . ' succeeded', $updated_post );
 		}
 	}
 
@@ -789,7 +789,7 @@ 
 		$input_type = RGFormsModel::get_input_type( $field );
 
 		// Only certain custom field types are supported
-		switch( $input_type ) {
+		switch ( $input_type ) {
 			case 'fileupload':
 			case 'list':
 			case 'multiselect':
@@ -826,7 +826,7 @@ 
 		$output = GFCommon::replace_variables( $output, $form, $entry, false, false, false );
 
 		// replace conditional shortcodes
-		if( $do_shortcode ) {
+		if ( $do_shortcode ) {
 			$output = do_shortcode( $output );
 		}
 
@@ -845,19 +845,19 @@ 
 	 */
 	private function after_update() {
 
-		do_action( 'gform_after_update_entry', $this->form, $this->entry['id'], self::$original_entry );
-		do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'], self::$original_entry );
+		do_action( 'gform_after_update_entry', $this->form, $this->entry[ 'id' ], self::$original_entry );
+		do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", $this->form, $this->entry[ 'id' ], self::$original_entry );
 
 		// Re-define the entry now that we've updated it.
-		$entry = RGFormsModel::get_lead( $this->entry['id'] );
+		$entry = RGFormsModel::get_lead( $this->entry[ 'id' ] );
 
 		$entry = GFFormsModel::set_entry_meta( $entry, $this->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 );
 			}
 		}
 
@@ -876,7 +876,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
@@ -892,7 +892,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>
@@ -938,20 +938,20 @@ 
 	 */
 	private function maybe_print_message() {
 
-		if( rgpost('action') === 'update' ) {
+		if ( rgpost( 'action' ) === 'update' ) {
 
 			$back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
 
-			if( ! $this->is_valid ){
+			if ( ! $this->is_valid ) {
 
 				// Keeping this compatible with Gravity Forms.
-				$validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>";
-				$message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form);
+				$validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>";
+				$message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form );
 
-				echo GVCommon::generate_notice( $message , 'gv-error' );
+				echo GVCommon::generate_notice( $message, 'gv-error' );
 
 			} else {
-				$entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. $back_link .'">', '</a>' );
+				$entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . $back_link . '">', '</a>' );
 
 				/**
 				 * @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link)
@@ -961,7 +961,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 );
 			}
@@ -985,21 +985,21 @@ 
 		 */
 		do_action( 'gravityview/edit-entry/render/before', $this );
 
-		add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 );
-		add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') );
+		add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 );
+		add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
 		add_filter( 'gform_disable_view_counter', '__return_true' );
 
 		add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 );
 		add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 );
 
 		// We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
-		unset( $_GET['page'] );
+		unset( $_GET[ 'page' ] );
 
 		// TODO: Verify multiple-page forms
 
 		ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic
 
-		$html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
+		$html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry );
 
 		ob_get_clean();
 
@@ -1025,7 +1025,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 );
 	}
 
 
@@ -1045,10 +1045,10 @@ 
 	public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) {
 
 		// In case we have validated the form, use it to inject the validation results into the form render
-		if( isset( $this->form_after_validation ) ) {
+		if ( isset( $this->form_after_validation ) ) {
 			$form = $this->form_after_validation;
 		} else {
-			$form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id );
+			$form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id );
 		}
 
 		$form = $this->filter_conditional_logic( $form );
@@ -1056,8 +1056,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' ] );
 		}
 
 		return $form;
@@ -1078,29 +1078,29 @@ 
 	 */
 	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 ) ) {
 
 			$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 ) );
 			}
 		}
 
@@ -1125,8 +1125,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 )
@@ -1146,7 +1146,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 );
@@ -1155,7 +1155,7 @@ 
 		// If there was output, it's an error
 		$warnings = ob_get_clean();
 
-		if( !empty( $warnings ) ) {
+		if ( ! empty( $warnings ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value );
 		}
 
@@ -1180,7 +1180,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();
 
@@ -1189,10 +1189,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;
 				}
 
@@ -1200,7 +1200,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 {
 
@@ -1211,13 +1211,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 = !gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
+			$field_value = ! 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 );
 			}
@@ -1245,7 +1245,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;
 	}
@@ -1262,12 +1262,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.
@@ -1275,7 +1275,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.
@@ -1289,37 +1289,37 @@ 
 					// 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' => '' );
 
 					}
 
-					if( rgar($field, "multipleFiles") ) {
+					if ( rgar( $field, "multipleFiles" ) ) {
 
 						// 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 {
@@ -1337,8 +1337,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;
 			}
@@ -1380,7 +1380,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;
@@ -1388,14 +1388,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 );
 		remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'user_registration_validation' ), 10 );
 	}
 
@@ -1412,7 +1412,7 @@ 
 		$user_registration = GF_User_Registration::get_instance();
 
 		$entry = $this->get_entry();
-		$form = $validation_results['form'];
+		$form = $validation_results[ 'form' ];
 
 		if ( ! $feed = $user_registration->get_single_submission_feed( $entry, $form ) ) {
 			return $validation_results;
@@ -1428,18 +1428,18 @@ 
 		if ( $user_email != $value && email_exists( $value ) ) {
 			$email_field->failed_validation = 1;
 			$email_field->validation_message = __( 'This email is already in use', 'gravityview' );
-			$validation_results['is_valid'] = false;
+			$validation_results[ 'is_valid' ] = false;
 		}
 
 		$value = RGFormsModel::get_field_value( $username_field );
 		if ( $username != $value ) {
 			$username_field->failed_validation = 1;
 			$username_field->validation_message = __( 'Usernames cannot be changed', 'gravityview' );
-			$validation_results['is_valid'] = false;
+			$validation_results[ 'is_valid' ] = false;
 		}
 
 		// 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;
 	}
@@ -1457,13 +1457,13 @@ 
 	 */
 	public function custom_validation( $validation_results ) {
 
-		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
+		do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
 
-		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+		do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 
 		$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 );
@@ -1476,35 +1476,35 @@ 
 				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( rgobj( $field, 'maxFiles') && rgobj( $field, 'multipleFiles') ) {
+					if ( rgobj( $field, 'maxFiles' ) && rgobj( $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 );
 						}
 
 						// count uploaded files and existent entry files
 						$count_files = count( $file_names ) + count( $value );
 
-						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;
 						}
 
 					}
@@ -1515,7 +1515,7 @@ 
 			}
 
 			// This field has failed validation.
-			if( !empty( $field->failed_validation ) ) {
+			if ( ! empty( $field->failed_validation ) ) {
 
 				do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) );
 
@@ -1533,32 +1533,32 @@ 
 				}
 
 				// 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;
 
 						unset( $field->validation_message );
 
-						do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
+						do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
 
 						continue;
 					}
 				}
 
 				// 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;
@@ -1570,12 +1570,12 @@ 
 
 		}
 
-		$validation_results['is_valid'] = $gv_valid;
+		$validation_results[ 'is_valid' ] = $gv_valid;
 
-		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results );
+		do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $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;
 	}
@@ -1588,7 +1588,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() );
 		}
@@ -1623,10 +1623,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 );
@@ -1658,7 +1658,7 @@ 
 	 */
 	private function filter_fields( $fields, $configured_fields ) {
 
-		if( empty( $fields ) || !is_array( $fields ) ) {
+		if ( empty( $fields ) || ! is_array( $fields ) ) {
 			return $fields;
 		}
 
@@ -1671,18 +1671,18 @@ 
 
 			// 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 ] );
 			}
 		}
 
 		// The Edit tab has not been configured, so we return all fields by default.
-		if( empty( $configured_fields ) ) {
+		if ( empty( $configured_fields ) ) {
 			return $fields;
 		}
 
@@ -1692,8 +1692,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;
 				}
 
@@ -1716,14 +1716,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' ] );
 		}
 
 		/**
@@ -1761,16 +1761,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 $fields;
 		}
 
-		foreach( $fields as &$field ) {
+		foreach ( $fields as &$field ) {
 			$field->adminOnly = false;
 		}
 
@@ -1794,22 +1794,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 = rgar( $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 {
@@ -1817,15 +1817,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;
 								}
 							}
 
@@ -1860,16 +1860,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;
 
@@ -1886,7 +1886,7 @@ 
 	 */
 	public function manage_conditional_logic( $has_conditional_logic, $form ) {
 
-		if( ! $this->is_edit_entry() ) {
+		if ( ! $this->is_edit_entry() ) {
 			return $has_conditional_logic;
 		}
 
@@ -1918,44 +1918,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 );
 
@@ -1963,13 +1963,13 @@ 
 			 * @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' );
 		}
 
-		do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
+		do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
 
 		return false;
 	}
@@ -1986,20 +1986,20 @@ 
 
 		$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' );
 		}
 
-		do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error );
+		do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error );
 
 		return false;
 
@@ -2017,15 +2017,15 @@ 
 	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 the field has custom editing capaibilities set, check those
-		if( $field_cap ) {
-			return GVCommon::has_cap( $field['allow_edit_cap'] );
+		if ( $field_cap ) {
+			return GVCommon::has_cap( $field[ 'allow_edit_cap' ] );
 		}
 
 		return false;
@@ -2039,17 +2039,17 @@ 
 	public function verify_nonce() {
 
 		// Verify form submitted for editing single
-		if( $this->is_edit_entry_submission() ) {
+		if ( $this->is_edit_entry_submission() ) {
 			$valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
 		}
 
 		// Verify
-		else if( ! $this->is_edit_entry() ) {
+		else if ( ! $this->is_edit_entry() ) {
 			$valid = false;
 		}
 
 		else {
-			$valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
+			$valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key );
 		}
 
 		/**

includes/class-gravityview-uninstall.php

Spacing +6 added lines, -6 removed lines

@@ -42,9 +42,9 @@ 
 		$tables = array();
 
 		if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
-			$tables []= GFFormsModel::get_entry_meta_table_name();
+			$tables [ ] = GFFormsModel::get_entry_meta_table_name();
 		}
-		$tables []= GFFormsModel::get_lead_meta_table_name();
+		$tables [ ] = GFFormsModel::get_lead_meta_table_name();
 
 		$suppress = $wpdb->suppress_errors();
 		foreach ( $tables as $meta_table ) {
@@ -70,12 +70,12 @@ 
 		$tables = array();
 
 		if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
-			$tables []= GFFormsModel::get_entry_notes_table_name();
+			$tables [ ] = GFFormsModel::get_entry_notes_table_name();
 		}
-		$tables []= GFFormsModel::get_lead_notes_table_name();
+		$tables [ ] = GFFormsModel::get_lead_notes_table_name();
 
-		$disapproved = __('Disapproved the Entry for GravityView', 'gravityview');
-		$approved = __('Approved the Entry for GravityView', 'gravityview');
+		$disapproved = __( 'Disapproved the Entry for GravityView', 'gravityview' );
+		$approved = __( 'Approved the Entry for GravityView', 'gravityview' );
 
 		$suppress = $wpdb->suppress_errors();
 		foreach ( $tables as $notes_table ) {

future/includes/class-gv-form-gravityforms.php

Spacing +5 added lines, -5 removed lines

@@ -55,7 +55,7 @@ 
 		$self = new self();
 		$self->form = $form;
 
-		$self->ID = $self->form['id'];
+		$self->ID = $self->form[ 'id' ];
 
 		return $self;
 	}
@@ -98,11 +98,11 @@ 
 
 			/** The offset and limit */
 			if ( ! empty( $offset->limit ) ) {
-				$paging['page_size'] = $offset->limit;
+				$paging[ 'page_size' ] = $offset->limit;
 			}
 
 			if ( ! empty( $offset->offset ) ) {
-				$paging['offset'] = $offset->offset;
+				$paging[ 'offset' ] = $offset->offset;
 			}
 
 			foreach ( \GFAPI::get_entries( $form->ID, $search_criteria, $sorting, $paging ) as $entry ) {
@@ -138,7 +138,7 @@ 
 	 * @return bool Whether the offset exists or not.
 	 */
 	public function offsetExists( $offset ) {
-		return isset( $this->form[$offset] );
+		return isset( $this->form[ $offset ] );
 	}
 
 	/**
@@ -153,7 +153,7 @@ 
 	 * @return mixed The value of the requested form data.
 	 */
 	public function offsetGet( $offset ) {
-		return $this->form[$offset];
+		return $this->form[ $offset ];
 	}
 
 	/**

includes/admin/metaboxes/views/data-source.php

Spacing +7 added lines, -7 removed lines

@@ -10,10 +10,10 @@ 
 wp_nonce_field( 'gravityview_select_form', 'gravityview_select_form_nonce' );
 
 //current value
-$current_form = (int) rgar( (array) $_GET, 'form_id', gravityview_get_form_id( $post->ID ) );
+$current_form = (int)rgar( (array)$_GET, 'form_id', gravityview_get_form_id( $post->ID ) );
 
 // check for available gravity forms
-$forms = gravityview_get_forms('any');
+$forms = gravityview_get_forms( 'any' );
 
 /**
  * @param int $current_form Form currently selected in the View (0 if none selected)
@@ -32,24 +32,24 @@ 
 		?>
 		<a class="button button-primary" href="#gv_start_fresh" title="<?php esc_attr_e( 'Use a Form Preset', 'gravityview' ); ?>"><?php esc_html_e( 'Use a Form Preset', 'gravityview' ); ?></a>
 
-		<?php if( !empty( $forms ) ) { ?>
+		<?php if ( ! empty( $forms ) ) { ?>
 			<span>&nbsp;<?php esc_html_e( 'or use an existing form', 'gravityview' ); ?>&nbsp;</span>
 		<?php }
 	}
 
 	// If there are no forms to select, show no forms.
-	if( !empty( $forms ) ) { ?>
+	if ( ! empty( $forms ) ) { ?>
 		<select name="gravityview_form_id" id="gravityview_form_id">
 			<option value="" <?php selected( '', $current_form, true ); ?>>&mdash; <?php esc_html_e( 'list of forms', 'gravityview' ); ?> &mdash;</option>
-			<?php foreach( $forms as $form ) { ?>
-				<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
+			<?php foreach ( $forms as $form ) { ?>
+				<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
 			<?php } ?>
 		</select>
 	<?php } else { ?>
 		<select name="gravityview_form_id" id="gravityview_form_id" class="hidden"><option selected="selected" value=""></option></select>
 	<?php } ?>
 
-	&nbsp;<a class="button button-primary" <?php if( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" href="#gv_switch_view" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></a>
+	&nbsp;<a class="button button-primary" <?php if ( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" href="#gv_switch_view" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></a>
 </p>
 
 <?php // confirm dialog box ?>

includes/class-oembed.php

Spacing +40 added lines, -40 removed lines

@@ -35,7 +35,7 @@ 
 		add_action( 'init', array( $this, 'register_handler' ) );
 		add_action( 'init', array( $this, 'add_provider' ) );
 
-		if ( ! empty( $_GET['gv_oembed_provider'] ) && ! empty( $_GET['url'] ) ) {
+		if ( ! empty( $_GET[ 'gv_oembed_provider' ] ) && ! empty( $_GET[ 'url' ] ) ) {
 			add_action( 'template_redirect', array( $this, 'render_provider_request' ) );
 		}
 	}
@@ -46,7 +46,7 @@ 
 	 */
 	static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 
 			self::$instance->initialize();
@@ -90,8 +90,8 @@ 
 	 * @return void
 	 */
 	function render_provider_request() {
-		if ( ! empty( $_GET['url'] ) ) {
-			$url = $_GET['url'];
+		if ( ! empty( $_GET[ 'url' ] ) ) {
+			$url = $_GET[ 'url' ];
 		} else {
 			header( 'HTTP/1.0 404 Not Found' );
 			exit;
@@ -100,16 +100,16 @@ 
 		preg_match( $this->get_handler_regex(), $url, $matches );
 
 		// If not using permalinks, re-assign values for matching groups
-		if ( ! empty( $matches['entry_slug2'] ) ) {
-			$matches['is_cpt'] = $matches['is_cpt2'];
-			$matches['slug'] = $matches['slug2'];
-			$matches['entry_slug'] = $matches['entry_slug2'];
-			unset( $matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2'] );
+		if ( ! empty( $matches[ 'entry_slug2' ] ) ) {
+			$matches[ 'is_cpt' ] = $matches[ 'is_cpt2' ];
+			$matches[ 'slug' ] = $matches[ 'slug2' ];
+			$matches[ 'entry_slug' ] = $matches[ 'entry_slug2' ];
+			unset( $matches[ 'is_cpt2' ], $matches[ 'slug2' ], $matches[ 'entry_slug2' ] );
 		}
 
 		// No Entry was found
-		if ( empty( $matches['entry_slug'] ) ) {
-			do_action('gravityview_log_error', 'GravityView_oEmbed[render_handler] $entry_slug not parsed by regex.', $matches );
+		if ( empty( $matches[ 'entry_slug' ] ) ) {
+			do_action( 'gravityview_log_error', 'GravityView_oEmbed[render_handler] $entry_slug not parsed by regex.', $matches );
 			header( 'HTTP/1.0 404 Not Found' );
 			exit;
 		}
@@ -162,7 +162,7 @@ 
 		// Catch either
 		$match_regex = "(?:{$using_permalinks}|{$not_using_permalinks})";
 
-		return '#'.$match_regex.'#i';
+		return '#' . $match_regex . '#i';
 	}
 
 	/**
@@ -183,18 +183,18 @@ 
 
 		$page_on_front = get_option( 'page_on_front' );
 
-		if( (int) $post_id === (int) $page_on_front || empty( $post_id ) ) {
+		if ( (int)$post_id === (int)$page_on_front || empty( $post_id ) ) {
 
 			$args = array(
 				'post_status' => 'publish',
 				'name' => $slug,
-				'post_type' => array('any', 'gravityview'),
+				'post_type' => array( 'any', 'gravityview' ),
 			);
 
 			$posts = get_posts( $args );
 
-			if( !empty( $posts ) ) {
-				$post_id = $posts[0]->ID;
+			if ( ! empty( $posts ) ) {
+				$post_id = $posts[ 0 ]->ID;
 			}
 		}
 
@@ -227,17 +227,17 @@ 
 	public function render_handler( $matches, $attr, $url, $rawattr ) {
 
 		// If not using permalinks, re-assign values for matching groups
-		if( !empty( $matches['entry_slug2'] ) ) {
-			$matches['is_cpt'] = $matches['is_cpt2'];
-			$matches['slug'] = $matches['slug2'];
-			$matches['entry_slug'] = $matches['entry_slug2'];
-			unset( $matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2'] );
+		if ( ! empty( $matches[ 'entry_slug2' ] ) ) {
+			$matches[ 'is_cpt' ] = $matches[ 'is_cpt2' ];
+			$matches[ 'slug' ] = $matches[ 'slug2' ];
+			$matches[ 'entry_slug' ] = $matches[ 'entry_slug2' ];
+			unset( $matches[ 'is_cpt2' ], $matches[ 'slug2' ], $matches[ 'entry_slug2' ] );
 		}
 
 		// No Entry was found
-		if( empty( $matches['entry_slug'] ) ) {
+		if ( empty( $matches[ 'entry_slug' ] ) ) {
 
-			do_action('gravityview_log_error', 'GravityView_oEmbed[render_handler] $entry_slug not parsed by regex.', $matches );
+			do_action( 'gravityview_log_error', 'GravityView_oEmbed[render_handler] $entry_slug not parsed by regex.', $matches );
 
 			return '';
 		}
@@ -247,11 +247,11 @@ 
 		// Setup the data used
 		$this->set_vars( $matches, $attr, $url, $rawattr );
 
-		if( is_admin() && !$this->is_full_oembed_preview ) {
+		if ( is_admin() && ! $this->is_full_oembed_preview ) {
 			$return = $this->render_admin( $matches, $attr, $url, $rawattr );
 		} else {
 
-			if( $this->is_full_oembed_preview ) {
+			if ( $this->is_full_oembed_preview ) {
 				$return .= $this->generate_preview_notice();
 			}
 
@@ -270,8 +270,8 @@ 
 	private function generate_preview_notice() {
 		$floaty = GravityView_Admin::get_floaty();
 		$title = esc_html__( 'This will look better when it is embedded.', 'gravityview' );
-		$message = esc_html__('Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview');
-		return '<div class="updated notice">'. $floaty. '<h3>'.$title.'</h3><p>'.$message.'</p><br style="clear:both;" /></div>';
+		$message = esc_html__( 'Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview' );
+		return '<div class="updated notice">' . $floaty . '<h3>' . $title . '</h3><p>' . $message . '</p><br style="clear:both;" /></div>';
 	}
 
 	/**
@@ -284,14 +284,14 @@ 
 	 */
 	private function set_vars( $matches, $attr, $url, $rawattr ) {
 
-		$this->entry_id = $matches['entry_slug'];
+		$this->entry_id = $matches[ 'entry_slug' ];
 
-		$post_id = $this->get_postid_from_url_and_slug( $url, $matches['slug'] );
+		$post_id = $this->get_postid_from_url_and_slug( $url, $matches[ 'slug' ] );
 
 		// The URL didn't have the View Custom Post Type structure.
-		if( empty( $matches['is_cpt'] ) || $matches['is_cpt'] !== 'gravityview' ) {
+		if ( empty( $matches[ 'is_cpt' ] ) || $matches[ 'is_cpt' ] !== 'gravityview' ) {
 
-			do_action('gravityview_log_debug', 'GravityView_oEmbed[render_handler] Embedding an entry inside a post or page', $matches );
+			do_action( 'gravityview_log_debug', 'GravityView_oEmbed[render_handler] Embedding an entry inside a post or page', $matches );
 
 			if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && $post = get_post( $post_id ) ) {
 				$views = \GV\View_Collection::from_post( $post );
@@ -304,7 +304,7 @@ 
 						}
 					}
 
-					$this->view_id = $views[0]->ID;
+					$this->view_id = $views[ 0 ]->ID;
 				}
 			} else {
 				/** Deprecated. */
@@ -318,7 +318,7 @@ 
 		}
 
 		// The inline content has $_POST['type'] set to "embed", while the "Add Media" modal doesn't set that.
-		$this->is_full_oembed_preview = ( isset( $_POST['action'] ) && $_POST['action'] === 'parse-embed' && !isset( $_POST['type'] ) );
+		$this->is_full_oembed_preview = ( isset( $_POST[ 'action' ] ) && $_POST[ 'action' ] === 'parse-embed' && ! isset( $_POST[ 'type' ] ) );
 	}
 
 	/**
@@ -336,15 +336,15 @@ 
 		// Floaty the astronaut
 		$image = GravityView_Admin::get_floaty();
 
-		$embed_heading = sprintf( esc_html__('Embed Entry %d', 'gravityview'), $this->entry_id );
+		$embed_heading = sprintf( esc_html__( 'Embed Entry %d', 'gravityview' ), $this->entry_id );
 
-		$embed_text = sprintf( esc_html__('This entry will be displayed as it is configured in View %d', 'gravityview'), $this->view_id );
+		$embed_text = sprintf( esc_html__( 'This entry will be displayed as it is configured in View %d', 'gravityview' ), $this->view_id );
 
 		return '
 		<div class="loading-placeholder" style="background-color:#e6f0f5;">
-			<h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image.$embed_heading.'</h3>
+			<h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image . $embed_heading . '</h3>
 			<p style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">
-				'.$embed_text.'
+				'.$embed_text . '
 			</p>
 			<br style="clear: both;">
 		</div>';
@@ -399,14 +399,14 @@ 
 	private function render_frontend( $matches, $attr, $url, $rawattr ) {
 
 		// If it's already been parsed, don't re-output it.
-		if( !empty( $this->output[ $this->entry_id ] ) ) {
+		if ( ! empty( $this->output[ $this->entry_id ] ) ) {
 			return $this->output[ $this->entry_id ];
 		}
 
 		$entry_output = $this->generate_entry_output();
 
 		// Wrap a container div around the output to allow for custom styling
-		$output = sprintf('<div class="gravityview-oembed gravityview-oembed-entry gravityview-oembed-entry-'.$this->entry_id.'">%s</div>', $entry_output );
+		$output = sprintf( '<div class="gravityview-oembed gravityview-oembed-entry gravityview-oembed-entry-' . $this->entry_id . '">%s</div>', $entry_output );
 
 		/**
 		 * @filter `gravityview/oembed/entry` Filter the output of the oEmbed entry embed
@@ -419,7 +419,7 @@ 
 		 *  @var string $url The original URL that was matched by the regex. \n
 		 *  @var array $rawattr The original unmodified attributes.
 		 */
-		$output = apply_filters('gravityview/oembed/entry', $output, $this, compact( $entry_output, $matches, $attr, $url, $rawattr ) );
+		$output = apply_filters( 'gravityview/oembed/entry', $output, $this, compact( $entry_output, $matches, $attr, $url, $rawattr ) );
 
 		unset( $entry_output );
 

includes/class-common.php

Spacing +113 added lines, -113 removed lines

@@ -126,8 +126,8 @@ 
 
 		$form = false;
 
-		if( $entry ) {
-			$form = GFAPI::get_form( $entry['form_id'] );
+		if ( $entry ) {
+			$form = GFAPI::get_form( $entry[ 'form_id' ] );
 		}
 
 		return $form;
@@ -193,12 +193,12 @@ 
 
 			$has_transaction_data = rgar( $entry, $meta, false );
 
-			if( ! empty( $has_transaction_data ) ) {
+			if ( ! empty( $has_transaction_data ) ) {
 				break;
 			}
 		}
 
-		return (bool) $has_transaction_data;
+		return (bool)$has_transaction_data;
 	}
 
 	/**
@@ -236,7 +236,7 @@ 
 
 		$results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging );
 
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
+		$result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null;
 
 		return $result;
 	}
@@ -253,10 +253,10 @@ 
 	 *
 	 * @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms
 	 */
-	public static function get_forms(  $active = true, $trash = false ) {
+	public static function get_forms( $active = true, $trash = false ) {
 		$forms = array();
 		if ( class_exists( 'GFAPI' ) ) {
-			if( 'any' === $active ) {
+			if ( 'any' === $active ) {
 				$active_forms = GFAPI::get_forms( true, $trash );
 				$inactive_forms = GFAPI::get_forms( false, $trash );
 				$forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) );
@@ -287,9 +287,9 @@ 
 		$has_post_fields = false;
 
 		if ( $form ) {
-			foreach ( $form['fields'] as $field ) {
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
-					$fields["{$field['id']}"] = array(
+			foreach ( $form[ 'fields' ] as $field ) {
+				if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) {
+					$fields[ "{$field[ 'id' ]}" ] = array(
 						'label' => rgar( $field, 'label' ),
 						'parent' => null,
 						'type' => rgar( $field, 'type' ),
@@ -298,10 +298,10 @@ 
 					);
 				}
 
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
-					foreach ( $field['inputs'] as $input ) {
+				if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) {
+					foreach ( $field[ 'inputs' ] as $input ) {
 
-						if( ! empty( $input['isHidden'] ) ) {
+						if ( ! empty( $input[ 'isHidden' ] ) ) {
 							continue;
 						}
 
@@ -309,10 +309,10 @@ 
                          * @hack
                          * In case of email/email confirmation, the input for email has the same id as the parent field
                          */
-						if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
+						if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) {
                             continue;
                         }
-						$fields["{$input['id']}"] = array(
+						$fields[ "{$input[ 'id' ]}" ] = array(
 							'label' => rgar( $input, 'label' ),
 							'customLabel' => rgar( $input, 'customLabel' ),
 							'parent' => $field,
@@ -324,7 +324,7 @@ 
 				}
 
 
-				if( GFCommon::is_product_field( $field['type'] ) ){
+				if ( GFCommon::is_product_field( $field[ 'type' ] ) ) {
 					$has_product_fields = true;
 				}
 
@@ -338,7 +338,7 @@ 
 		 * @since 1.7
 		 */
 		if ( $has_post_fields ) {
-			$fields['post_id'] = array(
+			$fields[ 'post_id' ] = array(
 				'label' => __( 'Post ID', 'gravityview' ),
 				'type' => 'post_id',
 			);
@@ -351,11 +351,11 @@ 
 			foreach ( $payment_fields as $payment_field ) {
 
 				// Either the field exists ($fields['shipping']) or the form explicitly contains a `shipping` field with numeric key
-				if( isset( $fields["{$payment_field->name}"] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
+				if ( isset( $fields[ "{$payment_field->name}" ] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
 					continue;
 				}
 
-				$fields["{$payment_field->name}"] = array(
+				$fields[ "{$payment_field->name}" ] = array(
 					'label' => $payment_field->label,
 					'desc' => $payment_field->description,
 					'type' => $payment_field->name,
@@ -387,9 +387,9 @@ 
 
 		$fields = array();
 
-		foreach ( $extra_fields as $key => $field ){
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
+		foreach ( $extra_fields as $key => $field ) {
+			if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) {
+				$fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' );
 			}
 		}
 
@@ -429,32 +429,32 @@ 
 			'search_criteria' => null,
 			'sorting' => null,
 			'paging' => null,
-			'cache' => (isset( $passed_criteria['cache'] ) ? (bool) $passed_criteria['cache'] : true),
+			'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? (bool)$passed_criteria[ 'cache' ] : true ),
 		);
 
 		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
 
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) ) {
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
+		if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+			foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) {
 
 				if ( ! is_array( $filter ) ) {
 					continue;
 				}
 
 				// By default, we want searches to be wildcard for each field.
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
+				$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
 
 				/**
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
 				 * @param string $operator Existing search operator
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
 				 */
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
+				$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter );
 			}
 
 			// don't send just the [mode] without any field filter.
-			if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) {
-				unset( $criteria['search_criteria']['field_filters']['mode'] );
+			if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+				unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] );
 			}
 
 		}
@@ -465,21 +465,21 @@ 
 		 * Prepare date formats to be in Gravity Forms DB format;
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
 		 */
-		foreach ( array('start_date', 'end_date' ) as $key ) {
+		foreach ( array( 'start_date', 'end_date' ) as $key ) {
 
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
+			if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) {
 
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
-				$date = date_create( $criteria['search_criteria'][ $key ] );
+				$date = date_create( $criteria[ 'search_criteria' ][ $key ] );
 
 				if ( $date ) {
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
+					$criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' );
 				} else {
-					do_action( 'gravityview_log_error', '[filter_get_entries_criteria] '.$key.' Date format not valid:', $criteria['search_criteria'][ $key ] );
+					do_action( 'gravityview_log_error', '[filter_get_entries_criteria] ' . $key . ' Date format not valid:', $criteria[ 'search_criteria' ][ $key ] );
 
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
-					unset( $criteria['search_criteria'][ $key ] );
+					unset( $criteria[ 'search_criteria' ][ $key ] );
 				}
 			}
 		}
@@ -498,14 +498,14 @@ 
 
 		// Calculate the context view id and send it to the advanced filter
 		if ( GravityView_frontend::getInstance()->getSingleEntry() ) {
-			$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
+			$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
 		} elseif ( $multiple_original ) {
-			$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
+			$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
 		} elseif ( 'delete' === GFForms::get( 'action' ) ) {
-			$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null;
-		} elseif( !isset( $criteria['context_view_id'] ) ) {
+			$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null;
+		} elseif ( ! isset( $criteria[ 'context_view_id' ] ) ) {
             // Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget)
-			$criteria['context_view_id'] = null;
+			$criteria[ 'context_view_id' ] = null;
 		}
 
 		/**
@@ -514,7 +514,7 @@ 
 		 * @param array $form_ids Forms to search
 		 * @param int $view_id ID of the view being used to search
 		 */
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
+		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] );
 
 		return (array)$criteria;
 	}
@@ -544,7 +544,7 @@ 
 		/** Reduce # of database calls */
 		add_filter( 'gform_is_encrypted_field', '__return_false' );
 
-		if ( ! empty( $criteria['cache'] ) ) {
+		if ( ! empty( $criteria[ 'cache' ] ) ) {
 
 			$Cache = new GravityView_Cache( $form_ids, $criteria );
 
@@ -552,7 +552,7 @@ 
 
 				// Still update the total count when using cached results
 				if ( ! is_null( $total ) ) {
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
+					$total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] );
 				}
 
 				$return = $entries;
@@ -573,9 +573,9 @@ 
 			$entries = apply_filters( 'gravityview_before_get_entries', null, $criteria, $passed_criteria, $total );
 
 			// No entries returned from gravityview_before_get_entries
-			if( is_null( $entries ) ) {
+			if ( is_null( $entries ) ) {
 
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
+				$entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total );
 
 				if ( is_wp_error( $entries ) ) {
 					do_action( 'gravityview_log_error', $entries->get_error_message(), $entries );
@@ -586,7 +586,7 @@ 
 				}
 			}
 
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
 
 				// Cache results
 				$Cache->set( $entries, 'entries' );
@@ -691,12 +691,12 @@ 
 			 */
 			$check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry );
 
-			if( $check_entry_display ) {
+			if ( $check_entry_display ) {
 				// Is the entry allowed
 				$entry = self::check_entry_display( $entry );
 			}
 
-			if( is_wp_error( $entry ) ) {
+			if ( is_wp_error( $entry ) ) {
 				do_action( 'gravityview_log_error', __METHOD__ . ': ' . $entry->get_error_message() );
 				return false;
 			}
@@ -727,7 +727,7 @@ 
 	 */
 	public static function matches_operation( $val1, $val2, $operation ) {
 
-		$json_function = function_exists('wp_json_encode') ? 'wp_json_encode' : 'json_encode';
+		$json_function = function_exists( 'wp_json_encode' ) ? 'wp_json_encode' : 'json_encode';
 
 		// Only process strings
 		$val1 = ! is_string( $val1 ) ? $json_function( $val1 ) : $val1;
@@ -735,12 +735,12 @@ 
 
 		$value = false;
 
-		if( 'context' === $val1 ) {
+		if ( 'context' === $val1 ) {
 
 			$matching_contexts = array( $val2 );
 
 			// We allow for non-standard contexts.
-			switch( $val2 ) {
+			switch ( $val2 ) {
 				// Check for either single or edit
 				case 'singular':
 					$matching_contexts = array( 'single', 'edit' );
@@ -783,7 +783,7 @@ 
 				$json_val_1 = json_decode( $val1, true );
 				$json_val_2 = json_decode( $val2, true );
 
-				if( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
+				if ( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
 
 					$json_in = false;
 					$json_val_1 = $json_val_1 ? $json_val_1 : array( $val1 );
@@ -794,7 +794,7 @@ 
 						foreach ( $json_val_2 as $item_2 ) {
 							$json_in = self::matches_operation( $item_1, $item_2, 'is' );
 
-							if( $json_in ) {
+							if ( $json_in ) {
 								break 2;
 							}
 						}
@@ -861,76 +861,76 @@ 
 	public static function check_entry_display( $entry ) {
 
 		if ( ! $entry || is_wp_error( $entry ) ) {
-			return new WP_Error('entry_not_found', 'Entry was not found.', $entry );
+			return new WP_Error( 'entry_not_found', 'Entry was not found.', $entry );
 		}
 
-		if ( empty( $entry['form_id'] ) ) {
+		if ( empty( $entry[ 'form_id' ] ) ) {
 			return new WP_Error( 'form_id_not_set', '[apply_filters_to_entry] Entry is empty!', $entry );
 		}
 
 		$criteria = self::calculate_get_entries_criteria();
 
-		if ( empty( $criteria['search_criteria'] ) || ! is_array( $criteria['search_criteria'] ) ) {
+		if ( empty( $criteria[ 'search_criteria' ] ) || ! is_array( $criteria[ 'search_criteria' ] ) ) {
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No search criteria found:', $criteria );
 			return $entry;
 		}
 
 		// Make sure the current View is connected to the same form as the Entry
-		if( ! empty( $criteria['context_view_id'] ) ) {
-			$context_view_id = intval( $criteria['context_view_id'] );
+		if ( ! empty( $criteria[ 'context_view_id' ] ) ) {
+			$context_view_id = intval( $criteria[ 'context_view_id' ] );
 			$context_form_id = gravityview_get_form_id( $context_view_id );
-			if( intval( $context_form_id ) !== intval( $entry['form_id'] ) ) {
-				return new WP_Error( 'view_id_not_match', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry['form_id'] ), $criteria['context_view_id'] );
+			if ( intval( $context_form_id ) !== intval( $entry[ 'form_id' ] ) ) {
+				return new WP_Error( 'view_id_not_match', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry[ 'form_id' ] ), $criteria[ 'context_view_id' ] );
 			}
 		}
 
-		$search_criteria = $criteria['search_criteria'];
+		$search_criteria = $criteria[ 'search_criteria' ];
 
 		// check entry status
-		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria['status'] != $entry['status'] ) {
-			return new WP_Error( 'status_not_valid', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status'] ), $search_criteria );
+		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria[ 'status' ] != $entry[ 'status' ] ) {
+			return new WP_Error( 'status_not_valid', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry[ 'status' ] ), $search_criteria );
 		}
 
 		// check entry date
 		// @todo: Does it make sense to apply the Date create filters to the single entry?
 
 		// field_filters
-		if ( empty( $search_criteria['field_filters'] ) || ! is_array( $search_criteria['field_filters'] ) ) {
+		if ( empty( $search_criteria[ 'field_filters' ] ) || ! is_array( $search_criteria[ 'field_filters' ] ) ) {
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No field filters criteria found:', $search_criteria );
 			return $entry;
 		}
 
-		$filters = $search_criteria['field_filters'];
+		$filters = $search_criteria[ 'field_filters' ];
 
-		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters['mode'] ) : 'all';
+		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters[ 'mode' ] ) : 'all';
 
 		// Prevent the mode from being processed below
-		unset( $filters['mode'] );
+		unset( $filters[ 'mode' ] );
 
-		$form = self::get_form( $entry['form_id'] );
+		$form = self::get_form( $entry[ 'form_id' ] );
 
 		foreach ( $filters as $filter ) {
 
-			if ( ! isset( $filter['key'] ) ) {
+			if ( ! isset( $filter[ 'key' ] ) ) {
 				do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Filter key not set', $filter );
 				continue;
 			}
 
-			$k = $filter['key'];
+			$k = $filter[ 'key' ];
 
 			$field = self::get_field( $form, $k );
 
 			if ( is_null( $field ) ) {
 				$field_value = isset( $entry[ $k ] ) ? $entry[ $k ] : null;
 			} else {
-				$field_value  = GFFormsModel::get_lead_field_value( $entry, $field );
+				$field_value = GFFormsModel::get_lead_field_value( $entry, $field );
 				 // If it's a complex field, then fetch the input's value, if exists at the current key. Otherwise, let GF handle it
 				$field_value = ( is_array( $field_value ) && isset( $field_value[ $k ] ) ) ? rgar( $field_value, $k ) : $field_value;
 			}
 
-			$operator = isset( $filter['operator'] ) ? strtolower( $filter['operator'] ) : 'is';
+			$operator = isset( $filter[ 'operator' ] ) ? strtolower( $filter[ 'operator' ] ) : 'is';
 
-			$is_value_match = GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field );
+			$is_value_match = GFFormsModel::is_value_match( $field_value, $filter[ 'value' ], $operator, $field );
 
 			// Any match is all we need to know
 			if ( $is_value_match && 'any' === $mode ) {
@@ -939,7 +939,7 @@ 
 
 			// Any failed match is a total fail
 			if ( ! $is_value_match && 'all' === $mode ) {
-				return new WP_Error('failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a criterium for ALL mode', $filter );
+				return new WP_Error( 'failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a criterium for ALL mode', $filter );
 			}
 		}
 
@@ -949,7 +949,7 @@ 
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved: all conditions were met' );
 			return $entry;
 		} else {
-			return new WP_Error('failed_any_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters );
+			return new WP_Error( 'failed_any_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters );
 		}
 
 	}
@@ -990,18 +990,18 @@ 
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
 		 * @see GFCommon::format_date() for original code
 		 */
-		$date_gmt_time   = mysql2date( 'G', $date_string );
+		$date_gmt_time = mysql2date( 'G', $date_string );
 		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
 
-		$format  = rgar( $atts, 'format' );
-		$is_human  = ! empty( $atts['human'] );
-		$is_diff  = ! empty( $atts['diff'] );
-		$is_raw = ! empty( $atts['raw'] );
-		$is_timestamp = ! empty( $atts['timestamp'] );
-		$include_time = ! empty( $atts['time'] );
+		$format = rgar( $atts, 'format' );
+		$is_human = ! empty( $atts[ 'human' ] );
+		$is_diff = ! empty( $atts[ 'diff' ] );
+		$is_raw = ! empty( $atts[ 'raw' ] );
+		$is_timestamp = ! empty( $atts[ 'timestamp' ] );
+		$include_time = ! empty( $atts[ 'time' ] );
 
 		// If we're using time diff, we want to have a different default format
-		if( empty( $format ) ) {
+		if ( empty( $format ) ) {
 			/* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */
 			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
 		}
@@ -1009,7 +1009,7 @@ 
 		// If raw was specified, don't modify the stored value
 		if ( $is_raw ) {
 			$formatted_date = $date_string;
-		} elseif( $is_timestamp ) {
+		} elseif ( $is_timestamp ) {
 			$formatted_date = $date_local_timestamp;
 		} elseif ( $is_diff ) {
 			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
@@ -1043,7 +1043,7 @@ 
 
 		$label = rgar( $field, 'label' );
 
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
 			$label = GFFormsModel::get_choice_text( $field, $field_value, $field_id );
 		}
 
@@ -1071,7 +1071,7 @@ 
 			$form = GFAPI::get_form( $form );
 		}
 
-		if ( class_exists( 'GFFormsModel' ) ){
+		if ( class_exists( 'GFFormsModel' ) ) {
 			return GFFormsModel::get_field( $form, $field_id );
 		} else {
 			return null;
@@ -1118,19 +1118,19 @@ 
 			$shortcodes = array();
 
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
-			if ( empty( $matches ) ){
+			if ( empty( $matches ) ) {
 				return false;
 			}
 
 			foreach ( $matches as $shortcode ) {
-				if ( $tag === $shortcode[2] ) {
+				if ( $tag === $shortcode[ 2 ] ) {
 
 					// Changed this to $shortcode instead of true so we get the parsed atts.
-					$shortcodes[] = $shortcode;
+					$shortcodes[ ] = $shortcode;
 
-				} else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) {
-					foreach( $results as $result ) {
-						$shortcodes[] = $result;
+				} else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
+					foreach ( $results as $result ) {
+						$shortcodes[ ] = $result;
 					}
 				}
 			}
@@ -1274,7 +1274,7 @@ 
 	public static function get_directory_fields( $post_id, $apply_filter = true ) {
 		$fields = get_post_meta( $post_id, '_gravityview_directory_fields', true );
 
-		if( $apply_filter ) {
+		if ( $apply_filter ) {
 			/**
 			 * @filter `gravityview/configuration/fields` Filter the View fields' configuration array
 			 * @since 1.6.5
@@ -1297,7 +1297,7 @@ 
 	 * @return string         html
 	 */
 	public static function get_sortable_fields( $formid, $current = '' ) {
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>';
+		$output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default', 'gravityview' ) . '</option>';
 
 		if ( empty( $formid ) ) {
 			return $output;
@@ -1310,11 +1310,11 @@ 
 			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null );
 
 			foreach ( $fields as $id => $field ) {
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 					continue;
 				}
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>';
 			}
 		}
 
@@ -1349,9 +1349,9 @@ 
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
 
 		// TODO: Convert to using array_filter
-		foreach( $fields as $id => $field ) {
+		foreach ( $fields as $id => $field ) {
 
-			if( in_array( $field['type'], $blacklist_field_types ) ) {
+			if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 				unset( $fields[ $id ] );
 			}
 		}
@@ -1392,14 +1392,14 @@ 
 	 * @param  int|array  $field field key or field array
 	 * @return boolean
 	 */
-	public static function is_field_numeric(  $form = null, $field = '' ) {
+	public static function is_field_numeric( $form = null, $field = '' ) {
 
 		if ( ! is_array( $form ) && ! is_array( $field ) ) {
 			$form = self::get_form( $form );
 		}
 
 		// If entry meta, it's a string. Otherwise, numeric
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
+		if ( ! is_numeric( $field ) && is_string( $field ) ) {
 			$type = $field;
 		} else {
 			$type = self::get_field_type( $form, $field );
@@ -1413,9 +1413,9 @@ 
 		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
 
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
-			if( true === $gv_field->is_numeric ) {
-				$numeric_types[] = $gv_field->is_numeric;
+		if ( $gv_field = GravityView_Fields::get( $type ) ) {
+			if ( true === $gv_field->is_numeric ) {
+				$numeric_types[ ] = $gv_field->is_numeric;
 			}
 		}
 
@@ -1565,18 +1565,18 @@ 
 		$final_atts = array_filter( $final_atts );
 
 		// If the href wasn't passed as an attribute, use the value passed to the function
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
-			$final_atts['href'] = $href;
+		if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) {
+			$final_atts[ 'href' ] = $href;
 		}
 
-		$final_atts['href'] = esc_url_raw( $href );
+		$final_atts[ 'href' ] = esc_url_raw( $href );
 
 		/**
 		 * Fix potential security issue with target=_blank
 		 * @see https://dev.to/ben/the-targetblank-vulnerability-by-example
 		 */
-		if( '_blank' === rgar( $final_atts, 'target' ) ) {
-			$final_atts['rel'] = trim( rgar( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
+		if ( '_blank' === rgar( $final_atts, 'target' ) ) {
+			$final_atts[ 'rel' ] = trim( rgar( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
 		}
 
 		// Sort the attributes alphabetically, to help testing
@@ -1588,7 +1588,7 @@ 
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
 		}
 
-		if( '' !== $output ) {
+		if ( '' !== $output ) {
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
 		}
 
@@ -1615,7 +1615,7 @@ 
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
 			} else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) {
-				$merged[] = $value;
+				$merged[ ] = $value;
 			} else {
 				$merged[ $key ] = $value;
 			}
@@ -1648,7 +1648,7 @@ 
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
 		 */
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
+		$get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
 
 		return get_users( $get_users_settings );
 	}
@@ -1668,11 +1668,11 @@ 
     public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
 
     	// If $cap is defined, only show notice if user has capability
-    	if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
+    	if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
     		return '';
 	    }
 
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
     }
 
 	/**

includes/class-gvlogic-shortcode.php

Spacing +28 added lines, -28 removed lines

@@ -85,7 +85,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 		}
 
@@ -119,9 +119,9 @@ 
 
 		$operators = array_merge( self::$SUPPORTED_ARRAY_OPERATORS, self::$SUPPORTED_NUMERIC_OPERATORS, self::$SUPPORTED_SCALAR_OPERATORS, self::$SUPPORTED_CUSTOM_OPERATORS );
 
-		if( $with_values ) {
+		if ( $with_values ) {
 			$operators_with_values = array();
-			foreach( $operators as $key ) {
+			foreach ( $operators as $key ) {
 				$operators_with_values[ $key ] = '';
 			}
 			return $operators_with_values;
@@ -138,14 +138,14 @@ 
 	 */
 	private function set_operation( $operation = '' ) {
 
-		if( empty( $operation ) ) {
+		if ( empty( $operation ) ) {
 			return false;
 		}
 
 		$operators = $this->get_operators( false );
 
-		if( !in_array( $operation, $operators ) ) {
-			do_action( 'gravityview_log_debug', __METHOD__ .' Attempted to add invalid operation type.', $operation );
+		if ( ! in_array( $operation, $operators ) ) {
+			do_action( 'gravityview_log_debug', __METHOD__ . ' Attempted to add invalid operation type.', $operation );
 			return false;
 		}
 
@@ -165,11 +165,11 @@ 
 	 */
 	private function setup_operation_and_comparison() {
 
-		foreach( $this->atts as $key => $value ) {
+		foreach ( $this->atts as $key => $value ) {
 
 			$valid = $this->set_operation( $key );
 
-			if( $valid ) {
+			if ( $valid ) {
 				$this->comparison = $value;
 				return true;
 			}
@@ -195,8 +195,8 @@ 
 			return null;
 		}
 
-		if( empty( $atts ) ) {
-			do_action( 'gravityview_log_error', __METHOD__.' $atts are empty.', $atts );
+		if ( empty( $atts ) ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' $atts are empty.', $atts );
 			return null;
 		}
 
@@ -210,16 +210,16 @@ 
 		$this->parse_atts();
 
 		// We need an "if"
-		if( false === $this->if ) {
-			do_action( 'gravityview_log_error', __METHOD__.' $atts->if is empty.', $this->passed_atts );
+		if ( false === $this->if ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' $atts->if is empty.', $this->passed_atts );
 			return null;
 		}
 
 		$setup = $this->setup_operation_and_comparison();
 
 		// We need an operation and comparison value
-		if( ! $setup ) {
-			do_action( 'gravityview_log_error', __METHOD__.' No valid operators were passed.', $this->atts );
+		if ( ! $setup ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' No valid operators were passed.', $this->atts );
 			return null;
 		}
 
@@ -252,7 +252,7 @@ 
 	 */
 	private function get_output() {
 
-		if( $this->is_match ) {
+		if ( $this->is_match ) {
 			$output = $this->content;
 		} else {
 			$output = $this->else_content;
@@ -266,9 +266,9 @@ 
 		 * @param string $output HTML/text output
 		 * @param GVLogic_Shortcode $this This class
 		 */
-		$output = apply_filters('gravityview/gvlogic/output', $output, $this );
+		$output = apply_filters( 'gravityview/gvlogic/output', $output, $this );
 
-		do_action( 'gravityview_log_debug', __METHOD__ .' Output: ', $output );
+		do_action( 'gravityview_log_debug', __METHOD__ . ' Output: ', $output );
 
 		return $output;
 	}
@@ -286,14 +286,14 @@ 
 		list( $before_else, $after_else ) = array_pad( explode( '[else]', $passed_content ), 2, NULL );
 		list( $before_else_if, $after_else_if ) = array_pad( explode( '[else', $passed_content ), 2, NULL );
 
-		$else_attr = isset( $this->atts['else'] ) ? $this->atts['else'] : NULL;
+		$else_attr = isset( $this->atts[ 'else' ] ) ? $this->atts[ 'else' ] : NULL;
 		$else_content = isset( $after_else ) ? $after_else : $else_attr;
 
 		// The content is everything OTHER than the [else]
 		$this->content = $before_else_if;
 
 		if ( ! $this->is_match ) {
-			if( $elseif_content = $this->process_elseif( $before_else ) ) {
+			if ( $elseif_content = $this->process_elseif( $before_else ) ) {
 				$this->else_content = $elseif_content;
 			} else {
 				$this->else_content = $else_content;
@@ -321,16 +321,16 @@ 
 		foreach ( $else_if_matches as $key => $else_if_match ) {
 
 			// If $else_if_match[5] exists and has content, check for more shortcodes
-			preg_match_all( '/' . $regex . '/', $else_if_match[5] . '[/else]', $recursive_matches, PREG_SET_ORDER );
+			preg_match_all( '/' . $regex . '/', $else_if_match[ 5 ] . '[/else]', $recursive_matches, PREG_SET_ORDER );
 
 			// If the logic passes, this is the value that should be used for $this->else_content
-			$else_if_value = $else_if_match[5];
-			$check_elseif_match = $else_if_match[0];
+			$else_if_value = $else_if_match[ 5 ];
+			$check_elseif_match = $else_if_match[ 0 ];
 
 			// Retrieve the value of the match that is currently being checked, without any other [else] tags
-			if( ! empty( $recursive_matches[0][0] ) ) {
-				$else_if_value = str_replace( $recursive_matches[0][0], '', $else_if_value );
-				$check_elseif_match = str_replace( $recursive_matches[0][0], '', $check_elseif_match );
+			if ( ! empty( $recursive_matches[ 0 ][ 0 ] ) ) {
+				$else_if_value = str_replace( $recursive_matches[ 0 ][ 0 ], '', $else_if_value );
+				$check_elseif_match = str_replace( $recursive_matches[ 0 ][ 0 ], '', $check_elseif_match );
 			}
 
 			$check_elseif_match = str_replace( '[else', '[gvlogicelse', $check_elseif_match );
@@ -347,7 +347,7 @@ 
 			}
 
 			// Process any remaining [else] tags
-			return $this->process_elseif( $else_if_match[5] );
+			return $this->process_elseif( $else_if_match[ 5 ] );
 		}
 
 		return false;
@@ -373,7 +373,7 @@ 
 		$this->atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( $this->passed_atts, $this->atts ) : $this->atts;
 
 		// Strip whitespace if it's not default false
-		$this->if = ( isset( $this->atts['if'] ) && is_string( $this->atts['if'] ) ) ? trim( $this->atts['if'] ) : false;
+		$this->if = ( isset( $this->atts[ 'if' ] ) && is_string( $this->atts[ 'if' ] ) ) ? trim( $this->atts[ 'if' ] ) : false;
 
 		/**
 		 * @action `gravityview/gvlogic/parse_atts/after` Modify shortcode attributes after it's been parsed
@@ -384,7 +384,7 @@ 
 		do_action( 'gravityview/gvlogic/parse_atts/after', $this );
 
 		// Make sure the "if" isn't processed in self::setup_operation_and_comparison()
-		unset( $this->atts['if'] );
+		unset( $this->atts[ 'if' ] );
 	}
 }
 

includes/extensions/entry-notes/class-gravityview-field-notes.php

Indentation +17 added lines, -17 removed lines

@@ -169,10 +169,10 @@ 
 
 		if( 'gv_note_add' === $_POST['action'] ) {
 
-            if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
-                do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' );
-                return;
-            }
+			if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
+				do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' );
+				return;
+			}
 
 			$post = wp_unslash( $_POST );
 
@@ -272,7 +272,7 @@ 
 	 *
 	 * Verify permissions. Check expected $_POST. Parse args, then send to process_delete_notes
 	 *
-  	 * @since 1.17
+	 * @since 1.17
 	 *
 	 * @see process_delete_notes
 	 *
@@ -425,7 +425,7 @@ 
 			'subject-label' => __( 'Subject', 'gravityview' ),
 			'subject' => __( 'Email subject', 'gravityview' ),
 			'default-email-subject' => __( 'New entry note', 'gravityview' ),
-            'email-footer' => __( 'This note was sent from {url}', 'gravityview' ),
+			'email-footer' => __( 'This note was sent from {url}', 'gravityview' ),
 			'also-email' => __( 'Also email this note to', 'gravityview' ),
 			'error-add-note' => __( 'There was an error adding the note.', 'gravityview' ),
 			'error-invalid' => __( 'The request was invalid. Refresh the page and try again.', 'gravityview' ),
@@ -717,7 +717,7 @@ 
 				'gv-note-to-custom' => '',
 				'gv-note-subject' => '',
 				'gv-note-content' => '',
-                'current-url' => '',
+				'current-url' => '',
 			);
 
 			$current_user  = wp_get_current_user();
@@ -769,9 +769,9 @@ 
 			$message .= $this->get_email_footer( $email_footer, $is_html, $email_data );
 
 			/**
-             * @filter `gravityview/field/notes/wpautop_email` Should the message content have paragraphs added automatically, if using HTML message format
+			 * @filter `gravityview/field/notes/wpautop_email` Should the message content have paragraphs added automatically, if using HTML message format
 			 * @since 1.18
-             * @param bool $wpautop_email True: Apply wpautop() to the email message if using; False: Leave as entered (Default: true)
+			 * @param bool $wpautop_email True: Apply wpautop() to the email message if using; False: Leave as entered (Default: true)
 			 */
 			$wpautop_email = apply_filters( 'gravityview/field/notes/wpautop_email', true );
 
@@ -791,12 +791,12 @@ 
 	}
 
 	/**
-     * Get the footer for Entry Note emails
-     *
-     * `{url}` is replaced by the URL of the page where the note form was embedded
-     *
-     * @since 1.18
-     * @see GravityView_Field_Notes::strings The default value of $message_footer is set here, with the key 'email-footer'
+	 * Get the footer for Entry Note emails
+	 *
+	 * `{url}` is replaced by the URL of the page where the note form was embedded
+	 *
+	 * @since 1.18
+	 * @see GravityView_Field_Notes::strings The default value of $message_footer is set here, with the key 'email-footer'
 	 *
 	 * @param string $email_footer The message footer value
 	 * @param bool $is_html True: Email is being sent as HTML; False: sent as text
@@ -805,10 +805,10 @@ 
 	 */
 	private function get_email_footer( $email_footer = '', $is_html = true, $email_data = array() ) {
 
-	    $output = '';
+		$output = '';
 
 		if( ! empty( $email_footer ) ) {
-		    $url = rgar( $email_data, 'current-url' );
+			$url = rgar( $email_data, 'current-url' );
 			$url = html_entity_decode( $url );
 			$url = site_url( $url );
 

Spacing +80 added lines, -80 removed lines

@@ -63,18 +63,18 @@ 
 
 		add_shortcode( 'gv_note_add', array( 'GravityView_Field_Notes', 'get_add_note_part' ) );
 
-		add_action( 'wp', array( $this, 'maybe_delete_notes'), 1000 );
-		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes') );
-		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes') );
+		add_action( 'wp', array( $this, 'maybe_delete_notes' ), 1000 );
+		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
+		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
 
-		add_action( 'wp', array( $this, 'maybe_add_note'), 1000 );
-		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note') );
-		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note') );
+		add_action( 'wp', array( $this, 'maybe_add_note' ), 1000 );
+		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note' ) );
+		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note' ) );
 
 		// add template path to check for field
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
 
-		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
+		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
 		add_action( 'gravityview/field/notes/scripts', array( $this, 'enqueue_scripts' ) );
 		
 		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_entry_default_field' ), 10, 3 );
@@ -96,8 +96,8 @@ 
 	 */
 	public function add_entry_default_field( $entry_default_fields, $form, $zone ) {
 
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
-			$entry_default_fields['notes'] = array(
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
+			$entry_default_fields[ 'notes' ] = array(
 				'label' => __( 'Entry Notes', 'gravityview' ),
 				'type'  => 'notes',
 				'desc'  => __( 'Display, add, and delete notes for an entry.', 'gravityview' ),
@@ -130,23 +130,23 @@ 
 	public function enqueue_scripts() {
 		global $wp_actions;
 
-		if( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
+		if ( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
 			wp_enqueue_style( 'gravityview-notes' );
 			wp_enqueue_script( 'gravityview-notes' );
 		}
 
-		if( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
+		if ( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
 
 			$strings = self::strings();
 
 			wp_localize_script( 'gravityview-notes', 'GVNotes', array(
 				'ajaxurl' => admin_url( 'admin-ajax.php' ),
 				'text' => array(
-					'processing' => $strings['processing'],
-					'delete_confirm' => $strings['delete-confirm'],
-					'note_added' => $strings['added-note'],
-					'error_invalid' => $strings['error-invalid'],
-					'error_empty_note' => $strings['error-empty-note'],
+					'processing' => $strings[ 'processing' ],
+					'delete_confirm' => $strings[ 'delete-confirm' ],
+					'note_added' => $strings[ 'added-note' ],
+					'error_invalid' => $strings[ 'error-invalid' ],
+					'error_empty_note' => $strings[ 'error-empty-note' ],
 				),
 			) );
 		}
@@ -163,26 +163,26 @@ 
 	 */
 	function maybe_add_note() {
 
-		if( ! isset( $_POST['action'] ) ) {
+		if ( ! isset( $_POST[ 'action' ] ) ) {
 			return;
 		}
 
-		if( 'gv_note_add' === $_POST['action'] ) {
+		if ( 'gv_note_add' === $_POST[ 'action' ] ) {
 
-            if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
+            if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
                 do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' );
                 return;
             }
 
 			$post = wp_unslash( $_POST );
 
-			if( $this->doing_ajax ) {
-				parse_str( $post['data'], $data );
+			if ( $this->doing_ajax ) {
+				parse_str( $post[ 'data' ], $data );
 			} else {
 				$data = $post;
 			}
 
-			$this->process_add_note( (array) $data );
+			$this->process_add_note( (array)$data );
 		}
 	}
 
@@ -209,23 +209,23 @@ 
 		$error = false;
 		$success = false;
 
-		if( empty( $data['entry-slug'] ) ) {
+		if ( empty( $data[ 'entry-slug' ] ) ) {
 
-			$error = self::strings('error-invalid');
+			$error = self::strings( 'error-invalid' );
 			do_action( 'gravityview_log_error', __METHOD__ . ': The note is missing an Entry ID.' );
 
 		} else {
 
-			$valid = wp_verify_nonce( $data['gv_note_add'], 'gv_note_add_' . $data['entry-slug'] );
+			$valid = wp_verify_nonce( $data[ 'gv_note_add' ], 'gv_note_add_' . $data[ 'entry-slug' ] );
 			
 			$has_cap = GVCommon::has_cap( 'gravityview_add_entry_notes' );
 
-			if( ! $has_cap ) {
+			if ( ! $has_cap ) {
 				$error = self::strings( 'error-cap-add' );
 				do_action( 'gravityview_log_error', __METHOD__ . ': Adding a note failed: the user does not have the "gravityview_add_entry_notes" capability.' );
 			} elseif ( $valid ) {
 
-				$entry = gravityview_get_entry( $data['entry-slug'], true, false );
+				$entry = gravityview_get_entry( $data[ 'entry-slug' ], true, false );
 
 				$added = $this->add_note( $entry, $data );
 
@@ -243,22 +243,22 @@ 
 					$this->maybe_send_entry_notes( $note, $entry, $data );
 
 					if ( $note ) {
-						$success = self::display_note( $note, ! empty( $data['show-delete'] ) );
-						do_action( 'gravityview_log_debug', __METHOD__ . ': The note was successfully created', compact('note', 'data') );
+						$success = self::display_note( $note, ! empty( $data[ 'show-delete' ] ) );
+						do_action( 'gravityview_log_debug', __METHOD__ . ': The note was successfully created', compact( 'note', 'data' ) );
 					} else {
-						$error = self::strings('error-add-note');
-						do_action( 'gravityview_log_error', __METHOD__ . ': The note was not successfully created', compact('note', 'data') );
+						$error = self::strings( 'error-add-note' );
+						do_action( 'gravityview_log_error', __METHOD__ . ': The note was not successfully created', compact( 'note', 'data' ) );
 					}
 				}
 			} else {
-				$error = self::strings('error-invalid');
+				$error = self::strings( 'error-invalid' );
 				do_action( 'gravityview_log_error', __METHOD__ . ': Nonce validation failed; the note was not created' );
 			}
 		}
 
 
-		if( $this->doing_ajax ) {
-			if( $success ) {
+		if ( $this->doing_ajax ) {
+			if ( $success ) {
 				wp_send_json_success( array( 'html' => $success ) );
 			} else {
 				$error = $error ? $error : self::strings( 'error-invalid' );
@@ -284,11 +284,11 @@ 
 			return;
 		}
 
-		if ( isset( $_POST['action'] ) && 'gv_delete_notes' === $_POST['action'] ) {
+		if ( isset( $_POST[ 'action' ] ) && 'gv_delete_notes' === $_POST[ 'action' ] ) {
 
 			$post = wp_unslash( $_POST );
 			if ( $this->doing_ajax ) {
-				parse_str( $post['data'], $data );
+				parse_str( $post[ 'data' ], $data );
 			} else {
 				$data = $post;
 			}
@@ -319,18 +319,18 @@ 
 	 */
 	function process_delete_notes( $data ) {
 
-		$valid = wp_verify_nonce( $data['gv_delete_notes'], 'gv_delete_notes_' . $data['entry-slug'] );
+		$valid = wp_verify_nonce( $data[ 'gv_delete_notes' ], 'gv_delete_notes_' . $data[ 'entry-slug' ] );
 		$has_cap = GVCommon::has_cap( 'gravityview_delete_entry_notes' );
 		$success = false;
 
 		if ( $valid && $has_cap ) {
-			GravityView_Entry_Notes::delete_notes( $data['note'] );
+			GravityView_Entry_Notes::delete_notes( $data[ 'note' ] );
 			$success = true;
 		}
 
-		if( $this->doing_ajax ) {
+		if ( $this->doing_ajax ) {
 
-			if( $success ) {
+			if ( $success ) {
 				wp_send_json_success();
 			} else {
 				if ( ! $valid ) {
@@ -363,13 +363,13 @@ 
 
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
-		unset( $field_options['show_as_link'] );
+		unset( $field_options[ 'show_as_link' ] );
 
 		$notes_options = array(
 			'notes' => array(
 				'type' => 'checkboxes',
-				'label' => __('Note Settings', 'gravityview'),
-				'desc' => sprintf( _x('Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
+				'label' => __( 'Note Settings', 'gravityview' ),
+				'desc' => sprintf( _x( 'Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
 				'options' => array(
 					'view' => array(
 						'label' => __( 'Display notes?', 'gravityview' ),
@@ -421,7 +421,7 @@ 
 			'processing' => __( 'Processing&hellip;', 'gravityview' ),
 			'other-email' => __( 'Other email address', 'gravityview' ),
 			'email-label' => __( 'Email address', 'gravityview' ),
-			'email-placeholder' => _x('you@example.com', 'Example email address used as a placeholder', 'gravityview'),
+			'email-placeholder' => _x( 'you@example.com', 'Example email address used as a placeholder', 'gravityview' ),
 			'subject-label' => __( 'Subject', 'gravityview' ),
 			'subject' => __( 'Email subject', 'gravityview' ),
 			'default-email-subject' => __( 'New entry note', 'gravityview' ),
@@ -441,7 +441,7 @@ 
 		 */
 		$strings = gv_map_deep( apply_filters( 'gravityview/field/notes/strings', $strings ), 'esc_html' );
 
-		if( $key ) {
+		if ( $key ) {
 			return isset( $strings[ $key ] ) ? $strings[ $key ] : '';
 		}
 
@@ -460,7 +460,7 @@ 
 	 */
 	static public function display_note( $note, $show_delete = false ) {
 
-		if( ! is_object( $note ) ) {
+		if ( ! is_object( $note ) ) {
 			return '';
 		}
 
@@ -501,7 +501,7 @@ 
 		$note_row = ob_get_clean();
 
 		$replacements = array(
-			'{note_id}' => $note_content['note_id'],
+			'{note_id}' => $note_content[ 'note_id' ],
 			'{row_class}' => 'gv-note',
 			'{note_detail}' => $note_detail_html
 		);
@@ -533,13 +533,13 @@ 
 
 		$user_data = get_userdata( $current_user->ID );
 
-		$note_content = trim( $data['gv-note-content'] );
+		$note_content = trim( $data[ 'gv-note-content' ] );
 
-		if( empty( $note_content ) ) {
+		if ( empty( $note_content ) ) {
 			return new WP_Error( 'gv-add-note-empty', __( 'The note is empty.', 'gravityview' ) );
 		}
 
-		$return = GravityView_Entry_Notes::add_note( $entry['id'], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
+		$return = GravityView_Entry_Notes::add_note( $entry[ 'id' ], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
 
 		return $return;
 	}
@@ -555,7 +555,7 @@ 
 	 */
 	public static function get_add_note_part() {
 
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ': User does not have permission to add entry notes ("gravityview_add_entry_notes").' );
 			return '';
 		}
@@ -571,19 +571,19 @@ 
 
 		$visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
 		$entry = $gravityview_view->getCurrentEntry();
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
 		$nonce_field = wp_nonce_field( 'gv_note_add_' . $entry_slug, 'gv_note_add', false, false );
 
 		// Only generate the dropdown if the field settings allow it
 		$email_fields = '';
-		if( ! empty( $visibility_settings['email'] ) ) {
+		if ( ! empty( $visibility_settings[ 'email' ] ) ) {
 			$email_fields = self::get_note_email_fields( $entry_slug );
 		}
 
 		$add_note_html = str_replace( '{entry_slug}', $entry_slug, $add_note_html );
 		$add_note_html = str_replace( '{nonce_field}', $nonce_field, $add_note_html );
-		$add_note_html = str_replace( '{show_delete}', intval( $visibility_settings['delete'] ), $add_note_html );
-		$add_note_html   = str_replace( '{email_fields}', $email_fields, $add_note_html );
+		$add_note_html = str_replace( '{show_delete}', intval( $visibility_settings[ 'delete' ] ), $add_note_html );
+		$add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html );
 		$add_note_html = str_replace( '{url}', esc_url_raw( add_query_arg( array() ) ), $add_note_html );
 
 		return $add_note_html;
@@ -608,8 +608,8 @@ 
 		$note_emails = array();
 
 		foreach ( $email_fields as $email_field ) {
-			if ( ! empty( $entry["{$email_field->id}"] ) && is_email( $entry["{$email_field->id}"] ) ) {
-				$note_emails[] = $entry["{$email_field->id}"];
+			if ( ! empty( $entry[ "{$email_field->id}" ] ) && is_email( $entry[ "{$email_field->id}" ] ) ) {
+				$note_emails[ ] = $entry[ "{$email_field->id}" ];
 			}
 		}
 
@@ -621,7 +621,7 @@ 
 		 */
 		$note_emails = apply_filters( 'gravityview/field/notes/emails', $note_emails, $entry );
 
-		return (array) $note_emails;
+		return (array)$note_emails;
 	}
 
 	/**
@@ -637,7 +637,7 @@ 
 	 */
 	private static function get_note_email_fields( $entry_slug = '' ) {
 
-		if( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
+		if ( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ': User does not have permission to email entry notes ("gravityview_email_entry_notes").' );
 			return '';
 		}
@@ -659,27 +659,27 @@ 
 
 		if ( ! empty( $note_emails ) || $include_custom ) { ?>
 			<div class="gv-note-email-container">
-				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings['also-email'];  ?></label>
+				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings[ 'also-email' ]; ?></label>
 				<select class="gv-note-email-to" name="gv-note-to" id="gv-note-email-to-<?php echo $entry_slug_esc; ?>">
-					<option value=""><?php echo $strings['also-email'];  ?></option>
+					<option value=""><?php echo $strings[ 'also-email' ]; ?></option>
 					<?php foreach ( $note_emails as  $email ) {
 						?>
 						<option value="<?php echo esc_attr( $email ); ?>"><?php echo esc_html( $email ); ?></option>
 					<?php }
-					if( $include_custom ) { ?>
-					<option value="custom"><?php echo self::strings('other-email'); ?></option>
+					if ( $include_custom ) { ?>
+					<option value="custom"><?php echo self::strings( 'other-email' ); ?></option>
 					<?php } ?>
 				</select>
 				<fieldset class="gv-note-to-container">
-					<?php if( $include_custom ) { ?>
+					<?php if ( $include_custom ) { ?>
 					<div class='gv-note-to-custom-container'>
-						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings['email-label']; ?></label>
-						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings['email-placeholder']; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
+						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'email-label' ]; ?></label>
+						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings[ 'email-placeholder' ]; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
 					</div>
 					<?php } ?>
 		            <div class='gv-note-subject-container'>
-		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings['subject-label']; ?></label>
-		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings['subject']; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
+		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'subject-label' ]; ?></label>
+		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings[ 'subject' ]; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
 		            </div>
 				</fieldset>
 			</div>
@@ -702,7 +702,7 @@ 
 	 */
 	private function maybe_send_entry_notes( $note = false, $entry, $data ) {
 
-		if( ! $note || ! GVCommon::has_cap('gravityview_email_entry_notes') ) {
+		if ( ! $note || ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
 			do_action( 'gravityview_log_debug', __METHOD__ . ': User doesnt have "gravityview_email_entry_notes" cap, or $note is empty', $note );
 			return;
 		}
@@ -710,7 +710,7 @@ 
 		do_action( 'gravityview_log_debug', __METHOD__ . ': $data', $data );
 
 		//emailing notes if configured
-		if ( ! empty( $data['gv-note-to'] ) ) {
+		if ( ! empty( $data[ 'gv-note-to' ] ) ) {
 
 			$default_data = array(
 				'gv-note-to' => '',
@@ -720,11 +720,11 @@ 
                 'current-url' => '',
 			);
 
-			$current_user  = wp_get_current_user();
+			$current_user = wp_get_current_user();
 			$email_data = wp_parse_args( $data, $default_data );
 
-			$from    = $current_user->user_email;
-			$to = $email_data['gv-note-to'];
+			$from = $current_user->user_email;
+			$to = $email_data[ 'gv-note-to' ];
 
 			/**
 			 * Documented in get_note_email_fields
@@ -732,8 +732,8 @@ 
 			 */
 			$include_custom = apply_filters( 'gravityview/field/notes/custom-email', true );
 
-			if( 'custom' === $to && $include_custom ) {
-				$to = $email_data['gv-note-to-custom'];
+			if ( 'custom' === $to && $include_custom ) {
+				$to = $email_data[ 'gv-note-to-custom' ];
 				do_action( 'gravityview_log_debug', __METHOD__ . ': Sending note to a custom email address: ' . $to );
 			}
 
@@ -744,13 +744,13 @@ 
 
 			$bcc = false;
 			$reply_to = $from;
-			$subject = trim( $email_data['gv-note-subject'] );
+			$subject = trim( $email_data[ 'gv-note-subject' ] );
 
 			// We use empty() here because GF uses empty to check against, too. `0` isn't a valid subject to GF
 			$subject = empty( $subject ) ? self::strings( 'default-email-subject' ) : $subject;
-			$message = $email_data['gv-note-content'];
+			$message = $email_data[ 'gv-note-content' ];
 			$email_footer = self::strings( 'email-footer' );
-			$from_name     = $current_user->display_name;
+			$from_name = $current_user->display_name;
 			$message_format = 'html';
 
 			/**
@@ -781,7 +781,7 @@ 
 
 			GVCommon::send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name, $message_format, '', $entry, false );
 
-			$form  = isset( $entry['form_id'] ) ? GFAPI::get_form( $entry['form_id'] ) : array();
+			$form = isset( $entry[ 'form_id' ] ) ? GFAPI::get_form( $entry[ 'form_id' ] ) : array();
 
 			/**
 			 * @see https://www.gravityhelp.com/documentation/article/10146-2/ It's here for compatibility with Gravity Forms
@@ -807,7 +807,7 @@ 
 
 	    $output = '';
 
-		if( ! empty( $email_footer ) ) {
+		if ( ! empty( $email_footer ) ) {
 		    $url = rgar( $email_data, 'current-url' );
 			$url = html_entity_decode( $url );
 			$url = site_url( $url );