gravityview / GravityView

future/includes/class-gv-view.php

Spacing +76 added lines, -77 removed lines

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

future/includes/rest/class-gv-rest-views-route.php

Spacing +25 added lines, -25 removed lines

@@ -63,7 +63,7 @@ 
 			'total' => wp_count_posts( 'gravityview' )->publish,
 		);
 		foreach ( $items as $item ) {
-			$data['views'][] = $this->prepare_view_for_response( $item, $request );
+			$data[ 'views' ][ ] = $this->prepare_view_for_response( $item, $request );
 		}
 
 		return new \WP_REST_Response( $data, 200 );
@@ -82,7 +82,7 @@ 
 
 		$url = $request->get_url_params();
 
-		$view_id = intval( $url['id'] );
+		$view_id = intval( $url[ 'id' ] );
 
 		$item = get_post( $view_id );
 
@@ -114,7 +114,7 @@ 
 		// Only output the fields that should be displayed.
 		$allowed = array();
 		foreach ( $view->fields->by_position( "{$context}_*" )->by_visible( $view )->all() as $field ) {
-			$allowed[] = $field;
+			$allowed[ ] = $field;
 		}
 
 		/**
@@ -133,7 +133,7 @@ 
 
 		// Tack on additional fields if needed
 		foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) {
-			$allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
+			$allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
 		}
 
 		$r = new Request( $request );
@@ -211,10 +211,10 @@ 
 	public function get_sub_items( $request ) {
 
 		$url     = $request->get_url_params();
-		$view_id = intval( $url['id'] );
+		$view_id = intval( $url[ 'id' ] );
 		$format  = \GV\Utils::get( $url, 'format', 'json' );
 
-		if( $post_id = $request->get_param('post_id') ) {
+		if ( $post_id = $request->get_param( 'post_id' ) ) {
 			global $post;
 
 			$post = get_post( $post_id );
@@ -319,7 +319,7 @@ 
 
 		$data = array( 'entries' => $entries->all(), 'total' => $entries->total() );
 
-		foreach ( $data['entries'] as &$entry ) {
+		foreach ( $data[ 'entries' ] as &$entry ) {
 			$entry = $this->prepare_entry_for_response( $view, $entry, $request, 'directory' );
 		}
 
@@ -338,8 +338,8 @@ 
 	 */
 	public function get_sub_item( $request ) {
 		$url      = $request->get_url_params();
-		$view_id  = intval( $url['id'] );
-		$entry_id = intval( $url['s_id'] );
+		$view_id  = intval( $url[ 'id' ] );
+		$entry_id = intval( $url[ 's_id' ] );
 		$format   = \GV\Utils::get( $url, 'format', 'json' );
 
 		$view  = \GV\View::by_id( $view_id );
@@ -374,32 +374,32 @@ 
 		// Add all the WP_Post data
 		$view_post = $view_post->to_array();
 
-		unset( $view_post['to_ping'], $view_post['ping_status'], $view_post['pinged'], $view_post['post_type'], $view_post['filter'], $view_post['post_category'], $view_post['tags_input'], $view_post['post_content'], $view_post['post_content_filtered'] );
+		unset( $view_post[ 'to_ping' ], $view_post[ 'ping_status' ], $view_post[ 'pinged' ], $view_post[ 'post_type' ], $view_post[ 'filter' ], $view_post[ 'post_category' ], $view_post[ 'tags_input' ], $view_post[ 'post_content' ], $view_post[ 'post_content_filtered' ] );
 
 		$return = wp_parse_args( $item, $view_post );
 
-		$return['title'] = $return['post_title'];
+		$return[ 'title' ] = $return[ 'post_title' ];
 
-		$return['settings'] = isset( $return['atts'] ) ? $return['atts'] : array();
-		unset( $return['atts'], $return['view_id'] );
+		$return[ 'settings' ] = isset( $return[ 'atts' ] ) ? $return[ 'atts' ] : array();
+		unset( $return[ 'atts' ], $return[ 'view_id' ] );
 
-		$return['search_criteria'] = array(
+		$return[ 'search_criteria' ] = array(
 			'page_size' => rgars( $return, 'settings/page_size' ),
 			'sort_field' => rgars( $return, 'settings/sort_field' ),
 			'sort_direction' => rgars( $return, 'settings/sort_direction' ),
 			'offset' => rgars( $return, 'settings/offset' ),
 		);
 
-		unset( $return['settings']['page_size'], $return['settings']['sort_field'], $return['settings']['sort_direction'] );
+		unset( $return[ 'settings' ][ 'page_size' ], $return[ 'settings' ][ 'sort_field' ], $return[ 'settings' ][ 'sort_direction' ] );
 
 		// Redact for non-logged ins
 		if ( ! \GVCommon::has_cap( 'edit_others_gravityviews' ) ) {
-			unset( $return['settings'] );
-			unset( $return['search_criteria'] );
+			unset( $return[ 'settings' ] );
+			unset( $return[ 'search_criteria' ] );
 		}
 		
 		if ( ! \GFCommon::current_user_can_any( 'gravityforms_edit_forms' ) ) {
-			unset( $return['form'] );
+			unset( $return[ 'form' ] );
 		}
 
 		return $return;
@@ -415,7 +415,7 @@ 
 			$view_id = func_get_arg( 1 ); // $view_id override
 		} else {
 			$url     = $request->get_url_params();
-			$view_id = intval( $url['id'] );
+			$view_id = intval( $url[ 'id' ] );
 		}
 
 		if ( ! $view = \GV\View::by_id( $view_id ) ) {
@@ -461,8 +461,8 @@ 
 		}
 
 		$url     = $request->get_url_params();
-		$view_id = intval( $url['id'] );
-		$entry_id = intval( $url['s_id'] );
+		$view_id = intval( $url[ 'id' ] );
+		$entry_id = intval( $url[ 's_id' ] );
 
 		$view = \GV\View::by_id( $view_id );
 
@@ -470,11 +470,11 @@ 
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 		}
 
-		if ( $entry['form_id'] != $view->form->ID ) {
+		if ( $entry[ 'form_id' ] != $view->form->ID ) {
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 		}
 
-		if ( $entry['status'] != 'active' ) {
+		if ( $entry[ 'status' ] != 'active' ) {
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 		}
 
@@ -482,10 +482,10 @@ 
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 		}
 
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
 		if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 				return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 			}
 		}

future/includes/class-gv-template-legacy-override.php

Spacing +16 added lines, -16 removed lines

@@ -98,15 +98,15 @@ 
 		$additional = array();
 
 		// form-19-table-body.php
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->view->form ? $this->view->form->ID : 0, $slug, $name );
+		$additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->view->form ? $this->view->form->ID : 0, $slug, $name );
 
 		// view-3-table-body.php
-		$additional[] = sprintf( 'view-%d-%s-%s.php', $this->view->ID, $slug, $name );
+		$additional[ ] = sprintf( 'view-%d-%s-%s.php', $this->view->ID, $slug, $name );
 
 		global $post;
 		if ( $post ) {
 			// page-19-table-body.php
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $post->ID, $slug, $name );
+			$additional[ ] = sprintf( 'page-%d-%s-%s.php', $post->ID, $slug, $name );
 		}
 
 		// Combine with existing table-body.php and table.php
@@ -130,7 +130,7 @@ 
 		ob_start();
 
 		$request = new Mock_Request();
-		$request->returns['is_view'] = $this->view;
+		$request->returns[ 'is_view' ] = $this->view;
 
 		/**
 		 * You got one shot. One opportunity. To render all the widgets you have ever wanted.
@@ -144,17 +144,17 @@ 
 		foreach ( array( 'gravityview_before', 'gravityview_after' ) as $hook ) {
 			/** WordPress 4.6 and lower compatibility, when WP_Hook classes were still absent. */
 			if ( is_array( $wp_filter[ $hook ] ) ) {
-				if ( ! empty( $wp_filter[ $hook ][10] ) ) {
-					foreach ( $wp_filter[ $hook ][10] as $function_key => $callback ) {
+				if ( ! empty( $wp_filter[ $hook ][ 10 ] ) ) {
+					foreach ( $wp_filter[ $hook ][ 10 ] as $function_key => $callback ) {
 						if ( strpos( $function_key, 'render_widget_hooks' ) ) {
-							unset( $wp_filter[ $hook ][10][ $function_key ] );
+							unset( $wp_filter[ $hook ][ 10 ][ $function_key ] );
 						}
 					}
 				}
 			} else {
-				foreach ( $wp_filter[ $hook ]->callbacks[10] as $function_key => $callback ) {
+				foreach ( $wp_filter[ $hook ]->callbacks[ 10 ] as $function_key => $callback ) {
 					if ( strpos( $function_key, 'render_widget_hooks' ) ) {
-						unset( $wp_filter[ $hook ]->callbacks[10][ $function_key ] );
+						unset( $wp_filter[ $hook ]->callbacks[ 10 ][ $function_key ] );
 					}
 				}
 			}
@@ -165,7 +165,7 @@ 
 		 */
 		if ( $this->entry ) {
 
-			$request->returns['is_entry'] = $this->entry;
+			$request->returns[ 'is_entry' ] = $this->entry;
 
 			global $post;
 
@@ -199,11 +199,11 @@ 
 			 * This allows us to fake it till we make it.
 			 */
 			$parameters = $this->view->settings->as_atts();
-			if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) {
+			if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) {
 				$has_multisort = true;
-				$parameters['sort_field'] = reset( $parameters['sort_field'] );
-				if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) {
-					$parameters['sort_direction'] = reset( $parameters['sort_direction'] );
+				$parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] );
+				if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) {
+					$parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] );
 				}
 			}
 
@@ -222,8 +222,8 @@ 
 					'fields' => $this->view->fields->by_visible( $this->view ),
 					'in_the_loop' => true,
 				), empty( $parameters ) ? array() : array(
-					'paging' => $parameters['paging'],
-					'sorting' => $parameters['sorting'],
+					'paging' => $parameters[ 'paging' ],
+					'sorting' => $parameters[ 'sorting' ],
 				), $post ? array(
 					'post' => $post,
 				) : array() ) );

includes/fields/class-gravityview-field-unsubscribe.php

Spacing +18 added lines, -18 removed lines

