| @@ -4,18 +4,8 @@ | ||
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | class FrmFormsController { |
| 7 | 7 | |
| 8 | - /** | |
| 9 | - * Track the form that opened the redirect URL in a new tab. This is used to check if we should show the default | |
| 10 | - * message in the currect tab. | |
| 11 | - * | |
| 12 | - * @since 6.2 | |
| 13 | - * | |
| 14 | - * @var array Keys are form IDs and values are 1. | |
| 15 | - */ | |
| 16 | - private static $redirected_in_new_tab = array(); | |
| 17 | - | |
| 18 | 8 | public static function menu() { |
| 19 | 9 | $menu_label = __( 'Forms', 'formidable' ); |
| 20 | 10 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| 21 | 11 | $menu_label .= ' (Lite)'; |
| @@ -25,9 +15,10 @@ | ||
| 25 | 15 | self::maybe_load_listing_hooks(); |
| 26 | 16 | } |
| 27 | 17 | |
| 28 | 18 | public static function maybe_load_listing_hooks() { |
| 29 | - if ( ! FrmAppHelper::on_form_listing_page() ) { | |
| 19 | + $action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ); | |
| 20 | + if ( ! empty( $action ) && ! in_array( $action, array( 'list', 'trash', 'untrash', 'destroy' ) ) ) { | |
| 30 | 21 | return; |
| 31 | 22 | } |
| 32 | 23 | |
| 33 | 24 | add_filter( 'get_user_option_managetoplevel_page_formidablecolumnshidden', 'FrmFormsController::hidden_columns' ); |
| @@ -42,9 +33,9 @@ | ||
| 42 | 33 | } |
| 43 | 34 | } |
| 44 | 35 | |
| 45 | 36 | public static function register_widgets() { |
| 46 | - require_once FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php'; | |
| 37 | + require_once( FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php' ); | |
| 47 | 38 | register_widget( 'FrmShowForm' ); |
| 48 | 39 | } |
| 49 | 40 | |
| 50 | 41 | /** |
| @@ -55,11 +46,11 @@ | ||
| 55 | 46 | public static function logic_tip() { |
| 56 | 47 | $images_url = FrmAppHelper::plugin_url() . '/images/'; |
| 57 | 48 | $data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' ); |
| 58 | 49 | $data_message .= ' <img src="' . esc_attr( $images_url ) . '/survey-logic.png" srcset="' . esc_attr( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>'; |
| 59 | - echo '<a href="javascript:void(0)" class="frm_noallow frm_show_upgrade frm_add_logic_link frm-collapsed frm-flex-justify" data-upgrade="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '" data-message="' . esc_attr( $data_message ) . '" data-medium="builder" data-content="logic">'; | |
| 60 | - esc_html_e( 'Conditional Logic', 'formidable' ); | |
| 61 | - FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) ); | |
| 50 | + echo '<a href="javascript:void(0)" class="frm_noallow frm_show_upgrade frm_add_logic_link" data-upgrade="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '" data-message="' . esc_attr( $data_message ) . '" data-medium="builder" data-content="logic">'; | |
| 51 | + FrmAppHelper::icon_by_class( 'frmfont frm_swap_icon' ); | |
| 52 | + esc_html_e( 'Add Conditional Logic', 'formidable' ); | |
| 62 | 53 | echo '</a>'; |
| 63 | 54 | } |
| 64 | 55 | |
| 65 | 56 | /** |
| @@ -73,11 +64,8 @@ | ||
| 73 | 64 | |
| 74 | 65 | return $shortcodes; |
| 75 | 66 | } |
| 76 | 67 | |
| 77 | - /** | |
| 78 | - * @return void | |
| 79 | - */ | |
| 80 | 68 | public static function list_form() { |
| 81 | 69 | FrmAppHelper::permission_check( 'frm_view_forms' ); |
| 82 | 70 | |
| 83 | 71 | $message = ''; |
| @@ -88,9 +76,9 @@ | ||
| 88 | 76 | unset( $errors['message'] ); |
| 89 | 77 | } |
| 90 | 78 | $errors = apply_filters( 'frm_admin_list_form_action', $errors ); |
| 91 | 79 | |
| 92 | - self::display_forms_list( $params, $message, $errors ); | |
| 80 | + return self::display_forms_list( $params, $message, $errors ); | |
| 93 | 81 | } |
| 94 | 82 | |
| 95 | 83 | /** |
| 96 | 84 | * Create the default email action |
| @@ -108,34 +96,8 @@ | ||
| 108 | 96 | $action_control->create( $form->id ); |
| 109 | 97 | } |
| 110 | 98 | } |
| 111 | 99 | |
| 112 | - /** | |
| 113 | - * Create the default On submit action | |
| 114 | - * | |
| 115 | - * @since 6.0.0 | |
| 116 | - * | |
| 117 | - * @param object|int $form Form object or ID. | |
| 118 | - */ | |
| 119 | - private static function create_default_on_submit_action( $form ) { | |
| 120 | - FrmForm::maybe_get_form( $form ); | |
| 121 | - | |
| 122 | - /** | |
| 123 | - * Enable or disable the default On Submit action. | |
| 124 | - * | |
| 125 | - * @since 6.0.0 | |
| 126 | - * | |
| 127 | - * @param bool $create Set to `false` if you want to disable. | |
| 128 | - * @param object $form Form object. | |
| 129 | - */ | |
| 130 | - $create = apply_filters( 'frm_create_default_on_submit_action', true, $form ); | |
| 131 | - | |
| 132 | - if ( $create ) { | |
| 133 | - $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug ); | |
| 134 | - $action_control->create( $form->id ); | |
| 135 | - } | |
| 136 | - } | |
| 137 | - | |
| 138 | 100 | public static function edit( $values = false ) { |
| 139 | 101 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 140 | 102 | |
| 141 | 103 | $id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' ); |
| @@ -149,10 +111,8 @@ | ||
| 149 | 111 | if ( ! $id || ! is_numeric( $id ) ) { |
| 150 | 112 | $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' ); |
| 151 | 113 | } |
| 152 | 114 | |
| 153 | - FrmOnSubmitHelper::maybe_migrate_submit_settings_to_action( $id ); | |
| 154 | - | |
| 155 | 115 | return self::get_settings_vars( $id, array(), $message ); |
| 156 | 116 | } |
| 157 | 117 | |
| 158 | 118 | public static function update_settings() { |
| @@ -269,29 +229,17 @@ | ||
| 269 | 229 | } |
| 270 | 230 | |
| 271 | 231 | public static function duplicate() { |
| 272 | 232 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 273 | - $nonce = FrmAppHelper::simple_get( '_wpnonce' ); | |
| 274 | 233 | |
| 275 | - if ( ! wp_verify_nonce( $nonce ) ) { | |
| 276 | - $frm_settings = FrmAppHelper::get_settings(); | |
| 277 | - wp_die( esc_html( $frm_settings->admin_permission ) ); | |
| 278 | - } | |
| 279 | - | |
| 280 | 234 | $params = FrmForm::list_page_params(); |
| 281 | 235 | $form = FrmForm::duplicate( $params['id'], $params['template'], true ); |
| 282 | - $url = admin_url( 'admin.php?page=formidable' ); | |
| 283 | - $message = 'form_duplicate_error'; | |
| 284 | - | |
| 236 | + $message = $params['template'] ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' ); | |
| 285 | 237 | if ( $form ) { |
| 286 | - $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) ); | |
| 287 | - $message = 'form_duplicated'; | |
| 238 | + return self::get_edit_vars( $form, array(), $message, true ); | |
| 239 | + } else { | |
| 240 | + return self::display_forms_list( $params, __( 'There was a problem creating the new template.', 'formidable' ) ); | |
| 288 | 241 | } |
| 289 | - | |
| 290 | - $url .= '&message=' . $message; | |
| 291 | - | |
| 292 | - wp_safe_redirect( $url ); | |
| 293 | - exit(); | |
| 294 | 242 | } |
| 295 | 243 | |
| 296 | 244 | /** |
| 297 | 245 | * @return string |
| @@ -335,59 +283,30 @@ | ||
| 335 | 283 | |
| 336 | 284 | wp_die(); |
| 337 | 285 | } |
| 338 | 286 | |
| 339 | - /** | |
| 340 | - * Set the page global to any available page (except for the Blog Page). | |
| 341 | - * | |
| 342 | - * @return void | |
| 343 | - */ | |
| 344 | 287 | private static function set_preview_query() { |
| 345 | - $page_query = array( | |
| 346 | - 'numberposts' => 1, | |
| 347 | - 'orderby' => 'date', | |
| 348 | - 'order' => 'ASC', | |
| 349 | - 'post_type' => 'page', | |
| 350 | - ); | |
| 351 | - | |
| 352 | - $page_for_posts = get_option( 'page_for_posts' ); | |
| 353 | - if ( is_numeric( $page_for_posts ) ) { | |
| 354 | - // Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms. | |
| 355 | - $page_query['post__not_in'] = array( $page_for_posts ); | |
| 356 | - } | |
| 357 | - | |
| 358 | - $random_page = get_posts( $page_query ); | |
| 359 | - if ( ! $random_page ) { | |
| 360 | - return; | |
| 361 | - } | |
| 362 | - | |
| 363 | - $random_page = reset( $random_page ); | |
| 364 | - query_posts( | |
| 288 | + $random_page = get_posts( | |
| 365 | 289 | array( |
| 366 | - 'post_type' => 'page', | |
| 367 | - 'page_id' => $random_page->ID, | |
| 290 | + 'numberposts' => 1, | |
| 291 | + 'orderby' => 'date', | |
| 292 | + 'order' => 'ASC', | |
| 293 | + 'post_type' => 'page', | |
| 368 | 294 | ) |
| 369 | 295 | ); |
| 370 | 296 | |
| 371 | - // Fixes Pro issue #3004. Prevent an undefined $post object. | |
| 372 | - // Otherwise WordPress themes will trigger a warning "Attempt to read property "comment_count" on null". | |
| 373 | - self::set_post_global( $random_page ); | |
| 297 | + if ( ! empty( $random_page ) ) { | |
| 298 | + $random_page = reset( $random_page ); | |
| 299 | + query_posts( | |
| 300 | + array( | |
| 301 | + 'post_type' => 'page', | |
| 302 | + 'page_id' => $random_page->ID, | |
| 303 | + ) | |
| 304 | + ); | |
| 305 | + } | |
| 374 | 306 | } |
| 375 | 307 | |
| 376 | 308 | /** |
| 377 | - * Set the WP $post global object. Used for in-theme preview when defining a page. | |
| 378 | - * | |
| 379 | - * @since 5.5.2 | |
| 380 | - * | |
| 381 | - * @param WP_Post $post | |
| 382 | - * @return void | |
| 383 | - */ | |
| 384 | - private static function set_post_global( $page ) { | |
| 385 | - global $post; | |
| 386 | - $post = $page; // phpcs:ignore WordPress.WP.GlobalVariablesOverride | |
| 387 | - } | |
| 388 | - | |
| 389 | - /** | |
| 390 | 309 | * @since 3.0 |
| 391 | 310 | */ |
| 392 | 311 | private static function load_theme_preview() { |
| 393 | 312 | add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 ); |
| @@ -477,24 +396,15 @@ | ||
| 477 | 396 | public static function untrash() { |
| 478 | 397 | self::change_form_status( 'untrash' ); |
| 479 | 398 | } |
| 480 | 399 | |
| 481 | - /** | |
| 482 | - * @param array $ids | |
| 483 | - * @return string | |
| 484 | - */ | |
| 485 | 400 | public static function bulk_untrash( $ids ) { |
| 486 | 401 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 487 | 402 | |
| 488 | 403 | $count = FrmForm::set_status( $ids, 'published' ); |
| 489 | 404 | |
| 490 | - if ( ! $count ) { | |
| 491 | - // Don't show "0 forms restored" on refresh. | |
| 492 | - return ''; | |
| 493 | - } | |
| 494 | - | |
| 495 | 405 | /* translators: %1$s: Number of forms */ |
| 496 | - $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count ); | |
| 406 | + $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 ); | |
| 497 | 407 | |
| 498 | 408 | return $message; |
| 499 | 409 | } |
| 500 | 410 | |
| @@ -649,8 +559,10 @@ | ||
| 649 | 559 | * |
| 650 | 560 | * @since 4.0 |
| 651 | 561 | */ |
| 652 | 562 | public static function build_new_form() { |
| 563 | + global $wpdb; | |
| 564 | + | |
| 653 | 565 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 654 | 566 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 655 | 567 | |
| 656 | 568 | $new_values = self::get_modal_values(); |
| @@ -656,20 +568,10 @@ | ||
| 656 | 568 | $new_values = self::get_modal_values(); |
| 657 | 569 | $new_values['form_key'] = $new_values['name']; |
| 658 | 570 | $new_values['options'] = array( |
| 659 | 571 | 'antispam' => 1, |
| 660 | - 'on_submit_migrated' => 1, | |
| 661 | 572 | ); |
| 662 | 573 | |
| 663 | - /** | |
| 664 | - * Allows changing form values before creating from the modal. | |
| 665 | - * | |
| 666 | - * @since 5.4 | |
| 667 | - * | |
| 668 | - * @param array $values Form values. | |
| 669 | - */ | |
| 670 | - $new_values = apply_filters( 'frm_new_form_values', $new_values ); | |
| 671 | - | |
| 672 | 574 | $form_id = FrmForm::create( $new_values ); |
| 673 | 575 | /** |
| 674 | 576 | * @since 5.3 |
| 675 | 577 | * |
| @@ -676,9 +578,8 @@ | ||
| 676 | 578 | * @param int $form_id |
| 677 | 579 | */ |
| 678 | 580 | do_action( 'frm_build_new_form', $form_id ); |
| 679 | 581 | |
| 680 | - self::create_default_on_submit_action( $form_id ); | |
| 681 | 582 | self::create_default_email_action( $form_id ); |
| 682 | 583 | |
| 683 | 584 | $response = array( |
| 684 | 585 | 'redirect' => FrmForm::get_edit_link( $form_id ), |
| @@ -712,9 +613,9 @@ | ||
| 712 | 613 | FrmForm::clear_form_cache(); |
| 713 | 614 | } |
| 714 | 615 | |
| 715 | 616 | $response = array( |
| 716 | - 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . $new_form_id ) . '&_wpnonce=' . wp_create_nonce(), | |
| 617 | + 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . $new_form_id ), | |
| 717 | 618 | ); |
| 718 | 619 | } |
| 719 | 620 | |
| 720 | 621 | echo wp_json_encode( $response ); |
| @@ -845,32 +746,18 @@ | ||
| 845 | 746 | |
| 846 | 747 | wp_die(); |
| 847 | 748 | } |
| 848 | 749 | |
| 849 | - /** | |
| 850 | - * Display list of forms in a table. | |
| 851 | - * | |
| 852 | - * @param array $params | |
| 853 | - * @param string $message | |
| 854 | - * @param array $errors | |
| 855 | - * @return void | |
| 856 | - */ | |
| 857 | 750 | public static function display_forms_list( $params = array(), $message = '', $errors = array() ) { |
| 858 | 751 | FrmAppHelper::permission_check( 'frm_view_forms' ); |
| 859 | 752 | |
| 860 | 753 | global $wpdb, $frm_vars; |
| 861 | 754 | |
| 862 | - if ( ! $params ) { | |
| 755 | + if ( empty( $params ) ) { | |
| 863 | 756 | $params = FrmForm::list_page_params(); |
| 864 | 757 | } |
| 865 | 758 | |
| 866 | - /** | |
| 867 | - * @since 5.3.1 | |
| 868 | - * | |
| 869 | - * @param string $table_class Class name for List Helper. | |
| 870 | - */ | |
| 871 | - $table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' ); | |
| 872 | - $wp_list_table = new $table_class( compact( 'params' ) ); | |
| 759 | + $wp_list_table = new FrmFormsListHelper( compact( 'params' ) ); | |
| 873 | 760 | |
| 874 | 761 | $pagenum = $wp_list_table->get_pagenum(); |
| 875 | 762 | |
| 876 | 763 | $wp_list_table->prepare_items(); |
| @@ -880,22 +767,34 @@ | ||
| 880 | 767 | wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) ); |
| 881 | 768 | die(); |
| 882 | 769 | } |
| 883 | 770 | |
| 884 | - require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php'; | |
| 771 | + require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php' ); | |
| 885 | 772 | } |
| 886 | 773 | |
| 887 | - /** | |
| 888 | - * @param array<string,string> $columns | |
| 889 | - * @return array<string,string> | |
| 890 | - */ | |
| 891 | 774 | public static function get_columns( $columns ) { |
| 892 | - $columns['cb'] = '<input type="checkbox" />'; | |
| 893 | - $columns['name'] = __( 'Form Title', 'formidable' ); | |
| 894 | - $columns['entries'] = __( 'Entries', 'formidable' ); | |
| 895 | - $columns['id'] = 'ID'; | |
| 896 | - $columns['form_key'] = __( 'Key', 'formidable' ); | |
| 897 | - $columns['shortcode'] = __( 'Actions', 'formidable' ); | |
| 775 | + $columns['cb'] = '<input type="checkbox" />'; | |
| 776 | + $columns['id'] = 'ID'; | |
| 777 | + | |
| 778 | + $type = FrmAppHelper::get_simple_request( | |
| 779 | + array( | |
| 780 | + 'param' => 'form_type', | |
| 781 | + 'type' => 'request', | |
| 782 | + 'default' => 'published', | |
| 783 | + ) | |
| 784 | + ); | |
| 785 | + | |
| 786 | + if ( 'template' == $type ) { | |
| 787 | + $columns['name'] = __( 'Template Name', 'formidable' ); | |
| 788 | + $columns['type'] = __( 'Type', 'formidable' ); | |
| 789 | + $columns['form_key'] = __( 'Key', 'formidable' ); | |
| 790 | + } else { | |
| 791 | + $columns['name'] = __( 'Form Title', 'formidable' ); | |
| 792 | + $columns['entries'] = __( 'Entries', 'formidable' ); | |
| 793 | + $columns['form_key'] = __( 'Key', 'formidable' ); | |
| 794 | + $columns['shortcode'] = __( 'Actions', 'formidable' ); | |
| 795 | + } | |
| 796 | + | |
| 898 | 797 | $columns['created_at'] = __( 'Date', 'formidable' ); |
| 899 | 798 | |
| 900 | 799 | add_screen_option( |
| 901 | 800 | 'per_page', |
| @@ -918,17 +817,9 @@ | ||
| 918 | 817 | 'created_at' => 'created_at', |
| 919 | 818 | ); |
| 920 | 819 | } |
| 921 | 820 | |
| 922 | - /** | |
| 923 | - * @param mixed $hidden_columns | |
| 924 | - * @return array | |
| 925 | - */ | |
| 926 | 821 | public static function hidden_columns( $hidden_columns ) { |
| 927 | - if ( ! is_array( $hidden_columns ) ) { | |
| 928 | - $hidden_columns = array(); | |
| 929 | - } | |
| 930 | - | |
| 931 | 822 | $type = FrmAppHelper::get_simple_request( |
| 932 | 823 | array( |
| 933 | 824 | 'param' => 'form_type', |
| 934 | 825 | 'type' => 'request', |
| @@ -960,10 +851,8 @@ | ||
| 960 | 851 | } |
| 961 | 852 | |
| 962 | 853 | /** |
| 963 | 854 | * Get data from api before rendering it so that we can flag the modal as expired |
| 964 | - * | |
| 965 | - * @return void | |
| 966 | 855 | */ |
| 967 | 856 | public static function before_list_templates() { |
| 968 | 857 | global $frm_templates; |
| 969 | 858 | global $frm_expired; |
| @@ -984,11 +873,8 @@ | ||
| 984 | 873 | $frm_expired = $expired; |
| 985 | 874 | $frm_license_type = $license_type; |
| 986 | 875 | } |
| 987 | 876 | |
| 988 | - /** | |
| 989 | - * @return void | |
| 990 | - */ | |
| 991 | 877 | public static function list_templates() { |
| 992 | 878 | global $frm_templates; |
| 993 | 879 | global $frm_license_type; |
| 994 | 880 | |
| @@ -1072,9 +958,9 @@ | ||
| 1072 | 958 | 'id' => $template->id, |
| 1073 | 959 | 'name' => $template->name, |
| 1074 | 960 | 'key' => $template->form_key, |
| 1075 | 961 | 'description' => $template->description, |
| 1076 | - 'url' => wp_nonce_url( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ) ), | |
| 962 | + 'url' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ), | |
| 1077 | 963 | 'released' => $template->created_at, |
| 1078 | 964 | 'installed' => 1, |
| 1079 | 965 | ); |
| 1080 | 966 | array_unshift( $templates, $template ); |
| @@ -1126,10 +1012,8 @@ | ||
| 1126 | 1012 | if ( $form->is_template && $message == $edit_message ) { |
| 1127 | 1013 | $message = __( 'Template was successfully updated.', 'formidable' ); |
| 1128 | 1014 | } |
| 1129 | 1015 | |
| 1130 | - self::maybe_update_form_builder_message( $message ); | |
| 1131 | - | |
| 1132 | 1016 | $all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' ); |
| 1133 | 1017 | $has_fields = isset( $values['fields'] ) && ! empty( $values['fields'] ); |
| 1134 | 1018 | |
| 1135 | 1019 | if ( defined( 'DOING_AJAX' ) ) { |
| @@ -1138,21 +1022,8 @@ | ||
| 1138 | 1022 | require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' ); |
| 1139 | 1023 | } |
| 1140 | 1024 | } |
| 1141 | 1025 | |
| 1142 | - public static function update_form_builder_fields( $fields, $form ) { | |
| 1143 | - foreach ( $fields as $field ) { | |
| 1144 | - $field->do_not_include_icons = true; | |
| 1145 | - } | |
| 1146 | - return $fields; | |
| 1147 | - } | |
| 1148 | - | |
| 1149 | - public static function maybe_update_form_builder_message( &$message ) { | |
| 1150 | - if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) { | |
| 1151 | - $message = __( 'Form was Successfully Copied', 'formidable' ); | |
| 1152 | - } | |
| 1153 | - } | |
| 1154 | - | |
| 1155 | 1026 | public static function get_settings_vars( $id, $errors = array(), $args = array() ) { |
| 1156 | 1027 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 1157 | 1028 | |
| 1158 | 1029 | global $frm_vars; |
| @@ -1224,50 +1095,47 @@ | ||
| 1224 | 1095 | 'id' => 'frm_notification_settings', |
| 1225 | 1096 | 'icon' => 'frm_icon_font frm_mail_bulk_icon', |
| 1226 | 1097 | ), |
| 1227 | 1098 | 'permissions' => array( |
| 1228 | - 'name' => __( 'Form Permissions', 'formidable' ), | |
| 1229 | - 'icon' => 'frm_icon_font frm_lock_icon', | |
| 1230 | - 'html_class' => 'frm_show_upgrade_tab frm_noallow', | |
| 1231 | - 'data' => array( | |
| 1232 | - 'medium' => 'permissions', | |
| 1233 | - 'upgrade' => __( 'Form Permissions', 'formidable' ), | |
| 1234 | - 'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ), | |
| 1235 | - 'screenshot' => 'permissions.png', | |
| 1099 | + 'name' => __( 'Form Permissions', 'formidable' ), | |
| 1100 | + 'icon' => 'frm_icon_font frm_lock_icon', | |
| 1101 | + 'html_class' => 'frm_show_upgrade frm_noallow', | |
| 1102 | + 'data' => array( | |
| 1103 | + 'medium' => 'permissions', | |
| 1104 | + 'upgrade' => __( 'Form Permissions', 'formidable' ), | |
| 1105 | + 'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ), | |
| 1236 | 1106 | ), |
| 1237 | 1107 | ), |
| 1238 | 1108 | 'scheduling' => array( |
| 1239 | - 'name' => __( 'Form Scheduling', 'formidable' ), | |
| 1240 | - 'icon' => 'frm_icon_font frm_calendar_icon', | |
| 1241 | - 'html_class' => 'frm_show_upgrade_tab frm_noallow', | |
| 1242 | - 'data' => array( | |
| 1243 | - 'medium' => 'scheduling', | |
| 1244 | - 'upgrade' => __( 'Form scheduling settings', 'formidable' ), | |
| 1245 | - 'screenshot' => 'scheduling.png', | |
| 1109 | + 'name' => __( 'Form Scheduling', 'formidable' ), | |
| 1110 | + 'icon' => 'frm_icon_font frm_calendar_icon', | |
| 1111 | + 'html_class' => 'frm_show_upgrade frm_noallow', | |
| 1112 | + 'data' => array( | |
| 1113 | + 'medium' => 'scheduling', | |
| 1114 | + 'upgrade' => __( 'Form scheduling settings', 'formidable' ), | |
| 1246 | 1115 | ), |
| 1247 | 1116 | ), |
| 1248 | 1117 | 'buttons' => array( |
| 1249 | - 'name' => __( 'Buttons', 'formidable' ), | |
| 1118 | + 'name' => __( 'Styling & Buttons', 'formidable' ), | |
| 1250 | 1119 | 'class' => __CLASS__, |
| 1251 | 1120 | 'function' => 'buttons_settings', |
| 1252 | - 'icon' => 'frm_icon_font frm_button_icon', | |
| 1121 | + 'icon' => 'frm_icon_font frm_pallet_icon', | |
| 1253 | 1122 | ), |
| 1254 | 1123 | 'landing' => array( |
| 1255 | 1124 | 'name' => __( 'Form Landing Page', 'formidable' ), |
| 1256 | 1125 | 'icon' => 'frm_icon_font frm_file_text_icon', |
| 1257 | - 'html_class' => 'frm_show_upgrade_tab frm_noallow', | |
| 1126 | + 'html_class' => 'frm_show_upgrade frm_noallow', | |
| 1258 | 1127 | 'data' => FrmAppHelper::get_landing_page_upgrade_data_params(), |
| 1259 | 1128 | ), |
| 1260 | 1129 | 'chat' => array( |
| 1261 | 1130 | 'name' => __( 'Conversational Forms', 'formidable' ), |
| 1262 | 1131 | 'icon' => 'frm_icon_font frm_chat_forms_icon', |
| 1263 | - 'html_class' => 'frm_show_upgrade_tab frm_noallow', | |
| 1132 | + 'html_class' => 'frm_show_upgrade frm_noallow', | |
| 1264 | 1133 | 'data' => FrmAppHelper::get_upgrade_data_params( |
| 1265 | 1134 | 'chat', |
| 1266 | 1135 | array( |
| 1267 | - 'upgrade' => __( 'Conversational Forms', 'formidable' ), | |
| 1268 | - 'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ), | |
| 1269 | - 'screenshot' => 'chat.png', | |
| 1136 | + 'upgrade' => __( 'Conversational Forms', 'formidable' ), | |
| 1137 | + 'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ), | |
| 1270 | 1138 | ) |
| 1271 | 1139 | ), |
| 1272 | 1140 | ), |
| 1273 | 1141 | 'html' => array( |
| @@ -1332,9 +1200,9 @@ | ||
| 1332 | 1200 | |
| 1333 | 1201 | /** |
| 1334 | 1202 | * @param array $values |
| 1335 | 1203 | */ |
| 1336 | - public static function render_spam_settings( $values ) { | |
| 1204 | + private static function render_spam_settings( $values ) { | |
| 1337 | 1205 | if ( function_exists( 'akismet_http_post' ) ) { |
| 1338 | 1206 | include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php'; |
| 1339 | 1207 | } |
| 1340 | 1208 | include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php'; |
| @@ -1376,23 +1244,8 @@ | ||
| 1376 | 1244 | $values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] ); |
| 1377 | 1245 | } |
| 1378 | 1246 | } |
| 1379 | 1247 | |
| 1380 | - /** | |
| 1381 | - * Updates classes used in submit and prev buttons to avoid conflict with twenty twenty-one theme. | |
| 1382 | - * | |
| 1383 | - * @param array $classes | |
| 1384 | - * | |
| 1385 | - * @return array | |
| 1386 | - */ | |
| 1387 | - public static function update_button_classes( $classes ) { | |
| 1388 | - if ( function_exists( 'twenty_twenty_one_setup' ) ) { | |
| 1389 | - $classes[] = 'has-text-color has-background'; | |
| 1390 | - } | |
| 1391 | - | |
| 1392 | - return $classes; | |
| 1393 | - } | |
| 1394 | - | |
| 1395 | 1248 | public static function mb_tags_box( $form_id, $class = '' ) { |
| 1396 | 1249 | $fields = FrmField::get_all_for_form( $form_id, '', 'include' ); |
| 1397 | 1250 | |
| 1398 | 1251 | /** |
| @@ -1524,9 +1377,8 @@ | ||
| 1524 | 1377 | if ( $settings_tab ) { |
| 1525 | 1378 | $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' ); |
| 1526 | 1379 | $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' ); |
| 1527 | 1380 | $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' ); |
| 1528 | - $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' ); | |
| 1529 | 1381 | } |
| 1530 | 1382 | |
| 1531 | 1383 | /** |
| 1532 | 1384 | * Use this hook to add or remove buttons in the helpers section |
| @@ -1539,12 +1391,9 @@ | ||
| 1539 | 1391 | return $entry_shortcodes; |
| 1540 | 1392 | } |
| 1541 | 1393 | |
| 1542 | 1394 | /** |
| 1543 | - * Insert the form class setting into the form. | |
| 1544 | - * | |
| 1545 | - * @param stdClass $form | |
| 1546 | - * @return void | |
| 1395 | + * Insert the form class setting into the form | |
| 1547 | 1396 | */ |
| 1548 | 1397 | public static function form_classes( $form ) { |
| 1549 | 1398 | if ( isset( $form->options['form_class'] ) ) { |
| 1550 | 1399 | echo esc_attr( sanitize_text_field( $form->options['form_class'] ) ); |
| @@ -1553,12 +1402,8 @@ | ||
| 1553 | 1402 | if ( ! empty( $form->options['js_validate'] ) ) { |
| 1554 | 1403 | echo ' frm_js_validate '; |
| 1555 | 1404 | self::add_js_validate_form_to_global_vars( $form ); |
| 1556 | 1405 | } |
| 1557 | - | |
| 1558 | - if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) { | |
| 1559 | - echo ' frm_ajax_submit '; | |
| 1560 | - } | |
| 1561 | 1406 | } |
| 1562 | 1407 | |
| 1563 | 1408 | /** |
| 1564 | 1409 | * @since 5.0.03 |
| @@ -1586,17 +1431,9 @@ | ||
| 1586 | 1431 | ); |
| 1587 | 1432 | wp_die(); |
| 1588 | 1433 | } |
| 1589 | 1434 | |
| 1590 | - /** | |
| 1591 | - * @param string $content | |
| 1592 | - * @param stdClass|string|int $form | |
| 1593 | - * @param stdClass|string|int|false $entry | |
| 1594 | - * @return string | |
| 1595 | - */ | |
| 1596 | 1435 | public static function filter_content( $content, $form, $entry = false ) { |
| 1597 | - $content = self::replace_form_name_shortcodes( $content, $form ); | |
| 1598 | - | |
| 1599 | 1436 | self::get_entry_by_param( $entry ); |
| 1600 | 1437 | if ( ! $entry ) { |
| 1601 | 1438 | return $content; |
| 1602 | 1439 | } |
| @@ -1610,38 +1447,8 @@ | ||
| 1610 | 1447 | |
| 1611 | 1448 | return $content; |
| 1612 | 1449 | } |
| 1613 | 1450 | |
| 1614 | - /** | |
| 1615 | - * Replace any [form_name] shortcodes in a string. | |
| 1616 | - * | |
| 1617 | - * @since 5.5 | |
| 1618 | - * | |
| 1619 | - * @param string|array $string | |
| 1620 | - * @param stdClass|string|int $form | |
| 1621 | - * @return string|array | |
| 1622 | - */ | |
| 1623 | - public static function replace_form_name_shortcodes( $string, $form ) { | |
| 1624 | - if ( ! is_string( $string ) ) { | |
| 1625 | - return $string; | |
| 1626 | - } | |
| 1627 | - | |
| 1628 | - if ( false === strpos( $string, '[form_name]' ) ) { | |
| 1629 | - return $string; | |
| 1630 | - } | |
| 1631 | - | |
| 1632 | - if ( ! is_object( $form ) ) { | |
| 1633 | - $form = FrmForm::getOne( $form ); | |
| 1634 | - } | |
| 1635 | - | |
| 1636 | - $form_name = is_object( $form ) ? $form->name : ''; | |
| 1637 | - return str_replace( '[form_name]', $form_name, $string ); | |
| 1638 | - } | |
| 1639 | - | |
| 1640 | - /** | |
| 1641 | - * @param stdClass|string|int|false $entry | |
| 1642 | - * @return void | |
| 1643 | - */ | |
| 1644 | 1451 | private static function get_entry_by_param( &$entry ) { |
| 1645 | 1452 | if ( ! $entry || ! is_object( $entry ) ) { |
| 1646 | 1453 | if ( ! $entry || ! is_numeric( $entry ) ) { |
| 1647 | 1454 | $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' ); |
| @@ -1750,8 +1557,9 @@ | ||
| 1750 | 1557 | return self::new_form( $vars ); |
| 1751 | 1558 | case 'create': |
| 1752 | 1559 | case 'edit': |
| 1753 | 1560 | case 'update': |
| 1561 | + case 'duplicate': | |
| 1754 | 1562 | case 'trash': |
| 1755 | 1563 | case 'untrash': |
| 1756 | 1564 | case 'destroy': |
| 1757 | 1565 | case 'delete_all': |
| @@ -1775,21 +1583,12 @@ | ||
| 1775 | 1583 | |
| 1776 | 1584 | if ( strpos( $action, 'bulk_' ) === 0 ) { |
| 1777 | 1585 | FrmAppHelper::remove_get_action(); |
| 1778 | 1586 | |
| 1779 | - self::list_form(); | |
| 1780 | - return; | |
| 1587 | + return self::list_form(); | |
| 1781 | 1588 | } |
| 1782 | 1589 | |
| 1783 | - $message = FrmAppHelper::get_param( 'message' ); | |
| 1784 | - if ( 'form_duplicate_error' === $message ) { | |
| 1785 | - self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) ); | |
| 1786 | - return; | |
| 1787 | - } | |
| 1788 | - | |
| 1789 | - self::display_forms_list(); | |
| 1790 | - | |
| 1791 | - return; | |
| 1590 | + return self::display_forms_list(); | |
| 1792 | 1591 | } |
| 1793 | 1592 | } |
| 1794 | 1593 | |
| 1795 | 1594 | public static function json_error( $errors ) { |
| @@ -2062,15 +1861,11 @@ | ||
| 2062 | 1861 | $fields = FrmFieldsHelper::get_form_fields( $form->id, $errors ); |
| 2063 | 1862 | $reset = false; |
| 2064 | 1863 | $pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' ); |
| 2065 | 1864 | |
| 2066 | - $pass_args['action'] = $params['action']; | |
| 2067 | 1865 | $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 2068 | 1866 | |
| 2069 | 1867 | if ( ! $handle_process_here ) { |
| 2070 | - FrmFormState::set_initial_value( 'title', $title ); | |
| 2071 | - FrmFormState::set_initial_value( 'description', $description ); | |
| 2072 | - | |
| 2073 | 1868 | do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description ); |
| 2074 | 1869 | if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) { |
| 2075 | 1870 | self::show_form_after_submit( $pass_args ); |
| 2076 | 1871 | } |
| @@ -2084,10 +1879,11 @@ | ||
| 2084 | 1879 | if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) { |
| 2085 | 1880 | $entry_id = self::just_created_entry( $form->id ); |
| 2086 | 1881 | $pass_args['entry_id'] = $entry_id; |
| 2087 | 1882 | $pass_args['reset'] = true; |
| 1883 | + $pass_args['conf_method'] = self::get_confirmation_method( compact( 'form', 'entry_id' ) ); | |
| 2088 | 1884 | |
| 2089 | - self::run_on_submit_actions( $pass_args ); | |
| 1885 | + self::run_success_action( $pass_args ); | |
| 2090 | 1886 | |
| 2091 | 1887 | do_action( |
| 2092 | 1888 | 'frm_after_entry_processed', |
| 2093 | 1889 | array( |
| @@ -2133,35 +1929,15 @@ | ||
| 2133 | 1929 | return ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0; |
| 2134 | 1930 | } |
| 2135 | 1931 | |
| 2136 | 1932 | /** |
| 2137 | - * Gets confirmation method. | |
| 2138 | - * | |
| 2139 | 1933 | * @since 3.0 |
| 2140 | - * @since 6.0 This method can return an array of met On Submit actions. | |
| 2141 | - * | |
| 2142 | - * @param array $atts { | |
| 2143 | - * Atts. | |
| 2144 | - * | |
| 2145 | - * @type object $form Form object. | |
| 2146 | - * @type int $entry_id Entry ID. | |
| 2147 | - * } | |
| 2148 | - * @return string|array | |
| 2149 | 1934 | */ |
| 2150 | 1935 | private static function get_confirmation_method( $atts ) { |
| 2151 | - $action = FrmOnSubmitHelper::current_event( $atts ); | |
| 2152 | - $opt = 'update' === $action ? 'edit_action' : 'success_action'; | |
| 1936 | + $opt = 'success_action'; | |
| 2153 | 1937 | $method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message'; |
| 1938 | + $method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' ); | |
| 2154 | 1939 | |
| 2155 | - if ( ! empty( $atts['entry_id'] ) ) { | |
| 2156 | - $met_actions = self::get_met_on_submit_actions( $atts, $action ); | |
| 2157 | - if ( $met_actions ) { | |
| 2158 | - $method = $met_actions; | |
| 2159 | - } | |
| 2160 | - } | |
| 2161 | - | |
| 2162 | - $method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action ); | |
| 2163 | - | |
| 2164 | 1940 | if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) { |
| 2165 | 1941 | $method = 'message'; |
| 2166 | 1942 | } |
| 2167 | 1943 | |
| @@ -2177,34 +1953,11 @@ | ||
| 2177 | 1953 | $conf_method = self::get_confirmation_method( |
| 2178 | 1954 | array( |
| 2179 | 1955 | 'form' => $form, |
| 2180 | 1956 | 'entry_id' => $params['id'], |
| 2181 | - 'action' => FrmOnSubmitHelper::current_event( $params ), | |
| 2182 | 1957 | ) |
| 2183 | 1958 | ); |
| 2184 | 1959 | |
| 2185 | - self::maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ); | |
| 2186 | - } | |
| 2187 | - | |
| 2188 | - /** | |
| 2189 | - * Maybe trigger redirect with the new Confirmation action. | |
| 2190 | - * | |
| 2191 | - * @since 6.1.1 | |
| 2192 | - * | |
| 2193 | - * @param array|string $conf_method Array of confirmation actions or the action type string. | |
| 2194 | - * @param object $form Form object. | |
| 2195 | - * @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}. | |
| 2196 | - * @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}. | |
| 2197 | - */ | |
| 2198 | - public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) { | |
| 2199 | - if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) { | |
| 2200 | - if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) { | |
| 2201 | - $event = FrmOnSubmitHelper::current_event( $params ); | |
| 2202 | - FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event ); | |
| 2203 | - $conf_method = 'redirect'; | |
| 2204 | - } | |
| 2205 | - } | |
| 2206 | - | |
| 2207 | 1960 | if ( 'redirect' === $conf_method ) { |
| 2208 | 1961 | self::trigger_redirect( $form, $params, $args ); |
| 2209 | 1962 | } |
| 2210 | 1963 | } |
| @@ -2227,23 +1980,10 @@ | ||
| 2227 | 1980 | /** |
| 2228 | 1981 | * Used when the success action is not 'message' |
| 2229 | 1982 | * |
| 2230 | 1983 | * @since 2.05 |
| 2231 | - * @since 6.0 `$args['force_delay_redirect']` is added. | |
| 2232 | - * | |
| 2233 | - * @param array $args { | |
| 2234 | - * The args. | |
| 2235 | - * | |
| 2236 | - * @type string $conf_method The method. | |
| 2237 | - * @type object $form Form object. | |
| 2238 | - * @type int $entry_id Entry ID. | |
| 2239 | - * @type string $action The action event. Accepts `create` or `update`. | |
| 2240 | - * @type array $fields The array of fields. | |
| 2241 | - * @type int $force_delay_redirect Force to show the message before redirecting in case redirect method runs. | |
| 2242 | - * } | |
| 2243 | 1984 | */ |
| 2244 | 1985 | public static function run_success_action( $args ) { |
| 2245 | - global $frm_vars; | |
| 2246 | 1986 | $extra_args = $args; |
| 2247 | 1987 | unset( $extra_args['form'] ); |
| 2248 | 1988 | |
| 2249 | 1989 | do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args ); |
| @@ -2250,10 +1990,8 @@ | ||
| 2250 | 1990 | |
| 2251 | 1991 | $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit'; |
| 2252 | 1992 | |
| 2253 | 1993 | $args['success_opt'] = $opt; |
| 2254 | - $args['ajax'] = ! empty( $frm_vars['ajax'] ); | |
| 2255 | - | |
| 2256 | 1994 | if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) { |
| 2257 | 1995 | self::load_page_after_submit( $args ); |
| 2258 | 1996 | } elseif ( $args['conf_method'] === 'redirect' ) { |
| 2259 | 1997 | self::redirect_after_submit( $args ); |
| @@ -2262,224 +2000,8 @@ | ||
| 2262 | 2000 | } |
| 2263 | 2001 | } |
| 2264 | 2002 | |
| 2265 | 2003 | /** |
| 2266 | - * Gets met On Submit actions. | |
| 2267 | - * | |
| 2268 | - * @since 6.0 | |
| 2269 | - * | |
| 2270 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2271 | - * @param string $event Form event. Default is `create`. | |
| 2272 | - * @return array Array of actions that meet the conditional logics. | |
| 2273 | - */ | |
| 2274 | - public static function get_met_on_submit_actions( $args, $event = 'create' ) { | |
| 2275 | - if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) { | |
| 2276 | - return array(); | |
| 2277 | - } | |
| 2278 | - | |
| 2279 | - // If a redirect action has already opened the URL in a new tab, we show the default message in the currect tab. | |
| 2280 | - if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) { | |
| 2281 | - return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) ); | |
| 2282 | - } | |
| 2283 | - | |
| 2284 | - $entry = FrmEntry::getOne( $args['entry_id'], true ); | |
| 2285 | - $actions = FrmOnSubmitHelper::get_actions( $args['form']->id ); | |
| 2286 | - $met_actions = array(); | |
| 2287 | - $has_redirect = false; | |
| 2288 | - | |
| 2289 | - foreach ( $actions as $action ) { | |
| 2290 | - if ( ! in_array( $event, $action->post_content['event'], true ) ) { | |
| 2291 | - continue; | |
| 2292 | - } | |
| 2293 | - | |
| 2294 | - if ( FrmFormAction::action_conditions_met( $action, $entry ) ) { | |
| 2295 | - continue; | |
| 2296 | - } | |
| 2297 | - | |
| 2298 | - $action_type = FrmOnSubmitHelper::get_action_type( $action ); | |
| 2299 | - | |
| 2300 | - if ( 'redirect' === $action_type ) { | |
| 2301 | - if ( $has_redirect ) { // Do not process because we run the first redirect action only. | |
| 2302 | - continue; | |
| 2303 | - } | |
| 2304 | - } | |
| 2305 | - | |
| 2306 | - if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) { | |
| 2307 | - continue; | |
| 2308 | - } | |
| 2309 | - | |
| 2310 | - if ( 'redirect' === $action_type ) { | |
| 2311 | - $has_redirect = true; | |
| 2312 | - } | |
| 2313 | - | |
| 2314 | - $met_actions[] = $action; | |
| 2315 | - unset( $action ); | |
| 2316 | - } | |
| 2317 | - | |
| 2318 | - $args['event'] = $event; | |
| 2319 | - | |
| 2320 | - /** | |
| 2321 | - * Filters the On Submit actions that meet the conditional logics. | |
| 2322 | - * | |
| 2323 | - * @since 6.0 | |
| 2324 | - * | |
| 2325 | - * @param array $met_actions Actions that meet the conditional logics. | |
| 2326 | - * @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added. | |
| 2327 | - */ | |
| 2328 | - $met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args ); | |
| 2329 | - | |
| 2330 | - if ( empty( $met_actions ) ) { | |
| 2331 | - $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) ); | |
| 2332 | - } | |
| 2333 | - | |
| 2334 | - return $met_actions; | |
| 2335 | - } | |
| 2336 | - | |
| 2337 | - /** | |
| 2338 | - * Checks if a Confirmation action has the valid data. | |
| 2339 | - * | |
| 2340 | - * @since 6.1.2 | |
| 2341 | - * | |
| 2342 | - * @param object $action Form action object. | |
| 2343 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2344 | - * @param string $event Form event. Default is `create`. | |
| 2345 | - * @return bool | |
| 2346 | - */ | |
| 2347 | - private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) { | |
| 2348 | - $action_type = FrmOnSubmitHelper::get_action_type( $action ); | |
| 2349 | - | |
| 2350 | - if ( 'redirect' === $action_type ) { | |
| 2351 | - // Run through frm_redirect_url filter. This is used for the valid action check. | |
| 2352 | - $action->post_content['success_url'] = apply_filters( | |
| 2353 | - 'frm_redirect_url', | |
| 2354 | - $action->post_content['success_url'], | |
| 2355 | - $args['form'], | |
| 2356 | - $args + array( 'action' => $event ) | |
| 2357 | - ); | |
| 2358 | - | |
| 2359 | - return ! empty( $action->post_content['success_url'] ); | |
| 2360 | - } | |
| 2361 | - | |
| 2362 | - if ( 'page' === $action_type ) { | |
| 2363 | - if ( empty( $action->post_content['success_page_id'] ) ) { | |
| 2364 | - return false; | |
| 2365 | - } | |
| 2366 | - | |
| 2367 | - $page = get_post( $action->post_content['success_page_id'] ); | |
| 2368 | - if ( ! $page || 'trash' === $page->post_status ) { | |
| 2369 | - return false; | |
| 2370 | - } | |
| 2371 | - } | |
| 2372 | - | |
| 2373 | - return true; | |
| 2374 | - } | |
| 2375 | - | |
| 2376 | - /** | |
| 2377 | - * Runs On Submit actions. | |
| 2378 | - * | |
| 2379 | - * @since 6.0 | |
| 2380 | - * | |
| 2381 | - * @param array $args See inside {@see FrmFormsController::get_form_contents()} method. | |
| 2382 | - */ | |
| 2383 | - public static function run_on_submit_actions( $args ) { | |
| 2384 | - $args['conf_method'] = self::get_confirmation_method( | |
| 2385 | - array( | |
| 2386 | - 'form' => $args['form'], | |
| 2387 | - 'entry_id' => $args['entry_id'], | |
| 2388 | - 'action' => FrmOnSubmitHelper::current_event( $args ), | |
| 2389 | - ) | |
| 2390 | - ); | |
| 2391 | - if ( ! is_array( $args['conf_method'] ) ) { | |
| 2392 | - self::run_success_action( $args ); | |
| 2393 | - return; | |
| 2394 | - } | |
| 2395 | - | |
| 2396 | - // If conf_method is an array, run On Submit actions. | |
| 2397 | - if ( ! $args['conf_method'] ) { | |
| 2398 | - // Use default message. | |
| 2399 | - FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options ); | |
| 2400 | - self::run_success_action( $args ); | |
| 2401 | - } elseif ( 1 === count( $args['conf_method'] ) ) { | |
| 2402 | - FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options, reset( $args['conf_method'] ) ); | |
| 2403 | - $args['conf_method'] = $args['form']->options['success_action']; | |
| 2404 | - self::run_success_action( $args ); | |
| 2405 | - } else { | |
| 2406 | - self::run_multi_on_submit_actions( $args ); | |
| 2407 | - } | |
| 2408 | - } | |
| 2409 | - | |
| 2410 | - /** | |
| 2411 | - * Runs multiple success actions. | |
| 2412 | - * | |
| 2413 | - * @since 6.0 | |
| 2414 | - * | |
| 2415 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2416 | - */ | |
| 2417 | - public static function run_multi_on_submit_actions( $args ) { | |
| 2418 | - $redirect_action = null; | |
| 2419 | - foreach ( $args['conf_method'] as $action ) { | |
| 2420 | - if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) { | |
| 2421 | - // We catch the redirect action to run it last. | |
| 2422 | - $redirect_action = $action; | |
| 2423 | - continue; | |
| 2424 | - } | |
| 2425 | - | |
| 2426 | - self::run_single_on_submit_action( $args, $action ); | |
| 2427 | - | |
| 2428 | - unset( $action ); | |
| 2429 | - } | |
| 2430 | - | |
| 2431 | - if ( $redirect_action ) { | |
| 2432 | - // Show script to delay the redirection. | |
| 2433 | - $args['force_delay_redirect'] = true; | |
| 2434 | - self::run_single_on_submit_action( $args, $redirect_action ); | |
| 2435 | - } | |
| 2436 | - } | |
| 2437 | - | |
| 2438 | - /** | |
| 2439 | - * Runs single On Submit action. | |
| 2440 | - * | |
| 2441 | - * @since 6.0 | |
| 2442 | - * | |
| 2443 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2444 | - * @param object $action On Submit action object. | |
| 2445 | - */ | |
| 2446 | - public static function run_single_on_submit_action( $args, $action ) { | |
| 2447 | - $new_args = self::get_run_success_action_args( $args, $action ); | |
| 2448 | - self::run_success_action( $new_args ); | |
| 2449 | - } | |
| 2450 | - | |
| 2451 | - /** | |
| 2452 | - * Gets run_success_action() args from the On Submit action. | |
| 2453 | - * | |
| 2454 | - * @since 6.0 | |
| 2455 | - * | |
| 2456 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2457 | - * @param object $action On Submit action object. | |
| 2458 | - * @return array | |
| 2459 | - */ | |
| 2460 | - private static function get_run_success_action_args( $args, $action ) { | |
| 2461 | - $new_args = $args; | |
| 2462 | - | |
| 2463 | - FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] ); | |
| 2464 | - | |
| 2465 | - $opt = 'update' === $args['action'] ? 'edit_' : 'success_'; | |
| 2466 | - | |
| 2467 | - $new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ]; | |
| 2468 | - | |
| 2469 | - /** | |
| 2470 | - * Filters the run success action args. | |
| 2471 | - * | |
| 2472 | - * @since 6.0 | |
| 2473 | - * | |
| 2474 | - * @param array $new_args The new args. | |
| 2475 | - * @param array $args The old args. See {@see FrmFormsController::run_success_action()}. | |
| 2476 | - * @param object $action On Submit action object. | |
| 2477 | - */ | |
| 2478 | - return apply_filters( 'frm_get_run_success_action_args', $new_args, $args, $action ); | |
| 2479 | - } | |
| 2480 | - | |
| 2481 | - /** | |
| 2482 | 2004 | * @since 3.0 |
| 2483 | 2005 | */ |
| 2484 | 2006 | private static function load_page_after_submit( $args ) { |
| 2485 | 2007 | global $post; |
| @@ -2488,22 +2010,9 @@ | ||
| 2488 | 2010 | $page = get_post( $args['form']->options[ $opt . '_page_id' ] ); |
| 2489 | 2011 | $old_post = $post; |
| 2490 | 2012 | $post = $page; |
| 2491 | 2013 | $content = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] ); |
| 2492 | - | |
| 2493 | - // Fix the On Submit page content doesn't show when previewing In theme. | |
| 2494 | - $has_preview_filter = has_filter( 'the_content', 'FrmFormsController::preview_content' ); | |
| 2495 | - | |
| 2496 | - if ( $has_preview_filter ) { | |
| 2497 | - remove_filter( 'the_content', 'FrmFormsController::preview_content', 9999 ); | |
| 2498 | - } | |
| 2499 | - | |
| 2500 | 2014 | echo apply_filters( 'the_content', $content ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped |
| 2501 | - | |
| 2502 | - if ( $has_preview_filter ) { | |
| 2503 | - add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 ); | |
| 2504 | - } | |
| 2505 | - | |
| 2506 | 2015 | $post = $old_post; |
| 2507 | 2016 | } |
| 2508 | 2017 | } |
| 2509 | 2018 | |
| @@ -2508,11 +2017,12 @@ | ||
| 2508 | 2017 | } |
| 2509 | 2018 | |
| 2510 | 2019 | /** |
| 2511 | 2020 | * @since 3.0 |
| 2512 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2513 | 2021 | */ |
| 2514 | 2022 | private static function redirect_after_submit( $args ) { |
| 2023 | + global $frm_vars; | |
| 2024 | + | |
| 2515 | 2025 | add_filter( 'frm_use_wpautop', '__return_false' ); |
| 2516 | 2026 | |
| 2517 | 2027 | $opt = $args['success_opt']; |
| 2518 | 2028 | $success_url = trim( $args['form']->options[ $opt . '_url' ] ); |
| @@ -2518,8 +2028,12 @@ | ||
| 2518 | 2028 | $success_url = trim( $args['form']->options[ $opt . '_url' ] ); |
| 2519 | 2029 | $success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] ); |
| 2520 | 2030 | $success_url = do_shortcode( $success_url ); |
| 2521 | 2031 | |
| 2032 | + $success_msg = isset( $args['form']->options[ $opt . '_msg' ] ) ? $args['form']->options[ $opt . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' ); | |
| 2033 | + | |
| 2034 | + $redirect_msg = self::get_redirect_message( $success_url, $success_msg, $args ); | |
| 2035 | + | |
| 2522 | 2036 | $args['id'] = $args['entry_id']; |
| 2523 | 2037 | FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args ); |
| 2524 | 2038 | |
| 2525 | 2039 | add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' ); |
| @@ -2526,122 +2040,19 @@ | ||
| 2526 | 2040 | $success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args ); |
| 2527 | 2041 | |
| 2528 | 2042 | $doing_ajax = FrmAppHelper::doing_ajax(); |
| 2529 | 2043 | |
| 2530 | - if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) { // Is AJAX submit and there is just one Redirect action runs. | |
| 2531 | - echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) ); | |
| 2044 | + if ( isset( $args['ajax'] ) && $args['ajax'] && $doing_ajax ) { | |
| 2045 | + echo json_encode( array( 'redirect' => $success_url ) ); | |
| 2532 | 2046 | wp_die(); |
| 2533 | - } | |
| 2534 | - | |
| 2535 | - if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) { // Not AJAX submit, no headers sent, and there is just one Redirect action runs. | |
| 2536 | - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) { | |
| 2537 | - self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args ); | |
| 2538 | - self::$redirected_in_new_tab[ $args['form']->id ] = 1; | |
| 2539 | - return; | |
| 2540 | - } | |
| 2541 | - | |
| 2047 | + } elseif ( ! headers_sent() ) { | |
| 2542 | 2048 | wp_redirect( esc_url_raw( $success_url ) ); |
| 2543 | 2049 | die(); // do not use wp_die or redirect fails |
| 2544 | - } | |
| 2545 | - | |
| 2546 | - // Redirect with a delay. | |
| 2547 | - self::redirect_after_submit_using_js( $args + compact( 'success_url', 'doing_ajax' ) ); | |
| 2548 | - } | |
| 2549 | - | |
| 2550 | - /** | |
| 2551 | - * Prints open in new tab js with fallback handler. | |
| 2552 | - * | |
| 2553 | - * @since 6.x | |
| 2554 | - * | |
| 2555 | - * @param string $success_url Success URL. | |
| 2556 | - * @param array $args See {@see FrmFormsController::redirect_after_submit()}. | |
| 2557 | - */ | |
| 2558 | - private static function print_open_in_new_tab_js_with_fallback_handler( $success_url, $args ) { | |
| 2559 | - echo '<script>var newTab = window.open("' . esc_url_raw( $success_url ) . '", "_blank");'; | |
| 2560 | - echo 'if ( ! newTab ) {'; | |
| 2561 | - | |
| 2562 | - $data = array( | |
| 2563 | - 'formId' => intval( $args['form']->id ), | |
| 2564 | - 'message' => self::get_redirect_fallback_message( $success_url, $args ), | |
| 2565 | - ); | |
| 2566 | - // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 2567 | - echo 'frmShowNewTabFallback = ' . FrmAppHelper::maybe_json_encode( $data ) . ';'; | |
| 2568 | - echo '}</script>'; | |
| 2569 | - } | |
| 2570 | - | |
| 2571 | - /** | |
| 2572 | - * Gets response data for redirect action when AJAX submitting. | |
| 2573 | - * | |
| 2574 | - * @since 6.x | |
| 2575 | - * | |
| 2576 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2577 | - * @return array | |
| 2578 | - */ | |
| 2579 | - private static function get_ajax_redirect_response_data( $args ) { | |
| 2580 | - $response_data = array( 'redirect' => $args['success_url'] ); | |
| 2581 | - | |
| 2582 | - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) { | |
| 2583 | - $response_data['openInNewTab'] = 1; | |
| 2584 | - | |
| 2585 | - $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg(); | |
| 2586 | - | |
| 2587 | - $args['form']->options['success_msg'] = $args['message']; | |
| 2588 | - $args['form']->options['edit_msg'] = $args['message']; | |
| 2589 | - if ( ! isset( $args['fields'] ) ) { | |
| 2590 | - $args['fields'] = FrmField::get_all_for_form( $args['form']->id ); | |
| 2591 | - } | |
| 2592 | - | |
| 2593 | - $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args ); | |
| 2594 | - | |
| 2595 | - ob_start(); | |
| 2596 | - self::show_lone_success_messsage( $args ); | |
| 2597 | - $response_data['content'] = ob_get_clean(); | |
| 2598 | - | |
| 2599 | - $response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args ); | |
| 2600 | - } | |
| 2601 | - | |
| 2602 | - return $response_data; | |
| 2603 | - } | |
| 2604 | - | |
| 2605 | - /** | |
| 2606 | - * Redirects after submitting using JS. This is used when showing message before redirecting. | |
| 2607 | - * | |
| 2608 | - * @since 6.0 | |
| 2609 | - * | |
| 2610 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2611 | - */ | |
| 2612 | - private static function redirect_after_submit_using_js( $args ) { | |
| 2613 | - $success_msg = FrmOnSubmitHelper::get_default_redirect_msg(); | |
| 2614 | - $redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args ); | |
| 2615 | - $success_url = esc_url_raw( $args['success_url'] ); | |
| 2616 | - | |
| 2617 | - /** | |
| 2618 | - * Filters the delay time before redirecting when On Submit Redirect action is delayed. | |
| 2619 | - * | |
| 2620 | - * @since 6.0 | |
| 2621 | - * | |
| 2622 | - * @param int $delay_time Delay time in miliseconds. | |
| 2623 | - */ | |
| 2624 | - $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 ); | |
| 2625 | - | |
| 2626 | - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) { | |
| 2627 | - $redirect_js = 'window.open("' . $success_url . '", "_blank")'; | |
| 2628 | 2050 | } else { |
| 2629 | - $redirect_js = 'window.location="' . $success_url . '";'; | |
| 2051 | + add_filter( 'frm_use_wpautop', '__return_true' ); | |
| 2052 | + echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 2053 | + echo "<script type='text/javascript'>window.onload = function(){setTimeout(window.location='" . esc_url_raw( $success_url ) . "', 8000);}</script>"; | |
| 2630 | 2054 | } |
| 2631 | - | |
| 2632 | - add_filter( 'frm_use_wpautop', '__return_true' ); | |
| 2633 | - | |
| 2634 | - echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 2635 | - echo '<script>'; | |
| 2636 | - if ( empty( $args['doing_ajax'] ) ) { // Not AJAX submit, delay JS until window.load. | |
| 2637 | - echo 'window.onload=function(){'; | |
| 2638 | - } | |
| 2639 | - echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 2640 | - if ( empty( $args['doing_ajax'] ) ) { | |
| 2641 | - echo '};'; | |
| 2642 | - } | |
| 2643 | - echo '</script>'; | |
| 2644 | 2055 | } |
| 2645 | 2056 | |
| 2646 | 2057 | /** |
| 2647 | 2058 | * @since 3.0 |
| @@ -2650,10 +2061,11 @@ | ||
| 2650 | 2061 | * @param string $success_msg |
| 2651 | 2062 | * @param array $args |
| 2652 | 2063 | */ |
| 2653 | 2064 | private static function get_redirect_message( $success_url, $success_msg, $args ) { |
| 2654 | - $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' . | |
| 2655 | - self::get_redirect_fallback_message( $success_url, $args ) . | |
| 2065 | + $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg frm_message" role="status">' . $success_msg . '<br/>' . | |
| 2066 | + /* translators: %1$s: Start link HTML, %2$s: End link HTML */ | |
| 2067 | + sprintf( __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), '<a href="' . esc_url( $success_url ) . '">', '</a>' ) . | |
| 2656 | 2068 | '</div></div>'; |
| 2657 | 2069 | |
| 2658 | 2070 | $redirect_args = array( |
| 2659 | 2071 | 'entry_id' => $args['entry_id'], |
| @@ -2664,50 +2076,17 @@ | ||
| 2664 | 2076 | return apply_filters( 'frm_redirect_msg', $redirect_msg, $redirect_args ); |
| 2665 | 2077 | } |
| 2666 | 2078 | |
| 2667 | 2079 | /** |
| 2668 | - * Gets fallback message when redirecting failed. | |
| 2669 | - * | |
| 2670 | - * @since 6.x | |
| 2671 | - * | |
| 2672 | - * @param string $success_url Redirect URL. | |
| 2673 | - * @param array $args Contains `form` object. | |
| 2674 | - * @return string | |
| 2675 | - */ | |
| 2676 | - private static function get_redirect_fallback_message( $success_url, $args ) { | |
| 2677 | - $target = ''; | |
| 2678 | - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) { | |
| 2679 | - $target = ' target="_blank"'; | |
| 2680 | - } | |
| 2681 | - | |
| 2682 | - return sprintf( | |
| 2683 | - /* translators: %1$s: Start link HTML, %2$s: End link HTML */ | |
| 2684 | - __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), | |
| 2685 | - '<a href="' . esc_url( $success_url ) . '"' . $target . '>', | |
| 2686 | - '</a>' | |
| 2687 | - ); | |
| 2688 | - } | |
| 2689 | - | |
| 2690 | - /** | |
| 2691 | 2080 | * Prepare to show the success message and empty form after submit |
| 2692 | 2081 | * |
| 2693 | 2082 | * @since 2.05 |
| 2694 | 2083 | */ |
| 2695 | 2084 | public static function show_message_after_save( $atts ) { |
| 2696 | - $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts ); | |
| 2085 | + $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'] ); | |
| 2697 | 2086 | |
| 2698 | 2087 | if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) { |
| 2699 | - if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) { | |
| 2700 | - $entry = FrmEntry::getOne( $atts['entry_id'] ); | |
| 2701 | - if ( $entry ) { | |
| 2702 | - // This is copied from the Pro plugin. | |
| 2703 | - $atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts ); | |
| 2704 | - $atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] ); | |
| 2705 | - FrmProEntriesController::show_front_end_form_with_entry( $entry, $atts ); | |
| 2706 | - } | |
| 2707 | - } else { | |
| 2708 | - self::show_form_after_submit( $atts ); | |
| 2709 | - } | |
| 2088 | + self::show_form_after_submit( $atts ); | |
| 2710 | 2089 | } else { |
| 2711 | 2090 | self::show_lone_success_messsage( $atts ); |
| 2712 | 2091 | } |
| 2713 | 2092 | } |
| @@ -2777,16 +2156,8 @@ | ||
| 2777 | 2156 | * |
| 2778 | 2157 | * @since 2.05 |
| 2779 | 2158 | */ |
| 2780 | 2159 | private static function fill_atts_for_form_display( &$args ) { |
| 2781 | - if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) { | |
| 2782 | - $args['title'] = $args['show_title']; | |
| 2783 | - } | |
| 2784 | - | |
| 2785 | - if ( ! isset( $args['description'] ) && isset( $args['show_description'] ) ) { | |
| 2786 | - $args['description'] = $args['show_description']; | |
| 2787 | - } | |
| 2788 | - | |
| 2789 | 2160 | $defaults = array( |
| 2790 | 2161 | 'errors' => array(), |
| 2791 | 2162 | 'message' => '', |
| 2792 | 2163 | 'fields' => array(), |
| @@ -2820,21 +2191,14 @@ | ||
| 2820 | 2191 | /** |
| 2821 | 2192 | * Prepare the success message before it's shown |
| 2822 | 2193 | * |
| 2823 | 2194 | * @since 2.05 |
| 2824 | - * @since 6.0.x Added the third parameter. | |
| 2825 | - * | |
| 2826 | - * @param object $form Form object. | |
| 2827 | - * @param int $entry_id Entry ID. | |
| 2828 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2829 | - * @return string | |
| 2830 | 2195 | */ |
| 2831 | - private static function prepare_submit_message( $form, $entry_id, $args = array() ) { | |
| 2196 | + private static function prepare_submit_message( $form, $entry_id ) { | |
| 2832 | 2197 | $frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) ); |
| 2833 | - $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success'; | |
| 2834 | 2198 | |
| 2835 | 2199 | if ( $entry_id && is_numeric( $entry_id ) ) { |
| 2836 | - $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg; | |
| 2200 | + $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg; | |
| 2837 | 2201 | $class = 'frm_message'; |
| 2838 | 2202 | } else { |
| 2839 | 2203 | $message = $frm_settings->failed_msg; |
| 2840 | 2204 | $class = FrmFormsHelper::form_error_class(); |
| @@ -2844,11 +2208,8 @@ | ||
| 2844 | 2208 | |
| 2845 | 2209 | return apply_filters( 'frm_main_feedback', $message, $form, $entry_id ); |
| 2846 | 2210 | } |
| 2847 | 2211 | |
| 2848 | - /** | |
| 2849 | - * @return void | |
| 2850 | - */ | |
| 2851 | 2212 | public static function front_head() { |
| 2852 | 2213 | $version = FrmAppHelper::plugin_version(); |
| 2853 | 2214 | $suffix = FrmAppHelper::js_suffix(); |
| 2854 | 2215 | |
| @@ -2894,38 +2255,24 @@ | ||
| 2894 | 2255 | * If css is loaded only on applicable pages, include it before the form loads |
| 2895 | 2256 | * to prevent a flash of unstyled form. |
| 2896 | 2257 | * |
| 2897 | 2258 | * @since 4.01 |
| 2898 | - * | |
| 2899 | - * @return void | |
| 2900 | 2259 | */ |
| 2901 | 2260 | private static function load_late_css() { |
| 2902 | 2261 | $frm_settings = FrmAppHelper::get_settings(); |
| 2903 | - $late_css = $frm_settings->load_style === 'dynamic'; | |
| 2904 | - | |
| 2905 | - if ( ! $late_css || ! self::should_load_late() ) { | |
| 2262 | + $late_css = $frm_settings->load_style === 'dynamic'; | |
| 2263 | + if ( ! $late_css ) { | |
| 2906 | 2264 | return; |
| 2907 | 2265 | } |
| 2908 | 2266 | |
| 2909 | 2267 | global $wp_styles; |
| 2910 | - if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) { | |
| 2268 | + if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue ) ) { | |
| 2911 | 2269 | wp_print_styles( 'formidable' ); |
| 2912 | 2270 | } |
| 2913 | 2271 | } |
| 2914 | 2272 | |
| 2915 | - /** | |
| 2916 | - * Avoid late load if All in One SEO is active because it prevents CSS from loading entirely. | |
| 2917 | - * | |
| 2918 | - * @since 5.2.03 | |
| 2919 | - * | |
| 2920 | - * @return bool | |
| 2921 | - */ | |
| 2922 | - private static function should_load_late() { | |
| 2923 | - return ! function_exists( 'aioseo' ); | |
| 2924 | - } | |
| 2925 | - | |
| 2926 | 2273 | public static function defer_script_loading( $tag, $handle ) { |
| 2927 | - if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) { | |
| 2274 | + if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) { | |
| 2928 | 2275 | $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag ); |
| 2929 | 2276 | } |
| 2930 | 2277 | |
| 2931 | 2278 | return $tag; |
| @@ -3092,13 +2439,29 @@ | ||
| 3092 | 2439 | self::update( $values ); |
| 3093 | 2440 | } |
| 3094 | 2441 | |
| 3095 | 2442 | /** |
| 2443 | + * @deprecated 1.07.05 | |
| 2444 | + * @codeCoverageIgnore | |
| 2445 | + */ | |
| 2446 | + public static function add_default_templates( $path, $default = true, $template = true ) { | |
| 2447 | + FrmDeprecated::add_default_templates( $path, $default, $template ); | |
| 2448 | + } | |
| 2449 | + | |
| 2450 | + /** | |
| 3096 | 2451 | * @deprecated 3.0 |
| 3097 | 2452 | * @codeCoverageIgnore |
| 3098 | 2453 | */ |
| 3099 | 2454 | public static function bulk_create_template( $ids ) { |
| 3100 | 2455 | return FrmDeprecated::bulk_create_template( $ids ); |
| 2456 | + } | |
| 2457 | + | |
| 2458 | + /** | |
| 2459 | + * @deprecated 2.03 | |
| 2460 | + * @codeCoverageIgnore | |
| 2461 | + */ | |
| 2462 | + public static function register_pro_scripts() { | |
| 2463 | + FrmDeprecated::register_pro_scripts(); | |
| 3101 | 2464 | } |
| 3102 | 2465 | |
| 3103 | 2466 | /** |
| 3104 | 2467 | * @deprecated 3.0 |
