gravityview / GravityView

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

Indentation +112 added lines, -112 removed lines

@@ -138,20 +138,20 @@ 
 	}
 
 	/**
-     * Uninstall all traces of GravityView
-     *
-     * Note: method is public because parent method is public
-     *
+	 * Uninstall all traces of GravityView
+	 *
+	 * Note: method is public because parent method is public
+	 *
 	 * @return bool
 	 */
 	public function uninstall() {
 		gravityview()->plugin->uninstall();
 
 		/**
-         * Set the path so that Gravity Forms can de-activate GravityView
-         * @see GFAddOn::uninstall_addon
-         * @uses deactivate_plugins()
-         */
+		 * Set the path so that Gravity Forms can de-activate GravityView
+		 * @see GFAddOn::uninstall_addon
+		 * @uses deactivate_plugins()
+		 */
 		$this->_path = GRAVITYVIEW_FILE;
 
 		return true;
@@ -181,42 +181,42 @@ 
 	}
 
 	/**
-     * Get an array of reasons why the plugin might be uninstalled
-     *
-     * @since 1.17.5
-     *
+	 * Get an array of reasons why the plugin might be uninstalled
+	 *
+	 * @since 1.17.5
+	 *
 	 * @return array Array of reasons with the label and followup questions for each uninstall reason
 	 */
 	private function get_uninstall_reasons() {
 		$reasons = array(
 			'will-continue' => array(
-                'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
-            ),
+				'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
+			),
 			'no-longer-need' => array(
-                'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
-            ),
+				'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
+			),
 			'doesnt-work' => array(
-                'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
-            ),
+				'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
+			),
 			'found-other' => array(
-                'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
-                'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ),
-            ),
+				'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
+				'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ),
+			),
 			'other' => array(
-                'label' => esc_html__( 'Other', 'gravityview' ),
-            ),
+				'label' => esc_html__( 'Other', 'gravityview' ),
+			),
 		);
 
 		shuffle( $reasons );
 
 		return $reasons;
