gravityview / GravityView

future/includes/class-gv-license-handler.php

Spacing +65 added lines, -65 removed lines

@@ -106,7 +106,7 @@ 
 		);
 
 		if ( ! empty( $action ) ) {
-			$settings['edd_action'] = esc_attr( $action );
+			$settings[ 'edd_action' ] = esc_attr( $action );
 		}
 
 		return array_map( 'urlencode', $settings );
@@ -126,7 +126,7 @@ 
 		}
 
 		// If doing ajax, get outta here.
-		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST('action') ) )  {
+		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST( 'action' ) ) ) {
 			return;
 		}
 
@@ -173,7 +173,7 @@ 
 			'format' => 'json',
 		) );
 
-		if ( $is_ajax && empty( $data['license'] ) ) {
+		if ( $is_ajax && empty( $data[ 'license' ] ) ) {
 			die( -1 );
 		}
 
@@ -201,11 +201,11 @@ 
 
 			$json = json_encode( $license_data );
 
-			$update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST('action');
+			$update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST( 'action' );
 
 			$is_check_action_button = ( 'check_license' === Utils::get( $data, 'edd_action' ) && defined( 'DOING_AJAX' ) && DOING_AJAX );
 
-			do_action('gravityview/admin_installer/delete_downloads_data', true );
+			do_action( 'gravityview/admin_installer/delete_downloads_data', true );
 
 			if ( $is_check_action_button ) {
 				delete_transient( self::status_transient_key );
@@ -216,7 +216,7 @@ 
 			// most likely a mistake.
 			} else if ( $license_data->license !== 'failed' && $update_license ) {
 
-				if ( ! empty( $data['field_id'] ) ) {
+				if ( ! empty( $data[ 'field_id' ] ) ) {
 					set_transient( self::status_transient_key, $license_data, DAY_IN_SECONDS );
 				}
 
@@ -244,7 +244,7 @@ 
 			$class   = 'hide';
 			$message = '';
 		} else {
-			if( ! empty( $license_data->error ) ) {
+			if ( ! empty( $license_data->error ) ) {
 				$class = 'error';
 				$string_key = $license_data->error;
 			} else { $class = $license_data->license;
@@ -268,12 +268,12 @@ 
 	 */
 	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>' . rtrim( esc_html__( 'License Details:', 'gravityview' ), ':' ) . '</h3>';
 
 			if ( in_array( Utils::get( $response, 'license' ), array( 'invalid', 'deactivated' ) ) ) {
@@ -282,8 +282,8 @@ 
 				}
 
 
-				$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'   => '',
 					'license_limit'  => '',
@@ -298,22 +298,22 @@ 
 				$response = wp_parse_args( $response, $response_keys );
 
 				$login_link_class = gravityview()->plugin->is_GF_25() ? 'button button-outline outline' : 'text-link';
-				$renews_on = ( 'lifetime' === $response['expires'] ) ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response['expires'] ) - DAY_IN_SECONDS ) );
-				$login_link       = sprintf( '<a href="%s" class="gv-access-account ' . $login_link_class . '" rel="external">%s</a>', esc_url( sprintf( 'https://www.gravitykit.com/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>' : '' );
-				$license_limit    = empty( $response['license_limit'] ) ? __( 'Unlimited', 'gravityview' ) : (int) $response['license_limit'];
+				$renews_on = ( 'lifetime' === $response[ 'expires' ] ) ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response[ 'expires' ] ) - DAY_IN_SECONDS ) );
+				$login_link       = sprintf( '<a href="%s" class="gv-access-account ' . $login_link_class . '" rel="external">%s</a>', esc_url( sprintf( 'https://www.gravitykit.com/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>' : '' );
+				$license_limit    = empty( $response[ 'license_limit' ] ) ? __( 'Unlimited', 'gravityview' ) : (int)$response[ 'license_limit' ];
 
 
 				$details = array(
-					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), '<span class="gv-license-detail">' . esc_html( $response['license_name'] ) . '</span>' ),
-					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), '<span class="gv-license-detail">' . esc_html__( $response['customer_name'], 'gravityview' ), esc_html__( $response['customer_email'], 'gravityview' ) ) . '</span>' . $renews_on . $login_link,
-					'activations' => sprintf( str_replace( '%d', '%s', esc_html__( 'Activations: %d of %s sites', 'gravityview' ) ), '<span class="gv-license-detail">' . intval( $response['site_count'] ), esc_html( $license_limit ) ) . '</span>' . $local_text,
-					'upgrade'     => $this->get_upgrade_html( $response['upgrades'] ),
+					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), '<span class="gv-license-detail">' . esc_html( $response[ 'license_name' ] ) . '</span>' ),
+					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), '<span class="gv-license-detail">' . esc_html__( $response[ 'customer_name' ], 'gravityview' ), esc_html__( $response[ 'customer_email' ], 'gravityview' ) ) . '</span>' . $renews_on . $login_link,
+					'activations' => sprintf( str_replace( '%d', '%s', esc_html__( 'Activations: %d of %s sites', 'gravityview' ) ), '<span class="gv-license-detail">' . intval( $response[ 'site_count' ] ), esc_html( $license_limit ) ) . '</span>' . $local_text,
+					'upgrade'     => $this->get_upgrade_html( $response[ 'upgrades' ] ),
 				);
 
