gravityview / GravityView

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

Spacing +5 added lines, -5 removed lines

@@ -7,17 +7,17 @@
 
 $gravityview_view = GravityView_View::getInstance();
 $view_id = $gravityview_view->getViewId();
-$value = $gravityview_view->search_field['value'];
-$label = $gravityview_view->search_field['label'];
+$value = $gravityview_view->search_field[ 'value' ];
+$label = $gravityview_view->search_field[ 'label' ];
 
 ?>
 
 <div class="gv-search-box gv-search-date gv-search-date-range gv-search-field-entry_date">
-	<?php if( ! gv_empty( $label, false, false ) ) { ?>
+	<?php if ( ! gv_empty( $label, false, false ) ) { ?>
 	<label for="gv_start_date_<?php echo $view_id; ?>"><?php echo esc_html( $label ); ?></label>
 	<?php } ?>
 	<p>
-		<input name="gv_start" id="gv_start_date_<?php echo $view_id; ?>" type="text" class="<?php echo esc_attr( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('Start date', 'gravityview' ); ?>" value="<?php echo $value['start']; ?>">
-		<input name="gv_end" id="gv_end_date_<?php echo $view_id; ?>" type="text" class="<?php echo esc_attr( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('End date', 'gravityview' ); ?>" value="<?php echo $value['end']; ?>">
+		<input name="gv_start" id="gv_start_date_<?php echo $view_id; ?>" type="text" class="<?php echo esc_attr( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'Start date', 'gravityview' ); ?>" value="<?php echo $value[ 'start' ]; ?>">
+		<input name="gv_end" id="gv_end_date_<?php echo $view_id; ?>" type="text" class="<?php echo esc_attr( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'End date', 'gravityview' ); ?>" value="<?php echo $value[ 'end' ]; ?>">
 	</p>
 </div>
\ No newline at end of file

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

Spacing +7 added lines, -7 removed lines

@@ -7,17 +7,17 @@
 
 $gravityview_view = GravityView_View::getInstance();
 $view_id = $gravityview_view->getViewId();
-$value = $gravityview_view->search_field['value'];
-$label = $gravityview_view->search_field['label'];
-$name = $gravityview_view->search_field['name'];
+$value = $gravityview_view->search_field[ 'value' ];
+$label = $gravityview_view->search_field[ 'label' ];
+$name = $gravityview_view->search_field[ 'name' ];
 ?>
 
 <div class="gv-search-box gv-search-date gv-search-date-range">
-	<?php if( ! gv_empty( $label, false, false ) ) { ?>
-	<label for="search-box-<?php echo esc_attr( $name ).'-start'; ?>"><?php echo esc_html( $label ); ?></label>
+	<?php if ( ! gv_empty( $label, false, false ) ) { ?>
+	<label for="search-box-<?php echo esc_attr( $name ) . '-start'; ?>"><?php echo esc_html( $label ); ?></label>
 	<?php } ?>
 	<p>
-		<input name="<?php echo esc_attr( $name ).'[start]'; ?>" id="search-box-<?php echo esc_attr( $name ).'-start'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('Start date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value['start'] ); ?>">
-		<input name="<?php echo esc_attr( $name ).'[end]'; ?>" id="search-box-<?php echo esc_attr( $name ).'-end'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('End date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value['end'] ); ?>">
+		<input name="<?php echo esc_attr( $name ) . '[start]'; ?>" id="search-box-<?php echo esc_attr( $name ) . '-start'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'Start date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value[ 'start' ] ); ?>">
+		<input name="<?php echo esc_attr( $name ) . '[end]'; ?>" id="search-box-<?php echo esc_attr( $name ) . '-end'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'End date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value[ 'end' ] ); ?>">
 	</p>
 </div>
\ No newline at end of file

future/includes/class-gv-entry.php

Spacing +9 added lines, -9 removed lines

@@ -113,7 +113,7 @@ 
 
 		$args = array();
 
-		$view_id = is_null ( $view ) ? null : $view->ID;
+		$view_id = is_null( $view ) ? null : $view->ID;
 
 		$permalink = null;
 
@@ -126,8 +126,8 @@ 
 
 				$view_collection = View_Collection::from_post( $post );
 
-				if( 1 < $view_collection->count() ) {
-					$args['gvid'] = $view_id;
+				if ( 1 < $view_collection->count() ) {
+					$args[ 'gvid' ] = $view_id;
 				}
 			}
 		}
@@ -156,21 +156,21 @@ 
 			 */
 			$link_parts = explode( '?', $permalink );
 
-			$query = ! empty( $link_parts[1] ) ? '?' . $link_parts[1] : '';
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
 
-			$permalink = trailingslashit( $link_parts[0] ) . $entry_endpoint_name . '/'. $entry_slug .'/' . $query;
+			$permalink = trailingslashit( $link_parts[ 0 ] ) . $entry_endpoint_name . '/' . $entry_slug . '/' . $query;
 		} else {
 			$args[ $entry_endpoint_name ] = $entry_slug;
 		}
 
 		if ( $track_directory ) {
-			if ( ! empty( $_GET['pagenum'] ) ) {
-				$args['pagenum'] = intval( $_GET['pagenum'] );
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
 			}
 
 			if ( $sort = Utils::_GET( 'sort' ) ) {
-				$args['sort'] = $sort;
-				$args['dir'] = Utils::_GET( 'dir' );
+				$args[ 'sort' ] = $sort;
+				$args[ 'dir' ] = Utils::_GET( 'dir' );
 			}
 		}
 

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

