gravityview / GravityView

uninstall.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 		 */
 		$delete = $this->get_delete_setting();
 
-		if( GravityView_Roles_Capabilities::has_cap( 'gravityview_uninstall' ) && 'delete' === $delete ) {
+		if ( GravityView_Roles_Capabilities::has_cap( 'gravityview_uninstall' ) && 'delete' === $delete ) {
 			$this->fire_everything();
 		}
 	}
@@ -97,8 +97,8 @@ 
 
 		$notes_table = class_exists( 'GFFormsModel' ) ? GFFormsModel::get_lead_notes_table_name() : $wpdb->prefix . 'rg_lead_notes';
 
-		$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' );
 
 		$sql = $wpdb->prepare( "
 			DELETE FROM $notes_table

gravityview.php

Spacing +28 added lines, -28 removed lines

@@ -66,20 +66,20 @@ 
 
 /** Load common & connector functions */
 require_once( GRAVITYVIEW_DIR . 'includes/helper-functions.php' );
-require_once( GRAVITYVIEW_DIR . 'includes/class-common.php');
-require_once( GRAVITYVIEW_DIR . 'includes/connector-functions.php');
+require_once( GRAVITYVIEW_DIR . 'includes/class-common.php' );
+require_once( GRAVITYVIEW_DIR . 'includes/connector-functions.php' );
 require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-compatibility.php' );
 require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-roles-capabilities.php' );
 require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-notices.php' );
 
 /** Register Post Types and Rewrite Rules */
-require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php');
+require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php' );
 
 /** Add Cache Class */
-require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php');
+require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php' );
 
 /** Register hooks that are fired when the plugin is activated and deactivated. */
-if( is_admin() ) {
+if ( is_admin() ) {
 	register_activation_hook( __FILE__, array( 'GravityView_Plugin', 'activate' ) );
 	register_deactivation_hook( __FILE__, array( 'GravityView_Plugin', 'deactivate' ) );
 }
@@ -100,7 +100,7 @@ 
 	 */
 	public static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 		}
 
@@ -110,7 +110,7 @@ 
 	private function __construct() {
 
 
-		if( ! GravityView_Compatibility::is_valid() ) {
+		if ( ! GravityView_Compatibility::is_valid() ) {
 			return;
 		}
 
@@ -139,7 +139,7 @@ 
 	 */
 	public function include_files() {
 
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin.php' );
 
 		// Load fields
 		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-fields.php' );
@@ -150,19 +150,19 @@ 
 			include_once( $gv_field_filename );
 		}
 
-		include_once( GRAVITYVIEW_DIR .'includes/class-gravityview-entry-notes.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/load-plugin-and-theme-hooks.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-notes.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/load-plugin-and-theme-hooks.php' );
 
 		// Load Extensions
 		// @todo: Convert to a scan of the directory or a method where this all lives
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/edit-entry/class-edit-entry.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/delete-entry/class-delete-entry.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/extensions/edit-entry/class-edit-entry.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/extensions/delete-entry/class-delete-entry.php' );
 
 		// Load WordPress Widgets
-		include_once( GRAVITYVIEW_DIR .'includes/wordpress-widgets/register-wordpress-widgets.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/wordpress-widgets/register-wordpress-widgets.php' );
 
 		// Load GravityView Widgets
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/register-gravityview-widgets.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/register-gravityview-widgets.php' );
 
 		// Add oEmbed
 		include_once( GRAVITYVIEW_DIR . 'includes/class-oembed.php' );
@@ -171,11 +171,11 @@ 
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-logging.php' );
 
 		include_once( GRAVITYVIEW_DIR . 'includes/class-ajax.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-settings.php');
+		include_once( GRAVITYVIEW_DIR . 'includes/class-settings.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-frontend-views.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-bar.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-list.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-merge-tags.php'); /** @since 1.8.4 */
+		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-merge-tags.php' ); /** @since 1.8.4 */
 		include_once( GRAVITYVIEW_DIR . 'includes/class-data.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-shortcode.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-link-shortcode.php' );
@@ -190,7 +190,7 @@ 
 	 * @return bool
 	 */
 	public static function is_network_activated() {
-		return is_multisite() && ( function_exists('is_plugin_active_for_network') && is_plugin_active_for_network( 'gravityview/gravityview.php' ) );
+		return is_multisite() && ( function_exists( 'is_plugin_active_for_network' ) && is_plugin_active_for_network( 'gravityview/gravityview.php' ) );
 	}
 
 
@@ -255,7 +255,7 @@ 
 	 * @since 1.7.5.1
 	 */
 	public static function include_widget_class() {
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' );
 	}
 
 
@@ -276,7 +276,7 @@ 
 		}
 		if ( ! $loaded ) {
 			$locale = apply_filters( 'plugin_locale', get_locale(), 'gravityview' );
-			$mofile = dirname( __FILE__ ) . '/languages/gravityview-'. $locale .'.mo';
+			$mofile = dirname( __FILE__ ) . '/languages/gravityview-' . $locale . '.mo';
 			load_textdomain( 'gravityview', $mofile );
 		}
 
@@ -302,12 +302,12 @@ 
 	 */
 	public function frontend_actions() {
 
-		if( self::is_admin() ) { return; }
+		if ( self::is_admin() ) { return; }
 
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-image.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-template.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-api.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-frontend-views.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-template.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-api.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-frontend-views.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-change-entry-creator.php' );
 
 
@@ -332,8 +332,8 @@ 
 	 */
 	public static function get_default_widget_areas() {
 		$default_areas = array(
-			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __('Top', 'gravityview' ) , 'subtitle' => '' ) ) ),
-			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __('Left', 'gravityview') , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __('Right', 'gravityview') , 'subtitle' => '' ) ) ),
+			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ), 'subtitle' => '' ) ) ),
+			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ), 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ), 'subtitle' => '' ) ) ),
 		);
 
 		/**
@@ -351,7 +351,7 @@ 
      * @param mixed $data Additional data to display
      * @return void
      */
