gravityview / GravityView

includes/helper-functions.php

Spacing +50 added lines, -50 removed lines

@@ -32,19 +32,19 @@ 
 	// If there's an overriding CSS file in the current template folder, use it.
 	$template_css_path = trailingslashit( get_stylesheet_directory() ) . 'gravityview/css/' . $css_file;
 
-	if( file_exists( $template_css_path ) ) {
+	if ( file_exists( $template_css_path ) ) {
 		$path = trailingslashit( get_stylesheet_directory_uri() ) . 'gravityview/css/' . $css_file;
 		gravityview()->log->debug( 'Stylesheet override ({css_file})', array( 'css_file' => esc_attr( $css_file ) ) );
 	} else {
 		// Default: use GravityView CSS file
 
 		// If no path is provided, assume default plugin templates CSS folder
-		if( '' === $dir_path ) {
+		if ( '' === $dir_path ) {
 			$dir_path = GRAVITYVIEW_DIR . 'templates/css/';
 		}
 		
 		// plugins_url() expects a path to a file, not directory. We append a file to be stripped.
-		$path = plugins_url( $css_file, trailingslashit( $dir_path )  . 'stripped-by-plugin_basename.php' );
+		$path = plugins_url( $css_file, trailingslashit( $dir_path ) . 'stripped-by-plugin_basename.php' );
 	}
 
 	return $path;
@@ -82,9 +82,9 @@ 
 
 	$parsed_permalink = parse_url( get_permalink( $id ) );
 
-	$permalink_args =  isset( $parsed_permalink['query'] ) ? $parsed_permalink['query'] : false;
+	$permalink_args = isset( $parsed_permalink[ 'query' ] ) ? $parsed_permalink[ 'query' ] : false;
 
-	if( empty( $permalink_args ) ) {
+	if ( empty( $permalink_args ) ) {
 		return array();
 	}
 
@@ -109,15 +109,15 @@ 
 function gv_selected( $value, $current, $echo = true, $type = 'selected' ) {
 
 	$output = '';
-	if( is_array( $current ) ) {
-		if( in_array( $value, $current ) ) {
+	if ( is_array( $current ) ) {
+		if ( in_array( $value, $current ) ) {
 			$output = __checked_selected_helper( true, true, false, $type );
 		}
 	} else {
 		$output = __checked_selected_helper( $value, $current, false, $type );
 	}
 
-	if( $echo ) {
+	if ( $echo ) {
 		echo $output;
 	}
 
@@ -125,7 +125,7 @@ 
 }
 
 
-if( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
+if ( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
 
 	/**
 	 * sanitize_html_class doesn't handle spaces (multiple classes). We remedy that.
@@ -171,7 +171,7 @@ 
  */
 function gravityview_strip_whitespace( $string ) {
 	$string = normalize_whitespace( $string );
-	return preg_replace('/[\r\n\t ]+/', ' ', $string );
+	return preg_replace( '/[\r\n\t ]+/', ' ', $string );
 }
 
 /**
@@ -185,7 +185,7 @@ 
  * @return string Included file contents
  */
 function gravityview_ob_include( $file_path, $object = NULL ) {
-	if( ! file_exists( $file_path ) ) {
+	if ( ! file_exists( $file_path ) ) {
 		gravityview()->log->error( 'File path does not exist. {path}', array( 'path' => $file_path ) );
 		return '';
 	}
@@ -203,7 +203,7 @@ 
 
 	$width = $height * 0.7586206897;
 
-	if( function_exists('is_rtl') && is_rtl() ) {
+	if ( function_exists( 'is_rtl' ) && is_rtl() ) {
 		$style = 'margin:10px 10px 10px 0;';
 		$class = 'alignright';
 	} else {
@@ -211,7 +211,7 @@ 
 		$class = 'alignleft';
 	}
 
-	return '<img src="'.plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ).'" class="'.$class.'" height="'.intval( $height ).'" width="'.round( $width, 2 ).'" alt="The GravityView Astronaut Says:" style="'.$style.'" />';
+	return '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" class="' . $class . '" height="' . intval( $height ) . '" width="' . round( $width, 2 ) . '" alt="The GravityView Astronaut Says:" style="' . $style . '" />';
 }
 
 /**
@@ -234,9 +234,9 @@ 
 function gravityview_number_format( $number, $decimals = '' ) {
 	global $wp_locale;
 
-	if( '' === $decimals ) {
+	if ( '' === $decimals ) {
 
-		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format['decimal_point'] : '.';
+		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format[ 'decimal_point' ] : '.';
 
 		/**
 		 * Calculate the position of the decimal point in the number
@@ -265,7 +265,7 @@ 
 	$parts = parse_url( $value );
 
 	// No domain? Strange...show the original text.
-	if( empty( $parts['host'] ) ) {
+	if ( empty( $parts[ 'host' ] ) ) {
 		return $value;
 	}
 
@@ -278,16 +278,16 @@ 
 	 * @param boolean $enable Whether to strip the scheme. Return false to show scheme. (default: true)\n
 	 * If true: `http://example.com => example.com`
 	 */
-	if( false === apply_filters('gravityview_anchor_text_striphttp', true) ) {
+	if ( false === apply_filters( 'gravityview_anchor_text_striphttp', true ) ) {
 
-		if( isset( $parts['scheme'] ) ) {
-			$return .= $parts['scheme'];
+		if ( isset( $parts[ 'scheme' ] ) ) {
+			$return .= $parts[ 'scheme' ];
 		}
 
 	}
 
 	// The domain, which may contain a subdomain
-	$domain = $parts['host'];
+	$domain = $parts[ 'host' ];
 
 	/**
 	 * @filter `gravityview_anchor_text_stripwww` Strip www from the domain?
@@ -295,10 +295,10 @@ 
 	 * @param boolean $enable Whether to strip www. Return false to show www. (default: true)\n
 	 * If true: `www.example.com => example.com`
 	 */
-	$strip_www = apply_filters('gravityview_anchor_text_stripwww', true );
+	$strip_www = apply_filters( 'gravityview_anchor_text_stripwww', true );
 
-	if( $strip_www ) {
-		$domain = str_replace('www.', '', $domain );
+	if ( $strip_www ) {
+		$domain = str_replace( 'www.', '', $domain );
 	}
 
 	/**
@@ -308,11 +308,11 @@ 
 	 * If true: `http://demo.example.com => example.com` \n
 	 * If false: `http://demo.example.com => demo.example.com`
 	 */
-	$strip_subdomains = apply_filters('gravityview_anchor_text_nosubdomain', true);
+	$strip_subdomains = apply_filters( 'gravityview_anchor_text_nosubdomain', true );
 
-	if( $strip_subdomains ) {
+	if ( $strip_subdomains ) {
 
-		$domain = _gravityview_strip_subdomain( $parts['host'] );
+		$domain = _gravityview_strip_subdomain( $parts[ 'host' ] );
 
 	}
 
@@ -326,12 +326,12 @@ 
 	 * If true: `http://example.com/sub/directory/page.html => example.com`  \n
 	 * If false: `http://example.com/sub/directory/page.html => example.com/sub/directory/page.html`
 	 */
-	$root_only = apply_filters('gravityview_anchor_text_rootonly', true);
+	$root_only = apply_filters( 'gravityview_anchor_text_rootonly', true );
 
-	if( empty( $root_only ) ) {
+	if ( empty( $root_only ) ) {
 
-		if( isset( $parts['path'] ) ) {
-			$return .= $parts['path'];
+		if ( isset( $parts[ 'path' ] ) ) {
+			$return .= $parts[ 'path' ];
 		}
 	}
 
@@ -341,12 +341,12 @@ 
 	 * @param boolean $enable Whether to enable "root only". Return false to show full path. (default: true)\n
 	 * If true: `http://example.com/?query=example => example.com`
 	 */
-	$strip_query_string = apply_filters('gravityview_anchor_text_noquerystring', true );
+	$strip_query_string = apply_filters( 'gravityview_anchor_text_noquerystring', true );
 
-	if( empty( $strip_query_string ) ) {
+	if ( empty( $strip_query_string ) ) {
 
-		if( isset( $parts['query'] ) ) {
-			$return .= '?'.$parts['query'];
+		if ( isset( $parts[ 'query' ] ) ) {
+			$return .= '?' . $parts[ 'query' ];
 		}
 
 	}
@@ -363,8 +363,8 @@ 
  */
 function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) {
 
-	if( preg_match("/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
-		return $matches['domain'];
+	if ( preg_match( "/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
+		return $matches[ 'domain' ];
 	} else {
 		return $string_maybe_has_subdomain;
 	}
@@ -433,7 +433,7 @@ 
 
 		if ( in_array( $value, array( 'yes', 'true' ), true ) ) {
 			$value = true;
-		} else if( in_array( $value, array( 'no', 'false' ), true ) ) {
+		} else if ( in_array( $value, array( 'no', 'false' ), true ) ) {
 			$value = false;
 		}
 	}
@@ -462,19 +462,19 @@ 
  */
 function gv_maybe_json_decode( $value, $assoc = false, $depth = 512, $options = 0 ) {
 
-	if( ! is_string( $value ) ) {
+	if ( ! is_string( $value ) ) {
 		return $value;
 	}
 
 	$decoded = json_decode( $value );
 
 	// There was a JSON error (PHP 5.3+)
-	if( function_exists('json_last_error') && JSON_ERROR_NONE !== json_last_error() ) {
+	if ( function_exists( 'json_last_error' ) && JSON_ERROR_NONE !== json_last_error() ) {
 		return $value;
 	}
 
 	// It wasn't JSON (PHP < 5.3 fallback)
-	if( is_null( $decoded ) ) {
+	if ( is_null( $decoded ) ) {
 		return $value;
 	}
 
@@ -497,7 +497,7 @@ 
 
 	// Use the original function, if exists.
 	// Requires WP 4.4+
-	if( function_exists( 'map_deep') ) {
+	if ( function_exists( 'map_deep' ) ) {
 		return map_deep( $value, $callback );
 	}
 
@@ -562,7 +562,7 @@ 
 
 	$exploded = explode( '.', "{$field_id}" );
 
-	return isset( $exploded[1] ) ? intval( $exploded[1] ) : false;
+	return isset( $exploded[ 1 ] ) ? intval( $exploded[ 1 ] ) : false;
 }
 
 /**
@@ -603,13 +603,13 @@ 
 	 */
 	$args = apply_filters( 'gravityview_get_terms_choices_args', $args );
 
-	$terms = get_terms( $args['taxonomy'], $args );
+	$terms = get_terms( $args[ 'taxonomy' ], $args );
 
 	$choices = array();
 
 	if ( is_array( $terms ) ) {
 		foreach ( $terms as $term_id => $term_name ) {
-			$choices[] = array(
+			$choices[ ] = array(
 				'text'  => $term_name,
 				'value' => $term_id
 			);
@@ -633,21 +633,21 @@ 
 function _gravityview_process_posted_fields() {
 	$fields = array();
 
-	if( !empty( $_POST['gv_fields'] ) ) {
-		if ( ! is_array( $_POST['gv_fields'] ) ) {
+	if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
+		if ( ! is_array( $_POST[ 'gv_fields' ] ) ) {
 
 			// We are not using parse_str() due to max_input_vars limitation with large View configurations
 			$fields_holder = array();
-			GVCommon::gv_parse_str( $_POST['gv_fields'], $fields_holder );
+			GVCommon::gv_parse_str( $_POST[ 'gv_fields' ], $fields_holder );
 
-			if ( isset( $fields_holder['fields'] ) ) {
-				$fields = $fields_holder['fields'];
+			if ( isset( $fields_holder[ 'fields' ] ) ) {
+				$fields = $fields_holder[ 'fields' ];
 			} else {
 				gravityview()->log->error( 'No `fields` key was found after parsing $fields string', array( 'data' => $fields_holder ) );
 			}
 
 		} else {
-			$fields = $_POST['gv_fields'];
+			$fields = $_POST[ 'gv_fields' ];
 		}
 	}
 

includes/class-gravityview-migrate.php

Spacing +39 added lines, -39 removed lines

@@ -72,7 +72,7 @@ 
 
 		$disapproved_result = $wpdb->query( $wpdb->prepare( $sql, GravityView_Entry_Approval_Status::DISAPPROVED, '0' ) );
 
-		if( false === $approved_result || false === $disapproved_result ) {
+		if ( false === $approved_result || false === $disapproved_result ) {
 			gravityview()->log->error( 'There was an error processing the query. {error}', array( 'error' => $wpdb->last_error ) );
 		} else {
 			// All done: Meta values are migrated
@@ -105,11 +105,11 @@ 
 		$redux_settings = $this->get_redux_settings();
 
 		// No need to process
-		if( false === $redux_settings ) {
+		if ( false === $redux_settings ) {
 			return;
 		}
 
-		if( empty(  $redux_settings['license_key_status'] ) ) {
+		if ( empty( $redux_settings[ 'license_key_status' ] ) ) {
 			$redux_settings = $this->get_redux_license_status( $redux_settings );
 		}
 
@@ -123,8 +123,8 @@ 
 		gravityview()->settings->update( $updated_settings );
 
 		// And now remove the previous option, so this is a one-time thing.
-		delete_option('gravityview_settings');
-		delete_option('gravityview_settings-transients');
+		delete_option( 'gravityview_settings' );
+		delete_option( 'gravityview_settings-transients' );
 	}
 
 	/**
@@ -147,9 +147,9 @@ 
 
 		$license_call = \GV\License_Handler::get()->license_call( $data );
 
-		if( is_object( $license_call ) && isset( $license_call->license ) ) {
-			$redux_settings['license_key_status'] = $license_call->license;
-			$redux_settings['license_key_response'] = json_encode( $license_call );
+		if ( is_object( $license_call ) && isset( $license_call->license ) ) {
+			$redux_settings[ 'license_key_status' ] = $license_call->license;
+			$redux_settings[ 'license_key_response' ] = json_encode( $license_call );
 		}
 
 		return $redux_settings;
@@ -163,10 +163,10 @@ 
 	function get_redux_settings() {
 
 		// Previous settings set by Redux
-		$redux_option = get_option('gravityview_settings');
+		$redux_option = get_option( 'gravityview_settings' );
 
 		// No Redux settings? Don't proceed.
-		if( false === $redux_option ) {
+		if ( false === $redux_option ) {
 			return false;
 		}
 
@@ -178,19 +178,19 @@ 
 
 		if ( $license_array = \GV\Utils::get( $redux_option, 'license' ) ) {
 
-			$redux_settings['license_key'] = $license_key = \GV\Utils::get( $license_array, 'license' );
+			$redux_settings[ 'license_key' ] = $license_key = \GV\Utils::get( $license_array, 'license' );
 
-			$redux_last_changed_values = get_option('gravityview_settings-transients');
+			$redux_last_changed_values = get_option( 'gravityview_settings-transients' );
 
 			// This contains the last response for license validation
-			if( !empty( $redux_last_changed_values ) && $saved_values = \GV\Utils::get( $redux_last_changed_values, 'changed_values' ) ) {
+			if ( ! empty( $redux_last_changed_values ) && $saved_values = \GV\Utils::get( $redux_last_changed_values, 'changed_values' ) ) {
 
 				$saved_license = \GV\Utils::get( $saved_values, 'license' );
 
 				// Only use the last-saved values if they are for the same license
-				if( $saved_license && \GV\Utils::get( $saved_license, 'license' ) === $license_key ) {
-					$redux_settings['license_key_status'] = \GV\Utils::get( $saved_license, 'status' );
-					$redux_settings['license_key_response'] = \GV\Utils::get( $saved_license, 'response' );
+				if ( $saved_license && \GV\Utils::get( $saved_license, 'license' ) === $license_key ) {
+					$redux_settings[ 'license_key_status' ] = \GV\Utils::get( $saved_license, 'status' );
+					$redux_settings[ 'license_key_response' ] = \GV\Utils::get( $saved_license, 'response' );
 				}
 			}
 		}
@@ -202,8 +202,8 @@ 
 	/** ----  Migrate from old search widget to new search widget  ---- */
 	function update_search_on_views() {
 
-		if( !class_exists('GravityView_Widget_Search') ) {
-			include_once( GRAVITYVIEW_DIR .'includes/extensions/search-widget/class-search-widget.php' );
+		if ( ! class_exists( 'GravityView_Widget_Search' ) ) {
+			include_once( GRAVITYVIEW_DIR . 'includes/extensions/search-widget/class-search-widget.php' );
 		}
 
 		// Loop through all the views
@@ -215,20 +215,20 @@ 
 
 		$views = get_posts( $query_args );
 
-		foreach( $views as $view ) {
+		foreach ( $views as $view ) {
 
 			$widgets = gravityview_get_directory_widgets( $view->ID );
 			$search_fields = null;
 
-			if( empty( $widgets ) || !is_array( $widgets ) ) { continue; }
+			if ( empty( $widgets ) || ! is_array( $widgets ) ) { continue; }
 
 			gravityview()->log->debug( '[GravityView_Migrate/update_search_on_views] Loading View ID: {view_id}', array( 'view_id' => $view->ID ) );
 
-			foreach( $widgets as $area => $ws ) {
-				foreach( $ws as $k => $widget ) {
-					if( $widget['id'] !== 'search_bar' ) { continue; }
+			foreach ( $widgets as $area => $ws ) {
+				foreach ( $ws as $k => $widget ) {
+					if ( $widget[ 'id' ] !== 'search_bar' ) { continue; }
 
-					if( is_null( $search_fields ) ) {
+					if ( is_null( $search_fields ) ) {
 						$search_fields = $this->get_search_fields( $view->ID );
 					}
 
@@ -236,24 +236,24 @@ 
 					//  [search_free] => 1
 			        //  [search_date] => 1
 			        $search_generic = array();
-					if( !empty( $widget['search_free'] ) ) {
-						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
+					if ( ! empty( $widget[ 'search_free' ] ) ) {
+						$search_generic[ ] = array( 'field' => 'search_all', 'input' => 'input_text' );
 					}
-					if( !empty( $widget['search_date'] ) ) {
-						$search_generic[] = array( 'field' => 'entry_date', 'input' => 'date' );
+					if ( ! empty( $widget[ 'search_date' ] ) ) {
+						$search_generic[ ] = array( 'field' => 'entry_date', 'input' => 'date' );
 					}
 
 					$search_config = array_merge( $search_generic, $search_fields );
 
 					// don't throw '[]' when json_encode an empty array
-					if( empty( $search_config ) ) {
+					if ( empty( $search_config ) ) {
 						$search_config = '';
 					} else {
 						$search_config = json_encode( $search_config );
 					}
 
-					$widgets[ $area ][ $k ]['search_fields'] = $search_config;
-					$widgets[ $area ][ $k ]['search_layout'] = 'horizontal';
+					$widgets[ $area ][ $k ][ 'search_fields' ] = $search_config;
+					$widgets[ $area ][ $k ][ 'search_layout' ] = 'horizontal';
 
 					gravityview()->log->debug( '[GravityView_Migrate/update_search_on_views] Updated Widget: ', array( 'data' => $widgets[ $area ][ $k ] ) );
 				}
@@ -281,26 +281,26 @@ 
 		// check view fields' settings
 		$fields = gravityview_get_directory_fields( $view_id, false );
 
-		if( !empty( $fields ) && is_array( $fields ) ) {
+		if ( ! empty( $fields ) && is_array( $fields ) ) {
 
-			foreach( $fields as $t => $fs ) {
+			foreach ( $fields as $t => $fs ) {
 
-				foreach( $fs as $k => $field ) {
+				foreach ( $fs as $k => $field ) {
 					// is field a search_filter ?
-					if( empty( $field['search_filter'] ) ) { continue; }
+					if ( empty( $field[ 'search_filter' ] ) ) { continue; }
 
 					// get field type & calculate the input type (by default)
-					$form_field = gravityview_get_field( $form, $field['id'] );
+					$form_field = gravityview_get_field( $form, $field[ 'id' ] );
 
-					if( empty( $form_field['type'] ) ) {
+					if ( empty( $form_field[ 'type' ] ) ) {
 						continue;
 					}
 
 					// depending on the field type assign a group of possible search field types
-					$type = GravityView_Widget_Search::get_search_input_types( $field['id'], $form_field['type'] );
+					$type = GravityView_Widget_Search::get_search_input_types( $field[ 'id' ], $form_field[ 'type' ] );
 
 					// add field to config
-					$search_fields[] = array( 'field' => $field['id'], 'input' => $type );
+					$search_fields[ ] = array( 'field' => $field[ 'id' ], 'input' => $type );
 
 				}
 			}

includes/class-gravityview-compatibility.php

Spacing +36 added lines, -36 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,
 			);
@@ -233,9 +233,9 @@ 
 
 		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>' ),
+				'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',
 				'dismiss' => 'wp_version',
 			);
@@ -258,17 +258,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 === version_compare( GFCommon::$version, GV_FUTURE_MIN_GF_VERSION, ">=" ) ) {
+			if ( true === version_compare( GFCommon::$version, GV_FUTURE_MIN_GF_VERSION, ">=" ) ) {
 				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;
@@ -283,14 +283,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://gravityview.co/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',
@@ -308,42 +308,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://gravityview.co/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://gravityview.co/gravityforms/" class="button button-secondary button-large button-hero">', '<em>', '</em>', '</a>' ),
 					'cap' => 'install_plugins',
 					'dismiss' => 'gf_installed',
 				);
@@ -360,10 +360,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',
@@ -382,21 +382,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-gravityview-shortcode.php

Spacing +9 added lines, -9 removed lines

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

includes/class-template.php

Spacing +49 added lines, -49 removed lines

@@ -16,7 +16,7 @@ 
 	die;
 }
 
-if( ! class_exists( 'Gamajo_Template_Loader' ) ) {
+if ( ! class_exists( 'Gamajo_Template_Loader' ) ) {
 	require( GRAVITYVIEW_DIR . 'includes/lib/class-gamajo-template-loader.php' );
 }
 
@@ -157,8 +157,8 @@ 
 			'atts'	  => NULL,
 		) );
 
-		foreach ($atts as $key => $value) {
-			if( is_null( $value ) ) {
+		foreach ( $atts as $key => $value ) {
+			if ( is_null( $value ) ) {
 				continue;
 			}
 			$this->{$key} = $value;
@@ -188,7 +188,7 @@ 
 	 */
 	static function getInstance( $passed_post = NULL ) {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self( $passed_post );
 		}
 
@@ -201,8 +201,8 @@ 
 	 */
 	public function getCurrentField( $key = NULL ) {
 
-		if( !empty( $key ) ) {
-			if( isset( $this->_current_field[ $key ] ) ) {
+		if ( ! empty( $key ) ) {
+			if ( isset( $this->_current_field[ $key ] ) ) {
 				return $this->_current_field[ $key ];
 			}
 			return NULL;
@@ -213,16 +213,16 @@ 
 
 	public function setCurrentFieldSetting( $key, $value ) {
 
-		if( !empty( $this->_current_field ) ) {
-			$this->_current_field['field_settings'][ $key ] = $value;
+		if ( ! empty( $this->_current_field ) ) {
+			$this->_current_field[ 'field_settings' ][ $key ] = $value;
 		}
 
 	}
 
 	public function getCurrentFieldSetting( $key ) {
-		$settings = $this->getCurrentField('field_settings');
+		$settings = $this->getCurrentField( 'field_settings' );
 
-		if( $settings && !empty( $settings[ $key ] ) ) {
+		if ( $settings && ! empty( $settings[ $key ] ) ) {
 			return $settings[ $key ];
 		}
 
@@ -253,8 +253,8 @@ 
 	 */
 	public function getAtts( $key = NULL ) {
 
-		if( !empty( $key ) ) {
-			if( isset( $this->atts[ $key ] ) ) {
+		if ( ! empty( $key ) ) {
+			if ( isset( $this->atts[ $key ] ) ) {
 				return $this->atts[ $key ];
 			}
 			return NULL;
@@ -320,7 +320,7 @@ 
 
 		$fields = empty( $this->fields ) ? NULL : $this->fields;
 
-		if( $fields && !empty( $key ) ) {
+		if ( $fields && ! empty( $key ) ) {
 			$fields = isset( $fields[ $key ] ) ? $fields[ $key ] : NULL;
 		}
 
@@ -338,18 +338,18 @@ 
 	 */
 	public function getContextFields( $context = '' ) {
 
-	    if( '' === $context ) {
+	    if ( '' === $context ) {
 	        $context = $this->getContext();
         }
 
 		$fields = $this->getFields();
 
-        foreach ( (array) $fields as $key => $context_fields ) {
+        foreach ( (array)$fields as $key => $context_fields ) {
 
             // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
             $matches = explode( '_', $key );
 
-            if( isset( $matches[0] ) && $matches[0] === $context ) {
+            if ( isset( $matches[ 0 ] ) && $matches[ 0 ] === $context ) {
                 return $context_fields;
             }
         }
@@ -370,8 +370,8 @@ 
 	 */
 	public function getField( $key ) {
 
-		if( !empty( $key ) ) {
-			if( isset( $this->fields[ $key ] ) ) {
+		if ( ! empty( $key ) ) {
+			if ( isset( $this->fields[ $key ] ) ) {
 				return $this->fields[ $key ];
 			}
 		}
@@ -477,8 +477,8 @@ 
 	public function getPaginationCounts() {
 
 		$paging = $this->getPaging();
-		$offset = $paging['offset'];
-		$page_size = $paging['page_size'];
+		$offset = $paging[ 'offset' ];
+		$page_size = $paging[ 'page_size' ];
 		$total = $this->getTotalEntries();
 
 		if ( empty( $total ) ) {
@@ -499,7 +499,7 @@ 
 		 */
 		list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', array( $first, $last, $total ) );
 
-		return array( 'first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total );
+		return array( 'first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total );
 	}
 
 	/**
@@ -595,16 +595,16 @@ 
 	 */
 	public function getCurrentEntry() {
 
-		if( in_array( $this->getContext(), array( 'edit', 'single') ) ) {
+		if ( in_array( $this->getContext(), array( 'edit', 'single' ) ) ) {
 			$entries = $this->getEntries();
-			$entry = $entries[0];
+			$entry = $entries[ 0 ];
 		} else {
 			$entry = $this->_current_entry;
 		}
 
 		/** @since 1.16 Fixes DataTables empty entry issue */
-		if ( empty( $entry ) && ! empty( $this->_current_field['entry'] ) ) {
-			$entry = $this->_current_field['entry'];
+		if ( empty( $entry ) && ! empty( $this->_current_field[ 'entry' ] ) ) {
+			$entry = $this->_current_field[ 'entry' ];
 		}
 
 		return $entry;
@@ -644,7 +644,7 @@ 
 	public function renderZone( $zone = '', $atts = array(), $echo = true ) {
 
 		if ( empty( $zone ) ) {
-			gravityview()->log->error( 'No zone defined.');
+			gravityview()->log->error( 'No zone defined.' );
 			return NULL;
 		}
 
@@ -653,16 +653,16 @@ 
 			'context' => $this->getContext(),
 			'entry' => $this->getCurrentEntry(),
 			'form' => $this->getForm(),
-			'hide_empty' => $this->getAtts('hide_empty'),
+			'hide_empty' => $this->getAtts( 'hide_empty' ),
 		);
 
 		$final_atts = wp_parse_args( $atts, $defaults );
 
 		$output = '';
 
-		$final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}";
+		$final_atts[ 'zone_id' ] = "{$final_atts[ 'context' ]}_{$final_atts[ 'slug' ]}-{$zone}";
 
-		$fields = $this->getField( $final_atts['zone_id'] );
+		$fields = $this->getField( $final_atts[ 'zone_id' ] );
 
 		// Backward compatibility
 		if ( 'table' === $this->getTemplatePartSlug() ) {
@@ -672,7 +672,7 @@ 
 			 * @param GravityView_View $this
 			 * @deprecated Use `gravityview/template/table/fields`
 			 */
-			$fields = apply_filters("gravityview_table_cells", $fields, $this );
+			$fields = apply_filters( "gravityview_table_cells", $fields, $this );
 		}
 
 		if ( empty( $fields ) ) {
@@ -684,7 +684,7 @@ 
 
 		$field_output = '';
 		foreach ( $fields as $field ) {
-			$final_atts['field'] = $field;
+			$final_atts[ 'field' ] = $field;
 
 			$field_output .= gravityview_field_output( $final_atts );
 		}
@@ -701,17 +701,17 @@ 
 			return NULL;
 		}
 
-		if( !empty( $final_atts['wrapper_class'] ) ) {
-			$output .= '<div class="'.gravityview_sanitize_html_class( $final_atts['wrapper_class'] ).'">';
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
+			$output .= '<div class="' . gravityview_sanitize_html_class( $final_atts[ 'wrapper_class' ] ) . '">';
 		}
 
 		$output .= $field_output;
 
-		if( !empty( $final_atts['wrapper_class'] ) ) {
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
 			$output .= '</div>';
 		}
 
-		if( $echo ) {
+		if ( $echo ) {
 			echo $output;
 		}
 
@@ -729,7 +729,7 @@ 
 	 */
 	function locate_template( $template_names, $load = false, $require_once = true ) {
 
-		if( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
+		if ( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
 
 			$located = $this->located_templates[ $template_names ];
 
@@ -738,7 +738,7 @@ 
 			// Set $load to always false so we handle it here.
 			$located = parent::locate_template( $template_names, false, $require_once );
 
-			if( is_string( $template_names ) ) {
+			if ( is_string( $template_names ) ) {
 				$this->located_templates[ $template_names ] = $located;
 			}
 		}
@@ -756,7 +756,7 @@ 
 	 * @return mixed|null    The stored data.
 	 */
 	public function __get( $name ) {
-		if( isset( $this->{$name} ) ) {
+		if ( isset( $this->{$name} ) ) {
 			return $this->{$name};
 		} else {
 			return NULL;
@@ -785,17 +785,17 @@ 
 		$additional = array();
 
 		// form-19-table-body.php
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
+		$additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
 
-		if( $view_id = $this->getViewId() ) {
+		if ( $view_id = $this->getViewId() ) {
 			// view-3-table-body.php
-			$additional[] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name );
+			$additional[ ] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name );
 		}
 
-		if( $this->getPostId() ) {
+		if ( $this->getPostId() ) {
 
 			// page-19-table-body.php
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
+			$additional[ ] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
 		}
 
 		// Combine with existing table-body.php and table.php
@@ -817,7 +817,7 @@ 
 
 		gravityview()->log->debug( 'Rendering Template File: {path}', array( 'path' => $template_file ) );
 
-		if( !empty( $template_file) ) {
+		if ( ! empty( $template_file ) ) {
 
 			if ( $require_once ) {
 				require_once( $template_file );
@@ -884,7 +884,7 @@ 
 
 		// Prevent being called twice
 		if ( did_action( "gravityview/widgets/$zone/{$view->ID}/rendered" ) ) {
-			gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone.'_'.$view->ID.'_widgets' ) );
+			gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone . '_' . $view->ID . '_widgets' ) );
 			return;
 		}
 
@@ -906,7 +906,7 @@ 
 		 * @param string $zone Current widget zone, either `header` or `footer`
 		 * @param array $widgets Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']`
 		 */
-		$css_class = apply_filters('gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() );
+		$css_class = apply_filters( 'gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() );
 
 		$css_class = gravityview_sanitize_html_class( $css_class );
 
@@ -914,15 +914,15 @@ 
 		?>
 		<div class="<?php echo $css_class; ?>">
 			<?php
-			foreach( $rows as $row ) {
-				foreach( $row as $col => $areas ) {
+			foreach ( $rows as $row ) {
+				foreach ( $row as $col => $areas ) {
 					$column = ( $col == '2-2' ) ? '1-2 gv-right' : "$col gv-left";
 				?>
 					<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
 						<?php
 						if ( ! empty( $areas ) ) {
 							foreach ( $areas as $area ) {
-								foreach ( $widgets->by_position( $zone . '_' . $area['areaid'] )->all() as $widget ) {
+								foreach ( $widgets->by_position( $zone . '_' . $area[ 'areaid' ] )->all() as $widget ) {
 									do_action( sprintf( 'gravityview/widgets/%s/render', $widget->get_widget_id() ), $widget->configuration->all(), null, $view_id_or_context );
 								}
 							}

includes/class-gravityview-merge-tags.php

Spacing +23 added lines, -23 removed lines

@@ -74,7 +74,7 @@ 
 
 		foreach ( $modifiers as $passed_modifier ) {
 
-			foreach( $gv_modifiers as $gv_modifier => $method ) {
+			foreach ( $gv_modifiers as $gv_modifier => $method ) {
 
 				// Uses ^ to only match the first modifier, to enforce same order as passed by GF
 				preg_match( '/^' . $gv_modifier . '/ism', $passed_modifier, $matches );
@@ -118,7 +118,7 @@ 
 	 */
 	private static function modifier_timestamp( $raw_value, $matches ) {
 
-		if( empty( $matches[0] ) ) {
+		if ( empty( $matches[ 0 ] ) ) {
 			return $raw_value;
 		}
 
@@ -147,11 +147,11 @@ 
 	 */
 	private static function modifier_maxwords( $raw_value, $matches, $field = null ) {
 
-		if( ! is_string( $raw_value ) || empty( $matches[1] ) || ! function_exists( 'wp_trim_words' ) ) {
+		if ( ! is_string( $raw_value ) || empty( $matches[ 1 ] ) || ! function_exists( 'wp_trim_words' ) ) {
 			return $raw_value;
 		}
 
-		$max = intval( $matches[1] );
+		$max = intval( $matches[ 1 ] );
 
 		$more_placeholder = '[GVMORE]';
 
@@ -220,7 +220,7 @@ 
 	private static function modifier_explode( $raw_value, $matches, $value, $field = null ) {
 
 		// For JSON-encoded arrays
-		if( $json_array = json_decode( $raw_value, true ) ) {
+		if ( $json_array = json_decode( $raw_value, true ) ) {
 			return implode( ' ', $json_array );
 		}
 
@@ -241,13 +241,13 @@ 
 	 */
 	private static function modifier_strings( $raw_value, $matches, $value = '', $field = null ) {
 
-		if( empty( $matches[0] ) ) {
+		if ( empty( $matches[ 0 ] ) ) {
 			return $raw_value;
 		}
 
 		$return = $raw_value;
 
-		switch( $matches[0] ) {
+		switch ( $matches[ 0 ] ) {
 			case 'urlencode':
 				$return = urlencode( $raw_value );
 				break;
@@ -329,9 +329,9 @@ 
 		 * @internal Fixed $form['title'] in Gravity Forms
 		 * @see      https://github.com/gravityforms/gravityforms/pull/27/files
 		 */
-		$form['title']  = isset( $form['title'] ) ? $form['title'] : '';
-		$form['id']     = isset( $form['id'] ) ? $form['id'] : '';
-		$form['fields'] = isset( $form['fields'] ) ? $form['fields'] : array();
+		$form[ 'title' ]  = isset( $form[ 'title' ] ) ? $form[ 'title' ] : '';
+		$form[ 'id' ]     = isset( $form[ 'id' ] ) ? $form[ 'id' ] : '';
+		$form[ 'fields' ] = isset( $form[ 'fields' ] ) ? $form[ 'fields' ] : array();
 
 		return GFCommon::replace_variables( $text, $form, $entry, $url_encode, $esc_html, $nl2br, $format, $aux_data );
 	}
@@ -392,7 +392,7 @@ 
 		// Is there is {gv_entry_link} or {gv_entry_link:[post id]} or {gv_entry_link:[post id]:[action]} merge tag?
 		preg_match_all( "/{gv_entry_link(?:\:(\d+)\:?(.*?))?}/ism", $original_text, $matches, PREG_SET_ORDER );
 
-		if( empty( $matches ) ) {
+		if ( empty( $matches ) ) {
 			return $original_text;
 		}
 
@@ -413,18 +413,18 @@ 
 		 * }
 		 */
 		foreach ( $matches as $match ) {
-			$full_tag = $match[0];
+			$full_tag = $match[ 0 ];
 
 			$link_args = array(
 				'return' => 'url',
-				'entry_id' => $entry['id'],
+				'entry_id' => $entry[ 'id' ],
 				'post_id' => \GV\Utils::get( $match, 1, null ),
 				'action' => \GV\Utils::get( $match, 2, 'read' ),
 			);
 
 			$entry_link = $Shortcode->read_shortcode( $link_args, null, 'gv_entry_link_merge_tag' );
 
-			if( $url_encode ) {
+			if ( $url_encode ) {
 				$entry_link = urlencode( $entry_link );
 			}
 
@@ -461,7 +461,7 @@ 
 			'diff' => in_array( 'diff', $exploded ), // {date_created:diff}
 			'raw' => in_array( 'raw', $exploded ), // {date_created:raw}
 			'timestamp' => in_array( 'timestamp', $exploded ), // {date_created:timestamp}
-			'time' => in_array( 'time', $exploded ),  // {date_created:time}
+			'time' => in_array( 'time', $exploded ), // {date_created:time}
 		);
 
 		$formatted_date = GVCommon::format_date( $date_created, $atts );
@@ -538,8 +538,8 @@ 
 			return $original_text;
 		}
 
-		foreach ( (array) $matches as $match ) {
-			$full_tag = $match[0];
+		foreach ( (array)$matches as $match ) {
+			$full_tag = $match[ 0 ];
 			$modifier = \GV\Utils::get( $match, 2, 'permalink' );
 
 			$replacement = false;
@@ -557,7 +557,7 @@ 
 					$replacement = esc_html( $replacement );
 				}
 
-				if( $url_encode ) {
+				if ( $url_encode ) {
 					$replacement = urlencode( $replacement );
 				}
 
@@ -597,14 +597,14 @@ 
 		preg_match_all( "/{get:(.*?)}/ism", $text, $matches, PREG_SET_ORDER );
 
 		// If there are no matches OR the Entry `created_by` isn't set or is 0 (no user)
-		if( empty( $matches ) ) {
+		if ( empty( $matches ) ) {
 			return $text;
 		}
 
 		foreach ( $matches as $match ) {
 
-			$full_tag = $match[0];
-			$property = $match[1];
+			$full_tag = $match[ 0 ];
+			$property = $match[ 1 ];
 
 			$value = stripslashes_deep( \GV\Utils::_GET( $property ) );
 
@@ -628,7 +628,7 @@ 
 			 * @since 1.15
 			 * @param bool $esc_html Whether to esc_html() the value. Default: `true`
 			 */
-			$esc_html = apply_filters('gravityview/merge_tags/get/esc_html/' . $property, true );
+			$esc_html = apply_filters( 'gravityview/merge_tags/get/esc_html/' . $property, true );
 
 			$value = $esc_html ? esc_html( $value ) : $value;
 
@@ -639,7 +639,7 @@ 
 			 * @param[in] array $form Gravity Forms form array
 			 * @param[in] array $entry Entry array
 			 */
-			$value = apply_filters('gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
+			$value = apply_filters( 'gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
 
 			$text = str_replace( $full_tag, $value, $text );
 		}

includes/class-admin-add-shortcode.php

Spacing +30 added lines, -30 removed lines

@@ -20,12 +20,12 @@ 
 
 	function __construct() {
 
-			add_action( 'media_buttons', array( $this, 'add_shortcode_button'), 30);
+			add_action( 'media_buttons', array( $this, 'add_shortcode_button' ), 30 );
 
-			add_action( 'admin_footer',	array( $this, 'add_shortcode_popup') );
+			add_action( 'admin_footer', array( $this, 'add_shortcode_popup' ) );
 
 			// adding styles and scripts
-			add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') );
+			add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) );
 
 			// ajax - populate sort fields based on the selected view
 			add_action( 'wp_ajax_gv_sortable_fields', array( $this, 'get_sortable_fields' ) );
@@ -40,7 +40,7 @@ 
 	 */
 	function is_post_editor_screen() {
 		global $current_screen, $pagenow;
-		return !empty( $current_screen->post_type ) && 'gravityview' != $current_screen->post_type && in_array( $pagenow , array( 'post.php' , 'post-new.php' ) );
+		return ! empty( $current_screen->post_type ) && 'gravityview' != $current_screen->post_type && in_array( $pagenow, array( 'post.php', 'post-new.php' ) );
 	}
 
 
@@ -55,15 +55,15 @@ 
 		/**
 		 * @since 1.15.3
 		 */
-		if( ! GVCommon::has_cap( array( 'publish_gravityviews' ) ) ) {
+		if ( ! GVCommon::has_cap( array( 'publish_gravityviews' ) ) ) {
 			return;
 		}
 
-		if( !$this->is_post_editor_screen() ) {
+		if ( ! $this->is_post_editor_screen() ) {
 			return;
 		}
 		?>
-		<a href="#TB_inline?width=600&amp;height=800&amp;inlineId=select_gravityview_view" class="thickbox hide-if-no-js button gform_media_link" id="add_gravityview" title="<?php esc_attr_e("Insert View", 'gravityview'); ?>"><span class="icon gv-icon-astronaut-head"></span><?php esc_html_e( 'Add View', 'gravityview' ); ?></a>
+		<a href="#TB_inline?width=600&amp;height=800&amp;inlineId=select_gravityview_view" class="thickbox hide-if-no-js button gform_media_link" id="add_gravityview" title="<?php esc_attr_e( "Insert View", 'gravityview' ); ?>"><span class="icon gv-icon-astronaut-head"></span><?php esc_html_e( 'Add View', 'gravityview' ); ?></a>
 		<?php
 
 	}
@@ -79,16 +79,16 @@ 
 	function add_shortcode_popup() {
 		global $post;
 
-		if( !$this->is_post_editor_screen() ) {
+		if ( ! $this->is_post_editor_screen() ) {
 			return;
 		}
 
-		$post_type = get_post_type_object($post->post_type);
+		$post_type = get_post_type_object( $post->post_type );
 
-		$views = get_posts( array('post_type' => 'gravityview', 'posts_per_page' => -1 ) );
+		$views = get_posts( array( 'post_type' => 'gravityview', 'posts_per_page' => -1 ) );
 
 		// If there are no views set up yet, we get outta here.
-		if( empty( $views ) ) {
+		if ( empty( $views ) ) {
 			echo '<div id="select_gravityview_view"><div class="wrap">' . GravityView_Admin::no_views_text() . '</div></div>';
 			return;
 		}
@@ -99,7 +99,7 @@ 
 				<div class="wrap">
 
 					<h2 class=""><?php esc_html_e( 'Embed a View', 'gravityview' ); ?></h2>
-					<p class="subtitle"><?php printf( esc_attr ( __( 'Use this form to embed a View into this %s. %sLearn more about using shortcodes.%s', 'gravityview') ), $post_type->labels->singular_name, '<a href="https://docs.gravityview.co/article/73-using-the-shortcode" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p>
+					<p class="subtitle"><?php printf( esc_attr( __( 'Use this form to embed a View into this %s. %sLearn more about using shortcodes.%s', 'gravityview' ) ), $post_type->labels->singular_name, '<a href="https://docs.gravityview.co/article/73-using-the-shortcode" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p>
 
 					<div>
 						<h3><label for="gravityview_id"><?php esc_html_e( 'Select a View', 'gravityview' ); ?></label></h3>
@@ -107,9 +107,9 @@ 
 						<select name="gravityview_id" id="gravityview_id">
 							<option value=""><?php esc_html_e( '&mdash; Select a View to Insert &mdash;', 'gravityview' ); ?></option>
 							<?php
-							foreach( $views as $view ) {
-								$title = empty( $view->post_title ) ? __('(no title)', 'gravityview') : $view->post_title;
-								echo '<option value="'. $view->ID .'">'. esc_html( sprintf('%s #%d', $title, $view->ID ) ) .'</option>';
+							foreach ( $views as $view ) {
+								$title = empty( $view->post_title ) ? __( '(no title)', 'gravityview' ) : $view->post_title;
+								echo '<option value="' . $view->ID . '">' . esc_html( sprintf( '%s #%d', $title, $view->ID ) ) . '</option>';
 							}
 							?>
 						</select>
@@ -125,7 +125,7 @@ 
 
 						foreach ( $settings as $key => $setting ) {
 
-							if( empty( $setting['show_in_shortcode'] ) ) { continue; }
+							if ( empty( $setting[ 'show_in_shortcode' ] ) ) { continue; }
 
 							GravityView_Render_Settings::render_setting_row( $key, array(), NULL, 'gravityview_%s', 'gravityview_%s' );
 						}
@@ -134,8 +134,8 @@ 
 					</table>
 
 					<div class="submit">
-						<input type="submit" class="button button-primary button-large alignleft hide-if-js" value="<?php esc_attr_e('Insert View', 'gravityview' ); ?>" id="insert_gravityview_view" />
-						<input class="button button-secondary alignright" type="submit" onclick="tb_remove(); return false;" value="<?php esc_attr_e("Cancel", 'gravityview'); ?>" />
+						<input type="submit" class="button button-primary button-large alignleft hide-if-js" value="<?php esc_attr_e( 'Insert View', 'gravityview' ); ?>" id="insert_gravityview_view" />
+						<input class="button button-secondary alignright" type="submit" onclick="tb_remove(); return false;" value="<?php esc_attr_e( "Cancel", 'gravityview' ); ?>" />
 					</div>
 
 				</div>
@@ -156,7 +156,7 @@ 
 	 */
 	function add_scripts_and_styles() {
 
-		if( ! $this->is_post_editor_screen() ) {
+		if ( ! $this->is_post_editor_screen() ) {
 			return;
 		}
 
@@ -167,22 +167,22 @@ 
 
 		$protocol = is_ssl() ? 'https://' : 'http://';
 
-		wp_enqueue_style( 'jquery-ui-datepicker', $protocol.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css', array(), GravityView_Plugin::version );
+		wp_enqueue_style( 'jquery-ui-datepicker', $protocol . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css', array(), GravityView_Plugin::version );
 
 		//enqueue styles
-		wp_register_style( 'gravityview_postedit_styles', plugins_url('assets/css/admin-post-edit.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
+		wp_register_style( 'gravityview_postedit_styles', plugins_url( 'assets/css/admin-post-edit.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
 		wp_enqueue_style( 'gravityview_postedit_styles' );
 
-		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
 		// custom js
-		wp_register_script( 'gravityview_postedit_scripts',  plugins_url('assets/js/admin-post-edit'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery', 'jquery-ui-datepicker' ), GravityView_Plugin::version );
+		wp_register_script( 'gravityview_postedit_scripts', plugins_url( 'assets/js/admin-post-edit' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery', 'jquery-ui-datepicker' ), GravityView_Plugin::version );
 		wp_enqueue_script( 'gravityview_postedit_scripts' );
-		wp_localize_script('gravityview_postedit_scripts', 'gvGlobals', array(
-			'nonce' => wp_create_nonce( 'gravityview_ajaxaddshortcode'),
+		wp_localize_script( 'gravityview_postedit_scripts', 'gvGlobals', array(
+			'nonce' => wp_create_nonce( 'gravityview_ajaxaddshortcode' ),
 			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
-			'alert_1' => esc_html__( 'Please select a View', 'gravityview'),
-		));
+			'alert_1' => esc_html__( 'Please select a View', 'gravityview' ),
+		) );
 
 	}
 
@@ -198,16 +198,16 @@ 
 	function get_sortable_fields() {
 
 		// Not properly formatted request
-		if ( empty( $_POST['viewid'] ) || !is_numeric( $_POST['viewid'] ) ) {
+		if ( empty( $_POST[ 'viewid' ] ) || ! is_numeric( $_POST[ 'viewid' ] ) ) {
 			exit( false );
 		}
 
 		// Not valid request
-		if( empty( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxaddshortcode' ) ) {
+		if ( empty( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxaddshortcode' ) ) {
 			exit( false );
 		}
 
-		$viewid = (int)$_POST['viewid'];
+		$viewid = (int)$_POST[ 'viewid' ];
 
 		// fetch form id assigned to the view
 		$formid = gravityview_get_form_id( $viewid );

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

Spacing +8 added lines, -8 removed lines

@@ -40,7 +40,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' ] );
 
 		$new_fields = array(
 			'content' => array(
@@ -68,7 +68,7 @@ 
 		);
 
 		if ( 'edit' === $context ) {
-			unset( $field_options['custom_label'], $field_options['show_label'], $field_options['allow_edit_cap'], $new_fields['wpautop'], $new_fields['oembed'] );
+			unset( $field_options[ 'custom_label' ], $field_options[ 'show_label' ], $field_options[ 'allow_edit_cap' ], $new_fields[ 'wpautop' ], $new_fields[ 'oembed' ] );
 		}
 
 		return $new_fields + $field_options;
@@ -102,9 +102,9 @@ 
 
 		// Loop through the configured Edit Entry fields and add Custom Content fields if there are any
 		// TODO: Make this available to other custom GV field types
-		foreach ( (array) $edit_fields as $edit_field ) {
+		foreach ( (array)$edit_fields as $edit_field ) {
 
-			if( 'custom' === \GV\Utils::get( $edit_field, 'id') ) {
+			if ( 'custom' === \GV\Utils::get( $edit_field, 'id' ) ) {
 
 				$field_data = array(
 					'label' => \GV\Utils::get( $edit_field, 'custom_label' ),
@@ -117,13 +117,13 @@ 
 					$field_data[ $key ] = GravityView_Merge_Tags::replace_variables( $field_datum, $form, $entry, false, false );
 				}
 
-				$field_data['cssClass'] = \GV\Utils::get( $edit_field, 'custom_class' );
+				$field_data[ 'cssClass' ] = \GV\Utils::get( $edit_field, 'custom_class' );
 
-				$new_fields[] = new GF_Field_HTML( $field_data );
+				$new_fields[ ] = new GF_Field_HTML( $field_data );
 
 			} else {
-				if( isset( $fields[ $i ] ) ) {
-					$new_fields[] =  $fields[ $i ];
+				if ( isset( $fields[ $i ] ) ) {
+					$new_fields[ ] = $fields[ $i ];
 				}
 				$i++;
 			}

includes/fields/class-gravityview-field-is-starred.php

Spacing +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
 	private function add_hooks() {
 	    /** @see \GV\Field::get_value_filters */
 		add_filter( "gravityview/field/{$this->name}/output", array( $this, 'get_content' ), 4, 2 );
-		add_action( 'gravityview/template/after', array( $this, 'print_script'), 10, 1 );
+		add_action( 'gravityview/template/after', array( $this, 'print_script' ), 10, 1 );
 		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
 	}
 
@@ -52,7 +52,7 @@ 
 	 */
 	function add_default_field( $entry_default_fields = array(), $form = array(), $zone = '' ) {
 
-		if( 'edit' !== $zone ) {
+		if ( 'edit' !== $zone ) {
 			$entry_default_fields[ $this->name ] = array(
 				'label' => $this->label,
 				'desc'  => $this->description,
@@ -76,7 +76,7 @@ 
 	public function get_content( $output, $template ) {
 		$entry = $template->entry;
 
-	    $star_url = GFCommon::get_base_url() .'/images/star' . intval( $entry['is_starred'] ) .'.png';
+	    $star_url = GFCommon::get_base_url() . '/images/star' . intval( $entry[ 'is_starred' ] ) . '.png';
 
 		$entry_id = '';
 
@@ -85,7 +85,7 @@ 
 		}
 
 		// if( $show_as_star )
-		$output = '<img class="gv-star-image" '.$entry_id.' data-is_starred="'. intval( $entry['is_starred'] ) .'" src="'. esc_attr( $star_url ) .'" />';
+		$output = '<img class="gv-star-image" ' . $entry_id . ' data-is_starred="' . intval( $entry[ 'is_starred' ] ) . '" src="' . esc_attr( $star_url ) . '" />';
 
 		self::$has_star_field = true;
 
@@ -102,7 +102,7 @@ 
 	 */
 	public function print_script( $context ) {
 
-		if( ! self::$has_star_field ) {
+		if ( ! self::$has_star_field ) {
 			return;
 		}