Completed
Push — develop ( 2f2ee7...c0a108 )
by Gennady
15:45
created
includes/widgets/search-widget/templates/deprecated/widget-search.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 		/**
32 32
 		 * @action `gravityview_search_widget_field_before` Before each search input is rendered (other than the submit button)
33 33
 		 * @param GravityView_Widget_Search $this GravityView Widget instance
34
-         * @param array $search_field
34
+		 * @param array $search_field
35 35
 		 */
36 36
 		do_action( 'gravityview_search_widget_field_before', $this, $search_field );
37 37
 
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 		/**
47 47
 		 * @action `gravityview_search_widget_field_after` After each search input is rendered (other than the submit button)
48 48
 		 * @param GravityView_Widget_Search $this GravityView Widget instance
49
-         * @param array $search_field
49
+		 * @param array $search_field
50 50
 		 */
51 51
 		do_action( 'gravityview_search_widget_field_after', $this, $search_field );
52 52
 	}
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 	do_action( 'gravityview_search_widget_fields_after', $this );
59 59
 
60 60
 	if( $has_inputs ) {
61
-	    $this->render( 'search-field', 'submit', false );
62
-    }
61
+		$this->render( 'search-field', 'submit', false );
62
+	}
63 63
 ?>
64 64
 </form>
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 	 */
27 27
 	do_action( 'gravityview_search_widget_fields_before', $this );
28 28
 
