gravityview / GravityView

includes/admin/metaboxes/views/data-source.php

Spacing +7 added lines, -7 removed lines

@@ -11,13 +11,13 @@ 
 wp_nonce_field( 'gravityview_select_form', 'gravityview_select_form_nonce' );
 
 //current value
-$current_form = (int) rgar( (array) $_GET, 'form_id', gravityview_get_form_id( $post->ID ) );
+$current_form = (int)rgar( (array)$_GET, 'form_id', gravityview_get_form_id( $post->ID ) );
 
 // If form is in trash or not existing, show error
 GravityView_Admin::connected_form_warning( $current_form );
 
 // check for available gravity forms
-$forms = gravityview_get_forms('any');
+$forms = gravityview_get_forms( 'any' );
 ?>
 <label for="gravityview_form_id" ><?php esc_html_e( 'Where would you like the data to come from for this View?', 'gravityview' ); ?></label>
 
@@ -28,24 +28,24 @@ 
 		?>
 		<a class="button button-primary" href="#gv_start_fresh" title="<?php esc_attr_e( 'Start Fresh', 'gravityview' ); ?>"><?php esc_html_e( 'Start Fresh', 'gravityview' ); ?></a>
 
-		<?php if( !empty( $forms ) ) { ?>
+		<?php if ( ! empty( $forms ) ) { ?>
 			<span>&nbsp;<?php esc_html_e( 'or use an existing form', 'gravityview' ); ?>&nbsp;</span>
 		<?php }
 	}
 
 	// If there are no forms to select, show no forms.