@@ -18,7 +18,7 @@ 
 
 	public function __construct() {
 		$this->label = esc_html__( 'Unsubscribe', 'gravityview' );
-		$this->description =  esc_attr__( 'Unsubscribe from a Payment-based entry.', 'gravityview' );
+		$this->description = esc_attr__( 'Unsubscribe from a Payment-based entry.', 'gravityview' );
 
 		$this->add_hooks();
 
@@ -57,13 +57,13 @@ 
 	 */
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
-		unset( $field_options['only_loggedin'] );
+		unset( $field_options[ 'only_loggedin' ] );
 
-		unset( $field_options['new_window'] );
+		unset( $field_options[ 'new_window' ] );
 
-		unset( $field_options['show_as_link'] );
+		unset( $field_options[ 'show_as_link' ] );
 
-		$add_options['unsub_all'] = array(
+		$add_options[ 'unsub_all' ] = array(
 			'type'       => 'checkbox',
 			'label'      => __( 'Allow admins to unsubscribe', 'gravityview' ),
 			'desc'       => __( 'Allow users with `gravityforms_edit_entries` to cancel subscriptions', 'gravityview' ),
@@ -130,9 +130,9 @@ 
 		}
 
 		foreach ( $feeds as $feed ) {
-			if ( isset( $subscription_addons[ $feed['addon_slug'] ] ) && 'subscription' === \GV\Utils::get( $feed, 'meta/transactionType' ) ) {
-				if ( ! isset( $entry_default_fields["{$this->name}"] ) && 'edit' !== $context ) {
-					$entry_default_fields["{$this->name}"] = array(
+			if ( isset( $subscription_addons[ $feed[ 'addon_slug' ] ] ) && 'subscription' === \GV\Utils::get( $feed, 'meta/transactionType' ) ) {
+				if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' !== $context ) {
+					$entry_default_fields[ "{$this->name}" ] = array(
 						'label' => $this->label,
 						'desc'  => $this->description,
 						'type'  => $this->name,
@@ -163,10 +163,10 @@ 
 			return $output;
 		}
 
-		$can_current_user_edit = is_numeric( $entry['created_by'] ) && ( wp_get_current_user()->ID === intval( $entry['created_by'] ) );
+		$can_current_user_edit = is_numeric( $entry[ 'created_by' ] ) && ( wp_get_current_user()->ID === intval( $entry[ 'created_by' ] ) );
 
 		if ( ! $can_current_user_edit ) {
-			if ( empty( $field_settings['unsub_all'] ) || ! \GVCommon::has_cap( 'gravityforms_edit_entries', $entry['id'] ) ) {
+			if ( empty( $field_settings[ 'unsub_all' ] ) || ! \GVCommon::has_cap( 'gravityforms_edit_entries', $entry[ 'id' ] ) ) {
 				return $output;
 			}
 		}
@@ -179,21 +179,21 @@ 
 		// @todo Also make sure we check caps if moved from here
 		// @todo Also make sure test_GravityView_Field_Unsubscribe_unsubscribe_permissions is rewritten
 		if ( $entry = $this->maybe_unsubscribe( $entry ) ) {
-			if ( $entry['payment_status'] !== $status ) {
+			if ( $entry[ 'payment_status' ] !== $status ) {
 				// @todo Probably __( 'Unsubscribed', 'gravityview' );
-				return $entry['payment_status'];
+				return $entry[ 'payment_status' ];
 			}
 		}
 
-		if ( 'active' !== mb_strtolower( $entry['payment_status'] ) ) {
+		if ( 'active' !== mb_strtolower( $entry[ 'payment_status' ] ) ) {
 			return $output;
 		}
 
 		global $wp;
 		$current_url = add_query_arg( $wp->query_string, '', home_url( $wp->request ) );
 
-		$link = add_query_arg( 'unsubscribe', wp_create_nonce( 'unsubscribe_' . $entry['id'] ), $current_url );
-		$link = add_query_arg( 'uid', $entry['id'], $link );
+		$link = add_query_arg( 'unsubscribe', wp_create_nonce( 'unsubscribe_' . $entry[ 'id' ] ), $current_url );
+		$link = add_query_arg( 'uid', $entry[ 'id' ], $link );
 
 		return sprintf( '<a href="%s">%s</a>', esc_url( $link ), esc_html__( 'Unsubscribe', 'gravityview' ) );
 	}
@@ -213,11 +213,11 @@ 
 	 */
 	private function maybe_unsubscribe( $entry ) {
 
-		if ( ! wp_verify_nonce( \GV\Utils::_REQUEST( 'unsubscribe' ), 'unsubscribe_' . $entry['id'] ) ) {
+		if ( ! wp_verify_nonce( \GV\Utils::_REQUEST( 'unsubscribe' ), 'unsubscribe_' . $entry[ 'id' ] ) ) {
 			return $entry;
 		}
 
-		if ( ( ! $uid = \GV\Utils::_REQUEST( 'uid' ) ) || ! is_numeric( $uid ) || ( intval( $uid ) !== intval( $entry['id'] ) ) ) {
+		if ( ( ! $uid = \GV\Utils::_REQUEST( 'uid' ) ) || ! is_numeric( $uid ) || ( intval( $uid ) !== intval( $entry[ 'id' ] ) ) ) {
 			return $entry;
 		}
 
@@ -259,7 +259,7 @@ 
 
 						$subscription_addons[ $slug ]->cancel_subscription( $entry, $feed );
 
-						return \GFAPI::get_entry( $entry['id'] );
+						return \GFAPI::get_entry( $entry[ 'id' ] );
 					}
 				}
 			}

includes/extensions/delete-entry/class-delete-entry.php

Spacing +72 added lines, -72 removed lines

@@ -42,12 +42,12 @@ 
 
 		add_action( 'wp', array( $this, 'process_delete' ), 10000 );
 
-		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field'), 10, 3 );
+		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
 
 		add_action( 'gravityview_before', array( $this, 'display_message' ) );
 
 		// For the Delete Entry Link, you don't want visible to all users.
-		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps'), 10, 5 );
+		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
 
 		// Modify the field options based on the name of the field type
 		add_filter( 'gravityview_template_delete_link_options', array( $this, 'delete_link_field_options' ), 10, 5 );
@@ -55,10 +55,10 @@ 
 		// add template path to check for field
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
 
-		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button'), 10, 4 );
+		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button' ), 10, 4 );
 
-		add_action ( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 );
-		add_action ( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 );
+		add_action( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 );
+		add_action( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 );
 
 		add_filter( 'gravityview/field/is_visible', array( $this, 'maybe_not_visible' ), 10, 3 );
 	}
@@ -71,7 +71,7 @@ 
 	 */
 	static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 		}
 
@@ -151,20 +151,20 @@ 
 	function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
 		// Always a link, never a filter
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
 
 		// Delete Entry link should only appear to visitors capable of editing entries
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
 
-		$add_option['delete_link'] = array(
+		$add_option[ 'delete_link' ] = array(
 			'type' => 'text',
 			'label' => __( 'Delete Link Text', 'gravityview' ),
 			'desc' => NULL,
-			'value' => __('Delete Entry', 'gravityview'),
+			'value' => __( 'Delete Entry', 'gravityview' ),
 			'merge_tags' => true,
 		);
 
-		$field_options['allow_edit_cap'] = array(
+		$field_options[ 'allow_edit_cap' ] = array(
 			'type' => 'select',
 			'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ),
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -188,8 +188,8 @@ 
 	 */
 	function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
 
-		if( 'edit' !== $zone ) {
-			$entry_default_fields['delete_link'] = array(
+		if ( 'edit' !== $zone ) {
+			$entry_default_fields[ 'delete_link' ] = array(
 				'label' => __( 'Delete Entry', 'gravityview' ),
 				'type'  => 'delete_link',
 				'desc'  => __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ),
@@ -206,7 +206,7 @@ 
 	 */
 	function add_available_field( $available_fields = array() ) {
 
-		$available_fields['delete_link'] = array(
+		$available_fields[ 'delete_link' ] = array(
 			'label_text' => __( 'Delete Entry', 'gravityview' ),
 			'field_id' => 'delete_link',
 			'label_type' => 'field',
@@ -234,12 +234,12 @@ 
 		$caps = $visibility_caps;
 
 		// If we're configuring fields in the edit context, we want a limited selection
-		if( $field_id === 'delete_link' ) {
+		if ( $field_id === 'delete_link' ) {
 
 			// Remove other built-in caps.
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
 
-			$caps['read'] = _x('Entry Creator', 'User capability', 'gravityview');
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
 		}
 
 		return $caps;
@@ -252,7 +252,7 @@ 
 	 * @param [type] $entry [description]
 	 */
 	function set_entry( $entry = null ) {
-		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[0] : $entry;
+		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[ 0 ] : $entry;
 	}
 
 	/**
@@ -285,7 +285,7 @@ 
 
 		self::getInstance()->set_entry( $entry );
 
-        $base = GravityView_API::directory_link( $post_id ? : $view_id, true );
+        $base = GravityView_API::directory_link( $post_id ?: $view_id, true );
 
 		if ( empty( $base ) ) {
 			gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) );
@@ -293,7 +293,7 @@ 
 		}
 
 		// Use the slug instead of the ID for consistent security
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
 
 		$actionurl = add_query_arg( array(
 			'action'	=> 'delete',
@@ -302,7 +302,7 @@ 
             'view_id' => $view_id,
 		), $base );
 
-		$url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' );
+		$url = wp_nonce_url( $actionurl, 'delete_' . $entry_slug, 'delete' );
 
 		return $url;
 	}
@@ -324,7 +324,7 @@ 
 	public function add_delete_button( $form = array(), $entry = array(), $view_id = null, $post_id = null ) {
 
 		// Only show the link to those who are allowed to see it.
-		if( !self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
+		if ( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
 			return;
 		}
 
@@ -335,13 +335,13 @@ 
 		$show_delete_button = apply_filters( 'gravityview/delete-entry/show-delete-button', true );
 
 		// If the button is hidden by the filter, don't show.
-		if( !$show_delete_button ) {
+		if ( ! $show_delete_button ) {
 			return;
 		}
 
 		$attributes = array(
 			'class' => 'btn btn-sm button button-small alignright pull-right btn-danger gv-button-delete',
-			'tabindex' => ( GFCommon::$tab_index ++ ),
+			'tabindex' => ( GFCommon::$tab_index++ ),
 			'onclick' => self::get_confirm_dialog(),
 		);
 
@@ -365,27 +365,27 @@ 
 	function process_delete() {
 
 		// If the form is submitted
-		if( isset( $_GET['action'] ) && 'delete' === $_GET['action'] && isset( $_GET['entry_id'] ) ) {
+		if ( isset( $_GET[ 'action' ] ) && 'delete' === $_GET[ 'action' ] && isset( $_GET[ 'entry_id' ] ) ) {
 
 			// Make sure it's a GravityView request
-			$valid_nonce_key = wp_verify_nonce( $_GET['delete'], self::get_nonce_key( $_GET['entry_id'] ) );
+			$valid_nonce_key = wp_verify_nonce( $_GET[ 'delete' ], self::get_nonce_key( $_GET[ 'entry_id' ] ) );
 
-			if( ! $valid_nonce_key ) {
+			if ( ! $valid_nonce_key ) {
 				gravityview()->log->debug( 'Delete entry not processed: nonce validation failed.' );
 				return;
 			}
 
 			// Get the entry slug
-			$entry_slug = esc_attr( $_GET['entry_id'] );
+			$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
 
 			// See if there's an entry there
 			$entry = gravityview_get_entry( $entry_slug, true, false );
 
-			if( $entry ) {
+			if ( $entry ) {
 
 				$has_permission = $this->user_can_delete_entry( $entry );
 
-				if( is_wp_error( $has_permission ) ) {
+				if ( is_wp_error( $has_permission ) ) {
 
 					$messages = array(
 						'message' => urlencode( $has_permission->get_error_message() ),
@@ -397,7 +397,7 @@ 
 					// Delete the entry
 					$delete_response = $this->delete_or_trash_entry( $entry );
 
-					if( is_wp_error( $delete_response ) ) {
+					if ( is_wp_error( $delete_response ) ) {
 
 						$messages = array(
 							'message' => urlencode( $delete_response->get_error_message() ),
@@ -419,7 +419,7 @@ 
 				gravityview()->log->debug( 'Delete entry failed: there was no entry with the entry slug {entry_slug}', array( 'entry_slug' => $entry_slug ) );
 
 				$messages = array(
-					'message' => urlencode( __('The entry does not exist.', 'gravityview') ),
+					'message' => urlencode( __( 'The entry does not exist.', 'gravityview' ) ),
 					'status' => 'error',
 				);
 			}
@@ -459,18 +459,18 @@ 
 	 */
 	private function delete_or_trash_entry( $entry ) {
 
-		$entry_id = $entry['id'];
+		$entry_id = $entry[ 'id' ];
 		
 		$mode = $this->get_delete_mode();
 
-		if( 'delete' === $mode ) {
+		if ( 'delete' === $mode ) {
 
 			gravityview()->log->debug( 'Starting delete entry: {entry_id}', array( 'entry_id' => $entry_id ) );
 
 			// Delete the entry
 			$delete_response = GFAPI::delete_entry( $entry_id );
 
-			if( ! is_wp_error( $delete_response ) ) {
+			if ( ! is_wp_error( $delete_response ) ) {
 				$delete_response = 'deleted';
 
 				/**
@@ -491,8 +491,8 @@ 
 			$trashed = GFAPI::update_entry_property( $entry_id, 'status', 'trash' );
 			new GravityView_Cache;
 
-			if( ! $trashed ) {
-				$delete_response = new WP_Error( 'trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview' ) );
+			if ( ! $trashed ) {
+				$delete_response = new WP_Error( 'trash_entry_failed', __( 'Moving the entry to the trash failed.', 'gravityview' ) );
 			} else {
 
 				/**
@@ -523,7 +523,7 @@ 
 	public function process_connected_posts( $entry_id = 0, $entry = array() ) {
 
 		// The entry had no connected post
-		if( empty( $entry['post_id'] ) ) {
+		if ( empty( $entry[ 'post_id' ] ) ) {
 			return;
 		}
 
@@ -534,19 +534,19 @@ 
 		 */
 		$delete_post = apply_filters( 'gravityview/delete-entry/delete-connected-post', true );
 		
-		if( false === $delete_post ) {
+		if ( false === $delete_post ) {
 			return;
 		}
 
 		$action = current_action();
 
-		if( 'gravityview/delete-entry/deleted' === $action ) {
-			$result = wp_delete_post( $entry['post_id'], true );
+		if ( 'gravityview/delete-entry/deleted' === $action ) {
+			$result = wp_delete_post( $entry[ 'post_id' ], true );
 		} else {
-			$result = wp_trash_post( $entry['post_id'] );
+			$result = wp_trash_post( $entry[ 'post_id' ] );
 		}
 
-		if( false === $result ) {
+		if ( false === $result ) {
 			gravityview()->log->error( '(called by {action}): Error processing the Post connected to the entry.', array( 'action' => $action, 'data' => $entry ) );
 		} else {
 			gravityview()->log->debug( '(called by {action}): Successfully processed Post connected to the entry.', array( 'action' => $action, 'data' => $entry ) );
@@ -562,13 +562,13 @@ 
 	public function verify_nonce() {
 
 		// No delete entry request was made
-		if( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) {
 			return false;
 		}
 
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
 
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
+		$valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key );
 
 		/**
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -590,7 +590,7 @@ 
 	 */
 	public static function get_confirm_dialog() {
 
-		$confirm = __('Are you sure you want to delete this entry? This cannot be undone.', 'gravityview');
+		$confirm = __( 'Are you sure you want to delete this entry? This cannot be undone.', 'gravityview' );
 
 		/**
 		 * @filter `gravityview/delete-entry/confirm-text` Modify the Delete Entry Javascript confirmation text
@@ -598,7 +598,7 @@ 
 		 */
 		$confirm = apply_filters( 'gravityview/delete-entry/confirm-text', $confirm );
 
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
 	}
 
 	/**
@@ -616,16 +616,16 @@ 
 
 		$error = NULL;
 
-		if( ! $this->verify_nonce() ) {
-			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview');
+		if ( ! $this->verify_nonce() ) {
+			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview' );
 		}
 
-		if( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
-			$error = __( 'You do not have permission to delete this entry.', 'gravityview');
+		if ( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
+			$error = __( 'You do not have permission to delete this entry.', 'gravityview' );
 		}
 
-		if( $entry['status'] === 'trash' ) {
-			if( 'trash' === $this->get_delete_mode() ) {
+		if ( $entry[ 'status' ] === 'trash' ) {
+			if ( 'trash' === $this->get_delete_mode() ) {
 				$error = __( 'The entry is already in the trash.', 'gravityview' );
 			} else {
 				$error = __( 'You cannot delete the entry; it is already in the trash.', 'gravityview' );
@@ -633,7 +633,7 @@ 
 		}
 
 		// No errors; everything's fine here!
-		if( empty( $error ) ) {
+		if ( empty( $error ) ) {
 			return true;
 		}
 
@@ -661,17 +661,17 @@ 
 			$view = \GV\View::by_id( $view_id );
 		} else {
 			if ( ! $view instanceof \GV\View ) {
-				$view = \GV\View::by_id ( $view );
+				$view = \GV\View::by_id( $view );
 			}
 			$view_id = $view->ID;
 		}
 
 		$current_user = wp_get_current_user();
 
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL;
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL;
 
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
-		if( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
+		if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
 
 			gravityview()->log->debug( 'Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' );
 
@@ -680,20 +680,20 @@ 
 
 
 		// If field options are passed, check if current user can view the link
-		if( !empty( $field ) ) {
+		if ( ! empty( $field ) ) {
 
 			// If capability is not defined, something is not right!
-			if( empty( $field['allow_edit_cap'] ) ) {
+			if ( empty( $field[ 'allow_edit_cap' ] ) ) {
 
 				gravityview()->log->error( 'Cannot read delete entry field caps', array( 'data' => $field ) );
 
 				return false;
 			}
 
-			if( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
+			if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) {
 
 				// Do not return true if cap is read, as we need to check if the current user created the entry
-				if( $field['allow_edit_cap'] !== 'read' ) {
+				if ( $field[ 'allow_edit_cap' ] !== 'read' ) {
 					return true;
 				}
 
@@ -706,9 +706,9 @@ 
 
 		}
 
-		if( !isset( $entry['created_by'] ) ) {
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
 
-			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
+			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
 
 			return false;
 		}
@@ -725,7 +725,7 @@ 
 		}
 
 		// If the logged-in user is the same as the user who created the entry, we're good.
-		if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
 
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
 
@@ -750,16 +750,16 @@ 
 	 */
 	public function display_message( $current_view_id = 0 ) {
 
-		if( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
 			return;
 		}
 
 		// Entry wasn't deleted from current View
-		if( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) {
+		if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) {
 			return;
 		}
 
-		$status = esc_attr( $_GET['status'] );
+		$status = esc_attr( $_GET[ 'status' ] );
 		$message_from_url = \GV\Utils::_GET( 'message' );
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
 		$class = '';
@@ -767,14 +767,14 @@ 
 		switch ( $status ) {
 			case 'error':
 				$class = ' gv-error error';
-				$error_message = __('There was an error deleting the entry: %s', 'gravityview');
+				$error_message = __( 'There was an error deleting the entry: %s', 'gravityview' );
 				$message = sprintf( $error_message, $message_from_url );
 				break;
 			case 'trashed':
-				$message = __('The entry was successfully moved to the trash.', 'gravityview');
+				$message = __( 'The entry was successfully moved to the trash.', 'gravityview' );
 				break;
 			default:
-				$message = __('The entry was successfully deleted.', 'gravityview');
+				$message = __( 'The entry was successfully deleted.', 'gravityview' );
 				break;
 		}
 
@@ -788,7 +788,7 @@ 
 		$message = apply_filters( 'gravityview/delete-entry/message', esc_attr( $message ), $status, $message_from_url );
 
 		// DISPLAY ERROR/SUCCESS MESSAGE
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
 	}
 
 

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

Spacing +18 added lines, -18 removed lines

@@ -36,7 +36,7 @@ 
 
         self::$file = plugin_dir_path( __FILE__ );
 
-        if( is_admin() ) {
+        if ( is_admin() ) {
             $this->load_components( 'admin' );
         }
 
@@ -57,7 +57,7 @@ 
 
     static function getInstance() {
 
-        if( empty( self::$instance ) ) {
+        if ( empty( self::$instance ) ) {
             self::$instance = new GravityView_Edit_Entry;
         }
 
@@ -83,10 +83,10 @@ 
     private function add_hooks() {
 
         // Add front-end access to Gravity Forms delete file action
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
+        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file' ) );
 
         // Make sure this hook is run for non-admins
-        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
+        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file' ) );
 
         add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
 
@@ -103,8 +103,8 @@ 
 	 */
 	private function addon_specific_hooks() {
 
-		if( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
-			add_filter('gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script'));
+		if ( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
+			add_filter( 'gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script' ) );
 		}
 
 	}
@@ -194,15 +194,15 @@ 
      */
     public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
 
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
+        $nonce_key = self::get_nonce_key( $view_id, $entry[ 'form_id' ], $entry[ 'id' ] );
 
-        $base = gv_entry_link( $entry, $post_id ? : $view_id  );
+        $base = gv_entry_link( $entry, $post_id ?: $view_id );
 
         $url = add_query_arg( array(
             'edit' => wp_create_nonce( $nonce_key )
         ), $base );
 
-        if( $post_id ) {
+        if ( $post_id ) {
 	        $url = add_query_arg( array( 'gvid' => $view_id ), $url );
         }
 
@@ -210,9 +210,9 @@ 
 	     * Allow passing params to dynamically populate entry with values
 	     * @since 1.9.2
 	     */
-	    if( !empty( $field_values ) ) {
+	    if ( ! empty( $field_values ) ) {
 
-		    if( is_array( $field_values ) ) {
+		    if ( is_array( $field_values ) ) {
 			    // If already an array, no parse_str() needed
 			    $params = $field_values;
 		    } else {
@@ -233,7 +233,7 @@ 
 	 */
 	public function modify_field_blacklist( $fields = array(), $context = NULL ) {
 
-		if( empty( $context ) || $context !== 'edit' ) {
+		if ( empty( $context ) || $context !== 'edit' ) {
 			return $fields;
 		}
 
@@ -311,15 +311,15 @@ 
         // If they can edit any entries (as defined in Gravity Forms)
         // Or if they can edit other people's entries
         // Then we're good.
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
+        if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry[ 'id' ] ) ) {
 
             gravityview()->log->debug( 'User has ability to edit all entries.' );
 
             $user_can_edit = true;
 
-        } else if( !isset( $entry['created_by'] ) ) {
+        } else if ( ! isset( $entry[ 'created_by' ] ) ) {
 
-            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
+            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
 
             $user_can_edit = false;
 
@@ -329,7 +329,7 @@ 
             $current_user = wp_get_current_user();
 
             // User edit is disabled
-            if( empty( $user_edit ) ) {
+            if ( empty( $user_edit ) ) {
 
                 gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
 
@@ -337,13 +337,13 @@ 
             }
 
             // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
+            else if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
 
                 gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
 
                 $user_can_edit = true;
 
-            } else if( ! is_user_logged_in() ) {
+            } else if ( ! is_user_logged_in() ) {
 
                 gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
             }

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

Spacing +242 added lines, -242 removed lines

@@ -135,16 +135,16 @@ 
 	function load() {
 
 		/** @define "GRAVITYVIEW_DIR" "../../../" */
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
 
 		// Don't display an embedded form when editing an entry
 		add_action( 'wp_head', array( $this, 'prevent_render_form' ) );
 		add_action( 'wp_footer', array( $this, 'prevent_render_form' ) );
 
 		// Stop Gravity Forms processing what is ours!
-		add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 );
+		add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 );
 
-		add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') );
+		add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) );
 
 		add_action( 'gravityview_edit_entry', array( $this, 'init' ), 10, 4 );
 
@@ -155,7 +155,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 );
@@ -172,8 +172,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' );
@@ -188,14 +188,14 @@ 
 	 */
 	public function prevent_maybe_process_form() {
 
-	    if( ! $this->is_edit_entry_submission() ) {
+	    if ( ! $this->is_edit_entry_submission() ) {
 			return;
 		}
 
 		gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] Removing GFForms::maybe_process_form() action.' );
 
-		remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
-		remove_action( 'wp',  array( 'GFForms', 'maybe_process_form'), 9 );
+		remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 );
+		remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 );
 	}
 
 	/**
@@ -204,7 +204,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() );
 	}
@@ -215,7 +215,7 @@ 
 	 * @return boolean
 	 */
 	public function is_edit_entry_submission() {
-		return !empty( $_POST[ self::$nonce_field ] );
+		return ! empty( $_POST[ self::$nonce_field ] );
 	}
 
 	/**
@@ -228,16 +228,16 @@ 
 
 
 		$entries = $gravityview_view->getEntries();
-	    self::$original_entry = $entries[0];
-	    $this->entry = $entries[0];
+	    self::$original_entry = $entries[ 0 ];
+	    $this->entry = $entries[ 0 ];
 
 		self::$original_form = $gravityview_view->getForm();
 		$this->form = $gravityview_view->getForm();
-		$this->form_id = $this->entry['form_id'];
+		$this->form_id = $this->entry[ 'form_id' ];
 		$this->view_id = $gravityview_view->getViewId();
 		$this->post_id = \GV\Utils::get( $post, 'ID', null );
 
-		self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] );
+		self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] );
 	}
 
 
@@ -296,9 +296,9 @@ 
 	private function print_scripts() {
 		$gravityview_view = GravityView_View::getInstance();
 
-		wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
+		wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
 
-		GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false);
+		GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false );
 
 		wp_localize_script( 'gravityview-fe-view', 'gvGlobals', array( 'cookiepath' => COOKIEPATH ) );
 
@@ -314,19 +314,19 @@ 
 	 */
 	private function process_save( $gv_data ) {
 
-		if ( empty( $_POST ) || ! isset( $_POST['lid'] ) ) {
+		if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) {
 			return;
 		}
 
 		// Make sure the entry, view, and form IDs are all correct
 		$valid = $this->verify_nonce();
 
-		if ( !$valid ) {
+		if ( ! $valid ) {
 			gravityview()->log->error( 'Nonce validation failed.' );
 			return;
 		}
 
-		if ( $this->entry['id'] !== $_POST['lid'] ) {
+		if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) {
 			gravityview()->log->error( 'Entry ID did not match posted entry ID.' );
 			return;
 		}
@@ -337,7 +337,7 @@ 
 
 		$this->validate();
 
-		if( $this->is_valid ) {
+		if ( $this->is_valid ) {
 
 			gravityview()->log->debug( 'Submission is valid.' );
 
@@ -349,15 +349,15 @@ 
 			/**
 			 * @hack to avoid the capability validation of the method save_lead for GF 1.9+
 			 */
-			unset( $_GET['page'] );
+			unset( $_GET[ 'page' ] );
 
-			$date_created = $this->entry['date_created'];
+			$date_created = $this->entry[ 'date_created' ];
 
 			/**
 			 * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead()
 			 * @since 1.17.2
 			 */
-			unset( $this->entry['date_created'] );
+			unset( $this->entry[ 'date_created' ] );
 
 			/**
 			 * @action `gravityview/edit_entry/before_update` Perform an action after the entry has been updated using Edit Entry
@@ -367,14 +367,14 @@ 
 			 * @param GravityView_Edit_Entry_Render $this This object
 			 * @param GravityView_View_Data $gv_data The View data
 			 */
-			do_action( 'gravityview/edit_entry/before_update', $form, $this->entry['id'], $this, $gv_data );
+			do_action( 'gravityview/edit_entry/before_update', $form, $this->entry[ 'id' ], $this, $gv_data );
 
 			GFFormsModel::save_lead( $form, $this->entry );
 
 	        // Delete the values for hidden inputs
 	        $this->unset_hidden_field_values();
 			
-			$this->entry['date_created'] = $date_created;
+			$this->entry[ 'date_created' ] = $date_created;
 
 			// Process calculation fields
 			$this->update_calculation_fields();
@@ -399,7 +399,7 @@ 
 			 * @param GravityView_Edit_Entry_Render $this This object
 			 * @param GravityView_View_Data $gv_data The View data
 			 */
-			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this, $gv_data );
+			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this, $gv_data );
 
 		} else {
 			gravityview()->log->error( 'Submission is NOT valid.', array( 'entry' => $this->entry ) );
@@ -435,10 +435,10 @@ 
 
 		if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
 			$entry_meta_table = GFFormsModel::get_entry_meta_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry[ 'id' ] ) );
 		} else {
 			$lead_detail_table = GFFormsModel::get_lead_details_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) );
 		}
 
 	    foreach ( $this->entry as $input_id => $field_value ) {
@@ -456,11 +456,11 @@ 
 
 				$empty_value = $field->get_value_save_entry(
 					is_array( $field->get_entry_inputs() ) ? array() : '',
-					$this->form, '', $this->entry['id'], $this->entry
+					$this->form, '', $this->entry[ 'id' ], $this->entry
 				);
 
 				if ( $field->has_calculation() ) {
-					$this->unset_hidden_calculations[] = $field->id; // Unset
+					$this->unset_hidden_calculations[ ] = $field->id; // Unset
 					$empty_value = '';
 				}
 
@@ -489,7 +489,7 @@ 
 	private function preset_approval_fields() {
 		$has_approved_field = false;
 
-		foreach ( self::$original_form['fields'] as $field ) {
+		foreach ( self::$original_form[ 'fields' ] as $field ) {
 			if ( $field->gravityview_approved ) {
 				$has_approved_field = true;
 				break;
@@ -502,7 +502,7 @@ 
 
 		$is_field_hidden = true;
 
-		foreach ( $this->form['fields'] as $field ) {
+		foreach ( $this->form[ 'fields' ] as $field ) {
 			if ( $field->gravityview_approved ) {
 				$is_field_hidden = false;
 				break;
@@ -527,7 +527,7 @@ 
 		
 		remove_filter( 'gravityview/approve_entries/update_unapproved_meta', array( $this, 'prevent_update_unapproved_meta' ), 9 );
 		
-		if ( ! $value = gform_get_meta( $entry['id'], 'is_approved' ) ) {
+		if ( ! $value = gform_get_meta( $entry[ 'id' ], 'is_approved' ) ) {
 			
 			$value = GravityView_Entry_Approval_Status::UNAPPROVED;
 			
@@ -592,7 +592,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 ];
 		}
@@ -610,11 +610,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;
 	}
@@ -629,27 +629,27 @@ 
 		$form = $this->filter_conditional_logic( $this->form );
 
 	    /** @var GF_Field $field */
-		foreach( $form['fields'] as $k => &$field ) {
+		foreach ( $form[ 'fields' ] as $k => &$field ) {
 
 			/**
 			 * Remove the fields with calculation formulas before save to avoid conflicts with GF logic
 			 * @since 1.16.3
 			 * @var GF_Field $field
 			 */
-			if( $field->has_calculation() ) {
-				unset( $form['fields'][ $k ] );
+			if ( $field->has_calculation() ) {
+				unset( $form[ 'fields' ][ $k ] );
 			}
 
 			$field->adminOnly = false;
 
-			if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
-				foreach( $field->inputs as $key => $input ) {
-				    $field->inputs[ $key ][ 'id' ] = (string)$input['id'];
+			if ( isset( $field->inputs ) && is_array( $field->inputs ) ) {
+				foreach ( $field->inputs as $key => $input ) {
+				    $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ];
 				}
 			}
 		}
 
-		$form['fields'] = array_values( $form['fields'] );
+		$form[ 'fields' ] = array_values( $form[ 'fields' ] );
 
 		return $form;
 	}
@@ -661,14 +661,14 @@ 
 		$update = false;
 
 		// get the most up to date entry values
-		$entry = GFAPI::get_entry( $this->entry['id'] );
+		$entry = GFAPI::get_entry( $this->entry[ 'id' ] );
 
 		if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
 			$entry_meta_table = GFFormsModel::get_entry_meta_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry[ 'id' ] ) );
 		} else {
 			$lead_detail_table = GFFormsModel::get_lead_details_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry[ 'id' ] ) );
 		}
 
 
@@ -685,24 +685,24 @@ 
 				$inputs = $field->get_entry_inputs();
 				if ( is_array( $inputs ) ) {
 				    foreach ( $inputs as $input ) {
-						list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 );
+						list( $field_id, $input_id ) = rgexplode( '.', $input[ 'id' ], 2 );
 
 						if ( 'product' === $field->type ) {
-							$input_name = 'input_' . str_replace( '.', '_', $input['id'] );
+							$input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] );
 
 							// Only allow quantity to be set if it's allowed to be edited
 							if ( in_array( $field_id, $allowed_fields ) && $input_id == 3 ) {
 							} else { // otherwise set to what it previously was
-								$_POST[ $input_name ] = $entry[ $input['id'] ];
+								$_POST[ $input_name ] = $entry[ $input[ 'id' ] ];
 							}
 						} else {
 							// Set to what it previously was if it's not editable
 							if ( ! in_array( $field_id, $allowed_fields ) ) {
-								$_POST[ $input_name ] = $entry[ $input['id'] ];
+								$_POST[ $input_name ] = $entry[ $input[ 'id' ] ];
 							}
 						}
 
-						GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] );
+						GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input[ 'id' ] );
 				    }
 				} else {
 					// Set to what it previously was if it's not editable
@@ -742,19 +742,19 @@ 
 
 		$input_name = 'input_' . $field_id;
 
-		if ( !empty( $_FILES[ $input_name ]['name'] ) ) {
+		if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) {
 
 			// We have a new image
 
-			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] );
+			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] );
 
 			$ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
 	        $ary = stripslashes_deep( $ary );
 			$img_url = \GV\Utils::get( $ary, 0 );
 
-			$img_title       = count( $ary ) > 1 ? $ary[1] : '';
-			$img_caption     = count( $ary ) > 2 ? $ary[2] : '';
-			$img_description = count( $ary ) > 3 ? $ary[3] : '';
+			$img_title       = count( $ary ) > 1 ? $ary[ 1 ] : '';
+			$img_caption     = count( $ary ) > 2 ? $ary[ 2 ] : '';
+			$img_description = count( $ary ) > 3 ? $ary[ 3 ] : '';
 
 			$image_meta = array(
 				'post_excerpt' => $img_caption,
@@ -763,7 +763,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;
 			}
 
 			/**
@@ -821,15 +821,15 @@ 
 	 */
 	private function maybe_update_post_fields( $form ) {
 
-		if( empty( $this->entry['post_id'] ) ) {
+		if ( empty( $this->entry[ 'post_id' ] ) ) {
 	        gravityview()->log->debug( 'This entry has no post fields. Continuing...' );
 			return;
 		}
 
-		$post_id = $this->entry['post_id'];
+		$post_id = $this->entry[ 'post_id' ];
 
 		// Security check
-		if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
+		if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
 			gravityview()->log->error( 'The current user does not have the ability to edit Post #{post_id}', array( 'post_id' => $post_id ) );
 			return;
 		}
@@ -842,25 +842,25 @@ 
 
 			$field = RGFormsModel::get_field( $form, $field_id );
 
-			if( ! $field ) {
+			if ( ! $field ) {
 				continue;
 			}
 
-			if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) {
+			if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) {
 
 				// Get the value of the field, including $_POSTed value
 				$value = RGFormsModel::get_field_value( $field );
 
 				// Use temporary entry variable, to make values available to fill_post_template() and update_post_image()
 				$entry_tmp = $this->entry;
-				$entry_tmp["{$field_id}"] = $value;
+				$entry_tmp[ "{$field_id}" ] = $value;
 
-				switch( $field->type ) {
+				switch ( $field->type ) {
 
 				    case 'post_title':
 				        $post_title = $value;
 				        if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) {
-				            $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
+				            $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp );
 				        }
 				        $updated_post->post_title = $post_title;
 				        $updated_post->post_name  = $post_title;
@@ -870,7 +870,7 @@ 
 				    case 'post_content':
 				        $post_content = $value;
 				        if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) {
-				            $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
+				            $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true );
 				        }
 				        $updated_post->post_content = $post_content;
 				        unset( $post_content );
@@ -888,11 +888,11 @@ 
 							$value = $value[ $field_id ];
 						}
 
-				        if( ! empty( $field->customFieldTemplateEnabled ) ) {
+				        if ( ! empty( $field->customFieldTemplateEnabled ) ) {
 				            $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
 				        }
 
-						$value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry );
+						$value = $field->get_value_save_entry( $value, $form, '', $this->entry[ 'id' ], $this->entry );
 
 				        update_post_meta( $post_id, $field->postCustomFieldName, $value );
 				        break;
@@ -904,7 +904,7 @@ 
 				}
 
 				// update entry after
-				$this->entry["{$field_id}"] = $value;
+				$this->entry[ "{$field_id}" ] = $value;
 
 				$update_entry = true;
 
@@ -913,11 +913,11 @@ 
 
 		}
 
-		if( $update_entry ) {
+		if ( $update_entry ) {
 
 			$return_entry = GFAPI::update_entry( $this->entry );
 
-			if( is_wp_error( $return_entry ) ) {
+			if ( is_wp_error( $return_entry ) ) {
 				gravityview()->log->error( 'Updating the entry post fields failed', array( 'data' => array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) ) );
 			} else {
 				gravityview()->log->debug( 'Updating the entry post fields for post #{post_id} succeeded', array( 'post_id' => $post_id ) );
@@ -927,7 +927,7 @@ 
 
 		$return_post = wp_update_post( $updated_post, true );
 
-		if( is_wp_error( $return_post ) ) {
+		if ( is_wp_error( $return_post ) ) {
 			$return_post->add_data( $updated_post, '$updated_post' );
 			gravityview()->log->error( 'Updating the post content failed', array( 'data' => compact( 'updated_post', 'return_post' ) ) );
 		} else {
@@ -961,7 +961,7 @@ 
 		$output = GFCommon::replace_variables( $output, $form, $entry, false, false, false );
 
 		// replace conditional shortcodes
-		if( $do_shortcode ) {
+		if ( $do_shortcode ) {
 			$output = do_shortcode( $output );
 		}
 
@@ -980,19 +980,19 @@ 
 	 */
 	private function after_update() {
 
-		do_action( 'gform_after_update_entry', self::$original_form, $this->entry['id'], self::$original_entry );
-		do_action( "gform_after_update_entry_{$this->form['id']}", self::$original_form, $this->entry['id'], self::$original_entry );
+		do_action( 'gform_after_update_entry', self::$original_form, $this->entry[ 'id' ], self::$original_entry );
+		do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", self::$original_form, $this->entry[ 'id' ], self::$original_entry );
 
 		// Re-define the entry now that we've updated it.
-		$entry = RGFormsModel::get_lead( $this->entry['id'] );
+		$entry = RGFormsModel::get_lead( $this->entry[ 'id' ] );
 
 		$entry = GFFormsModel::set_entry_meta( $entry, self::$original_form );
 
 		if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '<' ) ) {
 			// We need to clear the cache because Gravity Forms caches the field values, which
 			// we have just updated.
-			foreach ($this->form['fields'] as $key => $field) {
-				GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id );
+			foreach ( $this->form[ 'fields' ] as $key => $field ) {
+				GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id );
 			}
 		}
 
@@ -1002,11 +1002,11 @@ 
 		 * @since develop
 		 */
 		if ( $allowed_feeds = $this->view->settings->get( 'edit_feeds', array() ) ) {
-			$feeds = GFAPI::get_feeds( null, $entry['form_id'] );
+			$feeds = GFAPI::get_feeds( null, $entry[ 'form_id' ] );
 			if ( ! is_wp_error( $feeds ) ) {
 				$registered_feeds = array();
 				foreach ( GFAddOn::get_registered_addons() as $registered_feed ) {
-					if ( is_subclass_of( $registered_feed,  'GFFeedAddOn' ) ) {
+					if ( is_subclass_of( $registered_feed, 'GFFeedAddOn' ) ) {
 						if ( method_exists( $registered_feed, 'get_instance' ) ) {
 							$registered_feed = call_user_func( array( $registered_feed, 'get_instance' ) );
 							$registered_feeds[ $registered_feed->get_slug() ] = $registered_feed;
@@ -1014,8 +1014,8 @@ 
 					}
 				}
 				foreach ( $feeds as $feed ) {
-					if ( in_array( $feed['id'], $allowed_feeds ) ) {
-						if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed['addon_slug'] ) ) {
+					if ( in_array( $feed[ 'id' ], $allowed_feeds ) ) {
+						if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed[ 'addon_slug' ] ) ) {
 							$returned_entry = $feed_object->process_feed( $feed, $entry, self::$original_form );
 							if ( is_array( $returned_entry ) && rgar( $returned_entry, 'id' ) ) {
 								$entry = $returned_entry;
@@ -1045,7 +1045,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
@@ -1061,7 +1061,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>
@@ -1127,18 +1127,18 @@ 
 				*/
 				$labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id );
 
-				$this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels['submit'];
+				$this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels[ 'submit' ];
 			}
 
 			$back_link = remove_query_arg( array( 'page', 'view', 'edit' ) );
 
-			if( ! $this->is_valid ){
+			if ( ! $this->is_valid ) {
 
 				// Keeping this compatible with Gravity Forms.
-				$validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>";
-				$message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form);
+				$validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>";
+				$message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form );
 
-				echo GVCommon::generate_notice( $message , 'gv-error' );
+				echo GVCommon::generate_notice( $message, 'gv-error' );
 
 			} elseif ( false === $this->is_paged_submitted ) {
 				// Paged form that hasn't been submitted on the last page yet
@@ -1151,7 +1151,7 @@ 
 				 * @param int $view_id View ID
 				 * @param array $entry Gravity Forms entry array
 				 */
-				$message = apply_filters( 'gravityview/edit_entry/page/success', $entry_updated_message , $this->view_id, $this->entry );
+				$message = apply_filters( 'gravityview/edit_entry/page/success', $entry_updated_message, $this->view_id, $this->entry );
 
 				echo GVCommon::generate_notice( $message );
 			} else {
@@ -1163,23 +1163,23 @@ 
 
                     case '0':
 	                    $redirect_url = $back_link;
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' );
+	                    $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', '</a>' );
                         break;
 
                     case '1':
 	                    $redirect_url = $directory_link = GravityView_API::directory_link();
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' );
+	                    $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' );
 	                    break;
 
                     case '2':
 	                    $redirect_url = $edit_redirect_url;
 	                    $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' );
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' );
+	                    $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' );
                         break;
 
                     case '':
                     default:
-					    $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' );
+					    $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . esc_url( $back_link ) . '">', '</a>' );
                         break;
 				}
 
@@ -1195,7 +1195,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 );
 			}
@@ -1219,8 +1219,8 @@ 
 		 */
 		do_action( 'gravityview/edit-entry/render/before', $this );
 
-		add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 );
-		add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') );
+		add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 );
+		add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
 		add_filter( 'gform_next_button', array( $this, 'render_form_buttons' ) );
 		add_filter( 'gform_previous_button', array( $this, 'render_form_buttons' ) );
 		add_filter( 'gform_disable_view_counter', '__return_true' );
@@ -1229,14 +1229,14 @@ 
 		add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 );
 
 		// We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
-		unset( $_GET['page'] );
+		unset( $_GET[ 'page' ] );
 
 		$this->show_next_button = false;
 		$this->show_previous_button = false;
 
 		// TODO: Verify multiple-page forms
 		if ( GFCommon::has_pages( $this->form ) && apply_filters( 'gravityview/features/paged-edit', false ) ) {
-			if ( intval( $page_number = \GV\Utils::_POST( 'gform_source_page_number_' . $this->form['id'], 0 ) ) ) {
+			if ( intval( $page_number = \GV\Utils::_POST( 'gform_source_page_number_' . $this->form[ 'id' ], 0 ) ) ) {
 
 				$labels = array(
 					'cancel'   => __( 'Cancel', 'gravityview' ),
@@ -1255,20 +1255,20 @@ 
 				*/
 				$labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id );
 
-				GFFormDisplay::$submission[ $this->form['id'] ][ 'form' ] = $this->form;
-				GFFormDisplay::$submission[ $this->form['id'] ][ 'is_valid' ] = true;
+				GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'form' ] = $this->form;
+				GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'is_valid' ] = true;
 
-				if ( \GV\Utils::_POST( 'save' ) === $labels['next'] ) {
+				if ( \GV\Utils::_POST( 'save' ) === $labels[ 'next' ] ) {
 					$last_page = \GFFormDisplay::get_max_page_number( $this->form );
 
 					while ( ++$page_number < $last_page && RGFormsModel::is_page_hidden( $this->form, $page_number, \GV\Utils::_POST( 'gform_field_values' ) ) ) {
 					} // Advance to next visible page
-				} elseif ( \GV\Utils::_POST( 'save' ) === $labels['previous'] ) {
+				} elseif ( \GV\Utils::_POST( 'save' ) === $labels[ 'previous' ] ) {
 					while ( --$page_number > 1 && RGFormsModel::is_page_hidden( $this->form, $page_number, \GV\Utils::_POST( 'gform_field_values' ) ) ) {
 					} // Advance to next visible page
 				}
 
-				GFFormDisplay::$submission[ $this->form['id'] ]['page_number'] = $page_number;
+				GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'page_number' ] = $page_number;
 			}
 
 			if ( ( $page_number = intval( $page_number ) ) < 2 ) {
@@ -1294,7 +1294,7 @@ 
 
 		ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic
 
-		$html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
+		$html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry );
 
 		ob_get_clean();
 
@@ -1322,7 +1322,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 );
 	}
 
 
@@ -1341,15 +1341,15 @@ 
 	 */
 	public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) {
 
-		if( $form['id'] != $this->form_id ) {
+		if ( $form[ 'id' ] != $this->form_id ) {
 			return $form;
 		}
 
 		// In case we have validated the form, use it to inject the validation results into the form render
-		if( isset( $this->form_after_validation ) && $this->form_after_validation['id'] === $form['id'] ) {
+		if ( isset( $this->form_after_validation ) && $this->form_after_validation[ 'id' ] === $form[ 'id' ] ) {
 			$form = $this->form_after_validation;
 		} else {
-			$form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id );
+			$form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id );
 		}
 
 		$form = $this->filter_conditional_logic( $form );
@@ -1357,8 +1357,8 @@ 
 		$form = $this->prefill_conditional_logic( $form );
 
 		// for now we don't support Save and Continue feature.
-		if( ! self::$supports_save_and_continue ) {
-	        unset( $form['save'] );
+		if ( ! self::$supports_save_and_continue ) {
+	        unset( $form[ 'save' ] );
 		}
 
 		$form = $this->unselect_default_values( $form );
@@ -1381,31 +1381,31 @@ 
 	 */
 	public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
 
-		if( ! GFCommon::is_post_field( $field ) ) {
+		if ( ! GFCommon::is_post_field( $field ) ) {
 			return $field_content;
 		}
 
         $message = null;
 
         // First, make sure they have the capability to edit the post.
-        if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
+        if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) {
 
             /**
              * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
              * @param string $message The existing "You don't have permission..." text
              */
-            $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
+            $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don&rsquo;t have permission to edit this post.', 'gravityview' ) );
 
-        } elseif( null === get_post( $this->entry['post_id'] ) ) {
+        } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) {
             /**
              * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
              * @param string $message The existing "This field is not editable; the post no longer exists." text
              */
-            $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
+            $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) );
         }
 
-        if( $message ) {
-            $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
+        if ( $message ) {
+            $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
         }
 
         return $field_content;
@@ -1429,8 +1429,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 )
@@ -1450,7 +1450,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 );
@@ -1459,7 +1459,7 @@ 
 	    // If there was output, it's an error
 	    $warnings = ob_get_clean();
 
-	    if( !empty( $warnings ) ) {
+	    if ( ! empty( $warnings ) ) {
 		    gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) );
 	    }
 
@@ -1484,7 +1484,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();
 
@@ -1493,10 +1493,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;
 				}
 
@@ -1504,7 +1504,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 {
 
@@ -1515,13 +1515,13 @@ 
 
 			// saved field entry value (if empty, fallback to the pre-populated value, if exists)
 			// or pre-populated value if not empty and set to override saved value
-			$field_value = isset( $this->entry[ $id ] ) && ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
+			$field_value = isset( $this->entry[ $id ] ) && ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
 
 			// in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs.
-			if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) {
+			if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) {
 				$categories = array();
 				foreach ( explode( ',', $field_value ) as $cat_string ) {
-				    $categories[] = GFCommon::format_post_category( $cat_string, true );
+				    $categories[ ] = GFCommon::format_post_category( $cat_string, true );
 				}
 				$field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
 			}
@@ -1549,7 +1549,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;
 	}
@@ -1566,12 +1566,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.
@@ -1579,7 +1579,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.
@@ -1593,26 +1593,26 @@ 
 				    // Set the previous value
 				    $entry = $this->get_entry();
 
-				    $input_name = 'input_'.$field->id;
-				    $form_id = $form['id'];
+				    $input_name = 'input_' . $field->id;
+				    $form_id = $form[ 'id' ];
 
 				    $value = NULL;
 
 				    // Use the previous entry value as the default.
-				    if( isset( $entry[ $field->id ] ) ) {
+				    if ( isset( $entry[ $field->id ] ) ) {
 				        $value = $entry[ $field->id ];
 				    }
 
 				    // If this is a single upload file
-				    if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
-				        $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
-				        $value = $file_path['url'];
+				    if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) {
+				        $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] );
+				        $value = $file_path[ 'url' ];
 
 				    } else {
 
 				        // Fix PHP warning on line 1498 of form_display.php for post_image fields
 				        // Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
-				        $_FILES[ $input_name ] = array('name' => '', 'size' => '' );
+				        $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' );
 
 				    }
 
@@ -1620,10 +1620,10 @@ 
 
 				        // If there are fresh uploads, process and merge them.
 				        // Otherwise, use the passed values, which should be json-encoded array of URLs
-				        if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
+				        if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
 				            $value = empty( $value ) ? '[]' : $value;
 				            $value = stripslashes_deep( $value );
-				            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
+				            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() );
 				        }
 
 				    } else {
@@ -1641,8 +1641,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;
 			}
@@ -1679,7 +1679,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;
@@ -1687,14 +1687,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 );
 	}
 
 
@@ -1717,7 +1717,7 @@ 
 
 		$gv_valid = true;
 
-		foreach ( $validation_results['form']['fields'] as $key => &$field ) {
+		foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) {
 
 			$value = RGFormsModel::get_field_value( $field );
 			$field_type = RGFormsModel::get_input_type( $field );
@@ -1730,22 +1730,22 @@ 
 				case 'post_image':
 
 				    // in case nothing is uploaded but there are already files saved
-				    if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
+				    if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) {
 				        $field->failed_validation = false;
 				        unset( $field->validation_message );
 				    }
 
 				    // validate if multi file upload reached max number of files [maxFiles] => 2
-				    if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) {
+				    if ( \GV\Utils::get( $field, 'maxFiles' ) && \GV\Utils::get( $field, 'multipleFiles' ) ) {
 
 				        $input_name = 'input_' . $field->id;
 				        //uploaded
-				        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
+				        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array();
 
 				        //existent
 				        $entry = $this->get_entry();
 				        $value = NULL;
-				        if( isset( $entry[ $field->id ] ) ) {
+				        if ( isset( $entry[ $field->id ] ) ) {
 				            $value = json_decode( $entry[ $field->id ], true );
 				        }
 
@@ -1753,13 +1753,13 @@ 
 				        $count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) +
 						               ( is_array( $value ) ? count( $value ) : 0 );
 
-				        if( $count_files > $field->maxFiles ) {
+				        if ( $count_files > $field->maxFiles ) {
 				            $field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
 				            $field->failed_validation = 1;
 				            $gv_valid = false;
 
 				            // in case of error make sure the newest upload files are removed from the upload input
-				            GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
+				            GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null;
 				        }
 
 				    }
@@ -1770,7 +1770,7 @@ 
 			}
 
 			// This field has failed validation.
-			if( !empty( $field->failed_validation ) ) {
+			if ( ! empty( $field->failed_validation ) ) {
 
 				gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'data' => array( 'field' => $field, 'value' => $value ) ) );
 
@@ -1788,19 +1788,19 @@ 
 				}
 
 				// You can't continue inside a switch, so we do it after.
-				if( empty( $field->failed_validation ) ) {
+				if ( empty( $field->failed_validation ) ) {
 				    continue;
 				}
 
 				// checks if the No Duplicates option is not validating entry against itself, since
 				// we're editing a stored entry, it would also assume it's a duplicate.
-				if( !empty( $field->noDuplicates ) ) {
+				if ( ! empty( $field->noDuplicates ) ) {
 
 				    $entry = $this->get_entry();
 
 				    // If the value of the entry is the same as the stored value
 				    // Then we can assume it's not a duplicate, it's the same.
-				    if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
+				    if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) {
 				        //if value submitted was not changed, then don't validate
 				        $field->failed_validation = false;
 
@@ -1813,7 +1813,7 @@ 
 				}
 
 				// if here then probably we are facing the validation 'At least one field must be filled out'
-				if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
+				if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) {
 				    unset( $field->validation_message );
 	                $field->validation_message = false;
 				    continue;
@@ -1825,12 +1825,12 @@ 
 
 		}
 
-		$validation_results['is_valid'] = $gv_valid;
+		$validation_results[ 'is_valid' ] = $gv_valid;
 
 		gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Validation results.', array( 'data' => $validation_results ) );
 
 		// We'll need this result when rendering the form ( on GFFormDisplay::get_form )
-		$this->form_after_validation = $validation_results['form'];
+		$this->form_after_validation = $validation_results[ 'form' ];
 
 		return $validation_results;
 	}
@@ -1843,7 +1843,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() );
 		}
@@ -1875,10 +1875,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 );
@@ -1911,7 +1911,7 @@ 
 	 */
 	private function filter_fields( $fields, $configured_fields ) {
 
-		if( empty( $fields ) || !is_array( $fields ) ) {
+		if ( empty( $fields ) || ! is_array( $fields ) ) {
 			return $fields;
 		}
 
@@ -1928,12 +1928,12 @@ 
 
 			// Remove the fields that have calculation properties and keep them to be used later
 			// @since 1.16.2
-			if( $field->has_calculation() ) {
-				$this->fields_with_calculation[] = $field;
+			if ( $field->has_calculation() ) {
+				$this->fields_with_calculation[ ] = $field;
 				// don't remove the calculation fields on form render.
 			}
 
-			if( in_array( $field->type, $field_type_blacklist ) ) {
+			if ( in_array( $field->type, $field_type_blacklist ) ) {
 				unset( $fields[ $key ] );
 			}
 		}
@@ -1951,7 +1951,7 @@ 
 					continue; // Same
 				}
 
-				$out_fields[] = $field;
+				$out_fields[ ] = $field;
 			}
 
 			return array_values( $out_fields );
@@ -1962,8 +1962,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;
 				}
 