Braces +3 added lines, -2 removed lines

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

Spacing +21 added lines, -21 removed lines

@@ -41,8 +41,8 @@ 
 			'detail' => null,
 		) );
 		
-		if ( ! $view_id = $atts['id'] ? : $atts['view_id'] ) {
-			if ( $atts['detail'] && $view = $request->is_view() ) {
+		if ( ! $view_id = $atts[ 'id' ] ?: $atts[ 'view_id' ] ) {
+			if ( $atts[ 'detail' ] && $view = $request->is_view() ) {
 				$view_id = $view->ID;
 			}
 		}
@@ -110,12 +110,12 @@ 
 			}
 		}
 
-		$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 );
 
 		/**
 		 * View details.
 		 */
-		if ( $atts['detail'] ) {
+		if ( $atts[ 'detail' ] ) {
 			$entries = $view->get_entries( $request );
 			return self::_return( $this->detail( $view, $entries, $atts ) );
 
@@ -132,7 +132,7 @@ 
 				return self::_return( '' );
 			}
 
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
 			}
@@ -143,7 +143,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
 				}
@@ -163,7 +163,7 @@ 
 				return self::_return( '' );
 			}
 
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
 			}
@@ -174,7 +174,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
 				}
@@ -182,7 +182,7 @@ 
 
 			$error = \GVCommon::check_entry_display( $entry->as_entry(), $view );
 
-			if( is_wp_error( $error ) ) {
+			if ( is_wp_error( $error ) ) {
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing: {message}', array( 'entry_id' => $entry->ID, 'message' => $error->get_error_message() ) );
 				return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
 			}
@@ -198,10 +198,10 @@ 
 				
 				// Mock the request with the actual View, not the global one
 				$mock_request = new \GV\Mock_Request();
-				$mock_request->returns['is_view'] = $view;
-				$mock_request->returns['is_entry'] = $request->is_entry();
-				$mock_request->returns['is_edit_entry'] = $request->is_edit_entry();
-				$mock_request->returns['is_search'] = $request->is_search();
+				$mock_request->returns[ 'is_view' ] = $view;
+				$mock_request->returns[ 'is_entry' ] = $request->is_entry();
+				$mock_request->returns[ 'is_edit_entry' ] = $request->is_edit_entry();
+				$mock_request->returns[ 'is_search' ] = $request->is_search();
 
 				$request = $mock_request;
 			}
@@ -237,16 +237,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.
@@ -254,7 +254,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;
@@ -269,8 +269,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;
@@ -282,7 +282,7 @@ 
 			}
 		}
 
-		$atts['detail'] = \GV\Utils::get( $passed_atts, 'detail', null );
+		$atts[ 'detail' ] = \GV\Utils::get( $passed_atts, 'detail', null );
 
 		return $atts;
 	}