-	if( !empty( $forms ) ) { ?>
+	if ( ! empty( $forms ) ) { ?>
 		<select name="gravityview_form_id" id="gravityview_form_id">
 			<option value="" <?php selected( '', $current_form, true ); ?>>&mdash; <?php esc_html_e( 'list of forms', 'gravityview' ); ?> &mdash;</option>
-			<?php foreach( $forms as $form ) { ?>
-				<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
+			<?php foreach ( $forms as $form ) { ?>
+				<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
 			<?php } ?>
 		</select>
 	<?php } else { ?>
 		<select name="gravityview_form_id" id="gravityview_form_id" class="hidden"><option selected="selected" value=""></option></select>
 	<?php } ?>
 
-	&nbsp;<a class="button button-primary" <?php if( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" href="#gv_switch_view" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></a>
+	&nbsp;<a class="button button-primary" <?php if ( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" href="#gv_switch_view" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></a>
 </p>
 
 <?php // confirm dialog box ?>

includes/class-frontend-views.php

Spacing +109 added lines, -109 removed lines

@@ -85,9 +85,9 @@ 
 	private function __construct() {}
 
 	private function initialize() {
-		add_action( 'wp', array( $this, 'parse_content'), 11 );
+		add_action( 'wp', array( $this, 'parse_content' ), 11 );
 		add_filter( 'parse_query', array( $this, 'parse_query_fix_frontpage' ), 10 );
-		add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 );
+		add_action( 'template_redirect', array( $this, 'set_entry_data' ), 1 );
 
 		// Enqueue scripts and styles after GravityView_Template::register_styles()
 		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 );
@@ -234,15 +234,15 @@ 
 
 			$this->context_view_id = $view_id;
 
-		} elseif ( isset( $_GET['gvid'] ) && $this->getGvOutputData()->has_multiple_views() ) {
+		} elseif ( isset( $_GET[ 'gvid' ] ) && $this->getGvOutputData()->has_multiple_views() ) {
 			/**
 			 * used on a has_multiple_views context
 			 * @see GravityView_API::entry_link
 			 * @see GravityView_View_Data::getInstance()->has_multiple_views()
 			 */
-			$this->context_view_id = $_GET['gvid'];
+			$this->context_view_id = $_GET[ 'gvid' ];
 
-		} elseif ( ! $this->getGvOutputData()->has_multiple_views() )  {
+		} elseif ( ! $this->getGvOutputData()->has_multiple_views() ) {
 			$array_keys = array_keys( $this->getGvOutputData()->get_views() );
 			$this->context_view_id = array_pop( $array_keys );
 			unset( $array_keys );
@@ -277,24 +277,24 @@ 
 		global $wp_rewrite;
 
 		$is_front_page = ( $query->is_home || $query->is_page );
-		$show_on_front = ( 'page' === get_option('show_on_front') );
-		$front_page_id = get_option('page_on_front');
+		$show_on_front = ( 'page' === get_option( 'show_on_front' ) );
+		$front_page_id = get_option( 'page_on_front' );
 
-		if (  $is_front_page && $show_on_front && $front_page_id ) {
+		if ( $is_front_page && $show_on_front && $front_page_id ) {
 
 			// Force to be an array, potentially a query string ( entry=16 )
 			$_query = wp_parse_args( $query->query );
 
 			// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
-			if ( isset( $_query['pagename'] ) && '' === $_query['pagename'] ) {
-				unset( $_query['pagename'] );
+			if ( isset( $_query[ 'pagename' ] ) && '' === $_query[ 'pagename' ] ) {
+				unset( $_query[ 'pagename' ] );
 			}
 
 			// this is where will break from core wordpress
 			$ignore = array( 'preview', 'page', 'paged', 'cpage' );
 			$endpoints = rgobj( $wp_rewrite, 'endpoints' );
-			foreach ( (array) $endpoints as $endpoint ) {
-				$ignore[] = $endpoint[1];
+			foreach ( (array)$endpoints as $endpoint ) {
+				$ignore[ ] = $endpoint[ 1 ];
 			}
 			unset( $endpoints );
 
@@ -304,21 +304,21 @@ 
 			// - The query includes keys that are associated with registered endpoints. `entry`, for example.
 			if ( empty( $_query ) || ! array_diff( array_keys( $_query ), $ignore ) ) {
 
-				$qv =& $query->query_vars;
+				$qv = & $query->query_vars;
 
 				// Prevent redirect when on the single entry endpoint
-				if( self::is_single_entry() ) {
+				if ( self::is_single_entry() ) {
 					add_filter( 'redirect_canonical', '__return_false' );
 				}
 
 				$query->is_page = true;
 				$query->is_home = false;
-				$qv['page_id']  = $front_page_id;
+				$qv[ 'page_id' ]  = $front_page_id;
 
 				// Correct <!--nextpage--> for page_on_front
-				if ( ! empty( $qv['paged'] ) ) {
-					$qv['page'] = $qv['paged'];
-					unset( $qv['paged'] );
+				if ( ! empty( $qv[ 'paged' ] ) ) {
+					$qv[ 'page' ] = $qv[ 'paged' ];
+					unset( $qv[ 'paged' ] );
 				}
 			}
 
@@ -336,7 +336,7 @@ 
 		global $post;
 
 		// If in admin and NOT AJAX request, get outta here.
-		if ( GravityView_Plugin::is_admin() )  {
+		if ( GravityView_Plugin::is_admin() ) {
 			return;
 		}
 
@@ -348,7 +348,7 @@ 
 
 		$this->setIsGravityviewPostType( get_post_type( $post ) === 'gravityview' );
 
-		$post_id = $this->getPostId() ? $this->getPostId() : (isset( $post ) ? $post->ID : null );
+		$post_id = $this->getPostId() ? $this->getPostId() : ( isset( $post ) ? $post->ID : null );
 		$this->setPostId( $post_id );
 		$post_has_shortcode = ! empty( $post->post_content ) ? gravityview_has_shortcode_r( $post->post_content, 'gravityview' ) : false;
 		$this->setPostHasShortcode( $this->isGravityviewPostType() ? null : ! empty( $post_has_shortcode ) );
@@ -384,7 +384,7 @@ 
 
 		$search_method = GravityView_Widget_Search::getInstance()->get_search_method();
 
-		if( 'post' === $search_method ) {
+		if ( 'post' === $search_method ) {
 			$get = $_POST;
 		} else {
 			$get = $_GET;
@@ -440,20 +440,20 @@ 
 		 * @param boolean $in_the_loop Whether to apply the filter to the menu title and the meta tag <title> - outside the loop
 		 * @param array $entry Current entry
 		 */
-		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop' , in_the_loop(), $entry );
+		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop', in_the_loop(), $entry );
 
 		if ( ! $apply_outside_loop ) {
 			return $title;
 		}
 
 		// User reported WooCommerce doesn't pass two args.
-		if ( empty( $passed_post_id ) )  {
+		if ( empty( $passed_post_id ) ) {
 			return $title;
 		}
 
 		// Don't modify the title for anything other than the current view/post.
 		// This is true for embedded shortcodes and Views.
-		if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) {
+		if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) {
 			return $title;
 		}
 
@@ -463,19 +463,19 @@ 
 			$view_meta = $this->getGvOutputData()->get_view( $context_view_id );
 		} else {
 			foreach ( $this->getGvOutputData()->get_views() as $view_id => $view_data ) {
-				if ( intval( $view_data['form_id'] ) === intval( $entry['form_id'] ) ) {
+				if ( intval( $view_data[ 'form_id' ] ) === intval( $entry[ 'form_id' ] ) ) {
 					$view_meta = $view_data;
 					break;
 				}
 			}
 		}
 
-		if ( ! empty( $view_meta['atts']['single_title'] ) ) {
+		if ( ! empty( $view_meta[ 'atts' ][ 'single_title' ] ) ) {
 
-			$title = $view_meta['atts']['single_title'];
+			$title = $view_meta[ 'atts' ][ 'single_title' ];
 
 			// We are allowing HTML in the fields, so no escaping the output
-			$title = GravityView_API::replace_variables( $title, $view_meta['form'], $entry );
+			$title = GravityView_API::replace_variables( $title, $view_meta[ 'form' ], $entry );
 
 			$title = do_shortcode( $title );
 		}
@@ -576,7 +576,7 @@ 
 	public function render_view( $passed_args ) {
 
 		// validate attributes
-		if ( empty( $passed_args['id'] ) ) {
+		if ( empty( $passed_args[ 'id' ] ) ) {
 			do_action( 'gravityview_log_error', '[render_view] Returning; no ID defined.', $passed_args );
 			return null;
 		}
@@ -598,7 +598,7 @@ 
 			return null;
 		}
 
-		$view_id = $passed_args['id'];
+		$view_id = $passed_args[ 'id' ];
 
 		$view_data = $this->getGvOutputData()->get_view( $view_id, $passed_args );
 
@@ -611,7 +611,7 @@ 
 		$passed_args = array_filter( $passed_args, 'strlen' );
 
 		//Override shortcode args over View template settings
-		$atts = wp_parse_args( $passed_args, $view_data['atts'] );
+		$atts = wp_parse_args( $passed_args, $view_data[ 'atts' ] );
 
 		do_action( 'gravityview_log_debug', '[render_view] Arguments after merging with View settings: ', $atts );
 
@@ -634,14 +634,14 @@ 
 		 * @since 1.15
 		 * @since 1.17.2 Added check for if a user has no caps but is logged in (member of multisite, but not any site). Treat as if logged-out.
 		 */
-		if( is_user_logged_in() && ! ( empty( wp_get_current_user()->caps ) && empty( wp_get_current_user()->roles ) ) && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
+		if ( is_user_logged_in() && ! ( empty( wp_get_current_user()->caps ) && empty( wp_get_current_user()->roles ) ) && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
 
 			do_action( 'gravityview_log_debug', sprintf( '%s Returning: View %d is not visible by current user.', __METHOD__, $view_id ) );
 
 			return null;
 		}
 
-		if( $this->isGravityviewPostType() ) {
+		if ( $this->isGravityviewPostType() ) {
 
 			/**
 			 * @filter `gravityview_direct_access` Should Views be directly accessible, or only visible using the shortcode?
@@ -653,9 +653,9 @@ 
 			 */
 			$direct_access = apply_filters( 'gravityview_direct_access', true, $view_id );
 
-			$embed_only = ! empty( $atts['embed_only'] );
+			$embed_only = ! empty( $atts[ 'embed_only' ] );
 
-			if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
+			if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
 		}
@@ -670,7 +670,7 @@ 
 
 		$gravityview_view = new GravityView_View( $view_data );
 
-		$post_id = ! empty( $atts['post_id'] ) ? intval( $atts['post_id'] ) : $this->getPostId();
+		$post_id = ! empty( $atts[ 'post_id' ] ) ? intval( $atts[ 'post_id' ] ) : $this->getPostId();
 
 		$gravityview_view->setPostId( $post_id );
 
@@ -680,20 +680,20 @@ 
 			do_action( 'gravityview_log_debug', '[render_view] Executing Directory View' );
 
 			//fetch template and slug
-			$view_slug = apply_filters( 'gravityview_template_slug_'. $view_data['template_id'], 'table', 'directory' );
+			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data[ 'template_id' ], 'table', 'directory' );
 
 			do_action( 'gravityview_log_debug', '[render_view] View template slug: ', $view_slug );
 
 			/**
 			 * Disable fetching initial entries for views that don't need it (DataTables)
 			 */
-			$get_entries = apply_filters( 'gravityview_get_view_entries_'.$view_slug, true );
+			$get_entries = apply_filters( 'gravityview_get_view_entries_' . $view_slug, true );
 
 			/**
 			 * Hide View data until search is performed
 			 * @since 1.5.4
 			 */
-			if ( ! empty( $atts['hide_until_searched'] ) && ! $this->isSearch() ) {
+			if ( ! empty( $atts[ 'hide_until_searched' ] ) && ! $this->isSearch() ) {
 				$gravityview_view->setHideUntilSearched( true );
 				$get_entries = false;
 			}
@@ -701,23 +701,23 @@ 
 
 			if ( $get_entries ) {
 
-				if ( ! empty( $atts['sort_columns'] ) ) {
+				if ( ! empty( $atts[ 'sort_columns' ] ) ) {
 					// add filter to enable column sorting
-					add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ) , 100, 3 );
+					add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ), 100, 3 );
 				}
 
-				$view_entries = self::get_view_entries( $atts, $view_data['form_id'] );
+				$view_entries = self::get_view_entries( $atts, $view_data[ 'form_id' ] );
 
-				do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries['count'], sizeof( $view_entries['entries'] ) ) );
+				do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries[ 'count' ], sizeof( $view_entries[ 'entries' ] ) ) );
 
 			} else {
 
 				$view_entries = array( 'count' => null, 'entries' => null, 'paging' => null );
 
-				do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_'.$view_slug.'` is false' );
+				do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_' . $view_slug . '` is false' );
 			}
 
-			$gravityview_view->setPaging( $view_entries['paging'] );
+			$gravityview_view->setPaging( $view_entries[ 'paging' ] );
 			$gravityview_view->setContext( 'directory' );
 			$sections = array( 'header', 'body', 'footer' );
 
@@ -731,7 +731,7 @@ 
 			 * @action `gravityview_render_entry_{View ID}` Before rendering a single entry for a specific View ID
 			 * @since 1.17
 			 */
-			do_action( 'gravityview_render_entry_'.$view_data['id'] );
+			do_action( 'gravityview_render_entry_' . $view_data[ 'id' ] );
 
 			$entry = $this->getEntry();
 
@@ -758,20 +758,20 @@ 
 			// We're in single view, but the view being processed is not the same view the single entry belongs to.
 			// important: do not remove this as it prevents fake attempts of displaying entries from other views/forms
 			if ( $this->getGvOutputData()->has_multiple_views() && $view_id != $this->get_context_view_id() ) {
-				do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: '. $view_id );
+				do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: ' . $view_id );
 				return null;
 			}
 
 			//fetch template and slug
-			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data['template_id'], 'table', 'single' );
+			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data[ 'template_id' ], 'table', 'single' );
 			do_action( 'gravityview_log_debug', '[render_view] View single template slug: ', $view_slug );
 
 			//fetch entry detail
-			$view_entries['count'] = 1;
-			$view_entries['entries'][] = $entry;
-			do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries['entries'] );
+			$view_entries[ 'count' ] = 1;
+			$view_entries[ 'entries' ][ ] = $entry;
+			do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries[ 'entries' ] );
 
-			$back_link_label = isset( $atts['back_link_label'] ) ? $atts['back_link_label'] : null;
+			$back_link_label = isset( $atts[ 'back_link_label' ] ) ? $atts[ 'back_link_label' ] : null;
 
 			// set back link label
 			$gravityview_view->setBackLinkLabel( $back_link_label );
@@ -781,11 +781,11 @@ 
 		}
 
 		// add template style
-		self::add_style( $view_data['template_id'] );
+		self::add_style( $view_data[ 'template_id' ] );
 
 		// Prepare to render view and set vars
-		$gravityview_view->setEntries( $view_entries['entries'] );
-		$gravityview_view->setTotalEntries( $view_entries['count'] );
+		$gravityview_view->setEntries( $view_entries[ 'entries' ] );
+		$gravityview_view->setTotalEntries( $view_entries[ 'count' ] );
 
 		// If Edit
 		if ( 'edit' === gravityview_get_context() ) {
@@ -798,11 +798,11 @@ 
 
 		} else {
 			// finaly we'll render some html
-			$sections = apply_filters( 'gravityview_render_view_sections', $sections, $view_data['template_id'] );
+			$sections = apply_filters( 'gravityview_render_view_sections', $sections, $view_data[ 'template_id' ] );
 
 			do_action( 'gravityview_log_debug', '[render_view] Sections to render: ', $sections );
 			foreach ( $sections as $section ) {
-				do_action( 'gravityview_log_debug', '[render_view] Rendering '. $section . ' section.' );
+				do_action( 'gravityview_log_debug', '[render_view] Rendering ' . $section . ' section.' );
 				$gravityview_view->render( $view_slug, $section, false );
 			}
 		}
@@ -856,7 +856,7 @@ 
 				$datetime_format = 'Y-m-d H:i:s';
 				$search_is_outside_view_bounds = false;
 
-				if( ! empty( $search_criteria[ $key ] ) ) {
+				if ( ! empty( $search_criteria[ $key ] ) ) {
 
 					$search_date = strtotime( $search_criteria[ $key ] );
 
@@ -884,14 +884,14 @@ 
 				if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) {
 
 					// Then we override the search and re-set the start date
-					$return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true );
+					$return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true );
 				}
 			}
 		}
 
-		if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) {
+		if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) {
 			// The start date is AFTER the end date. This will result in no results, but let's not force the issue.
-			if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) {
+			if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) {
 				do_action( 'gravityview_log_error', __METHOD__ . ' Invalid search: the start date is after the end date.', $return_search_criteria );
 			}
 		}
