gravityview / GravityView

future/includes/class-gv-template-entry-table.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 	 */
 	public function the_field( \GV\Field $field ) {
 		$renderer = new Field_Renderer();
-		$source = is_numeric( $field->ID ) ? ( GF_Form::by_id( $field->form_id ) ? : $this->view->form ) : new Internal_Source();
+		$source = is_numeric( $field->ID ) ? ( GF_Form::by_id( $field->form_id ) ?: $this->view->form ) : new Internal_Source();
 
 		return $renderer->render( $field, $this->view, $source, $this->entry->from_field( $field ), $this->request );
 	}
@@ -63,7 +63,7 @@ 
 		foreach ( $fields->all() as $field ) {
 			$context = Template_Context::from_template( $this, compact( 'field' ) );
 
-			$form = \GV\GF_Form::by_id( $field->form_id ) ? : $this->view->form;
+			$form = \GV\GF_Form::by_id( $field->form_id ) ?: $this->view->form;
 			$entry = $this->entry->from_field( $field );
 
 			if ( ! $entry ) {

future/includes/class-gv-template-entry-list.php

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
 	 * @return string
 	 */
 	public function the_field( \GV\Field $field, $extras = null ) {
-		$form = \GV\GF_Form::by_id( $field->form_id ) ? : $this->view->form;
+		$form = \GV\GF_Form::by_id( $field->form_id ) ?: $this->view->form;
 		$entry = $this->entry->from_field( $field );
 
 		if ( ! $entry ) {
@@ -34,7 +34,7 @@ 
 		}
 
 		$renderer = new Field_Renderer();
-		$source = is_numeric( $field->ID ) ? ( GF_Form::by_id( $field->form_id ) ? : $this->view->form ) : new Internal_Source();
+		$source = is_numeric( $field->ID ) ? ( GF_Form::by_id( $field->form_id ) ?: $this->view->form ) : new Internal_Source();
 		
 		$value = $renderer->render( $field, $this->view, $source, $entry, $this->request );
 		
@@ -62,13 +62,13 @@ 
 		$hide_empty = apply_filters( 'gravityview/render/hide-empty-zone', Utils::get( $extras, 'hide_empty', $this->view->settings->get( 'hide_empty', false ) ), $context );
 
 		if ( is_numeric( $field->ID ) ) {
-			$extras['field'] = $field->as_configuration();
+			$extras[ 'field' ] = $field->as_configuration();
 		}
 
-		$extras['entry'] = $this->entry->as_entry();
-		$extras['hide_empty'] = $hide_empty;
-		$extras['label'] = $label;
-		$extras['value'] = $value;
+		$extras[ 'entry' ] = $this->entry->as_entry();
+		$extras[ 'hide_empty' ] = $hide_empty;
+		$extras[ 'label' ] = $label;
+		$extras[ 'value' ] = $value;
 
 		return \gravityview_field_output( $extras, $context );
 	}

future/includes/class-gv-template-view-list.php

Spacing +8 added lines, -8 removed lines

@@ -29,9 +29,9 @@ 
 	public function the_field( \GV\Field $field, \GV\Entry $entry, $extras = null ) {
 		$form = $this->view->form;
 
-		if ( isset( $this->view->unions[ $entry['form_id'] ] ) ) {
-			if ( isset( $this->view->unions[ $entry['form_id'] ][ $field->ID ] ) ) {
-				$field = $this->view->unions[ $entry['form_id'] ][ $field->ID ];
+		if ( isset( $this->view->unions[ $entry[ 'form_id' ] ] ) ) {
+			if ( isset( $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ] ) ) {
+				$field = $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ];
 			} elseif ( ! $field instanceof Internal_Field ) {
 				$field = Internal_Field::from_configuration( array( 'id' => 'custom' ) );
 			}
@@ -81,13 +81,13 @@ 
 		$hide_empty = apply_filters( 'gravityview/render/hide-empty-zone', Utils::get( $extras, 'hide_empty', $this->view->settings->get( 'hide_empty', false ) ), $context );
 
 		if ( is_numeric( $field->ID ) ) {
-			$extras['field'] = $field->as_configuration();
+			$extras[ 'field' ] = $field->as_configuration();
 		}
 
-		$extras['entry'] = $entry->as_entry();
-		$extras['hide_empty'] = $hide_empty;
-		$extras['label'] = $label;
-		$extras['value'] = $value;
+		$extras[ 'entry' ] = $entry->as_entry();
+		$extras[ 'hide_empty' ] = $hide_empty;
+		$extras[ 'label' ] = $label;
+		$extras[ 'value' ] = $value;
 
 		return \gravityview_field_output( $extras, $context );
 	}

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

Spacing +14 added lines, -14 removed lines

@@ -10,14 +10,14 @@ 
 $search_field = $gravityview_view->search_field;
 
 // Make sure that there are choices to display
-if( empty( $search_field['choices'] ) ) {
+if ( empty( $search_field[ 'choices' ] ) ) {
 	gravityview()->log->debug( 'search-field-select.php - No choices for field' );
 	return;
 }
 
-if( is_array( $search_field['value'] ) ) {
+if ( is_array( $search_field[ 'value' ] ) ) {
     gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' );
-	$search_field['value'] = reset( $search_field['value'] );
+	$search_field[ 'value' ] = reset( $search_field[ 'value' ] );
 }
 
 /**
@@ -26,26 +26,26 @@ 
  * @param string $default_option Default: `—` (—)
  * @param string $field_type Field type: "select" or "multiselect"
  */
-$default_option = apply_filters('gravityview/extension/search/select_default', '—', 'select' );
+$default_option = apply_filters( 'gravityview/extension/search/select_default', '—', 'select' );
 
 ?>
 <div class="gv-search-box gv-search-field-select">
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
-		<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
+		<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
 	<?php } ?>
 	<p>
-		<select name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>">
-			<option value="" <?php gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option>
+		<select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>">
+			<option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option>
 			<?php
-			foreach( $search_field['choices'] as $choice ) { ?>
-				<?php if ( is_array( $choice['value'] ) ) { ?>
-					<optgroup label="<?php echo esc_attr( $choice['text'] ); ?>">
-						<?php foreach ( $choice['value'] as $subchoice ): ?>
-							<option value="<?php echo esc_attr( $subchoice['value'] ); ?>"><?php echo esc_html( $subchoice['text'] ); ?></option>
+			foreach ( $search_field[ 'choices' ] as $choice ) { ?>
+				<?php if ( is_array( $choice[ 'value' ] ) ) { ?>
+					<optgroup label="<?php echo esc_attr( $choice[ 'text' ] ); ?>">
+						<?php foreach ( $choice[ 'value' ] as $subchoice ): ?>
+							<option value="<?php echo esc_attr( $subchoice[ 'value' ] ); ?>"><?php echo esc_html( $subchoice[ 'text' ] ); ?></option>
 						<?php endforeach; ?>
 					</optgroup>
 				<?php } else { ?>
-					<option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $search_field['value'] ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
+					<option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $search_field[ 'value' ] ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
 				<?php } ?>
 			<?php } ?>
 		</select>

includes/class-template.php

Spacing +50 added lines, -50 removed lines

@@ -16,7 +16,7 @@ 
 	die;
 }
 
-if( ! class_exists( '\GV\Gamajo_Template_Loader' ) ) {
+if ( ! class_exists( '\GV\Gamajo_Template_Loader' ) ) {
 	require( GRAVITYVIEW_DIR . 'future/lib/class-gamajo-template-loader.php' );
 }
 
@@ -157,8 +157,8 @@ 
 			'atts'	  => NULL,
 		) );
 
-		foreach ($atts as $key => $value) {
-			if( is_null( $value ) ) {
+		foreach ( $atts as $key => $value ) {
+			if ( is_null( $value ) ) {
 				continue;
 			}
 			$this->{$key} = $value;
@@ -188,7 +188,7 @@ 
 	 */
 	static function getInstance( $passed_post = NULL ) {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self( $passed_post );
 		}
 
@@ -201,8 +201,8 @@ 
 	 */
 	public function getCurrentField( $key = NULL ) {
 
-		if( !empty( $key ) ) {
-			if( isset( $this->_current_field[ $key ] ) ) {
+		if ( ! empty( $key ) ) {
+			if ( isset( $this->_current_field[ $key ] ) ) {
 				return $this->_current_field[ $key ];
 			}
 			return NULL;
@@ -213,16 +213,16 @@ 
 
 	public function setCurrentFieldSetting( $key, $value ) {
 
-		if( !empty( $this->_current_field ) ) {
-			$this->_current_field['field_settings'][ $key ] = $value;
+		if ( ! empty( $this->_current_field ) ) {
+			$this->_current_field[ 'field_settings' ][ $key ] = $value;
 		}
 
 	}
 
 	public function getCurrentFieldSetting( $key ) {
-		$settings = $this->getCurrentField('field_settings');
+		$settings = $this->getCurrentField( 'field_settings' );
 
-		if( $settings && !empty( $settings[ $key ] ) ) {
+		if ( $settings && ! empty( $settings[ $key ] ) ) {
 			return $settings[ $key ];
 		}
 
@@ -253,8 +253,8 @@ 
 	 */
 	public function getAtts( $key = NULL ) {
 
-		if( !empty( $key ) ) {
-			if( isset( $this->atts[ $key ] ) ) {
+		if ( ! empty( $key ) ) {
+			if ( isset( $this->atts[ $key ] ) ) {
 				return $this->atts[ $key ];
 			}
 			return NULL;
@@ -320,7 +320,7 @@ 
 
 		$fields = empty( $this->fields ) ? NULL : $this->fields;
 
-		if( $fields && !empty( $key ) ) {
+		if ( $fields && ! empty( $key ) ) {
 			$fields = isset( $fields[ $key ] ) ? $fields[ $key ] : NULL;
 		}
 
@@ -338,18 +338,18 @@ 
 	 */
 	public function getContextFields( $context = '' ) {
 
-	    if( '' === $context ) {
+	    if ( '' === $context ) {
 	        $context = $this->getContext();
         }
 
 		$fields = $this->getFields();
 
-        foreach ( (array) $fields as $key => $context_fields ) {
+        foreach ( (array)$fields as $key => $context_fields ) {
 
             // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
             $matches = explode( '_', $key );
 
-            if( isset( $matches[0] ) && $matches[0] === $context ) {
+            if ( isset( $matches[ 0 ] ) && $matches[ 0 ] === $context ) {
                 return $context_fields;
             }
         }
@@ -370,8 +370,8 @@ 
 	 */
 	public function getField( $key ) {
 
-		if( !empty( $key ) ) {
-			if( isset( $this->fields[ $key ] ) ) {
+		if ( ! empty( $key ) ) {
+			if ( isset( $this->fields[ $key ] ) ) {
 				return $this->fields[ $key ];
 			}
 		}
@@ -477,8 +477,8 @@ 
 	public function getPaginationCounts() {
 
 		$paging = $this->getPaging();
-		$offset = $paging['offset'];
-		$page_size = $paging['page_size'];
+		$offset = $paging[ 'offset' ];
+		$page_size = $paging[ 'page_size' ];
 		$total = $this->getTotalEntries();
 
 		if ( empty( $total ) ) {
@@ -499,7 +499,7 @@ 
 		 */
 		list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', array( $first, $last, $total ) );
 
-		return array( 'first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total );
+		return array( 'first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total );
 	}
 
 	/**
@@ -595,16 +595,16 @@ 
 	 */
 	public function getCurrentEntry() {
 
-		if( in_array( $this->getContext(), array( 'edit', 'single') ) ) {
+		if ( in_array( $this->getContext(), array( 'edit', 'single' ) ) ) {
 			$entries = $this->getEntries();
-			$entry = $entries[0];
+			$entry = $entries[ 0 ];
 		} else {
 			$entry = $this->_current_entry;
 		}
 
 		/** @since 1.16 Fixes DataTables empty entry issue */
-		if ( empty( $entry ) && ! empty( $this->_current_field['entry'] ) ) {
-			$entry = $this->_current_field['entry'];
+		if ( empty( $entry ) && ! empty( $this->_current_field[ 'entry' ] ) ) {
+			$entry = $this->_current_field[ 'entry' ];
 		}
 
 		return $entry;
@@ -644,7 +644,7 @@ 
 	public function renderZone( $zone = '', $atts = array(), $echo = true ) {
 
 		if ( empty( $zone ) ) {
-			gravityview()->log->error( 'No zone defined.');
+			gravityview()->log->error( 'No zone defined.' );
 			return NULL;
 		}
 
@@ -653,16 +653,16 @@ 
 			'context' => $this->getContext(),
 			'entry' => $this->getCurrentEntry(),
 			'form' => $this->getForm(),
-			'hide_empty' => $this->getAtts('hide_empty'),
+			'hide_empty' => $this->getAtts( 'hide_empty' ),
 		);
 
 		$final_atts = wp_parse_args( $atts, $defaults );
 
 		$output = '';
 
-		$final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}";
+		$final_atts[ 'zone_id' ] = "{$final_atts[ 'context' ]}_{$final_atts[ 'slug' ]}-{$zone}";
 
-		$fields = $this->getField( $final_atts['zone_id'] );
+		$fields = $this->getField( $final_atts[ 'zone_id' ] );
 
 		// Backward compatibility
 		if ( 'table' === $this->getTemplatePartSlug() ) {
@@ -672,19 +672,19 @@ 
 			 * @param \GravityView_View $this
 			 * @deprecated Use `gravityview/template/table/fields`
 			 */
-			$fields = apply_filters("gravityview_table_cells", $fields, $this );
+			$fields = apply_filters( "gravityview_table_cells", $fields, $this );
 		}
 
 		if ( empty( $fields ) ) {
 
-			gravityview()->log->error( 'Empty zone configuration for {zone_id}.', array( 'zone_id' => $final_atts['zone_id'] ) );
+			gravityview()->log->error( 'Empty zone configuration for {zone_id}.', array( 'zone_id' => $final_atts[ 'zone_id' ] ) );
 
 			return NULL;
 		}
 
 		$field_output = '';
 		foreach ( $fields as $field ) {
-			$final_atts['field'] = $field;
+			$final_atts[ 'field' ] = $field;
 
 			$field_output .= gravityview_field_output( $final_atts );
 		}
@@ -701,17 +701,17 @@ 
 			return NULL;
 		}
 
-		if( !empty( $final_atts['wrapper_class'] ) ) {
-			$output .= '<div class="'.gravityview_sanitize_html_class( $final_atts['wrapper_class'] ).'">';
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
+			$output .= '<div class="' . gravityview_sanitize_html_class( $final_atts[ 'wrapper_class' ] ) . '">';
 		}
 
 		$output .= $field_output;
 
-		if( !empty( $final_atts['wrapper_class'] ) ) {
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
 			$output .= '</div>';
 		}
 
-		if( $echo ) {
+		if ( $echo ) {
 			echo $output;
 		}
 
@@ -729,7 +729,7 @@ 
 	 */
 	function locate_template( $template_names, $load = false, $require_once = true ) {
 
-		if( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
+		if ( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
 
 			$located = $this->located_templates[ $template_names ];
 
@@ -738,7 +738,7 @@ 
 			// Set $load to always false so we handle it here.
 			$located = parent::locate_template( $template_names, false, $require_once );
 
-			if( is_string( $template_names ) ) {
+			if ( is_string( $template_names ) ) {
 				$this->located_templates[ $template_names ] = $located;
 			}
 		}
@@ -756,7 +756,7 @@ 
 	 * @return mixed|null    The stored data.
 	 */
 	public function __get( $name ) {
-		if( isset( $this->{$name} ) ) {
+		if ( isset( $this->{$name} ) ) {
 			return $this->{$name};
 		} else {
 			return NULL;
@@ -785,17 +785,17 @@ 
 		$additional = array();
 
 		// form-19-table-body.php
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
+		$additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
 
-		if( $view_id = $this->getViewId() ) {
+		if ( $view_id = $this->getViewId() ) {
 			// view-3-table-body.php
-			$additional[] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name );
+			$additional[ ] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name );
 		}
 
-		if( $this->getPostId() ) {
+		if ( $this->getPostId() ) {
 
 			// page-19-table-body.php
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
+			$additional[ ] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
 		}
 
 		// Combine with existing table-body.php and table.php
@@ -817,7 +817,7 @@ 
 
 		gravityview()->log->debug( 'Rendering Template File: {path}', array( 'path' => $template_file ) );
 
-		if( !empty( $template_file) ) {
+		if ( ! empty( $template_file ) ) {
 
 			if ( $require_once ) {
 				require_once( $template_file );
@@ -892,7 +892,7 @@ 
 
 		// Prevent being called twice
 		if ( did_action( "gravityview/widgets/$zone/{$view->ID}/rendered" ) ) {
-			gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone.'_'.$view->ID.'_widgets' ) );
+			gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone . '_' . $view->ID . '_widgets' ) );
 			return;
 		}
 
@@ -914,7 +914,7 @@ 
 		 * @param string $zone Current widget zone, either `header` or `footer`
 		 * @param array $widgets Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']`
 		 */
-		$css_class = apply_filters('gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() );
+		$css_class = apply_filters( 'gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() );
 
 		$css_class = gravityview_sanitize_html_class( $css_class );
 
@@ -922,15 +922,15 @@ 
 		?>
 		<div class="<?php echo $css_class; ?>">
 			<?php
-			foreach( $rows as $row ) {
-				foreach( $row as $col => $areas ) {
+			foreach ( $rows as $row ) {
+				foreach ( $row as $col => $areas ) {
 					$column = ( $col == '2-2' ) ? '1-2 gv-right' : "$col gv-left";
 				?>
 					<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
 						<?php
 						if ( ! empty( $areas ) ) {
 							foreach ( $areas as $area ) {
-								foreach ( $widgets->by_position( $zone . '_' . $area['areaid'] )->all() as $widget ) {
+								foreach ( $widgets->by_position( $zone . '_' . $area[ 'areaid' ] )->all() as $widget ) {
 									do_action( sprintf( 'gravityview/widgets/%s/render', $widget->get_widget_id() ), $widget->configuration->all(), null, $view_id_or_context );
 								}
 							}

includes/admin/metaboxes/views/sort-filter.php

Spacing +5 added lines, -5 removed lines

@@ -28,18 +28,18 @@
 
 	$sort_fields_input = '<select name="template_settings[sort_field][]" class="gravityview_sort_field" id="gravityview_sort_field_%d">%s</select>';
 
-	if ( is_array( $current_settings['sort_field'] ) ) {
-		$primary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'][0] );
-		$secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'][1] );
+	if ( is_array( $current_settings[ 'sort_field' ] ) ) {
+		$primary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings[ 'sort_field' ][ 0 ] );
+		$secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings[ 'sort_field' ][ 1 ] );
 	} else {
-		$primary_sort_fields = $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'] );
+		$primary_sort_fields = $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings[ 'sort_field' ] );
 	}
 
 	// Splice the sort direction
 	$_directions = array();
 	foreach ( (array)\GV\Utils::get( $current_settings, 'sort_direction', array() ) as $i => $direction ) {
 		if ( ! $i ) {
-			$_directions['sort_direction'] = $direction;
+			$_directions[ 'sort_direction' ] = $direction;
 		} else {
 			$_directions[ sprintf( 'sort_direction_%d', $i + 1 ) ] = $direction;
 		}

future/includes/class-gv-template-view-table.php

Spacing +22 added lines, -22 removed lines

@@ -69,22 +69,22 @@ 
 			if ( is_array( $sorts ) ) {
 				foreach ( (array)$sorts as $key => $direction ) {
 					if ( $key == $context->field->ID ) {
-						$sorting['key'] = $context->field->ID;
-						$sorting['direction'] = strtolower( $direction );
+						$sorting[ 'key' ] = $context->field->ID;
+						$sorting[ 'direction' ] = strtolower( $direction );
 						break;
 					}
 				}
 			} else {
 				if ( $sorts == $context->field->ID ) {
-					$sorting['key'] = $context->field->ID;
-					$sorting['direction'] = strtolower( Utils::_GET( 'dir', '' ) );
+					$sorting[ 'key' ] = $context->field->ID;
+					$sorting[ 'direction' ] = strtolower( Utils::_GET( 'dir', '' ) );
 				}
 			}
 		} else {
 			foreach ( (array)$context->view->settings->get( 'sort_field', array() ) as $i => $sort_field ) {
 				if ( $sort_field == $context->field->ID ) {
-					$sorting['key'] = $sort_field;
-					$sorting['direction'] = strtolower( Utils::get( $directions, $i, '' ) );
+					$sorting[ 'key' ] = $sort_field;
+					$sorting[ 'direction' ] = strtolower( Utils::get( $directions, $i, '' ) );
 					break; // Only get the first sort
 				}
 			}
@@ -100,21 +100,21 @@ 
 		);
 
 		// If we are already sorting by the current field...
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
 
-		    switch( $sorting['direction'] ) {
+		    switch ( $sorting[ 'direction' ] ) {
 		        // No sort
                 case '':
-	                $sort_args[1] = 'asc';
+	                $sort_args[ 1 ] = 'asc';
 	                $class .= ' gv-icon-caret-up-down';
                     break;
                 case 'desc':
-	                $sort_args[1] = '';
+	                $sort_args[ 1 ] = '';
 	                $class .= ' gv-icon-sort-asc';
 	                break;
                 case 'asc':
                 default:
-                    $sort_args[1] = 'desc';
+                    $sort_args[ 1 ] = 'desc';
                     $class .= ' gv-icon-sort-desc';
                     break;
             }
@@ -127,15 +127,15 @@ 
 		$url = remove_query_arg( 'sort', $url );
 		$multisort_url = self::_get_multisort_url( $url, $sort_args, $context->field->ID );
 
-    	$url = add_query_arg( $sort_args[0], $sort_args[1], $url );
+    	$url = add_query_arg( $sort_args[ 0 ], $sort_args[ 1 ], $url );
 
-		$return = '<a href="'. esc_url_raw( $url ) .'"';
+		$return = '<a href="' . esc_url_raw( $url ) . '"';
 
 		if ( ! empty( $multisort_url ) ) {
-			$return .= ' data-multisort-href="'. esc_url_raw( $multisort_url ) . '"';
+			$return .= ' data-multisort-href="' . esc_url_raw( $multisort_url ) . '"';
 		}
 
-		$return .= ' class="'. $class .'" ></a>&nbsp;'. $column_label;
+		$return .= ' class="' . $class . '" ></a>&nbsp;' . $column_label;
 
 		return $return;
 	}
@@ -168,19 +168,19 @@ 
         if ( ! in_array( $field_id, $keys = array_keys( $sorts ) ) ) {
             if ( count( $keys ) ) {
                 $multisort_url = add_query_arg( sprintf( 'sort[%s]', end( $keys ) ), $sorts[ end( $keys ) ], $multisort_url );
-                $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url );
+                $multisort_url = add_query_arg( $sort_args[ 0 ], $sort_args[ 1 ], $multisort_url );
             } else {
-                $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url );
+                $multisort_url = add_query_arg( $sort_args[ 0 ], $sort_args[ 1 ], $multisort_url );
             }
         }
         // Otherwise, we are just updating the sort order
         else {
 
             // Pass empty value to unset
-            if( '' === $sort_args[1] ) {
+            if ( '' === $sort_args[ 1 ] ) {
 	            unset( $sorts[ $field_id ] );
             } else {
-	            $sorts[ $field_id ] = $sort_args[1];
+	            $sorts[ $field_id ] = $sort_args[ 1 ];
             }
 
             $multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url );
@@ -318,9 +318,9 @@ 
                 do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() );
 
                 foreach ( $fields->all() as $field ) {
-					if ( isset( $this->view->unions[ $entry['form_id'] ] ) ) {
-						if ( isset( $this->view->unions[ $entry['form_id'] ][ $field->ID ] ) ) {
-							$field = $this->view->unions[ $entry['form_id'] ][ $field->ID ];
+					if ( isset( $this->view->unions[ $entry[ 'form_id' ] ] ) ) {
+						if ( isset( $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ] ) ) {
+							$field = $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ];
 						} else {
 							if ( ! $field instanceof Internal_Field ) {
 								$field = Internal_Field::from_configuration( array( 'id' => 'custom' ) );

future/includes/class-gv-extension.php

Spacing +17 added lines, -17 removed lines

@@ -180,13 +180,13 @@ 
 		$tab = wp_parse_args( $tab_settings, $tab_defaults );
 
 		// Force the screen to be GravityView
-		$tab['screen'] = 'gravityview';
+		$tab[ 'screen' ] = 'gravityview';
 
 		if ( class_exists( 'GravityView_Metabox_Tab' ) ) {
-			$metabox = new \GravityView_Metabox_Tab( $tab['id'], $tab['title'], $tab['file'], $tab['icon-class'], $tab['callback'], $tab['callback_args'] );
+			$metabox = new \GravityView_Metabox_Tab( $tab[ 'id' ], $tab[ 'title' ], $tab[ 'file' ], $tab[ 'icon-class' ], $tab[ 'callback' ], $tab[ 'callback_args' ] );
 			\GravityView_Metabox_Tabs::add( $metabox );
 		} else {
-			add_meta_box( 'gravityview_' . $tab['id'], $tab['title'], $tab['callback'], $tab['screen'], $tab['context'], $tab['priority'] );
+			add_meta_box( 'gravityview_' . $tab[ 'id' ], $tab[ 'title' ], $tab[ 'callback' ], $tab[ 'screen' ], $tab[ 'context' ], $tab[ 'priority' ] );
 		}
 	}
 
@@ -211,14 +211,14 @@ 
 	 */
 	protected function is_extension_supported() {
 
-		self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : array( get_called_class() => (bool) self::$is_compatible );
+		self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : array( get_called_class() => (bool)self::$is_compatible );
 
 		if ( ! function_exists( 'gravityview' ) ) {
 			$message = sprintf( __( 'Could not activate the %s Extension; GravityView is not active.', 'gravityview' ), esc_html( $this->_title ) );
-		} else if ( false === version_compare( Plugin::$version, $this->_min_gravityview_version , ">=" ) ) {
-			$message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>'.$this->_min_gravityview_version.'</tt>' );
-		} else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version , ">=" ) ) {
-			$message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>'.$this->_min_php_version.'</tt>' );
+		} else if ( false === version_compare( Plugin::$version, $this->_min_gravityview_version, ">=" ) ) {
+			$message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_gravityview_version . '</tt>' );
+		} else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version, ">=" ) ) {
+			$message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_php_version . '</tt>' );
 		} else if ( ! empty( $this->_max_gravityview_version ) && false === version_compare( $this->_max_gravityview_version, Plugin::$version, ">" ) ) {
 			$message = sprintf( __( 'The %s Extension is not compatible with this version of GravityView. Please update the Extension to the latest version.', 'gravityview' ), esc_html( $this->_title ) );
 		} else {
@@ -258,12 +258,12 @@ 
 
 		$locale = get_locale();
 
-		if ( function_exists('get_user_locale') && is_admin() ) {
+		if ( function_exists( 'get_user_locale' ) && is_admin() ) {
 			$locale = get_user_locale();
 		}
 
 		// Traditional WordPress plugin locale filter
-		$locale = apply_filters( 'plugin_locale',  $locale, $this->_text_domain );
+		$locale = apply_filters( 'plugin_locale', $locale, $this->_text_domain );
 
 		$mofile = sprintf( '%1$s-%2$s.mo', $this->_text_domain, $locale );
 
@@ -291,7 +291,7 @@ 
 	public function settings() {
 
 		// If doing ajax, get outta here
-		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST('action') ) )  {
+		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST( 'action' ) ) ) {
 			return;
 		}
 
@@ -308,7 +308,7 @@ 
             	'version'	=> $this->_version, // current version number
             	'license'	=> \GV\Utils::get( $license, 'license_key', \GV\Utils::get( $license, 'license', null ) ),
 	            'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
-            	'item_name' => $this->_title,  // name of this plugin
+            	'item_name' => $this->_title, // name of this plugin
             	'author' 	=> strip_tags( $this->_author )  // author of this plugin
           	)
         );
@@ -337,16 +337,16 @@ 
 	 */
 	public static function add_notice( $notice = array() ) {
 
-		if ( is_array( $notice ) && empty( $notice['message'] ) ) {
+		if ( is_array( $notice ) && empty( $notice[ 'message' ] ) ) {
 			gravityview()->log->error( 'Notice not set', array( 'data' => $notice ) );
 			return;
 		} else if ( is_string( $notice ) ) {
 			$notice = array( 'message' => $notice );
 		}
 
-		$notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
+		$notice[ 'class' ] = empty( $notice[ 'class' ] ) ? 'error' : $notice[ 'class' ];
 
-		self::$admin_notices []= $notice;
+		self::$admin_notices [ ] = $notice;
 	}
 
 	/**
@@ -360,8 +360,8 @@ 
 		}
 
 		foreach ( self::$admin_notices as $key => $notice ) {
-			echo '<div id="message" class="'. esc_attr( $notice['class'] ).'">';
-			echo wpautop( $notice['message'] );
+			echo '<div id="message" class="' . esc_attr( $notice[ 'class' ] ) . '">';
+			echo wpautop( $notice[ 'message' ] );
 			echo '<div class="clear"></div>';
 			echo '</div>';
 		}

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

Spacing +6 added lines, -6 removed lines

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