@@ -299,7 +299,7 @@ 
 	private function detail( $view, $entries, $atts ) {
 		$output = '';
 
-		switch ( $key = $atts['detail'] ):
+		switch ( $key = $atts[ 'detail' ] ):
 			case 'total_entries':
 				$output = number_format_i18n( $entries->total() );
 				break;

includes/class-admin-installer.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	 *
 	 * @param array $items Scripts or styles to exclude from no-conflict
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	public function register_noconflict( $items ) {
 

Indentation +94 added lines, -94 removed lines

@@ -66,9 +66,9 @@ 
 	 */
 	public function add_downloads_data_filters() {
 
-	    $downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT );
+		$downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT );
 
-	    if ( ! $downloads_data ) {
+		if ( ! $downloads_data ) {
 			return;
 		}
 
@@ -97,7 +97,7 @@ 
 	 */
 	public function add_admin_menu() {
 
-	    $menu_text = _x( 'Extensions', 'Extensions are WordPress plugins that add functionality to GravityView and Gravity Forms', 'gravityview' );
+		$menu_text = _x( 'Extensions', 'Extensions are WordPress plugins that add functionality to GravityView and Gravity Forms', 'gravityview' );
 
 		$menu_text = sprintf( '<span title="%s">%s</span>', esc_attr__( 'Plugins that extend GravityView and Gravity Forms functionality.', 'gravityview' ), $menu_text );
 
@@ -112,8 +112,8 @@ 
 	}
 
 	/**
-     * When on the Installer page, show a different notice than on the Settings page
-     *
+	 * When on the Installer page, show a different notice than on the Settings page
+	 *
 	 * @param array $notice
 	 *
 	 * @return string License notice
@@ -121,10 +121,10 @@ 
 	public function maybe_modify_license_notice( $notice = '' ) {
 
 		if ( ! gravityview()->request->is_admin( '', 'downloads' ) ) {
-            return $notice;
-        }
+			return $notice;
+		}
 
-        return esc_html__( 'Your license %s. Do you want access to these plugins? %sActivate your license%s or %sget a license here%s.', 'gravityview' );
+		return esc_html__( 'Your license %s. Do you want access to these plugins? %sActivate your license%s or %sget a license here%s.', 'gravityview' );
 	}
 
 	/**
@@ -162,43 +162,43 @@ 
 	 * Get downloads data from transient or from API; save transient after getting data from API
 	 *
 	 * @return WP_Error|array If error, returns WP_Error. If not valid JSON, empty array. Otherwise, this structure: {
-     *   @type array  $info {
-     *       @type string $id int 17
-     *       @type string $slug Extension slug
-     *       @type string $title Extension title
-     *       @type string $create_date in '2018-07-19 20:03:10' format
-     *       @type string $modified_date
-     *       @type string $status
-     *       @type string $link URL to public plugin page
-     *       @type string $content
-     *       @type string $excerpt
-     *       @type string $thumbnail URL to thumbnail
-     *       @type array  $category Taxonomy details for the plugin's category {
-     *         @type int $term_id => int 30
-     *         @type string $name => string 'Plugins' (length=7)
-     *         @type string $slug => string 'plugins' (length=7)
-     *         @type int $term_group => int 0
-     *         @type int $term_taxonomy_id => int 30
-     *         @type string $taxonomy => string 'download_category' (length=17)
-     *         @type string $description => string '' (length=0)
-     *         @type int $parent => int 0
-     *         @type int $count => int 4
-     *         @type string $filter => string 'raw' (length=3)
-     *       }
-     *       @type array $tags {see $category above}
-     *       @type string $textdomain string 'gravityview' (length=11)
-     *   }
-     *   @type array $pricing array of `price_name_slugs` => '00.00' values, if price options exist
-     *   @type array $licensing {
-     *       @type bool   $enabled Is licensing enabled for the extension
-     *       @type string $version Version number
-     *       @type string $exp_unit Expiration unit ('years')
-     *       @type string $exp_length Expiration length ('1')
-     *   }
-     *   @type array $files Array of files. Empty if user has no access to the file. {
-     *       @type string $file string URL of the file download
-     *   }
-     * }
+	 *   @type array  $info {
+	 *       @type string $id int 17
+	 *       @type string $slug Extension slug
+	 *       @type string $title Extension title
+	 *       @type string $create_date in '2018-07-19 20:03:10' format
+	 *       @type string $modified_date
+	 *       @type string $status
+	 *       @type string $link URL to public plugin page
+	 *       @type string $content
+	 *       @type string $excerpt
+	 *       @type string $thumbnail URL to thumbnail
+	 *       @type array  $category Taxonomy details for the plugin's category {
+	 *         @type int $term_id => int 30
+	 *         @type string $name => string 'Plugins' (length=7)
+	 *         @type string $slug => string 'plugins' (length=7)
+	 *         @type int $term_group => int 0
+	 *         @type int $term_taxonomy_id => int 30
+	 *         @type string $taxonomy => string 'download_category' (length=17)
+	 *         @type string $description => string '' (length=0)
+	 *         @type int $parent => int 0
+	 *         @type int $count => int 4
+	 *         @type string $filter => string 'raw' (length=3)
+	 *       }
+	 *       @type array $tags {see $category above}
+	 *       @type string $textdomain string 'gravityview' (length=11)
+	 *   }
+	 *   @type array $pricing array of `price_name_slugs` => '00.00' values, if price options exist
+	 *   @type array $licensing {
+	 *       @type bool   $enabled Is licensing enabled for the extension
+	 *       @type string $version Version number
+	 *       @type string $exp_unit Expiration unit ('years')
+	 *       @type string $exp_length Expiration length ('1')
+	 *   }
+	 *   @type array $files Array of files. Empty if user has no access to the file. {
+	 *       @type string $file string URL of the file download
+	 *   }
+	 * }
 	 */
 	public function get_downloads_data() {
 
@@ -226,7 +226,7 @@ 
 		) );
 
 		if ( is_wp_error( $response ) ) {
-		    gravityview()->log->error( "Extension data response is an error", array( 'data' => $response ) );
+			gravityview()->log->error( "Extension data response is an error", array( 'data' => $response ) );
 			return $response;
 		}
 
@@ -279,10 +279,10 @@ 
                 <div class="gv-admin-installer-notice notice inline error">
                     <h3><?php esc_html_e( 'Extensions and plugins data cannot be loaded at the moment. Please try again later.', 'gravityview' ); ?></h3>
                     <?php
-                    if ( is_wp_error( $downloads_data ) ) {
-	                    echo wpautop( '<pre>' . esc_html( $downloads_data->get_error_message() ) . '</pre>' );
-                    }
-                    ?>
+					if ( is_wp_error( $downloads_data ) ) {
+						echo wpautop( '<pre>' . esc_html( $downloads_data->get_error_message() ) . '</pre>' );
+					}
+					?>
                 </div>
             </div>
 			<?php
@@ -338,9 +338,9 @@ 
 	protected function render_download( $download, $wp_plugins ) {
 
 
-        $details = $this->get_download_display_details( $download, $wp_plugins );
+		$details = $this->get_download_display_details( $download, $wp_plugins );
 
-        $download_info = $details['download_info'];
+		$download_info = $details['download_info'];
 
 		?>
         <div class="item <?php echo esc_attr( $details['item_class'] ); ?>">
@@ -362,43 +362,43 @@ 
 
                 <div class="addon-excerpt"><?php
 
-                    $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] );
+					$excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] );
 
