gravityview / GravityView

future/includes/class-gv-view.php

Spacing +18 added lines, -19 removed lines

@@ -108,7 +108,7 @@ 
 		$supports = array( 'title', 'revisions' );
 
 		if ( $is_hierarchical ) {
-			$supports[] = 'page-attributes';
+			$supports[ ] = 'page-attributes';
 		}
 
 		/**
@@ -282,7 +282,7 @@ 
 		 * Editing a single entry.
 		 */
 		if ( $entry = $request->is_edit_entry() ) {
-			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' );
 			}
@@ -293,7 +293,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) ) {
-				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' );
 				}
@@ -306,7 +306,7 @@ 
 		 * Viewing a single entry.
 		 */
 		} else if ( $entry = $request->is_entry() ) {
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
@@ -317,7 +317,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) ) {
-				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' );
 				}
@@ -365,11 +365,11 @@ 
 		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,
 			) );
 		} else if ( gravityview()->plugin->supports( Plugin::FEATURE_JOINS ) ) {
 			/** And the connected joins. */
-			foreach( (array)get_post_meta( $view->ID, '_gravityview_form_joins', true ) as $_join ) {
+			foreach ( (array)get_post_meta( $view->ID, '_gravityview_form_joins', true ) as $_join ) {
 				if ( ! is_array( $_join ) || count( $_join ) != 4 ) {
 					continue;
 				}
@@ -381,7 +381,7 @@ 
 				$join_column = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field( $join_column );
 				$join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field( $join_on_column );
 
-				$view->joins []= new Join( $join, $join_column, $join_on, $join_on_column );
+				$view->joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column );
 			}
 		}
 
@@ -610,21 +610,20 @@ 
 			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 );
 
 			if ( gravityview()->plugin->supports( Plugin::FEATURE_GFQUERY ) ) {
 				/**
 				 * New \GF_Query stuff :)
 				 */
-				$query = new \GF_Query( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] );
+				$query = new \GF_Query( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] );
 
-				$query->limit( $parameters['paging']['page_size'] )
+				$query->limit( $parameters[ 'paging' ][ 'page_size' ] )
 					->page( $page );
 
 				/**
@@ -665,15 +664,15 @@ 
 				} );
 			} 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'] ) && ! 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 ) );
 				}
 			}

future/_mocks.php

Spacing +43 added lines, -46 removed lines

@@ -101,8 +101,7 @@ 
 			$entries = $view->get_entries( gravityview()->request );
 		}
 
-		$page = \GV\Utils::get( $parameters['paging'], 'current_page' ) ?
-			: ( ( ( $parameters['paging']['offset'] - $view->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 );
+		$page = \GV\Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $view->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 );
 
 		/** Set paging, count and unwrap the entries. */
 		$paging = array(
@@ -141,16 +140,16 @@ 
  * @return null|string The value of a field in an entry.
  */
 function GravityView_API_field_value( $entry, $field_settings, $format ) {
-	if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) {
+	if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) {
 		gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) );
 		return null;
 	}
 