29
-	foreach( $this->search_fields as $search_field ) {
29
+	foreach ( $this->search_fields as $search_field ) {
30 30
 
31 31
 		/**
32 32
 		 * @action `gravityview_search_widget_field_before` Before each search input is rendered (other than the submit button)
@@ -36,10 +36,10 @@  discard block
 block discarded – undo
36 36
 		do_action( 'gravityview_search_widget_field_before', $this, $search_field );
37 37
 
38 38
 		$gravityview_view->search_field = $search_field;
39
-		$this->render( 'search-field', $search_field['input'], false );
39
+		$this->render( 'search-field', $search_field[ 'input' ], false );
40 40
 
41 41
 		// show/hide the search button if there are input type fields
42
-		if( !$has_inputs &&  $search_field['input'] != 'link' ) {
42
+		if ( ! $has_inputs && $search_field[ 'input' ] != 'link' ) {
43 43
 			$has_inputs = true;
44 44
 		}
45 45
 
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 	 */
58 58
 	do_action( 'gravityview_search_widget_fields_after', $this );
59 59
 
60
-	if( $has_inputs ) {
60
+	if ( $has_inputs ) {
61 61
 	    $this->render( 'search-field', 'submit', false );
62 62
     }
63 63
 ?>
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/deprecated/search-field-link.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -41,22 +41,22 @@
 block discarded – undo
41 41
 
42 42
         <?php
43 43
 
44
-        $search_value = \GV\Utils::_GET( $search_field['name'] );
44
+		$search_value = \GV\Utils::_GET( $search_field['name'] );
45 45
 
46
-        foreach ( $search_field['choices'] as $k => $choice ) {
46
+		foreach ( $search_field['choices'] as $k => $choice ) {
47 47
 
48
-            if ( 0 != $k ) {
49
-                echo esc_html( $links_sep );
50
-            }
48
+			if ( 0 != $k ) {
49
+				echo esc_html( $links_sep );
50
+			}
51 51
 
52
-            $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
52
+			$active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
53 53
 
54
-            if ( $active ) {
55
-                $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
56
-            } else {
57
-                $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
58
-            }
59
-            ?>
54
+			if ( $active ) {
55
+				$link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
56
+			} else {
57
+				$link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
58
+			}
59
+			?>
60 60
 
61 61
 			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
62 62
 
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -13,12 +13,12 @@  discard block
 block discarded – undo
13 13
 $base_url = GravityView_Widget_Search::get_search_form_action();
14 14
 
15 15
 // Make sure that there are choices to display
16
-if ( empty( $search_field['choices'] ) ) {
16
+if ( empty( $search_field[ 'choices' ] ) ) {
17 17
 	gravityview()->log->debug( 'search-field-link.php - No choices for field' );
18 18
 	return;
19 19
 }
20 20
 
21
-$links_label = empty( $search_field['label'] ) ? __( 'Show only:', 'gravityview' ) : $search_field['label'];
21
+$links_label = empty( $search_field[ 'label' ] ) ? __( 'Show only:', 'gravityview' ) : $search_field[ 'label' ];
22 22
 
23 23
 /**
24 24
  * @filter `gravityview/extension/search/links_label` Change the label for the "Link" search bar input type
@@ -41,24 +41,24 @@  discard block
 block discarded – undo
41 41
 
42 42
         <?php
43 43
 
44
-        $search_value = \GV\Utils::_GET( $search_field['name'] );
44
+        $search_value = \GV\Utils::_GET( $search_field[ 'name' ] );
45 45
 
46
-        foreach ( $search_field['choices'] as $k => $choice ) {
46
+        foreach ( $search_field[ 'choices' ] as $k => $choice ) {
47 47
 
48 48
             if ( 0 != $k ) {
49 49
                 echo esc_html( $links_sep );
50 50
             }
51 51
 
52
-            $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
52
+            $active = ( '' !== $search_value && in_array( $search_value, array( $choice[ 'text' ], $choice[ 'value' ] ) ) ) ? ' class="active"' : false;
53 53
 
54 54
             if ( $active ) {
55
-                $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
55
+                $link = remove_query_arg( array( 'pagenum', $search_field[ 'name' ] ), $base_url );
56 56
             } else {
57
-                $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
57
+                $link = add_query_arg( array( $search_field[ 'name' ] => urlencode( $choice[ 'value' ] ) ), remove_query_arg( array( 'pagenum' ), $base_url ) );
58 58
             }
59 59
             ?>
60 60
 
61
-			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
61
+			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice[ 'text' ] ); ?></a>
62 62
 
63 63
 		<?php } ?>
64 64
 	</p>
Please login to merge, or discard this patch.
widgets/search-widget/templates/deprecated/search-field-date_range.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -7,17 +7,17 @@
 block discarded – undo
7 7
 
8 8
 $gravityview_view = GravityView_View::getInstance();
9 9
 $view_id = $gravityview_view->getViewId();
10
-$value = $gravityview_view->search_field['value'];
11
-$label = $gravityview_view->search_field['label'];
12
-$name = $gravityview_view->search_field['name'];
10
+$value = $gravityview_view->search_field[ 'value' ];
11
+$label = $gravityview_view->search_field[ 'label' ];
12
+$name = $gravityview_view->search_field[ 'name' ];
13 13
 ?>
14 14
 
15 15
 <div class="gv-search-box gv-search-date gv-search-date-range">
16
-	<?php if( ! gv_empty( $label, false, false ) ) { ?>
17
-	<label for="search-box-<?php echo esc_attr( $name ).'-start'; ?>"><?php echo esc_html( $label ); ?></label>
16
+	<?php if ( ! gv_empty( $label, false, false ) ) { ?>
17
+	<label for="search-box-<?php echo esc_attr( $name ) . '-start'; ?>"><?php echo esc_html( $label ); ?></label>
18 18
 	<?php } ?>
19 19
 	<p>
20
-		<input name="<?php echo esc_attr( $name ).'[start]'; ?>" id="search-box-<?php echo esc_attr( $name ).'-start'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('Start date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value['start'] ); ?>">
21
-		<input name="<?php echo esc_attr( $name ).'[end]'; ?>" id="search-box-<?php echo esc_attr( $name ).'-end'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('End date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value['end'] ); ?>">
20
+		<input name="<?php echo esc_attr( $name ) . '[start]'; ?>" id="search-box-<?php echo esc_attr( $name ) . '-start'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'Start date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value[ 'start' ] ); ?>">
21
+		<input name="<?php echo esc_attr( $name ) . '[end]'; ?>" id="search-box-<?php echo esc_attr( $name ) . '-end'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'End date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value[ 'end' ] ); ?>">
22 22
 	</p>
23 23
 </div>
24 24
\ No newline at end of file
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/deprecated/search-field-radio.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -10,22 +10,22 @@
 block discarded – undo
10 10
 $search_field = $gravityview_view->search_field;
11 11
 
12 12
 // Make sure that there are choices to display
13
-if( empty( $search_field['choices'] ) ) {
13
+if ( empty( $search_field[ 'choices' ] ) ) {
14 14
 	gravityview()->log->debug( 'search-field-radio.php - No choices for field' );
15 15
 	return;
16 16
 }
17 17
 
18 18
 ?>
19 19
 <div class="gv-search-box gv-search-field-radio">
20
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
21
-	<label for=search-box-<?php echo esc_attr( $search_field['name'] ); ?>><?php echo esc_html( $search_field['label'] ); ?></label>
20
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
21
+	<label for=search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
22 22
 	<?php } ?>
23 23
 	<p>
24
-	<?php foreach( $search_field['choices'] as $choice ) { ?>
24
+	<?php foreach ( $search_field[ 'choices' ] as $choice ) { ?>
25 25
 
26
-		<label for="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" class="gv-check-radio">
27
-			<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 ); ?>>
28
-			<?php echo esc_html( $choice['text'] ); ?>
26
+		<label for="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" class="gv-check-radio">
27
+			<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 ); ?>>
28
+			<?php echo esc_html( $choice[ 'text' ] ); ?>
29 29
 		</label>
30 30
 
31 31
 	<?php } ?>
Please login to merge, or discard this patch.
widgets/search-widget/templates/deprecated/search-field-entry_id.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,13 +7,13 @@
 block discarded – undo
7 7
 
8 8
 $gravityview_view = GravityView_View::getInstance();
9 9
 $view_id = $gravityview_view->getViewId();
10
-$value = $gravityview_view->search_field['value'];
11
-$label = $gravityview_view->search_field['label'];
10
+$value = $gravityview_view->search_field[ 'value' ];
11
+$label = $gravityview_view->search_field[ 'label' ];
12 12
 ?>
13 13
 
14 14
 <div class="gv-search-box gv-search-field-entry_id">
15 15
 	<div class="gv-search">
16
-		<?php if( ! gv_empty( $label, false, false ) ) { ?>
16
+		<?php if ( ! gv_empty( $label, false, false ) ) { ?>
17 17
 		<label for="gv_entry_id_<?php echo $view_id; ?>"><?php echo esc_html( $label ); ?></label>
18 18
 		<?php } ?>
19 19
 		<p><input type="text" name="gv_id" id="gv_entry_id_<?php echo $view_id; ?>" value="<?php echo esc_attr( $value ); ?>" /></p>
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/deprecated/search-field-date.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,10 +11,10 @@
 block discarded – undo
11 11
 ?>
12 12
 
13 13
 <div class="gv-search-box gv-search-date">
14
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
15
-	<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
14
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
15
+	<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
16 16
 	<?php } ?>
17 17
 	<p>
18
-		<input type="text" name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $search_field['value'] ); ?>" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" >
18
+		<input type="text" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $search_field[ 'value' ] ); ?>" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" >
19 19
 	</p>
20 20
 </div>
21 21
\ No newline at end of file
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/deprecated/search-field-select.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 $search_field = $gravityview_view->search_field;
11 11
 
12 12
 // Make sure that there are choices to display
13
-if( empty( $search_field['choices'] ) ) {
13
+if ( empty( $search_field[ 'choices' ] ) ) {
14 14
 	gravityview()->log->debug( 'search-field-select.php - No choices for field' );
15 15
 	return;
16 16
 }
@@ -21,19 +21,19 @@  discard block
 block discarded – undo
21 21
  * @param string $default_option Default: `&mdash;` (—)
22 22
  * @param string $field_type Field type: "select" or "multiselect"
23 23
  */
24
-$default_option = apply_filters('gravityview/extension/search/select_default', '&mdash;', 'select' );
24
+$default_option = apply_filters( 'gravityview/extension/search/select_default', '&mdash;', 'select' );
25 25
 
26 26
 ?>
27 27
 <div class="gv-search-box gv-search-field-select">
28
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
29
-		<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
28
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
29
+		<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
30 30
 	<?php } ?>
31 31
 	<p>
32
-		<select name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>">
33
-			<option value="" <?php gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option>
32
+		<select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>">
33
+			<option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option>
34 34
 			<?php
35
-			foreach( $search_field['choices'] as $choice ) : ?>
36
-				<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>
35
+			foreach ( $search_field[ 'choices' ] as $choice ) : ?>
36
+				<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>
37 37
 			<?php endforeach; ?>
38 38
 		</select>
39 39
 	</p>
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/field-single_checkbox.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,6 +13,6 @@
 block discarded – undo
13 13
 <div class="gv-search-box gv-search-field-single_checkbox">
14 14
 	<label for="search-box-<?php echo esc_attr( $search_field->name ); ?>" class="gv-check-radio">
15 15
 		<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 ); ?>>
16
-			<?php if( ! gv_empty( $search_field->label, false, false ) ) { echo esc_html(  $search_field->label ); } ?>
16
+			<?php if ( ! gv_empty( $search_field->label, false, false ) ) { echo esc_html( $search_field->label ); } ?>
17 17
 	</label>
18 18
 </div>
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/field-select.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,19 +24,19 @@
 block discarded – undo
24 24
  * @param \GV\Template_Context $gravityview The template context.
25 25
  * @param object               $search_field The current field.
26 26
  */
27
-$default_option = apply_filters('gravityview/extension/search/select_default', '&mdash;', 'select', $widget, $gravityview, $search_field );
27
+$default_option = apply_filters( 'gravityview/extension/search/select_default', '&mdash;', 'select', $widget, $gravityview, $search_field );
28 28
 
29 29
 ?>
30 30
 <div class="gv-search-box gv-search-field-select">
31
-	<?php if( ! gv_empty( $search_field->label, false, false ) ) { ?>
31
+	<?php if ( ! gv_empty( $search_field->label, false, false ) ) { ?>
32 32
 		<label for="search-box-<?php echo esc_attr( $search_field->name ); ?>"><?php echo esc_html( $search_field->label ); ?></label>
33 33
 	<?php } ?>
34 34
 	<p>
35 35
 		<select name="<?php echo esc_attr( $search_field->name ); ?>" id="search-box-<?php echo esc_attr( $search_field->name ); ?>">
36 36
 			<option value="" <?php gv_selected( '', $search_field->value, true ); ?>><?php echo esc_html( $default_option ); ?></option>
37 37
 			<?php
38
-			foreach( $search_field->choices as $choice ) : ?>
39
-				<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>
38
+			foreach ( $search_field->choices as $choice ) : ?>
39
+				<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>
40 40
 			<?php endforeach; ?>
41 41
 		</select>
42 42
 	</p>
Please login to merge, or discard this patch.