gravityview / GravityView

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

Spacing +5 added lines, -5 removed lines

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

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

Spacing +4 added lines, -4 removed lines

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

future/includes/class-gv-source-internal.php

Doc Comments +1 added lines, -2 removed lines

@@ -24,9 +24,8 @@
 	/**
 	 * Get a \GV\Field by Field ID for this data source.
 	 *
-	 * @param int $field_id The internal field ID (custom content, etc.)
 	 *
-	 * @return \GV\Field|null The requested field or null if not found.
+	 * @return null|Internal_Field The requested field or null if not found.
 	 */
 	public static function get_field( /** varargs */ ) {
 		$args = func_get_args();

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

Spacing +16 added lines, -16 removed lines

@@ -44,16 +44,16 @@ 
 		 */
 		$atts = apply_filters( 'gravityview/shortcodes/gventry/atts', $atts );
 
-		$view = \GV\View::by_id( $atts['view_id'] );
+		$view = \GV\View::by_id( $atts[ 'view_id' ] );
 
 		if ( ! $view ) {
-			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts['view_id'] ) );
+			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts[ 'view_id' ] ) );
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', null, null, $atts );
 		}
 
-		$entry_id = ! empty( $atts['entry_id'] ) ? $atts['entry_id'] : $atts['id'];
+		$entry_id = ! empty( $atts[ 'entry_id' ] ) ? $atts[ 'entry_id' ] : $atts[ 'id' ];
 
