@@ -20,15 +20,15 @@ |
||
20 | 20 | */ |
21 | 21 | function gravityview_register_gravityview_widgets() { |
22 | 22 | |
23 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' ); |
|
23 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' ); |
|
24 | 24 | |
25 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-pagination-info.php' ); |
|
26 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-links.php' ); |
|
27 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-custom-content.php' ); |
|
28 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/search-widget/class-search-widget.php' ); |
|
25 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-pagination-info.php' ); |
|
26 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-links.php' ); |
|
27 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-custom-content.php' ); |
|
28 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/search-widget/class-search-widget.php' ); |
|
29 | 29 | |
30 | - if( class_exists('GFPolls') ) { |
|
31 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/poll/class-gravityview-widget-poll.php' ); |
|
30 | + if ( class_exists( 'GFPolls' ) ) { |
|
31 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/poll/class-gravityview-widget-poll.php' ); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | } |
@@ -7,4 +7,4 @@ |
||
7 | 7 | |
8 | 8 | $gravityview_view = GravityView_View::getInstance(); |
9 | 9 | $search_field = $gravityview_view->search_field; |
10 | -?><div><input type="hidden" name="<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $search_field['value'] ); ?>"></div> |
|
11 | 10 | \ No newline at end of file |
11 | +?><div><input type="hidden" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $search_field[ 'value' ] ); ?>"></div> |
|
12 | 12 | \ No newline at end of file |
@@ -622,7 +622,7 @@ |
||
622 | 622 | 'ymd_dot' => 'Y.m.d', |
623 | 623 | ); |
624 | 624 | |
625 | - if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){ |
|
625 | + if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) { |
|
626 | 626 | $format = $datepicker[ $field->dateFormat ]; |
627 | 627 | } |
628 | 628 |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | /** |
202 | 202 | * Add admin script to the no-conflict scripts whitelist |
203 | 203 | * @param array $allowed Scripts allowed in no-conflict mode |
204 | - * @return array Scripts allowed in no-conflict mode, plus the search widget script |
|
204 | + * @return string[] Scripts allowed in no-conflict mode, plus the search widget script |
|
205 | 205 | */ |
206 | 206 | public function register_no_conflict( $allowed ) { |
207 | 207 | $allowed[] = 'gravityview_searchwidget_admin'; |
@@ -889,7 +889,7 @@ discard block |
||
889 | 889 | /** |
890 | 890 | * Get the label for a search form field |
891 | 891 | * @param array $field Field setting as sent by the GV configuration - has `field`, `input` (input type), and `label` keys |
892 | - * @param array $form_field Form field data, as fetched by `gravityview_get_field()` |
|
892 | + * @param GF_Field|null $form_field Form field data, as fetched by `gravityview_get_field()` |
|
893 | 893 | * @return string Label for the search form |
894 | 894 | */ |
895 | 895 | private static function get_field_label( $field, $form_field = array() ) { |
@@ -1058,7 +1058,7 @@ discard block |
||
1058 | 1058 | /** |
1059 | 1059 | * Require the datepicker script for the frontend GV script |
1060 | 1060 | * @param array $js_dependencies Array of existing required scripts for the fe-views.js script |
1061 | - * @return array Array required scripts, with `jquery-ui-datepicker` added |
|
1061 | + * @return string[] Array required scripts, with `jquery-ui-datepicker` added |
|
1062 | 1062 | */ |
1063 | 1063 | public function add_datepicker_js_dependency( $js_dependencies ) { |
1064 | 1064 | |
@@ -1070,7 +1070,7 @@ discard block |
||
1070 | 1070 | /** |
1071 | 1071 | * Modify the array passed to wp_localize_script() |
1072 | 1072 | * |
1073 | - * @param array $js_localization The data padded to the Javascript file |
|
1073 | + * @param array $localizations The data padded to the Javascript file |
|
1074 | 1074 | * @param array $view_data View data array with View settings |
1075 | 1075 | * |
1076 | 1076 | * @return array |
@@ -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( |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | |
87 | 87 | // admin - add scripts - run at 1100 to make sure GravityView_Admin_Views::add_scripts_and_styles() runs first at 999 |
88 | 88 | add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 1100 ); |
89 | - add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') ); |
|
89 | + add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) ); |
|
90 | 90 | add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) ); |
91 | 91 | |
92 | 92 | // ajax - get the searchable fields |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | $script_min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
225 | 225 | $script_source = empty( $script_min ) ? '/source' : ''; |
226 | 226 | |
227 | - 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 ); |
|
227 | + 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 ); |
|
228 | 228 | |
229 | 229 | wp_localize_script( 'gravityview_searchwidget_admin', 'gvSearchVar', array( |
230 | 230 | 'nonce' => wp_create_nonce( 'gravityview_ajaxsearchwidget' ), |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | * @return array Scripts allowed in no-conflict mode, plus the search widget script |
247 | 247 | */ |
248 | 248 | public function register_no_conflict( $allowed ) { |
249 | - $allowed[] = 'gravityview_searchwidget_admin'; |
|
249 | + $allowed[ ] = 'gravityview_searchwidget_admin'; |
|
250 | 250 | return $allowed; |
251 | 251 | } |
252 | 252 | |
@@ -259,24 +259,24 @@ discard block |
||
259 | 259 | */ |
260 | 260 | public static function get_searchable_fields() { |
261 | 261 | |
262 | - if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxsearchwidget' ) ) { |
|
262 | + if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxsearchwidget' ) ) { |
|
263 | 263 | exit( '0' ); |
264 | 264 | } |
265 | 265 | |
266 | 266 | $form = ''; |
267 | 267 | |
268 | 268 | // Fetch the form for the current View |
269 | - if ( ! empty( $_POST['view_id'] ) ) { |
|
269 | + if ( ! empty( $_POST[ 'view_id' ] ) ) { |
|
270 | 270 | |
271 | - $form = gravityview_get_form_id( $_POST['view_id'] ); |
|
271 | + $form = gravityview_get_form_id( $_POST[ 'view_id' ] ); |
|
272 | 272 | |
273 | - } elseif ( ! empty( $_POST['formid'] ) ) { |
|
273 | + } elseif ( ! empty( $_POST[ 'formid' ] ) ) { |
|
274 | 274 | |
275 | - $form = (int) $_POST['formid']; |
|
275 | + $form = (int)$_POST[ 'formid' ]; |
|
276 | 276 | |
277 | - } elseif ( ! empty( $_POST['template_id'] ) && class_exists( 'GravityView_Ajax' ) ) { |
|
277 | + } elseif ( ! empty( $_POST[ 'template_id' ] ) && class_exists( 'GravityView_Ajax' ) ) { |
|
278 | 278 | |
279 | - $form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] ); |
|
279 | + $form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] ); |
|
280 | 280 | |
281 | 281 | } |
282 | 282 | |
@@ -325,8 +325,8 @@ discard block |
||
325 | 325 | ), |
326 | 326 | ); |
327 | 327 | |
328 | - foreach( $custom_fields as $custom_field_key => $custom_field ) { |
|
329 | - $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'] ); |
|
328 | + foreach ( $custom_fields as $custom_field_key => $custom_field ) { |
|
329 | + $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' ] ); |
|
330 | 330 | } |
331 | 331 | |
332 | 332 | // Get fields with sub-inputs and no parent |
@@ -348,13 +348,13 @@ discard block |
||
348 | 348 | |
349 | 349 | foreach ( $fields as $id => $field ) { |
350 | 350 | |
351 | - if ( in_array( $field['type'], $blacklist_field_types ) ) { |
|
351 | + if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) { |
|
352 | 352 | continue; |
353 | 353 | } |
354 | 354 | |
355 | - $types = self::get_search_input_types( $id, $field['type'] ); |
|
355 | + $types = self::get_search_input_types( $id, $field[ 'type' ] ); |
|
356 | 356 | |
357 | - $output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'data-inputtypes="'. esc_attr( $types ) .'">'. esc_html( $field['label'] ) .'</option>'; |
|
357 | + $output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . 'data-inputtypes="' . esc_attr( $types ) . '">' . esc_html( $field[ 'label' ] ) . '</option>'; |
|
358 | 358 | } |
359 | 359 | } |
360 | 360 | |
@@ -377,7 +377,7 @@ discard block |
||
377 | 377 | public static function get_search_input_types( $field_id = '', $field_type = null ) { |
378 | 378 | |
379 | 379 | // @todo - This needs to be improved - many fields have . including products and addresses |
380 | - if ( false !== strpos( (string) $field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) { |
|
380 | + if ( false !== strpos( (string)$field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) { |
|
381 | 381 | $input_type = 'boolean'; // on/off checkbox |
382 | 382 | } elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) { |
383 | 383 | $input_type = 'multi'; //multiselect |
@@ -421,19 +421,19 @@ discard block |
||
421 | 421 | $post_id = 0; |
422 | 422 | |
423 | 423 | // We're in the WordPress Widget context, and an overriding post ID has been set. |
424 | - if ( ! empty( $widget_args['post_id'] ) ) { |
|
425 | - $post_id = absint( $widget_args['post_id'] ); |
|
424 | + if ( ! empty( $widget_args[ 'post_id' ] ) ) { |
|
425 | + $post_id = absint( $widget_args[ 'post_id' ] ); |
|
426 | 426 | } |
427 | 427 | // We're in the WordPress Widget context, and the base View ID should be used |
428 | - else if ( ! empty( $widget_args['view_id'] ) ) { |
|
429 | - $post_id = absint( $widget_args['view_id'] ); |
|
428 | + else if ( ! empty( $widget_args[ 'view_id' ] ) ) { |
|
429 | + $post_id = absint( $widget_args[ 'view_id' ] ); |
|
430 | 430 | } |
431 | 431 | |
432 | 432 | $args = gravityview_get_permalink_query_args( $post_id ); |
433 | 433 | |
434 | 434 | // Add hidden fields to the search form |
435 | 435 | foreach ( $args as $key => $value ) { |
436 | - $search_fields[] = array( |
|
436 | + $search_fields[ ] = array( |
|
437 | 437 | 'name' => $key, |
438 | 438 | 'input' => 'hidden', |
439 | 439 | 'value' => $value, |
@@ -470,22 +470,22 @@ discard block |
||
470 | 470 | /** |
471 | 471 | * Include the sidebar Widgets. |
472 | 472 | */ |
473 | - $widgets = (array) get_option( 'widget_gravityview_search', array() ); |
|
473 | + $widgets = (array)get_option( 'widget_gravityview_search', array() ); |
|
474 | 474 | |
475 | 475 | foreach ( $widgets as $widget ) { |
476 | - if ( ! empty( $widget['view_id'] ) && $widget['view_id'] == $view->ID ) { |
|
477 | - if( $_fields = json_decode( $widget['search_fields'], true ) ) { |
|
476 | + if ( ! empty( $widget[ 'view_id' ] ) && $widget[ 'view_id' ] == $view->ID ) { |
|
477 | + if ( $_fields = json_decode( $widget[ 'search_fields' ], true ) ) { |
|
478 | 478 | foreach ( $_fields as $field ) { |
479 | - $searchable_fields [] = $field['field']; |
|
479 | + $searchable_fields [ ] = $field[ 'field' ]; |
|
480 | 480 | } |
481 | 481 | } |
482 | 482 | } |
483 | 483 | } |
484 | 484 | |
485 | 485 | foreach ( $view->widgets->by_id( $this->get_widget_id() )->all() as $widget ) { |
486 | - if( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) { |
|
486 | + if ( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) { |
|
487 | 487 | foreach ( $_fields as $field ) { |
488 | - $searchable_fields [] = $field['field']; |
|
488 | + $searchable_fields [ ] = $field[ 'field' ]; |
|
489 | 489 | } |
490 | 490 | } |
491 | 491 | } |
@@ -502,7 +502,7 @@ discard block |
||
502 | 502 | */ |
503 | 503 | public function filter_entries( $search_criteria, $form_id = null, $args = array() ) { |
504 | 504 | |
505 | - if( 'post' === $this->search_method ) { |
|
505 | + if ( 'post' === $this->search_method ) { |
|
506 | 506 | $get = $_POST; |
507 | 507 | } else { |
508 | 508 | $get = $_GET; |
@@ -521,14 +521,14 @@ discard block |
||
521 | 521 | $get = gv_map_deep( $get, 'rawurldecode' ); |
522 | 522 | |
523 | 523 | // Make sure array key is set up |
524 | - $search_criteria['field_filters'] = \GV\Utils::get( $search_criteria, 'field_filters', array() ); |
|
524 | + $search_criteria[ 'field_filters' ] = \GV\Utils::get( $search_criteria, 'field_filters', array() ); |
|
525 | 525 | |
526 | 526 | $searchable_fields = $this->get_view_searchable_fields( $view ); |
527 | 527 | |
528 | 528 | // add free search |
529 | - if ( isset( $get['gv_search'] ) && '' !== $get['gv_search'] && in_array( 'search_all', $searchable_fields ) ) { |
|
529 | + if ( isset( $get[ 'gv_search' ] ) && '' !== $get[ 'gv_search' ] && in_array( 'search_all', $searchable_fields ) ) { |
|
530 | 530 | |
531 | - $search_all_value = trim( $get['gv_search'] ); |
|
531 | + $search_all_value = trim( $get[ 'gv_search' ] ); |
|
532 | 532 | |
533 | 533 | /** |
534 | 534 | * @filter `gravityview/search-all-split-words` Search for each word separately or the whole phrase? |
@@ -553,7 +553,7 @@ discard block |
||
553 | 553 | } |
554 | 554 | |
555 | 555 | foreach ( $words as $word ) { |
556 | - $search_criteria['field_filters'][] = array( |
|
556 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
557 | 557 | 'key' => null, // The field ID to search |
558 | 558 | 'value' => $word, // The value to search |
559 | 559 | 'operator' => 'contains', // What to search in. Options: `is` or `contains` |
@@ -563,19 +563,19 @@ discard block |
||
563 | 563 | |
564 | 564 | // start date & end date |
565 | 565 | if ( in_array( 'entry_date', $searchable_fields ) ) { |
566 | - $curr_start = !empty( $get['gv_start'] ) ? $get['gv_start'] : ''; |
|
567 | - $curr_end = !empty( $get['gv_start'] ) ? $get['gv_end'] : ''; |
|
566 | + $curr_start = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_start' ] : ''; |
|
567 | + $curr_end = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_end' ] : ''; |
|
568 | 568 | |
569 | 569 | if ( $view ) { |
570 | 570 | /** |
571 | 571 | * Override start and end dates if View is limited to some already. |
572 | 572 | */ |
573 | - if ( $start_date =$view->settings->get( 'start_date' ) ) { |
|
573 | + if ( $start_date = $view->settings->get( 'start_date' ) ) { |
|
574 | 574 | if ( $start_timestamp = strtotime( $curr_start ) ) { |
575 | 575 | $curr_start = $start_timestamp < strtotime( $start_date ) ? $start_date : $curr_start; |
576 | 576 | } |
577 | 577 | } |
578 | - if ( $end_date =$view->settings->get( 'end_date' ) ) { |
|
578 | + if ( $end_date = $view->settings->get( 'end_date' ) ) { |
|
579 | 579 | if ( $end_timestamp = strtotime( $curr_end ) ) { |
580 | 580 | $curr_end = $end_timestamp > strtotime( $end_date ) ? $end_date : $curr_end; |
581 | 581 | } |
@@ -596,19 +596,19 @@ discard block |
||
596 | 596 | */ |
597 | 597 | if ( ! empty( $curr_start ) ) { |
598 | 598 | $curr_start = date( 'Y-m-d H:i:s', strtotime( $curr_start ) ); |
599 | - $search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start; |
|
599 | + $search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start; |
|
600 | 600 | } |
601 | 601 | |
602 | 602 | if ( ! empty( $curr_end ) ) { |
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 | - $search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end; |
|
605 | + $search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end; |
|
606 | 606 | } |
607 | 607 | } |
608 | 608 | |
609 | 609 | // search for a specific entry ID |
610 | 610 | if ( ! empty( $get[ 'gv_id' ] ) && in_array( 'entry_id', $searchable_fields ) ) { |
611 | - $search_criteria['field_filters'][] = array( |
|
611 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
612 | 612 | 'key' => 'id', |
613 | 613 | 'value' => absint( $get[ 'gv_id' ] ), |
614 | 614 | 'operator' => '=', |
@@ -617,42 +617,42 @@ discard block |
||
617 | 617 | |
618 | 618 | // search for a specific Created_by ID |
619 | 619 | if ( ! empty( $get[ 'gv_by' ] ) && in_array( 'entry_creator', $searchable_fields ) ) { |
620 | - $search_criteria['field_filters'][] = array( |
|
620 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
621 | 621 | 'key' => 'created_by', |
622 | - 'value' => absint( $get['gv_by'] ), |
|
622 | + 'value' => absint( $get[ 'gv_by' ] ), |
|
623 | 623 | 'operator' => '=', |
624 | 624 | ); |
625 | 625 | } |
626 | 626 | |
627 | 627 | |
628 | 628 | // Get search mode passed in URL |
629 | - $mode = isset( $get['mode'] ) && in_array( $get['mode'], array( 'any', 'all' ) ) ? $get['mode'] : 'any'; |
|
629 | + $mode = isset( $get[ 'mode' ] ) && in_array( $get[ 'mode' ], array( 'any', 'all' ) ) ? $get[ 'mode' ] : 'any'; |
|
630 | 630 | |
631 | 631 | // get the other search filters |
632 | 632 | foreach ( $get as $key => $value ) { |
633 | 633 | |
634 | - if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[0], false, false ) ) ) { |
|
634 | + if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[ 0 ], false, false ) ) ) { |
|
635 | 635 | continue; |
636 | 636 | } |
637 | 637 | |
638 | 638 | $filter_key = $this->convert_request_key_to_filter_key( $key ); |
639 | 639 | |
640 | 640 | // could return simple filter or multiple filters |
641 | - if ( ! in_array( 'search_all', $searchable_fields ) && ! in_array( $filter_key , $searchable_fields ) ) { |
|
641 | + if ( ! in_array( 'search_all', $searchable_fields ) && ! in_array( $filter_key, $searchable_fields ) ) { |
|
642 | 642 | continue; |
643 | 643 | } |
644 | 644 | |
645 | 645 | $filter = $this->prepare_field_filter( $filter_key, $value, $view ); |
646 | 646 | |
647 | - if ( isset( $filter[0]['value'] ) ) { |
|
648 | - $search_criteria['field_filters'] = array_merge( $search_criteria['field_filters'], $filter ); |
|
647 | + if ( isset( $filter[ 0 ][ 'value' ] ) ) { |
|
648 | + $search_criteria[ 'field_filters' ] = array_merge( $search_criteria[ 'field_filters' ], $filter ); |
|
649 | 649 | |
650 | 650 | // if date range type, set search mode to ALL |
651 | - if ( ! empty( $filter[0]['operator'] ) && in_array( $filter[0]['operator'], array( '>=', '<=', '>', '<' ) ) ) { |
|
651 | + if ( ! empty( $filter[ 0 ][ 'operator' ] ) && in_array( $filter[ 0 ][ 'operator' ], array( '>=', '<=', '>', '<' ) ) ) { |
|
652 | 652 | $mode = 'all'; |
653 | 653 | } |
654 | - } elseif( !empty( $filter ) ) { |
|
655 | - $search_criteria['field_filters'][] = $filter; |
|
654 | + } elseif ( ! empty( $filter ) ) { |
|
655 | + $search_criteria[ 'field_filters' ][ ] = $filter; |
|
656 | 656 | } |
657 | 657 | } |
658 | 658 | |
@@ -661,7 +661,7 @@ discard block |
||
661 | 661 | * @since 1.5.1 |
662 | 662 | * @param[out,in] string $mode Search mode (`any` vs `all`) |
663 | 663 | */ |
664 | - $search_criteria['field_filters']['mode'] = apply_filters( 'gravityview/search/mode', $mode ); |
|
664 | + $search_criteria[ 'field_filters' ][ 'mode' ] = apply_filters( 'gravityview/search/mode', $mode ); |
|
665 | 665 | |
666 | 666 | gravityview()->log->debug( 'Returned Search Criteria: ', array( 'data' => $search_criteria ) ); |
667 | 667 | |
@@ -689,7 +689,7 @@ discard block |
||
689 | 689 | $field_id = str_replace( 'filter_', '', $key ); |
690 | 690 | |
691 | 691 | // calculates field_id, removing 'filter_' and for '_' for advanced fields ( like name or checkbox ) |
692 | - if ( preg_match('/^[0-9_]+$/ism', $field_id ) ) { |
|
692 | + if ( preg_match( '/^[0-9_]+$/ism', $field_id ) ) { |
|
693 | 693 | $field_id = str_replace( '_', '.', $field_id ); |
694 | 694 | } |
695 | 695 | |
@@ -724,7 +724,7 @@ discard block |
||
724 | 724 | |
725 | 725 | case 'select': |
726 | 726 | case 'radio': |
727 | - $filter['operator'] = 'is'; |
|
727 | + $filter[ 'operator' ] = 'is'; |
|
728 | 728 | break; |
729 | 729 | |
730 | 730 | case 'post_category': |
@@ -738,7 +738,7 @@ discard block |
||
738 | 738 | |
739 | 739 | foreach ( $value as $val ) { |
740 | 740 | $cat = get_term( $val, 'category' ); |
741 | - $filter[] = array( |
|
741 | + $filter[ ] = array( |
|
742 | 742 | 'key' => $filter_key, |
743 | 743 | 'value' => esc_attr( $cat->name ) . ':' . $val, |
744 | 744 | 'operator' => 'is', |
@@ -757,7 +757,7 @@ discard block |
||
757 | 757 | $filter = array(); |
758 | 758 | |
759 | 759 | foreach ( $value as $val ) { |
760 | - $filter[] = array( 'key' => $filter_key, 'value' => $val ); |
|
760 | + $filter[ ] = array( 'key' => $filter_key, 'value' => $val ); |
|
761 | 761 | } |
762 | 762 | |
763 | 763 | break; |
@@ -766,9 +766,9 @@ discard block |
||
766 | 766 | // convert checkbox on/off into the correct search filter |
767 | 767 | if ( false !== strpos( $filter_key, '.' ) && ! empty( $form_field->inputs ) && ! empty( $form_field->choices ) ) { |
768 | 768 | foreach ( $form_field->inputs as $k => $input ) { |
769 | - if ( $input['id'] == $filter_key ) { |
|
770 | - $filter['value'] = $form_field->choices[ $k ]['value']; |
|
771 | - $filter['operator'] = 'is'; |
|
769 | + if ( $input[ 'id' ] == $filter_key ) { |
|
770 | + $filter[ 'value' ] = $form_field->choices[ $k ][ 'value' ]; |
|
771 | + $filter[ 'operator' ] = 'is'; |
|
772 | 772 | break; |
773 | 773 | } |
774 | 774 | } |
@@ -778,7 +778,7 @@ discard block |
||
778 | 778 | $filter = array(); |
779 | 779 | |
780 | 780 | foreach ( $value as $val ) { |
781 | - $filter[] = array( |
|
781 | + $filter[ ] = array( |
|
782 | 782 | 'key' => $filter_key, |
783 | 783 | 'value' => $val, |
784 | 784 | 'operator' => 'is', |
@@ -799,9 +799,9 @@ discard block |
||
799 | 799 | foreach ( $words as $word ) { |
800 | 800 | if ( ! empty( $word ) && strlen( $word ) > 1 ) { |
801 | 801 | // Keep the same key for each filter |
802 | - $filter['value'] = $word; |
|
802 | + $filter[ 'value' ] = $word; |
|
803 | 803 | // Add a search for the value |
804 | - $filters[] = $filter; |
|
804 | + $filters[ ] = $filter; |
|
805 | 805 | } |
806 | 806 | } |
807 | 807 | |
@@ -828,19 +828,19 @@ discard block |
||
828 | 828 | * @since 1.16.3 |
829 | 829 | * Safeguard until GF implements '<=' operator |
830 | 830 | */ |
831 | - if( !GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) { |
|
831 | + if ( ! GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) { |
|
832 | 832 | $operator = '<'; |
833 | 833 | $date = date( 'Y-m-d', strtotime( $date . ' +1 day' ) ); |
834 | 834 | } |
835 | 835 | |
836 | - $filter[] = array( |
|
836 | + $filter[ ] = array( |
|
837 | 837 | 'key' => $filter_key, |
838 | 838 | 'value' => self::get_formatted_date( $date, 'Y-m-d' ), |
839 | 839 | 'operator' => $operator, |
840 | 840 | ); |
841 | 841 | } |
842 | 842 | } else { |
843 | - $filter['value'] = self::get_formatted_date( $value, 'Y-m-d' ); |
|
843 | + $filter[ 'value' ] = self::get_formatted_date( $value, 'Y-m-d' ); |
|
844 | 844 | } |
845 | 845 | |
846 | 846 | break; |
@@ -871,7 +871,7 @@ discard block |
||
871 | 871 | 'ymd_dot' => 'Y.m.d', |
872 | 872 | ); |
873 | 873 | |
874 | - if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){ |
|
874 | + if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) { |
|
875 | 875 | $format = $datepicker[ $field->dateFormat ]; |
876 | 876 | } |
877 | 877 | |
@@ -902,7 +902,7 @@ discard block |
||
902 | 902 | public function add_template_path( $file_paths ) { |
903 | 903 | |
904 | 904 | // Index 100 is the default GravityView template path. |
905 | - $file_paths[102] = self::$file . 'templates/'; |
|
905 | + $file_paths[ 102 ] = self::$file . 'templates/'; |
|
906 | 906 | |
907 | 907 | return $file_paths; |
908 | 908 | } |
@@ -921,7 +921,7 @@ discard block |
||
921 | 921 | $has_date = false; |
922 | 922 | |
923 | 923 | foreach ( $search_fields as $k => $field ) { |
924 | - if ( in_array( $field['input'], array( 'date', 'date_range', 'entry_date' ) ) ) { |
|
924 | + if ( in_array( $field[ 'input' ], array( 'date', 'date_range', 'entry_date' ) ) ) { |
|
925 | 925 | $has_date = true; |
926 | 926 | break; |
927 | 927 | } |
@@ -948,7 +948,7 @@ discard block |
||
948 | 948 | } |
949 | 949 | |
950 | 950 | // get configured search fields |
951 | - $search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : ''; |
|
951 | + $search_fields = ! empty( $widget_args[ 'search_fields' ] ) ? json_decode( $widget_args[ 'search_fields' ], true ) : ''; |
|
952 | 952 | |
953 | 953 | if ( empty( $search_fields ) || ! is_array( $search_fields ) ) { |
954 | 954 | gravityview()->log->debug( 'No search fields configured for widget:', array( 'data' => $widget_args ) ); |
@@ -963,34 +963,34 @@ discard block |
||
963 | 963 | |
964 | 964 | $updated_field = $this->get_search_filter_details( $updated_field ); |
965 | 965 | |
966 | - switch ( $field['field'] ) { |
|
966 | + switch ( $field[ 'field' ] ) { |
|
967 | 967 | |
968 | 968 | case 'search_all': |
969 | - $updated_field['key'] = 'search_all'; |
|
970 | - $updated_field['input'] = 'search_all'; |
|
971 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_search' ); |
|
969 | + $updated_field[ 'key' ] = 'search_all'; |
|
970 | + $updated_field[ 'input' ] = 'search_all'; |
|
971 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_search' ); |
|
972 | 972 | break; |
973 | 973 | |
974 | 974 | case 'entry_date': |
975 | - $updated_field['key'] = 'entry_date'; |
|
976 | - $updated_field['input'] = 'entry_date'; |
|
977 | - $updated_field['value'] = array( |
|
975 | + $updated_field[ 'key' ] = 'entry_date'; |
|
976 | + $updated_field[ 'input' ] = 'entry_date'; |
|
977 | + $updated_field[ 'value' ] = array( |
|
978 | 978 | 'start' => $this->rgget_or_rgpost( 'gv_start' ), |
979 | 979 | 'end' => $this->rgget_or_rgpost( 'gv_end' ), |
980 | 980 | ); |
981 | 981 | break; |
982 | 982 | |
983 | 983 | case 'entry_id': |
984 | - $updated_field['key'] = 'entry_id'; |
|
985 | - $updated_field['input'] = 'entry_id'; |
|
986 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_id' ); |
|
984 | + $updated_field[ 'key' ] = 'entry_id'; |
|
985 | + $updated_field[ 'input' ] = 'entry_id'; |
|
986 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_id' ); |
|
987 | 987 | break; |
988 | 988 | |
989 | 989 | case 'created_by': |
990 | - $updated_field['key'] = 'created_by'; |
|
991 | - $updated_field['name'] = 'gv_by'; |
|
992 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_by' ); |
|
993 | - $updated_field['choices'] = self::get_created_by_choices(); |
|
990 | + $updated_field[ 'key' ] = 'created_by'; |
|
991 | + $updated_field[ 'name' ] = 'gv_by'; |
|
992 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_by' ); |
|
993 | + $updated_field[ 'choices' ] = self::get_created_by_choices(); |
|
994 | 994 | break; |
995 | 995 | } |
996 | 996 | |
@@ -1009,16 +1009,16 @@ discard block |
||
1009 | 1009 | */ |
1010 | 1010 | $gravityview_view->search_fields = apply_filters( 'gravityview_widget_search_filters', $search_fields, $this, $widget_args, $context ); |
1011 | 1011 | |
1012 | - $gravityview_view->search_layout = ! empty( $widget_args['search_layout'] ) ? $widget_args['search_layout'] : 'horizontal'; |
|
1012 | + $gravityview_view->search_layout = ! empty( $widget_args[ 'search_layout' ] ) ? $widget_args[ 'search_layout' ] : 'horizontal'; |
|
1013 | 1013 | |
1014 | 1014 | /** @since 1.14 */ |
1015 | - $gravityview_view->search_mode = ! empty( $widget_args['search_mode'] ) ? $widget_args['search_mode'] : 'any'; |
|
1015 | + $gravityview_view->search_mode = ! empty( $widget_args[ 'search_mode' ] ) ? $widget_args[ 'search_mode' ] : 'any'; |
|
1016 | 1016 | |
1017 | - $custom_class = ! empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : ''; |
|
1017 | + $custom_class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : ''; |
|
1018 | 1018 | |
1019 | 1019 | $gravityview_view->search_class = self::get_search_class( $custom_class ); |
1020 | 1020 | |
1021 | - $gravityview_view->search_clear = ! empty( $widget_args['search_clear'] ) ? $widget_args['search_clear'] : false; |
|
1021 | + $gravityview_view->search_clear = ! empty( $widget_args[ 'search_clear' ] ) ? $widget_args[ 'search_clear' ] : false; |
|
1022 | 1022 | |
1023 | 1023 | if ( $this->has_date_field( $search_fields ) ) { |
1024 | 1024 | // enqueue datepicker stuff only if needed! |
@@ -1040,10 +1040,10 @@ discard block |
||
1040 | 1040 | public static function get_search_class( $custom_class = '' ) { |
1041 | 1041 | $gravityview_view = GravityView_View::getInstance(); |
1042 | 1042 | |
1043 | - $search_class = 'gv-search-'.$gravityview_view->search_layout; |
|
1043 | + $search_class = 'gv-search-' . $gravityview_view->search_layout; |
|
1044 | 1044 | |
1045 | - if ( ! empty( $custom_class ) ) { |
|
1046 | - $search_class .= ' '.$custom_class; |
|
1045 | + if ( ! empty( $custom_class ) ) { |
|
1046 | + $search_class .= ' ' . $custom_class; |
|
1047 | 1047 | } |
1048 | 1048 | |
1049 | 1049 | /** |
@@ -1087,9 +1087,9 @@ discard block |
||
1087 | 1087 | |
1088 | 1088 | if ( ! $label ) { |
1089 | 1089 | |
1090 | - $label = isset( $form_field['label'] ) ? $form_field['label'] : ''; |
|
1090 | + $label = isset( $form_field[ 'label' ] ) ? $form_field[ 'label' ] : ''; |
|
1091 | 1091 | |
1092 | - switch( $field['field'] ) { |
|
1092 | + switch ( $field[ 'field' ] ) { |
|
1093 | 1093 | case 'search_all': |
1094 | 1094 | $label = __( 'Search Entries:', 'gravityview' ); |
1095 | 1095 | break; |
@@ -1101,10 +1101,10 @@ discard block |
||
1101 | 1101 | break; |
1102 | 1102 | default: |
1103 | 1103 | // If this is a field input, not a field |
1104 | - if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) { |
|
1104 | + if ( strpos( $field[ 'field' ], '.' ) > 0 && ! empty( $form_field[ 'inputs' ] ) ) { |
|
1105 | 1105 | |
1106 | 1106 | // Get the label for the field in question, which returns an array |
1107 | - $items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) ); |
|
1107 | + $items = wp_list_filter( $form_field[ 'inputs' ], array( 'id' => $field[ 'field' ] ) ); |
|
1108 | 1108 | |
1109 | 1109 | // Get the item with the `label` key |
1110 | 1110 | $values = wp_list_pluck( $items, 'label' ); |
@@ -1143,32 +1143,32 @@ discard block |
||
1143 | 1143 | $form = $gravityview_view->getForm(); |
1144 | 1144 | |
1145 | 1145 | // for advanced field ids (eg, first name / last name ) |
1146 | - $name = 'filter_' . str_replace( '.', '_', $field['field'] ); |
|
1146 | + $name = 'filter_' . str_replace( '.', '_', $field[ 'field' ] ); |
|
1147 | 1147 | |
1148 | 1148 | // get searched value from $_GET/$_POST (string or array) |
1149 | 1149 | $value = $this->rgget_or_rgpost( $name ); |
1150 | 1150 | |
1151 | 1151 | // get form field details |
1152 | - $form_field = gravityview_get_field( $form, $field['field'] ); |
|
1152 | + $form_field = gravityview_get_field( $form, $field[ 'field' ] ); |
|
1153 | 1153 | |
1154 | 1154 | $filter = array( |
1155 | - 'key' => $field['field'], |
|
1155 | + 'key' => $field[ 'field' ], |
|
1156 | 1156 | 'name' => $name, |
1157 | 1157 | 'label' => self::get_field_label( $field, $form_field ), |
1158 | - 'input' => $field['input'], |
|
1158 | + 'input' => $field[ 'input' ], |
|
1159 | 1159 | 'value' => $value, |
1160 | - 'type' => $form_field['type'], |
|
1160 | + 'type' => $form_field[ 'type' ], |
|
1161 | 1161 | ); |
1162 | 1162 | |
1163 | 1163 | // collect choices |
1164 | - if ( 'post_category' === $form_field['type'] && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) { |
|
1165 | - $filter['choices'] = gravityview_get_terms_choices(); |
|
1166 | - } elseif ( ! empty( $form_field['choices'] ) ) { |
|
1167 | - $filter['choices'] = $form_field['choices']; |
|
1164 | + if ( 'post_category' === $form_field[ 'type' ] && ! empty( $form_field[ 'displayAllCategories' ] ) && empty( $form_field[ 'choices' ] ) ) { |
|
1165 | + $filter[ 'choices' ] = gravityview_get_terms_choices(); |
|
1166 | + } elseif ( ! empty( $form_field[ 'choices' ] ) ) { |
|
1167 | + $filter[ 'choices' ] = $form_field[ 'choices' ]; |
|
1168 | 1168 | } |
1169 | 1169 | |
1170 | - if ( 'date_range' === $field['input'] && empty( $value ) ) { |
|
1171 | - $filter['value'] = array( 'start' => '', 'end' => '' ); |
|
1170 | + if ( 'date_range' === $field[ 'input' ] && empty( $value ) ) { |
|
1171 | + $filter[ 'value' ] = array( 'start' => '', 'end' => '' ); |
|
1172 | 1172 | } |
1173 | 1173 | |
1174 | 1174 | return $filter; |
@@ -1192,7 +1192,7 @@ discard block |
||
1192 | 1192 | |
1193 | 1193 | $choices = array(); |
1194 | 1194 | foreach ( $users as $user ) { |
1195 | - $choices[] = array( |
|
1195 | + $choices[ ] = array( |
|
1196 | 1196 | 'value' => $user->ID, |
1197 | 1197 | 'text' => $user->display_name, |
1198 | 1198 | ); |
@@ -1247,7 +1247,7 @@ discard block |
||
1247 | 1247 | */ |
1248 | 1248 | public function add_datepicker_js_dependency( $js_dependencies ) { |
1249 | 1249 | |
1250 | - $js_dependencies[] = 'jquery-ui-datepicker'; |
|
1250 | + $js_dependencies[ ] = 'jquery-ui-datepicker'; |
|
1251 | 1251 | |
1252 | 1252 | return $js_dependencies; |
1253 | 1253 | } |
@@ -1291,7 +1291,7 @@ discard block |
||
1291 | 1291 | 'isRTL' => is_rtl(), |
1292 | 1292 | ), $view_data ); |
1293 | 1293 | |
1294 | - $localizations['datepicker'] = $datepicker_settings; |
|
1294 | + $localizations[ 'datepicker' ] = $datepicker_settings; |
|
1295 | 1295 | |
1296 | 1296 | return $localizations; |
1297 | 1297 | |
@@ -1318,7 +1318,7 @@ discard block |
||
1318 | 1318 | * @return void |
1319 | 1319 | */ |
1320 | 1320 | private function maybe_enqueue_flexibility() { |
1321 | - if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/MSIE [8-9]/', $_SERVER['HTTP_USER_AGENT'] ) ) { |
|
1321 | + if ( isset( $_SERVER[ 'HTTP_USER_AGENT' ] ) && preg_match( '/MSIE [8-9]/', $_SERVER[ 'HTTP_USER_AGENT' ] ) ) { |
|
1322 | 1322 | wp_enqueue_script( 'gv-flexibility' ); |
1323 | 1323 | } |
1324 | 1324 | } |
@@ -1340,7 +1340,7 @@ discard block |
||
1340 | 1340 | add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 ); |
1341 | 1341 | |
1342 | 1342 | $scheme = is_ssl() ? 'https://' : 'http://'; |
1343 | - wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' ); |
|
1343 | + wp_enqueue_style( 'jquery-ui-datepicker', $scheme . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' ); |
|
1344 | 1344 | |
1345 | 1345 | /** |
1346 | 1346 | * @filter `gravityview_search_datepicker_class` |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | |
17 | 17 | function __construct() { |
18 | 18 | |
19 | - $this->widget_description = __('Summary of the number of visible entries out of the total results.', 'gravityview' ); |
|
19 | + $this->widget_description = __( 'Summary of the number of visible entries out of the total results.', 'gravityview' ); |
|
20 | 20 | |
21 | 21 | $default_values = array( |
22 | 22 | 'header' => 1, |
@@ -25,18 +25,18 @@ discard block |
||
25 | 25 | |
26 | 26 | $settings = array(); |
27 | 27 | |
28 | - parent::__construct( __( 'Show Pagination Info', 'gravityview' ) , 'page_info', $default_values, $settings ); |
|
28 | + parent::__construct( __( 'Show Pagination Info', 'gravityview' ), 'page_info', $default_values, $settings ); |
|
29 | 29 | } |
30 | 30 | |
31 | - public function render_frontend( $widget_args, $content = '', $context = '') { |
|
31 | + public function render_frontend( $widget_args, $content = '', $context = '' ) { |
|
32 | 32 | $gravityview_view = GravityView_View::getInstance(); |
33 | 33 | |
34 | - if( !$this->pre_render_frontend() ) { |
|
34 | + if ( ! $this->pre_render_frontend() ) { |
|
35 | 35 | return; |
36 | 36 | } |
37 | 37 | |
38 | - if( !empty( $widget_args['title'] ) ) { |
|
39 | - echo $widget_args['title']; |
|
38 | + if ( ! empty( $widget_args[ 'title' ] ) ) { |
|
39 | + echo $widget_args[ 'title' ]; |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | $pagination_counts = $gravityview_view->getPaginationCounts(); |
@@ -45,16 +45,16 @@ discard block |
||
45 | 45 | |
46 | 46 | $output = ''; |
47 | 47 | |
48 | - if( ! empty( $pagination_counts ) ) { |
|
48 | + if ( ! empty( $pagination_counts ) ) { |
|
49 | 49 | |
50 | - $first = $pagination_counts['first']; |
|
51 | - $last = $pagination_counts['last']; |
|
52 | - $total = $pagination_counts['total']; |
|
50 | + $first = $pagination_counts[ 'first' ]; |
|
51 | + $last = $pagination_counts[ 'last' ]; |
|
52 | + $total = $pagination_counts[ 'total' ]; |
|
53 | 53 | |
54 | - $class = !empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : ''; |
|
54 | + $class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : ''; |
|
55 | 55 | $class = gravityview_sanitize_html_class( $class ); |
56 | 56 | |
57 | - $output = '<div class="gv-widget-pagination '.$class.'"><p>'. sprintf(__( 'Displaying %1$s - %2$s of %3$s', 'gravityview' ), number_format_i18n( $first ), number_format_i18n( $last ), number_format_i18n( $total ) ) . '</p></div>'; |
|
57 | + $output = '<div class="gv-widget-pagination ' . $class . '"><p>' . sprintf( __( 'Displaying %1$s - %2$s of %3$s', 'gravityview' ), number_format_i18n( $first ), number_format_i18n( $last ), number_format_i18n( $total ) ) . '</p></div>'; |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | /** |
@@ -22,13 +22,13 @@ discard block |
||
22 | 22 | |
23 | 23 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
24 | 24 | |
25 | - unset( $field_options['show_as_link'] ); |
|
25 | + unset( $field_options[ 'show_as_link' ] ); |
|
26 | 26 | |
27 | - if( 'edit' === $context ) { |
|
27 | + if ( 'edit' === $context ) { |
|
28 | 28 | return $field_options; |
29 | 29 | } |
30 | 30 | |
31 | - $this->add_field_support('dynamic_data', $field_options ); |
|
31 | + $this->add_field_support( 'dynamic_data', $field_options ); |
|
32 | 32 | |
33 | 33 | return $field_options; |
34 | 34 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | */ |
45 | 45 | public function get_field_input( $form, $value = '', $entry = null, GF_Field_Post_Content $field ) { |
46 | 46 | |
47 | - $id = (int) $field->id; |
|
47 | + $id = (int)$field->id; |
|
48 | 48 | $input_name = "input_{$id}"; |
49 | 49 | $class = esc_attr( $field->size ); |
50 | 50 | $tabindex = $field->get_tabindex(); |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | * @return GravityView_Field | bool |
43 | 43 | */ |
44 | 44 | public static function create( $properties ) { |
45 | - $type = isset( $properties['type'] ) ? $properties['type'] : ''; |
|
46 | - $type = empty( $properties['inputType'] ) ? $type : $properties['inputType']; |
|
45 | + $type = isset( $properties[ 'type' ] ) ? $properties[ 'type' ] : ''; |
|
46 | + $type = empty( $properties[ 'inputType' ] ) ? $type : $properties[ 'inputType' ]; |
|
47 | 47 | if ( empty( $type ) || ! isset( self::$_fields[ $type ] ) ) { |
48 | 48 | return new GravityView_Field( $properties ); |
49 | 49 | } |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | * @return bool True: yes, it exists; False: nope |
63 | 63 | */ |
64 | 64 | public static function exists( $field_name ) { |
65 | - return isset( self::$_fields["{$field_name}"] ); |
|
65 | + return isset( self::$_fields[ "{$field_name}" ] ); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | /** |
@@ -96,8 +96,8 @@ discard block |
||
96 | 96 | |
97 | 97 | $field_type = is_a( $gf_field, 'GF_Field' ) ? get_class( $gf_field ) : $gf_field; |
98 | 98 | |
99 | - foreach( self::$_fields as $field ) { |
|
100 | - if( $field_type === $field->_gf_field_class_name ) { |
|
99 | + foreach ( self::$_fields as $field ) { |
|
100 | + if ( $field_type === $field->_gf_field_class_name ) { |
|
101 | 101 | return $field; |
102 | 102 | } |
103 | 103 | } |
@@ -116,10 +116,10 @@ discard block |
||
116 | 116 | */ |
117 | 117 | public static function get_all( $group = '' ) { |
118 | 118 | |
119 | - if( '' !== $group ) { |
|
119 | + if ( '' !== $group ) { |
|
120 | 120 | $return_fields = self::$_fields; |
121 | 121 | foreach ( $return_fields as $key => $field ) { |
122 | - if( $group !== $field->group ) { |
|
122 | + if ( $group !== $field->group ) { |
|
123 | 123 | unset( $return_fields[ $key ] ); |
124 | 124 | } |
125 | 125 | } |
@@ -77,7 +77,7 @@ |
||
77 | 77 | /** |
78 | 78 | * Alias for get_instance() |
79 | 79 | * |
80 | - * @param $field_name |
|
80 | + * @param string $field_name |
|
81 | 81 | * |
82 | 82 | * @return GravityView_Field|false |
83 | 83 | */ |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | |
19 | 19 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
20 | 20 | |
21 | - if( 'edit' === $context ) { |
|
21 | + if ( 'edit' === $context ) { |
|
22 | 22 | return $field_options; |
23 | 23 | } |
24 | 24 | |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | 'quiz_show_explanation' => array( |
27 | 27 | 'type' => 'checkbox', |
28 | 28 | 'label' => __( 'Show Answer Explanation?', 'gravityview' ), |
29 | - 'desc' => __('If the field has an answer explanation, show it?', 'gravityview'), |
|
29 | + 'desc' => __( 'If the field has an answer explanation, show it?', 'gravityview' ), |
|
30 | 30 | 'value' => false, |
31 | 31 | 'merge_tags' => false, |
32 | 32 | ), |
@@ -40,11 +40,11 @@ |
||
40 | 40 | } |
41 | 41 | |
42 | 42 | $field_options['link_phone'] = array( |
43 | - 'type' => 'checkbox', |
|
44 | - 'label' => __( 'Make Phone Number Clickable', 'gravityview' ), |
|
45 | - 'desc' => __( 'Allow dialing a number by clicking it?', 'gravityview'), |
|
46 | - 'value' => true, |
|
47 | - ); |
|
43 | + 'type' => 'checkbox', |
|
44 | + 'label' => __( 'Make Phone Number Clickable', 'gravityview' ), |
|
45 | + 'desc' => __( 'Allow dialing a number by clicking it?', 'gravityview'), |
|
46 | + 'value' => true, |
|
47 | + ); |
|
48 | 48 | |
49 | 49 | return $field_options; |
50 | 50 | } |
@@ -35,14 +35,14 @@ |
||
35 | 35 | */ |
36 | 36 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
37 | 37 | |
38 | - if( 'edit' === $context ) { |
|
38 | + if ( 'edit' === $context ) { |
|
39 | 39 | return $field_options; |
40 | 40 | } |
41 | 41 | |
42 | - $field_options['link_phone'] = array( |
|
42 | + $field_options[ 'link_phone' ] = array( |
|
43 | 43 | 'type' => 'checkbox', |
44 | 44 | 'label' => __( 'Make Phone Number Clickable', 'gravityview' ), |
45 | - 'desc' => __( 'Allow dialing a number by clicking it?', 'gravityview'), |
|
45 | + 'desc' => __( 'Allow dialing a number by clicking it?', 'gravityview' ), |
|
46 | 46 | 'value' => true, |
47 | 47 | ); |
48 | 48 |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | * |
317 | 317 | * @param array $file_paths List of template paths ordered |
318 | 318 | * |
319 | - * @return array File paths with `./` and `./partials/` paths added |
|
319 | + * @return string[] File paths with `./` and `./partials/` paths added |
|
320 | 320 | */ |
321 | 321 | public function add_template_path( $file_paths ) { |
322 | 322 | |
@@ -485,7 +485,7 @@ discard block |
||
485 | 485 | * @param array $entry |
486 | 486 | * @param array $data Note details array |
487 | 487 | * |
488 | - * @return int|WP_Error |
|
488 | + * @return integer |
|
489 | 489 | */ |
490 | 490 | private function add_note( $entry, $data ) { |
491 | 491 | global $current_user, $wpdb; |
@@ -584,7 +584,7 @@ discard block |
||
584 | 584 | * |
585 | 585 | * @since 1.17 |
586 | 586 | * |
587 | - * @param int|string $entry_slug Current entry unique ID |
|
587 | + * @param string $entry_slug Current entry unique ID |
|
588 | 588 | * |
589 | 589 | * @return string HTML output |
590 | 590 | */ |
@@ -175,10 +175,10 @@ discard block |
||
175 | 175 | |
176 | 176 | if( 'gv_note_add' === $_POST['action'] ) { |
177 | 177 | |
178 | - if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
179 | - do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' ); |
|
180 | - return; |
|
181 | - } |
|
178 | + if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
179 | + do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' ); |
|
180 | + return; |
|
181 | + } |
|
182 | 182 | |
183 | 183 | $post = wp_unslash( $_POST ); |
184 | 184 | |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | * |
279 | 279 | * Verify permissions. Check expected $_POST. Parse args, then send to process_delete_notes |
280 | 280 | * |
281 | - * @since 1.17 |
|
281 | + * @since 1.17 |
|
282 | 282 | * |
283 | 283 | * @see process_delete_notes |
284 | 284 | * |
@@ -431,7 +431,7 @@ discard block |
||
431 | 431 | 'subject-label' => __( 'Subject', 'gravityview' ), |
432 | 432 | 'subject' => __( 'Email subject', 'gravityview' ), |
433 | 433 | 'default-email-subject' => __( 'New entry note', 'gravityview' ), |
434 | - 'email-footer' => __( 'This note was sent from {url}', 'gravityview' ), |
|
434 | + 'email-footer' => __( 'This note was sent from {url}', 'gravityview' ), |
|
435 | 435 | 'also-email' => __( 'Also email this note to', 'gravityview' ), |
436 | 436 | 'error-add-note' => __( 'There was an error adding the note.', 'gravityview' ), |
437 | 437 | 'error-invalid' => __( 'The request was invalid. Refresh the page and try again.', 'gravityview' ), |
@@ -501,11 +501,11 @@ discard block |
||
501 | 501 | |
502 | 502 | if ( $context instanceof \GV\Template_Context ) { |
503 | 503 | |
504 | - ob_start(); |
|
505 | - $context->template->get_template_part( 'note', 'detail', true ); |
|
506 | - $note_detail_html = ob_get_clean(); |
|
504 | + ob_start(); |
|
505 | + $context->template->get_template_part( 'note', 'detail', true ); |
|
506 | + $note_detail_html = ob_get_clean(); |
|
507 | 507 | |
508 | - ob_start(); |
|
508 | + ob_start(); |
|
509 | 509 | $context->template->get_template_part( 'note', $note_row_template, true ); |
510 | 510 | $note_row = ob_get_clean(); |
511 | 511 | } else { |
@@ -761,7 +761,7 @@ discard block |
||
761 | 761 | 'gv-note-to-custom' => '', |
762 | 762 | 'gv-note-subject' => '', |
763 | 763 | 'gv-note-content' => '', |
764 | - 'current-url' => '', |
|
764 | + 'current-url' => '', |
|
765 | 765 | ); |
766 | 766 | |
767 | 767 | $current_user = wp_get_current_user(); |
@@ -813,9 +813,9 @@ discard block |
||
813 | 813 | $message .= $this->get_email_footer( $email_footer, $is_html, $email_data ); |
814 | 814 | |
815 | 815 | /** |
816 | - * @filter `gravityview/field/notes/wpautop_email` Should the message content have paragraphs added automatically, if using HTML message format |
|
816 | + * @filter `gravityview/field/notes/wpautop_email` Should the message content have paragraphs added automatically, if using HTML message format |
|
817 | 817 | * @since 1.18 |
818 | - * @param bool $wpautop_email True: Apply wpautop() to the email message if using; False: Leave as entered (Default: true) |
|
818 | + * @param bool $wpautop_email True: Apply wpautop() to the email message if using; False: Leave as entered (Default: true) |
|
819 | 819 | */ |
820 | 820 | $wpautop_email = apply_filters( 'gravityview/field/notes/wpautop_email', true ); |
821 | 821 | |
@@ -835,12 +835,12 @@ discard block |
||
835 | 835 | } |
836 | 836 | |
837 | 837 | /** |
838 | - * Get the footer for Entry Note emails |
|
839 | - * |
|
840 | - * `{url}` is replaced by the URL of the page where the note form was embedded |
|
841 | - * |
|
842 | - * @since 1.18 |
|
843 | - * @see GravityView_Field_Notes::strings The default value of $message_footer is set here, with the key 'email-footer' |
|
838 | + * Get the footer for Entry Note emails |
|
839 | + * |
|
840 | + * `{url}` is replaced by the URL of the page where the note form was embedded |
|
841 | + * |
|
842 | + * @since 1.18 |
|
843 | + * @see GravityView_Field_Notes::strings The default value of $message_footer is set here, with the key 'email-footer' |
|
844 | 844 | * |
845 | 845 | * @param string $email_footer The message footer value |
846 | 846 | * @param bool $is_html True: Email is being sent as HTML; False: sent as text |
@@ -849,10 +849,10 @@ discard block |
||
849 | 849 | */ |
850 | 850 | private function get_email_footer( $email_footer = '', $is_html = true, $email_data = array() ) { |
851 | 851 | |
852 | - $output = ''; |
|
852 | + $output = ''; |
|
853 | 853 | |
854 | 854 | if( ! empty( $email_footer ) ) { |
855 | - $url = \GV\Utils::get( $email_data, 'current-url' ); |
|
855 | + $url = \GV\Utils::get( $email_data, 'current-url' ); |
|
856 | 856 | $url = html_entity_decode( $url ); |
857 | 857 | $url = site_url( $url ); |
858 | 858 |
@@ -63,19 +63,19 @@ discard block |
||
63 | 63 | |
64 | 64 | add_shortcode( 'gv_note_add', array( 'GravityView_Field_Notes', 'get_add_note_part' ) ); |
65 | 65 | |
66 | - add_action( 'wp', array( $this, 'maybe_delete_notes'), 1000 ); |
|
67 | - add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes') ); |
|
68 | - add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes') ); |
|
66 | + add_action( 'wp', array( $this, 'maybe_delete_notes' ), 1000 ); |
|
67 | + add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes' ) ); |
|
68 | + add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes' ) ); |
|
69 | 69 | |
70 | - add_action( 'wp', array( $this, 'maybe_add_note'), 1000 ); |
|
71 | - add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note') ); |
|
72 | - add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note') ); |
|
70 | + add_action( 'wp', array( $this, 'maybe_add_note' ), 1000 ); |
|
71 | + add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note' ) ); |
|
72 | + add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note' ) ); |
|
73 | 73 | |
74 | 74 | // add template path to check for field |
75 | 75 | add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) ); |
76 | 76 | add_filter( 'gravityview/template/fields_template_paths', array( $this, 'add_template_path' ) ); |
77 | 77 | |
78 | - add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') ); |
|
78 | + add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) ); |
|
79 | 79 | add_action( 'gravityview/field/notes/scripts', array( $this, 'enqueue_scripts' ) ); |
80 | 80 | |
81 | 81 | add_filter( 'gravityview_entry_default_fields', array( $this, 'add_entry_default_field' ), 10, 3 ); |
@@ -97,8 +97,8 @@ discard block |
||
97 | 97 | */ |
98 | 98 | public function add_entry_default_field( $entry_default_fields, $form, $zone ) { |
99 | 99 | |
100 | - if( in_array( $zone, array( 'directory', 'single' ) ) ) { |
|
101 | - $entry_default_fields['notes'] = array( |
|
100 | + if ( in_array( $zone, array( 'directory', 'single' ) ) ) { |
|
101 | + $entry_default_fields[ 'notes' ] = array( |
|
102 | 102 | 'label' => __( 'Entry Notes', 'gravityview' ), |
103 | 103 | 'type' => 'notes', |
104 | 104 | 'desc' => __( 'Display, add, and delete notes for an entry.', 'gravityview' ), |
@@ -131,23 +131,23 @@ discard block |
||
131 | 131 | public function enqueue_scripts() { |
132 | 132 | global $wp_actions; |
133 | 133 | |
134 | - if( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) { |
|
134 | + if ( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) { |
|
135 | 135 | wp_enqueue_style( 'gravityview-notes' ); |
136 | 136 | wp_enqueue_script( 'gravityview-notes' ); |
137 | 137 | } |
138 | 138 | |
139 | - if( ! wp_script_is( 'gravityview-notes', 'done' ) ) { |
|
139 | + if ( ! wp_script_is( 'gravityview-notes', 'done' ) ) { |
|
140 | 140 | |
141 | 141 | $strings = self::strings(); |
142 | 142 | |
143 | 143 | wp_localize_script( 'gravityview-notes', 'GVNotes', array( |
144 | 144 | 'ajaxurl' => admin_url( 'admin-ajax.php' ), |
145 | 145 | 'text' => array( |
146 | - 'processing' => $strings['processing'], |
|
147 | - 'delete_confirm' => $strings['delete-confirm'], |
|
148 | - 'note_added' => $strings['added-note'], |
|
149 | - 'error_invalid' => $strings['error-invalid'], |
|
150 | - 'error_empty_note' => $strings['error-empty-note'], |
|
146 | + 'processing' => $strings[ 'processing' ], |
|
147 | + 'delete_confirm' => $strings[ 'delete-confirm' ], |
|
148 | + 'note_added' => $strings[ 'added-note' ], |
|
149 | + 'error_invalid' => $strings[ 'error-invalid' ], |
|
150 | + 'error_empty_note' => $strings[ 'error-empty-note' ], |
|
151 | 151 | ), |
152 | 152 | ) ); |
153 | 153 | } |
@@ -164,31 +164,31 @@ discard block |
||
164 | 164 | */ |
165 | 165 | function maybe_add_note() { |
166 | 166 | |
167 | - if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
167 | + if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
168 | 168 | gravityview()->log->error( 'The user isnt allowed to add entry notes.' ); |
169 | 169 | return; |
170 | 170 | } |
171 | 171 | |
172 | - if( ! isset( $_POST['action'] ) ) { |
|
172 | + if ( ! isset( $_POST[ 'action' ] ) ) { |
|
173 | 173 | return; |
174 | 174 | } |
175 | 175 | |
176 | - if( 'gv_note_add' === $_POST['action'] ) { |
|
176 | + if ( 'gv_note_add' === $_POST[ 'action' ] ) { |
|
177 | 177 | |
178 | - if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
178 | + if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
179 | 179 | do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' ); |
180 | 180 | return; |
181 | 181 | } |
182 | 182 | |
183 | 183 | $post = wp_unslash( $_POST ); |
184 | 184 | |
185 | - if( $this->doing_ajax ) { |
|
186 | - parse_str( $post['data'], $data ); |
|
185 | + if ( $this->doing_ajax ) { |
|
186 | + parse_str( $post[ 'data' ], $data ); |
|
187 | 187 | } else { |
188 | 188 | $data = $post; |
189 | 189 | } |
190 | 190 | |
191 | - $this->process_add_note( (array) $data ); |
|
191 | + $this->process_add_note( (array)$data ); |
|
192 | 192 | } |
193 | 193 | } |
194 | 194 | |
@@ -215,23 +215,23 @@ discard block |
||
215 | 215 | $error = false; |
216 | 216 | $success = false; |
217 | 217 | |
218 | - if( empty( $data['entry-slug'] ) ) { |
|
218 | + if ( empty( $data[ 'entry-slug' ] ) ) { |
|
219 | 219 | |
220 | - $error = self::strings('error-invalid'); |
|
220 | + $error = self::strings( 'error-invalid' ); |
|
221 | 221 | gravityview()->log->error( 'The note is missing an Entry ID.' ); |
222 | 222 | |
223 | 223 | } else { |
224 | 224 | |
225 | - $valid = wp_verify_nonce( $data['gv_note_add'], 'gv_note_add_' . $data['entry-slug'] ); |
|
225 | + $valid = wp_verify_nonce( $data[ 'gv_note_add' ], 'gv_note_add_' . $data[ 'entry-slug' ] ); |
|
226 | 226 | |
227 | 227 | $has_cap = GVCommon::has_cap( 'gravityview_add_entry_notes' ); |
228 | 228 | |
229 | - if( ! $has_cap ) { |
|
229 | + if ( ! $has_cap ) { |
|
230 | 230 | $error = self::strings( 'error-cap-add' ); |
231 | 231 | gravityview()->log->error( 'Adding a note failed: the user does not have the "gravityview_add_entry_notes" capability.' ); |
232 | 232 | } elseif ( $valid ) { |
233 | 233 | |
234 | - $entry = gravityview_get_entry( $data['entry-slug'], true, false ); |
|
234 | + $entry = gravityview_get_entry( $data[ 'entry-slug' ], true, false ); |
|
235 | 235 | |
236 | 236 | $added = $this->add_note( $entry, $data ); |
237 | 237 | |
@@ -249,22 +249,22 @@ discard block |
||
249 | 249 | $this->maybe_send_entry_notes( $note, $entry, $data ); |
250 | 250 | |
251 | 251 | if ( $note ) { |
252 | - $success = self::display_note( $note, ! empty( $data['show-delete'] ) ); |
|
252 | + $success = self::display_note( $note, ! empty( $data[ 'show-delete' ] ) ); |
|
253 | 253 | gravityview()->log->debug( 'The note was successfully created', array( 'data' => compact( 'note', 'data' ) ) ); |
254 | 254 | } else { |
255 | - $error = self::strings('error-add-note'); |
|
255 | + $error = self::strings( 'error-add-note' ); |
|
256 | 256 | gravityview()->log->error( 'The note was not successfully created', array( 'data' => compact( 'note', 'data' ) ) ); |
257 | 257 | } |
258 | 258 | } |
259 | 259 | } else { |
260 | - $error = self::strings('error-invalid'); |
|
260 | + $error = self::strings( 'error-invalid' ); |
|
261 | 261 | gravityview()->log->error( 'Nonce validation failed; the note was not created' ); |
262 | 262 | } |
263 | 263 | } |
264 | 264 | |
265 | 265 | |
266 | - if( $this->doing_ajax ) { |
|
267 | - if( $success ) { |
|
266 | + if ( $this->doing_ajax ) { |
|
267 | + if ( $success ) { |
|
268 | 268 | wp_send_json_success( array( 'html' => $success ) ); |
269 | 269 | } else { |
270 | 270 | $error = $error ? $error : self::strings( 'error-invalid' ); |
@@ -290,11 +290,11 @@ discard block |
||
290 | 290 | return; |
291 | 291 | } |
292 | 292 | |
293 | - if ( isset( $_POST['action'] ) && 'gv_delete_notes' === $_POST['action'] ) { |
|
293 | + if ( isset( $_POST[ 'action' ] ) && 'gv_delete_notes' === $_POST[ 'action' ] ) { |
|
294 | 294 | |
295 | 295 | $post = wp_unslash( $_POST ); |
296 | 296 | if ( $this->doing_ajax ) { |
297 | - parse_str( $post['data'], $data ); |
|
297 | + parse_str( $post[ 'data' ], $data ); |
|
298 | 298 | } else { |
299 | 299 | $data = $post; |
300 | 300 | } |
@@ -325,18 +325,18 @@ discard block |
||
325 | 325 | */ |
326 | 326 | function process_delete_notes( $data ) { |
327 | 327 | |
328 | - $valid = wp_verify_nonce( $data['gv_delete_notes'], 'gv_delete_notes_' . $data['entry-slug'] ); |
|
328 | + $valid = wp_verify_nonce( $data[ 'gv_delete_notes' ], 'gv_delete_notes_' . $data[ 'entry-slug' ] ); |
|
329 | 329 | $has_cap = GVCommon::has_cap( 'gravityview_delete_entry_notes' ); |
330 | 330 | $success = false; |
331 | 331 | |
332 | 332 | if ( $valid && $has_cap ) { |
333 | - GravityView_Entry_Notes::delete_notes( $data['note'] ); |
|
333 | + GravityView_Entry_Notes::delete_notes( $data[ 'note' ] ); |
|
334 | 334 | $success = true; |
335 | 335 | } |
336 | 336 | |
337 | - if( $this->doing_ajax ) { |
|
337 | + if ( $this->doing_ajax ) { |
|
338 | 338 | |
339 | - if( $success ) { |
|
339 | + if ( $success ) { |
|
340 | 340 | wp_send_json_success(); |
341 | 341 | } else { |
342 | 342 | if ( ! $valid ) { |
@@ -369,13 +369,13 @@ discard block |
||
369 | 369 | |
370 | 370 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
371 | 371 | |
372 | - unset( $field_options['show_as_link'] ); |
|
372 | + unset( $field_options[ 'show_as_link' ] ); |
|
373 | 373 | |
374 | 374 | $notes_options = array( |
375 | 375 | 'notes' => array( |
376 | 376 | 'type' => 'checkboxes', |
377 | - 'label' => __('Note Settings', 'gravityview'), |
|
378 | - 'desc' => sprintf( _x('Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ), |
|
377 | + 'label' => __( 'Note Settings', 'gravityview' ), |
|
378 | + 'desc' => sprintf( _x( 'Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ), |
|
379 | 379 | 'options' => array( |
380 | 380 | 'view' => array( |
381 | 381 | 'label' => __( 'Display notes?', 'gravityview' ), |
@@ -427,7 +427,7 @@ discard block |
||
427 | 427 | 'processing' => __( 'Processing…', 'gravityview' ), |
428 | 428 | 'other-email' => __( 'Other email address', 'gravityview' ), |
429 | 429 | 'email-label' => __( 'Email address', 'gravityview' ), |
430 | - 'email-placeholder' => _x('[email protected]', 'Example email address used as a placeholder', 'gravityview'), |
|
430 | + 'email-placeholder' => _x( '[email protected]', 'Example email address used as a placeholder', 'gravityview' ), |
|
431 | 431 | 'subject-label' => __( 'Subject', 'gravityview' ), |
432 | 432 | 'subject' => __( 'Email subject', 'gravityview' ), |
433 | 433 | 'default-email-subject' => __( 'New entry note', 'gravityview' ), |
@@ -447,7 +447,7 @@ discard block |
||
447 | 447 | */ |
448 | 448 | $strings = gv_map_deep( apply_filters( 'gravityview/field/notes/strings', $strings ), 'esc_html' ); |
449 | 449 | |
450 | - if( $key ) { |
|
450 | + if ( $key ) { |
|
451 | 451 | return isset( $strings[ $key ] ) ? $strings[ $key ] : ''; |
452 | 452 | } |
453 | 453 | |
@@ -469,7 +469,7 @@ discard block |
||
469 | 469 | */ |
470 | 470 | static public function display_note( $note, $show_delete = false, $context = null ) { |
471 | 471 | |
472 | - if( ! is_object( $note ) ) { |
|
472 | + if ( ! is_object( $note ) ) { |
|
473 | 473 | return ''; |
474 | 474 | } |
475 | 475 | |
@@ -524,7 +524,7 @@ discard block |
||
524 | 524 | } |
525 | 525 | |
526 | 526 | $replacements = array( |
527 | - '{note_id}' => $note_content['note_id'], |
|
527 | + '{note_id}' => $note_content[ 'note_id' ], |
|
528 | 528 | '{row_class}' => 'gv-note', |
529 | 529 | '{note_detail}' => $note_detail_html |
530 | 530 | ); |
@@ -556,13 +556,13 @@ discard block |
||
556 | 556 | |
557 | 557 | $user_data = get_userdata( $current_user->ID ); |
558 | 558 | |
559 | - $note_content = trim( $data['gv-note-content'] ); |
|
559 | + $note_content = trim( $data[ 'gv-note-content' ] ); |
|
560 | 560 | |
561 | - if( empty( $note_content ) ) { |
|
561 | + if ( empty( $note_content ) ) { |
|
562 | 562 | return new WP_Error( 'gv-add-note-empty', __( 'The note is empty.', 'gravityview' ) ); |
563 | 563 | } |
564 | 564 | |
565 | - $return = GravityView_Entry_Notes::add_note( $entry['id'], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' ); |
|
565 | + $return = GravityView_Entry_Notes::add_note( $entry[ 'id' ], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' ); |
|
566 | 566 | |
567 | 567 | return $return; |
568 | 568 | } |
@@ -582,7 +582,7 @@ discard block |
||
582 | 582 | |
583 | 583 | $atts = shortcode_atts( array( 'entry' => null ), $atts ); |
584 | 584 | |
585 | - if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
585 | + if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
586 | 586 | gravityview()->log->error( 'User does not have permission to add entry notes ("gravityview_add_entry_notes").' ); |
587 | 587 | return ''; |
588 | 588 | } |
@@ -604,8 +604,8 @@ discard block |
||
604 | 604 | |
605 | 605 | $visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' ); |
606 | 606 | |
607 | - if ( $atts['entry'] ) { |
|
608 | - $entry = GFAPI::get_entry( $atts['entry'] ); |
|
607 | + if ( $atts[ 'entry' ] ) { |
|
608 | + $entry = GFAPI::get_entry( $atts[ 'entry' ] ); |
|
609 | 609 | } |
610 | 610 | |
611 | 611 | if ( ! isset( $entry ) || ! $entry ) { |
@@ -615,19 +615,19 @@ discard block |
||
615 | 615 | |
616 | 616 | // Strip extra whitespace in template |
617 | 617 | $add_note_html = gravityview_strip_whitespace( $add_note_html ); |
618 | - $entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry ); |
|
618 | + $entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry ); |
|
619 | 619 | $nonce_field = wp_nonce_field( 'gv_note_add_' . $entry_slug, 'gv_note_add', false, false ); |
620 | 620 | |
621 | 621 | // Only generate the dropdown if the field settings allow it |
622 | 622 | $email_fields = ''; |
623 | - if( ! empty( $visibility_settings['email'] ) ) { |
|
623 | + if ( ! empty( $visibility_settings[ 'email' ] ) ) { |
|
624 | 624 | $email_fields = self::get_note_email_fields( $entry_slug ); |
625 | 625 | } |
626 | 626 | |
627 | 627 | $add_note_html = str_replace( '{entry_slug}', $entry_slug, $add_note_html ); |
628 | 628 | $add_note_html = str_replace( '{nonce_field}', $nonce_field, $add_note_html ); |
629 | - $add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings['delete'] ) ? 0 : $visibility_settings['delete'] ), $add_note_html ); |
|
630 | - $add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html ); |
|
629 | + $add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings[ 'delete' ] ) ? 0 : $visibility_settings[ 'delete' ] ), $add_note_html ); |
|
630 | + $add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html ); |
|
631 | 631 | $add_note_html = str_replace( '{url}', esc_url_raw( add_query_arg( array() ) ), $add_note_html ); |
632 | 632 | |
633 | 633 | return $add_note_html; |
@@ -652,8 +652,8 @@ discard block |
||
652 | 652 | $note_emails = array(); |
653 | 653 | |
654 | 654 | foreach ( $email_fields as $email_field ) { |
655 | - if ( ! empty( $entry["{$email_field->id}"] ) && is_email( $entry["{$email_field->id}"] ) ) { |
|
656 | - $note_emails[] = $entry["{$email_field->id}"]; |
|
655 | + if ( ! empty( $entry[ "{$email_field->id}" ] ) && is_email( $entry[ "{$email_field->id}" ] ) ) { |
|
656 | + $note_emails[ ] = $entry[ "{$email_field->id}" ]; |
|
657 | 657 | } |
658 | 658 | } |
659 | 659 | |
@@ -665,7 +665,7 @@ discard block |
||
665 | 665 | */ |
666 | 666 | $note_emails = apply_filters( 'gravityview/field/notes/emails', $note_emails, $entry ); |
667 | 667 | |
668 | - return (array) $note_emails; |
|
668 | + return (array)$note_emails; |
|
669 | 669 | } |
670 | 670 | |
671 | 671 | /** |
@@ -681,7 +681,7 @@ discard block |
||
681 | 681 | */ |
682 | 682 | private static function get_note_email_fields( $entry_slug = '' ) { |
683 | 683 | |
684 | - if( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) { |
|
684 | + if ( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) { |
|
685 | 685 | gravityview()->log->error( 'User does not have permission to email entry notes ("gravityview_email_entry_notes").' ); |
686 | 686 | return ''; |
687 | 687 | } |
@@ -703,27 +703,27 @@ discard block |
||
703 | 703 | |
704 | 704 | if ( ! empty( $note_emails ) || $include_custom ) { ?> |
705 | 705 | <div class="gv-note-email-container"> |
706 | - <label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings['also-email']; ?></label> |
|
706 | + <label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings[ 'also-email' ]; ?></label> |
|
707 | 707 | <select class="gv-note-email-to" name="gv-note-to" id="gv-note-email-to-<?php echo $entry_slug_esc; ?>"> |
708 | - <option value=""><?php echo $strings['also-email']; ?></option> |
|
708 | + <option value=""><?php echo $strings[ 'also-email' ]; ?></option> |
|
709 | 709 | <?php foreach ( $note_emails as $email ) { |
710 | 710 | ?> |
711 | 711 | <option value="<?php echo esc_attr( $email ); ?>"><?php echo esc_html( $email ); ?></option> |
712 | 712 | <?php } |
713 | - if( $include_custom ) { ?> |
|
714 | - <option value="custom"><?php echo self::strings('other-email'); ?></option> |
|
713 | + if ( $include_custom ) { ?> |
|
714 | + <option value="custom"><?php echo self::strings( 'other-email' ); ?></option> |
|
715 | 715 | <?php } ?> |
716 | 716 | </select> |
717 | 717 | <fieldset class="gv-note-to-container"> |
718 | - <?php if( $include_custom ) { ?> |
|
718 | + <?php if ( $include_custom ) { ?> |
|
719 | 719 | <div class='gv-note-to-custom-container'> |
720 | - <label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings['email-label']; ?></label> |
|
721 | - <input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings['email-placeholder']; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" /> |
|
720 | + <label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'email-label' ]; ?></label> |
|
721 | + <input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings[ 'email-placeholder' ]; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" /> |
|
722 | 722 | </div> |
723 | 723 | <?php } ?> |
724 | 724 | <div class='gv-note-subject-container'> |
725 | - <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings['subject-label']; ?></label> |
|
726 | - <input type="text" name="gv-note-subject" placeholder="<?php echo $strings['subject']; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" /> |
|
725 | + <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'subject-label' ]; ?></label> |
|
726 | + <input type="text" name="gv-note-subject" placeholder="<?php echo $strings[ 'subject' ]; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" /> |
|
727 | 727 | </div> |
728 | 728 | </fieldset> |
729 | 729 | </div> |
@@ -746,7 +746,7 @@ discard block |
||
746 | 746 | */ |
747 | 747 | private function maybe_send_entry_notes( $note = false, $entry, $data ) { |
748 | 748 | |
749 | - if( ! $note || ! GVCommon::has_cap('gravityview_email_entry_notes') ) { |
|
749 | + if ( ! $note || ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) { |
|
750 | 750 | gravityview()->log->debug( 'User doesn\'t have "gravityview_email_entry_notes" cap, or $note is empty', array( 'data' => $note ) ); |
751 | 751 | return; |
752 | 752 | } |
@@ -754,7 +754,7 @@ discard block |
||
754 | 754 | gravityview()->log->debug( '$data', array( 'data' => $data ) ); |
755 | 755 | |
756 | 756 | //emailing notes if configured |
757 | - if ( ! empty( $data['gv-note-to'] ) ) { |
|
757 | + if ( ! empty( $data[ 'gv-note-to' ] ) ) { |
|
758 | 758 | |
759 | 759 | $default_data = array( |
760 | 760 | 'gv-note-to' => '', |
@@ -764,11 +764,11 @@ discard block |
||
764 | 764 | 'current-url' => '', |
765 | 765 | ); |
766 | 766 | |
767 | - $current_user = wp_get_current_user(); |
|
767 | + $current_user = wp_get_current_user(); |
|
768 | 768 | $email_data = wp_parse_args( $data, $default_data ); |
769 | 769 | |
770 | - $from = $current_user->user_email; |
|
771 | - $to = $email_data['gv-note-to']; |
|
770 | + $from = $current_user->user_email; |
|
771 | + $to = $email_data[ 'gv-note-to' ]; |
|
772 | 772 | |
773 | 773 | /** |
774 | 774 | * Documented in get_note_email_fields |
@@ -776,8 +776,8 @@ discard block |
||
776 | 776 | */ |
777 | 777 | $include_custom = apply_filters( 'gravityview/field/notes/custom-email', true ); |
778 | 778 | |
779 | - if( 'custom' === $to && $include_custom ) { |
|
780 | - $to = $email_data['gv-note-to-custom']; |
|
779 | + if ( 'custom' === $to && $include_custom ) { |
|
780 | + $to = $email_data[ 'gv-note-to-custom' ]; |
|
781 | 781 | gravityview()->log->debug( 'Sending note to a custom email address: {to}' . array( 'to' => $to ) ); |
782 | 782 | } |
783 | 783 | |
@@ -788,13 +788,13 @@ discard block |
||
788 | 788 | |
789 | 789 | $bcc = false; |
790 | 790 | $reply_to = $from; |
791 | - $subject = trim( $email_data['gv-note-subject'] ); |
|
791 | + $subject = trim( $email_data[ 'gv-note-subject' ] ); |
|
792 | 792 | |
793 | 793 | // We use empty() here because GF uses empty to check against, too. `0` isn't a valid subject to GF |
794 | 794 | $subject = empty( $subject ) ? self::strings( 'default-email-subject' ) : $subject; |
795 | - $message = $email_data['gv-note-content']; |
|
795 | + $message = $email_data[ 'gv-note-content' ]; |
|
796 | 796 | $email_footer = self::strings( 'email-footer' ); |
797 | - $from_name = $current_user->display_name; |
|
797 | + $from_name = $current_user->display_name; |
|
798 | 798 | $message_format = 'html'; |
799 | 799 | |
800 | 800 | /** |
@@ -825,7 +825,7 @@ discard block |
||
825 | 825 | |
826 | 826 | GVCommon::send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name, $message_format, '', $entry, false ); |
827 | 827 | |
828 | - $form = isset( $entry['form_id'] ) ? GFAPI::get_form( $entry['form_id'] ) : array(); |
|
828 | + $form = isset( $entry[ 'form_id' ] ) ? GFAPI::get_form( $entry[ 'form_id' ] ) : array(); |
|
829 | 829 | |
830 | 830 | /** |
831 | 831 | * @see https://www.gravityhelp.com/documentation/article/10146-2/ It's here for compatibility with Gravity Forms |
@@ -851,7 +851,7 @@ discard block |
||
851 | 851 | |
852 | 852 | $output = ''; |
853 | 853 | |
854 | - if( ! empty( $email_footer ) ) { |
|
854 | + if ( ! empty( $email_footer ) ) { |
|
855 | 855 | $url = \GV\Utils::get( $email_data, 'current-url' ); |
856 | 856 | $url = html_entity_decode( $url ); |
857 | 857 | $url = site_url( $url ); |