gravityview / GravityView

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

Spacing +18 added lines, -18 removed lines

@@ -14,42 +14,42 @@
 
 		$field_info_items = array();
 
-		if( !empty( $this->item['adminLabel'] ) ) {
-			$field_info_items[] = array(
-				'value' => sprintf( __('Admin Label: %s', 'gravityview' ), $this->item['adminLabel'] ),
+		if ( ! empty( $this->item[ 'adminLabel' ] ) ) {
+			$field_info_items[ ] = array(
+				'value' => sprintf( __( 'Admin Label: %s', 'gravityview' ), $this->item[ 'adminLabel' ] ),
 				'class'	=> 'gv-sublabel'
 			);
 		}
 
 		// Fields with IDs, not like Source URL or Entry ID
-		if( is_numeric( $this->id ) ) {
+		if ( is_numeric( $this->id ) ) {
 
-			$field_type_title = GFCommon::get_field_type_title( $this->item['input_type'] );
+			$field_type_title = GFCommon::get_field_type_title( $this->item[ 'input_type' ] );
 
-			if ( ! empty( $this->item['parent'] ) ) {
-				$field_info_items[] = array(
-					'value' => sprintf( esc_html__( 'Parent: %s', 'gravityview' ), esc_attr( $this->item['parent']['label'] ) ),
+			if ( ! empty( $this->item[ 'parent' ] ) ) {
+				$field_info_items[ ] = array(
+					'value' => sprintf( esc_html__( 'Parent: %s', 'gravityview' ), esc_attr( $this->item[ 'parent' ][ 'label' ] ) ),
 				);
 			}
 
-			$field_info_items[] = array(
-				'value' => sprintf( __('Type: %s', 'gravityview'), $field_type_title ),
-				'hide_in_picker' => ! empty( $this->item['parent'] ),
+			$field_info_items[ ] = array(
+				'value' => sprintf( __( 'Type: %s', 'gravityview' ), $field_type_title ),
+				'hide_in_picker' => ! empty( $this->item[ 'parent' ] ),
 			);
 
-			$field_info_items[] = array(
-				'value' => sprintf( __('Field ID: %s', 'gravityview'), $this->id ),
+			$field_info_items[ ] = array(
+				'value' => sprintf( __( 'Field ID: %s', 'gravityview' ), $this->id ),
 			);
 		}
 
-		if( !empty( $this->item['desc'] ) ) {
-			$field_info_items[] = array(
-				'value' => $this->item['desc']
+		if ( ! empty( $this->item[ 'desc' ] ) ) {
+			$field_info_items[ ] = array(
+				'value' => $this->item[ 'desc' ]
 			);
 		}
 
-		$field_info_items[] = array(
-			'value'          => sprintf( __('Form ID: %s', 'gravityview' ), $this->form_id ),
+		$field_info_items[ ] = array(
+			'value'          => sprintf( __( 'Form ID: %s', 'gravityview' ), $this->form_id ),
 			'hide_in_picker' => true,
 		);
 

includes/fields/class-gravityview-field-source-url.php

Spacing +6 added lines, -6 removed lines

@@ -29,24 +29,24 @@
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
 		// Don't link to entry; doesn't make sense.
-		unset( $field_options['show_as_link'] );
+		unset( $field_options[ 'show_as_link' ] );
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
 		$add_options = array();
-		$add_options['link_to_source'] = array(
+		$add_options[ 'link_to_source' ] = array(
 			'type' => 'checkbox',
 			'label' => __( 'Link to URL:', 'gravityview' ),
-			'desc' => __('Display as a link to the Source URL', 'gravityview'),
+			'desc' => __( 'Display as a link to the Source URL', 'gravityview' ),
 			'value' => false,
 			'merge_tags' => false,
 		);
-		$add_options['source_link_text'] = array(
+		$add_options[ 'source_link_text' ] = array(
 			'type' => 'text',
 			'label' => __( 'Link Text:', 'gravityview' ),
-			'desc' => __('Customize the link text. If empty, the link text will be the URL.', 'gravityview'),
+			'desc' => __( 'Customize the link text. If empty, the link text will be the URL.', 'gravityview' ),
 			'value' => NULL,
 			'merge_tags' => true,
 			'requires' => 'link_to_source',

future/includes/class-gv-settings-addon.php

Spacing +49 added lines, -49 removed lines

@@ -118,7 +118,7 @@ 
 		$setting_tabs = parent::get_app_settings_tabs();
 
 		foreach ( $setting_tabs as &$tab ) {
-			if ( 'uninstall' !== $tab['name'] ) {
+			if ( 'uninstall' !== $tab[ 'name' ] ) {
 				continue;
 			}
 
@@ -129,7 +129,7 @@ 
 			}
 
 			// Add trash can icon to resemble the look and feel of the GF Settings page
-			$tab['icon'] = 'dashicons-trash';
+			$tab[ 'icon' ] = 'dashicons-trash';
 		}
 
 		return array_filter( $setting_tabs );
@@ -144,8 +144,8 @@ 
 	 */
 	public function register_no_conflict( $items ) {
 
-		$items[] = 'gform_settings';
-		$items[] = 'gv-admin-edd-license';
+		$items[ ] = 'gform_settings';
+		$items[ ] = 'gv-admin-edd-license';
 
 		return $items;
 	}
@@ -196,7 +196,7 @@ 
 
 		$href = add_query_arg( array( 'post_type' => 'gravityview', 'page' => 'gravityview_settings', 'view' => 'uninstall' ), admin_url( 'edit.php' ) );
 
-		$uninstall_button = '<a href="' . esc_url( $href ) . '" class="' . gravityview_sanitize_html_class( $html_class ). '">' . esc_html__( 'Uninstall GravityView', 'gravityview' ) . '</a>';
+		$uninstall_button = '<a href="' . esc_url( $href ) . '" class="' . gravityview_sanitize_html_class( $html_class ) . '">' . esc_html__( 'Uninstall GravityView', 'gravityview' ) . '</a>';
 
 		$html .= $uninstall_button;
 
@@ -215,10 +215,10 @@ 
 	 */
 	public function settings_save( $field, $echo = true ) {
 
-		$field['type']  = 'submit';
-		$field['name']  = 'gform-settings-save';
-		$field['class'] = 'button button-primary primary button-hero';
-		$field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
+		$field[ 'type' ]  = 'submit';
+		$field[ 'name' ]  = 'gform-settings-save';
+		$field[ 'class' ] = 'button button-primary primary button-hero';
+		$field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
 
 		$html = $this->as_html( $field, false );
 
@@ -240,8 +240,8 @@ 
 	 */
 	public function modify_app_settings_menu_title( $setting_tabs ) {
 
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' );
-		$setting_tabs[0]['icon']  = 'dashicons-admin-settings';
+		$setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' );
+		$setting_tabs[ 0 ][ 'icon' ]  = 'dashicons-admin-settings';
 
 		return $setting_tabs;
 	}
@@ -489,7 +489,7 @@ 
 					$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>';
-						$i ++;
+						$i++;
 					}
 					?>
 				</ul>
@@ -694,14 +694,14 @@ 
 	 */
 	public function as_html( $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 = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) );
-		$value         = $this->get( $field['name'], $default_value );
+		$value         = $this->get( $field[ 'name' ], $default_value );
 
-		$attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary 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 primary gfbutton';
+		$name                = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ];
 
 		if ( empty( $value ) ) {
 			$value = __( 'Update Settings', 'gravityview' );
@@ -710,7 +710,7 @@ 
 		$attributes = $this->get_field_attributes( $field );
 
 		$html = '<input
-                    type="' . $field['type'] . '"
+                    type="' . $field[ 'type' ] . '"
                     name="' . esc_attr( $name ) . '"
                     value="' . $value . '" ' .
 				implode( ' ', $attributes ) .
@@ -744,7 +744,7 @@ 
 	 */
 	public function is_save_postback() {
 
-		return isset( $_POST['gform-settings-save'] ) && isset( $_POST['_gravityview_save_settings_nonce'] );
+		return isset( $_POST[ 'gform-settings-save' ] ) && isset( $_POST[ '_gravityview_save_settings_nonce' ] );
 	}
 
 	/**
@@ -856,7 +856,7 @@ 
 
 		$scripts = parent::scripts();
 
-		$scripts[] = array(
+		$scripts[ ] = array(
 				'handle'  => 'gform_tooltip_init',
 				'enqueue' => array(
 						array(
@@ -884,11 +884,11 @@ 
 		);
 
 		// This file was removed from 2.5
-		if( ! gravityview()->plugin->is_GF_25() ) {
-			$deps[] = 'gform_tooltip';
+		if ( ! gravityview()->plugin->is_GF_25() ) {
+			$deps[ ] = 'gform_tooltip';
 		}
 
-		$styles[] = array(
+		$styles[ ] = array(
 			'handle'  => 'gravityview_settings',
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
 			'version' => Plugin::$version,
@@ -975,7 +975,7 @@ 
 						'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',
@@ -987,7 +987,7 @@ 
 						'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(
@@ -1006,7 +1006,7 @@ 
 						'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(
@@ -1028,7 +1028,7 @@ 
 								'name'          => 'rest_api',
 								'type'          => 'radio',
 								'label'         => __( 'REST API', 'gravityview' ),
-								'default_value' => $default_settings['rest_api'],
+								'default_value' => $default_settings[ 'rest_api' ],
 								'horizontal'    => 1,
 								'choices'       => array(
 										array(
@@ -1047,7 +1047,7 @@ 
 					'name' => 'powered_by',
 					'type' => 'checkbox',
 					'label' => __( 'Display "Powered By" Link', 'gravityview' ),
-					'default_value' => $default_settings['powered_by'],
+					'default_value' => $default_settings[ 'powered_by' ],
 					'choices' => array(
 						array(
 							'label' => esc_html__( 'Display a "Powered by GravityView" link', 'gravityview' ),
@@ -1072,7 +1072,7 @@ 
 						'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(
@@ -1106,17 +1106,17 @@ 
 		 * @since 1.7.4
 		 */
 		foreach ( $fields as &$field ) {
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' );
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' );
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' );
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' );
+			$field[ 'name' ]          = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' );
+			$field[ 'label' ]         = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' );
+			$field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' );
+			$field[ 'description' ]   = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' );
 
 			if ( $disabled_attribute ) {
-				$field['disabled'] = $disabled_attribute;
+				$field[ 'disabled' ] = $disabled_attribute;
 			}
 
-			if ( empty( $field['disabled'] ) ) {
-				unset( $field['disabled'] );
+			if ( empty( $field[ 'disabled' ] ) ) {
+				unset( $field[ 'disabled' ] );
 			}
 		}
 
@@ -1128,23 +1128,23 @@ 
 					'description' => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ),
 					'type' => 'edd_license',
 					'data-pending-text' => __( 'Verifying license&hellip;', 'gravityview' ),
-					'default_value' => $default_settings['license_key'],
+					'default_value' => $default_settings[ 'license_key' ],
 					'class' => ( '' == $this->get( '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',
 			),
 		);
 
 		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
-			$license_fields[0] = array_merge( $license_fields[0], array(
+			$license_fields[ 0 ] = array_merge( $license_fields[ 0 ], array(
 				'disabled' => true,
 				'title'    => __( 'The license key is defined by your site\'s configuration file.', 'gravityview' ),
 			) );
@@ -1155,7 +1155,7 @@ 
 
 		if ( \gravityview()->plugin->is_GF_25() ) {
 
-			$sections[] = array(
+			$sections[ ] = array(
 					'title'       => __( 'GravityView License', 'gravityview' ),
 					'class'       => 'gform-settings-panel--full gv-settings-panel--license',
 					'description' => $version_info,
@@ -1173,7 +1173,7 @@ 
 			) );
 		}
 
-		$sections[] = array(
+		$sections[ ] = array(
 			'title' => ( gravityview()->plugin->is_GF_25() ? __( 'GravityView Settings', 'gravityview' ) : null ),
 			'class' => 'gform-settings-panel--full gv-settings-panel--core',
 			'fields'      => $fields,
@@ -1197,8 +1197,8 @@ 
 
 			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;
 					}
 				}
 			}
@@ -1264,7 +1264,7 @@ 
 	public 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 );
@@ -1316,7 +1316,7 @@ 
 
 		?>
 
-		<tr id="gaddon-setting-row-<?php echo esc_attr( $field['name'] ); ?>">
+		<tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>">
 			<td colspan="2">
 				<?php $this->single_setting( $field ); ?>
 			</td>
@@ -1342,8 +1342,8 @@ 
 	 */
 	public function single_setting_row( $field ) {
 
-		$field['gv_description'] = Utils::get( $field, 'description' );
-		$field['description']    = Utils::get( $field, 'subtitle' );
+		$field[ 'gv_description' ] = Utils::get( $field, 'description' );
+		$field[ 'description' ]    = Utils::get( $field, 'subtitle' );
 		parent::single_setting_row( $field );
 	}
 
@@ -1404,8 +1404,8 @@ 
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
 		if ( ! $added_message && ( $local_key !== $response_key ) ) {
 
-			unset( $posted_settings['license_key_response'] );
-			unset( $posted_settings['license_key_status'] );
+			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' ) );
 

includes/class-admin-welcome.php

Spacing +18 added lines, -18 removed lines

@@ -33,10 +33,10 @@ 
 	 * @since 1.0
 	 */
 	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'admin_menus'), 200 );
+		add_action( 'admin_menu', array( $this, 'admin_menus' ), 200 );
 		add_action( 'admin_head', array( $this, 'admin_head' ) );
-		add_action( 'admin_init', array( $this, 'welcome'    ) );
-		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page'), 10, 2 );
+		add_action( 'admin_init', array( $this, 'welcome' ) );
+		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page' ), 10, 2 );
 	}
 
 	/**
@@ -51,8 +51,8 @@ 
 		// Add help page to GravityView menu
 		add_submenu_page(
 			'edit.php?post_type=gravityview',
-			__('GravityView: Getting Started', 'gravityview'),
-			__('Getting Started', 'gravityview'),
+			__( 'GravityView: Getting Started', 'gravityview' ),
+			__( 'Getting Started', 'gravityview' ),
 			$this->minimum_capability,
 			'gv-getting-started',
 			array( $this, 'getting_started_screen' )
@@ -85,10 +85,10 @@ 
 	 *
 	 * @return boolean  $is_page   True: yep; false: nope
 	 */
-	public function is_dashboard_page($is_page = false, $hook = NULL) {
+	public function is_dashboard_page( $is_page = false, $hook = NULL ) {
 		global $plugin_page;
 
-		if($is_page) { return $is_page; }
+		if ( $is_page ) { return $is_page; }
 
 		return in_array( $plugin_page, array( 'gv-about', 'gv-credits', 'gv-getting-started' ) );
 	}
@@ -105,7 +105,7 @@ 
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-credits' );
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-changelog' );
 
-		if( !$this->is_dashboard_page() ) { return; }
+		if ( ! $this->is_dashboard_page() ) { return; }
 
 		?>
         <style type="text/css" media="screen" xmlns="http://www.w3.org/1999/html">
@@ -128,7 +128,7 @@ 
 		// Don't fetch -beta, etc.
 		list( $display_version ) = explode( '-', GravityView_Plugin::version );
 
-		$selected = !empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
+		$selected = ! empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
 
 		echo gravityview_get_floaty( 132 );
 		?>
@@ -137,13 +137,13 @@ 
 		<div class="about-text"><?php esc_html_e( 'Thank you for installing GravityView. Beautifully display your Gravity Forms entries.', 'gravityview' ); ?></div>
 
 		<h2 class="nav-tab-wrapper clear">
-			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
 				<?php _e( "Getting Started", 'gravityview' ); ?>
 			</a>
-			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
 				<?php _e( "List of Changes", 'gravityview' ); ?>
 			</a>
-			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
 				<?php _e( 'Credits', 'gravityview' ); ?>
 			</a>
 		</h2>
@@ -177,7 +177,7 @@ 
 					<h3>Create a View</h3>
 
                     <ol class="ol-decimal">
-						<li>Go to <a href="<?php echo admin_url('post-new.php?post_type=gravityview'); ?>">Views &gt; New View</a></li>
+						<li>Go to <a href="<?php echo admin_url( 'post-new.php?post_type=gravityview' ); ?>">Views &gt; New View</a></li>
 						<li>If you want to <strong>create a new form</strong>, click the "Use a Form Preset" button</li>
 						<li>If you want to <strong>use an existing form&rsquo;s entries</strong>, select from the dropdown.</li>
 						<li>Select the type of View you would like to create. There are two core types of Views: <strong>Table</strong> and <strong>Listing</strong>.
@@ -529,7 +529,7 @@ 
 					</ul>
 
 					<h4><?php esc_attr_e( 'Want to contribute?', 'gravityview' ); ?></h4>
-					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview'), '<a href="https://github.com/gravityview/GravityView">', '</a>' ); ?></p>
+					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview' ), '<a href="https://github.com/gravityview/GravityView">', '</a>' ); ?></p>
 				</div>
 			</div>
 
@@ -571,7 +571,7 @@ 
 		global $plugin_page;
 
 		// Bail if we're just editing the plugin
-		if( $plugin_page === 'plugin-editor.php' ) { return; }
+		if ( $plugin_page === 'plugin-editor.php' ) { return; }
 
 		// Bail if no activation redirect
 		if ( ! get_transient( '_gv_activation_redirect' ) ) { return; }
@@ -582,7 +582,7 @@ 
 		$upgrade = get_option( 'gv_version_upgraded_from' );
 
 		// Don't do anything if they've already seen the new version info
-		if( $upgrade === GravityView_Plugin::version ) {
+		if ( $upgrade === GravityView_Plugin::version ) {
 			return;
 		}
 
@@ -590,10 +590,10 @@ 
 		update_option( 'gv_version_upgraded_from', GravityView_Plugin::version );
 
 		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) { return; }
+		if ( is_network_admin() || isset( $_GET[ 'activate-multi' ] ) ) { return; }
 
 		// First time install
-		if( ! $upgrade ) {
+		if ( ! $upgrade ) {
 			wp_safe_redirect( admin_url( 'edit.php?post_type=gravityview&page=gv-getting-started' ) ); exit;
 		}
 		// Update

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

Spacing +9 added lines, -9 removed lines

@@ -56,7 +56,7 @@ 
 	 */
 	public function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
 
-		$entry_default_fields['custom']	= array(
+		$entry_default_fields[ 'custom' ] = array(
 			'label'	=> $this->label,
 			'type'	=> $this->name,
 			'desc'	=> $this->description,
@@ -69,7 +69,7 @@ 
 
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
-		unset ( $field_options['search_filter'], $field_options['show_as_link'], $field_options['new_window'] );
+		unset ( $field_options[ 'search_filter' ], $field_options[ 'show_as_link' ], $field_options[ 'new_window' ] );
 
 		$new_fields = array(
 			'content' => array(
@@ -108,7 +108,7 @@ 
 		);
 
 		if ( 'edit' === $context ) {
-			unset( $field_options['custom_label'], $field_options['show_label'], $field_options['allow_edit_cap'], $new_fields['wpautop'], $new_fields['oembed'] );
+			unset( $field_options[ 'custom_label' ], $field_options[ 'show_label' ], $field_options[ 'allow_edit_cap' ], $new_fields[ 'wpautop' ], $new_fields[ 'oembed' ] );
 		}
 
 		return $new_fields + $field_options;
@@ -142,9 +142,9 @@ 
 
 		// Loop through the configured Edit Entry fields and add Custom Content fields if there are any
 		// TODO: Make this available to other custom GV field types
-		foreach ( (array) $edit_fields as $edit_field ) {
+		foreach ( (array)$edit_fields as $edit_field ) {
 
-			if( 'custom' === \GV\Utils::get( $edit_field, 'id') ) {
+			if ( 'custom' === \GV\Utils::get( $edit_field, 'id' ) ) {
 
 				$field_data = array(
 					'label' => \GV\Utils::get( $edit_field, 'custom_label' ),
@@ -157,13 +157,13 @@ 
 					$field_data[ $key ] = GravityView_Merge_Tags::replace_variables( $field_datum, $form, $entry->as_entry(), false, false );
 				}
 
-				$field_data['cssClass'] = \GV\Utils::get( $edit_field, 'custom_class' );
+				$field_data[ 'cssClass' ] = \GV\Utils::get( $edit_field, 'custom_class' );
 
-				$new_fields[] = new GF_Field_HTML( $field_data );
+				$new_fields[ ] = new GF_Field_HTML( $field_data );
 
 			} else {
-				if( isset( $fields[ $i ] ) ) {
-					$new_fields[] =  $fields[ $i ];
+				if ( isset( $fields[ $i ] ) ) {
+					$new_fields[ ] = $fields[ $i ];
 				}
 				$i++;
 			}

includes/admin/metaboxes/views/view-configuration.php

Spacing +18 added lines, -18 removed lines

@@ -15,25 +15,25 @@ 
 
 		<div id="directory-fields" class="gv-section">
 
-			<h4><?php esc_html_e( 'Top Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview'); ?></span></h4>
+			<h4><?php esc_html_e( 'Top Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview' ); ?></span></h4>
 
-			<?php do_action('gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?>
+			<?php do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?>
 
-			<h4><?php esc_html_e( 'Entries Fields', 'gravityview'); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview'); ?></span></h4>
+			<h4><?php esc_html_e( 'Entries Fields', 'gravityview' ); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview' ); ?></span></h4>
 
 			<div id="directory-active-fields" class="gv-grid">
-				<?php if(!empty( $curr_template ) ) {
-					do_action('gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true );
+				<?php if ( ! empty( $curr_template ) ) {
+					do_action( 'gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true );
 				} ?>
 			</div>
 
-			<h4><?php esc_html_e( 'Bottom Widgets', 'gravityview'); ?> <i class="gf_tooltip gv_tooltip" title="<?php esc_attr_e( 'These widgets will be shown below entries.', 'gravityview'); ?>"></i></h4>
+			<h4><?php esc_html_e( 'Bottom Widgets', 'gravityview' ); ?> <i class="gf_tooltip gv_tooltip" title="<?php esc_attr_e( 'These widgets will be shown below entries.', 'gravityview' ); ?>"></i></h4>
 
 			<?php
 
-                do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
+                do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
 
-    			do_action('gravityview_render_field_pickers', 'directory' );
+    			do_action( 'gravityview_render_field_pickers', 'directory' );
 
             ?>
 
@@ -41,7 +41,7 @@ 
             <div id="directory-available-widgets" class="hide-if-js gv-tooltip">
 				<div aria-live="polite" role="listbox" class="gv-items-picker-container gv-widget-picker-container" data-layout="grid" data-cols="2">
                 	<button class="close" role="button" aria-label="<?php esc_html_e( 'Close', 'gravityview' ); ?>"><i class="dashicons dashicons-dismiss"></i></button>
-					<?php do_action('gravityview_render_available_widgets' ); ?>
+					<?php do_action( 'gravityview_render_available_widgets' ); ?>
 				</div>
             </div>
 
@@ -59,21 +59,21 @@ 
 		<div id="single-fields" class="gv-section">
 
 			<div class="notice notice-warning inline is-dismissible">
-				<h3><?php printf( esc_html__( 'Note: %s', 'gravityview' ), sprintf( esc_html__( 'No fields link to the %s layout.', 'gravityview'), esc_html__( 'Single Entry', 'gravityview' ) ) ); ?></h3>
+				<h3><?php printf( esc_html__( 'Note: %s', 'gravityview' ), sprintf( esc_html__( 'No fields link to the %s layout.', 'gravityview' ), esc_html__( 'Single Entry', 'gravityview' ) ) ); ?></h3>
 				<p><a data-beacon-article-modal="54c67bbae4b0512429885516" href="https://docs.gravityview.co/article/70-linking-to-a-single-entry"><?php printf( esc_html__( 'Learn how to link to %s', 'gravityview' ), esc_html__( 'Single Entry', 'gravityview' ) ); ?></a></p>
 			</div>
 
-			<h4><?php esc_html_e( 'These fields will be shown in Single Entry layout.', 'gravityview'); ?></h4>
+			<h4><?php esc_html_e( 'These fields will be shown in Single Entry layout.', 'gravityview' ); ?></h4>
 
 			<div id="single-active-fields" class="gv-grid">
 				<?php
-                if(!empty( $curr_template ) ) {
-				    do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
+                if ( ! empty( $curr_template ) ) {
+				    do_action( 'gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
                 }
 			    ?>
 			</div>
             <?php
-                do_action('gravityview_render_field_pickers', 'single' );
+                do_action( 'gravityview_render_field_pickers', 'single' );
 			?>
 		</div>
 
@@ -84,20 +84,20 @@ 
 		<div id="edit-fields" class="gv-section">
 
 			<div class="notice notice-warning inline is-dismissible">
-				<h3><?php printf( esc_html__( 'Note: %s', 'gravityview' ), sprintf( esc_html__( 'No fields link to the %s layout.', 'gravityview'), esc_html__( 'Edit Entry', 'gravityview' ) ) ); ?></h3>
+				<h3><?php printf( esc_html__( 'Note: %s', 'gravityview' ), sprintf( esc_html__( 'No fields link to the %s layout.', 'gravityview' ), esc_html__( 'Edit Entry', 'gravityview' ) ) ); ?></h3>
 				<p><a data-beacon-article-modal="54c67bb9e4b0512429885513" href="https://docs.gravityview.co/article/67-configuring-the-edit-entry-screen"><?php printf( esc_html__( 'Learn how to link to %s', 'gravityview' ), esc_html__( 'Edit Entry', 'gravityview' ) ); ?></a></p>
 			</div>
 
-			<h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview'); ?> <span><?php esc_html_e('If not configured, all form fields will be displayed.', 'gravityview'); ?></span></h4>
+			<h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview' ); ?> <span><?php esc_html_e( 'If not configured, all form fields will be displayed.', 'gravityview' ); ?></span></h4>
 
 			<div id="edit-active-fields" class="gv-grid">
 				<?php
-				do_action('gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true );
+				do_action( 'gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true );
 				?>
 			</div>
 
 			<?php
-			    do_action('gravityview_render_field_pickers', 'edit' );
+			    do_action( 'gravityview_render_field_pickers', 'edit' );
 			?>
 
 		</div>

includes/class-admin-views.php

Spacing +171 added lines, -171 removed lines

@@ -27,24 +27,24 @@ 
 		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_field_pickers', array( $this, 'render_field_pickers'), 10, 2 );
-		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_field_pickers', array( $this, 'render_field_pickers' ), 10, 2 );
+		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 );
 
 		// Enqueue code editor and settings for manipulating HTML.
-		add_action('admin_enqueue_scripts', function() {
+		add_action( 'admin_enqueue_scripts', function() {
 
 		    $settings = wp_enqueue_code_editor( array( 'type' => 'text/html' ) );
 		});
@@ -53,12 +53,12 @@ 
 		//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( 'gform_form_actions', 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' ) );
 
@@ -76,11 +76,11 @@ 
 	 */
 	function suggest_support_articles( $localization_data = array() ) {
 
-	    if( ! gravityview()->request->is_view() ) {
+	    if ( ! gravityview()->request->is_view() ) {
 	        return $localization_data;
         }
 
-		$localization_data['suggest'] = array(
+		$localization_data[ 'suggest' ] = array(
             '57ef23539033602e61d4a560',
             '54c67bb9e4b0512429885513',
             '54c67bb9e4b0512429885512',
@@ -109,20 +109,20 @@ 
 			return;
 		}
 
-		if ( ! isset( $query->query_vars['post_type'] ) ) {
+		if ( ! isset( $query->query_vars[ 'post_type' ] ) ) {
 			return;
 		}
 
-		if ( 'gravityview' !== $query->query_vars['post_type'] ) {
+		if ( 'gravityview' !== $query->query_vars[ 'post_type' ] ) {
 			return;
 		}
 
-		$form_id = (int) \GV\Utils::_GET( 'gravityview_form_id' );
+		$form_id = (int)\GV\Utils::_GET( 'gravityview_form_id' );
 
 		$meta_query = array();
 
 		if ( $form_id ) {
-			$meta_query[] = array(
+			$meta_query[ ] = array(
 					'key'   => '_gravityview_form_id',
 					'value' => $form_id,
 			);
@@ -131,7 +131,7 @@ 
 		$layout_id = \GV\Utils::_GET( 'gravityview_layout' );
 
 		if ( $layout_id ) {
-			$meta_query[] = array(
+			$meta_query[ ] = array(
 					'key'   => '_gravityview_directory_template',
 					'value' => esc_attr( $layout_id ),
 			);
@@ -148,7 +148,7 @@ 
 	public function add_view_dropdown() {
 		$current_screen = get_current_screen();
 
-		if( 'gravityview' !== $current_screen->post_type ) {
+		if ( 'gravityview' !== $current_screen->post_type ) {
 			return;
 		}
 
@@ -156,12 +156,12 @@ 
 		$current_form = \GV\Utils::_GET( 'gravityview_form_id' );
 
 		// If there are no forms to select, show no forms.
-		if( ! empty( $forms ) ) { ?>
+		if ( ! empty( $forms ) ) { ?>
 			<label for="gravityview_form_id" class="screen-reader-text"><?php esc_html_e( 'Filter Views by form', 'gravityview' ); ?></label>
 			<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 esc_attr( $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 esc_attr( $form[ 'id' ] ); ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
 				<?php } ?>
 			</select>
 		<?php }
@@ -170,26 +170,26 @@ 
 		$current_layout = \GV\Utils::_GET( 'gravityview_layout' );
 
 		// If there are no forms to select, show no forms.
-		if( ! empty( $layouts ) ) { ?>
+		if ( ! empty( $layouts ) ) { ?>
 			<label for="gravityview_layout_name" class="screen-reader-text"><?php esc_html_e( 'Filter Views by layout', 'gravityview' ); ?></label>
 			<select name="gravityview_layout" id="gravityview_layout_name">
 				<option value="" <?php selected( '', $current_layout, true ); ?>><?php esc_html_e( 'All layouts', 'gravityview' ); ?></option>
 				<optgroup label="<?php esc_html_e( 'Layouts', 'gravityview' ); ?>">
-				<?php foreach( $layouts as $layout_id => $layout ) {
-					if ( in_array( $layout['type'], array( 'preset', 'internal' ), true ) ) {
+				<?php foreach ( $layouts as $layout_id => $layout ) {
+					if ( in_array( $layout[ 'type' ], array( 'preset', 'internal' ), true ) ) {
 						continue;
 					}
 					?>
-					<option value="<?php echo esc_attr( $layout_id ); ?>" <?php selected( $layout_id, $current_layout, true ); ?>><?php echo esc_html( $layout['label'] ); ?></option>
+					<option value="<?php echo esc_attr( $layout_id ); ?>" <?php selected( $layout_id, $current_layout, true ); ?>><?php echo esc_html( $layout[ 'label' ] ); ?></option>
 				<?php } ?>
 				</optgroup>
 				<optgroup label="<?php esc_html_e( 'Form Presets', 'gravityview' ); ?>">
-				<?php foreach( $layouts as $layout_id => $layout ) {
-					if ( ! in_array( $layout['type'], array( 'preset' ), true ) ) {
+				<?php foreach ( $layouts as $layout_id => $layout ) {
+					if ( ! in_array( $layout[ 'type' ], array( 'preset' ), true ) ) {
 						continue;
 					}
 					?>
-					<option value="<?php echo esc_attr( $layout_id ); ?>" <?php selected( $layout_id, $current_layout, true ); ?>><?php echo esc_html( $layout['label'] ); ?></option>
+					<option value="<?php echo esc_attr( $layout_id ); ?>" <?php selected( $layout_id, $current_layout, true ); ?>><?php echo esc_html( $layout[ 'label' ] ); ?></option>
 				<?php } ?>
 				</optgroup>
 			</select>
@@ -203,7 +203,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 );
 	}
 
 	/**
@@ -233,13 +233,13 @@ 
 
 		$priority = 0;
 
-		if( 'form_list' === GFForms::get_page() ) {
+		if ( 'form_list' === GFForms::get_page() ) {
 			$priority = 790;
         }
 
-		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>', // Only appears in GF pre-2.5
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -255,23 +255,23 @@ 
 		$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 ),
 				'icon' => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
 			);
 		}
 
 		// 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' ),
 			    'icon' => '<span class="dashicons dashicons-plus"></span>',
 			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -280,14 +280,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' ),
@@ -315,8 +315,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 );
@@ -339,27 +339,27 @@ 
 		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' ];
 
 			// 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>' )
 		);
 
 		/**
@@ -377,9 +377,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;
@@ -393,7 +393,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 = '';
 
@@ -415,7 +415,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;
 
@@ -456,44 +456,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;
 		}
 
@@ -508,11 +508,11 @@ 
 		$css_class = 'row-actions';
 
 		// Is Screen Options > View mode set to "Extended view"? If so, keep actions visible.
-		if( 'excerpt' === get_user_setting( 'posts_list_mode', 'list' ) ) {
+		if ( 'excerpt' === get_user_setting( 'posts_list_mode', 'list' ) ) {
 			$css_class = 'row-actions visible';
 		}
 
-		$output .= '<div class="' . $css_class . '">'. implode( ' | ', $links ) .'</div>';
+		$output .= '<div class="' . $css_class . '">' . implode( ' | ', $links ) . '</div>';
 
 		return $output;
 	}
@@ -526,8 +526,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',
@@ -538,14 +538,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;
 	}
@@ -558,12 +558,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;
 		}
 
@@ -578,63 +578,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' ] ) ) {
 			gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => 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' ] );
 
 			// guard against unloaded View configuration page
-			if ( isset( $_POST['gv_fields'] ) && isset( $_POST['gv_fields_done'] ) ) {
+			if ( isset( $_POST[ 'gv_fields' ] ) && isset( $_POST[ 'gv_fields_done' ] ) ) {
 				$fields = array();
 
-				if ( ! empty( $_POST['gv_fields'] ) ) {
+				if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
 					$fields = _gravityview_process_posted_fields();
 				}
 
 				$fields = wp_slash( $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
 
@@ -644,7 +644,7 @@ 
 		 * @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 );
 
 		gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) );
 	}
@@ -689,20 +689,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, array(), $form );
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details, array(), $form );
 
 			} // End foreach
 		}
@@ -710,7 +710,7 @@ 
 		echo $output;
 
 		// For the EDIT view we only want to allow the form fields.
-		if( $context === 'edit' ) {
+		if ( $context === 'edit' ) {
 			return;
 		}
 
@@ -729,7 +729,7 @@ 
 		$additional_fields = array(
 			array(
 				'label_text' => __( 'Add All Form Fields', 'gravityview' ),
-				'desc' => __('Insert all the form fields at once.', 'gravityview'),
+				'desc' => __( 'Insert all the form fields at once.', 'gravityview' ),
 				'field_id' => 'all-fields',
 				'label_type' => 'field',
 				'input_type' => null,
@@ -745,7 +745,7 @@ 
 		 */
 		$additional_fields = apply_filters( 'gravityview_additional_fields', $additional_fields );
 
-		foreach ( (array) $additional_fields as $item ) {
+		foreach ( (array)$additional_fields as $item ) {
 
 			// Prevent items from not having index set
 			$item = wp_parse_args( $item, array(
@@ -756,16 +756,16 @@ 
 				'field_options' => null,
 				'settings_html'	=> null,
 				'icon' => 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, $settings = array(), $form );
+			echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item, $settings = array(), $form );
 
 		}
 
@@ -777,12 +777,12 @@ 
 	 * @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 zone directory or single
-		if( in_array( $zone, array( 'directory', 'single' ), true ) ) {
+		if ( in_array( $zone, array( 'directory', 'single' ), true ) ) {
 
 			$meta_fields = GravityView_Fields::get_all( array( 'meta', 'gravityview', 'add-ons' ) );
 
@@ -799,7 +799,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 );
 	}
 
 	/**
@@ -810,7 +810,7 @@ 
 	 */
 	function get_available_fields( $form = '', $zone = NULL ) {
 
-		if( empty( $form ) ) {
+		if ( empty( $form ) ) {
 			gravityview()->log->error( '$form is empty' );
 			return array();
 		}
@@ -819,7 +819,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();
@@ -832,8 +832,8 @@ 
 		$fields = $fields + $meta_fields + $default_fields;
 
 		// Move Custom Content to top
-		if ( isset( $fields['custom'] ) ) {
-			$fields = array( 'custom' => $fields['custom'] ) + $fields;
+		if ( isset( $fields[ 'custom' ] ) ) {
+			$fields = array( 'custom' => $fields[ 'custom' ] ) + $fields;
 		}
 
 		$gv_fields = GravityView_Fields::get_all();
@@ -841,7 +841,7 @@ 
 		foreach ( $fields as &$field ) {
 			foreach ( $gv_fields as $gv_field ) {
 				if ( \GV\Utils::get( $field, 'type' ) === $gv_field->name ) {
-					$field['icon'] = \GV\Utils::get( $gv_field, 'icon' );
+					$field[ 'icon' ] = \GV\Utils::get( $gv_field, 'icon' );
 				}
 			}
 		}
@@ -869,7 +869,7 @@ 
 		}
 
 		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 );
 		}
 
 	}
@@ -899,7 +899,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' );
@@ -925,10 +925,10 @@ 
 		$form_id = null;
 
 		// 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_id = $form = gravityview_get_form_id( $post->ID );
 			}
@@ -946,53 +946,53 @@ 
 			}
 		}
 
-		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" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
+						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
                             <p class="gv-droppable-area-title">
-								<strong <?php if ( 'widget' === $type ) { echo 'class="screen-reader-text"'; } ?>><?php echo esc_html( $area['title'] ); ?></strong>
+								<strong <?php if ( 'widget' === $type ) { echo 'class="screen-reader-text"'; } ?>><?php echo esc_html( $area[ 'title' ] ); ?></strong>
 
 								<?php if ( 'widget' !== $type ) { ?>
-									<a class="clear-all-fields alignright" role="button" href="#" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>"><?php esc_html_e( 'Clear all fields', 'gravityview' ); ?></a>
+									<a class="clear-all-fields alignright" role="button" href="#" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>"><?php esc_html_e( 'Clear all fields', 'gravityview' ); ?></a>
 								<?php } ?>
 
-                                <?php if ( ! empty( $area['subtitle'] ) ) { ?>
-									<span class="gv-droppable-area-subtitle"><span class="gf_tooltip gv_tooltip tooltip" title="<?php echo esc_attr( $area['subtitle'] ); ?>"></span></span>
+                                <?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?>
+									<span class="gv-droppable-area-subtitle"><span class="gf_tooltip gv_tooltip tooltip" title="<?php echo esc_attr( $area[ 'subtitle' ] ); ?>"></span></span>
 								<?php } ?>
 							</p>
 							<div class="active-drop-container active-drop-container-<?php echo esc_attr( $type ); ?>">
-							<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'] ] ) ) {
+							<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' ] ] ) ) {
 
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
 
 										// Maybe has a form ID
-										$form_id = empty( $field['form_id'] ) ? $form_id : $field['form_id'];
+										$form_id = empty( $field[ 'form_id' ] ) ? $form_id : $field[ 'form_id' ];
 
 										$input_type = NULL;
 
 										if ( $form_id ) {
-											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
+											$original_item = isset( $available_items[ $form_id ] [ $field[ 'id' ] ] ) ? $available_items[ $form_id ] [ $field[ 'id' ] ] : false;
                                         } else {
-											$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 ) {
-											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(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
+										if ( ! $original_item ) {
+											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( ' data' => 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( $form_id, $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( $form_id, $type, $template_id, $field[ 'id' ], $original_item[ 'label' ], $zone . '_' . $area[ 'areaid' ], $input_type, $uniqid, $field, $zone, $original_item );
 
 										$item = array(
 											'input_type' => $input_type,
@@ -1005,12 +1005,12 @@ 
 											$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( $field['label'], $field['id'], $item, $field, $form_id );
+												echo new GravityView_Admin_View_Field( $field[ 'label' ], $field[ 'id' ], $item, $field, $form_id );
 										}
 									}
 
@@ -1018,7 +1018,7 @@ 
 								<div class="gv-droppable-area-action">
 									<a href="#" class="gv-add-field button button-link button-hero" title=""
 									   data-objecttype="<?php echo esc_attr( $type ); ?>"
-									   data-areaid="<?php echo esc_attr( $zone . '_' . $area['areaid'] ); ?>"
+									   data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>"
 									   data-context="<?php echo esc_attr( $zone ); ?>"
 									   data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '<span class="dashicons dashicons-plus-alt"></span>' . esc_html( $button_label ); ?></a>
 								</div>
@@ -1051,7 +1051,7 @@ 
 				// This is a new View, prefill the widgets
 				$widgets = array(
 					'header_top' => array(
-						substr( md5( microtime( true ) ), 0, 13 ) => array (
+						substr( md5( microtime( true ) ), 0, 13 ) => array(
 							'id' => 'search_bar',
 							'label' => __( 'Search Bar', 'gravityview' ),
 							'search_layout' => 'horizontal',
@@ -1126,12 +1126,12 @@ 
 		if ( $post ) {
 			$source_form_id = gravityview_get_form_id( $post->ID );
 			if ( $source_form_id ) {
-				$form_ids[] = $source_form_id;
+				$form_ids[ ] = $source_form_id;
 			}
 
 			$joined_forms = \GV\View::get_joined_forms( $post->ID );
 			foreach ( $joined_forms as $joined_form ) {
-				$form_ids[] = $joined_form->ID;
+				$form_ids[ ] = $joined_form->ID;
 			}
 		}
 		foreach ( array_unique( $form_ids ) as $form_id ) {
@@ -1169,7 +1169,7 @@ 
 	 * @return string HTML of the active areas
 	 */
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
-		if( empty( $template_id ) ) {
+		if ( empty( $template_id ) ) {
 			gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) );
 			return '';
 		}
@@ -1183,12 +1183,12 @@ 
 		 */
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
 
-		if( empty( $template_areas ) ) {
+		if ( empty( $template_areas ) ) {
 
 			gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $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 {
 
@@ -1203,7 +1203,7 @@ 
 
 		}
 
-		if( $echo ) {
+		if ( $echo ) {
 			echo $output;
 		}
 
@@ -1231,31 +1231,31 @@ 
 		}
 
 		// Add the GV font (with the Astronaut)
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
+        wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), \GV\Plugin::$version );
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
 
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), \GV\Plugin::$version, true );
 
-		if( GFForms::get_page() === 'form_list' ) {
+		if ( GFForms::get_page() === 'form_list' ) {
 			wp_enqueue_style( 'gravityview_views_styles' );
 			return;
         }
 
 		// Don't process any scripts below here if it's not a GravityView page.
-		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
+		if ( ! gravityview()->request->is_admin( $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), \GV\Plugin::$version );
+        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), \GV\Plugin::$version );
 
         // 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' ), \GV\Plugin::$version );
 
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
+        wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
             'cookiepath' => COOKIEPATH,
             'admin_cookiepath' => ADMIN_COOKIE_PATH,
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
+            'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ),
             'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
             'label_viewname' => __( 'Enter View name here', 'gravityview' ),
             'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
@@ -1270,7 +1270,7 @@ 
             '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?', 'gravityview' ),
-        ));
+        ) );
 
 		wp_enqueue_style( 'gravityview_views_styles' );
 
@@ -1278,7 +1278,7 @@ 
         self::enqueue_gravity_forms_scripts();
 
 		// 2.5 changed how Merge Tags are enqueued
-		if ( is_callable( array( 'GFCommon', 'output_hooks_javascript') ) ) {
+		if ( is_callable( array( 'GFCommon', 'output_hooks_javascript' ) ) ) {
 			GFCommon::output_hooks_javascript();
 		}
 	}
@@ -1302,7 +1302,7 @@ 
 		);
 
 		if ( wp_is_mobile() ) {
-		    $scripts[] = 'jquery-touch-punch';
+		    $scripts[ ] = 'jquery-touch-punch';
 		}
 
 		wp_enqueue_script( $scripts );

includes/admin/class.render.settings.php

Spacing +85 added lines, -85 removed lines

@@ -53,7 +53,7 @@ 
 
 		$is_table_layout = preg_match( '/table/ism', $template_id );
 
-		if( 'field' === $field_type ) {
+		if ( 'field' === $field_type ) {
 
 			// Default options - fields
 			$field_options = array(
@@ -105,11 +105,11 @@ 
 			);
 
 			// Match Table as well as DataTables
-			if( $is_table_layout && 'directory' === $context ) {
-				$field_options['width'] = array(
+			if ( $is_table_layout && 'directory' === $context ) {
+				$field_options[ 'width' ] = array(
 					'type' => 'number',
-					'label' => __('Percent Width', 'gravityview'),
-					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview'),
+					'label' => __( 'Percent Width', 'gravityview' ),
+					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview' ),
 					'class' => 'code widefat',
 					'value' => '',
 					'priority' => 200,
@@ -121,7 +121,7 @@ 
 
 		// Remove suffix ":" from the labels to standardize style. Using trim() instead of rtrim() for i18n.
 		foreach ( $field_options as $key => $field_option ) {
-			$field_options[ $key ]['label'] = trim( $field_options[ $key ]['label'], ':' );
+			$field_options[ $key ][ 'label' ] = trim( $field_options[ $key ][ 'label' ], ':' );
 		}
 
 		/**
@@ -156,7 +156,7 @@ 
 				switch ( $key ) {
 					case 'show_as_link':
 						$_group = 'display';
-						$field_option['priority'] = 100;
+						$field_option[ 'priority' ] = 100;
 						break;
 					default:
 						$_group = \GV\Utils::get( $field_option, 'group', 'display' );
@@ -171,7 +171,7 @@ 
 			}
 
 			$field_options = array();
-			foreach ( self::get_field_groups() as $group_key => $group_name  ) {
+			foreach ( self::get_field_groups() as $group_key => $group_name ) {
 				$field_options[ $group_key ] = \GV\Utils::get( $option_groups, $group_key, array() );
 			}
 
@@ -202,7 +202,7 @@ 
 			return 0;
 		}
 
-		return ( $a_priority < $b_priority ) ? - 1 : 1;
+		return ( $a_priority < $b_priority ) ? -1 : 1;
 	}
 
 	/**
@@ -227,8 +227,8 @@ 
 			'manage_options' => __( 'Administrator', 'gravityview' ),
 		);
 
-		if( is_multisite() ) {
-			$select_cap_choices['manage_network'] = __('Multisite Super Admin', 'gravityview' );
+		if ( is_multisite() ) {
+			$select_cap_choices[ 'manage_network' ] = __( 'Multisite Super Admin', 'gravityview' );
 		}
 
 		/**
@@ -241,7 +241,7 @@ 
 		 * @param  string $context     Optional. What context are we in? Example: `single` or `directory`
 		 * @param  string $input_type  Optional. (textarea, list, select, etc.)
 		 */
-		$select_cap_choices = apply_filters('gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
+		$select_cap_choices = apply_filters( 'gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
 
 		return $select_cap_choices;
 	}
@@ -268,9 +268,9 @@ 
 	 */
 	public static function render_field_options( $form_id, $field_type, $template_id, $field_id, $field_label, $area, $input_type = NULL, $uniqid = '', $current = '', $context = 'single', $item = array() ) {
 
-		if( empty( $uniqid ) ) {
+		if ( empty( $uniqid ) ) {
 			//generate a unique field id
-			$uniqid = uniqid('', false);
+			$uniqid = uniqid( '', false );
 		}
 
 		$grouped = ( 'field' === $field_type );
@@ -278,24 +278,24 @@ 
 		// get field/widget options
 		$option_groups = self::get_default_field_options( $field_type, $template_id, $field_id, $context, $input_type, $form_id, $grouped );
 
-		if( ! $grouped ) {
+		if ( ! $grouped ) {
 			$option_groups = array( $option_groups );
 		}
 
 		$option_groups = array_filter( $option_groups );
 
 		// two different post arrays, depending of the field type
-		$name_prefix = $field_type .'s' .'['. $area .']['. $uniqid .']';
+		$name_prefix = $field_type . 's' . '[' . $area . '][' . $uniqid . ']';
 
 		// build output
-		$hidden_fields  = '<input type="hidden" class="field-key" name="'. $name_prefix .'[id]" value="'. esc_attr( $field_id ) .'">';
-		$hidden_fields .= '<input type="hidden" class="field-label" name="'. $name_prefix .'[label]" value="'. esc_attr( $field_label ) .'">';
+		$hidden_fields  = '<input type="hidden" class="field-key" name="' . $name_prefix . '[id]" value="' . esc_attr( $field_id ) . '">';
+		$hidden_fields .= '<input type="hidden" class="field-label" name="' . $name_prefix . '[label]" value="' . esc_attr( $field_label ) . '">';
 
 		$form_title = '';
 		if ( $form_id ) {
-			$hidden_fields .= '<input type="hidden" class="field-form-id" name="'. $name_prefix .'[form_id]" value="'. esc_attr( $form_id ) .'">';
+			$hidden_fields .= '<input type="hidden" class="field-form-id" name="' . $name_prefix . '[form_id]" value="' . esc_attr( $form_id ) . '">';
 			$form = GVCommon::get_form( $form_id );
-			$form_title = $form['title'];
+			$form_title = $form[ 'title' ];
 		}
 
 		// If there are no options, return what we got.
@@ -303,14 +303,14 @@ 
 			return $hidden_fields . '<!-- No Options -->'; // The HTML comment is here for checking if the output is empty in render_label()
 		}
 
-		$settings_title = esc_attr( sprintf( __( '%s Settings', 'gravityview' ) , strip_tags( html_entity_decode( $field_label ) ) ) );
+		$settings_title = esc_attr( sprintf( __( '%s Settings', 'gravityview' ), strip_tags( html_entity_decode( $field_label ) ) ) );
 
 		$field_details = '';
 
 		// Get the pretty name for the input type
 		$gv_field = GravityView_Fields::get( $input_type );
 
-		if( $gv_field ) {
+		if ( $gv_field ) {
 			$input_type_label = $gv_field->label;
 		} else {
 			$input_type_label = $input_type;
@@ -324,7 +324,7 @@ 
 			}
 
 			if ( $grouped ) {
-				$group_name     = rgar( self::get_field_groups(), $group_key, '' );
+				$group_name = rgar( self::get_field_groups(), $group_key, '' );
 				$field_settings .= '<fieldset class="item-settings-group item-settings-group-' . esc_attr( $group_key ) . '">';
 				$field_settings .= '<legend>' . esc_attr( $group_name ) . '</legend>';
 			}
@@ -341,15 +341,15 @@ 
 				}
 
 				$show_if = '';
-				if ( ! empty( $option['requires'] ) ) {
-					$show_if .= sprintf( ' data-requires="%s"', $option['requires'] );
+				if ( ! empty( $option[ 'requires' ] ) ) {
+					$show_if .= sprintf( ' data-requires="%s"', $option[ 'requires' ] );
 				}
 
-				if ( ! empty( $option['requires_not'] ) ) {
-					$show_if .= sprintf( ' data-requires-not="%s"', $option['requires_not'] );
+				if ( ! empty( $option[ 'requires_not' ] ) ) {
+					$show_if .= sprintf( ' data-requires-not="%s"', $option[ 'requires_not' ] );
 				}
 
-				switch ( $option['type'] ) {
+				switch ( $option[ 'type' ] ) {
 					// Hide hidden fields
 					case 'hidden':
 						$field_settings .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . ' screen-reader-text">' . $field_output . '</div>';
@@ -367,30 +367,30 @@ 
 		$item_details = '';
 		$subtitle = '';
 
-		if( 'field' === $field_type ) {
-			$subtitle = ! empty( $item['subtitle'] ) ? '<div class="subtitle">' . $item['subtitle'] . '</div>' : '';
+		if ( 'field' === $field_type ) {
+			$subtitle = ! empty( $item[ 'subtitle' ] ) ? '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>' : '';
 
 			$item_details .= '
 			<div class="gv-field-details--container">
-				<label class="gv-field-details--toggle">' . esc_html__( 'Field Details', 'gravityview' ) .' <i class="dashicons dashicons-arrow-down"></i></label>
+				<label class="gv-field-details--toggle">' . esc_html__( 'Field Details', 'gravityview' ) . ' <i class="dashicons dashicons-arrow-down"></i></label>
 				<section class="gv-field-details gv-field-details--closed">';
 
 				if ( $field_id && is_numeric( $field_id ) ) {
 				$item_details .= '
 					<div class="gv-field-detail gv-field-detail--field">
-						<span class="gv-field-detail--label">' . esc_html__( 'Field ID', 'gravityview' ) .'</span><span class="gv-field-detail--value">#{{field_id}}</span>
+						<span class="gv-field-detail--label">' . esc_html__( 'Field ID', 'gravityview' ) . '</span><span class="gv-field-detail--value">#{{field_id}}</span>
 					</div>';
 			    }
 
 				$item_details .= '
 					<div class="gv-field-detail gv-field-detail--type">
-						<span class="gv-field-detail--label">' . esc_html_x( 'Type', 'The type of field being configured (eg: "Single Line Text")', 'gravityview' ) .'</span><span class="gv-field-detail--value">{{input_type_label}}</span>
+						<span class="gv-field-detail--label">' . esc_html_x( 'Type', 'The type of field being configured (eg: "Single Line Text")', 'gravityview' ) . '</span><span class="gv-field-detail--value">{{input_type_label}}</span>
 					</div>';
 
-				if( $form_id ) {
+				if ( $form_id ) {
 					$item_details .= '
 					<div class="gv-field-detail gv-field-detail--form">
-						<span class="gv-field-detail--label">' . esc_html__( 'Form', 'gravityview' ) .'</span><span class="gv-field-detail--value">{{form_title}} (#{{form_id}})</span>
+						<span class="gv-field-detail--label">' . esc_html__( 'Form', 'gravityview' ) . '</span><span class="gv-field-detail--value">{{form_title}} (#{{form_id}})</span>
 					</div>';
 				}
 				$item_details .= '
@@ -398,8 +398,8 @@ 
 			</div>';
 		} else {
 			$widget_details_content = rgar( $item, 'description', '' );
-			if ( ! empty( $item['subtitle'] ) ) {
-				$widget_details_content .= ( '' !== $widget_details_content ) ? "\n\n" . $item['subtitle'] : $item['subtitle'];
+			if ( ! empty( $item[ 'subtitle' ] ) ) {
+				$widget_details_content .= ( '' !== $widget_details_content ) ? "\n\n" . $item[ 'subtitle' ] : $item[ 'subtitle' ];
 			}
 
 			// Intentionally not escaping to allow HTML.
@@ -455,17 +455,17 @@ 
 		 * @deprecated setting index 'default' was replaced by 'value'
 		 * @see GravityView_FieldType::get_field_defaults
 		 */
-		if( !empty( $option['default'] ) && empty( $option['value'] ) ) {
-			$option['value'] = $option['default'];
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting '. $name .' details' );
+		if ( ! empty( $option[ 'default' ] ) && empty( $option[ 'value' ] ) ) {
+			$option[ 'value' ] = $option[ 'default' ];
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting ' . $name . ' details' );
 		}
 
 		// prepare to render option field type
-		if( isset( $option['type'] ) ) {
+		if ( isset( $option[ 'type' ] ) ) {
 
 			$type_class = self::load_type_class( $option );
 
-			if( class_exists( $type_class ) ) {
+			if ( class_exists( $type_class ) ) {
 
 				/** @type GravityView_FieldType $render_type */
 				$render_type = new $type_class( $name, $option, $curr_value );
@@ -482,7 +482,7 @@ 
 				 * @param[in,out] string $output field class name
 				 * @param[in] array $option  option field data
 				 */
-				$output = apply_filters( "gravityview/option/output/{$option['type']}" , $output, $option );
+				$output = apply_filters( "gravityview/option/output/{$option[ 'type' ]}", $output, $option );
 			}
 
 		} // isset option[type]
@@ -517,27 +517,27 @@ 
 		 * @deprecated setting index 'name' was replaced by 'label'
 		 * @see GravityView_FieldType::get_field_defaults
 		 */
-		if( isset( $setting['name'] ) && empty( $setting['label'] ) ) {
-			$setting['label'] = $setting['name'];
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting '. $key .' details' );
+		if ( isset( $setting[ 'name' ] ) && empty( $setting[ 'label' ] ) ) {
+			$setting[ 'label' ] = $setting[ 'name' ];
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting ' . $key . ' details' );
 		}
 
 		$name = esc_attr( sprintf( $name, $key ) );
-		$setting['id'] = esc_attr( sprintf( $id, $key ) );
-		$setting['tooltip'] = 'gv_' . $key;
+		$setting[ 'id' ] = esc_attr( sprintf( $id, $key ) );
+		$setting[ 'tooltip' ] = 'gv_' . $key;
 
 		// Use default if current setting isn't set.
-		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting['value'];
+		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting[ 'value' ];
 
 		// default setting type = text
-		$setting['type'] = empty( $setting['type'] ) ? 'text' : $setting['type'];
+		$setting[ 'type' ] = empty( $setting[ 'type' ] ) ? 'text' : $setting[ 'type' ];
 
 		// merge tags
-		if( !isset( $setting['merge_tags'] ) ) {
-			if( $setting['type'] === 'text' ) {
-				$setting['merge_tags'] = true;
+		if ( ! isset( $setting[ 'merge_tags' ] ) ) {
+			if ( $setting[ 'type' ] === 'text' ) {
+				$setting[ 'merge_tags' ] = true;
 			} else {
-				$setting['merge_tags'] = false;
+				$setting[ 'merge_tags' ] = false;
 			}
 		}
 
@@ -545,7 +545,7 @@ 
 
 		// render the setting
 		$type_class = self::load_type_class( $setting );
-		if( class_exists( $type_class ) ) {
+		if ( class_exists( $type_class ) ) {
 			/** @type GravityView_FieldType $render_type */
 			$render_type = new $type_class( $name, $setting, $curr_value );
 			ob_start();
@@ -554,25 +554,25 @@ 
 		}
 
 		// Check if setting is specific for a template
-		if( !empty( $setting['show_in_template'] ) ) {
-			if( !is_array( $setting['show_in_template'] ) ) {
-				$setting['show_in_template'] = array( $setting['show_in_template'] );
+		if ( ! empty( $setting[ 'show_in_template' ] ) ) {
+			if ( ! is_array( $setting[ 'show_in_template' ] ) ) {
+				$setting[ 'show_in_template' ] = array( $setting[ 'show_in_template' ] );
 			}
-			$show_if = ' data-show-if="'. implode( ' ', $setting['show_in_template'] ).'"';
+			$show_if = ' data-show-if="' . implode( ' ', $setting[ 'show_in_template' ] ) . '"';
 		} else {
 			$show_if = '';
 		}
 
-		if( ! empty( $setting['requires'] ) ) {
-			$show_if .= sprintf( ' data-requires="%s"', $setting['requires'] );
+		if ( ! empty( $setting[ 'requires' ] ) ) {
+			$show_if .= sprintf( ' data-requires="%s"', $setting[ 'requires' ] );
 		}
 
-		if( ! empty( $setting['requires_not'] ) ) {
-			$show_if .= sprintf( ' data-requires-not="%s"', $setting['requires_not'] );
+		if ( ! empty( $setting[ 'requires_not' ] ) ) {
+			$show_if .= sprintf( ' data-requires-not="%s"', $setting[ 'requires_not' ] );
 		}
 
 		// output
-		echo '<tr style="vertical-align: top;" '. $show_if .'>' . $output . '</tr>';
+		echo '<tr style="vertical-align: top;" ' . $show_if . '>' . $output . '</tr>';
 
 	}
 
@@ -584,7 +584,7 @@ 
 	 */
 	public static function load_type_class( $field = NULL ) {
 
-		if( empty( $field['type'] ) ) {
+		if ( empty( $field[ 'type' ] ) ) {
 			return NULL;
 		}
 
@@ -593,9 +593,9 @@ 
 		 * @param string $class_suffix  field class suffix; `GravityView_FieldType_{$class_suffix}`
 		 * @param array $field   field data
 		 */
-		$type_class = apply_filters( "gravityview/setting/class/{$field['type']}", 'GravityView_FieldType_' . $field['type'], $field );
+		$type_class = apply_filters( "gravityview/setting/class/{$field[ 'type' ]}", 'GravityView_FieldType_' . $field[ 'type' ], $field );
 
-		if( class_exists( $type_class ) ) {
+		if ( class_exists( $type_class ) ) {
 			return $type_class;
 		}
 
@@ -604,9 +604,9 @@ 
 		 * @param string  $field_type_include_path field class file path
 		 * @param array $field  field data
 		 */
-		$class_file = apply_filters( "gravityview/setting/class_file/{$field['type']}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field['type']}.php", $field );
+		$class_file = apply_filters( "gravityview/setting/class_file/{$field[ 'type' ]}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field[ 'type' ]}.php", $field );
 
-		if( $class_file && file_exists( $class_file ) ) {
+		if ( $class_file && file_exists( $class_file ) ) {
 			require_once( $class_file );
 		}
 
@@ -628,8 +628,8 @@ 
 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_checkbox::render_input' );
 
-		$output  = '<input name="'. esc_attr( $name ) .'" type="hidden" value="0">';
-		$output .= '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="checkbox" value="1" '. checked( $current, '1', false ) .' >';
+		$output  = '<input name="' . esc_attr( $name ) . '" type="hidden" value="0">';
+		$output .= '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="checkbox" value="1" ' . checked( $current, '1', false ) . ' >';
 
 		return $output;
 	}
@@ -649,22 +649,22 @@ 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_text::render_input' );
 
 		// Show the merge tags if the field is a list view
-		$is_list = ( preg_match( '/_list-/ism', $name ));
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
 
 		// Or is a single entry view
-		$is_single = ( preg_match( '/single_/ism', $name ));
+		$is_single = ( preg_match( '/single_/ism', $name ) );
 		$show = ( $is_single || $is_list );
 
 		$class = '';
 		// and $add_merge_tags is not false
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
 		}
 
-		$class .= !empty( $args['class'] ) ? $args['class'] : 'widefat';
-		$type = !empty( $args['type'] ) ? $args['type'] : 'text';
+		$class .= ! empty( $args[ 'class' ] ) ? $args[ 'class' ] : 'widefat';
+		$type = ! empty( $args[ 'type' ] ) ? $args[ 'type' ] : 'text';
 
-		return '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="'.esc_attr($type).'" value="'. esc_attr( $current ) .'" class="'.esc_attr( $class ).'">';
+		return '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="' . esc_attr( $type ) . '" value="' . esc_attr( $current ) . '" class="' . esc_attr( $class ) . '">';
 	}
 
 	/**
@@ -681,21 +681,21 @@ 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_textarea::render_input' );
 
 		// Show the merge tags if the field is a list view
-		$is_list = ( preg_match( '/_list-/ism', $name ));
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
 
 		// Or is a single entry view
-		$is_single = ( preg_match( '/single_/ism', $name ));
+		$is_single = ( preg_match( '/single_/ism', $name ) );
 		$show = ( $is_single || $is_list );
 
 		$class = '';
 		// and $add_merge_tags is not false
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
 		}
 
-		$class .= !empty( $args['class'] ) ? 'widefat '.$args['class'] : 'widefat';
+		$class .= ! empty( $args[ 'class' ] ) ? 'widefat ' . $args[ 'class' ] : 'widefat';
 
-		return '<textarea name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" class="'.esc_attr( $class ).'">'. esc_textarea( $current ) .'</textarea>';
+		return '<textarea name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '">' . esc_textarea( $current ) . '</textarea>';
 	}
 
 	/**
@@ -711,9 +711,9 @@ 
 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_select::render_input' );
 
-		$output = '<select name="'. $name .'" id="'. $id .'">';
-		foreach( $choices as $value => $label ) {
-			$output .= '<option value="'. esc_attr( $value ) .'" '. selected( $value, $current, false ) .'>'. esc_html( $label ) .'</option>';
+		$output = '<select name="' . $name . '" id="' . $id . '">';
+		foreach ( $choices as $value => $label ) {
+			$output .= '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $current, false ) . '>' . esc_html( $label ) . '</option>';
 		}
 		$output .= '</select>';
 

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

Spacing +27 added lines, -27 removed lines

@@ -68,8 +68,8 @@ 
 				continue;
 			}
 
-			$field_id = intval( floor( $search_field['key'] ) );
-			$input_id = gravityview_get_input_id_from_id( $search_field['key'] );
+			$field_id = intval( floor( $search_field[ 'key' ] ) );
+			$input_id = gravityview_get_input_id_from_id( $search_field[ 'key' ] );
 			$form = GravityView_View::getInstance()->getForm();
 
 			/** @type GF_Field_Address $address_field */
@@ -78,7 +78,7 @@ 
 			$choices = array();
 
 			$method_name = 'get_choices_' . self::get_input_type_from_input_id( $input_id );
-			if( method_exists( $this, $method_name ) ) {
+			if ( method_exists( $this, $method_name ) ) {
 				/**
 				 * @uses GravityView_Field_Address::get_choices_country()
 				 * @uses GravityView_Field_Address::get_choices_state()
@@ -86,12 +86,12 @@ 
 				$choices = $this->{$method_name}( $address_field, $form );
 			}
 
-			if( ! empty( $choices ) ) {
-				$search_field['choices'] = $choices;
-				$search_field['type'] = \GV\Utils::get( $search_field, 'input');
+			if ( ! empty( $choices ) ) {
+				$search_field[ 'choices' ] = $choices;
+				$search_field[ 'type' ] = \GV\Utils::get( $search_field, 'input' );
 			} else {
-				$search_field['type'] = 'text';
-				$search_field['input'] = 'input_text';
+				$search_field[ 'type' ] = 'text';
+				$search_field[ 'input' ] = 'input_text';
 			}
 		}
 
@@ -116,7 +116,7 @@ 
 		$country_choices = array();
 
 		foreach ( $countries as $key => $country ) {
-			$country_choices[] = array(
+			$country_choices[ ] = array(
 				'value' => $country,
 				'text' => $country,
 			);
@@ -141,7 +141,7 @@ 
 	 */
 	private function get_choices_state( $address_field, $form ) {
 
-		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form['id'] ) : $address_field->addressType;
+		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form[ 'id' ] ) : $address_field->addressType;
 
 		$state_choices = array();
 
@@ -153,8 +153,8 @@ 
 				$states = GFCommon::get_canadian_provinces();
 				break;
 			default:
-				$address_types = $address_field->get_address_types( $form['id'] );
-				$states = empty( $address_types[ $address_type ]['states'] ) ? array() : $address_types[ $address_type ]['states'];
+				$address_types = $address_field->get_address_types( $form[ 'id' ] );
+				$states = empty( $address_types[ $address_type ][ 'states' ] ) ? array() : $address_types[ $address_type ][ 'states' ];
 				break;
 		}
 
@@ -163,19 +163,19 @@ 
 				$state_subchoices = array();
 
 				foreach ( $state as $key => $substate ) {
-					$state_subchoices[] = array(
+					$state_subchoices[ ] = array(
 						'value' => is_numeric( $key ) ? $substate : $key,
 						'text' => $substate,
 					);
 				}
 
-				$state_choices[] = array(
+				$state_choices[ ] = array(
 					'text' => $key,
 					'value' => $state_subchoices,
 				);
 
 			} else {
-				$state_choices[] = array(
+				$state_choices[ ] = array(
 					'value' => is_numeric( $key ) ? $state : $key,
 					'text' => $state,
 				);
@@ -199,13 +199,13 @@ 
 		// Use the same inputs as the "text" input type allows
 		$text_inputs = \GV\Utils::get( $input_types, 'text' );
 
-		$input_types['street'] = $text_inputs;
-		$input_types['street2'] = $text_inputs;
-		$input_types['city'] = $text_inputs;
+		$input_types[ 'street' ] = $text_inputs;
+		$input_types[ 'street2' ] = $text_inputs;
+		$input_types[ 'city' ] = $text_inputs;
 
-		$input_types['state'] = array( 'select', 'radio', 'link' ) + $text_inputs;
-		$input_types['zip'] = array( 'input_text' );
-		$input_types['country'] = array( 'select', 'radio', 'link' ) + $text_inputs;
+		$input_types[ 'state' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
+		$input_types[ 'zip' ] = array( 'input_text' );
+		$input_types[ 'country' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
 
 		return $input_types;
 	}
@@ -226,12 +226,12 @@ 
 		// Is this search field for an input (eg: 4.2) or the whole address field (eg: 4)?
 		$input_id = gravityview_get_input_id_from_id( $field_id );
 
-		if( 'address' !== $field_type && $input_id ) {
+		if ( 'address' !== $field_type && $input_id ) {
 			return $input_type;
 		}
 
 		// If the input ID matches an expected address input, set to that. Otherwise, keep existing input type.
-		if( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
+		if ( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
 			$input_type = $address_field_name;
 		}
 
@@ -279,17 +279,17 @@ 
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
 		// If this is NOT the full address field, return default options.
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
 			return $field_options;
 		}
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
 		$add_options = array();
 
-		$add_options['show_map_link'] = array(
+		$add_options[ 'show_map_link' ] = array(
 			'type'       => 'checkbox',
 			'label'      => __( 'Show Map Link:', 'gravityview' ),
 			'desc'       => __( 'Display a "Map It" link below the address', 'gravityview' ),
@@ -301,7 +301,7 @@ 
 
 		$this->add_field_support( 'new_window', $add_options );
 
-		$add_options['new_window']['requires'] = 'show_map_link';
+		$add_options[ 'new_window' ][ 'requires' ] = 'show_map_link';
 
 		return $add_options + $field_options;
 	}