@@ -29,12 +29,12 @@ |
||
29 | 29 | */ |
30 | 30 | public static function from_configuration( $configuration ) { |
31 | 31 | |
32 | - if ( empty( $configuration['id'] ) || ! is_string( $configuration['id'] ) ) { |
|
32 | + if ( empty( $configuration[ 'id' ] ) || ! is_string( $configuration[ 'id' ] ) ) { |
|
33 | 33 | gravityview()->log->error( 'Invalid configuration[id] supplied.' ); |
34 | 34 | return null; |
35 | 35 | } |
36 | 36 | |
37 | - $field = self::by_id( $configuration['id'] ); |
|
37 | + $field = self::by_id( $configuration[ 'id' ] ); |
|
38 | 38 | |
39 | 39 | $field->update_configuration( $configuration ); |
40 | 40 |
@@ -53,7 +53,6 @@ discard block |
||
53 | 53 | * Columns are able to be added to View layouts, but not separately searched! |
54 | 54 | * |
55 | 55 | * @param array $fields |
56 | - * @param int $form_id |
|
57 | 56 | * |
58 | 57 | * @return array |
59 | 58 | */ |
@@ -133,7 +132,7 @@ discard block |
||
133 | 132 | * |
134 | 133 | * @param GF_Field_List $field Gravity Forms field |
135 | 134 | * @param string|array $field_value Serialized or unserialized array value for the field |
136 | - * @param int|string $column_id The numeric key of the column (0-index) or the label of the column |
|
135 | + * @param integer $column_id The numeric key of the column (0-index) or the label of the column |
|
137 | 136 | * @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` |
138 | 137 | * |
139 | 138 | * @return array|string|null Returns null if the $field_value passed wasn't an array or serialized array |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | public function remove_columns_from_searchable_fields( $fields ) { |
61 | 61 | |
62 | 62 | foreach ( $fields as $key => $field ) { |
63 | - if ( isset( $field['parent'] ) && $field['parent'] instanceof \GF_Field_List ) { |
|
63 | + if ( isset( $field[ 'parent' ] ) && $field[ 'parent' ] instanceof \GF_Field_List ) { |
|
64 | 64 | unset( $fields[ $key ] ); |
65 | 65 | } |
66 | 66 | } |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | // Add the list columns |
87 | 87 | foreach ( $list_fields as $list_field ) { |
88 | 88 | |
89 | - if( empty( $list_field->enableColumns ) ) { |
|
89 | + if ( empty( $list_field->enableColumns ) ) { |
|
90 | 90 | continue; |
91 | 91 | } |
92 | 92 | |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | } |
108 | 108 | |
109 | 109 | // If there are columns, add them under the parent field |
110 | - if( ! empty( $list_columns ) ) { |
|
110 | + if ( ! empty( $list_columns ) ) { |
|
111 | 111 | |
112 | 112 | $index = array_search( $list_field->id, array_keys( $fields ) ) + 1; |
113 | 113 | |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | * Merge the $list_columns into the $fields array at $index |
116 | 116 | * @see https://stackoverflow.com/a/1783125 |
117 | 117 | */ |
118 | - $fields = array_slice( $fields, 0, $index, true) + $list_columns + array_slice( $fields, $index, null, true); |
|
118 | + $fields = array_slice( $fields, 0, $index, true ) + $list_columns + array_slice( $fields, $index, null, true ); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | unset( $list_columns, $index, $input_id ); |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | |
143 | 143 | $list_rows = maybe_unserialize( $field_value ); |
144 | 144 | |
145 | - if( ! is_array( $list_rows ) ) { |
|
145 | + if ( ! is_array( $list_rows ) ) { |
|
146 | 146 | gravityview()->log->error( '$field_value did not unserialize', array( 'data' => $field_value ) ); |
147 | 147 | return null; |
148 | 148 | } |
@@ -152,18 +152,18 @@ discard block |
||
152 | 152 | // Each list row |
153 | 153 | foreach ( $list_rows as $list_row ) { |
154 | 154 | $current_column = 0; |
155 | - foreach ( (array) $list_row as $column_key => $column_value ) { |
|
155 | + foreach ( (array)$list_row as $column_key => $column_value ) { |
|
156 | 156 | |
157 | 157 | // If the label of the column matches $column_id, or the numeric key value matches, add the value |
158 | - if( (string)$column_key === (string)$column_id || ( is_numeric( $column_id ) && (int)$column_id === $current_column ) ) { |
|
159 | - $column_values[] = $column_value; |
|
158 | + if ( (string)$column_key === (string)$column_id || ( is_numeric( $column_id ) && (int)$column_id === $current_column ) ) { |
|
159 | + $column_values[ ] = $column_value; |
|
160 | 160 | } |
161 | 161 | $current_column++; |
162 | 162 | } |
163 | 163 | } |
164 | 164 | |
165 | 165 | // Return the array of values |
166 | - if( 'raw' === $format ) { |
|
166 | + if ( 'raw' === $format ) { |
|
167 | 167 | return $column_values; |
168 | 168 | } |
169 | 169 | // Return the Gravity Forms Field output |
@@ -186,22 +186,22 @@ discard block |
||
186 | 186 | */ |
187 | 187 | public function _filter_field_label( $label, $field, $form, $entry ) { |
188 | 188 | |
189 | - $field_object = RGFormsModel::get_field( $form, $field['id'] ); |
|
189 | + $field_object = RGFormsModel::get_field( $form, $field[ 'id' ] ); |
|
190 | 190 | |
191 | 191 | // Not a list field |
192 | - if( ! $field_object || 'list' !== $field_object->type ) { |
|
192 | + if ( ! $field_object || 'list' !== $field_object->type ) { |
|
193 | 193 | return $label; |
194 | 194 | } |
195 | 195 | |
196 | 196 | // Custom label is defined, so use it |
197 | - if( ! empty( $field['custom_label'] ) ) { |
|
197 | + if ( ! empty( $field[ 'custom_label' ] ) ) { |
|
198 | 198 | return $label; |
199 | 199 | } |
200 | 200 | |
201 | - $column_id = gravityview_get_input_id_from_id( $field['id'] ); |
|
201 | + $column_id = gravityview_get_input_id_from_id( $field[ 'id' ] ); |
|
202 | 202 | |
203 | 203 | // Parent field, not column field |
204 | - if( false === $column_id ) { |
|
204 | + if ( false === $column_id ) { |
|
205 | 205 | return $label; |
206 | 206 | } |
207 | 207 | |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | public static function get_column_label( GF_Field_List $field, $column_id, $backup_label = '' ) { |
223 | 223 | |
224 | 224 | // Doesn't have columns enabled |
225 | - if( ! isset( $field->choices ) || ! $field->enableColumns ) { |
|
225 | + if ( ! isset( $field->choices ) || ! $field->enableColumns ) { |
|
226 | 226 | return $backup_label; |
227 | 227 | } |
228 | 228 |
@@ -603,7 +603,8 @@ discard block |
||
603 | 603 | // Fast-forward 24 hour on the end time |
604 | 604 | $curr_end = date( 'Y-m-d H:i:s', strtotime( $curr_end ) + DAY_IN_SECONDS ); |
605 | 605 | $search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end; |
606 | - if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056 |
|
606 | + if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) { |
|
607 | +// See https://github.com/gravityview/GravityView/issues/1056 |
|
607 | 608 | $search_criteria['end_date'] = date( 'Y-m-d H:i:s', strtotime( $search_criteria['end_date'] ) - 1 ); |
608 | 609 | } |
609 | 610 | } |
@@ -874,7 +875,7 @@ discard block |
||
874 | 875 | 'ymd_dot' => 'Y.m.d', |
875 | 876 | ); |
876 | 877 | |
877 | - if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){ |
|
878 | + if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) { |
|
878 | 879 | $format = $datepicker[ $field->dateFormat ]; |
879 | 880 | } |
880 | 881 |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | /** |
247 | 247 | * Add admin script to the no-conflict scripts whitelist |
248 | 248 | * @param array $allowed Scripts allowed in no-conflict mode |
249 | - * @return array Scripts allowed in no-conflict mode, plus the search widget script |
|
249 | + * @return string[] Scripts allowed in no-conflict mode, plus the search widget script |
|
250 | 250 | */ |
251 | 251 | public function register_no_conflict( $allowed ) { |
252 | 252 | $allowed[] = 'gravityview_searchwidget_admin'; |
@@ -420,6 +420,7 @@ discard block |
||
420 | 420 | * Display hidden fields to add support for sites using Default permalink structure |
421 | 421 | * |
422 | 422 | * @since 1.8 |
423 | + * @param GravityView_Widget_Search $object |
|
423 | 424 | * @return array Search fields, modified if not using permalinks |
424 | 425 | */ |
425 | 426 | public function add_no_permalink_fields( $search_fields, $object, $widget_args = array() ) { |
@@ -729,7 +730,6 @@ discard block |
||
729 | 730 | * Dropin for the legacy flat filters when \GF_Query is available. |
730 | 731 | * |
731 | 732 | * @param \GF_Query $query The current query object reference |
732 | - * @param \GV\View $this The current view object |
|
733 | 733 | * @param \GV\Request $request The request object |
734 | 734 | */ |
735 | 735 | public function gf_query_filter( &$query, $view, $request ) { |
@@ -1428,7 +1428,7 @@ discard block |
||
1428 | 1428 | /** |
1429 | 1429 | * Get the label for a search form field |
1430 | 1430 | * @param array $field Field setting as sent by the GV configuration - has `field`, `input` (input type), and `label` keys |
1431 | - * @param array $form_field Form field data, as fetched by `gravityview_get_field()` |
|
1431 | + * @param GF_Field|null $form_field Form field data, as fetched by `gravityview_get_field()` |
|
1432 | 1432 | * @return string Label for the search form |
1433 | 1433 | */ |
1434 | 1434 | private static function get_field_label( $field, $form_field = array() ) { |
@@ -1486,7 +1486,7 @@ discard block |
||
1486 | 1486 | * @param array $field |
1487 | 1487 | * @param \GV\Context $context |
1488 | 1488 | * |
1489 | - * @return array |
|
1489 | + * @return GV\View |
|
1490 | 1490 | */ |
1491 | 1491 | private function get_search_filter_details( $field, $context ) { |
1492 | 1492 | |
@@ -1634,7 +1634,7 @@ discard block |
||
1634 | 1634 | /** |
1635 | 1635 | * Require the datepicker script for the frontend GV script |
1636 | 1636 | * @param array $js_dependencies Array of existing required scripts for the fe-views.js script |
1637 | - * @return array Array required scripts, with `jquery-ui-datepicker` added |
|
1637 | + * @return string[] Array required scripts, with `jquery-ui-datepicker` added |
|
1638 | 1638 | */ |
1639 | 1639 | public function add_datepicker_js_dependency( $js_dependencies ) { |
1640 | 1640 | |
@@ -1646,7 +1646,7 @@ discard block |
||
1646 | 1646 | /** |
1647 | 1647 | * Modify the array passed to wp_localize_script() |
1648 | 1648 | * |
1649 | - * @param array $js_localization The data padded to the Javascript file |
|
1649 | + * @param array $localizations The data padded to the Javascript file |
|
1650 | 1650 | * @param array $view_data View data array with View settings |
1651 | 1651 | * |
1652 | 1652 | * @return array |
@@ -1826,7 +1826,7 @@ discard block |
||
1826 | 1826 | * |
1827 | 1827 | * @param array $get Where to look for the operator. |
1828 | 1828 | * @param string $key The filter key to look for. |
1829 | - * @param array $allowed The allowed operators (whitelist). |
|
1829 | + * @param string[] $allowed The allowed operators (whitelist). |
|
1830 | 1830 | * @param string $default The default operator. |
1831 | 1831 | * |
1832 | 1832 | * @return string The operator. |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | 'type' => 'radio', |
65 | 65 | 'full_width' => true, |
66 | 66 | 'label' => esc_html__( 'Search Mode', 'gravityview' ), |
67 | - 'desc' => __('Should search results match all search fields, or any?', 'gravityview'), |
|
67 | + 'desc' => __( 'Should search results match all search fields, or any?', 'gravityview' ), |
|
68 | 68 | 'value' => 'any', |
69 | 69 | 'class' => 'hide-if-js', |
70 | 70 | 'options' => array( |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | |
84 | 84 | // admin - add scripts - run at 1100 to make sure GravityView_Admin_Views::add_scripts_and_styles() runs first at 999 |
85 | 85 | add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 1100 ); |
86 | - add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') ); |
|
86 | + add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) ); |
|
87 | 87 | add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) ); |
88 | 88 | |
89 | 89 | // ajax - get the searchable fields |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | $script_min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
228 | 228 | $script_source = empty( $script_min ) ? '/source' : ''; |
229 | 229 | |
230 | - 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 ); |
|
230 | + 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 ); |
|
231 | 231 | |
232 | 232 | wp_localize_script( 'gravityview_searchwidget_admin', 'gvSearchVar', array( |
233 | 233 | 'nonce' => wp_create_nonce( 'gravityview_ajaxsearchwidget' ), |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | * @return array Scripts allowed in no-conflict mode, plus the search widget script |
250 | 250 | */ |
251 | 251 | public function register_no_conflict( $allowed ) { |
252 | - $allowed[] = 'gravityview_searchwidget_admin'; |
|
252 | + $allowed[ ] = 'gravityview_searchwidget_admin'; |
|
253 | 253 | return $allowed; |
254 | 254 | } |
255 | 255 | |
@@ -262,24 +262,24 @@ discard block |
||
262 | 262 | */ |
263 | 263 | public static function get_searchable_fields() { |
264 | 264 | |
265 | - if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxsearchwidget' ) ) { |
|
265 | + if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxsearchwidget' ) ) { |
|
266 | 266 | exit( '0' ); |
267 | 267 | } |
268 | 268 | |
269 | 269 | $form = ''; |
270 | 270 | |
271 | 271 | // Fetch the form for the current View |
272 | - if ( ! empty( $_POST['view_id'] ) ) { |
|
272 | + if ( ! empty( $_POST[ 'view_id' ] ) ) { |
|
273 | 273 | |
274 | - $form = gravityview_get_form_id( $_POST['view_id'] ); |
|
274 | + $form = gravityview_get_form_id( $_POST[ 'view_id' ] ); |
|
275 | 275 | |
276 | - } elseif ( ! empty( $_POST['formid'] ) ) { |
|
276 | + } elseif ( ! empty( $_POST[ 'formid' ] ) ) { |
|
277 | 277 | |
278 | - $form = (int) $_POST['formid']; |
|
278 | + $form = (int)$_POST[ 'formid' ]; |
|
279 | 279 | |
280 | - } elseif ( ! empty( $_POST['template_id'] ) && class_exists( 'GravityView_Ajax' ) ) { |
|
280 | + } elseif ( ! empty( $_POST[ 'template_id' ] ) && class_exists( 'GravityView_Ajax' ) ) { |
|
281 | 281 | |
282 | - $form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] ); |
|
282 | + $form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] ); |
|
283 | 283 | |
284 | 284 | } |
285 | 285 | |
@@ -329,14 +329,14 @@ discard block |
||
329 | 329 | ); |
330 | 330 | |
331 | 331 | if ( gravityview()->plugin->supports( \GV\Plugin::FEATURE_GFQUERY ) ) { |
332 | - $custom_fields['is_approved'] = array( |
|
332 | + $custom_fields[ 'is_approved' ] = array( |
|
333 | 333 | 'text' => esc_html__( 'Approval Status', 'gravityview' ), |
334 | 334 | 'type' => 'multi', |
335 | 335 | ); |
336 | 336 | } |
337 | 337 | |
338 | - foreach( $custom_fields as $custom_field_key => $custom_field ) { |
|
339 | - $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'] ); |
|
338 | + foreach ( $custom_fields as $custom_field_key => $custom_field ) { |
|
339 | + $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' ] ); |
|
340 | 340 | } |
341 | 341 | |
342 | 342 | // Get fields with sub-inputs and no parent |
@@ -358,13 +358,13 @@ discard block |
||
358 | 358 | |
359 | 359 | foreach ( $fields as $id => $field ) { |
360 | 360 | |
361 | - if ( in_array( $field['type'], $blacklist_field_types ) ) { |
|
361 | + if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) { |
|
362 | 362 | continue; |
363 | 363 | } |
364 | 364 | |
365 | - $types = self::get_search_input_types( $id, $field['type'] ); |
|
365 | + $types = self::get_search_input_types( $id, $field[ 'type' ] ); |
|
366 | 366 | |
367 | - $output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'data-inputtypes="'. esc_attr( $types ) .'">'. esc_html( $field['label'] ) .'</option>'; |
|
367 | + $output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . 'data-inputtypes="' . esc_attr( $types ) . '">' . esc_html( $field[ 'label' ] ) . '</option>'; |
|
368 | 368 | } |
369 | 369 | } |
370 | 370 | |
@@ -387,7 +387,7 @@ discard block |
||
387 | 387 | public static function get_search_input_types( $field_id = '', $field_type = null ) { |
388 | 388 | |
389 | 389 | // @todo - This needs to be improved - many fields have . including products and addresses |
390 | - if ( false !== strpos( (string) $field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) { |
|
390 | + if ( false !== strpos( (string)$field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) { |
|
391 | 391 | $input_type = 'boolean'; // on/off checkbox |
392 | 392 | } elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) { |
393 | 393 | $input_type = 'multi'; //multiselect |
@@ -433,19 +433,19 @@ discard block |
||
433 | 433 | $post_id = 0; |
434 | 434 | |
435 | 435 | // We're in the WordPress Widget context, and an overriding post ID has been set. |
436 | - if ( ! empty( $widget_args['post_id'] ) ) { |
|
437 | - $post_id = absint( $widget_args['post_id'] ); |
|
436 | + if ( ! empty( $widget_args[ 'post_id' ] ) ) { |
|
437 | + $post_id = absint( $widget_args[ 'post_id' ] ); |
|
438 | 438 | } |
439 | 439 | // We're in the WordPress Widget context, and the base View ID should be used |
440 | - else if ( ! empty( $widget_args['view_id'] ) ) { |
|
441 | - $post_id = absint( $widget_args['view_id'] ); |
|
440 | + else if ( ! empty( $widget_args[ 'view_id' ] ) ) { |
|
441 | + $post_id = absint( $widget_args[ 'view_id' ] ); |
|
442 | 442 | } |
443 | 443 | |
444 | 444 | $args = gravityview_get_permalink_query_args( $post_id ); |
445 | 445 | |
446 | 446 | // Add hidden fields to the search form |
447 | 447 | foreach ( $args as $key => $value ) { |
448 | - $search_fields[] = array( |
|
448 | + $search_fields[ ] = array( |
|
449 | 449 | 'name' => $key, |
450 | 450 | 'input' => 'hidden', |
451 | 451 | 'value' => $value, |
@@ -484,28 +484,28 @@ discard block |
||
484 | 484 | /** |
485 | 485 | * Include the sidebar Widgets. |
486 | 486 | */ |
487 | - $widgets = (array) get_option( 'widget_gravityview_search', array() ); |
|
487 | + $widgets = (array)get_option( 'widget_gravityview_search', array() ); |
|
488 | 488 | |
489 | 489 | foreach ( $widgets as $widget ) { |
490 | - if ( ! empty( $widget['view_id'] ) && $widget['view_id'] == $view->ID ) { |
|
491 | - if( $_fields = json_decode( $widget['search_fields'], true ) ) { |
|
490 | + if ( ! empty( $widget[ 'view_id' ] ) && $widget[ 'view_id' ] == $view->ID ) { |
|
491 | + if ( $_fields = json_decode( $widget[ 'search_fields' ], true ) ) { |
|
492 | 492 | foreach ( $_fields as $field ) { |
493 | - if ( empty( $field['form_id'] ) ) { |
|
494 | - $field['form_id'] = $view->form ? $view->form->ID : 0; |
|
493 | + if ( empty( $field[ 'form_id' ] ) ) { |
|
494 | + $field[ 'form_id' ] = $view->form ? $view->form->ID : 0; |
|
495 | 495 | } |
496 | - $searchable_fields[] = $with_full_field ? $field : $field['field']; |
|
496 | + $searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ]; |
|
497 | 497 | } |
498 | 498 | } |
499 | 499 | } |
500 | 500 | } |
501 | 501 | |
502 | 502 | foreach ( $view->widgets->by_id( $this->get_widget_id() )->all() as $widget ) { |
503 | - if( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) { |
|
503 | + if ( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) { |
|
504 | 504 | foreach ( $_fields as $field ) { |
505 | - if ( empty( $field['form_id'] ) ) { |
|
506 | - $field['form_id'] = $view->form ? $view->form->ID : 0; |
|
505 | + if ( empty( $field[ 'form_id' ] ) ) { |
|
506 | + $field[ 'form_id' ] = $view->form ? $view->form->ID : 0; |
|
507 | 507 | } |
508 | - $searchable_fields[] = $with_full_field ? $field : $field['field']; |
|
508 | + $searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ]; |
|
509 | 509 | } |
510 | 510 | } |
511 | 511 | } |
@@ -543,7 +543,7 @@ discard block |
||
543 | 543 | return $search_criteria; // Return the original criteria, GF_Query modification kicks in later |
544 | 544 | } |
545 | 545 | |
546 | - if( 'post' === $this->search_method ) { |
|
546 | + if ( 'post' === $this->search_method ) { |
|
547 | 547 | $get = $_POST; |
548 | 548 | } else { |
549 | 549 | $get = $_GET; |
@@ -562,15 +562,15 @@ discard block |
||
562 | 562 | $get = gv_map_deep( $get, 'rawurldecode' ); |
563 | 563 | |
564 | 564 | // Make sure array key is set up |
565 | - $search_criteria['field_filters'] = \GV\Utils::get( $search_criteria, 'field_filters', array() ); |
|
565 | + $search_criteria[ 'field_filters' ] = \GV\Utils::get( $search_criteria, 'field_filters', array() ); |
|
566 | 566 | |
567 | 567 | $searchable_fields = $this->get_view_searchable_fields( $view ); |
568 | 568 | $searchable_field_objects = $this->get_view_searchable_fields( $view, true ); |
569 | 569 | |
570 | 570 | // add free search |
571 | - if ( isset( $get['gv_search'] ) && '' !== $get['gv_search'] && in_array( 'search_all', $searchable_fields ) ) { |
|
571 | + if ( isset( $get[ 'gv_search' ] ) && '' !== $get[ 'gv_search' ] && in_array( 'search_all', $searchable_fields ) ) { |
|
572 | 572 | |
573 | - $search_all_value = trim( $get['gv_search'] ); |
|
573 | + $search_all_value = trim( $get[ 'gv_search' ] ); |
|
574 | 574 | |
575 | 575 | /** |
576 | 576 | * @filter `gravityview/search-all-split-words` Search for each word separately or the whole phrase? |
@@ -595,7 +595,7 @@ discard block |
||
595 | 595 | } |
596 | 596 | |
597 | 597 | foreach ( $words as $word ) { |
598 | - $search_criteria['field_filters'][] = array( |
|
598 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
599 | 599 | 'key' => null, // The field ID to search |
600 | 600 | 'value' => $word, // The value to search |
601 | 601 | 'operator' => 'contains', // What to search in. Options: `is` or `contains` |
@@ -608,14 +608,14 @@ discard block |
||
608 | 608 | /** |
609 | 609 | * Get and normalize the dates according to the input format. |
610 | 610 | */ |
611 | - if ( $curr_start = ! empty( $get['gv_start'] ) ? $get['gv_start'] : '' ) { |
|
612 | - if( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) { |
|
611 | + if ( $curr_start = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_start' ] : '' ) { |
|
612 | + if ( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) { |
|
613 | 613 | $curr_start = $curr_start_date->format( 'Y-m-d' ); |
614 | 614 | } |
615 | 615 | } |
616 | 616 | |
617 | - if ( $curr_end = ! empty( $get['gv_start'] ) ? ( ! empty( $get['gv_end'] ) ? $get['gv_end'] : '' ) : '' ) { |
|
618 | - if( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) { |
|
617 | + if ( $curr_end = ! empty( $get[ 'gv_start' ] ) ? ( ! empty( $get[ 'gv_end' ] ) ? $get[ 'gv_end' ] : '' ) : '' ) { |
|
618 | + if ( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) { |
|
619 | 619 | $curr_end = $curr_end_date->format( 'Y-m-d' ); |
620 | 620 | } |
621 | 621 | } |
@@ -650,22 +650,22 @@ discard block |
||
650 | 650 | */ |
651 | 651 | if ( ! empty( $curr_start ) ) { |
652 | 652 | $curr_start = date( 'Y-m-d H:i:s', strtotime( $curr_start ) ); |
653 | - $search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start; |
|
653 | + $search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start; |
|
654 | 654 | } |
655 | 655 | |
656 | 656 | if ( ! empty( $curr_end ) ) { |
657 | 657 | // Fast-forward 24 hour on the end time |
658 | 658 | $curr_end = date( 'Y-m-d H:i:s', strtotime( $curr_end ) + DAY_IN_SECONDS ); |
659 | - $search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end; |
|
660 | - if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056 |
|
661 | - $search_criteria['end_date'] = date( 'Y-m-d H:i:s', strtotime( $search_criteria['end_date'] ) - 1 ); |
|
659 | + $search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end; |
|
660 | + if ( strpos( $search_criteria[ 'end_date' ], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056 |
|
661 | + $search_criteria[ 'end_date' ] = date( 'Y-m-d H:i:s', strtotime( $search_criteria[ 'end_date' ] ) - 1 ); |
|
662 | 662 | } |
663 | 663 | } |
664 | 664 | } |
665 | 665 | |
666 | 666 | // search for a specific entry ID |
667 | 667 | if ( ! empty( $get[ 'gv_id' ] ) && in_array( 'entry_id', $searchable_fields ) ) { |
668 | - $search_criteria['field_filters'][] = array( |
|
668 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
669 | 669 | 'key' => 'id', |
670 | 670 | 'value' => absint( $get[ 'gv_id' ] ), |
671 | 671 | 'operator' => $this->get_operator( $get, 'gv_id', array( '=' ), '=' ), |
@@ -674,20 +674,20 @@ discard block |
||
674 | 674 | |
675 | 675 | // search for a specific Created_by ID |
676 | 676 | if ( ! empty( $get[ 'gv_by' ] ) && in_array( 'created_by', $searchable_fields ) ) { |
677 | - $search_criteria['field_filters'][] = array( |
|
677 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
678 | 678 | 'key' => 'created_by', |
679 | - 'value' => $get['gv_by'], |
|
679 | + 'value' => $get[ 'gv_by' ], |
|
680 | 680 | 'operator' => $this->get_operator( $get, 'gv_by', array( '=' ), '=' ), |
681 | 681 | ); |
682 | 682 | } |
683 | 683 | |
684 | 684 | // Get search mode passed in URL |
685 | - $mode = isset( $get['mode'] ) && in_array( $get['mode'], array( 'any', 'all' ) ) ? $get['mode'] : 'any'; |
|
685 | + $mode = isset( $get[ 'mode' ] ) && in_array( $get[ 'mode' ], array( 'any', 'all' ) ) ? $get[ 'mode' ] : 'any'; |
|
686 | 686 | |
687 | 687 | // get the other search filters |
688 | 688 | foreach ( $get as $key => $value ) { |
689 | 689 | |
690 | - if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[0], false, false ) ) ) { |
|
690 | + if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[ 0 ], false, false ) ) ) { |
|
691 | 691 | continue; // Not a filter, or empty |
692 | 692 | } |
693 | 693 | |
@@ -701,19 +701,19 @@ discard block |
||
701 | 701 | continue; |
702 | 702 | } |
703 | 703 | |
704 | - if ( ! isset( $filter['operator'] ) ) { |
|
705 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' ); |
|
704 | + if ( ! isset( $filter[ 'operator' ] ) ) { |
|
705 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' ); |
|
706 | 706 | } |
707 | 707 | |
708 | - if ( isset( $filter[0]['value'] ) ) { |
|
709 | - $search_criteria['field_filters'] = array_merge( $search_criteria['field_filters'], $filter ); |
|
708 | + if ( isset( $filter[ 0 ][ 'value' ] ) ) { |
|
709 | + $search_criteria[ 'field_filters' ] = array_merge( $search_criteria[ 'field_filters' ], $filter ); |
|
710 | 710 | |
711 | 711 | // if date range type, set search mode to ALL |
712 | - if ( ! empty( $filter[0]['operator'] ) && in_array( $filter[0]['operator'], array( '>=', '<=', '>', '<' ) ) ) { |
|
712 | + if ( ! empty( $filter[ 0 ][ 'operator' ] ) && in_array( $filter[ 0 ][ 'operator' ], array( '>=', '<=', '>', '<' ) ) ) { |
|
713 | 713 | $mode = 'all'; |
714 | 714 | } |
715 | - } elseif( !empty( $filter ) ) { |
|
716 | - $search_criteria['field_filters'][] = $filter; |
|
715 | + } elseif ( ! empty( $filter ) ) { |
|
716 | + $search_criteria[ 'field_filters' ][ ] = $filter; |
|
717 | 717 | } |
718 | 718 | } |
719 | 719 | |
@@ -722,7 +722,7 @@ discard block |
||
722 | 722 | * @since 1.5.1 |
723 | 723 | * @param[out,in] string $mode Search mode (`any` vs `all`) |
724 | 724 | */ |
725 | - $search_criteria['field_filters']['mode'] = apply_filters( 'gravityview/search/mode', $mode ); |
|
725 | + $search_criteria[ 'field_filters' ][ 'mode' ] = apply_filters( 'gravityview/search/mode', $mode ); |
|
726 | 726 | |
727 | 727 | gravityview()->log->debug( 'Returned Search Criteria: ', array( 'data' => $search_criteria ) ); |
728 | 728 | |
@@ -756,19 +756,19 @@ discard block |
||
756 | 756 | |
757 | 757 | $query_class = $view->get_query_class(); |
758 | 758 | |
759 | - if ( empty( $search_criteria['field_filters'] ) ) { |
|
759 | + if ( empty( $search_criteria[ 'field_filters' ] ) ) { |
|
760 | 760 | return; |
761 | 761 | } |
762 | 762 | |
763 | 763 | $widgets = $view->widgets->by_id( $this->widget_id ); |
764 | 764 | if ( $widgets->count() ) { |
765 | 765 | $widgets = $widgets->all(); |
766 | - $widget = $widgets[0]; |
|
766 | + $widget = $widgets[ 0 ]; |
|
767 | 767 | |
768 | 768 | $search_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ); |
769 | 769 | |
770 | - foreach ( (array) $search_fields as $search_field ) { |
|
771 | - if ( 'created_by' === $search_field['field'] && 'input_text' === $search_field['input'] ) { |
|
770 | + foreach ( (array)$search_fields as $search_field ) { |
|
771 | + if ( 'created_by' === $search_field[ 'field' ] && 'input_text' === $search_field[ 'input' ] ) { |
|
772 | 772 | $created_by_text_mode = true; |
773 | 773 | } |
774 | 774 | } |
@@ -777,7 +777,7 @@ discard block |
||
777 | 777 | $extra_conditions = array(); |
778 | 778 | $mode = 'any'; |
779 | 779 | |
780 | - foreach ( $search_criteria['field_filters'] as &$filter ) { |
|
780 | + foreach ( $search_criteria[ 'field_filters' ] as &$filter ) { |
|
781 | 781 | if ( ! is_array( $filter ) ) { |
782 | 782 | if ( in_array( strtolower( $filter ), array( 'any', 'all' ) ) ) { |
783 | 783 | $mode = $filter; |
@@ -786,13 +786,13 @@ discard block |
||
786 | 786 | } |
787 | 787 | |
788 | 788 | // Construct a manual query for unapproved statuses |
789 | - if ( 'is_approved' === $filter['key'] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array) $filter['value'] ) ) { |
|
790 | - $_tmp_query = new $query_class( $view->form->ID, array( |
|
789 | + if ( 'is_approved' === $filter[ 'key' ] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array)$filter[ 'value' ] ) ) { |
|
790 | + $_tmp_query = new $query_class( $view->form->ID, array( |
|
791 | 791 | 'field_filters' => array( |
792 | 792 | array( |
793 | 793 | 'operator' => 'in', |
794 | 794 | 'key' => 'is_approved', |
795 | - 'value' => (array) $filter['value'], |
|
795 | + 'value' => (array)$filter[ 'value' ], |
|
796 | 796 | ), |
797 | 797 | array( |
798 | 798 | 'operator' => 'is', |
@@ -804,30 +804,30 @@ discard block |
||
804 | 804 | ) ); |
805 | 805 | $_tmp_query_parts = $_tmp_query->_introspect(); |
806 | 806 | |
807 | - $extra_conditions[] = $_tmp_query_parts['where']; |
|
807 | + $extra_conditions[ ] = $_tmp_query_parts[ 'where' ]; |
|
808 | 808 | |
809 | 809 | $filter = false; |
810 | 810 | continue; |
811 | 811 | } |
812 | 812 | |
813 | 813 | // Construct manual query for text mode creator search |
814 | - if ( 'created_by' === $filter['key'] && ! empty( $created_by_text_mode ) ) { |
|
815 | - $extra_conditions[] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view ); |
|
814 | + if ( 'created_by' === $filter[ 'key' ] && ! empty( $created_by_text_mode ) ) { |
|
815 | + $extra_conditions[ ] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view ); |
|
816 | 816 | $filter = false; |
817 | 817 | continue; |
818 | 818 | } |
819 | 819 | |
820 | 820 | // By default, we want searches to be wildcard for each field. |
821 | - $filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator']; |
|
821 | + $filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ]; |
|
822 | 822 | |
823 | 823 | // For multichoice, let's have an in (OR) search. |
824 | - if ( is_array( $filter['value'] ) ) { |
|
825 | - $filter['operator'] = 'in'; // @todo what about in contains (OR LIKE chains)? |
|
824 | + if ( is_array( $filter[ 'value' ] ) ) { |
|
825 | + $filter[ 'operator' ] = 'in'; // @todo what about in contains (OR LIKE chains)? |
|
826 | 826 | } |
827 | 827 | |
828 | 828 | // Default form with joins functionality |
829 | - if ( empty( $filter['form_id'] ) ) { |
|
830 | - $filter['form_id'] = $view->form ? $view->form->ID : 0; |
|
829 | + if ( empty( $filter[ 'form_id' ] ) ) { |
|
830 | + $filter[ 'form_id' ] = $view->form ? $view->form->ID : 0; |
|
831 | 831 | } |
832 | 832 | |
833 | 833 | /** |
@@ -837,28 +837,28 @@ discard block |
||
837 | 837 | * @since develop |
838 | 838 | * @param \GV\View $view The View we're operating on. |
839 | 839 | */ |
840 | - $filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter, $view ); |
|
840 | + $filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter, $view ); |
|
841 | 841 | } |
842 | 842 | |
843 | - if ( ! empty( $search_criteria['start_date'] ) || ! empty( $search_criteria['end_date'] ) ) { |
|
843 | + if ( ! empty( $search_criteria[ 'start_date' ] ) || ! empty( $search_criteria[ 'end_date' ] ) ) { |
|
844 | 844 | $date_criteria = array(); |
845 | 845 | |
846 | - if ( isset( $search_criteria['start_date'] ) ) { |
|
847 | - $date_criteria['start_date'] = $search_criteria['start_date']; |
|
846 | + if ( isset( $search_criteria[ 'start_date' ] ) ) { |
|
847 | + $date_criteria[ 'start_date' ] = $search_criteria[ 'start_date' ]; |
|
848 | 848 | } |
849 | 849 | |
850 | - if ( isset( $search_criteria['end_date'] ) ) { |
|
851 | - $date_criteria['end_date'] = $search_criteria['end_date']; |
|
850 | + if ( isset( $search_criteria[ 'end_date' ] ) ) { |
|
851 | + $date_criteria[ 'end_date' ] = $search_criteria[ 'end_date' ]; |
|
852 | 852 | } |
853 | 853 | |
854 | 854 | $_tmp_query = new $query_class( $view->form->ID, $date_criteria ); |
855 | 855 | $_tmp_query_parts = $_tmp_query->_introspect(); |
856 | - $extra_conditions[] = $_tmp_query_parts['where']; |
|
856 | + $extra_conditions[ ] = $_tmp_query_parts[ 'where' ]; |
|
857 | 857 | } |
858 | 858 | |
859 | 859 | $search_conditions = array(); |
860 | 860 | |
861 | - if ( $filters = array_filter( $search_criteria['field_filters'] ) ) { |
|
861 | + if ( $filters = array_filter( $search_criteria[ 'field_filters' ] ) ) { |
|
862 | 862 | foreach ( $filters as &$filter ) { |
863 | 863 | if ( ! is_array( $filter ) ) { |
864 | 864 | continue; |
@@ -870,12 +870,12 @@ discard block |
||
870 | 870 | * code by reusing what's inside GF_Query already as they |
871 | 871 | * take care of many small things like forcing numeric, etc. |
872 | 872 | */ |
873 | - $_tmp_query = new $query_class( $filter['form_id'], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) ); |
|
873 | + $_tmp_query = new $query_class( $filter[ 'form_id' ], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) ); |
|
874 | 874 | $_tmp_query_parts = $_tmp_query->_introspect(); |
875 | - $search_condition = $_tmp_query_parts['where']; |
|
875 | + $search_condition = $_tmp_query_parts[ 'where' ]; |
|
876 | 876 | |
877 | - if ( empty( $filter['key'] ) && $search_condition->expressions ) { |
|
878 | - $search_conditions[] = $search_condition; |
|
877 | + if ( empty( $filter[ 'key' ] ) && $search_condition->expressions ) { |
|
878 | + $search_conditions[ ] = $search_condition; |
|
879 | 879 | } else { |
880 | 880 | $left = $search_condition->left; |
881 | 881 | $alias = $query->_alias( $left->field_id, $left->source, $left->is_entry_column() ? 't' : 'm' ); |
@@ -885,7 +885,7 @@ discard block |
||
885 | 885 | $on = $_join->join_on; |
886 | 886 | $join = $_join->join; |
887 | 887 | |
888 | - $search_conditions[] = GF_Query_Condition::_or( |
|
888 | + $search_conditions[ ] = GF_Query_Condition::_or( |
|
889 | 889 | // Join |
890 | 890 | new GF_Query_Condition( |
891 | 891 | new GF_Query_Column( GF_Query_Column::META, $join->ID, $query->_alias( GF_Query_Column::META, $join->ID, 'm' ) ), |
@@ -901,7 +901,7 @@ discard block |
||
901 | 901 | ); |
902 | 902 | } |
903 | 903 | } else { |
904 | - $search_conditions[] = new GF_Query_Condition( |
|
904 | + $search_conditions[ ] = new GF_Query_Condition( |
|
905 | 905 | new GF_Query_Column( $left->field_id, $left->source, $alias ), |
906 | 906 | $search_condition->operator, |
907 | 907 | $search_condition->right |
@@ -923,7 +923,7 @@ discard block |
||
923 | 923 | /** |
924 | 924 | * Combine the parts as a new WHERE clause. |
925 | 925 | */ |
926 | - $where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts['where'] ), $search_conditions, $extra_conditions ) ); |
|
926 | + $where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts[ 'where' ] ), $search_conditions, $extra_conditions ) ); |
|
927 | 927 | $query->where( $where ); |
928 | 928 | } |
929 | 929 | |
@@ -946,7 +946,7 @@ discard block |
||
946 | 946 | $field_id = str_replace( 'filter_', '', $key ); |
947 | 947 | |
948 | 948 | // calculates field_id, removing 'filter_' and for '_' for advanced fields ( like name or checkbox ) |
949 | - if ( preg_match('/^[0-9_]+$/ism', $field_id ) ) { |
|
949 | + if ( preg_match( '/^[0-9_]+$/ism', $field_id ) ) { |
|
950 | 950 | $field_id = str_replace( '_', '.', $field_id ); |
951 | 951 | } |
952 | 952 | |
@@ -1003,7 +1003,7 @@ discard block |
||
1003 | 1003 | // form is in searchable fields |
1004 | 1004 | $found = false; |
1005 | 1005 | foreach ( $searchable_fields as $field ) { |
1006 | - if ( $field_id == $field['field'] && $form->ID == $field['form_id'] ) { |
|
1006 | + if ( $field_id == $field[ 'field' ] && $form->ID == $field[ 'form_id' ] ) { |
|
1007 | 1007 | $found = true; |
1008 | 1008 | break; |
1009 | 1009 | } |
@@ -1043,7 +1043,7 @@ discard block |
||
1043 | 1043 | |
1044 | 1044 | case 'select': |
1045 | 1045 | case 'radio': |
1046 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
1046 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
1047 | 1047 | break; |
1048 | 1048 | |
1049 | 1049 | case 'post_category': |
@@ -1057,7 +1057,7 @@ discard block |
||
1057 | 1057 | |
1058 | 1058 | foreach ( $value as $val ) { |
1059 | 1059 | $cat = get_term( $val, 'category' ); |
1060 | - $filter[] = array( |
|
1060 | + $filter[ ] = array( |
|
1061 | 1061 | 'key' => $field_id, |
1062 | 1062 | 'value' => esc_attr( $cat->name ) . ':' . $val, |
1063 | 1063 | 'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ), |
@@ -1076,7 +1076,7 @@ discard block |
||
1076 | 1076 | $filter = array(); |
1077 | 1077 | |
1078 | 1078 | foreach ( $value as $val ) { |
1079 | - $filter[] = array( 'key' => $field_id, 'value' => $val ); |
|
1079 | + $filter[ ] = array( 'key' => $field_id, 'value' => $val ); |
|
1080 | 1080 | } |
1081 | 1081 | |
1082 | 1082 | break; |
@@ -1085,9 +1085,9 @@ discard block |
||
1085 | 1085 | // convert checkbox on/off into the correct search filter |
1086 | 1086 | if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field->inputs ) && ! empty( $form_field->choices ) ) { |
1087 | 1087 | foreach ( $form_field->inputs as $k => $input ) { |
1088 | - if ( $input['id'] == $field_id ) { |
|
1089 | - $filter['value'] = $form_field->choices[ $k ]['value']; |
|
1090 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
1088 | + if ( $input[ 'id' ] == $field_id ) { |
|
1089 | + $filter[ 'value' ] = $form_field->choices[ $k ][ 'value' ]; |
|
1090 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
1091 | 1091 | break; |
1092 | 1092 | } |
1093 | 1093 | } |
@@ -1097,7 +1097,7 @@ discard block |
||
1097 | 1097 | $filter = array(); |
1098 | 1098 | |
1099 | 1099 | foreach ( $value as $val ) { |
1100 | - $filter[] = array( |
|
1100 | + $filter[ ] = array( |
|
1101 | 1101 | 'key' => $field_id, |
1102 | 1102 | 'value' => $val, |
1103 | 1103 | 'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ), |
@@ -1118,9 +1118,9 @@ discard block |
||
1118 | 1118 | foreach ( $words as $word ) { |
1119 | 1119 | if ( ! empty( $word ) && strlen( $word ) > 1 ) { |
1120 | 1120 | // Keep the same key for each filter |
1121 | - $filter['value'] = $word; |
|
1121 | + $filter[ 'value' ] = $word; |
|
1122 | 1122 | // Add a search for the value |
1123 | - $filters[] = $filter; |
|
1123 | + $filters[ ] = $filter; |
|
1124 | 1124 | } |
1125 | 1125 | } |
1126 | 1126 | |
@@ -1134,19 +1134,19 @@ discard block |
||
1134 | 1134 | |
1135 | 1135 | foreach ( $searchable_fields as $searchable_field ) { |
1136 | 1136 | |
1137 | - if( $form_field->ID !== $searchable_field['field'] ) { |
|
1137 | + if ( $form_field->ID !== $searchable_field[ 'field' ] ) { |
|
1138 | 1138 | continue; |
1139 | 1139 | } |
1140 | 1140 | |
1141 | 1141 | // Only exact-match dropdowns, not text search |
1142 | - if( in_array( $searchable_field['input'], array( 'text', 'search' ), true ) ) { |
|
1142 | + if ( in_array( $searchable_field[ 'input' ], array( 'text', 'search' ), true ) ) { |
|
1143 | 1143 | continue; |
1144 | 1144 | } |
1145 | 1145 | |
1146 | 1146 | $input_id = gravityview_get_input_id_from_id( $form_field->ID ); |
1147 | 1147 | |
1148 | 1148 | if ( 4 === $input_id ) { |
1149 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
1149 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
1150 | 1150 | }; |
1151 | 1151 | } |
1152 | 1152 | } |
@@ -1173,12 +1173,12 @@ discard block |
||
1173 | 1173 | * @since 1.16.3 |
1174 | 1174 | * Safeguard until GF implements '<=' operator |
1175 | 1175 | */ |
1176 | - if( !GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) { |
|
1176 | + if ( ! GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) { |
|
1177 | 1177 | $operator = '<'; |
1178 | 1178 | $date = date( 'Y-m-d', strtotime( self::get_formatted_date( $date, 'Y-m-d', $date_format ) . ' +1 day' ) ); |
1179 | 1179 | } |
1180 | 1180 | |
1181 | - $filter[] = array( |
|
1181 | + $filter[ ] = array( |
|
1182 | 1182 | 'key' => $field_id, |
1183 | 1183 | 'value' => self::get_formatted_date( $date, 'Y-m-d', $date_format ), |
1184 | 1184 | 'operator' => $this->get_operator( $get, $key, array( $operator ), $operator ), |
@@ -1186,8 +1186,8 @@ discard block |
||
1186 | 1186 | } |
1187 | 1187 | } else { |
1188 | 1188 | $date = $value; |
1189 | - $filter['value'] = self::get_formatted_date( $date, 'Y-m-d', $date_format ); |
|
1190 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
1189 | + $filter[ 'value' ] = self::get_formatted_date( $date, 'Y-m-d', $date_format ); |
|
1190 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
1191 | 1191 | } |
1192 | 1192 | |
1193 | 1193 | break; |
@@ -1218,7 +1218,7 @@ discard block |
||
1218 | 1218 | 'ymd_dot' => 'Y.m.d', |
1219 | 1219 | ); |
1220 | 1220 | |
1221 | - if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){ |
|
1221 | + if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) { |
|
1222 | 1222 | $format = $datepicker[ $field->dateFormat ]; |
1223 | 1223 | } |
1224 | 1224 | |
@@ -1255,7 +1255,7 @@ discard block |
||
1255 | 1255 | public function add_template_path( $file_paths ) { |
1256 | 1256 | |
1257 | 1257 | // Index 100 is the default GravityView template path. |
1258 | - $file_paths[102] = self::$file . 'templates/'; |
|
1258 | + $file_paths[ 102 ] = self::$file . 'templates/'; |
|
1259 | 1259 | |
1260 | 1260 | return $file_paths; |
1261 | 1261 | } |
@@ -1274,7 +1274,7 @@ discard block |
||
1274 | 1274 | $has_date = false; |
1275 | 1275 | |
1276 | 1276 | foreach ( $search_fields as $k => $field ) { |
1277 | - if ( in_array( $field['input'], array( 'date', 'date_range', 'entry_date' ) ) ) { |
|
1277 | + if ( in_array( $field[ 'input' ], array( 'date', 'date_range', 'entry_date' ) ) ) { |
|
1278 | 1278 | $has_date = true; |
1279 | 1279 | break; |
1280 | 1280 | } |
@@ -1304,7 +1304,7 @@ discard block |
||
1304 | 1304 | $view = \GV\View::by_id( $gravityview_view->view_id ); |
1305 | 1305 | |
1306 | 1306 | // get configured search fields |
1307 | - $search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : ''; |
|
1307 | + $search_fields = ! empty( $widget_args[ 'search_fields' ] ) ? json_decode( $widget_args[ 'search_fields' ], true ) : ''; |
|
1308 | 1308 | |
1309 | 1309 | if ( empty( $search_fields ) || ! is_array( $search_fields ) ) { |
1310 | 1310 | gravityview()->log->debug( 'No search fields configured for widget:', array( 'data' => $widget_args ) ); |
@@ -1318,40 +1318,40 @@ discard block |
||
1318 | 1318 | |
1319 | 1319 | $updated_field = $this->get_search_filter_details( $updated_field, $context ); |
1320 | 1320 | |
1321 | - switch ( $field['field'] ) { |
|
1321 | + switch ( $field[ 'field' ] ) { |
|
1322 | 1322 | |
1323 | 1323 | case 'search_all': |
1324 | - $updated_field['key'] = 'search_all'; |
|
1325 | - $updated_field['input'] = 'search_all'; |
|
1326 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_search' ); |
|
1324 | + $updated_field[ 'key' ] = 'search_all'; |
|
1325 | + $updated_field[ 'input' ] = 'search_all'; |
|
1326 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_search' ); |
|
1327 | 1327 | break; |
1328 | 1328 | |
1329 | 1329 | case 'entry_date': |
1330 | - $updated_field['key'] = 'entry_date'; |
|
1331 | - $updated_field['input'] = 'entry_date'; |
|
1332 | - $updated_field['value'] = array( |
|
1330 | + $updated_field[ 'key' ] = 'entry_date'; |
|
1331 | + $updated_field[ 'input' ] = 'entry_date'; |
|
1332 | + $updated_field[ 'value' ] = array( |
|
1333 | 1333 | 'start' => $this->rgget_or_rgpost( 'gv_start' ), |
1334 | 1334 | 'end' => $this->rgget_or_rgpost( 'gv_end' ), |
1335 | 1335 | ); |
1336 | 1336 | break; |
1337 | 1337 | |
1338 | 1338 | case 'entry_id': |
1339 | - $updated_field['key'] = 'entry_id'; |
|
1340 | - $updated_field['input'] = 'entry_id'; |
|
1341 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_id' ); |
|
1339 | + $updated_field[ 'key' ] = 'entry_id'; |
|
1340 | + $updated_field[ 'input' ] = 'entry_id'; |
|
1341 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_id' ); |
|
1342 | 1342 | break; |
1343 | 1343 | |
1344 | 1344 | case 'created_by': |
1345 | - $updated_field['key'] = 'created_by'; |
|
1346 | - $updated_field['name'] = 'gv_by'; |
|
1347 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_by' ); |
|
1348 | - $updated_field['choices'] = self::get_created_by_choices( $view ); |
|
1345 | + $updated_field[ 'key' ] = 'created_by'; |
|
1346 | + $updated_field[ 'name' ] = 'gv_by'; |
|
1347 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_by' ); |
|
1348 | + $updated_field[ 'choices' ] = self::get_created_by_choices( $view ); |
|
1349 | 1349 | break; |
1350 | 1350 | |
1351 | 1351 | case 'is_approved': |
1352 | - $updated_field['key'] = 'is_approved'; |
|
1353 | - $updated_field['value'] = $this->rgget_or_rgpost( 'filter_is_approved' ); |
|
1354 | - $updated_field['choices'] = self::get_is_approved_choices(); |
|
1352 | + $updated_field[ 'key' ] = 'is_approved'; |
|
1353 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'filter_is_approved' ); |
|
1354 | + $updated_field[ 'choices' ] = self::get_is_approved_choices(); |
|
1355 | 1355 | break; |
1356 | 1356 | } |
1357 | 1357 | |
@@ -1372,16 +1372,16 @@ discard block |
||
1372 | 1372 | |
1373 | 1373 | $gravityview_view->permalink_fields = $this->add_no_permalink_fields( array(), $this, $widget_args ); |
1374 | 1374 | |
1375 | - $gravityview_view->search_layout = ! empty( $widget_args['search_layout'] ) ? $widget_args['search_layout'] : 'horizontal'; |
|
1375 | + $gravityview_view->search_layout = ! empty( $widget_args[ 'search_layout' ] ) ? $widget_args[ 'search_layout' ] : 'horizontal'; |
|
1376 | 1376 | |
1377 | 1377 | /** @since 1.14 */ |
1378 | - $gravityview_view->search_mode = ! empty( $widget_args['search_mode'] ) ? $widget_args['search_mode'] : 'any'; |
|
1378 | + $gravityview_view->search_mode = ! empty( $widget_args[ 'search_mode' ] ) ? $widget_args[ 'search_mode' ] : 'any'; |
|
1379 | 1379 | |
1380 | - $custom_class = ! empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : ''; |
|
1380 | + $custom_class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : ''; |
|
1381 | 1381 | |
1382 | 1382 | $gravityview_view->search_class = self::get_search_class( $custom_class ); |
1383 | 1383 | |
1384 | - $gravityview_view->search_clear = ! empty( $widget_args['search_clear'] ) ? $widget_args['search_clear'] : false; |
|
1384 | + $gravityview_view->search_clear = ! empty( $widget_args[ 'search_clear' ] ) ? $widget_args[ 'search_clear' ] : false; |
|
1385 | 1385 | |
1386 | 1386 | if ( $this->has_date_field( $search_fields ) ) { |
1387 | 1387 | // enqueue datepicker stuff only if needed! |
@@ -1403,10 +1403,10 @@ discard block |
||
1403 | 1403 | public static function get_search_class( $custom_class = '' ) { |
1404 | 1404 | $gravityview_view = GravityView_View::getInstance(); |
1405 | 1405 | |
1406 | - $search_class = 'gv-search-'.$gravityview_view->search_layout; |
|
1406 | + $search_class = 'gv-search-' . $gravityview_view->search_layout; |
|
1407 | 1407 | |
1408 | - if ( ! empty( $custom_class ) ) { |
|
1409 | - $search_class .= ' '.$custom_class; |
|
1408 | + if ( ! empty( $custom_class ) ) { |
|
1409 | + $search_class .= ' ' . $custom_class; |
|
1410 | 1410 | } |
1411 | 1411 | |
1412 | 1412 | /** |
@@ -1457,9 +1457,9 @@ discard block |
||
1457 | 1457 | |
1458 | 1458 | if ( ! $label ) { |
1459 | 1459 | |
1460 | - $label = isset( $form_field['label'] ) ? $form_field['label'] : ''; |
|
1460 | + $label = isset( $form_field[ 'label' ] ) ? $form_field[ 'label' ] : ''; |
|
1461 | 1461 | |
1462 | - switch( $field['field'] ) { |
|
1462 | + switch ( $field[ 'field' ] ) { |
|
1463 | 1463 | case 'search_all': |
1464 | 1464 | $label = __( 'Search Entries:', 'gravityview' ); |
1465 | 1465 | break; |
@@ -1471,10 +1471,10 @@ discard block |
||
1471 | 1471 | break; |
1472 | 1472 | default: |
1473 | 1473 | // If this is a field input, not a field |
1474 | - if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) { |
|
1474 | + if ( strpos( $field[ 'field' ], '.' ) > 0 && ! empty( $form_field[ 'inputs' ] ) ) { |
|
1475 | 1475 | |
1476 | 1476 | // Get the label for the field in question, which returns an array |
1477 | - $items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) ); |
|
1477 | + $items = wp_list_filter( $form_field[ 'inputs' ], array( 'id' => $field[ 'field' ] ) ); |
|
1478 | 1478 | |
1479 | 1479 | // Get the item with the `label` key |
1480 | 1480 | $values = wp_list_pluck( $items, 'label' ); |
@@ -1515,13 +1515,13 @@ discard block |
||
1515 | 1515 | $form = $gravityview_view->getForm(); |
1516 | 1516 | |
1517 | 1517 | // for advanced field ids (eg, first name / last name ) |
1518 | - $name = 'filter_' . str_replace( '.', '_', $field['field'] ); |
|
1518 | + $name = 'filter_' . str_replace( '.', '_', $field[ 'field' ] ); |
|
1519 | 1519 | |
1520 | 1520 | // get searched value from $_GET/$_POST (string or array) |
1521 | 1521 | $value = $this->rgget_or_rgpost( $name ); |
1522 | 1522 | |
1523 | 1523 | // get form field details |
1524 | - $form_field = gravityview_get_field( $form, $field['field'] ); |
|
1524 | + $form_field = gravityview_get_field( $form, $field[ 'field' ] ); |
|
1525 | 1525 | |
1526 | 1526 | $form_field_type = \GV\Utils::get( $form_field, 'type' ); |
1527 | 1527 | |
@@ -1535,17 +1535,17 @@ discard block |
||
1535 | 1535 | ); |
1536 | 1536 | |
1537 | 1537 | // collect choices |
1538 | - if ( 'post_category' === $form_field_type && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) { |
|
1539 | - $filter['choices'] = gravityview_get_terms_choices(); |
|
1540 | - } elseif ( ! empty( $form_field['choices'] ) ) { |
|
1541 | - $filter['choices'] = $form_field['choices']; |
|
1538 | + if ( 'post_category' === $form_field_type && ! empty( $form_field[ 'displayAllCategories' ] ) && empty( $form_field[ 'choices' ] ) ) { |
|
1539 | + $filter[ 'choices' ] = gravityview_get_terms_choices(); |
|
1540 | + } elseif ( ! empty( $form_field[ 'choices' ] ) ) { |
|
1541 | + $filter[ 'choices' ] = $form_field[ 'choices' ]; |
|
1542 | 1542 | } |
1543 | 1543 | |
1544 | - if ( 'date_range' === $field['input'] && empty( $value ) ) { |
|
1545 | - $filter['value'] = array( 'start' => '', 'end' => '' ); |
|
1544 | + if ( 'date_range' === $field[ 'input' ] && empty( $value ) ) { |
|
1545 | + $filter[ 'value' ] = array( 'start' => '', 'end' => '' ); |
|
1546 | 1546 | } |
1547 | 1547 | |
1548 | - if ( ! empty( $filter['choices'] ) ) { |
|
1548 | + if ( ! empty( $filter[ 'choices' ] ) ) { |
|
1549 | 1549 | /** |
1550 | 1550 | * @filter `gravityview/search/sieve_choices` Only output used choices for this field. |
1551 | 1551 | * @param[in,out] bool Yes or no. |
@@ -1553,7 +1553,7 @@ discard block |
||
1553 | 1553 | * @param \GV\Context The context. |
1554 | 1554 | */ |
1555 | 1555 | if ( apply_filters( 'gravityview/search/sieve_choices', false, $field, $context ) ) { |
1556 | - $filter['choices'] = $this->sieve_filter_choices( $filter, $context ); |
|
1556 | + $filter[ 'choices' ] = $this->sieve_filter_choices( $filter, $context ); |
|
1557 | 1557 | } |
1558 | 1558 | } |
1559 | 1559 | |
@@ -1582,11 +1582,11 @@ discard block |
||
1582 | 1582 | * @return array The filter choices. |
1583 | 1583 | */ |
1584 | 1584 | private function sieve_filter_choices( $filter, $context ) { |
1585 | - if ( empty( $filter['key'] ) || empty( $filter['choices'] ) ) { |
|
1585 | + if ( empty( $filter[ 'key' ] ) || empty( $filter[ 'choices' ] ) ) { |
|
1586 | 1586 | return $filter; // @todo Populate plugins might give us empty choices |
1587 | 1587 | } |
1588 | 1588 | |
1589 | - if ( ! is_numeric( $filter['key'] ) ) { |
|
1589 | + if ( ! is_numeric( $filter[ 'key' ] ) ) { |
|
1590 | 1590 | return $filter; |
1591 | 1591 | } |
1592 | 1592 | |
@@ -1596,29 +1596,29 @@ discard block |
||
1596 | 1596 | |
1597 | 1597 | $table = GFFormsModel::get_entry_meta_table_name(); |
1598 | 1598 | |
1599 | - $key_like = $wpdb->esc_like( $filter['key'] ) . '.%'; |
|
1599 | + $key_like = $wpdb->esc_like( $filter[ 'key' ] ) . '.%'; |
|
1600 | 1600 | |
1601 | 1601 | switch ( \GV\Utils::get( $filter, 'type' ) ): |
1602 | 1602 | case 'post_category': |
1603 | 1603 | $choices = $wpdb->get_col( $wpdb->prepare( |
1604 | 1604 | "SELECT DISTINCT SUBSTRING_INDEX(meta_value, ':', 1) FROM $table WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d", |
1605 | - $key_like, $filter['key'], $form_id |
|
1605 | + $key_like, $filter[ 'key' ], $form_id |
|
1606 | 1606 | ) ); |
1607 | 1607 | break; |
1608 | 1608 | default: |
1609 | 1609 | $choices = $wpdb->get_col( $wpdb->prepare( |
1610 | 1610 | "SELECT DISTINCT meta_value FROM $table WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d", |
1611 | - $key_like, $filter['key'], $form_id |
|
1611 | + $key_like, $filter[ 'key' ], $form_id |
|
1612 | 1612 | ) ); |
1613 | 1613 | |
1614 | - if ( ( $field = gravityview_get_field( $form_id, $filter['key'] ) ) && 'json' === $field->storageType ) { |
|
1614 | + if ( ( $field = gravityview_get_field( $form_id, $filter[ 'key' ] ) ) && 'json' === $field->storageType ) { |
|
1615 | 1615 | $choices = array_map( 'json_decode', $choices ); |
1616 | 1616 | $_choices_array = array(); |
1617 | 1617 | foreach ( $choices as $choice ) { |
1618 | 1618 | if ( is_array( $choice ) ) { |
1619 | 1619 | $_choices_array = array_merge( $_choices_array, $choice ); |
1620 | 1620 | } else { |
1621 | - $_choices_array []= $choice; |
|
1621 | + $_choices_array [ ] = $choice; |
|
1622 | 1622 | } |
1623 | 1623 | } |
1624 | 1624 | $choices = array_unique( $_choices_array ); |
@@ -1628,9 +1628,9 @@ discard block |
||
1628 | 1628 | endswitch; |
1629 | 1629 | |
1630 | 1630 | $filter_choices = array(); |
1631 | - foreach ( $filter['choices'] as $choice ) { |
|
1632 | - if ( in_array( $choice['text'], $choices, true ) || in_array( $choice['value'], $choices, true ) ) { |
|
1633 | - $filter_choices[] = $choice; |
|
1631 | + foreach ( $filter[ 'choices' ] as $choice ) { |
|
1632 | + if ( in_array( $choice[ 'text' ], $choices, true ) || in_array( $choice[ 'value' ], $choices, true ) ) { |
|
1633 | + $filter_choices[ ] = $choice; |
|
1634 | 1634 | } |
1635 | 1635 | } |
1636 | 1636 | |
@@ -1665,7 +1665,7 @@ discard block |
||
1665 | 1665 | * @param \GV\View $view The view. |
1666 | 1666 | */ |
1667 | 1667 | $text = apply_filters( 'gravityview/search/created_by/text', $user->display_name, $user, $view ); |
1668 | - $choices[] = array( |
|
1668 | + $choices[ ] = array( |
|
1669 | 1669 | 'value' => $user->ID, |
1670 | 1670 | 'text' => $text, |
1671 | 1671 | ); |
@@ -1685,9 +1685,9 @@ discard block |
||
1685 | 1685 | |
1686 | 1686 | $choices = array(); |
1687 | 1687 | foreach ( GravityView_Entry_Approval_Status::get_all() as $status ) { |
1688 | - $choices[] = array( |
|
1689 | - 'value' => $status['value'], |
|
1690 | - 'text' => $status['label'], |
|
1688 | + $choices[ ] = array( |
|
1689 | + 'value' => $status[ 'value' ], |
|
1690 | + 'text' => $status[ 'label' ], |
|
1691 | 1691 | ); |
1692 | 1692 | } |
1693 | 1693 | |
@@ -1739,7 +1739,7 @@ discard block |
||
1739 | 1739 | */ |
1740 | 1740 | public function add_datepicker_js_dependency( $js_dependencies ) { |
1741 | 1741 | |
1742 | - $js_dependencies[] = 'jquery-ui-datepicker'; |
|
1742 | + $js_dependencies[ ] = 'jquery-ui-datepicker'; |
|
1743 | 1743 | |
1744 | 1744 | return $js_dependencies; |
1745 | 1745 | } |
@@ -1783,7 +1783,7 @@ discard block |
||
1783 | 1783 | 'isRTL' => is_rtl(), |
1784 | 1784 | ), $view_data ); |
1785 | 1785 | |
1786 | - $localizations['datepicker'] = $datepicker_settings; |
|
1786 | + $localizations[ 'datepicker' ] = $datepicker_settings; |
|
1787 | 1787 | |
1788 | 1788 | return $localizations; |
1789 | 1789 | |
@@ -1810,7 +1810,7 @@ discard block |
||
1810 | 1810 | * @return void |
1811 | 1811 | */ |
1812 | 1812 | private function maybe_enqueue_flexibility() { |
1813 | - if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/MSIE [8-9]/', $_SERVER['HTTP_USER_AGENT'] ) ) { |
|
1813 | + if ( isset( $_SERVER[ 'HTTP_USER_AGENT' ] ) && preg_match( '/MSIE [8-9]/', $_SERVER[ 'HTTP_USER_AGENT' ] ) ) { |
|
1814 | 1814 | wp_enqueue_script( 'gv-flexibility' ); |
1815 | 1815 | } |
1816 | 1816 | } |
@@ -1832,7 +1832,7 @@ discard block |
||
1832 | 1832 | add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 ); |
1833 | 1833 | |
1834 | 1834 | $scheme = is_ssl() ? 'https://' : 'http://'; |
1835 | - wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' ); |
|
1835 | + wp_enqueue_style( 'jquery-ui-datepicker', $scheme . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' ); |
|
1836 | 1836 | |
1837 | 1837 | /** |
1838 | 1838 | * @filter `gravityview_search_datepicker_class` |
@@ -1911,7 +1911,7 @@ discard block |
||
1911 | 1911 | public function add_preview_inputs() { |
1912 | 1912 | global $wp; |
1913 | 1913 | |
1914 | - if ( ! is_preview() || ! current_user_can( 'publish_gravityviews') ) { |
|
1914 | + if ( ! is_preview() || ! current_user_can( 'publish_gravityviews' ) ) { |
|
1915 | 1915 | return; |
1916 | 1916 | } |
1917 | 1917 | |
@@ -1963,7 +1963,7 @@ discard block |
||
1963 | 1963 | */ |
1964 | 1964 | class GravityView_Widget_Search_Author_GF_Query_Condition extends \GF_Query_Condition { |
1965 | 1965 | public function __construct( $filter, $view ) { |
1966 | - $this->value = $filter['value']; |
|
1966 | + $this->value = $filter[ 'value' ]; |
|
1967 | 1967 | $this->view = $view; |
1968 | 1968 | } |
1969 | 1969 | |
@@ -1995,11 +1995,11 @@ discard block |
||
1995 | 1995 | $conditions = array(); |
1996 | 1996 | |
1997 | 1997 | foreach ( $user_fields as $user_field ) { |
1998 | - $conditions[] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
1998 | + $conditions[ ] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
1999 | 1999 | } |
2000 | 2000 | |
2001 | 2001 | foreach ( $user_meta_fields as $meta_field ) { |
2002 | - $conditions[] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
2002 | + $conditions[ ] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
2003 | 2003 | } |
2004 | 2004 | |
2005 | 2005 | $conditions = '(' . implode( ' OR ', $conditions ) . ')'; |
@@ -84,7 +84,7 @@ |
||
84 | 84 | * @see \Gamajo_Template_Loader::set_template_data |
85 | 85 | * @see \GV\Template::pop_template_data |
86 | 86 | * |
87 | - * @return \Gamajo_Template_Loader The current instance. |
|
87 | + * @return Template The current instance. |
|
88 | 88 | */ |
89 | 89 | public function push_template_data( $data, $var_name = 'data' ) { |
90 | 90 | if ( ! isset( self::$data_stack[ $var_name ] ) ) { |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | */ |
42 | 42 | function modify_entry_value_workflow_final_status( $output, $entry, $field_settings, $field ) { |
43 | 43 | |
44 | - if( ! empty( $output ) ) { |
|
44 | + if ( ! empty( $output ) ) { |
|
45 | 45 | $output = gravity_flow()->translate_status_label( $output ); |
46 | 46 | } |
47 | 47 | |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | |
65 | 65 | foreach ( $search_fields as & $search_field ) { |
66 | 66 | if ( $this->name === \GV\Utils::get( $search_field, 'key' ) ) { |
67 | - $search_field['choices'] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options(); |
|
67 | + $search_field[ 'choices' ] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options(); |
|
68 | 68 | } |
69 | 69 | } |
70 | 70 |
@@ -7,15 +7,15 @@ discard block |
||
7 | 7 | <div id="publishing-action"> |
8 | 8 | <?php |
9 | 9 | |
10 | - /** |
|
11 | - * @filter `gravityview/edit_entry/cancel_link` Modify the cancel button link URL |
|
12 | - * @since 1.11.1 |
|
13 | - * @param string $back_link Existing URL of the Cancel link |
|
14 | - * @param array $form The Gravity Forms form |
|
15 | - * @param array $entry The Gravity Forms entry |
|
16 | - * @param int $view_id The current View ID |
|
17 | - */ |
|
18 | - $back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id ); |
|
10 | + /** |
|
11 | + * @filter `gravityview/edit_entry/cancel_link` Modify the cancel button link URL |
|
12 | + * @since 1.11.1 |
|
13 | + * @param string $back_link Existing URL of the Cancel link |
|
14 | + * @param array $form The Gravity Forms form |
|
15 | + * @param array $entry The Gravity Forms entry |
|
16 | + * @param int $view_id The current View ID |
|
17 | + */ |
|
18 | + $back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id ); |
|
19 | 19 | |
20 | 20 | /** |
21 | 21 | * @action `gravityview/edit-entry/publishing-action/before` Triggered before the submit buttons in the Edit Entry screen, inside the `<div id="publishing-action">` container. |
@@ -53,11 +53,11 @@ discard block |
||
53 | 53 | /** |
54 | 54 | * @action `gravityview/edit-entry/publishing-action/after` Triggered after the submit buttons in the Edit Entry screen, inside the `<div id="publishing-action">` container. |
55 | 55 | * @since 1.5.1 |
56 | - * @since 2.0.13 Added $post_id |
|
56 | + * @since 2.0.13 Added $post_id |
|
57 | 57 | * @param array $form The Gravity Forms form |
58 | 58 | * @param array $entry The Gravity Forms entry |
59 | 59 | * @param int $view_id The current View ID |
60 | - * @param int $post_id The current Post ID |
|
60 | + * @param int $post_id The current Post ID |
|
61 | 61 | */ |
62 | 62 | do_action( 'gravityview/edit-entry/publishing-action/after', $object->form, $object->entry, $object->view_id, $object->post_id ); |
63 | 63 |
@@ -60,28 +60,28 @@ discard block |
||
60 | 60 | if ( $object->show_previous_button ) { |
61 | 61 | $previous_tabindex = GFCommon::get_tabindex(); |
62 | 62 | ?> |
63 | - <input id="gform_previous_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-previous" type="submit" <?php echo $previous_tabindex; ?> value="<?php echo esc_attr( $labels['previous'] ); ?>" name="save" /> |
|
63 | + <input id="gform_previous_button_<?php echo esc_attr( $object->form[ 'id' ] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-previous" type="submit" <?php echo $previous_tabindex; ?> value="<?php echo esc_attr( $labels[ 'previous' ] ); ?>" name="save" /> |
|
64 | 64 | <?php |
65 | 65 | } |
66 | 66 | |
67 | 67 | if ( $object->show_next_button ) { |
68 | - $next_tabindex = GFCommon::get_tabindex(); |
|
68 | + $next_tabindex = GFCommon::get_tabindex(); |
|
69 | 69 | ?> |
70 | - <input id="gform_next_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-next" type="submit" <?php echo $next_tabindex; ?> value="<?php echo esc_attr( $labels['next'] ); ?>" name="save" /> |
|
70 | + <input id="gform_next_button_<?php echo esc_attr( $object->form[ 'id' ] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-next" type="submit" <?php echo $next_tabindex; ?> value="<?php echo esc_attr( $labels[ 'next' ] ); ?>" name="save" /> |
|
71 | 71 | <?php |
72 | 72 | } |
73 | 73 | |
74 | 74 | if ( $object->show_update_button ) { |
75 | - $update_tabindex = GFCommon::get_tabindex(); |
|
75 | + $update_tabindex = GFCommon::get_tabindex(); |
|
76 | 76 | ?> |
77 | - <input id="gform_submit_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" <?php echo $update_tabindex; ?> value="<?php echo esc_attr( $labels['submit'] ); ?>" name="save" /> |
|
77 | + <input id="gform_submit_button_<?php echo esc_attr( $object->form[ 'id' ] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" <?php echo $update_tabindex; ?> value="<?php echo esc_attr( $labels[ 'submit' ] ); ?>" name="save" /> |
|
78 | 78 | <?php |
79 | 79 | } |
80 | 80 | |
81 | - $cancel_tabindex = GFCommon::get_tabindex(); |
|
81 | + $cancel_tabindex = GFCommon::get_tabindex(); |
|
82 | 82 | |
83 | 83 | ?> |
84 | - <a class="btn btn-sm button button-small gv-button-cancel" <?php echo $cancel_tabindex; ?> href="<?php echo esc_url( $back_link ); ?>"><?php echo esc_attr( $labels['cancel'] ); ?></a> |
|
84 | + <a class="btn btn-sm button button-small gv-button-cancel" <?php echo $cancel_tabindex; ?> href="<?php echo esc_url( $back_link ); ?>"><?php echo esc_attr( $labels[ 'cancel' ] ); ?></a> |
|
85 | 85 | <?php |
86 | 86 | |
87 | 87 | /** |
@@ -97,5 +97,5 @@ discard block |
||
97 | 97 | |
98 | 98 | ?> |
99 | 99 | <input type="hidden" name="action" value="update" /> |
100 | - <input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry['id'] ); ?>" /> |
|
100 | + <input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry[ 'id' ] ); ?>" /> |
|
101 | 101 | </div> |
@@ -4,10 +4,10 @@ discard block |
||
4 | 4 | |
5 | 5 | function __construct() { |
6 | 6 | |
7 | - if( ! is_admin() ) { return; } |
|
7 | + if ( ! is_admin() ) { return; } |
|
8 | 8 | |
9 | 9 | // If Gravity Forms isn't active or compatibile, stop loading |
10 | - if( false === GravityView_Compatibility::is_valid() ) { |
|
10 | + if ( false === GravityView_Compatibility::is_valid() ) { |
|
11 | 11 | return; |
12 | 12 | } |
13 | 13 | |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | add_filter( 'post_updated_messages', array( $this, 'post_updated_messages' ) ); |
49 | 49 | add_filter( 'bulk_post_updated_messages', array( $this, 'post_updated_messages' ) ); |
50 | 50 | |
51 | - add_filter( 'plugin_action_links_'. plugin_basename( GRAVITYVIEW_FILE ) , array( $this, 'plugin_action_links' ) ); |
|
51 | + add_filter( 'plugin_action_links_' . plugin_basename( GRAVITYVIEW_FILE ), array( $this, 'plugin_action_links' ) ); |
|
52 | 52 | |
53 | 53 | add_action( 'plugins_loaded', array( $this, 'backend_actions' ), 100 ); |
54 | 54 | |
@@ -64,9 +64,9 @@ discard block |
||
64 | 64 | */ |
65 | 65 | public static function no_views_text() { |
66 | 66 | |
67 | - if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] ) { |
|
67 | + if ( isset( $_REQUEST[ 'post_status' ] ) && 'trash' === $_REQUEST[ 'post_status' ] ) { |
|
68 | 68 | return __( 'No Views found in Trash', 'gravityview' ); |
69 | - } elseif( ! empty( $_GET['s'] ) ) { |
|
69 | + } elseif ( ! empty( $_GET[ 's' ] ) ) { |
|
70 | 70 | return __( 'No Views found.', 'gravityview' ); |
71 | 71 | } |
72 | 72 | |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | $error .= ' ' . esc_html__( 'or select another form.', 'gravityview' ); |
111 | 111 | } |
112 | 112 | |
113 | - if( $error ) { |
|
113 | + if ( $error ) { |
|
114 | 114 | ?> |
115 | 115 | <div class="wp-dialog notice-warning inline error wp-clearfix"> |
116 | 116 | <?php echo gravityview_get_floaty(); ?> |
@@ -129,23 +129,23 @@ discard block |
||
129 | 129 | public function backend_actions() { |
130 | 130 | |
131 | 131 | /** @define "GRAVITYVIEW_DIR" "../" */ |
132 | - include_once( GRAVITYVIEW_DIR .'includes/admin/class.field.type.php' ); |
|
133 | - include_once( GRAVITYVIEW_DIR .'includes/admin/class.render.settings.php' ); |
|
134 | - include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-item.php' ); |
|
135 | - include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-field.php' ); |
|
136 | - include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-widget.php' ); |
|
137 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-views.php' ); |
|
138 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-welcome.php' ); |
|
139 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-installer.php' ); |
|
140 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-add-shortcode.php' ); |
|
141 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' ); |
|
132 | + include_once( GRAVITYVIEW_DIR . 'includes/admin/class.field.type.php' ); |
|
133 | + include_once( GRAVITYVIEW_DIR . 'includes/admin/class.render.settings.php' ); |
|
134 | + include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-item.php' ); |
|
135 | + include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-field.php' ); |
|
136 | + include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-widget.php' ); |
|
137 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-views.php' ); |
|
138 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-welcome.php' ); |
|
139 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-installer.php' ); |
|
140 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-add-shortcode.php' ); |
|
141 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' ); |
|
142 | 142 | |
143 | 143 | /** |
144 | 144 | * @action `gravityview_include_backend_actions` Triggered after all GravityView admin files are loaded |
145 | 145 | * |
146 | 146 | * Nice place to insert extensions' backend stuff |
147 | 147 | */ |
148 | - do_action('gravityview_include_backend_actions'); |
|
148 | + do_action( 'gravityview_include_backend_actions' ); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | /** |
@@ -161,12 +161,12 @@ discard block |
||
161 | 161 | |
162 | 162 | $actions = array(); |
163 | 163 | |
164 | - if( GVCommon::has_cap( 'gravityview_view_settings' ) ) { |
|
165 | - $actions[] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) ); |
|
164 | + if ( GVCommon::has_cap( 'gravityview_view_settings' ) ) { |
|
165 | + $actions[ ] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) ); |
|
166 | 166 | } |
167 | 167 | |
168 | - if( GVCommon::has_cap( 'gravityview_support_port' ) ) { |
|
169 | - $actions[] = '<a href="https://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>'; |
|
168 | + if ( GVCommon::has_cap( 'gravityview_support_port' ) ) { |
|
169 | + $actions[ ] = '<a href="https://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>'; |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | return array_merge( $actions, $links ); |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | // By default, there will only be one item being modified. |
195 | 195 | // When in the `bulk_post_updated_messages` filter, there will be passed a number |
196 | 196 | // of modified items that will override this array. |
197 | - $bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1 , 'locked' => 1 , 'deleted' => 1 , 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts; |
|
197 | + $bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1, 'locked' => 1, 'deleted' => 1, 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts; |
|
198 | 198 | |
199 | 199 | // If we're starting fresh, a new form was created. |
200 | 200 | // We should let the user know this is the case. |
@@ -202,60 +202,60 @@ discard block |
||
202 | 202 | |
203 | 203 | $new_form_text = ''; |
204 | 204 | |
205 | - if( !empty( $start_fresh ) ) { |
|
205 | + if ( ! empty( $start_fresh ) ) { |
|
206 | 206 | |
207 | 207 | // Get the form that was created |
208 | 208 | $connected_form = gravityview_get_form_id( $post_id ); |
209 | 209 | |
210 | - if( !empty( $connected_form ) ) { |
|
210 | + if ( ! empty( $connected_form ) ) { |
|
211 | 211 | $form = gravityview_get_form( $connected_form ); |
212 | - $form_name = esc_attr( $form['title'] ); |
|
212 | + $form_name = esc_attr( $form[ 'title' ] ); |
|
213 | 213 | $image = self::get_floaty(); |
214 | - $new_form_text .= '<h3>'.$image.sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ).'</h3>'; |
|
215 | - $new_form_text .= sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s |
|
214 | + $new_form_text .= '<h3>' . $image . sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ) . '</h3>'; |
|
215 | + $new_form_text .= sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s |
|
216 | 216 | |
217 | 217 | You can %sedit the form%s in Gravity Forms and the updated fields will be available here. Don’t forget to %scustomize the form settings%s. |
218 | - ', 'gravityview' ), '<strong>', '</strong>', '<a href="'.site_url( '?gf_page=preview&id='.$connected_form ).'">', '</a>', '<code>[gravityform id="'.$connected_form.'" name="'.$form_name.'"]</code>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&id='.$connected_form ).'">', '</a>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&view=settings&id='.$connected_form ).'">', '</a>'); |
|
218 | + ', 'gravityview' ), '<strong>', '</strong>', '<a href="' . site_url( '?gf_page=preview&id=' . $connected_form ) . '">', '</a>', '<code>[gravityform id="' . $connected_form . '" name="' . $form_name . '"]</code>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&id=' . $connected_form ) . '">', '</a>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&view=settings&id=' . $connected_form ) . '">', '</a>' ); |
|
219 | 219 | $new_form_text = wpautop( $new_form_text ); |
220 | 220 | |
221 | 221 | delete_post_meta( $post_id, '_gravityview_start_fresh' ); |
222 | 222 | } |
223 | 223 | } |
224 | 224 | |
225 | - $messages['gravityview'] = array( |
|
225 | + $messages[ 'gravityview' ] = array( |
|
226 | 226 | 0 => '', // Unused. Messages start at index 1. |
227 | 227 | /* translators: %s and %s are HTML tags linking to the View on the website */ |
228 | - 1 => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'), |
|
228 | + 1 => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ), |
|
229 | 229 | /* translators: %s and %s are HTML tags linking to the View on the website */ |
230 | - 2 => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'), |
|
230 | + 2 => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ), |
|
231 | 231 | 3 => __( 'View deleted.', 'gravityview' ), |
232 | 232 | /* translators: %s and %s are HTML tags linking to the View on the website */ |
233 | - 4 => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'), |
|
233 | + 4 => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ), |
|
234 | 234 | /* translators: %s: date and time of the revision */ |
235 | - 5 => isset( $_GET['revision'] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false, |
|
235 | + 5 => isset( $_GET[ 'revision' ] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int)$_GET[ 'revision' ], false ) ) : false, |
|
236 | 236 | /* translators: %s and %s are HTML tags linking to the View on the website */ |
237 | - 6 => sprintf(__( 'View published. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text, |
|
237 | + 6 => sprintf( __( 'View published. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text, |
|
238 | 238 | /* translators: %s and %s are HTML tags linking to the View on the website */ |
239 | - 7 => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text, |
|
239 | + 7 => sprintf( __( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text, |
|
240 | 240 | 8 => __( 'View submitted.', 'gravityview' ), |
241 | 241 | 9 => sprintf( |
242 | 242 | /* translators: Date and time the View is scheduled to be published */ |
243 | 243 | __( 'View scheduled for: %1$s.', 'gravityview' ), |
244 | 244 | // translators: Publish box date format, see http://php.net/date |
245 | - date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL ) ) ) |
|
245 | + date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL ) ) ) |
|
246 | 246 | ) . $new_form_text, |
247 | 247 | /* translators: %s and %s are HTML tags linking to the View on the website */ |
248 | - 10 => sprintf(__( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text, |
|
248 | + 10 => sprintf( __( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text, |
|
249 | 249 | |
250 | 250 | /** |
251 | 251 | * These apply to `bulk_post_updated_messages` |
252 | 252 | * @file wp-admin/edit.php |
253 | 253 | */ |
254 | - 'updated' => _n( '%s View updated.', '%s Views updated.', $bulk_counts['updated'], 'gravityview' ), |
|
255 | - 'locked' => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts['locked'], 'gravityview' ), |
|
256 | - 'deleted' => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts['deleted'], 'gravityview' ), |
|
257 | - 'trashed' => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts['trashed'], 'gravityview' ), |
|
258 | - 'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts['untrashed'], 'gravityview' ), |
|
254 | + 'updated' => _n( '%s View updated.', '%s Views updated.', $bulk_counts[ 'updated' ], 'gravityview' ), |
|
255 | + 'locked' => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts[ 'locked' ], 'gravityview' ), |
|
256 | + 'deleted' => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts[ 'deleted' ], 'gravityview' ), |
|
257 | + 'trashed' => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts[ 'trashed' ], 'gravityview' ), |
|
258 | + 'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts[ 'untrashed' ], 'gravityview' ), |
|
259 | 259 | ); |
260 | 260 | |
261 | 261 | return $messages; |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | * @return void |
93 | 93 | */ |
94 | 94 | public static function connected_form_warning( $form_id = 0 ) { |
95 | - global $pagenow; |
|
95 | + global $pagenow; |
|
96 | 96 | |
97 | 97 | if ( empty( $form_id ) || $pagenow === 'post-new.php' ) { |
98 | 98 | return; |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | <?php |
120 | 120 | } |
121 | 121 | |
122 | - remove_action( 'gravityview/metaboxes/data-source/before', array( 'GravityView_Admin', 'connected_form_warning' ) ); |
|
122 | + remove_action( 'gravityview/metaboxes/data-source/before', array( 'GravityView_Admin', 'connected_form_warning' ) ); |
|
123 | 123 | } |
124 | 124 | |
125 | 125 | /** |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | 7 => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text, |
242 | 242 | 8 => __( 'View submitted.', 'gravityview' ), |
243 | 243 | 9 => sprintf( |
244 | - /* translators: Date and time the View is scheduled to be published */ |
|
244 | + /* translators: Date and time the View is scheduled to be published */ |
|
245 | 245 | __( 'View scheduled for: %1$s.', 'gravityview' ), |
246 | 246 | // translators: Publish box date format, see http://php.net/date |
247 | 247 | date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL ) ) ) |
@@ -298,7 +298,6 @@ discard block |
||
298 | 298 | * |
299 | 299 | * @deprecated since 1.12 |
300 | 300 | * @see GravityView_Compatibility::get_plugin_status() |
301 | - |
|
302 | 301 | * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive |
303 | 302 | */ |
304 | 303 | static function get_plugin_status( $location = '' ) { |
@@ -7,15 +7,15 @@ |
||
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 | $html_input_type = RGFormsModel::is_html5_enabled() ? 'search' : 'text'; |
14 | 14 | ?> |
15 | 15 | |
16 | 16 | <div class="gv-search-box gv-search-field-text gv-search-field-search_all"> |
17 | 17 | <div class="gv-search"> |
18 | - <?php if( ! gv_empty( $label, false, false ) ) { ?> |
|
18 | + <?php if ( ! gv_empty( $label, false, false ) ) { ?> |
|
19 | 19 | <label for="gv_search_<?php echo $view_id; ?>"><?php echo esc_html( $label ); ?></label> |
20 | 20 | <?php } ?> |
21 | 21 | <p><input type="<?php echo $html_input_type; ?>" name="gv_search" id="gv_search_<?php echo $view_id; ?>" value="<?php echo esc_attr( $value ); ?>" /></p> |
@@ -7,13 +7,13 @@ |
||
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> |