gravityview / GravityView

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

Spacing +3 added lines, -3 removed lines

@@ -11,10 +11,10 @@
 ?>
 
 <div class="gv-search-box gv-search-date">
-	<?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>
-		<input type="text" name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $search_field['value'] ); ?>" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" >
+		<input type="text" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $search_field[ 'value' ] ); ?>" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" >
 	</p>
 </div>
\ No newline at end of file

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

Spacing +3 added lines, -3 removed lines

@@ -10,10 +10,10 @@
 
 ?>
 <div class="gv-search-box gv-search-field-text">
-	<?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>
-		<input type="text" name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $search_field['value'] ); ?>">
+		<input type="text" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $search_field[ 'value' ] ); ?>">
 	</p>
 </div>
\ No newline at end of file

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

Spacing +3 added lines, -3 removed lines

@@ -12,8 +12,8 @@
 ?>
 
 <div class="gv-search-box gv-search-field-single_checkbox">
-	<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" class="gv-check-radio">
-		<input type="checkbox" name="<?php echo esc_attr( $search_field['name'] ); ?>" value="1" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" <?php checked( '1', $search_field['value'], true ); ?>>
-			<?php if( ! gv_empty( $search_field['label'], false, false ) ) { echo esc_html(  $search_field['label'] ); } ?>
+	<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" class="gv-check-radio">
+		<input type="checkbox" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="1" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" <?php checked( '1', $search_field[ 'value' ], true ); ?>>
+			<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { echo esc_html( $search_field[ 'label' ] ); } ?>
 	</label>
 </div>
\ No newline at end of file

includes/class-gravityview-html-elements.php

Spacing +25 added lines, -25 removed lines

@@ -42,16 +42,16 @@ 
 
 		$args = wp_parse_args( $args, $defaults );
 
-		$forms = gravityview_get_forms( (bool) $args['active'], (bool) $args['trash'] );
+		$forms = gravityview_get_forms( (bool)$args[ 'active' ], (bool)$args[ 'trash' ] );
 
