gravityview / GravityView

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

Spacing +3 added lines, -3 removed lines

@@ -11,10 +11,10 @@
 ?>
 
 <div class="gv-search-box gv-search-date">
-	<?php if( ! gv_empty( $search_field['label'], false ) ) { ?>
-	<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false ) ) { ?>
+	<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
 	<?php } ?>
 	<p>
-		<input type="text" name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $search_field['value'] ); ?>" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" >
+		<input type="text" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $search_field[ 'value' ] ); ?>" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" >
 	</p>
 </div>
\ No newline at end of file

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

Spacing +8 added lines, -8 removed lines

@@ -10,22 +10,22 @@
 $search_field = $gravityview_view->search_field;
 
 // Make sure that there are choices to display
-if( empty( $search_field['choices'] ) ) {
-	do_action('gravityview_log_debug', 'search-field-multiselect.php - No choices for field' );
+if ( empty( $search_field[ 'choices' ] ) ) {
+	do_action( 'gravityview_log_debug', 'search-field-multiselect.php - No choices for field' );
 	return;
 }
 
 ?>
 <div class="gv-search-box gv-search-field-multiselect">
-	<?php if( ! gv_empty( $search_field['label'], false ) ) { ?>
-	<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false ) ) { ?>
+	<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
 	<?php } ?>
 	<p>
-		<select name="<?php echo esc_attr( $search_field['name'] ); ?>[]" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" multiple>
-			<option value="" <?php gv_selected( '', $search_field['value'], true ); ?>>&mdash;</option>
+		<select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>[]" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" multiple>
+			<option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>>&mdash;</option>
 			<?php
-			foreach( $search_field['choices'] as $choice ) : ?>
-				<option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( $choice['value'], $search_field['value'], true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
+			foreach ( $search_field[ 'choices' ] as $choice ) : ?>
+				<option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php gv_selected( $choice[ 'value' ], $search_field[ 'value' ], true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
 			<?php endforeach; ?>
 		</select>
 	</p>

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

Spacing +8 added lines, -8 removed lines

@@ -10,22 +10,22 @@
 $search_field = $gravityview_view->search_field;
 
 // Make sure that there are choices to display
-if( empty( $search_field['choices'] ) ) {
-	do_action('gravityview_log_debug', 'search-field-select.php - No choices for field' );
+if ( empty( $search_field[ 'choices' ] ) ) {
+	do_action( 'gravityview_log_debug', 'search-field-select.php - No choices for field' );
 	return;
 }
 
 ?>
 <div class="gv-search-box gv-search-field-select">
-	<?php if( ! gv_empty( $search_field['label'], false ) ) { ?>
-	<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false ) ) { ?>
+	<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
 	<?php } ?>
 	<p>
-		<select name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>">
-			<option value="" <?php selected( '', $search_field['value'], true ); ?>>&mdash;</option>
+		<select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>">
+			<option value="" <?php selected( '', $search_field[ 'value' ], true ); ?>>&mdash;</option>
 			<?php
-			foreach( $search_field['choices'] as $choice ) : ?>
-				<option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php selected( $choice['value'], $search_field['value'], true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
+			foreach ( $search_field[ 'choices' ] as $choice ) : ?>
+				<option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php selected( $choice[ 'value' ], $search_field[ 'value' ], true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
 			<?php endforeach; ?>
 		</select>
 	</p>

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

Spacing +3 added lines, -3 removed lines

@@ -10,10 +10,10 @@
 
 ?>
 <div class="gv-search-box gv-search-field-text">
-	<?php if( ! gv_empty( $search_field['label'], false ) ) { ?>
-	<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false ) ) { ?>
+	<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
 	<?php } ?>
 	<p>
-		<input type="text" name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $search_field['value'] ); ?>">
+		<input type="text" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $search_field[ 'value' ] ); ?>">
 	</p>
 </div>
\ No newline at end of file

includes/widgets/search-widget/class-search-widget.php

Spacing +99 added lines, -99 removed lines

@@ -56,7 +56,7 @@ 
 				'type' => 'radio',
 				'full_width' => true,
 				'label' => esc_html__( 'Search Mode', 'gravityview' ),
-				'desc' => __('Should search results match all search fields, or any?', 'gravityview'),
+				'desc' => __( 'Should search results match all search fields, or any?', 'gravityview' ),
 				'value' => 'any',
 				'class' => 'hide-if-js',
 				'options' => array(
@@ -78,7 +78,7 @@ 
 
 		// admin - add scripts - run at 1100 to make sure GravityView_Admin_Views::add_scripts_and_styles() runs first at 999
 		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 1100 );
-		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
+		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
 		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
 
 		// ajax - get the searchable fields
@@ -112,7 +112,7 @@ 
 		$script_min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 		$script_source = empty( $script_min ) ? '/source' : '';
 
-		wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js'.$script_source.'/admin-search-widget'.$script_min.'.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), GravityView_Plugin::version );
+		wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js' . $script_source . '/admin-search-widget' . $script_min . '.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), GravityView_Plugin::version );
 
 
 		/**
@@ -166,7 +166,7 @@ 
 	 * @return array Scripts allowed in no-conflict mode, plus the search widget script
 	 */
 	public function register_no_conflict( $allowed ) {
-		$allowed[] = 'gravityview_searchwidget_admin';
+		$allowed[ ] = 'gravityview_searchwidget_admin';
 		return $allowed;
 	}
 
@@ -179,24 +179,24 @@ 
 	 */
 	public static function get_searchable_fields() {
 
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxsearchwidget' ) ) {
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxsearchwidget' ) ) {
 			exit( '0' );
 		}
 
 		$form = '';
 
 		// Fetch the form for the current View
-		if ( ! empty( $_POST['view_id'] ) ) {
+		if ( ! empty( $_POST[ 'view_id' ] ) ) {
 
-			$form = gravityview_get_form_id( $_POST['view_id'] );
+			$form = gravityview_get_form_id( $_POST[ 'view_id' ] );
 
-		} elseif ( ! empty( $_POST['formid'] ) ) {
+		} elseif ( ! empty( $_POST[ 'formid' ] ) ) {
 
-			$form = (int) $_POST['formid'];
+			$form = (int)$_POST[ 'formid' ];
 
-		} elseif ( ! empty( $_POST['template_id'] ) && class_exists( 'GravityView_Ajax' ) ) {
+		} elseif ( ! empty( $_POST[ 'template_id' ] ) && class_exists( 'GravityView_Ajax' ) ) {
 
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 
 		}
 
@@ -244,8 +244,8 @@ 
 			)
 		);
 
-		foreach( $custom_fields as $custom_field_key => $custom_field ) {
-			$output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field['type'], self::get_field_label( array('field' => $custom_field_key ) ), $custom_field['text'] );
+		foreach ( $custom_fields as $custom_field_key => $custom_field ) {
+			$output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field[ 'type' ], self::get_field_label( array( 'field' => $custom_field_key ) ), $custom_field[ 'text' ] );
 		}
 
 		if ( ! empty( $fields ) ) {
@@ -254,13 +254,13 @@ 
 
 			foreach ( $fields as $id => $field ) {
 
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 					continue;
 				}
 
-				$types = self::get_search_input_types( $id, $field['type'] );
+				$types = self::get_search_input_types( $id, $field[ 'type' ] );
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'data-inputtypes="'. esc_attr( $types ) .'">'. esc_html( $field['label'] ) .'</option>';
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . 'data-inputtypes="' . esc_attr( $types ) . '">' . esc_html( $field[ 'label' ] ) . '</option>';
 			}
 		}
 
