gravityview / GravityView

includes/extensions/edit-entry/partials/form-buttons.php

Indentation +11 added lines, -11 removed lines

@@ -7,15 +7,15 @@ 
 <div id="publishing-action">
 	<?php
 
-    /**
-     * @filter `gravityview/edit_entry/cancel_link` Modify the cancel button link URL
-     * @since 1.11.1
-     * @param string $back_link Existing URL of the Cancel link
-     * @param array $form The Gravity Forms form
-     * @param array $entry The Gravity Forms entry
-     * @param int $view_id The current View ID
-     */
-    $back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id );
+	/**
+	 * @filter `gravityview/edit_entry/cancel_link` Modify the cancel button link URL
+	 * @since 1.11.1
+	 * @param string $back_link Existing URL of the Cancel link
+	 * @param array $form The Gravity Forms form
+	 * @param array $entry The Gravity Forms entry
+	 * @param int $view_id The current View ID
+	 */
+	$back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id );
 
 	/**
 	 * @action `gravityview/edit-entry/publishing-action/before` Triggered before the submit buttons in the Edit Entry screen, inside the `<div id="publishing-action">` container.
@@ -53,11 +53,11 @@ 
 	/**
 	 * @action `gravityview/edit-entry/publishing-action/after` Triggered after the submit buttons in the Edit Entry screen, inside the `<div id="publishing-action">` container.
 	 * @since 1.5.1
-     * @since 2.0.13 Added $post_id
+	 * @since 2.0.13 Added $post_id
 	 * @param array $form The Gravity Forms form
 	 * @param array $entry The Gravity Forms entry
 	 * @param int $view_id The current View ID
-     * @param int $post_id The current Post ID
+	 * @param int $post_id The current Post ID
 	 */
 	do_action( 'gravityview/edit-entry/publishing-action/after', $object->form, $object->entry, $object->view_id, $object->post_id );
 

Spacing +8 added lines, -8 removed lines

@@ -60,28 +60,28 @@ 
 	if ( $object->show_previous_button ) {
 		$previous_tabindex = GFCommon::get_tabindex();
 		?>
-		<input id="gform_previous_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-previous" type="submit" <?php echo $previous_tabindex; ?> value="<?php echo esc_attr( $labels['previous'] ); ?>" name="save" />
+		<input id="gform_previous_button_<?php echo esc_attr( $object->form[ 'id' ] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-previous" type="submit" <?php echo $previous_tabindex; ?> value="<?php echo esc_attr( $labels[ 'previous' ] ); ?>" name="save" />
 		<?php
 	}
 
 	if ( $object->show_next_button ) {
-		$next_tabindex    = GFCommon::get_tabindex();
+		$next_tabindex = GFCommon::get_tabindex();
 		?>
-		<input id="gform_next_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-next" type="submit" <?php echo $next_tabindex; ?> value="<?php echo esc_attr( $labels['next'] ); ?>" name="save" />
+		<input id="gform_next_button_<?php echo esc_attr( $object->form[ 'id' ] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-next" type="submit" <?php echo $next_tabindex; ?> value="<?php echo esc_attr( $labels[ 'next' ] ); ?>" name="save" />
 		<?php
 	}
 
 	if ( $object->show_update_button ) {
-		$update_tabindex  = GFCommon::get_tabindex();
+		$update_tabindex = GFCommon::get_tabindex();
 		?>
-		<input id="gform_submit_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" <?php echo $update_tabindex; ?> value="<?php echo esc_attr( $labels['submit'] ); ?>" name="save" />
+		<input id="gform_submit_button_<?php echo esc_attr( $object->form[ 'id' ] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" <?php echo $update_tabindex; ?> value="<?php echo esc_attr( $labels[ 'submit' ] ); ?>" name="save" />
 		<?php
 	}
 
-	$cancel_tabindex   = GFCommon::get_tabindex();
+	$cancel_tabindex = GFCommon::get_tabindex();
 
 	?>
-	<a class="btn btn-sm button button-small gv-button-cancel" <?php echo $cancel_tabindex; ?> href="<?php echo esc_url( $back_link ); ?>"><?php echo esc_attr( $labels['cancel'] ); ?></a>
+	<a class="btn btn-sm button button-small gv-button-cancel" <?php echo $cancel_tabindex; ?> href="<?php echo esc_url( $back_link ); ?>"><?php echo esc_attr( $labels[ 'cancel' ] ); ?></a>
 	<?php
 
 	/**
@@ -97,5 +97,5 @@ 
 
 	?>
 	<input type="hidden" name="action" value="update" />
-	<input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry['id'] ); ?>" />
+	<input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry[ 'id' ] ); ?>" />
 </div>

includes/class-admin-approve-entries.php

Doc Comments +1 added lines, -1 removed lines

@@ -266,7 +266,7 @@
 	 *
 	 * @uses  GravityView_frontend::get_search_criteria() Convert the $_POST search request into a properly formatted request.
 	 * @access public
-	 * @return void|boolean
+	 * @return false|null
 	 */
 	public function process_bulk_action() {
 

Indentation +23 added lines, -23 removed lines

@@ -361,14 +361,14 @@ 
 	/**
 	 * update_approved function.
 	 *
-     * @since 1.18 Moved to GravityView_Entry_Approval::update_approved
+	 * @since 1.18 Moved to GravityView_Entry_Approval::update_approved
 	 * @see GravityView_Entry_Approval::update_approved
-     *
+	 *
 	 * @param int $entry_id (default: 0)
 	 * @param int $approved (default: 0)
 	 * @param int $form_id (default: 0)
 	 * @param int $approvedcolumn (default: 0)
-     *
+	 *
 	 * @return boolean True: It worked; False: it failed
 	 */
 	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
@@ -378,9 +378,9 @@ 
 	/**
 	 * Calculate the approve field.input id
 	 *
-     * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column
-     * @see GravityView_Entry_Approval::get_approved_column
-     *
+	 * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column
+	 * @see GravityView_Entry_Approval::get_approved_column
+	 *
 	 * @param mixed $form GF Form or Form ID
 	 * @return false|null|string Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set.
 	 */
@@ -505,37 +505,37 @@ 
 			'bulk_actions' => $this->get_bulk_actions( $form_id ),
 			'bulk_message' => $this->bulk_update_message,
 			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
-            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
+			'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
 			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'),
 			'column_title' => __( 'Show entry in directory view?', 'gravityview'),
 			'column_link' => esc_url( $this->get_sort_link() ),
-            'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
+			'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
 			'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
 		) );
 
 	}
 
 	/**
-     * Generate a link to sort by approval status
-     *
-     * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as
-     * numeric, but it does group the approved entries together.
-     *
-     * @since 2.0.14 Remove need for approval field for sorting by approval status
-     *
+	 * Generate a link to sort by approval status
+	 *
+	 * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as
+	 * numeric, but it does group the approved entries together.
+	 *
+	 * @since 2.0.14 Remove need for approval field for sorting by approval status
+	 *
 	 * @param int $form_id [NO LONGER USED]
 	 *
 	 * @return string Sorting link
 	 */
 	private function get_sort_link( $form_id = 0 ) {
 
-	    $args = array(
-		    'orderby' => 'is_approved',
-            'order' => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc',
-        );
+		$args = array(
+			'orderby' => 'is_approved',
+			'order' => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc',
+		);
 
 		return add_query_arg( $args );
-    }
+	}
 
 	/**
 	 * Get an array of options to be added to the Gravity Forms "Bulk action" dropdown in a "GravityView" option group
@@ -577,9 +577,9 @@ 
 		// Sanitize the values, just to be sure.
 		foreach ( $bulk_actions as $key => $group ) {
 
-		    if( empty( $group ) ) {
-		        continue;
-		    }
+			if( empty( $group ) ) {
+				continue;
+			}
 
 			foreach ( $group as $i => $action ) {
 				$bulk_actions[ $key ][ $i ]['label'] = esc_html( $bulk_actions[ $key ][ $i ]['label'] );

Spacing +65 added lines, -65 removed lines

@@ -44,7 +44,7 @@ 
 		/** gf_entries page - entries table screen */
 
 		// capture bulk actions