-    }
+	}
 
 	/**
-     * Display a feedback form when the plugin is uninstalled
-     *
-     * @since 1.17.5
-     *
+	 * Display a feedback form when the plugin is uninstalled
+	 *
+	 * @since 1.17.5
+	 *
 	 * @return string HTML of the uninstallation form
 	 */
 	public function uninstall_form() {
@@ -296,7 +296,7 @@ 
             <h2><?php esc_html_e( 'Why did you uninstall GravityView?', 'gravityview' ); ?></h2>
             <ul>
 				<?php
-                $reasons = $this->get_uninstall_reasons();
+				$reasons = $this->get_uninstall_reasons();
 				foreach ( $reasons as $reason ) {
 					printf( '<li><label><input name="reason" type="radio" value="other" data-followup="%s"> %s</label></li>', Utils::get( $reason, 'followup' ), Utils::get( $reason, 'label' ) );
 				}
@@ -390,12 +390,12 @@ 
 	}
 
 	public function app_settings_tab() {
-	    parent::app_settings_tab();
+		parent::app_settings_tab();
 
 		if ( $this->maybe_uninstall() ) {
-            echo $this->uninstall_form();
+			echo $this->uninstall_form();
 		}
-    }
+	}
 
 	/**
 	 * The Settings title
@@ -480,7 +480,7 @@ 
 	 * @return array The settings.
 	 */
 	public function all() {
-	    return wp_parse_args( get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', array() ), $this->defaults() );
+		return wp_parse_args( get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', array() ), $this->defaults() );
 	}
 
 	/**
@@ -549,8 +549,8 @@ 
                     type="' . $field['type'] . '"
                     name="' . esc_attr( $name ) . '"
                     value="' . $value . '" ' .
-		        implode( ' ', $attributes ) .
-		        ' />';
+				implode( ' ', $attributes ) .
+				' />';
 
 		if ( $echo ) {
 			echo $html;
@@ -568,12 +568,12 @@ 
 	}
 
 	/**
-     * Check whether GravityView is being saved
-     *
-     * The generic is_save_postback() is true for all addons
-     *
-     * @since 2.0.8
-     *
+	 * Check whether GravityView is being saved
+	 *
+	 * The generic is_save_postback() is true for all addons
+	 *
+	 * @since 2.0.8
+	 *
 	 * @return bool
 	 */
 	public function is_save_postback() {
@@ -587,16 +587,16 @@ 
 	 */
 	public function license_key_notice() {
 
-	    if( $this->is_save_postback() ) {
-		    $settings = $this->get_posted_settings();
-		    $license_key = \GV\Utils::get( $settings, 'license_key' );
-		    $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
-        } else {
-		    $license_status = $this->get( 'license_key_status', 'inactive' );
-		    $license_key    = $this->get( 'license_key' );
-	    }
+		if( $this->is_save_postback() ) {
+			$settings = $this->get_posted_settings();
+			$license_key = \GV\Utils::get( $settings, 'license_key' );
+			$license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
+		} else {
+			$license_status = $this->get( 'license_key_status', 'inactive' );
+			$license_key    = $this->get( 'license_key' );
+		}
 
-	    $license_id = empty( $license_key ) ? 'license' : $license_key;
+		$license_id = empty( $license_key ) ? 'license' : $license_key;
 
 		$message = esc_html__( 'Your GravityView license %s. This means you&rsquo;re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview' );
 
@@ -610,7 +610,7 @@ 
 		$update_below = false;
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
 
-        switch ( $license_status ) {
+		switch ( $license_status ) {
 			/** @since 1.17 */
 			case 'expired':
 				$title = __( 'Expired License', 'gravityview' );
@@ -666,12 +666,12 @@ 
 	}
 
 	/**
-     * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
-     *
-     * @since 1.21.5
-     *
-     * @see GFAddOn::scripts()
-     *
+	 * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
+	 *
+	 * @since 1.21.5
+	 *
+	 * @see GFAddOn::scripts()
+	 *
 	 * @return array Array of scripts
 	 */
 	public function scripts() {
@@ -680,10 +680,10 @@ 
 		$scripts[] = array(
 			'handle'  => 'gform_tooltip_init',
 			'enqueue' => array(
-                array(
-			        'admin_page' => array( 'app_settings' )
-                )
-            )
+				array(
+					'admin_page' => array( 'app_settings' )
+				)
+			)
 		);
 
 		return $scripts;
@@ -701,10 +701,10 @@ 
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
 			'version' => Plugin::$version,
 			'deps' => array(
-                'gform_admin',
+				'gform_admin',
 				'gaddon_form_settings_css',
-                'gform_tooltip',
-                'gform_font_awesome',
+				'gform_tooltip',
+				'gform_font_awesome',
 			),
 			'enqueue' => array(
 				array( 'admin_page' => array(
@@ -872,7 +872,7 @@ 
 					array(
 						'label' => _x( 'Show me beta versions if they are available.', 'gravityview' ),
 						'value' => '1',
-                        'name'  => 'beta',
+						'name'  => 'beta',
 					),
 				),
 				'description'   => __( 'You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview' ),
@@ -910,38 +910,38 @@ 
 
 			if ( empty( $field['disabled'] ) ) {
 				unset( $field['disabled'] );
-            }
+			}
 		}
 
-        $sections = array(
-            array(
-                'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ),
-                'fields'      => $fields,
-            )
-        );
+		$sections = array(
+			array(
+				'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ),
+				'fields'      => $fields,
+			)
+		);
 
-        // custom 'update settings' button
-        $button = array(
-            'class' => 'button button-primary button-hero',
-            'type' => 'save',
-        );
+		// custom 'update settings' button
+		$button = array(
+			'class' => 'button button-primary button-hero',
+			'type' => 'save',
+		);
 
 		if ( $disabled_attribute ) {
 			$button['disabled'] = $disabled_attribute;
 		}
 
-        /**
-         * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
-         * Extensions can tap in here to insert their own section and settings.
-         * <code>
-         *   $sections[] = array(
-         *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
-         *      'fields' => $settings,
-         *   );
-         * </code>
-         * @param array $extension_settings Empty array, ready for extension settings!
-         */
-        $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
+		/**
+		 * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
+		 * Extensions can tap in here to insert their own section and settings.
+		 * <code>
+		 *   $sections[] = array(
+		 *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
+		 *      'fields' => $settings,
+		 *   );
+		 * </code>
+		 * @param array $extension_settings Empty array, ready for extension settings!
+		 */
+		$extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
 
 		// If there are extensions, add a section for them
 		if ( ! empty( $extension_sections ) ) {
@@ -954,13 +954,13 @@ 
 				}
 			}
 
-            $k = count( $extension_sections ) - 1 ;
-            $extension_sections[ $k ]['fields'][] = $button;
+			$k = count( $extension_sections ) - 1 ;
+			$extension_sections[ $k ]['fields'][] = $button;
 			$sections = array_merge( $sections, $extension_sections );
 		} else {
-            // add the 'update settings' button to the general section
-            $sections[0]['fields'][] = $button;
-        }
+			// add the 'update settings' button to the general section
+			$sections[0]['fields'][] = $button;
+		}
 
 		return $sections;
 	}
@@ -1014,9 +1014,9 @@ 
 	 */
 	protected function settings_edd_license( $field, $echo = true ) {
 
-	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
-		    $field['input_type'] = 'password';
-        }
+		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
+			$field['input_type'] = 'password';
+		}
 
 		$text = $this->settings_text( $field, false );
 