@@ -910,19 +910,19 @@ 
 	public static function process_search_only_approved( $args, $search_criteria ) {
 
 		/** @since 1.19 */
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
 			do_action( 'gravityview_log_debug', __METHOD__ . ': User can moderate entries; showing all approval statuses' );
 			return $search_criteria;
 		}
 
-		if ( ! empty( $args['show_only_approved'] ) ) {
+		if ( ! empty( $args[ 'show_only_approved' ] ) ) {
 
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => GravityView_Entry_Approval::meta_key,
 				'value' => GravityView_Entry_Approval_Status::APPROVED
 			);
 
-			$search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met
 
 			do_action( 'gravityview_log_debug', '[process_search_only_approved] Search Criteria if show only approved: ', $search_criteria );
 		}
@@ -949,18 +949,18 @@ 
 	 */
 	public static function is_entry_approved( $entry, $args = array() ) {
 
-		if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) {
+		if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) {
 			// is implicitly approved if entry is null or View settings doesn't require to check for approval
 			return true;
 		}
 
 		/** @since 1.19 */
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
 			do_action( 'gravityview_log_debug', __METHOD__ . ': User can moderate entries, so entry is approved for viewing' );
 			return true;
 		}
 
-		$is_approved = gform_get_meta( $entry['id'], GravityView_Entry_Approval::meta_key );
+		$is_approved = gform_get_meta( $entry[ 'id' ], GravityView_Entry_Approval::meta_key );
 
 		return GravityView_Entry_Approval_Status::is_approved( $is_approved );
 	}
@@ -994,26 +994,26 @@ 
 		do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', $search_criteria );
 
 		// implicity search
-		if ( ! empty( $args['search_value'] ) ) {
+		if ( ! empty( $args[ 'search_value' ] ) ) {
 
 			// Search operator options. Options: `is` or `contains`
-			$operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains';
+			$operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains';
 
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => rgget( 'search_field', $args ), // The field ID to search
-				'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes.
+				'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes.
 				'operator' => $operator,
 			);
 		}
 