-		add_action( 'gform_loaded', array( $this, 'process_bulk_action') );
+		add_action( 'gform_loaded', array( $this, 'process_bulk_action' ) );
 
 		// add hidden field with approve status
 		add_action( 'gform_entries_first_column_actions', array( $this, 'add_entry_approved_hidden_input' ), 1, 5 );
@@ -52,7 +52,7 @@ 
 		add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips' ) );
 
 		// adding styles and scripts
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') );
+		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) );
 		// bypass Gravity Forms no-conflict mode
 		add_filter( 'gform_noconflict_scripts', array( $this, 'register_gform_noconflict_script' ) );
 		add_filter( 'gform_noconflict_styles', array( $this, 'register_gform_noconflict_style' ) );
@@ -81,7 +81,7 @@ 
 		 * @param bool $show_filter_links True: show the "approved"/"disapproved" filter links. False: hide them.
 		 * @param array $form GF Form object of current form
 		 */
-		if( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
+		if ( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
 			return $filter_links;
 		}
 
@@ -109,27 +109,27 @@ 
 		$approved_count = $disapproved_count = $unapproved_count = 0;
 
 		// Only count if necessary
-		if( $include_counts ) {
-			$approved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
-			$disapproved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
-			$unapproved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_unapproved ) ) );
+		if ( $include_counts ) {
+			$approved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
+			$disapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
+			$unapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_unapproved ) ) );
 		}
 
-		$filter_links[] = array(
+		$filter_links[ ] = array(
 			'id'            => 'gv_approved',
 			'field_filters' => $field_filters_approved,
 			'count'         => $approved_count,
 			'label'         => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::APPROVED ),
 		);
 
-		$filter_links[] = array(
+		$filter_links[ ] = array(
 			'id'            => 'gv_disapproved',
 			'field_filters' => $field_filters_disapproved,
 			'count'         => $disapproved_count,
 			'label'         => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::DISAPPROVED ),
 		);
 
