gravityview / GravityView

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

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
 
 	var $name = 'post_category';
 
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
 
 	var $_gf_field_class_name = 'GF_Field_Post_Category';
 
@@ -22,12 +22,12 @@ 
 
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
-		$this->add_field_support('dynamic_data', $field_options );
-		$this->add_field_support('link_to_term', $field_options );
+		$this->add_field_support( 'dynamic_data', $field_options );
+		$this->add_field_support( 'link_to_term', $field_options );
 
 		return $field_options;
 	}

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

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 
 	var $name = 'radio';
 
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
 
 	var $_gf_field_class_name = 'GF_Field_Radio';
 

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

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 
 	var $name = 'radio';
 
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
 
 	var $_gf_field_class_name = 'GF_Field_Radio';
 

includes/class-gravityview-settings.php

Doc Comments +1 added lines

@@ -301,6 +301,7 @@
 	 * Make protected public
 	 * @inheritDoc
 	 * @access public
+	 * @param string $setting_name
 	 */
 	public function get_app_setting( $setting_name ) {
 

Indentation +31 added lines, -31 removed lines

@@ -418,8 +418,8 @@ 
                     type="' . $field['type'] . '"
                     name="' . esc_attr( $name ) . '"
                     value="' . $value . '" ' .
-		        implode( ' ', $attributes ) .
-		        ' />';
+				implode( ' ', $attributes ) .
+				' />';
 
 		if ( $echo ) {
 			echo $html;
@@ -648,7 +648,7 @@ 
 					array(
 						'label' => _x( 'Permanently Delete', 'Setting: what to do when uninstalling plugin', 'gravityview' ),
 						'value' => 'delete',
-					    'tooltip' => sprintf( '<h6>%s</h6><p><span class="howto">%s</span></p><p>%s</p>', __( 'Delete all GravityView content and settings', 'gravityview' ), __( 'If you delete then re-install GravityView, it will be like installing GravityView for the first time.', 'gravityview' ), __( 'When GravityView is uninstalled and deleted, delete all Views, GravityView entry approvals, GravityView-generated entry notes (including approval and entry creator changes), and GravityView plugin settings. No Gravity Forms data will be touched.', 'gravityview' ) ),
+						'tooltip' => sprintf( '<h6>%s</h6><p><span class="howto">%s</span></p><p>%s</p>', __( 'Delete all GravityView content and settings', 'gravityview' ), __( 'If you delete then re-install GravityView, it will be like installing GravityView for the first time.', 'gravityview' ), __( 'When GravityView is uninstalled and deleted, delete all Views, GravityView entry approvals, GravityView-generated entry notes (including approval and entry creator changes), and GravityView plugin settings. No Gravity Forms data will be touched.', 'gravityview' ) ),
 					),
 				),
 				'description'   => sprintf( __( 'Should GravityView content and entry approval status be removed from the site when the GravityView plugin is deleted?', 'gravityview' ), __( 'Permanently Delete', 'gravityview' ) ),
@@ -674,36 +674,36 @@ 
 		}
 
 
