gravityview / GravityView

includes/class-gravityview-admin-notices.php

Spacing +23 added lines, -23 removed lines

@@ -60,21 +60,21 @@ 
 	public function dismiss_notice() {
 
 		// No dismiss sent
-		if( empty( $_GET['gv-dismiss'] ) ) {
+		if ( empty( $_GET[ 'gv-dismiss' ] ) ) {
 			return;
 		}
 
 		// Invalid nonce
-		if( !wp_verify_nonce( $_GET['gv-dismiss'], 'dismiss' ) ) {
+		if ( ! wp_verify_nonce( $_GET[ 'gv-dismiss' ], 'dismiss' ) ) {
 			return;
 		}
 
-		$notice_id = esc_attr( $_GET['notice'] );
+		$notice_id = esc_attr( $_GET[ 'notice' ] );
 
 		//don't display a message if use has dismissed the message for this version
 		$dismissed_notices = (array)get_transient( 'gravityview_dismissed_notices' );
 
-		$dismissed_notices[] = $notice_id;
+		$dismissed_notices[ ] = $notice_id;
 
 		$dismissed_notices = array_unique( $dismissed_notices );
 
@@ -97,12 +97,12 @@ 
 	private function is_notice_dismissed( $notice ) {
 
 		// There are no dismissed notices.
-		if( empty( self::$dismissed_notices ) ) {
+		if ( empty( self::$dismissed_notices ) ) {
 			return false;
 		}
 
 		// Has the
-		$is_dismissed = !empty( $notice['dismiss'] ) && in_array( $notice['dismiss'], self::$dismissed_notices );
+		$is_dismissed = ! empty( $notice[ 'dismiss' ] ) && in_array( $notice[ 'dismiss' ], self::$dismissed_notices );
 
 		return $is_dismissed ? true : false;
 	}
@@ -127,7 +127,7 @@ 
 	 */
 	private function check_show_multisite_notices() {
 
-		if( ! is_multisite() ) {
+		if ( ! is_multisite() ) {
 			return true;
 		}
 
@@ -137,7 +137,7 @@ 
 		}
 
 		// or they don't have admin capabilities
-		if( ! is_super_admin() ) {
+		if ( ! is_super_admin() ) {
 			return false;
 		}
 
@@ -160,48 +160,48 @@ 
 		 */
 		$notices = apply_filters( 'gravityview/admin/notices', self::$admin_notices );
 
-		if( empty( $notices ) || ! $this->check_show_multisite_notices() ) {
+		if ( empty( $notices ) || ! $this->check_show_multisite_notices() ) {
 			return;
 		}
 
 		//don't display a message if use has dismissed the message for this version
 		// TODO: Use get_user_meta instead of get_transient
-		self::$dismissed_notices = isset( $_GET['show-dismissed-notices'] ) ? array() : (array)get_transient( 'gravityview_dismissed_notices' );
+		self::$dismissed_notices = isset( $_GET[ 'show-dismissed-notices' ] ) ? array() : (array)get_transient( 'gravityview_dismissed_notices' );
 
 		$output = '';
 
-		foreach( $notices as $notice ) {
+		foreach ( $notices as $notice ) {
 
 			// If the user doesn't have the capability to see the warning
-			if( isset( $notice['cap'] ) && false === GVCommon::has_cap( $notice['cap'] ) ) {
+			if ( isset( $notice[ 'cap' ] ) && false === GVCommon::has_cap( $notice[ 'cap' ] ) ) {
 				gravityview()->log->debug( 'Notice not shown because user does not have the capability to view it.', array( 'data' => $notice ) );
 				continue;
 			}
 
-			if( true === $this->is_notice_dismissed( $notice ) ) {
+			if ( true === $this->is_notice_dismissed( $notice ) ) {
 				gravityview()->log->debug( 'Notice not shown because the notice has already been dismissed.', array( 'data' => $notice ) );
 				continue;
 			}
 
-			$output .= '<div id="message" style="position:relative" class="notice '. gravityview_sanitize_html_class( $notice['class'] ).'">';
+			$output .= '<div id="message" style="position:relative" class="notice ' . gravityview_sanitize_html_class( $notice[ 'class' ] ) . '">';
 
 			// Too cute to leave out.
 			$output .= gravityview_get_floaty();
 
-			if( !empty( $notice['title'] ) ) {
-				$output .= '<h3>'.esc_html( $notice['title'] ) .'</h3>';
+			if ( ! empty( $notice[ 'title' ] ) ) {
+				$output .= '<h3>' . esc_html( $notice[ 'title' ] ) . '</h3>';
 			}
 
-			$message = isset( $notice['message'] ) ? $notice['message'] : '';
+			$message = isset( $notice[ 'message' ] ) ? $notice[ 'message' ] : '';
 
-			if( !empty( $notice['dismiss'] ) ) {
+			if ( ! empty( $notice[ 'dismiss' ] ) ) {
 
-				$dismiss = esc_attr($notice['dismiss']);
+				$dismiss = esc_attr( $notice[ 'dismiss' ] );
 
 				$url = esc_url( add_query_arg( array( 'gv-dismiss' => wp_create_nonce( 'dismiss' ), 'notice' => $dismiss ) ) );
 
 				$align = is_rtl() ? 'alignleft' : 'alignright';
-				$message .= '<a href="'.$url.'" data-notice="'.$dismiss.'" class="' . $align . ' button button-link">'.esc_html__('Dismiss', 'gravityview' ).'</a></p>';
+				$message .= '<a href="' . $url . '" data-notice="' . $dismiss . '" class="' . $align . ' button button-link">' . esc_html__( 'Dismiss', 'gravityview' ) . '</a></p>';
 			}
 
 			$output .= wpautop( $message );
@@ -233,14 +233,14 @@ 
 	 */
 	public static function add_notice( $notice = array() ) {
 
-		if( !isset( $notice['message'] ) ) {
+		if ( ! isset( $notice[ 'message' ] ) ) {
 			gravityview()->log->error( 'Notice not set', array( 'data' => $notice ) );
 			return;
 		}
 
-		$notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
+		$notice[ 'class' ] = empty( $notice[ 'class' ] ) ? 'error' : $notice[ 'class' ];
 
-		self::$admin_notices[] = $notice;
+		self::$admin_notices[ ] = $notice;
 	}
 }
 

includes/class-gravityview-entry-approval-status.php

Spacing +5 added lines, -5 removed lines

@@ -113,16 +113,16 @@ 
 		$new_value = $old_value;
 
 		// Meta value does not exist yet
-		if( false === $old_value ) {
+		if ( false === $old_value ) {
 			return self::UNAPPROVED;
 		}
 
 		// Meta value does not exist yet
-		if( true === $old_value ) {
+		if ( true === $old_value ) {
 			return self::APPROVED;
 		}
 
-		switch ( (string) $old_value ) {
+		switch ( (string)$old_value ) {
 
 			// Approved values
 			case 'Approved':
@@ -248,9 +248,9 @@ 
 		foreach ( $choices as $key => $choice ) {
 
 			// Is the passed status value the same as the choice value or key?
-			if ( $status === $choice['value'] || $status === $key ) {
+			if ( $status === $choice[ 'value' ] || $status === $key ) {
 
-				if( 'key' === $attr_key ) {
+				if ( 'key' === $attr_key ) {
 					return $key;
 				} else {
 					return \GV\Utils::get( $choice, $attr_key, false );

includes/widgets/class-gravityview-widget-page-links.php

Spacing +16 added lines, -16 removed lines

@@ -11,35 +11,35 @@ 
 
 	function __construct() {
 
-		$this->widget_description = __('Links to multiple pages of results.', 'gravityview' );
+		$this->widget_description = __( 'Links to multiple pages of results.', 'gravityview' );
 
 		$default_values = array( 'header' => 1, 'footer' => 1 );
 		$settings = array( 'show_all' => array(
 			'type' => 'checkbox',
 			'label' => __( 'Show each page number', 'gravityview' ),
-			'desc' => __('Show every page number instead of summary (eg: 1 2 3 ... 8 »)', 'gravityview'),
+			'desc' => __( 'Show every page number instead of summary (eg: 1 2 3 ... 8 »)', 'gravityview' ),
 			'value' => false
-		));
-		parent::__construct( __( 'Page Links', 'gravityview' ) , 'page_links', $default_values, $settings );
+		) );
+		parent::__construct( __( 'Page Links', 'gravityview' ), 'page_links', $default_values, $settings );
 
 	}
 
-	public function render_frontend( $widget_args, $content = '', $context = '') {
+	public function render_frontend( $widget_args, $content = '', $context = '' ) {
 		$gravityview_view = GravityView_View::getInstance();
 
-		if( !$this->pre_render_frontend() ) {
+		if ( ! $this->pre_render_frontend() ) {
 			return;
 		}
 
 		$atts = shortcode_atts( array(
 			'page_size' => \GV\Utils::get( $gravityview_view->paging, 'page_size' ),
 			'total' => $gravityview_view->total_entries,
-			'show_all' => !empty( $this->settings['show_all']['default'] ),
-			'current' => (int) \GV\Utils::_GET( 'pagenum', 1 ),
+			'show_all' => ! empty( $this->settings[ 'show_all' ][ 'default' ] ),
+			'current' => (int)\GV\Utils::_GET( 'pagenum', 1 ),
 		), $widget_args, 'gravityview_widget_page_links' );
 		
 		$page_link_args = array(
-			'base' => add_query_arg('pagenum','%#%', gv_directory_link() ),
+			'base' => add_query_arg( 'pagenum', '%#%', gv_directory_link() ),
 			'format' => '&pagenum=%#%',
 			'add_args' => array(), //
 			'prev_text' => '«',
@@ -47,9 +47,9 @@ 
 			'type' => 'list',
 			'end_size' => 1,
 			'mid_size' => 2,
-			'total' => empty( $atts['page_size'] ) ? 0 : ceil( $atts['total'] / $atts['page_size'] ),
-			'current' => $atts['current'],
-			'show_all' => !empty( $atts['show_all'] ), // to be available at backoffice
+			'total' => empty( $atts[ 'page_size' ] ) ? 0 : ceil( $atts[ 'total' ] / $atts[ 'page_size' ] ),
+			'current' => $atts[ 'current' ],
+			'show_all' => ! empty( $atts[ 'show_all' ] ), // to be available at backoffice
 		);
 
 		/**
@@ -57,14 +57,14 @@ 
 		 * @since 1.1.4
 		 * @param array  $page_link_args Array of arguments for the `paginate_links()` function. [Read more about `paginate_links()`](http://developer.wordpress.org/reference/functions/paginate_links/)
 		 */
-		$page_link_args = apply_filters('gravityview_page_links_args', $page_link_args );
+		$page_link_args = apply_filters( 'gravityview_page_links_args', $page_link_args );
 
 		$page_links = paginate_links( $page_link_args );
 
-		if( !empty( $page_links )) {
-			$class = !empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
+		if ( ! empty( $page_links ) ) {
+			$class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
 			$class = gravityview_sanitize_html_class( 'gv-widget-page-links ' . $class );
-			echo '<div class="'.$class.'">'. $page_links .'</div>';
+			echo '<div class="' . $class . '">' . $page_links . '</div>';
 		} else {
 			gravityview()->log->debug( 'No page links; paginate_links() returned empty response.' );
 		}

includes/widgets/class-gravityview-widget-custom-content.php

Spacing +14 added lines, -14 removed lines

@@ -17,7 +17,7 @@ 
 
 	function __construct() {
 
-		$this->widget_description = __('Insert custom text or HTML as a widget', 'gravityview' );
+		$this->widget_description = __( 'Insert custom text or HTML as a widget', 'gravityview' );
 
 		$default_values = array(
 			'header' => 1,
@@ -42,39 +42,39 @@ 
 			),
 		);
 
-		parent::__construct( __( 'Custom Content', 'gravityview' ) , 'custom_content', $default_values, $settings );
+		parent::__construct( __( 'Custom Content', 'gravityview' ), 'custom_content', $default_values, $settings );
 	}
 
-	public function render_frontend( $widget_args, $content = '', $context = '') {
+	public function render_frontend( $widget_args, $content = '', $context = '' ) {
 
-		if( !$this->pre_render_frontend() ) {
+		if ( ! $this->pre_render_frontend() ) {
 			return;
 		}
 
-		if( !empty( $widget_args['title'] ) ) {
-			echo $widget_args['title'];
+		if ( ! empty( $widget_args[ 'title' ] ) ) {
+			echo $widget_args[ 'title' ];
 		}
 
 
 		// Make sure the class is loaded in DataTables
-		if( !class_exists( 'GFFormDisplay' ) ) {
+		if ( ! class_exists( 'GFFormDisplay' ) ) {
 			include_once( GFCommon::get_base_path() . '/form_display.php' );
 		}
 
-		$widget_args['content'] = trim( rtrim( $widget_args['content'] ) );
+		$widget_args[ 'content' ] = trim( rtrim( $widget_args[ 'content' ] ) );
 
 		// No custom content
-		if( empty( $widget_args['content'] ) ) {
+		if ( empty( $widget_args[ 'content' ] ) ) {
 			gravityview()->log->debug( 'No content.' );
 			return;
 		}
 
 		// Add paragraphs?
-		if( !empty( $widget_args['wpautop'] ) ) {
-			$widget_args['content'] = wpautop( $widget_args['content'] );
+		if ( ! empty( $widget_args[ 'wpautop' ] ) ) {
+			$widget_args[ 'content' ] = wpautop( $widget_args[ 'content' ] );
 		}
 
-		$content = $widget_args['content'];
+		$content = $widget_args[ 'content' ];
 
 		$content = GravityView_Merge_Tags::replace_variables( $content, array(), array(), false, true, false );
 
@@ -84,10 +84,10 @@ 
 
 
 		// Add custom class
-		$class = !empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
+		$class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
 		$class = gravityview_sanitize_html_class( $class );
 
-		echo '<div class="gv-widget-custom-content '.$class.'">'. $content .'</div>';
+		echo '<div class="gv-widget-custom-content ' . $class . '">' . $content . '</div>';
 
 	}
 

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

Spacing +109 added lines, -109 removed lines

@@ -64,7 +64,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(
@@ -86,7 +86,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
@@ -224,7 +224,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' ), \GV\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' ), \GV\Plugin::$version );
 
 		wp_localize_script( 'gravityview_searchwidget_admin', 'gvSearchVar', array(
 			'nonce' => wp_create_nonce( 'gravityview_ajaxsearchwidget' ),
@@ -246,7 +246,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;
 	}
 
@@ -259,24 +259,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' ] );
 
 		}
 
@@ -325,8 +325,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' ] );
 		}
 
 		// Get fields with sub-inputs and no parent
@@ -348,13 +348,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>';
 			}
 		}
 
@@ -377,7 +377,7 @@ 
 	public static function get_search_input_types( $field_id = '', $field_type = null ) {
 
 		// @todo - This needs to be improved - many fields have . including products and addresses
-		if ( false !== strpos( (string) $field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) {
+		if ( false !== strpos( (string)$field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) {
 			$input_type = 'boolean'; // on/off checkbox
 		} elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) {
 			$input_type = 'multi'; //multiselect
@@ -421,19 +421,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,
@@ -470,22 +470,22 @@ 
 		/**
 		 * Include the sidebar Widgets.
 		 */
-		$widgets = (array) get_option( 'widget_gravityview_search', array() );
+		$widgets = (array)get_option( 'widget_gravityview_search', array() );
 
 		foreach ( $widgets as $widget ) {
-			if ( ! empty( $widget['view_id'] ) && $widget['view_id'] == $view->ID ) {
-				if( $_fields = json_decode( $widget['search_fields'], true ) ) {
+			if ( ! empty( $widget[ 'view_id' ] ) && $widget[ 'view_id' ] == $view->ID ) {
+				if ( $_fields = json_decode( $widget[ 'search_fields' ], true ) ) {
 					foreach ( $_fields as $field ) {
-						$searchable_fields [] = $field['field'];
+						$searchable_fields [ ] = $field[ 'field' ];
 					}
 				}
 			}
 		}
 
 		foreach ( $view->widgets->by_id( $this->get_widget_id() )->all() as $widget ) {
-			if( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) {
+			if ( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) {
 				foreach ( $_fields as $field ) {
-					$searchable_fields [] = $field['field'];
+					$searchable_fields [ ] = $field[ 'field' ];
 				}
 			}
 		}
@@ -502,7 +502,7 @@ 
 	 */
 	public function filter_entries( $search_criteria, $form_id = null, $args = array() ) {
 
-		if( 'post' === $this->search_method ) {
+		if ( 'post' === $this->search_method ) {
 			$get = $_POST;
 		} else {
 			$get = $_GET;
@@ -521,14 +521,14 @@ 
 		$get = gv_map_deep( $get, 'rawurldecode' );
 
 		// Make sure array key is set up
-		$search_criteria['field_filters'] = \GV\Utils::get( $search_criteria, 'field_filters', array() );
+		$search_criteria[ 'field_filters' ] = \GV\Utils::get( $search_criteria, 'field_filters', array() );
 
 		$searchable_fields = $this->get_view_searchable_fields( $view );
 
 		// add free search
-		if ( isset( $get['gv_search'] ) && '' !== $get['gv_search'] && in_array( 'search_all', $searchable_fields ) ) {
+		if ( isset( $get[ 'gv_search' ] ) && '' !== $get[ 'gv_search' ] && in_array( 'search_all', $searchable_fields ) ) {
 
-			$search_all_value = trim( $get['gv_search'] );
+			$search_all_value = trim( $get[ 'gv_search' ] );
 
 			/**
 			 * @filter `gravityview/search-all-split-words` Search for each word separately or the whole phrase?
@@ -553,7 +553,7 @@ 
 			}
 
 			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`
@@ -563,19 +563,19 @@ 
 
 		// start date & end date
 		if ( in_array( 'entry_date', $searchable_fields ) ) {
-			$curr_start = !empty( $get['gv_start'] ) ? $get['gv_start'] : '';
-			$curr_end = !empty( $get['gv_start'] ) ? $get['gv_end'] : '';
+			$curr_start = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_start' ] : '';
+			$curr_end = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_end' ] : '';
 
 			if ( $view ) {
 				/**
 				 * Override start and end dates if View is limited to some already.
 				 */
-				if ( $start_date =$view->settings->get( 'start_date' ) ) {
+				if ( $start_date = $view->settings->get( 'start_date' ) ) {
 					if ( $start_timestamp = strtotime( $curr_start ) ) {
 						$curr_start = $start_timestamp < strtotime( $start_date ) ? $start_date : $curr_start;
 					}
 				}
-				if ( $end_date =$view->settings->get( 'end_date' ) ) {
+				if ( $end_date = $view->settings->get( 'end_date' ) ) {
 					if ( $end_timestamp = strtotime( $curr_end ) ) {
 						$curr_end = $end_timestamp > strtotime( $end_date ) ? $end_date : $curr_end;
 					}
@@ -596,19 +596,19 @@ 
 			 */
 			if ( ! empty( $curr_start ) ) {
 				$curr_start = date( 'Y-m-d H:i:s', strtotime( $curr_start ) );
-				$search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
+				$search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
 			}
 
 			if ( ! empty( $curr_end ) ) {
 				// Fast-forward 24 hour on the end time
 				$curr_end = date( 'Y-m-d H:i:s', strtotime( $curr_end ) + DAY_IN_SECONDS );
-				$search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $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' ] ) && in_array( 'entry_id', $searchable_fields ) ) {
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => 'id',
 				'value' => absint( $get[ 'gv_id' ] ),
 				'operator' => '=',
@@ -617,42 +617,42 @@ 
 
 		// search for a specific Created_by ID
 		if ( ! empty( $get[ 'gv_by' ] ) && in_array( 'entry_creator', $searchable_fields ) ) {
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => 'created_by',
-				'value' => absint( $get['gv_by'] ),
+				'value' => absint( $get[ 'gv_by' ] ),
 				'operator' => '=',
 			);
 		}
 
 
 		// Get search mode passed in URL
-		$mode = isset( $get['mode'] ) && in_array( $get['mode'], array( 'any', 'all' ) ) ?  $get['mode'] : 'any';
+		$mode = isset( $get[ 'mode' ] ) && in_array( $get[ 'mode' ], array( 'any', 'all' ) ) ? $get[ 'mode' ] : 'any';
 
 		// get the other search filters
 		foreach ( $get as $key => $value ) {
 
-			if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[0], false, false ) ) ) {
+			if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[ 0 ], false, false ) ) ) {
 				continue;
 			}
 
 			$filter_key = $this->convert_request_key_to_filter_key( $key );
 
 			// could return simple filter or multiple filters
-			if ( ! in_array( 'search_all', $searchable_fields ) && ! in_array( $filter_key , $searchable_fields ) ) {
+			if ( ! in_array( 'search_all', $searchable_fields ) && ! in_array( $filter_key, $searchable_fields ) ) {
 				continue;
 			}
 
 			$filter = $this->prepare_field_filter( $filter_key, $value, $view );
 
-			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;
 			}
 		}
 
@@ -661,7 +661,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 );
 
 		gravityview()->log->debug( 'Returned Search Criteria: ', array( 'data' => $search_criteria ) );
 
@@ -689,7 +689,7 @@ 
 		$field_id = str_replace( 'filter_', '', $key );
 
 		// calculates field_id, removing 'filter_' and for '_' for advanced fields ( like name or checkbox )
-		if ( preg_match('/^[0-9_]+$/ism', $field_id ) ) {
+		if ( preg_match( '/^[0-9_]+$/ism', $field_id ) ) {
 			$field_id = str_replace( '_', '.', $field_id );
 		}
 
@@ -724,7 +724,7 @@ 
 
 			case 'select':
 			case 'radio':
-				$filter['operator'] = 'is';
+				$filter[ 'operator' ] = 'is';
 				break;
 
 			case 'post_category':
@@ -738,7 +738,7 @@ 
 
 				foreach ( $value as $val ) {
 					$cat = get_term( $val, 'category' );
-					$filter[] = array(
+					$filter[ ] = array(
 						'key'      => $filter_key,
 						'value'    => esc_attr( $cat->name ) . ':' . $val,
 						'operator' => 'is',
@@ -757,7 +757,7 @@ 
 				$filter = array();
 
 				foreach ( $value as $val ) {
-					$filter[] = array( 'key' => $filter_key, 'value' => $val );
+					$filter[ ] = array( 'key' => $filter_key, 'value' => $val );
 				}
 
 				break;
@@ -766,9 +766,9 @@ 
 				// convert checkbox on/off into the correct search filter
 				if ( false !== strpos( $filter_key, '.' ) && ! empty( $form_field->inputs ) && ! empty( $form_field->choices ) ) {
 					foreach ( $form_field->inputs as $k => $input ) {
-						if ( $input['id'] == $filter_key ) {
-							$filter['value'] = $form_field->choices[ $k ]['value'];
-							$filter['operator'] = 'is';
+						if ( $input[ 'id' ] == $filter_key ) {
+							$filter[ 'value' ] = $form_field->choices[ $k ][ 'value' ];
+							$filter[ 'operator' ] = 'is';
 							break;
 						}
 					}
@@ -778,7 +778,7 @@ 
 					$filter = array();
 
 					foreach ( $value as $val ) {
-						$filter[] = array(
+						$filter[ ] = array(
 							'key'      => $filter_key,
 							'value'    => $val,
 							'operator' => 'is',
@@ -799,9 +799,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;
 						}
 					}
 
@@ -828,19 +828,19 @@ 
 						 * @since 1.16.3
 						 * Safeguard until GF implements '<=' operator
 						 */
-						if( !GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) {
+						if ( ! GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) {
 							$operator = '<';
 							$date = date( 'Y-m-d', strtotime( $date . ' +1 day' ) );
 						}
 
-						$filter[] = array(
+						$filter[ ] = array(
 							'key'      => $filter_key,
 							'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;
@@ -871,7 +871,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 ];
 		}
 
@@ -902,7 +902,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;
 	}
@@ -921,7 +921,7 @@ 
 		$has_date = false;
 
 		foreach ( $search_fields as $k => $field ) {
-			if ( in_array( $field['input'], array( 'date', 'date_range', 'entry_date' ) ) ) {
+			if ( in_array( $field[ 'input' ], array( 'date', 'date_range', 'entry_date' ) ) ) {
 				$has_date = true;
 				break;
 			}
@@ -948,7 +948,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 ) ) {
 			gravityview()->log->debug( 'No search fields configured for widget:', array( 'data' => $widget_args ) );
@@ -963,34 +963,34 @@ 
 
 			$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'] = $this->rgget_or_rgpost( 'gv_search' );
+					$updated_field[ 'key' ] = 'search_all';
+					$updated_field[ 'input' ] = 'search_all';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( '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' => $this->rgget_or_rgpost( 'gv_start' ),
 						'end' => $this->rgget_or_rgpost( 'gv_end' ),
 					);
 					break;
 
 				case 'entry_id':
-					$updated_field['key'] = 'entry_id';
-					$updated_field['input'] = 'entry_id';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_id' );
+					$updated_field[ 'key' ] = 'entry_id';
+					$updated_field[ 'input' ] = 'entry_id';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_id' );
 					break;
 
 				case 'created_by':
-					$updated_field['key'] = 'created_by';
-					$updated_field['name'] = 'gv_by';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_by' );
-					$updated_field['choices'] = self::get_created_by_choices();
+					$updated_field[ 'key' ] = 'created_by';
+					$updated_field[ 'name' ] = 'gv_by';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_by' );
+					$updated_field[ 'choices' ] = self::get_created_by_choices();
 					break;
 			}
 
@@ -1009,16 +1009,16 @@ 
 		 */
 		$gravityview_view->search_fields = apply_filters( 'gravityview_widget_search_filters', $search_fields, $this, $widget_args, $context );
 
-		$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 ( $this->has_date_field( $search_fields ) ) {
 			// enqueue datepicker stuff only if needed!
@@ -1040,10 +1040,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;
 		}
 
 		/**
@@ -1087,9 +1087,9 @@ 
 
 		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;
@@ -1101,10 +1101,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' );
@@ -1143,32 +1143,32 @@ 
 		$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/$_POST (string or array)
 		$value = $this->rgget_or_rgpost( $name );
 
 		// 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' => $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;
@@ -1192,7 +1192,7 @@ 
 
 		$choices = array();
 		foreach ( $users as $user ) {
-			$choices[] = array(
+			$choices[ ] = array(
 				'value' => $user->ID,
 				'text' => $user->display_name,
 			);
@@ -1247,7 +1247,7 @@ 
 	 */
 	public function add_datepicker_js_dependency( $js_dependencies ) {
 
-		$js_dependencies[] = 'jquery-ui-datepicker';
+		$js_dependencies[ ] = 'jquery-ui-datepicker';
 
 		return $js_dependencies;
 	}
@@ -1291,7 +1291,7 @@ 
 			'isRTL'             => is_rtl(),
 		), $view_data );
 
-		$localizations['datepicker'] = $datepicker_settings;
+		$localizations[ 'datepicker' ] = $datepicker_settings;
 
 		return $localizations;
 
@@ -1318,7 +1318,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' );
 		}
 	}
@@ -1340,7 +1340,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/widgets/search-widget/templates/search-field-link.php

Spacing +8 added lines, -8 removed lines

@@ -13,12 +13,12 @@ 
 $base_url = GravityView_Widget_Search::get_search_form_action();
 
 // Make sure that there are choices to display
-if ( empty( $search_field['choices'] ) ) {
+if ( empty( $search_field[ 'choices' ] ) ) {
 	gravityview()->log->debug( 'search-field-link.php - No choices for field' );
 	return;
 }
 
-$links_label = empty( $search_field['label'] ) ? __( 'Show only:', 'gravityview' ) : $search_field['label'];
+$links_label = empty( $search_field[ 'label' ] ) ? __( 'Show only:', 'gravityview' ) : $search_field[ 'label' ];
 
 /**
  * @filter `gravityview/extension/search/links_label` Change the label for the "Link" search bar input type
@@ -41,24 +41,24 @@ 
 
         <?php
 
-        $search_value = \GV\Utils::_GET( $search_field['name'] );
+        $search_value = \GV\Utils::_GET( $search_field[ 'name' ] );
 
-        foreach ( $search_field['choices'] as $k => $choice ) {
+        foreach ( $search_field[ 'choices' ] as $k => $choice ) {
 
             if ( 0 != $k ) {
                 echo esc_html( $links_sep );
             }
 
-            $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
+            $active = ( '' !== $search_value && in_array( $search_value, array( $choice[ 'text' ], $choice[ 'value' ] ) ) ) ? ' class="active"' : false;
 
             if ( $active ) {
-                $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
+                $link = remove_query_arg( array( 'pagenum', $search_field[ 'name' ] ), $base_url );
             } else {
-                $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
+                $link = add_query_arg( array( $search_field[ 'name' ] => urlencode( $choice[ 'value' ] ) ), remove_query_arg( array( 'pagenum' ), $base_url ) );
             }
             ?>
 
-			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
+			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice[ 'text' ] ); ?></a>
 
 		<?php } ?>
 	</p>

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

Spacing +8 added lines, -8 removed lines

@@ -10,7 +10,7 @@ 
 $search_field = $gravityview_view->search_field;
 
 // Make sure that there are choices to display
-if( empty( $search_field['choices'] ) ) {
+if ( empty( $search_field[ 'choices' ] ) ) {
 	gravityview()->log->debug( 'search-field-select.php - No choices for field' );
 	return;
 }
@@ -21,19 +21,19 @@ 
  * @param string $default_option Default: `—` (—)
  * @param string $field_type Field type: "select" or "multiselect"
  */
-$default_option = apply_filters('gravityview/extension/search/select_default', '—', 'select' );
+$default_option = apply_filters( 'gravityview/extension/search/select_default', '—', 'select' );
 
 ?>
 <div class="gv-search-box gv-search-field-select">
-	<?php if( ! gv_empty( $search_field['label'], false, 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, 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 gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option>
+		<select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>">
+			<option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option>
 			<?php
-			foreach( $search_field['choices'] as $choice ) : ?>
-				<option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $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( esc_attr( $choice[ 'value' ] ), esc_attr( $search_field[ 'value' ] ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
 			<?php endforeach; ?>
 		</select>
 	</p>

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

Spacing +7 added lines, -7 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'] ) ) {
+if ( empty( $search_field[ 'choices' ] ) ) {
 	gravityview()->log->debug( 'search-field-checkbox.php - No choices for field' );
 	return;
 }
 
 ?>
 <div class="gv-search-box gv-search-field-checkbox">
-	<?php if( ! gv_empty( $search_field['label'], false, 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, false ) ) { ?>
+	<label for=search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
 	<?php } ?>
 	<p>
-	<?php foreach( $search_field['choices'] as $choice ) { ?>
+	<?php foreach ( $search_field[ 'choices' ] as $choice ) { ?>
 
-		<label for="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" class="gv-check-radio">
-			<input type="checkbox" name="<?php echo esc_attr( $search_field['name'] ); ?>[]" value="<?php echo esc_attr( $choice['value'] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" <?php gv_selected( $choice['value'], $search_field['value'], true, 'checked' ); ?>>
-			<?php echo esc_html( $choice['text'] ); ?>
+		<label for="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" class="gv-check-radio">
+			<input type="checkbox" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>[]" value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" <?php gv_selected( $choice[ 'value' ], $search_field[ 'value' ], true, 'checked' ); ?>>
+			<?php echo esc_html( $choice[ 'text' ] ); ?>
 		</label>
 
 	<?php } ?>

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

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
 	 */
 	do_action( 'gravityview_search_widget_fields_before', $this );
 
-	foreach( $this->search_fields as $search_field ) {
+	foreach ( $this->search_fields as $search_field ) {
 
 		/**
 		 * @action `gravityview_search_widget_field_before` Before each search input is rendered (other than the submit button)
@@ -36,10 +36,10 @@ 
 		do_action( 'gravityview_search_widget_field_before', $this, $search_field );
 
 		$gravityview_view->search_field = $search_field;
-		$this->render( 'search-field', $search_field['input'], false );
+		$this->render( 'search-field', $search_field[ 'input' ], false );
 
 		// show/hide the search button if there are input type fields
-		if( !$has_inputs &&  $search_field['input'] != 'link' ) {
+		if ( ! $has_inputs && $search_field[ 'input' ] != 'link' ) {
 			$has_inputs = true;
 		}
 
@@ -57,7 +57,7 @@ 
 	 */
 	do_action( 'gravityview_search_widget_fields_after', $this );
 
-	if( $has_inputs ) {
+	if ( $has_inputs ) {
 	    $this->render( 'search-field', 'submit', false );
     }
 ?>