-		if( $search_criteria !== $original_search_criteria ) {
+		if ( $search_criteria !== $original_search_criteria ) {
 			do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after implicity search: ', $search_criteria );
 		}
 
 		// Handle setting date range
 		$search_criteria = self::process_search_dates( $args, $search_criteria );
 
-		if( $search_criteria !== $original_search_criteria ) {
+		if ( $search_criteria !== $original_search_criteria ) {
 			do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after date params: ', $search_criteria );
 		}
 
@@ -1024,7 +1024,7 @@ 
 		 * @filter `gravityview_status` Modify entry status requirements to be included in search results.
 		 * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash`
 		 */
-		$search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args );
+		$search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args );
 
 		return $search_criteria;
 	}
@@ -1070,16 +1070,16 @@ 
 		$search_criteria = self::get_search_criteria( $args, $form_id );
 
 		// Paging & offset
-		$page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : apply_filters( 'gravityview_default_page_size', 25 );
+		$page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : apply_filters( 'gravityview_default_page_size', 25 );
 
 		if ( -1 === $page_size ) {
 			$page_size = PHP_INT_MAX;
 		}
 
-		if ( isset( $args['offset'] ) ) {
-			$offset = intval( $args['offset'] );
+		if ( isset( $args[ 'offset' ] ) ) {
+			$offset = intval( $args[ 'offset' ] );
 		} else {
-			$curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] );
+			$curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] );
 			$offset = ( $curr_page - 1 ) * $page_size;
 		}
 
@@ -1097,7 +1097,7 @@ 
 			'search_criteria' => $search_criteria,
 			'sorting' => $sorting,
 			'paging' => $paging,
-			'cache' => isset( $args['cache'] ) ? $args['cache'] : true,
+			'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true,
 		);
 
 		/**
@@ -1122,7 +1122,7 @@ 
 		 * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys.
 		 * @param array $args View configuration args.
 		 */
-		$parameters = apply_filters( 'gravityview_get_entries_'.$args['id'], $parameters, $args, $form_id );
+		$parameters = apply_filters( 'gravityview_get_entries_' . $args[ 'id' ], $parameters, $args, $form_id );
 
 		do_action( 'gravityview_log_debug', __METHOD__ . ': $parameters passed to gravityview_get_entries(): ', $parameters );
 
@@ -1162,8 +1162,8 @@ 
 	 */
 	public static function updateViewSorting( $args, $form_id ) {
 		$sorting = array();
-		$sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : rgar( $args, 'sort_field' );
-		$sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : rgar( $args, 'sort_direction' );
+		$sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : rgar( $args, 'sort_field' );
+		$sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : rgar( $args, 'sort_direction' );
 
 		$sort_field_id = self::_override_sorting_id_by_field_type( $sort_field_id, $form_id );
 
@@ -1203,11 +1203,11 @@ 
 
 		$sort_field = GFFormsModel::get_field( $form, $sort_field_id );
 
-		if( ! $sort_field ) {
+		if ( ! $sort_field ) {
 			return $sort_field_id;
 		}
 
-		switch ( $sort_field['type'] ) {
+		switch ( $sort_field[ 'type' ] ) {
 
 			case 'address':
 				// Sorting by full address
@@ -1224,7 +1224,7 @@ 
 					 */
 					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
 
-					switch( strtolower( $address_part ) ){
+					switch ( strtolower( $address_part ) ) {
 						case 'street':
 							$sort_field_id .= '.1';
 							break;
@@ -1304,7 +1304,7 @@ 
 		 */
 		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
 
-		if ( empty( $single_entry ) ){
+		if ( empty( $single_entry ) ) {
 			return false;
 		} else {
 			return $single_entry;
@@ -1331,7 +1331,7 @@ 
 				 * Don't enqueue the scripts or styles if it's not going to be displayed.
 				 * @since 1.15
 				 */
-				if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
+				if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
 					continue;
 				}
 
@@ -1340,19 +1340,19 @@ 
 				$css_dependencies = array();
 
 				// If the thickbox is enqueued, add dependencies
-				if ( ! empty( $data['atts']['lightbox'] ) ) {
+				if ( ! empty( $data[ 'atts' ][ 'lightbox' ] ) ) {
 
 					/**
 					 * @filter `gravity_view_lightbox_script` Override the lightbox script to enqueue. Default: `thickbox`
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of it here.
 					 */
-					$js_dependencies[] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' );
+					$js_dependencies[ ] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' );
 
 					/**
 					 * @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox`
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of its CSS file here.
 					 */
-					$css_dependencies[] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' );
+					$css_dependencies[ ] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' );
 				}
 
 				/**
@@ -1360,25 +1360,25 @@ 
 				 * @see https://github.com/katzwebservices/GravityView/issues/536
 				 * @since 1.15
 				 */
-				if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) {
-					$css_dependencies[] = 'dashicons';
+				if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) {
+					$css_dependencies[ ] = 'dashicons';
 				}
 
 				wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
 
 				$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
-				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ) , GravityView_Plugin::version, true );
+				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ), GravityView_Plugin::version, true );
 
 				wp_enqueue_script( 'gravityview-fe-view' );
 
-				if ( ! empty( $data['atts']['sort_columns'] ) ) {
+				if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) {
 					wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
 				}
 
 				$this->enqueue_default_style( $css_dependencies );
 
-				self::add_style( $data['template_id'] );
+				self::add_style( $data[ 'template_id' ] );
 			}
 
 			if ( 'wp_print_footer_scripts' === current_filter() ) {
@@ -1440,7 +1440,7 @@ 
 		} elseif ( empty( $template_id ) ) {
 			do_action( 'gravityview_log_error', '[add_style] Cannot add template style; template_id is empty' );
 		} else {
-			do_action( 'gravityview_log_error', sprintf( '[add_style] Cannot add template style; %s is not registered', 'gravityview_style_'.$template_id ) );
+			do_action( 'gravityview_log_error', sprintf( '[add_style] Cannot add template style; %s is not registered', 'gravityview_style_' . $template_id ) );
 		}
 
 	}
@@ -1465,11 +1465,11 @@ 
 		 * Not a table-based template; don't add sort icons
 		 * @since 1.12
 		 */
-		if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
+		if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
 			return $label;
 		}
 
-		if ( ! $this->is_field_sortable( $field['id'], $form ) ) {
+		if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) {
 			return $label;
 		}
 
@@ -1477,29 +1477,29 @@ 
 
 		$class = 'gv-sort';
 
-		$sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] );
+		$sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] );
 
 		$sort_args = array(
-			'sort' => $field['id'],
+			'sort' => $field[ 'id' ],
 			'dir' => 'asc',
 		);
 
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
 			//toggle sorting direction.
-			if ( 'asc' === $sorting['direction'] ) {
-				$sort_args['dir'] = 'desc';
+			if ( 'asc' === $sorting[ 'direction' ] ) {
+				$sort_args[ 'dir' ] = 'desc';
 				$class .= ' gv-icon-sort-desc';
 			} else {
-				$sort_args['dir'] = 'asc';
+				$sort_args[ 'dir' ] = 'asc';
 				$class .= ' gv-icon-sort-asc';
 			}
 		} else {
 			$class .= ' gv-icon-caret-up-down';
 		}
 
-		$url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) );
+		$url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) );
 
-		return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a>&nbsp;'. $label;
+		return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a>&nbsp;' . $label;
 
 	}
 
@@ -1517,7 +1517,7 @@ 
 
 		$field_type = $field_id;
 
-		if( is_numeric( $field_id ) ) {
+		if ( is_numeric( $field_id ) ) {
 			$field = GFFormsModel::get_field( $form, $field_id );
 			$field_type = $field->type;
 		}
@@ -1540,7 +1540,7 @@ 
 			return false;
 		}
 
-		return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
+		return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
 
 	}
 

includes/class-common.php

Spacing +101 added lines, -101 removed lines

@@ -124,7 +124,7 @@ 
 
 		$entry = self::get_entry( $entry_slug, true );
 
-		$form = self::get_form( $entry['form_id'] );
+		$form = self::get_form( $entry[ 'form_id' ] );
 
 		return $form;
 	}
@@ -182,7 +182,7 @@ 
 
 		$results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging );
 
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
+		$result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null;
 
 		return $result;
 	}
@@ -199,10 +199,10 @@ 
 	 *
 	 * @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms
 	 */