-                    // Allow some pure HTML tags, but remove everything else from the excerpt.
-                    $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' );
-                    $replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' );
+					// Allow some pure HTML tags, but remove everything else from the excerpt.
+					$tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' );
+					$replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' );
 
-                    $excerpt = str_replace( $tags, $replacements, $excerpt );
-                    $excerpt = esc_html( strip_tags( $excerpt ) );
+					$excerpt = str_replace( $tags, $replacements, $excerpt );
+					$excerpt = esc_html( strip_tags( $excerpt ) );
 					$excerpt = str_replace( $replacements, $tags, $excerpt );
 
 					echo wpautop( $excerpt );
-                ?></div>
+				?></div>
             </div>
         </div>
 		<?php
 	}
 
 	/**
-     * Generates details array for the download to keep the render_download() method a bit tidier
-     *
+	 * Generates details array for the download to keep the render_download() method a bit tidier
+	 *
 	 * @param array $download Single download, as returned by {@see get_downloads_data}
 	 * @param array $wp_plugins All active plugins, as returned by {@see get_plugins()}
 	 *
 	 * @return array {
-     *   @type array $download_info
-     *   @type string $plugin_path
-     *   @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc)
-     *   @type string $status_label
-     *   @type string $button_title Title attribute to show when hovering over the download's button
-     *   @type string $button_class CSS class to use for the button
-     *   @type string $button_label Text to use for the download's anchor link
-     *   @type string $href URL for the download's button
-     *   @type bool   $spinner Whether to show the spinner icon
-     *   @type string $item_class CSS class for the download container
-     *   @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions")
-     *   @type bool   $is_active Is the current GravityView license (as entered in Settings) active?
-     * }
+	 *   @type array $download_info
+	 *   @type string $plugin_path
+	 *   @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc)
+	 *   @type string $status_label
+	 *   @type string $button_title Title attribute to show when hovering over the download's button
+	 *   @type string $button_class CSS class to use for the button
+	 *   @type string $button_label Text to use for the download's anchor link
+	 *   @type string $href URL for the download's button
+	 *   @type bool   $spinner Whether to show the spinner icon
+	 *   @type string $item_class CSS class for the download container
+	 *   @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions")
+	 *   @type bool   $is_active Is the current GravityView license (as entered in Settings) active?
+	 * }
 	 */
 	private function get_download_display_details( $download, $wp_plugins ) {
 
@@ -409,7 +409,7 @@ 
 			'slug' => '',
 			'excerpt' => '',
 			'link' => '',
-            'coming_soon' => false,
+			'coming_soon' => false,
 			'installer_title' => null, // May not be defined
 			'installer_excerpt' => null, // May not be defined
 		) );
@@ -451,14 +451,14 @@ 
 			$href         = 'https://gravityview.co/pricing/?utm_source=admin-installer&utm_medium=admin&utm_campaign=Admin%20Notice&utm_content=' . $required_license;
 		}
 
-        elseif ( ! empty( $download_info['coming_soon'] ) ) {
-	        $spinner      = false;
-	        $status       = 'notinstalled';
-	        $status_label = __( 'Coming Soon', 'gravityview' );
-	        $button_label = __( 'Learn More', 'gravityview' );
-	        $button_class = 'button-primary button-large';
-	        $href         = \GV\Utils::get( $download_info, 'link', 'https://gravityview.co/extensions/' );
-        }
+		elseif ( ! empty( $download_info['coming_soon'] ) ) {
+			$spinner      = false;
+			$status       = 'notinstalled';
+			$status_label = __( 'Coming Soon', 'gravityview' );
+			$button_label = __( 'Learn More', 'gravityview' );
+			$button_class = 'button-primary button-large';
+			$href         = \GV\Utils::get( $download_info, 'link', 'https://gravityview.co/extensions/' );
+		}
 
 		// Access but the plugin is not installed
 		elseif ( ! $wp_plugin ) {
@@ -498,18 +498,18 @@ 
 		}
 
 		return compact( 'download_info','plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' );
-    }
+	}
 
 	/**
-     * Returns the base price for an extension
-     *
+	 * Returns the base price for an extension
+	 *
 	 * @param array $download
 	 *
 	 * @return float Base price for an extension. If not for sale separately, returns 0
 	 */
 	private function get_download_base_price( $download ) {
 
-	    $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 );
+		$base_price = \GV\Utils::get( $download, 'pricing/amount', 0 );
 		$base_price = \GFCommon::to_number( $base_price );
 
 		unset( $download['pricing']['amount'] );
@@ -520,7 +520,7 @@ 
 		}
 
 		return floatval( $base_price );
-    }
+	}
 
 	/**
 	 * Handle AJAX request to activate extension
@@ -538,8 +538,8 @@ 
 
 		if ( is_wp_error( $result ) || ! is_plugin_active( $data['path'] ) ) {
 			wp_send_json_error( array(
-                'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() )
-            ) );
+				'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() )
+			) );
 		}
 
 		wp_send_json_success();
@@ -560,10 +560,10 @@ 
 		deactivate_plugins( $data['path'] );
 
 		if( is_plugin_active( $data['path'] ) ) {
-            wp_send_json_error( array(
-                'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) )
-            ) );
-        }
+			wp_send_json_error( array(
+				'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) )
+			) );
+		}
 
 		wp_send_json_success();
 	}

Spacing +47 added lines, -47 removed lines

@@ -53,7 +53,7 @@ 
 	 */
 	public function register_noconflict( $items ) {
 
-		$items[] = 'gravityview-admin-installer';
+		$items[ ] = 'gravityview-admin-installer';
 
 		return $items;
 	}
