gravityview / GravityView

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-acf.php

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
 
 		$acf_keys = get_field_objects( $post->ID, array( 'load_value' => false ) );
 
-		if( $acf_keys ) {
+		if ( $acf_keys ) {
 			return array_merge( array_keys( $acf_keys ), $meta_keys );
 		}
 
@@ -70,9 +70,9 @@ 
 	 * @return void
 	 */
 	private function fix_posted_fields() {
-		if( is_admin() && isset( $_POST['action'] ) && isset( $_POST['post_type'] ) ) {
-			if( 'editpost' === $_POST['action'] && 'gravityview' === $_POST['post_type'] ) {
-				$_POST['fields'] = _gravityview_process_posted_fields();
+		if ( is_admin() && isset( $_POST[ 'action' ] ) && isset( $_POST[ 'post_type' ] ) ) {
+			if ( 'editpost' === $_POST[ 'action' ] && 'gravityview' === $_POST[ 'post_type' ] ) {
+				$_POST[ 'fields' ] = _gravityview_process_posted_fields();
 			}
 		}
 	}

future/includes/class-gv-source-internal.php

Doc Comments +1 added lines, -2 removed lines

@@ -24,9 +24,8 @@
 	/**
 	 * Get a \GV\Field by Field ID for this data source.
 	 *
-	 * @param int $field_id The internal field ID (custom content, etc.)
 	 *
-	 * @return \GV\Field|null The requested field or null if not found.
+	 * @return null|Internal_Field The requested field or null if not found.
 	 */
 	public static function get_field( /** varargs */ ) {
 		$args = func_get_args();

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

Spacing +23 added lines, -23 removed lines

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

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

Spacing +16 added lines, -16 removed lines

@@ -44,16 +44,16 @@ 
 		 */
 		$atts = apply_filters( 'gravityview/shortcodes/gventry/atts', $atts );
 
-		$view = \GV\View::by_id( $atts['view_id'] );
+		$view = \GV\View::by_id( $atts[ 'view_id' ] );
 
 		if ( ! $view ) {
-			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts['view_id'] ) );
+			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts[ 'view_id' ] ) );
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', null, null, $atts );
 		}
 
-		$entry_id = ! empty( $atts['entry_id'] ) ? $atts['entry_id'] : $atts['id'];
+		$entry_id = ! empty( $atts[ 'entry_id' ] ) ? $atts[ 'entry_id' ] : $atts[ 'id' ];
 