-    public static function log_debug( $message, $data = null ){
+    public static function log_debug( $message, $data = null ) {
 	    /**
 	     * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
 	     * @param string $message Message to display
@@ -365,7 +365,7 @@ 
      * @param  string $message log message
      * @return void
      */
-    public static function log_error( $message, $data = null ){
+    public static function log_error( $message, $data = null ) {
 	    /**
 	     * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
 	     * @param string $message Error message to display
@@ -376,4 +376,4 @@ 
 
 } // end class GravityView_Plugin
 
-add_action('plugins_loaded', array('GravityView_Plugin', 'getInstance'), 1);
+add_action( 'plugins_loaded', array( 'GravityView_Plugin', 'getInstance' ), 1 );

includes/connector-functions.php

Spacing +9 added lines, -9 removed lines

@@ -289,8 +289,8 @@ 
  * @param  mixed $field_id Field ID or Field array
  * @return string field type
  */
-function gravityview_get_field_type(  $form = null , $field_id = '' ) {
-	return GVCommon::get_field_type(  $form, $field_id );
+function gravityview_get_field_type( $form = null, $field_id = '' ) {
+	return GVCommon::get_field_type( $form, $field_id );
 }
 
 
@@ -303,8 +303,8 @@ 
  * @return string HTML of the output. Empty string if $view_id is empty.
  */
 function get_gravityview( $view_id = '', $atts = array() ) {
-	if( !empty( $view_id ) ) {
-		$atts['id'] = $view_id;
+	if ( ! empty( $view_id ) ) {
+		$atts[ 'id' ] = $view_id;
 		$args = wp_parse_args( $atts, GravityView_View_Data::get_default_args() );
 		$GravityView_frontend = GravityView_frontend::getInstance();
 		$GravityView_frontend->setGvOutputData( GravityView_View_Data::getInstance( $view_id ) );
@@ -347,15 +347,15 @@ 
  */
 function gravityview_view_has_single_checkbox_or_radio( $form, $view_fields ) {
 
-	if( $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) {
+	if ( $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) {
 
 		/** @var GF_Field_Radio|GF_Field_Checkbox $form_field */
-		foreach( $form_fields as $form_field ) {
+		foreach ( $form_fields as $form_field ) {
 			$field_id = $form_field->id;
-			foreach( $view_fields as $zone ) {
-				foreach( $zone as $field ) {
+			foreach ( $view_fields as $zone ) {
+				foreach ( $zone as $field ) {
 					// If it's an input, not the parent and the parent ID matches a checkbox or radio
-					if( ( strpos( $field['id'], '.' ) > 0 ) && floor( $field['id'] ) === floor( $field_id ) ) {
+					if ( ( strpos( $field[ 'id' ], '.' ) > 0 ) && floor( $field[ 'id' ] ) === floor( $field_id ) ) {
 						return true;
 					}
 				}

includes/class-ajax.php

Spacing +74 added lines, -74 removed lines

@@ -36,7 +36,7 @@ 
 		 * Don't exit if we're running test suite.
 		 * @since 1.15
 		 */
-		if( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) {
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) {
 			return $mixed;
 		}
 
@@ -50,7 +50,7 @@ 
 	 * @return void
 	 */
 	function check_ajax_nonce() {
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxviews' ) ) {
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxviews' ) ) {
 			$this->_exit( false );
 		}
 	}
@@ -67,14 +67,14 @@ 
 		//check nonce
 		$this->check_ajax_nonce();
 
-		$context = isset($_POST['context']) ? esc_attr( $_POST['context'] ) : 'directory';
+		$context = isset( $_POST[ 'context' ] ) ? esc_attr( $_POST[ 'context' ] ) : 'directory';
 
 		// If Form was changed, JS sends form ID, if start fresh, JS sends template_id
-		if( !empty( $_POST['form_id'] ) ) {
-			do_action( 'gravityview_render_available_fields', (int) $_POST['form_id'], $context );
+		if ( ! empty( $_POST[ 'form_id' ] ) ) {
+			do_action( 'gravityview_render_available_fields', (int)$_POST[ 'form_id' ], $context );
 			$this->_exit();
-		} elseif( !empty( $_POST['template_id'] ) ) {
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+		} elseif ( ! empty( $_POST[ 'template_id' ] ) ) {
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 			do_action( 'gravityview_render_available_fields', $form, $context );
 			$this->_exit();
 		}
@@ -94,17 +94,17 @@ 
 	function get_active_areas() {
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
+		if ( empty( $_POST[ 'template_id' ] ) ) {
 			$this->_exit( false );
 		}
 
 		ob_start();
-		do_action( 'gravityview_render_directory_active_areas', $_POST['template_id'], 'directory', '', true );
-		$response['directory'] = ob_get_clean();
+		do_action( 'gravityview_render_directory_active_areas', $_POST[ 'template_id' ], 'directory', '', true );
+		$response[ 'directory' ] = ob_get_clean();
 
 		ob_start();
-		do_action( 'gravityview_render_directory_active_areas',  $_POST['template_id'], 'single', '', true );
-		$response['single'] = ob_get_clean();
+		do_action( 'gravityview_render_directory_active_areas', $_POST[ 'template_id' ], 'single', '', true );
+		$response[ 'single' ] = ob_get_clean();
 
 		$response = array_map( 'gravityview_strip_whitespace', $response );
 
@@ -119,20 +119,20 @@ 
 
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
+		if ( empty( $_POST[ 'template_id' ] ) ) {
 			$this->_exit( false );
 		}
 
 		// get the fields xml config file for this specific preset
-		$preset_fields_path = apply_filters( 'gravityview_template_fieldsxml', array(), $_POST['template_id'] );
+		$preset_fields_path = apply_filters( 'gravityview_template_fieldsxml', array(), $_POST[ 'template_id' ] );
 		// import fields
-		if( !empty( $preset_fields_path ) ) {
+		if ( ! empty( $preset_fields_path ) ) {
 			$presets = $this->import_fields( $preset_fields_path );
 		} else {
 			$presets = array( 'widgets' => array(), 'fields' => array() );
 		}
 
-		$template_id = esc_attr( $_POST['template_id'] );
+		$template_id = esc_attr( $_POST[ 'template_id' ] );
 
 		// template areas
 		$template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' );
@@ -142,20 +142,20 @@ 
 		$default_widget_areas = GravityView_Plugin::get_default_widget_areas();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets['widgets'] );
-		$response['header'] = ob_get_clean();
+		do_action( 'gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets[ 'widgets' ] );
+		$response[ 'header' ] = ob_get_clean();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets['widgets'] );
-		$response['footer'] = ob_get_clean();
+		do_action( 'gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets[ 'widgets' ] );
+		$response[ 'footer' ] = ob_get_clean();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets['fields'] );
-		$response['directory'] = ob_get_clean();
+		do_action( 'gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets[ 'fields' ] );
+		$response[ 'directory' ] = ob_get_clean();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets['fields'] );
-		$response['single'] = ob_get_clean();
+		do_action( 'gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets[ 'fields' ] );
+		$response[ 'single' ] = ob_get_clean();
 
 		$response = array_map( 'gravityview_strip_whitespace', $response );
 
@@ -173,26 +173,26 @@ 
 
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
+		if ( empty( $_POST[ 'template_id' ] ) ) {
 			do_action( 'gravityview_log_error', '[create_preset_form] Cannot create preset form; the template_id is empty.' );
 			$this->_exit( false );
 		}
 
 		// get the xml for this specific template_id
-		$preset_form_xml_path = apply_filters( 'gravityview_template_formxml', '', $_POST['template_id'] );
+		$preset_form_xml_path = apply_filters( 'gravityview_template_formxml', '', $_POST[ 'template_id' ] );
 
 		// import form
 		$form = $this->import_form( $preset_form_xml_path );
 
 		// get the form ID
-		if( false === $form ) {
+		if ( false === $form ) {
 			// send error to user
-			do_action( 'gravityview_log_error', '[create_preset_form] Error importing form for template id: ' . (int) $_POST['template_id'] );
+			do_action( 'gravityview_log_error', '[create_preset_form] Error importing form for template id: ' . (int)$_POST[ 'template_id' ] );
 
 			$this->_exit( false );
 		}
 
-		$this->_exit( '<option value="'.esc_attr( $form['id'] ).'" selected="selected">'.esc_html( $form['title'] ).'</option>' );
+		$this->_exit( '<option value="' . esc_attr( $form[ 'id' ] ) . '" selected="selected">' . esc_html( $form[ 'title' ] ) . '</option>' );
 
 	}
 
@@ -206,7 +206,7 @@ 
 
 		do_action( 'gravityview_log_debug', '[import_form] Import Preset Form. (File)', $xml_or_json_path );
 
-		if( empty( $xml_or_json_path ) || !class_exists('GFExport') || !file_exists( $xml_or_json_path ) ) {
+		if ( empty( $xml_or_json_path ) || ! class_exists( 'GFExport' ) || ! file_exists( $xml_or_json_path ) ) {
 			do_action( 'gravityview_log_error', '[import_form] Class GFExport or file not found. file: ', $xml_or_json_path );
 			return false;
 		}
@@ -218,13 +218,13 @@ 
 		do_action( 'gravityview_log_debug', '[import_form] Importing form (Result)', $count );
 		do_action( 'gravityview_log_debug', '[import_form] Importing form (Form) ', $forms );
 
-		if( $count != 1 || empty( $forms[0]['id'] ) ) {
+		if ( $count != 1 || empty( $forms[ 0 ][ 'id' ] ) ) {
 			do_action( 'gravityview_log_error', '[import_form] Form Import Failed!' );
 			return false;
 		}
 
 		// import success - return form id
-		return $forms[0];
+		return $forms[ 0 ];
 	}
 
 
@@ -238,7 +238,7 @@ 
 	function get_field_options() {
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template'] ) || empty( $_POST['area'] ) || empty( $_POST['field_id'] ) || empty( $_POST['field_type'] ) ) {
+		if ( empty( $_POST[ 'template' ] ) || empty( $_POST[ 'area' ] ) || empty( $_POST[ 'field_id' ] ) || empty( $_POST[ 'field_type' ] ) ) {
 			do_action( 'gravityview_log_error', '[get_field_options] Required fields were not set in the $_POST request. ' );
 			$this->_exit( false );
 		}
@@ -250,10 +250,10 @@ 
 		$_post = array_map( 'esc_attr', $_post );
 
 		// The GF type of field: `product`, `name`, `creditcard`, `id`, `text`
-		$input_type = isset($_post['input_type']) ? esc_attr( $_post['input_type'] ) : NULL;
-		$context = isset($_post['context']) ? esc_attr( $_post['context'] ) : NULL;
+		$input_type = isset( $_post[ 'input_type' ] ) ? esc_attr( $_post[ 'input_type' ] ) : NULL;
+		$context = isset( $_post[ 'context' ] ) ? esc_attr( $_post[ 'context' ] ) : NULL;
 
-		$response = GravityView_Render_Settings::render_field_options( $_post['field_type'], $_post['template'], $_post['field_id'], $_post['field_label'], $_post['area'], $input_type, '', '', $context  );
+		$response = GravityView_Render_Settings::render_field_options( $_post[ 'field_type' ], $_post[ 'template' ], $_post[ 'field_id' ], $_post[ 'field_label' ], $_post[ 'area' ], $input_type, '', '', $context );
 
 		$response = gravityview_strip_whitespace( $response );
 
@@ -274,15 +274,15 @@ 
 		$form = '';
 
 		// if form id is set, use it, else, get form from preset
-		if( !empty( $_POST['form_id'] ) ) {
+		if ( ! empty( $_POST[ 'form_id' ] ) ) {
 
-			$form = (int) $_POST['form_id'];
+			$form = (int)$_POST[ 'form_id' ];
 
 		}
 		// get form from preset
-		elseif( !empty( $_POST['template_id'] ) ) {
+		elseif ( ! empty( $_POST[ 'template_id' ] ) ) {
 
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 
 		}
 
@@ -298,27 +298,27 @@ 
 	 * @param  string $template_id Preset template
 	 *
 	 */
-	static function pre_get_form_fields( $template_id = '') {
+	static function pre_get_form_fields( $template_id = '' ) {
 
-		if( empty( $template_id ) ) {
+		if ( empty( $template_id ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ' - Template ID not set.' );
 			return false;
 		} else {
 			$form_file = apply_filters( 'gravityview_template_formxml', '', $template_id );
-			if( !file_exists( $form_file )  ) {
-				do_action( 'gravityview_log_error', __METHOD__ . ' - Importing Form Fields for preset ['. $template_id .']. File not found. file: ' . $form_file );
+			if ( ! file_exists( $form_file ) ) {
+				do_action( 'gravityview_log_error', __METHOD__ . ' - Importing Form Fields for preset [' . $template_id . ']. File not found. file: ' . $form_file );
 				return false;
 			}
 		}
 
 		// Load xml parser (from GravityForms)
-		if( class_exists( 'GFCommon' ) ) {
+		if ( class_exists( 'GFCommon' ) ) {
 			$xml_parser = GFCommon::get_base_path() . '/xml.php';
 		} else {
 			$xml_parser = trailingslashit( WP_PLUGIN_DIR ) . 'gravityforms/xml.php';
 		}
 
-		if( file_exists( $xml_parser ) ) {
+		if ( file_exists( $xml_parser ) ) {
 			require_once( $xml_parser );
 		} else {
 			do_action( 'gravityview_log_debug', __METHOD__ . ' - Gravity Forms XML Parser not found.', $xml_parser );
@@ -329,37 +329,37 @@ 
 		$xmlstr = file_get_contents( $form_file );
 
         $options = array(
-            "page" => array("unserialize_as_array" => true),
-            "form"=> array("unserialize_as_array" => true),
-            "field"=> array("unserialize_as_array" => true),
-            "rule"=> array("unserialize_as_array" => true),
-            "choice"=> array("unserialize_as_array" => true),
-            "input"=> array("unserialize_as_array" => true),
-            "routing_item"=> array("unserialize_as_array" => true),
-            "creditCard"=> array("unserialize_as_array" => true),
-            "routin"=> array("unserialize_as_array" => true),
-            "confirmation" => array("unserialize_as_array" => true),
-            "notification" => array("unserialize_as_array" => true)
+            "page" => array( "unserialize_as_array" => true ),
+            "form"=> array( "unserialize_as_array" => true ),
+            "field"=> array( "unserialize_as_array" => true ),
+            "rule"=> array( "unserialize_as_array" => true ),
+            "choice"=> array( "unserialize_as_array" => true ),
+            "input"=> array( "unserialize_as_array" => true ),
+            "routing_item"=> array( "unserialize_as_array" => true ),
+            "creditCard"=> array( "unserialize_as_array" => true ),
+            "routin"=> array( "unserialize_as_array" => true ),
+            "confirmation" => array( "unserialize_as_array" => true ),
+            "notification" => array( "unserialize_as_array" => true )
         );
 
-		$xml = new RGXML($options);
-        $forms = $xml->unserialize($xmlstr);
+		$xml = new RGXML( $options );
+        $forms = $xml->unserialize( $xmlstr );
 
-        if( !$forms ) {
-        	do_action( 'gravityview_log_error', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. Error importing file. (File)', $form_file );
+        if ( ! $forms ) {
+        	do_action( 'gravityview_log_error', '[pre_get_available_fields] Importing Form Fields for preset [' . $template_id . ']. Error importing file. (File)', $form_file );
         	return false;
         }
 
-        if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
-        	$form = $forms[0];
+        if ( ! empty( $forms[ 0 ] ) && is_array( $forms[ 0 ] ) ) {
+        	$form = $forms[ 0 ];
         }
 
-        if( empty( $form ) ) {
+        if ( empty( $form ) ) {
         	do_action( 'gravityview_log_error', '[pre_get_available_fields] $form not set.', $forms );
         	return false;
         }
 
-        do_action( 'gravityview_log_debug', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. (Form)', $form );
+        do_action( 'gravityview_log_debug', '[pre_get_available_fields] Importing Form Fields for preset [' . $template_id . ']. (Form)', $form );
 
         return $form;
 
@@ -373,38 +373,38 @@ 
 	 */
 	function import_fields( $file ) {
 
-		if( empty( $file ) || !file_exists(  $file ) ) {
+		if ( empty( $file ) || ! file_exists( $file ) ) {
 			do_action( 'gravityview_log_error', '[import_fields] Importing Preset Fields. File not found. (File)', $file );
 			return false;
 		}
 
-		if( !class_exists('WXR_Parser') ) {
+		if ( ! class_exists( 'WXR_Parser' ) ) {
 			include_once GRAVITYVIEW_DIR . 'includes/lib/xml-parsers/parsers.php';
 		}
 
 		$parser = new WXR_Parser();
 		$presets = $parser->parse( $file );
 
-		if(is_wp_error( $presets )) {
+		if ( is_wp_error( $presets ) ) {
 			do_action( 'gravityview_log_error', '[import_fields] Importing Preset Fields failed. Threw WP_Error.', $presets );
 			return false;
 		}
 
-		if( empty( $presets['posts'][0]['postmeta'] ) && !is_array( $presets['posts'][0]['postmeta'] ) ) {
+		if ( empty( $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) && ! is_array( $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) ) {
 			do_action( 'gravityview_log_error', '[import_fields] Importing Preset Fields failed. Meta not found in file.', $file );
 			return false;
 		}
 
-		do_action( 'gravityview_log_debug', '[import_fields] postmeta', $presets['posts'][0]['postmeta'] );
+		do_action( 'gravityview_log_debug', '[import_fields] postmeta', $presets[ 'posts' ][ 0 ][ 'postmeta' ] );
 
 		$fields = $widgets = array();
-		foreach( $presets['posts'][0]['postmeta'] as $meta ) {
-			switch ($meta['key']) {
+		foreach ( $presets[ 'posts' ][ 0 ][ 'postmeta' ] as $meta ) {
+			switch ( $meta[ 'key' ] ) {
 				case '_gravityview_directory_fields':
-					$fields = maybe_unserialize( $meta['value'] );
+					$fields = maybe_unserialize( $meta[ 'value' ] );
 					break;
 				case '_gravityview_directory_widgets':
-					$widgets = maybe_unserialize( $meta['value'] );
+					$widgets = maybe_unserialize( $meta[ 'value' ] );
 					break;
 			}
 		}

includes/class-admin-approve-entries.php

Spacing +71 added lines, -71 removed lines

@@ -34,19 +34,19 @@ 
 		/** gf_entries page - entries table screen */
 
 		// capture bulk actions
-		add_action( 'init', array( $this, 'process_bulk_action') );
+		add_action( 'init', array( $this, 'process_bulk_action' ) );
 		// add hidden field with approve status
 		add_action( 'gform_entries_first_column', array( $this, 'add_entry_approved_hidden_input' ), 1, 5 );
 		// process ajax approve entry requests
-		add_action('wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved'));
+		add_action( 'wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved' ) );
 
 		// in case entry is edited (on admin or frontend)
-		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2);
+		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2 );
 
 		add_filter( 'gravityview_tooltips', array( $this, 'tooltips' ) );
 
 		// adding styles and scripts
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') );
+		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) );
 		// bypass Gravity Forms no-conflict mode
 		add_filter( 'gform_noconflict_scripts', array( $this, 'register_gform_noconflict_script' ) );
 		add_filter( 'gform_noconflict_styles', array( $this, 'register_gform_noconflict_style' ) );
@@ -61,9 +61,9 @@ 
 	 */
 	function tooltips( $tooltips ) {
 
-		$tooltips['form_gravityview_fields'] = array(
-			'title' => __('GravityView Fields', 'gravityview'),
-			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'),
+		$tooltips[ 'form_gravityview_fields' ] = array(
+			'title' => __( 'GravityView Fields', 'gravityview' ),
+			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview' ),
 		);
 
 		return $tooltips;
@@ -178,12 +178,12 @@ 
 		}
 
 		// gforms_update_note is sent when bulk editing entry notes. We don't want to process then.
-		if ( 'bulk' === RGForms::post( 'action' ) && empty( $_POST['gforms_update_note'] ) ) {
+		if ( 'bulk' === RGForms::post( 'action' ) && empty( $_POST[ 'gforms_update_note' ] ) ) {
 
 			check_admin_referer( 'gforms_entry_list', 'gforms_entry_list' );
 
 			// The action is formatted like: approve-16 or disapprove-16, where the first word is the name of the action and the second is the ID of the form. Bulk action 2 is the bottom bulk action select form.
-			$bulk_action = ! empty( $_POST['bulk_action'] ) ? $_POST['bulk_action'] : $_POST['bulk_action2'];
+			$bulk_action = ! empty( $_POST[ 'bulk_action' ] ) ? $_POST[ 'bulk_action' ] : $_POST[ 'bulk_action2' ];
 
 			/**
 			 * The extra '-' is to make sure that there are at *least* two items in array.
@@ -199,13 +199,13 @@ 
 			}
 
 			// All entries are set to be updated, not just the visible ones
-			if ( ! empty( $_POST['all_entries'] ) ) {
+			if ( ! empty( $_POST[ 'all_entries' ] ) ) {
 
 				// Convert the current entry search into GF-formatted search criteria
 				$search = array(
-					'search_field' => isset( $_POST['f'] ) ? $_POST['f'][0] : 0,
-					'search_value' => isset( $_POST['v'][0] ) ? $_POST['v'][0] : '',
-					'search_operator' => isset( $_POST['o'][0] ) ? $_POST['o'][0] : 'contains',
+					'search_field' => isset( $_POST[ 'f' ] ) ? $_POST[ 'f' ][ 0 ] : 0,
+					'search_value' => isset( $_POST[ 'v' ][ 0 ] ) ? $_POST[ 'v' ][ 0 ] : '',
+					'search_operator' => isset( $_POST[ 'o' ][ 0 ] ) ? $_POST[ 'o' ][ 0 ] : 'contains',
 				);
 
 				$search_criteria = GravityView_frontend::get_search_criteria( $search, $form_id );
@@ -215,7 +215,7 @@ 
 
 			} else {
 
-				$entries = $_POST['lead'];
+				$entries = $_POST[ 'lead' ];
 
 			}
 
@@ -256,12 +256,12 @@ 
 	 */
 	private static function update_bulk( $entries, $approved, $form_id ) {
 
-		if( empty($entries) || ( $entries !== true && !is_array($entries) ) ) {
+		if ( empty( $entries ) || ( $entries !== true && ! is_array( $entries ) ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ' Entries were empty or malformed.', $entries );
 			return false;
 		}
 
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ' User does not have the `gravityview_moderate_entries` capability.' );
 			return false;
 		}
@@ -271,7 +271,7 @@ 
 		// calculate approved field id
 		$approved_column_id = self::get_approved_column( $form_id );
 
-		foreach( $entries as $entry_id ) {
+		foreach ( $entries as $entry_id ) {
 			self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id );
 		}
 	}
@@ -290,14 +290,14 @@ 
 	 * @param int $approvedcolumn (default: 0)
 	 * @return boolean True: It worked; False: it failed
 	 */
-	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
+	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0 ) {
 
-		if( !class_exists( 'GFAPI' ) ) {
+		if ( ! class_exists( 'GFAPI' ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . 'GFAPI does not exist' );
 			return false;
 		}
 
-		if( empty( $approvedcolumn ) ) {
+		if ( empty( $approvedcolumn ) ) {
 			$approvedcolumn = self::get_approved_column( $form_id );
 		}
 
@@ -316,10 +316,10 @@ 
 		self::update_approved_meta( $entry_id, $approved );
 
 		// add note to entry
-		if( $result === true ) {
+		if ( $result === true ) {
 			$note = empty( $approved ) ? __( 'Disapproved the Entry for GravityView', 'gravityview' ) : __( 'Approved the Entry for GravityView', 'gravityview' );
 
-			if( class_exists( 'GravityView_Entry_Notes' ) ){
+			if ( class_exists( 'GravityView_Entry_Notes' ) ) {
 				global $current_user;
       			get_currentuserinfo();
 				GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $current_user->display_name, $note );
@@ -332,7 +332,7 @@ 
 			 */
 			do_action( 'gravityview_clear_form_cache', $form_id );
 
-		} else if( is_wp_error( $result ) ) {
+		} else if ( is_wp_error( $result ) ) {
 
 			do_action( 'gravityview_log_error', __METHOD__ . sprintf( ' - Entry approval not updated: %s', $result->get_error_message() ) );
 
@@ -354,12 +354,12 @@ 
 	 */
 	public static function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) {
 
-		$approvedcolumn = self::get_approved_column( $form['id'] );
+		$approvedcolumn = self::get_approved_column( $form[ 'id' ] );
 
         /**
          * If the form doesn't contain the approve field, don't assume anything.
          */
-        if( empty( $approvedcolumn ) ) {
+        if ( empty( $approvedcolumn ) ) {
             return;
         }
 
@@ -381,7 +381,7 @@ 
 	private static function update_approved_meta( $entry_id, $is_approved ) {
 
 		// update entry meta
-		if( function_exists('gform_update_meta') ) {
+		if ( function_exists( 'gform_update_meta' ) ) {
 
 			gform_update_meta( $entry_id, 'is_approved', $is_approved );
 
@@ -393,7 +393,7 @@ 
 			 */
 			do_action( 'gravityview/approve_entries/updated', $entry_id, $is_approved );
 
-			if( empty( $is_approved ) ) {
+			if ( empty( $is_approved ) ) {
 
 				/**
 				 * @action `gravityview/approve_entries/disapproved` Triggered when an entry is rejected
@@ -415,7 +415,7 @@ 
 
 		} else {
 
-			do_action('gravityview_log_error', __METHOD__ . ' - `gform_update_meta` does not exist.' );
+			do_action( 'gravityview_log_error', __METHOD__ . ' - `gform_update_meta` does not exist.' );
 
 		}
 	}
@@ -427,21 +427,21 @@ 
 	 */
 	public function ajax_update_approved() {
 
-		if( empty( $_POST['entry_id'] ) || empty( $_POST['form_id'] ) ) {
+		if ( empty( $_POST[ 'entry_id' ] ) || empty( $_POST[ 'form_id' ] ) ) {
 
 			do_action( 'gravityview_log_error', __METHOD__ . ' entry_id or form_id are empty.', $_POST );
 
 			$result = false;
 		}
 
-		else if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxgfentries' ) ) {
+		else if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxgfentries' ) ) {
 
 			do_action( 'gravityview_log_error', __METHOD__ . ' Security check failed.', $_POST );
 
 			$result = false;
 		}
 
-		else if( ! GVCommon::has_cap( 'gravityview_moderate_entries', $_POST['entry_id'] ) ) {
+		else if ( ! GVCommon::has_cap( 'gravityview_moderate_entries', $_POST[ 'entry_id' ] ) ) {
 
 			do_action( 'gravityview_log_error', __METHOD__ . ' User does not have the `gravityview_moderate_entries` capability.' );
 
@@ -450,11 +450,11 @@ 
 
 		else {
 
-			$result = self::update_approved( $_POST['entry_id'], $_POST['approved'], $_POST['form_id'] );
+			$result = self::update_approved( $_POST[ 'entry_id' ], $_POST[ 'approved' ], $_POST[ 'form_id' ] );
 
-			if( is_wp_error( $result ) ) {
+			if ( is_wp_error( $result ) ) {
 				/** @var WP_Error $result */
-				do_action( 'gravityview_log_error', __METHOD__ .' Error updating approval: ' . $result->get_error_message() );
+				do_action( 'gravityview_log_error', __METHOD__ . ' Error updating approval: ' . $result->get_error_message() );
 				$result = false;
 			}
 
@@ -474,29 +474,29 @@ 
 	 */
 	static public function get_approved_column( $form ) {
 
-        if( empty( $form ) ) {
+        if ( empty( $form ) ) {
             return null;
         }
 
-        if( !is_array( $form ) ) {
+        if ( ! is_array( $form ) ) {
             $form = GVCommon::get_form( $form );
         }
 
-		foreach( $form['fields'] as $key => $field ) {
+		foreach ( $form[ 'fields' ] as $key => $field ) {
 
-            $field = (array) $field;
+            $field = (array)$field;
 
-			if( !empty( $field['gravityview_approved'] ) ) {
-				if( !empty($field['inputs'][0]['id']) ) {
-					return $field['inputs'][0]['id'];
+			if ( ! empty( $field[ 'gravityview_approved' ] ) ) {
+				if ( ! empty( $field[ 'inputs' ][ 0 ][ 'id' ] ) ) {
+					return $field[ 'inputs' ][ 0 ][ 'id' ];
 				}
 			}
 
             // Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work..
-            if( 'checkbox' == $field['type'] && isset( $field['inputs'] ) && is_array( $field['inputs'] ) ) {
-                foreach ( $field['inputs'] as $key2 => $input ) {
-                    if ( strtolower( $input['label'] ) == 'approved' ) {
-                        return $input['id'];
+            if ( 'checkbox' == $field[ 'type' ] && isset( $field[ 'inputs' ] ) && is_array( $field[ 'inputs' ] ) ) {
+                foreach ( $field[ 'inputs' ] as $key2 => $input ) {
+                    if ( strtolower( $input[ 'label' ] ) == 'approved' ) {
+                        return $input[ 'id' ];
                     }
                 }
             }
@@ -507,18 +507,18 @@ 
 
 
 
-	static public function add_entry_approved_hidden_input(  $form_id, $field_id, $value, $entry, $query_string ) {
+	static public function add_entry_approved_hidden_input( $form_id, $field_id, $value, $entry, $query_string ) {
 
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry['id'] ) ) {
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry[ 'id' ] ) ) {
 			return;
 		}
 
-		if( empty( $entry['id'] ) ) {
+		if ( empty( $entry[ 'id' ] ) ) {
 			return;
 		}
 
-		if( gform_get_meta( $entry['id'], 'is_approved' ) ) {
-			echo '<input type="hidden" class="entry_approved" id="entry_approved_'. $entry['id'] .'" value="true" />';
+		if ( gform_get_meta( $entry[ 'id' ], 'is_approved' ) ) {
+			echo '<input type="hidden" class="entry_approved" id="entry_approved_' . $entry[ 'id' ] . '" value="true" />';
 		}
 	}
 
@@ -527,7 +527,7 @@ 
 
 	function add_scripts_and_styles( $hook ) {
 
-		if( !class_exists( 'RGForms' ) ) {
+		if ( ! class_exists( 'RGForms' ) ) {
 
 			do_action( 'gravityview_log_error', 'GravityView_Admin_ApproveEntries[add_scripts_and_styles] RGForms does not exist.' );
 
@@ -536,40 +536,40 @@ 
 
 		// enqueue styles & scripts gf_entries
 		// But only if we're on the main Entries page, not on reports pages
-		if( RGForms::get_page() === 'entry_list' ) {
+		if ( RGForms::get_page() === 'entry_list' ) {
 
-			$form_id = RGForms::get('id');
+			$form_id = RGForms::get( 'id' );
 
 			// If there are no forms identified, use the first form. That's how GF does it.
-			if( empty( $form_id ) && class_exists('RGFormsModel') ) {
+			if ( empty( $form_id ) && class_exists( 'RGFormsModel' ) ) {
 				$forms = gravityview_get_forms();
-				if( !empty( $forms ) ) {
-					$form_id = $forms[0]['id'];
+				if ( ! empty( $forms ) ) {
+					$form_id = $forms[ 0 ][ 'id' ];
 				}
 			}
 
 			$approvedcolumn = self::get_approved_column( $form_id );
 
-			wp_register_style( 'gravityview_entries_list', plugins_url('assets/css/admin-entries-list.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
+			wp_register_style( 'gravityview_entries_list', plugins_url( 'assets/css/admin-entries-list.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
 			wp_enqueue_style( 'gravityview_entries_list' );
 
-			$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+			$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
-			wp_register_script( 'gravityview_gf_entries_scripts', plugins_url('assets/js/admin-entries-list'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version );
+			wp_register_script( 'gravityview_gf_entries_scripts', plugins_url( 'assets/js/admin-entries-list' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version );
 			wp_enqueue_script( 'gravityview_gf_entries_scripts' );
 
 			wp_localize_script( 'gravityview_gf_entries_scripts', 'gvGlobals', array(
-				'nonce' => wp_create_nonce( 'gravityview_ajaxgfentries'),
+				'nonce' => wp_create_nonce( 'gravityview_ajaxgfentries' ),
 				'form_id' => $form_id,
 				'show_column' => (int)$this->show_approve_entry_column( $form_id ),
 				'add_bulk_action' => (int)GVCommon::has_cap( 'gravityview_moderate_entries' ),
-				'label_approve' => __( 'Approve', 'gravityview' ) ,
+				'label_approve' => __( 'Approve', 'gravityview' ),
 				'label_disapprove' => __( 'Disapprove', 'gravityview' ),
 				'bulk_message' => $this->bulk_update_message,
-				'approve_title' => __( 'Entry not approved for directory viewing. Click to approve this entry.', 'gravityview'),
-				'unapprove_title' => __( 'Entry approved for directory viewing. Click to disapprove this entry.', 'gravityview'),
-				'column_title' => __( 'Show entry in directory view?', 'gravityview'),
-				'column_link' => esc_url( add_query_arg( array('sort' => $approvedcolumn) ) ),
+				'approve_title' => __( 'Entry not approved for directory viewing. Click to approve this entry.', 'gravityview' ),
+				'unapprove_title' => __( 'Entry approved for directory viewing. Click to disapprove this entry.', 'gravityview' ),
+				'column_title' => __( 'Show entry in directory view?', 'gravityview' ),
+				'column_link' => esc_url( add_query_arg( array( 'sort' => $approvedcolumn ) ) ),
 			) );
 
 		}
@@ -594,13 +594,13 @@ 
 		 * @since 1.7.2
 		 * @param boolean $hide_if_no_connections
 		 */
-		$hide_if_no_connections = apply_filters('gravityview/approve_entries/hide-if-no-connections', false );
+		$hide_if_no_connections = apply_filters( 'gravityview/approve_entries/hide-if-no-connections', false );
 
-		if( $hide_if_no_connections ) {
+		if ( $hide_if_no_connections ) {
 
 			$connected_views = gravityview_get_connected_views( $form_id );
 
-			if( empty( $connected_views ) ) {
+			if ( empty( $connected_views ) ) {
 				$show_approve_column = false;
 			}
 		}
@@ -610,18 +610,18 @@ 
 		 * @param boolean $show_approve_column Whether the column will be shown
 		 * @param int $form_id The ID of the Gravity Forms form for which entries are being shown
 		 */
-		$show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id );
+		$show_approve_column = apply_filters( 'gravityview/approve_entries/show-column', $show_approve_column, $form_id );
 
 		return $show_approve_column;
 	}
 
 	function register_gform_noconflict_script( $scripts ) {
-		$scripts[] = 'gravityview_gf_entries_scripts';
+		$scripts[ ] = 'gravityview_gf_entries_scripts';
 		return $scripts;
 	}
 
 	function register_gform_noconflict_style( $styles ) {
-		$styles[] = 'gravityview_entries_list';
+		$styles[ ] = 'gravityview_entries_list';
 		return $styles;
 	}
 

includes/class-frontend-views.php

Spacing +92 added lines, -92 removed lines

@@ -85,8 +85,8 @@ 
 	private function __construct() {}
 
 	private function initialize() {
-		add_action( 'wp', array( $this, 'parse_content'), 11 );
-		add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 );
+		add_action( 'wp', array( $this, 'parse_content' ), 11 );
+		add_action( 'template_redirect', array( $this, 'set_entry_data' ), 1 );
 
 		// Enqueue scripts and styles after GravityView_Template::register_styles()
 		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 );
@@ -233,15 +233,15 @@ 
 
 			$this->context_view_id = $view_id;
 
-		} elseif ( isset( $_GET['gvid'] ) && $this->getGvOutputData()->has_multiple_views() ) {
+		} elseif ( isset( $_GET[ 'gvid' ] ) && $this->getGvOutputData()->has_multiple_views() ) {
 			/**
 			 * used on a has_multiple_views context
 			 * @see GravityView_API::entry_link
 			 * @see GravityView_View_Data::getInstance()->has_multiple_views()
 			 */
-			$this->context_view_id = $_GET['gvid'];
+			$this->context_view_id = $_GET[ 'gvid' ];
 
-		} elseif ( ! $this->getGvOutputData()->has_multiple_views() )  {
+		} elseif ( ! $this->getGvOutputData()->has_multiple_views() ) {
 			$array_keys = array_keys( $this->getGvOutputData()->get_views() );
 			$this->context_view_id = array_pop( $array_keys );
 			unset( $array_keys );
@@ -269,7 +269,7 @@ 
 		global $post;
 
 		// If in admin and NOT AJAX request, get outta here.
-		if ( GravityView_Plugin::is_admin() )  {
+		if ( GravityView_Plugin::is_admin() ) {
 			return;
 		}
 
@@ -281,7 +281,7 @@ 
 
 		$this->setIsGravityviewPostType( get_post_type( $post ) === 'gravityview' );
 
-		$post_id = $this->getPostId() ? $this->getPostId() : (isset( $post ) ? $post->ID : null );
+		$post_id = $this->getPostId() ? $this->getPostId() : ( isset( $post ) ? $post->ID : null );
 		$this->setPostId( $post_id );
 		$post_has_shortcode = ! empty( $post->post_content ) ? gravityview_has_shortcode_r( $post->post_content, 'gravityview' ) : false;
 		$this->setPostHasShortcode( $this->isGravityviewPostType() ? null : ! empty( $post_has_shortcode ) );
@@ -365,20 +365,20 @@ 
 		 * @param boolean $in_the_loop Whether to apply the filter to the menu title and the meta tag <title> - outside the loop
 		 * @param array $entry Current entry
 		 */
-		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop' , in_the_loop(), $entry );
+		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop', in_the_loop(), $entry );
 
 		if ( ! $apply_outside_loop ) {
 			return $title;
 		}
 
 		// User reported WooCommerce doesn't pass two args.
-		if ( empty( $passed_post_id ) )  {
+		if ( empty( $passed_post_id ) ) {
 			return $title;
 		}
 
 		// Don't modify the title for anything other than the current view/post.
 		// This is true for embedded shortcodes and Views.
-		if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) {
+		if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) {
 			return $title;
 		}
 
@@ -388,19 +388,19 @@ 
 			$view_meta = $this->getGvOutputData()->get_view( $context_view_id );
 		} else {
 			foreach ( $this->getGvOutputData()->get_views() as $view_id => $view_data ) {
-				if ( intval( $view_data['form_id'] ) === intval( $entry['form_id'] ) ) {
+				if ( intval( $view_data[ 'form_id' ] ) === intval( $entry[ 'form_id' ] ) ) {
 					$view_meta = $view_data;
 					break;
 				}
 			}
 		}
 
-		if ( ! empty( $view_meta['atts']['single_title'] ) ) {
+		if ( ! empty( $view_meta[ 'atts' ][ 'single_title' ] ) ) {
 
-			$title = $view_meta['atts']['single_title'];
+			$title = $view_meta[ 'atts' ][ 'single_title' ];
 
 			// We are allowing HTML in the fields, so no escaping the output
-			$title = GravityView_API::replace_variables( $title, $view_meta['form'], $entry );
+			$title = GravityView_API::replace_variables( $title, $view_meta[ 'form' ], $entry );
 
 			$title = do_shortcode( $title );
 		}
@@ -501,7 +501,7 @@ 
 	public function render_view( $passed_args ) {
 
 		// validate attributes
-		if ( empty( $passed_args['id'] ) ) {
+		if ( empty( $passed_args[ 'id' ] ) ) {
 			do_action( 'gravityview_log_error', '[render_view] Returning; no ID defined.', $passed_args );
 			return null;
 		}
@@ -523,7 +523,7 @@ 
 			return null;
 		}
 
-		$view_id = $passed_args['id'];
+		$view_id = $passed_args[ 'id' ];
 
 		$view_data = $this->getGvOutputData()->get_view( $view_id, $passed_args );
 
@@ -536,7 +536,7 @@ 
 		$passed_args = array_filter( $passed_args, 'strlen' );
 
 		//Override shortcode args over View template settings
-		$atts = wp_parse_args( $passed_args, $view_data['atts'] );
+		$atts = wp_parse_args( $passed_args, $view_data[ 'atts' ] );
 
 		do_action( 'gravityview_log_debug', '[render_view] Arguments after merging with View settings: ', $atts );
 
@@ -558,11 +558,11 @@ 
 		 * Don't render View if user isn't allowed to see it
 		 * @since 1.15
 		 */
-		if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
+		if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
 			return null;
 		}
 
-		if( $this->isGravityviewPostType() ) {
+		if ( $this->isGravityviewPostType() ) {
 
 			/**
 			 * @filter `gravityview_direct_access` Should Views be directly accessible, or only visible using the shortcode?
@@ -574,9 +574,9 @@ 
 			 */
 			$direct_access = apply_filters( 'gravityview_direct_access', true, $view_id );
 
-			$embed_only = ! empty( $atts['embed_only'] );
+			$embed_only = ! empty( $atts[ 'embed_only' ] );
 
-			if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
+			if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
 		}
@@ -591,7 +591,7 @@ 
 
 		$gravityview_view = new GravityView_View( $view_data );
 
-		$post_id = ! empty( $atts['post_id'] ) ? intval( $atts['post_id'] ) : $this->getPostId();
+		$post_id = ! empty( $atts[ 'post_id' ] ) ? intval( $atts[ 'post_id' ] ) : $this->getPostId();
 
 		$gravityview_view->setPostId( $post_id );
 
@@ -601,20 +601,20 @@ 
 			do_action( 'gravityview_log_debug', '[render_view] Executing Directory View' );
 
 			//fetch template and slug
-			$view_slug = apply_filters( 'gravityview_template_slug_'. $view_data['template_id'], 'table', 'directory' );
+			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data[ 'template_id' ], 'table', 'directory' );
 
 			do_action( 'gravityview_log_debug', '[render_view] View template slug: ', $view_slug );
 
 			/**
 			 * Disable fetching initial entries for views that don't need it (DataTables)
 			 */
-			$get_entries = apply_filters( 'gravityview_get_view_entries_'.$view_slug, true );
+			$get_entries = apply_filters( 'gravityview_get_view_entries_' . $view_slug, true );
 
 			/**
 			 * Hide View data until search is performed
 			 * @since 1.5.4
 			 */
-			if ( ! empty( $atts['hide_until_searched'] ) && ! $this->isSearch() ) {
+			if ( ! empty( $atts[ 'hide_until_searched' ] ) && ! $this->isSearch() ) {
 				$gravityview_view->setHideUntilSearched( true );
 				$get_entries = false;
 			}
@@ -622,23 +622,23 @@ 
 
 			if ( $get_entries ) {
 
-				if ( ! empty( $atts['sort_columns'] ) ) {
+				if ( ! empty( $atts[ 'sort_columns' ] ) ) {
 					// add filter to enable column sorting
-					add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ) , 100, 3 );
+					add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ), 100, 3 );
 				}
 
-				$view_entries = self::get_view_entries( $atts, $view_data['form_id'] );
+				$view_entries = self::get_view_entries( $atts, $view_data[ 'form_id' ] );
 
-				do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries['count'], sizeof( $view_entries['entries'] ) ) );
+				do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries[ 'count' ], sizeof( $view_entries[ 'entries' ] ) ) );
 
 			} else {
 
 				$view_entries = array( 'count' => null, 'entries' => null, 'paging' => null );
 
-				do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_'.$view_slug.'` is false' );
+				do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_' . $view_slug . '` is false' );
 			}
 
-			$gravityview_view->setPaging( $view_entries['paging'] );
+			$gravityview_view->setPaging( $view_entries[ 'paging' ] );
 			$gravityview_view->setContext( 'directory' );
 			$sections = array( 'header', 'body', 'footer' );
 
@@ -647,7 +647,7 @@ 
 			// user requested Single Entry View
 			do_action( 'gravityview_log_debug', '[render_view] Executing Single View' );
 
-			do_action( 'gravityview_render_entry_'.$view_data['id'] );
+			do_action( 'gravityview_render_entry_' . $view_data[ 'id' ] );
 
 			$entry = $this->getEntry();
 
@@ -667,20 +667,20 @@ 
 			// We're in single view, but the view being processed is not the same view the single entry belongs to.
 			// important: do not remove this as it prevents fake attempts of displaying entries from other views/forms
 			if ( $this->getGvOutputData()->has_multiple_views() && $view_id != $this->get_context_view_id() ) {
-				do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: '. $view_id );
+				do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: ' . $view_id );
 				return null;
 			}
 
 			//fetch template and slug
-			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data['template_id'], 'table', 'single' );
+			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data[ 'template_id' ], 'table', 'single' );
 			do_action( 'gravityview_log_debug', '[render_view] View single template slug: ', $view_slug );
 
 			//fetch entry detail
-			$view_entries['count'] = 1;
-			$view_entries['entries'][] = $entry;
-			do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries['entries'] );
+			$view_entries[ 'count' ] = 1;
+			$view_entries[ 'entries' ][ ] = $entry;
+			do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries[ 'entries' ] );
 
-			$back_link_label = isset( $atts['back_link_label'] ) ? $atts['back_link_label'] : null;
+			$back_link_label = isset( $atts[ 'back_link_label' ] ) ? $atts[ 'back_link_label' ] : null;
 
 			// set back link label
 			$gravityview_view->setBackLinkLabel( $back_link_label );
@@ -690,11 +690,11 @@ 
 		}
 
 		// add template style
-		self::add_style( $view_data['template_id'] );
+		self::add_style( $view_data[ 'template_id' ] );
 
 		// Prepare to render view and set vars
-		$gravityview_view->setEntries( $view_entries['entries'] );
-		$gravityview_view->setTotalEntries( $view_entries['count'] );
+		$gravityview_view->setEntries( $view_entries[ 'entries' ] );
+		$gravityview_view->setTotalEntries( $view_entries[ 'count' ] );
 
 		// If Edit
 		if ( 'edit' === gravityview_get_context() ) {
@@ -707,11 +707,11 @@ 
 
 		} else {
 			// finaly we'll render some html
-			$sections = apply_filters( 'gravityview_render_view_sections', $sections, $view_data['template_id'] );
+			$sections = apply_filters( 'gravityview_render_view_sections', $sections, $view_data[ 'template_id' ] );
 
 			do_action( 'gravityview_log_debug', '[render_view] Sections to render: ', $sections );
 			foreach ( $sections as $section ) {
-				do_action( 'gravityview_log_debug', '[render_view] Rendering '. $section . ' section.' );
+				do_action( 'gravityview_log_debug', '[render_view] Rendering ' . $section . ' section.' );
 				$gravityview_view->render( $view_slug, $section, false );
 			}
 		}
@@ -765,7 +765,7 @@ 
 				$datetime_format = 'Y-m-d H:i:s';
 				$search_is_outside_view_bounds = false;
 
-				if( ! empty( $search_criteria[ $key ] ) ) {
+				if ( ! empty( $search_criteria[ $key ] ) ) {
 
 					$search_date = strtotime( $search_criteria[ $key ] );
 
@@ -793,14 +793,14 @@ 
 				if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) {
 
 					// Then we override the search and re-set the start date
-					$return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true );
+					$return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true );
 				}
 			}
 		}
 
-		if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) {
+		if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) {
 			// The start date is AFTER the end date. This will result in no results, but let's not force the issue.
-			if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) {
+			if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) {
 				do_action( 'gravityview_log_error', __METHOD__ . ' Invalid search: the start date is after the end date.', $return_search_criteria );
 			}
 		}
@@ -818,9 +818,9 @@ 
 	 */
 	public static function process_search_only_approved( $args, $search_criteria ) {
 
-		if ( ! empty( $args['show_only_approved'] ) ) {
-			$search_criteria['field_filters'][] = array( 'key' => 'is_approved', 'value' => 'Approved' );
-			$search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met
+		if ( ! empty( $args[ 'show_only_approved' ] ) ) {
+			$search_criteria[ 'field_filters' ][ ] = array( 'key' => 'is_approved', 'value' => 'Approved' );
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met
 
 			do_action( 'gravityview_log_debug', '[process_search_only_approved] Search Criteria if show only approved: ', $search_criteria );
 		}
@@ -844,12 +844,12 @@ 
 	 */
 	public static function is_entry_approved( $entry, $args = array() ) {
 
-		if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) {
+		if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) {
 			// is implicitly approved if entry is null or View settings doesn't require to check for approval
 			return true;
 		}
 
-		$is_approved = gform_get_meta( $entry['id'], 'is_approved' );
+		$is_approved = gform_get_meta( $entry[ 'id' ], 'is_approved' );
 
 		if ( $is_approved ) {
 			return true;
@@ -882,26 +882,26 @@ 
 		do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', $search_criteria );
 
 		// implicity search
-		if ( ! empty( $args['search_value'] ) ) {
+		if ( ! empty( $args[ 'search_value' ] ) ) {
 
 			// Search operator options. Options: `is` or `contains`
-			$operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains';
+			$operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains';
 
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => rgget( 'search_field', $args ), // The field ID to search
-				'value' => esc_attr( $args['search_value'] ), // The value to search
+				'value' => esc_attr( $args[ 'search_value' ] ), // The value to search
 				'operator' => $operator,
 			);
 		}
 
-		if( $search_criteria !== $original_search_criteria ) {
+		if ( $search_criteria !== $original_search_criteria ) {
 			do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after implicity search: ', $search_criteria );
 		}
 
 		// Handle setting date range
 		$search_criteria = self::process_search_dates( $args, $search_criteria );
 
-		if( $search_criteria !== $original_search_criteria ) {
+		if ( $search_criteria !== $original_search_criteria ) {
 			do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after date params: ', $search_criteria );
 		}
 
@@ -912,7 +912,7 @@ 
 		 * @filter `gravityview_status` Modify entry status requirements to be included in search results.
 		 * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash`
 		 */
-		$search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args );
+		$search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args );
 
 		return $search_criteria;
 	}
@@ -958,16 +958,16 @@ 
 		$search_criteria = self::get_search_criteria( $args, $form_id );
 
 		// Paging & offset
-		$page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : apply_filters( 'gravityview_default_page_size', 25 );
+		$page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : apply_filters( 'gravityview_default_page_size', 25 );
 
 		if ( -1 === $page_size ) {
 			$page_size = PHP_INT_MAX;
 		}
 
-		if ( isset( $args['offset'] ) ) {
-			$offset = intval( $args['offset'] );
+		if ( isset( $args[ 'offset' ] ) ) {
+			$offset = intval( $args[ 'offset' ] );
 		} else {
-			$curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] );
+			$curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] );
 			$offset = ( $curr_page - 1 ) * $page_size;
 		}
 
@@ -985,7 +985,7 @@ 
 			'search_criteria' => $search_criteria,
 			'sorting' => $sorting,
 			'paging' => $paging,
-			'cache' => isset( $args['cache'] ) ? $args['cache'] : true,
+			'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true,
 		);
 
 		/**
@@ -1010,7 +1010,7 @@ 
 		 * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys.
 		 * @param array $args View configuration args.
 		 */
-		$parameters = apply_filters( 'gravityview_get_entries_'.$args['id'], $parameters, $args, $form_id );
+		$parameters = apply_filters( 'gravityview_get_entries_' . $args[ 'id' ], $parameters, $args, $form_id );
 
 		do_action( 'gravityview_log_debug', '[get_view_entries] $parameters passed to gravityview_get_entries(): ', $parameters );
 
@@ -1050,8 +1050,8 @@ 
 	 */
 	public static function updateViewSorting( $args, $form_id ) {
 		$sorting = array();
-		$sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : rgar( $args, 'sort_field' );
-		$sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : rgar( $args, 'sort_direction' );
+		$sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : rgar( $args, 'sort_field' );
+		$sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : rgar( $args, 'sort_direction' );
 
 		$sort_field_id = self::_override_sorting_id_by_field_type( $sort_field_id, $form_id );
 
@@ -1091,7 +1091,7 @@ 
 
 		$sort_field = GFFormsModel::get_field( $form, $sort_field_id );
 
-		switch ( $sort_field['type'] ) {
+		switch ( $sort_field[ 'type' ] ) {
 
 			case 'address':
 				// Sorting by full address
@@ -1108,7 +1108,7 @@ 
 					 */
 					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
 
-					switch( strtolower( $address_part ) ){
+					switch ( strtolower( $address_part ) ) {
 						case 'street':
 							$sort_field_id .= '.1';
 							break;
@@ -1188,7 +1188,7 @@ 
 		 */
 		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
 
-		if ( empty( $single_entry ) ){
+		if ( empty( $single_entry ) ) {
 			return false;
 		} else {
 			return $single_entry;
@@ -1215,7 +1215,7 @@ 
 				 * Don't enqueue the scripts or styles if it's not going to be displayed.
 				 * @since 1.15
 				 */
-				if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
+				if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
 					continue;
 				}
 
@@ -1224,19 +1224,19 @@ 
 				$css_dependencies = array();
 
 				// If the thickbox is enqueued, add dependencies
-				if ( ! empty( $data['atts']['lightbox'] ) ) {
+				if ( ! empty( $data[ 'atts' ][ 'lightbox' ] ) ) {
 
 					/**
 					 * @filter `gravity_view_lightbox_script` Override the lightbox script to enqueue. Default: `thickbox`
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of it here.
 					 */
-					$js_dependencies[] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' );
+					$js_dependencies[ ] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' );
 
 					/**
 					 * @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox`
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of its CSS file here.
 					 */
-					$css_dependencies[] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' );
+					$css_dependencies[ ] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' );
 				}
 
 				/**
@@ -1244,25 +1244,25 @@ 
 				 * @see https://github.com/katzwebservices/GravityView/issues/536
 				 * @since 1.15
 				 */
-				if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) {
-					$css_dependencies[] = 'dashicons';
+				if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) {
+					$css_dependencies[ ] = 'dashicons';
 				}
 
 				wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'includes/lib/jquery-cookie/jquery_cookie.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
 
 				$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
-				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ) , GravityView_Plugin::version, true );
+				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ), GravityView_Plugin::version, true );
 
 				wp_enqueue_script( 'gravityview-fe-view' );
 
-				if ( ! empty( $data['atts']['sort_columns'] ) ) {
+				if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) {
 					wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
 				}
 
 				wp_enqueue_style( 'gravityview_default_style', plugins_url( 'templates/css/gv-default-styles.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
 
-				self::add_style( $data['template_id'] );
+				self::add_style( $data[ 'template_id' ] );
 
 			}
 
@@ -1298,7 +1298,7 @@ 
 		} elseif ( empty( $template_id ) ) {
 			do_action( 'gravityview_log_error', '[add_style] Cannot add template style; template_id is empty' );
 		} else {
-			do_action( 'gravityview_log_error', sprintf( '[add_style] Cannot add template style; %s is not registered', 'gravityview_style_'.$template_id ) );
+			do_action( 'gravityview_log_error', sprintf( '[add_style] Cannot add template style; %s is not registered', 'gravityview_style_' . $template_id ) );
 		}
 
 	}
@@ -1323,11 +1323,11 @@ 
 		 * Not a table-based template; don't add sort icons
 		 * @since 1.12
 		 */
-		if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
+		if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
 			return $label;
 		}
 
-		if ( ! $this->is_field_sortable( $field['id'], $form ) ) {
+		if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) {
 			return $label;
 		}
 
@@ -1335,29 +1335,29 @@ 
 
 		$class = 'gv-sort icon';
 
-		$sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] );
+		$sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] );
 
 		$sort_args = array(
-			'sort' => $field['id'],
+			'sort' => $field[ 'id' ],
 			'dir' => 'asc',
 		);
 
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
 			//toggle sorting direction.
-			if ( 'asc' === $sorting['direction'] ) {
-				$sort_args['dir'] = 'desc';
+			if ( 'asc' === $sorting[ 'direction' ] ) {
+				$sort_args[ 'dir' ] = 'desc';
 				$class .= ' gv-icon-sort-desc';
 			} else {
-				$sort_args['dir'] = 'asc';
+				$sort_args[ 'dir' ] = 'asc';
 				$class .= ' gv-icon-sort-asc';
 			}
 		} else {
 			$class .= ' gv-icon-caret-up-down';
 		}
 
-		$url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) );
+		$url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) );
 
-		return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a>&nbsp;'. $label;
+		return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a>&nbsp;' . $label;
 
 	}
 
@@ -1375,7 +1375,7 @@ 
 
 		$field_type = $field_id;
 
-		if( is_numeric( $field_id ) ) {
+		if ( is_numeric( $field_id ) ) {
 			$field = GFFormsModel::get_field( $form, $field_id );
 			$field_type = $field->type;
 		}
@@ -1398,7 +1398,7 @@ 
 			return false;
 		}
 
-		return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
+		return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
 
 	}
 

includes/class-gravityview-roles-capabilities.php

Spacing +14 added lines, -14 removed lines

@@ -33,7 +33,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if( ! self::$instance ) {
+		if ( ! self::$instance ) {
 			self::$instance = new self;
 		}
 
@@ -56,7 +56,7 @@ 
 		add_filter( 'members_get_capabilities', array( 'GravityView_Roles_Capabilities', 'merge_with_all_caps' ) );
 		add_action( 'members_register_cap_groups', array( $this, 'members_register_cap_group' ), 20 );
 		add_filter( 'user_has_cap', array( $this, 'filter_user_has_cap' ), 10, 4 );
-        add_action( 'admin_init', array( $this, 'add_caps') );
+        add_action( 'admin_init', array( $this, 'add_caps' ) );
 	}
 
 
@@ -77,18 +77,18 @@ 
 	public function filter_user_has_cap( $usercaps = array(), $caps = array(), $args = array(), $user = NULL ) {
 
 		// Empty caps_to_check array
-		if( ! $usercaps || ! $caps ) {
+		if ( ! $usercaps || ! $caps ) {
 			return $usercaps;
 		}
 
 		/**
 		 * Enable all GravityView caps_to_check if `gravityview_full_access` is enabled
 		 */
-		if( ! empty( $usercaps['gravityview_full_access'] ) ) {
+		if ( ! empty( $usercaps[ 'gravityview_full_access' ] ) ) {
 
 			$all_gravityview_caps = self::all_caps();
 
-			foreach( $all_gravityview_caps as $gv_cap ) {
+			foreach ( $all_gravityview_caps as $gv_cap ) {
 				$usercaps[ $gv_cap ] = true;
 			}
 
@@ -304,7 +304,7 @@ 
 		$all = $administrator;
 
 		// If role is set, return caps_to_check for just that role.
-		if( $single_role ) {
+		if ( $single_role ) {
 			$caps = isset( ${$single_role} ) ? ${$single_role} : false;
 			return $flat_array ? $caps : array( $single_role => $caps );
 		}
@@ -334,7 +334,7 @@ 
 
 		$has_cap = false;
 
-		if( empty( $caps_to_check ) ) {
+		if ( empty( $caps_to_check ) ) {
 			return $has_cap;
 		}
 
@@ -342,13 +342,13 @@ 
 		$caps_to_check = self::maybe_add_full_access_caps( $caps_to_check );
 
 		foreach ( $caps_to_check as $cap ) {
-			if( ! is_null( $object_id ) ) {
+			if ( ! is_null( $object_id ) ) {
 				$has_cap = $user_id ? user_can( $user_id, $cap, $object_id ) : current_user_can( $cap, $object_id );
 			} else {
 				$has_cap = $user_id ? user_can( $user_id, $cap ) : current_user_can( $cap );
 			}
 			// At the first successful response, stop checking
-			if( $has_cap ) {
+			if ( $has_cap ) {
 				break;
 			}
 		}
@@ -372,15 +372,15 @@ 
 		$all_gravityview_caps = self::all_caps();
 
 		// Are there any $caps_to_check that are from GravityView?
-		if( $has_gravityview_caps = array_intersect( $caps_to_check, $all_gravityview_caps ) ) {
-			$caps_to_check[] = 'gravityview_full_access';
+		if ( $has_gravityview_caps = array_intersect( $caps_to_check, $all_gravityview_caps ) ) {
+			$caps_to_check[ ] = 'gravityview_full_access';
 		}
 
 		$all_gravity_forms_caps = class_exists( 'GFCommon' ) ? GFCommon::all_caps() : array();
 
 		// Are there any $caps_to_check that are from Gravity Forms?
-		if( $all_gravity_forms_caps = array_intersect( $caps_to_check, $all_gravity_forms_caps ) ) {
-			$caps_to_check[] = 'gform_full_access';
+		if ( $all_gravity_forms_caps = array_intersect( $caps_to_check, $all_gravity_forms_caps ) ) {
+			$caps_to_check[ ] = 'gform_full_access';
 		}
 
 		return array_unique( $caps_to_check );
@@ -402,7 +402,7 @@ 
 			$capabilities = self::all_caps();
 
 			// Loop through each role and remove GV caps_to_check
-			foreach( $wp_roles->get_names() as $role_slug => $role_name ) {
+			foreach ( $wp_roles->get_names() as $role_slug => $role_name ) {
 				foreach ( $capabilities as $cap ) {
 					$wp_roles->remove_cap( $role_slug, $cap );
 				}

includes/class-gvlogic-shortcode.php

Spacing +20 added lines, -20 removed lines

@@ -85,7 +85,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 		}
 
@@ -118,9 +118,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;
@@ -137,14 +137,14 @@ 
 	 */
 	function set_operation( $operation = '' ) {
 
-		if( empty( $operation ) ) {
+		if ( empty( $operation ) ) {
 			return false;
 		}
 
 		$operators = $this->get_operators( false );
 
-		if( !in_array( $operation, $operators ) ) {
-			do_action( 'gravityview_log_debug', __METHOD__ .' Attempted to add invalid operation type.', $operation );
+		if ( ! in_array( $operation, $operators ) ) {
+			do_action( 'gravityview_log_debug', __METHOD__ . ' Attempted to add invalid operation type.', $operation );
 			return false;
 		}
 
@@ -164,11 +164,11 @@ 
 	 */
 	function setup_operation_and_comparison() {
 
-		foreach( $this->atts as $key => $value ) {
+		foreach ( $this->atts as $key => $value ) {
 
 			$valid = $this->set_operation( $key );
 
-			if( $valid ) {
+			if ( $valid ) {
 				$this->comparison = $value;
 				return true;
 			}
@@ -198,16 +198,16 @@ 
 		$this->parse_atts();
 
 		// We need an "if"
-		if( false === $this->if ) {
-			do_action( 'gravityview_log_error', __METHOD__.' $atts->if is empty.', $this->atts );
+		if ( false === $this->if ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' $atts->if is empty.', $this->atts );
 			return null;
 		}
 
 		$setup = $this->setup_operation_and_comparison();
 
 		// We need an operation and comparison value
-		if( ! $setup ) {
-			do_action( 'gravityview_log_error', __METHOD__.' No valid operators were passed.', $this->atts );
+		if ( ! $setup ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' No valid operators were passed.', $this->atts );
 			return null;
 		}
 
@@ -238,7 +238,7 @@ 
 	 */
 	function get_output() {
 
-		if( $this->is_match ) {
+		if ( $this->is_match ) {
 			$output = $this->content;
 		} else {
 			$output = $this->else_content;
@@ -252,9 +252,9 @@ 
 		 * @param string $output HTML/text output
 		 * @param GVLogic_Shortcode $this This class
 		 */
-		$output = apply_filters('gravityview/gvlogic/output', $output, $this );
+		$output = apply_filters( 'gravityview/gvlogic/output', $output, $this );
 
-		do_action( 'gravityview_log_debug', __METHOD__ .' Output: ', $output );
+		do_action( 'gravityview_log_debug', __METHOD__ . ' Output: ', $output );
 
 		return $output;
 	}
@@ -270,11 +270,11 @@ 
 
 		$content = explode( '[else]', $this->passed_content );
 
-		$this->content = $content[0];
+		$this->content = $content[ 0 ];
 
-		$else_attr = isset( $this->atts['else'] ) ? $this->atts['else'] : NULL;
+		$else_attr = isset( $this->atts[ 'else' ] ) ? $this->atts[ 'else' ] : NULL;
 
-		$this->else_content = isset( $content[1] ) ? $content[1] : $else_attr;
+		$this->else_content = isset( $content[ 1 ] ) ? $content[ 1 ] : $else_attr;
 	}
 
 	/**
@@ -297,10 +297,10 @@ 
 		$this->atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( $this->passed_atts, $this->atts ) : $this->atts;
 
 		// Strip whitespace if it's not default false
-		$this->if = is_string( $this->atts['if'] ) ? trim( $this->atts['if'] ) : false;
+		$this->if = is_string( $this->atts[ 'if' ] ) ? trim( $this->atts[ 'if' ] ) : false;
 
 		// Make sure the "if" isn't processed in self::setup_operation_and_comparison()
-		unset( $this->atts['if'] );
+		unset( $this->atts[ 'if' ] );
 	}
 }
 

includes/class-gv-license-handler.php

Spacing +62 added lines, -62 removed lines

@@ -34,7 +34,7 @@ 
 	 * @return GV_License_Handler
 	 */
 	public static function get_instance( GravityView_Settings $GFAddOn ) {
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self( $GFAddOn );
 		}
 		return self::$instance;
@@ -60,37 +60,37 @@ 
 		$status = trim( $this->Addon->get_app_setting( 'license_key_status' ) );
 		$key = trim( $this->Addon->get_app_setting( 'license_key' ) );
 
-		if( !empty( $key ) ) {
+		if ( ! empty( $key ) ) {
 			$response = $this->Addon->get_app_setting( 'license_key_response' );
-			$response = is_array( $response ) ? (object) $response : json_decode( $response );
+			$response = is_array( $response ) ? (object)$response : json_decode( $response );
 		} else {
 			$response = array();
 		}
 
 		wp_localize_script( 'gv-admin-edd-license', 'GVGlobals', array(
 			'license_box' => $this->get_license_message( $response )
-		));
+		) );
 
 
 		$fields = array(
 			array(
 				'name'  => 'edd-activate',
-				'value' => __('Activate License', 'gravityview'),
-				'data-pending_text' => __('Verifying license…', 'gravityview'),
+				'value' => __( 'Activate License', 'gravityview' ),
+				'data-pending_text' => __( 'Verifying license…', 'gravityview' ),
 				'data-edd_action' => 'activate_license',
 				'class' => 'button-primary',
 			),
 			array(
 				'name'  => 'edd-deactivate',
-				'value' => __('Deactivate License', 'gravityview'),
-				'data-pending_text' => __('Deactivating license…', 'gravityview'),
+				'value' => __( 'Deactivate License', 'gravityview' ),
+				'data-pending_text' => __( 'Deactivating license…', 'gravityview' ),
 				'data-edd_action' => 'deactivate_license',
 				'class' => ( empty( $status ) ? 'button-primary hide' : 'button-primary' ),
 			),
 			array(
 				'name'  => 'edd-check',
-				'value' => __('Check License', 'gravityview'),
-				'data-pending_text' => __('Verifying license…', 'gravityview'),
+				'value' => __( 'Check License', 'gravityview' ),
+				'data-pending_text' => __( 'Verifying license…', 'gravityview' ),
 				'title' => 'Check the license before saving it',
 				'data-edd_action' => 'check_license',
 				'class' => 'button-secondary',
@@ -100,17 +100,17 @@ 
 
 		$class = 'button gv-edd-action';
 
-		$class .= ( !empty( $key ) && $status !== 'valid' ) ? '' : ' hide';
+		$class .= ( ! empty( $key ) && $status !== 'valid' ) ? '' : ' hide';
 
 		$disabled_attribute = GVCommon::has_cap( 'gravityview_edit_settings' ) ? false : 'disabled';
 
 		$submit = '<div class="gv-edd-button-wrapper">';
 		foreach ( $fields as $field ) {
-			$field['type'] = 'button';
-			$field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class;
-			$field['style'] = 'margin-left: 10px;';
-			if( $disabled_attribute ) {
-				$field['disabled'] = $disabled_attribute;
+			$field[ 'type' ] = 'button';
+			$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] . ' ' . $class : $class;
+			$field[ 'style' ] = 'margin-left: 10px;';
+			if ( $disabled_attribute ) {
+				$field[ 'disabled' ] = $disabled_attribute;
 			}
 			$submit .= $this->Addon->settings_submit( $field, $echo );
 		}
@@ -126,8 +126,8 @@ 
 	 */
 	private function setup_edd() {
 
-		if( !class_exists('EDD_SL_Plugin_Updater') ) {
-			require_once( GRAVITYVIEW_DIR . 'includes/lib/EDD_SL_Plugin_Updater.php');
+		if ( ! class_exists( 'EDD_SL_Plugin_Updater' ) ) {
+			require_once( GRAVITYVIEW_DIR . 'includes/lib/EDD_SL_Plugin_Updater.php' );
 		}
 
 		// setup the updater
@@ -163,8 +163,8 @@ 
 			'url'       => home_url(),
 		);
 
-		if( !empty( $action ) ) {
-			$settings['edd_action'] = esc_attr( $action );
+		if ( ! empty( $action ) ) {
+			$settings[ 'edd_action' ] = esc_attr( $action );
 		}
 
 		$settings = array_map( 'urlencode', $settings );
@@ -178,14 +178,14 @@ 
 	 */
 	private function _license_get_remote_response( $data, $license = '' ) {
 
-		$api_params = $this->_get_edd_settings( $data['edd_action'], $license );
+		$api_params = $this->_get_edd_settings( $data[ 'edd_action' ], $license );
 
 		$url = add_query_arg( $api_params, self::url );
 
 		$response = wp_remote_get( $url, array(
 			'timeout'   => 15,
 			'sslverify' => false,
-		));
+		) );
 
 		if ( is_wp_error( $response ) ) {
 			return array();
@@ -196,7 +196,7 @@ 
 		// Not JSON
 		if ( empty( $license_data ) ) {
 
-			delete_transient( 'gravityview_' . esc_attr( $data['field_id'] ) . '_valid' );
+			delete_transient( 'gravityview_' . esc_attr( $data[ 'field_id' ] ) . '_valid' );
 
 			// Change status
 			return array();
@@ -218,12 +218,12 @@ 
 	 */
 	function get_license_message( $license_data ) {
 
-		if( empty( $license_data ) ) {
+		if ( empty( $license_data ) ) {
 			$class = 'hide';
 			$message = '';
 		} else {
 
-			if( ! empty( $license_data->error ) ) {
+			if ( ! empty( $license_data->error ) ) {
 				$class = 'error';
 				$string_key = $license_data->license;
 			} else {
@@ -231,7 +231,7 @@ 
 				$string_key = $license_data->license;
 			}
 
-			$message = sprintf( '<p><strong>%s: %s</strong></p>', $this->strings('status'), $this->strings( $string_key, $license_data ) );
+			$message = sprintf( '<p><strong>%s: %s</strong></p>', $this->strings( 'status' ), $this->strings( $string_key, $license_data ) );
 		}
 
 		return $this->generate_license_box( $message, $class );
@@ -272,16 +272,16 @@ 
 	 */
 	public function license_call( $array = array() ) {
 
-		$is_ajax = ( defined('DOING_AJAX') && DOING_AJAX );
-		$data = empty( $array ) ? $_POST['data'] : $array;
+		$is_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX );
+		$data = empty( $array ) ? $_POST[ 'data' ] : $array;
 		$has_cap = GVCommon::has_cap( 'gravityview_edit_settings' );
 
-		if ( $is_ajax && empty( $data['license'] ) ) {
-			die( - 1 );
+		if ( $is_ajax && empty( $data[ 'license' ] ) ) {
+			die( -1 );
 		}
 
 		// If the user isn't allowed to edit settings, show an error message
-		if( ! $has_cap ) {
+		if ( ! $has_cap ) {
 			$license_data = new stdClass();
 			$license_data->error = 'capability';
 			$license_data->message = $this->get_license_message( $license_data );
@@ -304,9 +304,9 @@ 
 
 			$json = json_encode( $license_data );
 
-			$update_license = ( ! isset( $data['update'] ) || ! empty( $data['update'] ) );
+			$update_license = ( ! isset( $data[ 'update' ] ) || ! empty( $data[ 'update' ] ) );
 
-			$is_check_action_button = ( 'check_license' === $data['edd_action'] && defined( 'DOING_AJAX' ) && DOING_AJAX );
+			$is_check_action_button = ( 'check_license' === $data[ 'edd_action' ] && defined( 'DOING_AJAX' ) && DOING_AJAX );
 
 			// Failed is the response from trying to de-activate a license and it didn't work.
 			// This likely happened because people entered in a different key and clicked "Deactivate",
@@ -314,8 +314,8 @@ 
 			// most likely a mistake.
 			if ( $license_data->license !== 'failed' && ! $is_check_action_button && $update_license ) {
 
-				if ( ! empty( $data['field_id'] ) ) {
-					set_transient( 'gravityview_' . esc_attr( $data['field_id'] ) . '_valid', $license_data, DAY_IN_SECONDS );
+				if ( ! empty( $data[ 'field_id' ] ) ) {
+					set_transient( 'gravityview_' . esc_attr( $data[ 'field_id' ] ) . '_valid', $license_data, DAY_IN_SECONDS );
 				}
 
 				$this->license_call_update_settings( $license_data, $data );
@@ -326,7 +326,7 @@ 
 		if ( $is_ajax ) {
 			exit( $json );
 		} else { // Non-ajax call
-			return ( rgget('format', $data ) === 'object' ) ? $license_data : $json;
+			return ( rgget( 'format', $data ) === 'object' ) ? $license_data : $json;
 		}
 	}
 
@@ -340,9 +340,9 @@ 
 		// Update option with passed data license
 		$settings = $this->Addon->get_app_settings();
 
-        $settings['license_key'] = $license_data->license_key = trim( $data['license'] );
-		$settings['license_key_status'] = $license_data->license;
-		$settings['license_key_response'] = (array)$license_data;
+        $settings[ 'license_key' ] = $license_data->license_key = trim( $data[ 'license' ] );
+		$settings[ 'license_key_status' ] = $license_data->license;
+		$settings[ 'license_key_response' ] = (array)$license_data;
 
 		$this->Addon->update_app_settings( $settings );
 	}
@@ -354,7 +354,7 @@ 
 	 * @return string Renewal or account URL
 	 */
 	private function get_license_renewal_url( $license_data ) {
-		$renew_license_url = ( ! empty( $license_data ) && !empty( $license_data->license_key ) ) ? sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s&utm_source=admin_notice&utm_medium=admin&utm_content=expired&utm_campaign=Activation', $license_data->license_key ) : 'https://gravityview.co/account/';
+		$renew_license_url = ( ! empty( $license_data ) && ! empty( $license_data->license_key ) ) ? sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s&utm_source=admin_notice&utm_medium=admin&utm_content=expired&utm_campaign=Activation', $license_data->license_key ) : 'https://gravityview.co/account/';
 		return $renew_license_url;
 	}
 
@@ -368,30 +368,30 @@ 
 
 
 		$strings = array(
-			'status' => esc_html__('Status', 'gravityview'),
-			'error' => esc_html__('There was an error processing the request.', 'gravityview'),
-			'failed'  => esc_html__('Could not deactivate the license. The license key you attempted to deactivate may not be active or valid.', 'gravityview'),
-			'site_inactive' => esc_html__('The license key is valid, but it has not been activated for this site.', 'gravityview'),
-			'no_activations_left' => esc_html__('Invalid: this license has reached its activation limit.', 'gravityview') . ' ' . sprintf( esc_html__('You can manage license activations %son your GravityView account page%s.', 'gravityview'), '<a href="https://gravityview.co/account/#licenses">', '</a>' ),
-			'deactivated' => esc_html__('The license has been deactivated.', 'gravityview'),
-			'valid' => esc_html__('The license key is valid and active.', 'gravityview'),
-			'invalid' => esc_html__('The license key entered is invalid.', 'gravityview'),
-			'missing' => esc_html__('The license key was not defined.', 'gravityview'),
-			'revoked' => esc_html__('This license key has been revoked.', 'gravityview'),
-			'expired' => sprintf( esc_html__('This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview'), '<a href="'. esc_url( $this->get_license_renewal_url( $license_data ) ) .'">', '</a>' ),
+			'status' => esc_html__( 'Status', 'gravityview' ),
+			'error' => esc_html__( 'There was an error processing the request.', 'gravityview' ),
+			'failed'  => esc_html__( 'Could not deactivate the license. The license key you attempted to deactivate may not be active or valid.', 'gravityview' ),
+			'site_inactive' => esc_html__( 'The license key is valid, but it has not been activated for this site.', 'gravityview' ),
+			'no_activations_left' => esc_html__( 'Invalid: this license has reached its activation limit.', 'gravityview' ) . ' ' . sprintf( esc_html__( 'You can manage license activations %son your GravityView account page%s.', 'gravityview' ), '<a href="https://gravityview.co/account/#licenses">', '</a>' ),
+			'deactivated' => esc_html__( 'The license has been deactivated.', 'gravityview' ),
+			'valid' => esc_html__( 'The license key is valid and active.', 'gravityview' ),
+			'invalid' => esc_html__( 'The license key entered is invalid.', 'gravityview' ),
+			'missing' => esc_html__( 'The license key was not defined.', 'gravityview' ),
+			'revoked' => esc_html__( 'This license key has been revoked.', 'gravityview' ),
+			'expired' => sprintf( esc_html__( 'This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview' ), '<a href="' . esc_url( $this->get_license_renewal_url( $license_data ) ) . '">', '</a>' ),
 			'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ),
 
-			'verifying_license' => esc_html__('Verifying license&hellip;', 'gravityview'),
-			'activate_license' => esc_html__('Activate License', 'gravityview'),
-			'deactivate_license' => esc_html__('Deactivate License', 'gravityview'),
-			'check_license' => esc_html__('Verify License', 'gravityview'),
+			'verifying_license' => esc_html__( 'Verifying license&hellip;', 'gravityview' ),
+			'activate_license' => esc_html__( 'Activate License', 'gravityview' ),
+			'deactivate_license' => esc_html__( 'Deactivate License', 'gravityview' ),
+			'check_license' => esc_html__( 'Verify License', 'gravityview' ),
 		);
 
-		if( empty( $status ) ) {
+		if ( empty( $status ) ) {
 			return $strings;
 		}
 
-		if( isset( $strings[ $status ] ) ) {
+		if ( isset( $strings[ $status ] ) ) {
 			return $strings[ $status ];
 		}
 
@@ -401,19 +401,19 @@ 
 	public function validate_license_key( $value, $field ) {
 
 		// No license? No status.
-		if( empty( $value ) ) {
+		if ( empty( $value ) ) {
 			return NULL;
 		}
 
-		$response = $this->license_call(array(
+		$response = $this->license_call( array(
 			'license' => $this->Addon->get_app_setting( 'license_key' ),
 			'edd_action' => 'check_license',
-			'field_id' => $field['name'],
-		));
+			'field_id' => $field[ 'name' ],
+		) );
 
 		$response = is_string( $response ) ? json_decode( $response, true ) : $response;
 
-		switch( $response['license'] ) {
+		switch ( $response[ 'license' ] ) {
 			case 'valid':
 				$return = true;
 				break;