-	public static function get_forms(  $active = true, $trash = false ) {
+	public static function get_forms( $active = true, $trash = false ) {
 		$forms = array();
 		if ( class_exists( 'GFAPI' ) ) {
-			if( 'any' === $active ) {
+			if ( 'any' === $active ) {
 				$active_forms = GFAPI::get_forms( true, $trash );
 				$inactive_forms = GFAPI::get_forms( false, $trash );
 				$forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) );
@@ -233,9 +233,9 @@ 
 		$has_post_fields = false;
 
 		if ( $form ) {
-			foreach ( $form['fields'] as $field ) {
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
-					$fields["{$field['id']}"] = array(
+			foreach ( $form[ 'fields' ] as $field ) {
+				if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) {
+					$fields[ "{$field[ 'id' ]}" ] = array(
 						'label' => rgar( $field, 'label' ),
 						'parent' => null,
 						'type' => rgar( $field, 'type' ),
@@ -244,10 +244,10 @@ 
 					);
 				}
 
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
-					foreach ( $field['inputs'] as $input ) {
+				if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) {
+					foreach ( $field[ 'inputs' ] as $input ) {
 
-						if( ! empty( $input['isHidden'] ) ) {
+						if ( ! empty( $input[ 'isHidden' ] ) ) {
 							continue;
 						}
 
@@ -255,10 +255,10 @@ 
                          * @hack
                          * In case of email/email confirmation, the input for email has the same id as the parent field
                          */
-						if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
+						if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) {
                             continue;
                         }
-						$fields["{$input['id']}"] = array(
+						$fields[ "{$input[ 'id' ]}" ] = array(
 							'label' => rgar( $input, 'label' ),
 							'customLabel' => rgar( $input, 'customLabel' ),
 							'parent' => $field,
@@ -270,7 +270,7 @@ 
 				}
 
 
-				if( GFCommon::is_product_field( $field['type'] ) ){
+				if ( GFCommon::is_product_field( $field[ 'type' ] ) ) {
 					$has_product_fields = true;
 				}
 
@@ -284,7 +284,7 @@ 
 		 * @since 1.7
 		 */
 		if ( $has_post_fields ) {
-			$fields['post_id'] = array(
+			$fields[ 'post_id' ] = array(
 				'label' => __( 'Post ID', 'gravityview' ),
 				'type' => 'post_id',
 			);
@@ -295,10 +295,10 @@ 
 			$payment_fields = GravityView_Fields::get_all( 'pricing' );
 
 			foreach ( $payment_fields as $payment_field ) {
-				if( isset( $fields["{$payment_field->name}"] ) ) {
+				if ( isset( $fields[ "{$payment_field->name}" ] ) ) {
 					continue;
 				}
-				$fields["{$payment_field->name}"] = array(
+				$fields[ "{$payment_field->name}" ] = array(
 					'label' => $payment_field->label,
 					'desc' => $payment_field->description,
 					'type' => $payment_field->name,
@@ -330,9 +330,9 @@ 
 
 		$fields = array();
 
-		foreach ( $extra_fields as $key => $field ){
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
+		foreach ( $extra_fields as $key => $field ) {
+			if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) {
+				$fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' );
 			}
 		}
 
@@ -372,32 +372,32 @@ 
 			'search_criteria' => null,
 			'sorting' => null,
 			'paging' => null,
-			'cache' => (isset( $passed_criteria['cache'] ) ? $passed_criteria['cache'] : true),
+			'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? $passed_criteria[ 'cache' ] : true ),
 		);
 
 		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
 
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) ) {
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
+		if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+			foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) {
 
 				if ( ! is_array( $filter ) ) {
 					continue;
 				}
 
 				// By default, we want searches to be wildcard for each field.
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
+				$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
 
 				/**
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
 				 * @param string $operator Existing search operator
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
 				 */
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
+				$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter );
 			}
 
 			// don't send just the [mode] without any field filter.
-			if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) {
-				unset( $criteria['search_criteria']['field_filters']['mode'] );
+			if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+				unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] );
 			}
 
 		}
@@ -408,21 +408,21 @@ 
 		 * Prepare date formats to be in Gravity Forms DB format;
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
 		 */
-		foreach ( array('start_date', 'end_date' ) as $key ) {
+		foreach ( array( 'start_date', 'end_date' ) as $key ) {
 
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
+			if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) {
 
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
-				$date = date_create( $criteria['search_criteria'][ $key ] );
+				$date = date_create( $criteria[ 'search_criteria' ][ $key ] );
 
 				if ( $date ) {
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
+					$criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' );
 				} else {
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
-					unset( $criteria['search_criteria'][ $key ] );
+					unset( $criteria[ 'search_criteria' ][ $key ] );
 
-					do_action( 'gravityview_log_error', '[filter_get_entries_criteria] '.$key.' Date format not valid:', $criteria['search_criteria'][ $key ] );
+					do_action( 'gravityview_log_error', '[filter_get_entries_criteria] ' . $key . ' Date format not valid:', $criteria[ 'search_criteria' ][ $key ] );
 				}
 			}
 		}
@@ -430,12 +430,12 @@ 
 
 		// When multiple views are embedded, OR single entry, calculate the context view id and send it to the advanced filter
 		if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() || GravityView_frontend::getInstance()->getSingleEntry() ) {
-			$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
+			$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
 		} elseif ( 'delete' === RGForms::get( 'action' ) ) {
-			$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null;
-		} elseif( !isset( $criteria['context_view_id'] ) ) {
+			$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null;
+		} elseif ( ! isset( $criteria[ 'context_view_id' ] ) ) {
             // Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget)
-			$criteria['context_view_id'] = null;
+			$criteria[ 'context_view_id' ] = null;
 		}
 
 		/**
@@ -444,7 +444,7 @@ 
 		 * @param array $form_ids Forms to search
 		 * @param int $view_id ID of the view being used to search
 		 */
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
+		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] );
 
 		return (array)$criteria;
 
@@ -475,7 +475,7 @@ 
 		/** Reduce # of database calls */
 		add_filter( 'gform_is_encrypted_field', '__return_false' );
 
-		if ( ! empty( $criteria['cache'] ) ) {
+		if ( ! empty( $criteria[ 'cache' ] ) ) {
 
 			$Cache = new GravityView_Cache( $form_ids, $criteria );
 
@@ -483,7 +483,7 @@ 
 
 				// Still update the total count when using cached results
 				if ( ! is_null( $total ) ) {
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
+					$total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] );
 				}
 
 				$return = $entries;
@@ -503,9 +503,9 @@ 
 			$entries = apply_filters( 'gravityview_before_get_entries', null, $criteria, $passed_criteria, $total );
 
 			// No entries returned from gravityview_before_get_entries
-			if( is_null( $entries ) ) {
+			if ( is_null( $entries ) ) {
 
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
+				$entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total );
 
 				if ( is_wp_error( $entries ) ) {
 					do_action( 'gravityview_log_error', $entries->get_error_message(), $entries );
@@ -514,7 +514,7 @@ 
 				}
 			}
 
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
 
 				// Cache results
 				$Cache->set( $entries, 'entries' );
@@ -619,7 +619,7 @@ 
 			 */
 			$check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry );
 
-			if( $check_entry_display ) {
+			if ( $check_entry_display ) {
 				// Is the entry allowed
 				$entry = self::check_entry_display( $entry );
 			}
@@ -652,12 +652,12 @@ 
 
 		$value = false;
 
-		if( 'context' === $val1 ) {
+		if ( 'context' === $val1 ) {
 
 			$matching_contexts = array( $val2 );
 
 			// We allow for non-standard contexts.
-			switch( $val2 ) {
+			switch ( $val2 ) {
 				// Check for either single or edit
 				case 'singular':
 					$matching_contexts = array( 'single', 'edit' );
@@ -717,7 +717,7 @@ 
 			return false;
 		}
 
-		if ( empty( $entry['form_id'] ) ) {
+		if ( empty( $entry[ 'form_id' ] ) ) {
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry is empty! Entry:', $entry );
 			return false;
 		}
@@ -725,26 +725,26 @@ 
 		$criteria = self::calculate_get_entries_criteria();
 
 		// Make sure the current View is connected to the same form as the Entry
-		if( ! empty( $criteria['context_view_id'] ) ) {
-			$context_view_id = intval( $criteria['context_view_id'] );
+		if ( ! empty( $criteria[ 'context_view_id' ] ) ) {
+			$context_view_id = intval( $criteria[ 'context_view_id' ] );
 			$context_form_id = gravityview_get_form_id( $context_view_id );
-			if( intval( $context_form_id ) !== intval( $entry['form_id'] ) ) {
-				do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry['form_id'] ), $criteria['context_view_id'] );
+			if ( intval( $context_form_id ) !== intval( $entry[ 'form_id' ] ) ) {
+				do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry[ 'form_id' ] ), $criteria[ 'context_view_id' ] );
 				return false;
 			}
 		}
 
-		if ( empty( $criteria['search_criteria'] ) || ! is_array( $criteria['search_criteria'] ) ) {
+		if ( empty( $criteria[ 'search_criteria' ] ) || ! is_array( $criteria[ 'search_criteria' ] ) ) {
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No search criteria found:', $criteria );
 			return $entry;
 		}
 
-		$search_criteria = $criteria['search_criteria'];
+		$search_criteria = $criteria[ 'search_criteria' ];
 		unset( $criteria );
 
 		// check entry status
-		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria['status'] != $entry['status'] ) {
-			do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status'] ), $search_criteria );
+		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria[ 'status' ] != $entry[ 'status' ] ) {
+			do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry[ 'status' ] ), $search_criteria );
 			return false;
 		}
 
@@ -752,37 +752,37 @@ 
 		// @todo: Does it make sense to apply the Date create filters to the single entry?
 
 		// field_filters
-		if ( empty( $search_criteria['field_filters'] ) || ! is_array( $search_criteria['field_filters'] ) ) {
+		if ( empty( $search_criteria[ 'field_filters' ] ) || ! is_array( $search_criteria[ 'field_filters' ] ) ) {
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No field filters criteria found:', $search_criteria );
 			return $entry;
 		}
 
-		$filters = $search_criteria['field_filters'];
+		$filters = $search_criteria[ 'field_filters' ];
 		unset( $search_criteria );
 
-		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters['mode'] ) : 'all';
-		unset( $filters['mode'] );
+		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters[ 'mode' ] ) : 'all';
+		unset( $filters[ 'mode' ] );
 
-		$form = self::get_form( $entry['form_id'] );
+		$form = self::get_form( $entry[ 'form_id' ] );
 
 		foreach ( $filters as $filter ) {
 
-			if ( ! isset( $filter['key'] ) ) {
+			if ( ! isset( $filter[ 'key' ] ) ) {
 				continue;
 			}
 
-			$k = $filter['key'];
+			$k = $filter[ 'key' ];
 
 			if ( in_array( $k, array( 'created_by', 'payment_status' ) ) ) {
 				$field_value = $entry[ $k ];
 				$field = null;
 			} else {
 				$field = self::get_field( $form, $k );
-				$field_value  = GFFormsModel::get_lead_field_value( $entry, $field );
+				$field_value = GFFormsModel::get_lead_field_value( $entry, $field );
 			}
 
-			$operator = isset( $filter['operator'] ) ? strtolower( $filter['operator'] ) : 'is';
-			$is_value_match = GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field );
+			$operator = isset( $filter[ 'operator' ] ) ? strtolower( $filter[ 'operator' ] ) : 'is';
+			$is_value_match = GFFormsModel::is_value_match( $field_value, $filter[ 'value' ], $operator, $field );
 
 			// verify if we are already free to go!
 			if ( ! $is_value_match && 'all' === $mode ) {
@@ -840,18 +840,18 @@ 
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
 		 * @see GFCommon::format_date() for original code
 		 */
-		$date_gmt_time   = mysql2date( 'G', $date_string );
+		$date_gmt_time = mysql2date( 'G', $date_string );
 		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
 
-		$format  = rgar( $atts, 'format' );
-		$is_human  = ! empty( $atts['human'] );
-		$is_diff  = ! empty( $atts['diff'] );
-		$is_raw = ! empty( $atts['raw'] );
-		$is_timestamp = ! empty( $atts['timestamp'] );
-		$include_time = ! empty( $atts['time'] );
+		$format = rgar( $atts, 'format' );
+		$is_human = ! empty( $atts[ 'human' ] );
+		$is_diff = ! empty( $atts[ 'diff' ] );
+		$is_raw = ! empty( $atts[ 'raw' ] );
+		$is_timestamp = ! empty( $atts[ 'timestamp' ] );
+		$include_time = ! empty( $atts[ 'time' ] );
 
 		// If we're using time diff, we want to have a different default format
-		if( empty( $format ) ) {
+		if ( empty( $format ) ) {
 			/* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */
 			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
 		}
@@ -859,7 +859,7 @@ 
 		// If raw was specified, don't modify the stored value
 		if ( $is_raw ) {
 			$formatted_date = $date_string;
-		} elseif( $is_timestamp ) {
+		} elseif ( $is_timestamp ) {
 			$formatted_date = $date_local_timestamp;
 		} elseif ( $is_diff ) {
 			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
@@ -893,7 +893,7 @@ 
 
 		$label = rgar( $field, 'label' );
 
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
 			$label = GFFormsModel::get_choice_text( $field, $field_value, $field_id );
 		}
 
@@ -914,7 +914,7 @@ 
 	 * @return GF_Field|null Gravity Forms field object, or NULL: Gravity Forms GFFormsModel does not exist or field at $field_id doesn't exist.
 	 */
 	public static function get_field( $form, $field_id ) {
-		if ( class_exists( 'GFFormsModel' ) ){
+		if ( class_exists( 'GFFormsModel' ) ) {
 			return GFFormsModel::get_field( $form, $field_id );
 		} else {
 			return null;
@@ -961,19 +961,19 @@ 
 			$shortcodes = array();
 
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
-			if ( empty( $matches ) ){
+			if ( empty( $matches ) ) {
 				return false;
 			}
 
 			foreach ( $matches as $shortcode ) {
-				if ( $tag === $shortcode[2] ) {
+				if ( $tag === $shortcode[ 2 ] ) {
 
 					// Changed this to $shortcode instead of true so we get the parsed atts.
-					$shortcodes[] = $shortcode;
+					$shortcodes[ ] = $shortcode;
 
-				} else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) {
-					foreach( $results as $result ) {
-						$shortcodes[] = $result;
+				} else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
+					foreach ( $results as $result ) {
+						$shortcodes[ ] = $result;
 					}
 				}
 			}
@@ -1117,7 +1117,7 @@ 
 	public static function get_directory_fields( $post_id, $apply_filter = true ) {
 		$fields = get_post_meta( $post_id, '_gravityview_directory_fields', true );
 
-		if( $apply_filter ) {
+		if ( $apply_filter ) {
 			/**
 			 * @filter `gravityview/configuration/fields` Filter the View fields' configuration array
 			 * @since 1.6.5
@@ -1140,7 +1140,7 @@ 
 	 * @return string         html
 	 */
 	public static function get_sortable_fields( $formid, $current = '' ) {
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>';
+		$output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default', 'gravityview' ) . '</option>';
 
 		if ( empty( $formid ) ) {
 			return $output;
@@ -1153,11 +1153,11 @@ 
 			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null );
 
 			foreach ( $fields as $id => $field ) {
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 					continue;
 				}
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>';
 			}
 		}
 
@@ -1192,9 +1192,9 @@ 
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
 
 		// TODO: Convert to using array_filter
-		foreach( $fields as $id => $field ) {
+		foreach ( $fields as $id => $field ) {
 
-			if( in_array( $field['type'], $blacklist_field_types ) ) {
+			if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 				unset( $fields[ $id ] );
 			}
 		}
@@ -1235,14 +1235,14 @@ 
 	 * @param  int|array  $field field key or field array
 	 * @return boolean
 	 */
-	public static function is_field_numeric(  $form = null, $field = '' ) {
+	public static function is_field_numeric( $form = null, $field = '' ) {
 
 		if ( ! is_array( $form ) && ! is_array( $field ) ) {
 			$form = self::get_form( $form );
 		}
 
 		// If entry meta, it's a string. Otherwise, numeric
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
+		if ( ! is_numeric( $field ) && is_string( $field ) ) {
 			$type = $field;
 		} else {
 			$type = self::get_field_type( $form, $field );
@@ -1256,9 +1256,9 @@ 
 		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
 
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
-			if( true === $gv_field->is_numeric ) {
-				$numeric_types[] = $gv_field->is_numeric;
+		if ( $gv_field = GravityView_Fields::get( $type ) ) {
+			if ( true === $gv_field->is_numeric ) {
+				$numeric_types[ ] = $gv_field->is_numeric;
 			}
 		}
 
@@ -1408,18 +1408,18 @@ 
 		$final_atts = array_filter( $final_atts );
 
 		// If the href wasn't passed as an attribute, use the value passed to the function
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
-			$final_atts['href'] = $href;
+		if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) {
+			$final_atts[ 'href' ] = $href;
 		}
 
-		$final_atts['href'] = esc_url_raw( $href );
+		$final_atts[ 'href' ] = esc_url_raw( $href );
 
 		/**
 		 * Fix potential security issue with target=_blank
 		 * @see https://dev.to/ben/the-targetblank-vulnerability-by-example
 		 */
-		if( '_blank' === rgar( $final_atts, 'target' ) ) {
-			$final_atts['rel'] = trim( rgar( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
+		if ( '_blank' === rgar( $final_atts, 'target' ) ) {
+			$final_atts[ 'rel' ] = trim( rgar( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
 		}
 
 		// Sort the attributes alphabetically, to help testing
@@ -1431,7 +1431,7 @@ 
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
 		}
 
-		if( '' !== $output ) {
+		if ( '' !== $output ) {
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
 		}
 
@@ -1458,7 +1458,7 @@ 
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
 			} else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) {
-				$merged[] = $value;
+				$merged[ ] = $value;
 			} else {
 				$merged[ $key ] = $value;
 			}
@@ -1491,7 +1491,7 @@ 
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
 		 */
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
+		$get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
 
 		return get_users( $get_users_settings );
 	}
@@ -1506,7 +1506,7 @@ 
      * @return string
      */
     public static function generate_notice( $notice, $class = '' ) {
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
     }
 
 	/**

includes/class-gravityview-entry-approval.php

Spacing +42 added lines, -42 removed lines

@@ -39,13 +39,13 @@ 
 	private function add_hooks() {
 
 		// in case entry is edited (on admin or frontend)
-		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2);
+		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2 );
 
 		// when using the User opt-in field, check on entry submission
 		add_action( 'gform_after_submission', array( $this, 'after_submission' ), 10, 2 );
 
 		// process ajax approve entry requests
-		add_action('wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved'));
+		add_action( 'wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved' ) );
 
 	}
 
@@ -62,13 +62,13 @@ 
 	 */
 	public static function get_entry_status( $entry, $value_or_label = 'label' ) {
 
-		$entry_id = is_array( $entry ) ? $entry['id'] : GVCommon::get_entry_id( $entry, true );
+		$entry_id = is_array( $entry ) ? $entry[ 'id' ] : GVCommon::get_entry_id( $entry, true );
 
 		$status = gform_get_meta( $entry_id, self::meta_key );
 
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
 
-		if( 'value' === $value_or_label ) {
+		if ( 'value' === $value_or_label ) {
 			return $status;
 		}
 
@@ -93,20 +93,20 @@ 
 	 */
 	public function ajax_update_approved() {
 		
-		$form_id = intval( rgpost('form_id') );
+		$form_id = intval( rgpost( 'form_id' ) );
 
 		// We always want requests from the admin to allow entry IDs, but not from the frontend
 		// There's another nonce sent when approving entries in the admin that we check
 		$force_entry_ids = rgpost( 'admin_nonce' ) && wp_verify_nonce( rgpost( 'admin_nonce' ), 'gravityview_admin_entry_approval' );
 		
-		$entry_id = GVCommon::get_entry_id( rgpost('entry_slug'), $force_entry_ids );
+		$entry_id = GVCommon::get_entry_id( rgpost( 'entry_slug' ), $force_entry_ids );
 
-		$approval_status = rgpost('approved');
+		$approval_status = rgpost( 'approved' );
 
-		$nonce = rgpost('nonce');
+		$nonce = rgpost( 'nonce' );
 
 		// Valid status
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
 
 			do_action( 'gravityview_log_error', __METHOD__ . ': Invalid approval status', $_POST );
 
@@ -137,7 +137,7 @@ 
 
 			do_action( 'gravityview_log_error', __METHOD__ . ' User does not have the `gravityview_moderate_entries` capability.' );
 
-			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview') );
+			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview' ) );
 
 		}
 
@@ -170,7 +170,7 @@ 
 	 * @param $form array Gravity Forms form object
 	 */
 	public function after_submission( $entry, $form ) {
-		$this->after_update_entry_update_approved_meta( $form , $entry['id'] );
+		$this->after_update_entry_update_approved_meta( $form, $entry[ 'id' ] );
 	}
 
 	/**
@@ -184,12 +184,12 @@ 
 	 */
 	public function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) {
 
-		$approved_column = self::get_approved_column( $form['id'] );
+		$approved_column = self::get_approved_column( $form[ 'id' ] );
 
 		/**
 		 * If the form doesn't contain the approve field, don't assume anything.
 		 */
-		if( empty( $approved_column ) ) {
+		if ( empty( $approved_column ) ) {
 			return;
 		}
 
@@ -203,7 +203,7 @@ 
 			$value = GravityView_Entry_Approval_Status::APPROVED;
 		}
 
-		self::update_approved_meta( $entry_id, $value, $form['id'] );
+		self::update_approved_meta( $entry_id, $value, $form[ 'id' ] );
 	}
 
 	/**
@@ -221,12 +221,12 @@ 
 	 */
 	public static function update_bulk( $entries = array(), $approved, $form_id ) {
 
-		if( empty($entries) || ( $entries !== true && !is_array($entries) ) ) {
+		if ( empty( $entries ) || ( $entries !== true && ! is_array( $entries ) ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ' Entries were empty or malformed.', $entries );
 			return NULL;
 		}
 
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ' User does not have the `gravityview_moderate_entries` capability.' );
 			return NULL;
 		}
@@ -241,10 +241,10 @@ 
 		$approved_column_id = self::get_approved_column( $form_id );
 
 		$success = true;
-		foreach( $entries as $entry_id ) {
+		foreach ( $entries as $entry_id ) {
 			$update_success = self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id );
 
-			if( ! $update_success ) {
+			if ( ! $update_success ) {
 				$success = false;
 			}
 		}
@@ -268,12 +268,12 @@ 
 	 */
 	public static function update_approved( $entry_id = 0, $approved = 2, $form_id = 0, $approvedcolumn = 0 ) {
 
-		if( !class_exists( 'GFAPI' ) ) {
+		if ( ! class_exists( 'GFAPI' ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . 'GFAPI does not exist' );
 			return false;
 		}
 
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ': Not a valid approval value.' );
 			return false;
 		}
@@ -290,7 +290,7 @@ 
 		// If the form has an Approve/Reject field, update that value
 		$result = self::update_approved_column( $entry_id, $approved, $form_id, $approvedcolumn );
 
-		if( is_wp_error( $result ) ) {
+		if ( is_wp_error( $result ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . sprintf( ' - Entry approval not updated: %s', $result->get_error_message() ) );
 			return false;
 		}
@@ -302,7 +302,7 @@ 
 
 		// add note to entry if approval field updating worked or there was no approved field
 		// There's no validation for the meta
-		if( true === $result ) {
+		if ( true === $result ) {
 
 			// Add an entry note
 			self::add_approval_status_updated_note( $entry_id, $approved );
@@ -355,7 +355,7 @@ 
 
 		$note_id = false;
 
-		if( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
+		if ( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
 
 			$current_user = wp_get_current_user();
 
@@ -377,7 +377,7 @@ 
 	 */
 	private static function update_approved_column( $entry_id = 0, $status = '0', $form_id = 0, $approvedcolumn = 0 ) {
 
-		if( empty( $approvedcolumn ) ) {
+		if ( empty( $approvedcolumn ) ) {
 			$approvedcolumn = self::get_approved_column( $form_id );
 		}
 
@@ -400,12 +400,12 @@ 
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
 
 		$new_value = '';
-		if( GravityView_Entry_Approval_Status::APPROVED === $status ) {
+		if ( GravityView_Entry_Approval_Status::APPROVED === $status ) {
 			$new_value = self::get_approved_column_input_label( $form_id, $approvedcolumn );
 		}
 
 		//update entry
-		$entry["{$approvedcolumn}"] = $new_value;
+		$entry[ "{$approvedcolumn}" ] = $new_value;
 
 		/**
 		 * Note: GFAPI::update_entry() doesn't trigger `gform_after_update_entry`, so we trigger updating the meta ourselves
@@ -434,12 +434,12 @@ 
 		// If the user has enabled a different value than the label (for some reason), use it.
 		// This is highly unlikely
 		if ( is_array( $field->choices ) && ! empty( $field->choices ) ) {
-			return isset( $field->choices[0]['value'] ) ? $field->choices[0]['value'] : $field->choices[0]['text'];
+			return isset( $field->choices[ 0 ][ 'value' ] ) ? $field->choices[ 0 ][ 'value' ] : $field->choices[ 0 ][ 'text' ];
 		}
 
 		// Otherwise, fall back on the inputs array
 		if ( is_array( $field->inputs ) && ! empty( $field->inputs ) ) {
-			return $field->inputs[0]['label'];
+			return $field->inputs[ 0 ][ 'label' ];
 		}
 
 		return null;
@@ -460,16 +460,16 @@ 
 	private static function update_approved_meta( $entry_id, $status, $form_id = 0 ) {
 
 		if ( ! GravityView_Entry_Approval_Status::is_valid( $status ) ) {
-			do_action('gravityview_log_error', __METHOD__ . ': $is_approved not valid value', $status );
+			do_action( 'gravityview_log_error', __METHOD__ . ': $is_approved not valid value', $status );
 			return;
 		}
 
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
 
 		// update entry meta
-		if( function_exists('gform_update_meta') ) {
+		if ( function_exists( 'gform_update_meta' ) ) {
 
-			if( GravityView_Entry_Approval_Status::is_unapproved( $status ) ) {
+			if ( GravityView_Entry_Approval_Status::is_unapproved( $status ) ) {
 				gform_delete_meta( $entry_id, self::meta_key );
 			} else {
 				gform_update_meta( $entry_id, self::meta_key, $status, $form_id );
@@ -492,11 +492,11 @@ 
 			 * @since 1.18 Added "unapproved"
 			 * @param  int $entry_id ID of the Gravity Forms entry
 			 */
-			do_action( 'gravityview/approve_entries/' . $action , $entry_id );
+			do_action( 'gravityview/approve_entries/' . $action, $entry_id );
 
 		} else {
 
-			do_action('gravityview_log_error', __METHOD__ . ' - `gform_update_meta` does not exist.' );
+			do_action( 'gravityview_log_error', __METHOD__ . ' - `gform_update_meta` does not exist.' );
 
 		}
 	}
@@ -511,11 +511,11 @@ 
 	 */
 	static public function get_approved_column( $form ) {
 
-		if( empty( $form ) ) {
+		if ( empty( $form ) ) {
 			return null;
 		}
 
-		if( !is_array( $form ) ) {
+		if ( ! is_array( $form ) ) {
 			$form = GVCommon::get_form( $form );
 		}
 
@@ -525,22 +525,22 @@ 
 		 * @var string $key
 		 * @var GF_Field $field
 		 */
-		foreach( $form['fields'] as $key => $field ) {
+		foreach ( $form[ 'fields' ] as $key => $field ) {
 
 			$inputs = $field->get_entry_inputs();
 
-			if( !empty( $field->gravityview_approved ) ) {
-				if ( ! empty( $inputs ) && !empty( $inputs[0]['id'] ) ) {
-					$approved_column_id = $inputs[0]['id'];
+			if ( ! empty( $field->gravityview_approved ) ) {
+				if ( ! empty( $inputs ) && ! empty( $inputs[ 0 ][ 'id' ] ) ) {
+					$approved_column_id = $inputs[ 0 ][ 'id' ];
 					break;
 				}
 			}
 
 			// Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work..
-			if( 'checkbox' === $field->type && ! empty( $inputs ) ) {
+			if ( 'checkbox' === $field->type && ! empty( $inputs ) ) {
 				foreach ( $inputs as $input ) {
-					if ( 'approved' === strtolower( $input['label'] ) ) {
-						$approved_column_id = $input['id'];
+					if ( 'approved' === strtolower( $input[ 'label' ] ) ) {
+						$approved_column_id = $input[ 'id' ];
 						break;
 					}
 				}