gravityview / GravityView

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

Doc Comments +1 added lines, -1 removed lines

@@ -25,7 +25,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 +13 added lines, -13 removed lines

@@ -62,7 +62,7 @@ 
 		// Add the list columns
 		foreach ( $list_fields as $list_field ) {
 
-			if( empty( $list_field->enableColumns ) ) {
+			if ( empty( $list_field->enableColumns ) ) {
 				continue;
 			}
 
@@ -83,7 +83,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;
 
@@ -91,7 +91,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 );
@@ -118,7 +118,7 @@ 
 
 		$list_rows = maybe_unserialize( $field_value );
 
-		if( ! is_array( $list_rows ) ) {
+		if ( ! is_array( $list_rows ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ' - $field_value did not unserialize', $field_value );
 			return null;
 		}
@@ -131,15 +131,15 @@ 
 			foreach ( $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
@@ -162,22 +162,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;
 		}
 
@@ -198,7 +198,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;
 		}
 

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

Indentation +1 added lines, -1 removed lines

@@ -227,7 +227,7 @@
 				 */
 				$content = apply_filters( 'gravityview/fields/fileupload/link_content', $content, $gravityview_view->getCurrentField() );
 
-                $content = gravityview_get_link( $link, $content, $link_atts );
+				$content = gravityview_get_link( $link, $content, $link_atts );
 			}
 
 			$output_arr[] = array(

Spacing +32 added lines, -32 removed lines

@@ -20,16 +20,16 @@ 
 
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
-		unset( $field_options['search_filter'] );
+		unset( $field_options[ 'search_filter' ] );
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
-		$add_options['link_to_file'] = array(
+		$add_options[ 'link_to_file' ] = array(
 			'type' => 'checkbox',
 			'label' => __( 'Display as a Link:', 'gravityview' ),
-			'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'),
+			'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ),
 			'value' => false,
 			'merge_tags' => false,
 		);
@@ -65,7 +65,7 @@ 
 		$output_arr = array();
 
 		// Get an array of file paths for the field.
-		$file_paths = rgar( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value );
+		$file_paths = rgar( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value );
 
 		// The $value JSON was probably truncated; let's check lead_detail_long.
 		if ( ! is_array( $file_paths ) ) {
@@ -79,19 +79,19 @@ 
 		}
 
 		// Process each file path
-		foreach( $file_paths as $file_path ) {
+		foreach ( $file_paths as $file_path ) {
 
 			// If the site is HTTPS, use HTTPS
-			if(function_exists('set_url_scheme')) { $file_path = set_url_scheme($file_path); }
+			if ( function_exists( 'set_url_scheme' ) ) { $file_path = set_url_scheme( $file_path ); }
 
 			// This is from Gravity Forms's code
-			$file_path = esc_attr(str_replace(" ", "%20", $file_path));
+			$file_path = esc_attr( str_replace( " ", "%20", $file_path ) );
 
 			// If the field is set to link to the single entry, link to it.
-			$link = !empty( $field_settings['show_as_link'] ) ? GravityView_API::entry_link( $entry, $field ) : $file_path;
+			$link = ! empty( $field_settings[ 'show_as_link' ] ) ? GravityView_API::entry_link( $entry, $field ) : $file_path;
 
 			// Get file path information
-			$file_path_info = pathinfo($file_path);
+			$file_path_info = pathinfo( $file_path );
 
 			$html_format = NULL;
 
@@ -100,30 +100,30 @@ 
 			$disable_wrapped_link = false;
 
 			// Is this an image?
-			$image = new GravityView_Image(array(
+			$image = new GravityView_Image( array(
 				'src' => $file_path,
-				'class' => 'gv-image gv-field-id-'.$field_settings['id'],
-				'alt' => $field_settings['label'],
-				'width' => (gravityview_get_context() === 'single' ? NULL : 250)
-			));
+				'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ],
+				'alt' => $field_settings[ 'label' ],
+				'width' => ( gravityview_get_context() === 'single' ? NULL : 250 )
+			) );
 
 			$content = $image->html();
 
 			// The new default content is the image, if it exists. If not, use the file name as the content.
-			$content = !empty( $content ) ? $content : $file_path_info['basename'];
+			$content = ! empty( $content ) ? $content : $file_path_info[ 'basename' ];
 
 			// If pathinfo() gave us the extension of the file, run the switch statement using that.
-			$extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] );
+			$extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] );
 
 
-			switch( true ) {
+			switch ( true ) {
 
 				// Audio file
 				case in_array( $extension, wp_get_audio_extensions() ):
 
 					$disable_lightbox = true;
 
-					if( shortcode_exists( 'audio' ) ) {
+					if ( shortcode_exists( 'audio' ) ) {
 
 						$disable_wrapped_link = true;
 
@@ -134,8 +134,8 @@ 
 						 */
 						$audio_settings = apply_filters( 'gravityview_audio_settings', array(
 							'src' => $file_path,
-							'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id']
-						));
+							'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ]
+						) );
 
 						/**
 						 * Generate the audio shortcode
@@ -153,7 +153,7 @@ 
 
 					$disable_lightbox = true;
 
-					if( shortcode_exists( 'video' ) ) {
+					if ( shortcode_exists( 'video' ) ) {
 
 						$disable_wrapped_link = true;
 
@@ -164,8 +164,8 @@ 
 						 */
 						$video_settings = apply_filters( 'gravityview_video_settings', array(
 							'src' => $file_path,
-							'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id']
-						));
+							'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ]
+						) );
 
 						/**
 						 * Generate the video shortcode
@@ -187,7 +187,7 @@ 
 					break;
 
 				// if not image, do not set the lightbox (@since 1.5.3)
-				case !in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ):
+				case ! in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ):
 
 					$disable_lightbox = true;
 
@@ -197,10 +197,10 @@ 
 
 			// If using Link to File, override the content.
 			// (We do this here so that the $disable_lightbox can be set. Yes, there's a little more processing time, but oh well.)
-			if( !empty( $field_settings['link_to_file'] ) ) {
+			if ( ! empty( $field_settings[ 'link_to_file' ] ) ) {
 
 				// Force the content to be the file name
-				$content =  $file_path_info["basename"];
+				$content = $file_path_info[ "basename" ];
 
 				// Restore the wrapped link
 				$disable_wrapped_link = false;
@@ -208,13 +208,13 @@ 
 			}
 
 			// Whether to use lightbox or not
-			if( $disable_lightbox || empty( $gravityview_view->atts['lightbox'] ) || !empty( $field_settings['show_as_link'] ) ) {
+			if ( $disable_lightbox || empty( $gravityview_view->atts[ 'lightbox' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) {
 
-				$link_atts = empty( $field_settings['show_as_link'] ) ? array( 'target' => '_blank' ) : array();
+				$link_atts = empty( $field_settings[ 'show_as_link' ] ) ? array( 'target' => '_blank' ) : array();
 
 			} else {
 
-				$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
+				$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
 
 				$link_atts = array(
 					'rel' => sprintf( "%s-%s", $gv_class, $entry_slug ),
@@ -240,7 +240,7 @@ 
 			$disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', $disable_wrapped_link, $gravityview_view->getCurrentField() );
 
 			// If the HTML output hasn't been overridden by the switch statement above, use the default format
-			if( !empty( $content ) && empty( $disable_wrapped_link ) ) {
+			if ( ! empty( $content ) && empty( $disable_wrapped_link ) ) {
 
 				/**
 				 * Modify the link text (defaults to the file name)
@@ -255,7 +255,7 @@ 
                 $content = gravityview_get_link( $link, $content, $link_atts );
 			}
 
-			$output_arr[] = array(
+			$output_arr[ ] = array(
 				'file_path' => $file_path,
 				'content' => $content
 			);

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

Indentation +7 added lines, -7 removed lines

@@ -21,13 +21,13 @@
 			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
 		);
 
-        $field_options['make_clickable'] = array(
-            'type' => 'checkbox',
-            'merge_tags' => false,
-            'value' => 0,
-            'label' => __( 'Convert text URLs to HTML links', 'gravityview' ),
-            'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
-        );
+		$field_options['make_clickable'] = array(
+			'type' => 'checkbox',
+			'merge_tags' => false,
+			'value' => 0,
+			'label' => __( 'Convert text URLs to HTML links', 'gravityview' ),
+			'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
+		);
 
 		return $field_options;
 	}

Spacing +3 added lines, -3 removed lines

@@ -25,11 +25,11 @@ 
 
 	function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
-		$field_options['trim_words'] = array(
+		$field_options[ 'trim_words' ] = array(
 			'type' => 'number',
 			'merge_tags' => false,
 			'value' => null,
@@ -37,7 +37,7 @@ 
 			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
 		);
 
-        $field_options['make_clickable'] = array(
+        $field_options[ 'make_clickable' ] = array(
             'type' => 'checkbox',
             'merge_tags' => false,
             'value' => 0,

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

Indentation -1 removed lines

@@ -255,7 +255,6 @@
 	 * Get the default date format for a field based on the field ID and the time format setting
 	 *
 	 * @since 1.14
-
 	 * @param string $time_format The time format ("12" or "24"). Default: "12" {@since 1.14}
 	 * @param int $field_id The ID of the field. Used to figure out full time/hours/minutes/am/pm {@since 1.14}
 	 *

Spacing +18 added lines, -18 removed lines

@@ -59,7 +59,7 @@ 
 
 		add_filter( 'gravityview/sorting/time', array( $this, 'modify_sort_id' ), 10, 2 );
 
-		add_filter('gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 );
+		add_filter( 'gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 );
 	}
 
 	/**
@@ -100,31 +100,31 @@ 
 	public function _maybe_filter_gravity_forms_query( $criteria, $form_ids, $view_id ) {
 
 		// If the search is being sorted
-		if( ! empty( $criteria['sorting']['key'] ) ) {
+		if ( ! empty( $criteria[ 'sorting' ][ 'key' ] ) ) {
 
-			$pieces = explode( $this->_sort_divider, $criteria['sorting']['key'] );
+			$pieces = explode( $this->_sort_divider, $criteria[ 'sorting' ][ 'key' ] );
 
 			/**
 			 * And the sort key matches the key set in modify_sort_id(), then modify the Gravity Forms query SQL
 			 * @see modify_sort_id()
 			 */