-		$filter_links[] = array(
+		$filter_links[ ] = array(
 			'id'            => 'gv_unapproved',
 			'field_filters' => $field_filters_unapproved,
 			'count'         => $unapproved_count,
@@ -148,9 +148,9 @@ 
 	 */
 	function tooltips( $tooltips ) {
 
-		$tooltips['form_gravityview_fields'] = array(
-			'title' => __('GravityView Fields', 'gravityview'),
-			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'),
+		$tooltips[ 'form_gravityview_fields' ] = array(
+			'title' => __( 'GravityView Fields', 'gravityview' ),
+			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview' ),
 		);
 
 		return $tooltips;
@@ -261,7 +261,7 @@ 
 
 		$gv_bulk_action = false;
 
-		if( version_compare( GFForms::$version, '2.0', '>=' ) ) {
+		if ( version_compare( GFForms::$version, '2.0', '>=' ) ) {
 			$bulk_action = ( '-1' !== \GV\Utils::_POST( 'action' ) ) ? \GV\Utils::_POST( 'action' ) : \GV\Utils::_POST( 'action2' );
 		} else {
 			// GF 1.9.x - Bulk action 2 is the bottom bulk action select form.
@@ -269,7 +269,7 @@ 
 		}
 
 		// Check the $bulk_action value against GV actions, see if they're the same. I hate strpos().
-		if( ! empty( $bulk_action ) && preg_match( '/^('. implode( '|', $this->bulk_action_prefixes ) .')/ism', $bulk_action ) ) {
+		if ( ! empty( $bulk_action ) && preg_match( '/^(' . implode( '|', $this->bulk_action_prefixes ) . ')/ism', $bulk_action ) ) {
 			$gv_bulk_action = $bulk_action;
 		}
 
@@ -294,7 +294,7 @@ 
 
 		// gforms_entry_list is the nonce that confirms we're on the right page
 		// gforms_update_note is sent when bulk editing entry notes. We don't want to process then.
-		if ( $bulk_action && \GV\Utils::_POST( 'gforms_entry_list' ) && empty( $_POST['gforms_update_note'] ) ) {
+		if ( $bulk_action && \GV\Utils::_POST( 'gforms_entry_list' ) && empty( $_POST[ 'gforms_update_note' ] ) ) {
 
 			check_admin_referer( 'gforms_entry_list', 'gforms_entry_list' );
 
@@ -312,13 +312,13 @@ 
 			}
 
 			// All entries are set to be updated, not just the visible ones
-			if ( ! empty( $_POST['all_entries'] ) ) {
+			if ( ! empty( $_POST[ 'all_entries' ] ) ) {
 
 				// Convert the current entry search into GF-formatted search criteria
 				$search = array(
-					'search_field' => isset( $_POST['f'] ) ? $_POST['f'][0] : 0,
-					'search_value' => isset( $_POST['v'][0] ) ? $_POST['v'][0] : '',
-					'search_operator' => isset( $_POST['o'][0] ) ? $_POST['o'][0] : 'contains',
+					'search_field' => isset( $_POST[ 'f' ] ) ? $_POST[ 'f' ][ 0 ] : 0,
+					'search_value' => isset( $_POST[ 'v' ][ 0 ] ) ? $_POST[ 'v' ][ 0 ] : '',
+					'search_operator' => isset( $_POST[ 'o' ][ 0 ] ) ? $_POST[ 'o' ][ 0 ] : 'contains',
 				);
 
 				$search_criteria = GravityView_frontend::get_search_criteria( $search, $form_id );
@@ -329,7 +329,7 @@ 
 			} else {
 
 				// Changed from 'lead' to 'entry' in 2.0
-				$entries = isset( $_POST['lead'] ) ? $_POST['lead'] : $_POST['entry'];
+				$entries = isset( $_POST[ 'lead' ] ) ? $_POST[ 'lead' ] : $_POST[ 'entry' ];
 
 			}
 
@@ -341,15 +341,15 @@ 
 			$entry_count = count( $entries ) > 1 ? sprintf( __( '%d entries', 'gravityview' ), count( $entries ) ) : __( '1 entry', 'gravityview' );
 
 			switch ( $approved_status ) {
-				case $this->bulk_action_prefixes['approve']:
+				case $this->bulk_action_prefixes[ 'approve' ]:
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::APPROVED, $form_id );
 					$this->bulk_update_message = sprintf( __( '%s approved.', 'gravityview' ), $entry_count );
 					break;
-				case $this->bulk_action_prefixes['unapprove']:
+				case $this->bulk_action_prefixes[ 'unapprove' ]:
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::UNAPPROVED, $form_id );
 					$this->bulk_update_message = sprintf( __( '%s unapproved.', 'gravityview' ), $entry_count );
 					break;
-				case $this->bulk_action_prefixes['disapprove']:
+				case $this->bulk_action_prefixes[ 'disapprove' ]:
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::DISAPPROVED, $form_id );
 					$this->bulk_update_message = sprintf( __( '%s disapproved.', 'gravityview' ), $entry_count );
 					break;
@@ -371,7 +371,7 @@ 
      *
 	 * @return boolean True: It worked; False: it failed
 	 */
-	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
+	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0 ) {
 		return GravityView_Entry_Approval::update_approved( $entry_id, $approved, $form_id, $approvedcolumn );
 	}
 
@@ -401,20 +401,20 @@ 
 	 *
 	 * @return void
 	 */
-	static public function add_entry_approved_hidden_input(  $form_id, $field_id, $value, $entry, $query_string ) {
+	static public function add_entry_approved_hidden_input( $form_id, $field_id, $value, $entry, $query_string ) {
 
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry['id'] ) ) {
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry[ 'id' ] ) ) {
 			return;
 		}
 
-		if( empty( $entry['id'] ) ) {
+		if ( empty( $entry[ 'id' ] ) ) {
 			return;
 		}
 
 		$status_value = GravityView_Entry_Approval::get_entry_status( $entry, 'value' );
 
-		if( $status_value ) {
-			echo '<input type="hidden" class="entry_approval" id="entry_approved_'. $entry['id'] .'" value="' . esc_attr( $status_value ) . '" />';
+		if ( $status_value ) {
+			echo '<input type="hidden" class="entry_approval" id="entry_approved_' . $entry[ 'id' ] . '" value="' . esc_attr( $status_value ) . '" />';
 		}
 	}
 
@@ -427,10 +427,10 @@ 
 	 */
 	private function get_form_id() {
 
-		$form_id = GFForms::get('id');
+		$form_id = GFForms::get( 'id' );
 
 		// If there are no forms identified, use the first form. That's how GF does it.
-		if( empty( $form_id ) && class_exists('RGFormsModel') ) {
+		if ( empty( $form_id ) && class_exists( 'RGFormsModel' ) ) {
 			$form_id = $this->get_first_form_id();
 		}
 
@@ -450,14 +450,14 @@ 
 
 		$forms = RGFormsModel::get_forms( null, 'title' );
 
-		if( ! isset( $forms[0] ) ) {
+		if ( ! isset( $forms[ 0 ] ) ) {
 			gravityview()->log->error( 'No forms were found' );
 			return 0;
 		}
 
-		$first_form = $forms[0];
+		$first_form = $forms[ 0 ];
 
-		$form_id = is_object( $forms[0] ) ? $first_form->id : $first_form['id'];
+		$form_id = is_object( $forms[ 0 ] ) ? $first_form->id : $first_form[ 'id' ];
 
 		return intval( $form_id );
 	}
@@ -465,37 +465,37 @@ 
 
 	function add_scripts_and_styles( $hook ) {
 
-		if( ! class_exists( 'GFForms' ) ) {
+		if ( ! class_exists( 'GFForms' ) ) {
 			gravityview()->log->error( 'GFForms does not exist.' );
 			return;
 		}
 
 		// enqueue styles & scripts gf_entries
 		// But only if we're on the main Entries page, not on reports pages
-		if( GFForms::get_page() !== 'entry_list' ) {
+		if ( GFForms::get_page() !== 'entry_list' ) {
 			return;
 		}
 
 		$form_id = $this->get_form_id();
 
 		// Things are broken; no forms were found
-		if( empty( $form_id ) ) {
+		if ( empty( $form_id ) ) {
 			return;
 		}
 
-		wp_enqueue_style( 'gravityview_entries_list', plugins_url('assets/css/admin-entries-list.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
+		wp_enqueue_style( 'gravityview_entries_list', plugins_url( 'assets/css/admin-entries-list.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
 
-		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
-		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url('assets/js/admin-entries-list'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version );
+		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url( 'assets/js/admin-entries-list' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version );
 
 		wp_enqueue_script( 'gravityview_entries_list-popper', plugins_url( 'assets/lib/tippy/popper.min.js', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
 		wp_enqueue_script( 'gravityview_entries_list-tippy', plugins_url( 'assets/lib/tippy/tippy.min.js', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
 		wp_enqueue_style( 'gravityview_entries_list-tippy', plugins_url( 'assets/lib/tippy/tippy.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
 
 		wp_localize_script( 'gravityview_gf_entries_scripts', 'gvGlobals', array(
-			'nonce' => wp_create_nonce( 'gravityview_entry_approval'),
-			'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval'),
+			'nonce' => wp_create_nonce( 'gravityview_entry_approval' ),
+			'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval' ),
 			'form_id' => $form_id,
 			'show_column' => (int)$this->show_approve_entry_column( $form_id ),
 			'add_bulk_action' => (int)GVCommon::has_cap( 'gravityview_moderate_entries' ),
@@ -504,10 +504,10 @@ 
 			'status_unapproved' => GravityView_Entry_Approval_Status::UNAPPROVED,
 			'bulk_actions' => $this->get_bulk_actions( $form_id ),
 			'bulk_message' => $this->bulk_update_message,
-			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
-            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
-			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'),
-			'column_title' => __( 'Show entry in directory view?', 'gravityview'),
+			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'unapproved' ),
+            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr( 'disapproved' ),
+			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'approved' ),
+			'column_title' => __( 'Show entry in directory view?', 'gravityview' ),
 			'column_link' => esc_url( $this->get_sort_link() ),
             'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
 			'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
@@ -551,16 +551,16 @@ 
 		$bulk_actions = array(
 			'GravityView' => array(
 				array(
-					'label' => GravityView_Entry_Approval_Status::get_string('approved', 'action'),
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['approve'], $form_id ),
+					'label' => GravityView_Entry_Approval_Status::get_string( 'approved', 'action' ),
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'approve' ], $form_id ),
 				),
 				array(
-					'label' => GravityView_Entry_Approval_Status::get_string('disapproved', 'action'),
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['disapprove'], $form_id ),
+					'label' => GravityView_Entry_Approval_Status::get_string( 'disapproved', 'action' ),
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'disapprove' ], $form_id ),
 				),
 				array(
-					'label' => GravityView_Entry_Approval_Status::get_string('unapproved', 'action'),
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['unapprove'], $form_id ),
+					'label' => GravityView_Entry_Approval_Status::get_string( 'unapproved', 'action' ),
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'unapprove' ], $form_id ),
 				),
 			),
 		);
@@ -577,13 +577,13 @@ 
 		// Sanitize the values, just to be sure.
 		foreach ( $bulk_actions as $key => $group ) {
 
-		    if( empty( $group ) ) {
+		    if ( empty( $group ) ) {
 		        continue;
 		    }
 
 			foreach ( $group as $i => $action ) {
-				$bulk_actions[ $key ][ $i ]['label'] = esc_html( $bulk_actions[ $key ][ $i ]['label'] );
-				$bulk_actions[ $key ][ $i ]['value'] = esc_attr( $bulk_actions[ $key ][ $i ]['value'] );
+				$bulk_actions[ $key ][ $i ][ 'label' ] = esc_html( $bulk_actions[ $key ][ $i ][ 'label' ] );
+				$bulk_actions[ $key ][ $i ][ 'value' ] = esc_attr( $bulk_actions[ $key ][ $i ][ 'value' ] );
 			}
 		}
 
@@ -608,13 +608,13 @@ 
 		 * @since 1.7.2
 		 * @param boolean $hide_if_no_connections
 		 */
-		$hide_if_no_connections = apply_filters('gravityview/approve_entries/hide-if-no-connections', false );
+		$hide_if_no_connections = apply_filters( 'gravityview/approve_entries/hide-if-no-connections', false );
 
-		if( $hide_if_no_connections ) {
+		if ( $hide_if_no_connections ) {
 
 			$connected_views = gravityview_get_connected_views( $form_id );
 
-			if( empty( $connected_views ) ) {
+			if ( empty( $connected_views ) ) {
 				$show_approve_column = false;
 			}
 		}
@@ -624,21 +624,21 @@ 
 		 * @param boolean $show_approve_column Whether the column will be shown
 		 * @param int $form_id The ID of the Gravity Forms form for which entries are being shown
 		 */
-		$show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id );
+		$show_approve_column = apply_filters( 'gravityview/approve_entries/show-column', $show_approve_column, $form_id );
 
 		return $show_approve_column;
 	}
 
 	function register_gform_noconflict_script( $scripts ) {
-		$scripts[] = 'gravityview_gf_entries_scripts';
-		$scripts[] = 'gravityview_entries_list-popper';
-		$scripts[] = 'gravityview_entries_list-tippy';
+		$scripts[ ] = 'gravityview_gf_entries_scripts';
+		$scripts[ ] = 'gravityview_entries_list-popper';
+		$scripts[ ] = 'gravityview_entries_list-tippy';
 		return $scripts;
 	}
 
 	function register_gform_noconflict_style( $styles ) {
-		$styles[] = 'gravityview_entries_list';
-		$styles[] = 'gravityview_entries_list-tippy';
+		$styles[ ] = 'gravityview_entries_list';
+		$styles[ ] = 'gravityview_entries_list-tippy';
 		return $styles;
 	}
 

includes/class-admin.php

Spacing +42 added lines, -42 removed lines

@@ -4,10 +4,10 @@ 
 
 	function __construct() {
 
-		if( ! is_admin() ) { return; }
+		if ( ! is_admin() ) { return; }
 
 		// If Gravity Forms isn't active or compatibile, stop loading
-		if( false === GravityView_Compatibility::is_valid() ) {
+		if ( false === GravityView_Compatibility::is_valid() ) {
 			return;
 		}
 
@@ -48,7 +48,7 @@ 
 		add_filter( 'post_updated_messages', array( $this, 'post_updated_messages' ) );
 		add_filter( 'bulk_post_updated_messages', array( $this, 'post_updated_messages' ) );
 
-		add_filter( 'plugin_action_links_'. plugin_basename( GRAVITYVIEW_FILE ) , array( $this, 'plugin_action_links' ) );
+		add_filter( 'plugin_action_links_' . plugin_basename( GRAVITYVIEW_FILE ), array( $this, 'plugin_action_links' ) );
 
 		add_action( 'plugins_loaded', array( $this, 'backend_actions' ), 100 );
 
@@ -64,9 +64,9 @@ 
 	 */
 	public static function no_views_text() {
 
-		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] ) {
+		if ( isset( $_REQUEST[ 'post_status' ] ) && 'trash' === $_REQUEST[ 'post_status' ] ) {
 			return __( 'No Views found in Trash', 'gravityview' );
-		} elseif( ! empty( $_GET['s'] ) ) {
+		} elseif ( ! empty( $_GET[ 's' ] ) ) {
 			return __( 'No Views found.', 'gravityview' );
 		}
 
@@ -110,7 +110,7 @@ 
 			$error .= ' ' . esc_html__( 'or select another form.', 'gravityview' );
 		}
 
-		if( $error ) {
+		if ( $error ) {
 			?>
 			<div class="wp-dialog notice-warning inline error wp-clearfix">
 				<?php echo gravityview_get_floaty(); ?>
@@ -129,23 +129,23 @@ 
 	public function backend_actions() {
 
 		/** @define "GRAVITYVIEW_DIR" "../" */
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.field.type.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.render.settings.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-item.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-field.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-widget.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-views.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-welcome.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-installer.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-add-shortcode.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class.field.type.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class.render.settings.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-item.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-field.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-widget.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-views.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-welcome.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-installer.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-add-shortcode.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
 
 		/**
 		 * @action `gravityview_include_backend_actions` Triggered after all GravityView admin files are loaded
 		 *
 		 * Nice place to insert extensions' backend stuff
 		 */
-		do_action('gravityview_include_backend_actions');
+		do_action( 'gravityview_include_backend_actions' );
 	}
 
 	/**
@@ -161,12 +161,12 @@ 
 
 		$actions = array();
 
-		if( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
-			$actions[] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
+		if ( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
+			$actions[ ] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
 		}
 
-		if( GVCommon::has_cap( 'gravityview_support_port' ) ) {
-			$actions[] = '<a href="https://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
+		if ( GVCommon::has_cap( 'gravityview_support_port' ) ) {
+			$actions[ ] = '<a href="https://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
 		}
 
 		return array_merge( $actions, $links );
@@ -194,7 +194,7 @@ 
 		// By default, there will only be one item being modified.
 		// When in the `bulk_post_updated_messages` filter, there will be passed a number
 		// of modified items that will override this array.
-		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1 , 'locked' => 1 , 'deleted' => 1 , 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
+		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1, 'locked' => 1, 'deleted' => 1, 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
 
 		// If we're starting fresh, a new form was created.
 		// We should let the user know this is the case.
@@ -202,60 +202,60 @@ 
 
 		$new_form_text = '';
 
-		if( !empty( $start_fresh ) ) {
+		if ( ! empty( $start_fresh ) ) {
 
 			// Get the form that was created
 			$connected_form = gravityview_get_form_id( $post_id );
 
-			if( !empty( $connected_form ) ) {
+			if ( ! empty( $connected_form ) ) {
 				$form = gravityview_get_form( $connected_form );
-				$form_name = esc_attr( $form['title'] );
+				$form_name = esc_attr( $form[ 'title' ] );
 				$image = self::get_floaty();
-				$new_form_text .= '<h3>'.$image.sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ).'</h3>';
-				$new_form_text .=  sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
+				$new_form_text .= '<h3>' . $image . sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ) . '</h3>';
+				$new_form_text .= sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
 
 					You can %sedit the form%s in Gravity Forms and the updated fields will be available here. Don&rsquo;t forget to %scustomize the form settings%s.
-					', 'gravityview' ), '<strong>', '</strong>', '<a href="'.site_url( '?gf_page=preview&amp;id='.$connected_form ).'">', '</a>', '<code>[gravityform id="'.$connected_form.'" name="'.$form_name.'"]</code>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;id='.$connected_form ).'">', '</a>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id='.$connected_form ).'">', '</a>');
+					', 'gravityview' ), '<strong>', '</strong>', '<a href="' . site_url( '?gf_page=preview&amp;id=' . $connected_form ) . '">', '</a>', '<code>[gravityform id="' . $connected_form . '" name="' . $form_name . '"]</code>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&amp;id=' . $connected_form ) . '">', '</a>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=' . $connected_form ) . '">', '</a>' );
 				$new_form_text = wpautop( $new_form_text );
 
 				delete_post_meta( $post_id, '_gravityview_start_fresh' );
 			}
 		}
 
-		$messages['gravityview'] = array(
+		$messages[ 'gravityview' ] = array(
 			0  => '', // Unused. Messages start at index 1.
 			/* translators: %s and %s are HTML tags linking to the View on the website */
-			1  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+			1  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
 			/* translators: %s and %s are HTML tags linking to the View on the website */
-			2  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+			2  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
 			3  => __( 'View deleted.', 'gravityview' ),
 			/* translators: %s and %s are HTML tags linking to the View on the website */
-			4  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+			4  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
 			/* translators: %s: date and time of the revision */
-			5  => isset( $_GET['revision'] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+			5  => isset( $_GET[ 'revision' ] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int)$_GET[ 'revision' ], false ) ) : false,
 			/* translators: %s and %s are HTML tags linking to the View on the website */
-			6  => sprintf(__( 'View published. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
+			6  => sprintf( __( 'View published. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
 			/* translators: %s and %s are HTML tags linking to the View on the website */
-			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
+			7  => sprintf( __( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
 			8  => __( 'View submitted.', 'gravityview' ),
 			9  => sprintf(
 		        /* translators: Date and time the View is scheduled to be published */
 				__( 'View scheduled for: %1$s.', 'gravityview' ),
 				// translators: Publish box date format, see http://php.net/date
-				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
+				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL ) ) )
 			) . $new_form_text,
 			/* translators: %s and %s are HTML tags linking to the View on the website */
-			10  => sprintf(__( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
+			10  => sprintf( __( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
 
 			/**
 			 * These apply to `bulk_post_updated_messages`
 			 * @file wp-admin/edit.php
 			 */
-			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts['updated'], 'gravityview' ),
-			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts['locked'], 'gravityview' ),
-			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts['deleted'], 'gravityview' ),
-			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts['trashed'], 'gravityview' ),
-			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts['untrashed'], 'gravityview' ),
+			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts[ 'updated' ], 'gravityview' ),
+			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts[ 'locked' ], 'gravityview' ),
+			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts[ 'deleted' ], 'gravityview' ),
+			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts[ 'trashed' ], 'gravityview' ),
+			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts[ 'untrashed' ], 'gravityview' ),
 		);
 
 		return $messages;

Indentation +3 added lines, -4 removed lines

@@ -92,7 +92,7 @@ 
 	 * @return void
 	 */
 	public static function connected_form_warning( $form_id = 0 ) {
-        global $pagenow;
+		global $pagenow;
 
 		if ( empty( $form_id ) || $pagenow === 'post-new.php' ) {
 			return;
@@ -119,7 +119,7 @@ 
 			<?php
 		}
 
-        remove_action( 'gravityview/metaboxes/data-source/before', array( 'GravityView_Admin', 'connected_form_warning' ) );
+		remove_action( 'gravityview/metaboxes/data-source/before', array( 'GravityView_Admin', 'connected_form_warning' ) );
 	}
 
 	/**
@@ -241,7 +241,7 @@ 
 			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
 			8  => __( 'View submitted.', 'gravityview' ),
 			9  => sprintf(
-		        /* translators: Date and time the View is scheduled to be published */
+				/* translators: Date and time the View is scheduled to be published */
 				__( 'View scheduled for: %1$s.', 'gravityview' ),
 				// translators: Publish box date format, see http://php.net/date
 				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
@@ -298,7 +298,6 @@ 
 	 *
 	 * @deprecated since 1.12
 	 * @see GravityView_Compatibility::get_plugin_status()
-
 	 * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive
 	 */
 	static function get_plugin_status( $location = '' ) {

includes/widgets/search-widget/templates/search-field-search_all.php

Spacing +3 added lines, -3 removed lines

@@ -7,15 +7,15 @@
 
 $gravityview_view = GravityView_View::getInstance();
 $view_id = $gravityview_view->getViewId();
-$value = $gravityview_view->search_field['value'];
-$label = $gravityview_view->search_field['label'];
+$value = $gravityview_view->search_field[ 'value' ];
+$label = $gravityview_view->search_field[ 'label' ];
 
 $html_input_type = RGFormsModel::is_html5_enabled() ? 'search' : 'text';
 ?>
 
 <div class="gv-search-box gv-search-field-text gv-search-field-search_all">
 	<div class="gv-search">
-	<?php if( ! gv_empty( $label, false, false ) ) { ?>
+	<?php if ( ! gv_empty( $label, false, false ) ) { ?>
 		<label for="gv_search_<?php echo $view_id; ?>"><?php echo esc_html( $label ); ?></label>
 	<?php } ?>
 		<p><input type="<?php echo $html_input_type; ?>" name="gv_search" id="gv_search_<?php echo $view_id; ?>" value="<?php echo esc_attr( $value ); ?>" /></p>

includes/widgets/search-widget/templates/search-field-entry_id.php

Spacing +3 added lines, -3 removed lines

@@ -7,13 +7,13 @@
 
 $gravityview_view = GravityView_View::getInstance();
 $view_id = $gravityview_view->getViewId();
-$value = $gravityview_view->search_field['value'];
-$label = $gravityview_view->search_field['label'];
+$value = $gravityview_view->search_field[ 'value' ];
+$label = $gravityview_view->search_field[ 'label' ];
 ?>
 
 <div class="gv-search-box gv-search-field-entry_id">
 	<div class="gv-search">
-		<?php if( ! gv_empty( $label, false, false ) ) { ?>
+		<?php if ( ! gv_empty( $label, false, false ) ) { ?>
 		<label for="gv_entry_id_<?php echo $view_id; ?>"><?php echo esc_html( $label ); ?></label>
 		<?php } ?>
 		<p><input type="text" name="gv_id" id="gv_entry_id_<?php echo $view_id; ?>" value="<?php echo esc_attr( $value ); ?>" /></p>

includes/widgets/search-widget/templates/search-field-entry_date.php

Spacing +5 added lines, -5 removed lines

@@ -7,17 +7,17 @@
 
 $gravityview_view = GravityView_View::getInstance();
 $view_id = $gravityview_view->getViewId();
-$value = $gravityview_view->search_field['value'];
-$label = $gravityview_view->search_field['label'];
+$value = $gravityview_view->search_field[ 'value' ];
+$label = $gravityview_view->search_field[ 'label' ];
 
 ?>
 
 <div class="gv-search-box gv-search-date gv-search-date-range gv-search-field-entry_date">
-	<?php if( ! gv_empty( $label, false, false ) ) { ?>
+	<?php if ( ! gv_empty( $label, false, false ) ) { ?>
 	<label for="gv_start_date_<?php echo $view_id; ?>"><?php echo esc_html( $label ); ?></label>
 	<?php } ?>
 	<p>
-		<input name="gv_start" id="gv_start_date_<?php echo $view_id; ?>" type="text" class="<?php echo esc_attr( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('Start date', 'gravityview' ); ?>" value="<?php echo $value['start']; ?>">
-		<input name="gv_end" id="gv_end_date_<?php echo $view_id; ?>" type="text" class="<?php echo esc_attr( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('End date', 'gravityview' ); ?>" value="<?php echo $value['end']; ?>">
+		<input name="gv_start" id="gv_start_date_<?php echo $view_id; ?>" type="text" class="<?php echo esc_attr( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'Start date', 'gravityview' ); ?>" value="<?php echo $value[ 'start' ]; ?>">
+		<input name="gv_end" id="gv_end_date_<?php echo $view_id; ?>" type="text" class="<?php echo esc_attr( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'End date', 'gravityview' ); ?>" value="<?php echo $value[ 'end' ]; ?>">
 	</p>
 </div>
\ No newline at end of file

includes/widgets/search-widget/templates/search-field-date_range.php

Spacing +7 added lines, -7 removed lines

@@ -7,17 +7,17 @@
 
 $gravityview_view = GravityView_View::getInstance();
 $view_id = $gravityview_view->getViewId();
-$value = $gravityview_view->search_field['value'];
-$label = $gravityview_view->search_field['label'];
-$name = $gravityview_view->search_field['name'];
+$value = $gravityview_view->search_field[ 'value' ];
+$label = $gravityview_view->search_field[ 'label' ];
+$name = $gravityview_view->search_field[ 'name' ];
 ?>
 
 <div class="gv-search-box gv-search-date gv-search-date-range">
-	<?php if( ! gv_empty( $label, false, false ) ) { ?>
-	<label for="search-box-<?php echo esc_attr( $name ).'-start'; ?>"><?php echo esc_html( $label ); ?></label>
+	<?php if ( ! gv_empty( $label, false, false ) ) { ?>
+	<label for="search-box-<?php echo esc_attr( $name ) . '-start'; ?>"><?php echo esc_html( $label ); ?></label>
 	<?php } ?>
 	<p>
-		<input name="<?php echo esc_attr( $name ).'[start]'; ?>" id="search-box-<?php echo esc_attr( $name ).'-start'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('Start date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value['start'] ); ?>">
-		<input name="<?php echo esc_attr( $name ).'[end]'; ?>" id="search-box-<?php echo esc_attr( $name ).'-end'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('End date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value['end'] ); ?>">
+		<input name="<?php echo esc_attr( $name ) . '[start]'; ?>" id="search-box-<?php echo esc_attr( $name ) . '-start'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'Start date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value[ 'start' ] ); ?>">
+		<input name="<?php echo esc_attr( $name ) . '[end]'; ?>" id="search-box-<?php echo esc_attr( $name ) . '-end'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'End date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value[ 'end' ] ); ?>">
 	</p>
 </div>
\ No newline at end of file

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

Braces +3 added lines, -2 removed lines

@@ -79,8 +79,9 @@
 		 * Check permissions.
 		 */
 		while ( $error = $view->can_render( array( 'shortcode' ), $request ) ) {
-			if ( ! is_wp_error( $error ) )
-				break;
+			if ( ! is_wp_error( $error ) ) {
+							break;
+			}
 
 			switch ( str_replace( 'gravityview/', '', $error->get_error_code() ) ) {
 				case 'post_password_required':

Spacing +20 added lines, -20 removed lines

@@ -43,8 +43,8 @@ 
 			'class' => '',
 		) );
 
-		if ( ! $view_id = $atts['id'] ? : $atts['view_id'] ) {
-			if ( $atts['detail'] && $view = $request->is_view() ) {
+		if ( ! $view_id = $atts[ 'id' ] ?: $atts[ 'view_id' ] ) {
+			if ( $atts[ 'detail' ] && $view = $request->is_view() ) {
 				$view_id = $view->ID;
 			}
 		}
@@ -114,12 +114,12 @@ 
 			}
 		}
 
-		$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 );
 
 		/**
 		 * View details.
 		 */
-		if ( $atts['detail'] ) {
+		if ( $atts[ 'detail' ] ) {
 			$entries = $view->get_entries( $request );
 			return self::_return( $this->detail( $view, $entries, $atts ) );
 
@@ -136,7 +136,7 @@ 
 				return self::_return( '' );
 			}
 
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
 			}
@@ -147,7 +147,7 @@ 
 			}
 
 			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 self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
 				}
@@ -170,7 +170,7 @@ 
 			$entryset = $entry->is_multi() ? $entry->entries : array( $entry );
 
 			foreach ( $entryset as $e ) {
-				if ( $e['status'] != 'active' ) {
+				if ( $e[ 'status' ] != 'active' ) {
 					gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) );
 					return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
 				}
@@ -181,7 +181,7 @@ 
 				}
 
 				if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 						gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) );
 						return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
 					}
@@ -206,10 +206,10 @@ 
 
 				// Mock the request with the actual View, not the global one
 				$mock_request = new \GV\Mock_Request();
-				$mock_request->returns['is_view'] = $view;
-				$mock_request->returns['is_entry'] = $request->is_entry( $view->form ? $view->form->ID : 0 );
-				$mock_request->returns['is_edit_entry'] = $request->is_edit_entry( $view->form ? $view->form->ID : 0 );
-				$mock_request->returns['is_search'] = $request->is_search();
+				$mock_request->returns[ 'is_view' ] = $view;
+				$mock_request->returns[ 'is_entry' ] = $request->is_entry( $view->form ? $view->form->ID : 0 );
+				$mock_request->returns[ 'is_edit_entry' ] = $request->is_edit_entry( $view->form ? $view->form->ID : 0 );
+				$mock_request->returns[ 'is_search' ] = $request->is_search();
 
 				$request = $mock_request;
 			}
@@ -245,16 +245,16 @@ 
 		$filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' );
 
 		// Only keep the passed attributes after making sure that they're valid pairs
-		$filtered_atts = array_intersect_key( (array) $passed_atts, $filtered_atts );
+		$filtered_atts = array_intersect_key( (array)$passed_atts, $filtered_atts );
 
 		$atts = array();
 
-		foreach( $filtered_atts as $key => $passed_value ) {
+		foreach ( $filtered_atts as $key => $passed_value ) {
 
 			// Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by}
 			$passed_value = \GravityView_Merge_Tags::replace_variables( $passed_value );
 
-			switch( $defaults[ $key ]['type'] ) {
+			switch ( $defaults[ $key ][ 'type' ] ) {
 
 				/**
 				 * Make sure number fields are numeric.
@@ -262,7 +262,7 @@ 
 				 * @see http://php.net/manual/en/function.is-numeric.php#107326
 				 */
 				case 'number':
-					if( is_numeric( $passed_value ) ) {
+					if ( is_numeric( $passed_value ) ) {
 						$atts[ $key ] = ( $passed_value + 0 );
 					}
 					break;
@@ -277,8 +277,8 @@ 
 				 */
 				case 'select':
 				case 'radio':
-					$options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options'];
-					if( in_array( $passed_value, array_keys( $options ) ) ) {
+					$options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ];
+					if ( in_array( $passed_value, array_keys( $options ) ) ) {
 						$atts[ $key ] = $passed_value;
 					}
 					break;
@@ -290,7 +290,7 @@ 
 			}
 		}
 
-		$atts['detail'] = \GV\Utils::get( $passed_atts, 'detail', null );
+		$atts[ 'detail' ] = \GV\Utils::get( $passed_atts, 'detail', null );
 
 		return $atts;
 	}
@@ -307,7 +307,7 @@ 
 	private function detail( $view, $entries, $atts ) {
 		$output = '';
 
-		switch ( $key = $atts['detail'] ):
+		switch ( $key = $atts[ 'detail' ] ):
 			case 'total_entries':
 				$output = number_format_i18n( $entries->total() );
 				break;

includes/class-admin-installer.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	 *
 	 * @param array $items Scripts or styles to exclude from no-conflict
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	public function register_noconflict( $items ) {
 

Braces +1 added lines, -3 removed lines

@@ -449,9 +449,7 @@
 			$button_label = sprintf( __( 'Upgrade to %s for Access', 'gravityview' ), $required_license );
 			$button_class = 'button-primary button-large';
 			$href         = 'https://gravityview.co/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' );

Indentation +94 added lines, -94 removed lines

@@ -66,9 +66,9 @@ 
 	 */
 	public function add_downloads_data_filters() {
 
-	    $downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT );
+		$downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT );
 
-	    if ( ! $downloads_data && ! isset( $_GET['cache'] ) ) {
+		if ( ! $downloads_data && ! isset( $_GET['cache'] ) ) {
 			return;
 		}
 
@@ -97,7 +97,7 @@ 
 	 */
 	public function add_admin_menu() {
 
-	    $menu_text = _x( 'Extensions', 'Extensions are WordPress plugins that add functionality to GravityView and Gravity Forms', 'gravityview' );
+		$menu_text = _x( 'Extensions', 'Extensions are WordPress plugins that add functionality to GravityView and Gravity Forms', 'gravityview' );
 
 		$menu_text = sprintf( '<span title="%s" style="margin: 0">%s</span>', esc_attr__( 'Plugins that extend GravityView and Gravity Forms functionality.', 'gravityview' ), $menu_text );
 
@@ -112,8 +112,8 @@ 
 	}
 
 	/**
-     * When on the Installer page, show a different notice than on the Settings page
-     *
+	 * When on the Installer page, show a different notice than on the Settings page
+	 *
 	 * @param array $notice
 	 *
 	 * @return string License notice
@@ -121,10 +121,10 @@ 
 	public function maybe_modify_license_notice( $notice = '' ) {
 
 		if ( ! gravityview()->request->is_admin( '', 'downloads' ) ) {
-            return $notice;
-        }
+			return $notice;
+		}
 
-        return esc_html__( 'Your license %s. Do you want access to these plugins? %sActivate your license%s or %sget a license here%s.', 'gravityview' );
+		return esc_html__( 'Your license %s. Do you want access to these plugins? %sActivate your license%s or %sget a license here%s.', 'gravityview' );
 	}
 
 	/**
@@ -162,43 +162,43 @@ 
 	 * Get downloads data from transient or from API; save transient after getting data from API
 	 *
 	 * @return WP_Error|array If error, returns WP_Error. If not valid JSON, empty array. Otherwise, this structure: {
-     *   @type array  $info {
-     *       @type string $id int 17
-     *       @type string $slug Extension slug
-     *       @type string $title Extension title
-     *       @type string $create_date in '2018-07-19 20:03:10' format
-     *       @type string $modified_date
-     *       @type string $status
-     *       @type string $link URL to public plugin page
-     *       @type string $content
-     *       @type string $excerpt
-     *       @type string $thumbnail URL to thumbnail
-     *       @type array  $category Taxonomy details for the plugin's category {
-     *         @type int $term_id => int 30
-     *         @type string $name => string 'Plugins' (length=7)
-     *         @type string $slug => string 'plugins' (length=7)
-     *         @type int $term_group => int 0
-     *         @type int $term_taxonomy_id => int 30
-     *         @type string $taxonomy => string 'download_category' (length=17)
-     *         @type string $description => string '' (length=0)
-     *         @type int $parent => int 0
-     *         @type int $count => int 4
-     *         @type string $filter => string 'raw' (length=3)
-     *       }
-     *       @type array $tags {see $category above}
-     *       @type string $textdomain string 'gravityview' (length=11)
-     *   }
-     *   @type array $pricing array of `price_name_slugs` => '00.00' values, if price options exist
-     *   @type array $licensing {
-     *       @type bool   $enabled Is licensing enabled for the extension
-     *       @type string $version Version number
-     *       @type string $exp_unit Expiration unit ('years')
-     *       @type string $exp_length Expiration length ('1')
-     *   }
-     *   @type array $files Array of files. Empty if user has no access to the file. {
-     *       @type string $file string URL of the file download
-     *   }
-     * }
+	 *   @type array  $info {
+	 *       @type string $id int 17
+	 *       @type string $slug Extension slug
+	 *       @type string $title Extension title
+	 *       @type string $create_date in '2018-07-19 20:03:10' format
+	 *       @type string $modified_date
+	 *       @type string $status
+	 *       @type string $link URL to public plugin page
+	 *       @type string $content
+	 *       @type string $excerpt
+	 *       @type string $thumbnail URL to thumbnail
+	 *       @type array  $category Taxonomy details for the plugin's category {
+	 *         @type int $term_id => int 30
+	 *         @type string $name => string 'Plugins' (length=7)
+	 *         @type string $slug => string 'plugins' (length=7)
+	 *         @type int $term_group => int 0
+	 *         @type int $term_taxonomy_id => int 30
+	 *         @type string $taxonomy => string 'download_category' (length=17)
+	 *         @type string $description => string '' (length=0)
+	 *         @type int $parent => int 0
+	 *         @type int $count => int 4
+	 *         @type string $filter => string 'raw' (length=3)
+	 *       }
+	 *       @type array $tags {see $category above}
+	 *       @type string $textdomain string 'gravityview' (length=11)
+	 *   }
+	 *   @type array $pricing array of `price_name_slugs` => '00.00' values, if price options exist
+	 *   @type array $licensing {
+	 *       @type bool   $enabled Is licensing enabled for the extension
+	 *       @type string $version Version number
+	 *       @type string $exp_unit Expiration unit ('years')
+	 *       @type string $exp_length Expiration length ('1')
+	 *   }
+	 *   @type array $files Array of files. Empty if user has no access to the file. {
+	 *       @type string $file string URL of the file download
+	 *   }
+	 * }
 	 */
 	public function get_downloads_data() {
 
@@ -230,7 +230,7 @@ 
 		) );
 
 		if ( is_wp_error( $response ) ) {
-		    gravityview()->log->error( "Extension data response is an error", array( 'data' => $response ) );
+			gravityview()->log->error( "Extension data response is an error", array( 'data' => $response ) );
 			return $response;
 		}
 
@@ -283,10 +283,10 @@ 
                 <div class="gv-admin-installer-notice notice inline error">
                     <h3><?php esc_html_e( 'Extensions and plugins data cannot be loaded at the moment. Please try again later.', 'gravityview' ); ?></h3>
                     <?php
-                    if ( is_wp_error( $downloads_data ) ) {
-	                    echo wpautop( '<pre>' . esc_html( $downloads_data->get_error_message() ) . '</pre>' );
-                    }
-                    ?>
+					if ( is_wp_error( $downloads_data ) ) {
+						echo wpautop( '<pre>' . esc_html( $downloads_data->get_error_message() ) . '</pre>' );
+					}
+					?>
                 </div>
             </div>
 			<?php
@@ -342,9 +342,9 @@ 
 	protected function render_download( $download, $wp_plugins ) {
 
 
-        $details = $this->get_download_display_details( $download, $wp_plugins );
+		$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'] ); ?>">
@@ -366,43 +366,43 @@ 
 
                 <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>' );
-                    $replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' );
+					// Allow some pure HTML tags, but remove everything else from the excerpt.
+					$tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' );
+					$replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' );
 
-                    $excerpt = str_replace( $tags, $replacements, $excerpt );
-                    $excerpt = esc_html( strip_tags( $excerpt ) );
+					$excerpt = str_replace( $tags, $replacements, $excerpt );
+					$excerpt = esc_html( strip_tags( $excerpt ) );
 					$excerpt = str_replace( $replacements, $tags, $excerpt );
 
 					echo wpautop( $excerpt );
-                ?></div>
+				?></div>
             </div>
         </div>
 		<?php
 	}
 
 	/**
-     * Generates details array for the download to keep the render_download() method a bit tidier
-     *
+	 * Generates details array for the download to keep the render_download() method a bit tidier
+	 *
 	 * @param array $download Single download, as returned by {@see get_downloads_data}
 	 * @param array $wp_plugins All active plugins, as returned by {@see get_plugins()}
 	 *
 	 * @return array {
-     *   @type array $download_info
-     *   @type string $plugin_path
-     *   @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc)
-     *   @type string $status_label
-     *   @type string $button_title Title attribute to show when hovering over the download's button
-     *   @type string $button_class CSS class to use for the button
-     *   @type string $button_label Text to use for the download's anchor link
-     *   @type string $href URL for the download's button
-     *   @type bool   $spinner Whether to show the spinner icon
-     *   @type string $item_class CSS class for the download container
-     *   @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions")
-     *   @type bool   $is_active Is the current GravityView license (as entered in Settings) active?
-     * }
+	 *   @type array $download_info
+	 *   @type string $plugin_path
+	 *   @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc)
+	 *   @type string $status_label
+	 *   @type string $button_title Title attribute to show when hovering over the download's button
+	 *   @type string $button_class CSS class to use for the button
+	 *   @type string $button_label Text to use for the download's anchor link
+	 *   @type string $href URL for the download's button
+	 *   @type bool   $spinner Whether to show the spinner icon
+	 *   @type string $item_class CSS class for the download container
+	 *   @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions")
+	 *   @type bool   $is_active Is the current GravityView license (as entered in Settings) active?
+	 * }
 	 */
 	private function get_download_display_details( $download, $wp_plugins ) {
 
@@ -413,7 +413,7 @@ 
 			'slug' => '',
 			'excerpt' => '',
 			'link' => '',
-            'coming_soon' => false,
+			'coming_soon' => false,
 			'installer_title' => null, // May not be defined
 			'installer_excerpt' => null, // May not be defined
 		) );
@@ -456,14 +456,14 @@ 
 			$href         = 'https://gravityview.co/pricing/?utm_source=admin-installer&utm_medium=admin&utm_campaign=Admin%20Notice&utm_content=' . $required_license;
 		}
 
-        elseif ( ! empty( $download_info['coming_soon'] ) ) {
-	        $spinner      = false;
-	        $status       = 'notinstalled';
-	        $status_label = __( 'Coming Soon', 'gravityview' );
-	        $button_label = __( 'Learn More', 'gravityview' );
-	        $button_class = 'button-primary button-large';
-	        $href         = \GV\Utils::get( $download_info, 'link', 'https://gravityview.co/extensions/' );
-        }
+		elseif ( ! empty( $download_info['coming_soon'] ) ) {
+			$spinner      = false;
+			$status       = 'notinstalled';
+			$status_label = __( 'Coming Soon', 'gravityview' );
+			$button_label = __( 'Learn More', 'gravityview' );
+			$button_class = 'button-primary button-large';
+			$href         = \GV\Utils::get( $download_info, 'link', 'https://gravityview.co/extensions/' );
+		}
 
 		// Access but the plugin is not installed
 		elseif ( ! $wp_plugin ) {
@@ -503,18 +503,18 @@ 
 		}
 
 		return compact( 'download_info','plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' );
-    }
+	}
 
 	/**
-     * Returns the base price for an extension
-     *
+	 * Returns the base price for an extension
+	 *
 	 * @param array $download
 	 *
 	 * @return float Base price for an extension. If not for sale separately, returns 0
 	 */
 	private function get_download_base_price( $download ) {
 
-	    $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 );
+		$base_price = \GV\Utils::get( $download, 'pricing/amount', 0 );
 		$base_price = \GFCommon::to_number( $base_price );
 
 		unset( $download['pricing']['amount'] );
@@ -525,7 +525,7 @@ 
 		}
 
 		return floatval( $base_price );
-    }
+	}
 
 	/**
 	 * Handle AJAX request to activate extension
@@ -543,8 +543,8 @@ 
 
 		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() )
-            ) );
+				'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() )
+			) );
 		}
 
 		wp_send_json_success();
@@ -565,10 +565,10 @@ 
 		deactivate_plugins( $data['path'] );
 
 		if( is_plugin_active( $data['path'] ) ) {
-            wp_send_json_error( array(
-                'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) )
-            ) );
-        }
+			wp_send_json_error( array(
+				'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) )
+			) );
+		}
 
 		wp_send_json_success();
 	}

Spacing +49 added lines, -49 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' ],
 				);
 			}
 
@@ -144,13 +144,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 )
 			);
 		}
@@ -208,7 +208,7 @@ 
 			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();
@@ -236,13 +236,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' ];
 	}
 
 	/**
@@ -315,7 +315,7 @@ 
 
 				foreach ( $downloads_data as $extension ) {
 
-					if ( empty( $extension['info'] ) ) {
+					if ( empty( $extension[ 'info' ] ) ) {
 						continue;
 					}
 
@@ -344,29 +344,29 @@ 
 
         $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 } ?>
 
-                    <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 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>
                 </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>' );
@@ -406,7 +406,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' => '',
@@ -418,9 +418,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 = '';
@@ -430,7 +430,7 @@ 
 		$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_class = 'disabled disabled-license';
@@ -443,7 +443,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';
 		}
 
@@ -456,7 +456,7 @@ 
 			$href         = 'https://gravityview.co/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' );
@@ -471,8 +471,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' )
 			);
@@ -484,25 +484,25 @@ 
 		}
 
 		// Access and the plugin is installed but not active
-		elseif ( false === $wp_plugin['activated'] ) {
+		elseif ( false === $wp_plugin[ 'activated' ] ) {
 			$status = 'inactive';
 			$status_label = __( 'Inactive', 'gravityview' );
 			$button_label = __( 'Activate', 'gravityview' );
-			$plugin_path = $wp_plugin['path'];
+			$plugin_path = $wp_plugin[ 'path' ];
 
 		}
 
 		// Access and the plugin is installed and active
 		else {
 
-			$plugin_path = $wp_plugin['path'];
+			$plugin_path = $wp_plugin[ 'path' ];
 			$status = 'active';
 			$status_label = __( 'Active', 'gravityview' );
 			$button_label = __( 'Deactivate', 'gravityview' );
 
 		}
 
-		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' );
     }
 
 	/**
@@ -517,11 +517,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 );
@@ -535,13 +535,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() )
             ) );
@@ -558,13 +558,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' ) )
             ) );