@@ -282,7 +282,7 @@ 
 	public static function get_search_input_types( $id = '', $field_type = null ) {
 
 		// @todo - This needs to be improved - many fields have . including products and addresses
-		if ( false !== strpos( (string) $id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $id, array( 'is_fulfilled' ) ) ) {
+		if ( false !== strpos( (string)$id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $id, array( 'is_fulfilled' ) ) ) {
 			$input_type = 'boolean'; // on/off checkbox
 		} elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) {
 			$input_type = 'multi'; //multiselect
@@ -324,19 +324,19 @@ 
 			$post_id = 0;
 
 			// We're in the WordPress Widget context, and an overriding post ID has been set.
-			if ( ! empty( $widget_args['post_id'] ) ) {
-				$post_id = absint( $widget_args['post_id'] );
+			if ( ! empty( $widget_args[ 'post_id' ] ) ) {
+				$post_id = absint( $widget_args[ 'post_id' ] );
 			}
 			// We're in the WordPress Widget context, and the base View ID should be used
-			else if ( ! empty( $widget_args['view_id'] ) ) {
-				$post_id = absint( $widget_args['view_id'] );
+			else if ( ! empty( $widget_args[ 'view_id' ] ) ) {
+				$post_id = absint( $widget_args[ 'view_id' ] );
 			}
 
 			$args = gravityview_get_permalink_query_args( $post_id );
 
 			// Add hidden fields to the search form
 			foreach ( $args as $key => $value ) {
-				$search_fields[] = array(
+				$search_fields[ ] = array(
 					'name'  => $key,
 					'input' => 'hidden',
 					'value' => $value,
@@ -368,15 +368,15 @@ 
 		$get = array_map( 'urldecode', $get );
 
 		// add free search
-		if ( ! empty( $get['gv_search'] ) ) {
+		if ( ! empty( $get[ 'gv_search' ] ) ) {
 
 			// Search for a piece
-			$words = explode( ' ', $get['gv_search'] );
+			$words = explode( ' ', $get[ 'gv_search' ] );
 
 			$words = array_filter( $words );
 
 			foreach ( $words as $word ) {
-				$search_criteria['field_filters'][] = array(
+				$search_criteria[ 'field_filters' ][ ] = array(
 					'key' => null, // The field ID to search
 					'value' => $word, // The value to search
 					'operator' => 'contains', // What to search in. Options: `is` or `contains`
@@ -401,16 +401,16 @@ 
 		/**
 		 * Don't set $search_criteria['start_date'] if start_date is empty as it may lead to bad query results (GFAPI::get_entries)
 		 */
-		if( !empty( $curr_start ) ) {
-			$search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
+		if ( ! empty( $curr_start ) ) {
+			$search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
 		}
-		if( !empty( $curr_end ) ) {
-			$search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
+		if ( ! empty( $curr_end ) ) {
+			$search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
 		}
 
 		// search for a specific entry ID
 		if ( ! empty( $get[ 'gv_id' ] ) ) {
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => 'id',
 				'value' => absint( $get[ 'gv_id' ] ),
 				'operator' => '=',
@@ -419,9 +419,9 @@ 
 
 		// search for a specific Created_by ID
 		if ( ! empty( $get[ 'gv_by' ] ) ) {
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => 'created_by',
-				'value' => absint( $get['gv_by'] ),
+				'value' => absint( $get[ 'gv_by' ] ),
 				'operator' => '=',
 			);
 		}
@@ -433,22 +433,22 @@ 
 		// get the other search filters
 		foreach ( $get as $key => $value ) {
 
-			if ( 0 !== strpos( $key, 'filter_' ) || empty( $value ) || ( is_array( $value ) && count( $value ) === 1 && empty( $value[0] ) ) ) {
+			if ( 0 !== strpos( $key, 'filter_' ) || empty( $value ) || ( is_array( $value ) && count( $value ) === 1 && empty( $value[ 0 ] ) ) ) {
 				continue;
 			}
 
 			// could return simple filter or multiple filters
 			$filter = $this->prepare_field_filter( $key, $value );
 
-			if ( isset( $filter[0]['value'] ) ) {
-				$search_criteria['field_filters'] = array_merge( $search_criteria['field_filters'], $filter );
+			if ( isset( $filter[ 0 ][ 'value' ] ) ) {
+				$search_criteria[ 'field_filters' ] = array_merge( $search_criteria[ 'field_filters' ], $filter );
 
 				// if date range type, set search mode to ALL
-				if ( ! empty( $filter[0]['operator'] ) && in_array( $filter[0]['operator'], array( '>', '<' ) ) ) {
+				if ( ! empty( $filter[ 0 ][ 'operator' ] ) && in_array( $filter[ 0 ][ 'operator' ], array( '>', '<' ) ) ) {
 					$mode = 'all';
 				}
-			} elseif( !empty( $filter ) ) {
-				$search_criteria['field_filters'][] = $filter;
+			} elseif ( ! empty( $filter ) ) {
+				$search_criteria[ 'field_filters' ][ ] = $filter;
 			}
 		}
 
@@ -457,7 +457,7 @@ 
 		 * @since 1.5.1
 		 * @param[out,in] string $mode Search mode (`any` vs `all`)
 		 */
-		$search_criteria['field_filters']['mode'] = apply_filters( 'gravityview/search/mode', $mode );
+		$search_criteria[ 'field_filters' ][ 'mode' ] = apply_filters( 'gravityview/search/mode', $mode );
 
 		do_action( 'gravityview_log_debug', sprintf( '%s[filter_entries] Returned Search Criteria: ', get_class( $this ) ), $search_criteria );
 
@@ -493,11 +493,11 @@ 
 			'value' => _wp_specialchars( $value ), // Gravity Forms encodes ampersands but not quotes
 		);
 
-		switch ( $form_field['type'] ) {
+		switch ( $form_field[ 'type' ] ) {
 
 			case 'select':
 			case 'radio':
-				$filter['operator'] = 'is';
+				$filter[ 'operator' ] = 'is';
 				break;
 
 			case 'post_category':
@@ -511,7 +511,7 @@ 
 
 				foreach ( $value as $val ) {
 					$cat = get_term( $val, 'category' );
-					$filter[] = array(
+					$filter[ ] = array(
 						'key' => $field_id,
 						'value' => esc_attr( $cat->name ) . ':' . $val,
 						'operator' => 'is',
@@ -530,18 +530,18 @@ 
 				$filter = array();
 
 				foreach ( $value as $val ) {
-					$filter[] = array( 'key' => $field_id, 'value' => $val );
+					$filter[ ] = array( 'key' => $field_id, 'value' => $val );
 				}
 
 				break;
 
 			case 'checkbox':
 				// convert checkbox on/off into the correct search filter
-				if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field['inputs'] ) && ! empty( $form_field['choices'] ) ) {
-					foreach ( $form_field['inputs'] as $k => $input ) {
-						if ( $input['id'] == $field_id ) {
-							$filter['value'] = $form_field['choices'][ $k ]['value'];
-							$filter['operator'] = 'is';
+				if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field[ 'inputs' ] ) && ! empty( $form_field[ 'choices' ] ) ) {
+					foreach ( $form_field[ 'inputs' ] as $k => $input ) {
+						if ( $input[ 'id' ] == $field_id ) {
+							$filter[ 'value' ] = $form_field[ 'choices' ][ $k ][ 'value' ];
+							$filter[ 'operator' ] = 'is';
 							break;
 						}
 					}
@@ -551,7 +551,7 @@ 
 					$filter = array();
 
 					foreach ( $value as $val ) {
-						$filter[] = array(
+						$filter[ ] = array(
 								'key'   => $field_id,
 								'value' => $val,
 								'operator' => 'is',
@@ -572,9 +572,9 @@ 
 					foreach ( $words as $word ) {
 						if ( ! empty( $word ) && strlen( $word ) > 1 ) {
 							// Keep the same key for each filter
-							$filter['value'] = $word;
+							$filter[ 'value' ] = $word;
 							// Add a search for the value
-							$filters[] = $filter;
+							$filters[ ] = $filter;
 						}
 					}
 
@@ -596,14 +596,14 @@ 
 						}
 						$operator = 'start' === $k ? '>' : '<';
 
-						$filter[] = array(
+						$filter[ ] = array(
 							'key' => $field_id,
 							'value' => self::get_formatted_date( $date, 'Y-m-d' ),
 							'operator' => $operator,
 						);
 					}
 				} else {
-					$filter['value'] = self::get_formatted_date( $value, 'Y-m-d' );
+					$filter[ 'value' ] = self::get_formatted_date( $value, 'Y-m-d' );
 				}
 
 				break;
@@ -634,7 +634,7 @@ 
 			'ymd_dot' => 'Y.m.d',
 		);
 
-		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){
+		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) {
 			$format = $datepicker[ $field->dateFormat ];
 		}
 
@@ -665,7 +665,7 @@ 
 	public function add_template_path( $file_paths ) {
 
 		// Index 100 is the default GravityView template path.
-		$file_paths[102] = self::$file . 'templates/';
+		$file_paths[ 102 ] = self::$file . 'templates/';
 
 		return $file_paths;
 	}
@@ -688,7 +688,7 @@ 
 		}
 
 		// get configured search fields
-		$search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : '';
+		$search_fields = ! empty( $widget_args[ 'search_fields' ] ) ? json_decode( $widget_args[ 'search_fields' ], true ) : '';
 
 		if ( empty( $search_fields ) || ! is_array( $search_fields ) ) {
 			do_action( 'gravityview_log_debug', sprintf( '%s[render_frontend] No search fields configured for widget:', get_class( $this ) ), $widget_args );
@@ -702,24 +702,24 @@ 
 
 			$updated_field = $field;
 
-			if ( in_array( $field['input'], array( 'date', 'date_range' ) ) ) {
+			if ( in_array( $field[ 'input' ], array( 'date', 'date_range' ) ) ) {
 				$has_date = true;
 			}
 
 			$updated_field = $this->get_search_filter_details( $updated_field );
 
-			switch ( $field['field'] ) {
+			switch ( $field[ 'field' ] ) {
 
 				case 'search_all':
-					$updated_field['key'] = 'search_all';
-					$updated_field['input'] = 'search_all';
-					$updated_field['value'] = esc_attr( stripslashes_deep( rgget( 'gv_search' ) ) );
+					$updated_field[ 'key' ] = 'search_all';
+					$updated_field[ 'input' ] = 'search_all';
+					$updated_field[ 'value' ] = esc_attr( stripslashes_deep( rgget( 'gv_search' ) ) );
 					break;
 
 				case 'entry_date':
-					$updated_field['key'] = 'entry_date';
-					$updated_field['input'] = 'entry_date';
-					$updated_field['value'] = array(
+					$updated_field[ 'key' ] = 'entry_date';
+					$updated_field[ 'input' ] = 'entry_date';
+					$updated_field[ 'value' ] = array(
 						'start' => esc_attr( stripslashes_deep( rgget( 'gv_start' ) ) ),
 						'end' => esc_attr( stripslashes_deep( rgget( 'gv_end' ) ) ),
 					);
@@ -727,16 +727,16 @@ 
 					break;
 
 				case 'entry_id':
-					$updated_field['key'] = 'entry_id';
-					$updated_field['input'] = 'entry_id';
-					$updated_field['value'] = esc_attr( stripslashes_deep( rgget( 'gv_id' ) ) );
+					$updated_field[ 'key' ] = 'entry_id';
+					$updated_field[ 'input' ] = 'entry_id';
+					$updated_field[ 'value' ] = esc_attr( stripslashes_deep( rgget( 'gv_id' ) ) );
 					break;
 
 				case 'created_by':
-					$updated_field['key'] = 'created_by';
-					$updated_field['name'] = 'gv_by';
-					$updated_field['value'] = esc_attr( stripslashes_deep( rgget( 'gv_by' ) ) );
-					$updated_field['choices'] = self::get_created_by_choices();
+					$updated_field[ 'key' ] = 'created_by';
+					$updated_field[ 'name' ] = 'gv_by';
+					$updated_field[ 'value' ] = esc_attr( stripslashes_deep( rgget( 'gv_by' ) ) );
+					$updated_field[ 'choices' ] = self::get_created_by_choices();
 					break;
 			}
 
@@ -754,16 +754,16 @@ 
 		 */
 		$gravityview_view->search_fields = apply_filters( 'gravityview_widget_search_filters', $search_fields, $this, $widget_args );
 
-		$gravityview_view->search_layout = ! empty( $widget_args['search_layout'] ) ? $widget_args['search_layout'] : 'horizontal';
+		$gravityview_view->search_layout = ! empty( $widget_args[ 'search_layout' ] ) ? $widget_args[ 'search_layout' ] : 'horizontal';
 
 		/** @since 1.14 */
-		$gravityview_view->search_mode = ! empty( $widget_args['search_mode'] ) ? $widget_args['search_mode'] : 'any';
+		$gravityview_view->search_mode = ! empty( $widget_args[ 'search_mode' ] ) ? $widget_args[ 'search_mode' ] : 'any';
 
-		$custom_class = ! empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
+		$custom_class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
 
 		$gravityview_view->search_class = self::get_search_class( $custom_class );
 
-		$gravityview_view->search_clear = ! empty( $widget_args['search_clear'] ) ? $widget_args['search_clear'] : false;
+		$gravityview_view->search_clear = ! empty( $widget_args[ 'search_clear' ] ) ? $widget_args[ 'search_clear' ] : false;
 
 		if ( $has_date ) {
 			// enqueue datepicker stuff only if needed!
@@ -785,10 +785,10 @@ 
 	public static function get_search_class( $custom_class = '' ) {
 		$gravityview_view = GravityView_View::getInstance();
 
-		$search_class = 'gv-search-'.$gravityview_view->search_layout;
+		$search_class = 'gv-search-' . $gravityview_view->search_layout;
 
-		if ( ! empty( $custom_class )  ) {
-			$search_class .= ' '.$custom_class;
+		if ( ! empty( $custom_class ) ) {
+			$search_class .= ' ' . $custom_class;
 		}
 
 		/**
@@ -831,11 +831,11 @@ 
 
 		$label = rgget( 'label', $field );
 
-		if( '' === $label ) {
+		if ( '' === $label ) {
 
-			$label = isset( $form_field['label'] ) ? $form_field['label'] : '';
+			$label = isset( $form_field[ 'label' ] ) ? $form_field[ 'label' ] : '';
 
-			switch( $field['field'] ) {
+			switch ( $field[ 'field' ] ) {
 				case 'search_all':
 					$label = __( 'Search Entries:', 'gravityview' );
 					break;
@@ -853,10 +853,10 @@ 
 					break;
 				default:
 					// If this is a field input, not a field
-					if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) {
+					if ( strpos( $field[ 'field' ], '.' ) > 0 && ! empty( $form_field[ 'inputs' ] ) ) {
 
 						// Get the label for the field in question, which returns an array
-						$items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) );
+						$items = wp_list_filter( $form_field[ 'inputs' ], array( 'id' => $field[ 'field' ] ) );
 
 						// Get the item with the `label` key
 						$values = wp_list_pluck( $items, 'label' );
@@ -893,7 +893,7 @@ 
 		$form = $gravityview_view->getForm();
 
 		// for advanced field ids (eg, first name / last name )
-		$name = 'filter_' . str_replace( '.', '_', $field['field'] );
+		$name = 'filter_' . str_replace( '.', '_', $field[ 'field' ] );
 
 		// get searched value from $_GET (string or array)
 		$value = rgget( $name );
@@ -903,26 +903,26 @@ 
 		$value = is_array( $value ) ? array_map( 'urldecode', $value ) : urldecode( $value );
 
 		// get form field details
-		$form_field = gravityview_get_field( $form, $field['field'] );
+		$form_field = gravityview_get_field( $form, $field[ 'field' ] );
 
 		$filter = array(
-			'key' => $field['field'],
+			'key' => $field[ 'field' ],
 			'name' => $name,
 			'label' => self::get_field_label( $field, $form_field ),
-			'input' => $field['input'],
+			'input' => $field[ 'input' ],
 			'value' => _wp_specialchars( $value ),
-			'type' => $form_field['type'],
+			'type' => $form_field[ 'type' ],
 		);
 
 		// collect choices
-		if ( 'post_category' === $form_field['type'] && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) {
-			$filter['choices'] = gravityview_get_terms_choices();
-		} elseif ( ! empty( $form_field['choices'] ) ) {
-			$filter['choices'] = $form_field['choices'];
+		if ( 'post_category' === $form_field[ 'type' ] && ! empty( $form_field[ 'displayAllCategories' ] ) && empty( $form_field[ 'choices' ] ) ) {
+			$filter[ 'choices' ] = gravityview_get_terms_choices();
+		} elseif ( ! empty( $form_field[ 'choices' ] ) ) {
+			$filter[ 'choices' ] = $form_field[ 'choices' ];
 		}
 
-		if ( 'date_range' === $field['input'] && empty( $value ) ) {
-			$filter['value'] = array( 'start' => '', 'end' => '' );
+		if ( 'date_range' === $field[ 'input' ] && empty( $value ) ) {
+			$filter[ 'value' ] = array( 'start' => '', 'end' => '' );
 		}
 
 		return $filter;
@@ -946,7 +946,7 @@ 
 
 		$choices = array();
 		foreach ( $users as $user ) {
-			$choices[] = array(
+			$choices[ ] = array(
 				'value' => $user->ID,
 				'text' => $user->display_name,
 			);
@@ -981,7 +981,7 @@ 
 	 */
 	public function add_datepicker_js_dependency( $js_dependencies ) {
 
-		$js_dependencies[] = 'jquery-ui-datepicker';
+		$js_dependencies[ ] = 'jquery-ui-datepicker';
 
 		return $js_dependencies;
 	}
@@ -1025,7 +1025,7 @@ 
 			'isRTL'             => is_rtl(),
 		), $view_data );
 
-		$localizations['datepicker'] = $datepicker_settings;
+		$localizations[ 'datepicker' ] = $datepicker_settings;
 
 		return $localizations;
 
@@ -1054,7 +1054,7 @@ 
 	 * @return void
 	 */
 	private function maybe_enqueue_flexibility() {
-		if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/MSIE [8-9]/', $_SERVER['HTTP_USER_AGENT'] ) ) {
+		if ( isset( $_SERVER[ 'HTTP_USER_AGENT' ] ) && preg_match( '/MSIE [8-9]/', $_SERVER[ 'HTTP_USER_AGENT' ] ) ) {
 			wp_enqueue_script( 'gv-flexibility' );
 		}
 	}
@@ -1076,7 +1076,7 @@ 
 		add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 );
 
 		$scheme = is_ssl() ? 'https://' : 'http://';
-		wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
+		wp_enqueue_style( 'jquery-ui-datepicker', $scheme . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
 
 		/**
 		 * @filter `gravityview_search_datepicker_class`

includes/class-api.php

Spacing +146 added lines, -146 removed lines

@@ -30,29 +30,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' ] );
 
 					}
 
@@ -61,9 +61,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 );
 
 			}
 
@@ -117,11 +117,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;
 			}
 
@@ -144,39 +144,39 @@ 
 
 		$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 {
-				$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 ) );
 	}
 
 	/**
@@ -193,16 +193,16 @@ 
 	 */
 	public static function field_html_attr_id( $field, $form = array(), $entry = array() ) {
 		$gravityview_view = GravityView_View::getInstance();
-		$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 {
 				$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 );
@@ -219,13 +219,13 @@ 
 	 */
 	public static function field_value( $entry, $field_settings, $format = 'html' ) {
 
-		if( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) {
+		if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) {
 			return NULL;
 		}
 
 		$gravityview_view = GravityView_View::getInstance();
 
-		if( class_exists( 'GFCache' ) ) {
+		if ( class_exists( 'GFCache' ) ) {
 			/**
 			 * Gravity Forms' GFCache function was thrashing the database, causing double the amount of time for the field_value() method to run.
 			 *
@@ -240,46 +240,46 @@ 
 			 * @param boolean false Tell Gravity Forms not to store this as a transient
 			 * @param  int 0 Time to store the value. 0 is maximum amount of time possible.
 			 */
-			GFCache::set( "GFFormsModel::get_lead_field_value_" . $entry["id"] . "_" . $field_settings["id"], false, false, 0 );
+			GFCache::set( "GFFormsModel::get_lead_field_value_" . $entry[ "id" ] . "_" . $field_settings[ "id" ], false, false, 0 );
 		}
 
-		$field_id = $field_settings['id'];
+		$field_id = $field_settings[ 'id' ];
 
 		$form = $gravityview_view->getForm();
 
 		$field = gravityview_get_field( $form, $field_id );
 
-		$field_type = RGFormsModel::get_input_type($field);
+		$field_type = RGFormsModel::get_input_type( $field );
 
-		if( $field_type ) {
-			$field_type = $field['type'];
-			$value = RGFormsModel::get_lead_field_value($entry, $field);
+		if ( $field_type ) {
+			$field_type = $field[ 'type' ];
+			$value = RGFormsModel::get_lead_field_value( $entry, $field );
 		} else {
 			// For non-integer field types (`id`, `date_created`, etc.)
 			$field_type = $field_id;
-			$field['type'] = $field_id;
-			$value = isset($entry[$field_type]) ? $entry[$field_type] : NULL;
+			$field[ 'type' ] = $field_id;
+			$value = isset( $entry[ $field_type ] ) ? $entry[ $field_type ] : NULL;
 		}
 
 		// Prevent any PHP warnings that may be generated
 		ob_start();
 
-		$display_value = GFCommon::get_lead_field_display($field, $value, $entry["currency"], false, $format);
+		$display_value = GFCommon::get_lead_field_display( $field, $value, $entry[ "currency" ], false, $format );
 
-		if( $errors = ob_get_clean() ) {
+		if ( $errors = ob_get_clean() ) {
 			do_action( 'gravityview_log_error', 'GravityView_API[field_value] Errors when calling GFCommon::get_lead_field_display()', $errors );
 		}
 
-		$display_value = apply_filters("gform_entry_field_value", $display_value, $field, $entry, $form);
+		$display_value = apply_filters( "gform_entry_field_value", $display_value, $field, $entry, $form );
 
 		// prevent the use of merge_tags for non-admin fields
-		if( !empty( $field['adminOnly'] ) ) {
+		if ( ! empty( $field[ 'adminOnly' ] ) ) {
 			$display_value = self::replace_variables( $display_value, $form, $entry );
 		}
 
 		// Check whether the field exists in /includes/fields/{$field_type}.php
 		// This can be overridden by user template files.
-		$field_path = $gravityview_view->locate_template("fields/{$field_type}.php");
+		$field_path = $gravityview_view->locate_template( "fields/{$field_type}.php" );
 
 		// Set the field data to be available in the templates
 		$gravityview_view->setCurrentField( array(
@@ -293,11 +293,11 @@ 
 			'entry' => $entry,
 			'field_type' => $field_type, /** {@since 1.6} */
 		    'field_path' => $field_path, /** {@since 1.16} */
-		));
+		) );
 
-		if( ! empty( $field_path ) ) {
+		if ( ! empty( $field_path ) ) {
 
-			do_action( 'gravityview_log_debug', sprintf('[field_value] Rendering %s', $field_path ) );
+			do_action( 'gravityview_log_debug', sprintf( '[field_value] Rendering %s', $field_path ) );
 
 			ob_start();
 
@@ -312,7 +312,7 @@ 
 
 		}
 
-		$field_settings = $gravityview_view->getCurrentField('field_settings');
+		$field_settings = $gravityview_view->getCurrentField( 'field_settings' );
 
 		/**
 		 * @filter `gravityview_field_entry_value_{$field_type}_pre_link` Modify the field value output for a field type before Show As Link setting is applied. Example: `gravityview_field_entry_value_number_pre_link`
@@ -330,9 +330,9 @@ 
 		 * Fields can override this by modifying the field data variable inside the field. See /templates/fields/post_image.php for an example.
 		 *
 		 */
-		if( !empty( $field_settings['show_as_link'] ) && ! gv_empty( $output, false, false ) ) {
+		if ( ! empty( $field_settings[ 'show_as_link' ] ) && ! gv_empty( $output, false, false ) ) {
 
-			$link_atts = empty( $field_settings['new_window'] ) ? array() : array( 'target' => '_blank' );
+			$link_atts = empty( $field_settings[ 'new_window' ] ) ? array() : array( 'target' => '_blank' );
 
 			$output = self::entry_link_html( $entry, $output, $link_atts, $field_settings );
 
@@ -346,7 +346,7 @@ 
 		 * @param  array $field_settings Settings for the particular GV field
 		 * @param array $field Current field being displayed
 		 */
-		$output = apply_filters( 'gravityview_field_entry_value_'.$field_type, $output, $entry, $field_settings, $gravityview_view->getCurrentField() );
+		$output = apply_filters( 'gravityview_field_entry_value_' . $field_type, $output, $entry, $field_settings, $gravityview_view->getCurrentField() );
 
 		/**
 		 * @filter `gravityview_field_entry_value` Modify the field value output for all field types
@@ -375,14 +375,14 @@ 
 	 */
 	public static function entry_link_html( $entry = array(), $anchor_text = '', $passed_tag_atts = array(), $field_settings = array() ) {
 
-		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry['id'] ) ) {
+		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry[ 'id' ] ) ) {
 			do_action( 'gravityview_log_debug', 'GravityView_API[entry_link_tag] Entry not defined; returning null', $entry );
 			return NULL;
 		}
 
 		$href = self::entry_link( $entry );
 
-		if( '' === $href ) {
+		if ( '' === $href ) {
 			return NULL;
 		}
 
@@ -405,19 +405,19 @@ 
 	 * @param  boolean     $wpautop Apply wpautop() to the output?
 	 * @return string               HTML of "no results" text
 	 */
-	public static function no_results($wpautop = true) {
+	public static function no_results( $wpautop = true ) {
 		$gravityview_view = GravityView_View::getInstance();
 
 		$is_search = false;
 
-		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;
 		}
 
-		if($is_search) {
-			$output = __('This search returned no results.', 'gravityview');
+		if ( $is_search ) {
+			$output = __( 'This search returned no results.', 'gravityview' );
 		} else {
-			$output = __('No entries match your request.', 'gravityview');
+			$output = __( 'No entries match your request.', 'gravityview' );
 		}
 
 		/**
@@ -425,9 +425,9 @@ 
 		 * @param string $output The existing "No Entries" text
 		 * @param boolean $is_search Is the current page a search result, or just a multiple entries screen?
 		 */
-		$output = apply_filters( 'gravitview_no_entries_text', $output, $is_search);
+		$output = apply_filters( 'gravitview_no_entries_text', $output, $is_search );
 
-		return $wpautop ? wpautop($output) : $output;
+		return $wpautop ? wpautop( $output ) : $output;
 	}
 
 	/**
@@ -444,37 +444,37 @@ 
 
 		$gravityview_view = GravityView_View::getInstance();
 
-		if( empty( $post_id ) ) {
+		if ( empty( $post_id ) ) {
 
 			$post_id = false;
 
 			// DataTables passes the Post ID
-			if( defined('DOING_AJAX') && DOING_AJAX ) {
+			if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
 
-				$post_id = isset( $_POST['post_id'] ) ? (int)$_POST['post_id'] : false;
+				$post_id = isset( $_POST[ 'post_id' ] ) ? (int)$_POST[ 'post_id' ] : false;
 
 			} else {
 
 				// The Post ID has been passed via the shortcode
-				if( !empty( $gravityview_view ) && $gravityview_view->getPostId() ) {
+				if ( ! empty( $gravityview_view ) && $gravityview_view->getPostId() ) {
 
 					$post_id = $gravityview_view->getPostId();
 
 				} else {
 
 					// This is a GravityView post type
-					if( GravityView_frontend::getInstance()->isGravityviewPostType() ) {
+					if ( GravityView_frontend::getInstance()->isGravityviewPostType() ) {
 
 						$post_id = isset( $gravityview_view ) ? $gravityview_view->getViewId() : $post->ID;
 
 					} else {
 
 						// This is an embedded GravityView; use the embedded post's ID as the base.
-						if( GravityView_frontend::getInstance()->isPostHasShortcode() && is_a( $post, 'WP_Post' ) ) {
+						if ( GravityView_frontend::getInstance()->isPostHasShortcode() && is_a( $post, 'WP_Post' ) ) {
 
 							$post_id = $post->ID;
 
-						} elseif( $gravityview_view->getViewId() ) {
+						} elseif ( $gravityview_view->getViewId() ) {
 
 							// The GravityView has been embedded in a widget or in a template, and
 							// is not in the current content. Thus, we defer to the View's own ID.
@@ -489,36 +489,36 @@ 
 		}
 
 		// No post ID, get outta here.
-		if( empty( $post_id ) ) {
+		if ( empty( $post_id ) ) {
 			return NULL;
 		}
 
 		// 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( empty( $link ) ) {
+		if ( empty( $link ) ) {
 
 			$link = get_permalink( $post_id );
 
 			// 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
-		if( $link && $add_query_args ) {
+		if ( $link && $add_query_args ) {
 
 			$args = array();
 
-			if( $pagenum = rgget('pagenum') ) {
-				$args['pagenum'] = intval( $pagenum );
+			if ( $pagenum = rgget( 'pagenum' ) ) {
+				$args[ 'pagenum' ] = intval( $pagenum );
 			}
 
-			if( $sort = rgget('sort') ) {
-				$args['sort'] = $sort;
-				$args['dir'] = rgget('dir');
+			if ( $sort = rgget( 'sort' ) ) {
+				$args[ 'sort' ] = $sort;
+				$args[ 'dir' ] = rgget( 'dir' );
 			}
 
 			$link = add_query_arg( $args, $link );
@@ -541,7 +541,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}`
@@ -552,7 +552,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;
 		}
 
@@ -581,7 +581,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 ) {
@@ -595,7 +595,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 ) {
 
 				gform_update_meta( $id_or_string, 'gravityview_unique_id', $hash );
 
@@ -623,12 +623,12 @@ 
          * @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 );
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash );
+            $hash = self::get_custom_entry_slug( $entry[ 'id' ], $entry );
+            gform_update_meta( $entry[ 'id' ], 'gravityview_unique_id', $hash );
 
         }
     }
@@ -645,14 +645,14 @@ 
 	 */
 	public static function entry_link( $entry, $post_id = NULL, $add_directory_args = true ) {
 
-		if( ! empty( $entry ) && ! is_array( $entry ) ) {
+		if ( ! empty( $entry ) && ! is_array( $entry ) ) {
 			$entry = GVCommon::get_entry( $entry );
-		} else if( empty( $entry ) ) {
+		} else if ( empty( $entry ) ) {
 			$entry = GravityView_frontend::getInstance()->getEntry();
 		}
 
 		// Second parameter used to be passed as $field; this makes sure it's not an array
-		if( !is_numeric( $post_id ) ) {
+		if ( ! is_numeric( $post_id ) ) {
 			$post_id = NULL;
 		}
 
@@ -660,19 +660,19 @@ 
 		$directory_link = self::directory_link( $post_id, false );
 
 		// No post ID? Get outta here.
-		if( empty( $directory_link ) ) {
+		if ( empty( $directory_link ) ) {
 			return '';
 		}
 
 		$query_arg_name = GravityView_Post_Types::get_entry_var_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();
 
-			$directory_link = trailingslashit( $directory_link ) . $query_arg_name . '/'. $entry_slug .'/';
+			$directory_link = trailingslashit( $directory_link ) . $query_arg_name . '/' . $entry_slug . '/';
 
 		} else {
 
@@ -682,18 +682,18 @@ 
 		/**
 		 * @since 1.7.3
 		 */
-		if( $add_directory_args ) {
+		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 = rgget('sort') ) {
-				$args['sort'] = $sort;
-				$args['dir'] = rgget('dir');
+			if ( $sort = rgget( 'sort' ) ) {
+				$args[ 'sort' ] = $sort;
+				$args[ 'dir' ] = rgget( 'dir' );
 			}
 
 		}
@@ -703,8 +703,8 @@ 
 		 * has the view id so that Advanced Filters can be applied correctly when rendering the single view
 		 * @see GravityView_frontend::get_context_view_id()
 		 */
-		if( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() ) {
-			$args['gvid'] = gravityview_get_view_id();
+		if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() ) {
+			$args[ 'gvid' ] = gravityview_get_view_id();
 		}
 
 		return add_query_arg( $args, $directory_link );
@@ -722,7 +722,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 );
 }
 
 /**
@@ -744,11 +744,11 @@ 
 
 	$default_css_class = ! empty( $view_id ) ? sprintf( 'gv-container gv-container-%d', $view_id ) : 'gv-container';
 
-	if( GravityView_View::getInstance()->isHideUntilSearched() ) {
+	if ( GravityView_View::getInstance()->isHideUntilSearched() ) {
 		$default_css_class .= ' hidden';
 	}
 
-	$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
@@ -759,7 +759,7 @@ 
 
 	$css_class = gravityview_sanitize_html_class( $css_class );
 
-	if( $echo ) {
+	if ( $echo ) {
 		echo $css_class;
 	}
 
@@ -770,7 +770,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)
@@ -789,7 +789,7 @@ 
 	return GravityView_API::entry_link( $entry, $post_id );
 }
 
-function gv_no_results($wpautop = true) {
+function gv_no_results( $wpautop = true ) {
 	return GravityView_API::no_results( $wpautop );
 }
 
@@ -802,7 +802,7 @@ 
 
 	$href = gv_directory_link();
 
-	if( empty( $href ) ) { return NULL; }
+	if ( empty( $href ) ) { return NULL; }
 
 	// calculate link label
 	$gravityview_view = GravityView_View::getInstance();
@@ -818,7 +818,7 @@ 
 
 	$link = gravityview_get_link( $href, esc_html( $label ), array(
 		'data-viewid' => $gravityview_view->getViewId()
-	));
+	) );
 
 	return $link;
 }
@@ -837,7 +837,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;
@@ -867,16 +867,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( ':', $value, 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
@@ -889,7 +889,7 @@ 
 		}
 
 		// There's still a tag/category here.
-		if( $term ) {
+		if ( $term ) {
 
 			$term_link = get_term_link( $term, $taxonomy );
 
@@ -898,11 +898,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 );
 }
 
 /**
@@ -916,8 +916,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;
@@ -936,7 +936,7 @@ 
 	$fe = GravityView_frontend::getInstance();
 
 	// Solve problem when loading content via admin-ajax.php
-	if( ! $fe->getGvOutputData() ) {
+	if ( ! $fe->getGvOutputData() ) {
 
 		do_action( 'gravityview_log_debug', '[gravityview_get_current_views] gv_output_data not defined; parsing content.' );
 
@@ -944,7 +944,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' ) ) {
 
 		do_action( 'gravityview_log_debug', '[gravityview_get_current_views] gv_output_data not an object or get_view not callable.', $fe->getGvOutputData() );
 
@@ -964,10 +964,10 @@ 
 
 	$fe = GravityView_frontend::getInstance();
 
-	if( ! $fe->getGvOutputData() ) { return array(); }
+	if ( ! $fe->getGvOutputData() ) { return array(); }
 
 	// If not set, grab the current view ID
-	if( empty( $view_id ) ) {
+	if ( empty( $view_id ) ) {
 		$view_id = $fe->get_context_view_id();
 	}
 
@@ -1032,11 +1032,11 @@ 
 	 */
 	$is_edit_entry = apply_filters( 'gravityview_is_edit_entry', false );
 
-	if( $is_edit_entry ) {
+	if ( $is_edit_entry ) {
 		$context = 'edit';
-	} else if( class_exists( 'GravityView_frontend' ) && $single = GravityView_frontend::is_single_entry() ) {
+	} else if ( class_exists( 'GravityView_frontend' ) && $single = GravityView_frontend::is_single_entry() ) {
 		$context = 'single';
-	} else if( class_exists( 'GravityView_View' ) ) {
+	} else if ( class_exists( 'GravityView_View' ) ) {
 		$context = GravityView_View::getInstance()->getContext();
 	}
 
@@ -1064,12 +1064,12 @@ 
 function gravityview_get_files_array( $value, $gv_class = '' ) {
 	/** @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/fileupload.php' );
+	if ( ! class_exists( 'GravityView_Field_FileUpload' ) ) {
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/fileupload.php' );
 	}
 
 	return GravityView_Field_FileUpload::get_files_array( $value, $gv_class );
@@ -1147,12 +1147,12 @@ 
 	$args = apply_filters( 'gravityview/field_output/args', $args, $passed_args );
 
 	// Required fields.
-	if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
+	if ( empty( $args[ 'field' ] ) || empty( $args[ 'form' ] ) ) {
 		do_action( 'gravityview_log_error', '[gravityview_field_output] Field or form are empty.', $args );
 		return '';
 	}
 
-	$entry = empty( $args['entry'] ) ? array() : $args['entry'];
+	$entry = empty( $args[ 'entry' ] ) ? array() : $args[ 'entry' ];
 
 	/**
 	 * Create the content variables for replacing.
@@ -1168,37 +1168,37 @@ 
 		'field_id' => '',
 	);
 
-	$context['value'] = gv_value( $entry, $args['field'] );
+	$context[ 'value' ] = gv_value( $entry, $args[ 'field' ] );
 
 	// If the value is empty and we're hiding empty, return empty.
-	if ( $context['value'] === '' && ! empty( $args['hide_empty'] ) ) {
+	if ( $context[ 'value' ] === '' && ! empty( $args[ 'hide_empty' ] ) ) {
 		return '';
 	}
 
-	if ( $context['value'] !== '' && ! empty( $args['wpautop'] ) ) {
-		$context['value'] = wpautop( $context['value'] );
+	if ( $context[ 'value' ] !== '' && ! empty( $args[ 'wpautop' ] ) ) {
+		$context[ 'value' ] = wpautop( $context[ 'value' ] );
 	}
 
 	// Get width setting, if exists
-	$context['width'] = GravityView_API::field_width( $args['field'] );
+	$context[ 'width' ] = GravityView_API::field_width( $args[ 'field' ] );
 
 	// If replacing with CSS inline formatting, let's do it.
-	$context['width:style'] = GravityView_API::field_width( $args['field'], 'width:' . $context['width'] . '%;' );
+	$context[ 'width:style' ] = GravityView_API::field_width( $args[ 'field' ], 'width:' . $context[ 'width' ] . '%;' );
 
 	// Grab the Class using `gv_class`
-	$context['class'] = gv_class( $args['field'], $args['form'], $entry );
-	$context['field_id'] = GravityView_API::field_html_attr_id( $args['field'], $args['form'], $entry );
+	$context[ 'class' ] = gv_class( $args[ 'field' ], $args[ 'form' ], $entry );
+	$context[ 'field_id' ] = GravityView_API::field_html_attr_id( $args[ 'field' ], $args[ 'form' ], $entry );
 
 	// Get field label if needed
-	if ( ! empty( $args['label_markup'] ) && ! empty( $args['field']['show_label'] ) ) {
-		$context['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' ] ) ) {
+		$context[ 'label' ] = str_replace( array( '{{label}}', '{{ label }}' ), '<span class="gv-field-label">{{ label_value }}</span>', $args[ 'label_markup' ] );
 	}
 
 	// Default Label value
-	$context['label_value'] = gv_label( $args['field'], $entry );
+	$context[ 'label_value' ] = gv_label( $args[ 'field' ], $entry );
 
-	if ( empty( $context['label'] ) && ! empty( $context['label_value'] ) ){
-		$context['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
+	if ( empty( $context[ 'label' ] ) && ! empty( $context[ 'label_value' ] ) ) {
+		$context[ 'label' ] = '<span class="gv-field-label">{{ label_value }}</span>';
 	}
 
 	/**
@@ -1207,7 +1207,7 @@ 
 	 * @param string $markup The HTML for the markup
 	 * @param array $args All args for the field output
 	 */
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args );
+	$html = apply_filters( 'gravityview/field_output/pre_html', $args[ 'markup' ], $args );
 
 	/**
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
@@ -1230,7 +1230,7 @@ 
 	foreach ( $context 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;
 		}
 

includes/class-common.php

Spacing +107 added lines, -107 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;
 	}
@@ -175,7 +175,7 @@ 
 
 		$results = GFAPI::get_entries( 0, $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;
 	}
@@ -193,9 +193,9 @@ 
 		if ( class_exists( 'GFAPI' ) ) {
 			$gf_forms = GFAPI::get_forms();
 			foreach ( $gf_forms as $form ) {
-				$forms[] = array(
-					'id' => $form['id'],
-					'title' => $form['title'],
+				$forms[ ] = array(
+					'id' => $form[ 'id' ],
+					'title' => $form[ 'title' ],
 				);
 			}
 		}
@@ -227,9 +227,9 @@ 
 		}
 
 		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' ),
@@ -238,16 +238,16 @@ 
 					);
 				}
 
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
-					foreach ( $field['inputs'] as $input ) {
+				if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) {
+					foreach ( $field[ 'inputs' ] as $input ) {
                         /**
                          * @hack
                          * In case of email/email confirmation, the input for email has the same id as the parent field
                          */
-                        if( 'email' == rgar( $field, 'type' ) && false === strpos( $input['id'], '.' ) ) {
+                        if ( 'email' == rgar( $field, 'type' ) && false === strpos( $input[ 'id' ], '.' ) ) {
                             continue;
                         }
-						$fields[ (string)$input['id'] ] = array(
+						$fields[ (string)$input[ 'id' ] ] = array(
 							'label' => rgar( $input, 'label' ),
 							'customLabel' => rgar( $input, 'customLabel' ),
 							'parent' => $field,
@@ -259,11 +259,11 @@ 
 				}
 
 				/** @since 1.14 */
-				if( 'list' === $field['type'] && !empty( $field['enableColumns'] ) ) {
+				if ( 'list' === $field[ 'type' ] && ! empty( $field[ 'enableColumns' ] ) ) {
 
-					foreach ( (array)$field['choices'] as $key => $input ) {
+					foreach ( (array)$field[ 'choices' ] as $key => $input ) {
 
-						$input_id = sprintf( '%d.%d', $field['id'], $key ); // {field_id}.{column_key}
+						$input_id = sprintf( '%d.%d', $field[ 'id' ], $key ); // {field_id}.{column_key}
 
 						$fields[ $input_id ] = array(
 							'label'       => rgar( $input, 'text' ),
@@ -279,25 +279,25 @@ 
 				/**
 				 * @since 1.8
 				 */
-				if( 'quiz' === $field['type'] ) {
+				if ( 'quiz' === $field[ 'type' ] ) {
 					$has_quiz_fields = true;
 				}
 
 				/**
 				 * @since 1.8
 				 */
-				if( 'poll' === $field['type'] ) {
+				if ( 'poll' === $field[ 'type' ] ) {
 					$has_poll_fields = true;
 				}
 
-				if( GFCommon::is_product_field( $field['type'] ) ){
+				if ( GFCommon::is_product_field( $field[ 'type' ] ) ) {
 					$has_product_fields = true;
 				}
 
 				/**
 				 * @hack Version 1.9
 				 */
-				$field_for_is_post_field = class_exists( 'GF_Fields' ) ? (object) $field : (array) $field;
+				$field_for_is_post_field = class_exists( 'GF_Fields' ) ? (object)$field : (array)$field;
 
 				if ( GFCommon::is_post_field( $field_for_is_post_field ) ) {
 					$has_post_fields = true;
@@ -309,7 +309,7 @@ 
 		 * @since 1.7
 		 */
 		if ( $has_post_fields ) {
-			$fields['post_id'] = array(
+			$fields[ 'post_id' ] = array(
 				'label' => __( 'Post ID', 'gravityview' ),
 				'type' => 'post_id',
 			);
@@ -320,10 +320,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,
@@ -334,24 +334,24 @@ 
 		/**
 		 * @since 1.8
 		 */
-		if( $has_quiz_fields ) {
+		if ( $has_quiz_fields ) {
 
-			$fields['gquiz_score']   = array(
+			$fields[ 'gquiz_score' ] = array(
 				'label' => __( 'Quiz Score Total', 'gravityview' ),
 				'type'  => 'quiz_score',
 				'desc'  => __( 'Displays the number of correct Quiz answers the user submitted.', 'gravityview' ),
 			);
-			$fields['gquiz_percent'] = array(
+			$fields[ 'gquiz_percent' ] = array(
 				'label' => __( 'Quiz Percentage Grade', 'gravityview' ),
 				'type'  => 'quiz_percent',
 				'desc'  => __( 'Displays the percentage of correct Quiz answers the user submitted.', 'gravityview' ),
 			);
-			$fields['gquiz_grade']   = array(
+			$fields[ 'gquiz_grade' ] = array(
 				'label' => __( 'Quiz Letter Grade', 'gravityview' ),
 				'type'  => 'quiz_grade',
 				'desc'  => __( 'Displays the Grade the user achieved based on Letter Grading configured in the Quiz Settings.', 'gravityview' ),
 			);
-			$fields['gquiz_is_pass'] = array(
+			$fields[ 'gquiz_is_pass' ] = array(
 				'label' => __( 'Quiz Pass/Fail', 'gravityview' ),
 				'type'  => 'quiz_is_pass',
 				'desc'  => __( 'Displays either Passed or Failed based on the Pass/Fail settings configured in the Quiz Settings.', 'gravityview' ),
@@ -373,9 +373,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' );
 			}
 		}
 
@@ -415,32 +415,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' ] );
 			}
 
 		}
@@ -451,21 +451,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 ] );
 				}
 			}
 		}
@@ -473,12 +473,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'] ) ? $_GET['view_id'] : null;
-		} elseif( !isset( $criteria['context_view_id'] ) ) {
+			$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? $_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;
 		}
 
 		/**
@@ -487,7 +487,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;
 
@@ -518,7 +518,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 );
 
@@ -526,7 +526,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;
@@ -546,9 +546,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 );
@@ -557,7 +557,7 @@ 
 				}
 			}
 
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
 
 				// Cache results
 				$Cache->set( $entries, 'entries' );
@@ -644,7 +644,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 );
 			}
@@ -677,12 +677,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' );
@@ -742,7 +742,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;
 		}
@@ -750,26 +750,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;
 		}
 
@@ -777,37 +777,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 ) {
@@ -865,25 +865,25 @@ 
 		 * 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 ) ) {
 			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
 		}
 
 		// 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 ) );
@@ -911,7 +911,7 @@ 
 		}
 
 		$field = self::get_field( $form, $field_id );
-		return isset( $field['label'] ) ?  $field['label'] : '';
+		return isset( $field[ 'label' ] ) ? $field[ 'label' ] : '';
 
 	}
 
@@ -929,7 +929,7 @@ 
 	 * @return array|null Array: Gravity Forms field array; NULL: Gravity Forms GFFormsModel does not 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;
@@ -976,17 +976,17 @@ 
 			$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] ) && $result = self::has_shortcode_r( $shortcode[5], $tag ) ) {
+				} else if ( isset( $shortcode[ 5 ] ) && $result = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
 					$shortcodes = $result;
 				}
 			}
@@ -1137,7 +1137,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;
@@ -1150,11 +1150,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>';
 			}
 		}
 
@@ -1189,9 +1189,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 ] );
 			}
 		}
@@ -1232,14 +1232,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 );
@@ -1253,9 +1253,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;
 			}
 		}
 
@@ -1405,11 +1405,11 @@ 
 		$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 );
 
 		// Sort the attributes alphabetically, to help testing
 		ksort( $final_atts );
@@ -1420,7 +1420,7 @@ 
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
 		}
 
-		if( '' !== $output ) {
+		if ( '' !== $output ) {
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
 		}
 
@@ -1444,7 +1444,7 @@ 
 	public static function array_merge_recursive_distinct( array &$array1, array &$array2 ) {
 		$merged = $array1;
 
-		foreach ( $array2 as $key => &$value )  {
+		foreach ( $array2 as $key => &$value ) {
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
 			} else {
@@ -1479,7 +1479,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 );
 	}
@@ -1494,7 +1494,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-admin-views.php

Spacing +177 added lines, -177 removed lines

@@ -28,30 +28,30 @@ 
 		add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 );
 
 		// Tooltips
-		add_filter( 'gform_tooltips', array( $this, 'tooltips') );
+		add_filter( 'gform_tooltips', array( $this, 'tooltips' ) );
 
 		// adding styles and scripts
-		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 );
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') );
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') );
-		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') );
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') );
-
-		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 );
-		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 );
-		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 );
-		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') );
-		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 );
+		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 );
+		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) );
+		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) );
+		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) );
+		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
+
+		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 );
+		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 );
+		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 );
+		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) );
+		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 );
 
 		// @todo check if this hook is needed..
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
 
 		// Add Connected Form column
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
+		add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) );
 
 		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
 
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
 
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
 
@@ -66,11 +66,11 @@ 
 	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) {
 		global $pagenow;
 
-		if ( !is_admin() ) {
+		if ( ! is_admin() ) {
 			return;
 		}
 
-		if( 'edit.php' !== $pagenow || ! rgget( 'gravityview_form_id' ) || ! isset( $query->query_vars[ 'post_type' ] ) ) {
+		if ( 'edit.php' !== $pagenow || ! rgget( 'gravityview_form_id' ) || ! isset( $query->query_vars[ 'post_type' ] ) ) {
 			return;
 		}
 
@@ -87,18 +87,18 @@ 
 	function add_view_dropdown() {
 		$current_screen = get_current_screen();
 
-		if( 'gravityview' !== $current_screen->post_type ) {
+		if ( 'gravityview' !== $current_screen->post_type ) {
 			return;
 		}
 
 		$forms = gravityview_get_forms();
 		$current_form = rgget( 'gravityview_form_id' );
 		// 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 ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></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 }
@@ -111,7 +111,7 @@ 
 	 */
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
 	}
 
 	/**
@@ -134,37 +134,37 @@ 
 
 		$connected_views = gravityview_get_connected_views( $id );
 
-		if( empty( $connected_views ) ) {
+		if ( empty( $connected_views ) ) {
 			return $menu_items;
 		}
 
 		$sub_menu_items = array();
 		foreach ( (array)$connected_views as $view ) {
 
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
 				continue;
 			}
 
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
 
-			$sub_menu_items[] = array(
+			$sub_menu_items[ ] = array(
 				'label' => esc_attr( $label ),
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
 			);
 		}
 
 		// If there were no items added, then let's create the parent menu
-		if( $sub_menu_items ) {
+		if ( $sub_menu_items ) {
 
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
-			$sub_menu_items[] = array(
+			$sub_menu_items[ ] = array(
 				'url' => '#',
 				'label' => '',
 				'menu_class' => 'hidden',
 				'capabilities' => '',
 			);
 
-			$menu_items['gravityview'] = array(
+			$menu_items[ 'gravityview' ] = array(
 				'label'          => __( 'Connected Views', 'gravityview' ),
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -194,8 +194,8 @@ 
 		$add = array( 'captcha', 'page' );
 
 		// Don't allowing editing the following values:
-		if( $context === 'edit' ) {
-			$add[] = 'post_id';
+		if ( $context === 'edit' ) {
+			$add[ ] = 'post_id';
 		}
 
 		$return = array_merge( $array, $add );
@@ -218,32 +218,32 @@ 
 		foreach ( $default_args as $key => $arg ) {
 
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
 
 			// By default, use `tooltip` if defined.
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
 
 			// Otherwise, use the description as a tooltip.
-			if( empty( $tooltip ) && !empty( $arg['desc'] ) ) {
-				$tooltip = $arg['desc'];
+			if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) {
+				$tooltip = $arg[ 'desc' ];
 			}
 
 			// If there's no tooltip set, continue
-			if( empty( $tooltip ) ) {
+			if ( empty( $tooltip ) ) {
 				continue;
 			}
 
 			// Add the tooltip
-			$gv_tooltips[ 'gv_'.$key ] = array(
-				'title'	=> $arg['label'],
+			$gv_tooltips[ 'gv_' . $key ] = array(
+				'title'	=> $arg[ 'label' ],
 				'value'	=> $tooltip,
 			);
 
 		}
 
-		$gv_tooltips['gv_css_merge_tags'] = array(
-			'title' => __('CSS Merge Tags', 'gravityview'),
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
 		);
 
 		/**
@@ -254,9 +254,9 @@ 
 
 		foreach ( $gv_tooltips as $key => $tooltip ) {
 
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
 
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
 		}
 
 		return $tooltips;
@@ -270,7 +270,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
 
 		$output = '';
 
@@ -292,7 +292,7 @@ 
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
 
-				$output = $template ? $template['label'] : $template_id_pretty;
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
 
 				break;
 
@@ -333,44 +333,44 @@ 
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
 
 		// Either the form is empty or the form ID is 0, not yet set.
-		if( empty( $form ) ) {
+		if ( empty( $form ) ) {
 			return '';
 		}
 
 		// The $form is passed as the form ID
-		if( !is_array( $form ) ) {
+		if ( ! is_array( $form ) ) {
 			$form = gravityview_get_form( $form );
 		}
 
-		$form_id = $form['id'];
+		$form_id = $form[ 'id' ];
 		$links = array();
 
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
 		} else {
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
 		}
 
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
 		}
 
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
 		}
 
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
 		}
 
 		$output = '';
 
-		if( !empty( $include_form_link ) ) {
+		if ( ! empty( $include_form_link ) ) {
 			$output .= $form_link;
 		}
 
@@ -382,7 +382,7 @@ 
 		 */
 		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
 
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
+		$output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>';
 
 		return $output;
 	}
@@ -396,8 +396,8 @@ 
 		// Get the date column and save it for later to add back in.
 		// This adds it after the Data Source column.
 		// This way, we don't need to do array_slice, array_merge, etc.
-		$date = $columns['date'];
-		unset( $columns['date'] );
+		$date = $columns[ 'date' ];
+		unset( $columns[ 'date' ] );
 
 		$data_source_required_caps = array(
 			'gravityforms_edit_forms',
@@ -408,14 +408,14 @@ 
 			'gravityforms_preview_forms',
 		);
 
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
 		}
 
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
 
 		// Add the date back in.
-		$columns['date'] = $date;
+		$columns[ 'date' ] = $date;
 
 		return $columns;
 	}
@@ -429,12 +429,12 @@ 
 	 */
 	function save_postdata( $post_id ) {
 
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
 			return;
 		}
 
 		// validate post_type
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
 			return;
 		}
 
@@ -449,90 +449,90 @@ 
 		$statii = array();
 
 		// check if this is a start fresh View
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
 
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
 			// save form id
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
 
 		}
 
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ' - Current user does not have the capability to create a new Form.', wp_get_current_user() );
 			return;
 		}
 
 		// Was this a start fresh?
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
 		} else {
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
 		}
 
 		// Check if we have a template id
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
 
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
 
 			// now save template id
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
 		}
 
 
 		// save View Configuration metabox
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
 
 			// template settings
-			if( empty( $_POST['template_settings'] ) ) {
-				$_POST['template_settings'] = array();
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
+				$_POST[ 'template_settings' ] = array();
 			}
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
 
 			$fields = array();
 
 			// Directory&single Visible Fields
-			if( !empty( $preset_fields ) ) {
+			if ( ! empty( $preset_fields ) ) {
 
 				$fields = $preset_fields;
 
-			} elseif( !empty( $_POST['fields'] ) ) {
+			} elseif ( ! empty( $_POST[ 'fields' ] ) ) {
 
-				if( !is_array( $_POST['fields'] ) ) {
+				if ( ! is_array( $_POST[ 'fields' ] ) ) {
 
 					// Fields are passed as a jQuery-serialized array, created in admin-views.js in the serializeForm method
 					// Not using parse_str due to max_input_vars limitation
 					$fields_holder = array();
-					GVCommon::gv_parse_str( $_POST['fields'], $fields_holder );
+					GVCommon::gv_parse_str( $_POST[ 'fields' ], $fields_holder );
 
-					if( isset( $fields_holder['fields'] ) ) {
+					if ( isset( $fields_holder[ 'fields' ] ) ) {
 
 						// When parsed, there's a m
-						$fields = $fields_holder['fields'];
+						$fields = $fields_holder[ 'fields' ];
 
 					} else {
 
-						do_action('gravityview_log_error', '[save_postdata] No `fields` key was found after parsing $fields string', $fields_holder );
+						do_action( 'gravityview_log_error', '[save_postdata] No `fields` key was found after parsing $fields string', $fields_holder );
 
 					}
 
 				} else {
 
-					$fields = $_POST['fields'];
+					$fields = $_POST[ 'fields' ];
 
 				}
 			}
 
-			$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
+			$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
 
 			// Directory Visible Widgets
-			if( empty( $_POST['widgets'] ) ) {
-				$_POST['widgets'] = array();
+			if ( empty( $_POST[ 'widgets' ] ) ) {
+				$_POST[ 'widgets' ] = array();
 			}
-			$statii['directory_widgets'] = update_post_meta( $post_id, '_gravityview_directory_widgets', $_POST['widgets'] );
+			$statii[ 'directory_widgets' ] = update_post_meta( $post_id, '_gravityview_directory_widgets', $_POST[ 'widgets' ] );
 
 		} // end save view configuration
 
-		do_action('gravityview_log_debug', '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array_map( 'intval', $statii ) );
+		do_action( 'gravityview_log_debug', '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array_map( 'intval', $statii ) );
 	}
 
 	/**
@@ -564,20 +564,20 @@ 
 
 		$output = '';
 
-		if( !empty( $fields ) ) {
+		if ( ! empty( $fields ) ) {
 
-			foreach( $fields as $id => $details ) {
+			foreach ( $fields as $id => $details ) {
 
-				if( in_array( $details['type'], $blacklist_field_types ) ) {
+				if ( in_array( $details[ 'type' ], $blacklist_field_types ) ) {
 					continue;
 				}
 
 				// Edit mode only allows editing the parent fields, not single inputs.
-				if( $context === 'edit' && !empty( $details['parent'] ) ) {
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
 					continue;
 				}
 
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details );
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details );
 
 			} // End foreach
 		}
@@ -585,7 +585,7 @@ 
 		echo $output;
 
 		// For the EDIT view we only want to allow the form fields.
-		if( $context === 'edit' ) {
+		if ( $context === 'edit' ) {
 			return;
 		}
 
@@ -609,16 +609,16 @@ 
 		$additional_fields = apply_filters( 'gravityview_additional_fields', array(
 			array(
 				'label_text' => __( '+ Add All Fields', 'gravityview' ),
-				'desc' => __('Add all the available fields at once.', 'gravityview'),
+				'desc' => __( 'Add all the available fields at once.', 'gravityview' ),
 				'field_id' => 'all-fields',
 				'label_type' => 'field',
 				'input_type' => NULL,
 				'field_options' => NULL,
 				'settings_html'	=> NULL,
 			)
-		));
+		) );
 
-		if( !empty( $additional_fields )) {
+		if ( ! empty( $additional_fields ) ) {
 			foreach ( (array)$additional_fields as $item ) {
 
 				// Prevent items from not having index set
@@ -629,16 +629,16 @@ 
 					'input_type' => NULL,
 					'field_options' => NULL,
 					'settings_html'	=> NULL,
-				));
+				) );
 
 				// Backward compat.
-				if( !empty( $item['field_options'] ) ) {
+				if ( ! empty( $item[ 'field_options' ] ) ) {
 					// Use settings_html from now on.
-					$item['settings_html'] = $item['field_options'];
+					$item[ 'settings_html' ] = $item[ 'field_options' ];
 				}
 
 				// Render a label for each of them
-				echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item );
+				echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item );
 
 			}
 		}
@@ -651,64 +651,64 @@ 
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
 	 * @return array
 	 */
-	function get_entry_default_fields($form, $zone) {
+	function get_entry_default_fields( $form, $zone ) {
 
 		$entry_default_fields = array();
 
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
 
 			$entry_default_fields = array(
 				'id' => array(
-					'label' => __('Entry ID', 'gravityview'),
+					'label' => __( 'Entry ID', 'gravityview' ),
 					'type' => 'id',
-					'desc'	=> __('The unique ID of the entry.', 'gravityview'),
+					'desc'	=> __( 'The unique ID of the entry.', 'gravityview' ),
 				),
 				'date_created' => array(
-					'label' => __('Entry Date', 'gravityview'),
-					'desc'	=> __('The date the entry was created.', 'gravityview'),
+					'label' => __( 'Entry Date', 'gravityview' ),
+					'desc'	=> __( 'The date the entry was created.', 'gravityview' ),
 					'type' => 'date_created',
 				),
 				'source_url' => array(
-					'label' => __('Source URL', 'gravityview'),
+					'label' => __( 'Source URL', 'gravityview' ),
 					'type' => 'source_url',
-					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'),
+					'desc'	=> __( 'The URL of the page where the form was submitted.', 'gravityview' ),
 				),
 				'ip' => array(
-					'label' => __('User IP', 'gravityview'),
+					'label' => __( 'User IP', 'gravityview' ),
 					'type' => 'ip',
-					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'),
+					'desc'	=> __( 'The IP Address of the user who created the entry.', 'gravityview' ),
 				),
 				'created_by' => array(
-					'label' => __('User', 'gravityview'),
+					'label' => __( 'User', 'gravityview' ),
 					'type' => 'created_by',
-					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'),
+					'desc'	=> __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ),
 				),
 
 				/**
 				 * @since  1.2
 				 */
 				'custom'	=> array(
-					'label'	=> __('Custom Content', 'gravityview'),
+					'label'	=> __( 'Custom Content', 'gravityview' ),
 					'type'	=> 'custom',
-					'desc'	=> __('Insert custom text or HTML.', 'gravityview'),
+					'desc'	=> __( 'Insert custom text or HTML.', 'gravityview' ),
 				),
 
 				/**
 				 * @since 1.7.2
 				 */
 				'other_entries' => array(
-					'label'	=> __('Other Entries', 'gravityview'),
+					'label'	=> __( 'Other Entries', 'gravityview' ),
 					'type'	=> 'other_entries',
-					'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
+					'desc'	=> __( 'Display other entries created by the entry creator.', 'gravityview' ),
 				),
 			);
 
 
-			if( 'single' !== $zone) {
+			if ( 'single' !== $zone ) {
 
-				$entry_default_fields['entry_link'] = array(
-					'label' => __('Link to Entry', 'gravityview'),
-					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'),
+				$entry_default_fields[ 'entry_link' ] = array(
+					'label' => __( 'Link to Entry', 'gravityview' ),
+					'desc'	=> __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ),
 					'type' => 'entry_link',
 				);
 			}
@@ -722,7 +722,7 @@ 
 		 * @param  string|array $form form_ID or form object
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
 		 */
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
 	}
 
 	/**
@@ -733,7 +733,7 @@ 
 	 */
 	function get_available_fields( $form = '', $zone = NULL ) {
 
-		if( empty( $form ) ) {
+		if ( empty( $form ) ) {
 			do_action( 'gravityview_log_error', '[get_available_fields] $form is empty' );
 			return array();
 		}
@@ -742,7 +742,7 @@ 
 		$fields = gravityview_get_form_fields( $form, true );
 
 		// get meta fields ( only if form was already created )
-		if( !is_array( $form ) ) {
+		if ( ! is_array( $form ) ) {
 			$meta_fields = gravityview_get_entry_meta( $form );
 		} else {
 			$meta_fields = array();
@@ -766,11 +766,11 @@ 
 
 		$widgets = $this->get_registered_widgets();
 
-		if( !empty( $widgets ) ) {
+		if ( ! empty( $widgets ) ) {
 
-			foreach( $widgets as $id => $details ) {
+			foreach ( $widgets as $id => $details ) {
 
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
+				echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
 
 			}
 		}
@@ -804,7 +804,7 @@ 
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
 		global $post;
 
-		if( $type === 'widget' ) {
+		if ( $type === 'widget' ) {
 			$button_label = __( 'Add Widget', 'gravityview' );
 		} else {
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -813,15 +813,15 @@ 
 		$available_items = array();
 
 		// if saved values, get available fields to label everyone
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
 
-			if( !empty( $_POST['template_id'] ) ) {
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 			} else {
 				$form = gravityview_get_form_id( $post->ID );
 			}
 
-			if( 'field' === $type ) {
+			if ( 'field' === $type ) {
 				$available_items = $this->get_available_fields( $form, $zone );
 			} else {
 				$available_items = $this->get_registered_widgets();
@@ -829,39 +829,39 @@ 
 
 		}
 
-		foreach( $rows as $row ) :
-			foreach( $row as $col => $areas ) :
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
+		foreach ( $rows as $row ) :
+			foreach ( $row as $col => $areas ) :
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
 
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
 
-					<?php foreach( $areas as $area ) : 	?>
+					<?php foreach ( $areas as $area ) : 	?>
 
 						<div class="gv-droppable-area">
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>">
 
 								<?php // render saved fields
 
-								if( !empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
 
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
 
 										$input_type = NULL;
-										$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
+										$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
 
-										if( !$original_item ) {
+										if ( ! $original_item ) {
 
-											do_action('gravityview_log_error', 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array('available_items' => $available_items, 'field' => $field ));
+											do_action( 'gravityview_log_error', 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array( 'available_items' => $available_items, 'field' => $field ) );
 
 											$original_item = $field;
 										} else {
 
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
 
 										}
 
 										// Field options dialog box
-										$field_options = GravityView_Render_Settings::render_field_options( $type, $template_id, $field['id'], $original_item['label'], $zone .'_'. $area['areaid'], $input_type, $uniqid, $field, $zone, $original_item );
+										$field_options = GravityView_Render_Settings::render_field_options( $type, $template_id, $field[ 'id' ], $original_item[ 'label' ], $zone . '_' . $area[ 'areaid' ], $input_type, $uniqid, $field, $zone, $original_item );
 
 										$item = array(
 											'input_type' => $input_type,
@@ -870,16 +870,16 @@ 
 										);
 
 										// Merge the values with the current item to pass things like widget descriptions and original field names
-										if( $original_item ) {
+										if ( $original_item ) {
 											$item = wp_parse_args( $item, $original_item );
 										}
 
-										switch( $type ) {
+										switch ( $type ) {
 											case 'widget':
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
 												break;
 											default:
-												echo new GravityView_Admin_View_Field( $item['label'], $field['id'], $item, $field );
+												echo new GravityView_Admin_View_Field( $item[ 'label' ], $field[ 'id' ], $item, $field );
 										}
 
 
@@ -889,11 +889,11 @@ 
 
 								} // End if zone is not empty ?>
 
-								<span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type ); ?></span>
+								<span class="drop-message"><?php echo sprintf( esc_attr__( '"+ %s" or drag existing %ss here.', 'gravityview' ), $button_label, $type ); ?></span>
 							</div>
 							<div class="gv-droppable-area-action">
-								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>"><?php echo '+ '.esc_html( $button_label ); ?></a>
-								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area['title'] ); ?></strong><?php if( !empty( $area['subtitle'] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area['subtitle'] ); ?></span><?php } ?></p>
+								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>"><?php echo '+ ' . esc_html( $button_label ); ?></a>
+								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area[ 'title' ] ); ?></strong><?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area[ 'subtitle' ] ); ?></span><?php } ?></p>
 							</div>
 						</div>
 
@@ -915,7 +915,7 @@ 
 		$default_widget_areas = GravityView_Plugin::get_default_widget_areas();
 
 		$widgets = array();
-		if( !empty( $post_id ) ) {
+		if ( ! empty( $post_id ) ) {
 			$widgets = get_post_meta( $post_id, '_gravityview_directory_widgets', true );
 
 		}
@@ -946,19 +946,19 @@ 
 	 */
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
 
-		if( empty( $template_id ) ) {
+		if ( empty( $template_id ) ) {
 			do_action( 'gravityview_log_debug', '[render_directory_active_areas] $template_id is empty' );
 			return;
 		}
 
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
 
-		if( empty( $template_areas ) ) {
+		if ( empty( $template_areas ) ) {
 
 			do_action( 'gravityview_log_debug', '[render_directory_active_areas] No areas defined. Maybe template %s is disabled.', $template_id );
 			$output = '<div>';
-			$output .= '<h2 class="description" style="font-size: 16px; margin:0">'. sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>'.$template_id.'</em>' ) .'</h2>';
-			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">'.esc_html__('The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview').'</p>';
+			$output .= '<h2 class="description" style="font-size: 16px; margin:0">' . sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>' . $template_id . '</em>' ) . '</h2>';
+			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">' . esc_html__( 'The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview' ) . '</p>';
 			$output .= '</div>';
 		} else {
 
@@ -973,7 +973,7 @@ 
 
 		}
 
-		if( $echo ) {
+		if ( $echo ) {
 			echo $output;
 		}
 
@@ -993,25 +993,25 @@ 
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
 
 		// Add the GV font (with the Astronaut)
-		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
+		wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
 
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version, true );
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
 
 		// Don't process any scripts below here if it's not a GravityView page.
-		if( !gravityview_is_admin_page($hook) && !$is_widgets_page ) { return; }
+		if ( ! gravityview_is_admin_page( $hook ) && ! $is_widgets_page ) { return; }
 
 		// Only enqueue the following on single pages
-		if( gravityview_is_admin_page($hook, 'single') || $is_widgets_page ) {
+		if ( gravityview_is_admin_page( $hook, 'single' ) || $is_widgets_page ) {
 
 			wp_enqueue_script( 'jquery-ui-datepicker' );
-			wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), GravityView_Plugin::version );
+			wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), GravityView_Plugin::version );
 
-			$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+			$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
 			//enqueue scripts
 			wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), GravityView_Plugin::version );
 
-			wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
+			wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
 				'cookiepath' => COOKIEPATH,
 				'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
 				'label_viewname' => __( 'Enter View name here', 'gravityview' ),
@@ -1024,9 +1024,9 @@ 
 				'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
 				'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
 				'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
-			));
+			) );
 
-			wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array('dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
+			wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
 
 			self::enqueue_gravity_forms_scripts();
 
@@ -1045,10 +1045,10 @@ 
 		);
 
 		if ( wp_is_mobile() ) {
-				    $scripts[] = 'jquery-touch-punch';
+				    $scripts[ ] = 'jquery-touch-punch';
 		}
 
-		foreach ($scripts as $script) {
+		foreach ( $scripts as $script ) {
 			wp_enqueue_script( $script );
 		}
 	}
@@ -1057,11 +1057,11 @@ 
 
 		$filter = current_filter();
 
-		if( preg_match('/script/ism', $filter ) ) {
+		if ( preg_match( '/script/ism', $filter ) ) {
 			$allow_scripts = array( 'jquery-ui-core', 'jquery-ui-dialog', 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'gravityview_views_scripts', 'gravityview-support', 'gravityview-jquery-cookie', 'gravityview_views_datepicker',
 			'sack', 'gform_gravityforms', 'gform_forms', 'gform_form_admin', 'jquery-ui-autocomplete' );
 			$registered = array_merge( $registered, $allow_scripts );
-		} elseif( preg_match('/style/ism', $filter ) ) {
+		} elseif ( preg_match( '/style/ism', $filter ) ) {
 			$allow_styles = array( 'dashicons', 'wp-jquery-ui-dialog', 'gravityview_views_styles', 'gravityview_global', 'gravityview_views_datepicker' );
 			$registered = array_merge( $registered, $allow_styles );
 		}

includes/class-admin-approve-entries.php

Spacing +72 added lines, -72 removed lines

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