gravityview / GravityView

includes/class-admin-approve-entries.php

Spacing +61 added lines, -61 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;
 		}
 
@@ -102,19 +102,19 @@ 
 		$approved_count = $disapproved_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 ) ) );
+		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 ) ) );
 		}
 
-		$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,
@@ -133,9 +133,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;
@@ -246,7 +246,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.
@@ -254,7 +254,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;
 		}
 
@@ -279,7 +279,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' );
 
@@ -297,13 +297,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 );
@@ -314,7 +314,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' ];
 
 			}
 
@@ -326,15 +326,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;
@@ -356,7 +356,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 );
 	}
 
@@ -386,20 +386,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 ) . '" />';
 		}
 	}
 
@@ -412,10 +412,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();
 		}
 
@@ -435,14 +435,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 );
 	}
@@ -450,33 +450,33 @@ 
 
 	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_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' ),
@@ -485,10 +485,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( $form_id ) ),
 		) );
 
@@ -508,7 +508,7 @@ 
 
 		$approved_column_id = self::get_approved_column( $form_id );
 
-		if( ! $approved_column_id ) {
+		if ( ! $approved_column_id ) {
 		    return '';
         }
 
@@ -538,16 +538,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 ),
 				),
 			),
 		);
@@ -564,13 +564,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' ] );
 			}
 		}
 
@@ -595,13 +595,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;
 			}
 		}
@@ -611,18 +611,18 @@ 
 		 * @param boolean $show_approve_column Whether the column will be shown
 		 * @param int $form_id The ID of the Gravity Forms form for which entries are being shown
 		 */
-		$show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id );
+		$show_approve_column = apply_filters( 'gravityview/approve_entries/show-column', $show_approve_column, $form_id );
 
 		return $show_approve_column;
 	}
 
 	function register_gform_noconflict_script( $scripts ) {
-		$scripts[] = 'gravityview_gf_entries_scripts';
+		$scripts[ ] = 'gravityview_gf_entries_scripts';
 		return $scripts;
 	}
 
 	function register_gform_noconflict_style( $styles ) {
-		$styles[] = 'gravityview_entries_list';
+		$styles[ ] = 'gravityview_entries_list';
 		return $styles;
 	}
 

future/includes/class-gv-collection-view.php

Spacing +5 added lines, -5 removed lines

@@ -99,7 +99,7 @@ 
 			$meta_keys = apply_filters_ref_array( 'gravityview/view_collection/from_post/meta_keys', array( array(), $post, &$views ) );
 
 			if ( function_exists( 'apply_filters_deprecated' ) ) {
-				$meta_keys = (array) apply_filters_deprecated( 'gravityview/data/parse/meta_keys', array( $meta_keys, $post->ID ), '2.0.7', 'gravityview/view_collection/from_post/meta_keys' );
+				$meta_keys = (array)apply_filters_deprecated( 'gravityview/data/parse/meta_keys', array( $meta_keys, $post->ID ), '2.0.7', 'gravityview/view_collection/from_post/meta_keys' );
 			} else {
 				/**
 				 * @filter `gravityview/data/parse/meta_keys`
@@ -107,7 +107,7 @@ 
 				 * @todo Require WP 4.6.0 so that `apply_filters_deprecated` is always available
 				 * @see The `gravityview/view_collection/from_post/meta_keys` filter.
 				 */
-				$meta_keys = (array) apply_filters( 'gravityview/data/parse/meta_keys', $meta_keys, $post->ID );
+				$meta_keys = (array)apply_filters( 'gravityview/data/parse/meta_keys', $meta_keys, $post->ID );
 			}
 
 			/** What about inside post meta values? */
@@ -137,12 +137,12 @@ 
 
 		/** Let's find us some [gravityview] shortcodes perhaps. */
 		foreach ( Shortcode::parse( $content ) as $shortcode ) {
-			if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts['id'] ) ) {
+			if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts[ 'id' ] ) ) {
 				continue;
 			}
 
