gravityview / GravityView

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

Indentation -1 removed lines

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

Spacing +18 added lines, -18 removed lines

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

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

Doc Comments +1 added lines, -1 removed lines

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

Spacing +3 added lines, -3 removed lines

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

includes/class-gv-license-handler.php

Braces +4 added lines, -2 removed lines

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

Doc Comments +4 added lines, -2 removed lines

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

Indentation +10 added lines, -10 removed lines

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

Spacing +103 added lines, -103 removed lines

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

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

Spacing +3 added lines, -3 removed lines

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

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

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 		$gv_page = gravityview_is_admin_page( '', 'single' );
 
 		// New View or Edit View page
-		if( $gv_page && $pagenow === 'post-new.php' ) {
+		if ( $gv_page && $pagenow === 'post-new.php' ) {
 			remove_meta_box( 'woothemes-settings', 'gravityview', 'normal' );
 		}
 	}

includes/class-debug-bar.php

Spacing +32 added lines, -32 removed lines

@@ -21,12 +21,12 @@ 
 	function init() {
 
 		$icon = is_admin() ? '<i class="icon gv-icon-astronaut-head"></i>&nbsp;' : NULL;
-		$this->title( $icon . __('GravityView', 'gravityview') );
+		$this->title( $icon . __( 'GravityView', 'gravityview' ) );
 	}
 
 	function get_warnings() {
 
-		if( is_null( $this->warnings ) ) {
+		if ( is_null( $this->warnings ) ) {
 			$this->warnings = GravityView_Logging::get_errors();
 		}
 
@@ -35,7 +35,7 @@ 
 
 	function get_notices() {
 
-		if( is_null( $this->notices ) ) {
+		if ( is_null( $this->notices ) ) {
 			$this->notices = GravityView_Logging::get_notices();
 		}
 
@@ -84,27 +84,27 @@ 
 		</style>
 		<div id='debug-bar-gravityview'>";
 
-		$output .= '<img src="'.plugins_url('assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ).'" class="alignright" alt="" width="100" height="132" />';
+		$output .= '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" class="alignright" alt="" width="100" height="132" />';
 
 
 		$warnings = $this->get_warnings();
 		$notices = $this->get_notices();
 
-		if(count($warnings)) {
-			$output .= '<h3><span>'.__('Warnings', 'gravityview').'</span></h3>';
+		if ( count( $warnings ) ) {
+			$output .= '<h3><span>' . __( 'Warnings', 'gravityview' ) . '</span></h3>';
 			$output .= '<ol>';
-			foreach ( $warnings as $key => $notice) {
-				if(empty($notice['message'])) { continue; }
-				$output .= '<li><a href="#'.sanitize_html_class( 'gv-warning-' . $key ).'">'.strip_tags($notice['message']).'</a></li>';
+			foreach ( $warnings as $key => $notice ) {
+				if ( empty( $notice[ 'message' ] ) ) { continue; }
+				$output .= '<li><a href="#' . sanitize_html_class( 'gv-warning-' . $key ) . '">' . strip_tags( $notice[ 'message' ] ) . '</a></li>';
 			}
 			$output .= '</ol><hr />';
 		}
-		if(count($notices)) {
-			$output .= '<h3><span>'.__('Logs', 'gravityview').'</span></h3>';
+		if ( count( $notices ) ) {
+			$output .= '<h3><span>' . __( 'Logs', 'gravityview' ) . '</span></h3>';
 			$output .= '<ol>';
-			foreach ( $notices as $key => $notice) {
-				if(empty($notice['message'])) { continue; }
-				$output .= '<li><a href="#'.sanitize_html_class( 'gv-notice-' . $key ).'">'.strip_tags($notice['message']).'</a></li>';
+			foreach ( $notices as $key => $notice ) {
+				if ( empty( $notice[ 'message' ] ) ) { continue; }
+				$output .= '<li><a href="#' . sanitize_html_class( 'gv-notice-' . $key ) . '">' . strip_tags( $notice[ 'message' ] ) . '</a></li>';
 			}
 			$output .= '</ol><hr />';
 		}
@@ -112,14 +112,14 @@ 
 		if ( count( $warnings ) ) {
 			$output .= '<h3>Warnings</h3>';
 			$output .= '<ol class="debug-bar-php-list">';
-			foreach ( $warnings as $key => $notice) { $output .= $this->render_item( $notice, 'gv-warning-'  . $key ); }
+			foreach ( $warnings as $key => $notice ) { $output .= $this->render_item( $notice, 'gv-warning-' . $key ); }
 			$output .= '</ol>';
 		}
 
 		if ( count( $notices ) ) {
 			$output .= '<h3>Notices</h3>';
 			$output .= '<ol class="debug-bar-php-list">';
-			foreach ( $notices as $key => $notice) { $output .= $this->render_item( $notice, 'gv-notice-' . $key ); }
+			foreach ( $notices as $key => $notice ) { $output .= $this->render_item( $notice, 'gv-notice-' . $key ); }
 			$output .= '</ol>';
 		}
 
@@ -133,17 +133,17 @@ 
 	 * @param  string|array $item Unescaped
 	 * @return string       Escaped HTML
 	 */
-	function esc_html_recursive($item) {
-		if(is_object($item)) {
-			foreach($item as $key => $value) {
-				$item->{$key} = $this->esc_html_recursive($value);
+	function esc_html_recursive( $item ) {
+		if ( is_object( $item ) ) {
+			foreach ( $item as $key => $value ) {
+				$item->{$key} = $this->esc_html_recursive( $value );
 			}
-		} else if(is_array($item)) {
-			foreach($item as $key => $value) {
-				$item[$key] = $this->esc_html_recursive($value);
+		} else if ( is_array( $item ) ) {
+			foreach ( $item as $key => $value ) {
+				$item[ $key ] = $this->esc_html_recursive( $value );
 			}
 		} else {
-			$item = esc_html($item);
+			$item = esc_html( $item );
 		}
 		return $item;
 	}
@@ -159,26 +159,26 @@ 
 
 		$output = '';
 
-		if(!empty($notice['message'])) {
-			$output .= '<a id="'.sanitize_html_class( $anchor ).'"></a>';
+		if ( ! empty( $notice[ 'message' ] ) ) {
+			$output .= '<a id="' . sanitize_html_class( $anchor ) . '"></a>';
 			$output .= "<li class='debug-bar-php-notice'>";
 		}
 
 		$output .= '<div class="clear"></div>';
 
 		// Title
-		$output .= '<div class="gravityview-debug-bar-title">'.esc_attr( $notice['message'] ).'</div>';
+		$output .= '<div class="gravityview-debug-bar-title">' . esc_attr( $notice[ 'message' ] ) . '</div>';
 
 		// Debugging Output
-		if( empty( $notice['data'] ) ) {
-			if( !is_null( $notice['data'] ) ) {
-				$output .= '<em>'._x('Empty', 'Debugging output data is empty.', 'gravityview' ).'</em>';
+		if ( empty( $notice[ 'data' ] ) ) {
+			if ( ! is_null( $notice[ 'data' ] ) ) {
+				$output .= '<em>' . _x( 'Empty', 'Debugging output data is empty.', 'gravityview' ) . '</em>';
 			}
 		} else {
-			$output .= sprintf( '<pre>%s</pre>', print_r($this->esc_html_recursive( $notice['data'] ), true) );
+			$output .= sprintf( '<pre>%s</pre>', print_r( $this->esc_html_recursive( $notice[ 'data' ] ), true ) );
 		}
 
-		if(!empty($notice['message'])) {
+		if ( ! empty( $notice[ 'message' ] ) ) {
 			$output .= '</li>';
 		}
 

includes/default-widgets.php

Spacing +1 added lines, -1 removed lines

@@ -5,4 +5,4 @@
  * @deprecated 1.7.5
  */
 
-include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
+include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' );

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

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
-		unset ( $field_options['search_filter'], $field_options['show_as_link'] );
+		unset ( $field_options[ 'search_filter' ], $field_options[ 'show_as_link' ] );
 
 		return $field_options;
 	}

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

Spacing +4 added lines, -4 removed lines

@@ -28,17 +28,17 @@
 
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
-		$field_options['number_format'] = array(
+		$field_options[ 'number_format' ] = array(
 			'type' => 'checkbox',
 			'label' => __( 'Format number?', 'gravityview' ),
-			'desc' => __('Display numbers with thousands separators.', 'gravityview'),
+			'desc' => __( 'Display numbers with thousands separators.', 'gravityview' ),
 			'value' => false,
 		);
 
-		$field_options['decimals'] = array(
+		$field_options[ 'decimals' ] = array(
 			'type' => 'number',
 			'label' => __( 'Decimals', 'gravityview' ),
-			'desc' => __('Precision of the number of decimal places. Leave blank to use existing precision.', 'gravityview'),
+			'desc' => __( 'Precision of the number of decimal places. Leave blank to use existing precision.', 'gravityview' ),
 			'value' => '',
 			'merge_tags' => false,
 		);