-		switch( $entry_id ):
+		switch ( $entry_id ):
 			case 'last':
 				if ( class_exists( '\GF_Query' ) ) {
 					/**
@@ -62,17 +62,17 @@ 
 					 * Since we're using \GF_Query shorthand initialization we have to reverse the order parameters here.
 					 */
 					add_filter( 'gravityview_get_entries', $filter = function( $parameters, $args, $form_id ) {
-						if ( ! empty( $parameters['sorting'] ) ) {
+						if ( ! empty( $parameters[ 'sorting' ] ) ) {
 							/**
 							 * Reverse existing sorts.
 							 */
-							$sort = &$parameters['sorting'];
-							$sort['direction'] = $sort['direction'] == 'RAND' ? : ( $sort['direction'] == 'ASC' ? 'DESC' : 'ASC' );
+							$sort = &$parameters[ 'sorting' ];
+							$sort[ 'direction' ] = $sort[ 'direction' ] == 'RAND' ?: ( $sort[ 'direction' ] == 'ASC' ? 'DESC' : 'ASC' );
 						} else {
 							/**
 							 * Otherwise, sort by date_created.
 							 */
-							$parameters['sorting'] = array(
+							$parameters[ 'sorting' ] = array(
 								'key' => 'id',
 								'direction' => 'ASC',
 								'is_numeric' => true
@@ -87,7 +87,7 @@ 
 
 					/** If a sort already exists, reverse it. */
 					if ( $sort = end( $entries->sorts ) ) {
-						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ? : ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
+						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ?: ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
 					} else {
 						/** Otherwise, sort by date_created */
 						$entries = $entries->sort( new \GV\Entry_Sort( \GV\Internal_Field::by_id( 'id' ), \GV\Entry_Sort::ASC ), \GV\Entry_Sort::NUMERIC );
@@ -105,12 +105,12 @@ 
 				break;
 			default:
 				if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) {
-					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts['view_id'] ) );
+					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts[ 'view_id' ] ) );
 					return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, null, $atts );
 				}
 		endswitch;
 
-		if ( $view->form->ID != $entry['form_id'] ) {
+		if ( $view->form->ID != $entry[ 'form_id' ] ) {
 			gravityview()->log->error( 'Entry does not belong to view (form mismatch)' );
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
 		}
@@ -120,7 +120,7 @@ 
 			return apply_filters( 'gravityview/shortcodes/gventry/output', get_the_password_form( $view->ID ), $view, $entry, $atts );
 		}
 
-		if ( ! $view->form  ) {
+		if ( ! $view->form ) {
 			gravityview()->log->notice( 'View #{id} has no form attached to it.', array( 'id' => $view->ID ) );
 
 			/**
@@ -143,15 +143,15 @@ 
 		}
 
 		/** Unapproved entries. */
-		if ( $entry['status'] != 'active' ) {
+		if ( $entry[ 'status' ] != 'active' ) {
 			gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
 		}
 
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
 		if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 				return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
 			}
@@ -163,7 +163,7 @@ 
 		$renderer = new \GV\Entry_Renderer();
 
 		$request = new \GV\Mock_Request();
-		$request->returns['is_entry'] = $entry;
+		$request->returns[ 'is_entry' ] = $entry;
 
 		$output = $renderer->render( $entry, $view, $request );
 

future/includes/class-gv-field-internal.php

Spacing +2 added lines, -2 removed lines

@@ -29,12 +29,12 @@
 	 */
 	public static function from_configuration( $configuration ) {
 
-		if ( empty( $configuration['id'] ) || ! is_string( $configuration['id'] ) ) {
+		if ( empty( $configuration[ 'id' ] ) || ! is_string( $configuration[ 'id' ] ) ) {
 			gravityview()->log->error( 'Invalid configuration[id] supplied.' );
 			return null;
 		}
 
-		$field = self::by_id( $configuration['id'] );
+		$field = self::by_id( $configuration[ 'id' ] );
 
 		$field->update_configuration( $configuration );
 

future/includes/class-gv-field.php

Spacing +17 added lines, -17 removed lines

@@ -166,7 +166,7 @@ 
 	 * @return \GV\Field The field implementation from configuration (\GV\GF_Field, \GV\Internal_Field).
 	 */
 	public static function from_configuration( $configuration ) {
-		if ( empty( $configuration['id'] ) ) {
+		if ( empty( $configuration[ 'id' ] ) ) {
 			$field = new self();
 			gravityview()->log->error( 'Trying to get field from configuration without a field ID.', array( 'data' => $configuration ) );
 			$field->update_configuration( $configuration );
@@ -179,8 +179,8 @@ 
 		} else {
 			$trace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS );
 		}
-		$trace = $trace[1];
-		if ( $trace['function'] == 'from_configuration' && $trace['class'] == __CLASS__ ) {
+		$trace = $trace[ 1 ];
+		if ( $trace[ 'function' ] == 'from_configuration' && $trace[ 'class' ] == __CLASS__ ) {
 			$field = new self();
 			gravityview()->log->error( 'Infinite loop protection tripped. Returning default class here.' );
 			$field->update_configuration( $configuration );
@@ -188,7 +188,7 @@ 
 		}
 
 		/** Determine the field implementation to use, and try to use. */
-		$field_class = is_numeric( $configuration['id'] ) ? '\GV\GF_Field' : '\GV\Internal_Field';
+		$field_class = is_numeric( $configuration[ 'id' ] ) ? '\GV\GF_Field' : '\GV\Internal_Field';
 
 		/**
 		 * @filter `gravityview/field/class` Filter the field class about to be created from the configuration.
@@ -227,24 +227,24 @@ 
 	public function update_configuration( $configuration ) {
 		$configuration = wp_parse_args( $configuration, $this->as_configuration() );
 
-		if ( $this->ID != $configuration['id'] ) {
+		if ( $this->ID != $configuration[ 'id' ] ) {
 			/** Smelling trouble here... */
 			gravityview()->log->warning( 'ID is being changed for {field_class} instance, but implementation is not. Use ::from_configuration instead', array( 'field_class', __CLASS__ ) );
 		}
 
-		$this->ID = $configuration['id'];
-		$this->label = $configuration['label'];
-		$this->show_label = $configuration['show_label'] == '1';
-		$this->custom_label = $configuration['custom_label'];
-		$this->custom_class = $configuration['custom_class'];
-		$this->cap = $configuration['only_loggedin'] == '1' ? $configuration['only_loggedin_cap'] : '';
-		$this->search_filter = $configuration['search_filter'] == '1';
-		$this->show_as_link = $configuration['show_as_link'] == '1';
+		$this->ID = $configuration[ 'id' ];
+		$this->label = $configuration[ 'label' ];
+		$this->show_label = $configuration[ 'show_label' ] == '1';
+		$this->custom_label = $configuration[ 'custom_label' ];
+		$this->custom_class = $configuration[ 'custom_class' ];
+		$this->cap = $configuration[ 'only_loggedin' ] == '1' ? $configuration[ 'only_loggedin_cap' ] : '';
+		$this->search_filter = $configuration[ 'search_filter' ] == '1';
+		$this->show_as_link = $configuration[ 'show_as_link' ] == '1';
 
 		/** Shared among all field types (sort of). */
 		$shared_configuration_keys = array(
 			'id', 'label', 'show_label', 'custom_label', 'custom_class',
-			'only_loggedin' ,'only_loggedin_cap', 'search_filter', 'show_as_link',
+			'only_loggedin', 'only_loggedin_cap', 'search_filter', 'show_as_link',
 		);
 
 		/** Everything else goes into the properties for now. @todo subclasses! */
@@ -273,7 +273,7 @@ 
 
 		/** A custom label is available. */
 		if ( ! empty( $this->custom_label ) ) {
-			return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ? : null : null, $entry ? $entry->as_entry() : null );
+			return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ?: null : null, $entry ? $entry->as_entry() : null );
 		}
 
 		return '';
@@ -350,7 +350,7 @@ 
 	 * @return mixed|null The value for the given configuration key, null if doesn't exist.
 	 */
 	public function __get( $key ) {
-		switch( $key ):
+		switch ( $key ):
 			default:
 				if ( isset( $this->configuration[ $key ] ) ) {
 					return $this->configuration[ $key ];
@@ -366,7 +366,7 @@ 
 	 * @return boolean Whether this $key is set or not.
 	 */
 	public function __isset( $key ) {
-		switch( $key ):
+		switch ( $key ):
 			default:
 				return isset( $this->configuration[ $key ] );
 		endswitch;

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

Doc Comments +1 added lines, -2 removed lines

@@ -53,7 +53,6 @@ 
 	 * Columns are able to be added to View layouts, but not separately searched!
 	 *
 	 * @param array $fields
-	 * @param int $form_id
 	 *
 	 * @return array
 	 */
@@ -133,7 +132,7 @@ 
 	 *
 	 * @param GF_Field_List $field Gravity Forms field
 	 * @param string|array $field_value Serialized or unserialized array value for the field
-	 * @param int|string $column_id The numeric key of the column (0-index) or the label of the column
+	 * @param integer $column_id The numeric key of the column (0-index) or the label of the column
 	 * @param string $format If set to 'raw', return an array of values for the column. Otherwise, allow Gravity Forms to render using `html` or `text`
 	 *
 	 * @return array|string|null Returns null if the $field_value passed wasn't an array or serialized array

Spacing +15 added lines, -15 removed lines

@@ -60,7 +60,7 @@ 
 	public function remove_columns_from_searchable_fields( $fields ) {
 
 		foreach ( $fields as $key => $field ) {
-			if ( isset( $field['parent'] ) && $field['parent'] instanceof \GF_Field_List ) {
+			if ( isset( $field[ 'parent' ] ) && $field[ 'parent' ] instanceof \GF_Field_List ) {
 				unset( $fields[ $key ] );
 			}
 		}
@@ -86,7 +86,7 @@ 
 		// Add the list columns
 		foreach ( $list_fields as $list_field ) {
 
-			if( empty( $list_field->enableColumns ) ) {
+			if ( empty( $list_field->enableColumns ) ) {
 				continue;
 			}
 
@@ -107,7 +107,7 @@ 
 			}
 
 			// If there are columns, add them under the parent field
-			if( ! empty( $list_columns ) ) {
+			if ( ! empty( $list_columns ) ) {
 
 				$index = array_search( $list_field->id, array_keys( $fields ) ) + 1;
 
@@ -115,7 +115,7 @@ 
 				 * Merge the $list_columns into the $fields array at $index
 				 * @see https://stackoverflow.com/a/1783125
 				 */
-				$fields = array_slice( $fields, 0, $index, true) + $list_columns + array_slice( $fields, $index, null, true);
+				$fields = array_slice( $fields, 0, $index, true ) + $list_columns + array_slice( $fields, $index, null, true );
 			}
 
 			unset( $list_columns, $index, $input_id );
@@ -142,7 +142,7 @@ 
 
 		$list_rows = maybe_unserialize( $field_value );
 
-		if( ! is_array( $list_rows ) ) {
+		if ( ! is_array( $list_rows ) ) {
 			gravityview()->log->error( '$field_value did not unserialize', array( 'data' => $field_value ) );
 			return null;
 		}
@@ -152,18 +152,18 @@ 
 		// Each list row
 		foreach ( $list_rows as $list_row ) {
 			$current_column = 0;
-			foreach ( (array) $list_row as $column_key => $column_value ) {
+			foreach ( (array)$list_row as $column_key => $column_value ) {
 
 				// If the label of the column matches $column_id, or the numeric key value matches, add the value
-				if( (string)$column_key === (string)$column_id || ( is_numeric( $column_id ) && (int)$column_id === $current_column ) ) {
-					$column_values[] = $column_value;
+				if ( (string)$column_key === (string)$column_id || ( is_numeric( $column_id ) && (int)$column_id === $current_column ) ) {
+					$column_values[ ] = $column_value;
 				}
 				$current_column++;
 			}
 		}
 
 		// Return the array of values
-		if( 'raw' === $format ) {
+		if ( 'raw' === $format ) {
 			return $column_values;
 		}
 		// Return the Gravity Forms Field output
@@ -186,22 +186,22 @@ 
 	 */
 	public function _filter_field_label( $label, $field, $form, $entry ) {
 
-		$field_object = RGFormsModel::get_field( $form, $field['id'] );
+		$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
 
 		// Not a list field
-		if( ! $field_object || 'list' !== $field_object->type ) {
+		if ( ! $field_object || 'list' !== $field_object->type ) {
 			return $label;
 		}
 
 		// Custom label is defined, so use it
-		if( ! empty( $field['custom_label'] ) ) {
+		if ( ! empty( $field[ 'custom_label' ] ) ) {
 			return $label;
 		}
 
-		$column_id = gravityview_get_input_id_from_id( $field['id'] );
+		$column_id = gravityview_get_input_id_from_id( $field[ 'id' ] );
 
 		// Parent field, not column field
-		if( false === $column_id ) {
+		if ( false === $column_id ) {
 			return $label;
 		}
 
@@ -222,7 +222,7 @@ 
 	public static function get_column_label( GF_Field_List $field, $column_id, $backup_label = '' ) {
 
 		// Doesn't have columns enabled
-		if( ! isset( $field->choices ) || ! $field->enableColumns ) {
+		if ( ! isset( $field->choices ) || ! $field->enableColumns ) {
 			return $backup_label;
 		}
 

future/includes/class-gv-settings-addon.php

Indentation +112 added lines, -112 removed lines

@@ -138,20 +138,20 @@ 
 	}
 
 	/**
-     * Uninstall all traces of GravityView
-     *
-     * Note: method is public because parent method is public
-     *
+	 * Uninstall all traces of GravityView
+	 *
+	 * Note: method is public because parent method is public
+	 *
 	 * @return bool
 	 */
 	public function uninstall() {
 		gravityview()->plugin->uninstall();
 
 		/**
-         * Set the path so that Gravity Forms can de-activate GravityView
-         * @see GFAddOn::uninstall_addon
-         * @uses deactivate_plugins()
-         */
+		 * Set the path so that Gravity Forms can de-activate GravityView
+		 * @see GFAddOn::uninstall_addon
+		 * @uses deactivate_plugins()
+		 */
 		$this->_path = GRAVITYVIEW_FILE;
 
 		return true;
@@ -181,42 +181,42 @@ 
 	}
 
 	/**
-     * Get an array of reasons why the plugin might be uninstalled
-     *
-     * @since 1.17.5
-     *
+	 * Get an array of reasons why the plugin might be uninstalled
+	 *
+	 * @since 1.17.5
+	 *
 	 * @return array Array of reasons with the label and followup questions for each uninstall reason
 	 */
 	private function get_uninstall_reasons() {
 		$reasons = array(
 			'will-continue' => array(
-                'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
-            ),
+				'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
+			),
 			'no-longer-need' => array(
-                'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
-            ),
+				'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
+			),
 			'doesnt-work' => array(
-                'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
-            ),
+				'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
+			),
 			'found-other' => array(
-                'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
-                'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ),
-            ),
+				'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
+				'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ),
+			),
 			'other' => array(
-                'label' => esc_html__( 'Other', 'gravityview' ),
-            ),
+				'label' => esc_html__( 'Other', 'gravityview' ),
+			),
 		);
 
 		shuffle( $reasons );
 
 		return $reasons;
-    }
+	}
 
 	/**
-     * Display a feedback form when the plugin is uninstalled
-     *
-     * @since 1.17.5
-     *
+	 * Display a feedback form when the plugin is uninstalled
+	 *
+	 * @since 1.17.5
+	 *
 	 * @return string HTML of the uninstallation form
 	 */
 	public function uninstall_form() {
@@ -296,7 +296,7 @@ 
             <h2><?php esc_html_e( 'Why did you uninstall GravityView?', 'gravityview' ); ?></h2>
             <ul>
 				<?php
-                $reasons = $this->get_uninstall_reasons();
+				$reasons = $this->get_uninstall_reasons();
 				foreach ( $reasons as $reason ) {
 					printf( '<li><label><input name="reason" type="radio" value="other" data-followup="%s"> %s</label></li>', Utils::get( $reason, 'followup' ), Utils::get( $reason, 'label' ) );
 				}
@@ -390,12 +390,12 @@ 
 	}
 
 	public function app_settings_tab() {
-	    parent::app_settings_tab();
+		parent::app_settings_tab();
 
 		if ( $this->maybe_uninstall() ) {
-            echo $this->uninstall_form();
+			echo $this->uninstall_form();
 		}
-    }
+	}
 
 	/**
 	 * The Settings title
@@ -480,7 +480,7 @@ 
 	 * @return array The settings.
 	 */
 	public function all() {
-	    return wp_parse_args( get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', array() ), $this->defaults() );
+		return wp_parse_args( get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', array() ), $this->defaults() );
 	}
 
 	/**
@@ -549,8 +549,8 @@ 
                     type="' . $field['type'] . '"
                     name="' . esc_attr( $name ) . '"
                     value="' . $value . '" ' .
-		        implode( ' ', $attributes ) .
-		        ' />';
+				implode( ' ', $attributes ) .
+				' />';
 
 		if ( $echo ) {
 			echo $html;
@@ -568,12 +568,12 @@ 
 	}
 
 	/**
-     * Check whether GravityView is being saved
-     *
-     * The generic is_save_postback() is true for all addons
-     *
-     * @since 2.0.8
-     *
+	 * Check whether GravityView is being saved
+	 *
+	 * The generic is_save_postback() is true for all addons
+	 *
+	 * @since 2.0.8
+	 *
 	 * @return bool
 	 */
 	public function is_save_postback() {
@@ -587,16 +587,16 @@ 
 	 */
 	public function license_key_notice() {
 
-	    if( $this->is_save_postback() ) {
-		    $settings = $this->get_posted_settings();
-		    $license_key = \GV\Utils::get( $settings, 'license_key' );
-		    $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
-        } else {
-		    $license_status = $this->get( 'license_key_status', 'inactive' );
-		    $license_key    = $this->get( 'license_key' );
-	    }
+		if( $this->is_save_postback() ) {
+			$settings = $this->get_posted_settings();
+			$license_key = \GV\Utils::get( $settings, 'license_key' );
+			$license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
+		} else {
+			$license_status = $this->get( 'license_key_status', 'inactive' );
+			$license_key    = $this->get( 'license_key' );
+		}
 
-	    $license_id = empty( $license_key ) ? 'license' : $license_key;
+		$license_id = empty( $license_key ) ? 'license' : $license_key;
 
 		$message = esc_html__( 'Your GravityView license %s. This means you&rsquo;re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview' );
 
@@ -610,7 +610,7 @@ 
 		$update_below = false;
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
 
-        switch ( $license_status ) {
+		switch ( $license_status ) {
 			/** @since 1.17 */
 			case 'expired':
 				$title = __( 'Expired License', 'gravityview' );
@@ -666,12 +666,12 @@ 
 	}
 
 	/**
-     * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
-     *
-     * @since 1.21.5
-     *
-     * @see GFAddOn::scripts()
-     *
+	 * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
+	 *
+	 * @since 1.21.5
+	 *
+	 * @see GFAddOn::scripts()
+	 *
 	 * @return array Array of scripts
 	 */
 	public function scripts() {
@@ -680,10 +680,10 @@ 
 		$scripts[] = array(
 			'handle'  => 'gform_tooltip_init',
 			'enqueue' => array(
-                array(
-			        'admin_page' => array( 'app_settings' )
-                )
-            )
+				array(
+					'admin_page' => array( 'app_settings' )
+				)
+			)
 		);
 
 		return $scripts;
@@ -701,10 +701,10 @@ 
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
 			'version' => Plugin::$version,
 			'deps' => array(
-                'gform_admin',
+				'gform_admin',
 				'gaddon_form_settings_css',
-                'gform_tooltip',
-                'gform_font_awesome',
+				'gform_tooltip',
+				'gform_font_awesome',
 			),
 			'enqueue' => array(
 				array( 'admin_page' => array(
@@ -872,7 +872,7 @@ 
 					array(
 						'label' => _x( 'Show me beta versions if they are available.', 'gravityview' ),
 						'value' => '1',
-                        'name'  => 'beta',
+						'name'  => 'beta',
 					),
 				),
 				'description'   => __( 'You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview' ),
@@ -910,38 +910,38 @@ 
 
 			if ( empty( $field['disabled'] ) ) {
 				unset( $field['disabled'] );
-            }
+			}
 		}
 
-        $sections = array(
-            array(
-                'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ),
-                'fields'      => $fields,
-            )
-        );
+		$sections = array(
+			array(
+				'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ),
+				'fields'      => $fields,
+			)
+		);
 
-        // custom 'update settings' button
-        $button = array(
-            'class' => 'button button-primary button-hero',
-            'type' => 'save',
-        );
+		// custom 'update settings' button
+		$button = array(
+			'class' => 'button button-primary button-hero',
+			'type' => 'save',
+		);
 
 		if ( $disabled_attribute ) {
 			$button['disabled'] = $disabled_attribute;
 		}
 
-        /**
-         * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
-         * Extensions can tap in here to insert their own section and settings.
-         * <code>
-         *   $sections[] = array(
-         *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
-         *      'fields' => $settings,
-         *   );
-         * </code>
-         * @param array $extension_settings Empty array, ready for extension settings!
-         */
-        $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
+		/**
+		 * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
+		 * Extensions can tap in here to insert their own section and settings.
+		 * <code>
+		 *   $sections[] = array(
+		 *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
+		 *      'fields' => $settings,
+		 *   );
+		 * </code>
+		 * @param array $extension_settings Empty array, ready for extension settings!
+		 */
+		$extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
 
 		// If there are extensions, add a section for them
 		if ( ! empty( $extension_sections ) ) {
@@ -954,13 +954,13 @@ 
 				}
 			}
 
-            $k = count( $extension_sections ) - 1 ;
-            $extension_sections[ $k ]['fields'][] = $button;
+			$k = count( $extension_sections ) - 1 ;
+			$extension_sections[ $k ]['fields'][] = $button;
 			$sections = array_merge( $sections, $extension_sections );
 		} else {
-            // add the 'update settings' button to the general section
-            $sections[0]['fields'][] = $button;
-        }
+			// add the 'update settings' button to the general section
+			$sections[0]['fields'][] = $button;
+		}
 
 		return $sections;
 	}
@@ -1014,9 +1014,9 @@ 
 	 */
 	protected function settings_edd_license( $field, $echo = true ) {
 
-	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
-		    $field['input_type'] = 'password';
-        }
+		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
+			$field['input_type'] = 'password';
+		}
 
 		$text = $this->settings_text( $field, false );
 
@@ -1033,9 +1033,9 @@ 
 
 	/**
 	 * Allow pure HTML settings row
-     *
-     * @since 2.0.6
-     *
+	 *
+	 * @since 2.0.6
+	 *
 	 * @param array $field
 	 * @param bool $echo Whether to echo the
 	 *
@@ -1101,19 +1101,19 @@ 
 	}
 
 	/**
-     * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it
-     *
-     * Converts `$field['description']` to `$field['gv_description']`
-     * Converts `$field['subtitle']` to `$field['description']`
-     *
-     * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description`
-     * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description
-     *
-     * @since 1.21.5.2
-     *
+	 * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it
+	 *
+	 * Converts `$field['description']` to `$field['gv_description']`
+	 * Converts `$field['subtitle']` to `$field['description']`
+	 *
+	 * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description`
+	 * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description
+	 *
+	 * @since 1.21.5.2
+	 *
 	 * @param array $field
-     *
-     * @return void
+	 *
+	 * @return void
 	 */
 	public function single_setting_row( $field ) {
 		$field['gv_description'] = Utils::get( $field, 'description' );

Spacing +51 added lines, -51 removed lines

@@ -101,7 +101,7 @@ 
 	 * @return array
 	 */
 	public function modify_app_settings_menu_title( $setting_tabs ) {
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' );
+		$setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' );
 		return $setting_tabs;
 	}
 
@@ -304,15 +304,15 @@ 
             </ul>
             <div class="gv-followup widefat">
                 <p><strong><label for="gv-reason-details"><?php esc_html_e( 'Comments', 'gravityview' ); ?></label></strong></p>
-                <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview') ?>" placeholder="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview'); ?>" class="large-text"></textarea>
+                <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ) ?>" placeholder="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ); ?>" class="large-text"></textarea>
             </div>
             <div class="scale-description">
                 <p><strong><?php esc_html_e( 'How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p>
                 <ul class="inline">
 					<?php
 					$i = 0;
-					while( $i < 11 ) {
-						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_'.$i.'" value="'.$i.'" type="radio"> '.$i.'</label></li>';
+					while ( $i < 11 ) {
+						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>';
 						$i++;
 					}
 					?>
@@ -529,15 +529,15 @@ 
 	 * @return string The HTML
 	 */
 	public function as_html( $field, $echo = true ) {
-		$field['type']  = ( isset( $field['type'] ) && in_array( $field['type'], array( 'submit','reset','button' ) ) ) ? $field['type'] : 'submit';
+		$field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit';
 
 		$attributes    = $this->get_field_attributes( $field );
 		$default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) );
-		$value         = $this->get( $field['name'], $default_value );
+		$value         = $this->get( $field[ 'name' ], $default_value );
 
 
-		$attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary gfbutton';
-		$name    = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name'];
+		$attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary gfbutton';
+		$name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ];
 
 		if ( empty( $value ) ) {
 			$value = __( 'Update Settings', 'gravityview' );
@@ -546,7 +546,7 @@ 
 		$attributes = $this->get_field_attributes( $field );
 
 		$html = '<input
-                    type="' . $field['type'] . '"
+                    type="' . $field[ 'type' ] . '"
                     name="' . esc_attr( $name ) . '"
                     value="' . $value . '" ' .
 		        implode( ' ', $attributes ) .
@@ -577,7 +577,7 @@ 
 	 * @return bool
 	 */
 	public function is_save_postback() {
-		return isset( $_POST['gform-settings-save'] ) && isset( $_POST['_gravityview_save_settings_nonce'] );
+		return isset( $_POST[ 'gform-settings-save' ] ) && isset( $_POST[ '_gravityview_save_settings_nonce' ] );
 	}
 
 	/**
@@ -587,7 +587,7 @@ 
 	 */
 	public function license_key_notice() {
 
-	    if( $this->is_save_postback() ) {
+	    if ( $this->is_save_postback() ) {
 		    $settings = $this->get_posted_settings();
 		    $license_key = \GV\Utils::get( $settings, 'license_key' );
 		    $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
@@ -605,7 +605,7 @@ 
 		 * but didn't want to mess up the translation strings for the translators.
 		 */
 		$message = mb_substr( $message, 0, mb_strlen( $message ) - 1 );
-		$title = __ ( 'Inactive License', 'gravityview');
+		$title = __( 'Inactive License', 'gravityview' );
 		$status = '';
 		$update_below = false;
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
@@ -635,7 +635,7 @@ 
 				$update_below = __( 'Activate your license key below.', 'gravityview' );
 				break;
 		}
-		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice';
+		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice';
 
 		// Show a different notice on settings page for inactive licenses (hide the buttons)
 		if ( $update_below && gravityview_is_admin_page( '', 'settings' ) ) {
@@ -677,7 +677,7 @@ 
 	public function scripts() {
 		$scripts = parent::scripts();
 
-		$scripts[] = array(
+		$scripts[ ] = array(
 			'handle'  => 'gform_tooltip_init',
 			'enqueue' => array(
                 array(
@@ -696,7 +696,7 @@ 
 	public function styles() {
 		$styles = parent::styles();
 
-		$styles[] = array(
+		$styles[ ] = array(
 			'handle'  => 'gravityview_settings',
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
 			'version' => Plugin::$version,
@@ -727,7 +727,7 @@ 
 		 * If multisite and not network admin, we don't want the settings to show.
 		 * @since 1.7.6
 		 */
-		$show_submenu = ( ! is_multisite() ) ||  is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() );
+		$show_submenu = ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() );
 
 		/**
 		 * Override whether to show the Settings menu on a per-blog basis.
@@ -775,26 +775,26 @@ 
 				'label' => __( 'License Key', 'gravityview' ),
 				'description' => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ) . $this->get_license_handler()->license_details( $this->get_app_setting( 'license_key_response' ) ),
 				'type' => 'edd_license',
-				'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' )  && GRAVITYVIEW_LICENSE_KEY ),
+				'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ),
 				'data-pending-text' => __( 'Verifying license&hellip;', 'gravityview' ),
-				'default_value' => $default_settings['license_key'],
+				'default_value' => $default_settings[ 'license_key' ],
 				'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
 			),
 			array(
 				'name' => 'license_key_response',
-				'default_value' => $default_settings['license_key_response'],
+				'default_value' => $default_settings[ 'license_key_response' ],
 				'type' => 'hidden',
 			),
 			array(
 				'name' => 'license_key_status',
-				'default_value' => $default_settings['license_key_status'],
+				'default_value' => $default_settings[ 'license_key_status' ],
 				'type' => 'hidden',
 			),
 			array(
 				'name' => 'support-email',
 				'type' => 'text',
 				'validate' => 'email',
-				'default_value' => $default_settings['support-email'],
+				'default_value' => $default_settings[ 'support-email' ],
 				'label' => __( 'Support Email', 'gravityview' ),
 				'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
 				'class' => 'code regular-text',
@@ -806,7 +806,7 @@ 
 				'name' => 'support_port',
 				'type' => 'radio',
 				'label' => __( 'Show Support Port?', 'gravityview' ),
-				'default_value' => $default_settings['support_port'],
+				'default_value' => $default_settings[ 'support_port' ],
 				'horizontal' => 1,
 				'choices' => array(
 					array(
@@ -825,7 +825,7 @@ 
 				'name' => 'no-conflict-mode',
 				'type' => 'radio',
 				'label' => __( 'No-Conflict Mode', 'gravityview' ),
-				'default_value' => $default_settings['no-conflict-mode'],
+				'default_value' => $default_settings[ 'no-conflict-mode' ],
 				'horizontal' => 1,
 				'choices' => array(
 					array(
@@ -847,7 +847,7 @@ 
 					'name' => 'rest_api',
 					'type' => 'radio',
 					'label' => __( 'REST API', 'gravityview' ),
-					'default_value' => $default_settings['rest_api'],
+					'default_value' => $default_settings[ 'rest_api' ],
 					'horizontal' => 1,
 					'choices' => array(
 						array(
@@ -866,7 +866,7 @@ 
 				'name' => 'beta',
 				'type' => 'checkbox',
 				'label' => __( 'Become a Beta Tester', 'gravityview' ),
-				'default_value' => $default_settings['beta'],
+				'default_value' => $default_settings[ 'beta' ],
 				'horizontal' => 1,
 				'choices' => array(
 					array(
@@ -899,17 +899,17 @@ 
 		 * @since 1.7.4
 		 */
 		foreach ( $fields as &$field ) {
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' );
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' );
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' );
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' );
+			$field[ 'name' ]          = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' );
+			$field[ 'label' ]         = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' );
+			$field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' );
+			$field[ 'description' ]   = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' );
 
 			if ( $disabled_attribute ) {
-				$field['disabled']  = $disabled_attribute;
+				$field[ 'disabled' ] = $disabled_attribute;
 			}
 
-			if ( empty( $field['disabled'] ) ) {
-				unset( $field['disabled'] );
+			if ( empty( $field[ 'disabled' ] ) ) {
+				unset( $field[ 'disabled' ] );
             }
 		}
 
@@ -927,7 +927,7 @@ 
         );
 
 		if ( $disabled_attribute ) {
-			$button['disabled'] = $disabled_attribute;
+			$button[ 'disabled' ] = $disabled_attribute;
 		}
 
         /**
@@ -946,20 +946,20 @@ 
 		// If there are extensions, add a section for them
 		if ( ! empty( $extension_sections ) ) {
 
-			if( $disabled_attribute ) {
+			if ( $disabled_attribute ) {
 				foreach ( $extension_sections as &$section ) {
-					foreach ( $section['fields'] as &$field ) {
-						$field['disabled'] = $disabled_attribute;
+					foreach ( $section[ 'fields' ] as &$field ) {
+						$field[ 'disabled' ] = $disabled_attribute;
 					}
 				}
 			}
 
-            $k = count( $extension_sections ) - 1 ;
-            $extension_sections[ $k ]['fields'][] = $button;
+            $k = count( $extension_sections ) - 1;
+            $extension_sections[ $k ][ 'fields' ][ ] = $button;
 			$sections = array_merge( $sections, $extension_sections );
 		} else {
             // add the 'update settings' button to the general section
-            $sections[0]['fields'][] = $button;
+            $sections[ 0 ][ 'fields' ][ ] = $button;
         }
 
 		return $sections;
@@ -1015,7 +1015,7 @@ 
 	protected function settings_edd_license( $field, $echo = true ) {
 
 	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
-		    $field['input_type'] = 'password';
+		    $field[ 'input_type' ] = 'password';
         }
 
 		$text = $this->settings_text( $field, false );
@@ -1064,7 +1064,7 @@ 
 	public function single_setting_row_html( $field ) {
 		?>
 
-        <tr id="gaddon-setting-row-<?php echo esc_attr( $field['name'] ); ?>">
+        <tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>">
             <td colspan="2">
 				<?php $this->single_setting( $field ); ?>
             </td>
@@ -1082,10 +1082,10 @@ 
 	 * @return string
 	 */
 	public function settings_save( $field, $echo = true ) {
-		$field['type']  = 'submit';
-		$field['name']  = 'gform-settings-save';
-		$field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton';
-		$field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
+		$field[ 'type' ]  = 'submit';
+		$field[ 'name' ]  = 'gform-settings-save';
+		$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] : 'button-primary gfbutton';
+		$field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
 
 		$output = $this->settings_submit( $field, false );
 
@@ -1116,8 +1116,8 @@ 
      * @return void
 	 */
 	public function single_setting_row( $field ) {
-		$field['gv_description'] = Utils::get( $field, 'description' );
-		$field['description']    = Utils::get( $field, 'subtitle' );
+		$field[ 'gv_description' ] = Utils::get( $field, 'description' );
+		$field[ 'description' ]    = Utils::get( $field, 'subtitle' );
 		parent::single_setting_row( $field );
 	}
 
@@ -1129,7 +1129,7 @@ 
 	public function single_setting_label( $field ) {
 		parent::single_setting_label( $field );
 		if ( $description = Utils::get( $field, 'gv_description' ) ) {
-			echo '<span class="description">'. $description .'</span>';
+			echo '<span class="description">' . $description . '</span>';
 		}
 	}
 
@@ -1166,9 +1166,9 @@ 
 		// If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response),
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
 		if ( $local_key !== $response_key ) {
-			unset( $posted_settings['license_key_response'] );
-			unset( $posted_settings['license_key_status'] );
-			\GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
+			unset( $posted_settings[ 'license_key_response' ] );
+			unset( $posted_settings[ 'license_key_status' ] );
+			\GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
 		}
 		return $posted_settings;
 	}

includes/class-gravityview-shortcode.php

Spacing +9 added lines, -9 removed lines

@@ -48,8 +48,8 @@ 
 		gravityview()->log->debug( '$passed_atts: ', array( 'data' => $passed_atts ) );
 
 		// Get details about the current View
-		if( !empty( $passed_atts['detail'] ) ) {
-			return $this->get_view_detail( $passed_atts['detail'] );
+		if ( ! empty( $passed_atts[ 'detail' ] ) ) {
+			return $this->get_view_detail( $passed_atts[ 'detail' ] );
 		}
 
 		$atts = $this->parse_and_sanitize_atts( $passed_atts );
@@ -85,16 +85,16 @@ 
 		$filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' );
 
 		// Only keep the passed attributes after making sure that they're valid pairs
-		$filtered_atts = array_intersect_key( (array) $passed_atts, $filtered_atts );
+		$filtered_atts = array_intersect_key( (array)$passed_atts, $filtered_atts );
 
 		$atts = array();
 
-		foreach( $filtered_atts as $key => $passed_value ) {
+		foreach ( $filtered_atts as $key => $passed_value ) {
 
 			// Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by}
 			$passed_value = GravityView_Merge_Tags::replace_variables( $passed_value );
 
-			switch( $defaults[ $key ]['type'] ) {
+			switch ( $defaults[ $key ][ 'type' ] ) {
 
 				/**
 				 * Make sure number fields are numeric.
@@ -102,7 +102,7 @@ 
 				 * @see http://php.net/manual/en/function.is-numeric.php#107326
 				 */
 				case 'number':
-					if( is_numeric( $passed_value ) ) {
+					if ( is_numeric( $passed_value ) ) {
 						$atts[ $key ] = ( $passed_value + 0 );
 					}
 					break;
@@ -117,8 +117,8 @@ 
 				 */
 				case 'select':
 				case 'radio':
-					$options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options'];
-					if( in_array( $passed_value, array_keys( $options ) ) ) {
+					$options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ];
+					if ( in_array( $passed_value, array_keys( $options ) ) ) {
 						$atts[ $key ] = $passed_value;
 					}
 					break;
@@ -147,7 +147,7 @@ 
 		$gravityview_view = GravityView_View::getInstance();
 		$return = '';
 
-		switch( $detail ) {
+		switch ( $detail ) {
 			case 'total_entries':
 				$return = number_format_i18n( $gravityview_view->getTotalEntries() );
 				break;