-			if ( is_numeric( $shortcode->atts['id'] ) ) {
-				$view = View::by_id( $shortcode->atts['id'] );
+			if ( is_numeric( $shortcode->atts[ 'id' ] ) ) {
+				$view = View::by_id( $shortcode->atts[ 'id' ] );
 				if ( ! $view ) {
 					continue;
 				}

includes/plugin-and-theme-hooks/abstract-gravityview-plugin-and-theme-hooks.php

Spacing +7 added lines, -7 removed lines

@@ -110,9 +110,9 @@ 
 	private function maybe_add_hooks() {
 		$class_exists = $this->class_name && class_exists( $this->class_name );
 		$function_exists = $this->function_name && function_exists( $this->function_name );
-		$constant_defined = $this->constant_name && defined("{$this->constant_name}");
+		$constant_defined = $this->constant_name && defined( "{$this->constant_name}" );
 
-		if( $class_exists || $function_exists || $constant_defined ) {
+		if ( $class_exists || $function_exists || $constant_defined ) {
 			$this->add_hooks();
 		}
 	}
@@ -124,23 +124,23 @@ 
 	 */
 	protected function add_hooks() {
 
-		if( $this->meta_keys ) {
+		if ( $this->meta_keys ) {
 			add_filter( 'gravityview/data/parse/meta_keys', array( $this, 'merge_meta_keys' ), 10, 2 );
 		}
 
-		if( $this->content_meta_keys ) {
+		if ( $this->content_meta_keys ) {
 			add_filter( 'gravityview/view_collection/from_post/meta_keys', array( $this, 'merge_content_meta_keys' ), 10, 3 );
 		}
 
-		if( $this->script_handles ) {
+		if ( $this->script_handles ) {
 			add_filter( 'gravityview_noconflict_scripts', array( $this, 'merge_noconflict_scripts' ) );
 		}
 
-		if( $this->style_handles ) {
+		if ( $this->style_handles ) {
 			add_filter( 'gravityview_noconflict_styles', array( $this, 'merge_noconflict_styles' ) );
 		}
 
-		if( $this->post_type_support ) {
+		if ( $this->post_type_support ) {
 			add_filter( 'gravityview_post_type_support', array( $this, 'merge_post_type_support' ), 10, 2 );
 		}
 	}

includes/plugin-and-theme-hooks/class-gravityview-theme-hooks-siteorigin.php

Spacing +5 added lines, -5 removed lines

@@ -39,19 +39,19 @@ 
 	 */
 	function merge_content_meta_keys( $meta_keys = array(), $post = null, & $views = null ) {
 
-		if( empty( $post->panels_data ) || empty( $post->panels_data['widgets'] ) ) {
+		if ( empty( $post->panels_data ) || empty( $post->panels_data[ 'widgets' ] ) ) {
 			return $meta_keys;
 		}
 
-		foreach ( (array) $post->panels_data['widgets'] as $widget ) {
+		foreach ( (array)$post->panels_data[ 'widgets' ] as $widget ) {
 
 			$views->merge( \GV\View_Collection::from_content( \GV\Utils::get( $widget, 'text' ) ) );
 
-			if ( empty( $widget['tabs'] ) || ! is_array( $widget['tabs'] ) ) {
+			if ( empty( $widget[ 'tabs' ] ) || ! is_array( $widget[ 'tabs' ] ) ) {
 				continue;
 			}
 
-			foreach ( $widget['tabs'] as $tab ) {
+			foreach ( $widget[ 'tabs' ] as $tab ) {
 
 				// Livemesh Tabs
 				$backup = \GV\Utils::get( $tab, 'tab_content' );
@@ -59,7 +59,7 @@ 
 				// SiteOrigin Tabs
 				$content = \GV\Utils::get( $tab, 'content_text', $backup );
 
-				if( $content ) {
+				if ( $content ) {
 					$views->merge( \GV\View_Collection::from_content( $content ) );
 				}
 			}

future/includes/class-gv-oembed.php

Spacing +18 added lines, -18 removed lines

@@ -26,7 +26,7 @@ 
 		wp_embed_register_handler( 'gravityview_entry', self::get_entry_regex(), array( __CLASS__, 'render' ), 20000 );
 		wp_oembed_add_provider( self::get_entry_regex(), self::$provider_url, true );
 
-		if ( ! empty( $_GET['gv_oembed_provider'] ) && ! empty( $_GET['url'] ) ) {
+		if ( ! empty( $_GET[ 'gv_oembed_provider' ] ) && ! empty( $_GET[ 'url' ] ) ) {
 			add_action( 'template_redirect', array( __CLASS__, 'render_provider_request' ) );
 		}
 
@@ -43,8 +43,8 @@ 
 	 * @return void
 	 */
 	public static function render_provider_request() {
-		if ( ! empty( $_GET['url'] ) ) {
-			$url = $_GET['url'];
+		if ( ! empty( $_GET[ 'url' ] ) ) {
+			$url = $_GET[ 'url' ];
 		} else {
 			header( 'HTTP/1.0 404 Not Found' );
 			exit;
@@ -111,18 +111,18 @@ 
 	 */
 	private static function parse_matches( $matches, $url ) {
 		// If not using permalinks, re-assign values for matching groups
-		if ( ! empty( $matches['entry_slug2'] ) ) {
-			$matches['is_cpt'] = $matches['is_cpt2'];
-			$matches['slug'] = $matches['slug2'];
-			$matches['entry_slug'] = $matches['entry_slug2'];
-			unset( $matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2'] );
+		if ( ! empty( $matches[ 'entry_slug2' ] ) ) {
+			$matches[ 'is_cpt' ] = $matches[ 'is_cpt2' ];
+			$matches[ 'slug' ] = $matches[ 'slug2' ];
+			$matches[ 'entry_slug' ] = $matches[ 'entry_slug2' ];
+			unset( $matches[ 'is_cpt2' ], $matches[ 'slug2' ], $matches[ 'entry_slug2' ] );
 		}
 
-		if ( empty( $matches['entry_slug'] ) ) {
+		if ( empty( $matches[ 'entry_slug' ] ) ) {
 			gravityview()->log->error( 'Entry slug not parsed by regex.', array( 'data' => $matches ) );
 			return null;
 		} else {
-			$entry_id = $matches['entry_slug'];
+			$entry_id = $matches[ 'entry_slug' ];
 		}
 
 		if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) {
@@ -131,7 +131,7 @@ 
 		}
 
 		if ( ! $view_id = url_to_postid( $url ) ) {
-			$view = \GV\View::from_post( get_page_by_path( $matches['slug'], OBJECT, 'gravityview' ) );
+			$view = \GV\View::from_post( get_page_by_path( $matches[ 'slug' ], OBJECT, 'gravityview' ) );
 		} else {
 			$view = \GV\View::by_id( $view_id );
 		}
@@ -163,9 +163,9 @@ 
 
 		return '
 		<div class="loading-placeholder" style="background-color:#e6f0f5;">
-			<h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image.$embed_heading.'</h3>
+			<h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image . $embed_heading . '</h3>
 			<p style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">
-				'.$embed_text.'
+				'.$embed_text . '
 			</p>
 			<br style="clear: both;">
 		</div>';
@@ -179,8 +179,8 @@ 
 	private static function render_preview_notice() {
 		$floaty = \GravityView_Admin::get_floaty();
 		$title = esc_html__( 'This will look better when it is embedded.', 'gravityview' );
-		$message = esc_html__( 'Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview');
-		return '<div class="updated notice">'.$floaty.'<h3>'.$title.'</h3><p>'.$message.'</p><br style="clear:both;" /></div>';
+		$message = esc_html__( 'Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview' );
+		return '<div class="updated notice">' . $floaty . '<h3>' . $title . '</h3><p>' . $message . '</p><br style="clear:both;" /></div>';
 	}
 
 	/**
@@ -199,13 +199,13 @@ 
 			return __( 'You are not allowed to view this content.', 'gravityview' );
 		}
 
-		if ( $entry && 'active' !== $entry['status'] ) {
+		if ( $entry && 'active' !== $entry[ 'status' ] ) {
 			gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 			return __( 'You are not allowed to view this content.', 'gravityview' );
 		}
 
 		if ( $view->settings->get( 'show_only_approved' ) ) {
-			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 __( 'You are not allowed to view this content.', 'gravityview' );
 			}
@@ -270,7 +270,7 @@ 
 		// Catch either
 		$match_regex = "(?:{$using_permalinks}|{$not_using_permalinks})";
 
-		return '#'.$match_regex.'#i';
+		return '#' . $match_regex . '#i';
 	}
 
 	/**

future/includes/class-gv-entry.php

Spacing +8 added lines, -8 removed lines

@@ -113,7 +113,7 @@ 
 
 		$args = array();
 
-		$view_id = is_null ( $view ) ? null : $view->ID;
+		$view_id = is_null( $view ) ? null : $view->ID;
 
 		$permalink = null;
 
@@ -123,7 +123,7 @@ 
 			/** Must be an embed of some sort. */
 			if ( is_object( $post ) && is_numeric( $post->ID ) ) {
 				$permalink = get_permalink( $post->ID );
-				$args['gvid'] = $view_id;
+				$args[ 'gvid' ] = $view_id;
 			}
 		}
 		
@@ -151,21 +151,21 @@ 
 			 */
 			$link_parts = explode( '?', $permalink );
 
-			$query = ! empty( $link_parts[1] ) ? '?' . $link_parts[1] : '';
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
 
-			$permalink = trailingslashit( $link_parts[0] ) . $entry_endpoint_name . '/'. $entry_slug .'/' . $query;
+			$permalink = trailingslashit( $link_parts[ 0 ] ) . $entry_endpoint_name . '/' . $entry_slug . '/' . $query;
 		} else {
 			$args[ $entry_endpoint_name ] = $entry_slug;
 		}
 
 		if ( $track_directory ) {
-			if ( ! empty( $_GET['pagenum'] ) ) {
-				$args['pagenum'] = intval( $_GET['pagenum'] );
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
 			}
 
 			if ( $sort = Utils::_GET( 'sort' ) ) {
-				$args['sort'] = $sort;
-				$args['dir'] = Utils::_GET( 'dir' );
+				$args[ 'sort' ] = $sort;
+				$args[ 'dir' ] = Utils::_GET( 'dir' );
 			}
 		}
 

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-acf.php

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
 
 		$acf_keys = get_field_objects( $post->ID, array( 'load_value' => false ) );
 
-		if( $acf_keys ) {
+		if ( $acf_keys ) {
 			return array_merge( array_keys( $acf_keys ), $meta_keys );
 		}
 
@@ -70,9 +70,9 @@ 
 	 * @return void
 	 */
 	private function fix_posted_fields() {
-		if( is_admin() && isset( $_POST['action'] ) && isset( $_POST['post_type'] ) ) {
-			if( 'editpost' === $_POST['action'] && 'gravityview' === $_POST['post_type'] ) {
-				$_POST['fields'] = _gravityview_process_posted_fields();
+		if ( is_admin() && isset( $_POST[ 'action' ] ) && isset( $_POST[ 'post_type' ] ) ) {
+			if ( 'editpost' === $_POST[ 'action' ] && 'gravityview' === $_POST[ 'post_type' ] ) {
+				$_POST[ 'fields' ] = _gravityview_process_posted_fields();
 			}
 		}
 	}

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

Spacing +60 added lines, -60 removed lines

@@ -100,7 +100,7 @@ 
 		);
 
 		if ( ! empty( $action ) ) {
-			$settings['edd_action'] = esc_attr( $action );
+			$settings[ 'edd_action' ] = esc_attr( $action );
 		}
 
 		return array_map( 'urlencode', $settings );
@@ -156,7 +156,7 @@ 
 			'format' => 'json',
 		) );
 
-		if ( $is_ajax && empty( $data['license'] ) ) {
+		if ( $is_ajax && empty( $data[ 'license' ] ) ) {
 			die( -1 );
 		}
 
@@ -197,7 +197,7 @@ 
 			// most likely a mistake.
 			} else if ( $license_data->license !== 'failed' && $update_license ) {
 
-				if ( ! empty( $data['field_id'] ) ) {
+				if ( ! empty( $data[ 'field_id' ] ) ) {
 					set_transient( self::status_transient_key, $license_data, DAY_IN_SECONDS );
 				}
 
@@ -224,7 +224,7 @@ 
 		if ( empty( $license_data ) ) {
 			$message = '';
 		} else {
-			if( ! empty( $license_data->error ) ) {
+			if ( ! empty( $license_data->error ) ) {
 				$class = 'error';
 				$string_key = $license_data->error;
 			} else { $class = $license_data->license;
@@ -250,17 +250,17 @@ 
 	 */
 	public function license_details( $response = array() ) {
 
-		$response = (array) $response;
+		$response = (array)$response;
 
 		$return = '';
 		$wrapper = '<span class="gv-license-details" aria-live="polite" aria-busy="false">%s</span>';
 
-		if ( ! empty( $response['license_key'] ) ) {
+		if ( ! empty( $response[ 'license_key' ] ) ) {
 			$return .= '<h3>' . esc_html__( 'License Details:', 'gravityview' ) . '</h3>';
 
 			if ( in_array( Utils::get( $response, 'license' ), array( 'invalid', 'deactivated' ) ) ) {
-				$return .= $this->strings( $response['license'], $response );
-			} elseif ( ! empty( $response['license_name'] ) ) {
+				$return .= $this->strings( $response[ 'license' ], $response );
+			} elseif ( ! empty( $response[ 'license_name' ] ) ) {
 				$response_keys = array(
 					'license_name'   => '',
 					'license_limit'  => '',
@@ -274,19 +274,19 @@ 
 				// Make sure all the keys are set
 				$response = wp_parse_args( $response, $response_keys );
 
-				$login_link = sprintf( '<a href="%s" class="howto" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response['customer_email'] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) );
-				$local_text = ( ! empty( $response['is_local'] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
+				$login_link = sprintf( '<a href="%s" class="howto" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response[ 'customer_email' ] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) );
+				$local_text = ( ! empty( $response[ 'is_local' ] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
 				$details    = array(
-					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response['license_name'] ), esc_html( $response['license_limit'] ) ),
-					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), esc_html__( $response['customer_name'], 'gravityview' ), esc_html__( $response['customer_email'], 'gravityview' ) ) . $login_link,
-					'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response['site_count'] ), esc_html( $response['license_limit'] ) ) . $local_text,
-					'expires'     => 'lifetime' === $response['expires'] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response['expires'] ) - DAY_IN_SECONDS ) ),
-					'upgrade'     => $this->get_upgrade_html( $response['upgrades'] ),
+					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response[ 'license_name' ] ), esc_html( $response[ 'license_limit' ] ) ),
+					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), esc_html__( $response[ 'customer_name' ], 'gravityview' ), esc_html__( $response[ 'customer_email' ], 'gravityview' ) ) . $login_link,
+					'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response[ 'site_count' ] ), esc_html( $response[ 'license_limit' ] ) ) . $local_text,
+					'expires'     => 'lifetime' === $response[ 'expires' ] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response[ 'expires' ] ) - DAY_IN_SECONDS ) ),
+					'upgrade'     => $this->get_upgrade_html( $response[ 'upgrades' ] ),
 				);
 
-				if ( ! empty( $response['error'] ) && 'expired' === $response['error'] ) {
-					unset( $details['upgrade'] );
-					$details['expires'] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
+				if ( ! empty( $response[ 'error' ] ) && 'expired' === $response[ 'error' ] ) {
+					unset( $details[ 'upgrade' ] );
+					$details[ 'expires' ] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
 				}
 
 				$return .= '<ul><li>' . implode( '</li><li>', array_filter( $details ) ) . '</li></ul>';
@@ -312,20 +312,20 @@ 
 		if ( ! empty( $upgrades ) ) {
 
 			$locale_parts = explode( '_', get_locale() );
-			$is_english = ( 'en' === $locale_parts[0] );
+			$is_english = ( 'en' === $locale_parts[ 0 ] );
 
 			$output .= '<h4>' . esc_html__( 'Upgrades available:', 'gravityview' ) . '</h4>';
 			$output .= '<ul class="ul-disc">';
 
 			foreach ( $upgrades as $upgrade_id => $upgrade ) {
-				$upgrade = (object) $upgrade;
+				$upgrade = (object)$upgrade;
 
 				$anchor_text = sprintf( esc_html_x( 'Upgrade to %1$s for %2$s', '1: GravityView upgrade name, 2: Cost of upgrade', 'gravityview' ), esc_attr( $upgrade->name ), esc_attr( $upgrade->price ) );
 
 				if ( $is_english && isset( $upgrade->description ) ) {
 					$message = esc_html( $upgrade->description );
 				} else {
-					switch( $upgrade->price_id ) {
+					switch ( $upgrade->price_id ) {
 						// Interstellar
 						case 1:
 						default:
@@ -383,7 +383,7 @@ 
 			'invalid' => esc_html__( 'The license key entered is invalid.', 'gravityview' ),
 			'missing' => esc_html__( 'Invalid license key.', 'gravityview' ),
 			'revoked' => esc_html__( 'This license key has been revoked.', 'gravityview' ),
-			'expired' => sprintf( esc_html__( 'This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview' ), '<a href="'. esc_url( $this->get_license_renewal_url( $license_data ) ) .'">', '</a>' ),
+			'expired' => sprintf( esc_html__( 'This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview' ), '<a href="' . esc_url( $this->get_license_renewal_url( $license_data ) ) . '">', '</a>' ),
 			'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ),
 
 			'verifying_license' => esc_html__( 'Verifying license&hellip;', 'gravityview' ),
@@ -406,7 +406,7 @@ 
 
 		if ( ! empty( $license_data->renewal_url ) ) {
 			$renew_license_url = $license_data->renewal_url;
-		} elseif( ! empty( $license_data->license_key ) ) {
+		} elseif ( ! empty( $license_data->license_key ) ) {
 			$renew_license_url = sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s', $license_data->license_key );
 		} else {
 			$renew_license_url = 'https://gravityview.co/account/';
@@ -423,7 +423,7 @@ 
 	 * @return array|WP_Error
 	 */
 	private function _license_get_remote_response( $data, $license = '' ) {
-		$api_params = $this->_get_edd_settings( $data['edd_action'], $license );
+		$api_params = $this->_get_edd_settings( $data[ 'edd_action' ], $license );
 
 		$url = add_query_arg( $api_params, self::url );
 
@@ -463,9 +463,9 @@ 
 	private function license_call_update_settings( $license_data, $data ) {
 		$settings = array();
 
-        $settings['license_key'] = $license_data->license_key = trim( $data['license'] );
-		$settings['license_key_status'] = $license_data->license;
-		$settings['license_key_response'] = (array)$license_data;
+        $settings[ 'license_key' ] = $license_data->license_key = trim( $data[ 'license' ] );
+		$settings[ 'license_key_status' ] = $license_data->license;
+		$settings[ 'license_key_response' ] = (array)$license_data;
 
 		$this->settings->set( $settings );
 	}
@@ -480,7 +480,7 @@ 
 
 		if ( ! empty( $key ) ) {
 			$response = $this->settings->get( 'license_key_response' );
-			$response = is_array( $response ) ? (object) $response : json_decode( $response );
+			$response = is_array( $response ) ? (object)$response : json_decode( $response );
 		} else {
 			$response = array();
 		}
@@ -522,11 +522,11 @@ 
 
 		$submit = '<div class="gv-edd-button-wrapper">';
 		foreach ( $fields as $field ) {
-			$field['type'] = 'button';
-			$field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class;
-			$field['style'] = 'margin-left: 10px;';
-			if( $disabled_attribute ) {
-				$field['disabled'] = $disabled_attribute;
+			$field[ 'type' ] = 'button';
+			$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] . ' ' . $class : $class;
+			$field[ 'style' ] = 'margin-left: 10px;';
+			if ( $disabled_attribute ) {
+				$field[ 'disabled' ] = $disabled_attribute;
 			}
 			$submit .= $this->settings->as_html( $field, $echo );
 		}
@@ -605,7 +605,7 @@ 
 				    'url'        => home_url(),
 				    'site_data'  => $this->get_site_data(),
 			    ),
-			));
+			) );
 
 			// make sure the response came back okay
 			if ( is_wp_error( $response ) ) {
@@ -636,45 +636,45 @@ 
 		$theme_data = wp_get_theme();
 		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
 
-		$data['gv_version']  = Plugin::$version;
-		$data['php_version']  = phpversion();
-		$data['wp_version']   = get_bloginfo( 'version' );
-		$data['gf_version']  = \GFForms::$version;
-		$data['server']       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
-		$data['multisite']    = is_multisite();
-		$data['theme']        = $theme;
-		$data['url']          = home_url();
-		$data['license_key']  = $this->settings->get( 'license_key' );
-		$data['beta']         = $this->settings->get( 'beta' );
+		$data[ 'gv_version' ]  = Plugin::$version;
+		$data[ 'php_version' ]  = phpversion();
+		$data[ 'wp_version' ]   = get_bloginfo( 'version' );
+		$data[ 'gf_version' ]  = \GFForms::$version;
+		$data[ 'server' ]       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
+		$data[ 'multisite' ]    = is_multisite();
+		$data[ 'theme' ]        = $theme;
+		$data[ 'url' ]          = home_url();
+		$data[ 'license_key' ]  = $this->settings->get( 'license_key' );
+		$data[ 'beta' ]         = $this->settings->get( 'beta' );
 
 		// View Data
 		$gravityview_posts = wp_count_posts( 'gravityview', 'readable' );
 
-		$data['view_count'] = null;
-		$data['view_first'] = null;
-		$data['view_latest'] = null;
+		$data[ 'view_count' ] = null;
+		$data[ 'view_first' ] = null;
+		$data[ 'view_latest' ] = null;
 
 		if ( $gravityview_posts->publish ) {
-			$data['view_count'] = $gravityview_posts->publish;
+			$data[ 'view_count' ] = $gravityview_posts->publish;
 
 			$first = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=ASC' );
 			$latest = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=DESC' );
 
 			if ( $first = array_shift( $first ) ) {
-				$data['view_first'] = $first->post_date;
+				$data[ 'view_first' ] = $first->post_date;
 			}
 			if ( $latest = array_pop( $latest ) ) {
-				$data['view_latest'] = $latest->post_date;
+				$data[ 'view_latest' ] = $latest->post_date;
 			}
 		}
 
 		// Form counts
 		if ( class_exists( 'GFFormsModel' ) ) {
 			$form_data = \GFFormsModel::get_form_count();
-			$data['forms_total'] = Utils::get( $form_data, 'total', 0 );
-			$data['forms_active'] = Utils::get( $form_data, 'active', 0 );
-			$data['forms_inactive'] = Utils::get( $form_data, 'inactive', 0 );
-			$data['forms_trash'] = Utils::get( $form_data, 'inactive', 0 );
+			$data[ 'forms_total' ] = Utils::get( $form_data, 'total', 0 );
+			$data[ 'forms_active' ] = Utils::get( $form_data, 'active', 0 );
+			$data[ 'forms_inactive' ] = Utils::get( $form_data, 'inactive', 0 );
+			$data[ 'forms_trash' ] = Utils::get( $form_data, 'inactive', 0 );
 		}
 
 		// Retrieve current plugin information
@@ -682,13 +682,13 @@ 
 			include ABSPATH . '/wp-admin/includes/plugin.php';
 		}
 
-		$data['integrations']     = self::get_related_plugins_and_extensions();
-		$data['active_plugins']   = get_option( 'active_plugins', array() );
-		$data['inactive_plugins'] = array();
-		$data['locale']           = get_locale();
+		$data[ 'integrations' ]     = self::get_related_plugins_and_extensions();
+		$data[ 'active_plugins' ]   = get_option( 'active_plugins', array() );
+		$data[ 'inactive_plugins' ] = array();
+		$data[ 'locale' ]           = get_locale();
 
 		// Validate request on the GV server
-		$data['hash']             = 'gv_version.url.locale:' . sha1( $data['gv_version'] . $data['url'] . $data['locale'] );
+		$data[ 'hash' ]             = 'gv_version.url.locale:' . sha1( $data[ 'gv_version' ] . $data[ 'url' ] . $data[ 'locale' ] );
 
 		return $data;
 	}
@@ -718,7 +718,7 @@ 
 
 				$plugin_data = get_plugin_data( $active_plugin );
 
-				$extensions[] = sprintf( '%s %s', $plugin_data['Name'], $plugin_data['Version'] );
+				$extensions[ ] = sprintf( '%s %s', $plugin_data[ 'Name' ], $plugin_data[ 'Version' ] );
 			}
 
 			if ( ! empty( $extensions ) ) {

includes/class-api.php

Spacing +104 added lines, -104 removed lines

@@ -31,7 +31,7 @@ 
 
 		$form = $gravityview_view->getForm();
 
-		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS['GravityView_API_field_label_override'] ) ) {
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS[ 'GravityView_API_field_label_override' ] ) ) {
 			/** Allow to fall through for back compatibility testing purposes. */
 		} else {
 			return \GV\Mocks\GravityView_API_field_label( $form, $field, $entry, $force_show_label );
@@ -39,29 +39,29 @@ 
 
 		$label = '';
 
-		if( !empty( $field['show_label'] ) || $force_show_label ) {
+		if ( ! empty( $field[ 'show_label' ] ) || $force_show_label ) {
 
-			$label = $field['label'];
+			$label = $field[ 'label' ];
 
 			// Support Gravity Forms 1.9+
-			if( class_exists( 'GF_Field' ) ) {
+			if ( class_exists( 'GF_Field' ) ) {
 
-				$field_object = RGFormsModel::get_field( $form, $field['id'] );
+				$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
 
-				if( $field_object ) {
+				if ( $field_object ) {
 
-					$input = GFFormsModel::get_input( $field_object, $field['id'] );
+					$input = GFFormsModel::get_input( $field_object, $field[ 'id' ] );
 
 					// This is a complex field, with labels on a per-input basis
-					if( $input ) {
+					if ( $input ) {
 
 						// Does the input have a custom label on a per-input basis? Otherwise, default label.
-						$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
+						$label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
 
 					} else {
 
 						// This is a field with one label
-						$label = $field_object->get_field_label( true, $field['label'] );
+						$label = $field_object->get_field_label( true, $field[ 'label' ] );
 
 					}
 
@@ -70,9 +70,9 @@ 
 			}
 
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
-			if ( !empty( $field['custom_label'] ) ) {
+			if ( ! empty( $field[ 'custom_label' ] ) ) {
 
-				$label = self::replace_variables( $field['custom_label'], $form, $entry );
+				$label = self::replace_variables( $field[ 'custom_label' ], $form, $entry );
 
 			}
 
@@ -134,11 +134,11 @@ 
 
 		$width = NULL;
 
-		if( !empty( $field['width'] ) ) {
-			$width = absint( $field['width'] );
+		if ( ! empty( $field[ 'width' ] ) ) {
+			$width = absint( $field[ 'width' ] );
 
 			// If using percentages, limit to 100%
-			if( '%d%%' === $format && $width > 100 ) {
+			if ( '%d%%' === $format && $width > 100 ) {
 				$width = 100;
 			}
 
@@ -159,42 +159,42 @@ 
 	public static function field_class( $field, $form = NULL, $entry = NULL ) {
 		$classes = array();
 
-		if( !empty( $field['custom_class'] ) ) {
+		if ( ! empty( $field[ 'custom_class' ] ) ) {
 
-            $custom_class = $field['custom_class'];
+            $custom_class = $field[ 'custom_class' ];
 
-            if( !empty( $entry ) ) {
+            if ( ! empty( $entry ) ) {
 
                 // We want the merge tag to be formatted as a class. The merge tag may be
                 // replaced by a multiple-word value that should be output as a single class.
                 // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
-                add_filter('gform_merge_tag_filter', 'sanitize_html_class');
+                add_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
 
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
+                $custom_class = self::replace_variables( $custom_class, $form, $entry );
 
                 // And then we want life to return to normal
-                remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
+                remove_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
             }
 
 			// And now we want the spaces to be handled nicely.
-			$classes[] = gravityview_sanitize_html_class( $custom_class );
+			$classes[ ] = gravityview_sanitize_html_class( $custom_class );
 
 		}
 
-		if(!empty($field['id'])) {
-			if( !empty( $form ) && !empty( $form['id'] ) ) {
-				$form_id = '-'.$form['id'];
+		if ( ! empty( $field[ 'id' ] ) ) {
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
+				$form_id = '-' . $form[ 'id' ];
 			} else {
 				// @deprecated path. Form should always be given.
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
 				$gravityview_view = GravityView_View::getInstance();
-				$form_id = $gravityview_view->getFormId() ? '-'. $gravityview_view->getFormId() : '';
+				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
 			}
 
-			$classes[] = 'gv-field'.$form_id.'-'.$field['id'];
+			$classes[ ] = 'gv-field' . $form_id . '-' . $field[ 'id' ];
 		}
 
-		return esc_attr(implode(' ', $classes));
+		return esc_attr( implode( ' ', $classes ) );
 	}
 
 	/**
@@ -210,11 +210,11 @@ 
 	 * @return string Sanitized unique HTML `id` attribute for the field
 	 */
 	public static function field_html_attr_id( $field, $form = array(), $entry = array() ) {
-		$id = $field['id'];
+		$id = $field[ 'id' ];
 
 		if ( ! empty( $id ) ) {
-			if ( ! empty( $form ) && ! empty( $form['id'] ) ) {
-				$form_id = '-' . $form['id'];
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
+				$form_id = '-' . $form[ 'id' ];
 			} else {
 				// @deprecated path. Form should always be given.
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
@@ -222,7 +222,7 @@ 
 				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
 			}
 
-			$id = 'gv-field' . $form_id . '-' . $field['id'];
+			$id = 'gv-field' . $form_id . '-' . $field[ 'id' ];
 		}
 
 		return esc_attr( $id );
@@ -262,14 +262,14 @@ 
 	 */
 	public static function entry_link_html( $entry = array(), $anchor_text = '', $passed_tag_atts = array(), $field_settings = array(), $base_id = null ) {
 
-		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry['id'] ) ) {
+		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry[ 'id' ] ) ) {
 			gravityview()->log->debug( 'Entry not defined; returning null', array( 'data' => $entry ) );
 			return NULL;
 		}
 
 		$href = self::entry_link( $entry, $base_id );
 
-		if( '' === $href ) {
+		if ( '' === $href ) {
 			return NULL;
 		}
 
@@ -306,7 +306,7 @@ 
 		} else {
 			$gravityview_view = GravityView_View::getInstance();
 
-			if( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
+			if ( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
 				$is_search = true;
 			}
 		}
@@ -402,9 +402,9 @@ 
 
 		// If we've saved the permalink in memory, use it
 		// @since 1.3
-		$link = wp_cache_get( 'gv_directory_link_'.$post_id );
+		$link = wp_cache_get( 'gv_directory_link_' . $post_id );
 
-		if ( (int) $post_id === (int) get_option( 'page_on_front' ) ) {
+		if ( (int)$post_id === (int)get_option( 'page_on_front' ) ) {
 			$link = home_url();
 		}
 
@@ -413,7 +413,7 @@ 
 
 			// If not yet saved, cache the permalink.
 			// @since 1.3
-			wp_cache_set( 'gv_directory_link_'.$post_id, $link );
+			wp_cache_set( 'gv_directory_link_' . $post_id, $link );
 		}
 
 		// Deal with returning to proper pagination for embedded views
@@ -421,13 +421,13 @@ 
 
 			$args = array();
 
-			if( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
-				$args['pagenum'] = intval( $pagenum );
+			if ( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
+				$args[ 'pagenum' ] = intval( $pagenum );
 			}
 
-			if( $sort = \GV\Utils::_GET( 'sort' ) ) {
-				$args['sort'] = $sort;
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
+			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
+				$args[ 'sort' ] = $sort;
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
 			}
 
 			$link = add_query_arg( $args, $link );
@@ -464,7 +464,7 @@ 
 	private static function get_custom_entry_slug( $id, $entry = array() ) {
 
 		// Generate an unique hash to use as the default value
-		$slug = substr( wp_hash( $id, 'gravityview'.$id ), 0, 8 );
+		$slug = substr( wp_hash( $id, 'gravityview' . $id ), 0, 8 );
 
 		/**
 		 * @filter `gravityview_entry_slug` Modify the unique hash ID generated, if you want to improve usability or change the format. This will allow for custom URLs, such as `{entryid}-{first-name}` or even, if unique, `{first-name}-{last-name}`
@@ -475,7 +475,7 @@ 
 		$slug = apply_filters( 'gravityview_entry_slug', $slug, $id, $entry );
 
 		// Make sure we have something - use the original ID as backup.
-		if( empty( $slug ) ) {
+		if ( empty( $slug ) ) {
 			$slug = $id;
 		}
 
@@ -504,7 +504,7 @@ 
 		 * @filter `gravityview_custom_entry_slug` Whether to enable and use custom entry slugs.
 		 * @param boolean True: Allow for slugs based on entry values. False: always use entry IDs (default)
 		 */
-		$custom = apply_filters('gravityview_custom_entry_slug', false );
+		$custom = apply_filters( 'gravityview_custom_entry_slug', false );
 
 		// If we're using custom slug...
 		if ( $custom ) {
@@ -518,7 +518,7 @@ 
 			// If it does have a hash set, and the hash is expected, use it.
 			// This check allows users to change the hash structure using the
 			// gravityview_entry_hash filter and have the old hashes expire.
-			if( empty( $value ) || $value !== $hash ) {
+			if ( empty( $value ) || $value !== $hash ) {
 				gravityview()->log->debug( 'Setting hash for entry {entry}: {hash}', array( 'entry' => $id_or_string, 'hash' => $hash ) );
 				gform_update_meta( $id_or_string, 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
 			}
@@ -545,15 +545,15 @@ 
          * @param boolean $custom Should we process the custom entry slug?
          */
         $custom = apply_filters( 'gravityview_custom_entry_slug', false );
-        if( $custom ) {
+        if ( $custom ) {
             // create the gravityview_unique_id and save it
 
             // Get the entry hash
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
+            $hash = self::get_custom_entry_slug( $entry[ 'id' ], $entry );
 
-	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
+	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry[ 'id' ], 'hash' => $hash ) );
 
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
+            gform_update_meta( $entry[ 'id' ], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
 
         }
     }
@@ -572,7 +572,7 @@ 
 
 		if ( ! empty( $entry ) && ! is_array( $entry ) ) {
 			$entry = GVCommon::get_entry( $entry );
-		} else if( empty( $entry ) ) {
+		} else if ( empty( $entry ) ) {
 			// @deprecated path
 			$entry = GravityView_frontend::getInstance()->getEntry();
 		}
@@ -592,9 +592,9 @@ 
 
 		$query_arg_name = \GV\Entry::get_endpoint_name();
 
-		$entry_slug = self::get_entry_slug( $entry['id'], $entry );
+		$entry_slug = self::get_entry_slug( $entry[ 'id' ], $entry );
 
-		if ( get_option('permalink_structure') && !is_preview() ) {
+		if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
 
 			$args = array();
 
@@ -604,9 +604,9 @@ 
 			 */
 			$link_parts = explode( '?', $directory_link );
 
-			$query = !empty( $link_parts[1] ) ? '?'.$link_parts[1] : '';
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
 
-			$directory_link = trailingslashit( $link_parts[0] ) . $query_arg_name . '/'. $entry_slug .'/' . $query;
+			$directory_link = trailingslashit( $link_parts[ 0 ] ) . $query_arg_name . '/' . $entry_slug . '/' . $query;
 
 		} else {
 
@@ -618,22 +618,22 @@ 
 		 */
 		if ( $add_directory_args ) {
 
-			if ( ! empty( $_GET['pagenum'] ) ) {
-				$args['pagenum'] = intval( $_GET['pagenum'] );
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
 			}
 
 			/**
 			 * @since 1.7
 			 */
 			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
-				$args['sort'] = $sort;
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
+				$args[ 'sort' ] = $sort;
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
 			}
 
 		}
 
 		if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() ) {
-			$args['gvid'] = gravityview_get_view_id();
+			$args[ 'gvid' ] = gravityview_get_view_id();
 		}
 
 		return add_query_arg( $args, $directory_link );
@@ -654,7 +654,7 @@ 
 }
 
 function gv_class( $field, $form = NULL, $entry = array() ) {
-	return GravityView_API::field_class( $field, $form, $entry  );
+	return GravityView_API::field_class( $field, $form, $entry );
 }
 
 /**
@@ -677,7 +677,7 @@ 
 		$view_id = 0;
 		if ( $context->view ) {
 			$view_id = $context->view->ID;
-			if( $context->view->settings->get( 'hide_until_searched' ) ) {
+			if ( $context->view->settings->get( 'hide_until_searched' ) ) {
 				$hide_until_searched = ( empty( $context->entry ) && ! $context->request->is_search() );
 			}
 		}
@@ -705,7 +705,7 @@ 
 		$default_css_class .= ' gv-container-no-results';
 	}
 
-	$css_class = trim( $passed_css_class . ' '. $default_css_class );
+	$css_class = trim( $passed_css_class . ' ' . $default_css_class );
 
 	/**
 	 * @filter `gravityview/render/container/class` Modify the CSS class to be added to the wrapper <div> of a View
@@ -732,7 +732,7 @@ 
 
 	$value = GravityView_API::field_value( $entry, $field );
 
-	if( $value === '' ) {
+	if ( $value === '' ) {
 		/**
 		 * @filter `gravityview_empty_value` What to display when a field is empty
 		 * @param string $value (empty string)
@@ -839,7 +839,7 @@ 
  */
 function gravityview_get_field_value( $entry, $field_id, $display_value ) {
 
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
+	if ( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
 
 		// For the complete field value as generated by Gravity Forms
 		return $display_value;
@@ -873,16 +873,16 @@ 
 		$terms = explode( ', ', $value );
 	}
 
-	foreach ($terms as $term_name ) {
+	foreach ( $terms as $term_name ) {
 
 		// If we're processing a category,
-		if( $taxonomy === 'category' ) {
+		if ( $taxonomy === 'category' ) {
 
 			// Use rgexplode to prevent errors if : doesn't exist
 			list( $term_name, $term_id ) = rgexplode( ':', $term_name, 2 );
 
 			// The explode was succesful; we have the category ID
-			if( !empty( $term_id )) {
+			if ( ! empty( $term_id ) ) {
 				$term = get_term_by( 'id', $term_id, $taxonomy );
 			} else {
 			// We have to fall back to the name
@@ -895,7 +895,7 @@ 
 		}
 
 		// There's still a tag/category here.
-		if( $term ) {
+		if ( $term ) {
 
 			$term_link = get_term_link( $term, $taxonomy );
 
@@ -904,11 +904,11 @@ 
 			    continue;
 			}
 
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
+			$output[ ] = gravityview_get_link( $term_link, esc_html( $term->name ) );
 		}
 	}
 
-	return implode(', ', $output );
+	return implode( ', ', $output );
 }
 
 /**
@@ -922,8 +922,8 @@ 
 
 	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
 
-	if( empty( $link ) ) {
-		return strip_tags( $output);
+	if ( empty( $link ) ) {
+		return strip_tags( $output );
 	}
 
 	return $output;
@@ -942,7 +942,7 @@ 
 	$fe = GravityView_frontend::getInstance();
 
 	// Solve problem when loading content via admin-ajax.php
-	if( ! $fe->getGvOutputData() ) {
+	if ( ! $fe->getGvOutputData() ) {
 
 		gravityview()->log->debug( 'gv_output_data not defined; parsing content.' );
 
@@ -950,7 +950,7 @@ 
 	}
 
 	// Make 100% sure that we're dealing with a properly called situation
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
+	if ( ! is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
 
 		gravityview()->log->debug( 'gv_output_data not an object or get_view not callable.', array( 'data' => $fe->getGvOutputData() ) );
 
@@ -1155,12 +1155,12 @@ 
 function gravityview_get_files_array( $value, $gv_class = '', $context = null ) {
 	/** @define "GRAVITYVIEW_DIR" "../" */
 
-	if( !class_exists( 'GravityView_Field' ) ) {
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
+	if ( ! class_exists( 'GravityView_Field' ) ) {
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
 	}
 
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field-fileupload.php' );
+	if ( ! class_exists( 'GravityView_Field_FileUpload' ) ) {
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field-fileupload.php' );
 	}
 
 	return GravityView_Field_FileUpload::get_files_array( $value, $gv_class, $context );
@@ -1259,21 +1259,21 @@ 
 	} else {
 		// @deprecated path
 		// Required fields.
-		if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
+		if ( empty( $args[ 'field' ] ) || empty( $args[ 'form' ] ) ) {
 			gravityview()->log->error( 'Field or form are empty.', array( 'data' => $args ) );
 			return '';
 		}
 	}
 
 	if ( $context instanceof \GV\Template_Context ) {
-		$entry = $args['entry'] ? : ( $context->entry ? $context->entry->as_entry() : array() );
-		$field = $args['field'] ? : ( $context->field ? $context->field->as_configuration() : array() );
-		$form = $args['form'] ? : ( $context->view->form ? $context->view->form->form : array() );
+		$entry = $args[ 'entry' ] ?: ( $context->entry ? $context->entry->as_entry() : array() );
+		$field = $args[ 'field' ] ?: ( $context->field ? $context->field->as_configuration() : array() );
+		$form = $args[ 'form' ] ?: ( $context->view->form ? $context->view->form->form : array() );
 	} else {
 		// @deprecated path
-		$entry = empty( $args['entry'] ) ? array() : $args['entry'];
-		$field = $args['field'];
-		$form = $args['form'];
+		$entry = empty( $args[ 'entry' ] ) ? array() : $args[ 'entry' ];
+		$field = $args[ 'field' ];
+		$form = $args[ 'form' ];
 	}
 
 	/**
@@ -1291,46 +1291,46 @@ 
 	);
 
 	if ( $context instanceof \GV\Template_Context ) {
-		$placeholders['value'] = \GV\Utils::get( $args, 'value', '' );
+		$placeholders[ 'value' ] = \GV\Utils::get( $args, 'value', '' );
 	} else {
 		// @deprecated path
-		$placeholders['value'] = gv_value( $entry, $field );
+		$placeholders[ 'value' ] = gv_value( $entry, $field );
 	}
 
 	// If the value is empty and we're hiding empty, return empty.
-	if ( $placeholders['value'] === '' && ! empty( $args['hide_empty'] ) ) {
+	if ( $placeholders[ 'value' ] === '' && ! empty( $args[ 'hide_empty' ] ) ) {
 		return '';
 	}
 
-	if ( $placeholders['value'] !== '' && ! empty( $args['wpautop'] ) ) {
-		$placeholders['value'] = wpautop( $placeholders['value'] );
+	if ( $placeholders[ 'value' ] !== '' && ! empty( $args[ 'wpautop' ] ) ) {
+		$placeholders[ 'value' ] = wpautop( $placeholders[ 'value' ] );
 	}
 
 	// Get width setting, if exists
-	$placeholders['width'] = GravityView_API::field_width( $field );
+	$placeholders[ 'width' ] = GravityView_API::field_width( $field );
 
 	// If replacing with CSS inline formatting, let's do it.
-	$placeholders['width:style'] = GravityView_API::field_width( $field, 'width:' . $placeholders['width'] . '%;' );
+	$placeholders[ 'width:style' ] = GravityView_API::field_width( $field, 'width:' . $placeholders[ 'width' ] . '%;' );
 
 	// Grab the Class using `gv_class`
-	$placeholders['class'] = gv_class( $field, $form, $entry );
-	$placeholders['field_id'] = GravityView_API::field_html_attr_id( $field, $form, $entry );
+	$placeholders[ 'class' ] = gv_class( $field, $form, $entry );
+	$placeholders[ 'field_id' ] = GravityView_API::field_html_attr_id( $field, $form, $entry );
 
 
 	// Get field label if needed
-	if ( ! empty( $args['label_markup'] ) && ! empty( $args['field']['show_label'] ) ) {
-		$placeholders['label'] = str_replace( array( '{{label}}', '{{ label }}' ), '<span class="gv-field-label">{{ label_value }}</span>', $args['label_markup'] );
+	if ( ! empty( $args[ 'label_markup' ] ) && ! empty( $args[ 'field' ][ 'show_label' ] ) ) {
+		$placeholders[ 'label' ] = str_replace( array( '{{label}}', '{{ label }}' ), '<span class="gv-field-label">{{ label_value }}</span>', $args[ 'label_markup' ] );
 	}
 
 	if ( $context instanceof \GV\Template_Context ) {
-		$placeholders['label_value'] = \GV\Utils::get( $args, 'label' );
+		$placeholders[ 'label_value' ] = \GV\Utils::get( $args, 'label' );
 	} else {
 		// Default Label value
-		$placeholders['label_value'] = gv_label( $field, $entry );
+		$placeholders[ 'label_value' ] = gv_label( $field, $entry );
 	}
 
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
-		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
+	if ( empty( $placeholders[ 'label' ] ) && ! empty( $placeholders[ 'label_value' ] ) ) {
+		$placeholders[ 'label' ] = '<span class="gv-field-label">{{ label_value }}</span>';
 	}
 
 	/**
@@ -1341,7 +1341,7 @@ 
 	 * @since 2.0
 	 * @param \GV\Template_Context $context The context.
 	 */
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args, $context );
+	$html = apply_filters( 'gravityview/field_output/pre_html', $args[ 'markup' ], $args, $context );
 
 	/**
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
@@ -1368,7 +1368,7 @@ 
 	foreach ( $placeholders as $tag => $value ) {
 
 		// If the tag doesn't exist just skip it
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
 			continue;
 		}