gravityview / GravityView

future/includes/class-gv-shortcode-gventry.php

Spacing +25 added lines, -25 removed lines

@@ -47,16 +47,16 @@ 
 		 */
 		$atts = apply_filters( 'gravityview/shortcodes/gventry/atts', $atts );
 
-		$view = \GV\View::by_id( $atts['view_id'] );
+		$view = \GV\View::by_id( $atts[ 'view_id' ] );
 
 		if ( ! $view ) {
-			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts['view_id'] ) );
+			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts[ 'view_id' ] ) );
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', null, null, $atts );
 		}
 
-		$entry_id = ! empty( $atts['entry_id'] ) ? $atts['entry_id'] : $atts['id'];
+		$entry_id = ! empty( $atts[ 'entry_id' ] ) ? $atts[ 'entry_id' ] : $atts[ 'id' ];
 
-		switch( $entry_id ):
+		switch ( $entry_id ):
 			case 'last':
 				if ( class_exists( '\GF_Query' ) ) {
 					/**
@@ -65,17 +65,17 @@ 
 					 * Since we're using \GF_Query shorthand initialization we have to reverse the order parameters here.
 					 */
 					add_filter( 'gravityview_get_entries', $filter = function( $parameters, $args, $form_id ) {
-						if ( ! empty( $parameters['sorting'] ) ) {
+						if ( ! empty( $parameters[ 'sorting' ] ) ) {
 							/**
 							 * Reverse existing sorts.
 							 */
-							$sort = &$parameters['sorting'];
-							$sort['direction'] = $sort['direction'] == 'RAND' ? : ( $sort['direction'] == 'ASC' ? 'DESC' : 'ASC' );
+							$sort = &$parameters[ 'sorting' ];
+							$sort[ 'direction' ] = $sort[ 'direction' ] == 'RAND' ?: ( $sort[ 'direction' ] == 'ASC' ? 'DESC' : 'ASC' );
 						} else {
 							/**
 							 * Otherwise, sort by date_created.
 							 */
-							$parameters['sorting'] = array(
+							$parameters[ 'sorting' ] = array(
 								'key' => 'id',
 								'direction' => 'ASC',
 								'is_numeric' => true
@@ -90,7 +90,7 @@ 
 
 					/** If a sort already exists, reverse it. */
 					if ( $sort = end( $entries->sorts ) ) {
-						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ? : ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
+						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ?: ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
 					} else {
 						/** Otherwise, sort by date_created */
 						$entries = $entries->sort( new \GV\Entry_Sort( \GV\Internal_Field::by_id( 'id' ), \GV\Entry_Sort::ASC ), \GV\Entry_Sort::NUMERIC );
@@ -108,12 +108,12 @@ 
 				break;
 			default:
 				if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) {
-					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts['view_id'] ) );
+					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts[ 'view_id' ] ) );
 					return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, null, $atts );
 				}
 		endswitch;
 
-		if ( $view->form->ID != $entry['form_id'] ) {
+		if ( $view->form->ID != $entry[ 'form_id' ] ) {
 			gravityview()->log->error( 'Entry does not belong to view (form mismatch)' );
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
 		}
@@ -123,7 +123,7 @@ 
 			return apply_filters( 'gravityview/shortcodes/gventry/output', get_the_password_form( $view->ID ), $view, $entry, $atts );
 		}
 
-		if ( ! $view->form  ) {
+		if ( ! $view->form ) {
 			gravityview()->log->notice( 'View #{id} has no form attached to it.', array( 'id' => $view->ID ) );
 
 			/**
@@ -146,50 +146,50 @@ 
 		}
 
 		/** Unapproved entries. */
-		if ( $entry['status'] != 'active' ) {
+		if ( $entry[ 'status' ] != 'active' ) {
 			gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
 		}
 
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
 		if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 				return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
 			}
 		}
 
 		if ( \GV\Utils::get( $_GET, 'edit' ) && \GV\Utils::get( $_GET, 'gvid' ) ) {
-			$atts['edit'] = 1;
+			$atts[ 'edit' ] = 1;
 		}
 
-		if ( $atts['edit'] ) {
+		if ( $atts[ 'edit' ] ) {
 			/**
 			 * Based on code in our unit-tests.
 			 * Mocks old context, etc.
 			 */
 			$loader = \GravityView_Edit_Entry::getInstance();
-			$render = $loader->instances['render'];
+			$render = $loader->instances[ 'render' ];
 
 			add_filter( 'gravityview/is_single_entry', '__return_true' );
 
-			$form = \GFAPI::get_form( $entry['form_id'] );
+			$form = \GFAPI::get_form( $entry[ 'form_id' ] );
 
 			$data = \GravityView_View_Data::getInstance( $view );
 			$template = \GravityView_View::getInstance( array(
 				'form' => $form,
-				'form_id' => $form['id'],
+				'form_id' => $form[ 'id' ],
 				'view_id' => $view->ID,
 				'entries' => array( $entry ),
 				'atts' => \GVCommon::get_template_settings( $view->ID ),
 			) );
 
-			$_GET['edit'] = wp_create_nonce(
-				\GravityView_Edit_Entry::get_nonce_key( $view->ID, $form['id'], $entry['id'] )
+			$_GET[ 'edit' ] = wp_create_nonce(
+				\GravityView_Edit_Entry::get_nonce_key( $view->ID, $form[ 'id' ], $entry[ 'id' ] )
 			);
 
-			add_filter( 'gravityview/edit_entry/success', $callback = function ( $message, $_view_id, $_entry, $back_link, $redirect_url ) use ( $view, $entry, $atts ) {
+			add_filter( 'gravityview/edit_entry/success', $callback = function( $message, $_view_id, $_entry, $back_link, $redirect_url ) use ( $view, $entry, $atts ) {
 				/**
 				 * @filter `gravityview/shortcodes/gventry/edit/success` Modify the edit entry success message in [gventry].
 				 *
@@ -205,7 +205,7 @@ 
 				return apply_filters( 'gravityview/shortcodes/gventry/edit/success', $message, $view, $entry, $atts, $back_link, $redirect_url );
 			}, 10, 5 );
 
-			ob_start() && $render->init( $data, \GV\GF_Entry::by_id( $entry['id'] ), $view );
+			ob_start() && $render->init( $data, \GV\GF_Entry::by_id( $entry[ 'id' ] ), $view );
 			$output = ob_get_clean(); // Render :)
 
 			remove_filter( 'gravityview/is_single_entry', '__return_true' );
@@ -217,7 +217,7 @@ 
 			$renderer = new \GV\Entry_Renderer();
 
 			$request = new \GV\Mock_Request();
-			$request->returns['is_entry'] = $entry;
+			$request->returns[ 'is_entry' ] = $entry;
 
 			$output = $renderer->render( $entry, $view, $request );
 

includes/extensions/edit-entry/class-edit-entry.php

Spacing +21 added lines, -21 removed lines

@@ -36,7 +36,7 @@ 
 
         self::$file = plugin_dir_path( __FILE__ );
 
-        if( is_admin() ) {
+        if ( is_admin() ) {
             $this->load_components( 'admin' );
         }
 
@@ -56,7 +56,7 @@ 
 
     static function getInstance() {
 
-        if( empty( self::$instance ) ) {
+        if ( empty( self::$instance ) ) {
             self::$instance = new GravityView_Edit_Entry;
         }
 
@@ -82,10 +82,10 @@ 
     private function add_hooks() {
 
         // Add front-end access to Gravity Forms delete file action
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( $this, 'delete_file') );
+        add_action( 'wp_ajax_nopriv_rg_delete_file', array( $this, 'delete_file' ) );
 
         // Make sure this hook is run for non-admins
-        add_action( 'wp_ajax_rg_delete_file', array( $this, 'delete_file') );
+        add_action( 'wp_ajax_rg_delete_file', array( $this, 'delete_file' ) );
 
         add_filter( 'gravityview_blocklist_field_types', array( $this, 'modify_field_blocklist' ), 10, 2 );
 
@@ -108,7 +108,7 @@ 
 	 */
 	public function add_reserved_arg( $args ) {
 
-		$args[] = 'edit';
+		$args[ ] = 'edit';
 
 		return $args;
 	}
@@ -119,8 +119,8 @@ 
 	 */
 	private function addon_specific_hooks() {
 
-		if( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
-			add_filter('gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script'));
+		if ( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
+			add_filter( 'gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script' ) );
 		}
 
 	}
@@ -207,9 +207,9 @@ 
      */
     public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
 
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
+        $nonce_key = self::get_nonce_key( $view_id, $entry[ 'form_id' ], $entry[ 'id' ] );
 
-        $base = gv_entry_link( $entry, $post_id ? : $view_id  );
+        $base = gv_entry_link( $entry, $post_id ?: $view_id );
 
         $url = add_query_arg( array(
             'edit' => wp_create_nonce( $nonce_key )
@@ -223,9 +223,9 @@ 
 	     * Allow passing params to dynamically populate entry with values
 	     * @since 1.9.2
 	     */
-	    if( !empty( $field_values ) ) {
+	    if ( ! empty( $field_values ) ) {
 
-		    if( is_array( $field_values ) ) {
+		    if ( is_array( $field_values ) ) {
 			    // If already an array, no parse_str() needed
 			    $params = $field_values;
 		    } else {
@@ -273,7 +273,7 @@ 
 	 */
 	public function modify_field_blocklist( $fields = array(), $context = NULL ) {
 
-		if( empty( $context ) || $context !== 'edit' ) {
+		if ( empty( $context ) || $context !== 'edit' ) {
 			return $fields;
 		}
 
@@ -370,15 +370,15 @@ 
         // If they can edit any entries (as defined in Gravity Forms)
         // Or if they can edit other people's entries
         // Then we're good.
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
+        if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry[ 'id' ] ) ) {
 
             gravityview()->log->debug( 'User has ability to edit all entries.' );
 
             $user_can_edit = true;
 
-        } else if( !isset( $entry['created_by'] ) ) {
+        } else if ( ! isset( $entry[ 'created_by' ] ) ) {
 
-            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
+            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
 
             $user_can_edit = false;
 
@@ -387,7 +387,7 @@ 
             $current_user = wp_get_current_user();
 
             // User edit is disabled
-            if( empty( $user_edit ) ) {
+            if ( empty( $user_edit ) ) {
 
                 gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
 
@@ -395,13 +395,13 @@ 
             }
 
             // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
+            else if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
 
                 gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
 
                 $user_can_edit = true;
 
-            } else if( ! is_user_logged_in() ) {
+            } else if ( ! is_user_logged_in() ) {
 
                 gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
 
@@ -419,7 +419,7 @@ 
          */
         $user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
 
-        return (bool) $user_can_edit;
+        return (bool)$user_can_edit;
     }
 
 	/**
@@ -430,8 +430,8 @@ 
 	 * @uses   GFForms::delete_file()
 	 */
 	public function delete_file() {
-		add_filter( 'user_has_cap', function ( $caps ) {
-			$caps['gravityforms_delete_entries'] = true;
+		add_filter( 'user_has_cap', function( $caps ) {
+			$caps[ 'gravityforms_delete_entries' ] = true;
 
 			return $caps;
 

includes/extensions/edit-entry/class-edit-entry-render.php

Spacing +241 added lines, -241 removed lines

@@ -135,7 +135,7 @@ 
 	function load() {
 
 		/** @define "GRAVITYVIEW_DIR" "../../../" */
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
 
 		// Don't display an embedded form when editing an entry
 		add_action( 'wp_head', array( $this, 'prevent_render_form' ) );
@@ -145,7 +145,7 @@ 
 		add_action( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 );
 		add_action( 'admin_init', array( $this, 'prevent_maybe_process_form' ), 8 );
 
-		add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') );
+		add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) );
 
 		add_action( 'gravityview_edit_entry', array( $this, 'init' ), 10, 4 );
 
@@ -156,7 +156,7 @@ 
 		add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 );
 
 		// Add fields expected by GFFormDisplay::validate()
-		add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') );
+		add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) );
 
 		// Fix multiselect value for GF 2.2
 		add_filter( 'gravityview/edit_entry/field_value_multiselect', array( $this, 'fix_multiselect_value_serialization' ), 10, 3 );
@@ -173,8 +173,8 @@ 
 	 * @return void
 	 */
 	public function prevent_render_form() {
-		if( $this->is_edit_entry() ) {
-			if( 'wp_head' === current_filter() ) {
+		if ( $this->is_edit_entry() ) {
+			if ( 'wp_head' === current_filter() ) {
 				add_filter( 'gform_shortcode_form', '__return_empty_string' );
 			} else {
 				remove_filter( 'gform_shortcode_form', '__return_empty_string' );
@@ -189,17 +189,17 @@ 
 	 */
 	public function prevent_maybe_process_form() {
 
-	    if( ! $this->is_edit_entry_submission() ) {
+	    if ( ! $this->is_edit_entry_submission() ) {
 			return;
 		}
 
 		gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] Removing GFForms::maybe_process_form() action.' );
 
-		remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
-		remove_action( 'wp',  array( 'GFForms', 'maybe_process_form'), 9 );
+		remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 );
+		remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 );
 
-		remove_action( 'admin_init',  array( 'GFForms', 'maybe_process_form'), 9 );
-		remove_action( 'admin_init',  array( 'RGForms', 'maybe_process_form'), 9 );
+		remove_action( 'admin_init', array( 'GFForms', 'maybe_process_form' ), 9 );
+		remove_action( 'admin_init', array( 'RGForms', 'maybe_process_form' ), 9 );
 	}
 
 	/**
@@ -210,7 +210,7 @@ 
 
 		$is_edit_entry =
 			( GravityView_frontend::is_single_entry() || gravityview()->request->is_entry() )
-			&& ( ! empty( $_GET['edit'] ) );
+			&& ( ! empty( $_GET[ 'edit' ] ) );
 
 		return ( $is_edit_entry || $this->is_edit_entry_submission() );
 	}
@@ -221,7 +221,7 @@ 
 	 * @return boolean
 	 */
 	public function is_edit_entry_submission() {
-		return !empty( $_POST[ self::$nonce_field ] );
+		return ! empty( $_POST[ self::$nonce_field ] );
 	}
 
 	/**
@@ -243,20 +243,20 @@ 
 		} else {
 			$gravityview_view     = GravityView_View::getInstance();
 			$entries              = $gravityview_view->getEntries();
-			self::$original_entry = $entries[0];
-			$this->entry          = $entries[0];
+			self::$original_entry = $entries[ 0 ];
+			$this->entry          = $entries[ 0 ];
 		}
 
-		self::$original_form = GFAPI::get_form( $this->entry['form_id'] );
+		self::$original_form = GFAPI::get_form( $this->entry[ 'form_id' ] );
 		$this->form          = self::$original_form;
 
-		$this->form_id = $this->entry['form_id'];
+		$this->form_id = $this->entry[ 'form_id' ];
 
 		$this->view_id = $view ? $view->ID : $gravityview_view->getViewId();
 
 		$this->post_id = \GV\Utils::get( $post, 'ID', null );
 
-		self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] );
+		self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] );
 	}
 
 	/**
@@ -318,7 +318,7 @@ 
 	private function print_scripts() {
 		$gravityview_view = GravityView_View::getInstance();
 
-		wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
+		wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
 
 		GFFormDisplay::enqueue_form_scripts( $this->form ? $this->form : $gravityview_view->getForm(), false );
 
@@ -339,19 +339,19 @@ 
 	 */
 	private function process_save( $gv_data ) {
 
-		if ( empty( $_POST ) || ! isset( $_POST['lid'] ) ) {
+		if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) {
 			return;
 		}
 
 		// Make sure the entry, view, and form IDs are all correct
 		$valid = $this->verify_nonce();
 
-		if ( !$valid ) {
+		if ( ! $valid ) {
 			gravityview()->log->error( 'Nonce validation failed.' );
 			return;
 		}
 
-		if ( $this->entry['id'] !== $_POST['lid'] ) {
+		if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) {
 			gravityview()->log->error( 'Entry ID did not match posted entry ID.' );
 			return;
 		}
@@ -362,7 +362,7 @@ 
 
 		$this->validate();
 
-		if( $this->is_valid ) {
+		if ( $this->is_valid ) {
 
 			gravityview()->log->debug( 'Submission is valid.' );
 
@@ -374,15 +374,15 @@ 
 			/**
 			 * @hack to avoid the capability validation of the method save_lead for GF 1.9+
 			 */
-			unset( $_GET['page'] );
+			unset( $_GET[ 'page' ] );
 
-			$date_created = $this->entry['date_created'];
+			$date_created = $this->entry[ 'date_created' ];
 
 			/**
 			 * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead()
 			 * @since 1.17.2
 			 */
-			unset( $this->entry['date_created'] );
+			unset( $this->entry[ 'date_created' ] );
 
 			/**
 			 * @action `gravityview/edit_entry/before_update` Perform an action before the entry has been updated using Edit Entry
@@ -392,14 +392,14 @@ 
 			 * @param GravityView_Edit_Entry_Render $this This object
 			 * @param GravityView_View_Data $gv_data The View data
 			 */
-			do_action( 'gravityview/edit_entry/before_update', $form, $this->entry['id'], $this, $gv_data );
+			do_action( 'gravityview/edit_entry/before_update', $form, $this->entry[ 'id' ], $this, $gv_data );
 
 			GFFormsModel::save_lead( $form, $this->entry );
 
 	        // Delete the values for hidden inputs
 	        $this->unset_hidden_field_values();
 
-			$this->entry['date_created'] = $date_created;
+			$this->entry[ 'date_created' ] = $date_created;
 
 			// Process calculation fields
 			$this->update_calculation_fields();
@@ -424,7 +424,7 @@ 
 			 * @param GravityView_Edit_Entry_Render $this This object
 			 * @param GravityView_View_Data $gv_data The View data
 			 */
-			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this, $gv_data );
+			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this, $gv_data );
 
 		} else {
 			gravityview()->log->error( 'Submission is NOT valid.', array( 'entry' => $this->entry ) );
@@ -460,10 +460,10 @@ 
 
 		if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
 			$entry_meta_table = GFFormsModel::get_entry_meta_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry[ 'id' ] ) );
 		} else {
 			$lead_detail_table = GFFormsModel::get_lead_details_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) );
 		}
 
 	    foreach ( $this->entry as $input_id => $field_value ) {
@@ -481,11 +481,11 @@ 
 
 				$empty_value = $field->get_value_save_entry(
 					is_array( $field->get_entry_inputs() ) ? array() : '',
-					$this->form, '', $this->entry['id'], $this->entry
+					$this->form, '', $this->entry[ 'id' ], $this->entry
 				);
 
 				if ( $field->has_calculation() ) {
-					$this->unset_hidden_calculations[] = $field->id; // Unset
+					$this->unset_hidden_calculations[ ] = $field->id; // Unset
 					$empty_value = '';
 				}
 
@@ -514,7 +514,7 @@ 
 	private function preset_approval_fields() {
 		$has_approved_field = false;
 
-		foreach ( self::$original_form['fields'] as $field ) {
+		foreach ( self::$original_form[ 'fields' ] as $field ) {
 			if ( $field->gravityview_approved ) {
 				$has_approved_field = true;
 				break;
@@ -527,7 +527,7 @@ 
 
 		$is_field_hidden = true;
 
-		foreach ( $this->form['fields'] as $field ) {
+		foreach ( $this->form[ 'fields' ] as $field ) {
 			if ( $field->gravityview_approved ) {
 				$is_field_hidden = false;
 				break;
@@ -552,7 +552,7 @@ 
 
 		remove_filter( 'gravityview/approve_entries/update_unapproved_meta', array( $this, 'prevent_update_unapproved_meta' ), 9 );
 
-		if ( ! $value = gform_get_meta( $entry['id'], 'is_approved' ) ) {
+		if ( ! $value = gform_get_meta( $entry[ 'id' ], 'is_approved' ) ) {
 
 			$value = GravityView_Entry_Approval_Status::UNAPPROVED;
 
@@ -617,7 +617,7 @@ 
 		}
 
 		/** No file is being uploaded. */
-		if ( empty( $_FILES[ $input_name ]['name'] ) ) {
+		if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) {
 			/** So return the original upload, with $value as backup (it can be empty during edit form rendering) */
 			return rgar( $entry, $input_id, $value );
 		}
@@ -635,11 +635,11 @@ 
 	 * @return mixed
 	 */
 	public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
-		if( ! $this->is_edit_entry() ) {
+		if ( ! $this->is_edit_entry() ) {
 			return $plupload_init;
 		}
 
-		$plupload_init['gf_vars']['max_files'] = 0;
+		$plupload_init[ 'gf_vars' ][ 'max_files' ] = 0;
 
 		return $plupload_init;
 	}
@@ -654,26 +654,26 @@ 
 		$form = $this->filter_conditional_logic( $this->form );
 
 	    /** @type GF_Field $field */
-		foreach( $form['fields'] as $k => &$field ) {
+		foreach ( $form[ 'fields' ] as $k => &$field ) {
 
 			/**
 			 * Remove the fields with calculation formulas before save to avoid conflicts with GF logic
 			 * @since 1.16.3
 			 */
-			if( $field->has_calculation() ) {
-				unset( $form['fields'][ $k ] );
+			if ( $field->has_calculation() ) {
+				unset( $form[ 'fields' ][ $k ] );
 			}
 
 			$field->adminOnly = false;
 
-			if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
-				foreach( $field->inputs as $key => $input ) {
-				    $field->inputs[ $key ][ 'id' ] = (string)$input['id'];
+			if ( isset( $field->inputs ) && is_array( $field->inputs ) ) {
+				foreach ( $field->inputs as $key => $input ) {
+				    $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ];
 				}
 			}
 		}
 
-		$form['fields'] = array_values( $form['fields'] );
+		$form[ 'fields' ] = array_values( $form[ 'fields' ] );
 
 		return $form;
 	}
@@ -685,14 +685,14 @@ 
 		$update = false;
 
 		// get the most up to date entry values
-		$entry = GFAPI::get_entry( $this->entry['id'] );
+		$entry = GFAPI::get_entry( $this->entry[ 'id' ] );
 
 		if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
 			$entry_meta_table = GFFormsModel::get_entry_meta_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry[ 'id' ] ) );
 		} else {
 			$lead_detail_table = GFFormsModel::get_lead_details_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry[ 'id' ] ) );
 		}
 
 
@@ -709,24 +709,24 @@ 
 				$inputs = $field->get_entry_inputs();
 				if ( is_array( $inputs ) ) {
 				    foreach ( $inputs as $input ) {
-						list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 );
+						list( $field_id, $input_id ) = rgexplode( '.', $input[ 'id' ], 2 );
 
 						if ( 'product' === $field->type ) {
-							$input_name = 'input_' . str_replace( '.', '_', $input['id'] );
+							$input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] );
 
 							// Only allow quantity to be set if it's allowed to be edited
 							if ( in_array( $field_id, $allowed_fields ) && $input_id == 3 ) {
 							} else { // otherwise set to what it previously was
-								$_POST[ $input_name ] = $entry[ $input['id'] ];
+								$_POST[ $input_name ] = $entry[ $input[ 'id' ] ];
 							}
 						} else {
 							// Set to what it previously was if it's not editable
 							if ( ! in_array( $field_id, $allowed_fields ) ) {
-								$_POST[ $input_name ] = $entry[ $input['id'] ];
+								$_POST[ $input_name ] = $entry[ $input[ 'id' ] ];
 							}
 						}
 
-						GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] );
+						GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input[ 'id' ] );
 				    }
 				} else {
 					// Set to what it previously was if it's not editable
@@ -766,19 +766,19 @@ 
 
 		$input_name = 'input_' . $field_id;
 
-		if ( !empty( $_FILES[ $input_name ]['name'] ) ) {
+		if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) {
 
 			// We have a new image
 
-			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] );
+			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] );
 
 			$ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
 	        $ary = stripslashes_deep( $ary );
 			$img_url = \GV\Utils::get( $ary, 0 );
 
-			$img_title       = count( $ary ) > 1 ? $ary[1] : '';
-			$img_caption     = count( $ary ) > 2 ? $ary[2] : '';
-			$img_description = count( $ary ) > 3 ? $ary[3] : '';
+			$img_title       = count( $ary ) > 1 ? $ary[ 1 ] : '';
+			$img_caption     = count( $ary ) > 2 ? $ary[ 2 ] : '';
+			$img_description = count( $ary ) > 3 ? $ary[ 3 ] : '';
 
 			$image_meta = array(
 				'post_excerpt' => $img_caption,
@@ -787,7 +787,7 @@ 
 
 			//adding title only if it is not empty. It will default to the file name if it is not in the array
 			if ( ! empty( $img_title ) ) {
-				$image_meta['post_title'] = $img_title;
+				$image_meta[ 'post_title' ] = $img_title;
 			}
 
 			/**
@@ -845,15 +845,15 @@ 
 	 */
 	private function maybe_update_post_fields( $form ) {
 
-		if( empty( $this->entry['post_id'] ) ) {
+		if ( empty( $this->entry[ 'post_id' ] ) ) {
 	        gravityview()->log->debug( 'This entry has no post fields. Continuing...' );
 			return;
 		}
 
-		$post_id = $this->entry['post_id'];
+		$post_id = $this->entry[ 'post_id' ];
 
 		// Security check
-		if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
+		if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
 			gravityview()->log->error( 'The current user does not have the ability to edit Post #{post_id}', array( 'post_id' => $post_id ) );
 			return;
 		}
@@ -866,25 +866,25 @@ 
 
 			$field = RGFormsModel::get_field( $form, $field_id );
 
-			if( ! $field ) {
+			if ( ! $field ) {
 				continue;
 			}
 
-			if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) {
+			if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) {
 
 				// Get the value of the field, including $_POSTed value
 				$value = RGFormsModel::get_field_value( $field );
 
 				// Use temporary entry variable, to make values available to fill_post_template() and update_post_image()
 				$entry_tmp = $this->entry;
-				$entry_tmp["{$field_id}"] = $value;
+				$entry_tmp[ "{$field_id}" ] = $value;
 
-				switch( $field->type ) {
+				switch ( $field->type ) {
 
 				    case 'post_title':
 				        $post_title = $value;
 				        if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) {
-				            $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
+				            $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp );
 				        }
 				        $updated_post->post_title = $post_title;
 				        $updated_post->post_name  = $post_title;
@@ -894,7 +894,7 @@ 
 				    case 'post_content':
 				        $post_content = $value;
 				        if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) {
-				            $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
+				            $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true );
 				        }
 				        $updated_post->post_content = $post_content;
 				        unset( $post_content );
@@ -912,11 +912,11 @@ 
 							$value = $value[ $field_id ];
 						}
 
-				        if( ! empty( $field->customFieldTemplateEnabled ) ) {
+				        if ( ! empty( $field->customFieldTemplateEnabled ) ) {
 				            $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
 				        }
 
-						$value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry );
+						$value = $field->get_value_save_entry( $value, $form, '', $this->entry[ 'id' ], $this->entry );
 
 				        update_post_meta( $post_id, $field->postCustomFieldName, $value );
 				        break;
@@ -928,7 +928,7 @@ 
 				}
 
 				// update entry after
-				$this->entry["{$field_id}"] = $value;
+				$this->entry[ "{$field_id}" ] = $value;
 
 				$update_entry = true;
 
@@ -937,11 +937,11 @@ 
 
 		}
 
-		if( $update_entry ) {
+		if ( $update_entry ) {
 
 			$return_entry = GFAPI::update_entry( $this->entry );
 
-			if( is_wp_error( $return_entry ) ) {
+			if ( is_wp_error( $return_entry ) ) {
 				gravityview()->log->error( 'Updating the entry post fields failed', array( 'data' => array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) ) );
 			} else {
 				gravityview()->log->debug( 'Updating the entry post fields for post #{post_id} succeeded', array( 'post_id' => $post_id ) );
@@ -951,7 +951,7 @@ 
 
 		$return_post = wp_update_post( $updated_post, true );
 
-		if( is_wp_error( $return_post ) ) {
+		if ( is_wp_error( $return_post ) ) {
 			$return_post->add_data( $updated_post, '$updated_post' );
 			gravityview()->log->error( 'Updating the post content failed', array( 'data' => compact( 'updated_post', 'return_post' ) ) );
 		} else {
@@ -985,7 +985,7 @@ 
 		$output = GFCommon::replace_variables( $output, $form, $entry, false, false, false );
 
 		// replace conditional shortcodes
-		if( $do_shortcode ) {
+		if ( $do_shortcode ) {
 			$output = do_shortcode( $output );
 		}
 
@@ -1004,19 +1004,19 @@ 
 	 */
 	private function after_update() {
 
-		do_action( 'gform_after_update_entry', self::$original_form, $this->entry['id'], self::$original_entry );
-		do_action( "gform_after_update_entry_{$this->form['id']}", self::$original_form, $this->entry['id'], self::$original_entry );
+		do_action( 'gform_after_update_entry', self::$original_form, $this->entry[ 'id' ], self::$original_entry );
+		do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", self::$original_form, $this->entry[ 'id' ], self::$original_entry );
 
 		// Re-define the entry now that we've updated it.
-		$entry = RGFormsModel::get_lead( $this->entry['id'] );
+		$entry = RGFormsModel::get_lead( $this->entry[ 'id' ] );
 
 		$entry = GFFormsModel::set_entry_meta( $entry, self::$original_form );
 
 		if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '<' ) ) {
 			// We need to clear the cache because Gravity Forms caches the field values, which
 			// we have just updated.
-			foreach ($this->form['fields'] as $key => $field) {
-				GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id );
+			foreach ( $this->form[ 'fields' ] as $key => $field ) {
+				GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id );
 			}
 		}
 
@@ -1026,11 +1026,11 @@ 
 		 * @since develop
 		 */
 		if ( $allowed_feeds = $this->view->settings->get( 'edit_feeds', array() ) ) {
-			$feeds = GFAPI::get_feeds( null, $entry['form_id'] );
+			$feeds = GFAPI::get_feeds( null, $entry[ 'form_id' ] );
 			if ( ! is_wp_error( $feeds ) ) {
 				$registered_feeds = array();
 				foreach ( GFAddOn::get_registered_addons() as $registered_feed ) {
-					if ( is_subclass_of( $registered_feed,  'GFFeedAddOn' ) ) {
+					if ( is_subclass_of( $registered_feed, 'GFFeedAddOn' ) ) {
 						if ( method_exists( $registered_feed, 'get_instance' ) ) {
 							$registered_feed = call_user_func( array( $registered_feed, 'get_instance' ) );
 							$registered_feeds[ $registered_feed->get_slug() ] = $registered_feed;
@@ -1038,8 +1038,8 @@ 
 					}
 				}
 				foreach ( $feeds as $feed ) {
-					if ( in_array( $feed['id'], $allowed_feeds ) ) {
-						if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed['addon_slug'] ) ) {
+					if ( in_array( $feed[ 'id' ], $allowed_feeds ) ) {
+						if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed[ 'addon_slug' ] ) ) {
 							$returned_entry = $feed_object->process_feed( $feed, $entry, self::$original_form );
 							if ( is_array( $returned_entry ) && rgar( $returned_entry, 'id' ) ) {
 								$entry = $returned_entry;
@@ -1067,9 +1067,9 @@ 
 
 		$view = \GV\View::by_id( $this->view_id );
 
-		if( $view->settings->get( 'edit_locking' ) ) {
+		if ( $view->settings->get( 'edit_locking' ) ) {
 			$locking = new GravityView_Edit_Entry_Locking();
-			$locking->maybe_lock_object( $this->entry['id'] );
+			$locking->maybe_lock_object( $this->entry[ 'id' ] );
 		}
 
 		?>
@@ -1082,7 +1082,7 @@ 
 
 		<div class="gv-edit-entry-wrapper"><?php
 
-			$javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this );
+			$javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this );
 
 			/**
 			 * Fixes weird wpautop() issue
@@ -1098,7 +1098,7 @@ 
 				     * @param string $edit_entry_title Modify the "Edit Entry" title
 				     * @param GravityView_Edit_Entry_Render $this This object
 				     */
-				    $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
+				    $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this );
 
 				    echo esc_attr( $edit_entry_title );
 			?></span>
@@ -1175,18 +1175,18 @@ 
 			*/
 			$labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id );
 
-			$this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels['submit'];
+			$this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels[ 'submit' ];
 		}
 
 		$back_link = remove_query_arg( array( 'page', 'view', 'edit', 'gvid' ) );
 
-		if( ! $this->is_valid ){
+		if ( ! $this->is_valid ) {
 
 			// Keeping this compatible with Gravity Forms.
-			$validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>";
-			$message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form);
+			$validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>";
+			$message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form );
 
-			echo GVCommon::generate_notice( $message , 'gv-error' );
+			echo GVCommon::generate_notice( $message, 'gv-error' );
 
 		} elseif ( false === $this->is_paged_submitted ) {
 			// Paged form that hasn't been submitted on the last page yet
@@ -1199,7 +1199,7 @@ 
 			 * @param int $view_id View ID
 			 * @param array $entry Gravity Forms entry array
 			 */
-			$message = apply_filters( 'gravityview/edit_entry/page/success', $entry_updated_message , $this->view_id, $this->entry );
+			$message = apply_filters( 'gravityview/edit_entry/page/success', $entry_updated_message, $this->view_id, $this->entry );
 
 			echo GVCommon::generate_notice( $message );
 		} else {
@@ -1211,23 +1211,23 @@ 
 
 				case '0':
 					$redirect_url = $back_link;
-					$entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' );
+					$entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', '</a>' );
 					break;
 
 				case '1':
 					$redirect_url = $directory_link = GravityView_API::directory_link();
-					$entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' );
+					$entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' );
 					break;
 
 				case '2':
 					$redirect_url = $edit_redirect_url;
 					$redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' );
-					$entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' );
+					$entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' );
 					break;
 
 				case '':
 				default:
-					$entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' );
+					$entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . esc_url( $back_link ) . '">', '</a>' );
 					break;
 			}
 
@@ -1268,8 +1268,8 @@ 
 		 */
 		do_action( 'gravityview/edit-entry/render/before', $this );
 
-		add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 );
-		add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') );
+		add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 );
+		add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
 		add_filter( 'gform_next_button', array( $this, 'render_form_buttons' ) );
 		add_filter( 'gform_previous_button', array( $this, 'render_form_buttons' ) );
 		add_filter( 'gform_disable_view_counter', '__return_true' );
@@ -1278,14 +1278,14 @@ 
 		add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 );
 
 		// We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
-		unset( $_GET['page'] );
+		unset( $_GET[ 'page' ] );
 
 		$this->show_next_button = false;
 		$this->show_previous_button = false;
 
 		// TODO: Verify multiple-page forms
 		if ( GFCommon::has_pages( $this->form ) && apply_filters( 'gravityview/features/paged-edit', false ) ) {
-			if ( intval( $page_number = \GV\Utils::_POST( 'gform_source_page_number_' . $this->form['id'], 0 ) ) ) {
+			if ( intval( $page_number = \GV\Utils::_POST( 'gform_source_page_number_' . $this->form[ 'id' ], 0 ) ) ) {
 
 				$labels = array(
 					'cancel'   => __( 'Cancel', 'gravityview' ),
@@ -1304,20 +1304,20 @@ 
 				*/
 				$labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id );
 
-				GFFormDisplay::$submission[ $this->form['id'] ][ 'form' ] = $this->form;
-				GFFormDisplay::$submission[ $this->form['id'] ][ 'is_valid' ] = true;
+				GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'form' ] = $this->form;
+				GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'is_valid' ] = true;
 
-				if ( \GV\Utils::_POST( 'save' ) === $labels['next'] ) {
+				if ( \GV\Utils::_POST( 'save' ) === $labels[ 'next' ] ) {
 					$last_page = \GFFormDisplay::get_max_page_number( $this->form );
 
 					while ( ++$page_number < $last_page && RGFormsModel::is_page_hidden( $this->form, $page_number, \GV\Utils::_POST( 'gform_field_values' ) ) ) {
 					} // Advance to next visible page
-				} elseif ( \GV\Utils::_POST( 'save' ) === $labels['previous'] ) {
+				} elseif ( \GV\Utils::_POST( 'save' ) === $labels[ 'previous' ] ) {
 					while ( --$page_number > 1 && RGFormsModel::is_page_hidden( $this->form, $page_number, \GV\Utils::_POST( 'gform_field_values' ) ) ) {
 					} // Advance to next visible page
 				}
 
-				GFFormDisplay::$submission[ $this->form['id'] ]['page_number'] = $page_number;
+				GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'page_number' ] = $page_number;
 			}
 
 			if ( ( $page_number = intval( $page_number ) ) < 2 ) {
@@ -1343,7 +1343,7 @@ 
 
 		ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic
 
-		$html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
+		$html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry );
 
 		ob_get_clean();
 
@@ -1371,7 +1371,7 @@ 
 	 * @return string
 	 */
 	public function render_form_buttons() {
-		return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this );
+		return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this );
 	}
 
 
@@ -1390,15 +1390,15 @@ 
 	 */
 	public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) {
 
-		if( $form['id'] != $this->form_id ) {
+		if ( $form[ 'id' ] != $this->form_id ) {
 			return $form;
 		}
 
 		// In case we have validated the form, use it to inject the validation results into the form render
-		if( isset( $this->form_after_validation ) && $this->form_after_validation['id'] === $form['id'] ) {
+		if ( isset( $this->form_after_validation ) && $this->form_after_validation[ 'id' ] === $form[ 'id' ] ) {
 			$form = $this->form_after_validation;
 		} else {
-			$form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id );
+			$form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id );
 		}
 
 		$form = $this->filter_conditional_logic( $form );
@@ -1406,8 +1406,8 @@ 
 		$form = $this->prefill_conditional_logic( $form );
 
 		// for now we don't support Save and Continue feature.
-		if( ! self::$supports_save_and_continue ) {
-	        unset( $form['save'] );
+		if ( ! self::$supports_save_and_continue ) {
+	        unset( $form[ 'save' ] );
 		}
 
 		$form = $this->unselect_default_values( $form );
@@ -1430,31 +1430,31 @@ 
 	 */
 	public function verify_user_can_edit_post( $field_content = '', $field = null, $value = '', $lead_id = 0, $form_id = 0 ) {
 
-		if( ! GFCommon::is_post_field( $field ) ) {
+		if ( ! GFCommon::is_post_field( $field ) ) {
 			return $field_content;
 		}
 
         $message = null;
 
         // First, make sure they have the capability to edit the post.
-        if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
+        if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) {
 
             /**
              * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
              * @param string $message The existing "You don't have permission..." text
              */
-            $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
+            $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don&rsquo;t have permission to edit this post.', 'gravityview' ) );
 
-        } elseif( null === get_post( $this->entry['post_id'] ) ) {
+        } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) {
             /**
              * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
              * @param string $message The existing "This field is not editable; the post no longer exists." text
              */
-            $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
+            $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) );
         }
 
-        if( $message ) {
-            $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
+        if ( $message ) {
+            $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
         }
 
         return $field_content;
@@ -1478,8 +1478,8 @@ 
 
 		// If the form has been submitted, then we don't need to pre-fill the values,
 		// Except for fileupload type and when a field input is overridden- run always!!
-		if(
-			( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) )
+		if (
+			( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) )
 			&& false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) )
 			&& ! GFCommon::is_product_field( $field->type )
 			|| ! empty( $field_content )
@@ -1499,7 +1499,7 @@ 
 	    $return = null;
 
 		/** @var GravityView_Field $gv_field */
-		if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
+		if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
 			$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
 		} else {
 	        $return = $field->get_field_input( $this->form, $field_value, $this->entry );
@@ -1508,7 +1508,7 @@ 
 	    // If there was output, it's an error
 	    $warnings = ob_get_clean();
 
-	    if( !empty( $warnings ) ) {
+	    if ( ! empty( $warnings ) ) {
 		    gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) );
 	    }
 
@@ -1533,7 +1533,7 @@ 
 		$override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field );
 
 		// We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs)
-		if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) {
+		if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) {
 
 			$field_value = array();
 
@@ -1542,10 +1542,10 @@ 
 
 			foreach ( (array)$field->inputs as $input ) {
 
-				$input_id = strval( $input['id'] );
+				$input_id = strval( $input[ 'id' ] );
 
 				if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) {
-				    $field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
+				    $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
 				    $allow_pre_populated = false;
 				}
 
@@ -1553,7 +1553,7 @@ 
 
 			$pre_value = $field->get_value_submission( array(), false );
 
-			$field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value;
+			$field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value;
 
 		} else {
 
@@ -1564,13 +1564,13 @@ 
 
 			// saved field entry value (if empty, fallback to the pre-populated value, if exists)
 			// or pre-populated value if not empty and set to override saved value
-			$field_value = isset( $this->entry[ $id ] ) && ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
+			$field_value = isset( $this->entry[ $id ] ) && ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
 
 			// in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs.
-			if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) {
+			if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) {
 				$categories = array();
 				foreach ( explode( ',', $field_value ) as $cat_string ) {
-				    $categories[] = GFCommon::format_post_category( $cat_string, true );
+				    $categories[ ] = GFCommon::format_post_category( $cat_string, true );
 				}
 				$field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
 			}
@@ -1598,7 +1598,7 @@ 
 	     * @param GF_Field $field Gravity Forms field object
 	     * @param GravityView_Edit_Entry_Render $this Current object
 	     */
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
+	    $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this );
 
 		return $field_value;
 	}
@@ -1615,12 +1615,12 @@ 
 	 */
 	public function gform_pre_validation( $form ) {
 
-		if( ! $this->verify_nonce() ) {
+		if ( ! $this->verify_nonce() ) {
 			return $form;
 		}
 
 		// Fix PHP warning regarding undefined index.
-		foreach ( $form['fields'] as &$field) {
+		foreach ( $form[ 'fields' ] as &$field ) {
 
 			// This is because we're doing admin form pretending to be front-end, so Gravity Forms
 			// expects certain field array items to be set.
@@ -1628,7 +1628,7 @@ 
 	            $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
 			}
 
-			switch( RGFormsModel::get_input_type( $field ) ) {
+			switch ( RGFormsModel::get_input_type( $field ) ) {
 
 				/**
 				 * this whole fileupload hack is because in the admin, Gravity Forms simply doesn't update any fileupload field if it's empty, but it DOES in the frontend.
@@ -1642,26 +1642,26 @@ 
 				    // Set the previous value
 				    $entry = $this->get_entry();
 
-				    $input_name = 'input_'.$field->id;
-				    $form_id = $form['id'];
+				    $input_name = 'input_' . $field->id;
+				    $form_id = $form[ 'id' ];
 
 				    $value = NULL;
 
 				    // Use the previous entry value as the default.
-				    if( isset( $entry[ $field->id ] ) ) {
+				    if ( isset( $entry[ $field->id ] ) ) {
 				        $value = $entry[ $field->id ];
 				    }
 
 				    // If this is a single upload file
-				    if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
-				        $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
-				        $value = $file_path['url'];
+				    if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) {
+				        $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] );
+				        $value = $file_path[ 'url' ];
 
 				    } else {
 
 				        // Fix PHP warning on line 1498 of form_display.php for post_image fields
 				        // Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
-				        $_FILES[ $input_name ] = array('name' => '', 'size' => '' );
+				        $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' );
 
 				    }
 
@@ -1671,7 +1671,7 @@ 
 						if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
 							$value = empty( $value ) ? '[]' : $value;
 							$value = stripslashes_deep( $value );
-							$value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array() );
+							$value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() );
 						} else if ( GFCommon::is_json( $value ) ) {
 							// Existing file; let GF derive the value from the `$_gf_uploaded_files` object (see `\GF_Field_FileUpload::get_multifile_value()`)
 							global $_gf_uploaded_files;
@@ -1691,8 +1691,8 @@ 
 
 				case 'number':
 				    // Fix "undefined index" issue at line 1286 in form_display.php
-				    if( !isset( $_POST['input_'.$field->id ] ) ) {
-				        $_POST['input_'.$field->id ] = NULL;
+				    if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) {
+				        $_POST[ 'input_' . $field->id ] = NULL;
 				    }
 				    break;
 			}
@@ -1729,7 +1729,7 @@ 
 		 * You can enter whatever you want!
 		 * We try validating, and customize the results using `self::custom_validation()`
 		 */
-		add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4);
+		add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 );
 
 		// Needed by the validate funtion
 		$failed_validation_page = NULL;
@@ -1737,14 +1737,14 @@ 
 
 		// Prevent entry limit from running when editing an entry, also
 		// prevent form scheduling from preventing editing
-		unset( $this->form['limitEntries'], $this->form['scheduleForm'] );
+		unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] );
 
 		// Hide fields depending on Edit Entry settings
-		$this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id );
+		$this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id );
 
 		$this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page );
 
-		remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 );
+		remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 );
 	}
 
 