-        $sections = array(
-            array(
-                'description' =>      sprintf( '<span class="version-info description">%s</span>', sprintf( __('You are running GravityView version %s', 'gravityview'), 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'), 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 ) ) {
@@ -716,13 +716,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;
 	}

Braces +3 added lines, -2 removed lines

@@ -441,8 +441,9 @@
 		$field['name']  = 'gform-settings-save';
 		$field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton';
 
-		if ( ! rgar( $field, 'value' ) )
-			$field['value'] = __( 'Update Settings', 'gravityview' );
+		if ( ! rgar( $field, 'value' ) ) {
+					$field['value'] = __( 'Update Settings', 'gravityview' );
+		}
 
 		$output = $this->settings_submit( $field, false );
 

Spacing +75 added lines, -75 removed lines

@@ -71,7 +71,7 @@ 
 	 */
 	public function __construct( $prevent_multiple_instances = '' ) {
 
-		if( $prevent_multiple_instances === 'get_instance' ) {
+		if ( $prevent_multiple_instances === 'get_instance' ) {
 			return parent::__construct();
 		}
 
@@ -83,7 +83,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self( 'get_instance' );
 		}
 
@@ -106,11 +106,11 @@ 
 		 * Prevent Gravity Forms from showing the uninstall tab on the settings page
 		 * @hack
 		 */
-		if( $caps === $this->_capabilities_uninstall ) {
+		if ( $caps === $this->_capabilities_uninstall ) {
 			return false;
 		}
 
-		if( empty( $caps ) ) {
+		if ( empty( $caps ) ) {
 			$caps = array( 'gravityview_full_access' );
 		}
 
@@ -133,7 +133,7 @@ 
 		add_filter( 'gform_addon_app_settings_menu_gravityview', array( $this, 'modify_app_settings_menu_title' ) );
 
 		/** @since 1.7.6 */
-		add_action('network_admin_menu', array( $this, 'add_network_menu' ) );
+		add_action( 'network_admin_menu', array( $this, 'add_network_menu' ) );
 
 		parent::init_admin();
 	}
@@ -147,7 +147,7 @@ 
 	 */
 	public function modify_app_settings_menu_title( $setting_tabs ) {
 
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview');
+		$setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' );
 
 		return $setting_tabs;
 	}
@@ -164,11 +164,11 @@ 
 	 */
 	private function _load_license_handler() {
 
-		if( !empty( $this->License_Handler ) ) {
+		if ( ! empty( $this->License_Handler ) ) {
 			return;
 		}
 
-		require_once( GRAVITYVIEW_DIR . 'includes/class-gv-license-handler.php');
+		require_once( GRAVITYVIEW_DIR . 'includes/class-gv-license-handler.php' );
 
 		$this->License_Handler = GV_License_Handler::get_instance( $this );
 	}
@@ -180,60 +180,60 @@ 
 	function license_key_notice() {
 
 		// Only show on GravityView pages
-		if( ! gravityview_is_admin_page() ) {
+		if ( ! gravityview_is_admin_page() ) {
 			return;
 		}
 
-		$license_status = self::getSetting('license_key_status');
-		$license_id = self::getSetting('license_key');
+		$license_status = self::getSetting( 'license_key_status' );
+		$license_id = self::getSetting( 'license_key' );
 		$license_id = empty( $license_id ) ? 'license' : $license_id;
 
-		$message = esc_html__('Your GravityView license %s. This means you’re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview');
+		$message = esc_html__( 'Your GravityView license %s. This means you’re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview' );
 
 		/**
 		 * I wanted to remove the period from after the buttons in the string,
 		 * but didn't want to mess up the translation strings for the translators.
 		 */
 		$message = mb_substr( $message, 0, mb_strlen( $message ) - 1 );
-		$title = __('Inactive License', 'gravityview');
+		$title = __( 'Inactive License', 'gravityview' );
 		$status = '';
 		$update_below = false;
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' );
 		switch ( $license_status ) {
 			case 'invalid':
-				$title = __('Invalid License', 'gravityview');
-				$status = __('is invalid', 'gravityview');
+				$title = __( 'Invalid License', 'gravityview' );
+				$status = __( 'is invalid', 'gravityview' );
 				break;
 			case 'deactivated':
-				$status = __('is inactive', 'gravityview');
-				$update_below = __('Activate your license key below.', 'gravityview');
+				$status = __( 'is inactive', 'gravityview' );
+				$update_below = __( 'Activate your license key below.', 'gravityview' );
 				break;
 			/** @noinspection PhpMissingBreakStatementInspection */
 			case '':
 				$license_status = 'site_inactive';
 				// break intentionally left blank
 			case 'site_inactive':
-				$status = __('has not been activated', 'gravityview');
-				$update_below = __('Activate your license key below.', 'gravityview');
+				$status = __( 'has not been activated', 'gravityview' );
+				$update_below = __( 'Activate your license key below.', 'gravityview' );
 				break;
 		}
-		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice';
+		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice';
 
 		// Show a different notice on settings page for inactive licenses (hide the buttons)
-		if( $update_below && gravityview_is_admin_page( '', 'settings' ) ) {
+		if ( $update_below && gravityview_is_admin_page( '', 'settings' ) ) {
 			$message = sprintf( $message, $status, '<div class="hidden">', '', '', '</div><a href="#" onclick="jQuery(\'#license_key\').focus(); return false;">' . $update_below . '</a>' );
 		} else {
 			$message = sprintf( $message, $status, "\n\n" . '<a href="' . $primary_button_link . '" class="button button-primary">', '</a>', '<a href="' . esc_url( $url ) . '" class="button button-secondary">', '</a>' );
 		}
 
-		if( !empty( $status ) ) {
+		if ( ! empty( $status ) ) {
 			GravityView_Admin_Notices::add_notice( array(
 				'message' => $message,
 				'class'	=> 'updated',
 				'title' => $title,
 				'cap' => 'gravityview_edit_settings',
-				'dismiss' => sha1( $license_status.'_'.$license_id ),
-			));
+				'dismiss' => sha1( $license_status . '_' . $license_id ),
+			) );
 		}
 	}
 
@@ -245,7 +245,7 @@ 
 
 		$styles = parent::styles();
 
-		$styles[] = array(
+		$styles[ ] = array(
 			'handle'  => 'gravityview_settings',
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
 			'version' => GravityView_Plugin::version,
@@ -268,7 +268,7 @@ 
 	 * @return void
 	 */
 	public function add_network_menu() {
-		if( GravityView_Plugin::is_network_activated() ) {
+		if ( GravityView_Plugin::is_network_activated() ) {
 			add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", array( $this, 'app_tab_page' ), 'none' );
 		}
 	}
@@ -285,7 +285,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.
@@ -294,7 +294,7 @@ 
 		 */
 		$show_submenu = apply_filters( 'gravityview/show-settings-menu', $show_submenu );
 
-		if( $show_submenu ) {
+		if ( $show_submenu ) {
 			add_submenu_page( 'edit.php?post_type=gravityview', __( 'Settings', 'gravityview' ), __( 'Settings', 'gravityview' ), $this->_capabilities_app_settings, $this->_slug . '_settings', array( $this, 'app_tab_page' ) );
 		}
 	}
@@ -325,7 +325,7 @@ 
 		/**
 		 * Backward compatibility with Redux
 		 */
-		if( $setting_name === 'license' ) {
+		if ( $setting_name === 'license' ) {
 			return array(
 				'license' => parent::get_app_setting( 'license_key' ),
 				'status' => parent::get_app_setting( 'license_key_status' ),
@@ -389,7 +389,7 @@ 
 
 		$return = $text . $activation;
 
-		if( $echo ) {
+		if ( $echo ) {
 			echo $return;
 		}
 
@@ -416,15 +416,15 @@ 
 	 */
 	public function settings_submit( $field, $echo = true ) {
 
-		$field['type']  = ( isset($field['type']) && in_array( $field['type'], array('submit','reset','button') ) ) ? $field['type'] : 'submit';
+		$field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit';
 
 		$attributes    = $this->get_field_attributes( $field );
 		$default_value = rgar( $field, 'value' ) ? rgar( $field, 'value' ) : rgar( $field, 'default_value' );
-		$value         = $this->get_setting( $field['name'], $default_value );
+		$value         = $this->get_setting( $field[ 'name' ], $default_value );
 
 
-		$attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary gfbutton';
-		$name    = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_'.$field['name'];
+		$attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary gfbutton';
+		$name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ];
 
 		if ( empty( $value ) ) {
 			$value = __( 'Update Settings', 'gravityview' );
@@ -433,7 +433,7 @@ 
 		$attributes = $this->get_field_attributes( $field );
 
 		$html = '<input
-                    type="' . $field['type'] . '"
+                    type="' . $field[ 'type' ] . '"
                     name="' . esc_attr( $name ) . '"
                     value="' . $value . '" ' .
 		        implode( ' ', $attributes ) .
@@ -455,16 +455,16 @@ 
 	 * @return string
 	 */
 	public function settings_save( $field, $echo = true ) {
-		$field['type']  = 'submit';
-		$field['name']  = 'gform-settings-save';
-		$field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton';
+		$field[ 'type' ]  = 'submit';
+		$field[ 'name' ]  = 'gform-settings-save';
+		$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] : 'button-primary gfbutton';
 
 		if ( ! rgar( $field, 'value' ) )
-			$field['value'] = __( 'Update Settings', 'gravityview' );
+			$field[ 'value' ] = __( 'Update Settings', 'gravityview' );
 
 		$output = $this->settings_submit( $field, false );
 
-		if( $echo ) {
+		if ( $echo ) {
 			echo $output;
 		}
 
@@ -481,8 +481,8 @@ 
 		parent::single_setting_label( $field );
 
 		// Added by GravityView
-		if ( isset( $field['description'] ) ) {
-			echo '<span class="description">'. $field['description'] .'</span>';
+		if ( isset( $field[ 'description' ] ) ) {
+			echo '<span class="description">' . $field[ 'description' ] . '</span>';
 		}
 
 	}
@@ -544,11 +544,11 @@ 
 
 		// If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response),
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
-		if( $local_key !== $response_key ) {
+		if ( $local_key !== $response_key ) {
 
-			unset( $posted_settings['license_key_response'] );
-			unset( $posted_settings['license_key_status'] );
-			GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
+			unset( $posted_settings[ 'license_key_response' ] );
+			unset( $posted_settings[ 'license_key_status' ] );
+			GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
 		}
 
 		return $posted_settings;
@@ -583,25 +583,25 @@ 
 				'label'             => __( 'License Key', 'gravityview' ),
 				'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'],
+				'data-pending-text' => __( 'Verifying license&hellip;', 'gravityview' ),
+				'default_value'           => $default_settings[ 'license_key' ],
 				'class'             => ( '' == $this->get_app_setting( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
 			),
 			array(
 				'name'       => 'license_key_response',
-				'default_value'  => $default_settings['license_key_response'],
+				'default_value'  => $default_settings[ 'license_key_response' ],
 				'type'     => 'hidden',
 			),
 			array(
 				'name'       => 'license_key_status',
-				'default_value'  => $default_settings['license_key_status'],
+				'default_value'  => $default_settings[ 'license_key_status' ],
 				'type'     => 'hidden',
 			),
 			array(
 				'name'       => 'support-email',
 				'type'     => 'text',
 				'validate' => 'email',
-				'default_value'  => $default_settings['support-email'],
+				'default_value'  => $default_settings[ 'support-email' ],
 				'label'    => __( 'Support Email', 'gravityview' ),
 				'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
 				'class'    => 'code regular-text',
@@ -613,44 +613,44 @@ 
 				'name'         => 'support_port',
 				'type'       => 'radio',
 				'label'      => __( 'Show Support Port?', 'gravityview' ),
-				'default_value'    => $default_settings['support_port'],
+				'default_value'    => $default_settings[ 'support_port' ],
 				'horizontal' => 1,
 				'choices'    => array(
 					array(
-						'label' => _x('Show', 'Setting: Show or Hide', 'gravityview'),
+						'label' => _x( 'Show', 'Setting: Show or Hide', 'gravityview' ),
 						'value' => '1',
 					),
 					array(
-						'label' => _x('Hide', 'Setting: Show or Hide', 'gravityview'),
+						'label' => _x( 'Hide', 'Setting: Show or Hide', 'gravityview' ),
 						'value' => '0',
 					),
 				),
-				'tooltip' => '<p><img src="' . esc_url_raw( plugins_url('assets/images/screenshots/beacon.png', GRAVITYVIEW_FILE ) ) . '" alt="' . esc_attr__( 'The Support Port looks like this.', 'gravityview' ) . '" class="alignright" style="max-width:40px; margin:.5em;" />' . esc_html__('The Support Port provides quick access to how-to articles and tutorials. For administrators, it also makes it easy to contact support.', 'gravityview') . '</p>',
+				'tooltip' => '<p><img src="' . esc_url_raw( plugins_url( 'assets/images/screenshots/beacon.png', GRAVITYVIEW_FILE ) ) . '" alt="' . esc_attr__( 'The Support Port looks like this.', 'gravityview' ) . '" class="alignright" style="max-width:40px; margin:.5em;" />' . esc_html__( 'The Support Port provides quick access to how-to articles and tutorials. For administrators, it also makes it easy to contact support.', 'gravityview' ) . '</p>',
 				'description'   => __( 'Show the Support Port on GravityView pages?', 'gravityview' ),
 			),
 			array(
 				'name'         => 'no-conflict-mode',
 				'type'       => 'radio',
 				'label'      => __( 'No-Conflict Mode', 'gravityview' ),
-				'default_value'    => $default_settings['no-conflict-mode'],
+				'default_value'    => $default_settings[ 'no-conflict-mode' ],
 				'horizontal' => 1,
 				'choices'    => array(
 					array(
-						'label' => _x('On', 'Setting: On or off', 'gravityview'),
+						'label' => _x( 'On', 'Setting: On or off', 'gravityview' ),
 						'value' => '1',
 					),
 					array(
-						'label' => _x('Off', 'Setting: On or off', 'gravityview'),
+						'label' => _x( 'Off', 'Setting: On or off', 'gravityview' ),
 						'value' => '0',
 					),
 				),
-				'description'   => __( 'Set this to ON to prevent extraneous scripts and styles from being printed on GravityView admin pages, reducing conflicts with other plugins and themes.', 'gravityview' ) . ' ' . __('If your Edit View tabs are ugly, enable this setting.', 'gravityview'),
+				'description'   => __( 'Set this to ON to prevent extraneous scripts and styles from being printed on GravityView admin pages, reducing conflicts with other plugins and themes.', 'gravityview' ) . ' ' . __( 'If your Edit View tabs are ugly, enable this setting.', 'gravityview' ),
 			),
 			array(
 				'name'       => 'delete-on-uninstall',
 				'type'       => 'radio',
 				'label'      => __( 'Remove Data on Delete?', 'gravityview' ),
-				'default_value'    => $default_settings['delete-on-uninstall'],
+				'default_value'    => $default_settings[ 'delete-on-uninstall' ],
 				'horizontal' => 1,
 				'choices'    => array(
 					array(
@@ -676,20 +676,20 @@ 
 		 * @since 1.7.4
 		 */
 		foreach ( $fields as &$field ) {
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : rgget('id', $field );
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : rgget('title', $field );
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : rgget('default', $field );
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : rgget('subtitle', $field );
+			$field[ 'name' ]          = isset( $field[ 'name' ] ) ? $field[ 'name' ] : rgget( 'id', $field );
+			$field[ 'label' ]         = isset( $field[ 'label' ] ) ? $field[ 'label' ] : rgget( 'title', $field );
+			$field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : rgget( 'default', $field );
+			$field[ 'description' ]   = isset( $field[ 'description' ] ) ? $field[ 'description' ] : rgget( 'subtitle', $field );
 
-			if( $disabled_attribute ) {
-				$field['disabled']  = $disabled_attribute;
+			if ( $disabled_attribute ) {
+				$field[ 'disabled' ] = $disabled_attribute;
 			}
 		}
 
 
         $sections = array(
             array(
-                'description' =>      sprintf( '<span class="version-info description">%s</span>', sprintf( __('You are running GravityView version %s', 'gravityview'), GravityView_Plugin::version ) ),
+                'description' =>      sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), GravityView_Plugin::version ) ),
                 'fields'      => $fields,
             )
         );
@@ -700,8 +700,8 @@ 
             'type'     => 'save',
         );
 
-		if( $disabled_attribute ) {
-			$button['disabled'] = $disabled_attribute;
+		if ( $disabled_attribute ) {
+			$button[ 'disabled' ] = $disabled_attribute;
 		}
 
 
@@ -721,20 +721,20 @@ 
 		// If there are extensions, add a section for them
 		if ( ! empty( $extension_sections ) ) {
 
-			if( $disabled_attribute ) {
+			if ( $disabled_attribute ) {
 				foreach ( $extension_sections as &$section ) {
-					foreach ( $section['fields'] as &$field ) {
-						$field['disabled'] = $disabled_attribute;
+					foreach ( $section[ 'fields' ] as &$field ) {
+						$field[ 'disabled' ] = $disabled_attribute;
 					}
 				}
 			}
 
-            $k = count( $extension_sections ) - 1 ;
-            $extension_sections[ $k ]['fields'][] = $button;
+            $k = count( $extension_sections ) - 1;
+            $extension_sections[ $k ][ 'fields' ][ ] = $button;
 			$sections = array_merge( $sections, $extension_sections );
 		} else {
             // add the 'update settings' button to the general section
-            $sections[0]['fields'][] = $button;
+            $sections[ 0 ][ 'fields' ][ ] = $button;
         }
 
 		return $sections;

includes/fields/class-gravityview-fields.php

Doc Comments +1 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
 	/**
 	 * Alias for get_instance()
 	 *
-	 * @param $field_name
+	 * @param string $field_name
 	 *
 	 * @return GravityView_Field|false
 	 */
@@ -88,7 +88,6 @@ 
 	/**
 	 * Alias for get_instance()
 	 *
-	 * @param string|GF_Field $field_name Gravity Forms field class or the class name type
 	 *
 	 * @return GravityView_Field
 	 */

Spacing +7 added lines, -7 removed lines

@@ -42,8 +42,8 @@ 
 	 * @return GravityView_Field | bool
 	 */
 	public static function create( $properties ) {
-		$type = isset( $properties['type'] ) ? $properties['type'] : '';
-		$type = empty( $properties['inputType'] ) ? $type : $properties['inputType'];
+		$type = isset( $properties[ 'type' ] ) ? $properties[ 'type' ] : '';
+		$type = empty( $properties[ 'inputType' ] ) ? $type : $properties[ 'inputType' ];
 		if ( empty( $type ) || ! isset( self::$_fields[ $type ] ) ) {
 			return new GravityView_Field( $properties );
 		}
@@ -62,7 +62,7 @@ 
 	 * @return bool True: yes, it exists; False: nope
 	 */
 	public static function exists( $field_name ) {
-		return isset( self::$_fields["{$field_name}"] );
+		return isset( self::$_fields[ "{$field_name}" ] );
 	}
 
 	/**
@@ -96,8 +96,8 @@ 
 
 		$field_type = is_a( $gf_field, 'GF_Field' ) ? get_class( $gf_field ) : $gf_field;
 
-		foreach( self::$_fields as $field ) {
-			if( $field_type === $field->_gf_field_class_name ) {
+		foreach ( self::$_fields as $field ) {
+			if ( $field_type === $field->_gf_field_class_name ) {
 				return $field;
 			}
 		}
@@ -116,10 +116,10 @@ 
 	 */
 	public static function get_all( $group = '' ) {
 
-		if( '' !== $group ) {
+		if ( '' !== $group ) {
 			$return_fields = self::$_fields;
 			foreach ( $return_fields as $key => $field ) {
-				if( $group !== $field->group ) {
+				if ( $group !== $field->group ) {
 					unset( $return_fields[ $key ] );
 				}
 			}

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

Spacing +4 added lines, -4 removed lines

@@ -22,13 +22,13 @@ 
 
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
-		unset( $field_options['show_as_link'] );
+		unset( $field_options[ 'show_as_link' ] );
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
-		$this->add_field_support('dynamic_data', $field_options );
+		$this->add_field_support( 'dynamic_data', $field_options );
 
 		return $field_options;
 	}
@@ -44,7 +44,7 @@ 
 	 */
 	public function get_field_input( $form, $value = '', $entry = null, GF_Field_Post_Content $field ) {
 
-		$id    = (int) $field->id;
+		$id    = (int)$field->id;
 		$input_name = "input_{$id}";
 		$class = esc_attr( $field->size );
 		$tabindex = $field->get_tabindex();

includes/class-gravityview-gfformsmodel.php

Indentation +175 added lines, -175 removed lines

@@ -7,181 +7,181 @@
 
 class GravityView_GFFormsModel extends GFFormsModel {
 
-    /**
-     * Copied function from Gravity Forms plugin \GFFormsModel::copy_post_image since the method is private.
-     *
-     * @since 1.16.2
-     *
-     * @param string $url URL of the post image to update
-     * @param int $post_id ID of the post image to update
-     * @return array|bool Array with `file`, `url` and `type` keys. False: failed to copy file to final directory path.
-     */
-    public static function copy_post_image( $url, $post_id ) {
-
-        $reflection = new ReflectionMethod( 'GFFormsModel', 'copy_post_image' );
-
-        /**
-         * If the method changes to public, use Gravity Forms' method
-         * @todo: If/when the method is public, remove the unneeded copied code.
-         */
-        if( $reflection->isPublic() ) {
-            return parent::copy_post_image( $url, $post_id );
-        }
-
-        /**
-         * Original Gravity Forms code below:
-         * ==================================
-         */
-
-        $time = current_time( 'mysql' );
-
-        if ( $post = get_post( $post_id ) ) {
-            if ( substr( $post->post_date, 0, 4 ) > 0 ) {
-                $time = $post->post_date;
-            }
-        }
-
-        //making sure there is a valid upload folder
-        if ( ! ( ( $upload_dir = wp_upload_dir( $time ) ) && false === $upload_dir['error'] ) ) {
-            return false;
-        }
-
-        $form_id = get_post_meta( $post_id, '_gform-form-id', true );
-
-        /**
-         * Filter the media upload location.
-         *
-         * @param array $upload_dir The current upload directory’s path and url.
-         * @param int $form_id The ID of the form currently being processed.
-         * @param int $post_id The ID of the post created from the entry currently being processed.
-         */
-        $upload_dir = gf_apply_filters( 'gform_media_upload_path', $form_id, $upload_dir, $form_id, $post_id );
-
-        if ( ! file_exists( $upload_dir['path'] ) ) {
-            if ( ! wp_mkdir_p( $upload_dir['path'] ) ) {
-                return false;
-            }
-        }
-
-        $name     = basename( $url );
-        $filename = wp_unique_filename( $upload_dir['path'], $name );
-
-        // the destination path
-        $new_file = $upload_dir['path'] . "/$filename";
-
-        // the source path
-        $y                = substr( $time, 0, 4 );
-        $m                = substr( $time, 5, 2 );
-        $target_root      = RGFormsModel::get_upload_path( $form_id ) . "/$y/$m/";
-        $target_root_url  = RGFormsModel::get_upload_url( $form_id ) . "/$y/$m/";
-        $upload_root_info = array( 'path' => $target_root, 'url' => $target_root_url );
-        $upload_root_info = gf_apply_filters( 'gform_upload_path', $form_id, $upload_root_info, $form_id );
-        $path             = str_replace( $upload_root_info['url'], $upload_root_info['path'], $url );
-
-        // copy the file to the destination path
-        if ( ! copy( $path, $new_file ) ) {
-            return false;
-        }
-
-        // Set correct file permissions
-        $stat  = stat( dirname( $new_file ) );
-        $perms = $stat['mode'] & 0000666;
-        @ chmod( $new_file, $perms );
-
-        // Compute the URL
-        $url = $upload_dir['url'] . "/$filename";
-
-        if ( is_multisite() ) {
-            delete_transient( 'dirsize_cache' );
-        }
-
-        $type = wp_check_filetype( $new_file );
-
-        return array( 'file' => $new_file, 'url' => $url, 'type' => $type['type'] );
-
-    }
-
-    /**
-     * Copied function from Gravity Forms plugin \GFFormsModel::media_handle_upload since the method is private.
-     *
-     * @see GFFormsModel::media_handle_upload
-     * @see GravityView_Edit_Entry_Render::maybe_update_post_fields
-     * 
-     * @uses copy_post_image
-     * @uses wp_insert_attachment
-     * @uses wp_update_attachment_metadata
-     *
-     * @param string $url URL of the post image to update
-     * @param int $post_id ID of the post image to update
-     * @param array $post_data Array of data for the eventual attachment post type that is created using {@see wp_insert_attachment}. Supports `post_mime_type`, `guid`, `post_parent`, `post_title`, `post_content` keys.
-     * @return bool|int ID of attachment Post created. Returns false if file not created by copy_post_image
-     */
-    public static function media_handle_upload( $url, $post_id, $post_data = array() ) {
-
-        $reflection = new ReflectionMethod( 'GFFormsModel', 'media_handle_upload' );
-
-        /**
-         * If the method changes to public, use Gravity Forms' method
-         * @todo: If/when the method is public, remove the unneeded copied code.
-         */
-        if( $reflection->isPublic() ) {
-            return parent::media_handle_upload( $url, $post_id, $post_data );
-        }
-
-        /**
-         * Original Gravity Forms code below:
-         * ==================================
-         */
-
-        //WordPress Administration API required for the media_handle_upload() function
-        require_once( ABSPATH . 'wp-admin/includes/image.php' );
-
-        $name = basename( $url );
-
-        $file = self::copy_post_image( $url, $post_id );
-
-        if ( ! $file ) {
-            return false;
-        }
-
-        $name_parts = pathinfo( $name );
-        $name       = trim( substr( $name, 0, - ( 1 + strlen( $name_parts['extension'] ) ) ) );
-
-        $url     = $file['url'];
-        $type    = $file['type'];
-        $file    = $file['file'];
-        $title   = $name;
-        $content = '';
-
-        // use image exif/iptc data for title and caption defaults if possible
-        if ( $image_meta = @wp_read_image_metadata( $file ) ) {
-            if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
-                $title = $image_meta['title'];
-            }
-            if ( trim( $image_meta['caption'] ) ) {
-                $content = $image_meta['caption'];
-            }
-        }
-
-        // Construct the attachment array
-        $attachment = array_merge(
-            array(
-                'post_mime_type' => $type,
-                'guid'           => $url,
-                'post_parent'    => $post_id,
-                'post_title'     => $title,
-                'post_content'   => $content,
-            ), $post_data
-        );
-
-        // Save the data
-        $id = wp_insert_attachment( $attachment, $file, $post_id );
-        if ( ! is_wp_error( $id ) ) {
-            wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-        }
-
-        return $id;
-    }
+	/**
+	 * Copied function from Gravity Forms plugin \GFFormsModel::copy_post_image since the method is private.
+	 *
+	 * @since 1.16.2
+	 *
+	 * @param string $url URL of the post image to update
+	 * @param int $post_id ID of the post image to update
+	 * @return array|bool Array with `file`, `url` and `type` keys. False: failed to copy file to final directory path.
+	 */
+	public static function copy_post_image( $url, $post_id ) {
+
+		$reflection = new ReflectionMethod( 'GFFormsModel', 'copy_post_image' );
+
+		/**
+		 * If the method changes to public, use Gravity Forms' method
+		 * @todo: If/when the method is public, remove the unneeded copied code.
+		 */
+		if( $reflection->isPublic() ) {
+			return parent::copy_post_image( $url, $post_id );
+		}
+
+		/**
+		 * Original Gravity Forms code below:
+		 * ==================================
+		 */
+
+		$time = current_time( 'mysql' );
+
+		if ( $post = get_post( $post_id ) ) {
+			if ( substr( $post->post_date, 0, 4 ) > 0 ) {
+				$time = $post->post_date;
+			}
+		}
+
+		//making sure there is a valid upload folder
+		if ( ! ( ( $upload_dir = wp_upload_dir( $time ) ) && false === $upload_dir['error'] ) ) {
+			return false;
+		}
+
+		$form_id = get_post_meta( $post_id, '_gform-form-id', true );
+
+		/**
+		 * Filter the media upload location.
+		 *
+		 * @param array $upload_dir The current upload directory’s path and url.
+		 * @param int $form_id The ID of the form currently being processed.
+		 * @param int $post_id The ID of the post created from the entry currently being processed.
+		 */
+		$upload_dir = gf_apply_filters( 'gform_media_upload_path', $form_id, $upload_dir, $form_id, $post_id );
+
+		if ( ! file_exists( $upload_dir['path'] ) ) {
+			if ( ! wp_mkdir_p( $upload_dir['path'] ) ) {
+				return false;
+			}
+		}
+
+		$name     = basename( $url );
+		$filename = wp_unique_filename( $upload_dir['path'], $name );
+
+		// the destination path
+		$new_file = $upload_dir['path'] . "/$filename";
+
+		// the source path
+		$y                = substr( $time, 0, 4 );
+		$m                = substr( $time, 5, 2 );
+		$target_root      = RGFormsModel::get_upload_path( $form_id ) . "/$y/$m/";
+		$target_root_url  = RGFormsModel::get_upload_url( $form_id ) . "/$y/$m/";
+		$upload_root_info = array( 'path' => $target_root, 'url' => $target_root_url );
+		$upload_root_info = gf_apply_filters( 'gform_upload_path', $form_id, $upload_root_info, $form_id );
+		$path             = str_replace( $upload_root_info['url'], $upload_root_info['path'], $url );
+
+		// copy the file to the destination path
+		if ( ! copy( $path, $new_file ) ) {
+			return false;
+		}
+
+		// Set correct file permissions
+		$stat  = stat( dirname( $new_file ) );
+		$perms = $stat['mode'] & 0000666;
+		@ chmod( $new_file, $perms );
+
+		// Compute the URL
+		$url = $upload_dir['url'] . "/$filename";
+
+		if ( is_multisite() ) {
+			delete_transient( 'dirsize_cache' );
+		}
+
+		$type = wp_check_filetype( $new_file );
+
+		return array( 'file' => $new_file, 'url' => $url, 'type' => $type['type'] );
+
+	}
+
+	/**
+	 * Copied function from Gravity Forms plugin \GFFormsModel::media_handle_upload since the method is private.
+	 *
+	 * @see GFFormsModel::media_handle_upload
+	 * @see GravityView_Edit_Entry_Render::maybe_update_post_fields
+	 * 
+	 * @uses copy_post_image
+	 * @uses wp_insert_attachment
+	 * @uses wp_update_attachment_metadata
+	 *
+	 * @param string $url URL of the post image to update
+	 * @param int $post_id ID of the post image to update
+	 * @param array $post_data Array of data for the eventual attachment post type that is created using {@see wp_insert_attachment}. Supports `post_mime_type`, `guid`, `post_parent`, `post_title`, `post_content` keys.
+	 * @return bool|int ID of attachment Post created. Returns false if file not created by copy_post_image
+	 */
+	public static function media_handle_upload( $url, $post_id, $post_data = array() ) {
+
+		$reflection = new ReflectionMethod( 'GFFormsModel', 'media_handle_upload' );
+
+		/**
+		 * If the method changes to public, use Gravity Forms' method
+		 * @todo: If/when the method is public, remove the unneeded copied code.
+		 */
+		if( $reflection->isPublic() ) {
+			return parent::media_handle_upload( $url, $post_id, $post_data );
+		}
+
+		/**
+		 * Original Gravity Forms code below:
+		 * ==================================
+		 */
+
+		//WordPress Administration API required for the media_handle_upload() function
+		require_once( ABSPATH . 'wp-admin/includes/image.php' );
+
+		$name = basename( $url );
+
+		$file = self::copy_post_image( $url, $post_id );
+
+		if ( ! $file ) {
+			return false;
+		}
+
+		$name_parts = pathinfo( $name );
+		$name       = trim( substr( $name, 0, - ( 1 + strlen( $name_parts['extension'] ) ) ) );
+
+		$url     = $file['url'];
+		$type    = $file['type'];
+		$file    = $file['file'];
+		$title   = $name;
+		$content = '';
+
+		// use image exif/iptc data for title and caption defaults if possible
+		if ( $image_meta = @wp_read_image_metadata( $file ) ) {
+			if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
+				$title = $image_meta['title'];
+			}
+			if ( trim( $image_meta['caption'] ) ) {
+				$content = $image_meta['caption'];
+			}
+		}
+
+		// Construct the attachment array
+		$attachment = array_merge(
+			array(
+				'post_mime_type' => $type,
+				'guid'           => $url,
+				'post_parent'    => $post_id,
+				'post_title'     => $title,
+				'post_content'   => $content,
+			), $post_data
+		);
+
+		// Save the data
+		$id = wp_insert_attachment( $attachment, $file, $post_id );
+		if ( ! is_wp_error( $id ) ) {
+			wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
+		}
+
+		return $id;
+	}
 
 
 }
\ No newline at end of file

Spacing +19 added lines, -19 removed lines

@@ -24,7 +24,7 @@ 
          * If the method changes to public, use Gravity Forms' method
          * @todo: If/when the method is public, remove the unneeded copied code.
          */
-        if( $reflection->isPublic() ) {
+        if ( $reflection->isPublic() ) {
             return parent::copy_post_image( $url, $post_id );
         }
 
@@ -42,7 +42,7 @@ 
         }
 
         //making sure there is a valid upload folder
-        if ( ! ( ( $upload_dir = wp_upload_dir( $time ) ) && false === $upload_dir['error'] ) ) {
+        if ( ! ( ( $upload_dir = wp_upload_dir( $time ) ) && false === $upload_dir[ 'error' ] ) ) {
             return false;
         }
 
@@ -57,17 +57,17 @@ 
          */
         $upload_dir = gf_apply_filters( 'gform_media_upload_path', $form_id, $upload_dir, $form_id, $post_id );
 
-        if ( ! file_exists( $upload_dir['path'] ) ) {
-            if ( ! wp_mkdir_p( $upload_dir['path'] ) ) {
+        if ( ! file_exists( $upload_dir[ 'path' ] ) ) {
+            if ( ! wp_mkdir_p( $upload_dir[ 'path' ] ) ) {
                 return false;
             }
         }
 
         $name     = basename( $url );
-        $filename = wp_unique_filename( $upload_dir['path'], $name );
+        $filename = wp_unique_filename( $upload_dir[ 'path' ], $name );
 
         // the destination path
-        $new_file = $upload_dir['path'] . "/$filename";
+        $new_file = $upload_dir[ 'path' ] . "/$filename";
 
         // the source path
         $y                = substr( $time, 0, 4 );
@@ -76,7 +76,7 @@ 
         $target_root_url  = RGFormsModel::get_upload_url( $form_id ) . "/$y/$m/";
         $upload_root_info = array( 'path' => $target_root, 'url' => $target_root_url );
         $upload_root_info = gf_apply_filters( 'gform_upload_path', $form_id, $upload_root_info, $form_id );
-        $path             = str_replace( $upload_root_info['url'], $upload_root_info['path'], $url );
+        $path             = str_replace( $upload_root_info[ 'url' ], $upload_root_info[ 'path' ], $url );
 
         // copy the file to the destination path
         if ( ! copy( $path, $new_file ) ) {
@@ -85,11 +85,11 @@ 
 
         // Set correct file permissions
         $stat  = stat( dirname( $new_file ) );
-        $perms = $stat['mode'] & 0000666;
+        $perms = $stat[ 'mode' ] & 0000666;
         @ chmod( $new_file, $perms );
 
         // Compute the URL
-        $url = $upload_dir['url'] . "/$filename";
+        $url = $upload_dir[ 'url' ] . "/$filename";
 
         if ( is_multisite() ) {
             delete_transient( 'dirsize_cache' );
@@ -97,7 +97,7 @@ 
 
         $type = wp_check_filetype( $new_file );
 
-        return array( 'file' => $new_file, 'url' => $url, 'type' => $type['type'] );
+        return array( 'file' => $new_file, 'url' => $url, 'type' => $type[ 'type' ] );
 
     }
 
@@ -124,7 +124,7 @@ 
          * If the method changes to public, use Gravity Forms' method
          * @todo: If/when the method is public, remove the unneeded copied code.
          */
-        if( $reflection->isPublic() ) {
+        if ( $reflection->isPublic() ) {
             return parent::media_handle_upload( $url, $post_id, $post_data );
         }
 
@@ -145,21 +145,21 @@ 
         }
 
         $name_parts = pathinfo( $name );
-        $name       = trim( substr( $name, 0, - ( 1 + strlen( $name_parts['extension'] ) ) ) );
+        $name       = trim( substr( $name, 0, - ( 1 + strlen( $name_parts[ 'extension' ] ) ) ) );
 
-        $url     = $file['url'];
-        $type    = $file['type'];
-        $file    = $file['file'];
+        $url     = $file[ 'url' ];
+        $type    = $file[ 'type' ];
+        $file    = $file[ 'file' ];
         $title   = $name;
         $content = '';
 
         // use image exif/iptc data for title and caption defaults if possible
         if ( $image_meta = @wp_read_image_metadata( $file ) ) {
-            if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
-                $title = $image_meta['title'];
+            if ( trim( $image_meta[ 'title' ] ) && ! is_numeric( sanitize_title( $image_meta[ 'title' ] ) ) ) {
+                $title = $image_meta[ 'title' ];
             }
-            if ( trim( $image_meta['caption'] ) ) {
-                $content = $image_meta['caption'];
+            if ( trim( $image_meta[ 'caption' ] ) ) {
+                $content = $image_meta[ 'caption' ];
             }
         }
 

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

Spacing +12 added lines, -12 removed lines

@@ -23,16 +23,16 @@ 
 
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
-		unset ( $field_options['search_filter'] );
+		unset ( $field_options[ 'search_filter' ] );
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
-		$this->add_field_support('link_to_post', $field_options );
+		$this->add_field_support( 'link_to_post', $field_options );
 
 		// @since 1.5.4
-		$this->add_field_support('dynamic_data', $field_options );
+		$this->add_field_support( 'dynamic_data', $field_options );
 
 		return $field_options;
 	}
@@ -58,7 +58,7 @@ 
 		$url = $title = $caption = $description = '';
 
 		// If there's a |:| match, process. Otherwise, empty array!
-		if( preg_match( '/\|\:\|/', $value ) ) {
+		if ( preg_match( '/\|\:\|/', $value ) ) {
 			list( $url, $title, $caption, $description ) = array_pad( explode( '|:|', $value ), 4, false );
 		}
 
@@ -87,8 +87,8 @@ 
 	 */
 	public function get_field_input( $form, $value = '', $entry = null, GF_Field_Post_Image $field ) {
 
-		$id = (int) $field->id;
-		$form_id = $form['id'];
+		$id = (int)$field->id;
+		$form_id = $form[ 'id' ];
 		$input_name = "input_{$id}";
 		$field_id = sprintf( 'input_%d_%d', $form_id, $id );
 		$img_name = null;
@@ -96,16 +96,16 @@ 
 		// Convert |:| to associative array
 		$img_array = $this->explode_value( $value );
 
-		if( ! empty( $img_array['url'] ) ) {
+		if ( ! empty( $img_array[ 'url' ] ) ) {
 
-			$img_name = basename( $img_array['url'] );
+			$img_name = basename( $img_array[ 'url' ] );
 
 			/**
 			 * Set the $uploaded_files value so that the .ginput_preview renders, and the file upload is hidden
 			 * @see GF_Field_Post_Image::get_field_input See the `<span class='ginput_preview'>` code
 			 * @see GFFormsModel::get_temp_filename See the `rgget( $input_name, self::$uploaded_files[ $form_id ] );` code
 			 */
-			if( empty( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
+			if ( empty( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
 				GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $img_name;
 			}
 		}
@@ -134,8 +134,8 @@ 
 		 * @hack
 		 */
 		if ( $img_name ) {
-			$current_file = sprintf( "<input name='%s' id='%s' type='hidden' value='%s' />", $input_name, $field_id, esc_url_raw( $img_array['url'] ) );
-			$gf_post_image_field_output = str_replace('<span class=\'ginput_preview\'>', '<span class=\'ginput_preview\'>'.$current_file, $gf_post_image_field_output );
+			$current_file = sprintf( "<input name='%s' id='%s' type='hidden' value='%s' />", $input_name, $field_id, esc_url_raw( $img_array[ 'url' ] ) );
+			$gf_post_image_field_output = str_replace( '<span class=\'ginput_preview\'>', '<span class=\'ginput_preview\'>' . $current_file, $gf_post_image_field_output );
 		}
 
 		return $gf_post_image_field_output;

includes/class-template.php

Spacing +63 added lines, -63 removed lines

@@ -16,7 +16,7 @@ 
 	die;
 }
 
-if( ! class_exists( 'Gamajo_Template_Loader' ) ) {
+if ( ! class_exists( 'Gamajo_Template_Loader' ) ) {
 	require( GRAVITYVIEW_DIR . 'includes/lib/class-gamajo-template-loader.php' );
 }
 
@@ -157,8 +157,8 @@ 
 			'atts'	  => NULL,
 		) );
 
-		foreach ($atts as $key => $value) {
-			if( is_null( $value ) ) {
+		foreach ( $atts as $key => $value ) {
+			if ( is_null( $value ) ) {
 				continue;
 			}
 			$this->{$key} = $value;
@@ -189,7 +189,7 @@ 
 	 */
 	static function getInstance( $passed_post = NULL ) {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self( $passed_post );
 		}
 
@@ -202,8 +202,8 @@ 
 	 */
 	public function getCurrentField( $key = NULL ) {
 
-		if( !empty( $key ) ) {
-			if( isset( $this->_current_field[ $key ] ) ) {
+		if ( ! empty( $key ) ) {
+			if ( isset( $this->_current_field[ $key ] ) ) {
 				return $this->_current_field[ $key ];
 			}
 			return NULL;
@@ -214,16 +214,16 @@ 
 
 	public function setCurrentFieldSetting( $key, $value ) {
 
-		if( !empty( $this->_current_field ) ) {
-			$this->_current_field['field_settings'][ $key ] = $value;
+		if ( ! empty( $this->_current_field ) ) {
+			$this->_current_field[ 'field_settings' ][ $key ] = $value;
 		}
 
 	}
 
 	public function getCurrentFieldSetting( $key ) {
-		$settings = $this->getCurrentField('field_settings');
+		$settings = $this->getCurrentField( 'field_settings' );
 
-		if( $settings && !empty( $settings[ $key ] ) ) {
+		if ( $settings && ! empty( $settings[ $key ] ) ) {
 			return $settings[ $key ];
 		}
 
@@ -254,8 +254,8 @@ 
 	 */
 	public function getAtts( $key = NULL ) {
 
-		if( !empty( $key ) ) {
-			if( isset( $this->atts[ $key ] ) ) {
+		if ( ! empty( $key ) ) {
+			if ( isset( $this->atts[ $key ] ) ) {
 				return $this->atts[ $key ];
 			}
 			return NULL;
@@ -321,7 +321,7 @@ 
 
 		$fields = empty( $this->fields ) ? NULL : $this->fields;
 
-		if( $fields && !empty( $key ) ) {
+		if ( $fields && ! empty( $key ) ) {
 			$fields = isset( $fields[ $key ] ) ? $fields[ $key ] : NULL;
 		}
 
@@ -341,8 +341,8 @@ 
 	 */
 	public function getField( $key ) {
 
-		if( !empty( $key ) ) {
-			if( isset( $this->fields[ $key ] ) ) {
+		if ( ! empty( $key ) ) {
+			if ( isset( $this->fields[ $key ] ) ) {
 				return $this->fields[ $key ];
 			}
 		}
@@ -442,8 +442,8 @@ 
 	public function getPaginationCounts() {
 
 		$paging = $this->getPaging();
-		$offset = $paging['offset'];
-		$page_size = $paging['page_size'];
+		$offset = $paging[ 'offset' ];
+		$page_size = $paging[ 'page_size' ];
 		$total = $this->getTotalEntries();
 
 		if ( empty( $total ) ) {
@@ -464,7 +464,7 @@ 
 		 */
 		list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', array( $first, $last, $total ) );
 
-		return array( 'first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total );
+		return array( 'first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total );
 	}
 
 	/**
@@ -548,16 +548,16 @@ 
 	 */
 	public function getCurrentEntry() {
 
-		if( in_array( $this->getContext(), array( 'edit', 'single') ) ) {
+		if ( in_array( $this->getContext(), array( 'edit', 'single' ) ) ) {
 			$entries = $this->getEntries();
-			$entry = $entries[0];
+			$entry = $entries[ 0 ];
 		} else {
 			$entry = $this->_current_entry;
 		}
 
 		/** @since 1.16 Fixes DataTables empty entry issue */
-		if ( empty( $entry ) && ! empty( $this->_current_field['entry'] ) ) {
-			$entry = $this->_current_field['entry'];
+		if ( empty( $entry ) && ! empty( $this->_current_field[ 'entry' ] ) ) {
+			$entry = $this->_current_field[ 'entry' ];
 		}
 
 		return $entry;
@@ -594,8 +594,8 @@ 
 	 */
 	public function renderZone( $zone = '', $atts = array(), $echo = true ) {
 
-		if( empty( $zone ) ) {
-			do_action('gravityview_log_error', 'GravityView_View[renderZone] No zone defined.');
+		if ( empty( $zone ) ) {
+			do_action( 'gravityview_log_error', 'GravityView_View[renderZone] No zone defined.' );
 			return NULL;
 		}
 
@@ -604,33 +604,33 @@ 
 			'context' => $this->getContext(),
 			'entry' => $this->getCurrentEntry(),
 			'form' => $this->getForm(),
-			'hide_empty' => $this->getAtts('hide_empty'),
+			'hide_empty' => $this->getAtts( 'hide_empty' ),
 		);
 
 		$final_atts = wp_parse_args( $atts, $defaults );
 
 		$output = '';
 
-		$final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}";
+		$final_atts[ 'zone_id' ] = "{$final_atts[ 'context' ]}_{$final_atts[ 'slug' ]}-{$zone}";
 
-		$fields = $this->getField( $final_atts['zone_id'] );
+		$fields = $this->getField( $final_atts[ 'zone_id' ] );
 
 		// Backward compatibility
-		if( 'table' === $this->getTemplatePartSlug() ) {
+		if ( 'table' === $this->getTemplatePartSlug() ) {
 			/**
 			 * Modify the fields displayed in the table
 			 * @var array
 			 */
-			$fields = apply_filters("gravityview_table_cells", $fields, $this );
+			$fields = apply_filters( "gravityview_table_cells", $fields, $this );
 		}
 
-		if( empty( $fields ) ) {
+		if ( empty( $fields ) ) {
 			return NULL;
 		}
 
 		$field_output = '';
 		foreach ( $fields as $field ) {
-			$final_atts['field'] = $field;
+			$final_atts[ 'field' ] = $field;
 
 			$field_output .= gravityview_field_output( $final_atts );
 		}
@@ -641,21 +641,21 @@ 
 		 * @since 1.7.6
 		 * @param boolean $hide_empty_zone Default: false
 		 */
-		if( empty( $field_output ) && apply_filters( 'gravityview/render/hide-empty-zone', false ) ) {
+		if ( empty( $field_output ) && apply_filters( 'gravityview/render/hide-empty-zone', false ) ) {
 			return NULL;
 		}
 
-		if( !empty( $final_atts['wrapper_class'] ) ) {
-			$output .= '<div class="'.gravityview_sanitize_html_class( $final_atts['wrapper_class'] ).'">';
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
+			$output .= '<div class="' . gravityview_sanitize_html_class( $final_atts[ 'wrapper_class' ] ) . '">';
 		}
 
 		$output .= $field_output;
 
-		if( !empty( $final_atts['wrapper_class'] ) ) {
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
 			$output .= '</div>';
 		}
 
-		if( $echo ) {
+		if ( $echo ) {
 			echo $output;
 		}
 
@@ -673,7 +673,7 @@ 
 	 */
 	function locate_template( $template_names, $load = false, $require_once = true ) {
 
-		if( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
+		if ( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
 
 			$located = $this->located_templates[ $template_names ];
 
@@ -682,7 +682,7 @@ 
 			// Set $load to always false so we handle it here.
 			$located = parent::locate_template( $template_names, false, $require_once );
 
-			if( is_string( $template_names ) ) {
+			if ( is_string( $template_names ) ) {
 				$this->located_templates[ $template_names ] = $located;
 			}
 		}
@@ -700,7 +700,7 @@ 
 	 * @return mixed|null    The stored data.
 	 */
 	public function __get( $name ) {
-		if( isset( $this->{$name} ) ) {
+		if ( isset( $this->{$name} ) ) {
 			return $this->{$name};
 		} else {
 			return NULL;
@@ -729,15 +729,15 @@ 
 		$additional = array();
 
 		// form-19-table-body.php
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
+		$additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
 
 		// view-3-table-body.php
-		$additional[] = sprintf( 'view-%d-%s-%s.php', $this->getViewId(), $slug, $name );
+		$additional[ ] = sprintf( 'view-%d-%s-%s.php', $this->getViewId(), $slug, $name );
 
-		if( $this->getPostId() ) {
+		if ( $this->getPostId() ) {
 
 			// page-19-table-body.php
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
+			$additional[ ] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
 		}
 
 		// Combine with existing table-body.php and table.php
@@ -759,7 +759,7 @@ 
 
 		do_action( 'gravityview_log_debug', '[render] Rendering Template File', $template_file );
 
-		if( !empty( $template_file) ) {
+		if ( ! empty( $template_file ) ) {
 
 			if ( $require_once ) {
 				require_once( $template_file );
@@ -776,7 +776,7 @@ 
 	 */
 	public function render_widget_hooks( $view_id ) {
 
-		if( empty( $view_id ) || 'single' == gravityview_get_context() ) {
+		if ( empty( $view_id ) || 'single' == gravityview_get_context() ) {
 			do_action( 'gravityview_log_debug', __METHOD__ . ' - Not rendering widgets; single entry' );
 			return;
 		}
@@ -784,9 +784,9 @@ 
 		$view_data = gravityview_get_current_view_data( $view_id );
 
 		// get View widget configuration
-		$widgets = (array)$view_data['widgets'];
+		$widgets = (array)$view_data[ 'widgets' ];
 
-		switch( current_filter() ) {
+		switch ( current_filter() ) {
 			default:
 			case 'gravityview_before':
 				$zone = 'header';
@@ -800,9 +800,9 @@ 
 		 * Filter widgets not in the current zone
 		 * @since 1.16
 		 */
-		foreach( $widgets as $key => $widget ) {
+		foreach ( $widgets as $key => $widget ) {
 			// The widget isn't in the current zone
-			if( false === strpos( $key, $zone ) ) {
+			if ( false === strpos( $key, $zone ) ) {
 				unset( $widgets[ $key ] );
 			}
 		}
@@ -817,8 +817,8 @@ 
 		}
 
 		// Prevent being called twice
-		if( did_action( $zone.'_'.$view_id.'_widgets' ) ) {
-			do_action( 'gravityview_log_debug', sprintf( '%s - Not rendering %s; already rendered', __METHOD__ , $zone.'_'.$view_id.'_widgets' ) );
+		if ( did_action( $zone . '_' . $view_id . '_widgets' ) ) {
+			do_action( 'gravityview_log_debug', sprintf( '%s - Not rendering %s; already rendered', __METHOD__, $zone . '_' . $view_id . '_widgets' ) );
 			return;
 		}
 
@@ -829,7 +829,7 @@ 
 
 		$default_css_class = 'gv-grid gv-widgets-' . $zone;
 
-		if( 0 === GravityView_View::getInstance()->getTotalEntries() ) {
+		if ( 0 === GravityView_View::getInstance()->getTotalEntries() ) {
 			$default_css_class .= ' gv-widgets-no-results';
 		}
 
@@ -840,7 +840,7 @@ 
 		 * @param string $zone Current widget zone, either `header` or `footer`
 		 * @param array $widgets Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']`
 		 */
-		$css_class = apply_filters('gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets );
+		$css_class = apply_filters( 'gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets );
 
 		$css_class = gravityview_sanitize_html_class( $css_class );
 
@@ -848,17 +848,17 @@ 
 		?>
 		<div class="<?php echo $css_class; ?>">
 			<?php
-			foreach( $rows as $row ) {
-				foreach( $row as $col => $areas ) {
-					$column = ($col == '2-2') ? '1-2 gv-right' : $col.' gv-left';
+			foreach ( $rows as $row ) {
+				foreach ( $row as $col => $areas ) {
+					$column = ( $col == '2-2' ) ? '1-2 gv-right' : $col . ' gv-left';
 				?>
 					<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
 						<?php
-						if( !empty( $areas ) ) {
-							foreach( $areas as $area ) {
-								if( !empty( $widgets[ $zone .'_'. $area['areaid'] ] ) ) {
-									foreach( $widgets[ $zone .'_'. $area['areaid'] ] as $widget ) {
-										do_action( "gravityview_render_widget_{$widget['id']}", $widget );
+						if ( ! empty( $areas ) ) {
+							foreach ( $areas as $area ) {
+								if ( ! empty( $widgets[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
+									foreach ( $widgets[ $zone . '_' . $area[ 'areaid' ] ] as $widget ) {
+										do_action( "gravityview_render_widget_{$widget[ 'id' ]}", $widget );
 									}
 								}
 							}
@@ -874,8 +874,8 @@ 
 		 * Prevent widgets from being called twice.
 		 * Checking for loop_start prevents themes and plugins that pre-process shortcodes from triggering the action before displaying. Like, ahem, the Divi theme and WordPress SEO plugin
 		 */
-		if( did_action( 'loop_start' ) ) {
-			do_action( $zone.'_'.$view_id.'_widgets' );
+		if ( did_action( 'loop_start' ) ) {
+			do_action( $zone . '_' . $view_id . '_widgets' );
 		}
 	}