@@ -72,17 +72,17 @@ 
 			return;
 		}
 
-		add_filter( 'plugins_api', function ( $data, $action, $args ) use ( $downloads_data ) {
+		add_filter( 'plugins_api', function( $data, $action, $args ) use ( $downloads_data ) {
 			foreach ( $downloads_data as $extension ) {
-				if ( empty( $extension['info'] ) || empty( $args->slug ) || $args->slug !== $extension['info']['slug'] ) {
+				if ( empty( $extension[ 'info' ] ) || empty( $args->slug ) || $args->slug !== $extension[ 'info' ][ 'slug' ] ) {
 					continue;
 				}
 
-				return (object) array(
-					'slug'          => $extension['info']['slug'],
-					'name'          => $extension['info']['title'],
-					'version'       => $extension['licensing']['version'],
-					'download_link' => $extension['files'][0]['file'],
+				return (object)array(
+					'slug'          => $extension[ 'info' ][ 'slug' ],
+					'name'          => $extension[ 'info' ][ 'title' ],
+					'version'       => $extension[ 'licensing' ][ 'version' ],
+					'download_link' => $extension[ 'files' ][ 0 ][ 'file' ],
 				);
 			}
 
@@ -144,13 +144,13 @@ 
 
 		foreach ( $all_plugins as $path => $plugin ) {
 
-			if ( empty( $plugin['TextDomain'] ) ) {
+			if ( empty( $plugin[ 'TextDomain' ] ) ) {
 				continue;
 			}
 
-			$wp_plugins[ $plugin['TextDomain'] ] = array(
+			$wp_plugins[ $plugin[ 'TextDomain' ] ] = array(
 				'path'      => $path,
-				'version'   => $plugin['Version'],
+				'version'   => $plugin[ 'Version' ],
 				'activated' => is_plugin_active( $path )
 			);
 		}
@@ -232,13 +232,13 @@ 
 
 		$downloads_data = json_decode( wp_remote_retrieve_body( $response ), true );
 
-		if ( empty( $downloads_data['products'] ) ) {
+		if ( empty( $downloads_data[ 'products' ] ) ) {
 			return array();
 		}
 
-		$this->set_downloads_data( $downloads_data['products'] );
+		$this->set_downloads_data( $downloads_data[ 'products' ] );
 
-		return $downloads_data['products'];
+		return $downloads_data[ 'products' ];
 	}
 
 	/**
@@ -311,7 +311,7 @@ 
 
 				foreach ( $downloads_data as $extension ) {
 
-					if ( empty( $extension['info'] ) ) {
+					if ( empty( $extension[ 'info' ] ) ) {
 						continue;
 					}
 
@@ -340,29 +340,29 @@ 
 
         $details = $this->get_download_display_details( $download, $wp_plugins );
 
-        $download_info = $details['download_info'];
+        $download_info = $details[ 'download_info' ];
 
 		?>
-        <div class="item <?php echo esc_attr( $details['item_class'] ); ?>">
+        <div class="item <?php echo esc_attr( $details[ 'item_class' ] ); ?>">
             <div class="addon-inner">
-                <a href="<?php echo esc_url( $download_info['link'] ); ?>" rel="external noreferrer noopener" title="<?php esc_html_e( 'Visit the plugin page', 'gravityview' ); ?>"><img class="thumbnail" src="<?php echo esc_attr( $download_info['thumbnail'] ); ?>" alt="" /></a>
-                <h3><?php echo esc_html( \GV\Utils::get( $download_info, 'installer_title', $download_info['title'] ) ); ?></h3>
+                <a href="<?php echo esc_url( $download_info[ 'link' ] ); ?>" rel="external noreferrer noopener" title="<?php esc_html_e( 'Visit the plugin page', 'gravityview' ); ?>"><img class="thumbnail" src="<?php echo esc_attr( $download_info[ 'thumbnail' ] ); ?>" alt="" /></a>
+                <h3><?php echo esc_html( \GV\Utils::get( $download_info, 'installer_title', $download_info[ 'title' ] ) ); ?></h3>
                 <div>
-                    <?php if( $details['status_label'] ) { ?>
-                    <div class="status <?php echo esc_attr( $details['status'] ); ?>" title="<?php printf( esc_attr__( 'Plugin status: %s', 'gravityview' ), esc_html( $details['status_label'] ) ); ?>">
-                        <span class="dashicons dashicons-admin-plugins"></span> <span class="status-label"><?php echo esc_html( $details['status_label'] ); ?></span>
+                    <?php if ( $details[ 'status_label' ] ) { ?>
+                    <div class="status <?php echo esc_attr( $details[ 'status' ] ); ?>" title="<?php printf( esc_attr__( 'Plugin status: %s', 'gravityview' ), esc_html( $details[ 'status_label' ] ) ); ?>">
+                        <span class="dashicons dashicons-admin-plugins"></span> <span class="status-label"><?php echo esc_html( $details[ 'status_label' ] ); ?></span>
                     </div>
 			        <?php } ?>
 
-                    <a data-status="<?php echo esc_attr( $details['status'] ); ?>" data-plugin-path="<?php echo esc_attr( $details['plugin_path'] ); ?>" href="<?php echo esc_url( $details['href'] ); ?>" class="button <?php echo esc_attr( $details['button_class'] ); ?>" title="<?php echo esc_attr( $details['button_title'] ); ?>">
-                        <span class="title"><?php echo esc_html( $details['button_label'] ); ?></span>
-                        <?php if( $details['spinner'] ) { ?><span class="spinner"></span><?php } ?>
+                    <a data-status="<?php echo esc_attr( $details[ 'status' ] ); ?>" data-plugin-path="<?php echo esc_attr( $details[ 'plugin_path' ] ); ?>" href="<?php echo esc_url( $details[ 'href' ] ); ?>" class="button <?php echo esc_attr( $details[ 'button_class' ] ); ?>" title="<?php echo esc_attr( $details[ 'button_title' ] ); ?>">
+                        <span class="title"><?php echo esc_html( $details[ 'button_label' ] ); ?></span>
+                        <?php if ( $details[ 'spinner' ] ) { ?><span class="spinner"></span><?php } ?>
                     </a>
                 </div>
 
                 <div class="addon-excerpt"><?php
 
-                    $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] );
+                    $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info[ 'excerpt' ] );
 
                     // Allow some pure HTML tags, but remove everything else from the excerpt.
                     $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' );
@@ -402,7 +402,7 @@ 
 	 */
 	private function get_download_display_details( $download, $wp_plugins ) {
 
-		$download_info = wp_parse_args( (array) $download['info'], array(
+		$download_info = wp_parse_args( (array)$download[ 'info' ], array(
 			'thumbnail' => '',
 			'title' => '',
 			'textdomain' => '',
@@ -414,9 +414,9 @@ 
 			'installer_excerpt' => null, // May not be defined
 		) );
 
-		$wp_plugin = \GV\Utils::get( $wp_plugins, $download_info['textdomain'], false );
+		$wp_plugin = \GV\Utils::get( $wp_plugins, $download_info[ 'textdomain' ], false );
 
-		$has_access = ! empty( $download['files'] );
+		$has_access = ! empty( $download[ 'files' ] );
 		$spinner = true;
 		$href = $plugin_path = '#';
 		$status = $item_class = $button_title = $button_class = '';
@@ -426,7 +426,7 @@ 
 		$required_license = $galactic_only ? __( 'All Access', 'gravityview' ) : __( 'Core + Extensions', 'gravityview' );
 
 		// The license is not active - no matter what level, this should not work
-		if( ! $is_active  && empty( $base_price ) ) {
+		if ( ! $is_active && empty( $base_price ) ) {
 			$spinner      = false;
 			$button_class = 'disabled disabled-license';
 			$button_label = sprintf( __( 'Active %s License is Required.', 'gravityview' ), $required_license );
@@ -438,7 +438,7 @@ 
 			$status_label = '';
 			$button_label = sprintf( __( 'Purchase Now for %s', 'gravityview' ), '$' . $base_price );
 			$button_class = 'button-primary button-large';
-			$href         = $download_info['link'];
+			$href         = $download_info[ 'link' ];
 			$item_class   = 'featured';
 		}
 
@@ -451,7 +451,7 @@ 
 			$href         = 'https://gravityview.co/pricing/?utm_source=admin-installer&utm_medium=admin&utm_campaign=Admin%20Notice&utm_content=' . $required_license;
 		}
 
-        elseif ( ! empty( $download_info['coming_soon'] ) ) {
+        elseif ( ! empty( $download_info[ 'coming_soon' ] ) ) {
 	        $spinner      = false;
 	        $status       = 'notinstalled';
 	        $status_label = __( 'Coming Soon', 'gravityview' );
@@ -466,8 +466,8 @@ 
 			$href = add_query_arg(
 				array(
 					'action'   => 'install-plugin',
-					'plugin'   => $download_info['slug'],
-					'_wpnonce' => wp_create_nonce( 'install-plugin_' . $download_info['slug'] ),
+					'plugin'   => $download_info[ 'slug' ],
+					'_wpnonce' => wp_create_nonce( 'install-plugin_' . $download_info[ 'slug' ] ),
 				),
 				self_admin_url( 'update.php' )
 			);
@@ -479,25 +479,25 @@ 
 		}
 
 		// Access and the plugin is installed but not active
-		elseif ( false === $wp_plugin['activated'] ) {
+		elseif ( false === $wp_plugin[ 'activated' ] ) {
 			$status = 'inactive';
 			$status_label = __( 'Inactive', 'gravityview' );
 			$button_label = __( 'Activate', 'gravityview' );
-			$plugin_path = $wp_plugin['path'];
+			$plugin_path = $wp_plugin[ 'path' ];
 
 		}
 
 		// Access and the plugin is installed and active
 		else {
 
-			$plugin_path = $wp_plugin['path'];
+			$plugin_path = $wp_plugin[ 'path' ];
 			$status = 'active';
 			$status_label = __( 'Active', 'gravityview' );
 			$button_label = __( 'Deactivate', 'gravityview' );
 
 		}
 
-		return compact( 'download_info','plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' );
+		return compact( 'download_info', 'plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' );
     }
 
 	/**
@@ -512,11 +512,11 @@ 
 	    $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 );
 		$base_price = \GFCommon::to_number( $base_price );
 
-		unset( $download['pricing']['amount'] );
+		unset( $download[ 'pricing' ][ 'amount' ] );
 
 		// Price options array, not single price
-		if ( ! $base_price && ! empty( $download['pricing'] ) ) {
-			$base_price = array_shift( $download['pricing'] );
+		if ( ! $base_price && ! empty( $download[ 'pricing' ] ) ) {
+			$base_price = array_shift( $download[ 'pricing' ] );
 		}
 
 		return floatval( $base_price );
@@ -530,13 +530,13 @@ 
 	public function activate_download() {
 		$data = \GV\Utils::_POST( 'data', array() );
 
-		if ( empty( $data['path'] ) ) {
+		if ( empty( $data[ 'path' ] ) ) {
 			return;
 		}
 
-		$result = activate_plugin( $data['path'] );
+		$result = activate_plugin( $data[ 'path' ] );
 
-		if ( is_wp_error( $result ) || ! is_plugin_active( $data['path'] ) ) {
+		if ( is_wp_error( $result ) || ! is_plugin_active( $data[ 'path' ] ) ) {
 			wp_send_json_error( array(
                 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() )
             ) );
@@ -553,13 +553,13 @@ 
 	public function deactivate_download() {
 		$data = \GV\Utils::_POST( 'data', array() );
 
-		if ( empty( $data['path'] ) ) {
+		if ( empty( $data[ 'path' ] ) ) {
 			return;
 		}
 
-		deactivate_plugins( $data['path'] );
+		deactivate_plugins( $data[ 'path' ] );
 
-		if( is_plugin_active( $data['path'] ) ) {
+		if ( is_plugin_active( $data[ 'path' ] ) ) {
             wp_send_json_error( array(
                 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) )
             ) );

Braces +1 added lines, -3 removed lines

@@ -449,9 +449,7 @@
 			$button_label = sprintf( __( 'Upgrade to %s for Access', 'gravityview' ), $required_license );
 			$button_class = 'button-primary button-large';
 			$href         = 'https://gravityview.co/pricing/?utm_source=admin-installer&utm_medium=admin&utm_campaign=Admin%20Notice&utm_content=' . $required_license;
-		}
-
-        elseif ( ! empty( $download_info['coming_soon'] ) ) {
+		} elseif ( ! empty( $download_info['coming_soon'] ) ) {
 	        $spinner      = false;
 	        $status       = 'notinstalled';
 	        $status_label = __( 'Coming Soon', 'gravityview' );

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

Indentation +121 added lines, -121 removed lines

@@ -134,28 +134,28 @@ 
 	 */
 	public function add_network_menu() {
 
-	    if ( ! gravityview()->plugin->is_network_activated() ) {
+		if ( ! gravityview()->plugin->is_network_activated() ) {
 			return;
 		}
 
-        add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", array( $this, 'app_tab_page' ), 'none' );
+		add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", array( $this, 'app_tab_page' ), 'none' );
 	}
 
 	/**
-     * 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;
@@ -185,42 +185,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() {
@@ -300,7 +300,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' ) );
 				}
@@ -394,12 +394,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
@@ -484,7 +484,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() );
 	}
 
 	/**
@@ -553,8 +553,8 @@ 
                     type="' . $field['type'] . '"
                     name="' . esc_attr( $name ) . '"
                     value="' . $value . '" ' .
-		        implode( ' ', $attributes ) .
-		        ' />';
+				implode( ' ', $attributes ) .
+				' />';
 
 		if ( $echo ) {
 			echo $html;
@@ -572,12 +572,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() {
@@ -591,16 +591,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' );
 
@@ -617,7 +617,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' );
@@ -655,13 +655,13 @@ 
 			return;
 		}
 
-        \GravityView_Admin_Notices::add_notice( array(
-            'message' => $message,
-            'class'   => 'notice notice-warning',
-            'title'   => $title,
-            'cap'     => 'gravityview_edit_settings',
-            'dismiss' => sha1( $license_status . '_' . $license_id . '_' . date( 'z' ) ), // Show every day, instead of every 8 weeks (which is the default)
-        ) );
+		\GravityView_Admin_Notices::add_notice( array(
+			'message' => $message,
+			'class'   => 'notice notice-warning',
+			'title'   => $title,
+			'cap'     => 'gravityview_edit_settings',
+			'dismiss' => sha1( $license_status . '_' . $license_id . '_' . date( 'z' ) ), // Show every day, instead of every 8 weeks (which is the default)
+		) );
 	}
 
 	/**
@@ -675,12 +675,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() {
@@ -689,10 +689,10 @@ 
 		$scripts[] = array(
 			'handle'  => 'gform_tooltip_init',
 			'enqueue' => array(
-                array(
-			        'admin_page' => array( 'app_settings' )
-                )
-            )
+				array(
+					'admin_page' => array( 'app_settings' )
+				)
+			)
 		);
 
 		return $scripts;
@@ -710,10 +710,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(
@@ -881,7 +881,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' ),
@@ -919,38 +919,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 ) ) {
@@ -963,13 +963,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;
 	}
@@ -1023,9 +1023,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 );
 
@@ -1042,9 +1042,9 @@ 
 
 	/**
 	 * Allow pure HTML settings row
-     *
-     * @since 2.0.6
-     *
+	 *
+	 * @since 2.0.6
+	 *
 	 * @param array $field
 	 * @param bool $echo Whether to echo the
 	 *
@@ -1110,19 +1110,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

@@ -102,7 +102,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;
 	}
 
@@ -308,15 +308,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++;
 					}
 					?>
@@ -533,15 +533,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' );
@@ -550,7 +550,7 @@ 
 		$attributes = $this->get_field_attributes( $field );
 
 		$html = '<input
-                    type="' . $field['type'] . '"
+                    type="' . $field[ 'type' ] . '"
                     name="' . esc_attr( $name ) . '"
                     value="' . $value . '" ' .
 		        implode( ' ', $attributes ) .
@@ -581,7 +581,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' ] );
 	}
 
 	/**
@@ -591,7 +591,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' );
@@ -612,7 +612,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' );
@@ -642,7 +642,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' ) ) {
@@ -686,7 +686,7 @@ 
 	public function scripts() {
 		$scripts = parent::scripts();
 
-		$scripts[] = array(
+		$scripts[ ] = array(
 			'handle'  => 'gform_tooltip_init',
 			'enqueue' => array(
                 array(
@@ -705,7 +705,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,
@@ -736,7 +736,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.
@@ -784,26 +784,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',
@@ -815,7 +815,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(
@@ -834,7 +834,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(
@@ -856,7 +856,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(
@@ -875,7 +875,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(
@@ -908,17 +908,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' ] );
             }
 		}
 
@@ -936,7 +936,7 @@ 
         );
 
 		if ( $disabled_attribute ) {
-			$button['disabled'] = $disabled_attribute;
+			$button[ 'disabled' ] = $disabled_attribute;
 		}
 
         /**
@@ -955,20 +955,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;
@@ -1024,7 +1024,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 );
@@ -1073,7 +1073,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>
@@ -1091,10 +1091,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 );
 
@@ -1125,8 +1125,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 );
 	}
 
@@ -1138,7 +1138,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>';
 		}
 	}
 
@@ -1175,9 +1175,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;
 	}

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

Spacing +2 added lines, -2 removed lines

@@ -132,7 +132,7 @@ 
 
 		$format = '(?:\.(?P<format>html|json))?';
 
-		register_rest_route( $namespace, sprintf( '/%s/(?P<id>[\d]+)/%s/(?P<s_id>[\w-]+)%s', $base, $sub_type, $format ) , array(
+		register_rest_route( $namespace, sprintf( '/%s/(?P<id>[\d]+)/%s/(?P<s_id>[\w-]+)%s', $base, $sub_type, $format ), array(
 			array(
 				'methods'         => \WP_REST_Server::READABLE,
 				'callback'        => array( $this, 'get_sub_item' ),
@@ -383,7 +383,7 @@ 
 	 * @return \WP_REST_Response
 	 */
 	protected function not_implemented(  ) {
-		$error = new \WP_Error( 'not-implemented-yet', __( 'Endpoint Not Yet Implemented.', 'gravityview' )  );
+		$error = new \WP_Error( 'not-implemented-yet', __( 'Endpoint Not Yet Implemented.', 'gravityview' ) );
 		return new \WP_REST_Response( $error, 501 );
 	}
 

includes/class-gravityview-shortcode.php

Spacing +10 added lines, -10 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,14 +102,14 @@ 
 				 * @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;
 
 				/** @since 2.1 */
 				case 'operator':
-					if( GFFormsModel::is_valid_operator( $passed_value ) ) {
+					if ( GFFormsModel::is_valid_operator( $passed_value ) ) {
 						$atts[ $key ] = $passed_value;
 					}
 					break;
@@ -124,8 +124,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;
@@ -154,7 +154,7 @@ 
 		$gravityview_view = GravityView_View::getInstance();
 		$return = '';
 
-		switch( $detail ) {
+		switch ( $detail ) {
 			case 'total_entries':
 				$return = number_format_i18n( $gravityview_view->getTotalEntries() );
 				break;

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

Spacing +5 added lines, -5 removed lines

@@ -57,13 +57,13 @@
 		$hide_empty = apply_filters( 'gravityview/render/hide-empty-zone', Utils::get( $extras, 'hide_empty', $this->view->settings->get( 'hide_empty', false ) ), $context );
 
 		if ( is_numeric( $field->ID ) ) {
-			$extras['field'] = $field->as_configuration();
+			$extras[ 'field' ] = $field->as_configuration();
 		}
 
-		$extras['entry'] = $this->entry->as_entry();
-		$extras['hide_empty'] = $hide_empty;
-		$extras['label'] = $label;
-		$extras['value'] = $value;
+		$extras[ 'entry' ] = $this->entry->as_entry();
+		$extras[ 'hide_empty' ] = $hide_empty;
+		$extras[ 'label' ] = $label;
+		$extras[ 'value' ] = $value;
 
 		return \gravityview_field_output( $extras, $context );
 	}