@@ -1772,7 +1772,7 @@ 
 
 		$gv_valid = true;
 
-		foreach ( $validation_results['form']['fields'] as $key => &$field ) {
+		foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) {
 			$value             = RGFormsModel::get_field_value( $field );
 			$field_type        = RGFormsModel::get_input_type( $field );
 			$is_required       = ! empty( $field->isRequired );
@@ -1780,7 +1780,7 @@ 
 
 			// Manually validate required fields as they can be skipped be skipped by GF's validation
 			// This can happen when the field is considered "hidden" (see `GFFormDisplay::validate`) due to unmet conditional logic
-			if ( $is_required && !$failed_validation && rgblank( $value ) ) {
+			if ( $is_required && ! $failed_validation && rgblank( $value ) ) {
 				$field->failed_validation  = true;
 				$field->validation_message = esc_html__( 'This field is required.', 'gravityview' );
 
@@ -1804,7 +1804,7 @@ 
 					if ( \GV\Utils::get( $field, 'maxFiles' ) && \GV\Utils::get( $field, 'multipleFiles' ) ) {
 						$input_name = 'input_' . $field->id;
 						//uploaded
-						$file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
+						$file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array();
 
 						//existent
 						$entry = $this->get_entry();
@@ -1823,7 +1823,7 @@ 
 							$gv_valid                  = false;
 
 							// in case of error make sure the newest upload files are removed from the upload input
-							GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
+							GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null;
 						}
 					}
 
@@ -1831,7 +1831,7 @@ 
 			}
 
 			// This field has failed validation.
-			if( !empty( $field->failed_validation ) ) {
+			if ( ! empty( $field->failed_validation ) ) {
 
 				gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'data' => array( 'field' => $field, 'value' => $value ) ) );
 
@@ -1849,19 +1849,19 @@ 
 				}
 
 				// You can't continue inside a switch, so we do it after.