-			if( ! empty( $pieces[1] ) ) {
+			if ( ! empty( $pieces[ 1 ] ) ) {
 
 				// Pass these to the _modify_query_sort_by_time_hack() method
-				$this->_time_format = $pieces[1];
-				$this->_date_format = $pieces[2];
+				$this->_time_format = $pieces[ 1 ];
+				$this->_date_format = $pieces[ 2 ];
 
 				// Remove fake input IDs (5.1 doesn't exist. Use 5)
-				$criteria['sorting']['key'] = floor( $pieces[0] );
+				$criteria[ 'sorting' ][ 'key' ] = floor( $pieces[ 0 ] );
 
 				/**
 				 * Make sure sorting is numeric (# of seconds). IMPORTANT.
 				 * @see GVCommon::is_field_numeric() is_numeric should also be set here
 				 */
-				$criteria['sorting']['is_numeric'] = true;
+				$criteria[ 'sorting' ][ 'is_numeric' ] = true;
 
 				// Modify the Gravity Forms WP Query
-				add_filter('query', array( $this, '_modify_query_sort_by_time_hack' ) );
+				add_filter( 'query', array( $this, '_modify_query_sort_by_time_hack' ) );
 			}
 		}
 
@@ -147,9 +147,9 @@ 
 		 * then we want to modify the query.
 		 * @see GFFormsModel::sort_by_field_query()
 		 */
