gravityview / GravityView

includes/class-gravityview-settings.php

Spacing +93 added lines, -93 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if( ! class_exists('GFAddOn') ) {
+if ( ! class_exists( 'GFAddOn' ) ) {
 	return;
 }
 
@@ -75,7 +75,7 @@ 
 	 */
 	public function __construct( $prevent_multiple_instances = '' ) {
 
-		if( $prevent_multiple_instances === 'get_instance' ) {
+		if ( $prevent_multiple_instances === 'get_instance' ) {
 			return parent::__construct();
 		}
 
@@ -87,7 +87,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self( 'get_instance' );
 		}
 
@@ -106,7 +106,7 @@ 
 	 */
 	public function current_user_can_any( $caps ) {
 
-		if( empty( $caps ) ) {
+		if ( empty( $caps ) ) {
 			$caps = array( 'gravityview_full_access' );
 		}
 
@@ -167,7 +167,7 @@ 
             ),
 			'found-other' => array(
                 'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
-                'followup' => esc_attr__('What plugin you are using, and why?', 'gravityview'),
+                'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ),
             ),
 			'other' => array(
                 'label' => esc_html__( 'Other', 'gravityview' ),
@@ -254,7 +254,7 @@ 
                 });
 
                 function gv_feedback_append_error_message() {
-                    $('#gv-uninstall-thanks').append('<div class="notice error"><?php echo esc_js( __('There was an error sharing your feedback. Sorry! Please email us at support@gravityview.co', 'gravityview' ) ) ?></div>');
+                    $('#gv-uninstall-thanks').append('<div class="notice error"><?php echo esc_js( __( 'There was an error sharing your feedback. Sorry! Please email us at support@gravityview.co', 'gravityview' ) ) ?></div>');
                 }
             });
         </script>
@@ -271,15 +271,15 @@ 
             </ul>
             <div class="gv-followup widefat">
                 <p><strong><label for="gv-reason-details"><?php esc_html_e( 'Comments', 'gravityview' ); ?></label></strong></p>
-                <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview') ?>" placeholder="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview'); ?>" class="large-text"></textarea>
+                <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ) ?>" placeholder="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ); ?>" class="large-text"></textarea>
             </div>
             <div class="scale-description">