-				if ( ! empty( $response['error'] ) && 'expired' === $response['error'] ) {
-					unset( $details['upgrade'] );
-					$details['licensed_to'] .= '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
+				if ( ! empty( $response[ 'error' ] ) && 'expired' === $response[ 'error' ] ) {
+					unset( $details[ 'upgrade' ] );
+					$details[ 'licensed_to' ] .= '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
 				}
 
 				$return .= '<ul>';
@@ -345,20 +345,20 @@ 
 		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>';
 			$output .= '<ul>';
 
 			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 ) ) {
 					$message = esc_html( $upgrade->description );
 				} else {
-					switch( $upgrade->price_id ) {
+					switch ( $upgrade->price_id ) {
 						// Interstellar
 						case 1:
 						default:
@@ -437,7 +437,7 @@ 
 			'invalid_item_id' => esc_html__( 'This license key does not have access to this plugin.', 'gravityview' ),
 			'missing' => esc_html__( 'The license key entered is invalid.', 'gravityview' ), // Missing is "the license couldn't be found", not "you submitted an empty license"
 			'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>' ),
+			'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' ),
@@ -465,7 +465,7 @@ 
 
 		if ( ! empty( $license_data->renewal_url ) ) {
 			$renew_license_url = $license_data->renewal_url;
-		} elseif( ! empty( $license_data->license_key ) ) {
+		} elseif ( ! empty( $license_data->license_key ) ) {
 			$renew_license_url = sprintf( 'https://www.gravitykit.com/checkout/?download_id=17&edd_license_key=%s', $license_data->license_key );
 		} else {
 			$renew_license_url = 'https://www.gravitykit.com/account/';
@@ -482,7 +482,7 @@ 
 	 * @return array|\WP_Error
 	 */
 	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 );
 
@@ -522,9 +522,9 @@ 
 	private function license_call_update_settings( $license_data, $data ) {
 		$settings = array();
 
-        $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->settings->set( $settings );
 	}
@@ -544,9 +544,9 @@ 
 		$status = trim( $this->settings->get( 'license_key_status' ) );
 		$key = trim( $this->settings->get( 'license_key' ) );
 
-		if (  !empty( $key ) ) {
+		if ( ! empty( $key ) ) {
 			$response = $this->settings->get( 'license_key_response' );
-			$response = is_array( $response ) ? (object) $response : json_decode( $response );
+			$response = is_array( $response ) ? (object)$response : json_decode( $response );
 		} else {
 			$response = array();
 		}
@@ -589,11 +589,11 @@ 
 
 		$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->settings->as_html( $field, $echo );
 		}
@@ -671,7 +671,7 @@ 
 				    'url'        => home_url(),
 				    'site_data'  => $this->get_site_data(),
 			    ),
