gravityview / GravityView

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

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 		}
 
 		if ( 'single' === $context ) {
-			unset( $field_options['new_window'] );
+			unset( $field_options[ 'new_window' ] );
 		}
 
 		return $field_options;

includes/widgets/class-gravityview-widget-custom-content.php

Spacing +14 added lines, -14 removed lines

@@ -19,7 +19,7 @@ 
 
 	function __construct() {
 
-		$this->widget_description = __('Insert custom text or HTML as a widget', 'gravityview' );
+		$this->widget_description = __( 'Insert custom text or HTML as a widget', 'gravityview' );
 
 		$default_values = array(
 			'header' => 1,
@@ -44,39 +44,39 @@ 
 			),
 		);
 
-		parent::__construct( __( 'Custom Content', 'gravityview' ) , 'custom_content', $default_values, $settings );
+		parent::__construct( __( 'Custom Content', 'gravityview' ), 'custom_content', $default_values, $settings );
 	}
 
-	public function render_frontend( $widget_args, $content = '', $context = '') {
+	public function render_frontend( $widget_args, $content = '', $context = '' ) {
 
-		if( !$this->pre_render_frontend() ) {
+		if ( ! $this->pre_render_frontend() ) {
 			return;
 		}
 
-		if( !empty( $widget_args['title'] ) ) {
-			echo $widget_args['title'];
+		if ( ! empty( $widget_args[ 'title' ] ) ) {
+			echo $widget_args[ 'title' ];
 		}
 
 
 		// Make sure the class is loaded in DataTables
-		if( !class_exists( 'GFFormDisplay' ) ) {
+		if ( ! class_exists( 'GFFormDisplay' ) ) {
 			include_once( GFCommon::get_base_path() . '/form_display.php' );
 		}
 
-		$widget_args['content'] = trim( rtrim( \GV\Utils::get( $widget_args, 'content' ) ) );
+		$widget_args[ 'content' ] = trim( rtrim( \GV\Utils::get( $widget_args, 'content' ) ) );
 
 		// No custom content
-		if( empty( $widget_args['content'] ) ) {
+		if ( empty( $widget_args[ 'content' ] ) ) {
 			gravityview()->log->debug( 'No content.' );
 			return;
 		}
 
 		// Add paragraphs?
-		if( !empty( $widget_args['wpautop'] ) ) {
-			$widget_args['content'] = wpautop( $widget_args['content'] );
+		if ( ! empty( $widget_args[ 'wpautop' ] ) ) {
+			$widget_args[ 'content' ] = wpautop( $widget_args[ 'content' ] );
 		}
 
-		$content = $widget_args['content'];
+		$content = $widget_args[ 'content' ];
 
 		$content = GravityView_Merge_Tags::replace_variables( $content, array(), array(), false, true, false );
 
@@ -86,10 +86,10 @@ 
 
 
 		// Add custom class
-		$class = !empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
+		$class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
 		$class = gravityview_sanitize_html_class( $class );
 
-		echo '<div class="gv-widget-custom-content '.$class.'">'. $content .'</div>';
+		echo '<div class="gv-widget-custom-content ' . $class . '">' . $content . '</div>';
 
 	}
 

includes/widgets/register-gravityview-widgets.php

Spacing +9 added lines, -9 removed lines

@@ -16,17 +16,17 @@
  */
 function gravityview_register_gravityview_widgets() {
 
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' );
 
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/search-widget/class-search-widget.php' );
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-custom-content.php' );
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-gravityforms.php' );
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-size.php' );
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-pagination-info.php' );
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-links.php' );
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/search-widget/class-search-widget.php' );
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-custom-content.php' );
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-gravityforms.php' );
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-size.php' );
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-pagination-info.php' );
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-links.php' );
 
-	if( class_exists('GFPolls') ) {
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/poll/class-gravityview-widget-poll.php' );
+	if ( class_exists( 'GFPolls' ) ) {
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/poll/class-gravityview-widget-poll.php' );
 	}
 
 }

includes/admin/class-gravityview-admin-view-item.php

Spacing +39 added lines, -39 removed lines

@@ -44,12 +44,12 @@ 
 	 */
 	protected $form_id;
 
-	function __construct( $title = '', $item_id = '', $item = array(), $settings = array(), $form_id = null) {
+	function __construct( $title = '', $item_id = '', $item = array(), $settings = array(), $form_id = null ) {
 
 		// Backward compat
-		if ( ! empty( $item['type'] ) ) {
-			$item['input_type'] = $item['type'];
-			unset( $item['type'] );
+		if ( ! empty( $item[ 'type' ] ) ) {
+			$item[ 'input_type' ] = $item[ 'type' ];
+			unset( $item[ 'type' ] );
 		}
 
 		if ( $admin_label = \GV\Utils::get( $settings, 'admin_label' ) ) {
@@ -76,7 +76,7 @@ 
 		$this->id         = $item_id;
 		$this->form_id    = $form_id;
 		$this->settings   = $settings;
-		$this->label_type = $item['label_type'];
+		$this->label_type = $item[ 'label_type' ];
 	}
 
 	/**
@@ -120,14 +120,14 @@ 
 
 			foreach ( $field_info_items as $item ) {
 
-				if( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
+				if ( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
 					continue;
 				}
 
-				$class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description';
+				$class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description';
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
 				$output .= '<span class="' . $class . '">';
-				$output .= esc_html( $item['value'] );
+				$output .= esc_html( $item[ 'value' ] );
 				$output .= '</span>';
 			}
 
@@ -156,46 +156,46 @@ 
 
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
 		// TODO: Un-hack this
-		$hide_settings_link_class = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
-		$settings_link      = sprintf( '<button class="gv-field-settings %2$s" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class );
+		$hide_settings_link_class = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
+		$settings_link = sprintf( '<button class="gv-field-settings %2$s" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class );
 
 		// When a field label is empty, use the Field ID
 		$label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title;
 
 		// If there's a custom label, and show label is checked, use that as the field heading
-		if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) {
-			$label = $this->settings['custom_label'];
-		} else if ( ! empty( $this->item['customLabel'] ) ) {
-			$label = $this->item['customLabel'];
+		if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) {
+			$label = $this->settings[ 'custom_label' ];
+		} else if ( ! empty( $this->item[ 'customLabel' ] ) ) {
+			$label = $this->item[ 'customLabel' ];
 		}
 		$label = esc_attr( $label );
 
 		$field_icon = '';
 
 		$form = ! empty( $this->form_id ) ? GVCommon::get_form( $this->form_id ) : false;
-		$nonexistent_form_field = $form && $this->id && preg_match('/^\d+\.\d+$|^\d+$/', $this->id) && ! gravityview_get_field( $form, $this->id );
+		$nonexistent_form_field = $form && $this->id && preg_match( '/^\d+\.\d+$|^\d+$/', $this->id ) && ! gravityview_get_field( $form, $this->id );
 
-		if ( $this->item['icon'] && ! \GV\Utils::get( $this->item, 'parent' ) ) {
+		if ( $this->item[ 'icon' ] && ! \GV\Utils::get( $this->item, 'parent' ) ) {
 
-			$has_gf_icon = ( false !== strpos( $this->item['icon'], 'gform-icon' ) );
-			$has_dashicon = ( false !== strpos( $this->item['icon'], 'dashicons' ) );
+			$has_gf_icon = ( false !== strpos( $this->item[ 'icon' ], 'gform-icon' ) );
+			$has_dashicon = ( false !== strpos( $this->item[ 'icon' ], 'dashicons' ) );
 
-			if ( 0 === strpos( $this->item['icon'], 'data:' ) ) {
+			if ( 0 === strpos( $this->item[ 'icon' ], 'data:' ) ) {
 				// Inline icon SVG
-				$field_icon = '<i class="dashicons background-icon" style="background-image: url(\'' . esc_attr( $this->item['icon'] ) . '\');"></i>';
-			} elseif( $has_gf_icon && gravityview()->plugin->is_GF_25() ) {
+				$field_icon = '<i class="dashicons background-icon" style="background-image: url(\'' . esc_attr( $this->item[ 'icon' ] ) . '\');"></i>';
+			} elseif ( $has_gf_icon && gravityview()->plugin->is_GF_25() ) {
 				// Gravity Forms icon font
-				$field_icon = '<i class="gform-icon ' . esc_attr( $this->item['icon'] ) . '"></i>';
-			} elseif( $has_dashicon ) {
+				$field_icon = '<i class="gform-icon ' . esc_attr( $this->item[ 'icon' ] ) . '"></i>';
+			} elseif ( $has_dashicon ) {
 				// Dashicon; prefix with "dashicons"
-				$field_icon = '<i class="dashicons ' . esc_attr( $this->item['icon'] ) . '"></i>';
+				$field_icon = '<i class="dashicons ' . esc_attr( $this->item[ 'icon' ] ) . '"></i>';
 			} else {
 				// Not dashicon icon
-				$field_icon = '<i class="' . esc_attr( $this->item['icon'] ) . '"></i>';
+				$field_icon = '<i class="' . esc_attr( $this->item[ 'icon' ] ) . '"></i>';
 			}
 
 			$field_icon = $field_icon . ' ';
-		} elseif( \GV\Utils::get( $this->item, 'parent' ) ) {
+		} elseif ( \GV\Utils::get( $this->item, 'parent' ) ) {
 			$field_icon = '<i class="gv-icon gv-icon-level-down"></i>' . ' ';
 		}
 
@@ -222,19 +222,19 @@ 
 
 		$output .= '</h5>';
 
-		$container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : '';
+		$container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : '';
 
 		$container_class .= $nonexistent_form_field ? ' gv-nonexistent-form-field' : '';
 
-		$container_class .= empty( $this->settings['show_as_link'] ) ? '' : ' has-single-entry-link';
+		$container_class .= empty( $this->settings[ 'show_as_link' ] ) ? '' : ' has-single-entry-link';
 
-		$container_class .= empty( $this->settings['only_loggedin'] ) ? '' : ' has-custom-visibility';
+		$container_class .= empty( $this->settings[ 'only_loggedin' ] ) ? '' : ' has-custom-visibility';
 
-		$data_form_id   = $form ? ' data-formid="' . esc_attr( $this->form_id ) . '"' : '';
+		$data_form_id = $form ? ' data-formid="' . esc_attr( $this->form_id ) . '"' : '';
 
-		$data_parent_label = ! empty( $this->item['parent'] ) ? ' data-parent-label="' . esc_attr( $this->item['parent']['label'] ) . '"' : '';
+		$data_parent_label = ! empty( $this->item[ 'parent' ] ) ? ' data-parent-label="' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . '"' : '';
 
-		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . $data_parent_label . ' data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>';
+		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . $data_parent_label . ' data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>';
 
 		return $output;
 	}
@@ -252,12 +252,12 @@ 
 
 		$icons = array(
 			'show_as_link' => array(
-				'visible' => ( ! empty( $this->settings['show_as_link'] ) ),
+				'visible' => ( ! empty( $this->settings[ 'show_as_link' ] ) ),
 				'title' => __( 'This field links to the Single Entry', 'gravityview' ),
 				'css_class' => 'dashicons dashicons-media-default icon-link-to-single-entry',
 			),
 			'only_loggedin' => array(
-				'visible' => ( \GV\Utils::get( $this->settings, 'only_loggedin' ) || isset( $this->settings['allow_edit_cap'] ) && 'read' !== $this->settings['allow_edit_cap'] ),
+				'visible' => ( \GV\Utils::get( $this->settings, 'only_loggedin' ) || isset( $this->settings[ 'allow_edit_cap' ] ) && 'read' !== $this->settings[ 'allow_edit_cap' ] ),
 				'title' => __( 'This field has modified visibility', 'gravityview' ),
 				'css_class' => 'dashicons dashicons-lock icon-custom-visibility',
 			),
@@ -271,21 +271,21 @@ 
 		 * @param array $icons Array of icons to be shown, with `visible`, `title`, `css_class` keys.
 		 * @param array $item_settings Settings for the current item (widget or field)
 		 */
-		$icons = (array) apply_filters( 'gravityview/admin/indicator_icons', $icons, $this->settings );
+		$icons = (array)apply_filters( 'gravityview/admin/indicator_icons', $icons, $this->settings );
 
 		foreach ( $icons as $icon ) {
 
-			if ( empty( $icon['css_class'] ) || empty( $icon['title'] ) ) {
+			if ( empty( $icon[ 'css_class' ] ) || empty( $icon[ 'title' ] ) ) {
 				continue;
 			}
 
-			$css_class = trim( $icon['css_class'] );
+			$css_class = trim( $icon[ 'css_class' ] );
 
-			if ( empty( $icon['visible'] ) ) {
+			if ( empty( $icon[ 'visible' ] ) ) {
 				$css_class .= ' hide-if-js';
 			}
 
-			$output .= '<span class="' . gravityview_sanitize_html_class( $css_class ) . '" title="' . esc_attr( $icon['title'] ) . '"></span>';
+			$output .= '<span class="' . gravityview_sanitize_html_class( $css_class ) . '" title="' . esc_attr( $icon[ 'title' ] ) . '"></span>';
 		}
 
 		return $output;

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

Spacing +4 added lines, -4 removed lines

@@ -50,26 +50,26 @@
 
 		if ( ! empty( $quiz_fields ) ) {
 
-			$fields['gquiz_score']   = array(
+			$fields[ 'gquiz_score' ] = array(
 				'label' => __( 'Quiz Score Total', 'gravityview' ),
 				'type'  => 'quiz_score',
 				'desc'  => __( 'Displays the number of correct Quiz answers the user submitted.', 'gravityview' ),
 				'icon'  => 'dashicons-forms',
 			);
-			$fields['gquiz_percent'] = array(
+			$fields[ 'gquiz_percent' ] = array(
 				'label' => __( 'Quiz Percentage Grade', 'gravityview' ),
 				'type'  => 'quiz_percent',
 				'desc'  => __( 'Displays the percentage of correct Quiz answers the user submitted.', 'gravityview' ),
 				'icon'  => 'dashicons-forms',
 			);
-			$fields['gquiz_grade']   = array(
+			$fields[ 'gquiz_grade' ] = array(
 				/* translators: This is a field type used by the Gravity Forms Quiz Addon. "A" is 100-90, "B" is 89-80, "C" is 79-70, etc.  */
 				'label' => __( 'Quiz Letter Grade', 'gravityview' ),
 				'type'  => 'quiz_grade',
 				'desc'  => __( 'Displays the Grade the user achieved based on Letter Grading configured in the Quiz Settings.', 'gravityview' ),
 				'icon'  => 'dashicons-forms',
 			);
-			$fields['gquiz_is_pass'] = array(
+			$fields[ 'gquiz_is_pass' ] = array(
 				'label' => __( 'Quiz Pass/Fail', 'gravityview' ),
 				'type'  => 'quiz_is_pass',
 				'desc'  => __( 'Displays either Passed or Failed based on the Pass/Fail settings configured in the Quiz Settings.', 'gravityview' ),

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

Spacing +5 added lines, -5 removed lines

@@ -29,13 +29,13 @@ 
 
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
-		unset( $field_options['show_as_link'] );
+		unset( $field_options[ 'show_as_link' ] );
 
-		$field_options['trim_words'] = array(
+		$field_options[ 'trim_words' ] = array(
 			'type' => 'number',
 			'merge_tags' => false,
 			'value' => null,
@@ -43,7 +43,7 @@ 
 			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
 		);
 
-        $field_options['make_clickable'] = array(
+        $field_options[ 'make_clickable' ] = array(
             'type' => 'checkbox',
             'merge_tags' => false,
             'value' => 0,
@@ -51,7 +51,7 @@ 
             'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
         );
 
-		$field_options['allow_html'] = array(
+		$field_options[ 'allow_html' ] = array(
 			'type' => 'checkbox',
 			'merge_tags' => false,
 			'value' => 1,

includes/class-gravityview-merge-tags.php

Spacing +25 added lines, -25 removed lines

@@ -78,12 +78,12 @@ 
 
 			$non_gv_modifiers = array_diff( $modifiers, array_keys( $gv_modifiers ) );
 
-			$return = $field->get_value_merge_tag( $value, '', array( 'currency' => '' ), array(), implode( '', $non_gv_modifiers ), $raw_value, false, false, 'text', false);
+			$return = $field->get_value_merge_tag( $value, '', array( 'currency' => '' ), array(), implode( '', $non_gv_modifiers ), $raw_value, false, false, 'text', false );
 		}
 
 		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 );
@@ -132,7 +132,7 @@ 
 	 */
 	private static function modifier_timestamp( $raw_value, $matches ) {
 
-		if( empty( $matches[0] ) ) {
+		if ( empty( $matches[ 0 ] ) ) {
 			return $raw_value;
 		}
 
@@ -161,11 +161,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]';
 
@@ -234,7 +234,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 );
 		}
 
@@ -255,13 +255,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;
@@ -348,9 +348,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 );
 	}
@@ -418,7 +418,7 @@ 
 
 		$site_url = get_site_url();
 
-		if( $url_encode ) {
+		if ( $url_encode ) {
 			$site_url = urlencode( $site_url );
 		}
 
@@ -445,7 +445,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;
 		}
 
@@ -466,18 +466,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 );
 			}
 
@@ -514,7 +514,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 );
@@ -591,8 +591,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;
@@ -610,7 +610,7 @@ 
 					$replacement = esc_html( $replacement );
 				}
 
-				if( $url_encode ) {
+				if ( $url_encode ) {
 					$replacement = urlencode( $replacement );
 				}
 
@@ -650,14 +650,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 ) );
 
@@ -681,7 +681,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;
 
@@ -692,7 +692,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-installer.php

Spacing +57 added lines, -57 removed lines

@@ -53,7 +53,7 @@ 
 	 */
 	public function register_noconflict( $items ) {
 
-		$items[] = 'gravityview-admin-installer';
+		$items[ ] = 'gravityview-admin-installer';
 
 		return $items;
 	}
@@ -68,21 +68,21 @@ 
 
 	    $downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT );
 
-	    if ( ! $downloads_data && ! isset( $_GET['cache'] ) ) {
+	    if ( ! $downloads_data && ! isset( $_GET[ 'cache' ] ) ) {
 			return;
 		}
 
-		add_filter( 'plugins_api', function ( $data, $action, $args ) use ( $downloads_data ) {
+		add_filter( 'plugins_api', function( $data, $action, $args ) use ( $downloads_data ) {
 			foreach ( $downloads_data as $extension ) {
-				if ( empty( $extension['info'] ) || empty( $args->slug ) || $args->slug !== $extension['info']['slug'] ) {
+				if ( empty( $extension[ 'info' ] ) || empty( $args->slug ) || $args->slug !== $extension[ 'info' ][ 'slug' ] ) {
 					continue;
 				}
 
-				return (object) array(
-					'slug'          => $extension['info']['slug'],
-					'name'          => $extension['info']['title'],
-					'version'       => $extension['licensing']['version'],
-					'download_link' => $extension['files'][0]['file'],
+				return (object)array(
+					'slug'          => $extension[ 'info' ][ 'slug' ],
+					'name'          => $extension[ 'info' ][ 'title' ],
+					'version'       => $extension[ 'licensing' ][ 'version' ],
+					'download_link' => $extension[ 'files' ][ 0 ][ 'file' ],
 				);
 			}
 
@@ -149,13 +149,13 @@ 
 
 		foreach ( $all_plugins as $path => $plugin ) {
 
-			if ( empty( $plugin['TextDomain'] ) ) {
+			if ( empty( $plugin[ 'TextDomain' ] ) ) {
 				continue;
 			}
 
-			$wp_plugins[ $plugin['TextDomain'] ] = array(
+			$wp_plugins[ $plugin[ 'TextDomain' ] ] = array(
 				'path'      => $path,
-				'version'   => $plugin['Version'],
+				'version'   => $plugin[ 'Version' ],
 				'activated' => is_plugin_active( $path )
 			);
 		}
@@ -209,11 +209,11 @@ 
 
 		$downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT );
 
-		if ( $downloads_data && ! isset( $_GET['cache'] ) ) {
+		if ( $downloads_data && ! isset( $_GET[ 'cache' ] ) ) {
 			return $downloads_data;
 		}
 
-		if( \GV\Plugin::is_network_activated() ) {
+		if ( \GV\Plugin::is_network_activated() ) {
 			$home_url = network_home_url();
 		} else {
 			$home_url = home_url();
@@ -241,13 +241,13 @@ 
 
 		$downloads_data = json_decode( wp_remote_retrieve_body( $response ), true );
 
-		if ( empty( $downloads_data['products'] ) ) {
+		if ( empty( $downloads_data[ 'products' ] ) ) {
 			return array();
 		}
 
-		$this->set_downloads_data( $downloads_data['products'] );
+		$this->set_downloads_data( $downloads_data[ 'products' ] );
 
-		return $downloads_data['products'];
+		return $downloads_data[ 'products' ];
 	}
 
 	/**
@@ -307,7 +307,7 @@ 
 
             <h2><?php esc_html_e( 'The following plugins extend GravityView and Gravity Forms functionality:', 'gravityview' ); ?></h2>
 
-			<a class="button button-secondary gv-admin-installer-refresh-link" href="<?php echo add_query_arg(array( 'cache' => 1 ) ); ?>"><i class="dashicons dashicons-update" style="margin-top: .2em"></i> <?php esc_html_e( 'Refresh', 'gravityview' ); ?></a>
+			<a class="button button-secondary gv-admin-installer-refresh-link" href="<?php echo add_query_arg( array( 'cache' => 1 ) ); ?>"><i class="dashicons dashicons-update" style="margin-top: .2em"></i> <?php esc_html_e( 'Refresh', 'gravityview' ); ?></a>
 
 			<hr class="wp-header-end" />
 
@@ -324,11 +324,11 @@ 
 
 				$this->render_section( 'extensions', esc_html__( 'GravityView Extensions', 'gravityview' ), $downloads_data, $wp_plugins );
 
-				$this->render_section(  'plugins', esc_html__( 'Gravity Forms Add-Ons', 'gravityview' ), $downloads_data, $wp_plugins );
+				$this->render_section( 'plugins', esc_html__( 'Gravity Forms Add-Ons', 'gravityview' ), $downloads_data, $wp_plugins );
 
-				$this->render_section(  'labs', esc_html__( 'GravityView Labs', 'gravityview' ), $downloads_data, $wp_plugins );
+				$this->render_section( 'labs', esc_html__( 'GravityView Labs', 'gravityview' ), $downloads_data, $wp_plugins );
 
-				$this->render_section(  'friends', esc_html__( 'Friends of GravityView', 'gravityview' ), $downloads_data, $wp_plugins );
+				$this->render_section( 'friends', esc_html__( 'Friends of GravityView', 'gravityview' ), $downloads_data, $wp_plugins );
 				?>
             </div>
         </div>
@@ -355,7 +355,7 @@ 
 				continue;
 			}
 
-			if ( empty( $download['info'] ) ) {
+			if ( empty( $download[ 'info' ] ) ) {
 				continue;
 			}
 
@@ -383,31 +383,31 @@ 
 
         $details = $this->get_download_display_details( $download, $wp_plugins );
 
-        $download_info = $details['download_info'];
+        $download_info = $details[ 'download_info' ];
 
 		?>
-        <div class="item <?php echo esc_attr( $details['item_class'] ); ?>">
+        <div class="item <?php echo esc_attr( $details[ 'item_class' ] ); ?>">
             <div class="addon-inner">
-                <a href="<?php echo esc_url( $download_info['link'] ); ?>" rel="external noreferrer noopener" title="<?php esc_html_e( 'Visit the plugin page', 'gravityview' ); ?>"><img class="thumbnail" src="<?php echo esc_attr( $download_info['thumbnail'] ); ?>" alt="" /></a>
-                <h3><?php echo esc_html( \GV\Utils::get( $download_info, 'installer_title', $download_info['title'] ) ); ?></h3>
+                <a href="<?php echo esc_url( $download_info[ 'link' ] ); ?>" rel="external noreferrer noopener" title="<?php esc_html_e( 'Visit the plugin page', 'gravityview' ); ?>"><img class="thumbnail" src="<?php echo esc_attr( $download_info[ 'thumbnail' ] ); ?>" alt="" /></a>
+                <h3><?php echo esc_html( \GV\Utils::get( $download_info, 'installer_title', $download_info[ 'title' ] ) ); ?></h3>
                 <div>
-                    <?php if( ! empty( $details['status_label'] ) ) { ?>
-                    <div class="status <?php echo esc_attr( $details['status'] ); ?>" title="<?php printf( esc_attr__( 'Plugin status: %s', 'gravityview' ), esc_html( $details['status_label'] ) ); ?>">
-                        <span class="dashicons dashicons-admin-plugins"></span> <span class="status-label"><?php echo esc_html( $details['status_label'] ); ?></span>
+                    <?php if ( ! empty( $details[ 'status_label' ] ) ) { ?>
+                    <div class="status <?php echo esc_attr( $details[ 'status' ] ); ?>" title="<?php printf( esc_attr__( 'Plugin status: %s', 'gravityview' ), esc_html( $details[ 'status_label' ] ) ); ?>">
+                        <span class="dashicons dashicons-admin-plugins"></span> <span class="status-label"><?php echo esc_html( $details[ 'status_label' ] ); ?></span>
                     </div>
 			        <?php } ?>
 
-					<?php if ( 'gravityview' !== $download_info['slug'] ) { ?>
-                    <a data-status="<?php echo esc_attr( $details['status'] ); ?>" data-plugin-path="<?php echo esc_attr( $details['plugin_path'] ); ?>" href="<?php echo esc_url( $details['href'] ); ?>" class="button <?php echo esc_attr( $details['button_class'] ); ?>" title="<?php echo esc_attr( $details['button_title'] ); ?>">
-                        <span class="title"><?php echo esc_html( $details['button_label'] ); ?></span>
-                        <?php if( $details['spinner'] ) { ?><span class="spinner"></span><?php } ?>
+					<?php if ( 'gravityview' !== $download_info[ 'slug' ] ) { ?>
+                    <a data-status="<?php echo esc_attr( $details[ 'status' ] ); ?>" data-plugin-path="<?php echo esc_attr( $details[ 'plugin_path' ] ); ?>" href="<?php echo esc_url( $details[ 'href' ] ); ?>" class="button <?php echo esc_attr( $details[ 'button_class' ] ); ?>" title="<?php echo esc_attr( $details[ 'button_title' ] ); ?>">
+                        <span class="title"><?php echo esc_html( $details[ 'button_label' ] ); ?></span>
+                        <?php if ( $details[ 'spinner' ] ) { ?><span class="spinner"></span><?php } ?>
                     </a>
 					<?php } ?>
                 </div>
 
                 <div class="addon-excerpt"><?php
 
-                    $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] );
+                    $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info[ 'excerpt' ] );
 
                     // Allow some pure HTML tags, but remove everything else from the excerpt.
                     $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' );
@@ -449,7 +449,7 @@ 
 	 */
 	private function get_download_display_details( $download, $wp_plugins ) {
 
-		$download_info = wp_parse_args( (array) $download['info'], array(
+		$download_info = wp_parse_args( (array)$download[ 'info' ], array(
 			'thumbnail' => '',
 			'title' => '',
 			'textdomain' => '',
@@ -461,9 +461,9 @@ 
 			'installer_excerpt' => null, // May not be defined
 		) );
 
-		$wp_plugin = \GV\Utils::get( $wp_plugins, $download_info['textdomain'], false );
+		$wp_plugin = \GV\Utils::get( $wp_plugins, $download_info[ 'textdomain' ], false );
 
-		$has_access = ! empty( $download['files'] );
+		$has_access = ! empty( $download[ 'files' ] );
 		$spinner = true;
 		$href = $plugin_path = '#';
 		$status = $item_class = $button_title = $button_class = '';
@@ -473,11 +473,11 @@ 
 		$required_license = $galactic_only ? __( 'All Access', 'gravityview' ) : __( 'Core + Extensions', 'gravityview' );
 
 		// The license is not active - no matter what level, this should not work
-		if( ! $is_active  && empty( $base_price ) ) {
+		if ( ! $is_active && empty( $base_price ) ) {
 			$spinner      = false;
 			$status_label = '';
 			$button_label = sprintf( __( 'Active %s License is Required.', 'gravityview' ), $required_license );
-			$href         = $download_info['link'];
+			$href         = $download_info[ 'link' ];
 			$button_class = 'button-primary';
 		}
 
@@ -487,7 +487,7 @@ 
 			$status_label = '';
 			$button_label = sprintf( __( 'Purchase Now for %s', 'gravityview' ), '$' . $base_price );
 			$button_class = 'button-primary button-large';
-			$href         = $download_info['link'];
+			$href         = $download_info[ 'link' ];
 			$item_class   = 'featured';
 		}
 
@@ -500,7 +500,7 @@ 
 			$href         = 'https://gravityview.co/pricing/?utm_source=admin-installer&utm_medium=admin&utm_campaign=Admin%20Notice&utm_content=' . $required_license;
 		}
 
-        elseif ( ! empty( $download_info['coming_soon'] ) ) {
+        elseif ( ! empty( $download_info[ 'coming_soon' ] ) ) {
 	        $spinner      = false;
 	        $status       = 'notinstalled';
 	        $status_label = __( 'Coming Soon', 'gravityview' );
@@ -515,8 +515,8 @@ 
 			$href = add_query_arg(
 				array(
 					'action'   => 'install-plugin',
-					'plugin'   => $download_info['slug'],
-					'_wpnonce' => wp_create_nonce( 'install-plugin_' . $download_info['slug'] ),
+					'plugin'   => $download_info[ 'slug' ],
+					'_wpnonce' => wp_create_nonce( 'install-plugin_' . $download_info[ 'slug' ] ),
 				),
 				self_admin_url( 'update.php' )
 			);
@@ -532,12 +532,12 @@ 
 			$status = 'inactive';
 			$status_label = __( 'Inactive', 'gravityview' );
 			$button_label = __( 'Activate', 'gravityview' );
-			$plugin_path = $wp_plugin['path'];
+			$plugin_path = $wp_plugin[ 'path' ];
 			$button_class = 'button-secondary';
 		}
 		// The plugin is installed and active
-		elseif ( ! empty( $wp_plugin['path'] ) ) {
-			$plugin_path = $wp_plugin['path'];
+		elseif ( ! empty( $wp_plugin[ 'path' ] ) ) {
+			$plugin_path = $wp_plugin[ 'path' ];
 			$status = 'active';
 			$status_label = __( 'Active', 'gravityview' );
 			$button_label = __( 'Deactivate', 'gravityview' );
@@ -550,9 +550,9 @@ 
 			$href = add_query_arg( array( 'license_key' => $license_key ), $href );
 		}
 
-		$download_info['link'] = add_query_arg( array( 'license_key' => $license_key ), $download_info['link'] );
+		$download_info[ 'link' ] = add_query_arg( array( 'license_key' => $license_key ), $download_info[ 'link' ] );
 
-		return compact( 'download_info','plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' );
+		return compact( 'download_info', 'plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' );
     }
 
 	/**
@@ -567,11 +567,11 @@ 
 	    $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 );
 		$base_price = \GFCommon::to_number( $base_price );
 
-		unset( $download['pricing']['amount'] );
+		unset( $download[ 'pricing' ][ 'amount' ] );
 
 		// Price options array, not single price
-		if ( ! $base_price && ! empty( $download['pricing'] ) ) {
-			$base_price = array_shift( $download['pricing'] );
+		if ( ! $base_price && ! empty( $download[ 'pricing' ] ) ) {
+			$base_price = array_shift( $download[ 'pricing' ] );
 		}
 
 		return floatval( $base_price );
@@ -585,13 +585,13 @@ 
 	public function activate_download() {
 		$data = \GV\Utils::_POST( 'data', array() );
 
-		if ( empty( $data['path'] ) ) {
+		if ( empty( $data[ 'path' ] ) ) {
 			return;
 		}
 
-		$result = activate_plugin( $data['path'] );
+		$result = activate_plugin( $data[ 'path' ] );
 
-		if ( is_wp_error( $result ) || ! is_plugin_active( $data['path'] ) ) {
+		if ( is_wp_error( $result ) || ! is_plugin_active( $data[ 'path' ] ) ) {
 			wp_send_json_error( array(
                 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() )
             ) );
@@ -608,13 +608,13 @@ 
 	public function deactivate_download() {
 		$data = \GV\Utils::_POST( 'data', array() );
 
-		if ( empty( $data['path'] ) ) {
+		if ( empty( $data[ 'path' ] ) ) {
 			return;
 		}
 
-		deactivate_plugins( $data['path'] );
+		deactivate_plugins( $data[ 'path' ] );
 
-		if( is_plugin_active( $data['path'] ) ) {
+		if ( is_plugin_active( $data[ 'path' ] ) ) {
             wp_send_json_error( array(
                 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) )
             ) );

includes/class-cache.php

Spacing +18 added lines, -18 removed lines

@@ -81,7 +81,7 @@ 
 		/**
 		 * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
 		 */
-		foreach( $this->lead_db_columns as $column ) {
+		foreach ( $this->lead_db_columns as $column ) {
 			add_action( 'gform_update_' . $column, array( $this, 'entry_status_changed' ), 10, 3 );
 		}
 
@@ -112,9 +112,9 @@ 
 			return;
 		}
 
-		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{lead_id} was deleted', array( 'form_id' => $entry['form_id'], 'entry_id' => $lead_id, 'data' => array( 'value' => $property_value, 'previous' => $previous_value ) ) );
+		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{lead_id} was deleted', array( 'form_id' => $entry[ 'form_id' ], 'entry_id' => $lead_id, 'data' => array( 'value' => $property_value, 'previous' => $previous_value ) ) );
 
-		$this->blacklist_add( $entry['form_id'] );
+		$this->blacklist_add( $entry[ 'form_id' ] );
 	}
 
 	/**
@@ -127,9 +127,9 @@ 
 	 */
 	public function entry_updated( $form, $lead_id ) {
 
-		gravityview()->log->debug(' adding form {form_id} to blacklist because entry #{entry_id} was updated', array( 'form_id' => $form['id'], 'entry_id' => $lead_id ) );
+		gravityview()->log->debug( ' adding form {form_id} to blacklist because entry #{entry_id} was updated', array( 'form_id' => $form[ 'id' ], 'entry_id' => $lead_id ) );
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add( $form[ 'id' ] );
 	}
 
 	/**
@@ -144,9 +144,9 @@ 
 	 */
 	public function entry_created( $entry, $form ) {
 
-		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was created', array( 'form_id' => $form['id'], 'entry_id' => $entry['id'] ) );
+		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was created', array( 'form_id' => $form[ 'id' ], 'entry_id' => $entry[ 'id' ] ) );
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add( $form[ 'id' ] );
 	}
 
 	/**
@@ -162,9 +162,9 @@ 
 			return;
 		}
 
-		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was added', array( 'form_id' => $form['id'], 'entry_id' => $entry['id'] ) );
+		gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was added', array( 'form_id' => $form[ 'id' ], 'entry_id' => $entry[ 'id' ] ) );
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add( $form[ 'id' ] );
 	}
 
 	/**
@@ -183,7 +183,7 @@ 
 		// Normally just one form, but supports multiple forms
 		//
 		// Array of IDs 12, 5, 14 would result in `f:12-f:5-f:14`
-		$forms = 'f:' . implode( '-f:', (array) $form_ids );
+		$forms = 'f:' . implode( '-f:', (array)$form_ids );
 
 		// Prefix for transient keys
 		// Now the prefix would be: `gv-cache-f:12-f:5-f:14-`
@@ -235,7 +235,7 @@ 
 		$form_ids = is_array( $form_ids ) ? $form_ids : array( $form_ids );
 
 		// Add the passed form IDs
-		$blacklist = array_merge( (array) $blacklist, $form_ids );
+		$blacklist = array_merge( (array)$blacklist, $form_ids );
 
 		// Don't duplicate
 		$blacklist = array_unique( $blacklist );
@@ -266,7 +266,7 @@ 
 
 		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
 
-		$updated_list = array_diff( $blacklist, (array) $form_ids );
+		$updated_list = array_diff( $blacklist, (array)$form_ids );
 
 		gravityview()->log->debug( 'Removing form IDs from cache blacklist', array( 'data' => array(
 			'$form_ids'     => $form_ids,
@@ -299,7 +299,7 @@ 
 			return false;
 		}
 
-		foreach ( (array) $form_ids as $form_id ) {
+		foreach ( (array)$form_ids as $form_id ) {
 
 			if ( in_array( $form_id, $blacklist ) ) {
 
@@ -373,7 +373,7 @@ 
 			 * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
 			 * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
 			 */
-			$cache_time = (int) apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
+			$cache_time = (int)apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
 
 			gravityview()->log->debug( 'Setting cache with transient key {key} for {cache_time} seconds', array( 'key' => $this->key, 'cache_time' => $cache_time ) );
 
@@ -409,7 +409,7 @@ 
 			return;
 		}
 
-		foreach ( (array) $form_ids as $form_id ) {
+		foreach ( (array)$form_ids as $form_id ) {
 
 			$key = '_transient_gv-cache-';
 
@@ -520,7 +520,7 @@ 
 	public function use_cache() {
 
 		// Exit early if debugging (unless running PHPUnit)
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG && ! ( defined('DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) ) {
+		if ( defined( 'WP_DEBUG' ) && WP_DEBUG && ! ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) ) {
 			return apply_filters( 'gravityview_use_cache', false, $this );
 		}
 
@@ -528,7 +528,7 @@ 
 
 		if ( GVCommon::has_cap( 'edit_gravityviews' ) ) {
 
-			if ( isset( $_GET['cache'] ) || isset( $_GET['nocache'] ) ) {
+			if ( isset( $_GET[ 'cache' ] ) || isset( $_GET[ 'nocache' ] ) ) {
 
 				gravityview()->log->debug( 'Not using cache: ?cache or ?nocache is in the URL' );
 
@@ -555,7 +555,7 @@ 
 		 */
 		$use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this );
 
-		return (boolean) $use_cache;
+		return (boolean)$use_cache;
 	}
 
 }