@@ -1033,9 +1033,9 @@ 
 
 	/**
 	 * Allow pure HTML settings row
-     *
-     * @since 2.0.6
-     *
+	 *
+	 * @since 2.0.6
+	 *
 	 * @param array $field
 	 * @param bool $echo Whether to echo the
 	 *
@@ -1101,19 +1101,19 @@ 
 	}
 
 	/**
-     * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it
-     *
-     * Converts `$field['description']` to `$field['gv_description']`
-     * Converts `$field['subtitle']` to `$field['description']`
-     *
-     * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description`
-     * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description
-     *
-     * @since 1.21.5.2
-     *
+	 * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it
+	 *
+	 * Converts `$field['description']` to `$field['gv_description']`
+	 * Converts `$field['subtitle']` to `$field['description']`
+	 *
+	 * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description`
+	 * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description
+	 *
+	 * @since 1.21.5.2
+	 *
 	 * @param array $field
-     *
-     * @return void
+	 *
+	 * @return void
 	 */
 	public function single_setting_row( $field ) {
 		$field['gv_description'] = Utils::get( $field, 'description' );

Spacing +51 added lines, -51 removed lines

@@ -101,7 +101,7 @@ 
 	 * @return array
 	 */
 	public function modify_app_settings_menu_title( $setting_tabs ) {
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' );
+		$setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' );
 		return $setting_tabs;
 	}
 
@@ -304,15 +304,15 @@ 
             </ul>
             <div class="gv-followup widefat">
                 <p><strong><label for="gv-reason-details"><?php esc_html_e( 'Comments', 'gravityview' ); ?></label></strong></p>
-                <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview') ?>" placeholder="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview'); ?>" class="large-text"></textarea>
+                <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ) ?>" placeholder="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ); ?>" class="large-text"></textarea>
             </div>
             <div class="scale-description">
                 <p><strong><?php esc_html_e( 'How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p>
                 <ul class="inline">
 					<?php
 					$i = 0;
-					while( $i < 11 ) {
-						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_'.$i.'" value="'.$i.'" type="radio"> '.$i.'</label></li>';
+					while ( $i < 11 ) {
+						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>';
 						$i++;
 					}
 					?>
@@ -529,15 +529,15 @@ 
 	 * @return string The HTML
 	 */
 	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 gfbutton';
-		$name    = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name'];
+		$attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary gfbutton';
+		$name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ];
 
 		if ( empty( $value ) ) {
 			$value = __( 'Update Settings', 'gravityview' );
@@ -546,7 +546,7 @@ 
 		$attributes = $this->get_field_attributes( $field );
 
 		$html = '<input
-                    type="' . $field['type'] . '"
+                    type="' . $field[ 'type' ] . '"
                     name="' . esc_attr( $name ) . '"
                     value="' . $value . '" ' .
 		        implode( ' ', $attributes ) .
@@ -577,7 +577,7 @@ 
 	 * @return bool
 	 */
 	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' ] );
 	}
 
 	/**
@@ -587,7 +587,7 @@ 
 	 */
 	public function license_key_notice() {
 
-	    if( $this->is_save_postback() ) {
+	    if ( $this->is_save_postback() ) {
 		    $settings = $this->get_posted_settings();
 		    $license_key = \GV\Utils::get( $settings, 'license_key' );
 		    $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
@@ -605,7 +605,7 @@ 
 		 * but didn't want to mess up the translation strings for the translators.
 		 */
 		$message = mb_substr( $message, 0, mb_strlen( $message ) - 1 );
-		$title = __ ( 'Inactive License', 'gravityview');
+		$title = __( 'Inactive License', 'gravityview' );
 		$status = '';
 		$update_below = false;
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
@@ -635,7 +635,7 @@ 
 				$update_below = __( 'Activate your license key below.', 'gravityview' );
 				break;
 		}
-		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice';
+		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice';
 
 		// Show a different notice on settings page for inactive licenses (hide the buttons)
 		if ( $update_below && gravityview_is_admin_page( '', 'settings' ) ) {
@@ -677,7 +677,7 @@ 
 	public function scripts() {
 		$scripts = parent::scripts();
 
-		$scripts[] = array(
+		$scripts[ ] = array(
 			'handle'  => 'gform_tooltip_init',
 			'enqueue' => array(
                 array(
@@ -696,7 +696,7 @@ 
 	public function styles() {
 		$styles = parent::styles();
 
-		$styles[] = array(
+		$styles[ ] = array(
 			'handle'  => 'gravityview_settings',
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
 			'version' => Plugin::$version,
@@ -727,7 +727,7 @@ 
 		 * If multisite and not network admin, we don't want the settings to show.
 		 * @since 1.7.6
 		 */
-		$show_submenu = ( ! is_multisite() ) ||  is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() );
+		$show_submenu = ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() );
 
 		/**
 		 * Override whether to show the Settings menu on a per-blog basis.
@@ -775,26 +775,26 @@ 
 				'label' => __( 'License Key', 'gravityview' ),
 				'description' => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ) . $this->get_license_handler()->license_details( $this->get_app_setting( 'license_key_response' ) ),
 				'type' => 'edd_license',
-				'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' )  && GRAVITYVIEW_LICENSE_KEY ),
+				'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ),
 				'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',
 			),
 			array(
 				'name' => 'support-email',
 				'type' => 'text',
 				'validate' => 'email',
-				'default_value' => $default_settings['support-email'],
+				'default_value' => $default_settings[ 'support-email' ],
 				'label' => __( 'Support Email', 'gravityview' ),
 				'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
 				'class' => 'code regular-text',
@@ -806,7 +806,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(
@@ -825,7 +825,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(
@@ -847,7 +847,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(
@@ -866,7 +866,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(
@@ -899,17 +899,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' ] );
             }
 		}
 
@@ -927,7 +927,7 @@ 
         );
 
 		if ( $disabled_attribute ) {
-			$button['disabled'] = $disabled_attribute;
+			$button[ 'disabled' ] = $disabled_attribute;
 		}
 
         /**
@@ -946,20 +946,20 @@ 
 		// If there are extensions, add a section for them
 		if ( ! empty( $extension_sections ) ) {
 
-			if( $disabled_attribute ) {
+			if ( $disabled_attribute ) {
 				foreach ( $extension_sections as &$section ) {
-					foreach ( $section['fields'] as &$field ) {
-						$field['disabled'] = $disabled_attribute;
+					foreach ( $section[ 'fields' ] as &$field ) {
+						$field[ 'disabled' ] = $disabled_attribute;
 					}
 				}
 			}
 
-            $k = count( $extension_sections ) - 1 ;
-            $extension_sections[ $k ]['fields'][] = $button;
+            $k = count( $extension_sections ) - 1;
+            $extension_sections[ $k ][ 'fields' ][ ] = $button;
 			$sections = array_merge( $sections, $extension_sections );
 		} else {
             // add the 'update settings' button to the general section
-            $sections[0]['fields'][] = $button;
+            $sections[ 0 ][ 'fields' ][ ] = $button;
         }
 
 		return $sections;
@@ -1015,7 +1015,7 @@ 
 	protected function settings_edd_license( $field, $echo = true ) {
 
 	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
-		    $field['input_type'] = 'password';
+		    $field[ 'input_type' ] = 'password';
         }
 
 		$text = $this->settings_text( $field, false );
@@ -1064,7 +1064,7 @@ 
 	public function single_setting_row_html( $field ) {
 		?>
 
-        <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>
@@ -1082,10 +1082,10 @@ 
 	 * @return string
 	 */
 	public function settings_save( $field, $echo = true ) {
-		$field['type']  = 'submit';
-		$field['name']  = 'gform-settings-save';
-		$field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton';
-		$field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
+		$field[ 'type' ]  = 'submit';
+		$field[ 'name' ]  = 'gform-settings-save';
+		$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] : 'button-primary gfbutton';
+		$field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
 
 		$output = $this->settings_submit( $field, false );
 
@@ -1116,8 +1116,8 @@ 
      * @return void
 	 */
 	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 );
 	}
 
@@ -1129,7 +1129,7 @@ 
 	public function single_setting_label( $field ) {
 		parent::single_setting_label( $field );
 		if ( $description = Utils::get( $field, 'gv_description' ) ) {
-			echo '<span class="description">'. $description .'</span>';
+			echo '<span class="description">' . $description . '</span>';
 		}
 	}
 
@@ -1166,9 +1166,9 @@ 
 		// If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response),
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
 		if ( $local_key !== $response_key ) {
-			unset( $posted_settings['license_key_response'] );
-			unset( $posted_settings['license_key_status'] );
-			\GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
+			unset( $posted_settings[ 'license_key_response' ] );
+			unset( $posted_settings[ 'license_key_status' ] );
+			\GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
 		}
 		return $posted_settings;
 	}

includes/class-gravityview-shortcode.php

Spacing +9 added lines, -9 removed lines

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

includes/class-gvlogic-shortcode.php

Spacing +20 added lines, -20 removed lines

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

future/includes/class-gv-template.php

Doc Comments +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 	 * @see \Gamajo_Template_Loader::set_template_data
 	 * @see \GV\Template::pop_template_data
 	 *
-	 * @return \Gamajo_Template_Loader The current instance.
+	 * @return Template The current instance.
 	 */
 	public function push_template_data( $data, $var_name = 'data' ) {
 		if ( ! isset( self::$data_stack[ $var_name ] ) ) {

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

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	function modify_entry_value_workflow_final_status( $output, $entry, $field_settings, $field ) {
 
-		if( ! empty( $output ) ) {
+		if ( ! empty( $output ) ) {
 			$output = gravity_flow()->translate_status_label( $output );
 		}
 
@@ -64,7 +64,7 @@ 
 
 		foreach ( $search_fields as & $search_field ) {
 			if ( $this->name === \GV\Utils::get( $search_field, 'key' ) ) {
-				$search_field['choices'] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options();
+				$search_field[ 'choices' ] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options();
 			}
 		}
 

future/includes/class-gv-template-field.php

Spacing +38 added lines, -38 removed lines

@@ -92,7 +92,7 @@ 
 	}
 
 	public function __destruct() {
-		remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback );;
+		remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback ); ;
 	}
 
 	/**
@@ -175,55 +175,55 @@ 
 
 			if ( $is_view && $post ) {
 				if ( $field_type ) {
-					$specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name );
-					$inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name );
-					$specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type );
-					$inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType );
-					$specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name );
-					$inputType && $specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name );
-					$specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type );
-					$inputType &&  $specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType );
+					$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name );
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name );
+					$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type );
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType );
+					$specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name );
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name );
+					$specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type );
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType );
 				}
 
-				$specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name );
-				$specifics []= sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id );
-				$specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name );
-				$specifics []= sprintf( '%spost-%d-field.php', $slug_dir, $post->ID );
+				$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name );
+				$specifics [ ] = sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id );
+				$specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name );
+				$specifics [ ] = sprintf( '%spost-%d-field.php', $slug_dir, $post->ID );
 			}
 			
 			/** Field-specific */
 			if ( $field_id && $form_id ) {
 
 				if ( $field_id ) {
-					$specifics []= sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name );
-					$specifics []= sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id );
+					$specifics [ ] = sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name );
+					$specifics [ ] = sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id );
 				}
 
 				if ( $field_type ) {
-					$specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name );
-					$inputType && $specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name );
-					$specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type );
-					$inputType && $specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType );
-
-					$specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name );
-					$inputType && $specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name );
-					$specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type );
-					$inputType && $specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType );
-
-					$specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name );
-					$inputType && $specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name );
-					$specifics []= sprintf( '%sfield-%s.php', $slug_dir, $field_type );
-					$inputType && $specifics []= sprintf( '%sfield-%s.php', $slug_dir, $inputType );
+					$specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name );
+					$inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name );
+					$specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type );
+					$inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType );
+
+					$specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name );
+					$inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name );
+					$specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type );
+					$inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType );
+
+					$specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name );
+					$inputType && $specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name );
+					$specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $field_type );
+					$inputType && $specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $inputType );
 				}
 			}
 
 			if ( $form_id ) {
 				/** Generic field templates */
-				$specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name );
-				$specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name );
+				$specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name );
+				$specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name );
 