-                <p><strong><?php esc_html_e('How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p>
+                <p><strong><?php esc_html_e( 'How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p>
                 <ul class="inline">
 					<?php
 					$i = 0;
-					while( $i < 11 ) {
-						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_'.$i.'" value="'.$i.'" type="radio"> '.$i.'</label></li>';
+					while ( $i < 11 ) {
+						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>';
 						$i++;
 					}
 					?>
@@ -288,7 +288,7 @@ 
             </div>
 
             <div class="gv-form-field-wrapper">
-                <label><input type="checkbox" class="checkbox" name="follow_up_with_me" value="1" /> <?php esc_html_e('Please follow up with me about my feedback', 'gravityview'); ?></label>
+                <label><input type="checkbox" class="checkbox" name="follow_up_with_me" value="1" /> <?php esc_html_e( 'Please follow up with me about my feedback', 'gravityview' ); ?></label>
             </div>
 
             <div class="submit">
@@ -302,7 +302,7 @@ 
         <div id="gv-uninstall-thanks" class="notice notice-large notice-updated below-h2" style="display:none;">
             <h3 class="notice-title"><?php esc_html_e( 'Thank you for using GravityView!', 'gravityview' ); ?></h3>
             <p><?php echo gravityview_get_floaty(); ?>
-				<?php echo make_clickable( esc_html__('Your feedback helps us improve GravityView. If you have any questions or comments, email us: support@gravityview.co', 'gravityview' ) ); ?>
+				<?php echo make_clickable( esc_html__( 'Your feedback helps us improve GravityView. If you have any questions or comments, email us: support@gravityview.co', 'gravityview' ) ); ?>
             </p>
             <div class="wp-clearfix"></div>
         </div>
@@ -376,7 +376,7 @@ 
 		add_filter( 'gform_addon_app_settings_menu_gravityview', array( $this, 'modify_app_settings_menu_title' ) );
 
 		/** @since 1.7.6 */
-		add_action('network_admin_menu', array( $this, 'add_network_menu' ) );
+		add_action( 'network_admin_menu', array( $this, 'add_network_menu' ) );
 
 		parent::init_admin();
 	}
@@ -390,7 +390,7 @@ 
 	 */
 	public function modify_app_settings_menu_title( $setting_tabs ) {
 
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview');
+		$setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' );
 
 		return $setting_tabs;
 	}
@@ -407,11 +407,11 @@ 
 	 */
 	private function _load_license_handler() {
 
-		if( !empty( $this->License_Handler ) ) {
+		if ( ! empty( $this->License_Handler ) ) {
 			return;
 		}
 
-		require_once( GRAVITYVIEW_DIR . 'includes/class-gv-license-handler.php');
+		require_once( GRAVITYVIEW_DIR . 'includes/class-gv-license-handler.php' );
 
 		$this->License_Handler = GV_License_Handler::get_instance( $this );
 	}
@@ -422,21 +422,21 @@ 
 	 */
 	function license_key_notice() {
 
-		$license_status = self::getSetting('license_key_status');
-		$license_key = self::getSetting('license_key');
-		if( '' === $license_key ) {
+		$license_status = self::getSetting( 'license_key_status' );
+		$license_key = self::getSetting( 'license_key' );
+		if ( '' === $license_key ) {
 			$license_status = 'inactive';
         }
 		$license_id = empty( $license_key ) ? 'license' : $license_key;
 
-		$message = esc_html__('Your GravityView license %s. This means you&rsquo;re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview');
+		$message = esc_html__( 'Your GravityView license %s. This means you&rsquo;re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview' );
 
 		/**
 		 * I wanted to remove the period from after the buttons in the string,
 		 * but didn't want to mess up the translation strings for the translators.
 		 */
 		$message = mb_substr( $message, 0, mb_strlen( $message ) - 1 );
-		$title = __('Inactive License', 'gravityview');
+		$title = __( 'Inactive License', 'gravityview' );
 		$status = '';
 		$update_below = false;
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
@@ -444,17 +444,17 @@ 
         switch ( $license_status ) {
 			/** @since 1.17 */
 			case 'expired':
-				$title = __('Expired License', 'gravityview');
+				$title = __( 'Expired License', 'gravityview' );
 				$status = 'expired';
-				$message = $this->get_license_handler()->strings( 'expired', self::getSetting('license_key_response') );
+				$message = $this->get_license_handler()->strings( 'expired', self::getSetting( 'license_key_response' ) );
 				break;
 			case 'invalid':
-				$title = __('Invalid License', 'gravityview');
-				$status = __('is invalid', 'gravityview');
+				$title = __( 'Invalid License', 'gravityview' );
+				$status = __( 'is invalid', 'gravityview' );
 				break;
 			case 'deactivated':
-				$status = __('is inactive', 'gravityview');
-				$update_below = __('Activate your license key below.', 'gravityview');
+				$status = __( 'is inactive', 'gravityview' );
+				$update_below = __( 'Activate your license key below.', 'gravityview' );
 				break;
 			/** @noinspection PhpMissingBreakStatementInspection */
 			case '':
@@ -462,20 +462,20 @@ 
 				// break intentionally left blank
 			case 'inactive':
 			case 'site_inactive':
-				$status = __('has not been activated', 'gravityview');
-				$update_below = __('Activate your license key below.', 'gravityview');
+				$status = __( 'has not been activated', 'gravityview' );
+				$update_below = __( 'Activate your license key below.', 'gravityview' );
 				break;
 		}
-		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice';
+		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice';
 
 		// Show a different notice on settings page for inactive licenses (hide the buttons)
-		if( $update_below && gravityview_is_admin_page( '', 'settings' ) ) {
+		if ( $update_below && gravityview_is_admin_page( '', 'settings' ) ) {
 			$message = sprintf( $message, $status, '<div class="hidden">', '', '', '</div><a href="#" onclick="jQuery(\'#license_key\').focus(); return false;">' . $update_below . '</a>' );
 		} else {
 			$message = sprintf( $message, $status, "\n\n" . '<a href="' . esc_url( $primary_button_link ) . '" class="button button-primary">', '</a>', '<a href="' . esc_url( $url ) . '" class="button button-secondary">', '</a>' );
 		}
 
-		if( !empty( $status ) ) {
+		if ( ! empty( $status ) ) {
 			GravityView_Admin_Notices::add_notice( array(
 				'message' => $message,
 				'class'   => 'updated',
@@ -498,7 +498,7 @@ 
 	public function scripts() {
 		$scripts = parent::scripts();
 
-		$scripts[] = array(
+		$scripts[ ] = array(
 			'handle'  => 'gform_tooltip_init',
 			'enqueue' => array(
                 array(
@@ -518,7 +518,7 @@ 
 
 		$styles = parent::styles();
 
-		$styles[] = array(
+		$styles[ ] = array(
 			'handle'  => 'gravityview_settings',
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
 			'version' => GravityView_Plugin::version,
@@ -544,7 +544,7 @@ 
 	 * @return void
 	 */
 	public function add_network_menu() {
-		if( GravityView_Plugin::is_network_activated() ) {
+		if ( GravityView_Plugin::is_network_activated() ) {
 			add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", array( $this, 'app_tab_page' ), 'none' );
 		}
 	}
@@ -561,7 +561,7 @@ 
 		 * If multisite and not network admin, we don't want the settings to show.
 		 * @since 1.7.6
 		 */
-		$show_submenu = !is_multisite() ||  is_main_site() || !GravityView_Plugin::is_network_activated() || ( is_network_admin() && GravityView_Plugin::is_network_activated() );
+		$show_submenu = ! is_multisite() || is_main_site() || ! GravityView_Plugin::is_network_activated() || ( is_network_admin() && GravityView_Plugin::is_network_activated() );
 
 		/**
 		 * Override whether to show the Settings menu on a per-blog basis.
@@ -570,7 +570,7 @@ 
 		 */
 		$show_submenu = apply_filters( 'gravityview/show-settings-menu', $show_submenu );
 
-		if( $show_submenu ) {
+		if ( $show_submenu ) {
 			add_submenu_page( 'edit.php?post_type=gravityview', __( 'Settings', 'gravityview' ), __( 'Settings', 'gravityview' ), $this->_capabilities_app_settings, $this->_slug . '_settings', array( $this, 'app_tab_page' ) );
 		}
 	}
@@ -609,7 +609,7 @@ 
 		/**
 		 * Backward compatibility with Redux
 		 */
-		if( $setting_name === 'license' ) {
+		if ( $setting_name === 'license' ) {
 			return array(
 				'license' => parent::get_app_setting( 'license_key' ),
 				'status' => parent::get_app_setting( 'license_key_status' ),
@@ -635,8 +635,8 @@ 
 
 	    $settings = get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', $this->get_default_settings() );
 
-		if( defined( 'GRAVITYVIEW_LICENSE_KEY' ) ) {
-			$settings['license_key'] = GRAVITYVIEW_LICENSE_KEY;
+		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) ) {
+			$settings[ 'license_key' ] = GRAVITYVIEW_LICENSE_KEY;
 		}
 
 		return $settings;
@@ -675,7 +675,7 @@ 
 	protected function settings_edd_license( $field, $echo = true ) {
 
 	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
-		    $field['input_type'] = 'password';
+		    $field[ 'input_type' ] = 'password';
         }
 
 		$text = $this->settings_text( $field, false );
@@ -684,7 +684,7 @@ 
 
 		$return = $text . $activation;
 
-		if( $echo ) {
+		if ( $echo ) {
 			echo $return;
 		}
 
@@ -711,15 +711,15 @@ 
 	 */
 	public function settings_submit( $field, $echo = true ) {
 
-		$field['type']  = ( isset($field['type']) && in_array( $field['type'], array('submit','reset','button') ) ) ? $field['type'] : 'submit';
+		$field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit';
 
 		$attributes    = $this->get_field_attributes( $field );
 		$default_value = rgar( $field, 'value' ) ? rgar( $field, 'value' ) : rgar( $field, 'default_value' );
-		$value         = $this->get_setting( $field['name'], $default_value );
+		$value         = $this->get_setting( $field[ 'name' ], $default_value );
 
 
-		$attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary gfbutton';
-		$name    = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_'.$field['name'];
+		$attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary gfbutton';
+		$name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ];
 
 		if ( empty( $value ) ) {
 			$value = __( 'Update Settings', 'gravityview' );
@@ -728,7 +728,7 @@ 
 		$attributes = $this->get_field_attributes( $field );
 
 		$html = '<input
-                    type="' . $field['type'] . '"
+                    type="' . $field[ 'type' ] . '"
                     name="' . esc_attr( $name ) . '"
                     value="' . $value . '" ' .
 		        implode( ' ', $attributes ) .
@@ -750,12 +750,12 @@ 
 	 * @return string
 	 */
 	public function settings_save( $field, $echo = true ) {
-		$field['type']  = 'submit';
-		$field['name']  = 'gform-settings-save';
-		$field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton';
+		$field[ 'type' ]  = 'submit';
+		$field[ 'name' ]  = 'gform-settings-save';
+		$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] : 'button-primary gfbutton';
 
 		if ( ! rgar( $field, 'value' ) ) {
-			$field['value'] = __( 'Update Settings', 'gravityview' );
+			$field[ 'value' ] = __( 'Update Settings', 'gravityview' );
 		}
 
 		$output = $this->settings_submit( $field, false );
@@ -764,7 +764,7 @@ 
 		$this->app_settings_uninstall_tab();
 		$output .= ob_get_clean();
 
-		if( $echo ) {
+		if ( $echo ) {
 			echo $output;
 		}
 
@@ -789,8 +789,8 @@ 
 	 */
 	public function single_setting_row( $field ) {
 
-		$field['gv_description'] = rgar( $field, 'description' );
-		$field['description']    = rgar( $field, 'subtitle' );
+		$field[ 'gv_description' ] = rgar( $field, 'description' );
+		$field[ 'description' ]    = rgar( $field, 'subtitle' );
 
 		parent::single_setting_row( $field );
 	}
@@ -805,7 +805,7 @@ 
 		parent::single_setting_label( $field );
 
 		if ( $description = rgar( $field, 'gv_description' ) ) {
-			echo '<span class="description">'. $description .'</span>';
+			echo '<span class="description">' . $description . '</span>';
 		}
 	}
 
@@ -867,11 +867,11 @@ 
 
 		// If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response),
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
-		if( $local_key !== $response_key ) {
+		if ( $local_key !== $response_key ) {
 
-			unset( $posted_settings['license_key_response'] );
-			unset( $posted_settings['license_key_status'] );
-			GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
+			unset( $posted_settings[ 'license_key_response' ] );
+			unset( $posted_settings[ 'license_key_status' ] );
+			GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
 		}
 
 		return $posted_settings;
@@ -906,26 +906,26 @@ 
 				'label'             => __( 'License Key', 'gravityview' ),
 				'description'          => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ) . $this->get_license_handler()->license_details( $this->get_app_setting( 'license_key_response' ) ),
 				'type'              => 'edd_license',
-				'disabled'          => ( defined( 'GRAVITYVIEW_LICENSE_KEY' )  && GRAVITYVIEW_LICENSE_KEY ),
-				'data-pending-text' => __('Verifying license&hellip;', 'gravityview'),
-				'default_value'           => $default_settings['license_key'],
+				'disabled'          => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ),
+				'data-pending-text' => __( 'Verifying license&hellip;', 'gravityview' ),
+				'default_value'           => $default_settings[ 'license_key' ],
 				'class'             => ( '' == $this->get_app_setting( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
 			),
 			array(
 				'name'       => 'license_key_response',
-				'default_value'  => $default_settings['license_key_response'],
+				'default_value'  => $default_settings[ 'license_key_response' ],
 				'type'     => 'hidden',
 			),
 			array(
 				'name'       => 'license_key_status',
-				'default_value'  => $default_settings['license_key_status'],
+				'default_value'  => $default_settings[ 'license_key_status' ],
 				'type'     => 'hidden',
 			),
 			array(
 				'name'       => 'support-email',
 				'type'     => 'text',
 				'validate' => 'email',
-				'default_value'  => $default_settings['support-email'],
+				'default_value'  => $default_settings[ 'support-email' ],
 				'label'    => __( 'Support Email', 'gravityview' ),
 				'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
 				'class'    => 'code regular-text',
@@ -937,53 +937,53 @@ 
 				'name'         => 'support_port',
 				'type'       => 'radio',
 				'label'      => __( 'Show Support Port?', 'gravityview' ),
-				'default_value'    => $default_settings['support_port'],
+				'default_value'    => $default_settings[ 'support_port' ],
 				'horizontal' => 1,
 				'choices'    => array(
 					array(
-						'label' => _x('Show', 'Setting: Show or Hide', 'gravityview'),
+						'label' => _x( 'Show', 'Setting: Show or Hide', 'gravityview' ),
 						'value' => '1',
 					),
 					array(
-						'label' => _x('Hide', 'Setting: Show or Hide', 'gravityview'),
+						'label' => _x( 'Hide', 'Setting: Show or Hide', 'gravityview' ),
 						'value' => '0',
 					),
 				),
-				'tooltip' => '<p><img src="' . esc_url_raw( plugins_url('assets/images/beacon.png', GRAVITYVIEW_FILE ) ) . '" alt="' . esc_attr__( 'The Support Port looks like this.', 'gravityview' ) . '" class="alignright" style="max-width:40px; margin:.5em;" />' . esc_html__('The Support Port provides quick access to how-to articles and tutorials. For administrators, it also makes it easy to contact support.', 'gravityview') . '</p>',
+				'tooltip' => '<p><img src="' . esc_url_raw( plugins_url( 'assets/images/beacon.png', GRAVITYVIEW_FILE ) ) . '" alt="' . esc_attr__( 'The Support Port looks like this.', 'gravityview' ) . '" class="alignright" style="max-width:40px; margin:.5em;" />' . esc_html__( 'The Support Port provides quick access to how-to articles and tutorials. For administrators, it also makes it easy to contact support.', 'gravityview' ) . '</p>',
 				'description'   => __( 'Show the Support Port on GravityView pages?', 'gravityview' ),
 			),
 			array(
 				'name'         => 'no-conflict-mode',
 				'type'       => 'radio',
 				'label'      => __( 'No-Conflict Mode', 'gravityview' ),
-				'default_value'    => $default_settings['no-conflict-mode'],
+				'default_value'    => $default_settings[ 'no-conflict-mode' ],
 				'horizontal' => 1,
 				'choices'    => array(
 					array(
-						'label' => _x('On', 'Setting: On or off', 'gravityview'),
+						'label' => _x( 'On', 'Setting: On or off', 'gravityview' ),
 						'value' => '1',
 					),
 					array(
-						'label' => _x('Off', 'Setting: On or off', 'gravityview'),
+						'label' => _x( 'Off', 'Setting: On or off', 'gravityview' ),
 						'value' => '0',
 					),
 				),
-				'description'   => __( 'Set this to ON to prevent extraneous scripts and styles from being printed on GravityView admin pages, reducing conflicts with other plugins and themes.', 'gravityview' ) . ' ' . __('If your Edit View tabs are ugly, enable this setting.', 'gravityview'),
+				'description'   => __( 'Set this to ON to prevent extraneous scripts and styles from being printed on GravityView admin pages, reducing conflicts with other plugins and themes.', 'gravityview' ) . ' ' . __( 'If your Edit View tabs are ugly, enable this setting.', 'gravityview' ),
 			),
 			array(
 				'name'       => 'beta',
 				'type'       => 'checkbox',
 				'label'      => __( 'Become a Beta Tester', 'gravityview' ),
-				'default_value'    => $default_settings['beta'],
+				'default_value'    => $default_settings[ 'beta' ],
 				'horizontal' => 1,
 				'choices'    => array(
 					array(
-						'label' => _x('Show me beta versions if they are available.', 'gravityview'),
+						'label' => _x( 'Show me beta versions if they are available.', 'gravityview' ),
 						'value' => '1',
                         'name'  => 'beta',
 					),
 				),
-				'description'   => __( 'You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview'),
+				'description'   => __( 'You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview' ),
 			),
 		) );
 
@@ -994,23 +994,23 @@ 
 		 * @since 1.7.4
 		 */
 		foreach ( $fields as &$field ) {
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : rgget('id', $field );
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : rgget('title', $field );
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : rgget('default', $field );
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : rgget('subtitle', $field );
+			$field[ 'name' ]          = isset( $field[ 'name' ] ) ? $field[ 'name' ] : rgget( 'id', $field );
+			$field[ 'label' ]         = isset( $field[ 'label' ] ) ? $field[ 'label' ] : rgget( 'title', $field );
+			$field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : rgget( 'default', $field );
+			$field[ 'description' ]   = isset( $field[ 'description' ] ) ? $field[ 'description' ] : rgget( 'subtitle', $field );
 
-			if( $disabled_attribute ) {
-				$field['disabled']  = $disabled_attribute;
+			if ( $disabled_attribute ) {
+				$field[ 'disabled' ] = $disabled_attribute;
 			}
 
-			if( empty( $field['disabled'] ) ) {
-				unset( $field['disabled'] );
+			if ( empty( $field[ 'disabled' ] ) ) {
+				unset( $field[ 'disabled' ] );
             }
 		}
 
         $sections = array(
             array(
-                'description' =>      sprintf( '<span class="version-info description">%s</span>', sprintf( __('You are running GravityView version %s', 'gravityview'), GravityView_Plugin::version ) ),
+                'description' =>      sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), GravityView_Plugin::version ) ),
                 'fields'      => $fields,
             )
         );
@@ -1021,8 +1021,8 @@ 
             'type'     => 'save',
         );
 
-		if( $disabled_attribute ) {
-			$button['disabled'] = $disabled_attribute;
+		if ( $disabled_attribute ) {
+			$button[ 'disabled' ] = $disabled_attribute;
 		}
 
 
@@ -1042,20 +1042,20 @@ 
 		// If there are extensions, add a section for them
 		if ( ! empty( $extension_sections ) ) {
 
-			if( $disabled_attribute ) {
+			if ( $disabled_attribute ) {
 				foreach ( $extension_sections as &$section ) {
-					foreach ( $section['fields'] as &$field ) {
-						$field['disabled'] = $disabled_attribute;
+					foreach ( $section[ 'fields' ] as &$field ) {
+						$field[ 'disabled' ] = $disabled_attribute;
 					}
 				}
 			}
 
-            $k = count( $extension_sections ) - 1 ;
-            $extension_sections[ $k ]['fields'][] = $button;
+            $k = count( $extension_sections ) - 1;
+            $extension_sections[ $k ][ 'fields' ][ ] = $button;
 			$sections = array_merge( $sections, $extension_sections );
 		} else {
             // add the 'update settings' button to the general section
-            $sections[0]['fields'][] = $button;
+            $sections[ 0 ][ 'fields' ][ ] = $button;
         }
 
 		return $sections;

includes/fields/class-gravityview-field-post-excerpt.php

Spacing +3 added lines, -3 removed lines

@@ -22,13 +22,13 @@
 
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
-		unset( $field_options['show_as_link'] );
+		unset( $field_options[ 'show_as_link' ] );
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
-		$this->add_field_support('dynamic_data', $field_options );
+		$this->add_field_support( 'dynamic_data', $field_options );
 
 		return $field_options;
 	}

future/includes/class-gv-form-gravityforms.php

Spacing +5 added lines, -5 removed lines

@@ -55,7 +55,7 @@ 
 		$self = new self();
 		$self->form = $form;
 
-		$self->ID = $self->form['id'];
+		$self->ID = $self->form[ 'id' ];
 
 		return $self;
 	}
@@ -98,11 +98,11 @@ 
 
 			/** The offset and limit */
 			if ( ! empty( $offset->limit ) ) {
-				$paging['page_size'] = $offset->limit;
+				$paging[ 'page_size' ] = $offset->limit;
 			}
 
 			if ( ! empty( $offset->offset ) ) {
-				$paging['offset'] = $offset->offset;
+				$paging[ 'offset' ] = $offset->offset;
 			}
 
 			foreach ( \GFAPI::get_entries( $form->ID, $search_criteria, $sorting, $paging ) as $entry ) {
@@ -138,7 +138,7 @@ 
 	 * @return bool Whether the offset exists or not.
 	 */
 	public function offsetExists( $offset ) {
-		return isset( $this->form[$offset] );
+		return isset( $this->form[ $offset ] );
 	}
 
 	/**
@@ -153,7 +153,7 @@ 
 	 * @return mixed The value of the requested form data.
 	 */
 	public function offsetGet( $offset ) {
-		return $this->form[$offset];
+		return $this->form[ $offset ];
 	}
 
 	/**

includes/admin/metaboxes/views/data-source.php

Spacing +7 added lines, -7 removed lines

@@ -10,10 +10,10 @@ 
 wp_nonce_field( 'gravityview_select_form', 'gravityview_select_form_nonce' );
 
 //current value
-$current_form = (int) rgar( (array) $_GET, 'form_id', gravityview_get_form_id( $post->ID ) );
+$current_form = (int)rgar( (array)$_GET, 'form_id', gravityview_get_form_id( $post->ID ) );
 
 // check for available gravity forms
-$forms = gravityview_get_forms('any');
+$forms = gravityview_get_forms( 'any' );
 
 /**
  * @param int $current_form Form currently selected in the View (0 if none selected)
@@ -32,24 +32,24 @@ 
 		?>
 		<a class="button button-primary" href="#gv_start_fresh" title="<?php esc_attr_e( 'Use a Form Preset', 'gravityview' ); ?>"><?php esc_html_e( 'Use a Form Preset', 'gravityview' ); ?></a>
 
-		<?php if( !empty( $forms ) ) { ?>
+		<?php if ( ! empty( $forms ) ) { ?>
 			<span>&nbsp;<?php esc_html_e( 'or use an existing form', 'gravityview' ); ?>&nbsp;</span>
 		<?php }
 	}
 
 	// If there are no forms to select, show no forms.
-	if( !empty( $forms ) ) { ?>
+	if ( ! empty( $forms ) ) { ?>
 		<select name="gravityview_form_id" id="gravityview_form_id">
 			<option value="" <?php selected( '', $current_form, true ); ?>>&mdash; <?php esc_html_e( 'list of forms', 'gravityview' ); ?> &mdash;</option>
-			<?php foreach( $forms as $form ) { ?>
-				<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
+			<?php foreach ( $forms as $form ) { ?>
+				<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
 			<?php } ?>
 		</select>
 	<?php } else { ?>
 		<select name="gravityview_form_id" id="gravityview_form_id" class="hidden"><option selected="selected" value=""></option></select>
 	<?php } ?>
 
-	&nbsp;<a class="button button-primary" <?php if( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" href="#gv_switch_view" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></a>
+	&nbsp;<a class="button button-primary" <?php if ( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" href="#gv_switch_view" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></a>
 </p>
 
 <?php // confirm dialog box ?>

includes/class-oembed.php

Spacing +40 added lines, -40 removed lines

@@ -35,7 +35,7 @@ 
 		add_action( 'init', array( $this, 'register_handler' ) );
 		add_action( 'init', array( $this, 'add_provider' ) );
 
-		if ( ! empty( $_GET['gv_oembed_provider'] ) && ! empty( $_GET['url'] ) ) {
+		if ( ! empty( $_GET[ 'gv_oembed_provider' ] ) && ! empty( $_GET[ 'url' ] ) ) {
 			add_action( 'template_redirect', array( $this, 'render_provider_request' ) );
 		}
 	}
@@ -46,7 +46,7 @@ 
 	 */
 	static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 
 			self::$instance->initialize();
@@ -90,8 +90,8 @@ 
 	 * @return void
 	 */
 	function render_provider_request() {
-		if ( ! empty( $_GET['url'] ) ) {
-			$url = $_GET['url'];
+		if ( ! empty( $_GET[ 'url' ] ) ) {
+			$url = $_GET[ 'url' ];
 		} else {
 			header( 'HTTP/1.0 404 Not Found' );
 			exit;
@@ -100,16 +100,16 @@ 
 		preg_match( $this->get_handler_regex(), $url, $matches );
 
 		// If not using permalinks, re-assign values for matching groups
-		if ( ! empty( $matches['entry_slug2'] ) ) {
-			$matches['is_cpt'] = $matches['is_cpt2'];
-			$matches['slug'] = $matches['slug2'];
-			$matches['entry_slug'] = $matches['entry_slug2'];
-			unset( $matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2'] );
+		if ( ! empty( $matches[ 'entry_slug2' ] ) ) {
+			$matches[ 'is_cpt' ] = $matches[ 'is_cpt2' ];
+			$matches[ 'slug' ] = $matches[ 'slug2' ];
+			$matches[ 'entry_slug' ] = $matches[ 'entry_slug2' ];
+			unset( $matches[ 'is_cpt2' ], $matches[ 'slug2' ], $matches[ 'entry_slug2' ] );
 		}
 
 		// No Entry was found
-		if ( empty( $matches['entry_slug'] ) ) {
-			do_action('gravityview_log_error', 'GravityView_oEmbed[render_handler] $entry_slug not parsed by regex.', $matches );
+		if ( empty( $matches[ 'entry_slug' ] ) ) {
+			do_action( 'gravityview_log_error', 'GravityView_oEmbed[render_handler] $entry_slug not parsed by regex.', $matches );
 			header( 'HTTP/1.0 404 Not Found' );
 			exit;
 		}
@@ -162,7 +162,7 @@ 
 		// Catch either
 		$match_regex = "(?:{$using_permalinks}|{$not_using_permalinks})";
 
-		return '#'.$match_regex.'#i';
+		return '#' . $match_regex . '#i';
 	}
 
 	/**
@@ -183,18 +183,18 @@ 
 
 		$page_on_front = get_option( 'page_on_front' );
 
-		if( (int) $post_id === (int) $page_on_front || empty( $post_id ) ) {
+		if ( (int)$post_id === (int)$page_on_front || empty( $post_id ) ) {
 
 			$args = array(
 				'post_status' => 'publish',
 				'name' => $slug,
-				'post_type' => array('any', 'gravityview'),
+				'post_type' => array( 'any', 'gravityview' ),
 			);
 
 			$posts = get_posts( $args );
 
-			if( !empty( $posts ) ) {
-				$post_id = $posts[0]->ID;
+			if ( ! empty( $posts ) ) {
+				$post_id = $posts[ 0 ]->ID;
 			}
 		}
 
@@ -227,17 +227,17 @@ 
 	public function render_handler( $matches, $attr, $url, $rawattr ) {
 
 		// If not using permalinks, re-assign values for matching groups
-		if( !empty( $matches['entry_slug2'] ) ) {
-			$matches['is_cpt'] = $matches['is_cpt2'];
-			$matches['slug'] = $matches['slug2'];
-			$matches['entry_slug'] = $matches['entry_slug2'];
-			unset( $matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2'] );
+		if ( ! empty( $matches[ 'entry_slug2' ] ) ) {
+			$matches[ 'is_cpt' ] = $matches[ 'is_cpt2' ];
+			$matches[ 'slug' ] = $matches[ 'slug2' ];
+			$matches[ 'entry_slug' ] = $matches[ 'entry_slug2' ];
+			unset( $matches[ 'is_cpt2' ], $matches[ 'slug2' ], $matches[ 'entry_slug2' ] );
 		}
 
 		// No Entry was found
-		if( empty( $matches['entry_slug'] ) ) {
+		if ( empty( $matches[ 'entry_slug' ] ) ) {
 
-			do_action('gravityview_log_error', 'GravityView_oEmbed[render_handler] $entry_slug not parsed by regex.', $matches );
+			do_action( 'gravityview_log_error', 'GravityView_oEmbed[render_handler] $entry_slug not parsed by regex.', $matches );
 
 			return '';
 		}
@@ -247,11 +247,11 @@ 
 		// Setup the data used
 		$this->set_vars( $matches, $attr, $url, $rawattr );
 
-		if( is_admin() && !$this->is_full_oembed_preview ) {
+		if ( is_admin() && ! $this->is_full_oembed_preview ) {
 			$return = $this->render_admin( $matches, $attr, $url, $rawattr );
 		} else {
 
-			if( $this->is_full_oembed_preview ) {
+			if ( $this->is_full_oembed_preview ) {
 				$return .= $this->generate_preview_notice();
 			}
 
@@ -270,8 +270,8 @@ 
 	private function generate_preview_notice() {
 		$floaty = GravityView_Admin::get_floaty();
 		$title = esc_html__( 'This will look better when it is embedded.', 'gravityview' );
-		$message = esc_html__('Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview');
-		return '<div class="updated notice">'. $floaty. '<h3>'.$title.'</h3><p>'.$message.'</p><br style="clear:both;" /></div>';
+		$message = esc_html__( 'Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview' );
+		return '<div class="updated notice">' . $floaty . '<h3>' . $title . '</h3><p>' . $message . '</p><br style="clear:both;" /></div>';
 	}
 
 	/**
@@ -284,14 +284,14 @@ 
 	 */
 	private function set_vars( $matches, $attr, $url, $rawattr ) {
 
-		$this->entry_id = $matches['entry_slug'];
+		$this->entry_id = $matches[ 'entry_slug' ];
 
-		$post_id = $this->get_postid_from_url_and_slug( $url, $matches['slug'] );
+		$post_id = $this->get_postid_from_url_and_slug( $url, $matches[ 'slug' ] );
 
 		// The URL didn't have the View Custom Post Type structure.
-		if( empty( $matches['is_cpt'] ) || $matches['is_cpt'] !== 'gravityview' ) {
+		if ( empty( $matches[ 'is_cpt' ] ) || $matches[ 'is_cpt' ] !== 'gravityview' ) {
 
-			do_action('gravityview_log_debug', 'GravityView_oEmbed[render_handler] Embedding an entry inside a post or page', $matches );
+			do_action( 'gravityview_log_debug', 'GravityView_oEmbed[render_handler] Embedding an entry inside a post or page', $matches );
 
 			if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && $post = get_post( $post_id ) ) {
 				$views = \GV\View_Collection::from_post( $post );
@@ -304,7 +304,7 @@ 
 						}
 					}
 
-					$this->view_id = $views[0]->ID;
+					$this->view_id = $views[ 0 ]->ID;
 				}
 			} else {
 				/** Deprecated. */
@@ -318,7 +318,7 @@ 
 		}
 
 		// The inline content has $_POST['type'] set to "embed", while the "Add Media" modal doesn't set that.
-		$this->is_full_oembed_preview = ( isset( $_POST['action'] ) && $_POST['action'] === 'parse-embed' && !isset( $_POST['type'] ) );
+		$this->is_full_oembed_preview = ( isset( $_POST[ 'action' ] ) && $_POST[ 'action' ] === 'parse-embed' && ! isset( $_POST[ 'type' ] ) );
 	}
 
 	/**
@@ -336,15 +336,15 @@ 
 		// Floaty the astronaut
 		$image = GravityView_Admin::get_floaty();
 
-		$embed_heading = sprintf( esc_html__('Embed Entry %d', 'gravityview'), $this->entry_id );
+		$embed_heading = sprintf( esc_html__( 'Embed Entry %d', 'gravityview' ), $this->entry_id );
 
-		$embed_text = sprintf( esc_html__('This entry will be displayed as it is configured in View %d', 'gravityview'), $this->view_id );
+		$embed_text = sprintf( esc_html__( 'This entry will be displayed as it is configured in View %d', 'gravityview' ), $this->view_id );
 
 		return '
 		<div class="loading-placeholder" style="background-color:#e6f0f5;">
-			<h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image.$embed_heading.'</h3>
+			<h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image . $embed_heading . '</h3>
 			<p style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">
-				'.$embed_text.'
+				'.$embed_text . '
 			</p>
 			<br style="clear: both;">
 		</div>';
@@ -399,14 +399,14 @@ 
 	private function render_frontend( $matches, $attr, $url, $rawattr ) {
 
 		// If it's already been parsed, don't re-output it.
-		if( !empty( $this->output[ $this->entry_id ] ) ) {
+		if ( ! empty( $this->output[ $this->entry_id ] ) ) {
 			return $this->output[ $this->entry_id ];
 		}
 
 		$entry_output = $this->generate_entry_output();
 
 		// Wrap a container div around the output to allow for custom styling
-		$output = sprintf('<div class="gravityview-oembed gravityview-oembed-entry gravityview-oembed-entry-'.$this->entry_id.'">%s</div>', $entry_output );
+		$output = sprintf( '<div class="gravityview-oembed gravityview-oembed-entry gravityview-oembed-entry-' . $this->entry_id . '">%s</div>', $entry_output );
 
 		/**
 		 * @filter `gravityview/oembed/entry` Filter the output of the oEmbed entry embed
@@ -419,7 +419,7 @@ 
 		 *  @var string $url The original URL that was matched by the regex. \n
 		 *  @var array $rawattr The original unmodified attributes.
 		 */
-		$output = apply_filters('gravityview/oembed/entry', $output, $this, compact( $entry_output, $matches, $attr, $url, $rawattr ) );
+		$output = apply_filters( 'gravityview/oembed/entry', $output, $this, compact( $entry_output, $matches, $attr, $url, $rawattr ) );
 
 		unset( $entry_output );
 

includes/class-gvlogic-shortcode.php

Spacing +28 added lines, -28 removed lines

@@ -85,7 +85,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 		}
 
@@ -119,9 +119,9 @@ 
 
 		$operators = array_merge( self::$SUPPORTED_ARRAY_OPERATORS, self::$SUPPORTED_NUMERIC_OPERATORS, self::$SUPPORTED_SCALAR_OPERATORS, self::$SUPPORTED_CUSTOM_OPERATORS );
 
-		if( $with_values ) {
+		if ( $with_values ) {
 			$operators_with_values = array();
-			foreach( $operators as $key ) {
+			foreach ( $operators as $key ) {
 				$operators_with_values[ $key ] = '';
 			}
 			return $operators_with_values;
@@ -138,14 +138,14 @@ 
 	 */
 	private function set_operation( $operation = '' ) {
 
-		if( empty( $operation ) ) {
+		if ( empty( $operation ) ) {
 			return false;
 		}
 
 		$operators = $this->get_operators( false );
 
-		if( !in_array( $operation, $operators ) ) {
-			do_action( 'gravityview_log_debug', __METHOD__ .' Attempted to add invalid operation type.', $operation );
+		if ( ! in_array( $operation, $operators ) ) {
+			do_action( 'gravityview_log_debug', __METHOD__ . ' Attempted to add invalid operation type.', $operation );
 			return false;
 		}
 
@@ -165,11 +165,11 @@ 
 	 */
 	private function setup_operation_and_comparison() {
 
-		foreach( $this->atts as $key => $value ) {
+		foreach ( $this->atts as $key => $value ) {
 
 			$valid = $this->set_operation( $key );
 
-			if( $valid ) {
+			if ( $valid ) {
 				$this->comparison = $value;
 				return true;
 			}
@@ -195,8 +195,8 @@ 
 			return null;
 		}
 
-		if( empty( $atts ) ) {
-			do_action( 'gravityview_log_error', __METHOD__.' $atts are empty.', $atts );
+		if ( empty( $atts ) ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' $atts are empty.', $atts );
 			return null;
 		}
 
@@ -210,16 +210,16 @@ 
 		$this->parse_atts();
 
 		// We need an "if"
-		if( false === $this->if ) {
-			do_action( 'gravityview_log_error', __METHOD__.' $atts->if is empty.', $this->passed_atts );
+		if ( false === $this->if ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' $atts->if is empty.', $this->passed_atts );
 			return null;
 		}
 
 		$setup = $this->setup_operation_and_comparison();
 
 		// We need an operation and comparison value
-		if( ! $setup ) {
-			do_action( 'gravityview_log_error', __METHOD__.' No valid operators were passed.', $this->atts );
+		if ( ! $setup ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' No valid operators were passed.', $this->atts );
 			return null;
 		}
 
@@ -252,7 +252,7 @@ 
 	 */
 	private function get_output() {
 
-		if( $this->is_match ) {
+		if ( $this->is_match ) {
 			$output = $this->content;
 		} else {
 			$output = $this->else_content;
@@ -266,9 +266,9 @@ 
 		 * @param string $output HTML/text output
 		 * @param GVLogic_Shortcode $this This class
 		 */
-		$output = apply_filters('gravityview/gvlogic/output', $output, $this );
+		$output = apply_filters( 'gravityview/gvlogic/output', $output, $this );
 
-		do_action( 'gravityview_log_debug', __METHOD__ .' Output: ', $output );
+		do_action( 'gravityview_log_debug', __METHOD__ . ' Output: ', $output );
 
 		return $output;
 	}
@@ -286,14 +286,14 @@ 
 		list( $before_else, $after_else ) = array_pad( explode( '[else]', $passed_content ), 2, NULL );
 		list( $before_else_if, $after_else_if ) = array_pad( explode( '[else', $passed_content ), 2, NULL );
 
-		$else_attr = isset( $this->atts['else'] ) ? $this->atts['else'] : NULL;
+		$else_attr = isset( $this->atts[ 'else' ] ) ? $this->atts[ 'else' ] : NULL;
 		$else_content = isset( $after_else ) ? $after_else : $else_attr;
 
 		// The content is everything OTHER than the [else]
 		$this->content = $before_else_if;
 
 		if ( ! $this->is_match ) {
-			if( $elseif_content = $this->process_elseif( $before_else ) ) {
+			if ( $elseif_content = $this->process_elseif( $before_else ) ) {
 				$this->else_content = $elseif_content;
 			} else {
 				$this->else_content = $else_content;
@@ -321,16 +321,16 @@ 
 		foreach ( $else_if_matches as $key => $else_if_match ) {
 
 			// If $else_if_match[5] exists and has content, check for more shortcodes
-			preg_match_all( '/' . $regex . '/', $else_if_match[5] . '[/else]', $recursive_matches, PREG_SET_ORDER );
+			preg_match_all( '/' . $regex . '/', $else_if_match[ 5 ] . '[/else]', $recursive_matches, PREG_SET_ORDER );
 
 			// If the logic passes, this is the value that should be used for $this->else_content
-			$else_if_value = $else_if_match[5];
-			$check_elseif_match = $else_if_match[0];
+			$else_if_value = $else_if_match[ 5 ];
+			$check_elseif_match = $else_if_match[ 0 ];
 
 			// Retrieve the value of the match that is currently being checked, without any other [else] tags
-			if( ! empty( $recursive_matches[0][0] ) ) {
-				$else_if_value = str_replace( $recursive_matches[0][0], '', $else_if_value );
-				$check_elseif_match = str_replace( $recursive_matches[0][0], '', $check_elseif_match );
+			if ( ! empty( $recursive_matches[ 0 ][ 0 ] ) ) {
+				$else_if_value = str_replace( $recursive_matches[ 0 ][ 0 ], '', $else_if_value );
+				$check_elseif_match = str_replace( $recursive_matches[ 0 ][ 0 ], '', $check_elseif_match );
 			}
 
 			$check_elseif_match = str_replace( '[else', '[gvlogicelse', $check_elseif_match );
@@ -347,7 +347,7 @@ 
 			}
 
 			// Process any remaining [else] tags
-			return $this->process_elseif( $else_if_match[5] );
+			return $this->process_elseif( $else_if_match[ 5 ] );
 		}
 
 		return false;
@@ -373,7 +373,7 @@ 
 		$this->atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( $this->passed_atts, $this->atts ) : $this->atts;
 
 		// Strip whitespace if it's not default false
-		$this->if = ( isset( $this->atts['if'] ) && is_string( $this->atts['if'] ) ) ? trim( $this->atts['if'] ) : false;
+		$this->if = ( isset( $this->atts[ 'if' ] ) && is_string( $this->atts[ 'if' ] ) ) ? trim( $this->atts[ 'if' ] ) : false;
 
 		/**
 		 * @action `gravityview/gvlogic/parse_atts/after` Modify shortcode attributes after it's been parsed
@@ -384,7 +384,7 @@ 
 		do_action( 'gravityview/gvlogic/parse_atts/after', $this );
 
 		// Make sure the "if" isn't processed in self::setup_operation_and_comparison()
-		unset( $this->atts['if'] );
+		unset( $this->atts[ 'if' ] );
 	}
 }
 

includes/extensions/entry-notes/class-gravityview-field-notes.php

Spacing +80 added lines, -80 removed lines

@@ -63,18 +63,18 @@ 
 
 		add_shortcode( 'gv_note_add', array( 'GravityView_Field_Notes', 'get_add_note_part' ) );
 
-		add_action( 'wp', array( $this, 'maybe_delete_notes'), 1000 );
-		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes') );
-		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes') );
+		add_action( 'wp', array( $this, 'maybe_delete_notes' ), 1000 );
+		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
+		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
 
-		add_action( 'wp', array( $this, 'maybe_add_note'), 1000 );
-		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note') );
-		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note') );
+		add_action( 'wp', array( $this, 'maybe_add_note' ), 1000 );
+		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note' ) );
+		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note' ) );
 
 		// add template path to check for field
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
 
-		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
+		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
 		add_action( 'gravityview/field/notes/scripts', array( $this, 'enqueue_scripts' ) );
 		
 		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_entry_default_field' ), 10, 3 );
@@ -96,8 +96,8 @@ 
 	 */
 	public function add_entry_default_field( $entry_default_fields, $form, $zone ) {
 
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
-			$entry_default_fields['notes'] = array(
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
+			$entry_default_fields[ 'notes' ] = array(
 				'label' => __( 'Entry Notes', 'gravityview' ),
 				'type'  => 'notes',
 				'desc'  => __( 'Display, add, and delete notes for an entry.', 'gravityview' ),
@@ -130,23 +130,23 @@ 
 	public function enqueue_scripts() {
 		global $wp_actions;
 
-		if( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
+		if ( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
 			wp_enqueue_style( 'gravityview-notes' );
 			wp_enqueue_script( 'gravityview-notes' );
 		}
 
-		if( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
+		if ( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
 
 			$strings = self::strings();
 
 			wp_localize_script( 'gravityview-notes', 'GVNotes', array(
 				'ajaxurl' => admin_url( 'admin-ajax.php' ),
 				'text' => array(
-					'processing' => $strings['processing'],
-					'delete_confirm' => $strings['delete-confirm'],
-					'note_added' => $strings['added-note'],
-					'error_invalid' => $strings['error-invalid'],
-					'error_empty_note' => $strings['error-empty-note'],
+					'processing' => $strings[ 'processing' ],
+					'delete_confirm' => $strings[ 'delete-confirm' ],
+					'note_added' => $strings[ 'added-note' ],
+					'error_invalid' => $strings[ 'error-invalid' ],
+					'error_empty_note' => $strings[ 'error-empty-note' ],
 				),
 			) );
 		}
@@ -163,26 +163,26 @@ 
 	 */
 	function maybe_add_note() {
 
-		if( ! isset( $_POST['action'] ) ) {
+		if ( ! isset( $_POST[ 'action' ] ) ) {
 			return;
 		}
 
-		if( 'gv_note_add' === $_POST['action'] ) {
+		if ( 'gv_note_add' === $_POST[ 'action' ] ) {
 
-            if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
+            if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
                 do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' );
                 return;
             }
 
 			$post = wp_unslash( $_POST );
 
-			if( $this->doing_ajax ) {
-				parse_str( $post['data'], $data );
+			if ( $this->doing_ajax ) {
+				parse_str( $post[ 'data' ], $data );
 			} else {
 				$data = $post;
 			}
 
-			$this->process_add_note( (array) $data );
+			$this->process_add_note( (array)$data );
 		}
 	}
 
@@ -209,23 +209,23 @@ 
 		$error = false;
 		$success = false;
 
-		if( empty( $data['entry-slug'] ) ) {
+		if ( empty( $data[ 'entry-slug' ] ) ) {
 
-			$error = self::strings('error-invalid');
+			$error = self::strings( 'error-invalid' );
 			do_action( 'gravityview_log_error', __METHOD__ . ': The note is missing an Entry ID.' );
 
 		} else {
 
-			$valid = wp_verify_nonce( $data['gv_note_add'], 'gv_note_add_' . $data['entry-slug'] );
+			$valid = wp_verify_nonce( $data[ 'gv_note_add' ], 'gv_note_add_' . $data[ 'entry-slug' ] );
 			
 			$has_cap = GVCommon::has_cap( 'gravityview_add_entry_notes' );
 
-			if( ! $has_cap ) {
+			if ( ! $has_cap ) {
 				$error = self::strings( 'error-cap-add' );
 				do_action( 'gravityview_log_error', __METHOD__ . ': Adding a note failed: the user does not have the "gravityview_add_entry_notes" capability.' );
 			} elseif ( $valid ) {
 
-				$entry = gravityview_get_entry( $data['entry-slug'], true, false );
+				$entry = gravityview_get_entry( $data[ 'entry-slug' ], true, false );
 
 				$added = $this->add_note( $entry, $data );
 
@@ -243,22 +243,22 @@ 
 					$this->maybe_send_entry_notes( $note, $entry, $data );
 
 					if ( $note ) {
-						$success = self::display_note( $note, ! empty( $data['show-delete'] ) );
-						do_action( 'gravityview_log_debug', __METHOD__ . ': The note was successfully created', compact('note', 'data') );
+						$success = self::display_note( $note, ! empty( $data[ 'show-delete' ] ) );
+						do_action( 'gravityview_log_debug', __METHOD__ . ': The note was successfully created', compact( 'note', 'data' ) );
 					} else {
-						$error = self::strings('error-add-note');
-						do_action( 'gravityview_log_error', __METHOD__ . ': The note was not successfully created', compact('note', 'data') );
+						$error = self::strings( 'error-add-note' );
+						do_action( 'gravityview_log_error', __METHOD__ . ': The note was not successfully created', compact( 'note', 'data' ) );
 					}
 				}
 			} else {
-				$error = self::strings('error-invalid');
+				$error = self::strings( 'error-invalid' );
 				do_action( 'gravityview_log_error', __METHOD__ . ': Nonce validation failed; the note was not created' );
 			}
 		}
 
 
-		if( $this->doing_ajax ) {
-			if( $success ) {
+		if ( $this->doing_ajax ) {
+			if ( $success ) {
 				wp_send_json_success( array( 'html' => $success ) );
 			} else {
 				$error = $error ? $error : self::strings( 'error-invalid' );
@@ -284,11 +284,11 @@ 
 			return;
 		}
 
-		if ( isset( $_POST['action'] ) && 'gv_delete_notes' === $_POST['action'] ) {
+		if ( isset( $_POST[ 'action' ] ) && 'gv_delete_notes' === $_POST[ 'action' ] ) {
 
 			$post = wp_unslash( $_POST );
 			if ( $this->doing_ajax ) {
-				parse_str( $post['data'], $data );
+				parse_str( $post[ 'data' ], $data );
 			} else {
 				$data = $post;
 			}
@@ -319,18 +319,18 @@ 
 	 */
 	function process_delete_notes( $data ) {
 
-		$valid = wp_verify_nonce( $data['gv_delete_notes'], 'gv_delete_notes_' . $data['entry-slug'] );
+		$valid = wp_verify_nonce( $data[ 'gv_delete_notes' ], 'gv_delete_notes_' . $data[ 'entry-slug' ] );
 		$has_cap = GVCommon::has_cap( 'gravityview_delete_entry_notes' );
 		$success = false;
 
 		if ( $valid && $has_cap ) {
-			GravityView_Entry_Notes::delete_notes( $data['note'] );
+			GravityView_Entry_Notes::delete_notes( $data[ 'note' ] );
 			$success = true;
 		}
 
-		if( $this->doing_ajax ) {
+		if ( $this->doing_ajax ) {
 
-			if( $success ) {
+			if ( $success ) {
 				wp_send_json_success();
 			} else {
 				if ( ! $valid ) {
@@ -363,13 +363,13 @@ 
 
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
-		unset( $field_options['show_as_link'] );
+		unset( $field_options[ 'show_as_link' ] );
 
 		$notes_options = array(
 			'notes' => array(
 				'type' => 'checkboxes',
-				'label' => __('Note Settings', 'gravityview'),
-				'desc' => sprintf( _x('Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
+				'label' => __( 'Note Settings', 'gravityview' ),
+				'desc' => sprintf( _x( 'Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
 				'options' => array(
 					'view' => array(
 						'label' => __( 'Display notes?', 'gravityview' ),
@@ -421,7 +421,7 @@ 
 			'processing' => __( 'Processing&hellip;', 'gravityview' ),
 			'other-email' => __( 'Other email address', 'gravityview' ),
 			'email-label' => __( 'Email address', 'gravityview' ),
-			'email-placeholder' => _x('you@example.com', 'Example email address used as a placeholder', 'gravityview'),
+			'email-placeholder' => _x( 'you@example.com', 'Example email address used as a placeholder', 'gravityview' ),
 			'subject-label' => __( 'Subject', 'gravityview' ),
 			'subject' => __( 'Email subject', 'gravityview' ),
 			'default-email-subject' => __( 'New entry note', 'gravityview' ),
@@ -441,7 +441,7 @@ 
 		 */
 		$strings = gv_map_deep( apply_filters( 'gravityview/field/notes/strings', $strings ), 'esc_html' );
 
-		if( $key ) {
+		if ( $key ) {
 			return isset( $strings[ $key ] ) ? $strings[ $key ] : '';
 		}
 
@@ -460,7 +460,7 @@ 
 	 */
 	static public function display_note( $note, $show_delete = false ) {
 
-		if( ! is_object( $note ) ) {
+		if ( ! is_object( $note ) ) {
 			return '';
 		}
 
@@ -501,7 +501,7 @@ 
 		$note_row = ob_get_clean();
 
 		$replacements = array(
-			'{note_id}' => $note_content['note_id'],
+			'{note_id}' => $note_content[ 'note_id' ],
 			'{row_class}' => 'gv-note',
 			'{note_detail}' => $note_detail_html
 		);
@@ -533,13 +533,13 @@ 
 
 		$user_data = get_userdata( $current_user->ID );
 
-		$note_content = trim( $data['gv-note-content'] );
+		$note_content = trim( $data[ 'gv-note-content' ] );
 
-		if( empty( $note_content ) ) {
+		if ( empty( $note_content ) ) {
 			return new WP_Error( 'gv-add-note-empty', __( 'The note is empty.', 'gravityview' ) );
 		}
 
-		$return = GravityView_Entry_Notes::add_note( $entry['id'], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
+		$return = GravityView_Entry_Notes::add_note( $entry[ 'id' ], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
 
 		return $return;
 	}
@@ -555,7 +555,7 @@ 
 	 */
 	public static function get_add_note_part() {
 
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ': User does not have permission to add entry notes ("gravityview_add_entry_notes").' );
 			return '';
 		}
@@ -571,19 +571,19 @@ 
 
 		$visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
 		$entry = $gravityview_view->getCurrentEntry();
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
 		$nonce_field = wp_nonce_field( 'gv_note_add_' . $entry_slug, 'gv_note_add', false, false );
 
 		// Only generate the dropdown if the field settings allow it
 		$email_fields = '';
-		if( ! empty( $visibility_settings['email'] ) ) {
+		if ( ! empty( $visibility_settings[ 'email' ] ) ) {
 			$email_fields = self::get_note_email_fields( $entry_slug );
 		}
 
 		$add_note_html = str_replace( '{entry_slug}', $entry_slug, $add_note_html );
 		$add_note_html = str_replace( '{nonce_field}', $nonce_field, $add_note_html );
-		$add_note_html = str_replace( '{show_delete}', intval( $visibility_settings['delete'] ), $add_note_html );
-		$add_note_html   = str_replace( '{email_fields}', $email_fields, $add_note_html );
+		$add_note_html = str_replace( '{show_delete}', intval( $visibility_settings[ 'delete' ] ), $add_note_html );
+		$add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html );
 		$add_note_html = str_replace( '{url}', esc_url_raw( add_query_arg( array() ) ), $add_note_html );
 
 		return $add_note_html;
@@ -608,8 +608,8 @@ 
 		$note_emails = array();
 
 		foreach ( $email_fields as $email_field ) {
-			if ( ! empty( $entry["{$email_field->id}"] ) && is_email( $entry["{$email_field->id}"] ) ) {
-				$note_emails[] = $entry["{$email_field->id}"];
+			if ( ! empty( $entry[ "{$email_field->id}" ] ) && is_email( $entry[ "{$email_field->id}" ] ) ) {
+				$note_emails[ ] = $entry[ "{$email_field->id}" ];
 			}
 		}
 
@@ -621,7 +621,7 @@ 
 		 */
 		$note_emails = apply_filters( 'gravityview/field/notes/emails', $note_emails, $entry );
 
-		return (array) $note_emails;
+		return (array)$note_emails;
 	}
 
 	/**
@@ -637,7 +637,7 @@ 
 	 */
 	private static function get_note_email_fields( $entry_slug = '' ) {
 
-		if( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
+		if ( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ': User does not have permission to email entry notes ("gravityview_email_entry_notes").' );
 			return '';
 		}
@@ -659,27 +659,27 @@ 
 
 		if ( ! empty( $note_emails ) || $include_custom ) { ?>
 			<div class="gv-note-email-container">
-				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings['also-email'];  ?></label>
+				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings[ 'also-email' ]; ?></label>
 				<select class="gv-note-email-to" name="gv-note-to" id="gv-note-email-to-<?php echo $entry_slug_esc; ?>">
-					<option value=""><?php echo $strings['also-email'];  ?></option>
+					<option value=""><?php echo $strings[ 'also-email' ]; ?></option>
 					<?php foreach ( $note_emails as  $email ) {
 						?>
 						<option value="<?php echo esc_attr( $email ); ?>"><?php echo esc_html( $email ); ?></option>
 					<?php }
-					if( $include_custom ) { ?>
-					<option value="custom"><?php echo self::strings('other-email'); ?></option>
+					if ( $include_custom ) { ?>
+					<option value="custom"><?php echo self::strings( 'other-email' ); ?></option>
 					<?php } ?>
 				</select>
 				<fieldset class="gv-note-to-container">
-					<?php if( $include_custom ) { ?>
+					<?php if ( $include_custom ) { ?>
 					<div class='gv-note-to-custom-container'>
-						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings['email-label']; ?></label>
-						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings['email-placeholder']; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
+						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'email-label' ]; ?></label>
+						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings[ 'email-placeholder' ]; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
 					</div>
 					<?php } ?>
 		            <div class='gv-note-subject-container'>
-		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings['subject-label']; ?></label>
-		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings['subject']; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
+		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'subject-label' ]; ?></label>
+		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings[ 'subject' ]; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
 		            </div>
 				</fieldset>
 			</div>
@@ -702,7 +702,7 @@ 
 	 */
 	private function maybe_send_entry_notes( $note = false, $entry, $data ) {
 
-		if( ! $note || ! GVCommon::has_cap('gravityview_email_entry_notes') ) {
+		if ( ! $note || ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
 			do_action( 'gravityview_log_debug', __METHOD__ . ': User doesnt have "gravityview_email_entry_notes" cap, or $note is empty', $note );
 			return;
 		}
@@ -710,7 +710,7 @@ 
 		do_action( 'gravityview_log_debug', __METHOD__ . ': $data', $data );
 
 		//emailing notes if configured
-		if ( ! empty( $data['gv-note-to'] ) ) {
+		if ( ! empty( $data[ 'gv-note-to' ] ) ) {
 
 			$default_data = array(
 				'gv-note-to' => '',
@@ -720,11 +720,11 @@ 
                 'current-url' => '',
 			);
 
-			$current_user  = wp_get_current_user();
+			$current_user = wp_get_current_user();
 			$email_data = wp_parse_args( $data, $default_data );
 
-			$from    = $current_user->user_email;
-			$to = $email_data['gv-note-to'];
+			$from = $current_user->user_email;
+			$to = $email_data[ 'gv-note-to' ];
 
 			/**
 			 * Documented in get_note_email_fields
@@ -732,8 +732,8 @@ 
 			 */
 			$include_custom = apply_filters( 'gravityview/field/notes/custom-email', true );
 
-			if( 'custom' === $to && $include_custom ) {
-				$to = $email_data['gv-note-to-custom'];
+			if ( 'custom' === $to && $include_custom ) {
+				$to = $email_data[ 'gv-note-to-custom' ];
 				do_action( 'gravityview_log_debug', __METHOD__ . ': Sending note to a custom email address: ' . $to );
 			}
 
@@ -744,13 +744,13 @@ 
 
 			$bcc = false;
 			$reply_to = $from;
-			$subject = trim( $email_data['gv-note-subject'] );
+			$subject = trim( $email_data[ 'gv-note-subject' ] );
 
 			// We use empty() here because GF uses empty to check against, too. `0` isn't a valid subject to GF
 			$subject = empty( $subject ) ? self::strings( 'default-email-subject' ) : $subject;
-			$message = $email_data['gv-note-content'];
+			$message = $email_data[ 'gv-note-content' ];
 			$email_footer = self::strings( 'email-footer' );
-			$from_name     = $current_user->display_name;
+			$from_name = $current_user->display_name;
 			$message_format = 'html';
 
 			/**
@@ -781,7 +781,7 @@ 
 
 			GVCommon::send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name, $message_format, '', $entry, false );
 
-			$form  = isset( $entry['form_id'] ) ? GFAPI::get_form( $entry['form_id'] ) : array();
+			$form = isset( $entry[ 'form_id' ] ) ? GFAPI::get_form( $entry[ 'form_id' ] ) : array();
 
 			/**
 			 * @see https://www.gravityhelp.com/documentation/article/10146-2/ It's here for compatibility with Gravity Forms
@@ -807,7 +807,7 @@ 
 
 	    $output = '';
 
-		if( ! empty( $email_footer ) ) {
+		if ( ! empty( $email_footer ) ) {
 		    $url = rgar( $email_data, 'current-url' );
 			$url = html_entity_decode( $url );
 			$url = site_url( $url );

includes/class-admin-views.php

Spacing +174 added lines, -174 removed lines

@@ -28,30 +28,30 @@ 
 		add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 );
 
 		// Tooltips
-		add_filter( 'gform_tooltips', array( $this, 'tooltips') );
+		add_filter( 'gform_tooltips', array( $this, 'tooltips' ) );
 
 		// adding styles and scripts
-		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 );
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') );
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') );
-		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') );
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') );
-
-		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 );
-		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 );
-		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 );
-		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') );
-		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 );
+		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 );
+		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) );
+		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) );
+		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) );
+		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
+
+		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 );
+		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 );
+		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 );
+		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) );
+		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 );
 
 		// @todo check if this hook is needed..
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
 
 		// Add Connected Form column
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
+		add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) );
 
 		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
 
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
 
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
 
@@ -66,13 +66,13 @@ 
 	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) {
 		global $pagenow;
 
-		if ( !is_admin() ) {
+		if ( ! is_admin() ) {
 			return;
 		}
 
-		$form_id = isset( $_GET['gravityview_form_id'] ) ? (int) $_GET['gravityview_form_id'] : false;
+		$form_id = isset( $_GET[ 'gravityview_form_id' ] ) ? (int)$_GET[ 'gravityview_form_id' ] : false;
 
-		if( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
+		if ( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
 			return;
 		}
 
@@ -89,18 +89,18 @@ 
 	function add_view_dropdown() {
 		$current_screen = get_current_screen();
 
-		if( 'gravityview' !== $current_screen->post_type ) {
+		if ( 'gravityview' !== $current_screen->post_type ) {
 			return;
 		}
 
 		$forms = gravityview_get_forms();
 		$current_form = rgget( 'gravityview_form_id' );
 		// If there are no forms to select, show no forms.
-		if( !empty( $forms ) ) { ?>
+		if ( ! empty( $forms ) ) { ?>
 			<select name="gravityview_form_id" id="gravityview_form_id">
 				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
-				<?php foreach( $forms as $form ) { ?>
-					<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
+				<?php foreach ( $forms as $form ) { ?>
+					<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
 				<?php } ?>
 			</select>
 		<?php }
@@ -113,7 +113,7 @@ 
 	 */
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
 	}
 
 	/**
@@ -136,9 +136,9 @@ 
 
 		$connected_views = gravityview_get_connected_views( $id, array( 'post_status' => 'any' ) );
 
-		if( empty( $connected_views ) ) {
+		if ( empty( $connected_views ) ) {
 
-		    $menu_items['gravityview'] = array(
+		    $menu_items[ 'gravityview' ] = array(
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -154,22 +154,22 @@ 
 		$sub_menu_items = array();
 		foreach ( (array)$connected_views as $view ) {
 
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
 				continue;
 			}
 
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
 
-			$sub_menu_items[] = array(
+			$sub_menu_items[ ] = array(
 				'label' => esc_attr( $label ),
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
 			);
 		}
 
 		// If there were no items added, then let's create the parent menu
-		if( $sub_menu_items ) {
+		if ( $sub_menu_items ) {
 
-		    $sub_menu_items[] = array(
+		    $sub_menu_items[ ] = array(
 			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
                 'link_class' => 'gv-create-view',
 			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -178,14 +178,14 @@ 
             );
 
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
-			$sub_menu_items[] = array(
+			$sub_menu_items[ ] = array(
 				'url' => '#',
 				'label' => '',
 				'menu_class' => 'hidden',
 				'capabilities' => '',
 			);
 
-			$menu_items['gravityview'] = array(
+			$menu_items[ 'gravityview' ] = array(
 				'label'          => __( 'Connected Views', 'gravityview' ),
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -214,8 +214,8 @@ 
 		$add = array( 'captcha', 'page' );
 
 		// Don't allowing editing the following values:
-		if( $context === 'edit' ) {
-			$add[] = 'post_id';
+		if ( $context === 'edit' ) {
+			$add[ ] = 'post_id';
 		}
 
 		$return = array_merge( $array, $add );
@@ -238,32 +238,32 @@ 
 		foreach ( $default_args as $key => $arg ) {
 
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
 
 			// By default, use `tooltip` if defined.
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
 
 			// Otherwise, use the description as a tooltip.
-			if( empty( $tooltip ) && !empty( $arg['desc'] ) ) {
-				$tooltip = $arg['desc'];
+			if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) {
+				$tooltip = $arg[ 'desc' ];
 			}
 
 			// If there's no tooltip set, continue
-			if( empty( $tooltip ) ) {
+			if ( empty( $tooltip ) ) {
 				continue;
 			}
 
 			// Add the tooltip
-			$gv_tooltips[ 'gv_'.$key ] = array(
-				'title'	=> $arg['label'],
+			$gv_tooltips[ 'gv_' . $key ] = array(
+				'title'	=> $arg[ 'label' ],
 				'value'	=> $tooltip,
 			);
 
 		}
 
-		$gv_tooltips['gv_css_merge_tags'] = array(
-			'title' => __('CSS Merge Tags', 'gravityview'),
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
 		);
 
 		/**
@@ -274,9 +274,9 @@ 
 
 		foreach ( $gv_tooltips as $key => $tooltip ) {
 
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
 
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
 		}
 
 		return $tooltips;
@@ -290,7 +290,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
 
 		$output = '';
 
@@ -312,7 +312,7 @@ 
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
 
-				$output = $template ? $template['label'] : $template_id_pretty;
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
 
 				break;
 
@@ -353,44 +353,44 @@ 
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
 
 		// Either the form is empty or the form ID is 0, not yet set.
-		if( empty( $form ) ) {
+		if ( empty( $form ) ) {
 			return '';
 		}
 
 		// The $form is passed as the form ID
-		if( !is_array( $form ) ) {
+		if ( ! is_array( $form ) ) {
 			$form = gravityview_get_form( $form );
 		}
 
-		$form_id = $form['id'];
+		$form_id = $form[ 'id' ];
 		$links = array();
 
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
 		} else {
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
 		}
 
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
 		}
 
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
 		}
 
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
 		}
 
 		$output = '';
 
-		if( !empty( $include_form_link ) ) {
+		if ( ! empty( $include_form_link ) ) {
 			$output .= $form_link;
 		}
 
@@ -402,7 +402,7 @@ 
 		 */
 		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
 
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
+		$output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>';
 
 		return $output;
 	}
@@ -416,8 +416,8 @@ 
 		// Get the date column and save it for later to add back in.
 		// This adds it after the Data Source column.
 		// This way, we don't need to do array_slice, array_merge, etc.
-		$date = $columns['date'];
-		unset( $columns['date'] );
+		$date = $columns[ 'date' ];
+		unset( $columns[ 'date' ] );
 
 		$data_source_required_caps = array(
 			'gravityforms_edit_forms',
@@ -428,14 +428,14 @@ 
 			'gravityforms_preview_forms',
 		);
 
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
 		}
 
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
 
 		// Add the date back in.
-		$columns['date'] = $date;
+		$columns[ 'date' ] = $date;
 
 		return $columns;
 	}
@@ -449,12 +449,12 @@ 
 	 */
 	function save_postdata( $post_id ) {
 
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
 			return;
 		}
 
 		// validate post_type
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
 			return;
 		}
 
@@ -469,63 +469,63 @@ 
 		$statii = array();
 
 		// check if this is a start fresh View
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
 
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
 			// save form id
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
 
 		}
 
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ' - Current user does not have the capability to create a new Form.', wp_get_current_user() );
 			return;
 		}
 
 		// Was this a start fresh?
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
 		} else {
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
 		}
 
 		// Check if we have a template id
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
 
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
 
 			// now save template id
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
 		}
 
 
 		// save View Configuration metabox
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
 
 			// template settings
-			if( empty( $_POST['template_settings'] ) ) {
-				$_POST['template_settings'] = array();
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
+				$_POST[ 'template_settings' ] = array();
 			}
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
 
 			$fields = array();
 
 			// Directory&single Visible Fields
-			if( !empty( $preset_fields ) ) {
+			if ( ! empty( $preset_fields ) ) {
 
 				$fields = $preset_fields;
 
-			} elseif( !empty( $_POST['gv_fields'] ) ) {
+			} elseif ( ! empty( $_POST[ 'gv_fields' ] ) ) {
 				$fields = _gravityview_process_posted_fields();
 			}
 
-			$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
+			$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
 
 			// Directory Visible Widgets
-			if( empty( $_POST['widgets'] ) ) {
-				$_POST['widgets'] = array();
+			if ( empty( $_POST[ 'widgets' ] ) ) {
+				$_POST[ 'widgets' ] = array();
 			}
-			$statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] );
+			$statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] );
 
 		} // end save view configuration
 
@@ -535,9 +535,9 @@ 
 		 * @param array $statii Array of statuses of the post meta saving processes. If saving worked, each key should be mapped to a value of the post ID (`directory_widgets` => `124`). If failed (or didn't change), the value will be false.
 		 * @since 1.17.2
 		 */
-		do_action('gravityview_view_saved', $post_id, $statii );
+		do_action( 'gravityview_view_saved', $post_id, $statii );
 
-		do_action('gravityview_log_debug', '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array_map( 'intval', $statii ) );
+		do_action( 'gravityview_log_debug', '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array_map( 'intval', $statii ) );
 	}
 
 	/**
@@ -579,20 +579,20 @@ 
 
 		$output = '';
 
-		if( !empty( $fields ) ) {
+		if ( ! empty( $fields ) ) {
 
-			foreach( $fields as $id => $details ) {
+			foreach ( $fields as $id => $details ) {
 
-				if( in_array( $details['type'], (array) $blacklist_field_types ) ) {
+				if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) {
 					continue;
 				}
 
 				// Edit mode only allows editing the parent fields, not single inputs.
-				if( $context === 'edit' && !empty( $details['parent'] ) ) {
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
 					continue;
 				}
 
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details );
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details );
 
 			} // End foreach
 		}
@@ -600,7 +600,7 @@ 
 		echo $output;
 
 		// For the EDIT view we only want to allow the form fields.
-		if( $context === 'edit' ) {
+		if ( $context === 'edit' ) {
 			return;
 		}
 
@@ -624,16 +624,16 @@ 
 		$additional_fields = apply_filters( 'gravityview_additional_fields', array(
 			array(
 				'label_text' => __( '+ Add All Fields', 'gravityview' ),
-				'desc' => __('Add all the available fields at once.', 'gravityview'),
+				'desc' => __( 'Add all the available fields at once.', 'gravityview' ),
 				'field_id' => 'all-fields',
 				'label_type' => 'field',
 				'input_type' => NULL,
 				'field_options' => NULL,
 				'settings_html'	=> NULL,
 			)
-		));
+		) );
 
-		if( !empty( $additional_fields )) {
+		if ( ! empty( $additional_fields ) ) {
 			foreach ( (array)$additional_fields as $item ) {
 
 				// Prevent items from not having index set
@@ -644,16 +644,16 @@ 
 					'input_type' => NULL,
 					'field_options' => NULL,
 					'settings_html'	=> NULL,
-				));
+				) );
 
 				// Backward compat.
-				if( !empty( $item['field_options'] ) ) {
+				if ( ! empty( $item[ 'field_options' ] ) ) {
 					// Use settings_html from now on.
-					$item['settings_html'] = $item['field_options'];
+					$item[ 'settings_html' ] = $item[ 'field_options' ];
 				}
 
 				// Render a label for each of them
-				echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item );
+				echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item );
 
 			}
 		}
@@ -666,54 +666,54 @@ 
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
 	 * @return array
 	 */
-	function get_entry_default_fields($form, $zone) {
+	function get_entry_default_fields( $form, $zone ) {
 
 		$entry_default_fields = array();
 
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
 
 			$entry_default_fields = array(
 				'id' => array(
-					'label' => __('Entry ID', 'gravityview'),
+					'label' => __( 'Entry ID', 'gravityview' ),
 					'type' => 'id',
-					'desc'	=> __('The unique ID of the entry.', 'gravityview'),
+					'desc'	=> __( 'The unique ID of the entry.', 'gravityview' ),
 				),
 				'date_created' => array(
-					'label' => __('Entry Date', 'gravityview'),
-					'desc'	=> __('The date the entry was created.', 'gravityview'),
+					'label' => __( 'Entry Date', 'gravityview' ),
+					'desc'	=> __( 'The date the entry was created.', 'gravityview' ),
 					'type' => 'date_created',
 				),
 				'source_url' => array(
-					'label' => __('Source URL', 'gravityview'),
+					'label' => __( 'Source URL', 'gravityview' ),
 					'type' => 'source_url',
-					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'),
+					'desc'	=> __( 'The URL of the page where the form was submitted.', 'gravityview' ),
 				),
 				'ip' => array(
-					'label' => __('User IP', 'gravityview'),
+					'label' => __( 'User IP', 'gravityview' ),
 					'type' => 'ip',
-					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'),
+					'desc'	=> __( 'The IP Address of the user who created the entry.', 'gravityview' ),
 				),
 				'created_by' => array(
-					'label' => __('User', 'gravityview'),
+					'label' => __( 'User', 'gravityview' ),
 					'type' => 'created_by',
-					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'),
+					'desc'	=> __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ),
 				),
 
 				/**
 				 * @since 1.7.2
 				 */
 			    'other_entries' => array(
-				    'label'	=> __('Other Entries', 'gravityview'),
+				    'label'	=> __( 'Other Entries', 'gravityview' ),
 				    'type'	=> 'other_entries',
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
+				    'desc'	=> __( 'Display other entries created by the entry creator.', 'gravityview' ),
 			    ),
 	        );
 
-			if( 'single' !== $zone) {
+			if ( 'single' !== $zone ) {
 
-				$entry_default_fields['entry_link'] = array(
-					'label' => __('Link to Entry', 'gravityview'),
-					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'),
+				$entry_default_fields[ 'entry_link' ] = array(
+					'label' => __( 'Link to Entry', 'gravityview' ),
+					'desc'	=> __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ),
 					'type' => 'entry_link',
 				);
 			}
@@ -723,10 +723,10 @@ 
 		/**
 		 * @since  1.2
 		 */
-		$entry_default_fields['custom']	= array(
-			'label'	=> __('Custom Content', 'gravityview'),
+		$entry_default_fields[ 'custom' ] = array(
+			'label'	=> __( 'Custom Content', 'gravityview' ),
 			'type'	=> 'custom',
-			'desc'	=> __('Insert custom text or HTML.', 'gravityview'),
+			'desc'	=> __( 'Insert custom text or HTML.', 'gravityview' ),
 		);
 
 		/**
@@ -735,7 +735,7 @@ 
 		 * @param  string|array $form form_ID or form object
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
 		 */
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
 	}
 
 	/**
@@ -746,7 +746,7 @@ 
 	 */
 	function get_available_fields( $form = '', $zone = NULL ) {
 
-		if( empty( $form ) ) {
+		if ( empty( $form ) ) {
 			do_action( 'gravityview_log_error', '[get_available_fields] $form is empty' );
 			return array();
 		}
@@ -755,7 +755,7 @@ 
 		$fields = gravityview_get_form_fields( $form, true );
 
 		// get meta fields ( only if form was already created )
-		if( !is_array( $form ) ) {
+		if ( ! is_array( $form ) ) {
 			$meta_fields = gravityview_get_entry_meta( $form );
 		} else {
 			$meta_fields = array();
@@ -768,7 +768,7 @@ 
 		$fields = $fields + $meta_fields + $default_fields;
 
 		// Move Custom Content to top
-		$fields = array( 'custom' => $fields['custom'] ) + $fields;
+		$fields = array( 'custom' => $fields[ 'custom' ] ) + $fields;
 
 		return $fields;
 	}
@@ -782,11 +782,11 @@ 
 
 		$widgets = $this->get_registered_widgets();
 
-		if( !empty( $widgets ) ) {
+		if ( ! empty( $widgets ) ) {
 
-			foreach( $widgets as $id => $details ) {
+			foreach ( $widgets as $id => $details ) {
 
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
+				echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
 
 			}
 		}
@@ -820,7 +820,7 @@ 
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
 		global $post;
 
-		if( $type === 'widget' ) {
+		if ( $type === 'widget' ) {
 			$button_label = __( 'Add Widget', 'gravityview' );
 		} else {
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -829,15 +829,15 @@ 
 		$available_items = array();
 
 		// if saved values, get available fields to label everyone
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
 
-			if( !empty( $_POST['template_id'] ) ) {
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 			} else {
 				$form = gravityview_get_form_id( $post->ID );
 			}
 
-			if( 'field' === $type ) {
+			if ( 'field' === $type ) {
 				$available_items = $this->get_available_fields( $form, $zone );
 			} else {
 				$available_items = $this->get_registered_widgets();
@@ -845,39 +845,39 @@ 
 
 		}
 
-		foreach( $rows as $row ) :
-			foreach( $row as $col => $areas ) :
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
+		foreach ( $rows as $row ) :
+			foreach ( $row as $col => $areas ) :
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
 
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
 
-					<?php foreach( $areas as $area ) : 	?>
+					<?php foreach ( $areas as $area ) : 	?>
 
 						<div class="gv-droppable-area">
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>">
 
 								<?php // render saved fields
 
-								if( !empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
 
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
 
 										$input_type = NULL;
-										$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
+										$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
 
-										if( !$original_item ) {
+										if ( ! $original_item ) {
 
-											do_action('gravityview_log_error', 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array('available_items' => $available_items, 'field' => $field ));
+											do_action( 'gravityview_log_error', 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array( 'available_items' => $available_items, 'field' => $field ) );
 
 											$original_item = $field;
 										} else {
 
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
 
 										}
 
 										// Field options dialog box
-										$field_options = GravityView_Render_Settings::render_field_options( $type, $template_id, $field['id'], $original_item['label'], $zone .'_'. $area['areaid'], $input_type, $uniqid, $field, $zone, $original_item );
+										$field_options = GravityView_Render_Settings::render_field_options( $type, $template_id, $field[ 'id' ], $original_item[ 'label' ], $zone . '_' . $area[ 'areaid' ], $input_type, $uniqid, $field, $zone, $original_item );
 
 										$item = array(
 											'input_type' => $input_type,
@@ -886,16 +886,16 @@ 
 										);
 
 										// Merge the values with the current item to pass things like widget descriptions and original field names
-										if( $original_item ) {
+										if ( $original_item ) {
 											$item = wp_parse_args( $item, $original_item );
 										}
 
-										switch( $type ) {
+										switch ( $type ) {
 											case 'widget':
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
 												break;
 											default:
-												echo new GravityView_Admin_View_Field( $item['label'], $field['id'], $item, $field );
+												echo new GravityView_Admin_View_Field( $item[ 'label' ], $field[ 'id' ], $item, $field );
 										}
 
 
@@ -905,11 +905,11 @@ 
 
 								} // End if zone is not empty ?>
 
-								<span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type ); ?></span>
+								<span class="drop-message"><?php echo sprintf( esc_attr__( '"+ %s" or drag existing %ss here.', 'gravityview' ), $button_label, $type ); ?></span>
 							</div>
 							<div class="gv-droppable-area-action">
-								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>"><?php echo '+ '.esc_html( $button_label ); ?></a>
-								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area['title'] ); ?></strong><?php if( !empty( $area['subtitle'] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area['subtitle'] ); ?></span><?php } ?></p>
+								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>"><?php echo '+ ' . esc_html( $button_label ); ?></a>
+								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area[ 'title' ] ); ?></strong><?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area[ 'subtitle' ] ); ?></span><?php } ?></p>
 							</div>
 						</div>
 
@@ -931,7 +931,7 @@ 
 		$default_widget_areas = GravityView_Plugin::get_default_widget_areas();
 
 		$widgets = array();
-		if( !empty( $post_id ) ) {
+		if ( ! empty( $post_id ) ) {
 			$widgets = gravityview_get_directory_widgets( $post_id );
 		}
 
@@ -961,7 +961,7 @@ 
 	 */
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
 
-		if( empty( $template_id ) ) {
+		if ( empty( $template_id ) ) {
 			do_action( 'gravityview_log_debug', '[render_directory_active_areas] $template_id is empty' );
 			return '';
 		}
@@ -975,12 +975,12 @@ 
 		 */
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
 
-		if( empty( $template_areas ) ) {
+		if ( empty( $template_areas ) ) {
 
 			do_action( 'gravityview_log_debug', '[render_directory_active_areas] No areas defined. Maybe template %s is disabled.', $template_id );
 			$output = '<div>';
-			$output .= '<h2 class="description" style="font-size: 16px; margin:0">'. sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>'.$template_id.'</em>' ) .'</h2>';
-			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">'.esc_html__('The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview').'</p>';
+			$output .= '<h2 class="description" style="font-size: 16px; margin:0">' . sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>' . $template_id . '</em>' ) . '</h2>';
+			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">' . esc_html__( 'The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview' ) . '</p>';
 			$output .= '</div>';
 		} else {
 
@@ -995,7 +995,7 @@ 
 
 		}
 
-		if( $echo ) {
+		if ( $echo ) {
 			echo $output;
 		}
 
@@ -1015,26 +1015,26 @@ 
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
 
 		// Add the GV font (with the Astronaut)
-		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
+		wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
 
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version, true );
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
 
 		// Don't process any scripts below here if it's not a GravityView page.
-		if( ! gravityview_is_admin_page( $hook, 'single' ) && ! $is_widgets_page ) {
+		if ( ! gravityview_is_admin_page( $hook, 'single' ) && ! $is_widgets_page ) {
 		    return;
 		}
 
         wp_enqueue_script( 'jquery-ui-datepicker' );
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), GravityView_Plugin::version );
+        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), GravityView_Plugin::version );
 
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+        $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
         //enqueue scripts
         wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), GravityView_Plugin::version );
 
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
+        wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
             'cookiepath' => COOKIEPATH,
-            'passed_form_id' => (bool) rgget( 'form_id' ),
+            'passed_form_id' => (bool)rgget( 'form_id' ),
             'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
             'label_viewname' => __( 'Enter View name here', 'gravityview' ),
             'label_close' => __( 'Close', 'gravityview' ),
@@ -1046,9 +1046,9 @@ 
             'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
             'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
             'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
-        ));
+        ) );
 
-        wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array('dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
+        wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
 
         // Enqueue scripts needed for merge tags
         self::enqueue_gravity_forms_scripts();
@@ -1073,7 +1073,7 @@ 
 		);
 
 		if ( wp_is_mobile() ) {
-		    $scripts[] = 'jquery-touch-punch';
+		    $scripts[ ] = 'jquery-touch-punch';
 		}
 
 		wp_enqueue_script( $scripts );

future/_mocks.php

Spacing +12 added lines, -12 removed lines

@@ -96,18 +96,18 @@ 
 		$paging = rgar( $parameters, 'paging' );
 	} else {
 		$entries = $form->entries
-			->filter( \GV\GF_Entry_Filter::from_search_criteria( $criteria['search_criteria'] ) )
-			->offset( $args['offset'] )
-			->limit( $criteria['paging']['page_size'] );
+			->filter( \GV\GF_Entry_Filter::from_search_criteria( $criteria[ 'search_criteria' ] ) )
+			->offset( $args[ 'offset' ] )
+			->limit( $criteria[ 'paging' ][ 'page_size' ] );
 
-		if ( $criteria['paging']['page_size'] ) {
-			$entries = $entries->page( ( ( $criteria['paging']['offset'] - $args['offset'] ) / $criteria['paging']['page_size'] ) + 1 );
+		if ( $criteria[ 'paging' ][ 'page_size' ] ) {
+			$entries = $entries->page( ( ( $criteria[ 'paging' ][ 'offset' ] - $args[ 'offset' ] ) / $criteria[ 'paging' ][ 'page_size' ] ) + 1 );
 		}
 
-		if ( ! empty( $criteria['sorting'] ) ) {
+		if ( ! empty( $criteria[ 'sorting' ] ) ) {
 			$field = new \GV\Field();
-			$field->ID = $criteria['sorting']['key'];
-			switch( strtolower( $criteria['sorting']['direction'] ) ) {
+			$field->ID = $criteria[ 'sorting' ][ 'key' ];
+			switch ( strtolower( $criteria[ 'sorting' ][ 'direction' ] ) ) {
 				case 'asc':
 					$direction = \GV\Entry_Sort::ASC;
 					break;
@@ -120,7 +120,7 @@ 
 					break;
 			}
 
-			$mode = $criteria['sorting']['is_numeric'] ? \GV\Entry_Sort::NUMERIC : \GV\Entry_Sort::ALPHA;
+			$mode = $criteria[ 'sorting' ][ 'is_numeric' ] ? \GV\Entry_Sort::NUMERIC : \GV\Entry_Sort::ALPHA;
 			$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction, $mode ) );
 		}
 
@@ -146,7 +146,7 @@ 
 
 /** Add some global fix for field capability discrepancies. */
 add_filter( 'gravityview/configuration/fields', function( $fields ) {
-	if ( empty( $fields  ) ) {
+	if ( empty( $fields ) ) {
 		return $fields;
 	}
 
@@ -173,11 +173,11 @@ 
 		}
 
 		foreach ( $_fields as $uid => &$_field ) {
-			if ( ! isset( $_field['only_loggedin'] ) ) {
+			if ( ! isset( $_field[ 'only_loggedin' ] ) ) {
 				continue;
 			}
 			/** If we do not require login, we don't require a cap. */
-			$_field['only_loggedin'] != '1' && ( $_field['only_loggedin_cap'] = '' );
+			$_field[ 'only_loggedin' ] != '1' && ( $_field[ 'only_loggedin_cap' ] = '' );
 		}
 	}
 	return $fields;