-				if( empty( $field->failed_validation ) ) {
+				if ( empty( $field->failed_validation ) ) {
 				    continue;
 				}
 
 				// checks if the No Duplicates option is not validating entry against itself, since
 				// we're editing a stored entry, it would also assume it's a duplicate.
-				if( !empty( $field->noDuplicates ) ) {
+				if ( ! empty( $field->noDuplicates ) ) {
 
 				    $entry = $this->get_entry();
 
 				    // If the value of the entry is the same as the stored value
 				    // Then we can assume it's not a duplicate, it's the same.
-				    if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
+				    if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) {
 				        //if value submitted was not changed, then don't validate
 				        $field->failed_validation = false;
 
@@ -1874,7 +1874,7 @@ 
 				}
 
 				// if here then probably we are facing the validation 'At least one field must be filled out'
-				if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
+				if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) {
 				    unset( $field->validation_message );
 					$field->failed_validation = false;
 				    continue;
@@ -1886,12 +1886,12 @@ 
 
 		}
 
-		$validation_results['is_valid'] = $gv_valid;
+		$validation_results[ 'is_valid' ] = $gv_valid;
 
 		gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Validation results.', array( 'data' => $validation_results ) );
 
 		// We'll need this result when rendering the form ( on GFFormDisplay::get_form )
-		$this->form_after_validation = $validation_results['form'];
+		$this->form_after_validation = $validation_results[ 'form' ];
 
 		return $validation_results;
 	}