-			));
+			) );
 
 			// make sure the response came back okay
 			if ( is_wp_error( $response ) ) {
@@ -701,45 +701,45 @@ 
 		$theme_data = wp_get_theme();
 		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
 
-		$data['gv_version']  = Plugin::$version;
-		$data['php_version']  = phpversion();
-		$data['wp_version']   = get_bloginfo( 'version' );
-		$data['gf_version']  = \GFForms::$version;
-		$data['server']       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
-		$data['multisite']    = is_multisite();
-		$data['theme']        = $theme;
-		$data['url']          = home_url();
-		$data['license_key']  = $this->settings->get( 'license_key' );
-		$data['beta']         = $this->settings->get( 'beta' );
+		$data[ 'gv_version' ]  = Plugin::$version;
+		$data[ 'php_version' ]  = phpversion();
+		$data[ 'wp_version' ]   = get_bloginfo( 'version' );
+		$data[ 'gf_version' ]  = \GFForms::$version;
+		$data[ 'server' ]       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
+		$data[ 'multisite' ]    = is_multisite();
+		$data[ 'theme' ]        = $theme;
+		$data[ 'url' ]          = home_url();
+		$data[ 'license_key' ]  = $this->settings->get( 'license_key' );
+		$data[ 'beta' ]         = $this->settings->get( 'beta' );
 
 		// View Data
 		$gravityview_posts = wp_count_posts( 'gravityview', 'readable' );
 
-		$data['view_count'] = null;
-		$data['view_first'] = null;
-		$data['view_latest'] = null;
+		$data[ 'view_count' ] = null;
+		$data[ 'view_first' ] = null;
+		$data[ 'view_latest' ] = null;
 
 		if ( $gravityview_posts->publish ) {
-			$data['view_count'] = $gravityview_posts->publish;
+			$data[ 'view_count' ] = $gravityview_posts->publish;
 
 			$first = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=ASC' );
 			$latest = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=DESC' );
 
 			if ( $first = array_shift( $first ) ) {
-				$data['view_first'] = $first->post_date;
+				$data[ 'view_first' ] = $first->post_date;
 			}
 			if ( $latest = array_pop( $latest ) ) {
-				$data['view_latest'] = $latest->post_date;
+				$data[ 'view_latest' ] = $latest->post_date;
 			}
 		}
 
 		// Form counts
 		if ( class_exists( 'GFFormsModel' ) ) {
 			$form_data = \GFFormsModel::get_form_count();
-			$data['forms_total'] = Utils::get( $form_data, 'total', 0 );
-			$data['forms_active'] = Utils::get( $form_data, 'active', 0 );
-			$data['forms_inactive'] = Utils::get( $form_data, 'inactive', 0 );
-			$data['forms_trash'] = Utils::get( $form_data, 'inactive', 0 );
+			$data[ 'forms_total' ] = Utils::get( $form_data, 'total', 0 );
+			$data[ 'forms_active' ] = Utils::get( $form_data, 'active', 0 );
+			$data[ 'forms_inactive' ] = Utils::get( $form_data, 'inactive', 0 );
+			$data[ 'forms_trash' ] = Utils::get( $form_data, 'inactive', 0 );
 		}
 
 		// Retrieve current plugin information
@@ -747,13 +747,13 @@ 
 			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;
 	}
