@@ -12,11 +12,11 @@ |
||
12 | 12 | extract( $gravityview_view->getCurrentField() ); |
13 | 13 | |
14 | 14 | // Only show the link to logged-in users with the right caps. |
15 | -if( !GravityView_Delete_Entry::check_user_cap_delete_entry( $entry, $field_settings ) ) { |
|
15 | +if ( ! GravityView_Delete_Entry::check_user_cap_delete_entry( $entry, $field_settings ) ) { |
|
16 | 16 | return; |
17 | 17 | } |
18 | 18 | |
19 | -$link_text = empty( $field_settings['delete_link'] ) ? __('Delete Entry', 'gravityview') : $field_settings['delete_link']; |
|
19 | +$link_text = empty( $field_settings[ 'delete_link' ] ) ? __( 'Delete Entry', 'gravityview' ) : $field_settings[ 'delete_link' ]; |
|
20 | 20 | |
21 | 21 | $link_text = apply_filters( 'gravityview_entry_link', GravityView_API::replace_variables( $link_text, $form, $entry ) ); |
22 | 22 |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | |
166 | 166 | // Index 100 is the default GravityView template path. |
167 | 167 | // Index 110 is Edit Entry link |
168 | - $file_paths[115] = self::$file; |
|
168 | + $file_paths[ 115 ] = self::$file; |
|
169 | 169 | |
170 | 170 | return $file_paths; |
171 | 171 | } |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | |
270 | 270 | $attributes = array( |
271 | 271 | 'class' => 'btn btn-sm button button-small alignright pull-right btn-danger gv-button-delete', |
272 | - 'tabindex' => ( GFCommon::$tab_index ++ ), |
|
272 | + 'tabindex' => ( GFCommon::$tab_index++ ), |
|
273 | 273 | 'onclick' => self::get_confirm_dialog(), |
274 | 274 | ); |
275 | 275 | |
@@ -305,12 +305,12 @@ discard block |
||
305 | 305 | ); |
306 | 306 | |
307 | 307 | // If the form is not submitted, return early |
308 | - if ( 'delete' !== $get_fields['action'] || empty( $get_fields['entry_id'] ) ) { |
|
308 | + if ( 'delete' !== $get_fields[ 'action' ] || empty( $get_fields[ 'entry_id' ] ) ) { |
|
309 | 309 | return; |
310 | 310 | } |
311 | 311 | |
312 | 312 | // Make sure it's a GravityView request |
313 | - $valid_nonce_key = wp_verify_nonce( $get_fields['delete'], self::get_nonce_key( $get_fields['entry_id'] ) ); |
|
313 | + $valid_nonce_key = wp_verify_nonce( $get_fields[ 'delete' ], self::get_nonce_key( $get_fields[ 'entry_id' ] ) ); |
|
314 | 314 | |
315 | 315 | if ( ! $valid_nonce_key ) { |
316 | 316 | gravityview()->log->debug( 'Delete entry not processed: nonce validation failed.' ); |
@@ -319,10 +319,10 @@ discard block |
||
319 | 319 | } |
320 | 320 | |
321 | 321 | // Get the entry slug |
322 | - $entry_slug = esc_attr( $get_fields['entry_id'] ); |
|
322 | + $entry_slug = esc_attr( $get_fields[ 'entry_id' ] ); |
|
323 | 323 | |
324 | 324 | // Redirect after deleting the entry. |
325 | - $view = \GV\View::by_id( $get_fields['view_id'] ); |
|
325 | + $view = \GV\View::by_id( $get_fields[ 'view_id' ] ); |
|
326 | 326 | |
327 | 327 | // See if there's an entry there |
328 | 328 | $entry = gravityview_get_entry( $entry_slug, true, false, $view ); |
@@ -349,9 +349,9 @@ discard block |
||
349 | 349 | $this->_redirect_and_exit( $delete_redirect_base, $delete_response->get_error_message(), 'error' ); |
350 | 350 | } |
351 | 351 | |
352 | - if ( (int) $view->settings->get( 'delete_redirect' ) === self::REDIRECT_TO_URL_VALUE ) { |
|
352 | + if ( (int)$view->settings->get( 'delete_redirect' ) === self::REDIRECT_TO_URL_VALUE ) { |
|
353 | 353 | |
354 | - $form = GFAPI::get_form( $entry['form_id'] ); |
|
354 | + $form = GFAPI::get_form( $entry[ 'form_id' ] ); |
|
355 | 355 | $redirect_url_setting = $view->settings->get( 'delete_redirect_url' ); |
356 | 356 | $redirect_url = GFCommon::replace_variables( $redirect_url_setting, $form, $entry, false, false, false, 'text' ); |
357 | 357 | |
@@ -427,7 +427,7 @@ discard block |
||
427 | 427 | */ |
428 | 428 | private function delete_or_trash_entry( $entry ) { |
429 | 429 | |
430 | - $entry_id = $entry['id']; |
|
430 | + $entry_id = $entry[ 'id' ]; |
|
431 | 431 | |
432 | 432 | $mode = $this->get_delete_mode(); |
433 | 433 | |
@@ -491,7 +491,7 @@ discard block |
||
491 | 491 | public function process_connected_posts( $entry_id = 0, $entry = array() ) { |
492 | 492 | |
493 | 493 | // The entry had no connected post |
494 | - if ( empty( $entry['post_id'] ) ) { |
|
494 | + if ( empty( $entry[ 'post_id' ] ) ) { |
|
495 | 495 | return; |
496 | 496 | } |
497 | 497 | |
@@ -509,9 +509,9 @@ discard block |
||
509 | 509 | $action = current_action(); |
510 | 510 | |
511 | 511 | if ( 'gravityview/delete-entry/deleted' === $action ) { |
512 | - $result = wp_delete_post( $entry['post_id'], true ); |
|
512 | + $result = wp_delete_post( $entry[ 'post_id' ], true ); |
|
513 | 513 | } else { |
514 | - $result = wp_trash_post( $entry['post_id'] ); |
|
514 | + $result = wp_trash_post( $entry[ 'post_id' ] ); |
|
515 | 515 | } |
516 | 516 | |
517 | 517 | if ( false === $result ) { |
@@ -542,13 +542,13 @@ discard block |
||
542 | 542 | public function verify_nonce() { |
543 | 543 | |
544 | 544 | // No delete entry request was made |
545 | - if ( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) { |
|
545 | + if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) { |
|
546 | 546 | return false; |
547 | 547 | } |
548 | 548 | |
549 | - $nonce_key = self::get_nonce_key( $_GET['entry_id'] ); |
|
549 | + $nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] ); |
|
550 | 550 | |
551 | - $valid = wp_verify_nonce( $_GET['delete'], $nonce_key ); |
|
551 | + $valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key ); |
|
552 | 552 | |
553 | 553 | /** |
554 | 554 | * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid. |
@@ -604,7 +604,7 @@ discard block |
||
604 | 604 | $error = __( 'You do not have permission to delete this entry.', 'gravityview' ); |
605 | 605 | } |
606 | 606 | |
607 | - if ( $entry['status'] === 'trash' ) { |
|
607 | + if ( $entry[ 'status' ] === 'trash' ) { |
|
608 | 608 | if ( 'trash' === $this->get_delete_mode() ) { |
609 | 609 | $error = __( 'The entry is already in the trash.', 'gravityview' ); |
610 | 610 | } else { |
@@ -648,7 +648,7 @@ discard block |
||
648 | 648 | |
649 | 649 | $current_user = wp_get_current_user(); |
650 | 650 | |
651 | - $entry_id = isset( $entry['id'] ) ? $entry['id'] : null; |
|
651 | + $entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : null; |
|
652 | 652 | |
653 | 653 | // Or if they can delete any entries (as defined in Gravity Forms), we're good. |
654 | 654 | if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) { |
@@ -662,17 +662,17 @@ discard block |
||
662 | 662 | if ( ! empty( $field ) ) { |
663 | 663 | |
664 | 664 | // If capability is not defined, something is not right! |
665 | - if ( empty( $field['allow_edit_cap'] ) ) { |
|
665 | + if ( empty( $field[ 'allow_edit_cap' ] ) ) { |
|
666 | 666 | |
667 | 667 | gravityview()->log->error( 'Cannot read delete entry field caps', array( 'data' => $field ) ); |
668 | 668 | |
669 | 669 | return false; |
670 | 670 | } |
671 | 671 | |
672 | - if ( GVCommon::has_cap( $field['allow_edit_cap'] ) ) { |
|
672 | + if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) { |
|
673 | 673 | |
674 | 674 | // Do not return true if cap is read, as we need to check if the current user created the entry |
675 | - if ( $field['allow_edit_cap'] !== 'read' ) { |
|
675 | + if ( $field[ 'allow_edit_cap' ] !== 'read' ) { |
|
676 | 676 | return true; |
677 | 677 | } |
678 | 678 | } else { |
@@ -683,7 +683,7 @@ discard block |
||
683 | 683 | } |
684 | 684 | } |
685 | 685 | |
686 | - if ( ! isset( $entry['created_by'] ) ) { |
|
686 | + if ( ! isset( $entry[ 'created_by' ] ) ) { |
|
687 | 687 | |
688 | 688 | gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' ); |
689 | 689 | |
@@ -699,7 +699,7 @@ discard block |
||
699 | 699 | } |
700 | 700 | |
701 | 701 | // If the logged-in user is the same as the user who created the entry, we're good. |
702 | - if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) { |
|
702 | + if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) { |
|
703 | 703 | |
704 | 704 | gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) ); |
705 | 705 | |
@@ -724,12 +724,12 @@ discard block |
||
724 | 724 | */ |
725 | 725 | public function maybe_display_message( $current_view_id = 0 ) { |
726 | 726 | |
727 | - if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) { |
|
727 | + if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) { |
|
728 | 728 | return; |
729 | 729 | } |
730 | 730 | |
731 | 731 | // Entry wasn't deleted from current View |
732 | - if ( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) { |
|
732 | + if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) { |
|
733 | 733 | return; |
734 | 734 | } |
735 | 735 | |
@@ -738,11 +738,11 @@ discard block |
||
738 | 738 | |
739 | 739 | public function display_message() { |
740 | 740 | |
741 | - if ( empty( $_GET['status'] ) || empty( $_GET['delete'] ) ) { |
|
741 | + if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'delete' ] ) ) { |
|
742 | 742 | return; |
743 | 743 | } |
744 | 744 | |
745 | - $status = esc_attr( $_GET['status'] ); |
|
745 | + $status = esc_attr( $_GET[ 'status' ] ); |
|
746 | 746 | $message_from_url = \GV\Utils::_GET( 'message' ); |
747 | 747 | $message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) ); |
748 | 748 | $class = ''; |
@@ -83,9 +83,9 @@ discard block |
||
83 | 83 | if ( $field_id === 'delete_link' ) { |
84 | 84 | |
85 | 85 | // Remove other built-in caps. |
86 | - unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] ); |
|
86 | + unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] ); |
|
87 | 87 | |
88 | - $caps['read'] = _x( 'Entry Creator', 'User capability', 'gravityview' ); |
|
88 | + $caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' ); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | return $caps; |
@@ -108,12 +108,12 @@ discard block |
||
108 | 108 | public function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
109 | 109 | |
110 | 110 | // Always a link, never a filter |
111 | - unset( $field_options['show_as_link'], $field_options['search_filter'] ); |
|
111 | + unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] ); |
|
112 | 112 | |
113 | 113 | // Delete Entry link should only appear to visitors capable of editing entries |
114 | - unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] ); |
|
114 | + unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] ); |
|
115 | 115 | |
116 | - $add_option['delete_link'] = array( |
|
116 | + $add_option[ 'delete_link' ] = array( |
|
117 | 117 | 'type' => 'text', |
118 | 118 | 'label' => __( 'Delete Link Text', 'gravityview' ), |
119 | 119 | 'desc' => null, |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | 'merge_tags' => true, |
122 | 122 | ); |
123 | 123 | |
124 | - $field_options['allow_edit_cap'] = array( |
|
124 | + $field_options[ 'allow_edit_cap' ] = array( |
|
125 | 125 | 'type' => 'select', |
126 | 126 | 'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ), |
127 | 127 | 'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ), |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | */ |
147 | 147 | public function add_available_field( $available_fields = array() ) { |
148 | 148 | |
149 | - $available_fields['delete_link'] = array( |
|
149 | + $available_fields[ 'delete_link' ] = array( |
|
150 | 150 | 'label_text' => __( 'Delete Entry', 'gravityview' ), |
151 | 151 | 'field_id' => 'delete_link', |
152 | 152 | 'label_type' => 'field', |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | public function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) { |
189 | 189 | |
190 | 190 | if ( 'edit' !== $zone ) { |
191 | - $entry_default_fields['delete_link'] = array( |
|
191 | + $entry_default_fields[ 'delete_link' ] = array( |
|
192 | 192 | 'label' => __( 'Delete Entry', 'gravityview' ), |
193 | 193 | 'type' => 'delete_link', |
194 | 194 | 'desc' => __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ), |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | $setting_tabs = parent::get_app_settings_tabs(); |
119 | 119 | |
120 | 120 | foreach ( $setting_tabs as &$tab ) { |
121 | - if ( 'uninstall' !== $tab['name'] ) { |
|
121 | + if ( 'uninstall' !== $tab[ 'name' ] ) { |
|
122 | 122 | continue; |
123 | 123 | } |
124 | 124 | |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | } |
130 | 130 | |
131 | 131 | // Add trash can icon to resemble the look and feel of the GF Settings page |
132 | - $tab['icon'] = 'dashicons-trash'; |
|
132 | + $tab[ 'icon' ] = 'dashicons-trash'; |
|
133 | 133 | } |
134 | 134 | |
135 | 135 | return array_filter( $setting_tabs ); |
@@ -144,8 +144,8 @@ discard block |
||
144 | 144 | */ |
145 | 145 | public function register_no_conflict( $items ) { |
146 | 146 | |
147 | - $items[] = 'gform_settings'; |
|
148 | - $items[] = 'gv-admin-edd-license'; |
|
147 | + $items[ ] = 'gform_settings'; |
|
148 | + $items[ ] = 'gv-admin-edd-license'; |
|
149 | 149 | |
150 | 150 | return $items; |
151 | 151 | } |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | |
197 | 197 | $href = add_query_arg( array( 'post_type' => 'gravityview', 'page' => 'gravityview_settings', 'view' => 'uninstall' ), admin_url( 'edit.php' ) ); |
198 | 198 | |
199 | - $uninstall_button = '<a href="' . esc_url( $href ) . '" class="' . gravityview_sanitize_html_class( $html_class ). '">' . esc_html__( 'Uninstall GravityView', 'gravityview' ) . '</a>'; |
|
199 | + $uninstall_button = '<a href="' . esc_url( $href ) . '" class="' . gravityview_sanitize_html_class( $html_class ) . '">' . esc_html__( 'Uninstall GravityView', 'gravityview' ) . '</a>'; |
|
200 | 200 | |
201 | 201 | $html .= $uninstall_button; |
202 | 202 | |
@@ -215,10 +215,10 @@ discard block |
||
215 | 215 | */ |
216 | 216 | public function settings_save( $field, $echo = true ) { |
217 | 217 | |
218 | - $field['type'] = 'submit'; |
|
219 | - $field['name'] = 'gform-settings-save'; |
|
220 | - $field['class'] = 'button button-primary primary button-hero'; |
|
221 | - $field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) ); |
|
218 | + $field[ 'type' ] = 'submit'; |
|
219 | + $field[ 'name' ] = 'gform-settings-save'; |
|
220 | + $field[ 'class' ] = 'button button-primary primary button-hero'; |
|
221 | + $field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) ); |
|
222 | 222 | |
223 | 223 | $html = $this->as_html( $field, false ); |
224 | 224 | |
@@ -240,8 +240,8 @@ discard block |
||
240 | 240 | */ |
241 | 241 | public function modify_app_settings_menu_title( $setting_tabs ) { |
242 | 242 | |
243 | - $setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' ); |
|
244 | - $setting_tabs[0]['icon'] = 'dashicons-admin-settings'; |
|
243 | + $setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' ); |
|
244 | + $setting_tabs[ 0 ][ 'icon' ] = 'dashicons-admin-settings'; |
|
245 | 245 | |
246 | 246 | return $setting_tabs; |
247 | 247 | } |
@@ -489,7 +489,7 @@ discard block |
||
489 | 489 | $i = 0; |
490 | 490 | while ( $i < 11 ) { |
491 | 491 | echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>'; |
492 | - $i ++; |
|
492 | + $i++; |
|
493 | 493 | } |
494 | 494 | ?> |
495 | 495 | </ul> |
@@ -693,14 +693,14 @@ discard block |
||
693 | 693 | */ |
694 | 694 | public function as_html( $field, $echo = true ) { |
695 | 695 | |
696 | - $field['type'] = ( isset( $field['type'] ) && in_array( $field['type'], array( 'submit', 'reset', 'button' ) ) ) ? $field['type'] : 'submit'; |
|
696 | + $field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit'; |
|
697 | 697 | |
698 | 698 | $attributes = $this->get_field_attributes( $field ); |
699 | 699 | $default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) ); |
700 | - $value = $this->get( $field['name'], $default_value ); |
|
700 | + $value = $this->get( $field[ 'name' ], $default_value ); |
|
701 | 701 | |
702 | - $attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary primary gfbutton'; |
|
703 | - $name = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name']; |
|
702 | + $attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary primary gfbutton'; |
|
703 | + $name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ]; |
|
704 | 704 | |
705 | 705 | if ( empty( $value ) ) { |
706 | 706 | $value = __( 'Update Settings', 'gravityview' ); |
@@ -709,7 +709,7 @@ discard block |
||
709 | 709 | $attributes = $this->get_field_attributes( $field ); |
710 | 710 | |
711 | 711 | $html = '<input |
712 | - type="' . $field['type'] . '" |
|
712 | + type="' . $field[ 'type' ] . '" |
|
713 | 713 | name="' . esc_attr( $name ) . '" |
714 | 714 | value="' . $value . '" ' . |
715 | 715 | implode( ' ', $attributes ) . |
@@ -743,7 +743,7 @@ discard block |
||
743 | 743 | */ |
744 | 744 | public function is_save_postback() { |
745 | 745 | |
746 | - return isset( $_POST['gform-settings-save'] ) && isset( $_POST['_gravityview_save_settings_nonce'] ); |
|
746 | + return isset( $_POST[ 'gform-settings-save' ] ) && isset( $_POST[ '_gravityview_save_settings_nonce' ] ); |
|
747 | 747 | } |
748 | 748 | |
749 | 749 | /** |
@@ -855,7 +855,7 @@ discard block |
||
855 | 855 | |
856 | 856 | $scripts = parent::scripts(); |
857 | 857 | |
858 | - $scripts[] = array( |
|
858 | + $scripts[ ] = array( |
|
859 | 859 | 'handle' => 'gform_tooltip_init', |
860 | 860 | 'enqueue' => array( |
861 | 861 | array( |
@@ -876,7 +876,7 @@ discard block |
||
876 | 876 | |
877 | 877 | $styles = parent::styles(); |
878 | 878 | |
879 | - $styles[] = array( |
|
879 | + $styles[ ] = array( |
|
880 | 880 | 'handle' => 'gravityview_settings', |
881 | 881 | 'src' => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ), |
882 | 882 | 'version' => Plugin::$version, |
@@ -967,7 +967,7 @@ discard block |
||
967 | 967 | 'name' => 'support-email', |
968 | 968 | 'type' => 'text', |
969 | 969 | 'validate' => 'email', |
970 | - 'default_value' => $default_settings['support-email'], |
|
970 | + 'default_value' => $default_settings[ 'support-email' ], |
|
971 | 971 | 'label' => __( 'Support Email', 'gravityview' ), |
972 | 972 | 'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ), |
973 | 973 | 'class' => 'code regular-text', |
@@ -979,7 +979,7 @@ discard block |
||
979 | 979 | 'name' => 'support_port', |
980 | 980 | 'type' => 'radio', |
981 | 981 | 'label' => __( 'Show Support Port?', 'gravityview' ), |
982 | - 'default_value' => $default_settings['support_port'], |
|
982 | + 'default_value' => $default_settings[ 'support_port' ], |
|
983 | 983 | 'horizontal' => 1, |
984 | 984 | 'choices' => array( |
985 | 985 | array( |
@@ -998,7 +998,7 @@ discard block |
||
998 | 998 | 'name' => 'no-conflict-mode', |
999 | 999 | 'type' => 'radio', |
1000 | 1000 | 'label' => __( 'No-Conflict Mode', 'gravityview' ), |
1001 | - 'default_value' => $default_settings['no-conflict-mode'], |
|
1001 | + 'default_value' => $default_settings[ 'no-conflict-mode' ], |
|
1002 | 1002 | 'horizontal' => 1, |
1003 | 1003 | 'choices' => array( |
1004 | 1004 | array( |
@@ -1020,7 +1020,7 @@ discard block |
||
1020 | 1020 | 'name' => 'rest_api', |
1021 | 1021 | 'type' => 'radio', |
1022 | 1022 | 'label' => __( 'REST API', 'gravityview' ), |
1023 | - 'default_value' => $default_settings['rest_api'], |
|
1023 | + 'default_value' => $default_settings[ 'rest_api' ], |
|
1024 | 1024 | 'horizontal' => 1, |
1025 | 1025 | 'choices' => array( |
1026 | 1026 | array( |
@@ -1039,7 +1039,7 @@ discard block |
||
1039 | 1039 | 'name' => 'powered_by', |
1040 | 1040 | 'type' => 'checkbox', |
1041 | 1041 | 'label' => __( 'Display "Powered By" Link', 'gravityview' ), |
1042 | - 'default_value' => $default_settings['powered_by'], |
|
1042 | + 'default_value' => $default_settings[ 'powered_by' ], |
|
1043 | 1043 | 'choices' => array( |
1044 | 1044 | array( |
1045 | 1045 | 'label' => esc_html__( 'Display a "Powered by GravityView" link', 'gravityview' ), |
@@ -1064,7 +1064,7 @@ discard block |
||
1064 | 1064 | 'name' => 'beta', |
1065 | 1065 | 'type' => 'checkbox', |
1066 | 1066 | 'label' => __( 'Become a Beta Tester', 'gravityview' ), |
1067 | - 'default_value' => $default_settings['beta'], |
|
1067 | + 'default_value' => $default_settings[ 'beta' ], |
|
1068 | 1068 | 'horizontal' => 1, |
1069 | 1069 | 'choices' => array( |
1070 | 1070 | array( |
@@ -1098,17 +1098,17 @@ discard block |
||
1098 | 1098 | * @since 1.7.4 |
1099 | 1099 | */ |
1100 | 1100 | foreach ( $fields as &$field ) { |
1101 | - $field['name'] = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' ); |
|
1102 | - $field['label'] = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' ); |
|
1103 | - $field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' ); |
|
1104 | - $field['description'] = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' ); |
|
1101 | + $field[ 'name' ] = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' ); |
|
1102 | + $field[ 'label' ] = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' ); |
|
1103 | + $field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' ); |
|
1104 | + $field[ 'description' ] = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' ); |
|
1105 | 1105 | |
1106 | 1106 | if ( $disabled_attribute ) { |
1107 | - $field['disabled'] = $disabled_attribute; |
|
1107 | + $field[ 'disabled' ] = $disabled_attribute; |
|
1108 | 1108 | } |
1109 | 1109 | |
1110 | - if ( empty( $field['disabled'] ) ) { |
|
1111 | - unset( $field['disabled'] ); |
|
1110 | + if ( empty( $field[ 'disabled' ] ) ) { |
|
1111 | + unset( $field[ 'disabled' ] ); |
|
1112 | 1112 | } |
1113 | 1113 | } |
1114 | 1114 | |
@@ -1120,23 +1120,23 @@ discard block |
||
1120 | 1120 | 'description' => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates & support.', 'gravityview' ), |
1121 | 1121 | 'type' => 'edd_license', |
1122 | 1122 | 'data-pending-text' => __( 'Verifying license…', 'gravityview' ), |
1123 | - 'default_value' => $default_settings['license_key'], |
|
1123 | + 'default_value' => $default_settings[ 'license_key' ], |
|
1124 | 1124 | 'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key', |
1125 | 1125 | ), |
1126 | 1126 | array( |
1127 | 1127 | 'name' => 'license_key_response', |
1128 | - 'default_value' => $default_settings['license_key_response'], |
|
1128 | + 'default_value' => $default_settings[ 'license_key_response' ], |
|
1129 | 1129 | 'type' => 'hidden', |
1130 | 1130 | ), |
1131 | 1131 | array( |
1132 | 1132 | 'name' => 'license_key_status', |
1133 | - 'default_value' => $default_settings['license_key_status'], |
|
1133 | + 'default_value' => $default_settings[ 'license_key_status' ], |
|
1134 | 1134 | 'type' => 'hidden', |
1135 | 1135 | ), |
1136 | 1136 | ); |
1137 | 1137 | |
1138 | 1138 | if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) { |
1139 | - $license_fields[0] = array_merge( $license_fields[0], array( |
|
1139 | + $license_fields[ 0 ] = array_merge( $license_fields[ 0 ], array( |
|
1140 | 1140 | 'disabled' => true, |
1141 | 1141 | 'title' => __( 'The license key is defined by your site\'s configuration file.', 'gravityview' ), |
1142 | 1142 | ) ); |
@@ -1147,7 +1147,7 @@ discard block |
||
1147 | 1147 | |
1148 | 1148 | if ( \gravityview()->plugin->is_GF_25() ) { |
1149 | 1149 | |
1150 | - $sections[] = array( |
|
1150 | + $sections[ ] = array( |
|
1151 | 1151 | 'title' => __( 'GravityView License', 'gravityview' ), |
1152 | 1152 | 'class' => 'gform-settings-panel--full gv-settings-panel--license', |
1153 | 1153 | 'description' => $version_info, |
@@ -1165,7 +1165,7 @@ discard block |
||
1165 | 1165 | ) ); |
1166 | 1166 | } |
1167 | 1167 | |
1168 | - $sections[] = array( |
|
1168 | + $sections[ ] = array( |
|
1169 | 1169 | 'title' => ( gravityview()->plugin->is_GF_25() ? __( 'GravityView Settings', 'gravityview' ) : null ), |
1170 | 1170 | 'class' => 'gform-settings-panel--full gv-settings-panel--core', |
1171 | 1171 | 'fields' => $fields, |
@@ -1189,8 +1189,8 @@ discard block |
||
1189 | 1189 | |
1190 | 1190 | if ( $disabled_attribute ) { |
1191 | 1191 | foreach ( $extension_sections as &$section ) { |
1192 | - foreach ( $section['fields'] as &$field ) { |
|
1193 | - $field['disabled'] = $disabled_attribute; |
|
1192 | + foreach ( $section[ 'fields' ] as &$field ) { |
|
1193 | + $field[ 'disabled' ] = $disabled_attribute; |
|
1194 | 1194 | } |
1195 | 1195 | } |
1196 | 1196 | } |
@@ -1256,7 +1256,7 @@ discard block |
||
1256 | 1256 | public function settings_edd_license( $field, $echo = true ) { |
1257 | 1257 | |
1258 | 1258 | if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) { |
1259 | - $field['input_type'] = 'password'; |
|
1259 | + $field[ 'input_type' ] = 'password'; |
|
1260 | 1260 | } |
1261 | 1261 | |
1262 | 1262 | $text = $this->settings_text( $field, false ); |
@@ -1308,7 +1308,7 @@ discard block |
||
1308 | 1308 | |
1309 | 1309 | ?> |
1310 | 1310 | |
1311 | - <tr id="gaddon-setting-row-<?php echo esc_attr( $field['name'] ); ?>"> |
|
1311 | + <tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>"> |
|
1312 | 1312 | <td colspan="2"> |
1313 | 1313 | <?php $this->single_setting( $field ); ?> |
1314 | 1314 | </td> |
@@ -1334,8 +1334,8 @@ discard block |
||
1334 | 1334 | */ |
1335 | 1335 | public function single_setting_row( $field ) { |
1336 | 1336 | |
1337 | - $field['gv_description'] = Utils::get( $field, 'description' ); |
|
1338 | - $field['description'] = Utils::get( $field, 'subtitle' ); |
|
1337 | + $field[ 'gv_description' ] = Utils::get( $field, 'description' ); |
|
1338 | + $field[ 'description' ] = Utils::get( $field, 'subtitle' ); |
|
1339 | 1339 | parent::single_setting_row( $field ); |
1340 | 1340 | } |
1341 | 1341 | |
@@ -1396,8 +1396,8 @@ discard block |
||
1396 | 1396 | // then we assume it's changed. If it's changed, unset the status and the previous response. |
1397 | 1397 | if ( ! $added_message && ( $local_key !== $response_key ) ) { |
1398 | 1398 | |
1399 | - unset( $posted_settings['license_key_response'] ); |
|
1400 | - unset( $posted_settings['license_key_status'] ); |
|
1399 | + unset( $posted_settings[ 'license_key_response' ] ); |
|
1400 | + unset( $posted_settings[ 'license_key_status' ] ); |
|
1401 | 1401 | |
1402 | 1402 | \GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) ); |
1403 | 1403 |
@@ -85,9 +85,9 @@ discard block |
||
85 | 85 | private function __construct() {} |
86 | 86 | |
87 | 87 | private function initialize() { |
88 | - add_action( 'wp', array( $this, 'parse_content'), 11 ); |
|
88 | + add_action( 'wp', array( $this, 'parse_content' ), 11 ); |
|
89 | 89 | add_filter( 'parse_query', array( $this, 'parse_query_fix_frontpage' ), 10 ); |
90 | - add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 ); |
|
90 | + add_action( 'template_redirect', array( $this, 'set_entry_data' ), 1 ); |
|
91 | 91 | |
92 | 92 | // Enqueue scripts and styles after GravityView_Template::register_styles() |
93 | 93 | add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 ); |
@@ -234,18 +234,18 @@ discard block |
||
234 | 234 | |
235 | 235 | if ( ! empty( $view_id ) ) { |
236 | 236 | |
237 | - $this->context_view_id = (int) $view_id; |
|
237 | + $this->context_view_id = (int)$view_id; |
|
238 | 238 | |
239 | - } elseif ( isset( $_GET['gvid'] ) && $multiple_views ) { |
|
239 | + } elseif ( isset( $_GET[ 'gvid' ] ) && $multiple_views ) { |
|
240 | 240 | /** |
241 | 241 | * used on a has_multiple_views context |
242 | 242 | * @see GravityView_API::entry_link |
243 | 243 | */ |
244 | - $this->context_view_id = (int) $_GET['gvid']; |
|
244 | + $this->context_view_id = (int)$_GET[ 'gvid' ]; |
|
245 | 245 | |
246 | 246 | } elseif ( ! $multiple_views ) { |
247 | 247 | $array_keys = array_keys( $this->getGvOutputData()->get_views() ); |
248 | - $this->context_view_id = (int) array_pop( $array_keys ); |
|
248 | + $this->context_view_id = (int)array_pop( $array_keys ); |
|
249 | 249 | unset( $array_keys ); |
250 | 250 | } |
251 | 251 | |
@@ -278,25 +278,25 @@ discard block |
||
278 | 278 | global $wp_rewrite; |
279 | 279 | |
280 | 280 | $is_front_page = ( $query->is_home || $query->is_page ); |
281 | - $show_on_front = ( 'page' === get_option('show_on_front') ); |
|
282 | - $front_page_id = get_option('page_on_front'); |
|
281 | + $show_on_front = ( 'page' === get_option( 'show_on_front' ) ); |
|
282 | + $front_page_id = get_option( 'page_on_front' ); |
|
283 | 283 | |
284 | - if ( $is_front_page && $show_on_front && $front_page_id ) { |
|
284 | + if ( $is_front_page && $show_on_front && $front_page_id ) { |
|
285 | 285 | |
286 | 286 | // Force to be an array, potentially a query string ( entry=16 ) |
287 | 287 | $_query = wp_parse_args( $query->query ); |
288 | 288 | |
289 | 289 | // pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename. |
290 | - if ( isset( $_query['pagename'] ) && '' === $_query['pagename'] ) { |
|
291 | - unset( $_query['pagename'] ); |
|
290 | + if ( isset( $_query[ 'pagename' ] ) && '' === $_query[ 'pagename' ] ) { |
|
291 | + unset( $_query[ 'pagename' ] ); |
|
292 | 292 | } |
293 | 293 | |
294 | 294 | // this is where will break from core wordpress |
295 | 295 | /** @internal Don't use this filter; it will be unnecessary soon - it's just a patch for specific use case */ |
296 | 296 | $ignore = apply_filters( 'gravityview/internal/ignored_endpoints', array( 'preview', 'page', 'paged', 'cpage' ), $query ); |
297 | 297 | $endpoints = \GV\Utils::get( $wp_rewrite, 'endpoints' ); |
298 | - foreach ( (array) $endpoints as $endpoint ) { |
|
299 | - $ignore[] = $endpoint[1]; |
|
298 | + foreach ( (array)$endpoints as $endpoint ) { |
|
299 | + $ignore[ ] = $endpoint[ 1 ]; |
|
300 | 300 | } |
301 | 301 | unset( $endpoints ); |
302 | 302 | |
@@ -306,21 +306,21 @@ discard block |
||
306 | 306 | // - The query includes keys that are associated with registered endpoints. `entry`, for example. |
307 | 307 | if ( empty( $_query ) || ! array_diff( array_keys( $_query ), $ignore ) ) { |
308 | 308 | |
309 | - $qv =& $query->query_vars; |
|
309 | + $qv = & $query->query_vars; |
|
310 | 310 | |
311 | 311 | // Prevent redirect when on the single entry endpoint |
312 | - if( self::is_single_entry() ) { |
|
312 | + if ( self::is_single_entry() ) { |
|
313 | 313 | add_filter( 'redirect_canonical', '__return_false' ); |
314 | 314 | } |
315 | 315 | |
316 | 316 | $query->is_page = true; |
317 | 317 | $query->is_home = false; |
318 | - $qv['page_id'] = $front_page_id; |
|
318 | + $qv[ 'page_id' ] = $front_page_id; |
|
319 | 319 | |
320 | 320 | // Correct <!--nextpage--> for page_on_front |
321 | - if ( ! empty( $qv['paged'] ) ) { |
|
322 | - $qv['page'] = $qv['paged']; |
|
323 | - unset( $qv['paged'] ); |
|
321 | + if ( ! empty( $qv[ 'paged' ] ) ) { |
|
322 | + $qv[ 'page' ] = $qv[ 'paged' ]; |
|
323 | + unset( $qv[ 'paged' ] ); |
|
324 | 324 | } |
325 | 325 | } |
326 | 326 | |
@@ -350,7 +350,7 @@ discard block |
||
350 | 350 | |
351 | 351 | $this->setIsGravityviewPostType( get_post_type( $post ) === 'gravityview' ); |
352 | 352 | |
353 | - $post_id = $this->getPostId() ? $this->getPostId() : (isset( $post ) ? $post->ID : null ); |
|
353 | + $post_id = $this->getPostId() ? $this->getPostId() : ( isset( $post ) ? $post->ID : null ); |
|
354 | 354 | $this->setPostId( $post_id ); |
355 | 355 | $post_has_shortcode = ! empty( $post->post_content ) ? gravityview_has_shortcode_r( $post->post_content, 'gravityview' ) : false; |
356 | 356 | $this->setPostHasShortcode( $this->isGravityviewPostType() ? null : ! empty( $post_has_shortcode ) ); |
@@ -386,7 +386,7 @@ discard block |
||
386 | 386 | |
387 | 387 | $search_method = GravityView_Widget_Search::getInstance()->get_search_method(); |
388 | 388 | |
389 | - if( 'post' === $search_method ) { |
|
389 | + if ( 'post' === $search_method ) { |
|
390 | 390 | $get = $_POST; |
391 | 391 | } else { |
392 | 392 | $get = $_GET; |
@@ -438,7 +438,7 @@ discard block |
||
438 | 438 | $gventry = gravityview()->request->is_entry(); |
439 | 439 | |
440 | 440 | // If this is the directory view, return. |
441 | - if( ! $gventry ) { |
|
441 | + if ( ! $gventry ) { |
|
442 | 442 | return $passed_title; |
443 | 443 | } |
444 | 444 | |
@@ -456,19 +456,19 @@ discard block |
||
456 | 456 | } |
457 | 457 | |
458 | 458 | // WooCommerce doesn't $post_id |
459 | - if ( empty( $passed_post_id ) ) { |
|
459 | + if ( empty( $passed_post_id ) ) { |
|
460 | 460 | return $passed_title; |
461 | 461 | } |
462 | 462 | |
463 | 463 | // Don't modify the title for anything other than the current view/post. |
464 | 464 | // This is true for embedded shortcodes and Views. |
465 | - if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) { |
|
465 | + if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) { |
|
466 | 466 | return $passed_title; |
467 | 467 | } |
468 | 468 | |
469 | 469 | $view = gravityview()->request->is_view(); |
470 | 470 | |
471 | - if( $view ) { |
|
471 | + if ( $view ) { |
|
472 | 472 | return $this->_get_single_entry_title( $view, $entry, $passed_title ); |
473 | 473 | } |
474 | 474 | |
@@ -491,7 +491,7 @@ discard block |
||
491 | 491 | $view_collection = \GV\View_Collection::from_post( $post ); |
492 | 492 | |
493 | 493 | // We have multiple Views, but no gvid...this isn't valid security |
494 | - if( 1 < $view_collection->count() ) { |
|
494 | + if ( 1 < $view_collection->count() ) { |
|
495 | 495 | return $passed_title; |
496 | 496 | } |
497 | 497 | |
@@ -525,18 +525,18 @@ discard block |
||
525 | 525 | */ |
526 | 526 | $check_entry_display = apply_filters( 'gravityview/single/title/check_entry_display', true, $entry, $view ); |
527 | 527 | |
528 | - if( $check_entry_display ) { |
|
528 | + if ( $check_entry_display ) { |
|
529 | 529 | |
530 | 530 | $check_display = GVCommon::check_entry_display( $entry, $view ); |
531 | 531 | |
532 | - if( is_wp_error( $check_display ) ) { |
|
532 | + if ( is_wp_error( $check_display ) ) { |
|
533 | 533 | return $passed_title; |
534 | 534 | } |
535 | 535 | } |
536 | 536 | |
537 | 537 | $title = $view->settings->get( 'single_title', $passed_title ); |
538 | 538 | |
539 | - $form = GVCommon::get_form( $entry['form_id'] ); |
|
539 | + $form = GVCommon::get_form( $entry[ 'form_id' ] ); |
|
540 | 540 | |
541 | 541 | // We are allowing HTML in the fields, so no escaping the output |
542 | 542 | $title = GravityView_API::replace_variables( $title, $form, $entry ); |
@@ -607,7 +607,7 @@ discard block |
||
607 | 607 | |
608 | 608 | $context = GravityView_View::getInstance()->getContext(); |
609 | 609 | |
610 | - switch( $context ) { |
|
610 | + switch ( $context ) { |
|
611 | 611 | case 'directory': |
612 | 612 | $tab = __( 'Multiple Entries', 'gravityview' ); |
613 | 613 | break; |
@@ -621,12 +621,12 @@ discard block |
||
621 | 621 | } |
622 | 622 | |
623 | 623 | |
624 | - $title = sprintf( esc_html_x('The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab ); |
|
624 | + $title = sprintf( esc_html_x( 'The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab ); |
|
625 | 625 | $edit_link = admin_url( sprintf( 'post.php?post=%d&action=edit#%s-view', $view_id, $context ) ); |
626 | - $action_text = sprintf( esc_html__('Add fields to %s', 'gravityview' ), $tab ); |
|
626 | + $action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab ); |
|
627 | 627 | $message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' ); |
628 | 628 | |
629 | - $image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url(plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) ); |
|
629 | + $image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) ); |
|
630 | 630 | $output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message ); |
631 | 631 | |
632 | 632 | echo GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $view_id ); |
@@ -673,7 +673,7 @@ discard block |
||
673 | 673 | $direct_access = apply_filters( 'gravityview_direct_access', true, $view->ID ); |
674 | 674 | $embed_only = $view->settings->get( 'embed_only' ); |
675 | 675 | |
676 | - if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) { |
|
676 | + if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) { |
|
677 | 677 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
678 | 678 | } |
679 | 679 | |
@@ -720,7 +720,7 @@ discard block |
||
720 | 720 | $datetime_format = 'Y-m-d H:i:s'; |
721 | 721 | $search_is_outside_view_bounds = false; |
722 | 722 | |
723 | - if( ! empty( $search_criteria[ $key ] ) ) { |
|
723 | + if ( ! empty( $search_criteria[ $key ] ) ) { |
|
724 | 724 | |
725 | 725 | $search_date = strtotime( $search_criteria[ $key ], GFCommon::get_local_timestamp() ); |
726 | 726 | |
@@ -748,14 +748,14 @@ discard block |
||
748 | 748 | if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) { |
749 | 749 | |
750 | 750 | // Then we override the search and re-set the start date |
751 | - $return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true ); |
|
751 | + $return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true ); |
|
752 | 752 | } |
753 | 753 | } |
754 | 754 | } |
755 | 755 | |
756 | - if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) { |
|
756 | + if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) { |
|
757 | 757 | // The start date is AFTER the end date. This will result in no results, but let's not force the issue. |
758 | - if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) { |
|
758 | + if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) { |
|
759 | 759 | gravityview()->log->error( 'Invalid search: the start date is after the end date.', array( 'data' => $return_search_criteria ) ); |
760 | 760 | } |
761 | 761 | } |
@@ -774,19 +774,19 @@ discard block |
||
774 | 774 | public static function process_search_only_approved( $args, $search_criteria ) { |
775 | 775 | |
776 | 776 | /** @since 1.19 */ |
777 | - if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) { |
|
777 | + if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
778 | 778 | gravityview()->log->debug( 'User can moderate entries; showing all approval statuses' ); |
779 | 779 | return $search_criteria; |
780 | 780 | } |
781 | 781 | |
782 | - if ( ! empty( $args['show_only_approved'] ) ) { |
|
782 | + if ( ! empty( $args[ 'show_only_approved' ] ) ) { |
|
783 | 783 | |
784 | - $search_criteria['field_filters'][] = array( |
|
784 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
785 | 785 | 'key' => GravityView_Entry_Approval::meta_key, |
786 | 786 | 'value' => GravityView_Entry_Approval_Status::APPROVED |
787 | 787 | ); |
788 | 788 | |
789 | - $search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met |
|
789 | + $search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met |
|
790 | 790 | |
791 | 791 | gravityview()->log->debug( '[process_search_only_approved] Search Criteria if show only approved: ', array( 'data' => $search_criteria ) ); |
792 | 792 | } |
@@ -813,18 +813,18 @@ discard block |
||
813 | 813 | */ |
814 | 814 | public static function is_entry_approved( $entry, $args = array() ) { |
815 | 815 | |
816 | - if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) { |
|
816 | + if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) { |
|
817 | 817 | // is implicitly approved if entry is null or View settings doesn't require to check for approval |
818 | 818 | return true; |
819 | 819 | } |
820 | 820 | |
821 | 821 | /** @since 1.19 */ |
822 | - if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) { |
|
822 | + if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
823 | 823 | gravityview()->log->debug( 'User can moderate entries, so entry is approved for viewing' ); |
824 | 824 | return true; |
825 | 825 | } |
826 | 826 | |
827 | - $is_approved = gform_get_meta( $entry['id'], GravityView_Entry_Approval::meta_key ); |
|
827 | + $is_approved = gform_get_meta( $entry[ 'id' ], GravityView_Entry_Approval::meta_key ); |
|
828 | 828 | |
829 | 829 | return GravityView_Entry_Approval_Status::is_approved( $is_approved ); |
830 | 830 | } |
@@ -848,7 +848,7 @@ discard block |
||
848 | 848 | * Compatibility with filters hooking in `gravityview_search_criteria` instead of `gravityview_fe_search_criteria`. |
849 | 849 | */ |
850 | 850 | $criteria = apply_filters( 'gravityview_search_criteria', array(), array( $form_id ), \GV\Utils::get( $args, 'id' ) ); |
851 | - $search_criteria = isset( $criteria['search_criteria'] ) ? $criteria['search_criteria'] : array( 'field_filters' => array() ); |
|
851 | + $search_criteria = isset( $criteria[ 'search_criteria' ] ) ? $criteria[ 'search_criteria' ] : array( 'field_filters' => array() ); |
|
852 | 852 | |
853 | 853 | /** |
854 | 854 | * @filter `gravityview_fe_search_criteria` Modify the search criteria |
@@ -868,29 +868,29 @@ discard block |
||
868 | 868 | gravityview()->log->debug( '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', array( 'data' =>$search_criteria ) ); |
869 | 869 | |
870 | 870 | // implicity search |
871 | - if ( ! empty( $args['search_value'] ) ) { |
|
871 | + if ( ! empty( $args[ 'search_value' ] ) ) { |
|
872 | 872 | |
873 | 873 | // Search operator options. Options: `is` or `contains` |
874 | - $operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains'; |
|
874 | + $operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains'; |
|
875 | 875 | |
876 | - $search_criteria['field_filters'][] = array( |
|
876 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
877 | 877 | 'key' => \GV\Utils::_GET( 'search_field', \GV\Utils::get( $args, 'search_field' ) ), // The field ID to search |
878 | - 'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes. |
|
878 | + 'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes. |
|
879 | 879 | 'operator' => $operator, |
880 | 880 | ); |
881 | 881 | |
882 | 882 | // Lock search mode to "all" with implicit presearch filter. |
883 | - $search_criteria['field_filters']['mode'] = 'all'; |
|
883 | + $search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; |
|
884 | 884 | } |
885 | 885 | |
886 | - if( $search_criteria !== $original_search_criteria ) { |
|
886 | + if ( $search_criteria !== $original_search_criteria ) { |
|
887 | 887 | gravityview()->log->debug( '[get_search_criteria] Search Criteria after implicity search: ', array( 'data' => $search_criteria ) ); |
888 | 888 | } |
889 | 889 | |
890 | 890 | // Handle setting date range |
891 | 891 | $search_criteria = self::process_search_dates( $args, $search_criteria ); |
892 | 892 | |
893 | - if( $search_criteria !== $original_search_criteria ) { |
|
893 | + if ( $search_criteria !== $original_search_criteria ) { |
|
894 | 894 | gravityview()->log->debug( '[get_search_criteria] Search Criteria after date params: ', array( 'data' => $search_criteria ) ); |
895 | 895 | } |
896 | 896 | |
@@ -901,7 +901,7 @@ discard block |
||
901 | 901 | * @filter `gravityview_status` Modify entry status requirements to be included in search results. |
902 | 902 | * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash` |
903 | 903 | */ |
904 | - $search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args ); |
|
904 | + $search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args ); |
|
905 | 905 | |
906 | 906 | return $search_criteria; |
907 | 907 | } |
@@ -1013,7 +1013,7 @@ discard block |
||
1013 | 1013 | 'search_criteria' => $search_criteria, |
1014 | 1014 | 'sorting' => self::updateViewSorting( $args, $form_id ), |
1015 | 1015 | 'paging' => $paging, |
1016 | - 'cache' => isset( $args['cache'] ) ? $args['cache'] : true, |
|
1016 | + 'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true, |
|
1017 | 1017 | ); |
1018 | 1018 | |
1019 | 1019 | /** |
@@ -1038,7 +1038,7 @@ discard block |
||
1038 | 1038 | * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys. |
1039 | 1039 | * @param array $args View configuration args. |
1040 | 1040 | */ |
1041 | - $parameters = apply_filters( 'gravityview_get_entries_'.\GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id ); |
|
1041 | + $parameters = apply_filters( 'gravityview_get_entries_' . \GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id ); |
|
1042 | 1042 | |
1043 | 1043 | gravityview()->log->debug( '$parameters passed to gravityview_get_entries(): ', array( 'data' => $parameters ) ); |
1044 | 1044 | |
@@ -1063,17 +1063,17 @@ discard block |
||
1063 | 1063 | $default_page_size = apply_filters( 'gravityview_default_page_size', 25 ); |
1064 | 1064 | |
1065 | 1065 | // Paging & offset |
1066 | - $page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : $default_page_size; |
|
1066 | + $page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : $default_page_size; |
|
1067 | 1067 | |
1068 | 1068 | if ( -1 === $page_size ) { |
1069 | 1069 | $page_size = PHP_INT_MAX; |
1070 | 1070 | } |
1071 | 1071 | |
1072 | - $curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] ); |
|
1072 | + $curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] ); |
|
1073 | 1073 | $offset = ( $curr_page - 1 ) * $page_size; |
1074 | 1074 | |
1075 | - if ( ! empty( $args['offset'] ) ) { |
|
1076 | - $offset += intval( $args['offset'] ); |
|
1075 | + if ( ! empty( $args[ 'offset' ] ) ) { |
|
1076 | + $offset += intval( $args[ 'offset' ] ); |
|
1077 | 1077 | } |
1078 | 1078 | |
1079 | 1079 | $paging = array( |
@@ -1098,11 +1098,11 @@ discard block |
||
1098 | 1098 | public static function updateViewSorting( $args, $form_id ) { |
1099 | 1099 | $sorting = array(); |
1100 | 1100 | |
1101 | - $has_values = isset( $_GET['sort'] ); |
|
1101 | + $has_values = isset( $_GET[ 'sort' ] ); |
|
1102 | 1102 | |
1103 | - if ( $has_values && is_array( $_GET['sort'] ) ) { |
|
1104 | - $sorts = array_keys( $_GET['sort'] ); |
|
1105 | - $dirs = array_values( $_GET['sort'] ); |
|
1103 | + if ( $has_values && is_array( $_GET[ 'sort' ] ) ) { |
|
1104 | + $sorts = array_keys( $_GET[ 'sort' ] ); |
|
1105 | + $dirs = array_values( $_GET[ 'sort' ] ); |
|
1106 | 1106 | |
1107 | 1107 | if ( $has_values = array_filter( $dirs ) ) { |
1108 | 1108 | $sort_field_id = end( $sorts ); |
@@ -1111,11 +1111,11 @@ discard block |
||
1111 | 1111 | } |
1112 | 1112 | |
1113 | 1113 | if ( ! isset( $sort_field_id ) ) { |
1114 | - $sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : \GV\Utils::get( $args, 'sort_field' ); |
|
1114 | + $sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : \GV\Utils::get( $args, 'sort_field' ); |
|
1115 | 1115 | } |
1116 | 1116 | |
1117 | 1117 | if ( ! isset( $sort_direction ) ) { |
1118 | - $sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : \GV\Utils::get( $args, 'sort_direction' ); |
|
1118 | + $sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : \GV\Utils::get( $args, 'sort_direction' ); |
|
1119 | 1119 | } |
1120 | 1120 | |
1121 | 1121 | if ( is_array( $sort_field_id ) ) { |
@@ -1147,10 +1147,10 @@ discard block |
||
1147 | 1147 | $form = GFAPI::get_form( $form_id ); |
1148 | 1148 | |
1149 | 1149 | // Get the first GF_Field field ID, set as the key for entry randomization |
1150 | - if ( ! empty( $form['fields'] ) ) { |
|
1150 | + if ( ! empty( $form[ 'fields' ] ) ) { |
|
1151 | 1151 | |
1152 | 1152 | /** @var GF_Field $field */ |
1153 | - foreach ( $form['fields'] as $field ) { |
|
1153 | + foreach ( $form[ 'fields' ] as $field ) { |
|
1154 | 1154 | if ( ! is_a( $field, 'GF_Field' ) ) { |
1155 | 1155 | continue; |
1156 | 1156 | } |
@@ -1195,7 +1195,7 @@ discard block |
||
1195 | 1195 | if ( is_array( $sort_field_id ) ) { |
1196 | 1196 | $modified_ids = array(); |
1197 | 1197 | foreach ( $sort_field_id as $_sort_field_id ) { |
1198 | - $modified_ids []= self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id ); |
|
1198 | + $modified_ids [ ] = self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id ); |
|
1199 | 1199 | } |
1200 | 1200 | return $modified_ids; |
1201 | 1201 | } |
@@ -1204,11 +1204,11 @@ discard block |
||
1204 | 1204 | |
1205 | 1205 | $sort_field = GFFormsModel::get_field( $form, $sort_field_id ); |
1206 | 1206 | |
1207 | - if( ! $sort_field ) { |
|
1207 | + if ( ! $sort_field ) { |
|
1208 | 1208 | return $sort_field_id; |
1209 | 1209 | } |
1210 | 1210 | |
1211 | - switch ( $sort_field['type'] ) { |
|
1211 | + switch ( $sort_field[ 'type' ] ) { |
|
1212 | 1212 | |
1213 | 1213 | case 'address': |
1214 | 1214 | // Sorting by full address |
@@ -1225,7 +1225,7 @@ discard block |
||
1225 | 1225 | */ |
1226 | 1226 | $address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id ); |
1227 | 1227 | |
1228 | - switch( strtolower( $address_part ) ){ |
|
1228 | + switch ( strtolower( $address_part ) ) { |
|
1229 | 1229 | case 'street': |
1230 | 1230 | $sort_field_id .= '.1'; |
1231 | 1231 | break; |
@@ -1298,7 +1298,7 @@ discard block |
||
1298 | 1298 | if ( ! class_exists( '\GV\Entry' ) ) { |
1299 | 1299 | |
1300 | 1300 | // Not using gravityview()->log->error(), since that may not exist yet either! |
1301 | - do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary() ); |
|
1301 | + do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary() ); |
|
1302 | 1302 | |
1303 | 1303 | return null; |
1304 | 1304 | } |
@@ -1315,7 +1315,7 @@ discard block |
||
1315 | 1315 | */ |
1316 | 1316 | $single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry ); |
1317 | 1317 | |
1318 | - if ( empty( $single_entry ) ){ |
|
1318 | + if ( empty( $single_entry ) ) { |
|
1319 | 1319 | return false; |
1320 | 1320 | } else { |
1321 | 1321 | return $single_entry; |
@@ -1336,7 +1336,7 @@ discard block |
||
1336 | 1336 | $views = $this->getGvOutputData()->get_views(); |
1337 | 1337 | |
1338 | 1338 | foreach ( $views as $view_id => $data ) { |
1339 | - $view = \GV\View::by_id( $data['id'] ); |
|
1339 | + $view = \GV\View::by_id( $data[ 'id' ] ); |
|
1340 | 1340 | $view_id = $view->ID; |
1341 | 1341 | $template_id = gravityview_get_template_id( $view->ID ); |
1342 | 1342 | $data = $view->as_data(); |
@@ -1345,7 +1345,7 @@ discard block |
||
1345 | 1345 | * Don't enqueue the scripts or styles if it's not going to be displayed. |
1346 | 1346 | * @since 1.15 |
1347 | 1347 | */ |
1348 | - if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) { |
|
1348 | + if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) { |
|
1349 | 1349 | continue; |
1350 | 1350 | } |
1351 | 1351 | |
@@ -1378,7 +1378,7 @@ discard block |
||
1378 | 1378 | * @param \GV\View The View. |
1379 | 1379 | */ |
1380 | 1380 | apply_filters( 'gravityview_lightbox_script', $js_dependency, $view ); |
1381 | - $js_dependencies[] = $js_dependency; |
|
1381 | + $js_dependencies[ ] = $js_dependency; |
|
1382 | 1382 | |
1383 | 1383 | if ( ! empty( $wp_filter[ 'gravity_view_lightbox_style' ] ) ) { |
1384 | 1384 | gravityview()->log->warning( 'gravity_view_lightbox_style filter is deprecated use gravityview_lightbox_style instead' ); |
@@ -1398,7 +1398,7 @@ discard block |
||
1398 | 1398 | * @param \GV\View The View. |
1399 | 1399 | */ |
1400 | 1400 | $css_dependency = apply_filters( 'gravityview_lightbox_style', $css_dependency, $view ); |
1401 | - $css_dependencies[] = $css_dependency; |
|
1401 | + $css_dependencies[ ] = $css_dependency; |
|
1402 | 1402 | } |
1403 | 1403 | |
1404 | 1404 | /** |
@@ -1406,19 +1406,19 @@ discard block |
||
1406 | 1406 | * @see https://github.com/katzwebservices/GravityView/issues/536 |
1407 | 1407 | * @since 1.15 |
1408 | 1408 | */ |
1409 | - if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) { |
|
1410 | - $css_dependencies[] = 'dashicons'; |
|
1409 | + if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) { |
|
1410 | + $css_dependencies[ ] = 'dashicons'; |
|
1411 | 1411 | } |
1412 | 1412 | |
1413 | 1413 | wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true ); |
1414 | 1414 | |
1415 | 1415 | $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
1416 | 1416 | |
1417 | - wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ) , GravityView_Plugin::version, true ); |
|
1417 | + wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ), GravityView_Plugin::version, true ); |
|
1418 | 1418 | |
1419 | 1419 | wp_enqueue_script( 'gravityview-fe-view' ); |
1420 | 1420 | |
1421 | - if ( ! empty( $data['atts']['sort_columns'] ) ) { |
|
1421 | + if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) { |
|
1422 | 1422 | wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' ); |
1423 | 1423 | } |
1424 | 1424 | |
@@ -1481,7 +1481,7 @@ discard block |
||
1481 | 1481 | public static function add_style( $template_id ) { |
1482 | 1482 | |
1483 | 1483 | if ( ! empty( $template_id ) && wp_style_is( 'gravityview_style_' . $template_id, 'registered' ) ) { |
1484 | - gravityview()->log->debug( 'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) ); |
|
1484 | + gravityview()->log->debug( 'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) ); |
|
1485 | 1485 | wp_enqueue_style( 'gravityview_style_' . $template_id ); |
1486 | 1486 | } elseif ( empty( $template_id ) ) { |
1487 | 1487 | gravityview()->log->error( 'Cannot add template style; template_id is empty' ); |
@@ -1512,11 +1512,11 @@ discard block |
||
1512 | 1512 | * Not a table-based template; don't add sort icons |
1513 | 1513 | * @since 1.12 |
1514 | 1514 | */ |
1515 | - if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) { |
|
1515 | + if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) { |
|
1516 | 1516 | return $label; |
1517 | 1517 | } |
1518 | 1518 | |
1519 | - if ( ! $this->is_field_sortable( $field['id'], $form ) ) { |
|
1519 | + if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) { |
|
1520 | 1520 | return $label; |
1521 | 1521 | } |
1522 | 1522 | |
@@ -1524,29 +1524,29 @@ discard block |
||
1524 | 1524 | |
1525 | 1525 | $class = 'gv-sort'; |
1526 | 1526 | |
1527 | - $sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] ); |
|
1527 | + $sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] ); |
|
1528 | 1528 | |
1529 | 1529 | $sort_args = array( |
1530 | - 'sort' => $field['id'], |
|
1530 | + 'sort' => $field[ 'id' ], |
|
1531 | 1531 | 'dir' => 'asc', |
1532 | 1532 | ); |
1533 | 1533 | |
1534 | - if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) { |
|
1534 | + if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) { |
|
1535 | 1535 | //toggle sorting direction. |
1536 | - if ( 'asc' === $sorting['direction'] ) { |
|
1537 | - $sort_args['dir'] = 'desc'; |
|
1536 | + if ( 'asc' === $sorting[ 'direction' ] ) { |
|
1537 | + $sort_args[ 'dir' ] = 'desc'; |
|
1538 | 1538 | $class .= ' gv-icon-sort-desc'; |
1539 | 1539 | } else { |
1540 | - $sort_args['dir'] = 'asc'; |
|
1540 | + $sort_args[ 'dir' ] = 'asc'; |
|
1541 | 1541 | $class .= ' gv-icon-sort-asc'; |
1542 | 1542 | } |
1543 | 1543 | } else { |
1544 | 1544 | $class .= ' gv-icon-caret-up-down'; |
1545 | 1545 | } |
1546 | 1546 | |
1547 | - $url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) ); |
|
1547 | + $url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) ); |
|
1548 | 1548 | |
1549 | - return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a> '. $label; |
|
1549 | + return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a> ' . $label; |
|
1550 | 1550 | |
1551 | 1551 | } |
1552 | 1552 | |
@@ -1564,7 +1564,7 @@ discard block |
||
1564 | 1564 | |
1565 | 1565 | $field_type = $field_id; |
1566 | 1566 | |
1567 | - if( is_numeric( $field_id ) ) { |
|
1567 | + if ( is_numeric( $field_id ) ) { |
|
1568 | 1568 | $field = GFFormsModel::get_field( $form, $field_id ); |
1569 | 1569 | $field_type = $field ? $field->type : $field_id; |
1570 | 1570 | } |
@@ -1587,7 +1587,7 @@ discard block |
||
1587 | 1587 | return false; |
1588 | 1588 | } |
1589 | 1589 | |
1590 | - return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) ); |
|
1590 | + return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) ); |
|
1591 | 1591 | |
1592 | 1592 | } |
1593 | 1593 |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | |
54 | 54 | $partial_entries_addon = GF_Partial_Entries::get_instance(); |
55 | 55 | |
56 | - $feed_settings = $partial_entries_addon->get_feed_settings( $form['id'] ); |
|
56 | + $feed_settings = $partial_entries_addon->get_feed_settings( $form[ 'id' ] ); |
|
57 | 57 | |
58 | 58 | $is_enabled = \GV\Utils::get( $feed_settings, 'enable', 0 ); |
59 | 59 | |
@@ -70,14 +70,14 @@ discard block |
||
70 | 70 | } |
71 | 71 | |
72 | 72 | // Set the expected $_POST key for the Add-On to use |
73 | - $_POST['partial_entry_id'] = $partial_entry_id; |
|
73 | + $_POST[ 'partial_entry_id' ] = $partial_entry_id; |
|
74 | 74 | |
75 | 75 | gravityview()->log->debug( 'Saving partial entry (ID #{partial_entry_id}) for Entry #{entry_id}', array( |
76 | 76 | 'partial_entry_id' => $partial_entry_id, |
77 | 77 | 'entry_id' => $entry_id |
78 | 78 | ) ); |
79 | 79 | |
80 | - $partial_entries_addon->maybe_save_partial_entry( $form['id'] ); |
|
80 | + $partial_entries_addon->maybe_save_partial_entry( $form[ 'id' ] ); |
|
81 | 81 | } |
82 | 82 | } |
83 | 83 |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | */ |
54 | 54 | public function maybe_add_article_to_tooltip( $tooltip = '', $article = array(), $url = '', $atts = '', $css_class = '', $anchor_text = '' ) { |
55 | 55 | |
56 | - if ( empty( $article['id'] ) ) { |
|
56 | + if ( empty( $article[ 'id' ] ) ) { |
|
57 | 57 | return $tooltip; |
58 | 58 | } |
59 | 59 | |
@@ -69,10 +69,10 @@ discard block |
||
69 | 69 | |
70 | 70 | $css_class .= ' gv_tooltip'; |
71 | 71 | |
72 | - if ( ! empty( $article['type'] ) ) { |
|
73 | - $atts = sprintf( 'data-beacon-article-%s="%s"', $article['type'], $article['id'] ); |
|
72 | + if ( ! empty( $article[ 'type' ] ) ) { |
|
73 | + $atts = sprintf( 'data-beacon-article-%s="%s"', $article[ 'type' ], $article[ 'id' ] ); |
|
74 | 74 | } else { |
75 | - $atts = sprintf( 'data-beacon-article="%s"', $article['id'] ); |
|
75 | + $atts = sprintf( 'data-beacon-article="%s"', $article[ 'id' ] ); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | $url = \GV\Utils::get( $article, 'url', '#' ); |
@@ -172,9 +172,9 @@ discard block |
||
172 | 172 | ) ); |
173 | 173 | |
174 | 174 | // This is just HTML we don't need. |
175 | - unset( $response['message'] ); |
|
175 | + unset( $response[ 'message' ] ); |
|
176 | 176 | |
177 | - switch ( intval( $response['price_id'] ) ) { |
|
177 | + switch ( intval( $response[ 'price_id' ] ) ) { |
|
178 | 178 | default: |
179 | 179 | case 1: |
180 | 180 | $package = 'Core'; |
@@ -202,12 +202,12 @@ discard block |
||
202 | 202 | 'signature' => hash_hmac( 'sha256', $current_user->user_email, self::beacon_key ), |
203 | 203 | 'affiliate_id' => gravityview()->plugin->settings->get( 'affiliate_id' ), |
204 | 204 | 'is_super_admin' => is_super_admin(), |
205 | - 'License Key' => $response['license_key'] . ' (' . ucwords( $response['license'] ) . ')', |
|
205 | + 'License Key' => $response[ 'license_key' ] . ' (' . ucwords( $response[ 'license' ] ) . ')', |
|
206 | 206 | 'License Level' => $package, |
207 | 207 | 'Alt Emails' => sprintf( "Admin: %s, GV Support: %s", get_bloginfo( 'admin_email' ), gravityview()->plugin->settings->get( 'support-email' ) ), |
208 | - 'Payment Details' => $response['customer_name'] . ' ' . $response['customer_email'], |
|
208 | + 'Payment Details' => $response[ 'customer_name' ] . ' ' . $response[ 'customer_email' ], |
|
209 | 209 | 'WordPress Version' => get_bloginfo( 'version', 'display' ), |
210 | - 'PHP Version' => phpversion() . ' on ' . esc_html( $_SERVER['SERVER_SOFTWARE'] ), |
|
210 | + 'PHP Version' => phpversion() . ' on ' . esc_html( $_SERVER[ 'SERVER_SOFTWARE' ] ), |
|
211 | 211 | 'No-Conflict Mode' => empty( $no_conflict_mode ) ? 'Disabled' : 'Enabled', |
212 | 212 | 'GravityView Version' => \GV\Plugin::$version, |
213 | 213 | 'Gravity Forms Version' => GFForms::$version, |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | ob_get_clean(); |
218 | 218 | |
219 | 219 | // Help Scout length limit is 200 characters |
220 | - foreach( $data as $key => $value ) { |
|
220 | + foreach ( $data as $key => $value ) { |
|
221 | 221 | if ( ! is_string( $value ) ) { |
222 | 222 | continue; |
223 | 223 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | ); |
103 | 103 | |
104 | 104 | if ( ! empty( $action ) ) { |
105 | - $settings['edd_action'] = esc_attr( $action ); |
|
105 | + $settings[ 'edd_action' ] = esc_attr( $action ); |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | return array_map( 'urlencode', $settings ); |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | 'format' => 'json', |
159 | 159 | ) ); |
160 | 160 | |
161 | - if ( $is_ajax && empty( $data['license'] ) ) { |
|
161 | + if ( $is_ajax && empty( $data[ 'license' ] ) ) { |
|
162 | 162 | die( -1 ); |
163 | 163 | } |
164 | 164 | |
@@ -186,11 +186,11 @@ discard block |
||
186 | 186 | |
187 | 187 | $json = json_encode( $license_data ); |
188 | 188 | |
189 | - $update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST('action'); |
|
189 | + $update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST( 'action' ); |
|
190 | 190 | |
191 | 191 | $is_check_action_button = ( 'check_license' === Utils::get( $data, 'edd_action' ) && defined( 'DOING_AJAX' ) && DOING_AJAX ); |
192 | 192 | |
193 | - do_action('gravityview/admin_installer/delete_downloads_data', true ); |
|
193 | + do_action( 'gravityview/admin_installer/delete_downloads_data', true ); |
|
194 | 194 | |
195 | 195 | if ( $is_check_action_button ) { |
196 | 196 | delete_transient( self::status_transient_key ); |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | // most likely a mistake. |
202 | 202 | } else if ( $license_data->license !== 'failed' && $update_license ) { |
203 | 203 | |
204 | - if ( ! empty( $data['field_id'] ) ) { |
|
204 | + if ( ! empty( $data[ 'field_id' ] ) ) { |
|
205 | 205 | set_transient( self::status_transient_key, $license_data, DAY_IN_SECONDS ); |
206 | 206 | } |
207 | 207 | |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | $class = 'hide'; |
230 | 230 | $message = ''; |
231 | 231 | } else { |
232 | - if( ! empty( $license_data->error ) ) { |
|
232 | + if ( ! empty( $license_data->error ) ) { |
|
233 | 233 | $class = 'error'; |
234 | 234 | $string_key = $license_data->error; |
235 | 235 | } else { $class = $license_data->license; |
@@ -253,12 +253,12 @@ discard block |
||
253 | 253 | */ |
254 | 254 | public function license_details( $response = array() ) { |
255 | 255 | |
256 | - $response = (array) $response; |
|
256 | + $response = (array)$response; |
|
257 | 257 | |
258 | 258 | $return = ''; |
259 | 259 | $wrapper = '<span class="gv-license-details" aria-live="polite" aria-busy="false">%s</span>'; |
260 | 260 | |
261 | - if ( ! empty( $response['license_key'] ) ) { |
|
261 | + if ( ! empty( $response[ 'license_key' ] ) ) { |
|
262 | 262 | $return .= '<h3>' . rtrim( esc_html__( 'License Details:', 'gravityview' ), ':' ) . '</h3>'; |
263 | 263 | |
264 | 264 | if ( in_array( Utils::get( $response, 'license' ), array( 'invalid', 'deactivated' ) ) ) { |
@@ -266,8 +266,8 @@ discard block |
||
266 | 266 | return sprintf( $wrapper, '' ); // Do not show redundant information - invalid/deactivated notice will be displayed by generate_license_box() |
267 | 267 | } |
268 | 268 | |
269 | - $return .= $this->strings( $response['license'], $response ); |
|
270 | - } elseif ( ! empty( $response['license_name'] ) ) { |
|
269 | + $return .= $this->strings( $response[ 'license' ], $response ); |
|
270 | + } elseif ( ! empty( $response[ 'license_name' ] ) ) { |
|
271 | 271 | $response_keys = array( |
272 | 272 | 'license_name' => '', |
273 | 273 | 'license_limit' => '', |
@@ -282,22 +282,22 @@ discard block |
||
282 | 282 | $response = wp_parse_args( $response, $response_keys ); |
283 | 283 | |
284 | 284 | $login_link_class = gravityview()->plugin->is_GF_25() ? 'button button-outline outline' : 'text-link'; |
285 | - $renews_on = ( 'lifetime' === $response['expires'] ) ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response['expires'] ) - DAY_IN_SECONDS ) ); |
|
286 | - $login_link = sprintf( '<a href="%s" class="gv-access-account ' . $login_link_class . '" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response['customer_email'] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) ); |
|
287 | - $local_text = ( ! empty( $response['is_local'] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' ); |
|
288 | - $license_limit = empty( $response['license_limit'] ) ? __( 'Unlimited', 'gravityview' ) : (int) $response['license_limit']; |
|
285 | + $renews_on = ( 'lifetime' === $response[ 'expires' ] ) ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response[ 'expires' ] ) - DAY_IN_SECONDS ) ); |
|
286 | + $login_link = sprintf( '<a href="%s" class="gv-access-account ' . $login_link_class . '" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response[ 'customer_email' ] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) ); |
|
287 | + $local_text = ( ! empty( $response[ 'is_local' ] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' ); |
|
288 | + $license_limit = empty( $response[ 'license_limit' ] ) ? __( 'Unlimited', 'gravityview' ) : (int)$response[ 'license_limit' ]; |
|
289 | 289 | |
290 | 290 | |
291 | 291 | $details = array( |
292 | - 'license' => sprintf( esc_html__( 'License level: %s', 'gravityview' ), '<span class="gv-license-detail">' . esc_html( $response['license_name'] ) . '</span>' ), |
|
293 | - 'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), '<span class="gv-license-detail">' . esc_html__( $response['customer_name'], 'gravityview' ), esc_html__( $response['customer_email'], 'gravityview' ) ) . '</span>' . $renews_on . $login_link, |
|
294 | - 'activations' => sprintf( str_replace( '%d', '%s', esc_html__( 'Activations: %d of %s sites', 'gravityview' ) ), '<span class="gv-license-detail">' . intval( $response['site_count'] ), esc_html( $license_limit ) ) . '</span>' . $local_text, |
|
295 | - 'upgrade' => $this->get_upgrade_html( $response['upgrades'] ), |
|
292 | + 'license' => sprintf( esc_html__( 'License level: %s', 'gravityview' ), '<span class="gv-license-detail">' . esc_html( $response[ 'license_name' ] ) . '</span>' ), |
|
293 | + 'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), '<span class="gv-license-detail">' . esc_html__( $response[ 'customer_name' ], 'gravityview' ), esc_html__( $response[ 'customer_email' ], 'gravityview' ) ) . '</span>' . $renews_on . $login_link, |
|
294 | + 'activations' => sprintf( str_replace( '%d', '%s', esc_html__( 'Activations: %d of %s sites', 'gravityview' ) ), '<span class="gv-license-detail">' . intval( $response[ 'site_count' ] ), esc_html( $license_limit ) ) . '</span>' . $local_text, |
|
295 | + 'upgrade' => $this->get_upgrade_html( $response[ 'upgrades' ] ), |
|
296 | 296 | ); |
297 | 297 | |
298 | - if ( ! empty( $response['error'] ) && 'expired' === $response['error'] ) { |
|
299 | - unset( $details['upgrade'] ); |
|
300 | - $details['licensed_to'] .= '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>'; |
|
298 | + if ( ! empty( $response[ 'error' ] ) && 'expired' === $response[ 'error' ] ) { |
|
299 | + unset( $details[ 'upgrade' ] ); |
|
300 | + $details[ 'licensed_to' ] .= '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>'; |
|
301 | 301 | } |
302 | 302 | |
303 | 303 | $return .= '<ul>'; |
@@ -329,20 +329,20 @@ discard block |
||
329 | 329 | if ( ! empty( $upgrades ) ) { |
330 | 330 | |
331 | 331 | $locale_parts = explode( '_', get_locale() ); |
332 | - $is_english = ( 'en' === $locale_parts[0] ); |
|
332 | + $is_english = ( 'en' === $locale_parts[ 0 ] ); |
|
333 | 333 | |
334 | 334 | $output .= '<h4>' . esc_html__( 'Upgrades available:', 'gravityview' ) . '</h4>'; |
335 | 335 | $output .= '<ul>'; |
336 | 336 | |
337 | 337 | foreach ( $upgrades as $upgrade_id => $upgrade ) { |
338 | - $upgrade = (object) $upgrade; |
|
338 | + $upgrade = (object)$upgrade; |
|
339 | 339 | |
340 | 340 | $anchor_text = sprintf( esc_html_x( 'Upgrade to %1$s for %2$s', '1: GravityView upgrade name, 2: Cost of upgrade', 'gravityview' ), esc_attr( $upgrade->name ), esc_attr( $upgrade->price ) ); |
341 | 341 | |
342 | 342 | if ( $is_english && isset( $upgrade->description ) ) { |
343 | 343 | $message = esc_html( $upgrade->description ); |
344 | 344 | } else { |
345 | - switch( $upgrade->price_id ) { |
|
345 | + switch ( $upgrade->price_id ) { |
|
346 | 346 | // Interstellar |
347 | 347 | case 1: |
348 | 348 | default: |
@@ -421,7 +421,7 @@ discard block |
||
421 | 421 | 'invalid_item_id' => esc_html__( 'This license key does not have access to this plugin.', 'gravityview' ), |
422 | 422 | 'missing' => esc_html__( 'The license key entered is invalid.', 'gravityview' ), // Missing is "the license couldn't be found", not "you submitted an empty license" |
423 | 423 | 'revoked' => esc_html__( 'This license key has been revoked.', 'gravityview' ), |
424 | - 'expired' => sprintf( esc_html__( 'This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview' ), '<a href="'. esc_url( $this->get_license_renewal_url( $license_data ) ) .'">', '</a>' ), |
|
424 | + 'expired' => sprintf( esc_html__( 'This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview' ), '<a href="' . esc_url( $this->get_license_renewal_url( $license_data ) ) . '">', '</a>' ), |
|
425 | 425 | 'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ), |
426 | 426 | 'verifying_license' => esc_html__( 'Verifying license…', 'gravityview' ), |
427 | 427 | 'activate_license' => esc_html__( 'Activate License', 'gravityview' ), |
@@ -449,7 +449,7 @@ discard block |
||
449 | 449 | |
450 | 450 | if ( ! empty( $license_data->renewal_url ) ) { |
451 | 451 | $renew_license_url = $license_data->renewal_url; |
452 | - } elseif( ! empty( $license_data->license_key ) ) { |
|
452 | + } elseif ( ! empty( $license_data->license_key ) ) { |
|
453 | 453 | $renew_license_url = sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s', $license_data->license_key ); |
454 | 454 | } else { |
455 | 455 | $renew_license_url = 'https://gravityview.co/account/'; |
@@ -466,7 +466,7 @@ discard block |
||
466 | 466 | * @return array|\WP_Error |
467 | 467 | */ |
468 | 468 | private function _license_get_remote_response( $data, $license = '' ) { |
469 | - $api_params = $this->_get_edd_settings( $data['edd_action'], $license ); |
|
469 | + $api_params = $this->_get_edd_settings( $data[ 'edd_action' ], $license ); |
|
470 | 470 | |
471 | 471 | $url = add_query_arg( $api_params, self::url ); |
472 | 472 | |
@@ -506,9 +506,9 @@ discard block |
||
506 | 506 | private function license_call_update_settings( $license_data, $data ) { |
507 | 507 | $settings = array(); |
508 | 508 | |
509 | - $settings['license_key'] = $license_data->license_key = trim( $data['license'] ); |
|
510 | - $settings['license_key_status'] = $license_data->license; |
|
511 | - $settings['license_key_response'] = (array)$license_data; |
|
509 | + $settings[ 'license_key' ] = $license_data->license_key = trim( $data[ 'license' ] ); |
|
510 | + $settings[ 'license_key_status' ] = $license_data->license; |
|
511 | + $settings[ 'license_key_response' ] = (array)$license_data; |
|
512 | 512 | |
513 | 513 | $this->settings->set( $settings ); |
514 | 514 | } |
@@ -528,9 +528,9 @@ discard block |
||
528 | 528 | $status = trim( $this->settings->get( 'license_key_status' ) ); |
529 | 529 | $key = trim( $this->settings->get( 'license_key' ) ); |
530 | 530 | |
531 | - if ( !empty( $key ) ) { |
|
531 | + if ( ! empty( $key ) ) { |
|
532 | 532 | $response = $this->settings->get( 'license_key_response' ); |
533 | - $response = is_array( $response ) ? (object) $response : json_decode( $response ); |
|
533 | + $response = is_array( $response ) ? (object)$response : json_decode( $response ); |
|
534 | 534 | } else { |
535 | 535 | $response = array(); |
536 | 536 | } |
@@ -573,11 +573,11 @@ discard block |
||
573 | 573 | |
574 | 574 | $submit = '<div class="gv-edd-button-wrapper">'; |
575 | 575 | foreach ( $fields as $field ) { |
576 | - $field['type'] = 'button'; |
|
577 | - $field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class; |
|
578 | - $field['style'] = 'margin-left: 10px;'; |
|
579 | - if( $disabled_attribute ) { |
|
580 | - $field['disabled'] = $disabled_attribute; |
|
576 | + $field[ 'type' ] = 'button'; |
|
577 | + $field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] . ' ' . $class : $class; |
|
578 | + $field[ 'style' ] = 'margin-left: 10px;'; |
|
579 | + if ( $disabled_attribute ) { |
|
580 | + $field[ 'disabled' ] = $disabled_attribute; |
|
581 | 581 | } |
582 | 582 | $submit .= $this->settings->as_html( $field, $echo ); |
583 | 583 | } |
@@ -656,7 +656,7 @@ discard block |
||
656 | 656 | 'url' => home_url(), |
657 | 657 | 'site_data' => $this->get_site_data(), |
658 | 658 | ), |
659 | - )); |
|
659 | + ) ); |
|
660 | 660 | |
661 | 661 | // make sure the response came back okay |
662 | 662 | if ( is_wp_error( $response ) ) { |
@@ -686,45 +686,45 @@ discard block |
||
686 | 686 | $theme_data = wp_get_theme(); |
687 | 687 | $theme = $theme_data->Name . ' ' . $theme_data->Version; |
688 | 688 | |
689 | - $data['gv_version'] = Plugin::$version; |
|
690 | - $data['php_version'] = phpversion(); |
|
691 | - $data['wp_version'] = get_bloginfo( 'version' ); |
|
692 | - $data['gf_version'] = \GFForms::$version; |
|
693 | - $data['server'] = Utils::get( $_SERVER, 'SERVER_SOFTWARE' ); |
|
694 | - $data['multisite'] = is_multisite(); |
|
695 | - $data['theme'] = $theme; |
|
696 | - $data['url'] = home_url(); |
|
697 | - $data['license_key'] = $this->settings->get( 'license_key' ); |
|
698 | - $data['beta'] = $this->settings->get( 'beta' ); |
|
689 | + $data[ 'gv_version' ] = Plugin::$version; |
|
690 | + $data[ 'php_version' ] = phpversion(); |
|
691 | + $data[ 'wp_version' ] = get_bloginfo( 'version' ); |
|
692 | + $data[ 'gf_version' ] = \GFForms::$version; |
|
693 | + $data[ 'server' ] = Utils::get( $_SERVER, 'SERVER_SOFTWARE' ); |
|
694 | + $data[ 'multisite' ] = is_multisite(); |
|
695 | + $data[ 'theme' ] = $theme; |
|
696 | + $data[ 'url' ] = home_url(); |
|
697 | + $data[ 'license_key' ] = $this->settings->get( 'license_key' ); |
|
698 | + $data[ 'beta' ] = $this->settings->get( 'beta' ); |
|
699 | 699 | |
700 | 700 | // View Data |
701 | 701 | $gravityview_posts = wp_count_posts( 'gravityview', 'readable' ); |
702 | 702 | |
703 | - $data['view_count'] = null; |
|
704 | - $data['view_first'] = null; |
|
705 | - $data['view_latest'] = null; |
|
703 | + $data[ 'view_count' ] = null; |
|
704 | + $data[ 'view_first' ] = null; |
|
705 | + $data[ 'view_latest' ] = null; |
|
706 | 706 | |
707 | 707 | if ( $gravityview_posts->publish ) { |
708 | - $data['view_count'] = $gravityview_posts->publish; |
|
708 | + $data[ 'view_count' ] = $gravityview_posts->publish; |
|
709 | 709 | |
710 | 710 | $first = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=ASC' ); |
711 | 711 | $latest = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=DESC' ); |
712 | 712 | |
713 | 713 | if ( $first = array_shift( $first ) ) { |
714 | - $data['view_first'] = $first->post_date; |
|
714 | + $data[ 'view_first' ] = $first->post_date; |
|
715 | 715 | } |
716 | 716 | if ( $latest = array_pop( $latest ) ) { |
717 | - $data['view_latest'] = $latest->post_date; |
|
717 | + $data[ 'view_latest' ] = $latest->post_date; |
|
718 | 718 | } |
719 | 719 | } |
720 | 720 | |
721 | 721 | // Form counts |
722 | 722 | if ( class_exists( 'GFFormsModel' ) ) { |
723 | 723 | $form_data = \GFFormsModel::get_form_count(); |
724 | - $data['forms_total'] = Utils::get( $form_data, 'total', 0 ); |
|
725 | - $data['forms_active'] = Utils::get( $form_data, 'active', 0 ); |
|
726 | - $data['forms_inactive'] = Utils::get( $form_data, 'inactive', 0 ); |
|
727 | - $data['forms_trash'] = Utils::get( $form_data, 'inactive', 0 ); |
|
724 | + $data[ 'forms_total' ] = Utils::get( $form_data, 'total', 0 ); |
|
725 | + $data[ 'forms_active' ] = Utils::get( $form_data, 'active', 0 ); |
|
726 | + $data[ 'forms_inactive' ] = Utils::get( $form_data, 'inactive', 0 ); |
|
727 | + $data[ 'forms_trash' ] = Utils::get( $form_data, 'inactive', 0 ); |
|
728 | 728 | } |
729 | 729 | |
730 | 730 | // Retrieve current plugin information |
@@ -732,13 +732,13 @@ discard block |
||
732 | 732 | include ABSPATH . '/wp-admin/includes/plugin.php'; |
733 | 733 | } |
734 | 734 | |
735 | - $data['integrations'] = self::get_related_plugins_and_extensions(); |
|
736 | - $data['active_plugins'] = get_option( 'active_plugins', array() ); |
|
737 | - $data['inactive_plugins'] = array(); |
|
738 | - $data['locale'] = get_locale(); |
|
735 | + $data[ 'integrations' ] = self::get_related_plugins_and_extensions(); |
|
736 | + $data[ 'active_plugins' ] = get_option( 'active_plugins', array() ); |
|
737 | + $data[ 'inactive_plugins' ] = array(); |
|
738 | + $data[ 'locale' ] = get_locale(); |
|
739 | 739 | |
740 | 740 | // Validate request on the GV server |
741 | - $data['hash'] = 'gv_version.url.locale:' . sha1( $data['gv_version'] . $data['url'] . $data['locale'] ); |
|
741 | + $data[ 'hash' ] = 'gv_version.url.locale:' . sha1( $data[ 'gv_version' ] . $data[ 'url' ] . $data[ 'locale' ] ); |
|
742 | 742 | |
743 | 743 | return $data; |
744 | 744 | } |
@@ -768,7 +768,7 @@ discard block |
||
768 | 768 | |
769 | 769 | $plugin_data = get_plugin_data( $active_plugin ); |
770 | 770 | |
771 | - $extensions[] = sprintf( '%s %s', $plugin_data['Name'], $plugin_data['Version'] ); |
|
771 | + $extensions[ ] = sprintf( '%s %s', $plugin_data[ 'Name' ], $plugin_data[ 'Version' ] ); |
|
772 | 772 | } |
773 | 773 | |
774 | 774 | if ( ! empty( $extensions ) ) { |
@@ -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 |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | $script_min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
226 | 226 | $script_source = empty( $script_min ) ? '/source' : ''; |
227 | 227 | |
228 | - 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 | + 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 ); |
|
229 | 229 | |
230 | 230 | wp_localize_script( 'gravityview_searchwidget_admin', 'gvSearchVar', array( |
231 | 231 | 'nonce' => wp_create_nonce( 'gravityview_ajaxsearchwidget' ), |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | * @return array Scripts allowed in no-conflict mode, plus the search widget script |
248 | 248 | */ |
249 | 249 | public function register_no_conflict( $allowed ) { |
250 | - $allowed[] = 'gravityview_searchwidget_admin'; |
|
250 | + $allowed[ ] = 'gravityview_searchwidget_admin'; |
|
251 | 251 | return $allowed; |
252 | 252 | } |
253 | 253 | |
@@ -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 | |
@@ -326,14 +326,14 @@ discard block |
||
326 | 326 | ); |
327 | 327 | |
328 | 328 | if ( gravityview()->plugin->supports( \GV\Plugin::FEATURE_GFQUERY ) ) { |
329 | - $custom_fields['is_approved'] = array( |
|
329 | + $custom_fields[ 'is_approved' ] = array( |
|
330 | 330 | 'text' => esc_html__( 'Approval Status', 'gravityview' ), |
331 | 331 | 'type' => 'multi', |
332 | 332 | ); |
333 | 333 | } |
334 | 334 | |
335 | - foreach( $custom_fields as $custom_field_key => $custom_field ) { |
|
336 | - $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'] ); |
|
335 | + foreach ( $custom_fields as $custom_field_key => $custom_field ) { |
|
336 | + $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' ] ); |
|
337 | 337 | } |
338 | 338 | |
339 | 339 | // Get fields with sub-inputs and no parent |
@@ -355,13 +355,13 @@ discard block |
||
355 | 355 | |
356 | 356 | foreach ( $fields as $id => $field ) { |
357 | 357 | |
358 | - if ( in_array( $field['type'], $blacklist_field_types ) ) { |
|
358 | + if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) { |
|
359 | 359 | continue; |
360 | 360 | } |
361 | 361 | |
362 | - $types = self::get_search_input_types( $id, $field['type'] ); |
|
362 | + $types = self::get_search_input_types( $id, $field[ 'type' ] ); |
|
363 | 363 | |
364 | - $output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'data-inputtypes="'. esc_attr( $types ) .'">'. esc_html( $field['label'] ) .'</option>'; |
|
364 | + $output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . 'data-inputtypes="' . esc_attr( $types ) . '">' . esc_html( $field[ 'label' ] ) . '</option>'; |
|
365 | 365 | } |
366 | 366 | } |
367 | 367 | |
@@ -384,7 +384,7 @@ discard block |
||
384 | 384 | public static function get_search_input_types( $field_id = '', $field_type = null ) { |
385 | 385 | |
386 | 386 | // @todo - This needs to be improved - many fields have . including products and addresses |
387 | - if ( false !== strpos( (string) $field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) { |
|
387 | + if ( false !== strpos( (string)$field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) { |
|
388 | 388 | $input_type = 'boolean'; // on/off checkbox |
389 | 389 | } elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) { |
390 | 390 | $input_type = 'multi'; //multiselect |
@@ -430,19 +430,19 @@ discard block |
||
430 | 430 | $post_id = 0; |
431 | 431 | |
432 | 432 | // We're in the WordPress Widget context, and an overriding post ID has been set. |
433 | - if ( ! empty( $widget_args['post_id'] ) ) { |
|
434 | - $post_id = absint( $widget_args['post_id'] ); |
|
433 | + if ( ! empty( $widget_args[ 'post_id' ] ) ) { |
|
434 | + $post_id = absint( $widget_args[ 'post_id' ] ); |
|
435 | 435 | } |
436 | 436 | // We're in the WordPress Widget context, and the base View ID should be used |
437 | - else if ( ! empty( $widget_args['view_id'] ) ) { |
|
438 | - $post_id = absint( $widget_args['view_id'] ); |
|
437 | + else if ( ! empty( $widget_args[ 'view_id' ] ) ) { |
|
438 | + $post_id = absint( $widget_args[ 'view_id' ] ); |
|
439 | 439 | } |
440 | 440 | |
441 | 441 | $args = gravityview_get_permalink_query_args( $post_id ); |
442 | 442 | |
443 | 443 | // Add hidden fields to the search form |
444 | 444 | foreach ( $args as $key => $value ) { |
445 | - $search_fields[] = array( |
|
445 | + $search_fields[ ] = array( |
|
446 | 446 | 'name' => $key, |
447 | 447 | 'input' => 'hidden', |
448 | 448 | 'value' => $value, |
@@ -481,28 +481,28 @@ discard block |
||
481 | 481 | /** |
482 | 482 | * Include the sidebar Widgets. |
483 | 483 | */ |
484 | - $widgets = (array) get_option( 'widget_gravityview_search', array() ); |
|
484 | + $widgets = (array)get_option( 'widget_gravityview_search', array() ); |
|
485 | 485 | |
486 | 486 | foreach ( $widgets as $widget ) { |
487 | - if ( ! empty( $widget['view_id'] ) && $widget['view_id'] == $view->ID ) { |
|
488 | - if( $_fields = json_decode( $widget['search_fields'], true ) ) { |
|
487 | + if ( ! empty( $widget[ 'view_id' ] ) && $widget[ 'view_id' ] == $view->ID ) { |
|
488 | + if ( $_fields = json_decode( $widget[ 'search_fields' ], true ) ) { |
|
489 | 489 | foreach ( $_fields as $field ) { |
490 | - if ( empty( $field['form_id'] ) ) { |
|
491 | - $field['form_id'] = $view->form ? $view->form->ID : 0; |
|
490 | + if ( empty( $field[ 'form_id' ] ) ) { |
|
491 | + $field[ 'form_id' ] = $view->form ? $view->form->ID : 0; |
|
492 | 492 | } |
493 | - $searchable_fields[] = $with_full_field ? $field : $field['field']; |
|
493 | + $searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ]; |
|
494 | 494 | } |
495 | 495 | } |
496 | 496 | } |
497 | 497 | } |
498 | 498 | |
499 | 499 | foreach ( $view->widgets->by_id( $this->get_widget_id() )->all() as $widget ) { |
500 | - if( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) { |
|
500 | + if ( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) { |
|
501 | 501 | foreach ( $_fields as $field ) { |
502 | - if ( empty( $field['form_id'] ) ) { |
|
503 | - $field['form_id'] = $view->form ? $view->form->ID : 0; |
|
502 | + if ( empty( $field[ 'form_id' ] ) ) { |
|
503 | + $field[ 'form_id' ] = $view->form ? $view->form->ID : 0; |
|
504 | 504 | } |
505 | - $searchable_fields[] = $with_full_field ? $field : $field['field']; |
|
505 | + $searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ]; |
|
506 | 506 | } |
507 | 507 | } |
508 | 508 | } |
@@ -540,7 +540,7 @@ discard block |
||
540 | 540 | return $search_criteria; // Return the original criteria, GF_Query modification kicks in later |
541 | 541 | } |
542 | 542 | |
543 | - if( 'post' === $this->search_method ) { |
|
543 | + if ( 'post' === $this->search_method ) { |
|
544 | 544 | $get = $_POST; |
545 | 545 | } else { |
546 | 546 | $get = $_GET; |
@@ -559,15 +559,15 @@ discard block |
||
559 | 559 | $get = gv_map_deep( $get, 'rawurldecode' ); |
560 | 560 | |
561 | 561 | // Make sure array key is set up |
562 | - $search_criteria['field_filters'] = \GV\Utils::get( $search_criteria, 'field_filters', array() ); |
|
562 | + $search_criteria[ 'field_filters' ] = \GV\Utils::get( $search_criteria, 'field_filters', array() ); |
|
563 | 563 | |
564 | 564 | $searchable_fields = $this->get_view_searchable_fields( $view ); |
565 | 565 | $searchable_field_objects = $this->get_view_searchable_fields( $view, true ); |
566 | 566 | |
567 | 567 | // add free search |
568 | - if ( isset( $get['gv_search'] ) && '' !== $get['gv_search'] && in_array( 'search_all', $searchable_fields ) ) { |
|
568 | + if ( isset( $get[ 'gv_search' ] ) && '' !== $get[ 'gv_search' ] && in_array( 'search_all', $searchable_fields ) ) { |
|
569 | 569 | |
570 | - $search_all_value = trim( $get['gv_search'] ); |
|
570 | + $search_all_value = trim( $get[ 'gv_search' ] ); |
|
571 | 571 | |
572 | 572 | /** |
573 | 573 | * @filter `gravityview/search-all-split-words` Search for each word separately or the whole phrase? |
@@ -592,7 +592,7 @@ discard block |
||
592 | 592 | } |
593 | 593 | |
594 | 594 | foreach ( $words as $word ) { |
595 | - $search_criteria['field_filters'][] = array( |
|
595 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
596 | 596 | 'key' => null, // The field ID to search |
597 | 597 | 'value' => $word, // The value to search |
598 | 598 | 'operator' => 'contains', // What to search in. Options: `is` or `contains` |
@@ -605,14 +605,14 @@ discard block |
||
605 | 605 | /** |
606 | 606 | * Get and normalize the dates according to the input format. |
607 | 607 | */ |
608 | - if ( $curr_start = ! empty( $get['gv_start'] ) ? $get['gv_start'] : '' ) { |
|
609 | - if( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) { |
|
608 | + if ( $curr_start = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_start' ] : '' ) { |
|
609 | + if ( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) { |
|
610 | 610 | $curr_start = $curr_start_date->format( 'Y-m-d' ); |
611 | 611 | } |
612 | 612 | } |
613 | 613 | |
614 | - if ( $curr_end = ! empty( $get['gv_start'] ) ? ( ! empty( $get['gv_end'] ) ? $get['gv_end'] : '' ) : '' ) { |
|
615 | - if( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) { |
|
614 | + if ( $curr_end = ! empty( $get[ 'gv_start' ] ) ? ( ! empty( $get[ 'gv_end' ] ) ? $get[ 'gv_end' ] : '' ) : '' ) { |
|
615 | + if ( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) { |
|
616 | 616 | $curr_end = $curr_end_date->format( 'Y-m-d' ); |
617 | 617 | } |
618 | 618 | } |
@@ -647,22 +647,22 @@ discard block |
||
647 | 647 | */ |
648 | 648 | if ( ! empty( $curr_start ) ) { |
649 | 649 | $curr_start = date( 'Y-m-d H:i:s', strtotime( $curr_start ) ); |
650 | - $search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start; |
|
650 | + $search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start; |
|
651 | 651 | } |
652 | 652 | |
653 | 653 | if ( ! empty( $curr_end ) ) { |
654 | 654 | // Fast-forward 24 hour on the end time |
655 | 655 | $curr_end = date( 'Y-m-d H:i:s', strtotime( $curr_end ) + DAY_IN_SECONDS ); |
656 | - $search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end; |
|
657 | - if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056 |
|
658 | - $search_criteria['end_date'] = date( 'Y-m-d H:i:s', strtotime( $search_criteria['end_date'] ) - 1 ); |
|
656 | + $search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end; |
|
657 | + if ( strpos( $search_criteria[ 'end_date' ], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056 |
|
658 | + $search_criteria[ 'end_date' ] = date( 'Y-m-d H:i:s', strtotime( $search_criteria[ 'end_date' ] ) - 1 ); |
|
659 | 659 | } |
660 | 660 | } |
661 | 661 | } |
662 | 662 | |
663 | 663 | // search for a specific entry ID |
664 | 664 | if ( ! empty( $get[ 'gv_id' ] ) && in_array( 'entry_id', $searchable_fields ) ) { |
665 | - $search_criteria['field_filters'][] = array( |
|
665 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
666 | 666 | 'key' => 'id', |
667 | 667 | 'value' => absint( $get[ 'gv_id' ] ), |
668 | 668 | 'operator' => $this->get_operator( $get, 'gv_id', array( '=' ), '=' ), |
@@ -671,20 +671,20 @@ discard block |
||
671 | 671 | |
672 | 672 | // search for a specific Created_by ID |
673 | 673 | if ( ! empty( $get[ 'gv_by' ] ) && in_array( 'created_by', $searchable_fields ) ) { |
674 | - $search_criteria['field_filters'][] = array( |
|
674 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
675 | 675 | 'key' => 'created_by', |
676 | - 'value' => $get['gv_by'], |
|
676 | + 'value' => $get[ 'gv_by' ], |
|
677 | 677 | 'operator' => $this->get_operator( $get, 'gv_by', array( '=' ), '=' ), |
678 | 678 | ); |
679 | 679 | } |
680 | 680 | |
681 | 681 | // Get search mode passed in URL |
682 | - $mode = isset( $get['mode'] ) && in_array( $get['mode'], array( 'any', 'all' ) ) ? $get['mode'] : 'any'; |
|
682 | + $mode = isset( $get[ 'mode' ] ) && in_array( $get[ 'mode' ], array( 'any', 'all' ) ) ? $get[ 'mode' ] : 'any'; |
|
683 | 683 | |
684 | 684 | // get the other search filters |
685 | 685 | foreach ( $get as $key => $value ) { |
686 | 686 | |
687 | - if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[0], false, false ) ) ) { |
|
687 | + if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[ 0 ], false, false ) ) ) { |
|
688 | 688 | continue; // Not a filter, or empty |
689 | 689 | } |
690 | 690 | |
@@ -698,19 +698,19 @@ discard block |
||
698 | 698 | continue; |
699 | 699 | } |
700 | 700 | |
701 | - if ( ! isset( $filter['operator'] ) ) { |
|
702 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' ); |
|
701 | + if ( ! isset( $filter[ 'operator' ] ) ) { |
|
702 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' ); |
|
703 | 703 | } |
704 | 704 | |
705 | - if ( isset( $filter[0]['value'] ) ) { |
|
706 | - $search_criteria['field_filters'] = array_merge( $search_criteria['field_filters'], $filter ); |
|
705 | + if ( isset( $filter[ 0 ][ 'value' ] ) ) { |
|
706 | + $search_criteria[ 'field_filters' ] = array_merge( $search_criteria[ 'field_filters' ], $filter ); |
|
707 | 707 | |
708 | 708 | // if date range type, set search mode to ALL |
709 | - if ( ! empty( $filter[0]['operator'] ) && in_array( $filter[0]['operator'], array( '>=', '<=', '>', '<' ) ) ) { |
|
709 | + if ( ! empty( $filter[ 0 ][ 'operator' ] ) && in_array( $filter[ 0 ][ 'operator' ], array( '>=', '<=', '>', '<' ) ) ) { |
|
710 | 710 | $mode = 'all'; |
711 | 711 | } |
712 | - } elseif( !empty( $filter ) ) { |
|
713 | - $search_criteria['field_filters'][] = $filter; |
|
712 | + } elseif ( ! empty( $filter ) ) { |
|
713 | + $search_criteria[ 'field_filters' ][ ] = $filter; |
|
714 | 714 | } |
715 | 715 | } |
716 | 716 | |
@@ -719,7 +719,7 @@ discard block |
||
719 | 719 | * @since 1.5.1 |
720 | 720 | * @param[out,in] string $mode Search mode (`any` vs `all`) |
721 | 721 | */ |
722 | - $search_criteria['field_filters']['mode'] = apply_filters( 'gravityview/search/mode', $mode ); |
|
722 | + $search_criteria[ 'field_filters' ][ 'mode' ] = apply_filters( 'gravityview/search/mode', $mode ); |
|
723 | 723 | |
724 | 724 | gravityview()->log->debug( 'Returned Search Criteria: ', array( 'data' => $search_criteria ) ); |
725 | 725 | |
@@ -753,19 +753,19 @@ discard block |
||
753 | 753 | |
754 | 754 | $query_class = $view->get_query_class(); |
755 | 755 | |
756 | - if ( empty( $search_criteria['field_filters'] ) ) { |
|
756 | + if ( empty( $search_criteria[ 'field_filters' ] ) ) { |
|
757 | 757 | return; |
758 | 758 | } |
759 | 759 | |
760 | 760 | $widgets = $view->widgets->by_id( $this->widget_id ); |
761 | 761 | if ( $widgets->count() ) { |
762 | 762 | $widgets = $widgets->all(); |
763 | - $widget = $widgets[0]; |
|
763 | + $widget = $widgets[ 0 ]; |
|
764 | 764 | |
765 | 765 | $search_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ); |
766 | 766 | |
767 | - foreach ( (array) $search_fields as $search_field ) { |
|
768 | - if ( 'created_by' === $search_field['field'] && 'input_text' === $search_field['input'] ) { |
|
767 | + foreach ( (array)$search_fields as $search_field ) { |
|
768 | + if ( 'created_by' === $search_field[ 'field' ] && 'input_text' === $search_field[ 'input' ] ) { |
|
769 | 769 | $created_by_text_mode = true; |
770 | 770 | } |
771 | 771 | } |
@@ -774,7 +774,7 @@ discard block |
||
774 | 774 | $extra_conditions = array(); |
775 | 775 | $mode = 'any'; |
776 | 776 | |
777 | - foreach ( $search_criteria['field_filters'] as &$filter ) { |
|
777 | + foreach ( $search_criteria[ 'field_filters' ] as &$filter ) { |
|
778 | 778 | if ( ! is_array( $filter ) ) { |
779 | 779 | if ( in_array( strtolower( $filter ), array( 'any', 'all' ) ) ) { |
780 | 780 | $mode = $filter; |
@@ -783,13 +783,13 @@ discard block |
||
783 | 783 | } |
784 | 784 | |
785 | 785 | // Construct a manual query for unapproved statuses |
786 | - if ( 'is_approved' === $filter['key'] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array) $filter['value'] ) ) { |
|
787 | - $_tmp_query = new $query_class( $view->form->ID, array( |
|
786 | + if ( 'is_approved' === $filter[ 'key' ] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array)$filter[ 'value' ] ) ) { |
|
787 | + $_tmp_query = new $query_class( $view->form->ID, array( |
|
788 | 788 | 'field_filters' => array( |
789 | 789 | array( |
790 | 790 | 'operator' => 'in', |
791 | 791 | 'key' => 'is_approved', |
792 | - 'value' => (array) $filter['value'], |
|
792 | + 'value' => (array)$filter[ 'value' ], |
|
793 | 793 | ), |
794 | 794 | array( |
795 | 795 | 'operator' => 'is', |
@@ -801,30 +801,30 @@ discard block |
||
801 | 801 | ) ); |
802 | 802 | $_tmp_query_parts = $_tmp_query->_introspect(); |
803 | 803 | |
804 | - $extra_conditions[] = $_tmp_query_parts['where']; |
|
804 | + $extra_conditions[ ] = $_tmp_query_parts[ 'where' ]; |
|
805 | 805 | |
806 | 806 | $filter = false; |
807 | 807 | continue; |
808 | 808 | } |
809 | 809 | |
810 | 810 | // Construct manual query for text mode creator search |
811 | - if ( 'created_by' === $filter['key'] && ! empty( $created_by_text_mode ) ) { |
|
812 | - $extra_conditions[] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view ); |
|
811 | + if ( 'created_by' === $filter[ 'key' ] && ! empty( $created_by_text_mode ) ) { |
|
812 | + $extra_conditions[ ] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view ); |
|
813 | 813 | $filter = false; |
814 | 814 | continue; |
815 | 815 | } |
816 | 816 | |
817 | 817 | // By default, we want searches to be wildcard for each field. |
818 | - $filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator']; |
|
818 | + $filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ]; |
|
819 | 819 | |
820 | 820 | // For multichoice, let's have an in (OR) search. |
821 | - if ( is_array( $filter['value'] ) ) { |
|
822 | - $filter['operator'] = 'in'; // @todo what about in contains (OR LIKE chains)? |
|
821 | + if ( is_array( $filter[ 'value' ] ) ) { |
|
822 | + $filter[ 'operator' ] = 'in'; // @todo what about in contains (OR LIKE chains)? |
|
823 | 823 | } |
824 | 824 | |
825 | 825 | // Default form with joins functionality |
826 | - if ( empty( $filter['form_id'] ) ) { |
|
827 | - $filter['form_id'] = $view->form ? $view->form->ID : 0; |
|
826 | + if ( empty( $filter[ 'form_id' ] ) ) { |
|
827 | + $filter[ 'form_id' ] = $view->form ? $view->form->ID : 0; |
|
828 | 828 | } |
829 | 829 | |
830 | 830 | /** |
@@ -834,28 +834,28 @@ discard block |
||
834 | 834 | * @since develop |
835 | 835 | * @param \GV\View $view The View we're operating on. |
836 | 836 | */ |
837 | - $filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter, $view ); |
|
837 | + $filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter, $view ); |
|
838 | 838 | } |
839 | 839 | |
840 | - if ( ! empty( $search_criteria['start_date'] ) || ! empty( $search_criteria['end_date'] ) ) { |
|
840 | + if ( ! empty( $search_criteria[ 'start_date' ] ) || ! empty( $search_criteria[ 'end_date' ] ) ) { |
|
841 | 841 | $date_criteria = array(); |
842 | 842 | |
843 | - if ( isset( $search_criteria['start_date'] ) ) { |
|
844 | - $date_criteria['start_date'] = $search_criteria['start_date']; |
|
843 | + if ( isset( $search_criteria[ 'start_date' ] ) ) { |
|
844 | + $date_criteria[ 'start_date' ] = $search_criteria[ 'start_date' ]; |
|
845 | 845 | } |
846 | 846 | |
847 | - if ( isset( $search_criteria['end_date'] ) ) { |
|
848 | - $date_criteria['end_date'] = $search_criteria['end_date']; |
|
847 | + if ( isset( $search_criteria[ 'end_date' ] ) ) { |
|
848 | + $date_criteria[ 'end_date' ] = $search_criteria[ 'end_date' ]; |
|
849 | 849 | } |
850 | 850 | |
851 | 851 | $_tmp_query = new $query_class( $view->form->ID, $date_criteria ); |
852 | 852 | $_tmp_query_parts = $_tmp_query->_introspect(); |
853 | - $extra_conditions[] = $_tmp_query_parts['where']; |
|
853 | + $extra_conditions[ ] = $_tmp_query_parts[ 'where' ]; |
|
854 | 854 | } |
855 | 855 | |
856 | 856 | $search_conditions = array(); |
857 | 857 | |
858 | - if ( $filters = array_filter( $search_criteria['field_filters'] ) ) { |
|
858 | + if ( $filters = array_filter( $search_criteria[ 'field_filters' ] ) ) { |
|
859 | 859 | foreach ( $filters as &$filter ) { |
860 | 860 | if ( ! is_array( $filter ) ) { |
861 | 861 | continue; |
@@ -867,12 +867,12 @@ discard block |
||
867 | 867 | * code by reusing what's inside GF_Query already as they |
868 | 868 | * take care of many small things like forcing numeric, etc. |
869 | 869 | */ |
870 | - $_tmp_query = new $query_class( $filter['form_id'], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) ); |
|
870 | + $_tmp_query = new $query_class( $filter[ 'form_id' ], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) ); |
|
871 | 871 | $_tmp_query_parts = $_tmp_query->_introspect(); |
872 | - $search_condition = $_tmp_query_parts['where']; |
|
872 | + $search_condition = $_tmp_query_parts[ 'where' ]; |
|
873 | 873 | |
874 | - if ( empty( $filter['key'] ) && $search_condition->expressions ) { |
|
875 | - $search_conditions[] = $search_condition; |
|
874 | + if ( empty( $filter[ 'key' ] ) && $search_condition->expressions ) { |
|
875 | + $search_conditions[ ] = $search_condition; |
|
876 | 876 | } else { |
877 | 877 | $left = $search_condition->left; |
878 | 878 | $alias = $query->_alias( $left->field_id, $left->source, $left->is_entry_column() ? 't' : 'm' ); |
@@ -882,7 +882,7 @@ discard block |
||
882 | 882 | $on = $_join->join_on; |
883 | 883 | $join = $_join->join; |
884 | 884 | |
885 | - $search_conditions[] = GF_Query_Condition::_or( |
|
885 | + $search_conditions[ ] = GF_Query_Condition::_or( |
|
886 | 886 | // Join |
887 | 887 | new GF_Query_Condition( |
888 | 888 | new GF_Query_Column( GF_Query_Column::META, $join->ID, $query->_alias( GF_Query_Column::META, $join->ID, 'm' ) ), |
@@ -898,7 +898,7 @@ discard block |
||
898 | 898 | ); |
899 | 899 | } |
900 | 900 | } else { |
901 | - $search_conditions[] = new GF_Query_Condition( |
|
901 | + $search_conditions[ ] = new GF_Query_Condition( |
|
902 | 902 | new GF_Query_Column( $left->field_id, $left->source, $alias ), |
903 | 903 | $search_condition->operator, |
904 | 904 | $search_condition->right |
@@ -920,7 +920,7 @@ discard block |
||
920 | 920 | /** |
921 | 921 | * Combine the parts as a new WHERE clause. |
922 | 922 | */ |
923 | - $where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts['where'] ), $search_conditions, $extra_conditions ) ); |
|
923 | + $where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts[ 'where' ] ), $search_conditions, $extra_conditions ) ); |
|
924 | 924 | $query->where( $where ); |
925 | 925 | } |
926 | 926 | |
@@ -943,7 +943,7 @@ discard block |
||
943 | 943 | $field_id = str_replace( 'filter_', '', $key ); |
944 | 944 | |
945 | 945 | // calculates field_id, removing 'filter_' and for '_' for advanced fields ( like name or checkbox ) |
946 | - if ( preg_match('/^[0-9_]+$/ism', $field_id ) ) { |
|
946 | + if ( preg_match( '/^[0-9_]+$/ism', $field_id ) ) { |
|
947 | 947 | $field_id = str_replace( '_', '.', $field_id ); |
948 | 948 | } |
949 | 949 | |
@@ -1000,7 +1000,7 @@ discard block |
||
1000 | 1000 | // form is in searchable fields |
1001 | 1001 | $found = false; |
1002 | 1002 | foreach ( $searchable_fields as $field ) { |
1003 | - if ( $field_id == $field['field'] && $form->ID == $field['form_id'] ) { |
|
1003 | + if ( $field_id == $field[ 'field' ] && $form->ID == $field[ 'form_id' ] ) { |
|
1004 | 1004 | $found = true; |
1005 | 1005 | break; |
1006 | 1006 | } |
@@ -1040,7 +1040,7 @@ discard block |
||
1040 | 1040 | |
1041 | 1041 | case 'select': |
1042 | 1042 | case 'radio': |
1043 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
1043 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
1044 | 1044 | break; |
1045 | 1045 | |
1046 | 1046 | case 'post_category': |
@@ -1054,7 +1054,7 @@ discard block |
||
1054 | 1054 | |
1055 | 1055 | foreach ( $value as $val ) { |
1056 | 1056 | $cat = get_term( $val, 'category' ); |
1057 | - $filter[] = array( |
|
1057 | + $filter[ ] = array( |
|
1058 | 1058 | 'key' => $field_id, |
1059 | 1059 | 'value' => esc_attr( $cat->name ) . ':' . $val, |
1060 | 1060 | 'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ), |
@@ -1073,7 +1073,7 @@ discard block |
||
1073 | 1073 | $filter = array(); |
1074 | 1074 | |
1075 | 1075 | foreach ( $value as $val ) { |
1076 | - $filter[] = array( 'key' => $field_id, 'value' => $val ); |
|
1076 | + $filter[ ] = array( 'key' => $field_id, 'value' => $val ); |
|
1077 | 1077 | } |
1078 | 1078 | |
1079 | 1079 | break; |
@@ -1082,9 +1082,9 @@ discard block |
||
1082 | 1082 | // convert checkbox on/off into the correct search filter |
1083 | 1083 | if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field->inputs ) && ! empty( $form_field->choices ) ) { |
1084 | 1084 | foreach ( $form_field->inputs as $k => $input ) { |
1085 | - if ( $input['id'] == $field_id ) { |
|
1086 | - $filter['value'] = $form_field->choices[ $k ]['value']; |
|
1087 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
1085 | + if ( $input[ 'id' ] == $field_id ) { |
|
1086 | + $filter[ 'value' ] = $form_field->choices[ $k ][ 'value' ]; |
|
1087 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
1088 | 1088 | break; |
1089 | 1089 | } |
1090 | 1090 | } |
@@ -1094,7 +1094,7 @@ discard block |
||
1094 | 1094 | $filter = array(); |
1095 | 1095 | |
1096 | 1096 | foreach ( $value as $val ) { |
1097 | - $filter[] = array( |
|
1097 | + $filter[ ] = array( |
|
1098 | 1098 | 'key' => $field_id, |
1099 | 1099 | 'value' => $val, |
1100 | 1100 | 'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ), |
@@ -1115,9 +1115,9 @@ discard block |
||
1115 | 1115 | foreach ( $words as $word ) { |
1116 | 1116 | if ( ! empty( $word ) && strlen( $word ) > 1 ) { |
1117 | 1117 | // Keep the same key for each filter |
1118 | - $filter['value'] = $word; |
|
1118 | + $filter[ 'value' ] = $word; |
|
1119 | 1119 | // Add a search for the value |
1120 | - $filters[] = $filter; |
|
1120 | + $filters[ ] = $filter; |
|
1121 | 1121 | } |
1122 | 1122 | } |
1123 | 1123 | |
@@ -1131,19 +1131,19 @@ discard block |
||
1131 | 1131 | |
1132 | 1132 | foreach ( $searchable_fields as $searchable_field ) { |
1133 | 1133 | |
1134 | - if( $form_field->ID !== $searchable_field['field'] ) { |
|
1134 | + if ( $form_field->ID !== $searchable_field[ 'field' ] ) { |
|
1135 | 1135 | continue; |
1136 | 1136 | } |
1137 | 1137 | |
1138 | 1138 | // Only exact-match dropdowns, not text search |
1139 | - if( in_array( $searchable_field['input'], array( 'text', 'search' ), true ) ) { |
|
1139 | + if ( in_array( $searchable_field[ 'input' ], array( 'text', 'search' ), true ) ) { |
|
1140 | 1140 | continue; |
1141 | 1141 | } |
1142 | 1142 | |
1143 | 1143 | $input_id = gravityview_get_input_id_from_id( $form_field->ID ); |
1144 | 1144 | |
1145 | 1145 | if ( 4 === $input_id ) { |
1146 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
1146 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
1147 | 1147 | }; |
1148 | 1148 | } |
1149 | 1149 | } |
@@ -1171,12 +1171,12 @@ discard block |
||
1171 | 1171 | * @since 1.16.3 |
1172 | 1172 | * Safeguard until GF implements '<=' operator |
1173 | 1173 | */ |
1174 | - if( !GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) { |
|
1174 | + if ( ! GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) { |
|
1175 | 1175 | $operator = '<'; |
1176 | 1176 | $date = date( 'Y-m-d', strtotime( self::get_formatted_date( $date, 'Y-m-d', $date_format ) . ' +1 day' ) ); |
1177 | 1177 | } |
1178 | 1178 | |
1179 | - $filter[] = array( |
|
1179 | + $filter[ ] = array( |
|
1180 | 1180 | 'key' => $field_id, |
1181 | 1181 | 'value' => self::get_formatted_date( $date, 'Y-m-d', $date_format ), |
1182 | 1182 | 'operator' => $this->get_operator( $get, $key, array( $operator ), $operator ), |
@@ -1184,12 +1184,12 @@ discard block |
||
1184 | 1184 | } |
1185 | 1185 | } else { |
1186 | 1186 | $date = $value; |
1187 | - $filter['value'] = self::get_formatted_date( $date, 'Y-m-d', $date_format ); |
|
1188 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
1187 | + $filter[ 'value' ] = self::get_formatted_date( $date, 'Y-m-d', $date_format ); |
|
1188 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
1189 | 1189 | } |
1190 | 1190 | |
1191 | - if ('payment_date' === $key) { |
|
1192 | - $filter['operator'] = 'contains'; |
|
1191 | + if ( 'payment_date' === $key ) { |
|
1192 | + $filter[ 'operator' ] = 'contains'; |
|
1193 | 1193 | } |
1194 | 1194 | |
1195 | 1195 | 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 | } |
@@ -1303,7 +1303,7 @@ discard block |
||
1303 | 1303 | $view = \GV\View::by_id( $gravityview_view->view_id ); |
1304 | 1304 | |
1305 | 1305 | // get configured search fields |
1306 | - $search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : ''; |
|
1306 | + $search_fields = ! empty( $widget_args[ 'search_fields' ] ) ? json_decode( $widget_args[ 'search_fields' ], true ) : ''; |
|
1307 | 1307 | |
1308 | 1308 | if ( empty( $search_fields ) || ! is_array( $search_fields ) ) { |
1309 | 1309 | gravityview()->log->debug( 'No search fields configured for widget:', array( 'data' => $widget_args ) ); |
@@ -1317,40 +1317,40 @@ discard block |
||
1317 | 1317 | |
1318 | 1318 | $updated_field = $this->get_search_filter_details( $updated_field, $context ); |
1319 | 1319 | |
1320 | - switch ( $field['field'] ) { |
|
1320 | + switch ( $field[ 'field' ] ) { |
|
1321 | 1321 | |
1322 | 1322 | case 'search_all': |
1323 | - $updated_field['key'] = 'search_all'; |
|
1324 | - $updated_field['input'] = 'search_all'; |
|
1325 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_search' ); |
|
1323 | + $updated_field[ 'key' ] = 'search_all'; |
|
1324 | + $updated_field[ 'input' ] = 'search_all'; |
|
1325 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_search' ); |
|
1326 | 1326 | break; |
1327 | 1327 | |
1328 | 1328 | case 'entry_date': |
1329 | - $updated_field['key'] = 'entry_date'; |
|
1330 | - $updated_field['input'] = 'entry_date'; |
|
1331 | - $updated_field['value'] = array( |
|
1329 | + $updated_field[ 'key' ] = 'entry_date'; |
|
1330 | + $updated_field[ 'input' ] = 'entry_date'; |
|
1331 | + $updated_field[ 'value' ] = array( |
|
1332 | 1332 | 'start' => $this->rgget_or_rgpost( 'gv_start' ), |
1333 | 1333 | 'end' => $this->rgget_or_rgpost( 'gv_end' ), |
1334 | 1334 | ); |
1335 | 1335 | break; |
1336 | 1336 | |
1337 | 1337 | case 'entry_id': |
1338 | - $updated_field['key'] = 'entry_id'; |
|
1339 | - $updated_field['input'] = 'entry_id'; |
|
1340 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_id' ); |
|
1338 | + $updated_field[ 'key' ] = 'entry_id'; |
|
1339 | + $updated_field[ 'input' ] = 'entry_id'; |
|
1340 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_id' ); |
|
1341 | 1341 | break; |
1342 | 1342 | |
1343 | 1343 | case 'created_by': |
1344 | - $updated_field['key'] = 'created_by'; |
|
1345 | - $updated_field['name'] = 'gv_by'; |
|
1346 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_by' ); |
|
1347 | - $updated_field['choices'] = self::get_created_by_choices( $view ); |
|
1344 | + $updated_field[ 'key' ] = 'created_by'; |
|
1345 | + $updated_field[ 'name' ] = 'gv_by'; |
|
1346 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_by' ); |
|
1347 | + $updated_field[ 'choices' ] = self::get_created_by_choices( $view ); |
|
1348 | 1348 | break; |
1349 | 1349 | |
1350 | 1350 | case 'is_approved': |
1351 | - $updated_field['key'] = 'is_approved'; |
|
1352 | - $updated_field['value'] = $this->rgget_or_rgpost( 'filter_is_approved' ); |
|
1353 | - $updated_field['choices'] = self::get_is_approved_choices(); |
|
1351 | + $updated_field[ 'key' ] = 'is_approved'; |
|
1352 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'filter_is_approved' ); |
|
1353 | + $updated_field[ 'choices' ] = self::get_is_approved_choices(); |
|
1354 | 1354 | break; |
1355 | 1355 | } |
1356 | 1356 | |
@@ -1371,16 +1371,16 @@ discard block |
||
1371 | 1371 | |
1372 | 1372 | $gravityview_view->permalink_fields = $this->add_no_permalink_fields( array(), $this, $widget_args ); |
1373 | 1373 | |
1374 | - $gravityview_view->search_layout = ! empty( $widget_args['search_layout'] ) ? $widget_args['search_layout'] : 'horizontal'; |
|
1374 | + $gravityview_view->search_layout = ! empty( $widget_args[ 'search_layout' ] ) ? $widget_args[ 'search_layout' ] : 'horizontal'; |
|
1375 | 1375 | |
1376 | 1376 | /** @since 1.14 */ |
1377 | - $gravityview_view->search_mode = ! empty( $widget_args['search_mode'] ) ? $widget_args['search_mode'] : 'any'; |
|
1377 | + $gravityview_view->search_mode = ! empty( $widget_args[ 'search_mode' ] ) ? $widget_args[ 'search_mode' ] : 'any'; |
|
1378 | 1378 | |
1379 | - $custom_class = ! empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : ''; |
|
1379 | + $custom_class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : ''; |
|
1380 | 1380 | |
1381 | 1381 | $gravityview_view->search_class = self::get_search_class( $custom_class ); |
1382 | 1382 | |
1383 | - $gravityview_view->search_clear = ! empty( $widget_args['search_clear'] ) ? $widget_args['search_clear'] : false; |
|
1383 | + $gravityview_view->search_clear = ! empty( $widget_args[ 'search_clear' ] ) ? $widget_args[ 'search_clear' ] : false; |
|
1384 | 1384 | |
1385 | 1385 | if ( $this->has_date_field( $search_fields ) ) { |
1386 | 1386 | // enqueue datepicker stuff only if needed! |
@@ -1402,10 +1402,10 @@ discard block |
||
1402 | 1402 | public static function get_search_class( $custom_class = '' ) { |
1403 | 1403 | $gravityview_view = GravityView_View::getInstance(); |
1404 | 1404 | |
1405 | - $search_class = 'gv-search-'.$gravityview_view->search_layout; |
|
1405 | + $search_class = 'gv-search-' . $gravityview_view->search_layout; |
|
1406 | 1406 | |
1407 | - if ( ! empty( $custom_class ) ) { |
|
1408 | - $search_class .= ' '.$custom_class; |
|
1407 | + if ( ! empty( $custom_class ) ) { |
|
1408 | + $search_class .= ' ' . $custom_class; |
|
1409 | 1409 | } |
1410 | 1410 | |
1411 | 1411 | /** |
@@ -1456,9 +1456,9 @@ discard block |
||
1456 | 1456 | |
1457 | 1457 | if ( ! $label ) { |
1458 | 1458 | |
1459 | - $label = isset( $form_field['label'] ) ? $form_field['label'] : ''; |
|
1459 | + $label = isset( $form_field[ 'label' ] ) ? $form_field[ 'label' ] : ''; |
|
1460 | 1460 | |
1461 | - switch( $field['field'] ) { |
|
1461 | + switch ( $field[ 'field' ] ) { |
|
1462 | 1462 | case 'search_all': |
1463 | 1463 | $label = __( 'Search Entries:', 'gravityview' ); |
1464 | 1464 | break; |
@@ -1470,10 +1470,10 @@ discard block |
||
1470 | 1470 | break; |
1471 | 1471 | default: |
1472 | 1472 | // If this is a field input, not a field |
1473 | - if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) { |
|
1473 | + if ( strpos( $field[ 'field' ], '.' ) > 0 && ! empty( $form_field[ 'inputs' ] ) ) { |
|
1474 | 1474 | |
1475 | 1475 | // Get the label for the field in question, which returns an array |
1476 | - $items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) ); |
|
1476 | + $items = wp_list_filter( $form_field[ 'inputs' ], array( 'id' => $field[ 'field' ] ) ); |
|
1477 | 1477 | |
1478 | 1478 | // Get the item with the `label` key |
1479 | 1479 | $values = wp_list_pluck( $items, 'label' ); |
@@ -1514,13 +1514,13 @@ discard block |
||
1514 | 1514 | $form = $gravityview_view->getForm(); |
1515 | 1515 | |
1516 | 1516 | // for advanced field ids (eg, first name / last name ) |
1517 | - $name = 'filter_' . str_replace( '.', '_', $field['field'] ); |
|
1517 | + $name = 'filter_' . str_replace( '.', '_', $field[ 'field' ] ); |
|
1518 | 1518 | |
1519 | 1519 | // get searched value from $_GET/$_POST (string or array) |
1520 | 1520 | $value = $this->rgget_or_rgpost( $name ); |
1521 | 1521 | |
1522 | 1522 | // get form field details |
1523 | - $form_field = gravityview_get_field( $form, $field['field'] ); |
|
1523 | + $form_field = gravityview_get_field( $form, $field[ 'field' ] ); |
|
1524 | 1524 | |
1525 | 1525 | $form_field_type = \GV\Utils::get( $form_field, 'type' ); |
1526 | 1526 | |
@@ -1534,17 +1534,17 @@ discard block |
||
1534 | 1534 | ); |
1535 | 1535 | |
1536 | 1536 | // collect choices |
1537 | - if ( 'post_category' === $form_field_type && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) { |
|
1538 | - $filter['choices'] = gravityview_get_terms_choices(); |
|
1539 | - } elseif ( ! empty( $form_field['choices'] ) ) { |
|
1540 | - $filter['choices'] = $form_field['choices']; |
|
1537 | + if ( 'post_category' === $form_field_type && ! empty( $form_field[ 'displayAllCategories' ] ) && empty( $form_field[ 'choices' ] ) ) { |
|
1538 | + $filter[ 'choices' ] = gravityview_get_terms_choices(); |
|
1539 | + } elseif ( ! empty( $form_field[ 'choices' ] ) ) { |
|
1540 | + $filter[ 'choices' ] = $form_field[ 'choices' ]; |
|
1541 | 1541 | } |
1542 | 1542 | |
1543 | - if ( 'date_range' === $field['input'] && empty( $value ) ) { |
|
1544 | - $filter['value'] = array( 'start' => '', 'end' => '' ); |
|
1543 | + if ( 'date_range' === $field[ 'input' ] && empty( $value ) ) { |
|
1544 | + $filter[ 'value' ] = array( 'start' => '', 'end' => '' ); |
|
1545 | 1545 | } |
1546 | 1546 | |
1547 | - if ( ! empty( $filter['choices'] ) ) { |
|
1547 | + if ( ! empty( $filter[ 'choices' ] ) ) { |
|
1548 | 1548 | /** |
1549 | 1549 | * @filter `gravityview/search/sieve_choices` Only output used choices for this field. |
1550 | 1550 | * @param[in,out] bool Yes or no. |
@@ -1552,7 +1552,7 @@ discard block |
||
1552 | 1552 | * @param \GV\Context The context. |
1553 | 1553 | */ |
1554 | 1554 | if ( apply_filters( 'gravityview/search/sieve_choices', false, $field, $context ) ) { |
1555 | - $filter['choices'] = $this->sieve_filter_choices( $filter, $context ); |
|
1555 | + $filter[ 'choices' ] = $this->sieve_filter_choices( $filter, $context ); |
|
1556 | 1556 | } |
1557 | 1557 | } |
1558 | 1558 | |
@@ -1581,11 +1581,11 @@ discard block |
||
1581 | 1581 | * @return array The filter choices. |
1582 | 1582 | */ |
1583 | 1583 | private function sieve_filter_choices( $filter, $context ) { |
1584 | - if ( empty( $filter['key'] ) || empty( $filter['choices'] ) ) { |
|
1584 | + if ( empty( $filter[ 'key' ] ) || empty( $filter[ 'choices' ] ) ) { |
|
1585 | 1585 | return $filter; // @todo Populate plugins might give us empty choices |
1586 | 1586 | } |
1587 | 1587 | |
1588 | - if ( ! is_numeric( $filter['key'] ) ) { |
|
1588 | + if ( ! is_numeric( $filter[ 'key' ] ) ) { |
|
1589 | 1589 | return $filter; |
1590 | 1590 | } |
1591 | 1591 | |
@@ -1595,29 +1595,29 @@ discard block |
||
1595 | 1595 | |
1596 | 1596 | $table = GFFormsModel::get_entry_meta_table_name(); |
1597 | 1597 | |
1598 | - $key_like = $wpdb->esc_like( $filter['key'] ) . '.%'; |
|
1598 | + $key_like = $wpdb->esc_like( $filter[ 'key' ] ) . '.%'; |
|
1599 | 1599 | |
1600 | 1600 | switch ( \GV\Utils::get( $filter, 'type' ) ): |
1601 | 1601 | case 'post_category': |
1602 | 1602 | $choices = $wpdb->get_col( $wpdb->prepare( |
1603 | 1603 | "SELECT DISTINCT SUBSTRING_INDEX(meta_value, ':', 1) FROM $table WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d", |
1604 | - $key_like, $filter['key'], $form_id |
|
1604 | + $key_like, $filter[ 'key' ], $form_id |
|
1605 | 1605 | ) ); |
1606 | 1606 | break; |
1607 | 1607 | default: |
1608 | 1608 | $choices = $wpdb->get_col( $wpdb->prepare( |
1609 | 1609 | "SELECT DISTINCT meta_value FROM $table WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d", |
1610 | - $key_like, $filter['key'], $form_id |
|
1610 | + $key_like, $filter[ 'key' ], $form_id |
|
1611 | 1611 | ) ); |
1612 | 1612 | |
1613 | - if ( ( $field = gravityview_get_field( $form_id, $filter['key'] ) ) && 'json' === $field->storageType ) { |
|
1613 | + if ( ( $field = gravityview_get_field( $form_id, $filter[ 'key' ] ) ) && 'json' === $field->storageType ) { |
|
1614 | 1614 | $choices = array_map( 'json_decode', $choices ); |
1615 | 1615 | $_choices_array = array(); |
1616 | 1616 | foreach ( $choices as $choice ) { |
1617 | 1617 | if ( is_array( $choice ) ) { |
1618 | 1618 | $_choices_array = array_merge( $_choices_array, $choice ); |
1619 | 1619 | } else { |
1620 | - $_choices_array []= $choice; |
|
1620 | + $_choices_array [ ] = $choice; |
|
1621 | 1621 | } |
1622 | 1622 | } |
1623 | 1623 | $choices = array_unique( $_choices_array ); |
@@ -1627,9 +1627,9 @@ discard block |
||
1627 | 1627 | endswitch; |
1628 | 1628 | |
1629 | 1629 | $filter_choices = array(); |
1630 | - foreach ( $filter['choices'] as $choice ) { |
|
1631 | - if ( in_array( $choice['text'], $choices, true ) || in_array( $choice['value'], $choices, true ) ) { |
|
1632 | - $filter_choices[] = $choice; |
|
1630 | + foreach ( $filter[ 'choices' ] as $choice ) { |
|
1631 | + if ( in_array( $choice[ 'text' ], $choices, true ) || in_array( $choice[ 'value' ], $choices, true ) ) { |
|
1632 | + $filter_choices[ ] = $choice; |
|
1633 | 1633 | } |
1634 | 1634 | } |
1635 | 1635 | |
@@ -1664,7 +1664,7 @@ discard block |
||
1664 | 1664 | * @param \GV\View $view The view. |
1665 | 1665 | */ |
1666 | 1666 | $text = apply_filters( 'gravityview/search/created_by/text', $user->display_name, $user, $view ); |
1667 | - $choices[] = array( |
|
1667 | + $choices[ ] = array( |
|
1668 | 1668 | 'value' => $user->ID, |
1669 | 1669 | 'text' => $text, |
1670 | 1670 | ); |
@@ -1684,9 +1684,9 @@ discard block |
||
1684 | 1684 | |
1685 | 1685 | $choices = array(); |
1686 | 1686 | foreach ( GravityView_Entry_Approval_Status::get_all() as $status ) { |
1687 | - $choices[] = array( |
|
1688 | - 'value' => $status['value'], |
|
1689 | - 'text' => $status['label'], |
|
1687 | + $choices[ ] = array( |
|
1688 | + 'value' => $status[ 'value' ], |
|
1689 | + 'text' => $status[ 'label' ], |
|
1690 | 1690 | ); |
1691 | 1691 | } |
1692 | 1692 | |
@@ -1738,7 +1738,7 @@ discard block |
||
1738 | 1738 | */ |
1739 | 1739 | public function add_datepicker_js_dependency( $js_dependencies ) { |
1740 | 1740 | |
1741 | - $js_dependencies[] = 'jquery-ui-datepicker'; |
|
1741 | + $js_dependencies[ ] = 'jquery-ui-datepicker'; |
|
1742 | 1742 | |
1743 | 1743 | return $js_dependencies; |
1744 | 1744 | } |
@@ -1782,7 +1782,7 @@ discard block |
||
1782 | 1782 | 'isRTL' => is_rtl(), |
1783 | 1783 | ), $view_data ); |
1784 | 1784 | |
1785 | - $localizations['datepicker'] = $datepicker_settings; |
|
1785 | + $localizations[ 'datepicker' ] = $datepicker_settings; |
|
1786 | 1786 | |
1787 | 1787 | return $localizations; |
1788 | 1788 | |
@@ -1809,7 +1809,7 @@ discard block |
||
1809 | 1809 | * @return void |
1810 | 1810 | */ |
1811 | 1811 | private function maybe_enqueue_flexibility() { |
1812 | - if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/MSIE [8-9]/', $_SERVER['HTTP_USER_AGENT'] ) ) { |
|
1812 | + if ( isset( $_SERVER[ 'HTTP_USER_AGENT' ] ) && preg_match( '/MSIE [8-9]/', $_SERVER[ 'HTTP_USER_AGENT' ] ) ) { |
|
1813 | 1813 | wp_enqueue_script( 'gv-flexibility' ); |
1814 | 1814 | } |
1815 | 1815 | } |
@@ -1831,7 +1831,7 @@ discard block |
||
1831 | 1831 | add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 ); |
1832 | 1832 | |
1833 | 1833 | $scheme = is_ssl() ? 'https://' : 'http://'; |
1834 | - wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' ); |
|
1834 | + wp_enqueue_style( 'jquery-ui-datepicker', $scheme . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' ); |
|
1835 | 1835 | |
1836 | 1836 | /** |
1837 | 1837 | * @filter `gravityview_search_datepicker_class` |
@@ -1910,7 +1910,7 @@ discard block |
||
1910 | 1910 | public function add_preview_inputs() { |
1911 | 1911 | global $wp; |
1912 | 1912 | |
1913 | - if ( ! is_preview() || ! current_user_can( 'publish_gravityviews') ) { |
|
1913 | + if ( ! is_preview() || ! current_user_can( 'publish_gravityviews' ) ) { |
|
1914 | 1914 | return; |
1915 | 1915 | } |
1916 | 1916 | |
@@ -1962,7 +1962,7 @@ discard block |
||
1962 | 1962 | */ |
1963 | 1963 | class GravityView_Widget_Search_Author_GF_Query_Condition extends \GF_Query_Condition { |
1964 | 1964 | public function __construct( $filter, $view ) { |
1965 | - $this->value = $filter['value']; |
|
1965 | + $this->value = $filter[ 'value' ]; |
|
1966 | 1966 | $this->view = $view; |
1967 | 1967 | } |
1968 | 1968 | |
@@ -1994,11 +1994,11 @@ discard block |
||
1994 | 1994 | $conditions = array(); |
1995 | 1995 | |
1996 | 1996 | foreach ( $user_fields as $user_field ) { |
1997 | - $conditions[] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
1997 | + $conditions[ ] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
1998 | 1998 | } |
1999 | 1999 | |
2000 | 2000 | foreach ( $user_meta_fields as $meta_field ) { |
2001 | - $conditions[] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
2001 | + $conditions[ ] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
2002 | 2002 | } |
2003 | 2003 | |
2004 | 2004 | $conditions = '(' . implode( ' OR ', $conditions ) . ')'; |