@@ -1986,14 +1986,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' ] );
 		}
 
 		/**
@@ -2031,16 +2031,16 @@ 
 	     */
 	    $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
 
-	    if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
-			foreach( $fields as $k => $field ) {
-				if( $field->adminOnly ) {
+	    if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) {
+			foreach ( $fields as $k => $field ) {
+				if ( $field->adminOnly ) {
 				    unset( $fields[ $k ] );
 				}
 			}
 			return array_values( $fields );
 		}
 
-	    foreach( $fields as &$field ) {
+	    foreach ( $fields as &$field ) {
 		    $field->adminOnly = false;
 		}
 
@@ -2061,7 +2061,7 @@ 
 	 */
 	private function unselect_default_values( $form ) {
 
-	    foreach ( $form['fields'] as &$field ) {
+	    foreach ( $form[ 'fields' ] as &$field ) {
 
 			if ( empty( $field->choices ) ) {
                 continue;
@@ -2069,7 +2069,7 @@ 
 
             foreach ( $field->choices as &$choice ) {
 				if ( \GV\Utils::get( $choice, 'isSelected' ) ) {
-					$choice['isSelected'] = false;
+					$choice[ 'isSelected' ] = false;
 				}
 			}
 		}
@@ -2094,22 +2094,22 @@ 
 	 */
 	function prefill_conditional_logic( $form ) {
 
-		if( ! GFFormDisplay::has_conditional_logic( $form ) ) {
+		if ( ! GFFormDisplay::has_conditional_logic( $form ) ) {
 			return $form;
 		}
 
 		// Have Conditional Logic pre-fill fields as if the data were default values
 		/** @var GF_Field $field */
-		foreach ( $form['fields'] as &$field ) {
+		foreach ( $form[ 'fields' ] as &$field ) {
 
-			if( 'checkbox' === $field->type ) {
+			if ( 'checkbox' === $field->type ) {
 				foreach ( $field->get_entry_inputs() as $key => $input ) {
-				    $input_id = $input['id'];
+				    $input_id = $input[ 'id' ];
 				    $choice = $field->choices[ $key ];
 				    $value = \GV\Utils::get( $this->entry, $input_id );
 				    $match = RGFormsModel::choice_value_match( $field, $choice, $value );
-				    if( $match ) {
-				        $field->choices[ $key ]['isSelected'] = true;
+				    if ( $match ) {
+				        $field->choices[ $key ][ 'isSelected' ] = true;
 				    }
 				}
 			} else {
@@ -2117,15 +2117,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;
 				                }
 				            }
 
@@ -2158,32 +2158,32 @@ 
 		 * @see https://github.com/gravityview/GravityView/issues/840
 		 * @since develop
 		 */
-		$the_form = GFAPI::get_form( $form['id'] );
+		$the_form = GFAPI::get_form( $form[ 'id' ] );
 		$editable_ids = array();
-		foreach ( $form['fields'] as $field ) {
-			$editable_ids[] = $field['id']; // wp_list_pluck is destructive in this context
+		foreach ( $form[ 'fields' ] as $field ) {
+			$editable_ids[ ] = $field[ 'id' ]; // wp_list_pluck is destructive in this context
 		}
 		$remove_conditions_rule = array();
-		foreach ( $the_form['fields'] as $field ) {
-			if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic['rules'] ) ) {
-				foreach ( $field->conditionalLogic['rules'] as $i => $rule ) {
-					if ( ! in_array( $rule['fieldId'], $editable_ids ) ) {
+		foreach ( $the_form[ 'fields' ] as $field ) {
+			if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic[ 'rules' ] ) ) {
+				foreach ( $field->conditionalLogic[ 'rules' ] as $i => $rule ) {
+					if ( ! in_array( $rule[ 'fieldId' ], $editable_ids ) ) {
 						/**
 						 * This conditional field is not editable in this View.
 						 * We need to remove the rule, but only if it matches.
 						 */
-						if ( $_field = GFAPI::get_field( $the_form, $rule['fieldId'] ) ) {
+						if ( $_field = GFAPI::get_field( $the_form, $rule[ 'fieldId' ] ) ) {
 							$value = $_field->get_value_export( $this->entry );
-						} elseif ( isset( $this->entry[ $rule['fieldId'] ] ) ) {
-							$value = $this->entry[ $rule['fieldId'] ];
+						} elseif ( isset( $this->entry[ $rule[ 'fieldId' ] ] ) ) {
+							$value = $this->entry[ $rule[ 'fieldId' ] ];
 						} else {
-							$value = gform_get_meta( $this->entry['id'], $rule['fieldId'] );
+							$value = gform_get_meta( $this->entry[ 'id' ], $rule[ 'fieldId' ] );
 						}
 
-						$match = GFFormsModel::matches_operation( $value, $rule['value'], $rule['operator'] );
+						$match = GFFormsModel::matches_operation( $value, $rule[ 'value' ], $rule[ 'operator' ] );
 						
 						if ( $match ) {
-							$remove_conditions_rule[] = array( $field['id'], $i );
+							$remove_conditions_rule[ ] = array( $field[ 'id' ], $i );
 						}
 					}
 				}
@@ -2191,21 +2191,21 @@ 
 		}
 
 		if ( $remove_conditions_rule ) {
-			foreach ( $form['fields'] as &$field ) {
+			foreach ( $form[ 'fields' ] as &$field ) {
 				foreach ( $remove_conditions_rule as $_remove_conditions_r ) {
 
 				    list( $rule_field_id, $rule_i ) = $_remove_conditions_r;
 
-					if ( $field['id'] == $rule_field_id ) {
-						unset( $field->conditionalLogic['rules'][ $rule_i ] );
-						gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field['id'] ) );
+					if ( $field[ 'id' ] == $rule_field_id ) {
+						unset( $field->conditionalLogic[ 'rules' ][ $rule_i ] );
+						gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field[ 'id' ] ) );
 					}
 				}
 			}
 		}
 
 		/** Normalize the indices... */
-		$form['fields'] = array_values( $form['fields'] );
+		$form[ 'fields' ] = array_values( $form[ 'fields' ] );
 
 		/**
 		 * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields?
@@ -2215,16 +2215,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;
 
@@ -2241,7 +2241,7 @@ 
 	 */
 	public function manage_conditional_logic( $has_conditional_logic, $form ) {
 
-		if( ! $this->is_edit_entry() ) {
+		if ( ! $this->is_edit_entry() ) {
 			return $has_conditional_logic;
 		}
 
@@ -2273,44 +2273,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 );
 
@@ -2318,10 +2318,10 @@ 
 	         * @since 1.9
 	         */
 	        if ( ! empty( $this->entry ) ) {
-		        $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) );
+		        $error .= ' ' . gravityview_get_link( '#', _x( 'Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) );
 	        }
 
-			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
+			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' );
 		}
 
 		gravityview()->log->error( '{error}', array( 'error' => $error ) );
@@ -2341,17 +2341,17 @@ 
 
 		$error = NULL;
 
-		if( ! $this->check_user_cap_edit_field( $field ) ) {
-			$error = __( 'You do not have permission to edit this field.', 'gravityview');
+		if ( ! $this->check_user_cap_edit_field( $field ) ) {
+			$error = __( 'You do not have permission to edit this field.', 'gravityview' );
 		}
 
 		// No errors; everything's fine here!
-		if( empty( $error ) ) {
+		if ( empty( $error ) ) {
 			return true;
 		}
 
-		if( $echo ) {
-			echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error');
+		if ( $echo ) {
+			echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' );
 		}
 
 		gravityview()->log->error( '{error}', array( 'error' => $error ) );
@@ -2372,14 +2372,14 @@ 
 	private function check_user_cap_edit_field( $field ) {
 
 		// If they can edit any entries (as defined in Gravity Forms), we're good.
-		if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
 			return true;
 		}
 
-		$field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false;
+		$field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false;
 
-		if( $field_cap ) {
-			return GVCommon::has_cap( $field['allow_edit_cap'] );
+		if ( $field_cap ) {
+			return GVCommon::has_cap( $field[ 'allow_edit_cap' ] );
 		}
 
 		return false;
@@ -2393,17 +2393,17 @@ 
 	public function verify_nonce() {
 
 		// Verify form submitted for editing single
-		if( $this->is_edit_entry_submission() ) {
+		if ( $this->is_edit_entry_submission() ) {
 			$valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
 		}
 
 		// Verify
-		else if( ! $this->is_edit_entry() ) {
+		else if ( ! $this->is_edit_entry() ) {
 			$valid = false;
 		}
 
 		else {
-			$valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
+			$valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key );
 		}
 
 		/**

future/includes/class-gv-shortcode-gvlogic.php

Spacing +12 added lines, -12 removed lines

@@ -58,13 +58,13 @@ 
 		$value    = $this->get_value( $atts );
 
 		if ( false === $operator && is_null( $value ) ) {
-			if ( false !== $atts['if'] ) { // Only-if test
-				$match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) );
+			if ( false !== $atts[ 'if' ] ) { // Only-if test
+				$match = $authed && ! in_array( strtolower( $atts[ 'if' ] ), array( '', '0', 'false', 'no' ) );
 			} else {
 				$match = $authed; // Just login test
 			}
 		} else { // Regular test
-			$match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator );
+			$match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $value, $operator );
 		}
 
 		$output = $this->get_output( $match, $atts, $content );
@@ -150,8 +150,8 @@ 
 	 * @return string The output.
 	 */
 	private function get_output( $match, $atts, $content ) {
-		if ( ! $match && ! empty( $atts['else'] ) ) {
-			return $atts['else']; // Attributized else is easy :)
+		if ( ! $match && ! empty( $atts[ 'else' ] ) ) {
+			return $atts[ 'else' ]; // Attributized else is easy :)
 		}
 
 		$if = '';
@@ -278,18 +278,18 @@ 
 		$atts = array_intersect_key( $supplied_atts, $atts );
 
 		// Strip whitespace if it's not default false
-		if ( isset( $atts['if'] ) && is_string( $atts['if'] ) ) {
-			$atts['if'] = trim( $atts['if'] );
+		if ( isset( $atts[ 'if' ] ) && is_string( $atts[ 'if' ] ) ) {
+			$atts[ 'if' ] = trim( $atts[ 'if' ] );
 		} else {
-			$atts['if'] = false;
+			$atts[ 'if' ] = false;
 		}
 
-		if ( isset( $atts['logged_in'] ) ) {
+		if ( isset( $atts[ 'logged_in' ] ) ) {
 			// Truthy
-			if ( in_array( strtolower( $atts['logged_in'] ), array( '0', 'false', 'no' ) ) ) {
-				$atts['logged_in'] = false;
+			if ( in_array( strtolower( $atts[ 'logged_in' ] ), array( '0', 'false', 'no' ) ) ) {
+				$atts[ 'logged_in' ] = false;
 			} else {
-				$atts['logged_in'] = true;
+				$atts[ 'logged_in' ] = true;
 			}
 		}
 

includes/class-gravityview-entry-approval.php

Spacing +47 added lines, -47 removed lines

@@ -39,13 +39,13 @@ 
 	private function add_hooks() {
 
 		// in case entry is edited (on admin or frontend)
-		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2);
+		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2 );
 
 		// when using the User opt-in field, check on entry submission
 		add_action( 'gform_after_submission', array( $this, 'after_submission' ), 10, 2 );
 
 		// process ajax approve entry requests
-		add_action('wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved'));
+		add_action( 'wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved' ) );
 
 		// autounapprove
 		add_action( 'gravityview/edit_entry/after_update', array( __CLASS__, 'autounapprove' ), 10, 4 );
@@ -94,10 +94,10 @@ 
 			return;
 		}
 
-		$form = GFAPI::get_form( $entry['form_id'] );
+		$form = GFAPI::get_form( $entry[ 'form_id' ] );
 
 		if ( ! $form ) {
-			gravityview()->log->error( 'Form not found at ID #{form_id} for entry #{entry_id}', array( 'form_id' => $entry['form_id'], 'entry_id' => $entry_id ) );
+			gravityview()->log->error( 'Form not found at ID #{form_id} for entry #{entry_id}', array( 'form_id' => $entry[ 'form_id' ], 'entry_id' => $entry_id ) );
 			return;
 		}
 
@@ -114,10 +114,10 @@ 
 	 */
 	public static function add_approval_notification_events( $notification_events = array(), $form = array() ) {
 
-		$notification_events['gravityview/approve_entries/approved'] = 'GravityView - ' . esc_html_x( 'Entry is approved', 'The title for an event in a notifications drop down list.', 'gravityview' );
-		$notification_events['gravityview/approve_entries/disapproved'] = 'GravityView - ' . esc_html_x( 'Entry is disapproved', 'The title for an event in a notifications drop down list.', 'gravityview' );
-		$notification_events['gravityview/approve_entries/unapproved'] = 'GravityView - ' . esc_html_x( 'Entry approval is reset', 'The title for an event in a notifications drop down list.', 'gravityview' );
-		$notification_events['gravityview/approve_entries/updated'] = 'GravityView - ' . esc_html_x( 'Entry approval is changed', 'The title for an event in a notifications drop down list.', 'gravityview' );
+		$notification_events[ 'gravityview/approve_entries/approved' ] = 'GravityView - ' . esc_html_x( 'Entry is approved', 'The title for an event in a notifications drop down list.', 'gravityview' );
+		$notification_events[ 'gravityview/approve_entries/disapproved' ] = 'GravityView - ' . esc_html_x( 'Entry is disapproved', 'The title for an event in a notifications drop down list.', 'gravityview' );
+		$notification_events[ 'gravityview/approve_entries/unapproved' ] = 'GravityView - ' . esc_html_x( 'Entry approval is reset', 'The title for an event in a notifications drop down list.', 'gravityview' );
+		$notification_events[ 'gravityview/approve_entries/updated' ] = 'GravityView - ' . esc_html_x( 'Entry approval is changed', 'The title for an event in a notifications drop down list.', 'gravityview' );
 
 		return $notification_events;
 	}
@@ -135,13 +135,13 @@ 
 	 */
 	public static function get_entry_status( $entry, $value_or_label = 'label' ) {
 
-		$entry_id = is_array( $entry ) ? $entry['id'] : GVCommon::get_entry_id( $entry, true );
+		$entry_id = is_array( $entry ) ? $entry[ 'id' ] : GVCommon::get_entry_id( $entry, true );
 
 		$status = gform_get_meta( $entry_id, self::meta_key );
 
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
 
-		if( 'value' === $value_or_label ) {
+		if ( 'value' === $value_or_label ) {
 			return $status;
 		}
 
@@ -179,7 +179,7 @@ 
 		$nonce = \GV\Utils::_POST( 'nonce' );
 
 		// Valid status
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
 
 			gravityview()->log->error( 'Invalid approval status', array( 'data' => $_POST ) );
 
@@ -210,7 +210,7 @@ 
 
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
 
-			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview') );
+			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview' ) );
 
 		}
 
@@ -272,10 +272,10 @@ 
 		}
 
 		// Set default
-		self::update_approved_meta( $entry['id'], $default_status, $entry['form_id'] );
+		self::update_approved_meta( $entry[ 'id' ], $default_status, $entry[ 'form_id' ] );
 
 		// Then check for if there is an approval column, and use that value instead
-		$this->after_update_entry_update_approved_meta( $form , $entry['id'] );
+		$this->after_update_entry_update_approved_meta( $form, $entry[ 'id' ] );
 	}
 
 	/**
@@ -289,12 +289,12 @@ 
 	 */
 	public function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) {
 
-		$approved_column = self::get_approved_column( $form['id'] );
+		$approved_column = self::get_approved_column( $form[ 'id' ] );
 
 		/**
 		 * If the form doesn't contain the approve field, don't assume anything.
 		 */
-		if( empty( $approved_column ) ) {
+		if ( empty( $approved_column ) ) {
 			return;
 		}
 
@@ -316,7 +316,7 @@ 
 		 */
 		$value = apply_filters( 'gravityview/approve_entries/update_unapproved_meta', $value, $form, $entry );
 
-		self::update_approved_meta( $entry_id, $value, $form['id'] );
+		self::update_approved_meta( $entry_id, $value, $form[ 'id' ] );
 	}
 
 	/**
@@ -334,12 +334,12 @@ 
 	 */
 	public static function update_bulk( $entries = array(), $approved = 0, $form_id = 0 ) {
 
-		if( empty($entries) || ( $entries !== true && !is_array($entries) ) ) {
+		if ( empty( $entries ) || ( $entries !== true && ! is_array( $entries ) ) ) {
 			gravityview()->log->error( 'Entries were empty or malformed.', array( 'data' => $entries ) );
 			return NULL;
 		}
 
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
 			return NULL;
 		}
@@ -354,10 +354,10 @@ 
 		$approved_column_id = self::get_approved_column( $form_id );
 
 		$success = true;
-		foreach( $entries as $entry_id ) {
+		foreach ( $entries as $entry_id ) {
 			$update_success = self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id );
 
-			if( ! $update_success ) {
+			if ( ! $update_success ) {
 				$success = false;
 			}
 		}
@@ -381,12 +381,12 @@ 
 	 */
 	public static function update_approved( $entry_id = 0, $approved = 2, $form_id = 0, $approvedcolumn = 0 ) {
 
-		if( !class_exists( 'GFAPI' ) ) {
+		if ( ! class_exists( 'GFAPI' ) ) {
 			gravityview()->log->error( 'GFAPI does not exist' );
 			return false;
 		}
 
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
 			gravityview()->log->error( 'Not a valid approval value.' );
 			return false;
 		}
@@ -403,7 +403,7 @@ 
 		// If the form has an Approve/Reject field, update that value
 		$result = self::update_approved_column( $entry_id, $approved, $form_id, $approvedcolumn );
 
-		if( is_wp_error( $result ) ) {
+		if ( is_wp_error( $result ) ) {
 			gravityview()->log->error( 'Entry approval not updated: {error}', array( 'error' => $result->get_error_message() ) );
 			return false;
 		}
@@ -415,7 +415,7 @@ 
 
 		// add note to entry if approval field updating worked or there was no approved field
 		// There's no validation for the meta
-		if( true === $result ) {
+		if ( true === $result ) {
 
 			// Add an entry note
 			self::add_approval_status_updated_note( $entry_id, $approved );
@@ -468,7 +468,7 @@ 
 
 		$note_id = false;
 
-		if( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
+		if ( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
 
 			$current_user = wp_get_current_user();
 
@@ -490,7 +490,7 @@ 
 	 */
 	private static function update_approved_column( $entry_id = 0, $status = '0', $form_id = 0, $approvedcolumn = 0 ) {
 
-		if( empty( $approvedcolumn ) ) {
+		if ( empty( $approvedcolumn ) ) {
 			$approvedcolumn = self::get_approved_column( $form_id );
 		}
 
@@ -513,12 +513,12 @@ 
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
 
 		$new_value = '';
-		if( GravityView_Entry_Approval_Status::APPROVED === $status ) {
+		if ( GravityView_Entry_Approval_Status::APPROVED === $status ) {
 			$new_value = self::get_approved_column_input_label( $form_id, $approvedcolumn );
 		}
 
 		//update entry
-		$entry["{$approvedcolumn}"] = $new_value;
+		$entry[ "{$approvedcolumn}" ] = $new_value;
 
 		/**
 		 * Note: GFAPI::update_entry() doesn't trigger `gform_after_update_entry`, so we trigger updating the meta ourselves
@@ -549,12 +549,12 @@ 
 		// If the user has enabled a different value than the label (for some reason), use it.
 		// This is highly unlikely
 		if ( is_array( $field->choices ) && ! empty( $field->choices ) ) {
-			return isset( $field->choices[0]['value'] ) ? $field->choices[0]['value'] : $field->choices[0]['text'];
+			return isset( $field->choices[ 0 ][ 'value' ] ) ? $field->choices[ 0 ][ 'value' ] : $field->choices[ 0 ][ 'text' ];
 		}
 
 		// Otherwise, fall back on the inputs array
 		if ( is_array( $field->inputs ) && ! empty( $field->inputs ) ) {
-			return $field->inputs[0]['label'];
+			return $field->inputs[ 0 ][ 'label' ];
 		}
 
 		return null;
@@ -606,7 +606,7 @@ 
 		 * @since 1.18 Added "unapproved"
 		 * @param  int $entry_id ID of the Gravity Forms entry
 		 */
-		do_action( 'gravityview/approve_entries/' . $action , $entry_id );
+		do_action( 'gravityview/approve_entries/' . $action, $entry_id );
 	}
 
 	/**
@@ -619,11 +619,11 @@ 
 	 */
 	static public function get_approved_column( $form ) {
 
-		if( empty( $form ) ) {
+		if ( empty( $form ) ) {
 			return null;
 		}
 
-		if( !is_array( $form ) ) {
+		if ( ! is_array( $form ) ) {
 			$form = GVCommon::get_form( $form );
 		}
 
@@ -633,22 +633,22 @@ 
 		 * @var string $key
 		 * @var GF_Field $field
 		 */
-		foreach( $form['fields'] as $key => $field ) {
+		foreach ( $form[ 'fields' ] as $key => $field ) {
 
 			$inputs = $field->get_entry_inputs();
 
-			if( !empty( $field->gravityview_approved ) ) {
-				if ( ! empty( $inputs ) && !empty( $inputs[0]['id'] ) ) {
-					$approved_column_id = $inputs[0]['id'];
+			if ( ! empty( $field->gravityview_approved ) ) {
+				if ( ! empty( $inputs ) && ! empty( $inputs[ 0 ][ 'id' ] ) ) {
+					$approved_column_id = $inputs[ 0 ][ 'id' ];
 					break;
 				}
 			}
 
 			// Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work..
-			if( 'checkbox' === $field->type && ! empty( $inputs ) ) {
+			if ( 'checkbox' === $field->type && ! empty( $inputs ) ) {
 				foreach ( $inputs as $input ) {
-					if ( 'approved' === strtolower( $input['label'] ) ) {
-						$approved_column_id = $input['id'];
+					if ( 'approved' === strtolower( $input[ 'label' ] ) ) {
+						$approved_column_id = $input[ 'id' ];
 						break;
 					}
 				}
@@ -674,7 +674,7 @@ 
 
 		$view_keys = array_keys( $gv_data->get_views() );
 
-		$view = \GV\View::by_id( $view_keys[0] );
+		$view = \GV\View::by_id( $view_keys[ 0 ] );
 
 		if ( ! $view->settings->get( 'unapprove_edit' ) ) {
 			return;
@@ -699,11 +699,11 @@ 
 			return;
 		}
 
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
 			$approval_status = GravityView_Entry_Approval_Status::UNAPPROVED;
 		}
 
-		self::update_approved_meta( $entry_id, $approval_status, $form['id'] );
+		self::update_approved_meta( $entry_id, $approval_status, $form[ 'id' ] );
 	}
 
 	/**
@@ -741,9 +741,9 @@ 
 		$choices = GravityView_Entry_Approval_Status::get_all();
 
 		return <<<TEMPLATE
-<a href="#" data-approved="{$choices['approved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices['approved']['action']}"><span class="screen-reader-text">{$choices['approved']['action']}</span></a>
-<a href="#" data-approved="{$choices['disapproved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices['disapproved']['action']}"><span class="screen-reader-text">{$choices['disapproved']['action']}</span></a>
-<a href="#" data-approved="{$choices['unapproved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices['unapproved']['action']}"><span class="screen-reader-text">{$choices['unapproved']['action']}</span></a>
+<a href="#" data-approved="{$choices[ 'approved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices[ 'approved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'approved' ][ 'action' ]}</span></a>
+<a href="#" data-approved="{$choices[ 'disapproved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices[ 'disapproved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'disapproved' ][ 'action' ]}</span></a>
+<a href="#" data-approved="{$choices[ 'unapproved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices[ 'unapproved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'unapproved' ][ 'action' ]}</span></a>
 TEMPLATE;
 	}
 }