-				$specifics []= sprintf( '%sview-%d-field.php', $slug_dir, $view_id );
-				$specifics []= sprintf( '%sform-%d-field.php', $slug_dir, $form_id );
+				$specifics [ ] = sprintf( '%sview-%d-field.php', $slug_dir, $view_id );
+				$specifics [ ] = sprintf( '%sform-%d-field.php', $slug_dir, $form_id );
 			}
 
 			/**
@@ -231,12 +231,12 @@ 
 			 * Ignore some types that conflict.
 			 */
 			if ( ! in_array( $field_type, array( 'notes' ) ) ) {
-				$specifics []= sprintf( '%s.php', $field_type );
-				$specifics []= sprintf( 'fields/%s.php', $field_type );
+				$specifics [ ] = sprintf( '%s.php', $field_type );
+				$specifics [ ] = sprintf( 'fields/%s.php', $field_type );
 			}
 
-			$specifics []= sprintf( '%sfield-%s.php', $slug_dir, $slug_name );
-			$specifics []= sprintf( '%sfield.php', $slug_dir );
+			$specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $slug_name );
+			$specifics [ ] = sprintf( '%sfield.php', $slug_dir );
 
 			return array_merge( $specifics, $templates );
 		};
@@ -266,7 +266,7 @@ 
 			/** Prevent any PHP warnings that may be generated. */
 			ob_start();
 