-		switch( $entry_id ):
+		switch ( $entry_id ):
 			case 'last':
 				if ( class_exists( '\GF_Query' ) ) {
 					/**
@@ -62,17 +62,17 @@ 
 					 * Since we're using \GF_Query shorthand initialization we have to reverse the order parameters here.
 					 */
 					add_filter( 'gravityview_get_entries', $filter = function( $parameters, $args, $form_id ) {
-						if ( ! empty( $parameters['sorting'] ) ) {
+						if ( ! empty( $parameters[ 'sorting' ] ) ) {
 							/**
 							 * Reverse existing sorts.
 							 */
-							$sort = &$parameters['sorting'];
-							$sort['direction'] = $sort['direction'] == 'RAND' ? : ( $sort['direction'] == 'ASC' ? 'DESC' : 'ASC' );
+							$sort = &$parameters[ 'sorting' ];
+							$sort[ 'direction' ] = $sort[ 'direction' ] == 'RAND' ?: ( $sort[ 'direction' ] == 'ASC' ? 'DESC' : 'ASC' );
 						} else {
 							/**
 							 * Otherwise, sort by date_created.
 							 */
-							$parameters['sorting'] = array(
+							$parameters[ 'sorting' ] = array(
 								'key' => 'id',
 								'direction' => 'ASC',
 								'is_numeric' => true
@@ -87,7 +87,7 @@ 
 
 					/** If a sort already exists, reverse it. */
 					if ( $sort = end( $entries->sorts ) ) {
-						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ? : ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
+						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ?: ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
 					} else {
 						/** Otherwise, sort by date_created */
 						$entries = $entries->sort( new \GV\Entry_Sort( \GV\Internal_Field::by_id( 'id' ), \GV\Entry_Sort::ASC ), \GV\Entry_Sort::NUMERIC );
@@ -105,12 +105,12 @@ 
 				break;
 			default:
 				if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) {
-					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts['view_id'] ) );
+					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts[ 'view_id' ] ) );
 					return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, null, $atts );
 				}
 		endswitch;
 
-		if ( $view->form->ID != $entry['form_id'] ) {
+		if ( $view->form->ID != $entry[ 'form_id' ] ) {
 			gravityview()->log->error( 'Entry does not belong to view (form mismatch)' );
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
 		}
@@ -120,7 +120,7 @@ 
 			return apply_filters( 'gravityview/shortcodes/gventry/output', get_the_password_form( $view->ID ), $view, $entry, $atts );
 		}
 
-		if ( ! $view->form  ) {
+		if ( ! $view->form ) {
 			gravityview()->log->notice( 'View #{id} has no form attached to it.', array( 'id' => $view->ID ) );
 
 			/**
@@ -143,15 +143,15 @@ 
 		}
 
 		/** Unapproved entries. */
-		if ( $entry['status'] != 'active' ) {
+		if ( $entry[ 'status' ] != 'active' ) {
 			gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
 		}
 
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
 		if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 				return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
 			}
@@ -163,7 +163,7 @@ 
 		$renderer = new \GV\Entry_Renderer();
 
 		$request = new \GV\Mock_Request();
-		$request->returns['is_entry'] = $entry;
+		$request->returns[ 'is_entry' ] = $entry;
 
 		$output = $renderer->render( $entry, $view, $request );
 

future/includes/class-gv-field-internal.php

Spacing +2 added lines, -2 removed lines

@@ -29,12 +29,12 @@
 	 */
 	public static function from_configuration( $configuration ) {
 
-		if ( empty( $configuration['id'] ) || ! is_string( $configuration['id'] ) ) {
+		if ( empty( $configuration[ 'id' ] ) || ! is_string( $configuration[ 'id' ] ) ) {
 			gravityview()->log->error( 'Invalid configuration[id] supplied.' );
 			return null;
 		}
 
-		$field = self::by_id( $configuration['id'] );
+		$field = self::by_id( $configuration[ 'id' ] );
 
 		$field->update_configuration( $configuration );
 

future/includes/class-gv-field.php

Spacing +17 added lines, -17 removed lines

@@ -166,7 +166,7 @@ 
 	 * @return \GV\Field The field implementation from configuration (\GV\GF_Field, \GV\Internal_Field).
 	 */
 	public static function from_configuration( $configuration ) {
-		if ( empty( $configuration['id'] ) ) {
+		if ( empty( $configuration[ 'id' ] ) ) {
 			$field = new self();
 			gravityview()->log->error( 'Trying to get field from configuration without a field ID.', array( 'data' => $configuration ) );
 			$field->update_configuration( $configuration );
@@ -179,8 +179,8 @@ 
 		} else {
 			$trace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS );
 		}
-		$trace = $trace[1];
-		if ( $trace['function'] == 'from_configuration' && $trace['class'] == __CLASS__ ) {
+		$trace = $trace[ 1 ];
+		if ( $trace[ 'function' ] == 'from_configuration' && $trace[ 'class' ] == __CLASS__ ) {
 			$field = new self();
 			gravityview()->log->error( 'Infinite loop protection tripped. Returning default class here.' );
 			$field->update_configuration( $configuration );
@@ -188,7 +188,7 @@ 
 		}
 
 		/** Determine the field implementation to use, and try to use. */
-		$field_class = is_numeric( $configuration['id'] ) ? '\GV\GF_Field' : '\GV\Internal_Field';
+		$field_class = is_numeric( $configuration[ 'id' ] ) ? '\GV\GF_Field' : '\GV\Internal_Field';
 
 		/**
 		 * @filter `gravityview/field/class` Filter the field class about to be created from the configuration.
@@ -227,24 +227,24 @@ 
 	public function update_configuration( $configuration ) {
 		$configuration = wp_parse_args( $configuration, $this->as_configuration() );
 
-		if ( $this->ID != $configuration['id'] ) {
+		if ( $this->ID != $configuration[ 'id' ] ) {
 			/** Smelling trouble here... */
 			gravityview()->log->warning( 'ID is being changed for {field_class} instance, but implementation is not. Use ::from_configuration instead', array( 'field_class', __CLASS__ ) );
 		}
 
-		$this->ID = $configuration['id'];
-		$this->label = $configuration['label'];
-		$this->show_label = $configuration['show_label'] == '1';
-		$this->custom_label = $configuration['custom_label'];
-		$this->custom_class = $configuration['custom_class'];
-		$this->cap = $configuration['only_loggedin'] == '1' ? $configuration['only_loggedin_cap'] : '';
-		$this->search_filter = $configuration['search_filter'] == '1';
-		$this->show_as_link = $configuration['show_as_link'] == '1';
+		$this->ID = $configuration[ 'id' ];
+		$this->label = $configuration[ 'label' ];
+		$this->show_label = $configuration[ 'show_label' ] == '1';
+		$this->custom_label = $configuration[ 'custom_label' ];
+		$this->custom_class = $configuration[ 'custom_class' ];
+		$this->cap = $configuration[ 'only_loggedin' ] == '1' ? $configuration[ 'only_loggedin_cap' ] : '';
+		$this->search_filter = $configuration[ 'search_filter' ] == '1';
+		$this->show_as_link = $configuration[ 'show_as_link' ] == '1';
 
 		/** Shared among all field types (sort of). */
 		$shared_configuration_keys = array(
 			'id', 'label', 'show_label', 'custom_label', 'custom_class',
-			'only_loggedin' ,'only_loggedin_cap', 'search_filter', 'show_as_link',
+			'only_loggedin', 'only_loggedin_cap', 'search_filter', 'show_as_link',
 		);
 
 		/** Everything else goes into the properties for now. @todo subclasses! */
@@ -273,7 +273,7 @@ 
 
 		/** A custom label is available. */
 		if ( ! empty( $this->custom_label ) ) {
-			return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ? : null : null, $entry ? $entry->as_entry() : null );
+			return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ?: null : null, $entry ? $entry->as_entry() : null );
 		}
 
 		return '';
@@ -350,7 +350,7 @@ 
 	 * @return mixed|null The value for the given configuration key, null if doesn't exist.
 	 */
 	public function __get( $key ) {
-		switch( $key ):
+		switch ( $key ):
 			default:
 				if ( isset( $this->configuration[ $key ] ) ) {
 					return $this->configuration[ $key ];
@@ -366,7 +366,7 @@ 
 	 * @return boolean Whether this $key is set or not.
 	 */
 	public function __isset( $key ) {
-		switch( $key ):
+		switch ( $key ):
 			default:
 				return isset( $this->configuration[ $key ] );
 		endswitch;

includes/fields/class-gravityview-field-list.php

Doc Comments +1 added lines, -2 removed lines

@@ -53,7 +53,6 @@ 
 	 * Columns are able to be added to View layouts, but not separately searched!
 	 *
 	 * @param array $fields
-	 * @param int $form_id
 	 *
 	 * @return array
 	 */
@@ -133,7 +132,7 @@ 
 	 *
 	 * @param GF_Field_List $field Gravity Forms field
 	 * @param string|array $field_value Serialized or unserialized array value for the field
-	 * @param int|string $column_id The numeric key of the column (0-index) or the label of the column
+	 * @param integer $column_id The numeric key of the column (0-index) or the label of the column
 	 * @param string $format If set to 'raw', return an array of values for the column. Otherwise, allow Gravity Forms to render using `html` or `text`
 	 *
 	 * @return array|string|null Returns null if the $field_value passed wasn't an array or serialized array

Spacing +15 added lines, -15 removed lines

@@ -60,7 +60,7 @@ 
 	public function remove_columns_from_searchable_fields( $fields ) {
 
 		foreach ( $fields as $key => $field ) {
-			if ( isset( $field['parent'] ) && $field['parent'] instanceof \GF_Field_List ) {
+			if ( isset( $field[ 'parent' ] ) && $field[ 'parent' ] instanceof \GF_Field_List ) {
 				unset( $fields[ $key ] );
 			}
 		}
@@ -86,7 +86,7 @@ 
 		// Add the list columns
 		foreach ( $list_fields as $list_field ) {
 
-			if( empty( $list_field->enableColumns ) ) {
+			if ( empty( $list_field->enableColumns ) ) {
 				continue;
 			}
 
@@ -107,7 +107,7 @@ 
 			}
 
 			// If there are columns, add them under the parent field
-			if( ! empty( $list_columns ) ) {
+			if ( ! empty( $list_columns ) ) {
 
 				$index = array_search( $list_field->id, array_keys( $fields ) ) + 1;
 
@@ -115,7 +115,7 @@ 
 				 * Merge the $list_columns into the $fields array at $index
 				 * @see https://stackoverflow.com/a/1783125
 				 */
-				$fields = array_slice( $fields, 0, $index, true) + $list_columns + array_slice( $fields, $index, null, true);
+				$fields = array_slice( $fields, 0, $index, true ) + $list_columns + array_slice( $fields, $index, null, true );
 			}
 
 			unset( $list_columns, $index, $input_id );
@@ -142,7 +142,7 @@ 
 
 		$list_rows = maybe_unserialize( $field_value );
 
-		if( ! is_array( $list_rows ) ) {
+		if ( ! is_array( $list_rows ) ) {
 			gravityview()->log->error( '$field_value did not unserialize', array( 'data' => $field_value ) );
 			return null;
 		}
@@ -152,18 +152,18 @@ 
 		// Each list row
 		foreach ( $list_rows as $list_row ) {
 			$current_column = 0;
-			foreach ( (array) $list_row as $column_key => $column_value ) {
+			foreach ( (array)$list_row as $column_key => $column_value ) {
 
 				// If the label of the column matches $column_id, or the numeric key value matches, add the value
-				if( (string)$column_key === (string)$column_id || ( is_numeric( $column_id ) && (int)$column_id === $current_column ) ) {
-					$column_values[] = $column_value;
+				if ( (string)$column_key === (string)$column_id || ( is_numeric( $column_id ) && (int)$column_id === $current_column ) ) {
+					$column_values[ ] = $column_value;
 				}
 				$current_column++;
 			}
 		}
 
 		// Return the array of values
-		if( 'raw' === $format ) {
+		if ( 'raw' === $format ) {
 			return $column_values;
 		}
 		// Return the Gravity Forms Field output
@@ -186,22 +186,22 @@ 
 	 */
 	public function _filter_field_label( $label, $field, $form, $entry ) {
 
-		$field_object = RGFormsModel::get_field( $form, $field['id'] );
+		$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
 
 		// Not a list field
-		if( ! $field_object || 'list' !== $field_object->type ) {
+		if ( ! $field_object || 'list' !== $field_object->type ) {
 			return $label;
 		}
 
 		// Custom label is defined, so use it
-		if( ! empty( $field['custom_label'] ) ) {
+		if ( ! empty( $field[ 'custom_label' ] ) ) {
 			return $label;
 		}
 
-		$column_id = gravityview_get_input_id_from_id( $field['id'] );
+		$column_id = gravityview_get_input_id_from_id( $field[ 'id' ] );
 
 		// Parent field, not column field
-		if( false === $column_id ) {
+		if ( false === $column_id ) {
 			return $label;
 		}
 
@@ -222,7 +222,7 @@ 
 	public static function get_column_label( GF_Field_List $field, $column_id, $backup_label = '' ) {
 
 		// Doesn't have columns enabled
-		if( ! isset( $field->choices ) || ! $field->enableColumns ) {
+		if ( ! isset( $field->choices ) || ! $field->enableColumns ) {
 			return $backup_label;
 		}
 

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

Braces +3 added lines, -2 removed lines

@@ -603,7 +603,8 @@ 
 				// 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;
-				if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056
+				if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) {
+// See https://github.com/gravityview/GravityView/issues/1056
 					$search_criteria['end_date'] = date( 'Y-m-d H:i:s', strtotime( $search_criteria['end_date'] ) - 1 );
 				}
 			}
@@ -874,7 +875,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 ];
 		}
 

Doc Comments +4 added lines, -5 removed lines

@@ -243,7 +243,7 @@ 
 	/**
 	 * Add admin script to the no-conflict scripts whitelist
 	 * @param array $allowed Scripts allowed in no-conflict mode
-	 * @return array Scripts allowed in no-conflict mode, plus the search widget script
+	 * @return string[] Scripts allowed in no-conflict mode, plus the search widget script
 	 */
 	public function register_no_conflict( $allowed ) {
 		$allowed[] = 'gravityview_searchwidget_admin';
@@ -709,7 +709,6 @@ 
 	 * Dropin for the legacy flat filters when \GF_Query is available.
 	 *
 	 * @param \GF_Query $query The current query object reference
-	 * @param \GV\View $this The current view object
 	 * @param \GV\Request $request The request object
 	 */
 	public function gf_query_filter( &$query, $view, $request ) {
@@ -1199,7 +1198,7 @@ 
 	/**
 	 * Get the label for a search form field
 	 * @param  array $field      Field setting as sent by the GV configuration - has `field`, `input` (input type), and `label` keys
-	 * @param  array $form_field Form field data, as fetched by `gravityview_get_field()`
+	 * @param  GF_Field|null $form_field Form field data, as fetched by `gravityview_get_field()`
 	 * @return string             Label for the search form
 	 */
 	private static function get_field_label( $field, $form_field = array() ) {
@@ -1364,7 +1363,7 @@ 
 	/**
 	 * Require the datepicker script for the frontend GV script
 	 * @param array $js_dependencies Array of existing required scripts for the fe-views.js script
-	 * @return array Array required scripts, with `jquery-ui-datepicker` added
+	 * @return string[] Array required scripts, with `jquery-ui-datepicker` added
 	 */
 	public function add_datepicker_js_dependency( $js_dependencies ) {
 
@@ -1376,7 +1375,7 @@ 
 	/**
 	 * Modify the array passed to wp_localize_script()
 	 *
-	 * @param array $js_localization The data padded to the Javascript file
+	 * @param array $localizations The data padded to the Javascript file
 	 * @param array $view_data View data array with View settings
 	 *
 	 * @return array

Spacing +142 added lines, -142 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
@@ -227,7 +227,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' ),
@@ -249,7 +249,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;
 	}
 
@@ -262,24 +262,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' ] );
 
 		}
 
@@ -329,14 +329,14 @@ 
 		);
 
 		if ( gravityview()->plugin->supports( \GV\Plugin::FEATURE_GFQUERY ) ) {
-			$custom_fields['is_approved'] = array(
+			$custom_fields[ 'is_approved' ] = array(
 				'text' => esc_html__( 'Is Approved', 'gravityview' ),
 				'type' => 'boolean',
 			);
 		}
 
-		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
@@ -358,13 +358,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>';
 			}
 		}
 
@@ -387,7 +387,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
@@ -431,19 +431,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,
@@ -482,22 +482,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 [] = $with_full_field ? $field : $field['field'];
+						$searchable_fields [ ] = $with_full_field ? $field : $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 [] = $with_full_field ? $field : $field['field'];
+					$searchable_fields [ ] = $with_full_field ? $field : $field[ 'field' ];
 				}
 			}
 		}
@@ -527,7 +527,7 @@ 
 			return $search_criteria; // Return the original criteria, GF_Query modification kicks in later
 		}
 
-		if( 'post' === $this->search_method ) {
+		if ( 'post' === $this->search_method ) {
 			$get = $_POST;
 		} else {
 			$get = $_GET;
@@ -546,14 +546,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?
@@ -578,7 +578,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`
@@ -591,14 +591,14 @@ 
 			/**
 			 * Get and normalize the dates according to the input format.
 			 */
-			if ( $curr_start = ! empty( $get['gv_start'] ) ? $get['gv_start'] : '' ) {
-				if( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) {
+			if ( $curr_start = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_start' ] : '' ) {
+				if ( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) {
 					$curr_start = $curr_start_date->format( 'Y-m-d' );
 				}
 			}
 
-			if ( $curr_end = ! empty( $get['gv_start'] ) ? ( ! empty( $get['gv_end'] ) ? $get['gv_end'] : '' ) : '' ) {
-				if( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) {
+			if ( $curr_end = ! empty( $get[ 'gv_start' ] ) ? ( ! empty( $get[ 'gv_end' ] ) ? $get[ 'gv_end' ] : '' ) : '' ) {
+				if ( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) {
 					$curr_end = $curr_end_date->format( 'Y-m-d' );
 				}
 			}
@@ -633,22 +633,22 @@ 
 			 */
 			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;
-				if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056
-					$search_criteria['end_date'] = date( 'Y-m-d H:i:s', strtotime( $search_criteria['end_date'] ) - 1 );
+				$search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
+				if ( strpos( $search_criteria[ 'end_date' ], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056
+					$search_criteria[ 'end_date' ] = date( 'Y-m-d H:i:s', strtotime( $search_criteria[ 'end_date' ] ) - 1 );
 				}
 			}
 		}
 
 		// 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' => '=',
@@ -657,42 +657,42 @@ 
 
 		// search for a specific Created_by ID
 		if ( ! empty( $get[ 'gv_by' ] ) && in_array( 'created_by', $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;
 			}
 		}
 
@@ -701,7 +701,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 ) );
 
@@ -726,15 +726,15 @@ 
 		 */
 		$search_criteria = $this->filter_entries( array(), null, array( 'id' => $view->ID ), true /** force search_criteria */ );
 
-		if ( empty( $search_criteria['field_filters'] ) ) {
+		if ( empty( $search_criteria[ 'field_filters' ] ) ) {
 			return;
 		}
 
 		$widgets = $view->widgets->by_id( $this->widget_id );
 		if ( $widgets->count() ) {
-			$widget = $widgets->all()[0];
+			$widget = $widgets->all()[ 0 ];
 			foreach ( $search_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) as $search_field ) {
-				if ( 'created_by' === $search_field['field'] && 'input_text' === $search_field['input'] ) {
+				if ( 'created_by' === $search_field[ 'field' ] && 'input_text' === $search_field[ 'input' ] ) {
 					$created_by_text_mode = true;
 				}
 			}
@@ -742,19 +742,19 @@ 
 
 		$extra_conditions = array();
 
-		foreach ( $search_criteria['field_filters'] as &$filter ) {
+		foreach ( $search_criteria[ 'field_filters' ] as &$filter ) {
 			if ( ! is_array( $filter ) ) {
 				continue;
 			}
 
 			// Construct a manual query for unapproved statuses
-			if ( 'is_approved' === $filter['key'] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, $filter['value'] ) ) {
-				$_tmp_query       = new GF_Query( $view->form->ID, array(
+			if ( 'is_approved' === $filter[ 'key' ] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, $filter[ 'value' ] ) ) {
+				$_tmp_query = new GF_Query( $view->form->ID, array(
 					'field_filters' => array(
 						array(
 							'operator' => 'in',
 							'key'      => 'is_approved',
-							'value'    => $filter['value'],
+							'value'    => $filter[ 'value' ],
 						),
 						array(
 							'operator' => 'is',
@@ -766,17 +766,17 @@ 
 				) );
 				$_tmp_query_parts = $_tmp_query->_introspect();
 
-				$extra_conditions[] = $_tmp_query_parts['where'];
+				$extra_conditions[ ] = $_tmp_query_parts[ 'where' ];
 
 				$filter = false;
 				continue;
 			}
 
 			// Construct manual query for text mode creator search
-			if ( 'created_by' === $filter['key'] && ! empty( $created_by_text_mode ) ) {
-				$extra_conditions[] = new class( $filter, $view ) extends \GF_Query_Condition {
+			if ( 'created_by' === $filter[ 'key' ] && ! empty( $created_by_text_mode ) ) {
+				$extra_conditions[ ] = new class( $filter, $view ) extends \GF_Query_Condition {
 					public function __construct( $filter, $view ) {
-						$this->value = $filter['value'];
+						$this->value = $filter[ 'value' ];
 						$this->view = $view;
 					}
 
@@ -810,11 +810,11 @@ 
 						$conditions = array();
 
 						foreach ( $user_fields as $user_field ) {
-							$conditions[] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) .  '%' );
+							$conditions[ ] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) . '%' );
 						}
 
 						foreach ( $user_meta_fields as $meta_field ) {
-							$conditions[] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) .  '%' );
+							$conditions[ ] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) . '%' );
 						}
 
 						$conditions = '(' . implode( ' OR ', $conditions ) . ')';
@@ -830,11 +830,11 @@ 
 			}
 
 			// 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' ];
 
 			// For multichoice, let's have an in (OR) search.
-			if ( is_array( $filter['value'] ) ) {
-				$filter['operator'] = 'in'; // @todo what about in contains (OR LIKE chains)?
+			if ( is_array( $filter[ 'value' ] ) ) {
+				$filter[ 'operator' ] = 'in'; // @todo what about in contains (OR LIKE chains)?
 			}
 
 			/**
@@ -842,10 +842,10 @@ 
 			 * @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 );
 		}
 
-		$search_criteria['field_filters'] = array_filter( $search_criteria['field_filters'] );
+		$search_criteria[ 'field_filters' ] = array_filter( $search_criteria[ 'field_filters' ] );
 
 		/**
 		 * Parse the filter criteria to generate the needed
@@ -858,12 +858,12 @@ 
 		/**
 		 * Grab the current clauses. We'll be combining them shortly.
 		 */
-		$query_parts      = $query->_introspect();
+		$query_parts = $query->_introspect();
 
 		/**
 		 * Combine the parts as a new WHERE clause.
 		 */
-		$where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts['where'], $_tmp_query_parts['where'] ), $extra_conditions ) );
+		$where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts[ 'where' ], $_tmp_query_parts[ 'where' ] ), $extra_conditions ) );
 		$query->where( $where );
 	}
 
@@ -886,7 +886,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 );
 		}
 
@@ -921,7 +921,7 @@ 
 
 			case 'select':
 			case 'radio':
-				$filter['operator'] = 'is';
+				$filter[ 'operator' ] = 'is';
 				break;
 
 			case 'post_category':
@@ -935,7 +935,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',
@@ -954,7 +954,7 @@ 
 				$filter = array();
 
 				foreach ( $value as $val ) {
-					$filter[] = array( 'key' => $filter_key, 'value' => $val );
+					$filter[ ] = array( 'key' => $filter_key, 'value' => $val );
 				}
 
 				break;
@@ -963,9 +963,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;
 						}
 					}
@@ -975,7 +975,7 @@ 
 					$filter = array();
 
 					foreach ( $value as $val ) {
-						$filter[] = array(
+						$filter[ ] = array(
 							'key'      => $filter_key,
 							'value'    => $val,
 							'operator' => 'is',
@@ -996,9 +996,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;
 						}
 					}
 
@@ -1012,19 +1012,19 @@ 
 
 					foreach ( $searchable_fields as $searchable_field ) {
 
-						if( $form_field->ID !== $searchable_field['field'] ) {
+						if ( $form_field->ID !== $searchable_field[ 'field' ] ) {
 							continue;
 						}
 
 						// Only exact-match dropdowns, not text search
-						if( in_array( $searchable_field['input'], array( 'text', 'search' ), true ) ) {
+						if ( in_array( $searchable_field[ 'input' ], array( 'text', 'search' ), true ) ) {
 							continue;
 						}
 
 						$input_id = gravityview_get_input_id_from_id( $form_field->ID );
 
 						if ( 4 === $input_id ) {
-							$filter['operator'] = 'is';
+							$filter[ 'operator' ] = 'is';
 						};
 					}
 				}
@@ -1051,12 +1051,12 @@ 
 						 * @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( self::get_formatted_date( $date, 'Y-m-d', $date_format ) . ' +1 day' ) );
 						}
 
-						$filter[] = array(
+						$filter[ ] = array(
 							'key'      => $filter_key,
 							'value'    => self::get_formatted_date( $date, 'Y-m-d', $date_format ),
 							'operator' => $operator,
@@ -1064,7 +1064,7 @@ 
 					}
 				} else {
 					$date = $value;
-					$filter['value'] = self::get_formatted_date( $date, 'Y-m-d', $date_format );
+					$filter[ 'value' ] = self::get_formatted_date( $date, 'Y-m-d', $date_format );
 				}
 
 				break;
@@ -1095,7 +1095,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 ];
 		}
 
@@ -1132,7 +1132,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;
 	}
@@ -1151,7 +1151,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;
 			}
@@ -1178,7 +1178,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 ) );
@@ -1193,41 +1193,41 @@ 
 
 			$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;
 				
 				case 'is_approved':
-					$updated_field['key'] = 'is_approved';
-					$updated_field['input'] = 'checkbox';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'filter_is_approved' );
-					$updated_field['choices'] = self::get_is_approved_choices();
+					$updated_field[ 'key' ] = 'is_approved';
+					$updated_field[ 'input' ] = 'checkbox';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'filter_is_approved' );
+					$updated_field[ 'choices' ] = self::get_is_approved_choices();
 					break;
 			}
 
@@ -1246,16 +1246,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!
@@ -1277,10 +1277,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;
 		}
 
 		/**
@@ -1324,9 +1324,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;
@@ -1338,10 +1338,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' );
@@ -1380,32 +1380,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;
@@ -1429,7 +1429,7 @@ 
 
 		$choices = array();
 		foreach ( $users as $user ) {
-			$choices[] = array(
+			$choices[ ] = array(
 				'value' => $user->ID,
 				'text' => $user->display_name,
 			);
@@ -1449,9 +1449,9 @@ 
 
 		$choices = array();
 		foreach ( GravityView_Entry_Approval_Status::get_all() as $status ) {
-			$choices[] = array(
-				'value' => $status['value'],
-				'text' => $status['label'],
+			$choices[ ] = array(
+				'value' => $status[ 'value' ],
+				'text' => $status[ 'label' ],
 			);
 		}
 
@@ -1503,7 +1503,7 @@ 
 	 */
 	public function add_datepicker_js_dependency( $js_dependencies ) {
 
-		$js_dependencies[] = 'jquery-ui-datepicker';
+		$js_dependencies[ ] = 'jquery-ui-datepicker';
 
 		return $js_dependencies;
 	}
@@ -1547,7 +1547,7 @@ 
 			'isRTL'             => is_rtl(),
 		), $view_data );
 
-		$localizations['datepicker'] = $datepicker_settings;
+		$localizations[ 'datepicker' ] = $datepicker_settings;
 
 		return $localizations;
 
@@ -1574,7 +1574,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' );
 		}
 	}
@@ -1596,7 +1596,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`

future/includes/class-gv-request.php

Spacing +8 added lines, -8 removed lines

@@ -45,7 +45,7 @@ 
 	 */
 	public static function is_add_oembed_preview() {
 		/** The preview request is a parse-embed AJAX call without a type set. */
-		return ( self::is_ajax() && ! empty( $_POST['action'] ) && $_POST['action'] == 'parse-embed' && ! isset( $_POST['type'] ) );
+		return ( self::is_ajax() && ! empty( $_POST[ 'action' ] ) && $_POST[ 'action' ] == 'parse-embed' && ! isset( $_POST[ 'type' ] ) );
 	}
 
 	/**
@@ -63,7 +63,7 @@ 
 	 * @return boolean
 	 */
 	public static function is_rest() {
-		return ! empty( $GLOBALS['wp']->query_vars['rest_route'] );
+		return ! empty( $GLOBALS[ 'wp' ]->query_vars[ 'rest_route' ] );
 	}
 
 	/**
@@ -141,15 +141,15 @@ 
 			$get = $_GET;
 		}
 
-		unset( $get['mode'] );
+		unset( $get[ 'mode' ] );
 
 		$get = array_filter( $get, 'gravityview_is_not_empty_string' );
 
-		if( $has_field_key = $this->_has_field_key( $get ) ) {
+		if ( $has_field_key = $this->_has_field_key( $get ) ) {
 			return true;
 		}
 
-		return isset( $get['gv_search'] ) || isset( $get['gv_start'] ) || isset( $get['gv_end'] ) || isset( $get['gv_by'] ) || isset( $get['gv_id'] );
+		return isset( $get[ 'gv_search' ] ) || isset( $get[ 'gv_start' ] ) || isset( $get[ 'gv_end' ] ) || isset( $get[ 'gv_by' ] ) || isset( $get[ 'gv_id' ] );
 	}
 
 	/**
@@ -172,13 +172,13 @@ 
 
 		$meta = array();
 		foreach ( $fields as $field ) {
-			if( empty( $field->_gf_field_class_name ) ) {
-				$meta[] = preg_quote( $field->name );
+			if ( empty( $field->_gf_field_class_name ) ) {
+				$meta[ ] = preg_quote( $field->name );
 			}
 		}
 
 		foreach ( $get as $key => $value ) {
-			if ( preg_match('/^filter_(([0-9_]+)|'. implode( '|', $meta ) .')$/sm', $key ) ) {
+			if ( preg_match( '/^filter_(([0-9_]+)|' . implode( '|', $meta ) . ')$/sm', $key ) ) {
 				$has_field_key = true;
 				break;
 			}

Indentation +4 added lines, -4 removed lines

@@ -128,10 +128,10 @@
 	 */
 	public function is_edit_entry( $form_id = 0 ) {
 		/**
-		* @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n
-		* The Edit Entry functionality overrides this value.
-		* @param boolean $is_edit_entry
-		*/
+		 * @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n
+		 * The Edit Entry functionality overrides this value.
+		 * @param boolean $is_edit_entry
+		 */
 		if ( ( $entry = $this->is_entry( $form_id ) ) && apply_filters( 'gravityview_is_edit_entry', false ) ) {
 			return $entry;
 		}