@@ -1904,7 +1904,7 @@ 
 	 */
 	public function get_entry() {
 
-		if( empty( $this->entry ) ) {
+		if ( empty( $this->entry ) ) {
 			// Get the database value of the entry that's being edited
 			$this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() );
 		}
@@ -1936,10 +1936,10 @@ 
 		}
 
 		// If edit tab not yet configured, show all fields
-		$edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL;
+		$edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL;
 
 		// Hide fields depending on admin settings
-		$fields = $this->filter_fields( $form['fields'], $edit_fields );
+		$fields = $this->filter_fields( $form[ 'fields' ], $edit_fields );
 
 	    // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
 	    $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
@@ -1972,7 +1972,7 @@ 
 	 */
 	private function filter_fields( $fields, $configured_fields ) {
 
-		if( empty( $fields ) || !is_array( $fields ) ) {
+		if ( empty( $fields ) || ! is_array( $fields ) ) {
 			return $fields;
 		}
 
@@ -1989,12 +1989,12 @@ 
 
 			// Remove the fields that have calculation properties and keep them to be used later
 			// @since 1.16.2
-			if( $field->has_calculation() ) {
-				$this->fields_with_calculation[] = $field;
+			if ( $field->has_calculation() ) {
+				$this->fields_with_calculation[ ] = $field;
 				// don't remove the calculation fields on form render.
 			}
 
-			if( in_array( $field->type, $field_type_blocklist ) ) {
+			if ( in_array( $field->type, $field_type_blocklist ) ) {
 				unset( $fields[ $key ] );
 			}
 		}
@@ -2024,7 +2024,7 @@ 
 					continue; // Never include when no fields are configured
 				}
 
-				$out_fields[] = $field;
+				$out_fields[ ] = $field;
 			}
 
 			return array_values( $out_fields );
@@ -2035,8 +2035,8 @@ 
 
 	        /** @var GF_Field $field */
 	        foreach ( $fields as $field ) {
-				if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
-				    $edit_fields[] = $this->merge_field_properties( $field, $configured_field );
+				if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
+				    $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field );
 				    break;
 				}
 
@@ -2059,14 +2059,14 @@ 
 
 		$return_field = $field;
 
-		if( empty( $field_setting['show_label'] ) ) {
+		if ( empty( $field_setting[ 'show_label' ] ) ) {
 			$return_field->label = '';
-		} elseif ( !empty( $field_setting['custom_label'] ) ) {
-			$return_field->label = $field_setting['custom_label'];
+		} elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) {
+			$return_field->label = $field_setting[ 'custom_label' ];
 		}
 
-		if( !empty( $field_setting['custom_class'] ) ) {
-			$return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] );
+		if ( ! empty( $field_setting[ 'custom_class' ] ) ) {
+			$return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] );
 		}
 
 		/**
@@ -2104,16 +2104,16 @@ 
 	     */
 	    $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
 