@@ -783,7 +783,7 @@ 
 
 				$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 ) ) {

includes/admin/metaboxes/views/select-template.php

Spacing +22 added lines, -22 removed lines

@@ -26,52 +26,52 @@
 
 <?php // list all the available templates (type= fresh or custom ) ?>
 <div class="gv-grid">
-	<?php foreach( $templates as $id => $template ) {
+	<?php foreach ( $templates as $id => $template ) {
 		$selected     = ( $id == $current_template ) ? ' gv-selected' : '';
-		$placeholder  = ! empty( $template['buy_source'] );
-		$is_included  = ! empty( $template['included'] );
+		$placeholder  = ! empty( $template[ 'buy_source' ] );
+		$is_included  = ! empty( $template[ 'included' ] );
 		$plugin_data  = GravityView_Admin_Installer::get_wp_plugins_data( \GV\Utils::get( $template, 'textdomain', '' ) );
 		$button_text  = empty( $plugin_data ) ? esc_html__( 'Install Layout', 'gravityview' ) : esc_html__( 'Activate & Select Layout', 'gravityview' );
 		$button_class = 'gv-layout-' . ( empty( $plugin_data ) ? 'install' : 'activate' );
-		$template_path = isset($plugin_data['path']) ? $plugin_data['path'] : '';
+		$template_path = isset( $plugin_data[ 'path' ] ) ? $plugin_data[ 'path' ] : '';
 
 		?>
 		<div class="gv-grid-col-1-4">
-			<div class="gv-view-types-module<?php echo $selected; if( $placeholder ) { echo ' gv-view-template-placeholder'; } ?>" data-filter="<?php echo esc_attr( $template['type'] ); ?>">
+			<div class="gv-view-types-module<?php echo $selected; if ( $placeholder ) { echo ' gv-view-template-placeholder'; } ?>" data-filter="<?php echo esc_attr( $template[ 'type' ] ); ?>">
 				<div class="gv-view-types-normal">
-					<img src="<?php echo esc_url( $template['logo'] ); ?>" alt="<?php echo esc_attr( $template['label'] ); ?>">
-					<h5><?php echo esc_html( $template['label'] ); ?></h5>
-					<p class="description"><?php echo esc_html( $template['description'] ); ?></p>
+					<img src="<?php echo esc_url( $template[ 'logo' ] ); ?>" alt="<?php echo esc_attr( $template[ 'label' ] ); ?>">
+					<h5><?php echo esc_html( $template[ 'label' ] ); ?></h5>
+					<p class="description"><?php echo esc_html( $template[ 'description' ] ); ?></p>
 				</div>
 				<div class="gv-view-types-hover">
 					<div>
 						<?php
-						if( $is_included ) {
+						if ( $is_included ) {
 						?>
 							<p><a href="<?php echo esc_url( admin_url( 'edit.php?post_type=gravityview&page=gv-admin-installer' ) ); ?>" class="button button-secondary button-hero <?php echo $button_class; ?>" rel="internal" data-template-path="<?php echo $template_path; ?>"><?php echo $button_text; ?></a></p>
-							<?php if( !empty( $template['license'] ) ) { ?>
-								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), esc_html( str_replace( ' ', '&nbsp;', $template['license'] ) ) ); ?></p>
+							<?php if ( ! empty( $template[ 'license' ] ) ) { ?>
+								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), esc_html( str_replace( ' ', '&nbsp;', $template[ 'license' ] ) ) ); ?></p>
 							<?php } ?>
 						<?php
-						} elseif( $placeholder ) {
-							$utm_string = '?utm_source=plugin&utm_medium=buy_now&utm_campaign=view_type&utm_term=' . urlencode( $template['license'] ) . '&utm_content=' . urlencode( $template['slug'] );
+						} elseif ( $placeholder ) {
+							$utm_string = '?utm_source=plugin&utm_medium=buy_now&utm_campaign=view_type&utm_term=' . urlencode( $template[ 'license' ] ) . '&utm_content=' . urlencode( $template[ 'slug' ] );
 							?>
-							<p><a href="<?php echo esc_url( $template['buy_source'] ); ?>" class="button button-primary button-hero" rel="noreferrer noopener external"><?php esc_html_e( 'Buy Now', 'gravityview'); ?></a></p>
+							<p><a href="<?php echo esc_url( $template[ 'buy_source' ] ); ?>" class="button button-primary button-hero" rel="noreferrer noopener external"><?php esc_html_e( 'Buy Now', 'gravityview' ); ?></a></p>
 
-							<?php if( !empty( $template['preview'] ) ) { ?>
-								<p><a href="<?php echo esc_url( $template['preview'] ); ?>" rel="noreferrer noopener external" class="button button-secondary"><i class="dashicons dashicons-external" style="vertical-align: middle;" title="<?php esc_html_e( 'View a live demo of this layout', 'gravityview'); ?>"></i> <?php esc_html_e( 'Try a demo', 'gravityview' ); ?></a></p>
+							<?php if ( ! empty( $template[ 'preview' ] ) ) { ?>
+								<p><a href="<?php echo esc_url( $template[ 'preview' ] ); ?>" rel="noreferrer noopener external" class="button button-secondary"><i class="dashicons dashicons-external" style="vertical-align: middle;" title="<?php esc_html_e( 'View a live demo of this layout', 'gravityview' ); ?>"></i> <?php esc_html_e( 'Try a demo', 'gravityview' ); ?></a></p>
 							<?php } ?>
 
-							<?php if( ! empty( $template['license'] ) ) { ?>
-								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), '<a href="https://www.gravitykit.com/pricing/' . esc_attr( $utm_string ) . '" rel="noreferrer noopener external">' . esc_html( str_replace( ' ', '&nbsp;', $template['license'] ) ) . '</a>' ); ?></p>
+							<?php if ( ! empty( $template[ 'license' ] ) ) { ?>
+								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), '<a href="https://www.gravitykit.com/pricing/' . esc_attr( $utm_string ) . '" rel="noreferrer noopener external">' . esc_html( str_replace( ' ', '&nbsp;', $template[ 'license' ] ) ) . '</a>' ); ?></p>
 							<?php } ?>
 						<?php }
 
-						if ($placeholder || $is_included) { ?> </div><div class="hidden"> <?php } ?>
+						if ( $placeholder || $is_included ) { ?> </div><div class="hidden"> <?php } ?>
 
