| @@ -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)'; |
| @@ -55,11 +45,11 @@ | ||
| 55 | 45 | public static function logic_tip() { |
| 56 | 46 | $images_url = FrmAppHelper::plugin_url() . '/images/'; |
| 57 | 47 | $data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' ); |
| 58 | 48 | $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' ) ); | |
| 49 | + 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">'; | |
| 50 | + FrmAppHelper::icon_by_class( 'frmfont frm_swap_icon' ); | |
| 51 | + esc_html_e( 'Add Conditional Logic', 'formidable' ); | |
| 62 | 52 | echo '</a>'; |
| 63 | 53 | } |
| 64 | 54 | |
| 65 | 55 | /** |
| @@ -108,34 +98,8 @@ | ||
| 108 | 98 | $action_control->create( $form->id ); |
| 109 | 99 | } |
| 110 | 100 | } |
| 111 | 101 | |
| 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 | 102 | public static function edit( $values = false ) { |
| 139 | 103 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 140 | 104 | |
| 141 | 105 | $id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' ); |
| @@ -149,10 +113,8 @@ | ||
| 149 | 113 | if ( ! $id || ! is_numeric( $id ) ) { |
| 150 | 114 | $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' ); |
| 151 | 115 | } |
| 152 | 116 | |
| 153 | - FrmOnSubmitHelper::maybe_migrate_submit_settings_to_action( $id ); | |
| 154 | - | |
| 155 | 117 | return self::get_settings_vars( $id, array(), $message ); |
| 156 | 118 | } |
| 157 | 119 | |
| 158 | 120 | public static function update_settings() { |
| @@ -269,29 +231,18 @@ | ||
| 269 | 231 | } |
| 270 | 232 | |
| 271 | 233 | public static function duplicate() { |
| 272 | 234 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 273 | - $nonce = FrmAppHelper::simple_get( '_wpnonce' ); | |
| 274 | 235 | |
| 275 | - if ( ! wp_verify_nonce( $nonce ) ) { | |
| 276 | - $frm_settings = FrmAppHelper::get_settings(); | |
| 277 | - wp_die( esc_html( $frm_settings->admin_permission ) ); | |
| 278 | - } | |
| 279 | - | |
| 280 | 236 | $params = FrmForm::list_page_params(); |
| 281 | 237 | $form = FrmForm::duplicate( $params['id'], $params['template'], true ); |
| 282 | - $url = admin_url( 'admin.php?page=formidable' ); | |
| 283 | - $message = 'form_duplicate_error'; | |
| 238 | + $message = $params['template'] ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' ); | |
| 284 | 239 | |
| 285 | 240 | if ( $form ) { |
| 286 | - $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) ); | |
| 287 | - $message = 'form_duplicated'; | |
| 241 | + return self::get_edit_vars( $form, array(), $message, true ); | |
| 288 | 242 | } |
| 289 | 243 | |
| 290 | - $url .= '&message=' . $message; | |
| 291 | - | |
| 292 | - wp_safe_redirect( $url ); | |
| 293 | - exit(); | |
| 244 | + self::display_forms_list( $params, __( 'There was a problem creating the new template.', 'formidable' ) ); | |
| 294 | 245 | } |
| 295 | 246 | |
| 296 | 247 | /** |
| 297 | 248 | * @return string |
| @@ -335,59 +286,30 @@ | ||
| 335 | 286 | |
| 336 | 287 | wp_die(); |
| 337 | 288 | } |
| 338 | 289 | |
| 339 | - /** | |
| 340 | - * Set the page global to any available page (except for the Blog Page). | |
| 341 | - * | |
| 342 | - * @return void | |
| 343 | - */ | |
| 344 | 290 | 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( | |
| 291 | + $random_page = get_posts( | |
| 365 | 292 | array( |
| 366 | - 'post_type' => 'page', | |
| 367 | - 'page_id' => $random_page->ID, | |
| 293 | + 'numberposts' => 1, | |
| 294 | + 'orderby' => 'date', | |
| 295 | + 'order' => 'ASC', | |
| 296 | + 'post_type' => 'page', | |
| 368 | 297 | ) |
| 369 | 298 | ); |
| 370 | 299 | |
| 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 ); | |
| 300 | + if ( ! empty( $random_page ) ) { | |
| 301 | + $random_page = reset( $random_page ); | |
| 302 | + query_posts( | |
| 303 | + array( | |
| 304 | + 'post_type' => 'page', | |
| 305 | + 'page_id' => $random_page->ID, | |
| 306 | + ) | |
| 307 | + ); | |
| 308 | + } | |
| 374 | 309 | } |
| 375 | 310 | |
| 376 | 311 | /** |
| 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 | 312 | * @since 3.0 |
| 391 | 313 | */ |
| 392 | 314 | private static function load_theme_preview() { |
| 393 | 315 | add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 ); |
| @@ -397,29 +319,13 @@ | ||
| 397 | 319 | add_filter( 'is_active_sidebar', '__return_false' ); |
| 398 | 320 | FrmStylesController::enqueue_css( 'enqueue', true ); |
| 399 | 321 | |
| 400 | 322 | if ( false === get_template_part( 'page' ) ) { |
| 401 | - if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) { | |
| 402 | - add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' ); | |
| 403 | - } | |
| 404 | 323 | self::fallback_when_page_template_part_is_not_supported_by_theme(); |
| 405 | 324 | } |
| 406 | 325 | } |
| 407 | 326 | |
| 408 | 327 | /** |
| 409 | - * Add padding to the body for block themes. | |
| 410 | - * | |
| 411 | - * @since 6.5.2 | |
| 412 | - * | |
| 413 | - * @param array $classes The body classes list. | |
| 414 | - * @return array | |
| 415 | - */ | |
| 416 | - public static function preview_block_theme_body_classnames( $classes ) { | |
| 417 | - $classes[] = 'has-global-padding'; | |
| 418 | - return $classes; | |
| 419 | - } | |
| 420 | - | |
| 421 | - /** | |
| 422 | 328 | * Not every theme supports get_template_part( 'page' ). |
| 423 | 329 | * When this is not supported, false is returned, and we can handle a fallback. |
| 424 | 330 | */ |
| 425 | 331 | private static function fallback_when_page_template_part_is_not_supported_by_theme() { |
| @@ -493,24 +399,15 @@ | ||
| 493 | 399 | public static function untrash() { |
| 494 | 400 | self::change_form_status( 'untrash' ); |
| 495 | 401 | } |
| 496 | 402 | |
| 497 | - /** | |
| 498 | - * @param array $ids | |
| 499 | - * @return string | |
| 500 | - */ | |
| 501 | 403 | public static function bulk_untrash( $ids ) { |
| 502 | 404 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 503 | 405 | |
| 504 | 406 | $count = FrmForm::set_status( $ids, 'published' ); |
| 505 | 407 | |
| 506 | - if ( ! $count ) { | |
| 507 | - // Don't show "0 forms restored" on refresh. | |
| 508 | - return ''; | |
| 509 | - } | |
| 510 | - | |
| 511 | 408 | /* translators: %1$s: Number of forms */ |
| 512 | - $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count ); | |
| 409 | + $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 ); | |
| 513 | 410 | |
| 514 | 411 | return $message; |
| 515 | 412 | } |
| 516 | 413 | |
| @@ -665,8 +562,10 @@ | ||
| 665 | 562 | * |
| 666 | 563 | * @since 4.0 |
| 667 | 564 | */ |
| 668 | 565 | public static function build_new_form() { |
| 566 | + global $wpdb; | |
| 567 | + | |
| 669 | 568 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 670 | 569 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 671 | 570 | |
| 672 | 571 | $new_values = self::get_modal_values(); |
| @@ -672,9 +571,8 @@ | ||
| 672 | 571 | $new_values = self::get_modal_values(); |
| 673 | 572 | $new_values['form_key'] = $new_values['name']; |
| 674 | 573 | $new_values['options'] = array( |
| 675 | 574 | 'antispam' => 1, |
| 676 | - 'on_submit_migrated' => 1, | |
| 677 | 575 | ); |
| 678 | 576 | |
| 679 | 577 | /** |
| 680 | 578 | * Allows changing form values before creating from the modal. |
| @@ -692,9 +590,8 @@ | ||
| 692 | 590 | * @param int $form_id |
| 693 | 591 | */ |
| 694 | 592 | do_action( 'frm_build_new_form', $form_id ); |
| 695 | 593 | |
| 696 | - self::create_default_on_submit_action( $form_id ); | |
| 697 | 594 | self::create_default_email_action( $form_id ); |
| 698 | 595 | |
| 699 | 596 | $response = array( |
| 700 | 597 | 'redirect' => FrmForm::get_edit_link( $form_id ), |
| @@ -728,9 +625,9 @@ | ||
| 728 | 625 | FrmForm::clear_form_cache(); |
| 729 | 626 | } |
| 730 | 627 | |
| 731 | 628 | $response = array( |
| 732 | - 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . $new_form_id ) . '&_wpnonce=' . wp_create_nonce(), | |
| 629 | + 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . $new_form_id ), | |
| 733 | 630 | ); |
| 734 | 631 | } |
| 735 | 632 | |
| 736 | 633 | echo wp_json_encode( $response ); |
| @@ -904,16 +801,32 @@ | ||
| 904 | 801 | * @param array<string,string> $columns |
| 905 | 802 | * @return array<string,string> |
| 906 | 803 | */ |
| 907 | 804 | public static function get_columns( $columns ) { |
| 908 | - $columns['cb'] = '<input type="checkbox" />'; | |
| 909 | - $columns['name'] = esc_html__( 'Form Title', 'formidable' ); | |
| 910 | - $columns['entries'] = esc_html__( 'Entries', 'formidable' ); | |
| 911 | - $columns['id'] = 'ID'; | |
| 912 | - $columns['form_key'] = esc_html__( 'Key', 'formidable' ); | |
| 913 | - $columns['shortcode'] = esc_html__( 'Actions', 'formidable' ); | |
| 914 | - $columns['created_at'] = esc_html__( 'Date', 'formidable' ); | |
| 805 | + $columns['cb'] = '<input type="checkbox" />'; | |
| 806 | + $columns['id'] = 'ID'; | |
| 915 | 807 | |
| 808 | + $type = FrmAppHelper::get_simple_request( | |
| 809 | + array( | |
| 810 | + 'param' => 'form_type', | |
| 811 | + 'type' => 'request', | |
| 812 | + 'default' => 'published', | |
| 813 | + ) | |
| 814 | + ); | |
| 815 | + | |
| 816 | + if ( 'template' === $type ) { | |
| 817 | + $columns['name'] = __( 'Template Name', 'formidable' ); | |
| 818 | + $columns['type'] = __( 'Type', 'formidable' ); | |
| 819 | + $columns['form_key'] = __( 'Key', 'formidable' ); | |
| 820 | + } else { | |
| 821 | + $columns['name'] = __( 'Form Title', 'formidable' ); | |
| 822 | + $columns['entries'] = __( 'Entries', 'formidable' ); | |
| 823 | + $columns['form_key'] = __( 'Key', 'formidable' ); | |
| 824 | + $columns['shortcode'] = __( 'Actions', 'formidable' ); | |
| 825 | + } | |
| 826 | + | |
| 827 | + $columns['created_at'] = __( 'Date', 'formidable' ); | |
| 828 | + | |
| 916 | 829 | add_screen_option( |
| 917 | 830 | 'per_page', |
| 918 | 831 | array( |
| 919 | 832 | 'label' => __( 'Forms', 'formidable' ), |
| @@ -934,17 +847,9 @@ | ||
| 934 | 847 | 'created_at' => 'created_at', |
| 935 | 848 | ); |
| 936 | 849 | } |
| 937 | 850 | |
| 938 | - /** | |
| 939 | - * @param mixed $hidden_columns | |
| 940 | - * @return array | |
| 941 | - */ | |
| 942 | 851 | public static function hidden_columns( $hidden_columns ) { |
| 943 | - if ( ! is_array( $hidden_columns ) ) { | |
| 944 | - $hidden_columns = array(); | |
| 945 | - } | |
| 946 | - | |
| 947 | 852 | $type = FrmAppHelper::get_simple_request( |
| 948 | 853 | array( |
| 949 | 854 | 'param' => 'form_type', |
| 950 | 855 | 'type' => 'request', |
| @@ -976,10 +881,8 @@ | ||
| 976 | 881 | } |
| 977 | 882 | |
| 978 | 883 | /** |
| 979 | 884 | * Get data from api before rendering it so that we can flag the modal as expired |
| 980 | - * | |
| 981 | - * @return void | |
| 982 | 885 | */ |
| 983 | 886 | public static function before_list_templates() { |
| 984 | 887 | global $frm_templates; |
| 985 | 888 | global $frm_expired; |
| @@ -1000,11 +903,8 @@ | ||
| 1000 | 903 | $frm_expired = $expired; |
| 1001 | 904 | $frm_license_type = $license_type; |
| 1002 | 905 | } |
| 1003 | 906 | |
| 1004 | - /** | |
| 1005 | - * @return void | |
| 1006 | - */ | |
| 1007 | 907 | public static function list_templates() { |
| 1008 | 908 | global $frm_templates; |
| 1009 | 909 | global $frm_license_type; |
| 1010 | 910 | |
| @@ -1088,9 +988,9 @@ | ||
| 1088 | 988 | 'id' => $template->id, |
| 1089 | 989 | 'name' => $template->name, |
| 1090 | 990 | 'key' => $template->form_key, |
| 1091 | 991 | 'description' => $template->description, |
| 1092 | - 'url' => wp_nonce_url( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ) ), | |
| 992 | + 'url' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ), | |
| 1093 | 993 | 'released' => $template->created_at, |
| 1094 | 994 | 'installed' => 1, |
| 1095 | 995 | ); |
| 1096 | 996 | array_unshift( $templates, $template ); |
| @@ -1142,10 +1042,8 @@ | ||
| 1142 | 1042 | if ( $form->is_template && $message == $edit_message ) { |
| 1143 | 1043 | $message = __( 'Template was successfully updated.', 'formidable' ); |
| 1144 | 1044 | } |
| 1145 | 1045 | |
| 1146 | - self::maybe_update_form_builder_message( $message ); | |
| 1147 | - | |
| 1148 | 1046 | $all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' ); |
| 1149 | 1047 | $has_fields = isset( $values['fields'] ) && ! empty( $values['fields'] ); |
| 1150 | 1048 | |
| 1151 | 1049 | if ( defined( 'DOING_AJAX' ) ) { |
| @@ -1154,21 +1052,8 @@ | ||
| 1154 | 1052 | require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' ); |
| 1155 | 1053 | } |
| 1156 | 1054 | } |
| 1157 | 1055 | |
| 1158 | - public static function update_form_builder_fields( $fields, $form ) { | |
| 1159 | - foreach ( $fields as $field ) { | |
| 1160 | - $field->do_not_include_icons = true; | |
| 1161 | - } | |
| 1162 | - return $fields; | |
| 1163 | - } | |
| 1164 | - | |
| 1165 | - public static function maybe_update_form_builder_message( &$message ) { | |
| 1166 | - if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) { | |
| 1167 | - $message = __( 'Form was Successfully Copied', 'formidable' ); | |
| 1168 | - } | |
| 1169 | - } | |
| 1170 | - | |
| 1171 | 1056 | public static function get_settings_vars( $id, $errors = array(), $args = array() ) { |
| 1172 | 1057 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 1173 | 1058 | |
| 1174 | 1059 | global $frm_vars; |
| @@ -1240,66 +1125,50 @@ | ||
| 1240 | 1125 | 'id' => 'frm_notification_settings', |
| 1241 | 1126 | 'icon' => 'frm_icon_font frm_mail_bulk_icon', |
| 1242 | 1127 | ), |
| 1243 | 1128 | 'permissions' => array( |
| 1244 | - 'name' => __( 'Form Permissions', 'formidable' ), | |
| 1245 | - 'icon' => 'frm_icon_font frm_lock_icon', | |
| 1246 | - 'html_class' => 'frm_show_upgrade_tab frm_noallow', | |
| 1247 | - 'data' => array( | |
| 1248 | - 'medium' => 'permissions', | |
| 1249 | - 'upgrade' => __( 'Form Permissions', 'formidable' ), | |
| 1250 | - 'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ), | |
| 1251 | - 'screenshot' => 'permissions.png', | |
| 1129 | + 'name' => __( 'Form Permissions', 'formidable' ), | |
| 1130 | + 'icon' => 'frm_icon_font frm_lock_icon', | |
| 1131 | + 'html_class' => 'frm_show_upgrade frm_noallow', | |
| 1132 | + 'data' => array( | |
| 1133 | + 'medium' => 'permissions', | |
| 1134 | + 'upgrade' => __( 'Form Permissions', 'formidable' ), | |
| 1135 | + 'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ), | |
| 1252 | 1136 | ), |
| 1253 | 1137 | ), |
| 1254 | 1138 | 'scheduling' => array( |
| 1255 | - 'name' => __( 'Form Scheduling', 'formidable' ), | |
| 1256 | - 'icon' => 'frm_icon_font frm_calendar_icon', | |
| 1257 | - 'html_class' => 'frm_show_upgrade_tab frm_noallow', | |
| 1258 | - 'data' => array( | |
| 1259 | - 'medium' => 'scheduling', | |
| 1260 | - 'upgrade' => __( 'Form scheduling settings', 'formidable' ), | |
| 1261 | - 'screenshot' => 'scheduling.png', | |
| 1139 | + 'name' => __( 'Form Scheduling', 'formidable' ), | |
| 1140 | + 'icon' => 'frm_icon_font frm_calendar_icon', | |
| 1141 | + 'html_class' => 'frm_show_upgrade frm_noallow', | |
| 1142 | + 'data' => array( | |
| 1143 | + 'medium' => 'scheduling', | |
| 1144 | + 'upgrade' => __( 'Form scheduling settings', 'formidable' ), | |
| 1262 | 1145 | ), |
| 1263 | 1146 | ), |
| 1264 | 1147 | 'buttons' => array( |
| 1265 | - 'name' => __( 'Buttons', 'formidable' ), | |
| 1148 | + 'name' => __( 'Styling & Buttons', 'formidable' ), | |
| 1266 | 1149 | 'class' => __CLASS__, |
| 1267 | 1150 | 'function' => 'buttons_settings', |
| 1268 | - 'icon' => 'frm_icon_font frm_button_icon', | |
| 1151 | + 'icon' => 'frm_icon_font frm_pallet_icon', | |
| 1269 | 1152 | ), |
| 1270 | 1153 | 'landing' => array( |
| 1271 | 1154 | 'name' => __( 'Form Landing Page', 'formidable' ), |
| 1272 | 1155 | 'icon' => 'frm_icon_font frm_file_text_icon', |
| 1273 | - 'html_class' => 'frm_show_upgrade_tab frm_noallow', | |
| 1156 | + 'html_class' => 'frm_show_upgrade frm_noallow', | |
| 1274 | 1157 | 'data' => FrmAppHelper::get_landing_page_upgrade_data_params(), |
| 1275 | 1158 | ), |
| 1276 | 1159 | 'chat' => array( |
| 1277 | 1160 | 'name' => __( 'Conversational Forms', 'formidable' ), |
| 1278 | 1161 | 'icon' => 'frm_icon_font frm_chat_forms_icon', |
| 1279 | - 'html_class' => 'frm_show_upgrade_tab frm_noallow', | |
| 1162 | + 'html_class' => 'frm_show_upgrade frm_noallow', | |
| 1280 | 1163 | 'data' => FrmAppHelper::get_upgrade_data_params( |
| 1281 | 1164 | 'chat', |
| 1282 | 1165 | array( |
| 1283 | - 'upgrade' => __( 'Conversational Forms', 'formidable' ), | |
| 1284 | - 'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ), | |
| 1285 | - 'screenshot' => 'chat.png', | |
| 1166 | + 'upgrade' => __( 'Conversational Forms', 'formidable' ), | |
| 1167 | + 'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ), | |
| 1286 | 1168 | ) |
| 1287 | 1169 | ), |
| 1288 | 1170 | ), |
| 1289 | - 'abandonment' => array( | |
| 1290 | - 'name' => __( 'Form Abandonment', 'formidable' ), | |
| 1291 | - 'icon' => 'frm_icon_font frm_abandoned_icon', | |
| 1292 | - 'html_class' => 'frm_show_upgrade_tab frm_noallow', | |
| 1293 | - 'data' => FrmAppHelper::get_upgrade_data_params( | |
| 1294 | - 'abandonment', | |
| 1295 | - array( | |
| 1296 | - 'upgrade' => __( 'Form abandonment settings', 'formidable' ), | |
| 1297 | - 'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ), | |
| 1298 | - 'screenshot' => 'abandonment.png', | |
| 1299 | - ) | |
| 1300 | - ), | |
| 1301 | - ), | |
| 1302 | 1171 | 'html' => array( |
| 1303 | 1172 | 'name' => __( 'Customize HTML', 'formidable' ), |
| 1304 | 1173 | 'class' => __CLASS__, |
| 1305 | 1174 | 'function' => 'html_settings', |
| @@ -1306,9 +1175,9 @@ | ||
| 1306 | 1175 | 'icon' => 'frm_icon_font frm_code_icon', |
| 1307 | 1176 | ), |
| 1308 | 1177 | ); |
| 1309 | 1178 | |
| 1310 | - foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) { | |
| 1179 | + foreach ( array( 'landing', 'chat' ) as $feature ) { | |
| 1311 | 1180 | if ( ! FrmAppHelper::show_new_feature( $feature ) ) { |
| 1312 | 1181 | unset( $sections[ $feature ] ); |
| 1313 | 1182 | } |
| 1314 | 1183 | } |
| @@ -1361,9 +1230,9 @@ | ||
| 1361 | 1230 | |
| 1362 | 1231 | /** |
| 1363 | 1232 | * @param array $values |
| 1364 | 1233 | */ |
| 1365 | - public static function render_spam_settings( $values ) { | |
| 1234 | + private static function render_spam_settings( $values ) { | |
| 1366 | 1235 | if ( function_exists( 'akismet_http_post' ) ) { |
| 1367 | 1236 | include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php'; |
| 1368 | 1237 | } |
| 1369 | 1238 | include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php'; |
| @@ -1405,23 +1274,8 @@ | ||
| 1405 | 1274 | $values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] ); |
| 1406 | 1275 | } |
| 1407 | 1276 | } |
| 1408 | 1277 | |
| 1409 | - /** | |
| 1410 | - * Updates classes used in submit and prev buttons to avoid conflict with twenty twenty-one theme. | |
| 1411 | - * | |
| 1412 | - * @param array $classes | |
| 1413 | - * | |
| 1414 | - * @return array | |
| 1415 | - */ | |
| 1416 | - public static function update_button_classes( $classes ) { | |
| 1417 | - if ( function_exists( 'twenty_twenty_one_setup' ) ) { | |
| 1418 | - $classes[] = 'has-text-color has-background'; | |
| 1419 | - } | |
| 1420 | - | |
| 1421 | - return $classes; | |
| 1422 | - } | |
| 1423 | - | |
| 1424 | 1278 | public static function mb_tags_box( $form_id, $class = '' ) { |
| 1425 | 1279 | $fields = FrmField::get_all_for_form( $form_id, '', 'include' ); |
| 1426 | 1280 | |
| 1427 | 1281 | /** |
| @@ -1553,9 +1407,8 @@ | ||
| 1553 | 1407 | if ( $settings_tab ) { |
| 1554 | 1408 | $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' ); |
| 1555 | 1409 | $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' ); |
| 1556 | 1410 | $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' ); |
| 1557 | - $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' ); | |
| 1558 | 1411 | } |
| 1559 | 1412 | |
| 1560 | 1413 | /** |
| 1561 | 1414 | * Use this hook to add or remove buttons in the helpers section |
| @@ -1568,12 +1421,9 @@ | ||
| 1568 | 1421 | return $entry_shortcodes; |
| 1569 | 1422 | } |
| 1570 | 1423 | |
| 1571 | 1424 | /** |
| 1572 | - * Insert the form class setting into the form. | |
| 1573 | - * | |
| 1574 | - * @param stdClass $form | |
| 1575 | - * @return void | |
| 1425 | + * Insert the form class setting into the form | |
| 1576 | 1426 | */ |
| 1577 | 1427 | public static function form_classes( $form ) { |
| 1578 | 1428 | if ( isset( $form->options['form_class'] ) ) { |
| 1579 | 1429 | echo esc_attr( sanitize_text_field( $form->options['form_class'] ) ); |
| @@ -1582,12 +1432,8 @@ | ||
| 1582 | 1432 | if ( ! empty( $form->options['js_validate'] ) ) { |
| 1583 | 1433 | echo ' frm_js_validate '; |
| 1584 | 1434 | self::add_js_validate_form_to_global_vars( $form ); |
| 1585 | 1435 | } |
| 1586 | - | |
| 1587 | - if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) { | |
| 1588 | - echo ' frm_ajax_submit '; | |
| 1589 | - } | |
| 1590 | 1436 | } |
| 1591 | 1437 | |
| 1592 | 1438 | /** |
| 1593 | 1439 | * @since 5.0.03 |
| @@ -1615,17 +1461,9 @@ | ||
| 1615 | 1461 | ); |
| 1616 | 1462 | wp_die(); |
| 1617 | 1463 | } |
| 1618 | 1464 | |
| 1619 | - /** | |
| 1620 | - * @param string $content | |
| 1621 | - * @param stdClass|string|int $form | |
| 1622 | - * @param stdClass|string|int|false $entry | |
| 1623 | - * @return string | |
| 1624 | - */ | |
| 1625 | 1465 | public static function filter_content( $content, $form, $entry = false ) { |
| 1626 | - $content = self::replace_form_name_shortcodes( $content, $form ); | |
| 1627 | - | |
| 1628 | 1466 | self::get_entry_by_param( $entry ); |
| 1629 | 1467 | if ( ! $entry ) { |
| 1630 | 1468 | return $content; |
| 1631 | 1469 | } |
| @@ -1639,38 +1477,8 @@ | ||
| 1639 | 1477 | |
| 1640 | 1478 | return $content; |
| 1641 | 1479 | } |
| 1642 | 1480 | |
| 1643 | - /** | |
| 1644 | - * Replace any [form_name] shortcodes in a string. | |
| 1645 | - * | |
| 1646 | - * @since 5.5 | |
| 1647 | - * | |
| 1648 | - * @param string|array $string | |
| 1649 | - * @param stdClass|string|int $form | |
| 1650 | - * @return string|array | |
| 1651 | - */ | |
| 1652 | - public static function replace_form_name_shortcodes( $string, $form ) { | |
| 1653 | - if ( ! is_string( $string ) ) { | |
| 1654 | - return $string; | |
| 1655 | - } | |
| 1656 | - | |
| 1657 | - if ( false === strpos( $string, '[form_name]' ) ) { | |
| 1658 | - return $string; | |
| 1659 | - } | |
| 1660 | - | |
| 1661 | - if ( ! is_object( $form ) ) { | |
| 1662 | - $form = FrmForm::getOne( $form ); | |
| 1663 | - } | |
| 1664 | - | |
| 1665 | - $form_name = is_object( $form ) ? $form->name : ''; | |
| 1666 | - return str_replace( '[form_name]', $form_name, $string ); | |
| 1667 | - } | |
| 1668 | - | |
| 1669 | - /** | |
| 1670 | - * @param stdClass|string|int|false $entry | |
| 1671 | - * @return void | |
| 1672 | - */ | |
| 1673 | 1481 | private static function get_entry_by_param( &$entry ) { |
| 1674 | 1482 | if ( ! $entry || ! is_object( $entry ) ) { |
| 1675 | 1483 | if ( ! $entry || ! is_numeric( $entry ) ) { |
| 1676 | 1484 | $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' ); |
| @@ -1779,8 +1587,9 @@ | ||
| 1779 | 1587 | return self::new_form( $vars ); |
| 1780 | 1588 | case 'create': |
| 1781 | 1589 | case 'edit': |
| 1782 | 1590 | case 'update': |
| 1591 | + case 'duplicate': | |
| 1783 | 1592 | case 'trash': |
| 1784 | 1593 | case 'untrash': |
| 1785 | 1594 | case 'destroy': |
| 1786 | 1595 | case 'delete_all': |
| @@ -1808,16 +1617,9 @@ | ||
| 1808 | 1617 | self::list_form(); |
| 1809 | 1618 | return; |
| 1810 | 1619 | } |
| 1811 | 1620 | |
| 1812 | - $message = FrmAppHelper::get_param( 'message' ); | |
| 1813 | - if ( 'form_duplicate_error' === $message ) { | |
| 1814 | - self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) ); | |
| 1815 | - return; | |
| 1816 | - } | |
| 1817 | - | |
| 1818 | 1621 | self::display_forms_list(); |
| 1819 | - | |
| 1820 | 1622 | return; |
| 1821 | 1623 | } |
| 1822 | 1624 | } |
| 1823 | 1625 | |
| @@ -2091,15 +1893,11 @@ | ||
| 2091 | 1893 | $fields = FrmFieldsHelper::get_form_fields( $form->id, $errors ); |
| 2092 | 1894 | $reset = false; |
| 2093 | 1895 | $pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' ); |
| 2094 | 1896 | |
| 2095 | - $pass_args['action'] = $params['action']; | |
| 2096 | 1897 | $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 2097 | 1898 | |
| 2098 | 1899 | if ( ! $handle_process_here ) { |
| 2099 | - FrmFormState::set_initial_value( 'title', $title ); | |
| 2100 | - FrmFormState::set_initial_value( 'description', $description ); | |
| 2101 | - | |
| 2102 | 1900 | do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description ); |
| 2103 | 1901 | if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) { |
| 2104 | 1902 | self::show_form_after_submit( $pass_args ); |
| 2105 | 1903 | } |
| @@ -2113,10 +1911,11 @@ | ||
| 2113 | 1911 | if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) { |
| 2114 | 1912 | $entry_id = self::just_created_entry( $form->id ); |
| 2115 | 1913 | $pass_args['entry_id'] = $entry_id; |
| 2116 | 1914 | $pass_args['reset'] = true; |
| 1915 | + $pass_args['conf_method'] = self::get_confirmation_method( compact( 'form', 'entry_id' ) ); | |
| 2117 | 1916 | |
| 2118 | - self::run_on_submit_actions( $pass_args ); | |
| 1917 | + self::run_success_action( $pass_args ); | |
| 2119 | 1918 | |
| 2120 | 1919 | do_action( |
| 2121 | 1920 | 'frm_after_entry_processed', |
| 2122 | 1921 | array( |
| @@ -2162,35 +1961,15 @@ | ||
| 2162 | 1961 | 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; |
| 2163 | 1962 | } |
| 2164 | 1963 | |
| 2165 | 1964 | /** |
| 2166 | - * Gets confirmation method. | |
| 2167 | - * | |
| 2168 | 1965 | * @since 3.0 |
| 2169 | - * @since 6.0 This method can return an array of met On Submit actions. | |
| 2170 | - * | |
| 2171 | - * @param array $atts { | |
| 2172 | - * Atts. | |
| 2173 | - * | |
| 2174 | - * @type object $form Form object. | |
| 2175 | - * @type int $entry_id Entry ID. | |
| 2176 | - * } | |
| 2177 | - * @return string|array | |
| 2178 | 1966 | */ |
| 2179 | 1967 | private static function get_confirmation_method( $atts ) { |
| 2180 | - $action = FrmOnSubmitHelper::current_event( $atts ); | |
| 2181 | - $opt = 'update' === $action ? 'edit_action' : 'success_action'; | |
| 1968 | + $opt = 'success_action'; | |
| 2182 | 1969 | $method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message'; |
| 1970 | + $method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' ); | |
| 2183 | 1971 | |
| 2184 | - if ( ! empty( $atts['entry_id'] ) ) { | |
| 2185 | - $met_actions = self::get_met_on_submit_actions( $atts, $action ); | |
| 2186 | - if ( $met_actions ) { | |
| 2187 | - $method = $met_actions; | |
| 2188 | - } | |
| 2189 | - } | |
| 2190 | - | |
| 2191 | - $method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action ); | |
| 2192 | - | |
| 2193 | 1972 | if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) { |
| 2194 | 1973 | $method = 'message'; |
| 2195 | 1974 | } |
| 2196 | 1975 | |
| @@ -2206,34 +1985,11 @@ | ||
| 2206 | 1985 | $conf_method = self::get_confirmation_method( |
| 2207 | 1986 | array( |
| 2208 | 1987 | 'form' => $form, |
| 2209 | 1988 | 'entry_id' => $params['id'], |
| 2210 | - 'action' => FrmOnSubmitHelper::current_event( $params ), | |
| 2211 | 1989 | ) |
| 2212 | 1990 | ); |
| 2213 | 1991 | |
| 2214 | - self::maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ); | |
| 2215 | - } | |
| 2216 | - | |
| 2217 | - /** | |
| 2218 | - * Maybe trigger redirect with the new Confirmation action. | |
| 2219 | - * | |
| 2220 | - * @since 6.1.1 | |
| 2221 | - * | |
| 2222 | - * @param array|string $conf_method Array of confirmation actions or the action type string. | |
| 2223 | - * @param object $form Form object. | |
| 2224 | - * @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}. | |
| 2225 | - * @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}. | |
| 2226 | - */ | |
| 2227 | - public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) { | |
| 2228 | - if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) { | |
| 2229 | - if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) { | |
| 2230 | - $event = FrmOnSubmitHelper::current_event( $params ); | |
| 2231 | - FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event ); | |
| 2232 | - $conf_method = 'redirect'; | |
| 2233 | - } | |
| 2234 | - } | |
| 2235 | - | |
| 2236 | 1992 | if ( 'redirect' === $conf_method ) { |
| 2237 | 1993 | self::trigger_redirect( $form, $params, $args ); |
| 2238 | 1994 | } |
| 2239 | 1995 | } |
| @@ -2256,23 +2012,10 @@ | ||
| 2256 | 2012 | /** |
| 2257 | 2013 | * Used when the success action is not 'message' |
| 2258 | 2014 | * |
| 2259 | 2015 | * @since 2.05 |
| 2260 | - * @since 6.0 `$args['force_delay_redirect']` is added. | |
| 2261 | - * | |
| 2262 | - * @param array $args { | |
| 2263 | - * The args. | |
| 2264 | - * | |
| 2265 | - * @type string $conf_method The method. | |
| 2266 | - * @type object $form Form object. | |
| 2267 | - * @type int $entry_id Entry ID. | |
| 2268 | - * @type string $action The action event. Accepts `create` or `update`. | |
| 2269 | - * @type array $fields The array of fields. | |
| 2270 | - * @type int $force_delay_redirect Force to show the message before redirecting in case redirect method runs. | |
| 2271 | - * } | |
| 2272 | 2016 | */ |
| 2273 | 2017 | public static function run_success_action( $args ) { |
| 2274 | - global $frm_vars; | |
| 2275 | 2018 | $extra_args = $args; |
| 2276 | 2019 | unset( $extra_args['form'] ); |
| 2277 | 2020 | |
| 2278 | 2021 | do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args ); |
| @@ -2279,10 +2022,8 @@ | ||
| 2279 | 2022 | |
| 2280 | 2023 | $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit'; |
| 2281 | 2024 | |
| 2282 | 2025 | $args['success_opt'] = $opt; |
| 2283 | - $args['ajax'] = ! empty( $frm_vars['ajax'] ); | |
| 2284 | - | |
| 2285 | 2026 | if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) { |
| 2286 | 2027 | self::load_page_after_submit( $args ); |
| 2287 | 2028 | } elseif ( $args['conf_method'] === 'redirect' ) { |
| 2288 | 2029 | self::redirect_after_submit( $args ); |
| @@ -2291,224 +2032,8 @@ | ||
| 2291 | 2032 | } |
| 2292 | 2033 | } |
| 2293 | 2034 | |
| 2294 | 2035 | /** |
| 2295 | - * Gets met On Submit actions. | |
| 2296 | - * | |
| 2297 | - * @since 6.0 | |
| 2298 | - * | |
| 2299 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2300 | - * @param string $event Form event. Default is `create`. | |
| 2301 | - * @return array Array of actions that meet the conditional logics. | |
| 2302 | - */ | |
| 2303 | - public static function get_met_on_submit_actions( $args, $event = 'create' ) { | |
| 2304 | - if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) { | |
| 2305 | - return array(); | |
| 2306 | - } | |
| 2307 | - | |
| 2308 | - // If a redirect action has already opened the URL in a new tab, we show the default message in the currect tab. | |
| 2309 | - if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) { | |
| 2310 | - return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) ); | |
| 2311 | - } | |
| 2312 | - | |
| 2313 | - $entry = FrmEntry::getOne( $args['entry_id'], true ); | |
| 2314 | - $actions = FrmOnSubmitHelper::get_actions( $args['form']->id ); | |
| 2315 | - $met_actions = array(); | |
| 2316 | - $has_redirect = false; | |
| 2317 | - | |
| 2318 | - foreach ( $actions as $action ) { | |
| 2319 | - if ( ! in_array( $event, $action->post_content['event'], true ) ) { | |
| 2320 | - continue; | |
| 2321 | - } | |
| 2322 | - | |
| 2323 | - if ( FrmFormAction::action_conditions_met( $action, $entry ) ) { | |
| 2324 | - continue; | |
| 2325 | - } | |
| 2326 | - | |
| 2327 | - $action_type = FrmOnSubmitHelper::get_action_type( $action ); | |
| 2328 | - | |
| 2329 | - if ( 'redirect' === $action_type ) { | |
| 2330 | - if ( $has_redirect ) { // Do not process because we run the first redirect action only. | |
| 2331 | - continue; | |
| 2332 | - } | |
| 2333 | - } | |
| 2334 | - | |
| 2335 | - if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) { | |
| 2336 | - continue; | |
| 2337 | - } | |
| 2338 | - | |
| 2339 | - if ( 'redirect' === $action_type ) { | |
| 2340 | - $has_redirect = true; | |
| 2341 | - } | |
| 2342 | - | |
| 2343 | - $met_actions[] = $action; | |
| 2344 | - unset( $action ); | |
| 2345 | - } | |
| 2346 | - | |
| 2347 | - $args['event'] = $event; | |
| 2348 | - | |
| 2349 | - /** | |
| 2350 | - * Filters the On Submit actions that meet the conditional logics. | |
| 2351 | - * | |
| 2352 | - * @since 6.0 | |
| 2353 | - * | |
| 2354 | - * @param array $met_actions Actions that meet the conditional logics. | |
| 2355 | - * @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added. | |
| 2356 | - */ | |
| 2357 | - $met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args ); | |
| 2358 | - | |
| 2359 | - if ( empty( $met_actions ) ) { | |
| 2360 | - $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) ); | |
| 2361 | - } | |
| 2362 | - | |
| 2363 | - return $met_actions; | |
| 2364 | - } | |
| 2365 | - | |
| 2366 | - /** | |
| 2367 | - * Checks if a Confirmation action has the valid data. | |
| 2368 | - * | |
| 2369 | - * @since 6.1.2 | |
| 2370 | - * | |
| 2371 | - * @param object $action Form action object. | |
| 2372 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2373 | - * @param string $event Form event. Default is `create`. | |
| 2374 | - * @return bool | |
| 2375 | - */ | |
| 2376 | - private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) { | |
| 2377 | - $action_type = FrmOnSubmitHelper::get_action_type( $action ); | |
| 2378 | - | |
| 2379 | - if ( 'redirect' === $action_type ) { | |
| 2380 | - // Run through frm_redirect_url filter. This is used for the valid action check. | |
| 2381 | - $action->post_content['success_url'] = apply_filters( | |
| 2382 | - 'frm_redirect_url', | |
| 2383 | - $action->post_content['success_url'], | |
| 2384 | - $args['form'], | |
| 2385 | - $args + array( 'action' => $event ) | |
| 2386 | - ); | |
| 2387 | - | |
| 2388 | - return ! empty( $action->post_content['success_url'] ); | |
| 2389 | - } | |
| 2390 | - | |
| 2391 | - if ( 'page' === $action_type ) { | |
| 2392 | - if ( empty( $action->post_content['success_page_id'] ) ) { | |
| 2393 | - return false; | |
| 2394 | - } | |
| 2395 | - | |
| 2396 | - $page = get_post( $action->post_content['success_page_id'] ); | |
| 2397 | - if ( ! $page || 'trash' === $page->post_status ) { | |
| 2398 | - return false; | |
| 2399 | - } | |
| 2400 | - } | |
| 2401 | - | |
| 2402 | - return true; | |
| 2403 | - } | |
| 2404 | - | |
| 2405 | - /** | |
| 2406 | - * Runs On Submit actions. | |
| 2407 | - * | |
| 2408 | - * @since 6.0 | |
| 2409 | - * | |
| 2410 | - * @param array $args See inside {@see FrmFormsController::get_form_contents()} method. | |
| 2411 | - */ | |
| 2412 | - public static function run_on_submit_actions( $args ) { | |
| 2413 | - $args['conf_method'] = self::get_confirmation_method( | |
| 2414 | - array( | |
| 2415 | - 'form' => $args['form'], | |
| 2416 | - 'entry_id' => $args['entry_id'], | |
| 2417 | - 'action' => FrmOnSubmitHelper::current_event( $args ), | |
| 2418 | - ) | |
| 2419 | - ); | |
| 2420 | - if ( ! is_array( $args['conf_method'] ) ) { | |
| 2421 | - self::run_success_action( $args ); | |
| 2422 | - return; | |
| 2423 | - } | |
| 2424 | - | |
| 2425 | - // If conf_method is an array, run On Submit actions. | |
| 2426 | - if ( ! $args['conf_method'] ) { | |
| 2427 | - // Use default message. | |
| 2428 | - FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options ); | |
| 2429 | - self::run_success_action( $args ); | |
| 2430 | - } elseif ( 1 === count( $args['conf_method'] ) ) { | |
| 2431 | - FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options, reset( $args['conf_method'] ) ); | |
| 2432 | - $args['conf_method'] = $args['form']->options['success_action']; | |
| 2433 | - self::run_success_action( $args ); | |
| 2434 | - } else { | |
| 2435 | - self::run_multi_on_submit_actions( $args ); | |
| 2436 | - } | |
| 2437 | - } | |
| 2438 | - | |
| 2439 | - /** | |
| 2440 | - * Runs multiple success actions. | |
| 2441 | - * | |
| 2442 | - * @since 6.0 | |
| 2443 | - * | |
| 2444 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2445 | - */ | |
| 2446 | - public static function run_multi_on_submit_actions( $args ) { | |
| 2447 | - $redirect_action = null; | |
| 2448 | - foreach ( $args['conf_method'] as $action ) { | |
| 2449 | - if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) { | |
| 2450 | - // We catch the redirect action to run it last. | |
| 2451 | - $redirect_action = $action; | |
| 2452 | - continue; | |
| 2453 | - } | |
| 2454 | - | |
| 2455 | - self::run_single_on_submit_action( $args, $action ); | |
| 2456 | - | |
| 2457 | - unset( $action ); | |
| 2458 | - } | |
| 2459 | - | |
| 2460 | - if ( $redirect_action ) { | |
| 2461 | - // Show script to delay the redirection. | |
| 2462 | - $args['force_delay_redirect'] = true; | |
| 2463 | - self::run_single_on_submit_action( $args, $redirect_action ); | |
| 2464 | - } | |
| 2465 | - } | |
| 2466 | - | |
| 2467 | - /** | |
| 2468 | - * Runs single On Submit action. | |
| 2469 | - * | |
| 2470 | - * @since 6.0 | |
| 2471 | - * | |
| 2472 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2473 | - * @param object $action On Submit action object. | |
| 2474 | - */ | |
| 2475 | - public static function run_single_on_submit_action( $args, $action ) { | |
| 2476 | - $new_args = self::get_run_success_action_args( $args, $action ); | |
| 2477 | - self::run_success_action( $new_args ); | |
| 2478 | - } | |
| 2479 | - | |
| 2480 | - /** | |
| 2481 | - * Gets run_success_action() args from the On Submit action. | |
| 2482 | - * | |
| 2483 | - * @since 6.0 | |
| 2484 | - * | |
| 2485 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2486 | - * @param object $action On Submit action object. | |
| 2487 | - * @return array | |
| 2488 | - */ | |
| 2489 | - private static function get_run_success_action_args( $args, $action ) { | |
| 2490 | - $new_args = $args; | |
| 2491 | - | |
| 2492 | - FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] ); | |
| 2493 | - | |
| 2494 | - $opt = 'update' === $args['action'] ? 'edit_' : 'success_'; | |
| 2495 | - | |
| 2496 | - $new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ]; | |
| 2497 | - | |
| 2498 | - /** | |
| 2499 | - * Filters the run success action args. | |
| 2500 | - * | |
| 2501 | - * @since 6.0 | |
| 2502 | - * | |
| 2503 | - * @param array $new_args The new args. | |
| 2504 | - * @param array $args The old args. See {@see FrmFormsController::run_success_action()}. | |
| 2505 | - * @param object $action On Submit action object. | |
| 2506 | - */ | |
| 2507 | - return apply_filters( 'frm_get_run_success_action_args', $new_args, $args, $action ); | |
| 2508 | - } | |
| 2509 | - | |
| 2510 | - /** | |
| 2511 | 2036 | * @since 3.0 |
| 2512 | 2037 | */ |
| 2513 | 2038 | private static function load_page_after_submit( $args ) { |
| 2514 | 2039 | global $post; |
| @@ -2517,22 +2042,9 @@ | ||
| 2517 | 2042 | $page = get_post( $args['form']->options[ $opt . '_page_id' ] ); |
| 2518 | 2043 | $old_post = $post; |
| 2519 | 2044 | $post = $page; |
| 2520 | 2045 | $content = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] ); |
| 2521 | - | |
| 2522 | - // Fix the On Submit page content doesn't show when previewing In theme. | |
| 2523 | - $has_preview_filter = has_filter( 'the_content', 'FrmFormsController::preview_content' ); | |
| 2524 | - | |
| 2525 | - if ( $has_preview_filter ) { | |
| 2526 | - remove_filter( 'the_content', 'FrmFormsController::preview_content', 9999 ); | |
| 2527 | - } | |
| 2528 | - | |
| 2529 | 2046 | echo apply_filters( 'the_content', $content ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped |
| 2530 | - | |
| 2531 | - if ( $has_preview_filter ) { | |
| 2532 | - add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 ); | |
| 2533 | - } | |
| 2534 | - | |
| 2535 | 2047 | $post = $old_post; |
| 2536 | 2048 | } |
| 2537 | 2049 | } |
| 2538 | 2050 | |
| @@ -2537,11 +2049,12 @@ | ||
| 2537 | 2049 | } |
| 2538 | 2050 | |
| 2539 | 2051 | /** |
| 2540 | 2052 | * @since 3.0 |
| 2541 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2542 | 2053 | */ |
| 2543 | 2054 | private static function redirect_after_submit( $args ) { |
| 2055 | + global $frm_vars; | |
| 2056 | + | |
| 2544 | 2057 | add_filter( 'frm_use_wpautop', '__return_false' ); |
| 2545 | 2058 | |
| 2546 | 2059 | $opt = $args['success_opt']; |
| 2547 | 2060 | $success_url = trim( $args['form']->options[ $opt . '_url' ] ); |
| @@ -2547,8 +2060,12 @@ | ||
| 2547 | 2060 | $success_url = trim( $args['form']->options[ $opt . '_url' ] ); |
| 2548 | 2061 | $success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] ); |
| 2549 | 2062 | $success_url = do_shortcode( $success_url ); |
| 2550 | 2063 | |
| 2064 | + $success_msg = isset( $args['form']->options[ $opt . '_msg' ] ) ? $args['form']->options[ $opt . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' ); | |
| 2065 | + | |
| 2066 | + $redirect_msg = self::get_redirect_message( $success_url, $success_msg, $args ); | |
| 2067 | + | |
| 2551 | 2068 | $args['id'] = $args['entry_id']; |
| 2552 | 2069 | FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args ); |
| 2553 | 2070 | |
| 2554 | 2071 | add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' ); |
| @@ -2555,122 +2072,19 @@ | ||
| 2555 | 2072 | $success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args ); |
| 2556 | 2073 | |
| 2557 | 2074 | $doing_ajax = FrmAppHelper::doing_ajax(); |
| 2558 | 2075 | |
| 2559 | - if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) { // Is AJAX submit and there is just one Redirect action runs. | |
| 2560 | - echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) ); | |
| 2076 | + if ( isset( $args['ajax'] ) && $args['ajax'] && $doing_ajax ) { | |
| 2077 | + echo json_encode( array( 'redirect' => $success_url ) ); | |
| 2561 | 2078 | wp_die(); |
| 2562 | - } | |
| 2563 | - | |
| 2564 | - if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) { // Not AJAX submit, no headers sent, and there is just one Redirect action runs. | |
| 2565 | - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) { | |
| 2566 | - self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args ); | |
| 2567 | - self::$redirected_in_new_tab[ $args['form']->id ] = 1; | |
| 2568 | - return; | |
| 2569 | - } | |
| 2570 | - | |
| 2079 | + } elseif ( ! headers_sent() ) { | |
| 2571 | 2080 | wp_redirect( esc_url_raw( $success_url ) ); |
| 2572 | 2081 | die(); // do not use wp_die or redirect fails |
| 2573 | - } | |
| 2574 | - | |
| 2575 | - // Redirect with a delay. | |
| 2576 | - self::redirect_after_submit_using_js( $args + compact( 'success_url', 'doing_ajax' ) ); | |
| 2577 | - } | |
| 2578 | - | |
| 2579 | - /** | |
| 2580 | - * Prints open in new tab js with fallback handler. | |
| 2581 | - * | |
| 2582 | - * @since 6.3.1 | |
| 2583 | - * | |
| 2584 | - * @param string $success_url Success URL. | |
| 2585 | - * @param array $args See {@see FrmFormsController::redirect_after_submit()}. | |
| 2586 | - */ | |
| 2587 | - private static function print_open_in_new_tab_js_with_fallback_handler( $success_url, $args ) { | |
| 2588 | - echo '<script>var newTab = window.open("' . esc_url_raw( $success_url ) . '", "_blank");'; | |
| 2589 | - echo 'if ( ! newTab ) {'; | |
| 2590 | - | |
| 2591 | - $data = array( | |
| 2592 | - 'formId' => intval( $args['form']->id ), | |
| 2593 | - 'message' => self::get_redirect_fallback_message( $success_url, $args ), | |
| 2594 | - ); | |
| 2595 | - // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 2596 | - echo 'frmShowNewTabFallback = ' . FrmAppHelper::maybe_json_encode( $data ) . ';'; | |
| 2597 | - echo '}</script>'; | |
| 2598 | - } | |
| 2599 | - | |
| 2600 | - /** | |
| 2601 | - * Gets response data for redirect action when AJAX submitting. | |
| 2602 | - * | |
| 2603 | - * @since 6.3.1 | |
| 2604 | - * | |
| 2605 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2606 | - * @return array | |
| 2607 | - */ | |
| 2608 | - private static function get_ajax_redirect_response_data( $args ) { | |
| 2609 | - $response_data = array( 'redirect' => $args['success_url'] ); | |
| 2610 | - | |
| 2611 | - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) { | |
| 2612 | - $response_data['openInNewTab'] = 1; | |
| 2613 | - | |
| 2614 | - $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg(); | |
| 2615 | - | |
| 2616 | - $args['form']->options['success_msg'] = $args['message']; | |
| 2617 | - $args['form']->options['edit_msg'] = $args['message']; | |
| 2618 | - if ( ! isset( $args['fields'] ) ) { | |
| 2619 | - $args['fields'] = FrmField::get_all_for_form( $args['form']->id ); | |
| 2620 | - } | |
| 2621 | - | |
| 2622 | - $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args ); | |
| 2623 | - | |
| 2624 | - ob_start(); | |
| 2625 | - self::show_lone_success_messsage( $args ); | |
| 2626 | - $response_data['content'] = ob_get_clean(); | |
| 2627 | - | |
| 2628 | - $response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args ); | |
| 2629 | - } | |
| 2630 | - | |
| 2631 | - return $response_data; | |
| 2632 | - } | |
| 2633 | - | |
| 2634 | - /** | |
| 2635 | - * Redirects after submitting using JS. This is used when showing message before redirecting. | |
| 2636 | - * | |
| 2637 | - * @since 6.0 | |
| 2638 | - * | |
| 2639 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2640 | - */ | |
| 2641 | - private static function redirect_after_submit_using_js( $args ) { | |
| 2642 | - $success_msg = FrmOnSubmitHelper::get_default_redirect_msg(); | |
| 2643 | - $redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args ); | |
| 2644 | - $success_url = esc_url_raw( $args['success_url'] ); | |
| 2645 | - | |
| 2646 | - /** | |
| 2647 | - * Filters the delay time before redirecting when On Submit Redirect action is delayed. | |
| 2648 | - * | |
| 2649 | - * @since 6.0 | |
| 2650 | - * | |
| 2651 | - * @param int $delay_time Delay time in miliseconds. | |
| 2652 | - */ | |
| 2653 | - $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 ); | |
| 2654 | - | |
| 2655 | - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) { | |
| 2656 | - $redirect_js = 'window.open("' . $success_url . '", "_blank")'; | |
| 2657 | 2082 | } else { |
| 2658 | - $redirect_js = 'window.location="' . $success_url . '";'; | |
| 2083 | + add_filter( 'frm_use_wpautop', '__return_true' ); | |
| 2084 | + echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 2085 | + echo "<script type='text/javascript'>window.onload = function(){setTimeout(window.location='" . esc_url_raw( $success_url ) . "', 8000);}</script>"; | |
| 2659 | 2086 | } |
| 2660 | - | |
| 2661 | - add_filter( 'frm_use_wpautop', '__return_true' ); | |
| 2662 | - | |
| 2663 | - echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 2664 | - echo '<script>'; | |
| 2665 | - if ( empty( $args['doing_ajax'] ) ) { // Not AJAX submit, delay JS until window.load. | |
| 2666 | - echo 'window.onload=function(){'; | |
| 2667 | - } | |
| 2668 | - echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 2669 | - if ( empty( $args['doing_ajax'] ) ) { | |
| 2670 | - echo '};'; | |
| 2671 | - } | |
| 2672 | - echo '</script>'; | |
| 2673 | 2087 | } |
| 2674 | 2088 | |
| 2675 | 2089 | /** |
| 2676 | 2090 | * @since 3.0 |
| @@ -2679,10 +2093,11 @@ | ||
| 2679 | 2093 | * @param string $success_msg |
| 2680 | 2094 | * @param array $args |
| 2681 | 2095 | */ |
| 2682 | 2096 | private static function get_redirect_message( $success_url, $success_msg, $args ) { |
| 2683 | - $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' . | |
| 2684 | - self::get_redirect_fallback_message( $success_url, $args ) . | |
| 2097 | + $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/>' . | |
| 2098 | + /* translators: %1$s: Start link HTML, %2$s: End link HTML */ | |
| 2099 | + sprintf( __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), '<a href="' . esc_url( $success_url ) . '">', '</a>' ) . | |
| 2685 | 2100 | '</div></div>'; |
| 2686 | 2101 | |
| 2687 | 2102 | $redirect_args = array( |
| 2688 | 2103 | 'entry_id' => $args['entry_id'], |
| @@ -2693,50 +2108,17 @@ | ||
| 2693 | 2108 | return apply_filters( 'frm_redirect_msg', $redirect_msg, $redirect_args ); |
| 2694 | 2109 | } |
| 2695 | 2110 | |
| 2696 | 2111 | /** |
| 2697 | - * Gets fallback message when redirecting failed. | |
| 2698 | - * | |
| 2699 | - * @since 6.3.1 | |
| 2700 | - * | |
| 2701 | - * @param string $success_url Redirect URL. | |
| 2702 | - * @param array $args Contains `form` object. | |
| 2703 | - * @return string | |
| 2704 | - */ | |
| 2705 | - private static function get_redirect_fallback_message( $success_url, $args ) { | |
| 2706 | - $target = ''; | |
| 2707 | - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) { | |
| 2708 | - $target = ' target="_blank"'; | |
| 2709 | - } | |
| 2710 | - | |
| 2711 | - return sprintf( | |
| 2712 | - /* translators: %1$s: Start link HTML, %2$s: End link HTML */ | |
| 2713 | - __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), | |
| 2714 | - '<a href="' . esc_url( $success_url ) . '"' . $target . '>', | |
| 2715 | - '</a>' | |
| 2716 | - ); | |
| 2717 | - } | |
| 2718 | - | |
| 2719 | - /** | |
| 2720 | 2112 | * Prepare to show the success message and empty form after submit |
| 2721 | 2113 | * |
| 2722 | 2114 | * @since 2.05 |
| 2723 | 2115 | */ |
| 2724 | 2116 | public static function show_message_after_save( $atts ) { |
| 2725 | - $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts ); | |
| 2117 | + $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'] ); | |
| 2726 | 2118 | |
| 2727 | 2119 | if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) { |
| 2728 | - if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) { | |
| 2729 | - $entry = FrmEntry::getOne( $atts['entry_id'] ); | |
| 2730 | - if ( $entry ) { | |
| 2731 | - // This is copied from the Pro plugin. | |
| 2732 | - $atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts ); | |
| 2733 | - $atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] ); | |
| 2734 | - FrmProEntriesController::show_front_end_form_with_entry( $entry, $atts ); | |
| 2735 | - } | |
| 2736 | - } else { | |
| 2737 | - self::show_form_after_submit( $atts ); | |
| 2738 | - } | |
| 2120 | + self::show_form_after_submit( $atts ); | |
| 2739 | 2121 | } else { |
| 2740 | 2122 | self::show_lone_success_messsage( $atts ); |
| 2741 | 2123 | } |
| 2742 | 2124 | } |
| @@ -2806,16 +2188,8 @@ | ||
| 2806 | 2188 | * |
| 2807 | 2189 | * @since 2.05 |
| 2808 | 2190 | */ |
| 2809 | 2191 | private static function fill_atts_for_form_display( &$args ) { |
| 2810 | - if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) { | |
| 2811 | - $args['title'] = $args['show_title']; | |
| 2812 | - } | |
| 2813 | - | |
| 2814 | - if ( ! isset( $args['description'] ) && isset( $args['show_description'] ) ) { | |
| 2815 | - $args['description'] = $args['show_description']; | |
| 2816 | - } | |
| 2817 | - | |
| 2818 | 2192 | $defaults = array( |
| 2819 | 2193 | 'errors' => array(), |
| 2820 | 2194 | 'message' => '', |
| 2821 | 2195 | 'fields' => array(), |
| @@ -2849,21 +2223,14 @@ | ||
| 2849 | 2223 | /** |
| 2850 | 2224 | * Prepare the success message before it's shown |
| 2851 | 2225 | * |
| 2852 | 2226 | * @since 2.05 |
| 2853 | - * @since 6.0.x Added the third parameter. | |
| 2854 | - * | |
| 2855 | - * @param object $form Form object. | |
| 2856 | - * @param int $entry_id Entry ID. | |
| 2857 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2858 | - * @return string | |
| 2859 | 2227 | */ |
| 2860 | - private static function prepare_submit_message( $form, $entry_id, $args = array() ) { | |
| 2228 | + private static function prepare_submit_message( $form, $entry_id ) { | |
| 2861 | 2229 | $frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) ); |
| 2862 | - $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success'; | |
| 2863 | 2230 | |
| 2864 | 2231 | if ( $entry_id && is_numeric( $entry_id ) ) { |
| 2865 | - $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg; | |
| 2232 | + $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg; | |
| 2866 | 2233 | $class = 'frm_message'; |
| 2867 | 2234 | } else { |
| 2868 | 2235 | $message = $frm_settings->failed_msg; |
| 2869 | 2236 | $class = FrmFormsHelper::form_error_class(); |
| @@ -2873,11 +2240,8 @@ | ||
| 2873 | 2240 | |
| 2874 | 2241 | return apply_filters( 'frm_main_feedback', $message, $form, $entry_id ); |
| 2875 | 2242 | } |
| 2876 | 2243 | |
| 2877 | - /** | |
| 2878 | - * @return void | |
| 2879 | - */ | |
| 2880 | 2244 | public static function front_head() { |
| 2881 | 2245 | $version = FrmAppHelper::plugin_version(); |
| 2882 | 2246 | $suffix = FrmAppHelper::js_suffix(); |
| 2883 | 2247 | |
| @@ -2952,9 +2316,9 @@ | ||
| 2952 | 2316 | return ! function_exists( 'aioseo' ); |
| 2953 | 2317 | } |
| 2954 | 2318 | |
| 2955 | 2319 | public static function defer_script_loading( $tag, $handle ) { |
| 2956 | - if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) { | |
| 2320 | + if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) { | |
| 2957 | 2321 | $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag ); |
| 2958 | 2322 | } |
| 2959 | 2323 | |
| 2960 | 2324 | return $tag; |
| @@ -3121,13 +2485,29 @@ | ||
| 3121 | 2485 | self::update( $values ); |
| 3122 | 2486 | } |
| 3123 | 2487 | |
| 3124 | 2488 | /** |
| 2489 | + * @deprecated 1.07.05 | |
| 2490 | + * @codeCoverageIgnore | |
| 2491 | + */ | |
| 2492 | + public static function add_default_templates( $path, $default = true, $template = true ) { | |
| 2493 | + FrmDeprecated::add_default_templates( $path, $default, $template ); | |
| 2494 | + } | |
| 2495 | + | |
| 2496 | + /** | |
| 3125 | 2497 | * @deprecated 3.0 |
| 3126 | 2498 | * @codeCoverageIgnore |
| 3127 | 2499 | */ |
| 3128 | 2500 | public static function bulk_create_template( $ids ) { |
| 3129 | 2501 | return FrmDeprecated::bulk_create_template( $ids ); |
| 2502 | + } | |
| 2503 | + | |
| 2504 | + /** | |
| 2505 | + * @deprecated 2.03 | |
| 2506 | + * @codeCoverageIgnore | |
| 2507 | + */ | |
| 2508 | + public static function register_pro_scripts() { | |
| 2509 | + FrmDeprecated::register_pro_scripts(); | |
| 3130 | 2510 | } |
| 3131 | 2511 | |
| 3132 | 2512 | /** |
| 3133 | 2513 | * @deprecated 3.0 |