-			$display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $this->entry['currency'], false, 'html' );
+			$display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $this->entry[ 'currency' ], false, 'html' );
 
 			if ( $errors = ob_get_clean() ) {
 				gravityview()->log->error( 'Errors when calling GFCommon::get_lead_field_display()', array( 'data' => $errors ) );

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

Spacing +18 added lines, -18 removed lines

@@ -44,12 +44,12 @@ 
 	 */
 	protected $form_id;
 
-	function __construct( $title = '', $item_id, $item = array(), $settings = array(), $form_id = null) {
+	function __construct( $title = '', $item_id, $item = array(), $settings = array(), $form_id = null ) {
 
 		// Backward compat
-		if ( ! empty( $item['type'] ) ) {
-			$item['input_type'] = $item['type'];
-			unset( $item['type'] );
+		if ( ! empty( $item[ 'type' ] ) ) {
+			$item[ 'input_type' ] = $item[ 'type' ];
+			unset( $item[ 'type' ] );
 		}
 
 		// Prevent items from not having index set
@@ -71,7 +71,7 @@ 
 		$this->id         = $item_id;
 		$this->form_id    = $form_id;
 		$this->settings   = $settings;
-		$this->label_type = $item['label_type'];
+		$this->label_type = $item[ 'label_type' ];
 	}
 
 	/**
@@ -114,10 +114,10 @@ 
 		if ( $html ) {
 
 			foreach ( $field_info_items as $item ) {
-				$class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description';
+				$class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description';
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
 				$output .= '<span class="' . $class . '">';
-				$output .= esc_html( $item['value'] );
+				$output .= esc_html( $item[ 'value' ] );
 				$output .= '</span>';
 			}
 
@@ -145,29 +145,29 @@ 
 
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
 		// TODO: Un-hack this
-		$hide_settings_link = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
+		$hide_settings_link = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
 		$settings_link      = sprintf( '<a href="#settings" class="dashicons-admin-generic dashicons %s" title="%s"></a>', $hide_settings_link, esc_attr( $settings_title ) );
 
 		// Should we show the icon that the field is being used as a link to single entry?
-		$hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : '';
+		$hide_show_as_link_class = empty( $this->settings[ 'show_as_link' ] ) ? 'hide-if-js' : '';
 		$show_as_link            = '<span class="dashicons dashicons-admin-links ' . $hide_show_as_link_class . '" title="' . esc_attr( $single_link_title ) . '"></span>';
 
 		// When a field label is empty, use the Field ID
 		$label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title;
 
 		// If there's a custom label, and show label is checked, use that as the field heading
-		if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) {
-			$label = $this->settings['custom_label'];
-		} else if ( ! empty( $this->item['customLabel'] ) ) {
-			$label = $this->item['customLabel'];
+		if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) {
+			$label = $this->settings[ 'custom_label' ];
+		} else if ( ! empty( $this->item[ 'customLabel' ] ) ) {
+			$label = $this->item[ 'customLabel' ];
 		}
 
 		$output = '<h5 class="selectable gfield field-id-' . esc_attr( $this->id ) . '">';
 
 		$label = esc_attr( $label );
 
-		if ( ! empty( $this->item['parent'] ) ) {
-			$label .= ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>';
+		if ( ! empty( $this->item[ 'parent' ] ) ) {
+			$label .= ' <small>(' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . ')</small>';
 		}
 
 		// Name of field / widget
@@ -183,10 +183,10 @@ 
 
 		$output .= '</h5>';
 
-		$container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : '';
-		$data_form_id   = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
+		$container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : '';
+		$data_form_id = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
 
-		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>';
+		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>';
 
 		return $output;
 	}

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

Indentation +9 added lines, -9 removed lines

@@ -26,11 +26,11 @@ 
 
 			<?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' );
 
-            ?>
+			?>
 
 			<?php // list of available widgets to be shown in the popup ?>
             <div id="directory-available-widgets" class="hide-if-js gv-tooltip">
@@ -55,13 +55,13 @@ 
 
 			<div id="single-active-fields" class="gv-grid gv-grid-pad gv-grid-border">
 				<?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>
 
@@ -80,7 +80,7 @@ 
 			</div>
 
 			<?php
-			    do_action('gravityview_render_field_pickers', 'edit' );
+				do_action('gravityview_render_field_pickers', 'edit' );
 			?>
 
 		</div>

Spacing +16 added lines, -16 removed lines

@@ -10,32 +10,32 @@ 
 
 		<div id="directory-fields" class="gv-section">
 
-			<h4><?php esc_html_e( 'Above Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview'); ?></span></h4>
+			<h4><?php esc_html_e( 'Above Entries 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 gv-grid-pad gv-grid-border">
-				<?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( 'Below Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview'); ?></span></h4>
+			<h4><?php esc_html_e( 'Below Entries Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview' ); ?></span></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' );
 
             ?>
 
 			<?php // list of available widgets to be shown in the popup ?>
             <div id="directory-available-widgets" class="hide-if-js gv-tooltip">
                 <span class="close"><i class="dashicons dashicons-dismiss"></i></span>
-				<?php do_action('gravityview_render_available_widgets' ); ?>
+				<?php do_action( 'gravityview_render_available_widgets' ); ?>
             </div>
 
 		</div>
@@ -51,17 +51,17 @@ 
 
 		<div id="single-fields" class="gv-section">
 
-			<h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview'); ?></h4>
+			<h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview' ); ?></h4>
 
 			<div id="single-active-fields" class="gv-grid gv-grid-pad gv-grid-border">
 				<?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>
 
@@ -71,16 +71,16 @@ 
 
 		<div id="edit-fields" class="gv-section">
 
-			<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 gv-grid-pad gv-grid-border">
 				<?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>

future/includes/class-gv-plugin.php

Spacing +18 added lines, -18 removed lines

@@ -84,7 +84,7 @@ 
 	/**
 	 * @var string The REST API functionality identifier.
 	 */
-	const FEATURE_REST  = 'rest_api';
+	const FEATURE_REST = 'rest_api';
 
 	/**
 	 * Get the global instance of \GV\Plugin.
@@ -210,7 +210,7 @@ 
 		include_once $this->dir( 'includes/class-frontend-views.php' );
 		include_once $this->dir( 'includes/class-gravityview-admin-bar.php' );
 		include_once $this->dir( 'includes/class-gravityview-entry-list.php' );
-		include_once $this->dir( 'includes/class-gravityview-merge-tags.php'); /** @since 1.8.4 */
+		include_once $this->dir( 'includes/class-gravityview-merge-tags.php' ); /** @since 1.8.4 */
 		include_once $this->dir( 'includes/class-data.php' );
 		include_once $this->dir( 'includes/class-gravityview-shortcode.php' );
 		include_once $this->dir( 'includes/class-gravityview-entry-link-shortcode.php' );
@@ -244,12 +244,12 @@ 
 
 			$locale = get_locale();
 
-			if ( function_exists('get_user_locale') && is_admin() ) {
+			if ( function_exists( 'get_user_locale' ) && is_admin() ) {
 				$locale = get_user_locale();
 			}
 
 			$locale = apply_filters( 'plugin_locale', $locale, 'gravityview' );
-			$mofile = $this->dir( 'languages' ) . '/gravityview-'. $locale .'.mo';
+			$mofile = $this->dir( 'languages' ) . '/gravityview-' . $locale . '.mo';
 			load_textdomain( 'gravityview', $mofile );
 		}
 	}
@@ -382,7 +382,7 @@ 
 	 */
 	public function is_compatible_wordpress( $version = null ) {
 
-		if( ! $version ) {
+		if ( ! $version ) {
 			$version = self::$min_wp_version;
 		}
 
@@ -423,8 +423,8 @@ 
 	 * @return string The version of PHP.
 	 */
 	private function get_php_version() {
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ?
-			$GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion();
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ?
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion();
 	}
 
 	/**
@@ -435,8 +435,8 @@ 
 	 * @return string The version of WordPress.
 	 */
 	private function get_wordpress_version() {
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] ) ?
-			$GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] : $GLOBALS['wp_version'];
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] ) ?
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] : $GLOBALS[ 'wp_version' ];
 	}
 
 	/**
@@ -447,13 +447,13 @@ 
 	 * @return string|null The version of Gravity Forms or null if inactive.
 	 */
 	private function get_gravityforms_version() {
-		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE'] ) ) {
+		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE' ] ) ) {
 			gravityview()->log->error( 'Gravity Forms is inactive or not installed.' );
 			return null;
 		}
 
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] ) ?
-			$GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] : \GFCommon::$version;
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] ) ?
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] : \GFCommon::$version;
 	}
 
 	/**
@@ -509,9 +509,9 @@ 
 		$tables = array();
 
 		if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
-			$tables []= \GFFormsModel::get_entry_meta_table_name();
+			$tables [ ] = \GFFormsModel::get_entry_meta_table_name();
 		}
-		$tables []= \GFFormsModel::get_lead_meta_table_name();
+		$tables [ ] = \GFFormsModel::get_lead_meta_table_name();
 
 		foreach ( $tables as $meta_table ) {
 			$sql = "
@@ -529,13 +529,13 @@ 
 		$tables = array();
 
 		if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) {
-			$tables[] = \GFFormsModel::get_entry_notes_table_name();
+			$tables[ ] = \GFFormsModel::get_entry_notes_table_name();
 		}
 
-		$tables[] = \GFFormsModel::get_lead_notes_table_name();
+		$tables[ ] = \GFFormsModel::get_lead_notes_table_name();
 
-		$disapproved = __('Disapproved the Entry for GravityView', 'gravityview');
-		$approved = __('Approved the Entry for GravityView', 'gravityview');
+		$disapproved = __( 'Disapproved the Entry for GravityView', 'gravityview' );
+		$approved = __( 'Approved the Entry for GravityView', 'gravityview' );
 
 		$suppress = $wpdb->suppress_errors();
 		foreach ( $tables as $notes_table ) {