-                        <p><a href="#gv_select_template" role="button" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview'); ?></a></p>
-                        <?php if( !empty( $template['preview'] ) ) { ?>
-                            <a href="<?php echo esc_url( $template['preview'] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-welcome-view-site" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview'); ?>"></i></a>
+                        <p><a href="#gv_select_template" role="button" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview' ); ?></a></p>
+                        <?php if ( ! empty( $template[ 'preview' ] ) ) { ?>
+                            <a href="<?php echo esc_url( $template[ 'preview' ] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-welcome-view-site" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview' ); ?>"></i></a>
                         <?php } ?>
 					</div>
 				</div>

includes/class-gravityview-compatibility.php

Spacing +35 added lines, -35 removed lines

@@ -76,7 +76,7 @@ 
 	 * @return GravityView_Compatibility
 	 */
 	public static function getInstance() {
-		if( self::$instance ) {
+		if ( self::$instance ) {
 			return self::$instance;
 		}
 		return new self;
@@ -138,10 +138,10 @@ 
 		// If Gravity Forms doesn't exist or is outdated, load the admin view class to
 		// show the notice, but not load any post types or process shortcodes.
 		// Without Gravity Forms, there is no GravityView. Beautiful, really.
-		if( ! self::is_valid() ) {
+		if ( ! self::is_valid() ) {
 
 			// If the plugin's not loaded, might as well hide the shortcode for people.
-			add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice') );
+			add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice' ) );
 
 		}
 	}
@@ -167,15 +167,15 @@ 
 	 */
 	public function _shortcode_gf_notice( $atts = array(), $content = null, $shortcode = 'gravityview' ) {
 
-		if( ! GVCommon::has_cap( 'activate_plugins' ) ) {
+		if ( ! GVCommon::has_cap( 'activate_plugins' ) ) {
 			return null;
 		}
 
 		$notices = self::get_notices();
 
-		$message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>' . esc_html__( 'You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview') . '</em></p>';
-		foreach( (array)$notices as $notice ) {
-			$message .= wpautop( $notice['message'] );
+		$message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>' . esc_html__( 'You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview' ) . '</em></p>';
+		foreach ( (array)$notices as $notice ) {
+			$message .= wpautop( $notice[ 'message' ] );
 		}
 		$message .= '</div>';
 
@@ -195,9 +195,9 @@ 
 
 		if ( ! gravityview()->plugin->is_compatible_php() ) {
 
-			self::$notices['php_version'] = array(
+			self::$notices[ 'php_version' ] = array(
 				'class' => 'error',
-				'message' => sprintf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>' ),
+				'message' => sprintf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . phpversion() . '</span>' ),
 				'cap' => 'manage_options',
 				'dismiss' => 'php_version',
 			);
@@ -208,11 +208,11 @@ 
 		if ( ! gravityview()->plugin->is_compatible_future_php() ) {
 
 			// Show the notice on every update. Yes, annoying, but not as annoying as a plugin breaking.
-			$key = sprintf('php_%s_%s', GV_FUTURE_MIN_PHP_VERSION, GravityView_Plugin::version );
+			$key = sprintf( 'php_%s_%s', GV_FUTURE_MIN_PHP_VERSION, GravityView_Plugin::version );
 
 			self::$notices[ $key ] = array(
 				'class' => 'error',
-				'message' => sprintf( __( "%sGravityView will soon require PHP Version %s.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_FUTURE_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>' ),
+				'message' => sprintf( __( "%sGravityView will soon require PHP Version %s.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_FUTURE_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . phpversion() . '</span>' ),
 				'cap' => 'manage_options',
 				'dismiss' => $key,
 			);
@@ -237,7 +237,7 @@ 
 
 		if ( ! gravityview()->plugin->is_compatible_wordpress() ) {
 
-			self::$notices['wp_version'] = array(
+			self::$notices[ 'wp_version' ] = array(
 				'class' => 'error',
 				'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . $wp_version . '</span>' ),
 			    'cap' => 'update_core',
@@ -271,17 +271,17 @@ 
 	public static function check_gravityforms() {
 
 		// Bypass other checks: if the class exists
-		if( class_exists( 'GFCommon' ) ) {
+		if ( class_exists( 'GFCommon' ) ) {
 
 			// Does the version meet future requirements?
-			if( true === gravityview()->plugin->is_compatible_future_gravityforms() ) {
+			if ( true === gravityview()->plugin->is_compatible_future_gravityforms() ) {
 				return true;
 			}
 
 			// Does it meet minimum requirements?
 			$meets_minimum = gravityview()->plugin->is_compatible_gravityforms();
 
-			if( $meets_minimum ) {
+			if ( $meets_minimum ) {
 				/* translators: first placeholder is the future required version of Gravity Forms. The second placeholder is the current version of Gravity Forms. */
 				$title = __( 'In the future, GravityView will require Gravity Forms Version %s or newer.', 'gravityview' );
 				$version = GV_FUTURE_MIN_GF_VERSION;
@@ -296,14 +296,14 @@ 
 			$message = '<h3>' . esc_html( sprintf( $title, $version ) ) . '</h3>';
 
 			/* translators: the placeholder is the current version of Gravity Forms. */
-			$message .= '<p>' . sprintf( esc_html__( "You're using Version %s. Please update your Gravity Forms or purchase a license.", 'gravityview' ), '<span style="font-family: Consolas, Courier, monospace;">'.GFCommon::$version.'</span>' ) . '</p>';
+			$message .= '<p>' . sprintf( esc_html__( "You're using Version %s. Please update your Gravity Forms or purchase a license.", 'gravityview' ), '<span style="font-family: Consolas, Courier, monospace;">' . GFCommon::$version . '</span>' ) . '</p>';
 
 			/* translators: In this context, "get" means purchase */
 			$message .= '<p><a href="https://www.gravitykit.com/gravityforms/" class="button button-secondary button-large button-hero">' . esc_html__( 'Get the Latest Gravity Forms', 'gravityview' ) . '</a></p>';
 
 
 			// Show the notice even if the future version requirements aren't met
-			self::$notices['gf_version'] = array(
+			self::$notices[ 'gf_version' ] = array(
 				'class' => $class,
 				'message' => $message,
 				'cap' => 'update_plugins',
@@ -321,42 +321,42 @@ 
 		 * OR
 		 * It's the Network Admin and we just don't know whether the sites have GF activated themselves.
 		 */
-		if( true === $gf_status || is_network_admin() ) {
+		if ( true === $gf_status || is_network_admin() ) {
 			return true;
 		}
 
 		// If GFCommon doesn't exist, assume GF not active
 		$return = false;
 
-		switch( $gf_status ) {
+		switch ( $gf_status ) {
 			case 'inactive':
 
 				// Required for multisite
-				if( ! function_exists('wp_create_nonce') ) {
+				if ( ! function_exists( 'wp_create_nonce' ) ) {
 					require_once ABSPATH . WPINC . '/pluggable.php';
 				}
 
 				// Otherwise, throws an error on activation & deactivation "Use of undefined constant LOGGED_IN_COOKIE"
-				if( is_multisite() ) {
+				if ( is_multisite() ) {
 					wp_cookie_constants();
 				}
 
 				$return = false;
 
-				$button = function_exists('is_network_admin') && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="'. wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=gravityforms/gravityforms.php' ), 'activate-plugin_gravityforms/gravityforms.php') . '" class="button button-large">';
+				$button = function_exists( 'is_network_admin' ) && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="' . wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=gravityforms/gravityforms.php' ), 'activate-plugin_gravityforms/gravityforms.php' ) . '" class="button button-large">';
 
-				self::$notices['gf_inactive'] = array(
+				self::$notices[ 'gf_inactive' ] = array(
 					'class' => 'error',
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview' ), '<h3>', "</h3>\n\n". $button, '</a></strong>' ),
+					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview' ), '<h3>', "</h3>\n\n" . $button, '</a></strong>' ),
 					'cap' => 'activate_plugins',
 					'dismiss' => 'gf_inactive',
 				);
 
 				break;
 			default:
-				self::$notices['gf_installed'] = array(
+				self::$notices[ 'gf_installed' ] = array(
 					'class' => 'error',
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $59%s%s', 'gravityview' ), '<h3>', "</h3>\n\n".'<a href="https://www.gravitykit.com/gravityforms/" class="button button-secondary button-large button-hero">' , '<em>', '</em>', '</a>'),
+					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $59%s%s', 'gravityview' ), '<h3>', "</h3>\n\n" . '<a href="https://www.gravitykit.com/gravityforms/" class="button button-secondary button-large button-hero">', '<em>', '</em>', '</a>' ),
 					'cap' => 'install_plugins',
 					'dismiss' => 'gf_installed',
 				);
@@ -373,10 +373,10 @@ 
 	 */
 	private static function check_gf_directory() {
 
-		if( class_exists( 'GFDirectory' ) ) {
-			self::$notices['gf_directory'] = array(
+		if ( class_exists( 'GFDirectory' ) ) {
+			self::$notices[ 'gf_directory' ] = array(
 				'class' => 'error is-dismissible',
-				'title' => __('Potential Conflict', 'gravityview' ),
+				'title' => __( 'Potential Conflict', 'gravityview' ),
 				'message' => __( 'GravityView and Gravity Forms Directory are both active. This may cause problems. If you experience issues, disable the Gravity Forms Directory plugin.', 'gravityview' ),
 				'dismiss' => 'gf_directory',
 				'cap' => 'activate_plugins',
@@ -394,21 +394,21 @@ 
 	 */
 	public static function get_plugin_status( $location = '' ) {
 
-		if( ! function_exists('is_plugin_active') ) {
+		if ( ! function_exists( 'is_plugin_active' ) ) {
 			include_once( ABSPATH . '/wp-admin/includes/plugin.php' );
 		}
 
-		if( is_network_admin() && is_plugin_active_for_network( $location ) ) {
+		if ( is_network_admin() && is_plugin_active_for_network( $location ) ) {
 			return true;
 		}
 
-		if( ! is_network_admin() && is_plugin_active( $location ) ) {
+		if ( ! is_network_admin() && is_plugin_active( $location ) ) {
 			return true;
 		}
 
-		if(
-			!file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) &&
-			!file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location )
+		if (
+			! file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) &&
+			! file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location )
 		) {
 			return false;
 		}

includes/class-admin-installer.php

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 && ! isset( $_GET['cache'] ) ) {
+		if ( ! $downloads_data && ! isset( $_GET['cache'] ) ) {
 			return;
 		}
 
@@ -97,7 +97,7 @@ 
 	 */
 	public function add_admin_menu() {
 
-	    $menu_text = _x( 'Manage Add-Ons', 'Extensions are WordPress plugins that add functionality to GravityView and Gravity Forms', 'gravityview' );
+		$menu_text = _x( 'Manage Add-Ons', 'Extensions are WordPress plugins that add functionality to GravityView and Gravity Forms', 'gravityview' );
 
 		$menu_text = sprintf( '<span title="%s" style="margin: 0">%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' );
 	}
 
 	/**
@@ -167,43 +167,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() {
 
@@ -235,7 +235,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;
 		}
 
@@ -288,10 +288,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
@@ -381,9 +381,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'] ); ?>">
@@ -407,45 +407,45 @@ 
 
                 <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
+	 *
 	 * @since 2.10 Allow managing installed add-ons whether or not the user's license shows they have access.
 	 *
 	 * @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 ) {
 
@@ -456,7 +456,7 @@ 
 			'slug' => '',
 			'excerpt' => '',
 			'link' => '',
-            'coming_soon' => false,
+			'coming_soon' => false,
 			'installer_title' => null, // May not be defined
 			'installer_excerpt' => null, // May not be defined
 		) );
@@ -500,14 +500,14 @@ 
 			$href         = 'https://www.gravitykit.com/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://www.gravitykit.com/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://www.gravitykit.com/extensions/' );
+		}
 
 		// Access but the plugin is not installed
 		elseif ( ! $wp_plugin ) {
@@ -553,18 +553,18 @@ 
 		$download_info['link'] = add_query_arg( array( 'license_key' => $license_key ), $download_info['link'] );
 
 		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'] );
@@ -575,7 +575,7 @@ 
 		}
 
 		return floatval( $base_price );
-    }
+	}
 
 	/**
 	 * Handle AJAX request to activate extension
@@ -593,8 +593,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();
@@ -615,10 +615,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 +57 added lines, -57 removed lines

@@ -53,7 +53,7 @@ 
 	 */
 	public function register_noconflict( $items ) {
 
-		$items[] = 'gravityview-admin-installer';
+		$items[ ] = 'gravityview-admin-installer';
 
 		return $items;
 	}
@@ -68,21 +68,21 @@ 
 
 	    $downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT );
 
-	    if ( ! $downloads_data && ! isset( $_GET['cache'] ) ) {
+	    if ( ! $downloads_data && ! isset( $_GET[ 'cache' ] ) ) {
 			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' ],
 				);
 			}
 
@@ -149,13 +149,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 )
 			);
 		}
@@ -209,11 +209,11 @@ 
 
 		$downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT );
 
-		if ( $downloads_data && ! isset( $_GET['cache'] ) ) {
+		if ( $downloads_data && ! isset( $_GET[ 'cache' ] ) ) {
 			return $downloads_data;
 		}
 
-		if( \GV\Plugin::is_network_activated() ) {
+		if ( \GV\Plugin::is_network_activated() ) {
 			$home_url = network_home_url();
 		} else {
 			$home_url = home_url();
@@ -241,13 +241,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' ];
 	}
 
 	/**
@@ -307,7 +307,7 @@ 
 
             <h2><?php esc_html_e( 'The following plugins extend GravityView and Gravity Forms functionality:', 'gravityview' ); ?></h2>
 
-			<a class="button button-secondary gv-admin-installer-refresh-link" href="<?php echo add_query_arg(array( 'cache' => 1 ) ); ?>"><i class="dashicons dashicons-update" style="margin-top: .2em"></i> <?php esc_html_e( 'Refresh', 'gravityview' ); ?></a>
+			<a class="button button-secondary gv-admin-installer-refresh-link" href="<?php echo add_query_arg( array( 'cache' => 1 ) ); ?>"><i class="dashicons dashicons-update" style="margin-top: .2em"></i> <?php esc_html_e( 'Refresh', 'gravityview' ); ?></a>
 
 			<hr class="wp-header-end" />
 
@@ -324,11 +324,11 @@ 
 
 				$this->render_section( 'extensions', esc_html__( 'GravityView Extensions', 'gravityview' ), $downloads_data, $wp_plugins );
 
-				$this->render_section(  'plugins', esc_html__( 'Gravity Forms Add-Ons', 'gravityview' ), $downloads_data, $wp_plugins );
+				$this->render_section( 'plugins', esc_html__( 'Gravity Forms Add-Ons', 'gravityview' ), $downloads_data, $wp_plugins );
 
-				$this->render_section(  'labs', esc_html__( 'GravityView Labs', 'gravityview' ), $downloads_data, $wp_plugins );
+				$this->render_section( 'labs', esc_html__( 'GravityView Labs', 'gravityview' ), $downloads_data, $wp_plugins );
 
-				$this->render_section(  'friends', esc_html__( 'Friends of GravityView', 'gravityview' ), $downloads_data, $wp_plugins );
+				$this->render_section( 'friends', esc_html__( 'Friends of GravityView', 'gravityview' ), $downloads_data, $wp_plugins );
 				?>
             </div>
         </div>
@@ -355,7 +355,7 @@ 
 				continue;
 			}
 
-			if ( empty( $download['info'] ) ) {
+			if ( empty( $download[ 'info' ] ) ) {
 				continue;
 			}
 
@@ -383,31 +383,31 @@ 
 
         $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( ! empty( $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 ( ! empty( $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 } ?>
 
-					<?php if ( 'gravityview' !== $download_info['slug'] ) { ?>
-                    <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 } ?>
+					<?php if ( 'gravityview' !== $download_info[ 'slug' ] ) { ?>
+                    <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>
 					<?php } ?>
                 </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>' );
@@ -449,7 +449,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' => '',
@@ -461,9 +461,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 = '';
@@ -473,11 +473,11 @@ 
 		$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;
 			$status_label = '';
 			$button_label = sprintf( __( 'Active %s License is Required.', 'gravityview' ), $required_license );
-			$href         = $download_info['link'];
+			$href         = $download_info[ 'link' ];
 			$button_class = 'button-primary';
 		}
 
@@ -487,7 +487,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';
 		}
 
@@ -500,7 +500,7 @@ 
 			$href         = 'https://www.gravitykit.com/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' );
@@ -515,8 +515,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' )
 			);
@@ -532,12 +532,12 @@ 
 			$status = 'inactive';
 			$status_label = __( 'Inactive', 'gravityview' );
 			$button_label = __( 'Activate', 'gravityview' );
-			$plugin_path = $wp_plugin['path'];
+			$plugin_path = $wp_plugin[ 'path' ];
 			$button_class = 'button-secondary';
 		}
 		// The plugin is installed and active
-		elseif ( ! empty( $wp_plugin['path'] ) ) {
-			$plugin_path = $wp_plugin['path'];
+		elseif ( ! empty( $wp_plugin[ 'path' ] ) ) {
+			$plugin_path = $wp_plugin[ 'path' ];
 			$status = 'active';
 			$status_label = __( 'Active', 'gravityview' );
 			$button_label = __( 'Deactivate', 'gravityview' );
@@ -550,9 +550,9 @@ 
 			$href = add_query_arg( array( 'license_key' => $license_key ), $href );
 		}
 
-		$download_info['link'] = add_query_arg( array( 'license_key' => $license_key ), $download_info['link'] );
+		$download_info[ 'link' ] = add_query_arg( array( 'license_key' => $license_key ), $download_info[ 'link' ] );
 
-		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' );
     }
 
 	/**
@@ -567,11 +567,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 );
@@ -585,13 +585,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() )
             ) );
@@ -608,13 +608,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

@@ -498,9 +498,7 @@
 			$button_label = sprintf( __( 'Upgrade to %s for Access', 'gravityview' ), $required_license );
 			$button_class = 'button-primary button-large';
 			$href         = 'https://www.gravitykit.com/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' );

includes/presets/register-default-templates.php

Spacing +7 added lines, -7 removed lines

@@ -59,8 +59,8 @@ 
 		'GravityView_DataTables_Template' => array(
 			'slug' => 'dt_placeholder',
 			'label' =>  __( 'DataTables Table', 'gv-datatables', 'gravityview' ),
-			'description' => __('Display items in a dynamic table powered by DataTables.', 'gravityview'),
-			'logo' => plugins_url('assets/images/templates/logo-datatables.png', GRAVITYVIEW_FILE ),
+			'description' => __( 'Display items in a dynamic table powered by DataTables.', 'gravityview' ),
+			'logo' => plugins_url( 'assets/images/templates/logo-datatables.png', GRAVITYVIEW_FILE ),
 			'buy_source' => 'https://www.gravitykit.com/pricing/?utm_source=plugin&utm_medium=buy_now&utm_campaign=view_type&utm_term=datatables',
 			'preview' => 'https://try.gravityview.co/demo/view/datatables/?utm_source=plugin&utm_medium=try_demo&utm_campaign=view_type&utm_term=datatables',
 			'license' => esc_html__( 'All Access', 'gravityview' ),
@@ -102,13 +102,13 @@ 
 				continue;
 			}
 
-			$license_price_id = (int) \GV\Utils::get( $license, 'price_id', 0 );
-			$placeholder_price_id = (int) \GV\Utils::get( $placeholder, 'price_id' );
+			$license_price_id = (int)\GV\Utils::get( $license, 'price_id', 0 );
+			$placeholder_price_id = (int)\GV\Utils::get( $placeholder, 'price_id' );
 
-			$placeholder['type']     = 'custom';
-			$placeholder['included'] = ( $license_price_id >= $placeholder_price_id );
+			$placeholder[ 'type' ]     = 'custom';
+			$placeholder[ 'included' ] = ( $license_price_id >= $placeholder_price_id );
 
-			new GravityView_Placeholder_Template( $placeholder['slug'], $placeholder );
+			new GravityView_Placeholder_Template( $placeholder[ 'slug' ], $placeholder );
 		}
 
 	} catch ( Exception $exception ) {