-		if( array() === $args['options'] ) {
+		if ( array() === $args[ 'options' ] ) {
 			foreach ( $forms as $form ) {
 
-				if ( in_array( $form['id'], $args['exclude'] ) ) {
+				if ( in_array( $form[ 'id' ], $args[ 'exclude' ] ) ) {
 					continue;
 				}
 
-				$args['options'][ $form['id'] ] = esc_html( $form['title'] );
+				$args[ 'options' ][ $form[ 'id' ] ] = esc_html( $form[ 'title' ] );
 			}
 		}
 
@@ -83,15 +83,15 @@ 
 
 		$args = wp_parse_args( $args, $defaults );
 
-		if( empty( $args['form_id'] ) ) {
+		if ( empty( $args[ 'form_id' ] ) ) {
 			return '';
 		}
 
-		$fields = GVCommon::get_sortable_fields_array( $args['form_id'] );
+		$fields = GVCommon::get_sortable_fields_array( $args[ 'form_id' ] );
 
-		if( array() === $args['options'] ) {
+		if ( array() === $args[ 'options' ] ) {
 			foreach ( $fields as $field_id => $field ) {
-				$args['options'][ $field_id ] = esc_html( $field['label'] );
+				$args[ 'options' ][ $field_id ] = esc_html( $field[ 'label' ] );
 			}
 		}
 
@@ -127,43 +127,43 @@ 
 		$args = wp_parse_args( $args, $defaults );
 
 		$data_elements = '';
-		foreach ( $args['data'] as $key => $value ) {
+		foreach ( $args[ 'data' ] as $key => $value ) {
 			$data_elements .= ' data-' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
 		}
 
-		if( $args['multiple'] ) {
+		if ( $args[ 'multiple' ] ) {
 			$multiple = ' MULTIPLE';
 		} else {
 			$multiple = '';
 		}
 
-		if( $args['placeholder'] ) {
-			$placeholder = $args['placeholder'];
+		if ( $args[ 'placeholder' ] ) {
+			$placeholder = $args[ 'placeholder' ];
 		} else {
 			$placeholder = '';
 		}
 
-		$disabled = $args['disabled'] ? ' disabled="disabled"' : '';
-		$class  = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) ) );
-		$output = '<select name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( str_replace( '-', '_', $args['id'] ) ) . '" class="gravityview-select ' . $class . '"' . $multiple . $disabled . ' data-placeholder="' . $placeholder . '"'. $data_elements . '>';
+		$disabled = $args[ 'disabled' ] ? ' disabled="disabled"' : '';
+		$class  = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args[ 'class' ] ) ) );
+		$output = '<select name="' . esc_attr( $args[ 'name' ] ) . '" id="' . esc_attr( str_replace( '-', '_', $args[ 'id' ] ) ) . '" class="gravityview-select ' . $class . '"' . $multiple . $disabled . ' data-placeholder="' . $placeholder . '"' . $data_elements . '>';
 
-		if ( ! empty( $args['options'] ) ) {
+		if ( ! empty( $args[ 'options' ] ) ) {
 
-			if ( $args['show_option_none'] ) {
-				if( $args['multiple'] ) {
-					$selected = selected( true, in_array( -1, $args['selected'] ), false );
+			if ( $args[ 'show_option_none' ] ) {
+				if ( $args[ 'multiple' ] ) {
+					$selected = selected( true, in_array( -1, $args[ 'selected' ] ), false );
 				} else {
-					$selected = selected( $args['selected'], -1, false );
+					$selected = selected( $args[ 'selected' ], -1, false );
 				}
-				$output .= '<option value="-1"' . $selected . '>' . esc_html( $args['show_option_none'] ) . '</option>';
+				$output .= '<option value="-1"' . $selected . '>' . esc_html( $args[ 'show_option_none' ] ) . '</option>';
 			}
 
-			foreach( $args['options'] as $key => $option ) {
+			foreach ( $args[ 'options' ] as $key => $option ) {
 
-				if( $args['multiple'] && is_array( $args['selected'] ) ) {
-					$selected = selected( true, in_array( $key, $args['selected'], true ), false );
+				if ( $args[ 'multiple' ] && is_array( $args[ 'selected' ] ) ) {
+					$selected = selected( true, in_array( $key, $args[ 'selected' ], true ), false );
 				} else {
-					$selected = selected( $args['selected'], $key, false );
+					$selected = selected( $args[ 'selected' ], $key, false );
 				}
 
 				$output .= '<option value="' . esc_attr( $key ) . '"' . $selected . '>' . esc_html( $option ) . '</option>';

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-ultimate-member.php

Spacing +3 added lines, -3 removed lines

@@ -43,12 +43,12 @@ 
 	function parse_um_profile_post_content( $args = array() ) {
 		global $ultimatemember;
 
-		if( ! $ultimatemember || ! is_object( $ultimatemember ) || ! class_exists( 'GravityView_View_Data' ) ) {
+		if ( ! $ultimatemember || ! is_object( $ultimatemember ) || ! class_exists( 'GravityView_View_Data' ) ) {
 			return;
 		}
 
 		// @todo Support Ultimate Member 2.0 - for now, prevent fatal error
-		if( ! isset( $ultimatemember->profile ) ) {
+		if ( ! isset( $ultimatemember->profile ) ) {
 			return;
 		}
 
@@ -64,7 +64,7 @@ 
 			return;
 		}
 
-		GravityView_View_Data::getInstance()->parse_post_content( $active_tab[0]->post_content );
+		GravityView_View_Data::getInstance()->parse_post_content( $active_tab[ 0 ]->post_content );
 
 		wp_reset_postdata();
 	}

includes/class-gravityview-entry-notes.php

Indentation +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
 		global $wpdb;
 
 		if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' )
-		     && method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) {
+			 && method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) {
 			$notes_table = GFFormsModel::get_entry_notes_table_name();
 		} else {
 			$notes_table = GFFormsModel::get_lead_notes_table_name();

Spacing +6 added lines, -6 removed lines

@@ -67,10 +67,10 @@ 
 		// Make sure the keys are all set
 		$note = wp_parse_args( $note, $default_note );
 
-		GFFormsModel::add_note( intval( $note['lead_id'] ), intval( $note['user_id'] ), esc_attr( $note['user_name'] ), $note['note'], esc_attr( $note['note_type'] ) );
+		GFFormsModel::add_note( intval( $note[ 'lead_id' ] ), intval( $note[ 'user_id' ] ), esc_attr( $note[ 'user_name' ] ), $note[ 'note' ], esc_attr( $note[ 'note_type' ] ) );
 
 		// If last_error is empty string, there was no error.
-		if( empty( $wpdb->last_error ) ) {
+		if ( empty( $wpdb->last_error ) ) {
 			$return = $wpdb->insert_id;
 		} else {
 			$return = new WP_Error( 'gravityview-add-note', $wpdb->last_error );
@@ -96,7 +96,7 @@ 
 	 */
 	public static function delete_notes( $note_ids = array() ) {
 
-		if( !is_array( $note_ids ) ) {
+		if ( ! is_array( $note_ids ) ) {
 
 			gravityview()->log->error( 'Note IDs not an array. Not processing delete request.', array( 'data' => $note_ids ) );
 
@@ -157,7 +157,7 @@ 
 			)
 		);
 
-		return $results ? $results[0] : false;
+		return $results ? $results[ 0 ] : false;
 	}
 
 	/**
@@ -170,8 +170,8 @@ 
 	 */
 	public static function filter_avatar( $avatar = '', $note = null ) {
 
-		if( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) {
-			$avatar =  sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) );
+		if ( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) {
+			$avatar = sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) );
 		}
 
 		return $avatar;

future/includes/class-gv-shortcode.php

Spacing +6 added lines, -6 removed lines

@@ -76,7 +76,7 @@ 
 	 */
 	public static function remove() {
 		$shortcode = new static();
-		unset( self::$shortcodes[$shortcode->name] );
+		unset( self::$shortcodes[ $shortcode->name ] );
 		remove_shortcode( $shortcode->name );
 	}
 
@@ -108,14 +108,14 @@ 
 		preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );
 
 		foreach ( $matches as $shortcode ) {
-			$shortcode_name = $shortcode[2];
+			$shortcode_name = $shortcode[ 2 ];
 
-			$shortcode_atts = shortcode_parse_atts( $shortcode[3] );
-			$shortcode_content = $shortcode[5];
+			$shortcode_atts = shortcode_parse_atts( $shortcode[ 3 ] );
+			$shortcode_content = $shortcode[ 5 ];
 
 			/** This is a registered GravityView shortcode. */
-			if ( !empty( self::$shortcodes[$shortcode_name] ) ) {
-				$shortcode = clone self::$shortcodes[$shortcode_name];
+			if ( ! empty( self::$shortcodes[ $shortcode_name ] ) ) {
+				$shortcode = clone self::$shortcodes[ $shortcode_name ];
 			} else {
 				/** This is some generic shortcode. */
 				$shortcode = new self;

future/includes/class-gv-view.php

Indentation -1 removed lines

@@ -62,7 +62,6 @@
 	 *
 	 * Internal static cache for gets, and whatnot.
 	 * This is not persistent, resets across requests.
-
 	 * @internal
 	 */
 	private static $cache = array();

Braces +3 added lines, -2 removed lines

@@ -230,8 +230,9 @@
 		 * Check permissions.
 		 */
 		while ( $error = $view->can_render( null, $request ) ) {
-			if ( ! is_wp_error( $error ) )
-				break;
+			if ( ! is_wp_error( $error ) ) {
+							break;
+			}
 
 			switch ( str_replace( 'gravityview/', '', $error->get_error_code() ) ) {
 				case 'post_password_required':

Spacing +88 added lines, -89 removed lines

@@ -134,7 +134,7 @@ 
 		$supports = array( 'title', 'revisions' );
 
 		if ( $is_hierarchical ) {
-			$supports[] = 'page-attributes';
+			$supports[ ] = 'page-attributes';
 		}
 
 		/**
@@ -243,12 +243,12 @@ 
 		$tsv_rule = array( sprintf( '%s/([^/]+)/tsv/?', $slug ), 'index.php?gravityview=$matches[1]&tsv=1', 'top' );
 
 		add_filter( 'query_vars', function( $query_vars ) {
-			$query_vars[] = 'csv';
-			$query_vars[] = 'tsv';
+			$query_vars[ ] = 'csv';
+			$query_vars[ ] = 'tsv';
 			return $query_vars;
 		} );
 
-		if ( ! isset( $wp_rewrite->extra_rules_top[ $csv_rule[0] ] ) ) {
+		if ( ! isset( $wp_rewrite->extra_rules_top[ $csv_rule[ 0 ] ] ) ) {
 			call_user_func_array( 'add_rewrite_rule', $csv_rule );
 			call_user_func_array( 'add_rewrite_rule', $tsv_rule );
 		}
@@ -309,7 +309,7 @@ 
 
 						$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gk-gravityview' );
 
-						$image =  sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', esc_attr__( 'Data Source', 'gk-gravityview' ), esc_url( plugins_url( 'assets/images/screenshots/data-source.png', GRAVITYVIEW_FILE ) ) );
+						$image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', esc_attr__( 'Data Source', 'gk-gravityview' ), esc_url( plugins_url( 'assets/images/screenshots/data-source.png', GRAVITYVIEW_FILE ) ) );
 
 						return \GVCommon::generate_notice( '<h3>' . $title . '</h3>' . wpautop( $message . $image ), 'notice' );
 					}
@@ -335,13 +335,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.', 'gk-gravityview' );
 			}
@@ -352,7 +352,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.', 'gk-gravityview' );
 				}
@@ -375,7 +375,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.', 'gk-gravityview' );
 				}
@@ -386,7 +386,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.', 'gk-gravityview' );
 					}
@@ -561,7 +561,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;
@@ -651,13 +651,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 );
 					}
 				}
@@ -710,10 +710,10 @@ 
 		/** Get connected form. */
 		$view->form = GF_Form::by_id( $view->_gravityview_form_id );
 		global $pagenow;
-		if ( ! $view->form && 'post-new.php' !== $pagenow  ) {
+		if ( ! $view->form && 'post-new.php' !== $pagenow ) {
 			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,
 			) );
 		}
 
@@ -843,7 +843,7 @@ 
 	 * @since 2.0
 	 * @return bool Whether the offset exists or not, limited to GravityView_View_Data::$views element keys.
 	 */
-	#[\ReturnTypeWillChange]
+	#[\ReturnTypeWillChange ]
 	public function offsetExists( $offset ) {
 		$data_keys = array( 'id', 'view_id', 'form_id', 'template_id', 'atts', 'fields', 'widgets', 'form' );
 		return in_array( $offset, $data_keys );
@@ -860,7 +860,7 @@ 
 	 *
 	 * @return mixed The value of the requested view data key limited to GravityView_View_Data::$views element keys. If offset not found, return null.
 	 */
-	#[\ReturnTypeWillChange]
+	#[\ReturnTypeWillChange ]
 	public function offsetGet( $offset ) {
 
 		gravityview()->log->notice( 'This is a \GV\View object should not be accessed as an array.' );
@@ -897,7 +897,7 @@ 
 	 *
 	 * @return void
 	 */
-	#[\ReturnTypeWillChange]
+	#[\ReturnTypeWillChange ]
 	public function offsetSet( $offset, $value ) {
 		gravityview()->log->error( 'The old view data is no longer mutable. This is a \GV\View object should not be accessed as an array.' );
 	}
@@ -910,7 +910,7 @@ 
 	 * @since 2.0
 	 * @return void
 	 */
-	#[\ReturnTypeWillChange]
+	#[\ReturnTypeWillChange ]
 	public function offsetUnset( $offset ) {
 		gravityview()->log->error( 'The old view data is no longer mutable. This is a \GV\View object should not be accessed as an array.' );
 	}
@@ -961,11 +961,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' ] );
 			}
 		}
 
@@ -974,31 +974,30 @@ 
 		 */
 		$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 ( ! is_array( $parameters ) ) {
 			$parameters = array();
 		}
 
-		if ( ! is_array( $parameters['search_criteria'] ) ) {
-			$parameters['search_criteria'] = array();
+		if ( ! is_array( $parameters[ 'search_criteria' ] ) ) {
+			$parameters[ 'search_criteria' ] = array();
 		}
 
-		if ( ( ! isset( $parameters['search_criteria']['field_filters'] ) ) || ( ! is_array( $parameters['search_criteria']['field_filters'] ) ) ) {
-			$parameters['search_criteria']['field_filters'] = array();
+		if ( ( ! isset( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) || ( ! is_array( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) ) {
+			$parameters[ 'search_criteria' ][ 'field_filters' ] = array();
 		}
 
 		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' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 );
+		$page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 );
 
 		/**
 		 * Cleanup duplicate field_filter parameters to simplify the query.
@@ -1006,14 +1005,14 @@ 
 		$unique_field_filters = array();
 		foreach ( Utils::get( $parameters, 'search_criteria/field_filters', array() ) 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.' );
 		}
 
@@ -1022,7 +1021,7 @@ 
 			$query_class = $this->get_query_class();
 
 			/** @type \GF_Query $query */
-			$query = new $query_class( $this->form->ID, $parameters['search_criteria'], Utils::get( $parameters, 'sorting' ) );
+			$query = new $query_class( $this->form->ID, $parameters[ 'search_criteria' ], Utils::get( $parameters, 'sorting' ) );
 
 			/**
 			 * Apply multisort.
@@ -1033,15 +1032,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;
@@ -1049,7 +1048,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
@@ -1079,18 +1078,18 @@ 
 
 				$merged_time = false;
 
-				foreach ( $q['order'] as $oid => $order ) {
+				foreach ( $q[ 'order' ] as $oid => $order ) {
 
 					$column = null;
 
-					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 ) {
+					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 ( ! $column || ( ! $field = \GFAPI::get_field( $column->source, $column->field_id ) ) || $field->type !== 'time' ) {
@@ -1104,7 +1103,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;
@@ -1115,15 +1114,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?
@@ -1143,7 +1142,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 ) );
 					}
 
 					// Filter to active entries only
@@ -1161,7 +1160,7 @@ 
 					);
 
 					$q = $query->_introspect();
-					$query->where( \GF_Query_Condition::_and( $q['where'], $status_conditions ) );
+					$query->where( \GF_Query_Condition::_and( $q[ 'where' ], $status_conditions ) );
 
 					/**
 					 * Applies legacy modifications to Query for is_approved settings.
@@ -1189,7 +1188,7 @@ 
 						$conditions = array();
 
 						foreach ( $condition->expressions as $_condition ) {
-							$conditions[] = $recurse( $_condition, $fields, $recurse );
+							$conditions[ ] = $recurse( $_condition, $fields, $recurse );
 						}
 
 						return call_user_func_array(
@@ -1218,10 +1217,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 ) {
 						[ $column, $_order ] = $order;
 
 						if ( $column && $column instanceof \GF_Query_Column ) {
@@ -1235,15 +1234,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
 						);
 
@@ -1260,11 +1259,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();
 
@@ -1275,30 +1274,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;
 				} );
@@ -1343,20 +1342,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 ) );
 			}
 		}
@@ -1440,7 +1439,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();
@@ -1462,17 +1461,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;
 				}
 			}
 
@@ -1570,7 +1569,7 @@ 
 	 * @return void
 	 */
 	public function set_anchor_id( $counter = 1 ) {
-		$this->anchor_id = sprintf( 'gv-view-%d-%d', $this->ID, (int) $counter );
+		$this->anchor_id = sprintf( 'gv-view-%d-%d', $this->ID, (int)$counter );
 	}
 
 	/**
@@ -1630,7 +1629,7 @@ 
 		 * @param Join      $join         Which join we are dealing with.
 		 * @param self      $view         Instance of the view we are dealing with.
 		 */
-		$should_apply = (bool) apply_filters( 'gravityview/view/get_entries/should_apply_legacy_join_is_approved_query_conditions', true, $query, $join, $this );
+		$should_apply = (bool)apply_filters( 'gravityview/view/get_entries/should_apply_legacy_join_is_approved_query_conditions', true, $query, $join, $this );
 		if ( ! $should_apply ) {
 			return;
 		}
@@ -1660,6 +1659,6 @@ 
 
 		$query_parameters = $query->_introspect();
 
-		$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );
+		$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
 	}
 }

future/includes/class-gv-widget.php

Indentation +6 added lines, -6 removed lines

@@ -163,14 +163,14 @@
 		return $settings;
 	}
 
-    /**
+	/**
 	 * Get the Widget ID.
 	 *
-     * @return string The Widget ID.
-     */
-    public function get_widget_id() {
-        return $this->widget_id;
-    }
+	 * @return string The Widget ID.
+	 */
+	public function get_widget_id() {
+		return $this->widget_id;
+	}
 
 	/**
 	 * Get the widget settings

Spacing +7 added lines, -7 removed lines

@@ -165,7 +165,7 @@ 
 		$enable_custom_class = apply_filters( 'gravityview/widget/enable_custom_class', false, $this );
 
 		if ( $enable_custom_class ) {
-			$settings['custom_class'] = array(
+			$settings[ 'custom_class' ] = array(
 				'type'       => 'text',
 				'label'      => __( 'Custom CSS Class:', 'gk-gravityview' ),
 				'desc'       => __( 'This class will be added to the widget container', 'gk-gravityview' ),
@@ -223,7 +223,7 @@ 
 				'1-1' => array(
 					   array(
 						   'areaid' => 'top',
-						   'title' => __( 'Top', 'gk-gravityview' ) ,
+						   'title' => __( 'Top', 'gk-gravityview' ),
 						   'subtitle' => ''
 					   ),
 				   ),
@@ -232,14 +232,14 @@ 
 				'1-2' => array(
 					array(
 						'areaid' => 'left',
-						'title' => __( 'Left', 'gk-gravityview' ) ,
+						'title' => __( 'Left', 'gk-gravityview' ),
 						'subtitle' => ''
 					),
 				),
 				'2-2' => array(
 					array(
 						'areaid' => 'right',
-						'title' => __( 'Right', 'gk-gravityview' ) ,
+						'title' => __( 'Right', 'gk-gravityview' ),
 						'subtitle' => ''
 					),
 				),
@@ -274,7 +274,7 @@ 
 		}
 
 		$widgets[ $this->get_widget_id() ] = array(
-			'label' => $this->widget_label ,
+			'label' => $this->widget_label,
 			'description' => $this->widget_description,
 			'subtitle' => $this->widget_subtitle,
 			'icon' => $this->icon,
@@ -296,7 +296,7 @@ 
 	 */
 	public function assign_widget_options( $options = array(), $template = '', $widget = '' ) {
 		if ( $this->get_widget_id() === $widget ) {
-			if( $settings = $this->get_settings() ) {
+			if ( $settings = $this->get_settings() ) {
 				$options = array_merge( $options, $settings );
 			}
 		}
@@ -350,7 +350,7 @@ 
 			return;
 		}
 
-		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode') );
+		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode' ) );
 	}
 
 	/**