@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | $widget_ops = array( |
13 | 13 | 'classname' => 'widget_gravityview_search', |
14 | - 'description' => __( 'A search form for a specific GravityView.', 'gravityview') |
|
14 | + 'description' => __( 'A search form for a specific GravityView.', 'gravityview' ) |
|
15 | 15 | ); |
16 | 16 | |
17 | 17 | $widget_display = array( |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | } |
35 | 35 | |
36 | 36 | private function load_required_files() { |
37 | - if( !class_exists( 'GravityView_Widget_Search' ) ) { |
|
37 | + if ( ! class_exists( 'GravityView_Widget_Search' ) ) { |
|
38 | 38 | gravityview_register_gravityview_widgets(); |
39 | 39 | } |
40 | 40 | } |
@@ -53,30 +53,30 @@ discard block |
||
53 | 53 | public function widget( $args, $instance ) { |
54 | 54 | |
55 | 55 | // Don't show unless a View ID has been set. |
56 | - if( empty( $instance['view_id'] ) ) { |
|
56 | + if ( empty( $instance[ 'view_id' ] ) ) { |
|
57 | 57 | |
58 | - do_action('gravityview_log_debug', sprintf( '%s[widget]: No View ID has been defined. Not showing the widget.', get_class($this)), $instance ); |
|
58 | + do_action( 'gravityview_log_debug', sprintf( '%s[widget]: No View ID has been defined. Not showing the widget.', get_class( $this ) ), $instance ); |
|
59 | 59 | |
60 | 60 | return; |
61 | 61 | } |
62 | 62 | |
63 | 63 | /** This filter is documented in wp-includes/default-widgets.php */ |
64 | - $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base ); |
|
64 | + $title = apply_filters( 'widget_title', empty( $instance[ 'title' ] ) ? '' : $instance[ 'title' ], $instance, $this->id_base ); |
|
65 | 65 | |
66 | - echo $args['before_widget']; |
|
66 | + echo $args[ 'before_widget' ]; |
|
67 | 67 | |
68 | 68 | if ( $title ) { |
69 | - echo $args['before_title'] . $title . $args['after_title']; |
|
69 | + echo $args[ 'before_title' ] . $title . $args[ 'after_title' ]; |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | // @todo Add to the widget configuration form |
73 | - $instance['search_layout'] = apply_filters( 'gravityview/widget/search/layout', 'vertical', $instance ); |
|
73 | + $instance[ 'search_layout' ] = apply_filters( 'gravityview/widget/search/layout', 'vertical', $instance ); |
|
74 | 74 | |
75 | - $instance['context'] = 'wp_widget'; |
|
75 | + $instance[ 'context' ] = 'wp_widget'; |
|
76 | 76 | |
77 | 77 | // form |
78 | - $instance['form_id'] = GVCommon::get_meta_form_id( $instance['view_id'] ); |
|
79 | - $instance['form'] = GVCommon::get_form( $instance['form_id'] ); |
|
78 | + $instance[ 'form_id' ] = GVCommon::get_meta_form_id( $instance[ 'view_id' ] ); |
|
79 | + $instance[ 'form' ] = GVCommon::get_form( $instance[ 'form_id' ] ); |
|
80 | 80 | |
81 | 81 | // We don't want to overwrite existing context, etc. |
82 | 82 | $previous_view = GravityView_View::getInstance(); |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | */ |
93 | 93 | new GravityView_View( $previous_view ); |
94 | 94 | |
95 | - echo $args['after_widget']; |
|
95 | + echo $args[ 'after_widget' ]; |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
@@ -102,27 +102,27 @@ discard block |
||
102 | 102 | |
103 | 103 | $instance = $old_instance; |
104 | 104 | |
105 | - if( $this->is_preview() ) { |
|
105 | + if ( $this->is_preview() ) { |
|
106 | 106 | //Oh! Sorry but still not fully compatible with customizer |
107 | 107 | return $instance; |
108 | 108 | } |
109 | 109 | |
110 | - $new_instance = wp_parse_args( (array) $new_instance, self::get_defaults() ); |
|
110 | + $new_instance = wp_parse_args( (array)$new_instance, self::get_defaults() ); |
|
111 | 111 | |
112 | - $instance['title'] = strip_tags( $new_instance['title'] ); |
|
113 | - $instance['view_id'] = absint( $new_instance['view_id'] ); |
|
114 | - $instance['search_fields'] = $new_instance['search_fields']; |
|
115 | - $instance['post_id'] = $new_instance['post_id']; |
|
116 | - $instance['search_clear'] = $new_instance['search_clear']; |
|
117 | - $instance['search_mode'] = $new_instance['search_mode']; |
|
112 | + $instance[ 'title' ] = strip_tags( $new_instance[ 'title' ] ); |
|
113 | + $instance[ 'view_id' ] = absint( $new_instance[ 'view_id' ] ); |
|
114 | + $instance[ 'search_fields' ] = $new_instance[ 'search_fields' ]; |
|
115 | + $instance[ 'post_id' ] = $new_instance[ 'post_id' ]; |
|
116 | + $instance[ 'search_clear' ] = $new_instance[ 'search_clear' ]; |
|
117 | + $instance[ 'search_mode' ] = $new_instance[ 'search_mode' ]; |
|
118 | 118 | |
119 | - $is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $new_instance['post_id'], $instance['view_id'], true ); |
|
119 | + $is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $new_instance[ 'post_id' ], $instance[ 'view_id' ], true ); |
|
120 | 120 | |
121 | 121 | //check if post_id is a valid post with embedded View |
122 | - $instance['error_post_id'] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL; |
|
122 | + $instance[ 'error_post_id' ] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL; |
|
123 | 123 | |
124 | 124 | // Share that the widget isn't brand new |
125 | - $instance['updated'] = 1; |
|
125 | + $instance[ 'updated' ] = 1; |
|
126 | 126 | |
127 | 127 | return $instance; |
128 | 128 | } |
@@ -133,28 +133,28 @@ discard block |
||
133 | 133 | public function form( $instance ) { |
134 | 134 | |
135 | 135 | // @todo Make compatible with Customizer |
136 | - if( $this->is_preview() ) { |
|
136 | + if ( $this->is_preview() ) { |
|
137 | 137 | |
138 | - $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>' ); |
|
138 | + $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>' ); |
|
139 | 139 | |
140 | 140 | echo wpautop( GravityView_Admin::get_floaty() . $warning ); |
141 | 141 | |
142 | 142 | return; |
143 | 143 | } |
144 | 144 | |
145 | - $instance = wp_parse_args( (array) $instance, self::get_defaults() ); |
|
145 | + $instance = wp_parse_args( (array)$instance, self::get_defaults() ); |
|
146 | 146 | |
147 | - $title = $instance['title']; |
|
148 | - $view_id = $instance['view_id']; |
|
149 | - $post_id = $instance['post_id']; |
|
150 | - $search_fields = $instance['search_fields']; |
|
151 | - $search_clear = $instance['search_clear']; |
|
152 | - $search_mode = $instance['search_mode']; |
|
147 | + $title = $instance[ 'title' ]; |
|
148 | + $view_id = $instance[ 'view_id' ]; |
|
149 | + $post_id = $instance[ 'post_id' ]; |
|
150 | + $search_fields = $instance[ 'search_fields' ]; |
|
151 | + $search_clear = $instance[ 'search_clear' ]; |
|
152 | + $search_mode = $instance[ 'search_mode' ]; |
|
153 | 153 | |
154 | 154 | $views = GVCommon::get_all_views(); |
155 | 155 | |
156 | 156 | // If there are no views set up yet, we get outta here. |
157 | - if( empty( $views ) ) { ?> |
|
157 | + if ( empty( $views ) ) { ?> |
|
158 | 158 | <div id="select_gravityview_view"> |
159 | 159 | <div class="wrap"><?php echo GravityView_Admin::no_views_text(); ?></div> |
160 | 160 | </div> |
@@ -162,17 +162,17 @@ discard block |
||
162 | 162 | } |
163 | 163 | ?> |
164 | 164 | |
165 | - <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> |
|
165 | + <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> |
|
166 | 166 | |
167 | 167 | <?php |
168 | 168 | /** |
169 | 169 | * Display errors generated for invalid embed IDs |
170 | 170 | * @see GravityView_View_Data::is_valid_embed_id |
171 | 171 | */ |
172 | - if( isset( $instance['updated'] ) && empty( $instance['view_id'] ) ) { |
|
172 | + if ( isset( $instance[ 'updated' ] ) && empty( $instance[ 'view_id' ] ) ) { |
|
173 | 173 | ?> |
174 | 174 | <div class="error inline hide-on-view-change"> |
175 | - <p><?php esc_html_e('Please select a View to search.', 'gravityview'); ?></p> |
|
175 | + <p><?php esc_html_e( 'Please select a View to search.', 'gravityview' ); ?></p> |
|
176 | 176 | </div> |
177 | 177 | <?php |
178 | 178 | unset ( $error ); |
@@ -181,12 +181,12 @@ discard block |
||
181 | 181 | |
182 | 182 | <p> |
183 | 183 | <label for="gravityview_view_id"><?php _e( 'View:', 'gravityview' ); ?></label> |
184 | - <select id="gravityview_view_id" name="<?php echo $this->get_field_name('view_id'); ?>" class="widefat"> |
|
184 | + <select id="gravityview_view_id" name="<?php echo $this->get_field_name( 'view_id' ); ?>" class="widefat"> |
|
185 | 185 | <option value=""><?php esc_html_e( '— Select a View —', 'gravityview' ); ?></option> |
186 | 186 | <?php |
187 | - foreach( $views as $view_option ) { |
|
188 | - $title = empty( $view_option->post_title ) ? __('(no title)', 'gravityview') : $view_option->post_title; |
|
189 | - 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>'; |
|
187 | + foreach ( $views as $view_option ) { |
|
188 | + $title = empty( $view_option->post_title ) ? __( '(no title)', 'gravityview' ) : $view_option->post_title; |
|
189 | + 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>'; |
|
190 | 190 | } |
191 | 191 | ?> |
192 | 192 | </select> |
@@ -198,10 +198,10 @@ discard block |
||
198 | 198 | * Display errors generated for invalid embed IDs |
199 | 199 | * @see GravityView_View_Data::is_valid_embed_id |
200 | 200 | */ |
201 | - if( !empty( $instance['error_post_id'] ) ) { |
|
201 | + if ( ! empty( $instance[ 'error_post_id' ] ) ) { |
|
202 | 202 | ?> |
203 | 203 | <div class="error inline"> |
204 | - <p><?php echo $instance['error_post_id']; ?></p> |
|
204 | + <p><?php echo $instance[ 'error_post_id' ]; ?></p> |
|
205 | 205 | </div> |
206 | 206 | <?php |
207 | 207 | unset ( $error ); |
@@ -209,40 +209,40 @@ discard block |
||
209 | 209 | ?> |
210 | 210 | |
211 | 211 | <p> |
212 | - <label for="<?php echo $this->get_field_id('post_id'); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label> |
|
213 | - <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 ); ?>" /> |
|
212 | + <label for="<?php echo $this->get_field_id( 'post_id' ); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label> |
|
213 | + <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 ); ?>" /> |
|
214 | 214 | <span class="howto"><?php |
215 | - 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' ); |
|
216 | - echo ' '.gravityview_get_link('http://docs.gravityview.co/article/222-the-search-widget', __('Learn more…', 'gravityview' ), 'target=_blank' ); |
|
215 | + 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' ); |
|
216 | + echo ' ' . gravityview_get_link( 'http://docs.gravityview.co/article/222-the-search-widget', __( 'Learn more…', 'gravityview' ), 'target=_blank' ); |
|
217 | 217 | ?></span> |
218 | 218 | </p> |
219 | 219 | |
220 | 220 | <p> |
221 | - <label for="<?php echo $this->get_field_id('search_clear'); ?>"><?php esc_html_e( 'Show Clear button', 'gravityview' ); ?>:</label> |
|
222 | - <input name="<?php echo $this->get_field_name('search_clear'); ?>" type="hidden" value="0"> |
|
223 | - <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 ); ?>> |
|
221 | + <label for="<?php echo $this->get_field_id( 'search_clear' ); ?>"><?php esc_html_e( 'Show Clear button', 'gravityview' ); ?>:</label> |
|
222 | + <input name="<?php echo $this->get_field_name( 'search_clear' ); ?>" type="hidden" value="0"> |
|
223 | + <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 ); ?>> |
|
224 | 224 | </p> |
225 | 225 | |
226 | 226 | <p> |
227 | 227 | <label><?php esc_html_e( 'Search Mode', 'gravityview' ); ?>:</label> |
228 | - <label for="<?php echo $this->get_field_id('search_mode'); ?>_any"> |
|
229 | - <input id="<?php echo $this->get_field_id('search_mode'); ?>_any" name="<?php echo $this->get_field_name('search_mode'); ?>" type="radio" class="radio" value="any" <?php checked( $search_mode, 'any', true ); ?>> |
|
228 | + <label for="<?php echo $this->get_field_id( 'search_mode' ); ?>_any"> |
|
229 | + <input id="<?php echo $this->get_field_id( 'search_mode' ); ?>_any" name="<?php echo $this->get_field_name( 'search_mode' ); ?>" type="radio" class="radio" value="any" <?php checked( $search_mode, 'any', true ); ?>> |
|
230 | 230 | <?php esc_html_e( 'Match Any Fields', 'gravityview' ); ?> |
231 | 231 | </label> |
232 | - <label for="<?php echo $this->get_field_id('search_mode'); ?>_all"> |
|
233 | - <input id="<?php echo $this->get_field_id('search_mode'); ?>_all" name="<?php echo $this->get_field_name('search_mode'); ?>" type="radio" class="radio" value="all" <?php checked( $search_mode, 'all', true ); ?>> |
|
232 | + <label for="<?php echo $this->get_field_id( 'search_mode' ); ?>_all"> |
|
233 | + <input id="<?php echo $this->get_field_id( 'search_mode' ); ?>_all" name="<?php echo $this->get_field_name( 'search_mode' ); ?>" type="radio" class="radio" value="all" <?php checked( $search_mode, 'all', true ); ?>> |
|
234 | 234 | <?php esc_html_e( 'Match All Fields', 'gravityview' ); ?> |
235 | 235 | </label> |
236 | - <span class="howto"><?php esc_html_e('Should search results match all search fields, or any?', 'gravityview' ); ?></span |
|
236 | + <span class="howto"><?php esc_html_e( 'Should search results match all search fields, or any?', 'gravityview' ); ?></span |
|
237 | 237 | </p> |
238 | 238 | |
239 | 239 | <hr /> |
240 | 240 | |
241 | 241 | <?php // @todo: move style to CSS ?> |
242 | 242 | <div style="margin-bottom: 1em;"> |
243 | - <label class="screen-reader-text" for="<?php echo $this->get_field_id('search_fields'); ?>"><?php _e( 'Searchable fields:', 'gravityview' ); ?></label> |
|
244 | - <div class="gv-widget-search-fields" title="<?php esc_html_e('Search Fields', 'gravityview'); ?>"> |
|
245 | - <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"> |
|
243 | + <label class="screen-reader-text" for="<?php echo $this->get_field_id( 'search_fields' ); ?>"><?php _e( 'Searchable fields:', 'gravityview' ); ?></label> |
|
244 | + <div class="gv-widget-search-fields" title="<?php esc_html_e( 'Search Fields', 'gravityview' ); ?>"> |
|
245 | + <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"> |
|
246 | 246 | </div> |
247 | 247 | |
248 | 248 | </div> |