-	    if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
-			foreach( $fields as $k => $field ) {
-				if( $field->adminOnly ) {
+	    if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) {
+			foreach ( $fields as $k => $field ) {
+				if ( $field->adminOnly ) {
 				    unset( $fields[ $k ] );
 				}
 			}
 			return array_values( $fields );
 		}
 
-	    foreach( $fields as &$field ) {
+	    foreach ( $fields as &$field ) {
 		    $field->adminOnly = false;
 		}
 
@@ -2134,7 +2134,7 @@ 
 	 */
 	private function unselect_default_values( $form ) {
 
-	    foreach ( $form['fields'] as &$field ) {
+	    foreach ( $form[ 'fields' ] as &$field ) {
 
 			if ( empty( $field->choices ) ) {
                 continue;
@@ -2142,7 +2142,7 @@ 
 
             foreach ( $field->choices as &$choice ) {
 				if ( \GV\Utils::get( $choice, 'isSelected' ) ) {
-					$choice['isSelected'] = false;
+					$choice[ 'isSelected' ] = false;
 				}
 			}
 		}
@@ -2167,22 +2167,22 @@ 
 	 */
 	function prefill_conditional_logic( $form ) {
 
-		if( ! GFFormDisplay::has_conditional_logic( $form ) ) {
+		if ( ! GFFormDisplay::has_conditional_logic( $form ) ) {
 			return $form;
 		}
 
 		// Have Conditional Logic pre-fill fields as if the data were default values
 		/** @var GF_Field $field */
-		foreach ( $form['fields'] as &$field ) {
+		foreach ( $form[ 'fields' ] as &$field ) {
 
-			if( 'checkbox' === $field->type ) {
+			if ( 'checkbox' === $field->type ) {
 				foreach ( $field->get_entry_inputs() as $key => $input ) {
-				    $input_id = $input['id'];
+				    $input_id = $input[ 'id' ];
 				    $choice = $field->choices[ $key ];
 				    $value = \GV\Utils::get( $this->entry, $input_id );
 				    $match = RGFormsModel::choice_value_match( $field, $choice, $value );
-				    if( $match ) {
-				        $field->choices[ $key ]['isSelected'] = true;
+				    if ( $match ) {
+				        $field->choices[ $key ][ 'isSelected' ] = true;
 				    }
 				}
 			} else {
@@ -2190,15 +2190,15 @@ 
 				// We need to run through each field to set the default values
 				foreach ( $this->entry as $field_id => $field_value ) {
 
-				    if( floatval( $field_id ) === floatval( $field->id ) ) {
+				    if ( floatval( $field_id ) === floatval( $field->id ) ) {
 
-				        if( 'list' === $field->type ) {
+				        if ( 'list' === $field->type ) {
 				            $list_rows = maybe_unserialize( $field_value );
 
 				            $list_field_value = array();
-				            foreach ( (array) $list_rows as $row ) {
-				                foreach ( (array) $row as $column ) {
-				                    $list_field_value[] = $column;
+				            foreach ( (array)$list_rows as $row ) {
+				                foreach ( (array)$row as $column ) {
+				                    $list_field_value[ ] = $column;
 				                }
 				            }
 
@@ -2231,32 +2231,32 @@ 
 		 * @see https://github.com/gravityview/GravityView/issues/840
 		 * @since develop
 		 */
-		$the_form = GFAPI::get_form( $form['id'] );
+		$the_form = GFAPI::get_form( $form[ 'id' ] );
 		$editable_ids = array();
-		foreach ( $form['fields'] as $field ) {
-			$editable_ids[] = $field['id']; // wp_list_pluck is destructive in this context
+		foreach ( $form[ 'fields' ] as $field ) {
+			$editable_ids[ ] = $field[ 'id' ]; // wp_list_pluck is destructive in this context
 		}
 		$remove_conditions_rule = array();
-		foreach ( $the_form['fields'] as $field ) {
-			if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic['rules'] ) ) {
-				foreach ( $field->conditionalLogic['rules'] as $i => $rule ) {
-					if ( ! in_array( $rule['fieldId'], $editable_ids ) ) {
+		foreach ( $the_form[ 'fields' ] as $field ) {
+			if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic[ 'rules' ] ) ) {
+				foreach ( $field->conditionalLogic[ 'rules' ] as $i => $rule ) {
+					if ( ! in_array( $rule[ 'fieldId' ], $editable_ids ) ) {
 						/**
 						 * This conditional field is not editable in this View.
 						 * We need to remove the rule, but only if it matches.
 						 */
-						if ( $_field = GFAPI::get_field( $the_form, $rule['fieldId'] ) ) {
+						if ( $_field = GFAPI::get_field( $the_form, $rule[ 'fieldId' ] ) ) {
 							$value = $_field->get_value_export( $this->entry );
-						} elseif ( isset( $this->entry[ $rule['fieldId'] ] ) ) {
-							$value = $this->entry[ $rule['fieldId'] ];
+						} elseif ( isset( $this->entry[ $rule[ 'fieldId' ] ] ) ) {
+							$value = $this->entry[ $rule[ 'fieldId' ] ];
 						} else {
-							$value = gform_get_meta( $this->entry['id'], $rule['fieldId'] );
+							$value = gform_get_meta( $this->entry[ 'id' ], $rule[ 'fieldId' ] );
 						}
 
-						$match = GFFormsModel::matches_operation( $value, $rule['value'], $rule['operator'] );
+						$match = GFFormsModel::matches_operation( $value, $rule[ 'value' ], $rule[ 'operator' ] );
 
 						if ( $match ) {
-							$remove_conditions_rule[] = array( $field['id'], $i );
+							$remove_conditions_rule[ ] = array( $field[ 'id' ], $i );
 						}
 					}
 				}
@@ -2264,21 +2264,21 @@ 
 		}
 
 		if ( $remove_conditions_rule ) {
-			foreach ( $form['fields'] as &$field ) {
+			foreach ( $form[ 'fields' ] as &$field ) {
 				foreach ( $remove_conditions_rule as $_remove_conditions_r ) {
 
 				    list( $rule_field_id, $rule_i ) = $_remove_conditions_r;
 
-					if ( $field['id'] == $rule_field_id ) {
-						unset( $field->conditionalLogic['rules'][ $rule_i ] );
-						gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field['id'] ) );
+					if ( $field[ 'id' ] == $rule_field_id ) {
+						unset( $field->conditionalLogic[ 'rules' ][ $rule_i ] );
+						gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field[ 'id' ] ) );
 					}
 				}
 			}
 		}
 
 		/** Normalize the indices... */
-		$form['fields'] = array_values( $form['fields'] );
+		$form[ 'fields' ] = array_values( $form[ 'fields' ] );
 
 		/**
 		 * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields?
@@ -2288,16 +2288,16 @@ 
 		 */
 		$use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form );
 
-		if( $use_conditional_logic ) {
+		if ( $use_conditional_logic ) {
 			return $form;
 		}
 
-		foreach( $form['fields'] as &$field ) {
+		foreach ( $form[ 'fields' ] as &$field ) {
 			/* @var GF_Field $field */
 			$field->conditionalLogic = null;
 		}
 
-		unset( $form['button']['conditionalLogic'] );
+		unset( $form[ 'button' ][ 'conditionalLogic' ] );
 
 		return $form;
 
@@ -2314,7 +2314,7 @@ 
 	 */
 	public function manage_conditional_logic( $has_conditional_logic, $form ) {
 
-		if( ! $this->is_edit_entry() ) {
+		if ( ! $this->is_edit_entry() ) {
 			return $has_conditional_logic;
 		}
 
@@ -2346,44 +2346,44 @@ 
 		 *  2. There are two entries embedded using oEmbed
 		 *  3. One of the entries has just been saved
 		 */
-		if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) {
+		if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) {
 
 			$error = true;
 
 		}
 
-		if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) {
+		if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) {
 
 			$error = true;
 
-		} elseif( ! $this->verify_nonce() ) {
+		} elseif ( ! $this->verify_nonce() ) {
 
 			/**
 			 * If the Entry is embedded, there may be two entries on the same page.
 			 * If that's the case, and one is being edited, the other should fail gracefully and not display an error.
 			 */
-			if( GravityView_oEmbed::getInstance()->get_entry_id() ) {
+			if ( GravityView_oEmbed::getInstance()->get_entry_id() ) {
 				$error = true;
 			} else {
-				$error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview');
+				$error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' );
 			}
 
 		}
 
-		if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
-			$error = __( 'You do not have permission to edit this entry.', 'gravityview');
+		if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
+			$error = __( 'You do not have permission to edit this entry.', 'gravityview' );
 		}
 
-		if( $this->entry['status'] === 'trash' ) {
-			$error = __('You cannot edit the entry; it is in the trash.', 'gravityview' );
+		if ( $this->entry[ 'status' ] === 'trash' ) {
+			$error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' );
 		}
 
 		// No errors; everything's fine here!
-		if( empty( $error ) ) {
+		if ( empty( $error ) ) {
 			return true;
 		}
 
-		if( $echo && $error !== true ) {
+		if ( $echo && $error !== true ) {
 
 	        $error = esc_html( $error );
 
@@ -2391,10 +2391,10 @@ 
 	         * @since 1.9
 	         */
 	        if ( ! empty( $this->entry ) ) {
-		        $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) );
+		        $error .= ' ' . gravityview_get_link( '#', _x( 'Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) );
 	        }
 
-			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
+			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' );
 		}
 
 		gravityview()->log->error( '{error}', array( 'error' => $error ) );
@@ -2414,17 +2414,17 @@ 
 
 		$error = NULL;
 
-		if( ! $this->check_user_cap_edit_field( $field ) ) {
-			$error = __( 'You do not have permission to edit this field.', 'gravityview');
+		if ( ! $this->check_user_cap_edit_field( $field ) ) {
+			$error = __( 'You do not have permission to edit this field.', 'gravityview' );
 		}
 
 		// No errors; everything's fine here!
-		if( empty( $error ) ) {
+		if ( empty( $error ) ) {
 			return true;
 		}
 
-		if( $echo ) {
-			echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error');
+		if ( $echo ) {
+			echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' );
 		}
 
 		gravityview()->log->error( '{error}', array( 'error' => $error ) );
@@ -2445,14 +2445,14 @@ 
 	private function check_user_cap_edit_field( $field ) {
 
 		// If they can edit any entries (as defined in Gravity Forms), we're good.
-		if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
 			return true;
 		}
 
-		$field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false;
+		$field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false;
 
-		if( $field_cap ) {
-			return GVCommon::has_cap( $field['allow_edit_cap'] );
+		if ( $field_cap ) {
+			return GVCommon::has_cap( $field[ 'allow_edit_cap' ] );
 		}
 
 		return false;
@@ -2466,17 +2466,17 @@ 
 	public function verify_nonce() {
 
 		// Verify form submitted for editing single
-		if( $this->is_edit_entry_submission() ) {
+		if ( $this->is_edit_entry_submission() ) {
 			$valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
 		}
 
 		// Verify
-		else if( ! $this->is_edit_entry() ) {
+		else if ( ! $this->is_edit_entry() ) {
 			$valid = false;
 		}
 
 		else {
-			$valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
+			$valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key );
 		}
 
 		/**
@@ -2536,7 +2536,7 @@ 
 		 */
 		$labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id );
 
-		return (array) $labels;
+		return (array)$labels;
 	}
 
 } //end class

future/includes/class-gv-license-handler.php

Spacing +65 added lines, -65 removed lines

@@ -106,7 +106,7 @@ 
 		);
 
 		if ( ! empty( $action ) ) {
-			$settings['edd_action'] = esc_attr( $action );
+			$settings[ 'edd_action' ] = esc_attr( $action );
 		}
 
 		return array_map( 'urlencode', $settings );
@@ -126,7 +126,7 @@ 
 		}
 
 		// If doing ajax, get outta here.
-		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST('action') ) )  {
+		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST( 'action' ) ) ) {
 			return;
 		}
 
@@ -173,7 +173,7 @@ 
 			'format' => 'json',
 		) );
 
-		if ( $is_ajax && empty( $data['license'] ) ) {
+		if ( $is_ajax && empty( $data[ 'license' ] ) ) {
 			die( -1 );
 		}
 
@@ -201,11 +201,11 @@ 
 
 			$json = json_encode( $license_data );
 
-			$update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST('action');
+			$update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST( 'action' );
 
 			$is_check_action_button = ( 'check_license' === Utils::get( $data, 'edd_action' ) && defined( 'DOING_AJAX' ) && DOING_AJAX );
 
-			do_action('gravityview/admin_installer/delete_downloads_data', true );
+			do_action( 'gravityview/admin_installer/delete_downloads_data', true );
 
 			if ( $is_check_action_button ) {
 				delete_transient( self::status_transient_key );
@@ -216,7 +216,7 @@ 
 			// most likely a mistake.
 			} else if ( $license_data->license !== 'failed' && $update_license ) {
 
-				if ( ! empty( $data['field_id'] ) ) {
+				if ( ! empty( $data[ 'field_id' ] ) ) {
 					set_transient( self::status_transient_key, $license_data, DAY_IN_SECONDS );
 				}
 
@@ -244,7 +244,7 @@ 
 			$class   = 'hide';
 			$message = '';
 		} else {
-			if( ! empty( $license_data->error ) ) {
+			if ( ! empty( $license_data->error ) ) {
 				$class = 'error';
 				$string_key = $license_data->error;
 			} else { $class = $license_data->license;
@@ -268,12 +268,12 @@ 
 	 */
 	public function license_details( $response = array() ) {
 
-		$response = (array) $response;
+		$response = (array)$response;
 
 		$return  = '';
 		$wrapper = '<span class="gv-license-details" aria-live="polite" aria-busy="false">%s</span>';
 
-		if ( ! empty( $response['license_key'] ) ) {
+		if ( ! empty( $response[ 'license_key' ] ) ) {
 			$return .= '<h3>' . rtrim( esc_html__( 'License Details:', 'gravityview' ), ':' ) . '</h3>';
 
 			if ( in_array( Utils::get( $response, 'license' ), array( 'invalid', 'deactivated' ) ) ) {
@@ -282,8 +282,8 @@ 
 				}
 
 
-				$return .= $this->strings( $response['license'], $response );
-			} elseif ( ! empty( $response['license_name'] ) ) {
+				$return .= $this->strings( $response[ 'license' ], $response );
+			} elseif ( ! empty( $response[ 'license_name' ] ) ) {
 				$response_keys = array(
 					'license_name'   => '',
 					'license_limit'  => '',
@@ -298,22 +298,22 @@ 
 				$response = wp_parse_args( $response, $response_keys );
 
 				$login_link_class = gravityview()->plugin->is_GF_25() ? 'button button-outline outline' : 'text-link';
-				$renews_on = ( 'lifetime' === $response['expires'] ) ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response['expires'] ) - DAY_IN_SECONDS ) );
-				$login_link       = sprintf( '<a href="%s" class="gv-access-account ' . $login_link_class . '" rel="external">%s</a>', esc_url( sprintf( 'https://www.gravitykit.com/wp-login.php?username=%s', $response['customer_email'] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) );
-				$local_text       = ( ! empty( $response['is_local'] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
-				$license_limit    = empty( $response['license_limit'] ) ? __( 'Unlimited', 'gravityview' ) : (int) $response['license_limit'];
+				$renews_on = ( 'lifetime' === $response[ 'expires' ] ) ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response[ 'expires' ] ) - DAY_IN_SECONDS ) );
+				$login_link       = sprintf( '<a href="%s" class="gv-access-account ' . $login_link_class . '" rel="external">%s</a>', esc_url( sprintf( 'https://www.gravitykit.com/wp-login.php?username=%s', $response[ 'customer_email' ] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) );
+				$local_text       = ( ! empty( $response[ 'is_local' ] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
+				$license_limit    = empty( $response[ 'license_limit' ] ) ? __( 'Unlimited', 'gravityview' ) : (int)$response[ 'license_limit' ];
 
 
 				$details = array(
-					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), '<span class="gv-license-detail">' . esc_html( $response['license_name'] ) . '</span>' ),
-					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), '<span class="gv-license-detail">' . esc_html__( $response['customer_name'], 'gravityview' ), esc_html__( $response['customer_email'], 'gravityview' ) ) . '</span>' . $renews_on . $login_link,
-					'activations' => sprintf( str_replace( '%d', '%s', esc_html__( 'Activations: %d of %s sites', 'gravityview' ) ), '<span class="gv-license-detail">' . intval( $response['site_count'] ), esc_html( $license_limit ) ) . '</span>' . $local_text,
-					'upgrade'     => $this->get_upgrade_html( $response['upgrades'] ),
+					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), '<span class="gv-license-detail">' . esc_html( $response[ 'license_name' ] ) . '</span>' ),
+					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), '<span class="gv-license-detail">' . esc_html__( $response[ 'customer_name' ], 'gravityview' ), esc_html__( $response[ 'customer_email' ], 'gravityview' ) ) . '</span>' . $renews_on . $login_link,
+					'activations' => sprintf( str_replace( '%d', '%s', esc_html__( 'Activations: %d of %s sites', 'gravityview' ) ), '<span class="gv-license-detail">' . intval( $response[ 'site_count' ] ), esc_html( $license_limit ) ) . '</span>' . $local_text,
+					'upgrade'     => $this->get_upgrade_html( $response[ 'upgrades' ] ),
 				);
 
-				if ( ! empty( $response['error'] ) && 'expired' === $response['error'] ) {
-					unset( $details['upgrade'] );
-					$details['licensed_to'] .= '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
+				if ( ! empty( $response[ 'error' ] ) && 'expired' === $response[ 'error' ] ) {
+					unset( $details[ 'upgrade' ] );
+					$details[ 'licensed_to' ] .= '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
 				}
 
 				$return .= '<ul>';
@@ -345,20 +345,20 @@ 
 		if ( ! empty( $upgrades ) ) {
 
 			$locale_parts = explode( '_', get_locale() );
-			$is_english = ( 'en' === $locale_parts[0] );
+			$is_english = ( 'en' === $locale_parts[ 0 ] );
 
 			$output .= '<h4>' . esc_html__( 'Upgrades available:', 'gravityview' ) . '</h4>';
 			$output .= '<ul>';
 
 			foreach ( $upgrades as $upgrade_id => $upgrade ) {
-				$upgrade = (object) $upgrade;
+				$upgrade = (object)$upgrade;
 
 				$anchor_text = sprintf( esc_html_x( 'Upgrade to %1$s for %2$s', '1: GravityView upgrade name, 2: Cost of upgrade', 'gravityview' ), esc_attr( $upgrade->name ), esc_attr( $upgrade->price ) );
 
 				if ( $is_english && isset( $upgrade->description ) ) {
 					$message = esc_html( $upgrade->description );
 				} else {
-					switch( $upgrade->price_id ) {
+					switch ( $upgrade->price_id ) {
 						// Interstellar
 						case 1:
 						default:
@@ -437,7 +437,7 @@ 
 			'invalid_item_id' => esc_html__( 'This license key does not have access to this plugin.', 'gravityview' ),
 			'missing' => esc_html__( 'The license key entered is invalid.', 'gravityview' ), // Missing is "the license couldn't be found", not "you submitted an empty license"
 			'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>' ),
+			'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' ),
@@ -465,7 +465,7 @@ 
 
 		if ( ! empty( $license_data->renewal_url ) ) {
 			$renew_license_url = $license_data->renewal_url;
-		} elseif( ! empty( $license_data->license_key ) ) {
+		} elseif ( ! empty( $license_data->license_key ) ) {
 			$renew_license_url = sprintf( 'https://www.gravitykit.com/checkout/?download_id=17&edd_license_key=%s', $license_data->license_key );
 		} else {
 			$renew_license_url = 'https://www.gravitykit.com/account/';
@@ -482,7 +482,7 @@ 
 	 * @return array|\WP_Error
 	 */
 	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 );
 
@@ -522,9 +522,9 @@ 
 	private function license_call_update_settings( $license_data, $data ) {
 		$settings = array();
 
-        $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->settings->set( $settings );
 	}
@@ -544,9 +544,9 @@ 
 		$status = trim( $this->settings->get( 'license_key_status' ) );
 		$key = trim( $this->settings->get( 'license_key' ) );
 
-		if (  !empty( $key ) ) {
+		if ( ! empty( $key ) ) {
 			$response = $this->settings->get( 'license_key_response' );
-			$response = is_array( $response ) ? (object) $response : json_decode( $response );
+			$response = is_array( $response ) ? (object)$response : json_decode( $response );
 		} else {
 			$response = array();
 		}
@@ -589,11 +589,11 @@ 
 
 		$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->settings->as_html( $field, $echo );
 		}
@@ -671,7 +671,7 @@ 
 				    'url'        => home_url(),
 				    'site_data'  => $this->get_site_data(),
 			    ),
-			));
+			) );
 
 			// make sure the response came back okay
 			if ( is_wp_error( $response ) ) {
@@ -701,45 +701,45 @@ 
 		$theme_data = wp_get_theme();
 		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
 
-		$data['gv_version']  = Plugin::$version;
-		$data['php_version']  = phpversion();
-		$data['wp_version']   = get_bloginfo( 'version' );
-		$data['gf_version']  = \GFForms::$version;
-		$data['server']       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
-		$data['multisite']    = is_multisite();
-		$data['theme']        = $theme;
-		$data['url']          = home_url();
-		$data['license_key']  = $this->settings->get( 'license_key' );
-		$data['beta']         = $this->settings->get( 'beta' );
+		$data[ 'gv_version' ]  = Plugin::$version;
+		$data[ 'php_version' ]  = phpversion();
+		$data[ 'wp_version' ]   = get_bloginfo( 'version' );
+		$data[ 'gf_version' ]  = \GFForms::$version;
+		$data[ 'server' ]       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
+		$data[ 'multisite' ]    = is_multisite();
+		$data[ 'theme' ]        = $theme;
+		$data[ 'url' ]          = home_url();
+		$data[ 'license_key' ]  = $this->settings->get( 'license_key' );
+		$data[ 'beta' ]         = $this->settings->get( 'beta' );
 
 		// View Data
 		$gravityview_posts = wp_count_posts( 'gravityview', 'readable' );
 
-		$data['view_count'] = null;
-		$data['view_first'] = null;
-		$data['view_latest'] = null;
+		$data[ 'view_count' ] = null;
+		$data[ 'view_first' ] = null;
+		$data[ 'view_latest' ] = null;
 
 		if ( $gravityview_posts->publish ) {
-			$data['view_count'] = $gravityview_posts->publish;
+			$data[ 'view_count' ] = $gravityview_posts->publish;
 
 			$first = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=ASC' );
 			$latest = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=DESC' );
 
 			if ( $first = array_shift( $first ) ) {
-				$data['view_first'] = $first->post_date;
+				$data[ 'view_first' ] = $first->post_date;
 			}
 			if ( $latest = array_pop( $latest ) ) {
-				$data['view_latest'] = $latest->post_date;
+				$data[ 'view_latest' ] = $latest->post_date;
 			}
 		}
 
 		// Form counts
 		if ( class_exists( 'GFFormsModel' ) ) {
 			$form_data = \GFFormsModel::get_form_count();
-			$data['forms_total'] = Utils::get( $form_data, 'total', 0 );
-			$data['forms_active'] = Utils::get( $form_data, 'active', 0 );
-			$data['forms_inactive'] = Utils::get( $form_data, 'inactive', 0 );
-			$data['forms_trash'] = Utils::get( $form_data, 'inactive', 0 );
+			$data[ 'forms_total' ] = Utils::get( $form_data, 'total', 0 );
+			$data[ 'forms_active' ] = Utils::get( $form_data, 'active', 0 );
+			$data[ 'forms_inactive' ] = Utils::get( $form_data, 'inactive', 0 );
+			$data[ 'forms_trash' ] = Utils::get( $form_data, 'inactive', 0 );
 		}
 
 		// Retrieve current plugin information
@@ -747,13 +747,13 @@ 
 			include ABSPATH . '/wp-admin/includes/plugin.php';
 		}
 
-		$data['integrations']     = self::get_related_plugins_and_extensions();
-		$data['active_plugins']   = get_option( 'active_plugins', array() );
-		$data['inactive_plugins'] = array();
-		$data['locale']           = get_locale();
+		$data[ 'integrations' ]     = self::get_related_plugins_and_extensions();
+		$data[ 'active_plugins' ]   = get_option( 'active_plugins', array() );
+		$data[ 'inactive_plugins' ] = array();
+		$data[ 'locale' ]           = get_locale();
 
 		// Validate request on the GV server
-		$data['hash']             = 'gv_version.url.locale:' . sha1( $data['gv_version'] . $data['url'] . $data['locale'] );
+		$data[ 'hash' ]             = 'gv_version.url.locale:' . sha1( $data[ 'gv_version' ] . $data[ 'url' ] . $data[ 'locale' ] );
 
 		return $data;
 	}
@@ -783,7 +783,7 @@ 
 
 				$plugin_data = get_plugin_data( $active_plugin );
 
-				$extensions[] = sprintf( '%s %s', $plugin_data['Name'], $plugin_data['Version'] );
+				$extensions[ ] = sprintf( '%s %s', $plugin_data[ 'Name' ], $plugin_data[ 'Version' ] );
 			}
 
 			if ( ! empty( $extensions ) ) {

includes/admin/metaboxes/views/select-template.php

Spacing +22 added lines, -22 removed lines

@@ -26,52 +26,52 @@
 
 <?php // list all the available templates (type= fresh or custom ) ?>
 <div class="gv-grid">
-	<?php foreach( $templates as $id => $template ) {
+	<?php foreach ( $templates as $id => $template ) {
 		$selected     = ( $id == $current_template ) ? ' gv-selected' : '';
-		$placeholder  = ! empty( $template['buy_source'] );
-		$is_included  = ! empty( $template['included'] );
+		$placeholder  = ! empty( $template[ 'buy_source' ] );
+		$is_included  = ! empty( $template[ 'included' ] );
 		$plugin_data  = GravityView_Admin_Installer::get_wp_plugins_data( \GV\Utils::get( $template, 'textdomain', '' ) );
 		$button_text  = empty( $plugin_data ) ? esc_html__( 'Install Layout', 'gravityview' ) : esc_html__( 'Activate & Select Layout', 'gravityview' );
 		$button_class = 'gv-layout-' . ( empty( $plugin_data ) ? 'install' : 'activate' );
-		$template_path = isset($plugin_data['path']) ? $plugin_data['path'] : '';
+		$template_path = isset( $plugin_data[ 'path' ] ) ? $plugin_data[ 'path' ] : '';
 
 		?>
 		<div class="gv-grid-col-1-4">
-			<div class="gv-view-types-module<?php echo $selected; if( $placeholder ) { echo ' gv-view-template-placeholder'; } ?>" data-filter="<?php echo esc_attr( $template['type'] ); ?>">
+			<div class="gv-view-types-module<?php echo $selected; if ( $placeholder ) { echo ' gv-view-template-placeholder'; } ?>" data-filter="<?php echo esc_attr( $template[ 'type' ] ); ?>">
 				<div class="gv-view-types-normal">
-					<img src="<?php echo esc_url( $template['logo'] ); ?>" alt="<?php echo esc_attr( $template['label'] ); ?>">
-					<h5><?php echo esc_html( $template['label'] ); ?></h5>
-					<p class="description"><?php echo esc_html( $template['description'] ); ?></p>
+					<img src="<?php echo esc_url( $template[ 'logo' ] ); ?>" alt="<?php echo esc_attr( $template[ 'label' ] ); ?>">
+					<h5><?php echo esc_html( $template[ 'label' ] ); ?></h5>
+					<p class="description"><?php echo esc_html( $template[ 'description' ] ); ?></p>
 				</div>
 				<div class="gv-view-types-hover">
 					<div>
 						<?php
-						if( $is_included ) {
+						if ( $is_included ) {
 						?>
 							<p><a href="<?php echo esc_url( admin_url( 'edit.php?post_type=gravityview&page=gv-admin-installer' ) ); ?>" class="button button-secondary button-hero <?php echo $button_class; ?>" rel="internal" data-template-path="<?php echo $template_path; ?>"><?php echo $button_text; ?></a></p>
-							<?php if( !empty( $template['license'] ) ) { ?>
-								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), esc_html( str_replace( ' ', '&nbsp;', $template['license'] ) ) ); ?></p>
+							<?php if ( ! empty( $template[ 'license' ] ) ) { ?>
+								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), esc_html( str_replace( ' ', '&nbsp;', $template[ 'license' ] ) ) ); ?></p>
 							<?php } ?>
 						<?php
-						} elseif( $placeholder ) {
-							$utm_string = '?utm_source=plugin&utm_medium=buy_now&utm_campaign=view_type&utm_term=' . urlencode( $template['license'] ) . '&utm_content=' . urlencode( $template['slug'] );
+						} elseif ( $placeholder ) {
+							$utm_string = '?utm_source=plugin&utm_medium=buy_now&utm_campaign=view_type&utm_term=' . urlencode( $template[ 'license' ] ) . '&utm_content=' . urlencode( $template[ 'slug' ] );
 							?>
-							<p><a href="<?php echo esc_url( $template['buy_source'] ); ?>" class="button button-primary button-hero" rel="noreferrer noopener external"><?php esc_html_e( 'Buy Now', 'gravityview'); ?></a></p>
+							<p><a href="<?php echo esc_url( $template[ 'buy_source' ] ); ?>" class="button button-primary button-hero" rel="noreferrer noopener external"><?php esc_html_e( 'Buy Now', 'gravityview' ); ?></a></p>
 
-							<?php if( !empty( $template['preview'] ) ) { ?>
-								<p><a href="<?php echo esc_url( $template['preview'] ); ?>" rel="noreferrer noopener external" class="button button-secondary"><i class="dashicons dashicons-external" style="vertical-align: middle;" title="<?php esc_html_e( 'View a live demo of this layout', 'gravityview'); ?>"></i> <?php esc_html_e( 'Try a demo', 'gravityview' ); ?></a></p>
+							<?php if ( ! empty( $template[ 'preview' ] ) ) { ?>
+								<p><a href="<?php echo esc_url( $template[ 'preview' ] ); ?>" rel="noreferrer noopener external" class="button button-secondary"><i class="dashicons dashicons-external" style="vertical-align: middle;" title="<?php esc_html_e( 'View a live demo of this layout', 'gravityview' ); ?>"></i> <?php esc_html_e( 'Try a demo', 'gravityview' ); ?></a></p>
 							<?php } ?>
 
-							<?php if( ! empty( $template['license'] ) ) { ?>
-								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), '<a href="https://www.gravitykit.com/pricing/' . esc_attr( $utm_string ) . '" rel="noreferrer noopener external">' . esc_html( str_replace( ' ', '&nbsp;', $template['license'] ) ) . '</a>' ); ?></p>
+							<?php if ( ! empty( $template[ 'license' ] ) ) { ?>
+								<p class="gv-included-in"><?php echo sprintf( esc_html__( 'This layout is included in the %s license.', 'gravityview' ), '<a href="https://www.gravitykit.com/pricing/' . esc_attr( $utm_string ) . '" rel="noreferrer noopener external">' . esc_html( str_replace( ' ', '&nbsp;', $template[ 'license' ] ) ) . '</a>' ); ?></p>
 							<?php } ?>
 						<?php }
 
-						if ($placeholder || $is_included) { ?> </div><div class="hidden"> <?php } ?>
+						if ( $placeholder || $is_included ) { ?> </div><div class="hidden"> <?php } ?>
 
-                        <p><a href="#gv_select_template" role="button" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview'); ?></a></p>
-                        <?php if( !empty( $template['preview'] ) ) { ?>
-                            <a href="<?php echo esc_url( $template['preview'] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-welcome-view-site" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview'); ?>"></i></a>
+                        <p><a href="#gv_select_template" role="button" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview' ); ?></a></p>
+                        <?php if ( ! empty( $template[ 'preview' ] ) ) { ?>
+                            <a href="<?php echo esc_url( $template[ 'preview' ] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-welcome-view-site" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview' ); ?>"></i></a>
                         <?php } ?>
 					</div>
 				</div>

includes/class-gravityview-compatibility.php

Spacing +35 added lines, -35 removed lines

@@ -76,7 +76,7 @@ 
 	 * @return GravityView_Compatibility
 	 */
 	public static function getInstance() {
-		if( self::$instance ) {
+		if ( self::$instance ) {
 			return self::$instance;
 		}
 		return new self;
@@ -138,10 +138,10 @@ 
 		// If Gravity Forms doesn't exist or is outdated, load the admin view class to
 		// show the notice, but not load any post types or process shortcodes.
 		// Without Gravity Forms, there is no GravityView. Beautiful, really.
-		if( ! self::is_valid() ) {
+		if ( ! self::is_valid() ) {
 
 			// If the plugin's not loaded, might as well hide the shortcode for people.
-			add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice') );
+			add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice' ) );
 
 		}
 	}
@@ -167,15 +167,15 @@ 
 	 */
 	public function _shortcode_gf_notice( $atts = array(), $content = null, $shortcode = 'gravityview' ) {
 
-		if( ! GVCommon::has_cap( 'activate_plugins' ) ) {
+		if ( ! GVCommon::has_cap( 'activate_plugins' ) ) {
 			return null;
 		}
 
 		$notices = self::get_notices();
 
-		$message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>' . esc_html__( 'You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview') . '</em></p>';
-		foreach( (array)$notices as $notice ) {
-			$message .= wpautop( $notice['message'] );
+		$message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>' . esc_html__( 'You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview' ) . '</em></p>';
+		foreach ( (array)$notices as $notice ) {
+			$message .= wpautop( $notice[ 'message' ] );
 		}
 		$message .= '</div>';
 
@@ -195,9 +195,9 @@ 
 
 		if ( ! gravityview()->plugin->is_compatible_php() ) {
 
-			self::$notices['php_version'] = array(
+			self::$notices[ 'php_version' ] = array(
 				'class' => 'error',
-				'message' => sprintf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>' ),
+				'message' => sprintf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . phpversion() . '</span>' ),
 				'cap' => 'manage_options',
 				'dismiss' => 'php_version',
 			);
@@ -208,11 +208,11 @@ 
 		if ( ! gravityview()->plugin->is_compatible_future_php() ) {
 
 			// Show the notice on every update. Yes, annoying, but not as annoying as a plugin breaking.
-			$key = sprintf('php_%s_%s', GV_FUTURE_MIN_PHP_VERSION, GravityView_Plugin::version );
+			$key = sprintf( 'php_%s_%s', GV_FUTURE_MIN_PHP_VERSION, GravityView_Plugin::version );
 
 			self::$notices[ $key ] = array(
 				'class' => 'error',
-				'message' => sprintf( __( "%sGravityView will soon require PHP Version %s.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_FUTURE_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>' ),
+				'message' => sprintf( __( "%sGravityView will soon require PHP Version %s.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_FUTURE_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . phpversion() . '</span>' ),
 				'cap' => 'manage_options',
 				'dismiss' => $key,
 			);
@@ -237,7 +237,7 @@ 
 
 		if ( ! gravityview()->plugin->is_compatible_wordpress() ) {
 
-			self::$notices['wp_version'] = array(
+			self::$notices[ 'wp_version' ] = array(
 				'class' => 'error',
 				'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . $wp_version . '</span>' ),
 			    'cap' => 'update_core',
@@ -271,17 +271,17 @@ 
 	public static function check_gravityforms() {
 
 		// Bypass other checks: if the class exists
-		if( class_exists( 'GFCommon' ) ) {
+		if ( class_exists( 'GFCommon' ) ) {
 
 			// Does the version meet future requirements?
-			if( true === gravityview()->plugin->is_compatible_future_gravityforms() ) {
+			if ( true === gravityview()->plugin->is_compatible_future_gravityforms() ) {
 				return true;
 			}
 
 			// Does it meet minimum requirements?
 			$meets_minimum = gravityview()->plugin->is_compatible_gravityforms();
 
-			if( $meets_minimum ) {
+			if ( $meets_minimum ) {
 				/* translators: first placeholder is the future required version of Gravity Forms. The second placeholder is the current version of Gravity Forms. */
 				$title = __( 'In the future, GravityView will require Gravity Forms Version %s or newer.', 'gravityview' );
 				$version = GV_FUTURE_MIN_GF_VERSION;
@@ -296,14 +296,14 @@ 
 			$message = '<h3>' . esc_html( sprintf( $title, $version ) ) . '</h3>';
 
 			/* translators: the placeholder is the current version of Gravity Forms. */
-			$message .= '<p>' . sprintf( esc_html__( "You're using Version %s. Please update your Gravity Forms or purchase a license.", 'gravityview' ), '<span style="font-family: Consolas, Courier, monospace;">'.GFCommon::$version.'</span>' ) . '</p>';
+			$message .= '<p>' . sprintf( esc_html__( "You're using Version %s. Please update your Gravity Forms or purchase a license.", 'gravityview' ), '<span style="font-family: Consolas, Courier, monospace;">' . GFCommon::$version . '</span>' ) . '</p>';
 
 			/* translators: In this context, "get" means purchase */
 			$message .= '<p><a href="https://www.gravitykit.com/gravityforms/" class="button button-secondary button-large button-hero">' . esc_html__( 'Get the Latest Gravity Forms', 'gravityview' ) . '</a></p>';
 
 
 			// Show the notice even if the future version requirements aren't met
-			self::$notices['gf_version'] = array(
+			self::$notices[ 'gf_version' ] = array(
 				'class' => $class,
 				'message' => $message,
 				'cap' => 'update_plugins',
@@ -321,42 +321,42 @@ 
 		 * OR
 		 * It's the Network Admin and we just don't know whether the sites have GF activated themselves.
 		 */
-		if( true === $gf_status || is_network_admin() ) {
+		if ( true === $gf_status || is_network_admin() ) {
 			return true;
 		}
 
 		// If GFCommon doesn't exist, assume GF not active
 		$return = false;
 
-		switch( $gf_status ) {
+		switch ( $gf_status ) {
 			case 'inactive':
 
 				// Required for multisite
-				if( ! function_exists('wp_create_nonce') ) {
+				if ( ! function_exists( 'wp_create_nonce' ) ) {
 					require_once ABSPATH . WPINC . '/pluggable.php';
 				}
 
 				// Otherwise, throws an error on activation & deactivation "Use of undefined constant LOGGED_IN_COOKIE"
-				if( is_multisite() ) {
+				if ( is_multisite() ) {
 					wp_cookie_constants();
 				}
 
 				$return = false;
 
-				$button = function_exists('is_network_admin') && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="'. wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=gravityforms/gravityforms.php' ), 'activate-plugin_gravityforms/gravityforms.php') . '" class="button button-large">';
+				$button = function_exists( 'is_network_admin' ) && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="' . wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=gravityforms/gravityforms.php' ), 'activate-plugin_gravityforms/gravityforms.php' ) . '" class="button button-large">';
 
-				self::$notices['gf_inactive'] = array(
+				self::$notices[ 'gf_inactive' ] = array(
 					'class' => 'error',
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview' ), '<h3>', "</h3>\n\n". $button, '</a></strong>' ),
+					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview' ), '<h3>', "</h3>\n\n" . $button, '</a></strong>' ),
 					'cap' => 'activate_plugins',
 					'dismiss' => 'gf_inactive',
 				);
 
 				break;
 			default:
-				self::$notices['gf_installed'] = array(
+				self::$notices[ 'gf_installed' ] = array(
 					'class' => 'error',
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $59%s%s', 'gravityview' ), '<h3>', "</h3>\n\n".'<a href="https://www.gravitykit.com/gravityforms/" class="button button-secondary button-large button-hero">' , '<em>', '</em>', '</a>'),
+					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $59%s%s', 'gravityview' ), '<h3>', "</h3>\n\n" . '<a href="https://www.gravitykit.com/gravityforms/" class="button button-secondary button-large button-hero">', '<em>', '</em>', '</a>' ),
 					'cap' => 'install_plugins',
 					'dismiss' => 'gf_installed',
 				);
@@ -373,10 +373,10 @@ 
 	 */
 	private static function check_gf_directory() {
 
-		if( class_exists( 'GFDirectory' ) ) {
-			self::$notices['gf_directory'] = array(
+		if ( class_exists( 'GFDirectory' ) ) {
+			self::$notices[ 'gf_directory' ] = array(
 				'class' => 'error is-dismissible',
-				'title' => __('Potential Conflict', 'gravityview' ),
+				'title' => __( 'Potential Conflict', 'gravityview' ),
 				'message' => __( 'GravityView and Gravity Forms Directory are both active. This may cause problems. If you experience issues, disable the Gravity Forms Directory plugin.', 'gravityview' ),
 				'dismiss' => 'gf_directory',
 				'cap' => 'activate_plugins',
@@ -394,21 +394,21 @@ 
 	 */
 	public static function get_plugin_status( $location = '' ) {
 
-		if( ! function_exists('is_plugin_active') ) {
+		if ( ! function_exists( 'is_plugin_active' ) ) {
 			include_once( ABSPATH . '/wp-admin/includes/plugin.php' );
 		}
 
-		if( is_network_admin() && is_plugin_active_for_network( $location ) ) {
+		if ( is_network_admin() && is_plugin_active_for_network( $location ) ) {
 			return true;
 		}
 
-		if( ! is_network_admin() && is_plugin_active( $location ) ) {
+		if ( ! is_network_admin() && is_plugin_active( $location ) ) {
 			return true;
 		}
 
-		if(
-			!file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) &&
-			!file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location )
+		if (
+			! file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) &&
+			! file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location )
 		) {
 			return false;
 		}

includes/class-admin-installer.php

Spacing +57 added lines, -57 removed lines

@@ -53,7 +53,7 @@ 
 	 */
 	public function register_noconflict( $items ) {
 
-		$items[] = 'gravityview-admin-installer';
+		$items[ ] = 'gravityview-admin-installer';
 
 		return $items;
 	}
@@ -68,21 +68,21 @@ 
 
 	    $downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT );
 
-	    if ( ! $downloads_data && ! isset( $_GET['cache'] ) ) {
+	    if ( ! $downloads_data && ! isset( $_GET[ 'cache' ] ) ) {
 			return;
 		}
 
-		add_filter( 'plugins_api', function ( $data, $action, $args ) use ( $downloads_data ) {
+		add_filter( 'plugins_api', function( $data, $action, $args ) use ( $downloads_data ) {
 			foreach ( $downloads_data as $extension ) {
-				if ( empty( $extension['info'] ) || empty( $args->slug ) || $args->slug !== $extension['info']['slug'] ) {
+				if ( empty( $extension[ 'info' ] ) || empty( $args->slug ) || $args->slug !== $extension[ 'info' ][ 'slug' ] ) {
 					continue;
 				}
 
-				return (object) array(
-					'slug'          => $extension['info']['slug'],
-					'name'          => $extension['info']['title'],
-					'version'       => $extension['licensing']['version'],
-					'download_link' => $extension['files'][0]['file'],
+				return (object)array(
+					'slug'          => $extension[ 'info' ][ 'slug' ],
+					'name'          => $extension[ 'info' ][ 'title' ],
+					'version'       => $extension[ 'licensing' ][ 'version' ],
+					'download_link' => $extension[ 'files' ][ 0 ][ 'file' ],
 				);
 			}
 
@@ -149,13 +149,13 @@ 
 
 		foreach ( $all_plugins as $path => $plugin ) {
 
-			if ( empty( $plugin['TextDomain'] ) ) {
+			if ( empty( $plugin[ 'TextDomain' ] ) ) {
 				continue;
 			}
 
-			$wp_plugins[ $plugin['TextDomain'] ] = array(
+			$wp_plugins[ $plugin[ 'TextDomain' ] ] = array(
 				'path'      => $path,
-				'version'   => $plugin['Version'],
+				'version'   => $plugin[ 'Version' ],
 				'activated' => is_plugin_active( $path )
 			);
 		}
@@ -209,11 +209,11 @@ 
 
 		$downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT );
 
-		if ( $downloads_data && ! isset( $_GET['cache'] ) ) {
+		if ( $downloads_data && ! isset( $_GET[ 'cache' ] ) ) {
 			return $downloads_data;
 		}
 
-		if( \GV\Plugin::is_network_activated() ) {
+		if ( \GV\Plugin::is_network_activated() ) {
 			$home_url = network_home_url();
 		} else {
 			$home_url = home_url();
@@ -241,13 +241,13 @@ 
 
 		$downloads_data = json_decode( wp_remote_retrieve_body( $response ), true );
 
-		if ( empty( $downloads_data['products'] ) ) {
+		if ( empty( $downloads_data[ 'products' ] ) ) {
 			return array();
 		}
 
-		$this->set_downloads_data( $downloads_data['products'] );
+		$this->set_downloads_data( $downloads_data[ 'products' ] );
 
-		return $downloads_data['products'];
+		return $downloads_data[ 'products' ];
 	}
 
 	/**
@@ -307,7 +307,7 @@ 
 
             <h2><?php esc_html_e( 'The following plugins extend GravityView and Gravity Forms functionality:', 'gravityview' ); ?></h2>
 
-			<a class="button button-secondary gv-admin-installer-refresh-link" href="<?php echo add_query_arg(array( 'cache' => 1 ) ); ?>"><i class="dashicons dashicons-update" style="margin-top: .2em"></i> <?php esc_html_e( 'Refresh', 'gravityview' ); ?></a>
+			<a class="button button-secondary gv-admin-installer-refresh-link" href="<?php echo add_query_arg( array( 'cache' => 1 ) ); ?>"><i class="dashicons dashicons-update" style="margin-top: .2em"></i> <?php esc_html_e( 'Refresh', 'gravityview' ); ?></a>
 
 			<hr class="wp-header-end" />
 
@@ -324,11 +324,11 @@ 
 
 				$this->render_section( 'extensions', esc_html__( 'GravityView Extensions', 'gravityview' ), $downloads_data, $wp_plugins );
 
-				$this->render_section(  'plugins', esc_html__( 'Gravity Forms Add-Ons', 'gravityview' ), $downloads_data, $wp_plugins );
+				$this->render_section( 'plugins', esc_html__( 'Gravity Forms Add-Ons', 'gravityview' ), $downloads_data, $wp_plugins );
 
-				$this->render_section(  'labs', esc_html__( 'GravityView Labs', 'gravityview' ), $downloads_data, $wp_plugins );
+				$this->render_section( 'labs', esc_html__( 'GravityView Labs', 'gravityview' ), $downloads_data, $wp_plugins );
 
-				$this->render_section(  'friends', esc_html__( 'Friends of GravityView', 'gravityview' ), $downloads_data, $wp_plugins );
+				$this->render_section( 'friends', esc_html__( 'Friends of GravityView', 'gravityview' ), $downloads_data, $wp_plugins );
 				?>
             </div>
         </div>
@@ -355,7 +355,7 @@ 
 				continue;
 			}
 
-			if ( empty( $download['info'] ) ) {
+			if ( empty( $download[ 'info' ] ) ) {
 				continue;
 			}
 
@@ -383,31 +383,31 @@ 
 
         $details = $this->get_download_display_details( $download, $wp_plugins );
 
-        $download_info = $details['download_info'];
+        $download_info = $details[ 'download_info' ];
 
 		?>
-        <div class="item <?php echo esc_attr( $details['item_class'] ); ?>">
+        <div class="item <?php echo esc_attr( $details[ 'item_class' ] ); ?>">
             <div class="addon-inner">
-                <a href="<?php echo esc_url( $download_info['link'] ); ?>" rel="external noreferrer noopener" title="<?php esc_html_e( 'Visit the plugin page', 'gravityview' ); ?>"><img class="thumbnail" src="<?php echo esc_attr( $download_info['thumbnail'] ); ?>" alt="" /></a>
-                <h3><?php echo esc_html( \GV\Utils::get( $download_info, 'installer_title', $download_info['title'] ) ); ?></h3>
+                <a href="<?php echo esc_url( $download_info[ 'link' ] ); ?>" rel="external noreferrer noopener" title="<?php esc_html_e( 'Visit the plugin page', 'gravityview' ); ?>"><img class="thumbnail" src="<?php echo esc_attr( $download_info[ 'thumbnail' ] ); ?>" alt="" /></a>
+                <h3><?php echo esc_html( \GV\Utils::get( $download_info, 'installer_title', $download_info[ 'title' ] ) ); ?></h3>
                 <div>
-                    <?php if( ! empty( $details['status_label'] ) ) { ?>
-                    <div class="status <?php echo esc_attr( $details['status'] ); ?>" title="<?php printf( esc_attr__( 'Plugin status: %s', 'gravityview' ), esc_html( $details['status_label'] ) ); ?>">
-                        <span class="dashicons dashicons-admin-plugins"></span> <span class="status-label"><?php echo esc_html( $details['status_label'] ); ?></span>
+                    <?php if ( ! empty( $details[ 'status_label' ] ) ) { ?>
+                    <div class="status <?php echo esc_attr( $details[ 'status' ] ); ?>" title="<?php printf( esc_attr__( 'Plugin status: %s', 'gravityview' ), esc_html( $details[ 'status_label' ] ) ); ?>">
+                        <span class="dashicons dashicons-admin-plugins"></span> <span class="status-label"><?php echo esc_html( $details[ 'status_label' ] ); ?></span>
                     </div>
 			        <?php } ?>
 
-					<?php if ( 'gravityview' !== $download_info['slug'] ) { ?>
-                    <a data-status="<?php echo esc_attr( $details['status'] ); ?>" data-plugin-path="<?php echo esc_attr( $details['plugin_path'] ); ?>" href="<?php echo esc_url( $details['href'] ); ?>" class="button <?php echo esc_attr( $details['button_class'] ); ?>" title="<?php echo esc_attr( $details['button_title'] ); ?>">
-                        <span class="title"><?php echo esc_html( $details['button_label'] ); ?></span>
-                        <?php if( $details['spinner'] ) { ?><span class="spinner"></span><?php } ?>
+					<?php if ( 'gravityview' !== $download_info[ 'slug' ] ) { ?>
+                    <a data-status="<?php echo esc_attr( $details[ 'status' ] ); ?>" data-plugin-path="<?php echo esc_attr( $details[ 'plugin_path' ] ); ?>" href="<?php echo esc_url( $details[ 'href' ] ); ?>" class="button <?php echo esc_attr( $details[ 'button_class' ] ); ?>" title="<?php echo esc_attr( $details[ 'button_title' ] ); ?>">
+                        <span class="title"><?php echo esc_html( $details[ 'button_label' ] ); ?></span>
+                        <?php if ( $details[ 'spinner' ] ) { ?><span class="spinner"></span><?php } ?>
                     </a>
 					<?php } ?>
                 </div>
 
                 <div class="addon-excerpt"><?php
 
-                    $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] );
+                    $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info[ 'excerpt' ] );
 
                     // Allow some pure HTML tags, but remove everything else from the excerpt.
                     $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' );
@@ -449,7 +449,7 @@ 
 	 */
 	private function get_download_display_details( $download, $wp_plugins ) {
 
-		$download_info = wp_parse_args( (array) $download['info'], array(
+		$download_info = wp_parse_args( (array)$download[ 'info' ], array(
 			'thumbnail' => '',
 			'title' => '',
 			'textdomain' => '',
@@ -461,9 +461,9 @@ 
 			'installer_excerpt' => null, // May not be defined
 		) );
 
-		$wp_plugin = \GV\Utils::get( $wp_plugins, $download_info['textdomain'], false );
+		$wp_plugin = \GV\Utils::get( $wp_plugins, $download_info[ 'textdomain' ], false );
 
-		$has_access = ! empty( $download['files'] );
+		$has_access = ! empty( $download[ 'files' ] );
 		$spinner = true;
 		$href = $plugin_path = '#';
 		$status = $item_class = $button_title = $button_class = '';
@@ -473,11 +473,11 @@ 
 		$required_license = $galactic_only ? __( 'All Access', 'gravityview' ) : __( 'Core + Extensions', 'gravityview' );
 
 		// The license is not active - no matter what level, this should not work
-		if( ! $is_active  && empty( $base_price ) ) {
+		if ( ! $is_active && empty( $base_price ) ) {
 			$spinner      = false;
 			$status_label = '';
 			$button_label = sprintf( __( 'Active %s License is Required.', 'gravityview' ), $required_license );
-			$href         = $download_info['link'];
+			$href         = $download_info[ 'link' ];
 			$button_class = 'button-primary';
 		}
 
@@ -487,7 +487,7 @@ 
 			$status_label = '';
 			$button_label = sprintf( __( 'Purchase Now for %s', 'gravityview' ), '$' . $base_price );
 			$button_class = 'button-primary button-large';
-			$href         = $download_info['link'];
+			$href         = $download_info[ 'link' ];
 			$item_class   = 'featured';
 		}
 
@@ -500,7 +500,7 @@ 
 			$href         = 'https://www.gravitykit.com/pricing/?utm_source=admin-installer&utm_medium=admin&utm_campaign=Admin%20Notice&utm_content=' . $required_license;
 		}
 
-        elseif ( ! empty( $download_info['coming_soon'] ) ) {
+        elseif ( ! empty( $download_info[ 'coming_soon' ] ) ) {
 	        $spinner      = false;
 	        $status       = 'notinstalled';
 	        $status_label = __( 'Coming Soon', 'gravityview' );
@@ -515,8 +515,8 @@ 
 			$href = add_query_arg(
 				array(
 					'action'   => 'install-plugin',
-					'plugin'   => $download_info['slug'],
-					'_wpnonce' => wp_create_nonce( 'install-plugin_' . $download_info['slug'] ),
+					'plugin'   => $download_info[ 'slug' ],
+					'_wpnonce' => wp_create_nonce( 'install-plugin_' . $download_info[ 'slug' ] ),
 				),
 				self_admin_url( 'update.php' )
 			);
@@ -532,12 +532,12 @@ 
 			$status = 'inactive';
 			$status_label = __( 'Inactive', 'gravityview' );
 			$button_label = __( 'Activate', 'gravityview' );
-			$plugin_path = $wp_plugin['path'];
+			$plugin_path = $wp_plugin[ 'path' ];
 			$button_class = 'button-secondary';
 		}
 		// The plugin is installed and active
-		elseif ( ! empty( $wp_plugin['path'] ) ) {
-			$plugin_path = $wp_plugin['path'];
+		elseif ( ! empty( $wp_plugin[ 'path' ] ) ) {
+			$plugin_path = $wp_plugin[ 'path' ];
 			$status = 'active';
 			$status_label = __( 'Active', 'gravityview' );
 			$button_label = __( 'Deactivate', 'gravityview' );
@@ -550,9 +550,9 @@ 
 			$href = add_query_arg( array( 'license_key' => $license_key ), $href );
 		}
 
-		$download_info['link'] = add_query_arg( array( 'license_key' => $license_key ), $download_info['link'] );
+		$download_info[ 'link' ] = add_query_arg( array( 'license_key' => $license_key ), $download_info[ 'link' ] );
 
-		return compact( 'download_info','plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' );
+		return compact( 'download_info', 'plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' );
     }
 
 	/**
@@ -567,11 +567,11 @@ 
 	    $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 );
 		$base_price = \GFCommon::to_number( $base_price );
 
-		unset( $download['pricing']['amount'] );
+		unset( $download[ 'pricing' ][ 'amount' ] );
 
 		// Price options array, not single price
-		if ( ! $base_price && ! empty( $download['pricing'] ) ) {
-			$base_price = array_shift( $download['pricing'] );
+		if ( ! $base_price && ! empty( $download[ 'pricing' ] ) ) {
+			$base_price = array_shift( $download[ 'pricing' ] );
 		}
 
 		return floatval( $base_price );
@@ -585,13 +585,13 @@ 
 	public function activate_download() {
 		$data = \GV\Utils::_POST( 'data', array() );
 
-		if ( empty( $data['path'] ) ) {
+		if ( empty( $data[ 'path' ] ) ) {
 			return;
 		}
 
-		$result = activate_plugin( $data['path'] );
+		$result = activate_plugin( $data[ 'path' ] );
 
-		if ( is_wp_error( $result ) || ! is_plugin_active( $data['path'] ) ) {
+		if ( is_wp_error( $result ) || ! is_plugin_active( $data[ 'path' ] ) ) {
 			wp_send_json_error( array(
                 'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() )
             ) );
@@ -608,13 +608,13 @@ 
 	public function deactivate_download() {
 		$data = \GV\Utils::_POST( 'data', array() );
 
-		if ( empty( $data['path'] ) ) {
+		if ( empty( $data[ 'path' ] ) ) {
 			return;
 		}
 
-		deactivate_plugins( $data['path'] );
+		deactivate_plugins( $data[ 'path' ] );
 
-		if( is_plugin_active( $data['path'] ) ) {
+		if ( is_plugin_active( $data[ 'path' ] ) ) {
             wp_send_json_error( array(
                 'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) )
             ) );

includes/presets/register-default-templates.php

Spacing +7 added lines, -7 removed lines

@@ -59,8 +59,8 @@ 
 		'GravityView_DataTables_Template' => array(
 			'slug' => 'dt_placeholder',
 			'label' =>  __( 'DataTables Table', 'gv-datatables', 'gravityview' ),
-			'description' => __('Display items in a dynamic table powered by DataTables.', 'gravityview'),
-			'logo' => plugins_url('assets/images/templates/logo-datatables.png', GRAVITYVIEW_FILE ),
+			'description' => __( 'Display items in a dynamic table powered by DataTables.', 'gravityview' ),
+			'logo' => plugins_url( 'assets/images/templates/logo-datatables.png', GRAVITYVIEW_FILE ),
 			'buy_source' => 'https://www.gravitykit.com/pricing/?utm_source=plugin&utm_medium=buy_now&utm_campaign=view_type&utm_term=datatables',
 			'preview' => 'https://try.gravityview.co/demo/view/datatables/?utm_source=plugin&utm_medium=try_demo&utm_campaign=view_type&utm_term=datatables',
 			'license' => esc_html__( 'All Access', 'gravityview' ),
@@ -102,13 +102,13 @@ 
 				continue;
 			}
 
-			$license_price_id = (int) \GV\Utils::get( $license, 'price_id', 0 );
-			$placeholder_price_id = (int) \GV\Utils::get( $placeholder, 'price_id' );
+			$license_price_id = (int)\GV\Utils::get( $license, 'price_id', 0 );
+			$placeholder_price_id = (int)\GV\Utils::get( $placeholder, 'price_id' );
 
-			$placeholder['type']     = 'custom';
-			$placeholder['included'] = ( $license_price_id >= $placeholder_price_id );
+			$placeholder[ 'type' ]     = 'custom';
+			$placeholder[ 'included' ] = ( $license_price_id >= $placeholder_price_id );
 
-			new GravityView_Placeholder_Template( $placeholder['slug'], $placeholder );
+			new GravityView_Placeholder_Template( $placeholder[ 'slug' ], $placeholder );
 		}
 
 	} catch ( Exception $exception ) {

future/lib/EDD_SL_Plugin_Updater.php

Spacing +29 added lines, -29 removed lines

@@ -51,9 +51,9 @@ 
 		$this->plugin_file              = $_plugin_file;
 		$this->name                     = plugin_basename( $_plugin_file );
 		$this->slug                     = basename( $_plugin_file, '.php' );
-		$this->version                  = $_api_data['version'];
-		$this->wp_override              = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false;
-		$this->beta                     = ! empty( $this->api_data['beta'] ) ? true : false;
+		$this->version                  = $_api_data[ 'version' ];
+		$this->wp_override              = isset( $_api_data[ 'wp_override' ] ) ? (bool)$_api_data[ 'wp_override' ] : false;
+		$this->beta                     = ! empty( $this->api_data[ 'beta' ] ) ? true : false;
 		$this->failed_request_cache_key = 'edd_sl_failed_http_' . md5( $this->api_url );
 
 		$edd_plugin_data[ $this->slug ] = $this->api_data;
@@ -185,8 +185,8 @@ 
 		$tested_parts          = explode( '.', $version_info->tested );
 
 		// The current WordPress version is x.y.z, so update the tested version to match it.
-		if ( isset( $current_version_parts[2] ) && $current_version_parts[0] === $tested_parts[0] && $current_version_parts[1] === $tested_parts[1] ) {
-			$tested_parts[2] = $current_version_parts[2];
+		if ( isset( $current_version_parts[ 2 ] ) && $current_version_parts[ 0 ] === $tested_parts[ 0 ] && $current_version_parts[ 1 ] === $tested_parts[ 1 ] ) {
+			$tested_parts[ 2 ] = $current_version_parts[ 2 ];
 		}
 
 		return implode( '.', $tested_parts );
@@ -264,7 +264,7 @@ 
 		printf(
 		/* translators: the plugin name. */
 			esc_html__( 'There is a new version of %1$s available.', 'gravityview' ),
-			esc_html( $plugin['Name'] )
+			esc_html( $plugin[ 'Name' ] )
 		);
 
 		if ( ! current_user_can( 'update_plugins' ) ) {
@@ -309,8 +309,8 @@ 
 	 * @return array
 	 */
 	private function get_active_plugins() {
-		$active_plugins         = (array) get_option( 'active_plugins' );
-		$active_network_plugins = (array) get_site_option( 'active_sitewide_plugins' );
+		$active_plugins         = (array)get_option( 'active_plugins' );
+		$active_network_plugins = (array)get_site_option( 'active_sitewide_plugins' );
 
 		return array_merge( $active_plugins, array_keys( $active_network_plugins ) );
 	}
@@ -428,7 +428,7 @@ 
 	public function http_request_args( $args, $url ) {
 
 		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
-			$args['sslverify'] = $this->verify_ssl();
+			$args[ 'sslverify' ] = $this->verify_ssl();
 		}
 		return $args;
 
@@ -448,7 +448,7 @@ 
 	private function api_request( $_action, $_data ) {
 		$data = array_merge( $this->api_data, $_data );
 
-		if ( $data['slug'] !== $this->slug ) {
+		if ( $data[ 'slug' ] !== $this->slug ) {
 			return;
 		}
 
@@ -512,15 +512,15 @@ 
 	 */
 	public function show_changelog() {
 
-		if ( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' !== $_REQUEST['edd_sl_action'] ) {
+		if ( empty( $_REQUEST[ 'edd_sl_action' ] ) || 'view_plugin_changelog' !== $_REQUEST[ 'edd_sl_action' ] ) {
 			return;
 		}
 
-		if ( empty( $_REQUEST['plugin'] ) ) {
+		if ( empty( $_REQUEST[ 'plugin' ] ) ) {
 			return;
 		}
 
-		if ( empty( $_REQUEST['slug'] ) || $this->slug !== $_REQUEST['slug'] ) {
+		if ( empty( $_REQUEST[ 'slug' ] ) || $this->slug !== $_REQUEST[ 'slug' ] ) {
 			return;
 		}
 
@@ -531,8 +531,8 @@ 
 		$version_info = $this->get_repo_api_data();
 		if ( isset( $version_info->sections ) ) {
 			$sections = $this->convert_object_to_array( $version_info->sections );
-			if ( ! empty( $sections['changelog'] ) ) {
-				echo '<div style="background:#fff;padding:10px;">' . wp_kses_post( $sections['changelog'] ) . '</div>';
+			if ( ! empty( $sections[ 'changelog' ] ) ) {
+				echo '<div style="background:#fff;padding:10px;">' . wp_kses_post( $sections[ 'changelog' ] ) . '</div>';
 			}
 		}
 
@@ -547,12 +547,12 @@ 
 	private function get_version_from_remote() {
 		$api_params = array(
 			'edd_action'  => 'get_version',
-			'license'     => ! empty( $this->api_data['license'] ) ? $this->api_data['license'] : '',
-			'item_name'   => isset( $this->api_data['item_name'] ) ? $this->api_data['item_name'] : false,
-			'item_id'     => isset( $this->api_data['item_id'] ) ? $this->api_data['item_id'] : false,
-			'version'     => isset( $this->api_data['version'] ) ? $this->api_data['version'] : false,
+			'license'     => ! empty( $this->api_data[ 'license' ] ) ? $this->api_data[ 'license' ] : '',
+			'item_name'   => isset( $this->api_data[ 'item_name' ] ) ? $this->api_data[ 'item_name' ] : false,
+			'item_id'     => isset( $this->api_data[ 'item_id' ] ) ? $this->api_data[ 'item_id' ] : false,
+			'version'     => isset( $this->api_data[ 'version' ] ) ? $this->api_data[ 'version' ] : false,
 			'slug'        => $this->slug,
-			'author'      => $this->api_data['author'],
+			'author'      => $this->api_data[ 'author' ],
 			'url'         => home_url(),
 			'beta'        => $this->beta,
 			'php_version' => phpversion(),
@@ -601,7 +601,7 @@ 
 
 		if ( ! empty( $request->sections ) ) {
 			foreach ( $request->sections as $key => $section ) {
-				$request->$key = (array) $section;
+				$request->$key = (array)$section;
 			}
 		}
 
@@ -623,17 +623,17 @@ 
 		$cache = get_option( $cache_key );
 
 		// Cache is expired
-		if ( empty( $cache['timeout'] ) || time() > $cache['timeout'] ) {
+		if ( empty( $cache[ 'timeout' ] ) || time() > $cache[ 'timeout' ] ) {
 			return false;
 		}
 
 		// We need to turn the icons into an array, thanks to WP Core forcing these into an object at some point.
-		$cache['value'] = json_decode( $cache['value'] );
-		if ( ! empty( $cache['value']->icons ) ) {
-			$cache['value']->icons = (array) $cache['value']->icons;
+		$cache[ 'value' ] = json_decode( $cache[ 'value' ] );
+		if ( ! empty( $cache[ 'value' ]->icons ) ) {
+			$cache[ 'value' ]->icons = (array)$cache[ 'value' ]->icons;
 		}
 
-		return $cache['value'];
+		return $cache[ 'value' ];
 
 	}
 
@@ -657,7 +657,7 @@ 
 		update_option( $cache_key, $data, 'no' );
 
 		// Delete the duplicate option
-		delete_option( 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) ) );
+		delete_option( 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) ) );
 	}
 
 	/**
@@ -667,7 +667,7 @@ 
 	 * @return bool
 	 */
 	private function verify_ssl() {
-		return (bool) apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
+		return (bool)apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
 	}
 
 	/**
@@ -677,7 +677,7 @@ 
 	 * @return string
 	 */
 	private function get_cache_key() {
-		$string = $this->slug . $this->api_data['license'] . $this->beta;
+		$string = $this->slug . $this->api_data[ 'license' ] . $this->beta;
 
 		return 'edd_sl_' . md5( serialize( $string ) );
 	}