gravityview / GravityView

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

Doc Comments +3 added lines, -3 removed lines

@@ -141,8 +141,8 @@ 
      *
      * @see add_columns_sort_links
 	 * @param string $url Single-sort URL
-	 * @param array $sort_args Single sorting for rules, in [ field_id, dir ] format
-     * @param string|int $field_id ID of the current field being displayed
+	 * @param string[] $sort_args Single sorting for rules, in [ field_id, dir ] format
+     * @param string $field_id ID of the current field being displayed
      *
      * @return string Multisort URL, if there are multiple sorts. Otherwise, existing $url
 	 */
@@ -346,7 +346,7 @@ 
 	 * Output a field cell.
 	 *
 	 * @param \GV\Field $field The field to be ouput.
-	 * @param \GV\Field $entry The entry this field is for.
+	 * @param Entry $entry The entry this field is for.
 	 *
 	 * @return void
 	 */

Indentation +88 added lines, -88 removed lines

@@ -19,8 +19,8 @@ 
 
 
 	/**
-     * Constructor. Add filters to modify output.
-     *
+	 * Constructor. Add filters to modify output.
+	 *
 	 * @since 2.0.4
 	 *
 	 * @param View $view
@@ -29,19 +29,19 @@ 
 	 */
 	public function __construct( View $view, Entry_Collection $entries, Request $request ) {
 
-	    add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 );
+		add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 );
 
 		parent::__construct( $view, $entries, $request );
 	}
 
 	/**
-     * Add sorting links to HTML columns that support sorting
-     *
-     * @since 2.0.4
-     * @since 2.0.5 Made static
-     *
-     * @static
-     *
+	 * Add sorting links to HTML columns that support sorting
+	 *
+	 * @since 2.0.4
+	 * @since 2.0.5 Made static
+	 *
+	 * @static
+	 *
 	 * @param string $column_label Label for the table column
 	 * @param \GV\Template_Context $context
 	 *
@@ -52,7 +52,7 @@ 
 		$sort_columns = $context->view->settings->get( 'sort_columns' );
 
 		if ( empty( $sort_columns ) ) {
-            return $column_label;
+			return $column_label;
 		}
 
 		if ( ! \GravityView_frontend::getInstance()->is_field_sortable( $context->field->ID, $context->view->form->form ) ) {
@@ -102,22 +102,22 @@ 
 		// If we are already sorting by the current field...
 		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
 
-		    switch( $sorting['direction'] ) {
-		        // No sort
-                case '':
-	                $sort_args[1] = 'asc';
-	                $class .= ' gv-icon-caret-up-down';
-                    break;
-                case 'desc':
-	                $sort_args[1] = '';
-	                $class .= ' gv-icon-sort-asc';
-	                break;
-                case 'asc':
-                default:
-                    $sort_args[1] = 'desc';
-                    $class .= ' gv-icon-sort-desc';
-                    break;
-            }
+			switch( $sorting['direction'] ) {
+				// No sort
+				case '':
+					$sort_args[1] = 'asc';
+					$class .= ' gv-icon-caret-up-down';
+					break;
+				case 'desc':
+					$sort_args[1] = '';
+					$class .= ' gv-icon-sort-asc';
+					break;
+				case 'asc':
+				default:
+					$sort_args[1] = 'desc';
+					$class .= ' gv-icon-sort-desc';
+					break;
+			}
 
 		} else {
 			$class .= ' gv-icon-caret-up-down';
@@ -127,56 +127,56 @@ 
 		$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 ) .'" data-multisort-href="'. esc_url_raw( $multisort_url ) . '" class="'. $class .'" ></a>&nbsp;'. $column_label;
 	}
 
 	/**
-     * Get the multi-sort URL used in the sorting links
-     *
-     * @todo Consider moving to Utils?
-     *
-     * @since 2.3
-     *
-     * @see add_columns_sort_links
+	 * Get the multi-sort URL used in the sorting links
+	 *
+	 * @todo Consider moving to Utils?
+	 *
+	 * @since 2.3
+	 *
+	 * @see add_columns_sort_links
 	 * @param string $url Single-sort URL
 	 * @param array $sort_args Single sorting for rules, in [ field_id, dir ] format
-     * @param string|int $field_id ID of the current field being displayed
-     *
-     * @return string Multisort URL, if there are multiple sorts. Otherwise, existing $url
+	 * @param string|int $field_id ID of the current field being displayed
+	 *
+	 * @return string Multisort URL, if there are multiple sorts. Otherwise, existing $url
 	 */
 	static public function _get_multisort_url( $url, $sort_args, $field_id ) {
 
 		$sorts = Utils::_GET( 'sort' );
 
 		if ( ! is_array( $sorts ) ) {
-            return $url;
+			return $url;
 		}
 
-        $multisort_url = $url;
+		$multisort_url = $url;
 
 		// If the field has already been sorted by, add the field to the URL
-        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 );
-            } else {
-                $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] ) {
-	            unset( $sorts[ $field_id ] );
-            } else {
-	            $sorts[ $field_id ] = $sort_args[1];
-            }
-
-            $multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url );
-        }
+		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 );
+			} else {
+				$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] ) {
+				unset( $sorts[ $field_id ] );
+			} else {
+				$sorts[ $field_id ] = $sort_args[1];
+			}
+
+			$multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url );
+		}
 
 		return $multisort_url;
 	}
