@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | |
240 | 240 | self::getInstance()->set_entry( $entry ); |
241 | 241 | |
242 | - $base = GravityView_API::directory_link( $post_id ? : $view_id, true ); |
|
242 | + $base = GravityView_API::directory_link( $post_id ? : $view_id, true ); |
|
243 | 243 | |
244 | 244 | if ( empty( $base ) ) { |
245 | 245 | gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) ); |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | 'action' => 'delete', |
254 | 254 | 'entry_id' => $entry_slug, |
255 | 255 | 'gvid' => $view_id, |
256 | - 'view_id' => $view_id, |
|
256 | + 'view_id' => $view_id, |
|
257 | 257 | ), $base ); |
258 | 258 | |
259 | 259 | $url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' ); |
@@ -427,7 +427,7 @@ discard block |
||
427 | 427 | * @since 1.16.4 |
428 | 428 | * @param int $entry_id ID of the Gravity Forms entry |
429 | 429 | * @param array $entry Deleted entry array |
430 | - */ |
|
430 | + */ |
|
431 | 431 | do_action( 'gravityview/delete-entry/deleted', $entry_id, $entry ); |
432 | 432 | } |
433 | 433 |
@@ -222,7 +222,6 @@ discard block |
||
222 | 222 | * |
223 | 223 | * @since 1.5.1 |
224 | 224 | * @param array $visibility_caps Array of capabilities to display in field dropdown. |
225 | - * @param string $field_type Type of field options to render (`field` or `widget`) |
|
226 | 225 | * @param string $template_id Table slug |
227 | 226 | * @param float $field_id GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by` |
228 | 227 | * @param string $context What context are we in? Example: `single` or `directory` |
@@ -651,7 +650,7 @@ discard block |
||
651 | 650 | * |
652 | 651 | * @param array $entry Gravity Forms entry array |
653 | 652 | * @param array $field Field settings (optional) |
654 | - * @param int|\GV\View $view Pass a View ID to check caps against. If not set, check against current View (@deprecated no longer optional) |
|
653 | + * @param integer $view Pass a View ID to check caps against. If not set, check against current View (@deprecated no longer optional) |
|
655 | 654 | * @return bool |
656 | 655 | */ |
657 | 656 | public static function check_user_cap_delete_entry( $entry, $field = array(), $view = 0 ) { |
@@ -42,12 +42,12 @@ discard block |
||
42 | 42 | |
43 | 43 | add_action( 'wp', array( $this, 'process_delete' ), 10000 ); |
44 | 44 | |
45 | - add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field'), 10, 3 ); |
|
45 | + add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 ); |
|
46 | 46 | |
47 | 47 | add_action( 'gravityview_before', array( $this, 'maybe_display_message' ) ); |
48 | 48 | |
49 | 49 | // For the Delete Entry Link, you don't want visible to all users. |
50 | - add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps'), 10, 5 ); |
|
50 | + add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 ); |
|
51 | 51 | |
52 | 52 | // Modify the field options based on the name of the field type |
53 | 53 | add_filter( 'gravityview_template_delete_link_options', array( $this, 'delete_link_field_options' ), 10, 5 ); |
@@ -55,10 +55,10 @@ discard block |
||
55 | 55 | // add template path to check for field |
56 | 56 | add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) ); |
57 | 57 | |
58 | - add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button'), 10, 4 ); |
|
58 | + add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button' ), 10, 4 ); |
|
59 | 59 | |
60 | - add_action ( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 ); |
|
61 | - add_action ( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 ); |
|
60 | + add_action( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 ); |
|
61 | + add_action( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 ); |
|
62 | 62 | |
63 | 63 | add_filter( 'gravityview/field/is_visible', array( $this, 'maybe_not_visible' ), 10, 3 ); |
64 | 64 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | */ |
72 | 72 | static function getInstance() { |
73 | 73 | |
74 | - if( empty( self::$instance ) ) { |
|
74 | + if ( empty( self::$instance ) ) { |
|
75 | 75 | self::$instance = new self; |
76 | 76 | } |
77 | 77 | |
@@ -151,20 +151,20 @@ discard block |
||
151 | 151 | function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
152 | 152 | |
153 | 153 | // Always a link, never a filter |
154 | - unset( $field_options['show_as_link'], $field_options['search_filter'] ); |
|
154 | + unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] ); |
|
155 | 155 | |
156 | 156 | // Delete Entry link should only appear to visitors capable of editing entries |
157 | - unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] ); |
|
157 | + unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] ); |
|
158 | 158 | |
159 | - $add_option['delete_link'] = array( |
|
159 | + $add_option[ 'delete_link' ] = array( |
|
160 | 160 | 'type' => 'text', |
161 | 161 | 'label' => __( 'Delete Link Text', 'gravityview' ), |
162 | 162 | 'desc' => NULL, |
163 | - 'value' => __('Delete Entry', 'gravityview'), |
|
163 | + 'value' => __( 'Delete Entry', 'gravityview' ), |
|
164 | 164 | 'merge_tags' => true, |
165 | 165 | ); |
166 | 166 | |
167 | - $field_options['allow_edit_cap'] = array( |
|
167 | + $field_options[ 'allow_edit_cap' ] = array( |
|
168 | 168 | 'type' => 'select', |
169 | 169 | 'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ), |
170 | 170 | 'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ), |
@@ -188,8 +188,8 @@ discard block |
||
188 | 188 | */ |
189 | 189 | function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) { |
190 | 190 | |
191 | - if( 'edit' !== $zone ) { |
|
192 | - $entry_default_fields['delete_link'] = array( |
|
191 | + if ( 'edit' !== $zone ) { |
|
192 | + $entry_default_fields[ 'delete_link' ] = array( |
|
193 | 193 | 'label' => __( 'Delete Entry', 'gravityview' ), |
194 | 194 | 'type' => 'delete_link', |
195 | 195 | 'desc' => __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ), |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | */ |
207 | 207 | function add_available_field( $available_fields = array() ) { |
208 | 208 | |
209 | - $available_fields['delete_link'] = array( |
|
209 | + $available_fields[ 'delete_link' ] = array( |
|
210 | 210 | 'label_text' => __( 'Delete Entry', 'gravityview' ), |
211 | 211 | 'field_id' => 'delete_link', |
212 | 212 | 'label_type' => 'field', |
@@ -234,12 +234,12 @@ discard block |
||
234 | 234 | $caps = $visibility_caps; |
235 | 235 | |
236 | 236 | // If we're configuring fields in the edit context, we want a limited selection |
237 | - if( $field_id === 'delete_link' ) { |
|
237 | + if ( $field_id === 'delete_link' ) { |
|
238 | 238 | |
239 | 239 | // Remove other built-in caps. |
240 | - unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] ); |
|
240 | + unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] ); |
|
241 | 241 | |
242 | - $caps['read'] = _x('Entry Creator', 'User capability', 'gravityview'); |
|
242 | + $caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' ); |
|
243 | 243 | } |
244 | 244 | |
245 | 245 | return $caps; |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | * @param [type] $entry [description] |
253 | 253 | */ |
254 | 254 | function set_entry( $entry = null ) { |
255 | - $this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[0] : $entry; |
|
255 | + $this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[ 0 ] : $entry; |
|
256 | 256 | } |
257 | 257 | |
258 | 258 | /** |
@@ -285,7 +285,7 @@ discard block |
||
285 | 285 | |
286 | 286 | self::getInstance()->set_entry( $entry ); |
287 | 287 | |
288 | - $base = GravityView_API::directory_link( $post_id ? : $view_id, true ); |
|
288 | + $base = GravityView_API::directory_link( $post_id ?: $view_id, true ); |
|
289 | 289 | |
290 | 290 | if ( empty( $base ) ) { |
291 | 291 | gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) ); |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | 'view_id' => $view_id, |
305 | 305 | ), $base ); |
306 | 306 | |
307 | - $url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' ); |
|
307 | + $url = wp_nonce_url( $actionurl, 'delete_' . $entry_slug, 'delete' ); |
|
308 | 308 | |
309 | 309 | return $url; |
310 | 310 | } |
@@ -326,7 +326,7 @@ discard block |
||
326 | 326 | public function add_delete_button( $form = array(), $entry = array(), $view_id = null, $post_id = null ) { |
327 | 327 | |
328 | 328 | // Only show the link to those who are allowed to see it. |
329 | - if( !self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) { |
|
329 | + if ( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) { |
|
330 | 330 | return; |
331 | 331 | } |
332 | 332 | |
@@ -337,13 +337,13 @@ discard block |
||
337 | 337 | $show_delete_button = apply_filters( 'gravityview/delete-entry/show-delete-button', true ); |
338 | 338 | |
339 | 339 | // If the button is hidden by the filter, don't show. |
340 | - if( !$show_delete_button ) { |
|
340 | + if ( ! $show_delete_button ) { |
|
341 | 341 | return; |
342 | 342 | } |
343 | 343 | |
344 | 344 | $attributes = array( |
345 | 345 | 'class' => 'btn btn-sm button button-small alignright pull-right btn-danger gv-button-delete', |
346 | - 'tabindex' => ( GFCommon::$tab_index ++ ), |
|
346 | + 'tabindex' => ( GFCommon::$tab_index++ ), |
|
347 | 347 | 'onclick' => self::get_confirm_dialog(), |
348 | 348 | ); |
349 | 349 | |
@@ -367,27 +367,27 @@ discard block |
||
367 | 367 | function process_delete() { |
368 | 368 | |
369 | 369 | // If the form is submitted |
370 | - if( isset( $_GET['action'] ) && 'delete' === $_GET['action'] && isset( $_GET['entry_id'] ) ) { |
|
370 | + if ( isset( $_GET[ 'action' ] ) && 'delete' === $_GET[ 'action' ] && isset( $_GET[ 'entry_id' ] ) ) { |
|
371 | 371 | |
372 | 372 | // Make sure it's a GravityView request |
373 | - $valid_nonce_key = wp_verify_nonce( $_GET['delete'], self::get_nonce_key( $_GET['entry_id'] ) ); |
|
373 | + $valid_nonce_key = wp_verify_nonce( $_GET[ 'delete' ], self::get_nonce_key( $_GET[ 'entry_id' ] ) ); |
|
374 | 374 | |
375 | - if( ! $valid_nonce_key ) { |
|
375 | + if ( ! $valid_nonce_key ) { |
|
376 | 376 | gravityview()->log->debug( 'Delete entry not processed: nonce validation failed.' ); |
377 | 377 | return; |
378 | 378 | } |
379 | 379 | |
380 | 380 | // Get the entry slug |
381 | - $entry_slug = esc_attr( $_GET['entry_id'] ); |
|
381 | + $entry_slug = esc_attr( $_GET[ 'entry_id' ] ); |
|
382 | 382 | |
383 | 383 | // See if there's an entry there |
384 | 384 | $entry = gravityview_get_entry( $entry_slug, true, false ); |
385 | 385 | |
386 | - if( $entry ) { |
|
386 | + if ( $entry ) { |
|
387 | 387 | |
388 | 388 | $has_permission = $this->user_can_delete_entry( $entry, \GV\Utils::_GET( 'gvid', \GV\Utils::_GET( 'view_id' ) ) ); |
389 | 389 | |
390 | - if( is_wp_error( $has_permission ) ) { |
|
390 | + if ( is_wp_error( $has_permission ) ) { |
|
391 | 391 | |
392 | 392 | $messages = array( |
393 | 393 | 'message' => urlencode( $has_permission->get_error_message() ), |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | // Delete the entry |
400 | 400 | $delete_response = $this->delete_or_trash_entry( $entry ); |
401 | 401 | |
402 | - if( is_wp_error( $delete_response ) ) { |
|
402 | + if ( is_wp_error( $delete_response ) ) { |
|
403 | 403 | |
404 | 404 | $messages = array( |
405 | 405 | 'message' => urlencode( $delete_response->get_error_message() ), |
@@ -421,7 +421,7 @@ discard block |
||
421 | 421 | gravityview()->log->debug( 'Delete entry failed: there was no entry with the entry slug {entry_slug}', array( 'entry_slug' => $entry_slug ) ); |
422 | 422 | |
423 | 423 | $messages = array( |
424 | - 'message' => urlencode( __('The entry does not exist.', 'gravityview') ), |
|
424 | + 'message' => urlencode( __( 'The entry does not exist.', 'gravityview' ) ), |
|
425 | 425 | 'status' => 'error', |
426 | 426 | ); |
427 | 427 | } |
@@ -461,18 +461,18 @@ discard block |
||
461 | 461 | */ |
462 | 462 | private function delete_or_trash_entry( $entry ) { |
463 | 463 | |
464 | - $entry_id = $entry['id']; |
|
464 | + $entry_id = $entry[ 'id' ]; |
|
465 | 465 | |
466 | 466 | $mode = $this->get_delete_mode(); |
467 | 467 | |
468 | - if( 'delete' === $mode ) { |
|
468 | + if ( 'delete' === $mode ) { |
|
469 | 469 | |
470 | 470 | gravityview()->log->debug( 'Starting delete entry: {entry_id}', array( 'entry_id' => $entry_id ) ); |
471 | 471 | |
472 | 472 | // Delete the entry |
473 | 473 | $delete_response = GFAPI::delete_entry( $entry_id ); |
474 | 474 | |
475 | - if( ! is_wp_error( $delete_response ) ) { |
|
475 | + if ( ! is_wp_error( $delete_response ) ) { |
|
476 | 476 | $delete_response = 'deleted'; |
477 | 477 | |
478 | 478 | /** |
@@ -493,8 +493,8 @@ discard block |
||
493 | 493 | $trashed = GFAPI::update_entry_property( $entry_id, 'status', 'trash' ); |
494 | 494 | new GravityView_Cache; |
495 | 495 | |
496 | - if( ! $trashed ) { |
|
497 | - $delete_response = new WP_Error( 'trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview' ) ); |
|
496 | + if ( ! $trashed ) { |
|
497 | + $delete_response = new WP_Error( 'trash_entry_failed', __( 'Moving the entry to the trash failed.', 'gravityview' ) ); |
|
498 | 498 | } else { |
499 | 499 | |
500 | 500 | /** |
@@ -525,7 +525,7 @@ discard block |
||
525 | 525 | public function process_connected_posts( $entry_id = 0, $entry = array() ) { |
526 | 526 | |
527 | 527 | // The entry had no connected post |
528 | - if( empty( $entry['post_id'] ) ) { |
|
528 | + if ( empty( $entry[ 'post_id' ] ) ) { |
|
529 | 529 | return; |
530 | 530 | } |
531 | 531 | |
@@ -536,19 +536,19 @@ discard block |
||
536 | 536 | */ |
537 | 537 | $delete_post = apply_filters( 'gravityview/delete-entry/delete-connected-post', true ); |
538 | 538 | |
539 | - if( false === $delete_post ) { |
|
539 | + if ( false === $delete_post ) { |
|
540 | 540 | return; |
541 | 541 | } |
542 | 542 | |
543 | 543 | $action = current_action(); |
544 | 544 | |
545 | - if( 'gravityview/delete-entry/deleted' === $action ) { |
|
546 | - $result = wp_delete_post( $entry['post_id'], true ); |
|
545 | + if ( 'gravityview/delete-entry/deleted' === $action ) { |
|
546 | + $result = wp_delete_post( $entry[ 'post_id' ], true ); |
|
547 | 547 | } else { |
548 | - $result = wp_trash_post( $entry['post_id'] ); |
|
548 | + $result = wp_trash_post( $entry[ 'post_id' ] ); |
|
549 | 549 | } |
550 | 550 | |
551 | - if( false === $result ) { |
|
551 | + if ( false === $result ) { |
|
552 | 552 | gravityview()->log->error( '(called by {action}): Error processing the Post connected to the entry.', array( 'action' => $action, 'data' => $entry ) ); |
553 | 553 | } else { |
554 | 554 | gravityview()->log->debug( '(called by {action}): Successfully processed Post connected to the entry.', array( 'action' => $action, 'data' => $entry ) ); |
@@ -564,13 +564,13 @@ discard block |
||
564 | 564 | public function verify_nonce() { |
565 | 565 | |
566 | 566 | // No delete entry request was made |
567 | - if( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) { |
|
567 | + if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) { |
|
568 | 568 | return false; |
569 | 569 | } |
570 | 570 | |
571 | - $nonce_key = self::get_nonce_key( $_GET['entry_id'] ); |
|
571 | + $nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] ); |
|
572 | 572 | |
573 | - $valid = wp_verify_nonce( $_GET['delete'], $nonce_key ); |
|
573 | + $valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key ); |
|
574 | 574 | |
575 | 575 | /** |
576 | 576 | * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid. |
@@ -592,7 +592,7 @@ discard block |
||
592 | 592 | */ |
593 | 593 | public static function get_confirm_dialog() { |
594 | 594 | |
595 | - $confirm = __('Are you sure you want to delete this entry? This cannot be undone.', 'gravityview'); |
|
595 | + $confirm = __( 'Are you sure you want to delete this entry? This cannot be undone.', 'gravityview' ); |
|
596 | 596 | |
597 | 597 | /** |
598 | 598 | * @filter `gravityview/delete-entry/confirm-text` Modify the Delete Entry Javascript confirmation text |
@@ -600,7 +600,7 @@ discard block |
||
600 | 600 | */ |
601 | 601 | $confirm = apply_filters( 'gravityview/delete-entry/confirm-text', $confirm ); |
602 | 602 | |
603 | - return 'return window.confirm(\''. esc_js( $confirm ) .'\');'; |
|
603 | + return 'return window.confirm(\'' . esc_js( $confirm ) . '\');'; |
|
604 | 604 | } |
605 | 605 | |
606 | 606 | /** |
@@ -618,16 +618,16 @@ discard block |
||
618 | 618 | |
619 | 619 | $error = NULL; |
620 | 620 | |
621 | - if( ! $this->verify_nonce() ) { |
|
622 | - $error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview'); |
|
621 | + if ( ! $this->verify_nonce() ) { |
|
622 | + $error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview' ); |
|
623 | 623 | } |
624 | 624 | |
625 | - if( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) { |
|
626 | - $error = __( 'You do not have permission to delete this entry.', 'gravityview'); |
|
625 | + if ( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) { |
|
626 | + $error = __( 'You do not have permission to delete this entry.', 'gravityview' ); |
|
627 | 627 | } |
628 | 628 | |
629 | - if( $entry['status'] === 'trash' ) { |
|
630 | - if( 'trash' === $this->get_delete_mode() ) { |
|
629 | + if ( $entry[ 'status' ] === 'trash' ) { |
|
630 | + if ( 'trash' === $this->get_delete_mode() ) { |
|
631 | 631 | $error = __( 'The entry is already in the trash.', 'gravityview' ); |
632 | 632 | } else { |
633 | 633 | $error = __( 'You cannot delete the entry; it is already in the trash.', 'gravityview' ); |
@@ -635,7 +635,7 @@ discard block |
||
635 | 635 | } |
636 | 636 | |
637 | 637 | // No errors; everything's fine here! |
638 | - if( empty( $error ) ) { |
|
638 | + if ( empty( $error ) ) { |
|
639 | 639 | return true; |
640 | 640 | } |
641 | 641 | |
@@ -663,17 +663,17 @@ discard block |
||
663 | 663 | $view = \GV\View::by_id( $view_id ); |
664 | 664 | } else { |
665 | 665 | if ( ! $view instanceof \GV\View ) { |
666 | - $view = \GV\View::by_id ( $view ); |
|
666 | + $view = \GV\View::by_id( $view ); |
|
667 | 667 | } |
668 | 668 | $view_id = $view->ID; |
669 | 669 | } |
670 | 670 | |
671 | 671 | $current_user = wp_get_current_user(); |
672 | 672 | |
673 | - $entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL; |
|
673 | + $entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL; |
|
674 | 674 | |
675 | 675 | // Or if they can delete any entries (as defined in Gravity Forms), we're good. |
676 | - if( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) { |
|
676 | + if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) { |
|
677 | 677 | |
678 | 678 | gravityview()->log->debug( 'Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' ); |
679 | 679 | |
@@ -682,20 +682,20 @@ discard block |
||
682 | 682 | |
683 | 683 | |
684 | 684 | // If field options are passed, check if current user can view the link |
685 | - if( !empty( $field ) ) { |
|
685 | + if ( ! empty( $field ) ) { |
|
686 | 686 | |
687 | 687 | // If capability is not defined, something is not right! |
688 | - if( empty( $field['allow_edit_cap'] ) ) { |
|
688 | + if ( empty( $field[ 'allow_edit_cap' ] ) ) { |
|
689 | 689 | |
690 | 690 | gravityview()->log->error( 'Cannot read delete entry field caps', array( 'data' => $field ) ); |
691 | 691 | |
692 | 692 | return false; |
693 | 693 | } |
694 | 694 | |
695 | - if( GVCommon::has_cap( $field['allow_edit_cap'] ) ) { |
|
695 | + if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) { |
|
696 | 696 | |
697 | 697 | // Do not return true if cap is read, as we need to check if the current user created the entry |
698 | - if( $field['allow_edit_cap'] !== 'read' ) { |
|
698 | + if ( $field[ 'allow_edit_cap' ] !== 'read' ) { |
|
699 | 699 | return true; |
700 | 700 | } |
701 | 701 | |
@@ -708,9 +708,9 @@ discard block |
||
708 | 708 | |
709 | 709 | } |
710 | 710 | |
711 | - if( !isset( $entry['created_by'] ) ) { |
|
711 | + if ( ! isset( $entry[ 'created_by' ] ) ) { |
|
712 | 712 | |
713 | - gravityview()->log->error( 'Entry `created_by` doesn\'t exist.'); |
|
713 | + gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' ); |
|
714 | 714 | |
715 | 715 | return false; |
716 | 716 | } |
@@ -724,7 +724,7 @@ discard block |
||
724 | 724 | } |
725 | 725 | |
726 | 726 | // If the logged-in user is the same as the user who created the entry, we're good. |
727 | - if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) { |
|
727 | + if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) { |
|
728 | 728 | |
729 | 729 | gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) ); |
730 | 730 | |
@@ -748,12 +748,12 @@ discard block |
||
748 | 748 | * @return void |
749 | 749 | */ |
750 | 750 | public function maybe_display_message( $current_view_id = 0 ) { |
751 | - if( empty( $_GET['status'] ) || ! self::verify_nonce() ) { |
|
751 | + if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) { |
|
752 | 752 | return; |
753 | 753 | } |
754 | 754 | |
755 | 755 | // Entry wasn't deleted from current View |
756 | - if( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) { |
|
756 | + if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) { |
|
757 | 757 | return; |
758 | 758 | } |
759 | 759 | |
@@ -762,11 +762,11 @@ discard block |
||
762 | 762 | |
763 | 763 | public function display_message() { |
764 | 764 | |
765 | - if ( empty( $_GET['status'] ) || empty( $_GET['delete'] ) ) { |
|
765 | + if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'delete' ] ) ) { |
|
766 | 766 | return; |
767 | 767 | } |
768 | 768 | |
769 | - $status = esc_attr( $_GET['status'] ); |
|
769 | + $status = esc_attr( $_GET[ 'status' ] ); |
|
770 | 770 | $message_from_url = \GV\Utils::_GET( 'message' ); |
771 | 771 | $message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) ); |
772 | 772 | $class = ''; |
@@ -774,14 +774,14 @@ discard block |
||
774 | 774 | switch ( $status ) { |
775 | 775 | case 'error': |
776 | 776 | $class = ' gv-error error'; |
777 | - $error_message = __('There was an error deleting the entry: %s', 'gravityview'); |
|
777 | + $error_message = __( 'There was an error deleting the entry: %s', 'gravityview' ); |
|
778 | 778 | $message = sprintf( $error_message, $message_from_url ); |
779 | 779 | break; |
780 | 780 | case 'trashed': |
781 | - $message = __('The entry was successfully moved to the trash.', 'gravityview'); |
|
781 | + $message = __( 'The entry was successfully moved to the trash.', 'gravityview' ); |
|
782 | 782 | break; |
783 | 783 | default: |
784 | - $message = __('The entry was successfully deleted.', 'gravityview'); |
|
784 | + $message = __( 'The entry was successfully deleted.', 'gravityview' ); |
|
785 | 785 | break; |
786 | 786 | } |
787 | 787 | |
@@ -795,7 +795,7 @@ discard block |
||
795 | 795 | $message = apply_filters( 'gravityview/delete-entry/message', esc_attr( $message ), $status, $message_from_url ); |
796 | 796 | |
797 | 797 | // DISPLAY ERROR/SUCCESS MESSAGE |
798 | - echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>'; |
|
798 | + echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>'; |
|
799 | 799 | } |
800 | 800 | |
801 | 801 |
@@ -42,7 +42,7 @@ |
||
42 | 42 | static function getInstance() { |
43 | 43 | gravityview()->log->notice( '\GravityView_oEmbed is deprecated. Use \GV\oEmbed instead.' ); |
44 | 44 | |
45 | - if( empty( self::$instance ) ) { |
|
45 | + if ( empty( self::$instance ) ) { |
|
46 | 46 | self::$instance = new self; |
47 | 47 | self::$instance->initialize(); |
48 | 48 | } |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | $widget_ops = array( |
13 | 13 | 'classname' => 'widget_gravityview_search', |
14 | - 'description' => __( 'A search form for a specific GravityView.', 'gravityview') |
|
14 | + 'description' => __( 'A search form for a specific GravityView.', 'gravityview' ) |
|
15 | 15 | ); |
16 | 16 | |
17 | 17 | $widget_display = array( |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | } |
35 | 35 | |
36 | 36 | private function load_required_files() { |
37 | - if( !class_exists( 'GravityView_Widget_Search' ) ) { |
|
37 | + if ( ! class_exists( 'GravityView_Widget_Search' ) ) { |
|
38 | 38 | gravityview_register_gravityview_widgets(); |
39 | 39 | } |
40 | 40 | } |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | public function widget( $args, $instance ) { |
54 | 54 | |
55 | 55 | // Don't show unless a View ID has been set. |
56 | - if( empty( $instance['view_id'] ) ) { |
|
56 | + if ( empty( $instance[ 'view_id' ] ) ) { |
|
57 | 57 | |
58 | 58 | gravityview()->log->debug( 'No View ID has been defined. Not showing the widget.', array( 'data' => $instance ) ); |
59 | 59 | |
@@ -61,22 +61,22 @@ discard block |
||
61 | 61 | } |
62 | 62 | |
63 | 63 | /** This filter is documented in wp-includes/default-widgets.php */ |
64 | - $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base ); |
|
64 | + $title = apply_filters( 'widget_title', empty( $instance[ 'title' ] ) ? '' : $instance[ 'title' ], $instance, $this->id_base ); |
|
65 | 65 | |
66 | - echo $args['before_widget']; |
|
66 | + echo $args[ 'before_widget' ]; |
|
67 | 67 | |
68 | 68 | if ( $title ) { |
69 | - echo $args['before_title'] . $title . $args['after_title']; |
|
69 | + echo $args[ 'before_title' ] . $title . $args[ 'after_title' ]; |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | // @todo Add to the widget configuration form |
73 | - $instance['search_layout'] = apply_filters( 'gravityview/widget/search/layout', 'vertical', $instance ); |
|
73 | + $instance[ 'search_layout' ] = apply_filters( 'gravityview/widget/search/layout', 'vertical', $instance ); |
|
74 | 74 | |
75 | - $instance['context'] = 'wp_widget'; |
|
75 | + $instance[ 'context' ] = 'wp_widget'; |
|
76 | 76 | |
77 | 77 | // form |
78 | - $instance['form_id'] = GVCommon::get_meta_form_id( $instance['view_id'] ); |
|
79 | - $instance['form'] = GVCommon::get_form( $instance['form_id'] ); |
|
78 | + $instance[ 'form_id' ] = GVCommon::get_meta_form_id( $instance[ 'view_id' ] ); |
|
79 | + $instance[ 'form' ] = GVCommon::get_form( $instance[ 'form_id' ] ); |
|
80 | 80 | |
81 | 81 | // We don't want to overwrite existing context, etc. |
82 | 82 | $previous_view = GravityView_View::getInstance(); |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | */ |
93 | 93 | new GravityView_View( $previous_view ); |
94 | 94 | |
95 | - echo $args['after_widget']; |
|
95 | + echo $args[ 'after_widget' ]; |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
@@ -102,27 +102,27 @@ discard block |
||
102 | 102 | |
103 | 103 | $instance = $old_instance; |
104 | 104 | |
105 | - if( $this->is_preview() ) { |
|
105 | + if ( $this->is_preview() ) { |
|
106 | 106 | //Oh! Sorry but still not fully compatible with customizer |
107 | 107 | return $instance; |
108 | 108 | } |
109 | 109 | |
110 | - $new_instance = wp_parse_args( (array) $new_instance, self::get_defaults() ); |
|
110 | + $new_instance = wp_parse_args( (array)$new_instance, self::get_defaults() ); |
|
111 | 111 | |
112 | - $instance['title'] = strip_tags( $new_instance['title'] ); |
|
113 | - $instance['view_id'] = absint( $new_instance['view_id'] ); |
|
114 | - $instance['search_fields'] = $new_instance['search_fields']; |
|
115 | - $instance['post_id'] = $new_instance['post_id']; |
|
116 | - $instance['search_clear'] = $new_instance['search_clear']; |
|
117 | - $instance['search_mode'] = $new_instance['search_mode']; |
|
112 | + $instance[ 'title' ] = strip_tags( $new_instance[ 'title' ] ); |
|
113 | + $instance[ 'view_id' ] = absint( $new_instance[ 'view_id' ] ); |
|
114 | + $instance[ 'search_fields' ] = $new_instance[ 'search_fields' ]; |
|
115 | + $instance[ 'post_id' ] = $new_instance[ 'post_id' ]; |
|
116 | + $instance[ 'search_clear' ] = $new_instance[ 'search_clear' ]; |
|
117 | + $instance[ 'search_mode' ] = $new_instance[ 'search_mode' ]; |
|
118 | 118 | |
119 | - $is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance['post_id'], $instance['view_id'], true ); |
|
119 | + $is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance[ 'post_id' ], $instance[ 'view_id' ], true ); |
|
120 | 120 | |
121 | 121 | //check if post_id is a valid post with embedded View |
122 | - $instance['error_post_id'] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL; |
|
122 | + $instance[ 'error_post_id' ] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL; |
|
123 | 123 | |
124 | 124 | // Share that the widget isn't brand new |
125 | - $instance['updated'] = 1; |
|
125 | + $instance[ 'updated' ] = 1; |
|
126 | 126 | |
127 | 127 | return $instance; |
128 | 128 | } |
@@ -133,28 +133,28 @@ discard block |
||
133 | 133 | public function form( $instance ) { |
134 | 134 | |
135 | 135 | // @todo Make compatible with Customizer |
136 | - if( $this->is_preview() ) { |
|
136 | + if ( $this->is_preview() ) { |
|
137 | 137 | |
138 | - $warning = sprintf( esc_html__( 'This widget is not configurable from this screen. Please configure it on the %sWidgets page%s.', 'gravityview' ), '<a href="'.admin_url('widgets.php').'">', '</a>' ); |
|
138 | + $warning = sprintf( esc_html__( 'This widget is not configurable from this screen. Please configure it on the %sWidgets page%s.', 'gravityview' ), '<a href="' . admin_url( 'widgets.php' ) . '">', '</a>' ); |
|
139 | 139 | |
140 | 140 | echo wpautop( GravityView_Admin::get_floaty() . $warning ); |
141 | 141 | |
142 | 142 | return; |
143 | 143 | } |
144 | 144 | |
145 | - $instance = wp_parse_args( (array) $instance, self::get_defaults() ); |
|
145 | + $instance = wp_parse_args( (array)$instance, self::get_defaults() ); |
|
146 | 146 | |
147 | - $title = $instance['title']; |
|
148 | - $view_id = $instance['view_id']; |
|
149 | - $post_id = $instance['post_id']; |
|
150 | - $search_fields = $instance['search_fields']; |
|
151 | - $search_clear = $instance['search_clear']; |
|
152 | - $search_mode = $instance['search_mode']; |
|
147 | + $title = $instance[ 'title' ]; |
|
148 | + $view_id = $instance[ 'view_id' ]; |
|
149 | + $post_id = $instance[ 'post_id' ]; |
|
150 | + $search_fields = $instance[ 'search_fields' ]; |
|
151 | + $search_clear = $instance[ 'search_clear' ]; |
|
152 | + $search_mode = $instance[ 'search_mode' ]; |
|
153 | 153 | |
154 | 154 | $views = GVCommon::get_all_views(); |
155 | 155 | |
156 | 156 | // If there are no views set up yet, we get outta here. |
157 | - if( empty( $views ) ) { ?> |
|
157 | + if ( empty( $views ) ) { ?> |
|
158 | 158 | <div id="select_gravityview_view"> |
159 | 159 | <div class="wrap"><?php echo GravityView_Admin::no_views_text(); ?></div> |
160 | 160 | </div> |
@@ -162,17 +162,17 @@ discard block |
||
162 | 162 | } |
163 | 163 | ?> |
164 | 164 | |
165 | - <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'gravityview'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p> |
|
165 | + <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'gravityview' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p> |
|
166 | 166 | |
167 | 167 | <?php |
168 | 168 | /** |
169 | 169 | * Display errors generated for invalid embed IDs |
170 | 170 | * @see GravityView_View_Data::is_valid_embed_id |
171 | 171 | */ |
172 | - if( isset( $instance['updated'] ) && empty( $instance['view_id'] ) ) { |
|
172 | + if ( isset( $instance[ 'updated' ] ) && empty( $instance[ 'view_id' ] ) ) { |
|
173 | 173 | ?> |
174 | 174 | <div class="error inline hide-on-view-change"> |
175 | - <p><?php esc_html_e('Please select a View to search.', 'gravityview'); ?></p> |
|
175 | + <p><?php esc_html_e( 'Please select a View to search.', 'gravityview' ); ?></p> |
|
176 | 176 | </div> |
177 | 177 | <?php |
178 | 178 | unset ( $error ); |
@@ -181,12 +181,12 @@ discard block |
||
181 | 181 | |
182 | 182 | <p> |
183 | 183 | <label for="gravityview_view_id"><?php _e( 'View:', 'gravityview' ); ?></label> |
184 | - <select id="gravityview_view_id" name="<?php echo $this->get_field_name('view_id'); ?>" class="widefat"> |
|
184 | + <select id="gravityview_view_id" name="<?php echo $this->get_field_name( 'view_id' ); ?>" class="widefat"> |
|
185 | 185 | <option value=""><?php esc_html_e( '— Select a View —', 'gravityview' ); ?></option> |
186 | 186 | <?php |
187 | - foreach( $views as $view_option ) { |
|
188 | - $title = empty( $view_option->post_title ) ? __('(no title)', 'gravityview') : $view_option->post_title; |
|
189 | - echo '<option value="'. $view_option->ID .'" ' . selected( esc_attr( $view_id ), $view_option->ID, false ) . '>'. esc_html( sprintf('%s #%d', $title, $view_option->ID ) ) .'</option>'; |
|
187 | + foreach ( $views as $view_option ) { |
|
188 | + $title = empty( $view_option->post_title ) ? __( '(no title)', 'gravityview' ) : $view_option->post_title; |
|
189 | + echo '<option value="' . $view_option->ID . '" ' . selected( esc_attr( $view_id ), $view_option->ID, false ) . '>' . esc_html( sprintf( '%s #%d', $title, $view_option->ID ) ) . '</option>'; |
|
190 | 190 | } |
191 | 191 | ?> |
192 | 192 | </select> |
@@ -198,10 +198,10 @@ discard block |
||
198 | 198 | * Display errors generated for invalid embed IDs |
199 | 199 | * @see GravityView_View_Data::is_valid_embed_id |
200 | 200 | */ |
201 | - if( !empty( $instance['error_post_id'] ) ) { |
|
201 | + if ( ! empty( $instance[ 'error_post_id' ] ) ) { |
|
202 | 202 | ?> |
203 | 203 | <div class="error inline"> |
204 | - <p><?php echo $instance['error_post_id']; ?></p> |
|
204 | + <p><?php echo $instance[ 'error_post_id' ]; ?></p> |
|
205 | 205 | </div> |
206 | 206 | <?php |
207 | 207 | unset ( $error ); |
@@ -209,40 +209,40 @@ discard block |
||
209 | 209 | ?> |
210 | 210 | |
211 | 211 | <p> |
212 | - <label for="<?php echo $this->get_field_id('post_id'); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label> |
|
213 | - <input class="code" size="3" id="<?php echo $this->get_field_id('post_id'); ?>" name="<?php echo $this->get_field_name('post_id'); ?>" type="text" value="<?php echo esc_attr( $post_id ); ?>" /> |
|
212 | + <label for="<?php echo $this->get_field_id( 'post_id' ); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label> |
|
213 | + <input class="code" size="3" id="<?php echo $this->get_field_id( 'post_id' ); ?>" name="<?php echo $this->get_field_name( 'post_id' ); ?>" type="text" value="<?php echo esc_attr( $post_id ); ?>" /> |
|
214 | 214 | <span class="howto"><?php |
215 | - esc_html_e('To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' ); |
|
216 | - echo ' '.gravityview_get_link('https://docs.gravityview.co/article/222-the-search-widget', __('Learn more…', 'gravityview' ), 'target=_blank' ); |
|
215 | + esc_html_e( 'To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' ); |
|
216 | + echo ' ' . gravityview_get_link( 'https://docs.gravityview.co/article/222-the-search-widget', __( 'Learn more…', 'gravityview' ), 'target=_blank' ); |
|
217 | 217 | ?></span> |
218 | 218 | </p> |
219 | 219 | |
220 | 220 | <p> |
221 | - <label for="<?php echo $this->get_field_id('search_clear'); ?>"><?php esc_html_e( 'Show Clear button', 'gravityview' ); ?>:</label> |
|
222 | - <input name="<?php echo $this->get_field_name('search_clear'); ?>" type="hidden" value="0"> |
|
223 | - <input id="<?php echo $this->get_field_id('search_clear'); ?>" name="<?php echo $this->get_field_name('search_clear'); ?>" type="checkbox" class="checkbox" value="1" <?php checked( $search_clear, 1, true ); ?>> |
|
221 | + <label for="<?php echo $this->get_field_id( 'search_clear' ); ?>"><?php esc_html_e( 'Show Clear button', 'gravityview' ); ?>:</label> |
|
222 | + <input name="<?php echo $this->get_field_name( 'search_clear' ); ?>" type="hidden" value="0"> |
|
223 | + <input id="<?php echo $this->get_field_id( 'search_clear' ); ?>" name="<?php echo $this->get_field_name( 'search_clear' ); ?>" type="checkbox" class="checkbox" value="1" <?php checked( $search_clear, 1, true ); ?>> |
|
224 | 224 | </p> |
225 | 225 | |
226 | 226 | <p> |
227 | 227 | <label><?php esc_html_e( 'Search Mode', 'gravityview' ); ?>:</label> |
228 | - <label for="<?php echo $this->get_field_id('search_mode'); ?>_any"> |
|
229 | - <input id="<?php echo $this->get_field_id('search_mode'); ?>_any" name="<?php echo $this->get_field_name('search_mode'); ?>" type="radio" class="radio" value="any" <?php checked( $search_mode, 'any', true ); ?>> |
|
228 | + <label for="<?php echo $this->get_field_id( 'search_mode' ); ?>_any"> |
|
229 | + <input id="<?php echo $this->get_field_id( 'search_mode' ); ?>_any" name="<?php echo $this->get_field_name( 'search_mode' ); ?>" type="radio" class="radio" value="any" <?php checked( $search_mode, 'any', true ); ?>> |
|
230 | 230 | <?php esc_html_e( 'Match Any Fields', 'gravityview' ); ?> |
231 | 231 | </label> |
232 | - <label for="<?php echo $this->get_field_id('search_mode'); ?>_all"> |
|
233 | - <input id="<?php echo $this->get_field_id('search_mode'); ?>_all" name="<?php echo $this->get_field_name('search_mode'); ?>" type="radio" class="radio" value="all" <?php checked( $search_mode, 'all', true ); ?>> |
|
232 | + <label for="<?php echo $this->get_field_id( 'search_mode' ); ?>_all"> |
|
233 | + <input id="<?php echo $this->get_field_id( 'search_mode' ); ?>_all" name="<?php echo $this->get_field_name( 'search_mode' ); ?>" type="radio" class="radio" value="all" <?php checked( $search_mode, 'all', true ); ?>> |
|
234 | 234 | <?php esc_html_e( 'Match All Fields', 'gravityview' ); ?> |
235 | 235 | </label> |
236 | - <span class="howto"><?php esc_html_e('Should search results match all search fields, or any?', 'gravityview' ); ?></span |
|
236 | + <span class="howto"><?php esc_html_e( 'Should search results match all search fields, or any?', 'gravityview' ); ?></span |
|
237 | 237 | </p> |
238 | 238 | |
239 | 239 | <hr /> |
240 | 240 | |
241 | 241 | <?php // @todo: move style to CSS ?> |
242 | 242 | <div style="margin-bottom: 1em;"> |
243 | - <label class="screen-reader-text" for="<?php echo $this->get_field_id('search_fields'); ?>"><?php _e( 'Searchable fields:', 'gravityview' ); ?></label> |
|
244 | - <div class="gv-widget-search-fields" title="<?php esc_html_e('Search Fields', 'gravityview'); ?>"> |
|
245 | - <input id="<?php echo $this->get_field_id('search_fields'); ?>" name="<?php echo $this->get_field_name('search_fields'); ?>" type="hidden" value="<?php echo esc_attr( $search_fields ); ?>" class="gv-search-fields-value"> |
|
243 | + <label class="screen-reader-text" for="<?php echo $this->get_field_id( 'search_fields' ); ?>"><?php _e( 'Searchable fields:', 'gravityview' ); ?></label> |
|
244 | + <div class="gv-widget-search-fields" title="<?php esc_html_e( 'Search Fields', 'gravityview' ); ?>"> |
|
245 | + <input id="<?php echo $this->get_field_id( 'search_fields' ); ?>" name="<?php echo $this->get_field_name( 'search_fields' ); ?>" type="hidden" value="<?php echo esc_attr( $search_fields ); ?>" class="gv-search-fields-value"> |
|
246 | 246 | </div> |
247 | 247 | |
248 | 248 | </div> |
@@ -333,8 +333,8 @@ discard block |
||
333 | 333 | * @param mixed $field_id Field ID or Field array |
334 | 334 | * @return string field type |
335 | 335 | */ |
336 | -function gravityview_get_field_type( $form = null , $field_id = '' ) { |
|
337 | - return GVCommon::get_field_type( $form, $field_id ); |
|
336 | +function gravityview_get_field_type( $form = null, $field_id = '' ) { |
|
337 | + return GVCommon::get_field_type( $form, $field_id ); |
|
338 | 338 | } |
339 | 339 | |
340 | 340 | |
@@ -347,8 +347,8 @@ discard block |
||
347 | 347 | * @return string HTML of the output. Empty string if $view_id is empty. |
348 | 348 | */ |
349 | 349 | function get_gravityview( $view_id = '', $atts = array() ) { |
350 | - if( !empty( $view_id ) ) { |
|
351 | - $atts['id'] = $view_id; |
|
350 | + if ( ! empty( $view_id ) ) { |
|
351 | + $atts[ 'id' ] = $view_id; |
|
352 | 352 | $args = wp_parse_args( $atts, \GV\View_Settings::defaults() ); |
353 | 353 | $GravityView_frontend = GravityView_frontend::getInstance(); |
354 | 354 | $GravityView_frontend->setGvOutputData( GravityView_View_Data::getInstance( $view_id ) ); |
@@ -391,19 +391,19 @@ discard block |
||
391 | 391 | */ |
392 | 392 | function gravityview_view_has_single_checkbox_or_radio( $form, $view_fields ) { |
393 | 393 | |
394 | - if( class_exists('GFFormsModel') && $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) { |
|
394 | + if ( class_exists( 'GFFormsModel' ) && $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) { |
|
395 | 395 | |
396 | 396 | /** @var GF_Field_Radio|GF_Field_Checkbox $form_field */ |
397 | - foreach( $form_fields as $form_field ) { |
|
397 | + foreach ( $form_fields as $form_field ) { |
|
398 | 398 | $field_id = $form_field->id; |
399 | - foreach( $view_fields as $zone ) { |
|
399 | + foreach ( $view_fields as $zone ) { |
|
400 | 400 | |
401 | 401 | // ACF compatibility; ACF-added fields aren't arrays |
402 | 402 | if ( ! is_array( $zone ) ) { continue; } |
403 | 403 | |
404 | - foreach( $zone as $field ) { |
|
404 | + foreach ( $zone as $field ) { |
|
405 | 405 | // If it's an input, not the parent and the parent ID matches a checkbox or radio |
406 | - if( ( strpos( $field['id'], '.' ) > 0 ) && floor( $field['id'] ) === floor( $field_id ) ) { |
|
406 | + if ( ( strpos( $field[ 'id' ], '.' ) > 0 ) && floor( $field[ 'id' ] ) === floor( $field_id ) ) { |
|
407 | 407 | return true; |
408 | 408 | } |
409 | 409 | } |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | * |
58 | 58 | * @see GVCommon::get_form_fields() |
59 | 59 | * @access public |
60 | - * @param string|array $form_id (default: '') or $form object |
|
60 | + * @param string|array $form (default: '') or $form object |
|
61 | 61 | * @return array |
62 | 62 | */ |
63 | 63 | function gravityview_get_form_fields( $form = '', $add_default_properties = false, $include_parent_field = true ) { |
@@ -219,7 +219,6 @@ discard block |
||
219 | 219 | * |
220 | 220 | * @see GravityView_Template::template_id |
221 | 221 | * |
222 | - * @param int $view_id The ID of the View to get the layout of |
|
223 | 222 | * |
224 | 223 | * @return string GravityView_Template::template_id value. Empty string if not. |
225 | 224 | */ |
@@ -20,12 +20,12 @@ discard block |
||
20 | 20 | |
21 | 21 | function __construct() { |
22 | 22 | |
23 | - add_action( 'media_buttons', array( $this, 'add_shortcode_button'), 30); |
|
23 | + add_action( 'media_buttons', array( $this, 'add_shortcode_button' ), 30 ); |
|
24 | 24 | |
25 | - add_action( 'admin_footer', array( $this, 'add_shortcode_popup') ); |
|
25 | + add_action( 'admin_footer', array( $this, 'add_shortcode_popup' ) ); |
|
26 | 26 | |
27 | 27 | // adding styles and scripts |
28 | - add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') ); |
|
28 | + add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) ); |
|
29 | 29 | |
30 | 30 | // ajax - populate sort fields based on the selected view |
31 | 31 | add_action( 'wp_ajax_gv_sortable_fields', array( $this, 'get_sortable_fields' ) ); |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | */ |
41 | 41 | function is_post_editor_screen() { |
42 | 42 | global $current_screen, $pagenow; |
43 | - return !empty( $current_screen->post_type ) && 'gravityview' != $current_screen->post_type && in_array( $pagenow , array( 'post.php' , 'post-new.php' ) ); |
|
43 | + return ! empty( $current_screen->post_type ) && 'gravityview' != $current_screen->post_type && in_array( $pagenow, array( 'post.php', 'post-new.php' ) ); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
@@ -55,15 +55,15 @@ discard block |
||
55 | 55 | /** |
56 | 56 | * @since 1.15.3 |
57 | 57 | */ |
58 | - if( ! GVCommon::has_cap( array( 'publish_gravityviews' ) ) ) { |
|
58 | + if ( ! GVCommon::has_cap( array( 'publish_gravityviews' ) ) ) { |
|
59 | 59 | return; |
60 | 60 | } |
61 | 61 | |
62 | - if( !$this->is_post_editor_screen() ) { |
|
62 | + if ( ! $this->is_post_editor_screen() ) { |
|
63 | 63 | return; |
64 | 64 | } |
65 | 65 | ?> |
66 | - <a href="#TB_inline?width=600&height=800&inlineId=select_gravityview_view" class="thickbox hide-if-no-js button gform_media_link" id="add_gravityview" title="<?php esc_attr_e("Insert View", 'gravityview'); ?>"><span class="icon gv-icon-astronaut-head"></span><?php esc_html_e( 'Add View', 'gravityview' ); ?></a> |
|
66 | + <a href="#TB_inline?width=600&height=800&inlineId=select_gravityview_view" class="thickbox hide-if-no-js button gform_media_link" id="add_gravityview" title="<?php esc_attr_e( "Insert View", 'gravityview' ); ?>"><span class="icon gv-icon-astronaut-head"></span><?php esc_html_e( 'Add View', 'gravityview' ); ?></a> |
|
67 | 67 | <?php |
68 | 68 | |
69 | 69 | } |
@@ -79,16 +79,16 @@ discard block |
||
79 | 79 | function add_shortcode_popup() { |
80 | 80 | global $post; |
81 | 81 | |
82 | - if( !$this->is_post_editor_screen() ) { |
|
82 | + if ( ! $this->is_post_editor_screen() ) { |
|
83 | 83 | return; |
84 | 84 | } |
85 | 85 | |
86 | - $post_type = get_post_type_object($post->post_type); |
|
86 | + $post_type = get_post_type_object( $post->post_type ); |
|
87 | 87 | |
88 | - $views = get_posts( array('post_type' => 'gravityview', 'posts_per_page' => -1 ) ); |
|
88 | + $views = get_posts( array( 'post_type' => 'gravityview', 'posts_per_page' => -1 ) ); |
|
89 | 89 | |
90 | 90 | // If there are no views set up yet, we get outta here. |
91 | - if( empty( $views ) ) { |
|
91 | + if ( empty( $views ) ) { |
|
92 | 92 | echo '<div id="select_gravityview_view"><div class="wrap">' . GravityView_Admin::no_views_text() . '</div></div>'; |
93 | 93 | return; |
94 | 94 | } |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | <div class="wrap"> |
100 | 100 | |
101 | 101 | <h2 class=""><?php esc_html_e( 'Embed a View', 'gravityview' ); ?></h2> |
102 | - <p class="subtitle"><?php printf( esc_attr ( __( 'Use this form to embed a View into this %s. %sLearn more about using shortcodes.%s', 'gravityview') ), $post_type->labels->singular_name, '<a href="https://docs.gravityview.co/article/73-using-the-shortcode" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p> |
|
102 | + <p class="subtitle"><?php printf( esc_attr( __( 'Use this form to embed a View into this %s. %sLearn more about using shortcodes.%s', 'gravityview' ) ), $post_type->labels->singular_name, '<a href="https://docs.gravityview.co/article/73-using-the-shortcode" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p> |
|
103 | 103 | |
104 | 104 | <div> |
105 | 105 | <h3><label for="gravityview_id"><?php esc_html_e( 'Select a View', 'gravityview' ); ?></label></h3> |
@@ -107,9 +107,9 @@ discard block |
||
107 | 107 | <select name="gravityview_id" id="gravityview_id"> |
108 | 108 | <option value=""><?php esc_html_e( '— Select a View to Insert —', 'gravityview' ); ?></option> |
109 | 109 | <?php |
110 | - foreach( $views as $view ) { |
|
111 | - $title = empty( $view->post_title ) ? __('(no title)', 'gravityview') : $view->post_title; |
|
112 | - echo '<option value="'. $view->ID .'">'. esc_html( sprintf('%s #%d', $title, $view->ID ) ) .'</option>'; |
|
110 | + foreach ( $views as $view ) { |
|
111 | + $title = empty( $view->post_title ) ? __( '(no title)', 'gravityview' ) : $view->post_title; |
|
112 | + echo '<option value="' . $view->ID . '">' . esc_html( sprintf( '%s #%d', $title, $view->ID ) ) . '</option>'; |
|
113 | 113 | } |
114 | 114 | ?> |
115 | 115 | </select> |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | |
126 | 126 | foreach ( $settings as $key => $setting ) { |
127 | 127 | |
128 | - if( empty( $setting['show_in_shortcode'] ) ) { continue; } |
|
128 | + if ( empty( $setting[ 'show_in_shortcode' ] ) ) { continue; } |
|
129 | 129 | |
130 | 130 | GravityView_Render_Settings::render_setting_row( $key, array(), NULL, 'gravityview_%s', 'gravityview_%s' ); |
131 | 131 | } |
@@ -134,8 +134,8 @@ discard block |
||
134 | 134 | </table> |
135 | 135 | |
136 | 136 | <div class="submit"> |
137 | - <input type="submit" class="button button-primary button-large alignleft hide-if-js" value="<?php esc_attr_e('Insert View', 'gravityview' ); ?>" id="insert_gravityview_view" /> |
|
138 | - <input class="button button-secondary alignright" type="submit" onclick="tb_remove(); return false;" value="<?php esc_attr_e("Cancel", 'gravityview'); ?>" /> |
|
137 | + <input type="submit" class="button button-primary button-large alignleft hide-if-js" value="<?php esc_attr_e( 'Insert View', 'gravityview' ); ?>" id="insert_gravityview_view" /> |
|
138 | + <input class="button button-secondary alignright" type="submit" onclick="tb_remove(); return false;" value="<?php esc_attr_e( "Cancel", 'gravityview' ); ?>" /> |
|
139 | 139 | </div> |
140 | 140 | |
141 | 141 | </div> |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | */ |
157 | 157 | function add_scripts_and_styles() { |
158 | 158 | |
159 | - if( ! $this->is_post_editor_screen() ) { |
|
159 | + if ( ! $this->is_post_editor_screen() ) { |
|
160 | 160 | return; |
161 | 161 | } |
162 | 162 | |
@@ -167,22 +167,22 @@ discard block |
||
167 | 167 | |
168 | 168 | $protocol = is_ssl() ? 'https://' : 'http://'; |
169 | 169 | |
170 | - wp_enqueue_style( 'jquery-ui-datepicker', $protocol.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css', array(), GravityView_Plugin::version ); |
|
170 | + wp_enqueue_style( 'jquery-ui-datepicker', $protocol . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css', array(), GravityView_Plugin::version ); |
|
171 | 171 | |
172 | 172 | //enqueue styles |
173 | - wp_register_style( 'gravityview_postedit_styles', plugins_url('assets/css/admin-post-edit.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version ); |
|
173 | + wp_register_style( 'gravityview_postedit_styles', plugins_url( 'assets/css/admin-post-edit.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version ); |
|
174 | 174 | wp_enqueue_style( 'gravityview_postedit_styles' ); |
175 | 175 | |
176 | - $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min'; |
|
176 | + $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
|
177 | 177 | |
178 | 178 | // custom js |
179 | - wp_register_script( 'gravityview_postedit_scripts', plugins_url('assets/js/admin-post-edit'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery', 'jquery-ui-datepicker' ), GravityView_Plugin::version ); |
|
179 | + wp_register_script( 'gravityview_postedit_scripts', plugins_url( 'assets/js/admin-post-edit' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery', 'jquery-ui-datepicker' ), GravityView_Plugin::version ); |
|
180 | 180 | wp_enqueue_script( 'gravityview_postedit_scripts' ); |
181 | - wp_localize_script('gravityview_postedit_scripts', 'gvGlobals', array( |
|
182 | - 'nonce' => wp_create_nonce( 'gravityview_ajaxaddshortcode'), |
|
181 | + wp_localize_script( 'gravityview_postedit_scripts', 'gvGlobals', array( |
|
182 | + 'nonce' => wp_create_nonce( 'gravityview_ajaxaddshortcode' ), |
|
183 | 183 | 'loading_text' => esc_html__( 'Loading…', 'gravityview' ), |
184 | - 'alert_1' => esc_html__( 'Please select a View', 'gravityview'), |
|
185 | - )); |
|
184 | + 'alert_1' => esc_html__( 'Please select a View', 'gravityview' ), |
|
185 | + ) ); |
|
186 | 186 | |
187 | 187 | } |
188 | 188 | |
@@ -198,16 +198,16 @@ discard block |
||
198 | 198 | function get_sortable_fields() { |
199 | 199 | |
200 | 200 | // Not properly formatted request |
201 | - if ( empty( $_POST['viewid'] ) || !is_numeric( $_POST['viewid'] ) ) { |
|
201 | + if ( empty( $_POST[ 'viewid' ] ) || ! is_numeric( $_POST[ 'viewid' ] ) ) { |
|
202 | 202 | exit( false ); |
203 | 203 | } |
204 | 204 | |
205 | 205 | // Not valid request |
206 | - if( empty( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxaddshortcode' ) ) { |
|
206 | + if ( empty( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxaddshortcode' ) ) { |
|
207 | 207 | exit( false ); |
208 | 208 | } |
209 | 209 | |
210 | - $viewid = (int)$_POST['viewid']; |
|
210 | + $viewid = (int)$_POST[ 'viewid' ]; |
|
211 | 211 | |
212 | 212 | // fetch form id assigned to the view |
213 | 213 | $formid = gravityview_get_form_id( $viewid ); |
@@ -109,7 +109,7 @@ |
||
109 | 109 | $field_data = array( |
110 | 110 | 'label' => \GV\Utils::get( $edit_field, 'custom_label' ), |
111 | 111 | 'customLabel' => \GV\Utils::get( $edit_field, 'custom_label' ), |
112 | - 'content' => \GV\Utils::get( $edit_field, 'content' ), |
|
112 | + 'content' => \GV\Utils::get( $edit_field, 'content' ), |
|
113 | 113 | ); |
114 | 114 | |
115 | 115 | // Replace merge tags in the content |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | |
41 | 41 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
42 | 42 | |
43 | - unset ( $field_options['search_filter'], $field_options['show_as_link'] ); |
|
43 | + unset ( $field_options[ 'search_filter' ], $field_options[ 'show_as_link' ] ); |
|
44 | 44 | |
45 | 45 | $new_fields = array( |
46 | 46 | 'content' => array( |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | ); |
69 | 69 | |
70 | 70 | if ( 'edit' === $context ) { |
71 | - unset( $field_options['custom_label'], $field_options['show_label'], $field_options['allow_edit_cap'], $new_fields['wpautop'], $new_fields['oembed'] ); |
|
71 | + unset( $field_options[ 'custom_label' ], $field_options[ 'show_label' ], $field_options[ 'allow_edit_cap' ], $new_fields[ 'wpautop' ], $new_fields[ 'oembed' ] ); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | return $new_fields + $field_options; |
@@ -102,9 +102,9 @@ discard block |
||
102 | 102 | |
103 | 103 | // Loop through the configured Edit Entry fields and add Custom Content fields if there are any |
104 | 104 | // TODO: Make this available to other custom GV field types |
105 | - foreach ( (array) $edit_fields as $edit_field ) { |
|
105 | + foreach ( (array)$edit_fields as $edit_field ) { |
|
106 | 106 | |
107 | - if( 'custom' === \GV\Utils::get( $edit_field, 'id') ) { |
|
107 | + if ( 'custom' === \GV\Utils::get( $edit_field, 'id' ) ) { |
|
108 | 108 | |
109 | 109 | $field_data = array( |
110 | 110 | 'label' => \GV\Utils::get( $edit_field, 'custom_label' ), |
@@ -117,13 +117,13 @@ discard block |
||
117 | 117 | $field_data[ $key ] = GravityView_Merge_Tags::replace_variables( $field_datum, $form, $entry->as_entry(), false, false ); |
118 | 118 | } |
119 | 119 | |
120 | - $field_data['cssClass'] = \GV\Utils::get( $edit_field, 'custom_class' ); |
|
120 | + $field_data[ 'cssClass' ] = \GV\Utils::get( $edit_field, 'custom_class' ); |
|
121 | 121 | |
122 | - $new_fields[] = new GF_Field_HTML( $field_data ); |
|
122 | + $new_fields[ ] = new GF_Field_HTML( $field_data ); |
|
123 | 123 | |
124 | 124 | } else { |
125 | - if( isset( $fields[ $i ] ) ) { |
|
126 | - $new_fields[] = $fields[ $i ]; |
|
125 | + if ( isset( $fields[ $i ] ) ) { |
|
126 | + $new_fields[ ] = $fields[ $i ]; |
|
127 | 127 | } |
128 | 128 | $i++; |
129 | 129 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | } |
36 | 36 | |
37 | 37 | private function add_hooks() { |
38 | - /** @see \GV\Field::get_value_filters */ |
|
38 | + /** @see \GV\Field::get_value_filters */ |
|
39 | 39 | add_filter( "gravityview/field/{$this->name}/output", array( $this, 'get_content' ), 4, 2 ); |
40 | 40 | add_action( 'gravityview/template/after', array( $this, 'print_script'), 10, 1 ); |
41 | 41 | add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 ); |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | public function get_content( $output, $template ) { |
77 | 77 | $entry = $template->entry; |
78 | 78 | |
79 | - $star_url = GFCommon::get_base_url() .'/images/star' . intval( $entry['is_starred'] ) .'.png'; |
|
79 | + $star_url = GFCommon::get_base_url() .'/images/star' . intval( $entry['is_starred'] ) .'.png'; |
|
80 | 80 | |
81 | 81 | $entry_id = ''; |
82 | 82 | |
@@ -94,11 +94,11 @@ discard block |
||
94 | 94 | |
95 | 95 | /** |
96 | 96 | * Add JS to the bottom of the View if there is a star field and user has `gravityview_edit_entries` cap |
97 | - * |
|
97 | + * |
|
98 | 98 | * @param \GV\Template_Context $context The template context |
99 | - * @since 2.0 |
|
100 | - * |
|
101 | - * @return void |
|
99 | + * @since 2.0 |
|
100 | + * |
|
101 | + * @return void |
|
102 | 102 | */ |
103 | 103 | public function print_script( $context ) { |
104 | 104 | |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | } |
108 | 108 | |
109 | 109 | if ( ! GravityView_Roles_Capabilities::has_cap( 'gravityview_edit_entries' ) ) { |
110 | - return; |
|
110 | + return; |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | ?> |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | private function add_hooks() { |
38 | 38 | /** @see \GV\Field::get_value_filters */ |
39 | 39 | add_filter( "gravityview/field/{$this->name}/output", array( $this, 'get_content' ), 4, 2 ); |
40 | - add_action( 'gravityview/template/after', array( $this, 'print_script'), 10, 1 ); |
|
40 | + add_action( 'gravityview/template/after', array( $this, 'print_script' ), 10, 1 ); |
|
41 | 41 | add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 ); |
42 | 42 | } |
43 | 43 | |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | */ |
53 | 53 | function add_default_field( $entry_default_fields = array(), $form = array(), $zone = '' ) { |
54 | 54 | |
55 | - if( 'edit' !== $zone ) { |
|
55 | + if ( 'edit' !== $zone ) { |
|
56 | 56 | $entry_default_fields[ $this->name ] = array( |
57 | 57 | 'label' => $this->label, |
58 | 58 | 'desc' => $this->description, |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | public function get_content( $output, $template ) { |
77 | 77 | $entry = $template->entry; |
78 | 78 | |
79 | - $star_url = GFCommon::get_base_url() .'/images/star' . intval( $entry['is_starred'] ) .'.png'; |
|
79 | + $star_url = GFCommon::get_base_url() . '/images/star' . intval( $entry[ 'is_starred' ] ) . '.png'; |
|
80 | 80 | |
81 | 81 | $entry_id = ''; |
82 | 82 | |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | } |
86 | 86 | |
87 | 87 | // if( $show_as_star ) |
88 | - $output = '<img class="gv-star-image" '.$entry_id.' data-is_starred="'. intval( $entry['is_starred'] ) .'" src="'. esc_attr( $star_url ) .'" />'; |
|
88 | + $output = '<img class="gv-star-image" ' . $entry_id . ' data-is_starred="' . intval( $entry[ 'is_starred' ] ) . '" src="' . esc_attr( $star_url ) . '" />'; |
|
89 | 89 | |
90 | 90 | self::$has_star_field = true; |
91 | 91 | |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | */ |
103 | 103 | public function print_script( $context ) { |
104 | 104 | |
105 | - if( ! self::$has_star_field ) { |
|
105 | + if ( ! self::$has_star_field ) { |
|
106 | 106 | return; |
107 | 107 | } |
108 | 108 |
@@ -34,7 +34,7 @@ |
||
34 | 34 | global $post; |
35 | 35 | |
36 | 36 | if ( $post ) { |
37 | - $context['post'] = $post; |
|
37 | + $context[ 'post' ] = $post; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | \GV\Mocks\Legacy_Context::push( $context ); |
@@ -175,10 +175,10 @@ discard block |
||
175 | 175 | |
176 | 176 | if( 'gv_note_add' === $_POST['action'] ) { |
177 | 177 | |
178 | - if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
179 | - do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' ); |
|
180 | - return; |
|
181 | - } |
|
178 | + if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
179 | + do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' ); |
|
180 | + return; |
|
181 | + } |
|
182 | 182 | |
183 | 183 | $post = wp_unslash( $_POST ); |
184 | 184 | |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | * |
279 | 279 | * Verify permissions. Check expected $_POST. Parse args, then send to process_delete_notes |
280 | 280 | * |
281 | - * @since 1.17 |
|
281 | + * @since 1.17 |
|
282 | 282 | * |
283 | 283 | * @see process_delete_notes |
284 | 284 | * |
@@ -431,7 +431,7 @@ discard block |
||
431 | 431 | 'subject-label' => __( 'Subject', 'gravityview' ), |
432 | 432 | 'subject' => __( 'Email subject', 'gravityview' ), |
433 | 433 | 'default-email-subject' => __( 'New entry note', 'gravityview' ), |
434 | - 'email-footer' => __( 'This note was sent from {url}', 'gravityview' ), |
|
434 | + 'email-footer' => __( 'This note was sent from {url}', 'gravityview' ), |
|
435 | 435 | 'also-email' => __( 'Also email this note to', 'gravityview' ), |
436 | 436 | 'error-add-note' => __( 'There was an error adding the note.', 'gravityview' ), |
437 | 437 | 'error-invalid' => __( 'The request was invalid. Refresh the page and try again.', 'gravityview' ), |
@@ -501,11 +501,11 @@ discard block |
||
501 | 501 | |
502 | 502 | if ( $context instanceof \GV\Template_Context ) { |
503 | 503 | |
504 | - ob_start(); |
|
505 | - $context->template->get_template_part( 'note', 'detail', true ); |
|
506 | - $note_detail_html = ob_get_clean(); |
|
504 | + ob_start(); |
|
505 | + $context->template->get_template_part( 'note', 'detail', true ); |
|
506 | + $note_detail_html = ob_get_clean(); |
|
507 | 507 | |
508 | - ob_start(); |
|
508 | + ob_start(); |
|
509 | 509 | $context->template->get_template_part( 'note', $note_row_template, true ); |
510 | 510 | $note_row = ob_get_clean(); |
511 | 511 | } else { |
@@ -761,7 +761,7 @@ discard block |
||
761 | 761 | 'gv-note-to-custom' => '', |
762 | 762 | 'gv-note-subject' => '', |
763 | 763 | 'gv-note-content' => '', |
764 | - 'current-url' => '', |
|
764 | + 'current-url' => '', |
|
765 | 765 | ); |
766 | 766 | |
767 | 767 | $current_user = wp_get_current_user(); |
@@ -813,9 +813,9 @@ discard block |
||
813 | 813 | $message .= $this->get_email_footer( $email_footer, $is_html, $email_data ); |
814 | 814 | |
815 | 815 | /** |
816 | - * @filter `gravityview/field/notes/wpautop_email` Should the message content have paragraphs added automatically, if using HTML message format |
|
816 | + * @filter `gravityview/field/notes/wpautop_email` Should the message content have paragraphs added automatically, if using HTML message format |
|
817 | 817 | * @since 1.18 |
818 | - * @param bool $wpautop_email True: Apply wpautop() to the email message if using; False: Leave as entered (Default: true) |
|
818 | + * @param bool $wpautop_email True: Apply wpautop() to the email message if using; False: Leave as entered (Default: true) |
|
819 | 819 | */ |
820 | 820 | $wpautop_email = apply_filters( 'gravityview/field/notes/wpautop_email', true ); |
821 | 821 | |
@@ -835,12 +835,12 @@ discard block |
||
835 | 835 | } |
836 | 836 | |
837 | 837 | /** |
838 | - * Get the footer for Entry Note emails |
|
839 | - * |
|
840 | - * `{url}` is replaced by the URL of the page where the note form was embedded |
|
841 | - * |
|
842 | - * @since 1.18 |
|
843 | - * @see GravityView_Field_Notes::strings The default value of $message_footer is set here, with the key 'email-footer' |
|
838 | + * Get the footer for Entry Note emails |
|
839 | + * |
|
840 | + * `{url}` is replaced by the URL of the page where the note form was embedded |
|
841 | + * |
|
842 | + * @since 1.18 |
|
843 | + * @see GravityView_Field_Notes::strings The default value of $message_footer is set here, with the key 'email-footer' |
|
844 | 844 | * |
845 | 845 | * @param string $email_footer The message footer value |
846 | 846 | * @param bool $is_html True: Email is being sent as HTML; False: sent as text |
@@ -849,10 +849,10 @@ discard block |
||
849 | 849 | */ |
850 | 850 | private function get_email_footer( $email_footer = '', $is_html = true, $email_data = array() ) { |
851 | 851 | |
852 | - $output = ''; |
|
852 | + $output = ''; |
|
853 | 853 | |
854 | 854 | if( ! empty( $email_footer ) ) { |
855 | - $url = \GV\Utils::get( $email_data, 'current-url' ); |
|
855 | + $url = \GV\Utils::get( $email_data, 'current-url' ); |
|
856 | 856 | $url = html_entity_decode( $url ); |
857 | 857 | $url = site_url( $url ); |
858 | 858 |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | * |
358 | 358 | * @param array $file_paths List of template paths ordered |
359 | 359 | * |
360 | - * @return array File paths with `./` and `./partials/` paths added |
|
360 | + * @return string[] File paths with `./` and `./partials/` paths added |
|
361 | 361 | */ |
362 | 362 | public function add_template_path( $file_paths ) { |
363 | 363 | |
@@ -549,7 +549,7 @@ discard block |
||
549 | 549 | * @param array $entry |
550 | 550 | * @param array $data Note details array |
551 | 551 | * |
552 | - * @return int|WP_Error |
|
552 | + * @return integer |
|
553 | 553 | */ |
554 | 554 | private function add_note( $entry, $data ) { |
555 | 555 | global $current_user, $wpdb; |
@@ -63,19 +63,19 @@ discard block |
||
63 | 63 | |
64 | 64 | add_shortcode( 'gv_note_add', array( 'GravityView_Field_Notes', 'get_add_note_part' ) ); |
65 | 65 | |
66 | - add_action( 'wp', array( $this, 'maybe_delete_notes'), 1000 ); |
|
67 | - add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes') ); |
|
68 | - add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes') ); |
|
66 | + add_action( 'wp', array( $this, 'maybe_delete_notes' ), 1000 ); |
|
67 | + add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes' ) ); |
|
68 | + add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes' ) ); |
|
69 | 69 | |
70 | - add_action( 'wp', array( $this, 'maybe_add_note'), 1000 ); |
|
71 | - add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note') ); |
|
72 | - add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note') ); |
|
70 | + add_action( 'wp', array( $this, 'maybe_add_note' ), 1000 ); |
|
71 | + add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note' ) ); |
|
72 | + add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note' ) ); |
|
73 | 73 | |
74 | 74 | // add template path to check for field |
75 | 75 | add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) ); |
76 | 76 | add_filter( 'gravityview/template/fields_template_paths', array( $this, 'add_template_path' ) ); |
77 | 77 | |
78 | - add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') ); |
|
78 | + add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) ); |
|
79 | 79 | add_action( 'gravityview/field/notes/scripts', array( $this, 'enqueue_scripts' ) ); |
80 | 80 | |
81 | 81 | add_filter( 'gravityview_entry_default_fields', array( $this, 'add_entry_default_field' ), 10, 3 ); |
@@ -97,8 +97,8 @@ discard block |
||
97 | 97 | */ |
98 | 98 | public function add_entry_default_field( $entry_default_fields, $form, $zone ) { |
99 | 99 | |
100 | - if( in_array( $zone, array( 'directory', 'single' ) ) ) { |
|
101 | - $entry_default_fields['notes'] = array( |
|
100 | + if ( in_array( $zone, array( 'directory', 'single' ) ) ) { |
|
101 | + $entry_default_fields[ 'notes' ] = array( |
|
102 | 102 | 'label' => __( 'Entry Notes', 'gravityview' ), |
103 | 103 | 'type' => 'notes', |
104 | 104 | 'desc' => __( 'Display, add, and delete notes for an entry.', 'gravityview' ), |
@@ -131,23 +131,23 @@ discard block |
||
131 | 131 | public function enqueue_scripts() { |
132 | 132 | global $wp_actions; |
133 | 133 | |
134 | - if( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) { |
|
134 | + if ( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) { |
|
135 | 135 | wp_enqueue_style( 'gravityview-notes' ); |
136 | 136 | wp_enqueue_script( 'gravityview-notes' ); |
137 | 137 | } |
138 | 138 | |
139 | - if( ! wp_script_is( 'gravityview-notes', 'done' ) ) { |
|
139 | + if ( ! wp_script_is( 'gravityview-notes', 'done' ) ) { |
|
140 | 140 | |
141 | 141 | $strings = self::strings(); |
142 | 142 | |
143 | 143 | wp_localize_script( 'gravityview-notes', 'GVNotes', array( |
144 | 144 | 'ajaxurl' => admin_url( 'admin-ajax.php' ), |
145 | 145 | 'text' => array( |
146 | - 'processing' => $strings['processing'], |
|
147 | - 'delete_confirm' => $strings['delete-confirm'], |
|
148 | - 'note_added' => $strings['added-note'], |
|
149 | - 'error_invalid' => $strings['error-invalid'], |
|
150 | - 'error_empty_note' => $strings['error-empty-note'], |
|
146 | + 'processing' => $strings[ 'processing' ], |
|
147 | + 'delete_confirm' => $strings[ 'delete-confirm' ], |
|
148 | + 'note_added' => $strings[ 'added-note' ], |
|
149 | + 'error_invalid' => $strings[ 'error-invalid' ], |
|
150 | + 'error_empty_note' => $strings[ 'error-empty-note' ], |
|
151 | 151 | ), |
152 | 152 | ) ); |
153 | 153 | } |
@@ -164,31 +164,31 @@ discard block |
||
164 | 164 | */ |
165 | 165 | function maybe_add_note() { |
166 | 166 | |
167 | - if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
167 | + if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
168 | 168 | gravityview()->log->error( 'The user isnt allowed to add entry notes.' ); |
169 | 169 | return; |
170 | 170 | } |
171 | 171 | |
172 | - if( ! isset( $_POST['action'] ) ) { |
|
172 | + if ( ! isset( $_POST[ 'action' ] ) ) { |
|
173 | 173 | return; |
174 | 174 | } |
175 | 175 | |
176 | - if( 'gv_note_add' === $_POST['action'] ) { |
|
176 | + if ( 'gv_note_add' === $_POST[ 'action' ] ) { |
|
177 | 177 | |
178 | - if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
178 | + if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
179 | 179 | do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' ); |
180 | 180 | return; |
181 | 181 | } |
182 | 182 | |
183 | 183 | $post = wp_unslash( $_POST ); |
184 | 184 | |
185 | - if( $this->doing_ajax ) { |
|
186 | - parse_str( $post['data'], $data ); |
|
185 | + if ( $this->doing_ajax ) { |
|
186 | + parse_str( $post[ 'data' ], $data ); |
|
187 | 187 | } else { |
188 | 188 | $data = $post; |
189 | 189 | } |
190 | 190 | |
191 | - $this->process_add_note( (array) $data ); |
|
191 | + $this->process_add_note( (array)$data ); |
|
192 | 192 | } |
193 | 193 | } |
194 | 194 | |
@@ -215,23 +215,23 @@ discard block |
||
215 | 215 | $error = false; |
216 | 216 | $success = false; |
217 | 217 | |
218 | - if( empty( $data['entry-slug'] ) ) { |
|
218 | + if ( empty( $data[ 'entry-slug' ] ) ) { |
|
219 | 219 | |
220 | - $error = self::strings('error-invalid'); |
|
220 | + $error = self::strings( 'error-invalid' ); |
|
221 | 221 | gravityview()->log->error( 'The note is missing an Entry ID.' ); |
222 | 222 | |
223 | 223 | } else { |
224 | 224 | |
225 | - $valid = wp_verify_nonce( $data['gv_note_add'], 'gv_note_add_' . $data['entry-slug'] ); |
|
225 | + $valid = wp_verify_nonce( $data[ 'gv_note_add' ], 'gv_note_add_' . $data[ 'entry-slug' ] ); |
|
226 | 226 | |
227 | 227 | $has_cap = GVCommon::has_cap( 'gravityview_add_entry_notes' ); |
228 | 228 | |
229 | - if( ! $has_cap ) { |
|
229 | + if ( ! $has_cap ) { |
|
230 | 230 | $error = self::strings( 'error-cap-add' ); |
231 | 231 | gravityview()->log->error( 'Adding a note failed: the user does not have the "gravityview_add_entry_notes" capability.' ); |
232 | 232 | } elseif ( $valid ) { |
233 | 233 | |
234 | - $entry = gravityview_get_entry( $data['entry-slug'], true, false ); |
|
234 | + $entry = gravityview_get_entry( $data[ 'entry-slug' ], true, false ); |
|
235 | 235 | |
236 | 236 | $added = $this->add_note( $entry, $data ); |
237 | 237 | |
@@ -249,22 +249,22 @@ discard block |
||
249 | 249 | $this->maybe_send_entry_notes( $note, $entry, $data ); |
250 | 250 | |
251 | 251 | if ( $note ) { |
252 | - $success = self::display_note( $note, ! empty( $data['show-delete'] ) ); |
|
252 | + $success = self::display_note( $note, ! empty( $data[ 'show-delete' ] ) ); |
|
253 | 253 | gravityview()->log->debug( 'The note was successfully created', array( 'data' => compact( 'note', 'data' ) ) ); |
254 | 254 | } else { |
255 | - $error = self::strings('error-add-note'); |
|
255 | + $error = self::strings( 'error-add-note' ); |
|
256 | 256 | gravityview()->log->error( 'The note was not successfully created', array( 'data' => compact( 'note', 'data' ) ) ); |
257 | 257 | } |
258 | 258 | } |
259 | 259 | } else { |
260 | - $error = self::strings('error-invalid'); |
|
260 | + $error = self::strings( 'error-invalid' ); |
|
261 | 261 | gravityview()->log->error( 'Nonce validation failed; the note was not created' ); |
262 | 262 | } |
263 | 263 | } |
264 | 264 | |
265 | 265 | |
266 | - if( $this->doing_ajax ) { |
|
267 | - if( $success ) { |
|
266 | + if ( $this->doing_ajax ) { |
|
267 | + if ( $success ) { |
|
268 | 268 | wp_send_json_success( array( 'html' => $success ) ); |
269 | 269 | } else { |
270 | 270 | $error = $error ? $error : self::strings( 'error-invalid' ); |
@@ -290,11 +290,11 @@ discard block |
||
290 | 290 | return; |
291 | 291 | } |
292 | 292 | |
293 | - if ( isset( $_POST['action'] ) && 'gv_delete_notes' === $_POST['action'] ) { |
|
293 | + if ( isset( $_POST[ 'action' ] ) && 'gv_delete_notes' === $_POST[ 'action' ] ) { |
|
294 | 294 | |
295 | 295 | $post = wp_unslash( $_POST ); |
296 | 296 | if ( $this->doing_ajax ) { |
297 | - parse_str( $post['data'], $data ); |
|
297 | + parse_str( $post[ 'data' ], $data ); |
|
298 | 298 | } else { |
299 | 299 | $data = $post; |
300 | 300 | } |
@@ -325,18 +325,18 @@ discard block |
||
325 | 325 | */ |
326 | 326 | function process_delete_notes( $data ) { |
327 | 327 | |
328 | - $valid = wp_verify_nonce( $data['gv_delete_notes'], 'gv_delete_notes_' . $data['entry-slug'] ); |
|
328 | + $valid = wp_verify_nonce( $data[ 'gv_delete_notes' ], 'gv_delete_notes_' . $data[ 'entry-slug' ] ); |
|
329 | 329 | $has_cap = GVCommon::has_cap( 'gravityview_delete_entry_notes' ); |
330 | 330 | $success = false; |
331 | 331 | |
332 | 332 | if ( $valid && $has_cap ) { |
333 | - GravityView_Entry_Notes::delete_notes( $data['note'] ); |
|
333 | + GravityView_Entry_Notes::delete_notes( $data[ 'note' ] ); |
|
334 | 334 | $success = true; |
335 | 335 | } |
336 | 336 | |
337 | - if( $this->doing_ajax ) { |
|
337 | + if ( $this->doing_ajax ) { |
|
338 | 338 | |
339 | - if( $success ) { |
|
339 | + if ( $success ) { |
|
340 | 340 | wp_send_json_success(); |
341 | 341 | } else { |
342 | 342 | if ( ! $valid ) { |
@@ -369,13 +369,13 @@ discard block |
||
369 | 369 | |
370 | 370 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
371 | 371 | |
372 | - unset( $field_options['show_as_link'] ); |
|
372 | + unset( $field_options[ 'show_as_link' ] ); |
|
373 | 373 | |
374 | 374 | $notes_options = array( |
375 | 375 | 'notes' => array( |
376 | 376 | 'type' => 'checkboxes', |
377 | - 'label' => __('Note Settings', 'gravityview'), |
|
378 | - 'desc' => sprintf( _x('Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ), |
|
377 | + 'label' => __( 'Note Settings', 'gravityview' ), |
|
378 | + 'desc' => sprintf( _x( 'Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ), |
|
379 | 379 | 'options' => array( |
380 | 380 | 'view' => array( |
381 | 381 | 'label' => __( 'Display notes?', 'gravityview' ), |
@@ -427,7 +427,7 @@ discard block |
||
427 | 427 | 'processing' => __( 'Processing…', 'gravityview' ), |
428 | 428 | 'other-email' => __( 'Other email address', 'gravityview' ), |
429 | 429 | 'email-label' => __( 'Email address', 'gravityview' ), |
430 | - 'email-placeholder' => _x('[email protected]', 'Example email address used as a placeholder', 'gravityview'), |
|
430 | + 'email-placeholder' => _x( '[email protected]', 'Example email address used as a placeholder', 'gravityview' ), |
|
431 | 431 | 'subject-label' => __( 'Subject', 'gravityview' ), |
432 | 432 | 'subject' => __( 'Email subject', 'gravityview' ), |
433 | 433 | 'default-email-subject' => __( 'New entry note', 'gravityview' ), |
@@ -447,7 +447,7 @@ discard block |
||
447 | 447 | */ |
448 | 448 | $strings = gv_map_deep( apply_filters( 'gravityview/field/notes/strings', $strings ), 'esc_html' ); |
449 | 449 | |
450 | - if( $key ) { |
|
450 | + if ( $key ) { |
|
451 | 451 | return isset( $strings[ $key ] ) ? $strings[ $key ] : ''; |
452 | 452 | } |
453 | 453 | |
@@ -469,7 +469,7 @@ discard block |
||
469 | 469 | */ |
470 | 470 | static public function display_note( $note, $show_delete = false, $context = null ) { |
471 | 471 | |
472 | - if( ! is_object( $note ) ) { |
|
472 | + if ( ! is_object( $note ) ) { |
|
473 | 473 | return ''; |
474 | 474 | } |
475 | 475 | |
@@ -524,7 +524,7 @@ discard block |
||
524 | 524 | } |
525 | 525 | |
526 | 526 | $replacements = array( |
527 | - '{note_id}' => $note_content['note_id'], |
|
527 | + '{note_id}' => $note_content[ 'note_id' ], |
|
528 | 528 | '{row_class}' => 'gv-note', |
529 | 529 | '{note_detail}' => $note_detail_html |
530 | 530 | ); |
@@ -556,13 +556,13 @@ discard block |
||
556 | 556 | |
557 | 557 | $user_data = get_userdata( $current_user->ID ); |
558 | 558 | |
559 | - $note_content = trim( $data['gv-note-content'] ); |
|
559 | + $note_content = trim( $data[ 'gv-note-content' ] ); |
|
560 | 560 | |
561 | - if( empty( $note_content ) ) { |
|
561 | + if ( empty( $note_content ) ) { |
|
562 | 562 | return new WP_Error( 'gv-add-note-empty', __( 'The note is empty.', 'gravityview' ) ); |
563 | 563 | } |
564 | 564 | |
565 | - $return = GravityView_Entry_Notes::add_note( $entry['id'], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' ); |
|
565 | + $return = GravityView_Entry_Notes::add_note( $entry[ 'id' ], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' ); |
|
566 | 566 | |
567 | 567 | return $return; |
568 | 568 | } |
@@ -582,7 +582,7 @@ discard block |
||
582 | 582 | |
583 | 583 | $atts = shortcode_atts( array( 'entry' => null ), $atts ); |
584 | 584 | |
585 | - if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
585 | + if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
586 | 586 | gravityview()->log->error( 'User does not have permission to add entry notes ("gravityview_add_entry_notes").' ); |
587 | 587 | return ''; |
588 | 588 | } |
@@ -604,8 +604,8 @@ discard block |
||
604 | 604 | |
605 | 605 | $visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' ); |
606 | 606 | |
607 | - if ( $atts['entry'] ) { |
|
608 | - $entry = GFAPI::get_entry( $atts['entry'] ); |
|
607 | + if ( $atts[ 'entry' ] ) { |
|
608 | + $entry = GFAPI::get_entry( $atts[ 'entry' ] ); |
|
609 | 609 | } |
610 | 610 | |
611 | 611 | if ( ! isset( $entry ) || ! $entry ) { |
@@ -623,14 +623,14 @@ discard block |
||
623 | 623 | |
624 | 624 | // Only generate the dropdown if the field settings allow it |
625 | 625 | $email_fields = ''; |
626 | - if( ! empty( $visibility_settings['email'] ) ) { |
|
626 | + if ( ! empty( $visibility_settings[ 'email' ] ) ) { |
|
627 | 627 | $email_fields = self::get_note_email_fields( $entry_slug ); |
628 | 628 | } |
629 | 629 | |
630 | 630 | $add_note_html = str_replace( '{entry_slug}', $entry_slug, $add_note_html ); |
631 | 631 | $add_note_html = str_replace( '{nonce_field}', $nonce_field, $add_note_html ); |
632 | - $add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings['delete'] ) ? 0 : $visibility_settings['delete'] ), $add_note_html ); |
|
633 | - $add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html ); |
|
632 | + $add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings[ 'delete' ] ) ? 0 : $visibility_settings[ 'delete' ] ), $add_note_html ); |
|
633 | + $add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html ); |
|
634 | 634 | $add_note_html = str_replace( '{url}', esc_url_raw( add_query_arg( array() ) ), $add_note_html ); |
635 | 635 | |
636 | 636 | return $add_note_html; |
@@ -655,8 +655,8 @@ discard block |
||
655 | 655 | $note_emails = array(); |
656 | 656 | |
657 | 657 | foreach ( $email_fields as $email_field ) { |
658 | - if ( ! empty( $entry["{$email_field->id}"] ) && is_email( $entry["{$email_field->id}"] ) ) { |
|
659 | - $note_emails[] = $entry["{$email_field->id}"]; |
|
658 | + if ( ! empty( $entry[ "{$email_field->id}" ] ) && is_email( $entry[ "{$email_field->id}" ] ) ) { |
|
659 | + $note_emails[ ] = $entry[ "{$email_field->id}" ]; |
|
660 | 660 | } |
661 | 661 | } |
662 | 662 | |
@@ -668,7 +668,7 @@ discard block |
||
668 | 668 | */ |
669 | 669 | $note_emails = apply_filters( 'gravityview/field/notes/emails', $note_emails, $entry ); |
670 | 670 | |
671 | - return (array) $note_emails; |
|
671 | + return (array)$note_emails; |
|
672 | 672 | } |
673 | 673 | |
674 | 674 | /** |
@@ -684,7 +684,7 @@ discard block |
||
684 | 684 | */ |
685 | 685 | private static function get_note_email_fields( $entry_slug = '' ) { |
686 | 686 | |
687 | - if( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) { |
|
687 | + if ( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) { |
|
688 | 688 | gravityview()->log->error( 'User does not have permission to email entry notes ("gravityview_email_entry_notes").' ); |
689 | 689 | return ''; |
690 | 690 | } |
@@ -706,27 +706,27 @@ discard block |
||
706 | 706 | |
707 | 707 | if ( ! empty( $note_emails ) || $include_custom ) { ?> |
708 | 708 | <div class="gv-note-email-container"> |
709 | - <label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings['also-email']; ?></label> |
|
709 | + <label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings[ 'also-email' ]; ?></label> |
|
710 | 710 | <select class="gv-note-email-to" name="gv-note-to" id="gv-note-email-to-<?php echo $entry_slug_esc; ?>"> |
711 | - <option value=""><?php echo $strings['also-email']; ?></option> |
|
711 | + <option value=""><?php echo $strings[ 'also-email' ]; ?></option> |
|
712 | 712 | <?php foreach ( $note_emails as $email ) { |
713 | 713 | ?> |
714 | 714 | <option value="<?php echo esc_attr( $email ); ?>"><?php echo esc_html( $email ); ?></option> |
715 | 715 | <?php } |
716 | - if( $include_custom ) { ?> |
|
717 | - <option value="custom"><?php echo self::strings('other-email'); ?></option> |
|
716 | + if ( $include_custom ) { ?> |
|
717 | + <option value="custom"><?php echo self::strings( 'other-email' ); ?></option> |
|
718 | 718 | <?php } ?> |
719 | 719 | </select> |
720 | 720 | <fieldset class="gv-note-to-container"> |
721 | - <?php if( $include_custom ) { ?> |
|
721 | + <?php if ( $include_custom ) { ?> |
|
722 | 722 | <div class='gv-note-to-custom-container'> |
723 | - <label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings['email-label']; ?></label> |
|
724 | - <input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings['email-placeholder']; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" /> |
|
723 | + <label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'email-label' ]; ?></label> |
|
724 | + <input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings[ 'email-placeholder' ]; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" /> |
|
725 | 725 | </div> |
726 | 726 | <?php } ?> |
727 | 727 | <div class='gv-note-subject-container'> |
728 | - <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings['subject-label']; ?></label> |
|
729 | - <input type="text" name="gv-note-subject" placeholder="<?php echo $strings['subject']; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" /> |
|
728 | + <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'subject-label' ]; ?></label> |
|
729 | + <input type="text" name="gv-note-subject" placeholder="<?php echo $strings[ 'subject' ]; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" /> |
|
730 | 730 | </div> |
731 | 731 | </fieldset> |
732 | 732 | </div> |
@@ -749,7 +749,7 @@ discard block |
||
749 | 749 | */ |
750 | 750 | private function maybe_send_entry_notes( $note = false, $entry, $data ) { |
751 | 751 | |
752 | - if( ! $note || ! GVCommon::has_cap('gravityview_email_entry_notes') ) { |
|
752 | + if ( ! $note || ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) { |
|
753 | 753 | gravityview()->log->debug( 'User doesn\'t have "gravityview_email_entry_notes" cap, or $note is empty', array( 'data' => $note ) ); |
754 | 754 | return; |
755 | 755 | } |
@@ -757,7 +757,7 @@ discard block |
||
757 | 757 | gravityview()->log->debug( '$data', array( 'data' => $data ) ); |
758 | 758 | |
759 | 759 | //emailing notes if configured |
760 | - if ( ! empty( $data['gv-note-to'] ) ) { |
|
760 | + if ( ! empty( $data[ 'gv-note-to' ] ) ) { |
|
761 | 761 | |
762 | 762 | $default_data = array( |
763 | 763 | 'gv-note-to' => '', |
@@ -767,11 +767,11 @@ discard block |
||
767 | 767 | 'current-url' => '', |
768 | 768 | ); |
769 | 769 | |
770 | - $current_user = wp_get_current_user(); |
|
770 | + $current_user = wp_get_current_user(); |
|
771 | 771 | $email_data = wp_parse_args( $data, $default_data ); |
772 | 772 | |
773 | - $from = $current_user->user_email; |
|
774 | - $to = $email_data['gv-note-to']; |
|
773 | + $from = $current_user->user_email; |
|
774 | + $to = $email_data[ 'gv-note-to' ]; |
|
775 | 775 | |
776 | 776 | /** |
777 | 777 | * Documented in get_note_email_fields |
@@ -779,8 +779,8 @@ discard block |
||
779 | 779 | */ |
780 | 780 | $include_custom = apply_filters( 'gravityview/field/notes/custom-email', true ); |
781 | 781 | |
782 | - if( 'custom' === $to && $include_custom ) { |
|
783 | - $to = $email_data['gv-note-to-custom']; |
|
782 | + if ( 'custom' === $to && $include_custom ) { |
|
783 | + $to = $email_data[ 'gv-note-to-custom' ]; |
|
784 | 784 | gravityview()->log->debug( 'Sending note to a custom email address: {to}' . array( 'to' => $to ) ); |
785 | 785 | } |
786 | 786 | |
@@ -791,13 +791,13 @@ discard block |
||
791 | 791 | |
792 | 792 | $bcc = false; |
793 | 793 | $reply_to = $from; |
794 | - $subject = trim( $email_data['gv-note-subject'] ); |
|
794 | + $subject = trim( $email_data[ 'gv-note-subject' ] ); |
|
795 | 795 | |
796 | 796 | // We use empty() here because GF uses empty to check against, too. `0` isn't a valid subject to GF |
797 | 797 | $subject = empty( $subject ) ? self::strings( 'default-email-subject' ) : $subject; |
798 | - $message = $email_data['gv-note-content']; |
|
798 | + $message = $email_data[ 'gv-note-content' ]; |
|
799 | 799 | $email_footer = self::strings( 'email-footer' ); |
800 | - $from_name = $current_user->display_name; |
|
800 | + $from_name = $current_user->display_name; |
|
801 | 801 | $message_format = 'html'; |
802 | 802 | |
803 | 803 | /** |
@@ -828,7 +828,7 @@ discard block |
||
828 | 828 | |
829 | 829 | GVCommon::send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name, $message_format, '', $entry, false ); |
830 | 830 | |
831 | - $form = isset( $entry['form_id'] ) ? GFAPI::get_form( $entry['form_id'] ) : array(); |
|
831 | + $form = isset( $entry[ 'form_id' ] ) ? GFAPI::get_form( $entry[ 'form_id' ] ) : array(); |
|
832 | 832 | |
833 | 833 | /** |
834 | 834 | * @see https://www.gravityhelp.com/documentation/article/10146-2/ It's here for compatibility with Gravity Forms |
@@ -854,7 +854,7 @@ discard block |
||
854 | 854 | |
855 | 855 | $output = ''; |
856 | 856 | |
857 | - if( ! empty( $email_footer ) ) { |
|
857 | + if ( ! empty( $email_footer ) ) { |
|
858 | 858 | $url = \GV\Utils::get( $email_data, 'current-url' ); |
859 | 859 | $url = html_entity_decode( $url ); |
860 | 860 | $url = site_url( $url ); |