-		if( strpos( $query, self::GF_SORTING_SQL ) > 0 ) {
+		if ( strpos( $query, self::GF_SORTING_SQL ) > 0 ) {
 
-			if( $this->_time_format === '24' ) {
+			if ( $this->_time_format === '24' ) {
 				$sql_str_to_date = "STR_TO_DATE( `value`, '%H:%i' )";
 			} else {
 				$sql_str_to_date = "STR_TO_DATE( `value`, '%h:%i %p' )";
@@ -195,18 +195,18 @@ 
 		// Set variables
 		parent::field_options( $field_options, $template_id, $field_id, $context, $input_type );
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
 		/**
 		 * Set default date format based on field ID and Form ID
 		 */
-		add_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
+		add_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
 
-		$this->add_field_support('date_display', $field_options );
+		$this->add_field_support( 'date_display', $field_options );
 
-		remove_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
+		remove_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
 
 		return $field_options;
 	}
@@ -221,7 +221,7 @@ 
 	private function _get_time_format() {
 		global $post;
 
-		$current_form = isset( $_POST['form_id'] ) ? intval( $_POST['form_id'] ) : gravityview_get_form_id( $post->ID );
+		$current_form = isset( $_POST[ 'form_id' ] ) ? intval( $_POST[ 'form_id' ] ) : gravityview_get_form_id( $post->ID );
 
 		return self::_get_time_format_for_field( $this->_field_id, $current_form );
 	}
@@ -240,7 +240,7 @@ 
 		// GF defaults to 12, so should we.
 		$time_format = '12';
 
-		if( $form_id ) {
+		if ( $form_id ) {
 			$form = GFAPI::get_form( $form_id );
 
 			if ( $form ) {
@@ -287,7 +287,7 @@ 
 		$default = 'h:i A';
 
 		// This doesn't take into account 24-hour
-		switch( $field_input_id ) {
+		switch ( $field_input_id ) {
 			// Hours
 			case 1:
 				return ( $time_format === '12' ) ? 'h' : 'H';

includes/fields/class-gravityview-field-transaction-type.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 	 *
 	 * @since 1.16
 	 *
-	 * @param int|string $value Number value for the field
+	 * @param string $value Number value for the field
 	 *
 	 * @return string Based on $value; `1`: "One-Time Payment"; `2`: "Subscription"
 	 */

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 	public function get_content( $output, $entry, $field_settings, $field ) {
 
 		/** Overridden by a template. */
-		if( ! empty( $field['field_path'] ) ) { return $output; }
+		if ( ! empty( $field[ 'field_path' ] ) ) { return $output; }
 
 		return $this->get_string_from_value( $output );
 	}
@@ -78,11 +78,11 @@ 
 		switch ( intval( $value ) ) {
 			case self::ONE_TIME_PAYMENT:
 			default:
-				$return = __('One-Time Payment', 'gravityview');
+				$return = __( 'One-Time Payment', 'gravityview' );
 				break;
 
 			case self::SUBSCRIPTION:
-				$return = __('Subscription', 'gravityview');
+				$return = __( 'Subscription', 'gravityview' );
 				break;
 		}
 

includes/fields/class-gravityview-field.php

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 	 * @param bool $url_encode Whether to URL-encode output
 	 * @param bool $esc_html Whether to apply `esc_html()` to output
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	public static function replace_gv_merge_tags(  $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
 

Spacing +22 added lines, -22 removed lines

@@ -134,17 +134,17 @@ 
 
 		add_filter( 'gravityview/sortable/field_blacklist', array( $this, '_filter_sortable_fields' ), 1 );
 
-		if( $this->entry_meta_key ) {
+		if ( $this->entry_meta_key ) {
 			add_filter( 'gform_entry_meta', array( $this, 'add_entry_meta' ) );
 			add_filter( 'gravityview/common/sortable_fields', array( $this, 'add_sortable_field' ), 10, 2 );
 		}
 
-		if( $this->_custom_merge_tag ) {
+		if ( $this->_custom_merge_tag ) {
 			add_filter( 'gform_custom_merge_tags', array( $this, '_filter_gform_custom_merge_tags' ), 10, 4 );
 			add_filter( 'gform_replace_merge_tags', array( $this, '_filter_gform_replace_merge_tags' ), 10, 7 );
 		}
 
-		if( 'meta' === $this->group || '' !== $this->default_search_label ) {
+		if ( 'meta' === $this->group || '' !== $this->default_search_label ) {
 			add_filter( 'gravityview_search_field_label', array( $this, 'set_default_search_label' ), 10, 3 );
 		}
 
@@ -167,7 +167,7 @@ 
 			'type'  => $this->name
 		);
 
-		$fields["{$this->entry_meta_key}"] = $added_field;
+		$fields[ "{$this->entry_meta_key}" ] = $added_field;
 
 		return $fields;
 	}
@@ -187,7 +187,7 @@ 
 	 */
 	function set_default_search_label( $label = '', $gf_field = null, $field = array() ) {
 
-		if( $this->name === $field['field'] && '' === $label ) {
+		if ( $this->name === $field[ 'field' ] && '' === $label ) {
 			$label = esc_html( $this->default_search_label );
 		}
 
@@ -208,7 +208,7 @@ 
 	 *
 	 * @return string Original text if {_custom_merge_tag} isn't found. Otherwise, replaced text.
 	 */
-	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
+	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
 
 		/**
 		 * This prevents the gform_replace_merge_tags filter from being called twice, as defined in:
@@ -216,7 +216,7 @@ 
 		 * @see GFCommon::replace_variables_prepopulate()
 		 * @todo Remove eventually: Gravity Forms fixed this issue in 1.9.14
 		 */
-		if( false === $form ) {
+		if ( false === $form ) {
 			return $text;
 		}
 
@@ -249,19 +249,19 @@ 
 	 */
 	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
 
-		foreach( $matches as $match ) {
+		foreach ( $matches as $match ) {
 
-			$full_tag = $match[0];
+			$full_tag = $match[ 0 ];
 
 			// Strip the Merge Tags
-			$tag = str_replace( array( '{', '}'), '', $full_tag );
+			$tag = str_replace( array( '{', '}' ), '', $full_tag );
 
 			// Replace the value from the entry, if exists
-			if( isset( $entry[ $tag ] ) ) {
+			if ( isset( $entry[ $tag ] ) ) {
 
 				$value = $entry[ $tag ];
 
-				if( is_callable( array( $this, 'get_content') ) ) {
+				if ( is_callable( array( $this, 'get_content' ) ) ) {
 					$value = $this->get_content( $value );
 				}
 
@@ -334,8 +334,8 @@ 
 	 */
 	public function _filter_sortable_fields( $not_sortable ) {
 
-		if( ! $this->is_sortable ) {
-			$not_sortable[] = $this->name;
+		if ( ! $this->is_sortable ) {
+			$not_sortable[ ] = $this->name;
 		}
 
 		return $not_sortable;
@@ -352,7 +352,7 @@ 
 	 */
 	function add_entry_meta( $entry_meta ) {
 
-		if( ! isset( $entry_meta["{$this->entry_meta_key}"] ) ) {
+		if ( ! isset( $entry_meta[ "{$this->entry_meta_key}" ] ) ) {
 
 			$added_meta = array(
 				'label'             => $this->label,
@@ -361,13 +361,13 @@ 
 			);
 
 			if ( $this->entry_meta_update_callback && is_callable( $this->entry_meta_update_callback ) ) {
-				$added_meta['update_entry_meta_callback'] = $this->entry_meta_update_callback;
+				$added_meta[ 'update_entry_meta_callback' ] = $this->entry_meta_update_callback;
 			}
 
-			$entry_meta["{$this->entry_meta_key}"] = $added_meta;
+			$entry_meta[ "{$this->entry_meta_key}" ] = $added_meta;
 
 		} else {
-			do_action( 'gravityview_log_error', __METHOD__ . ' Entry meta already set: ' . $this->entry_meta_key, $entry_meta["{$this->entry_meta_key}"] );
+			do_action( 'gravityview_log_error', __METHOD__ . ' Entry meta already set: ' . $this->entry_meta_key, $entry_meta[ "{$this->entry_meta_key}" ] );
 		}
 
 		return $entry_meta;
@@ -396,7 +396,7 @@ 
 			'date_display' => array(
 				'type' => 'text',
 				'label' => __( 'Override Date Format', 'gravityview' ),
-				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview'), '<a href="https://codex.wordpress.org/Formatting_Date_and_Time">', '</a>' ),
+				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview' ), '<a href="https://codex.wordpress.org/Formatting_Date_and_Time">', '</a>' ),
 				/**
 				 * @filter `gravityview_date_format` Override the date format with a [PHP date format](https://codex.wordpress.org/Formatting_Date_and_Time)
 				 * @param[in,out] null|string $date_format Date Format (default: null)
@@ -421,7 +421,7 @@ 
 
 		$options = $this->field_support_options();
 
-		if( isset( $options[ $key ] ) ) {
+		if ( isset( $options[ $key ] ) ) {
 			$field_options[ $key ] = $options[ $key ];
 		}
 
@@ -485,11 +485,11 @@ 
 		$connected_form = rgpost( 'form_id' );
 
 		// Otherwise, get the Form ID from the Post page
-		if( empty( $connected_form ) ) {
+		if ( empty( $connected_form ) ) {
 			$connected_form = gravityview_get_form_id( get_the_ID() );
 		}
 
-		if( empty( $connected_form ) ) {
+		if ( empty( $connected_form ) ) {
 			do_action( 'gravityview_log_error', sprintf( '%s: Form not found for form ID "%s"', __METHOD__, $connected_form ) );
 			return false;
 		}

includes/class-frontend-views.php

Braces +5 added lines, -5 removed lines

@@ -241,7 +241,7 @@ 
 			 */
 			$this->context_view_id = $_GET['gvid'];
 
-		} elseif ( ! $this->getGvOutputData()->has_multiple_views() )  {
+		} elseif ( ! $this->getGvOutputData()->has_multiple_views() ) {
 			$array_keys = array_keys( $this->getGvOutputData()->get_views() );
 			$this->context_view_id = array_pop( $array_keys );
 			unset( $array_keys );
@@ -269,7 +269,7 @@ 
 		global $post;
 
 		// If in admin and NOT AJAX request, get outta here.
-		if ( GravityView_Plugin::is_admin() )  {
+		if ( GravityView_Plugin::is_admin() ) {
 			return;
 		}
 
@@ -372,7 +372,7 @@ 
 		}
 
 		// User reported WooCommerce doesn't pass two args.
-		if ( empty( $passed_post_id ) )  {
+		if ( empty( $passed_post_id ) ) {
 			return $title;
 		}
 
@@ -1108,7 +1108,7 @@ 
 					 */
 					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
 
-					switch( strtolower( $address_part ) ){
+					switch( strtolower( $address_part ) ) {
 						case 'street':
 							$sort_field_id .= '.1';
 							break;
@@ -1188,7 +1188,7 @@ 
 		 */
 		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
 
-		if ( empty( $single_entry ) ){
+		if ( empty( $single_entry ) ) {
 			return false;
 		} else {
 			return $single_entry;

Doc Comments +5 added lines, -5 removed lines

@@ -150,7 +150,7 @@ 
 
 	/**
 	 * Sets the single entry ID and also the entry
-	 * @param bool|int|string $single_entry
+	 * @param boolean|string $single_entry
 	 */
 	public function setSingleEntry( $single_entry ) {
 
@@ -167,7 +167,7 @@ 
 
 	/**
 	 * Set the current entry
-	 * @param array|int $entry Entry array or entry slug or ID
+	 * @param boolean|string $entry Entry array or entry slug or ID
 	 */
 	public function setEntry( $entry ) {
 
@@ -225,7 +225,7 @@ 
 	 *
 	 *
 	 *
-	 * @param null $view_id
+	 * @param string $view_id
 	 */
 	public function set_context_view_id( $view_id = null ) {
 
@@ -957,7 +957,7 @@ 
 	 *
 	 * @uses  gravityview_get_entries()
 	 * @access public
-	 * @param array $args\n
+	 * @param array $args
 	 *   - $id - View id
 	 *   - $page_size - Page
 	 *   - $sort_field - form field id to sort
@@ -1413,7 +1413,7 @@ 
 	/**
 	 * Checks if field (column) is sortable
 	 *
-	 * @param string $field Field settings
+	 * @param string $field_id Field settings
 	 * @param array $form Gravity Forms form array
 	 *
 	 * @since 1.7

Spacing +114 added lines, -114 removed lines

@@ -85,9 +85,9 @@ 
 	private function __construct() {}
 
 	private function initialize() {
-		add_action( 'wp', array( $this, 'parse_content'), 11 );
+		add_action( 'wp', array( $this, 'parse_content' ), 11 );
 		add_filter( 'parse_query', array( $this, 'parse_query_fix_frontpage' ), 10 );
-		add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 );
+		add_action( 'template_redirect', array( $this, 'set_entry_data' ), 1 );
 
 		// Enqueue scripts and styles after GravityView_Template::register_styles()
 		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 );
@@ -236,15 +236,15 @@ 
 
 			$this->context_view_id = $view_id;
 
-		} elseif ( isset( $_GET['gvid'] ) && $this->getGvOutputData()->has_multiple_views() ) {
+		} elseif ( isset( $_GET[ 'gvid' ] ) && $this->getGvOutputData()->has_multiple_views() ) {
 			/**
 			 * used on a has_multiple_views context
 			 * @see GravityView_API::entry_link
 			 * @see GravityView_View_Data::getInstance()->has_multiple_views()
 			 */
-			$this->context_view_id = $_GET['gvid'];
+			$this->context_view_id = $_GET[ 'gvid' ];
 
-		} elseif ( ! $this->getGvOutputData()->has_multiple_views() )  {
+		} elseif ( ! $this->getGvOutputData()->has_multiple_views() ) {
 			$array_keys = array_keys( $this->getGvOutputData()->get_views() );
 			$this->context_view_id = array_pop( $array_keys );
 			unset( $array_keys );
@@ -279,24 +279,24 @@ 
 		global $wp_rewrite;
 
 		$is_front_page = ( $query->is_home || $query->is_page );
-		$show_on_front = ( 'page' === get_option('show_on_front') );
-		$front_page_id = get_option('page_on_front');
+		$show_on_front = ( 'page' === get_option( 'show_on_front' ) );
+		$front_page_id = get_option( 'page_on_front' );
 
-		if (  $is_front_page && $show_on_front && $front_page_id ) {
+		if ( $is_front_page && $show_on_front && $front_page_id ) {
 
 			// Force to be an array, potentially a query string ( entry=16 )
 			$_query = wp_parse_args( $query->query );
 
 			// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
-			if ( isset( $_query['pagename'] ) && '' === $_query['pagename'] ) {
-				unset( $_query['pagename'] );
+			if ( isset( $_query[ 'pagename' ] ) && '' === $_query[ 'pagename' ] ) {
+				unset( $_query[ 'pagename' ] );
 			}
 
 			// this is where will break from core wordpress
 			$ignore = array( 'preview', 'page', 'paged', 'cpage' );
 			$endpoints = rgobj( $wp_rewrite, 'endpoints' );
-			foreach ( (array) $endpoints as $endpoint ) {
-				$ignore[] = $endpoint[1];
+			foreach ( (array)$endpoints as $endpoint ) {
+				$ignore[ ] = $endpoint[ 1 ];
 			}
 			unset( $endpoints );
 
@@ -306,21 +306,21 @@ 
 			// - The query includes keys that are associated with registered endpoints. `entry`, for example.
 			if ( empty( $_query ) || ! array_diff( array_keys( $_query ), $ignore ) ) {
 
-				$qv =& $query->query_vars;
+				$qv = & $query->query_vars;
 
 				// Prevent redirect when on the single entry endpoint
-				if( self::is_single_entry() ) {
+				if ( self::is_single_entry() ) {
 					add_filter( 'redirect_canonical', '__return_false' );
 				}
 
 				$query->is_page = true;
 				$query->is_home = false;
-				$qv['page_id']  = $front_page_id;
+				$qv[ 'page_id' ]  = $front_page_id;
 
 				// Correct <!--nextpage--> for page_on_front
-				if ( ! empty( $qv['paged'] ) ) {
-					$qv['page'] = $qv['paged'];
-					unset( $qv['paged'] );
+				if ( ! empty( $qv[ 'paged' ] ) ) {
+					$qv[ 'page' ] = $qv[ 'paged' ];
+					unset( $qv[ 'paged' ] );
 				}
 			}
 
@@ -338,7 +338,7 @@ 
 		global $post;
 
 		// If in admin and NOT AJAX request, get outta here.
-		if ( GravityView_Plugin::is_admin() )  {
+		if ( GravityView_Plugin::is_admin() ) {
 			return;
 		}
 
@@ -350,7 +350,7 @@ 
 
 		$this->setIsGravityviewPostType( get_post_type( $post ) === 'gravityview' );
 
-		$post_id = $this->getPostId() ? $this->getPostId() : (isset( $post ) ? $post->ID : null );
+		$post_id = $this->getPostId() ? $this->getPostId() : ( isset( $post ) ? $post->ID : null );
 		$this->setPostId( $post_id );
 		$post_has_shortcode = ! empty( $post->post_content ) ? gravityview_has_shortcode_r( $post->post_content, 'gravityview' ) : false;
 		$this->setPostHasShortcode( $this->isGravityviewPostType() ? null : ! empty( $post_has_shortcode ) );
@@ -386,7 +386,7 @@ 
 
 		$search_method = GravityView_Widget_Search::getInstance()->get_search_method();
 
-		if( 'post' === $search_method ) {
+		if ( 'post' === $search_method ) {
 			$get = $_POST;
 		} else {
 			$get = $_GET;
@@ -442,20 +442,20 @@ 
 		 * @param boolean $in_the_loop Whether to apply the filter to the menu title and the meta tag <title> - outside the loop
 		 * @param array $entry Current entry
 		 */
-		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop' , in_the_loop(), $entry );
+		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop', in_the_loop(), $entry );
 
 		if ( ! $apply_outside_loop ) {
 			return $title;
 		}
 
 		// User reported WooCommerce doesn't pass two args.
-		if ( empty( $passed_post_id ) )  {
+		if ( empty( $passed_post_id ) ) {
 			return $title;
 		}
 
 		// Don't modify the title for anything other than the current view/post.
 		// This is true for embedded shortcodes and Views.
-		if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) {
+		if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) {
 			return $title;
 		}
 
@@ -465,19 +465,19 @@ 
 			$view_meta = $this->getGvOutputData()->get_view( $context_view_id );
 		} else {
 			foreach ( $this->getGvOutputData()->get_views() as $view_id => $view_data ) {
-				if ( intval( $view_data['form_id'] ) === intval( $entry['form_id'] ) ) {
+				if ( intval( $view_data[ 'form_id' ] ) === intval( $entry[ 'form_id' ] ) ) {
 					$view_meta = $view_data;
 					break;
 				}
 			}
 		}
 
-		if ( ! empty( $view_meta['atts']['single_title'] ) ) {
+		if ( ! empty( $view_meta[ 'atts' ][ 'single_title' ] ) ) {
 
-			$title = $view_meta['atts']['single_title'];
+			$title = $view_meta[ 'atts' ][ 'single_title' ];
 
 			// We are allowing HTML in the fields, so no escaping the output
-			$title = GravityView_API::replace_variables( $title, $view_meta['form'], $entry );
+			$title = GravityView_API::replace_variables( $title, $view_meta[ 'form' ], $entry );
 
 			$title = do_shortcode( $title );
 		}
@@ -513,7 +513,7 @@ 
 		}
 
 		// Only render in the loop. Fixes issues with the_content filter being applied in places like the sidebar
-		if( ! in_the_loop() ) {
+		if ( ! in_the_loop() ) {
 			return $content;
 		}
 
@@ -577,7 +577,7 @@ 
 
 		$context = GravityView_View::getInstance()->getContext();
 
-		switch( $context ) {
+		switch ( $context ) {
 			case 'directory':
 				$tab = __( 'Multiple Entries', 'gravityview' );
 				break;
@@ -591,9 +591,9 @@ 
 		}
 
 
-		$title = sprintf( esc_html_x('The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab );
+		$title = sprintf( esc_html_x( 'The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab );
 		$edit_link = admin_url( sprintf( 'post.php?post=%d&action=edit#%s-view', $view_id, $context ) );
-		$action_text = sprintf( esc_html__('Add fields to %s', 'gravityview' ), $tab );
+		$action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
 		$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
 
 		$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
@@ -626,7 +626,7 @@ 
 	public function render_view( $passed_args ) {
 
 		// validate attributes
-		if ( empty( $passed_args['id'] ) ) {
+		if ( empty( $passed_args[ 'id' ] ) ) {
 			do_action( 'gravityview_log_error', '[render_view] Returning; no ID defined.', $passed_args );
 			return null;
 		}
@@ -648,7 +648,7 @@ 
 			return null;
 		}
 
-		$view_id = $passed_args['id'];
+		$view_id = $passed_args[ 'id' ];
 
 		$view_data = $this->getGvOutputData()->get_view( $view_id, $passed_args );
 
@@ -661,7 +661,7 @@ 
 		$passed_args = array_filter( $passed_args, 'strlen' );
 
 		//Override shortcode args over View template settings
-		$atts = wp_parse_args( $passed_args, $view_data['atts'] );
+		$atts = wp_parse_args( $passed_args, $view_data[ 'atts' ] );
 
 		do_action( 'gravityview_log_debug', '[render_view] Arguments after merging with View settings: ', $atts );
 
@@ -684,14 +684,14 @@ 
 		 * @since 1.15
 		 * @since 1.17.2 Added check for if a user has no caps but is logged in (member of multisite, but not any site). Treat as if logged-out.
 		 */
-		if( is_user_logged_in() && ! ( empty( wp_get_current_user()->caps ) && empty( wp_get_current_user()->roles ) ) && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
+		if ( is_user_logged_in() && ! ( empty( wp_get_current_user()->caps ) && empty( wp_get_current_user()->roles ) ) && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
 
 			do_action( 'gravityview_log_debug', sprintf( '%s Returning: View %d is not visible by current user.', __METHOD__, $view_id ) );
 
 			return null;
 		}
 
-		if( $this->isGravityviewPostType() ) {
+		if ( $this->isGravityviewPostType() ) {
 
 			/**
 			 * @filter `gravityview_direct_access` Should Views be directly accessible, or only visible using the shortcode?
@@ -703,9 +703,9 @@ 
 			 */
 			$direct_access = apply_filters( 'gravityview_direct_access', true, $view_id );
 
-			$embed_only = ! empty( $atts['embed_only'] );
+			$embed_only = ! empty( $atts[ 'embed_only' ] );
 
-			if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
+			if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
 		}
@@ -720,7 +720,7 @@ 
 
 		$gravityview_view = new GravityView_View( $view_data );
 
-		$post_id = ! empty( $atts['post_id'] ) ? intval( $atts['post_id'] ) : $this->getPostId();
+		$post_id = ! empty( $atts[ 'post_id' ] ) ? intval( $atts[ 'post_id' ] ) : $this->getPostId();
 
 		$gravityview_view->setPostId( $post_id );
 
@@ -730,20 +730,20 @@ 
 			do_action( 'gravityview_log_debug', '[render_view] Executing Directory View' );
 
 			//fetch template and slug
-			$view_slug = apply_filters( 'gravityview_template_slug_'. $view_data['template_id'], 'table', 'directory' );
+			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data[ 'template_id' ], 'table', 'directory' );
 
 			do_action( 'gravityview_log_debug', '[render_view] View template slug: ', $view_slug );
 
 			/**
 			 * Disable fetching initial entries for views that don't need it (DataTables)
 			 */
-			$get_entries = apply_filters( 'gravityview_get_view_entries_'.$view_slug, true );
+			$get_entries = apply_filters( 'gravityview_get_view_entries_' . $view_slug, true );
 
 			/**
 			 * Hide View data until search is performed
 			 * @since 1.5.4
 			 */
-			if ( ! empty( $atts['hide_until_searched'] ) && ! $this->isSearch() ) {
+			if ( ! empty( $atts[ 'hide_until_searched' ] ) && ! $this->isSearch() ) {
 				$gravityview_view->setHideUntilSearched( true );
 				$get_entries = false;
 			}
@@ -751,23 +751,23 @@ 
 
 			if ( $get_entries ) {
 
-				if ( ! empty( $atts['sort_columns'] ) ) {
+				if ( ! empty( $atts[ 'sort_columns' ] ) ) {
 					// add filter to enable column sorting
-					add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ) , 100, 3 );
+					add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ), 100, 3 );
 				}
 
-				$view_entries = self::get_view_entries( $atts, $view_data['form_id'] );
+				$view_entries = self::get_view_entries( $atts, $view_data[ 'form_id' ] );
 
-				do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries['count'], sizeof( $view_entries['entries'] ) ) );
+				do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries[ 'count' ], sizeof( $view_entries[ 'entries' ] ) ) );
 
 			} else {
 
 				$view_entries = array( 'count' => null, 'entries' => null, 'paging' => null );
 
-				do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_'.$view_slug.'` is false' );
+				do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_' . $view_slug . '` is false' );
 			}
 
-			$gravityview_view->setPaging( $view_entries['paging'] );
+			$gravityview_view->setPaging( $view_entries[ 'paging' ] );
 			$gravityview_view->setContext( 'directory' );
 			$sections = array( 'header', 'body', 'footer' );
 
@@ -781,7 +781,7 @@ 
 			 * @action `gravityview_render_entry_{View ID}` Before rendering a single entry for a specific View ID
 			 * @since 1.17
 			 */
-			do_action( 'gravityview_render_entry_'.$view_data['id'] );
+			do_action( 'gravityview_render_entry_' . $view_data[ 'id' ] );
 
 			$entry = $this->getEntry();
 
@@ -791,7 +791,7 @@ 
 				do_action( 'gravityview_log_debug', '[render_view] Entry does not exist. This may be because of View filters limiting access.' );
 
 				// Only display warning once when multiple Views are embedded
-				if( $view_id !== (int) GravityView_frontend::get_context_view_id() ) {
+				if ( $view_id !== (int)GravityView_frontend::get_context_view_id() ) {
 					return null;
 				}
 
@@ -813,20 +813,20 @@ 
 			// We're in single view, but the view being processed is not the same view the single entry belongs to.
 			// important: do not remove this as it prevents fake attempts of displaying entries from other views/forms
 			if ( $this->getGvOutputData()->has_multiple_views() && $view_id != $this->get_context_view_id() ) {
-				do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: '. $view_id );
+				do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: ' . $view_id );
 				return null;
 			}
 
 			//fetch template and slug
-			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data['template_id'], 'table', 'single' );
+			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data[ 'template_id' ], 'table', 'single' );
 			do_action( 'gravityview_log_debug', '[render_view] View single template slug: ', $view_slug );
 
 			//fetch entry detail
-			$view_entries['count'] = 1;
-			$view_entries['entries'][] = $entry;
-			do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries['entries'] );
+			$view_entries[ 'count' ] = 1;
+			$view_entries[ 'entries' ][ ] = $entry;
+			do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries[ 'entries' ] );
 
-			$back_link_label = isset( $atts['back_link_label'] ) ? $atts['back_link_label'] : null;
+			$back_link_label = isset( $atts[ 'back_link_label' ] ) ? $atts[ 'back_link_label' ] : null;
 
 			// set back link label
 			$gravityview_view->setBackLinkLabel( $back_link_label );
@@ -836,11 +836,11 @@ 
 		}
 
 		// add template style
-		self::add_style( $view_data['template_id'] );
+		self::add_style( $view_data[ 'template_id' ] );
 
 		// Prepare to render view and set vars
-		$gravityview_view->setEntries( $view_entries['entries'] );
-		$gravityview_view->setTotalEntries( $view_entries['count'] );
+		$gravityview_view->setEntries( $view_entries[ 'entries' ] );
+		$gravityview_view->setTotalEntries( $view_entries[ 'count' ] );
 
 		// If Edit
 		if ( 'edit' === gravityview_get_context() ) {
@@ -853,11 +853,11 @@ 
 
 		} else {
 			// finaly we'll render some html
-			$sections = apply_filters( 'gravityview_render_view_sections', $sections, $view_data['template_id'] );
+			$sections = apply_filters( 'gravityview_render_view_sections', $sections, $view_data[ 'template_id' ] );
 
 			do_action( 'gravityview_log_debug', '[render_view] Sections to render: ', $sections );
 			foreach ( $sections as $section ) {
-				do_action( 'gravityview_log_debug', '[render_view] Rendering '. $section . ' section.' );
+				do_action( 'gravityview_log_debug', '[render_view] Rendering ' . $section . ' section.' );
 				$gravityview_view->render( $view_slug, $section, false );
 			}
 		}
@@ -911,7 +911,7 @@ 
 				$datetime_format = 'Y-m-d H:i:s';
 				$search_is_outside_view_bounds = false;
 
-				if( ! empty( $search_criteria[ $key ] ) ) {
+				if ( ! empty( $search_criteria[ $key ] ) ) {
 
 					$search_date = strtotime( $search_criteria[ $key ] );
 
@@ -939,14 +939,14 @@ 
 				if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) {
 
 					// Then we override the search and re-set the start date
-					$return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true );
+					$return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true );
 				}
 			}
 		}
 
-		if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) {
+		if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) {
 			// The start date is AFTER the end date. This will result in no results, but let's not force the issue.
-			if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) {
+			if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) {
 				do_action( 'gravityview_log_error', __METHOD__ . ' Invalid search: the start date is after the end date.', $return_search_criteria );
 			}
 		}
@@ -965,19 +965,19 @@ 
 	public static function process_search_only_approved( $args, $search_criteria ) {
 
 		/** @since 1.19 */
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
 			do_action( 'gravityview_log_debug', __METHOD__ . ': User can moderate entries; showing all approval statuses' );
 			return $search_criteria;
 		}
 
-		if ( ! empty( $args['show_only_approved'] ) ) {
+		if ( ! empty( $args[ 'show_only_approved' ] ) ) {
 
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => GravityView_Entry_Approval::meta_key,
 				'value' => GravityView_Entry_Approval_Status::APPROVED
 			);
 
-			$search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met
 
 			do_action( 'gravityview_log_debug', '[process_search_only_approved] Search Criteria if show only approved: ', $search_criteria );
 		}
@@ -1004,18 +1004,18 @@ 
 	 */
 	public static function is_entry_approved( $entry, $args = array() ) {
 
-		if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) {
+		if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) {
 			// is implicitly approved if entry is null or View settings doesn't require to check for approval
 			return true;
 		}
 
 		/** @since 1.19 */
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
 			do_action( 'gravityview_log_debug', __METHOD__ . ': User can moderate entries, so entry is approved for viewing' );
 			return true;
 		}
 
-		$is_approved = gform_get_meta( $entry['id'], GravityView_Entry_Approval::meta_key );
+		$is_approved = gform_get_meta( $entry[ 'id' ], GravityView_Entry_Approval::meta_key );
 
 		return GravityView_Entry_Approval_Status::is_approved( $is_approved );
 	}
@@ -1049,26 +1049,26 @@ 
 		do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', $search_criteria );
 
 		// implicity search
-		if ( ! empty( $args['search_value'] ) ) {
+		if ( ! empty( $args[ 'search_value' ] ) ) {
 
 			// Search operator options. Options: `is` or `contains`
-			$operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains';
+			$operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains';
 
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => rgget( 'search_field', $args ), // The field ID to search
-				'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes.
+				'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes.
 				'operator' => $operator,
 			);
 		}
 
-		if( $search_criteria !== $original_search_criteria ) {
+		if ( $search_criteria !== $original_search_criteria ) {
 			do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after implicity search: ', $search_criteria );
 		}
 
 		// Handle setting date range
 		$search_criteria = self::process_search_dates( $args, $search_criteria );
 
-		if( $search_criteria !== $original_search_criteria ) {
+		if ( $search_criteria !== $original_search_criteria ) {
 			do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after date params: ', $search_criteria );
 		}
 
@@ -1079,7 +1079,7 @@ 
 		 * @filter `gravityview_status` Modify entry status requirements to be included in search results.
 		 * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash`
 		 */
-		$search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args );
+		$search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args );
 
 		return $search_criteria;
 	}
@@ -1125,16 +1125,16 @@ 
 		$search_criteria = self::get_search_criteria( $args, $form_id );
 
 		// Paging & offset
-		$page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : apply_filters( 'gravityview_default_page_size', 25 );
+		$page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : apply_filters( 'gravityview_default_page_size', 25 );
 
 		if ( -1 === $page_size ) {
 			$page_size = PHP_INT_MAX;
 		}
 
-		if ( isset( $args['offset'] ) ) {
-			$offset = intval( $args['offset'] );
+		if ( isset( $args[ 'offset' ] ) ) {
+			$offset = intval( $args[ 'offset' ] );
 		} else {
-			$curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] );
+			$curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] );
 			$offset = ( $curr_page - 1 ) * $page_size;
 		}
 
@@ -1152,7 +1152,7 @@ 
 			'search_criteria' => $search_criteria,
 			'sorting' => $sorting,
 			'paging' => $paging,
-			'cache' => isset( $args['cache'] ) ? $args['cache'] : true,
+			'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true,
 		);
 
 		/**
@@ -1177,7 +1177,7 @@ 
 		 * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys.
 		 * @param array $args View configuration args.
 		 */
-		$parameters = apply_filters( 'gravityview_get_entries_'.$args['id'], $parameters, $args, $form_id );
+		$parameters = apply_filters( 'gravityview_get_entries_' . $args[ 'id' ], $parameters, $args, $form_id );
 
 		do_action( 'gravityview_log_debug', __METHOD__ . ': $parameters passed to gravityview_get_entries(): ', $parameters );
 
@@ -1217,8 +1217,8 @@ 
 	 */
 	public static function updateViewSorting( $args, $form_id ) {
 		$sorting = array();
-		$sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : rgar( $args, 'sort_field' );
-		$sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : rgar( $args, 'sort_direction' );
+		$sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : rgar( $args, 'sort_field' );
+		$sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : rgar( $args, 'sort_direction' );
 
 		$sort_field_id = self::_override_sorting_id_by_field_type( $sort_field_id, $form_id );
 
@@ -1258,11 +1258,11 @@ 
 
 		$sort_field = GFFormsModel::get_field( $form, $sort_field_id );
 
-		if( ! $sort_field ) {
+		if ( ! $sort_field ) {
 			return $sort_field_id;
 		}
 
-		switch ( $sort_field['type'] ) {
+		switch ( $sort_field[ 'type' ] ) {
 
 			case 'address':
 				// Sorting by full address
@@ -1279,7 +1279,7 @@ 
 					 */
 					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
 
-					switch( strtolower( $address_part ) ){
+					switch ( strtolower( $address_part ) ) {
 						case 'street':
 							$sort_field_id .= '.1';
 							break;
@@ -1359,7 +1359,7 @@ 
 		 */
 		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
 
-		if ( empty( $single_entry ) ){
+		if ( empty( $single_entry ) ) {
 			return false;
 		} else {
 			return $single_entry;
@@ -1386,7 +1386,7 @@ 
 				 * Don't enqueue the scripts or styles if it's not going to be displayed.
 				 * @since 1.15
 				 */
-				if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
+				if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
 					continue;
 				}
 
@@ -1395,19 +1395,19 @@ 
 				$css_dependencies = array();
 
 				// If the thickbox is enqueued, add dependencies
-				if ( ! empty( $data['atts']['lightbox'] ) ) {
+				if ( ! empty( $data[ 'atts' ][ 'lightbox' ] ) ) {
 
 					/**
 					 * @filter `gravity_view_lightbox_script` Override the lightbox script to enqueue. Default: `thickbox`
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of it here.
 					 */
-					$js_dependencies[] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' );
+					$js_dependencies[ ] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' );
 
 					/**
 					 * @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox`
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of its CSS file here.
 					 */
-					$css_dependencies[] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' );
+					$css_dependencies[ ] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' );
 				}
 
 				/**
@@ -1415,25 +1415,25 @@ 
 				 * @see https://github.com/katzwebservices/GravityView/issues/536
 				 * @since 1.15
 				 */
-				if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) {
-					$css_dependencies[] = 'dashicons';
+				if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) {
+					$css_dependencies[ ] = 'dashicons';
 				}
 
 				wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
 
 				$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
-				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ) , GravityView_Plugin::version, true );
+				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ), GravityView_Plugin::version, true );
 
 				wp_enqueue_script( 'gravityview-fe-view' );
 
-				if ( ! empty( $data['atts']['sort_columns'] ) ) {
+				if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) {
 					wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
 				}
 
 				$this->enqueue_default_style( $css_dependencies );
 
-				self::add_style( $data['template_id'] );
+				self::add_style( $data[ 'template_id' ] );
 			}
 
 			if ( 'wp_print_footer_scripts' === current_filter() ) {
@@ -1495,7 +1495,7 @@ 
 		} elseif ( empty( $template_id ) ) {
 			do_action( 'gravityview_log_error', '[add_style] Cannot add template style; template_id is empty' );
 		} else {
-			do_action( 'gravityview_log_error', sprintf( '[add_style] Cannot add template style; %s is not registered', 'gravityview_style_'.$template_id ) );
+			do_action( 'gravityview_log_error', sprintf( '[add_style] Cannot add template style; %s is not registered', 'gravityview_style_' . $template_id ) );
 		}
 
 	}
@@ -1520,11 +1520,11 @@ 
 		 * Not a table-based template; don't add sort icons
 		 * @since 1.12
 		 */
-		if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
+		if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
 			return $label;
 		}
 
-		if ( ! $this->is_field_sortable( $field['id'], $form ) ) {
+		if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) {
 			return $label;
 		}
 
@@ -1532,29 +1532,29 @@ 
 
 		$class = 'gv-sort';
 
-		$sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] );
+		$sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] );
 
 		$sort_args = array(
-			'sort' => $field['id'],
+			'sort' => $field[ 'id' ],
 			'dir' => 'asc',
 		);
 
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
 			//toggle sorting direction.
-			if ( 'asc' === $sorting['direction'] ) {
-				$sort_args['dir'] = 'desc';
+			if ( 'asc' === $sorting[ 'direction' ] ) {
+				$sort_args[ 'dir' ] = 'desc';
 				$class .= ' gv-icon-sort-desc';
 			} else {
-				$sort_args['dir'] = 'asc';
+				$sort_args[ 'dir' ] = 'asc';
 				$class .= ' gv-icon-sort-asc';
 			}
 		} else {
 			$class .= ' gv-icon-caret-up-down';
 		}
 
-		$url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) );
+		$url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) );
 
-		return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a>&nbsp;'. $label;
+		return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a>&nbsp;' . $label;
 
 	}
 
@@ -1572,7 +1572,7 @@ 
 
 		$field_type = $field_id;
 
-		if( is_numeric( $field_id ) ) {
+		if ( is_numeric( $field_id ) ) {
 			$field = GFFormsModel::get_field( $form, $field_id );
 			$field_type = $field->type;
 		}
@@ -1595,7 +1595,7 @@ 
 			return false;
 		}
 
-		return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
+		return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
 
 	}
 

includes/class-gv-license-handler.php

Braces +4 added lines, -2 removed lines

@@ -295,7 +295,8 @@ 
 			if ( empty( $license_data ) ) {
 				if ( $is_ajax ) {
 					exit( json_encode( array() ) );
-				} else { // Non-ajax call
+				} else {
+// Non-ajax call
 					return json_encode( array() );
 				}
 			}
@@ -325,7 +326,8 @@ 
 
 		if ( $is_ajax ) {
 			exit( $json );
-		} else { // Non-ajax call
+		} else {
+// Non-ajax call
 			return ( rgget('format', $data ) === 'object' ) ? $license_data : $json;
 		}
 	}

Doc Comments +4 added lines, -2 removed lines

@@ -86,7 +86,6 @@ 
 	 *
 	 * @since 1.19.3
 	 *
-	 * @param bool $force Whether to force checking license, even if AJAX
 	 *
 	 * @return void
 	 */
@@ -272,6 +271,9 @@ 
 		return $implode ? implode( $implode, $extensions ) : $extensions;
 	}
 
+	/**
+	 * @param boolean $echo
+	 */
 	function settings_edd_license_activation( $field, $echo ) {
 
 		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
@@ -464,7 +466,7 @@ 
 	 * Generate the status message box HTML based on the current status
 	 *
 	 * @since 1.7.4
-	 * @param $message
+	 * @param string $message
 	 * @param string $class
 	 *
 	 * @return string

Indentation +9 added lines, -9 removed lines

@@ -115,14 +115,14 @@ 
 			// Call the custom API.
 			$response = wp_remote_post( self::url, array(
 				'timeout'   => 15,
-			    'sslverify' => false,
-			    'body'      =>  array(
-				    'edd_action' => 'check_license',
-				    'license'    => trim( $this->Addon->get_app_setting( 'license_key' ) ),
-				    'item_name'  => self::name,
-				    'url'        => home_url(),
-				    'site_data'  => $this->get_site_data(),
-			    ),
+				'sslverify' => false,
+				'body'      =>  array(
+					'edd_action' => 'check_license',
+					'license'    => trim( $this->Addon->get_app_setting( 'license_key' ) ),
+					'item_name'  => self::name,
+					'url'        => home_url(),
+					'site_data'  => $this->get_site_data(),
+				),
 			));
 
 			// make sure the response came back okay
@@ -675,7 +675,7 @@ 
 		// Update option with passed data license
 		$settings = $this->Addon->get_app_settings();
 
-        $settings['license_key'] = $license_data->license_key = trim( $data['license'] );
+		$settings['license_key'] = $license_data->license_key = trim( $data['license'] );
 		$settings['license_key_status'] = $license_data->license;
 		$settings['license_key_response'] = (array)$license_data;
 

Spacing +103 added lines, -103 removed lines

@@ -46,7 +46,7 @@ 
 	 * @return GV_License_Handler
 	 */
 	public static function get_instance( GravityView_Settings $GFAddOn ) {
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self( $GFAddOn );
 		}
 		return self::$instance;
@@ -123,7 +123,7 @@ 
 				    'url'        => home_url(),
 				    'site_data'  => $this->get_site_data(),
 			    ),
-			));
+			) );
 
 			// make sure the response came back okay
 			if ( is_wp_error( $response ) ) {
@@ -149,12 +149,12 @@ 
 	 */
 	public function refresh_license_status() {
 
-		if ( defined('DOING_AJAX') && DOING_AJAX ) {
+		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
 			return;
 		}
 
 		// The transient is fresh; don't fetch.
-		if( $status = get_transient( self::status_transient_key ) ) {
+		if ( $status = get_transient( self::status_transient_key ) ) {
 			return;
 		}
 
@@ -187,48 +187,48 @@ 
 		$theme_data = wp_get_theme();
 		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
 
-		$data['gv_version']  = GravityView_Plugin::version;
-		$data['php_version']  = phpversion();
-		$data['wp_version']   = get_bloginfo( 'version' );
-		$data['gf_version']  = GFForms::$version;
-		$data['server']       = isset( $_SERVER['SERVER_SOFTWARE'] ) ? $_SERVER['SERVER_SOFTWARE'] : '';
-		$data['multisite']    = is_multisite();
-		$data['theme']        = $theme;
-		$data['url']          = home_url();
-		$data['license_key']  = GravityView_Settings::get_instance()->get_app_setting( 'license_key' );
+		$data[ 'gv_version' ]  = GravityView_Plugin::version;
+		$data[ 'php_version' ]  = phpversion();
+		$data[ 'wp_version' ]   = get_bloginfo( 'version' );
+		$data[ 'gf_version' ]  = GFForms::$version;
+		$data[ 'server' ]       = isset( $_SERVER[ 'SERVER_SOFTWARE' ] ) ? $_SERVER[ 'SERVER_SOFTWARE' ] : '';
+		$data[ 'multisite' ]    = is_multisite();
+		$data[ 'theme' ]        = $theme;
+		$data[ 'url' ]          = home_url();
+		$data[ 'license_key' ]  = GravityView_Settings::get_instance()->get_app_setting( 'license_key' );
 
 		// View Data
-		$gravityview_posts = get_posts('numberposts=-1&post_type=gravityview&post_status=publish&order=ASC');
+		$gravityview_posts = get_posts( 'numberposts=-1&post_type=gravityview&post_status=publish&order=ASC' );
 
 		if ( ! empty( $gravityview_posts ) ) {
 			$first = array_shift( $gravityview_posts );
 			$latest = array_pop( $gravityview_posts );
-			$data['view_count'] = count( $gravityview_posts );
-			$data['view_first'] = $first->post_date;
-			$data['view_latest'] = $latest->post_date;
+			$data[ 'view_count' ] = count( $gravityview_posts );
+			$data[ 'view_first' ] = $first->post_date;
+			$data[ 'view_latest' ] = $latest->post_date;
 		}
 
 		// Form counts
 		if ( class_exists( 'GFFormsModel' ) ) {
 			$form_data = GFFormsModel::get_form_count();
-			$data['forms_total'] = rgar( $form_data, 'total', 0 );
-			$data['forms_active'] = rgar( $form_data, 'active', 0 );
-			$data['forms_inactive'] = rgar( $form_data, 'inactive', 0 );
-			$data['forms_trash'] = rgar( $form_data, 'inactive', 0 );
+			$data[ 'forms_total' ] = rgar( $form_data, 'total', 0 );
+			$data[ 'forms_active' ] = rgar( $form_data, 'active', 0 );
+			$data[ 'forms_inactive' ] = rgar( $form_data, 'inactive', 0 );
+			$data[ 'forms_trash' ] = rgar( $form_data, 'inactive', 0 );
 		}
 
 		// Retrieve current plugin information
-		if( ! function_exists( 'get_plugins' ) ) {
+		if ( ! function_exists( 'get_plugins' ) ) {
 			include ABSPATH . '/wp-admin/includes/plugin.php';
 		}
 
-		$data['integrations']     = self::get_related_plugins_and_extensions();
-		$data['active_plugins']   = get_option( 'active_plugins', array() );
-		$data['inactive_plugins'] = array();
-		$data['locale']           = get_locale();
+		$data[ 'integrations' ]     = self::get_related_plugins_and_extensions();
+		$data[ 'active_plugins' ]   = get_option( 'active_plugins', array() );
+		$data[ 'inactive_plugins' ] = array();
+		$data[ 'locale' ]           = get_locale();
 
 		// Validate request on the GV server
-		$data['hash']             = 'gv_version.url.locale:' . sha1( $data['gv_version'] . $data['url'] . $data['locale'] );
+		$data[ 'hash' ]             = 'gv_version.url.locale:' . sha1( $data[ 'gv_version' ] . $data[ 'url' ] . $data[ 'locale' ] );
 
 		return $data;
 	}
@@ -260,10 +260,10 @@ 
 
 				$plugin_data = get_plugin_data( $active_plugin );
 
-				$extensions[] = sprintf( '%s %s', $plugin_data['Name'], $plugin_data['Version'] );
+				$extensions[ ] = sprintf( '%s %s', $plugin_data[ 'Name' ], $plugin_data[ 'Version' ] );
 			}
 
-			if( ! empty( $extensions ) ) {
+			if ( ! empty( $extensions ) ) {
 				set_site_transient( self::related_plugins_key, $extensions, HOUR_IN_SECONDS );
 			} else {
 				return 'There was an error fetching related plugins.';
@@ -282,37 +282,37 @@ 
 		$status = trim( $this->Addon->get_app_setting( 'license_key_status' ) );
 		$key = trim( $this->Addon->get_app_setting( 'license_key' ) );
 
-		if( !empty( $key ) ) {
+		if ( ! empty( $key ) ) {
 			$response = $this->Addon->get_app_setting( 'license_key_response' );
-			$response = is_array( $response ) ? (object) $response : json_decode( $response );
+			$response = is_array( $response ) ? (object)$response : json_decode( $response );
 		} else {
 			$response = array();
 		}
 
 		wp_localize_script( 'gv-admin-edd-license', 'GVGlobals', array(
 			'license_box' => $this->get_license_message( $response )
-		));
+		) );
 
 
 		$fields = array(
 			array(
 				'name'  => 'edd-activate',
-				'value' => __('Activate License', 'gravityview'),
-				'data-pending_text' => __('Verifying license…', 'gravityview'),
+				'value' => __( 'Activate License', 'gravityview' ),
+				'data-pending_text' => __( 'Verifying license…', 'gravityview' ),
 				'data-edd_action' => 'activate_license',
 				'class' => 'button-primary',
 			),
 			array(
 				'name'  => 'edd-deactivate',
-				'value' => __('Deactivate License', 'gravityview'),
-				'data-pending_text' => __('Deactivating license…', 'gravityview'),
+				'value' => __( 'Deactivate License', 'gravityview' ),
+				'data-pending_text' => __( 'Deactivating license…', 'gravityview' ),
 				'data-edd_action' => 'deactivate_license',
 				'class' => ( empty( $status ) ? 'button-primary hide' : 'button-primary' ),
 			),
 			array(
 				'name'  => 'edd-check',
-				'value' => __('Check License', 'gravityview'),
-				'data-pending_text' => __('Verifying license…', 'gravityview'),
+				'value' => __( 'Check License', 'gravityview' ),
+				'data-pending_text' => __( 'Verifying license…', 'gravityview' ),
 				'title' => 'Check the license before saving it',
 				'data-edd_action' => 'check_license',
 				'class' => 'button-secondary',
@@ -322,17 +322,17 @@ 
 
 		$class = 'button gv-edd-action';
 
-		$class .= ( !empty( $key ) && $status !== 'valid' ) ? '' : ' hide';
+		$class .= ( ! empty( $key ) && $status !== 'valid' ) ? '' : ' hide';
 
 		$disabled_attribute = GVCommon::has_cap( 'gravityview_edit_settings' ) ? false : 'disabled';
 
 		$submit = '<div class="gv-edd-button-wrapper">';
 		foreach ( $fields as $field ) {
-			$field['type'] = 'button';
-			$field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class;
-			$field['style'] = 'margin-left: 10px;';
-			if( $disabled_attribute ) {
-				$field['disabled'] = $disabled_attribute;
+			$field[ 'type' ] = 'button';
+			$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] . ' ' . $class : $class;
+			$field[ 'style' ] = 'margin-left: 10px;';
+			if ( $disabled_attribute ) {
+				$field[ 'disabled' ] = $disabled_attribute;
 			}
 			$submit .= $this->Addon->settings_submit( $field, $echo );
 		}
@@ -348,8 +348,8 @@ 
 	 */
 	private function setup_edd() {
 
-		if( !class_exists('EDD_SL_Plugin_Updater') ) {
-			require_once( GRAVITYVIEW_DIR . 'includes/lib/EDD_SL_Plugin_Updater.php');
+		if ( ! class_exists( 'EDD_SL_Plugin_Updater' ) ) {
+			require_once( GRAVITYVIEW_DIR . 'includes/lib/EDD_SL_Plugin_Updater.php' );
 		}
 
 		// setup the updater
@@ -386,8 +386,8 @@ 
 			'url'       => home_url(),
 		);
 
-		if( !empty( $action ) ) {
-			$settings['edd_action'] = esc_attr( $action );
+		if ( ! empty( $action ) ) {
+			$settings[ 'edd_action' ] = esc_attr( $action );
 		}
 
 		$settings = array_map( 'urlencode', $settings );
@@ -401,14 +401,14 @@ 
 	 */
 	private function _license_get_remote_response( $data, $license = '' ) {
 
-		$api_params = $this->_get_edd_settings( $data['edd_action'], $license );
+		$api_params = $this->_get_edd_settings( $data[ 'edd_action' ], $license );
 
 		$url = add_query_arg( $api_params, self::url );
 
 		$response = wp_remote_get( $url, array(
 			'timeout'   => 15,
 			'sslverify' => false,
-		));
+		) );
 
 		if ( is_wp_error( $response ) ) {
 			return array();
@@ -441,11 +441,11 @@ 
 	 */
 	function get_license_message( $license_data ) {
 
-		if( empty( $license_data ) ) {
+		if ( empty( $license_data ) ) {
 			$message = '';
 		} else {
 
-			if( ! empty( $license_data->error ) ) {
+			if ( ! empty( $license_data->error ) ) {
 				$class = 'error';
 				$string_key = $license_data->error;
 			} else {
@@ -453,7 +453,7 @@ 
 				$string_key = $license_data->license;
 			}
 
-			$message = sprintf( '<p><strong>%s: %s</strong></p>', $this->strings('status'), $this->strings( $string_key, $license_data ) );
+			$message = sprintf( '<p><strong>%s: %s</strong></p>', $this->strings( 'status' ), $this->strings( $string_key, $license_data ) );
 
 			$message = $this->generate_license_box( $message, $class );
 		}
@@ -490,18 +490,18 @@ 
 	 */
 	public function license_details( $response = array() ) {
 
-		$response = (array) $response;
+		$response = (array)$response;
 
 		$return = '';
 		$wrapper = '<span class="gv-license-details" aria-live="polite" aria-busy="false">%s</span>';
 
-		if( ! empty( $response['license_key'] ) ) {
+		if ( ! empty( $response[ 'license_key' ] ) ) {
 
 			$return .= '<h3>' . esc_html__( 'License Details:', 'gravityview' ) . '</h3>';
 
 			if ( in_array( rgar( $response, 'license' ), array( 'invalid', 'deactivated' ) ) ) {
-				$return .= $this->strings( $response['license'], $response );
-			} elseif ( ! empty( $response['license_name'] ) ) {
+				$return .= $this->strings( $response[ 'license' ], $response );
+			} elseif ( ! empty( $response[ 'license_name' ] ) ) {
 
 				$response_keys = array(
 					'license_name'   => '',
@@ -516,19 +516,19 @@ 
 				// Make sure all the keys are set
 				$response = wp_parse_args( $response, $response_keys );
 
-				$login_link = sprintf( '<a href="%s" class="howto" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response['customer_email'] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) );
-				$local_text = ( ! empty( $response['is_local'] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
+				$login_link = sprintf( '<a href="%s" class="howto" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response[ 'customer_email' ] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) );
+				$local_text = ( ! empty( $response[ 'is_local' ] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
 				$details    = array(
-					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response['license_name'] ), esc_html( $response['license_limit'] ) ),
-					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), esc_html__( $response['customer_name'], 'gravityview' ), esc_html__( $response['customer_email'], 'gravityview' ) ) . $login_link,
-					'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response['site_count'] ), esc_html( $response['license_limit'] ) ) . $local_text,
-					'expires'     => 'lifetime' === $response['expires'] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response['expires'] ) - DAY_IN_SECONDS ) ),
-					'upgrade'     => $this->get_upgrade_html( $response['upgrades'] ),
+					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response[ 'license_name' ] ), esc_html( $response[ 'license_limit' ] ) ),
+					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), esc_html__( $response[ 'customer_name' ], 'gravityview' ), esc_html__( $response[ 'customer_email' ], 'gravityview' ) ) . $login_link,
+					'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response[ 'site_count' ] ), esc_html( $response[ 'license_limit' ] ) ) . $local_text,
+					'expires'     => 'lifetime' === $response[ 'expires' ] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response[ 'expires' ] ) - DAY_IN_SECONDS ) ),
+					'upgrade'     => $this->get_upgrade_html( $response[ 'upgrades' ] ),
 				);
 
-				if ( ! empty( $response['error'] ) && 'expired' === $response['error'] ) {
-					unset( $details['upgrade'] );
-					$details['expires'] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
+				if ( ! empty( $response[ 'error' ] ) && 'expired' === $response[ 'error' ] ) {
+					unset( $details[ 'upgrade' ] );
+					$details[ 'expires' ] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
 				}
 
 				$return .= '<ul><li>' . implode( '</li><li>', array_filter( $details ) ) . '</li></ul>';
@@ -551,11 +551,11 @@ 
 
 		$output = '';
 
-		if( ! empty( $upgrades ) ) {
+		if ( ! empty( $upgrades ) ) {
 
 			$locale_parts = explode( '_', get_locale() );
 
-			$is_english = ( 'en' === $locale_parts[0] );
+			$is_english = ( 'en' === $locale_parts[ 0 ] );
 
 			$output .= '<h4>' . esc_html__( 'Upgrades available:', 'gravityview' ) . '</h4>';
 
@@ -563,14 +563,14 @@ 
 
 			foreach ( $upgrades as $upgrade_id => $upgrade ) {
 
-				$upgrade = (object) $upgrade;
+				$upgrade = (object)$upgrade;
 
 				$anchor_text = sprintf( esc_html_x( 'Upgrade to %1$s for %2$s', '1: GravityView upgrade name, 2: Cost of upgrade', 'gravityview' ), esc_attr( $upgrade->name ), esc_attr( $upgrade->price ) );
 
-				if( $is_english && isset( $upgrade->description ) ) {
+				if ( $is_english && isset( $upgrade->description ) ) {
 					$message = esc_html( $upgrade->description );
 				} else {
-					switch( $upgrade->price_id ) {
+					switch ( $upgrade->price_id ) {
 						// Interstellar
 						case 1:
 						default:
@@ -608,16 +608,16 @@ 
 	 */
 	public function license_call( $array = array() ) {
 
-		$is_ajax = ( defined('DOING_AJAX') && DOING_AJAX );
-		$data = empty( $array ) ? $_POST['data'] : $array;
+		$is_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX );
+		$data = empty( $array ) ? $_POST[ 'data' ] : $array;
 		$has_cap = GVCommon::has_cap( 'gravityview_edit_settings' );
 
-		if ( $is_ajax && empty( $data['license'] ) ) {
-			die( - 1 );
+		if ( $is_ajax && empty( $data[ 'license' ] ) ) {
+			die( -1 );
 		}
 
 		// If the user isn't allowed to edit settings, show an error message
-		if( ! $has_cap && empty( $data['all_caps'] ) ) {
+		if ( ! $has_cap && empty( $data[ 'all_caps' ] ) ) {
 			$license_data = new stdClass();
 			$license_data->error = 'capability';
 			$license_data->message = $this->get_license_message( $license_data );
@@ -641,9 +641,9 @@ 
 
 			$json = json_encode( $license_data );
 
-			$update_license = ( ! isset( $data['update'] ) || ! empty( $data['update'] ) );
+			$update_license = ( ! isset( $data[ 'update' ] ) || ! empty( $data[ 'update' ] ) );
 
-			$is_check_action_button = ( 'check_license' === $data['edd_action'] && defined( 'DOING_AJAX' ) && DOING_AJAX );
+			$is_check_action_button = ( 'check_license' === $data[ 'edd_action' ] && defined( 'DOING_AJAX' ) && DOING_AJAX );
 
 			// Failed is the response from trying to de-activate a license and it didn't work.
 			// This likely happened because people entered in a different key and clicked "Deactivate",
@@ -651,7 +651,7 @@ 
 			// most likely a mistake.
 			if ( $license_data->license !== 'failed' && ! $is_check_action_button && $update_license ) {
 
-				if ( ! empty( $data['field_id'] ) ) {
+				if ( ! empty( $data[ 'field_id' ] ) ) {
 					set_transient( self::status_transient_key, $license_data, DAY_IN_SECONDS );
 				}
 
@@ -662,7 +662,7 @@ 
 		if ( $is_ajax ) {
 			exit( $json );
 		} else { // Non-ajax call
-			return ( rgget('format', $data ) === 'object' ) ? $license_data : $json;
+			return ( rgget( 'format', $data ) === 'object' ) ? $license_data : $json;
 		}
 	}
 
@@ -676,9 +676,9 @@ 
 		// Update option with passed data license
 		$settings = $this->Addon->get_app_settings();
 
-        $settings['license_key'] = $license_data->license_key = trim( $data['license'] );
-		$settings['license_key_status'] = $license_data->license;
-		$settings['license_key_response'] = (array)$license_data;
+        $settings[ 'license_key' ] = $license_data->license_key = trim( $data[ 'license' ] );
+		$settings[ 'license_key_status' ] = $license_data->license;
+		$settings[ 'license_key_response' ] = (array)$license_data;
 
 		$this->Addon->update_app_settings( $settings );
 	}
@@ -691,7 +691,7 @@ 
 	 */
 	private function get_license_renewal_url( $license_data ) {
 		$license_data = is_array( $license_data ) ? (object)$license_data : $license_data;
-		$renew_license_url = ( ! empty( $license_data ) && !empty( $license_data->license_key ) ) ? sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s&utm_source=admin_notice&utm_medium=admin&utm_content=expired&utm_campaign=Activation&force_login=1', $license_data->license_key ) : 'https://gravityview.co/account/';
+		$renew_license_url = ( ! empty( $license_data ) && ! empty( $license_data->license_key ) ) ? sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s&utm_source=admin_notice&utm_medium=admin&utm_content=expired&utm_campaign=Activation&force_login=1', $license_data->license_key ) : 'https://gravityview.co/account/';
 		return $renew_license_url;
 	}
 
@@ -706,31 +706,31 @@ 
 
 
 		$strings = array(
-			'status' => esc_html__('Status', 'gravityview'),
-			'error' => esc_html__('There was an error processing the request.', 'gravityview'),
-			'failed'  => esc_html__('Could not deactivate the license. The license key you attempted to deactivate may not be active or valid.', 'gravityview'),
-			'site_inactive' => esc_html__('The license key is valid, but it has not been activated for this site.', 'gravityview'),
-			'inactive' => esc_html__('The license key is valid, but it has not been activated for this site.', 'gravityview'),
-			'no_activations_left' => esc_html__('Invalid: this license has reached its activation limit.', 'gravityview') . ' ' . sprintf( esc_html__('You can manage license activations %son your GravityView account page%s.', 'gravityview'), '<a href="https://gravityview.co/account/#licenses">', '</a>' ),
-			'deactivated' => esc_html__('The license has been deactivated.', 'gravityview'),
-			'valid' => esc_html__('The license key is valid and active.', 'gravityview'),
-			'invalid' => esc_html__('The license key entered is invalid.', 'gravityview'),
-			'missing' => esc_html__('Invalid license key.', 'gravityview'),
-			'revoked' => esc_html__('This license key has been revoked.', 'gravityview'),
-			'expired' => sprintf( esc_html__('This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview'), '<a href="'. esc_url( $this->get_license_renewal_url( $license_data ) ) .'">', '</a>' ),
+			'status' => esc_html__( 'Status', 'gravityview' ),
+			'error' => esc_html__( 'There was an error processing the request.', 'gravityview' ),
+			'failed'  => esc_html__( 'Could not deactivate the license. The license key you attempted to deactivate may not be active or valid.', 'gravityview' ),
+			'site_inactive' => esc_html__( 'The license key is valid, but it has not been activated for this site.', 'gravityview' ),
+			'inactive' => esc_html__( 'The license key is valid, but it has not been activated for this site.', 'gravityview' ),
+			'no_activations_left' => esc_html__( 'Invalid: this license has reached its activation limit.', 'gravityview' ) . ' ' . sprintf( esc_html__( 'You can manage license activations %son your GravityView account page%s.', 'gravityview' ), '<a href="https://gravityview.co/account/#licenses">', '</a>' ),
+			'deactivated' => esc_html__( 'The license has been deactivated.', 'gravityview' ),
+			'valid' => esc_html__( 'The license key is valid and active.', 'gravityview' ),
+			'invalid' => esc_html__( 'The license key entered is invalid.', 'gravityview' ),
+			'missing' => esc_html__( 'Invalid license key.', 'gravityview' ),
+			'revoked' => esc_html__( 'This license key has been revoked.', 'gravityview' ),
+			'expired' => sprintf( esc_html__( 'This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview' ), '<a href="' . esc_url( $this->get_license_renewal_url( $license_data ) ) . '">', '</a>' ),
 			'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ),
 
-			'verifying_license' => esc_html__('Verifying license&hellip;', 'gravityview'),
-			'activate_license' => esc_html__('Activate License', 'gravityview'),
-			'deactivate_license' => esc_html__('Deactivate License', 'gravityview'),
-			'check_license' => esc_html__('Verify License', 'gravityview'),
+			'verifying_license' => esc_html__( 'Verifying license&hellip;', 'gravityview' ),
+			'activate_license' => esc_html__( 'Activate License', 'gravityview' ),
+			'deactivate_license' => esc_html__( 'Deactivate License', 'gravityview' ),
+			'check_license' => esc_html__( 'Verify License', 'gravityview' ),
 		);
 
-		if( empty( $status ) ) {
+		if ( empty( $status ) ) {
 			return $strings;
 		}
 
-		if( isset( $strings[ $status ] ) ) {
+		if ( isset( $strings[ $status ] ) ) {
 			return $strings[ $status ];
 		}
 

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-yoast-seo.php

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
 
 		parent::add_hooks();
 
-		if( gravityview_is_admin_page() ) {
+		if ( gravityview_is_admin_page() ) {
 
 				// Make Yoast metabox go down to the bottom please.
 			add_filter( 'wpseo_metabox_prio', array( $this, '__return_low' ) );
@@ -83,8 +83,8 @@ 
 		global $pagenow;
 
 		// New View page
-		if( $pagenow === 'post-new.php' ) {
-			$options['hideeditbox-gravityview'] = true;
+		if ( $pagenow === 'post-new.php' ) {
+			$options[ 'hideeditbox-gravityview' ] = true;
 		}
 
 		return $options;