-	if ( ! empty( $entry['_multi'] ) && ! empty( $field_settings['form_id'] ) && ! empty( $entry['_multi'][ $field_settings['form_id'] ] ) ) {
-		$entry = $entry['_multi'][ $field_settings['form_id'] ];
+	if ( ! empty( $entry[ '_multi' ] ) && ! empty( $field_settings[ 'form_id' ] ) && ! empty( $entry[ '_multi' ][ $field_settings[ 'form_id' ] ] ) ) {
+		$entry = $entry[ '_multi' ][ $field_settings[ 'form_id' ] ];
 	}
 
-	if ( empty( $entry['id'] ) || ! $entry = \GV\GF_Entry::by_id( $entry['id'] ) ) {
+	if ( empty( $entry[ 'id' ] ) || ! $entry = \GV\GF_Entry::by_id( $entry[ 'id' ] ) ) {
 		gravityview()->log->error( 'Invalid \GV\GF_Entry supplied', array( 'data' => $entry ) );
 		return null;
 	}
@@ -160,18 +159,18 @@ 
 	 *
 	 * Fields with a numeric ID are Gravity Forms ones.
 	 */
-	$source = is_numeric( $field_settings['id'] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;;
+	$source = is_numeric( $field_settings[ 'id' ] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL; ;
 
 	/** Initialize the future field. */
 	switch ( $source ):
 		/** The Gravity Forms backend. */
 		case \GV\Source::BACKEND_GRAVITYFORMS:
-			if ( ! $form = \GV\GF_Form::by_id( $entry['form_id'] ) ) {
+			if ( ! $form = \GV\GF_Form::by_id( $entry[ 'form_id' ] ) ) {
 				gravityview()->log->error( 'No form Gravity Form found for entry', array( 'data' => $entry ) );
 				return null;
 			}
 
-			if ( ! $field = $form::get_field( $form, $field_settings['id'] ) ) {
+			if ( ! $field = $form::get_field( $form, $field_settings[ 'id' ] ) ) {
 				return null;
 			}
 
@@ -179,7 +178,7 @@ 
 
 		/** Our internal backend. */
 		case \GV\Source::BACKEND_INTERNAL:
-			if ( ! $field = \GV\Internal_Source::get_field( $field_settings['id'] ) ) {
+			if ( ! $field = \GV\Internal_Source::get_field( $field_settings[ 'id' ] ) ) {
 				return null;
 			}
 
@@ -213,13 +212,13 @@ 
 
 	/** A bail condition. */
 	$bail = function( $label, $field_settings, $entry, $force_show_label, $form ) {
-		if ( ! empty( $field_settings['show_label'] ) || $force_show_label ) {
+		if ( ! empty( $field_settings[ 'show_label' ] ) || $force_show_label ) {
 
-			$label = isset( $field_settings['label'] ) ? $field_settings['label'] : '';
+			$label = isset( $field_settings[ 'label' ] ) ? $field_settings[ 'label' ] : '';
 
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
-			if ( ! empty( $field_settings['custom_label'] ) ) {
-				$label = \GravityView_API::replace_variables( $field_settings['custom_label'], $form, $entry );
+			if ( ! empty( $field_settings[ 'custom_label' ] ) ) {
+				$label = \GravityView_API::replace_variables( $field_settings[ 'custom_label' ], $form, $entry );
 			}
 
 			/**
@@ -245,19 +244,19 @@ 
 
 	$label = '';
 
-	if ( ! empty( $entry['_multi'] ) && ! empty( $field_settings['form_id'] ) && ! empty( $entry['_multi'][ $field_settings['form_id'] ] ) ) {
-		$entry = $entry['_multi'][ $field_settings['form_id'] ];
-		if ( $_form = \GV\GF_Form::by_id( $field_settings['form_id'] ) ) {
+	if ( ! empty( $entry[ '_multi' ] ) && ! empty( $field_settings[ 'form_id' ] ) && ! empty( $entry[ '_multi' ][ $field_settings[ 'form_id' ] ] ) ) {
+		$entry = $entry[ '_multi' ][ $field_settings[ 'form_id' ] ];
+		if ( $_form = \GV\GF_Form::by_id( $field_settings[ 'form_id' ] ) ) {
 			$form = $_form->form;
 		}
 	}
 
-	if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) {
+	if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) {
 		gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) );
 		return $bail( $label, $field_settings, $entry, $force_show_label, $form );
 	}
 
-	if ( empty( $entry['id'] ) || ! $gv_entry = \GV\GF_Entry::by_id( $entry['id'] ) ) {
+	if ( empty( $entry[ 'id' ] ) || ! $gv_entry = \GV\GF_Entry::by_id( $entry[ 'id' ] ) ) {
 		gravityview()->log->error( 'Invalid \GV\GF_Entry supplied', array( 'data' => $entry ) );
 		return $bail( $label, $field_settings, $entry, $force_show_label, $form );
 	}
@@ -269,31 +268,31 @@ 
 	 *
 	 * Fields with a numeric ID are Gravity Forms ones.
 	 */
-	$source = is_numeric( $field_settings['id'] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;
+	$source = is_numeric( $field_settings[ 'id' ] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;
 
 	/** Initialize the future field. */
 	switch ( $source ):
 		/** The Gravity Forms backend. */
 		case \GV\Source::BACKEND_GRAVITYFORMS:
-			if ( ! $gf_form = \GV\GF_Form::by_id( $entry['form_id'] ) ) {
+			if ( ! $gf_form = \GV\GF_Form::by_id( $entry[ 'form_id' ] ) ) {
 				gravityview()->log->error( 'No form Gravity Form found for entry', array( 'data' => $entry ) );
 				return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $form );
 			}
 
-			if ( ! $field = $gf_form::get_field( $gf_form, $field_settings['id'] ) ) {
-				gravityview()->log->error( 'No field found for specified form and field ID #{field_id}', array( 'field_id' => $field_settings['id'], 'data' => $form ) );
+			if ( ! $field = $gf_form::get_field( $gf_form, $field_settings[ 'id' ] ) ) {
+				gravityview()->log->error( 'No field found for specified form and field ID #{field_id}', array( 'field_id' => $field_settings[ 'id' ], 'data' => $form ) );
 				return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $gf_form->form );
 			}
-			if ( empty( $field_settings['show_label'] ) ) {
+			if ( empty( $field_settings[ 'show_label' ] ) ) {
 				/** The label never wins... */
-				$field_settings['label'] = '';
+				$field_settings[ 'label' ] = '';
 			}
 
 			break;
 
 		/** Our internal backend. */
 		case \GV\Source::BACKEND_INTERNAL:
-			if ( ! $field = \GV\Internal_Source::get_field( $field_settings['id'] ) ) {
+			if ( ! $field = \GV\Internal_Source::get_field( $field_settings[ 'id' ] ) ) {
 				return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $form );
 			}
 			break;
@@ -305,8 +304,8 @@ 
 			break;
 	endswitch;
 
-	if( $force_show_label ) {
-		$field_settings['show_label'] = '1';
+	if ( $force_show_label ) {
+		$field_settings[ 'show_label' ] = '1';
 	}
 
 	/** Add the field settings. */
@@ -440,7 +439,7 @@ 
 			'\GravityView_frontend::entry' => \GravityView_frontend::getInstance()->getEntry(),
 			'\GravityView_View::_current_entry' => \GravityView_View::getInstance()->getCurrentEntry(),
 			'\GravityView_View::fields' => \GravityView_View::getInstance()->getFields(),
-			'wp_actions[loop_start]' => empty( $wp_actions['loop_start'] ) ? 0 : $wp_actions['loop_start'],
+			'wp_actions[loop_start]' => empty( $wp_actions[ 'loop_start' ] ) ? 0 : $wp_actions[ 'loop_start' ],
 			'wp_query::in_the_loop' => $wp_query->in_the_loop,
 		);
 	}
@@ -522,7 +521,7 @@ 
 					break;
 				case 'wp_actions[loop_start]':
 					global $wp_actions;
-					$wp_actions['loop_start'] = $value;
+					$wp_actions[ 'loop_start' ] = $value;
 					break;
 				case 'wp_query::in_the_loop':
 					global $wp_query;
@@ -600,9 +599,7 @@ 
 				case 'request':
 					self::thaw( array(
 						'\GravityView_View::context' => (
-							$value->is_entry() ? 'single' :
-								( $value->is_edit_entry() ? 'edit' :
-									( $value->is_view() ? 'directory': null )
+							$value->is_entry() ? 'single' : ( $value->is_edit_entry() ? 'edit' : ( $value->is_view() ? 'directory' : null )
 								)
 						),
 						'\GravityView_frontend::is_search' => $value->is_search(),
@@ -656,14 +653,14 @@ 
 		global $wp_query, $wp_actions;
 
 		$wp_query->in_the_loop = false;
-		$wp_actions['loop_start'] = 0;
+		$wp_actions[ 'loop_start' ] = 0;
 	}
 }
 
 
 /** Add some global fix for field capability discrepancies. */
 add_filter( 'gravityview/configuration/fields', function( $fields ) {
-	if ( empty( $fields  ) ) {
+	if ( empty( $fields ) ) {
 		return $fields;
 	}
 
@@ -690,11 +687,11 @@ 
 		}
 
 		foreach ( $_fields as $uid => &$_field ) {
-			if ( ! isset( $_field['only_loggedin'] ) ) {
+			if ( ! isset( $_field[ 'only_loggedin' ] ) ) {
 				continue;
 			}
 			/** If we do not require login, we don't require a cap. */
-			$_field['only_loggedin'] != '1' && ( $_field['only_loggedin_cap'] = '' );
+			$_field[ 'only_loggedin' ] != '1' && ( $_field[ 'only_loggedin_cap' ] = '' );
 		}
 	}
 	return $fields;
@@ -725,8 +722,8 @@ 
 		}
 
 		foreach ( $_fields as $uid => &$_field ) {
-			if ( ! empty( $_field['id'] ) && is_numeric( $_field['id'] ) && empty( $_field['form_id'] ) ) {
-				$_field['form_id'] = $view->form->ID;
+			if ( ! empty( $_field[ 'id' ] ) && is_numeric( $_field[ 'id' ] ) && empty( $_field[ 'form_id' ] ) ) {
+				$_field[ 'form_id' ] = $view->form->ID;
 			}
 		}
 	}
@@ -740,25 +737,25 @@ 
 	if ( class_exists( '\GravityView_frontend' ) ) {
 		global $wp_filter;
 
-		if ( empty( $wp_filter['gravityview_after'] ) ) {
+		if ( empty( $wp_filter[ 'gravityview_after' ] ) ) {
 			return;
 		}
 
 		/** WordPress 4.6 and lower compatibility, when WP_Hook classes were still absent. */
-		if ( is_array( $wp_filter['gravityview_after'] ) ) {
-			if ( ! empty( $wp_filter['gravityview_after'][10] ) ) {
-				foreach ( $wp_filter['gravityview_after'][10] as $function_key => $callback ) {
+		if ( is_array( $wp_filter[ 'gravityview_after' ] ) ) {
+			if ( ! empty( $wp_filter[ 'gravityview_after' ][ 10 ] ) ) {
+				foreach ( $wp_filter[ 'gravityview_after' ][ 10 ] as $function_key => $callback ) {
 					if ( strpos( $function_key, 'context_not_configured_warning' ) ) {
-						unset( $wp_filter['gravityview_after'][10][ $function_key ] );
+						unset( $wp_filter[ 'gravityview_after' ][ 10 ][ $function_key ] );
 					}
 				}
 			}
 			return;
 		}
 
-		foreach ( $wp_filter['gravityview_after']->callbacks[10] as $function_key => $callback ) {
+		foreach ( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ] as $function_key => $callback ) {
 			if ( strpos( $function_key, 'context_not_configured_warning' ) ) {
-				unset( $wp_filter['gravityview_after']->callbacks[10][ $function_key ] );
+				unset( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ][ $function_key ] );
 			}
 		}
 	}