gravityview / GravityView

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

Spacing +3 added lines, -3 removed lines

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

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

Indentation +12 added lines, -12 removed lines

@@ -39,22 +39,22 @@
 
         <?php
 
-        $search_value = rgget( $search_field['name'] );
+		$search_value = rgget( $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 );
-            }
+			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 );
-            } else {
-                $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
-            }
-            ?>
+			if ( $active ) {
+				$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 ) );
+			}
+			?>
 
 			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
 

Spacing +14 added lines, -14 removed lines

@@ -13,8 +13,8 @@ 
 $base_url = GravityView_Widget_Search::get_search_form_action();
 
 // Make sure that there are choices to display
-if ( empty( $search_field['choices'] ) ) {
-	do_action( 'gravityview_log_debug', 'search-field-link.php - No choices for field' );
+if (empty($search_field['choices'])) {
+	do_action('gravityview_log_debug', 'search-field-link.php - No choices for field');
 	return;
 }
 
@@ -22,41 +22,41 @@ 
  * @filter `gravityview/extension/search/links_sep` Change the label for the "Link" search bar input type
  * @param string $links_label Default: `Show only:`
  */
-$links_label = apply_filters( 'gravityview/extension/search/links_label', __( 'Show only:', 'gravityview' ) );
+$links_label = apply_filters('gravityview/extension/search/links_label', __('Show only:', 'gravityview'));
 
 /**
  * @filter `gravityview/extension/search/links_sep` Change what separates search bar "Link" input type links
  * @param string $links_sep Default: ` | ` Used to connect multiple links
  */
-$links_sep = apply_filters( 'gravityview/extension/search/links_sep', ' | ' );
+$links_sep = apply_filters('gravityview/extension/search/links_sep', ' | ');
 
 ?>
 
 <div class="gv-search-box">
 
 	<p class="gv-search-box-links">
-		<?php echo esc_html( $links_label ); ?>
+		<?php echo esc_html($links_label); ?>
 
         <?php
 
-        $search_value = rgget( $search_field['name'] );
+        $search_value = rgget($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 );
+            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 );
+            if ($active) {
+                $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-multiselect.php

Spacing +8 added lines, -8 removed lines

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

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

Spacing +8 added lines, -8 removed lines

@@ -10,22 +10,22 @@
 $search_field = $gravityview_view->search_field;
 
 // Make sure that there are choices to display
-if( empty( $search_field['choices'] ) ) {
-	do_action('gravityview_log_debug', 'search-field-radio.php - No choices for field' );
+if (empty($search_field['choices'])) {
+	do_action('gravityview_log_debug', 'search-field-radio.php - No choices for field');
 	return;
 }
 
 ?>
 <div class="gv-search-box">
-	<?php if( ! gv_empty( $search_field['label'], false ) ) { ?>
-	<label for=search-box-<?php echo esc_attr( $search_field['name'] ); ?>><?php echo esc_html( $search_field['label'] ); ?></label>
+	<?php if (!gv_empty($search_field['label'], false)) { ?>
+	<label for=search-box-<?php echo esc_attr($search_field['name']); ?>><?php echo esc_html($search_field['label']); ?></label>
 	<?php } ?>
 	<p>
-	<?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="radio" 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 checked( $choice['value'], $search_field['value'], true ); ?>>
-			<?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="radio" 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 checked($choice['value'], $search_field['value'], true); ?>>
+			<?php echo esc_html($choice['text']); ?>
 		</label>
 
 	<?php } ?>

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

Spacing +2 added lines, -2 removed lines

@@ -14,8 +14,8 @@
 
 <div class="gv-search-box">
 	<div class="gv-search">
-	<?php if( ! gv_empty( $label, false ) ) { ?>
-		<label for="gv_search_<?php echo $view_id; ?>"><?php echo esc_html( $label ); ?></label>
+	<?php if (!gv_empty($label, false)) { ?>
+		<label for="gv_search_<?php echo $view_id; ?>"><?php echo esc_html($label); ?></label>
 	<?php } ?>
 		<p><input type="text" name="gv_search" id="gv_search_<?php echo $view_id; ?>" value="<?php echo $value; ?>" /></p>
 	</div>

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Display the search all input box
- *
- * @see class-search-widget.php
- */
+			 * Display the search all input box
+			 *
+			 * @see class-search-widget.php
+			 */
 
 $gravityview_view = GravityView_View::getInstance();
 $view_id = $gravityview_view->getViewId();

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

Spacing +8 added lines, -8 removed lines

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

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

Spacing +3 added lines, -3 removed lines

@@ -12,8 +12,8 @@
 ?>
 
 <div class="gv-search-box">
-	<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" class="gv-check-radio">
-		<input type="checkbox" name="<?php echo esc_attr( $search_field['name'] ); ?>" value="1" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" <?php checked( '1', $search_field['value'], true ); ?>>
-			<?php if( ! gv_empty( $search_field['label'], false ) ) { echo esc_html(  $search_field['label'] ); } ?>
+	<label for="search-box-<?php echo esc_attr($search_field['name']); ?>" class="gv-check-radio">
+		<input type="checkbox" name="<?php echo esc_attr($search_field['name']); ?>" value="1" id="search-box-<?php echo esc_attr($search_field['name']); ?>" <?php checked('1', $search_field['value'], true); ?>>
+			<?php if (!gv_empty($search_field['label'], false)) { echo esc_html($search_field['label']); } ?>
 	</label>
 </div>
\ No newline at end of file

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

Spacing +9 added lines, -9 removed lines

@@ -13,7 +13,7 @@ 
 
 ?>
 
-<form class="gv-widget-search <?php echo GravityView_Widget_Search::get_search_class(); ?>" method="get" action="<?php echo esc_url( GravityView_Widget_Search::get_search_form_action() ); ?>">
+<form class="gv-widget-search <?php echo GravityView_Widget_Search::get_search_class(); ?>" method="get" action="<?php echo esc_url(GravityView_Widget_Search::get_search_form_action()); ?>">
 
 	<?php
 
@@ -21,14 +21,14 @@ 
 	 * @action `gravityview_search_widget_fields_before` Inside the `<form>` tag of the GravityView search form, before inputs are rendered
 	 * @param GravityView_Widget_Search $this GravityView Widget instance
 	 */
-	do_action( 'gravityview_search_widget_fields_before', $this );
+	do_action('gravityview_search_widget_fields_before', $this);
 
-	foreach( $this->search_fields as $search_field ) {
+	foreach ($this->search_fields as $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;
 		}
 	}
@@ -37,9 +37,9 @@ 
 	 * @action `gravityview_search_widget_fields_after` Inside the `<form>` tag of the GravityView search form, after inputs are rendered
 	 * @param GravityView_Widget_Search $this GravityView Widget instance
 	 */
-	do_action( 'gravityview_search_widget_fields_after', $this );
+	do_action('gravityview_search_widget_fields_after', $this);
 
-	if( $has_inputs ) { ?>
+	if ($has_inputs) { ?>
 		<div class="gv-search-box gv-search-box-submit">
 			<?php
 
@@ -47,8 +47,8 @@ 
 			GravityView_Widget_Search::the_clear_search_button();
 
 			?>
-			<input type="hidden" name="mode" value="<?php echo esc_attr( $gravityview_view->search_mode ); ?>" />
-			<input type="submit" class="button gv-search-button" id="gv_search_button_<?php echo $view_id; ?>" value="<?php esc_attr_e( 'Search', 'gravityview' ); ?>" />
+			<input type="hidden" name="mode" value="<?php echo esc_attr($gravityview_view->search_mode); ?>" />
+			<input type="submit" class="button gv-search-button" id="gv_search_button_<?php echo $view_id; ?>" value="<?php esc_attr_e('Search', 'gravityview'); ?>" />
 		</div>
 	<?php } ?>
 </form>

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Display the Search widget
- *
- * @see class-search-widget.php
- */
+			 * Display the Search widget
+			 *
+			 * @see class-search-widget.php
+			 */
 
 $gravityview_view = GravityView_View::getInstance();
 

includes/wordpress-widgets/class-gravityview-search-wp-widget.php

Spacing +51 added lines, -51 removed lines

@@ -11,75 +11,75 @@ 
 
 		$widget_ops = array(
 			'classname' => 'widget_gravityview_search',
-			'description' => __( 'A search form for a specific GravityView.', 'gravityview')
+			'description' => __('A search form for a specific GravityView.', 'gravityview')
 		);
 
 		$widget_display = array(
 			'width' => 650
 		);
 
-		parent::__construct( 'gravityview_search', __( 'GravityView Search', 'gravityview' ), $widget_ops, $widget_display );
+		parent::__construct('gravityview_search', __('GravityView Search', 'gravityview'), $widget_ops, $widget_display);
 
 		$this->load_required_files();
 
 		$gravityview_widget = GravityView_Widget_Search::getInstance();
 
 		// frontend - filter entries
-		add_filter( 'gravityview_fe_search_criteria', array( $gravityview_widget, 'filter_entries' ), 10, 1 );
+		add_filter('gravityview_fe_search_criteria', array($gravityview_widget, 'filter_entries'), 10, 1);
 
 		// frontend - add template path
-		add_filter( 'gravityview_template_paths', array( $gravityview_widget, 'add_template_path' ) );
+		add_filter('gravityview_template_paths', array($gravityview_widget, 'add_template_path'));
 
-		unset( $gravityview_widget );
+		unset($gravityview_widget);
 	}
 
 	private function load_required_files() {
-		if( !class_exists( 'GravityView_Widget_Search' ) ) {
+		if (!class_exists('GravityView_Widget_Search')) {
 			gravityview_register_gravityview_widgets();
 		}
 	}
 
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 
 		// Don't show unless a View ID has been set.
-		if( empty( $instance['view_id'] ) ) {
+		if (empty($instance['view_id'])) {
 
-			do_action('gravityview_log_debug', sprintf( '%s[widget]: No View ID has been defined. Not showing the widget.', get_class($this)), $instance );
+			do_action('gravityview_log_debug', sprintf('%s[widget]: No View ID has been defined. Not showing the widget.', get_class($this)), $instance);
 
 			return;
 		}
 
 		/** This filter is documented in wp-includes/default-widgets.php */
-		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
+		$title = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base);
 
 		echo $args['before_widget'];
 
-		if ( $title ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+		if ($title) {
+			echo $args['before_title'].$title.$args['after_title'];
 		}
 
 		// @todo Add to the widget configuration form
-		$instance['search_layout'] = apply_filters( 'gravityview/widget/search/layout', 'vertical', $instance );
+		$instance['search_layout'] = apply_filters('gravityview/widget/search/layout', 'vertical', $instance);
 
 		$instance['context'] = 'wp_widget';
 
 		// form
-		$instance['form_id'] = GVCommon::get_meta_form_id( $instance['view_id'] );
-		$instance['form'] = GVCommon::get_form( $instance['form_id'] );
+		$instance['form_id'] = GVCommon::get_meta_form_id($instance['view_id']);
+		$instance['form'] = GVCommon::get_form($instance['form_id']);
 
 		// We don't want to overwrite existing context, etc.
 		$previous_view = GravityView_View::getInstance();
 
 		/** @hack */
-		new GravityView_View( $instance );
+		new GravityView_View($instance);
 
-		GravityView_Widget_Search::getInstance()->render_frontend( $instance );
+		GravityView_Widget_Search::getInstance()->render_frontend($instance);
 
 		/**
 		 * Restore previous View context
 		 * @hack
 		 */
-		new GravityView_View( $previous_view );
+		new GravityView_View($previous_view);
 
 		echo $args['after_widget'];
 	}
@@ -87,11 +87,11 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 
 		$instance = $old_instance;
 
-		if( $this->is_preview() ) {
+		if ($this->is_preview()) {
 			//Oh! Sorry but still not fully compatible with customizer
 			return $instance;
 		}
@@ -104,21 +104,21 @@ 
 			'search_clear' => 0
 		);
 
-		$new_instance = wp_parse_args( (array) $new_instance, $defaults );
+		$new_instance = wp_parse_args((array)$new_instance, $defaults);
 
-		$instance['title'] = strip_tags( $new_instance['title'] );
-		$instance['view_id'] = absint( $new_instance['view_id'] );
+		$instance['title'] = strip_tags($new_instance['title']);
+		$instance['view_id'] = absint($new_instance['view_id']);
 		$instance['search_fields'] = $new_instance['search_fields'];
 		$instance['post_id'] = $new_instance['post_id'];
 		$instance['search_clear'] = $new_instance['search_clear'];
 
-		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $new_instance['post_id'], $instance['view_id'] );
+		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id($new_instance['post_id'], $instance['view_id']);
 
 		//check if post_id is a valid post with embedded View
-		$instance['error_post_id'] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
+		$instance['error_post_id'] = is_wp_error($is_valid_embed_id) ? $is_valid_embed_id->get_error_message() : NULL;
 
 		// Share that the widget isn't brand new
-		$instance['updated']  = 1;
+		$instance['updated'] = 1;
 
 		return $instance;
 	}
@@ -126,14 +126,14 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 
 		// @todo Make compatible with Customizer
-		if( $this->is_preview() ) {
+		if ($this->is_preview()) {
 
-			$warning = sprintf( esc_html__( 'This widget is not configurable from this screen. Please configure it on the %sWidgets page%s.', 'gravityview' ), '<a href="'.admin_url('widgets.php').'">', '</a>' );
+			$warning = sprintf(esc_html__('This widget is not configurable from this screen. Please configure it on the %sWidgets page%s.', 'gravityview'), '<a href="'.admin_url('widgets.php').'">', '</a>');
 
-			echo wpautop( GravityView_Admin::get_floaty() . $warning );
+			echo wpautop(GravityView_Admin::get_floaty().$warning);
 
 			return;
 		}
@@ -146,7 +146,7 @@ 
 			'search_clear' => 0
 		);
 
-		$instance = wp_parse_args( (array) $instance, $defaults );
+		$instance = wp_parse_args((array)$instance, $defaults);
 
 		$title    = $instance['title'];
 		$view_id  = $instance['view_id'];
@@ -157,7 +157,7 @@ 
 		$views = GVCommon::get_all_views();
 
 		// If there are no views set up yet, we get outta here.
-		if( empty( $views ) ) { ?>
+		if (empty($views)) { ?>
 			<div id="select_gravityview_view">
 				<div class="wrap"><?php echo GravityView_Post_Types::no_views_text(); ?></div>
 			</div>
@@ -165,31 +165,31 @@ 
 		}
 		?>
 
-		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'gravityview'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p>
+		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'gravityview'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></label></p>
 
 		<?php
 		/**
 		 * Display errors generated for invalid embed IDs
 		 * @see GravityView_View_Data::is_valid_embed_id
 		 */
-		if( isset( $instance['updated'] ) && empty( $instance['view_id'] ) ) {
+		if (isset($instance['updated']) && empty($instance['view_id'])) {
 			?>
 			<div class="error inline hide-on-view-change">
 				<p><?php esc_html_e('Please select a View to search.', 'gravityview'); ?></p>
 			</div>
 			<?php
-			unset ( $error );
+			unset ($error);
 		}
 		?>
 
 		<p>
-			<label for="gravityview_view_id"><?php _e( 'View:', 'gravityview' ); ?></label>
+			<label for="gravityview_view_id"><?php _e('View:', 'gravityview'); ?></label>
 			<select id="gravityview_view_id" name="<?php echo $this->get_field_name('view_id'); ?>" class="widefat">
-				<option value=""><?php esc_html_e( '&mdash; Select a View &mdash;', 'gravityview' ); ?></option>
+				<option value=""><?php esc_html_e('&mdash; Select a View &mdash;', 'gravityview'); ?></option>
 				<?php
-				foreach( $views as $view_option ) {
-					$title = empty( $view_option->post_title ) ? __('(no title)', 'gravityview') : $view_option->post_title;
-					echo '<option value="'. $view_option->ID .'" ' . selected( esc_attr( $view_id ), $view_option->ID, false ) . '>'. esc_html( sprintf('%s #%d', $title, $view_option->ID ) ) .'</option>';
+				foreach ($views as $view_option) {
+					$title = empty($view_option->post_title) ? __('(no title)', 'gravityview') : $view_option->post_title;
+					echo '<option value="'.$view_option->ID.'" '.selected(esc_attr($view_id), $view_option->ID, false).'>'.esc_html(sprintf('%s #%d', $title, $view_option->ID)).'</option>';
 				}
 				?>
 			</select>
@@ -201,38 +201,38 @@ 
 		 * Display errors generated for invalid embed IDs
 		 * @see GravityView_View_Data::is_valid_embed_id
 		 */
-		if( !empty( $instance['error_post_id'] ) ) {
+		if (!empty($instance['error_post_id'])) {
 			?>
 			<div class="error inline">
 				<p><?php echo $instance['error_post_id']; ?></p>
 			</div>
 			<?php
-			unset ( $error );
+			unset ($error);
 		}
 		?>
 
 		<p>
-			<label for="<?php echo $this->get_field_id('post_id'); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
-			<input class="code" size="3" id="<?php echo $this->get_field_id('post_id'); ?>" name="<?php echo $this->get_field_name('post_id'); ?>" type="text" value="<?php echo esc_attr( $post_id ); ?>" />
+			<label for="<?php echo $this->get_field_id('post_id'); ?>"><?php esc_html_e('If Embedded, Page ID:', 'gravityview'); ?></label>
+			<input class="code" size="3" id="<?php echo $this->get_field_id('post_id'); ?>" name="<?php echo $this->get_field_name('post_id'); ?>" type="text" value="<?php echo esc_attr($post_id); ?>" />
 			<span class="howto"><?php
-				esc_html_e('To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
-				echo ' '.gravityview_get_link('http://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview' ), 'target=_blank' );
+				esc_html_e('To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview');
+				echo ' '.gravityview_get_link('http://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview'), 'target=_blank');
 				?></span>
 		</p>
 
 		<p>
-			<label for="<?php echo $this->get_field_id('search_clear'); ?>"><?php esc_html_e( 'Show Clear button', 'gravityview' ); ?>:</label>
+			<label for="<?php echo $this->get_field_id('search_clear'); ?>"><?php esc_html_e('Show Clear button', 'gravityview'); ?>:</label>
 			<input name="<?php echo $this->get_field_name('search_clear'); ?>" type="hidden" value="0">
-			<input id="<?php echo $this->get_field_id('search_clear'); ?>" name="<?php echo $this->get_field_name('search_clear'); ?>" type="checkbox" class="checkbox" value="1" <?php checked( $search_clear, 1, true ); ?>>
+			<input id="<?php echo $this->get_field_id('search_clear'); ?>" name="<?php echo $this->get_field_name('search_clear'); ?>" type="checkbox" class="checkbox" value="1" <?php checked($search_clear, 1, true); ?>>
 		</p>
 
 		<hr />
 
 		<?php // @todo: move style to CSS ?>
 		<div style="margin-bottom: 1em;">
-			<label class="screen-reader-text" for="<?php echo $this->get_field_id('search_fields'); ?>"><?php _e( 'Searchable fields:', 'gravityview' ); ?></label>
+			<label class="screen-reader-text" for="<?php echo $this->get_field_id('search_fields'); ?>"><?php _e('Searchable fields:', 'gravityview'); ?></label>
 			<div class="gv-widget-search-fields" title="<?php esc_html_e('Search Fields', 'gravityview'); ?>">
-				<input id="<?php echo $this->get_field_id('search_fields'); ?>" name="<?php echo $this->get_field_name('search_fields'); ?>" type="hidden" value="<?php echo esc_attr( $search_fields ); ?>" class="gv-search-fields-value">
+				<input id="<?php echo $this->get_field_id('search_fields'); ?>" name="<?php echo $this->get_field_name('search_fields'); ?>" type="hidden" value="<?php echo esc_attr($search_fields); ?>" class="gv-search-fields-value">
 			</div>
 
 		</div>
@@ -240,7 +240,7 @@ 
 		<script>
 			// When the widget is saved or added, refresh the Merge Tags (here for backward compatibility)
 			// WordPress 3.9 added widget-added and widget-updated actions
-			jQuery('#<?php echo $this->get_field_id( 'view_id' ); ?>').trigger( 'change' );
+			jQuery('#<?php echo $this->get_field_id('view_id'); ?>').trigger( 'change' );
 		</script>
 	<?php
 	}