@@ -206,10 +206,10 @@ 
 	}
 
 	/**
-     * Returns the label for a column, with support for all deprecated filters
-     *
-     * @since 2.1
-     *
+	 * Returns the label for a column, with support for all deprecated filters
+	 *
+	 * @since 2.1
+	 *
 	 * @param \GV\Field $field
 	 * @param \GV\Template_Context $context
 	 */
@@ -232,7 +232,7 @@ 
 		$column_label = apply_filters( 'gravityview/template/field/label', $column_label, $context );
 
 		return $column_label;
-    }
+	}
 
 	/**
 	 * Output the entry row.
@@ -301,15 +301,15 @@ 
 				 */
 				do_action( 'gravityview/template/table/cells/before', $context );
 
-                /**
-                 * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
-                 * @since 1.0.7
+				/**
+				 * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
+				 * @since 1.0.7
 				 * @param \GravityView_View $this Current GravityView_View object
 				 * @deprecated Use `gravityview/template/table/cells/before`
-                 */
-                do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() );
+				 */
+				do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() );
 
-                foreach ( $fields->all() as $field ) {
+				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 ];
@@ -329,13 +329,13 @@ 
 				 */
 				do_action( 'gravityview/template/table/cells/after', $context );
 
-                /**
-                 * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
-                 * @since 1.0.7
+				/**
+				 * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
+				 * @since 1.0.7
 				 * @param \GravityView_View $this Current GravityView_View object
 				 * @deprecated Use `gravityview/template/table/cells/after`
-                 */
-                do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() );
+				 */
+				do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() );
 
 				?>
 			</tr>
@@ -376,9 +376,9 @@ 
 			'value' => $value,
 			'hide_empty' => false,
 			'zone_id' => 'directory_table-columns',
-            'label' => self::get_field_column_label( $field, $context ),
+			'label' => self::get_field_column_label( $field, $context ),
 			'markup' => '<td id="{{ field_id }}" class="{{ class }}" data-label="{{label_value:data-label}}">{{ value }}</td>',
-            'form' => $form,
+			'form' => $form,
 		);
 
 		/** Output. */
@@ -403,11 +403,11 @@ 
 		do_action( 'gravityview/template/table/body/before', $context );
 
 		/**
-		* @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
-		* @deprecated Use `gravityview/template/table/body/before`
-		* @since 1.0.7
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
-		*/
+		 * @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
+		 * @deprecated Use `gravityview/template/table/body/before`
+		 * @since 1.0.7
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
+		 */
 		do_action( 'gravityview_table_body_before', \GravityView_View::getInstance() /** ugh! */ );
 	}
 
@@ -429,11 +429,11 @@ 
 		do_action( 'gravityview/template/table/body/after', $context );
 
 		/**
-		* @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
-		* @deprecated Use `gravityview/template/table/body/after`
-		* @since 1.0.7
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
-		*/
+		 * @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
+		 * @deprecated Use `gravityview/template/table/body/after`
+		 * @since 1.0.7
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
+		 */
 		do_action( 'gravityview_table_body_after', \GravityView_View::getInstance() /** ugh! */ );
 	}
 

Spacing +20 added lines, -20 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,9 +127,9 @@ 
 		$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 ) .'" data-multisort-href="'. esc_url_raw( $multisort_url ) . '" class="'. $class .'" ></a>&nbsp;'. $column_label;
+		return '<a href="' . esc_url_raw( $url ) . '" data-multisort-href="' . esc_url_raw( $multisort_url ) . '" class="' . $class . '" ></a>&nbsp;' . $column_label;
 	}
 
 	/**
@@ -160,19 +160,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 );
@@ -310,9 +310,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' ) );