| @@ -45,11 +45,11 @@ | ||
| 45 | 45 | public static function logic_tip() { |
| 46 | 46 | $images_url = FrmAppHelper::plugin_url() . '/images/'; |
| 47 | 47 | $data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' ); |
| 48 | 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' ) . '"/>'; |
| 49 | - 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">'; | |
| 50 | - esc_html_e( 'Conditional Logic', 'formidable' ); | |
| 51 | - 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' ); | |
| 52 | 52 | echo '</a>'; |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | /** |
| @@ -98,34 +98,8 @@ | ||
| 98 | 98 | $action_control->create( $form->id ); |
| 99 | 99 | } |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - /** | |
| 103 | - * Create the default On submit action | |
| 104 | - * | |
| 105 | - * @since 6.0.0 | |
| 106 | - * | |
| 107 | - * @param object|int $form Form object or ID. | |
| 108 | - */ | |
| 109 | - private static function create_default_on_submit_action( $form ) { | |
| 110 | - FrmForm::maybe_get_form( $form ); | |
| 111 | - | |
| 112 | - /** | |
| 113 | - * Enable or disable the default On Submit action. | |
| 114 | - * | |
| 115 | - * @since 6.0.0 | |
| 116 | - * | |
| 117 | - * @param bool $create Set to `false` if you want to disable. | |
| 118 | - * @param object $form Form object. | |
| 119 | - */ | |
| 120 | - $create = apply_filters( 'frm_create_default_on_submit_action', true, $form ); | |
| 121 | - | |
| 122 | - if ( $create ) { | |
| 123 | - $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug ); | |
| 124 | - $action_control->create( $form->id ); | |
| 125 | - } | |
| 126 | - } | |
| 127 | - | |
| 128 | 102 | public static function edit( $values = false ) { |
| 129 | 103 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 130 | 104 | |
| 131 | 105 | $id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' ); |
| @@ -139,10 +113,8 @@ | ||
| 139 | 113 | if ( ! $id || ! is_numeric( $id ) ) { |
| 140 | 114 | $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' ); |
| 141 | 115 | } |
| 142 | 116 | |
| 143 | - FrmOnSubmitHelper::maybe_migrate_submit_settings_to_action( $id ); | |
| 144 | - | |
| 145 | 117 | return self::get_settings_vars( $id, array(), $message ); |
| 146 | 118 | } |
| 147 | 119 | |
| 148 | 120 | public static function update_settings() { |
| @@ -325,59 +297,30 @@ | ||
| 325 | 297 | |
| 326 | 298 | wp_die(); |
| 327 | 299 | } |
| 328 | 300 | |
| 329 | - /** | |
| 330 | - * Set the page global to any available page (except for the Blog Page). | |
| 331 | - * | |
| 332 | - * @return void | |
| 333 | - */ | |
| 334 | 301 | private static function set_preview_query() { |
| 335 | - $page_query = array( | |
| 336 | - 'numberposts' => 1, | |
| 337 | - 'orderby' => 'date', | |
| 338 | - 'order' => 'ASC', | |
| 339 | - 'post_type' => 'page', | |
| 340 | - ); | |
| 341 | - | |
| 342 | - $page_for_posts = get_option( 'page_for_posts' ); | |
| 343 | - if ( is_numeric( $page_for_posts ) ) { | |
| 344 | - // Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms. | |
| 345 | - $page_query['post__not_in'] = array( $page_for_posts ); | |
| 346 | - } | |
| 347 | - | |
| 348 | - $random_page = get_posts( $page_query ); | |
| 349 | - if ( ! $random_page ) { | |
| 350 | - return; | |
| 351 | - } | |
| 352 | - | |
| 353 | - $random_page = reset( $random_page ); | |
| 354 | - query_posts( | |
| 302 | + $random_page = get_posts( | |
| 355 | 303 | array( |
| 356 | - 'post_type' => 'page', | |
| 357 | - 'page_id' => $random_page->ID, | |
| 304 | + 'numberposts' => 1, | |
| 305 | + 'orderby' => 'date', | |
| 306 | + 'order' => 'ASC', | |
| 307 | + 'post_type' => 'page', | |
| 358 | 308 | ) |
| 359 | 309 | ); |
| 360 | 310 | |
| 361 | - // Fixes Pro issue #3004. Prevent an undefined $post object. | |
| 362 | - // Otherwise WordPress themes will trigger a warning "Attempt to read property "comment_count" on null". | |
| 363 | - self::set_post_global( $random_page ); | |
| 311 | + if ( ! empty( $random_page ) ) { | |
| 312 | + $random_page = reset( $random_page ); | |
| 313 | + query_posts( | |
| 314 | + array( | |
| 315 | + 'post_type' => 'page', | |
| 316 | + 'page_id' => $random_page->ID, | |
| 317 | + ) | |
| 318 | + ); | |
| 319 | + } | |
| 364 | 320 | } |
| 365 | 321 | |
| 366 | 322 | /** |
| 367 | - * Set the WP $post global object. Used for in-theme preview when defining a page. | |
| 368 | - * | |
| 369 | - * @since 5.5.2 | |
| 370 | - * | |
| 371 | - * @param WP_Post $post | |
| 372 | - * @return void | |
| 373 | - */ | |
| 374 | - private static function set_post_global( $page ) { | |
| 375 | - global $post; | |
| 376 | - $post = $page; // phpcs:ignore WordPress.WP.GlobalVariablesOverride | |
| 377 | - } | |
| 378 | - | |
| 379 | - /** | |
| 380 | 323 | * @since 3.0 |
| 381 | 324 | */ |
| 382 | 325 | private static function load_theme_preview() { |
| 383 | 326 | add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 ); |
| @@ -467,24 +410,15 @@ | ||
| 467 | 410 | public static function untrash() { |
| 468 | 411 | self::change_form_status( 'untrash' ); |
| 469 | 412 | } |
| 470 | 413 | |
| 471 | - /** | |
| 472 | - * @param array $ids | |
| 473 | - * @return string | |
| 474 | - */ | |
| 475 | 414 | public static function bulk_untrash( $ids ) { |
| 476 | 415 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 477 | 416 | |
| 478 | 417 | $count = FrmForm::set_status( $ids, 'published' ); |
| 479 | 418 | |
| 480 | - if ( ! $count ) { | |
| 481 | - // Don't show "0 forms restored" on refresh. | |
| 482 | - return ''; | |
| 483 | - } | |
| 484 | - | |
| 485 | 419 | /* translators: %1$s: Number of forms */ |
| 486 | - $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count ); | |
| 420 | + $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 ); | |
| 487 | 421 | |
| 488 | 422 | return $message; |
| 489 | 423 | } |
| 490 | 424 | |
| @@ -639,8 +573,10 @@ | ||
| 639 | 573 | * |
| 640 | 574 | * @since 4.0 |
| 641 | 575 | */ |
| 642 | 576 | public static function build_new_form() { |
| 577 | + global $wpdb; | |
| 578 | + | |
| 643 | 579 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 644 | 580 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 645 | 581 | |
| 646 | 582 | $new_values = self::get_modal_values(); |
| @@ -646,9 +582,8 @@ | ||
| 646 | 582 | $new_values = self::get_modal_values(); |
| 647 | 583 | $new_values['form_key'] = $new_values['name']; |
| 648 | 584 | $new_values['options'] = array( |
| 649 | 585 | 'antispam' => 1, |
| 650 | - 'on_submit_migrated' => 1, | |
| 651 | 586 | ); |
| 652 | 587 | |
| 653 | 588 | /** |
| 654 | 589 | * Allows changing form values before creating from the modal. |
| @@ -666,9 +601,8 @@ | ||
| 666 | 601 | * @param int $form_id |
| 667 | 602 | */ |
| 668 | 603 | do_action( 'frm_build_new_form', $form_id ); |
| 669 | 604 | |
| 670 | - self::create_default_on_submit_action( $form_id ); | |
| 671 | 605 | self::create_default_email_action( $form_id ); |
| 672 | 606 | |
| 673 | 607 | $response = array( |
| 674 | 608 | 'redirect' => FrmForm::get_edit_link( $form_id ), |
| @@ -878,14 +812,30 @@ | ||
| 878 | 812 | * @param array<string,string> $columns |
| 879 | 813 | * @return array<string,string> |
| 880 | 814 | */ |
| 881 | 815 | public static function get_columns( $columns ) { |
| 882 | - $columns['cb'] = '<input type="checkbox" />'; | |
| 883 | - $columns['name'] = __( 'Form Title', 'formidable' ); | |
| 884 | - $columns['entries'] = __( 'Entries', 'formidable' ); | |
| 885 | - $columns['id'] = 'ID'; | |
| 886 | - $columns['form_key'] = __( 'Key', 'formidable' ); | |
| 887 | - $columns['shortcode'] = __( 'Actions', 'formidable' ); | |
| 816 | + $columns['cb'] = '<input type="checkbox" />'; | |
| 817 | + $columns['id'] = 'ID'; | |
| 818 | + | |
| 819 | + $type = FrmAppHelper::get_simple_request( | |
| 820 | + array( | |
| 821 | + 'param' => 'form_type', | |
| 822 | + 'type' => 'request', | |
| 823 | + 'default' => 'published', | |
| 824 | + ) | |
| 825 | + ); | |
| 826 | + | |
| 827 | + if ( 'template' === $type ) { | |
| 828 | + $columns['name'] = __( 'Template Name', 'formidable' ); | |
| 829 | + $columns['type'] = __( 'Type', 'formidable' ); | |
| 830 | + $columns['form_key'] = __( 'Key', 'formidable' ); | |
| 831 | + } else { | |
| 832 | + $columns['name'] = __( 'Form Title', 'formidable' ); | |
| 833 | + $columns['entries'] = __( 'Entries', 'formidable' ); | |
| 834 | + $columns['form_key'] = __( 'Key', 'formidable' ); | |
| 835 | + $columns['shortcode'] = __( 'Actions', 'formidable' ); | |
| 836 | + } | |
| 837 | + | |
| 888 | 838 | $columns['created_at'] = __( 'Date', 'formidable' ); |
| 889 | 839 | |
| 890 | 840 | add_screen_option( |
| 891 | 841 | 'per_page', |
| @@ -908,17 +858,9 @@ | ||
| 908 | 858 | 'created_at' => 'created_at', |
| 909 | 859 | ); |
| 910 | 860 | } |
| 911 | 861 | |
| 912 | - /** | |
| 913 | - * @param mixed $hidden_columns | |
| 914 | - * @return array | |
| 915 | - */ | |
| 916 | 862 | public static function hidden_columns( $hidden_columns ) { |
| 917 | - if ( ! is_array( $hidden_columns ) ) { | |
| 918 | - $hidden_columns = array(); | |
| 919 | - } | |
| 920 | - | |
| 921 | 863 | $type = FrmAppHelper::get_simple_request( |
| 922 | 864 | array( |
| 923 | 865 | 'param' => 'form_type', |
| 924 | 866 | 'type' => 'request', |
| @@ -1128,15 +1070,8 @@ | ||
| 1128 | 1070 | require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' ); |
| 1129 | 1071 | } |
| 1130 | 1072 | } |
| 1131 | 1073 | |
| 1132 | - public static function update_form_builder_fields( $fields, $form ) { | |
| 1133 | - foreach ( $fields as $field ) { | |
| 1134 | - $field->do_not_include_icons = true; | |
| 1135 | - } | |
| 1136 | - return $fields; | |
| 1137 | - } | |
| 1138 | - | |
| 1139 | 1074 | public static function maybe_update_form_builder_message( &$message ) { |
| 1140 | 1075 | if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) { |
| 1141 | 1076 | $message = __( 'Form was Successfully Copied', 'formidable' ); |
| 1142 | 1077 | } |
| @@ -1235,12 +1170,12 @@ | ||
| 1235 | 1170 | 'screenshot' => 'scheduling.png', |
| 1236 | 1171 | ), |
| 1237 | 1172 | ), |
| 1238 | 1173 | 'buttons' => array( |
| 1239 | - 'name' => __( 'Buttons', 'formidable' ), | |
| 1174 | + 'name' => __( 'Styling & Buttons', 'formidable' ), | |
| 1240 | 1175 | 'class' => __CLASS__, |
| 1241 | 1176 | 'function' => 'buttons_settings', |
| 1242 | - 'icon' => 'frm_icon_font frm_button_icon', | |
| 1177 | + 'icon' => 'frm_icon_font frm_pallet_icon', | |
| 1243 | 1178 | ), |
| 1244 | 1179 | 'landing' => array( |
| 1245 | 1180 | 'name' => __( 'Form Landing Page', 'formidable' ), |
| 1246 | 1181 | 'icon' => 'frm_icon_font frm_file_text_icon', |
| @@ -1322,9 +1257,9 @@ | ||
| 1322 | 1257 | |
| 1323 | 1258 | /** |
| 1324 | 1259 | * @param array $values |
| 1325 | 1260 | */ |
| 1326 | - public static function render_spam_settings( $values ) { | |
| 1261 | + private static function render_spam_settings( $values ) { | |
| 1327 | 1262 | if ( function_exists( 'akismet_http_post' ) ) { |
| 1328 | 1263 | include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php'; |
| 1329 | 1264 | } |
| 1330 | 1265 | include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php'; |
| @@ -1366,23 +1301,8 @@ | ||
| 1366 | 1301 | $values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] ); |
| 1367 | 1302 | } |
| 1368 | 1303 | } |
| 1369 | 1304 | |
| 1370 | - /** | |
| 1371 | - * Updates classes used in submit and prev buttons to avoid conflict with twenty twenty-one theme. | |
| 1372 | - * | |
| 1373 | - * @param array $classes | |
| 1374 | - * | |
| 1375 | - * @return array | |
| 1376 | - */ | |
| 1377 | - public static function update_button_classes( $classes ) { | |
| 1378 | - if ( function_exists( 'twenty_twenty_one_setup' ) ) { | |
| 1379 | - $classes[] = 'has-text-color has-background'; | |
| 1380 | - } | |
| 1381 | - | |
| 1382 | - return $classes; | |
| 1383 | - } | |
| 1384 | - | |
| 1385 | 1305 | public static function mb_tags_box( $form_id, $class = '' ) { |
| 1386 | 1306 | $fields = FrmField::get_all_for_form( $form_id, '', 'include' ); |
| 1387 | 1307 | |
| 1388 | 1308 | /** |
| @@ -1514,9 +1434,8 @@ | ||
| 1514 | 1434 | if ( $settings_tab ) { |
| 1515 | 1435 | $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' ); |
| 1516 | 1436 | $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' ); |
| 1517 | 1437 | $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' ); |
| 1518 | - $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' ); | |
| 1519 | 1438 | } |
| 1520 | 1439 | |
| 1521 | 1440 | /** |
| 1522 | 1441 | * Use this hook to add or remove buttons in the helpers section |
| @@ -1529,12 +1448,9 @@ | ||
| 1529 | 1448 | return $entry_shortcodes; |
| 1530 | 1449 | } |
| 1531 | 1450 | |
| 1532 | 1451 | /** |
| 1533 | - * Insert the form class setting into the form. | |
| 1534 | - * | |
| 1535 | - * @param stdClass $form | |
| 1536 | - * @return void | |
| 1452 | + * Insert the form class setting into the form | |
| 1537 | 1453 | */ |
| 1538 | 1454 | public static function form_classes( $form ) { |
| 1539 | 1455 | if ( isset( $form->options['form_class'] ) ) { |
| 1540 | 1456 | echo esc_attr( sanitize_text_field( $form->options['form_class'] ) ); |
| @@ -1543,12 +1459,8 @@ | ||
| 1543 | 1459 | if ( ! empty( $form->options['js_validate'] ) ) { |
| 1544 | 1460 | echo ' frm_js_validate '; |
| 1545 | 1461 | self::add_js_validate_form_to_global_vars( $form ); |
| 1546 | 1462 | } |
| 1547 | - | |
| 1548 | - if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) { | |
| 1549 | - echo ' frm_ajax_submit '; | |
| 1550 | - } | |
| 1551 | 1463 | } |
| 1552 | 1464 | |
| 1553 | 1465 | /** |
| 1554 | 1466 | * @since 5.0.03 |
| @@ -1576,17 +1488,9 @@ | ||
| 1576 | 1488 | ); |
| 1577 | 1489 | wp_die(); |
| 1578 | 1490 | } |
| 1579 | 1491 | |
| 1580 | - /** | |
| 1581 | - * @param string $content | |
| 1582 | - * @param stdClass|string|int $form | |
| 1583 | - * @param stdClass|string|int|false $entry | |
| 1584 | - * @return string | |
| 1585 | - */ | |
| 1586 | 1492 | public static function filter_content( $content, $form, $entry = false ) { |
| 1587 | - $content = self::replace_form_name_shortcodes( $content, $form ); | |
| 1588 | - | |
| 1589 | 1493 | self::get_entry_by_param( $entry ); |
| 1590 | 1494 | if ( ! $entry ) { |
| 1591 | 1495 | return $content; |
| 1592 | 1496 | } |
| @@ -1600,34 +1504,8 @@ | ||
| 1600 | 1504 | |
| 1601 | 1505 | return $content; |
| 1602 | 1506 | } |
| 1603 | 1507 | |
| 1604 | - /** | |
| 1605 | - * Replace any [form_name] shortcodes in a string. | |
| 1606 | - * | |
| 1607 | - * @since 5.5 | |
| 1608 | - * | |
| 1609 | - * @param string $string | |
| 1610 | - * @param stdClass|string|int $form | |
| 1611 | - * @return string | |
| 1612 | - */ | |
| 1613 | - public static function replace_form_name_shortcodes( $string, $form ) { | |
| 1614 | - if ( false === strpos( $string, '[form_name]' ) ) { | |
| 1615 | - return $string; | |
| 1616 | - } | |
| 1617 | - | |
| 1618 | - if ( ! is_object( $form ) ) { | |
| 1619 | - $form = FrmForm::getOne( $form ); | |
| 1620 | - } | |
| 1621 | - | |
| 1622 | - $form_name = is_object( $form ) ? $form->name : ''; | |
| 1623 | - return str_replace( '[form_name]', $form_name, $string ); | |
| 1624 | - } | |
| 1625 | - | |
| 1626 | - /** | |
| 1627 | - * @param stdClass|string|int|false $entry | |
| 1628 | - * @return void | |
| 1629 | - */ | |
| 1630 | 1508 | private static function get_entry_by_param( &$entry ) { |
| 1631 | 1509 | if ( ! $entry || ! is_object( $entry ) ) { |
| 1632 | 1510 | if ( ! $entry || ! is_numeric( $entry ) ) { |
| 1633 | 1511 | $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' ); |
| @@ -2048,15 +1926,11 @@ | ||
| 2048 | 1926 | $fields = FrmFieldsHelper::get_form_fields( $form->id, $errors ); |
| 2049 | 1927 | $reset = false; |
| 2050 | 1928 | $pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' ); |
| 2051 | 1929 | |
| 2052 | - $pass_args['action'] = $params['action']; | |
| 2053 | 1930 | $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 2054 | 1931 | |
| 2055 | 1932 | if ( ! $handle_process_here ) { |
| 2056 | - FrmFormState::set_initial_value( 'title', $title ); | |
| 2057 | - FrmFormState::set_initial_value( 'description', $description ); | |
| 2058 | - | |
| 2059 | 1933 | do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description ); |
| 2060 | 1934 | if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) { |
| 2061 | 1935 | self::show_form_after_submit( $pass_args ); |
| 2062 | 1936 | } |
| @@ -2070,10 +1944,11 @@ | ||
| 2070 | 1944 | if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) { |
| 2071 | 1945 | $entry_id = self::just_created_entry( $form->id ); |
| 2072 | 1946 | $pass_args['entry_id'] = $entry_id; |
| 2073 | 1947 | $pass_args['reset'] = true; |
| 1948 | + $pass_args['conf_method'] = self::get_confirmation_method( compact( 'form', 'entry_id' ) ); | |
| 2074 | 1949 | |
| 2075 | - self::run_on_submit_actions( $pass_args ); | |
| 1950 | + self::run_success_action( $pass_args ); | |
| 2076 | 1951 | |
| 2077 | 1952 | do_action( |
| 2078 | 1953 | 'frm_after_entry_processed', |
| 2079 | 1954 | array( |
| @@ -2119,35 +1994,15 @@ | ||
| 2119 | 1994 | 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; |
| 2120 | 1995 | } |
| 2121 | 1996 | |
| 2122 | 1997 | /** |
| 2123 | - * Gets confirmation method. | |
| 2124 | - * | |
| 2125 | 1998 | * @since 3.0 |
| 2126 | - * @since 6.0 This method can return an array of met On Submit actions. | |
| 2127 | - * | |
| 2128 | - * @param array $atts { | |
| 2129 | - * Atts. | |
| 2130 | - * | |
| 2131 | - * @type object $form Form object. | |
| 2132 | - * @type int $entry_id Entry ID. | |
| 2133 | - * } | |
| 2134 | - * @return string|array | |
| 2135 | 1999 | */ |
| 2136 | 2000 | private static function get_confirmation_method( $atts ) { |
| 2137 | - $action = FrmOnSubmitHelper::current_event( $atts ); | |
| 2138 | - $opt = 'update' === $action ? 'edit_action' : 'success_action'; | |
| 2001 | + $opt = 'success_action'; | |
| 2139 | 2002 | $method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message'; |
| 2003 | + $method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' ); | |
| 2140 | 2004 | |
| 2141 | - if ( ! empty( $atts['entry_id'] ) ) { | |
| 2142 | - $met_actions = self::get_met_on_submit_actions( $atts, $action ); | |
| 2143 | - if ( $met_actions ) { | |
| 2144 | - $method = $met_actions; | |
| 2145 | - } | |
| 2146 | - } | |
| 2147 | - | |
| 2148 | - $method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action ); | |
| 2149 | - | |
| 2150 | 2005 | if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) { |
| 2151 | 2006 | $method = 'message'; |
| 2152 | 2007 | } |
| 2153 | 2008 | |
| @@ -2163,34 +2018,11 @@ | ||
| 2163 | 2018 | $conf_method = self::get_confirmation_method( |
| 2164 | 2019 | array( |
| 2165 | 2020 | 'form' => $form, |
| 2166 | 2021 | 'entry_id' => $params['id'], |
| 2167 | - 'action' => FrmOnSubmitHelper::current_event( $params ), | |
| 2168 | 2022 | ) |
| 2169 | 2023 | ); |
| 2170 | 2024 | |
| 2171 | - self::maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ); | |
| 2172 | - } | |
| 2173 | - | |
| 2174 | - /** | |
| 2175 | - * Maybe trigger redirect with the new Confirmation action. | |
| 2176 | - * | |
| 2177 | - * @since 6.1.1 | |
| 2178 | - * | |
| 2179 | - * @param array|string $conf_method Array of confirmation actions or the action type string. | |
| 2180 | - * @param object $form Form object. | |
| 2181 | - * @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}. | |
| 2182 | - * @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}. | |
| 2183 | - */ | |
| 2184 | - public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) { | |
| 2185 | - if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) { | |
| 2186 | - if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) { | |
| 2187 | - $event = FrmOnSubmitHelper::current_event( $params ); | |
| 2188 | - FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event ); | |
| 2189 | - $conf_method = 'redirect'; | |
| 2190 | - } | |
| 2191 | - } | |
| 2192 | - | |
| 2193 | 2025 | if ( 'redirect' === $conf_method ) { |
| 2194 | 2026 | self::trigger_redirect( $form, $params, $args ); |
| 2195 | 2027 | } |
| 2196 | 2028 | } |
| @@ -2213,23 +2045,10 @@ | ||
| 2213 | 2045 | /** |
| 2214 | 2046 | * Used when the success action is not 'message' |
| 2215 | 2047 | * |
| 2216 | 2048 | * @since 2.05 |
| 2217 | - * @since 6.0 `$args['force_delay_redirect']` is added. | |
| 2218 | - * | |
| 2219 | - * @param array $args { | |
| 2220 | - * The args. | |
| 2221 | - * | |
| 2222 | - * @type string $conf_method The method. | |
| 2223 | - * @type object $form Form object. | |
| 2224 | - * @type int $entry_id Entry ID. | |
| 2225 | - * @type string $action The action event. Accepts `create` or `update`. | |
| 2226 | - * @type array $fields The array of fields. | |
| 2227 | - * @type int $force_delay_redirect Force to show the message before redirecting in case redirect method runs. | |
| 2228 | - * } | |
| 2229 | 2049 | */ |
| 2230 | 2050 | public static function run_success_action( $args ) { |
| 2231 | - global $frm_vars; | |
| 2232 | 2051 | $extra_args = $args; |
| 2233 | 2052 | unset( $extra_args['form'] ); |
| 2234 | 2053 | |
| 2235 | 2054 | do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args ); |
| @@ -2236,10 +2055,8 @@ | ||
| 2236 | 2055 | |
| 2237 | 2056 | $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit'; |
| 2238 | 2057 | |
| 2239 | 2058 | $args['success_opt'] = $opt; |
| 2240 | - $args['ajax'] = ! empty( $frm_vars['ajax'] ); | |
| 2241 | - | |
| 2242 | 2059 | if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) { |
| 2243 | 2060 | self::load_page_after_submit( $args ); |
| 2244 | 2061 | } elseif ( $args['conf_method'] === 'redirect' ) { |
| 2245 | 2062 | self::redirect_after_submit( $args ); |
| @@ -2248,219 +2065,8 @@ | ||
| 2248 | 2065 | } |
| 2249 | 2066 | } |
| 2250 | 2067 | |
| 2251 | 2068 | /** |
| 2252 | - * Gets met On Submit actions. | |
| 2253 | - * | |
| 2254 | - * @since 6.0 | |
| 2255 | - * | |
| 2256 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2257 | - * @param string $event Form event. Default is `create`. | |
| 2258 | - * @return array Array of actions that meet the conditional logics. | |
| 2259 | - */ | |
| 2260 | - public static function get_met_on_submit_actions( $args, $event = 'create' ) { | |
| 2261 | - if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) { | |
| 2262 | - return array(); | |
| 2263 | - } | |
| 2264 | - | |
| 2265 | - $entry = FrmEntry::getOne( $args['entry_id'], true ); | |
| 2266 | - $actions = FrmOnSubmitHelper::get_actions( $args['form']->id ); | |
| 2267 | - $met_actions = array(); | |
| 2268 | - $has_redirect = false; | |
| 2269 | - | |
| 2270 | - foreach ( $actions as $action ) { | |
| 2271 | - if ( ! in_array( $event, $action->post_content['event'], true ) ) { | |
| 2272 | - continue; | |
| 2273 | - } | |
| 2274 | - | |
| 2275 | - if ( FrmFormAction::action_conditions_met( $action, $entry ) ) { | |
| 2276 | - continue; | |
| 2277 | - } | |
| 2278 | - | |
| 2279 | - $action_type = FrmOnSubmitHelper::get_action_type( $action ); | |
| 2280 | - | |
| 2281 | - if ( 'redirect' === $action_type ) { | |
| 2282 | - if ( $has_redirect ) { // Do not process because we run the first redirect action only. | |
| 2283 | - continue; | |
| 2284 | - } | |
| 2285 | - } | |
| 2286 | - | |
| 2287 | - if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) { | |
| 2288 | - continue; | |
| 2289 | - } | |
| 2290 | - | |
| 2291 | - if ( 'redirect' === $action_type ) { | |
| 2292 | - $has_redirect = true; | |
| 2293 | - } | |
| 2294 | - | |
| 2295 | - $met_actions[] = $action; | |
| 2296 | - unset( $action ); | |
| 2297 | - } | |
| 2298 | - | |
| 2299 | - $args['event'] = $event; | |
| 2300 | - | |
| 2301 | - /** | |
| 2302 | - * Filters the On Submit actions that meet the conditional logics. | |
| 2303 | - * | |
| 2304 | - * @since 6.0 | |
| 2305 | - * | |
| 2306 | - * @param array $met_actions Actions that meet the conditional logics. | |
| 2307 | - * @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added. | |
| 2308 | - */ | |
| 2309 | - $met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args ); | |
| 2310 | - | |
| 2311 | - if ( empty( $met_actions ) ) { | |
| 2312 | - $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) ); | |
| 2313 | - } | |
| 2314 | - | |
| 2315 | - return $met_actions; | |
| 2316 | - } | |
| 2317 | - | |
| 2318 | - /** | |
| 2319 | - * Checks if a Confirmation action has the valid data. | |
| 2320 | - * | |
| 2321 | - * @since 6.1.2 | |
| 2322 | - * | |
| 2323 | - * @param object $action Form action object. | |
| 2324 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2325 | - * @param string $event Form event. Default is `create`. | |
| 2326 | - * @return bool | |
| 2327 | - */ | |
| 2328 | - private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) { | |
| 2329 | - $action_type = FrmOnSubmitHelper::get_action_type( $action ); | |
| 2330 | - | |
| 2331 | - if ( 'redirect' === $action_type ) { | |
| 2332 | - // Run through frm_redirect_url filter. This is used for the valid action check. | |
| 2333 | - $action->post_content['success_url'] = apply_filters( | |
| 2334 | - 'frm_redirect_url', | |
| 2335 | - $action->post_content['success_url'], | |
| 2336 | - $args['form'], | |
| 2337 | - $args + array( 'action' => $event ) | |
| 2338 | - ); | |
| 2339 | - | |
| 2340 | - return ! empty( $action->post_content['success_url'] ); | |
| 2341 | - } | |
| 2342 | - | |
| 2343 | - if ( 'page' === $action_type ) { | |
| 2344 | - if ( empty( $action->post_content['success_page_id'] ) ) { | |
| 2345 | - return false; | |
| 2346 | - } | |
| 2347 | - | |
| 2348 | - $page = get_post( $action->post_content['success_page_id'] ); | |
| 2349 | - if ( ! $page || 'trash' === $page->post_status ) { | |
| 2350 | - return false; | |
| 2351 | - } | |
| 2352 | - } | |
| 2353 | - | |
| 2354 | - return true; | |
| 2355 | - } | |
| 2356 | - | |
| 2357 | - /** | |
| 2358 | - * Runs On Submit actions. | |
| 2359 | - * | |
| 2360 | - * @since 6.0 | |
| 2361 | - * | |
| 2362 | - * @param array $args See inside {@see FrmFormsController::get_form_contents()} method. | |
| 2363 | - */ | |
| 2364 | - public static function run_on_submit_actions( $args ) { | |
| 2365 | - $args['conf_method'] = self::get_confirmation_method( | |
| 2366 | - array( | |
| 2367 | - 'form' => $args['form'], | |
| 2368 | - 'entry_id' => $args['entry_id'], | |
| 2369 | - 'action' => FrmOnSubmitHelper::current_event( $args ), | |
| 2370 | - ) | |
| 2371 | - ); | |
| 2372 | - if ( ! is_array( $args['conf_method'] ) ) { | |
| 2373 | - self::run_success_action( $args ); | |
| 2374 | - return; | |
| 2375 | - } | |
| 2376 | - | |
| 2377 | - // If conf_method is an array, run On Submit actions. | |
| 2378 | - if ( ! $args['conf_method'] ) { | |
| 2379 | - // Use default message. | |
| 2380 | - FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options ); | |
| 2381 | - self::run_success_action( $args ); | |
| 2382 | - } elseif ( 1 === count( $args['conf_method'] ) ) { | |
| 2383 | - FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options, reset( $args['conf_method'] ) ); | |
| 2384 | - $args['conf_method'] = $args['form']->options['success_action']; | |
| 2385 | - self::run_success_action( $args ); | |
| 2386 | - } else { | |
| 2387 | - self::run_multi_on_submit_actions( $args ); | |
| 2388 | - } | |
| 2389 | - } | |
| 2390 | - | |
| 2391 | - /** | |
| 2392 | - * Runs multiple success actions. | |
| 2393 | - * | |
| 2394 | - * @since 6.0 | |
| 2395 | - * | |
| 2396 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2397 | - */ | |
| 2398 | - public static function run_multi_on_submit_actions( $args ) { | |
| 2399 | - $redirect_action = null; | |
| 2400 | - foreach ( $args['conf_method'] as $action ) { | |
| 2401 | - if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) { | |
| 2402 | - // We catch the redirect action to run it last. | |
| 2403 | - $redirect_action = $action; | |
| 2404 | - continue; | |
| 2405 | - } | |
| 2406 | - | |
| 2407 | - self::run_single_on_submit_action( $args, $action ); | |
| 2408 | - | |
| 2409 | - unset( $action ); | |
| 2410 | - } | |
| 2411 | - | |
| 2412 | - if ( $redirect_action ) { | |
| 2413 | - // Show script to delay the redirection. | |
| 2414 | - $args['force_delay_redirect'] = true; | |
| 2415 | - self::run_single_on_submit_action( $args, $redirect_action ); | |
| 2416 | - } | |
| 2417 | - } | |
| 2418 | - | |
| 2419 | - /** | |
| 2420 | - * Runs single On Submit action. | |
| 2421 | - * | |
| 2422 | - * @since 6.0 | |
| 2423 | - * | |
| 2424 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2425 | - * @param object $action On Submit action object. | |
| 2426 | - */ | |
| 2427 | - public static function run_single_on_submit_action( $args, $action ) { | |
| 2428 | - $new_args = self::get_run_success_action_args( $args, $action ); | |
| 2429 | - self::run_success_action( $new_args ); | |
| 2430 | - } | |
| 2431 | - | |
| 2432 | - /** | |
| 2433 | - * Gets run_success_action() args from the On Submit action. | |
| 2434 | - * | |
| 2435 | - * @since 6.0 | |
| 2436 | - * | |
| 2437 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2438 | - * @param object $action On Submit action object. | |
| 2439 | - * @return array | |
| 2440 | - */ | |
| 2441 | - private static function get_run_success_action_args( $args, $action ) { | |
| 2442 | - $new_args = $args; | |
| 2443 | - | |
| 2444 | - FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] ); | |
| 2445 | - | |
| 2446 | - $opt = 'update' === $args['action'] ? 'edit_' : 'success_'; | |
| 2447 | - | |
| 2448 | - $new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ]; | |
| 2449 | - | |
| 2450 | - /** | |
| 2451 | - * Filters the run success action args. | |
| 2452 | - * | |
| 2453 | - * @since 6.0 | |
| 2454 | - * | |
| 2455 | - * @param array $new_args The new args. | |
| 2456 | - * @param array $args The old args. See {@see FrmFormsController::run_success_action()}. | |
| 2457 | - * @param object $action On Submit action object. | |
| 2458 | - */ | |
| 2459 | - return apply_filters( 'frm_get_run_success_action_args', $new_args, $args, $action ); | |
| 2460 | - } | |
| 2461 | - | |
| 2462 | - /** | |
| 2463 | 2069 | * @since 3.0 |
| 2464 | 2070 | */ |
| 2465 | 2071 | private static function load_page_after_submit( $args ) { |
| 2466 | 2072 | global $post; |
| @@ -2469,22 +2075,9 @@ | ||
| 2469 | 2075 | $page = get_post( $args['form']->options[ $opt . '_page_id' ] ); |
| 2470 | 2076 | $old_post = $post; |
| 2471 | 2077 | $post = $page; |
| 2472 | 2078 | $content = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] ); |
| 2473 | - | |
| 2474 | - // Fix the On Submit page content doesn't show when previewing In theme. | |
| 2475 | - $has_preview_filter = has_filter( 'the_content', 'FrmFormsController::preview_content' ); | |
| 2476 | - | |
| 2477 | - if ( $has_preview_filter ) { | |
| 2478 | - remove_filter( 'the_content', 'FrmFormsController::preview_content', 9999 ); | |
| 2479 | - } | |
| 2480 | - | |
| 2481 | 2079 | echo apply_filters( 'the_content', $content ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped |
| 2482 | - | |
| 2483 | - if ( $has_preview_filter ) { | |
| 2484 | - add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 ); | |
| 2485 | - } | |
| 2486 | - | |
| 2487 | 2080 | $post = $old_post; |
| 2488 | 2081 | } |
| 2489 | 2082 | } |
| 2490 | 2083 | |
| @@ -2489,11 +2082,12 @@ | ||
| 2489 | 2082 | } |
| 2490 | 2083 | |
| 2491 | 2084 | /** |
| 2492 | 2085 | * @since 3.0 |
| 2493 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2494 | 2086 | */ |
| 2495 | 2087 | private static function redirect_after_submit( $args ) { |
| 2088 | + global $frm_vars; | |
| 2089 | + | |
| 2496 | 2090 | add_filter( 'frm_use_wpautop', '__return_false' ); |
| 2497 | 2091 | |
| 2498 | 2092 | $opt = $args['success_opt']; |
| 2499 | 2093 | $success_url = trim( $args['form']->options[ $opt . '_url' ] ); |
| @@ -2499,8 +2093,12 @@ | ||
| 2499 | 2093 | $success_url = trim( $args['form']->options[ $opt . '_url' ] ); |
| 2500 | 2094 | $success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] ); |
| 2501 | 2095 | $success_url = do_shortcode( $success_url ); |
| 2502 | 2096 | |
| 2097 | + $success_msg = isset( $args['form']->options[ $opt . '_msg' ] ) ? $args['form']->options[ $opt . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' ); | |
| 2098 | + | |
| 2099 | + $redirect_msg = self::get_redirect_message( $success_url, $success_msg, $args ); | |
| 2100 | + | |
| 2503 | 2101 | $args['id'] = $args['entry_id']; |
| 2504 | 2102 | FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args ); |
| 2505 | 2103 | |
| 2506 | 2104 | add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' ); |
| @@ -2507,57 +2105,22 @@ | ||
| 2507 | 2105 | $success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args ); |
| 2508 | 2106 | |
| 2509 | 2107 | $doing_ajax = FrmAppHelper::doing_ajax(); |
| 2510 | 2108 | |
| 2511 | - if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) { // Is AJAX submit and there is just one Redirect action runs. | |
| 2109 | + if ( isset( $args['ajax'] ) && $args['ajax'] && $doing_ajax ) { | |
| 2512 | 2110 | echo json_encode( array( 'redirect' => $success_url ) ); |
| 2513 | 2111 | wp_die(); |
| 2514 | - } | |
| 2515 | - | |
| 2516 | - if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) { // Not AJAX submit, no headers sent, and there is just one Redirect action runs. | |
| 2112 | + } elseif ( ! headers_sent() ) { | |
| 2517 | 2113 | wp_redirect( esc_url_raw( $success_url ) ); |
| 2518 | 2114 | die(); // do not use wp_die or redirect fails |
| 2115 | + } else { | |
| 2116 | + add_filter( 'frm_use_wpautop', '__return_true' ); | |
| 2117 | + echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 2118 | + echo "<script type='text/javascript'>window.onload = function(){setTimeout(window.location='" . esc_url_raw( $success_url ) . "', 8000);}</script>"; | |
| 2519 | 2119 | } |
| 2520 | - | |
| 2521 | - // Redirect with a delay. | |
| 2522 | - self::redirect_after_submit_using_js( $args + compact( 'success_url', 'doing_ajax' ) ); | |
| 2523 | 2120 | } |
| 2524 | 2121 | |
| 2525 | 2122 | /** |
| 2526 | - * Redirects after submitting using JS. This is used when showing message before redirecting. | |
| 2527 | - * | |
| 2528 | - * @since 6.0 | |
| 2529 | - * | |
| 2530 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2531 | - */ | |
| 2532 | - private static function redirect_after_submit_using_js( $args ) { | |
| 2533 | - $success_msg = FrmOnSubmitHelper::get_default_redirect_msg(); | |
| 2534 | - $redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args ); | |
| 2535 | - | |
| 2536 | - /** | |
| 2537 | - * Filters the delay time before redirecting when On Submit Redirect action is delayed. | |
| 2538 | - * | |
| 2539 | - * @since 6.0 | |
| 2540 | - * | |
| 2541 | - * @param int $delay_time Delay time in miliseconds. | |
| 2542 | - */ | |
| 2543 | - $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 ); | |
| 2544 | - | |
| 2545 | - add_filter( 'frm_use_wpautop', '__return_true' ); | |
| 2546 | - | |
| 2547 | - echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 2548 | - echo '<script>'; | |
| 2549 | - if ( empty( $args['doing_ajax'] ) ) { // Not AJAX submit, delay JS until window.load. | |
| 2550 | - echo 'window.onload=function(){'; | |
| 2551 | - } | |
| 2552 | - echo 'setTimeout(function(){window.location="' . esc_url_raw( $args['success_url'] ) . '";}, ' . intval( $delay_time ) . ');'; | |
| 2553 | - if ( empty( $args['doing_ajax'] ) ) { | |
| 2554 | - echo '};'; | |
| 2555 | - } | |
| 2556 | - echo '</script>'; | |
| 2557 | - } | |
| 2558 | - | |
| 2559 | - /** | |
| 2560 | 2123 | * @since 3.0 |
| 2561 | 2124 | * |
| 2562 | 2125 | * @param string $success_url |
| 2563 | 2126 | * @param string $success_msg |
| @@ -2563,9 +2126,9 @@ | ||
| 2563 | 2126 | * @param string $success_msg |
| 2564 | 2127 | * @param array $args |
| 2565 | 2128 | */ |
| 2566 | 2129 | private static function get_redirect_message( $success_url, $success_msg, $args ) { |
| 2567 | - $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' . | |
| 2130 | + $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/>' . | |
| 2568 | 2131 | /* translators: %1$s: Start link HTML, %2$s: End link HTML */ |
| 2569 | 2132 | sprintf( __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), '<a href="' . esc_url( $success_url ) . '">', '</a>' ) . |
| 2570 | 2133 | '</div></div>'; |
| 2571 | 2134 | |
| @@ -2583,22 +2146,12 @@ | ||
| 2583 | 2146 | * |
| 2584 | 2147 | * @since 2.05 |
| 2585 | 2148 | */ |
| 2586 | 2149 | public static function show_message_after_save( $atts ) { |
| 2587 | - $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts ); | |
| 2150 | + $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'] ); | |
| 2588 | 2151 | |
| 2589 | 2152 | if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) { |
| 2590 | - if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) { | |
| 2591 | - $entry = FrmEntry::getOne( $atts['entry_id'] ); | |
| 2592 | - if ( $entry ) { | |
| 2593 | - // This is copied from the Pro plugin. | |
| 2594 | - $atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts ); | |
| 2595 | - $atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] ); | |
| 2596 | - FrmProEntriesController::show_front_end_form_with_entry( $entry, $atts ); | |
| 2597 | - } | |
| 2598 | - } else { | |
| 2599 | - self::show_form_after_submit( $atts ); | |
| 2600 | - } | |
| 2153 | + self::show_form_after_submit( $atts ); | |
| 2601 | 2154 | } else { |
| 2602 | 2155 | self::show_lone_success_messsage( $atts ); |
| 2603 | 2156 | } |
| 2604 | 2157 | } |
| @@ -2668,16 +2221,8 @@ | ||
| 2668 | 2221 | * |
| 2669 | 2222 | * @since 2.05 |
| 2670 | 2223 | */ |
| 2671 | 2224 | private static function fill_atts_for_form_display( &$args ) { |
| 2672 | - if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) { | |
| 2673 | - $args['title'] = $args['show_title']; | |
| 2674 | - } | |
| 2675 | - | |
| 2676 | - if ( ! isset( $args['description'] ) && isset( $args['show_description'] ) ) { | |
| 2677 | - $args['description'] = $args['show_description']; | |
| 2678 | - } | |
| 2679 | - | |
| 2680 | 2225 | $defaults = array( |
| 2681 | 2226 | 'errors' => array(), |
| 2682 | 2227 | 'message' => '', |
| 2683 | 2228 | 'fields' => array(), |
| @@ -2711,21 +2256,14 @@ | ||
| 2711 | 2256 | /** |
| 2712 | 2257 | * Prepare the success message before it's shown |
| 2713 | 2258 | * |
| 2714 | 2259 | * @since 2.05 |
| 2715 | - * @since 6.0.x Added the third parameter. | |
| 2716 | - * | |
| 2717 | - * @param object $form Form object. | |
| 2718 | - * @param int $entry_id Entry ID. | |
| 2719 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2720 | - * @return string | |
| 2721 | 2260 | */ |
| 2722 | - private static function prepare_submit_message( $form, $entry_id, $args = array() ) { | |
| 2261 | + private static function prepare_submit_message( $form, $entry_id ) { | |
| 2723 | 2262 | $frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) ); |
| 2724 | - $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success'; | |
| 2725 | 2263 | |
| 2726 | 2264 | if ( $entry_id && is_numeric( $entry_id ) ) { |
| 2727 | - $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg; | |
| 2265 | + $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg; | |
| 2728 | 2266 | $class = 'frm_message'; |
| 2729 | 2267 | } else { |
| 2730 | 2268 | $message = $frm_settings->failed_msg; |
| 2731 | 2269 | $class = FrmFormsHelper::form_error_class(); |
| @@ -2735,11 +2273,8 @@ | ||
| 2735 | 2273 | |
| 2736 | 2274 | return apply_filters( 'frm_main_feedback', $message, $form, $entry_id ); |
| 2737 | 2275 | } |
| 2738 | 2276 | |
| 2739 | - /** | |
| 2740 | - * @return void | |
| 2741 | - */ | |
| 2742 | 2277 | public static function front_head() { |
| 2743 | 2278 | $version = FrmAppHelper::plugin_version(); |
| 2744 | 2279 | $suffix = FrmAppHelper::js_suffix(); |
| 2745 | 2280 | |
| @@ -2814,9 +2349,9 @@ | ||
| 2814 | 2349 | return ! function_exists( 'aioseo' ); |
| 2815 | 2350 | } |
| 2816 | 2351 | |
| 2817 | 2352 | public static function defer_script_loading( $tag, $handle ) { |
| 2818 | - if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) { | |
| 2353 | + if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) { | |
| 2819 | 2354 | $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag ); |
| 2820 | 2355 | } |
| 2821 | 2356 | |
| 2822 | 2357 | return $tag; |
| @@ -2983,13 +2518,29 @@ | ||
| 2983 | 2518 | self::update( $values ); |
| 2984 | 2519 | } |
| 2985 | 2520 | |
| 2986 | 2521 | /** |
| 2522 | + * @deprecated 1.07.05 | |
| 2523 | + * @codeCoverageIgnore | |
| 2524 | + */ | |
| 2525 | + public static function add_default_templates( $path, $default = true, $template = true ) { | |
| 2526 | + FrmDeprecated::add_default_templates( $path, $default, $template ); | |
| 2527 | + } | |
| 2528 | + | |
| 2529 | + /** | |
| 2987 | 2530 | * @deprecated 3.0 |
| 2988 | 2531 | * @codeCoverageIgnore |
| 2989 | 2532 | */ |
| 2990 | 2533 | public static function bulk_create_template( $ids ) { |
| 2991 | 2534 | return FrmDeprecated::bulk_create_template( $ids ); |
| 2535 | + } | |
| 2536 | + | |
| 2537 | + /** | |
| 2538 | + * @deprecated 2.03 | |
| 2539 | + * @codeCoverageIgnore | |
| 2540 | + */ | |
| 2541 | + public static function register_pro_scripts() { | |
| 2542 | + FrmDeprecated::register_pro_scripts(); | |
| 2992 | 2543 | } |
| 2993 | 2544 | |
| 2994 | 2545 | /** |
| 2995 | 2546 | * @deprecated 3.0 |
