| @@ -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() { |
| @@ -477,24 +439,15 @@ | ||
| 477 | 439 | public static function untrash() { |
| 478 | 440 | self::change_form_status( 'untrash' ); |
| 479 | 441 | } |
| 480 | 442 | |
| 481 | - /** | |
| 482 | - * @param array $ids | |
| 483 | - * @return string | |
| 484 | - */ | |
| 485 | 443 | public static function bulk_untrash( $ids ) { |
| 486 | 444 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 487 | 445 | |
| 488 | 446 | $count = FrmForm::set_status( $ids, 'published' ); |
| 489 | 447 | |
| 490 | - if ( ! $count ) { | |
| 491 | - // Don't show "0 forms restored" on refresh. | |
| 492 | - return ''; | |
| 493 | - } | |
| 494 | - | |
| 495 | 448 | /* translators: %1$s: Number of forms */ |
| 496 | - $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count ); | |
| 449 | + $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 ); | |
| 497 | 450 | |
| 498 | 451 | return $message; |
| 499 | 452 | } |
| 500 | 453 | |
| @@ -649,8 +602,10 @@ | ||
| 649 | 602 | * |
| 650 | 603 | * @since 4.0 |
| 651 | 604 | */ |
| 652 | 605 | public static function build_new_form() { |
| 606 | + global $wpdb; | |
| 607 | + | |
| 653 | 608 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 654 | 609 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 655 | 610 | |
| 656 | 611 | $new_values = self::get_modal_values(); |
| @@ -656,9 +611,8 @@ | ||
| 656 | 611 | $new_values = self::get_modal_values(); |
| 657 | 612 | $new_values['form_key'] = $new_values['name']; |
| 658 | 613 | $new_values['options'] = array( |
| 659 | 614 | 'antispam' => 1, |
| 660 | - 'on_submit_migrated' => 1, | |
| 661 | 615 | ); |
| 662 | 616 | |
| 663 | 617 | /** |
| 664 | 618 | * Allows changing form values before creating from the modal. |
| @@ -676,9 +630,8 @@ | ||
| 676 | 630 | * @param int $form_id |
| 677 | 631 | */ |
| 678 | 632 | do_action( 'frm_build_new_form', $form_id ); |
| 679 | 633 | |
| 680 | - self::create_default_on_submit_action( $form_id ); | |
| 681 | 634 | self::create_default_email_action( $form_id ); |
| 682 | 635 | |
| 683 | 636 | $response = array( |
| 684 | 637 | 'redirect' => FrmForm::get_edit_link( $form_id ), |
| @@ -888,14 +841,30 @@ | ||
| 888 | 841 | * @param array<string,string> $columns |
| 889 | 842 | * @return array<string,string> |
| 890 | 843 | */ |
| 891 | 844 | public static function get_columns( $columns ) { |
| 892 | - $columns['cb'] = '<input type="checkbox" />'; | |
| 893 | - $columns['name'] = __( 'Form Title', 'formidable' ); | |
| 894 | - $columns['entries'] = __( 'Entries', 'formidable' ); | |
| 895 | - $columns['id'] = 'ID'; | |
| 896 | - $columns['form_key'] = __( 'Key', 'formidable' ); | |
| 897 | - $columns['shortcode'] = __( 'Actions', 'formidable' ); | |
| 845 | + $columns['cb'] = '<input type="checkbox" />'; | |
| 846 | + $columns['id'] = 'ID'; | |
| 847 | + | |
| 848 | + $type = FrmAppHelper::get_simple_request( | |
| 849 | + array( | |
| 850 | + 'param' => 'form_type', | |
| 851 | + 'type' => 'request', | |
| 852 | + 'default' => 'published', | |
| 853 | + ) | |
| 854 | + ); | |
| 855 | + | |
| 856 | + if ( 'template' === $type ) { | |
| 857 | + $columns['name'] = __( 'Template Name', 'formidable' ); | |
| 858 | + $columns['type'] = __( 'Type', 'formidable' ); | |
| 859 | + $columns['form_key'] = __( 'Key', 'formidable' ); | |
| 860 | + } else { | |
| 861 | + $columns['name'] = __( 'Form Title', 'formidable' ); | |
| 862 | + $columns['entries'] = __( 'Entries', 'formidable' ); | |
| 863 | + $columns['form_key'] = __( 'Key', 'formidable' ); | |
| 864 | + $columns['shortcode'] = __( 'Actions', 'formidable' ); | |
| 865 | + } | |
| 866 | + | |
| 898 | 867 | $columns['created_at'] = __( 'Date', 'formidable' ); |
| 899 | 868 | |
| 900 | 869 | add_screen_option( |
| 901 | 870 | 'per_page', |
| @@ -1245,12 +1214,12 @@ | ||
| 1245 | 1214 | 'screenshot' => 'scheduling.png', |
| 1246 | 1215 | ), |
| 1247 | 1216 | ), |
| 1248 | 1217 | 'buttons' => array( |
| 1249 | - 'name' => __( 'Buttons', 'formidable' ), | |
| 1218 | + 'name' => __( 'Styling & Buttons', 'formidable' ), | |
| 1250 | 1219 | 'class' => __CLASS__, |
| 1251 | 1220 | 'function' => 'buttons_settings', |
| 1252 | - 'icon' => 'frm_icon_font frm_button_icon', | |
| 1221 | + 'icon' => 'frm_icon_font frm_pallet_icon', | |
| 1253 | 1222 | ), |
| 1254 | 1223 | 'landing' => array( |
| 1255 | 1224 | 'name' => __( 'Form Landing Page', 'formidable' ), |
| 1256 | 1225 | 'icon' => 'frm_icon_font frm_file_text_icon', |
| @@ -1332,9 +1301,9 @@ | ||
| 1332 | 1301 | |
| 1333 | 1302 | /** |
| 1334 | 1303 | * @param array $values |
| 1335 | 1304 | */ |
| 1336 | - public static function render_spam_settings( $values ) { | |
| 1305 | + private static function render_spam_settings( $values ) { | |
| 1337 | 1306 | if ( function_exists( 'akismet_http_post' ) ) { |
| 1338 | 1307 | include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php'; |
| 1339 | 1308 | } |
| 1340 | 1309 | include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php'; |
| @@ -1539,12 +1508,9 @@ | ||
| 1539 | 1508 | return $entry_shortcodes; |
| 1540 | 1509 | } |
| 1541 | 1510 | |
| 1542 | 1511 | /** |
| 1543 | - * Insert the form class setting into the form. | |
| 1544 | - * | |
| 1545 | - * @param stdClass $form | |
| 1546 | - * @return void | |
| 1512 | + * Insert the form class setting into the form | |
| 1547 | 1513 | */ |
| 1548 | 1514 | public static function form_classes( $form ) { |
| 1549 | 1515 | if ( isset( $form->options['form_class'] ) ) { |
| 1550 | 1516 | echo esc_attr( sanitize_text_field( $form->options['form_class'] ) ); |
| @@ -1553,12 +1519,8 @@ | ||
| 1553 | 1519 | if ( ! empty( $form->options['js_validate'] ) ) { |
| 1554 | 1520 | echo ' frm_js_validate '; |
| 1555 | 1521 | self::add_js_validate_form_to_global_vars( $form ); |
| 1556 | 1522 | } |
| 1557 | - | |
| 1558 | - if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) { | |
| 1559 | - echo ' frm_ajax_submit '; | |
| 1560 | - } | |
| 1561 | 1523 | } |
| 1562 | 1524 | |
| 1563 | 1525 | /** |
| 1564 | 1526 | * @since 5.0.03 |
| @@ -1615,17 +1577,13 @@ | ||
| 1615 | 1577 | * Replace any [form_name] shortcodes in a string. |
| 1616 | 1578 | * |
| 1617 | 1579 | * @since 5.5 |
| 1618 | 1580 | * |
| 1619 | - * @param string|array $string | |
| 1581 | + * @param string $string | |
| 1620 | 1582 | * @param stdClass|string|int $form |
| 1621 | - * @return string|array | |
| 1583 | + * @return string | |
| 1622 | 1584 | */ |
| 1623 | 1585 | public static function replace_form_name_shortcodes( $string, $form ) { |
| 1624 | - if ( ! is_string( $string ) ) { | |
| 1625 | - return $string; | |
| 1626 | - } | |
| 1627 | - | |
| 1628 | 1586 | if ( false === strpos( $string, '[form_name]' ) ) { |
| 1629 | 1587 | return $string; |
| 1630 | 1588 | } |
| 1631 | 1589 | |
| @@ -2062,15 +2020,11 @@ | ||
| 2062 | 2020 | $fields = FrmFieldsHelper::get_form_fields( $form->id, $errors ); |
| 2063 | 2021 | $reset = false; |
| 2064 | 2022 | $pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' ); |
| 2065 | 2023 | |
| 2066 | - $pass_args['action'] = $params['action']; | |
| 2067 | 2024 | $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 2068 | 2025 | |
| 2069 | 2026 | if ( ! $handle_process_here ) { |
| 2070 | - FrmFormState::set_initial_value( 'title', $title ); | |
| 2071 | - FrmFormState::set_initial_value( 'description', $description ); | |
| 2072 | - | |
| 2073 | 2027 | do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description ); |
| 2074 | 2028 | if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) { |
| 2075 | 2029 | self::show_form_after_submit( $pass_args ); |
| 2076 | 2030 | } |
| @@ -2084,10 +2038,11 @@ | ||
| 2084 | 2038 | if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) { |
| 2085 | 2039 | $entry_id = self::just_created_entry( $form->id ); |
| 2086 | 2040 | $pass_args['entry_id'] = $entry_id; |
| 2087 | 2041 | $pass_args['reset'] = true; |
| 2042 | + $pass_args['conf_method'] = self::get_confirmation_method( compact( 'form', 'entry_id' ) ); | |
| 2088 | 2043 | |
| 2089 | - self::run_on_submit_actions( $pass_args ); | |
| 2044 | + self::run_success_action( $pass_args ); | |
| 2090 | 2045 | |
| 2091 | 2046 | do_action( |
| 2092 | 2047 | 'frm_after_entry_processed', |
| 2093 | 2048 | array( |
| @@ -2133,35 +2088,15 @@ | ||
| 2133 | 2088 | return ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0; |
| 2134 | 2089 | } |
| 2135 | 2090 | |
| 2136 | 2091 | /** |
| 2137 | - * Gets confirmation method. | |
| 2138 | - * | |
| 2139 | 2092 | * @since 3.0 |
| 2140 | - * @since 6.0 This method can return an array of met On Submit actions. | |
| 2141 | - * | |
| 2142 | - * @param array $atts { | |
| 2143 | - * Atts. | |
| 2144 | - * | |
| 2145 | - * @type object $form Form object. | |
| 2146 | - * @type int $entry_id Entry ID. | |
| 2147 | - * } | |
| 2148 | - * @return string|array | |
| 2149 | 2093 | */ |
| 2150 | 2094 | private static function get_confirmation_method( $atts ) { |
| 2151 | - $action = FrmOnSubmitHelper::current_event( $atts ); | |
| 2152 | - $opt = 'update' === $action ? 'edit_action' : 'success_action'; | |
| 2095 | + $opt = 'success_action'; | |
| 2153 | 2096 | $method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message'; |
| 2097 | + $method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' ); | |
| 2154 | 2098 | |
| 2155 | - if ( ! empty( $atts['entry_id'] ) ) { | |
| 2156 | - $met_actions = self::get_met_on_submit_actions( $atts, $action ); | |
| 2157 | - if ( $met_actions ) { | |
| 2158 | - $method = $met_actions; | |
| 2159 | - } | |
| 2160 | - } | |
| 2161 | - | |
| 2162 | - $method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action ); | |
| 2163 | - | |
| 2164 | 2099 | if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) { |
| 2165 | 2100 | $method = 'message'; |
| 2166 | 2101 | } |
| 2167 | 2102 | |
| @@ -2177,34 +2112,11 @@ | ||
| 2177 | 2112 | $conf_method = self::get_confirmation_method( |
| 2178 | 2113 | array( |
| 2179 | 2114 | 'form' => $form, |
| 2180 | 2115 | 'entry_id' => $params['id'], |
| 2181 | - 'action' => FrmOnSubmitHelper::current_event( $params ), | |
| 2182 | 2116 | ) |
| 2183 | 2117 | ); |
| 2184 | 2118 | |
| 2185 | - self::maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ); | |
| 2186 | - } | |
| 2187 | - | |
| 2188 | - /** | |
| 2189 | - * Maybe trigger redirect with the new Confirmation action. | |
| 2190 | - * | |
| 2191 | - * @since 6.1.1 | |
| 2192 | - * | |
| 2193 | - * @param array|string $conf_method Array of confirmation actions or the action type string. | |
| 2194 | - * @param object $form Form object. | |
| 2195 | - * @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}. | |
| 2196 | - * @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}. | |
| 2197 | - */ | |
| 2198 | - public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) { | |
| 2199 | - if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) { | |
| 2200 | - if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) { | |
| 2201 | - $event = FrmOnSubmitHelper::current_event( $params ); | |
| 2202 | - FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event ); | |
| 2203 | - $conf_method = 'redirect'; | |
| 2204 | - } | |
| 2205 | - } | |
| 2206 | - | |
| 2207 | 2119 | if ( 'redirect' === $conf_method ) { |
| 2208 | 2120 | self::trigger_redirect( $form, $params, $args ); |
| 2209 | 2121 | } |
| 2210 | 2122 | } |
| @@ -2227,23 +2139,10 @@ | ||
| 2227 | 2139 | /** |
| 2228 | 2140 | * Used when the success action is not 'message' |
| 2229 | 2141 | * |
| 2230 | 2142 | * @since 2.05 |
| 2231 | - * @since 6.0 `$args['force_delay_redirect']` is added. | |
| 2232 | - * | |
| 2233 | - * @param array $args { | |
| 2234 | - * The args. | |
| 2235 | - * | |
| 2236 | - * @type string $conf_method The method. | |
| 2237 | - * @type object $form Form object. | |
| 2238 | - * @type int $entry_id Entry ID. | |
| 2239 | - * @type string $action The action event. Accepts `create` or `update`. | |
| 2240 | - * @type array $fields The array of fields. | |
| 2241 | - * @type int $force_delay_redirect Force to show the message before redirecting in case redirect method runs. | |
| 2242 | - * } | |
| 2243 | 2143 | */ |
| 2244 | 2144 | public static function run_success_action( $args ) { |
| 2245 | - global $frm_vars; | |
| 2246 | 2145 | $extra_args = $args; |
| 2247 | 2146 | unset( $extra_args['form'] ); |
| 2248 | 2147 | |
| 2249 | 2148 | do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args ); |
| @@ -2250,10 +2149,8 @@ | ||
| 2250 | 2149 | |
| 2251 | 2150 | $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit'; |
| 2252 | 2151 | |
| 2253 | 2152 | $args['success_opt'] = $opt; |
| 2254 | - $args['ajax'] = ! empty( $frm_vars['ajax'] ); | |
| 2255 | - | |
| 2256 | 2153 | if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) { |
| 2257 | 2154 | self::load_page_after_submit( $args ); |
| 2258 | 2155 | } elseif ( $args['conf_method'] === 'redirect' ) { |
| 2259 | 2156 | self::redirect_after_submit( $args ); |
| @@ -2262,224 +2159,8 @@ | ||
| 2262 | 2159 | } |
| 2263 | 2160 | } |
| 2264 | 2161 | |
| 2265 | 2162 | /** |
| 2266 | - * Gets met On Submit actions. | |
| 2267 | - * | |
| 2268 | - * @since 6.0 | |
| 2269 | - * | |
| 2270 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2271 | - * @param string $event Form event. Default is `create`. | |
| 2272 | - * @return array Array of actions that meet the conditional logics. | |
| 2273 | - */ | |
| 2274 | - public static function get_met_on_submit_actions( $args, $event = 'create' ) { | |
| 2275 | - if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) { | |
| 2276 | - return array(); | |
| 2277 | - } | |
| 2278 | - | |
| 2279 | - // If a redirect action has already opened the URL in a new tab, we show the default message in the currect tab. | |
| 2280 | - if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) { | |
| 2281 | - return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) ); | |
| 2282 | - } | |
| 2283 | - | |
| 2284 | - $entry = FrmEntry::getOne( $args['entry_id'], true ); | |
| 2285 | - $actions = FrmOnSubmitHelper::get_actions( $args['form']->id ); | |
| 2286 | - $met_actions = array(); | |
| 2287 | - $has_redirect = false; | |
| 2288 | - | |
| 2289 | - foreach ( $actions as $action ) { | |
| 2290 | - if ( ! in_array( $event, $action->post_content['event'], true ) ) { | |
| 2291 | - continue; | |
| 2292 | - } | |
| 2293 | - | |
| 2294 | - if ( FrmFormAction::action_conditions_met( $action, $entry ) ) { | |
| 2295 | - continue; | |
| 2296 | - } | |
| 2297 | - | |
| 2298 | - $action_type = FrmOnSubmitHelper::get_action_type( $action ); | |
| 2299 | - | |
| 2300 | - if ( 'redirect' === $action_type ) { | |
| 2301 | - if ( $has_redirect ) { // Do not process because we run the first redirect action only. | |
| 2302 | - continue; | |
| 2303 | - } | |
| 2304 | - } | |
| 2305 | - | |
| 2306 | - if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) { | |
| 2307 | - continue; | |
| 2308 | - } | |
| 2309 | - | |
| 2310 | - if ( 'redirect' === $action_type ) { | |
| 2311 | - $has_redirect = true; | |
| 2312 | - } | |
| 2313 | - | |
| 2314 | - $met_actions[] = $action; | |
| 2315 | - unset( $action ); | |
| 2316 | - } | |
| 2317 | - | |
| 2318 | - $args['event'] = $event; | |
| 2319 | - | |
| 2320 | - /** | |
| 2321 | - * Filters the On Submit actions that meet the conditional logics. | |
| 2322 | - * | |
| 2323 | - * @since 6.0 | |
| 2324 | - * | |
| 2325 | - * @param array $met_actions Actions that meet the conditional logics. | |
| 2326 | - * @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added. | |
| 2327 | - */ | |
| 2328 | - $met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args ); | |
| 2329 | - | |
| 2330 | - if ( empty( $met_actions ) ) { | |
| 2331 | - $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) ); | |
| 2332 | - } | |
| 2333 | - | |
| 2334 | - return $met_actions; | |
| 2335 | - } | |
| 2336 | - | |
| 2337 | - /** | |
| 2338 | - * Checks if a Confirmation action has the valid data. | |
| 2339 | - * | |
| 2340 | - * @since 6.1.2 | |
| 2341 | - * | |
| 2342 | - * @param object $action Form action object. | |
| 2343 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2344 | - * @param string $event Form event. Default is `create`. | |
| 2345 | - * @return bool | |
| 2346 | - */ | |
| 2347 | - private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) { | |
| 2348 | - $action_type = FrmOnSubmitHelper::get_action_type( $action ); | |
| 2349 | - | |
| 2350 | - if ( 'redirect' === $action_type ) { | |
| 2351 | - // Run through frm_redirect_url filter. This is used for the valid action check. | |
| 2352 | - $action->post_content['success_url'] = apply_filters( | |
| 2353 | - 'frm_redirect_url', | |
| 2354 | - $action->post_content['success_url'], | |
| 2355 | - $args['form'], | |
| 2356 | - $args + array( 'action' => $event ) | |
| 2357 | - ); | |
| 2358 | - | |
| 2359 | - return ! empty( $action->post_content['success_url'] ); | |
| 2360 | - } | |
| 2361 | - | |
| 2362 | - if ( 'page' === $action_type ) { | |
| 2363 | - if ( empty( $action->post_content['success_page_id'] ) ) { | |
| 2364 | - return false; | |
| 2365 | - } | |
| 2366 | - | |
| 2367 | - $page = get_post( $action->post_content['success_page_id'] ); | |
| 2368 | - if ( ! $page || 'trash' === $page->post_status ) { | |
| 2369 | - return false; | |
| 2370 | - } | |
| 2371 | - } | |
| 2372 | - | |
| 2373 | - return true; | |
| 2374 | - } | |
| 2375 | - | |
| 2376 | - /** | |
| 2377 | - * Runs On Submit actions. | |
| 2378 | - * | |
| 2379 | - * @since 6.0 | |
| 2380 | - * | |
| 2381 | - * @param array $args See inside {@see FrmFormsController::get_form_contents()} method. | |
| 2382 | - */ | |
| 2383 | - public static function run_on_submit_actions( $args ) { | |
| 2384 | - $args['conf_method'] = self::get_confirmation_method( | |
| 2385 | - array( | |
| 2386 | - 'form' => $args['form'], | |
| 2387 | - 'entry_id' => $args['entry_id'], | |
| 2388 | - 'action' => FrmOnSubmitHelper::current_event( $args ), | |
| 2389 | - ) | |
| 2390 | - ); | |
| 2391 | - if ( ! is_array( $args['conf_method'] ) ) { | |
| 2392 | - self::run_success_action( $args ); | |
| 2393 | - return; | |
| 2394 | - } | |
| 2395 | - | |
| 2396 | - // If conf_method is an array, run On Submit actions. | |
| 2397 | - if ( ! $args['conf_method'] ) { | |
| 2398 | - // Use default message. | |
| 2399 | - FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options ); | |
| 2400 | - self::run_success_action( $args ); | |
| 2401 | - } elseif ( 1 === count( $args['conf_method'] ) ) { | |
| 2402 | - FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options, reset( $args['conf_method'] ) ); | |
| 2403 | - $args['conf_method'] = $args['form']->options['success_action']; | |
| 2404 | - self::run_success_action( $args ); | |
| 2405 | - } else { | |
| 2406 | - self::run_multi_on_submit_actions( $args ); | |
| 2407 | - } | |
| 2408 | - } | |
| 2409 | - | |
| 2410 | - /** | |
| 2411 | - * Runs multiple success actions. | |
| 2412 | - * | |
| 2413 | - * @since 6.0 | |
| 2414 | - * | |
| 2415 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2416 | - */ | |
| 2417 | - public static function run_multi_on_submit_actions( $args ) { | |
| 2418 | - $redirect_action = null; | |
| 2419 | - foreach ( $args['conf_method'] as $action ) { | |
| 2420 | - if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) { | |
| 2421 | - // We catch the redirect action to run it last. | |
| 2422 | - $redirect_action = $action; | |
| 2423 | - continue; | |
| 2424 | - } | |
| 2425 | - | |
| 2426 | - self::run_single_on_submit_action( $args, $action ); | |
| 2427 | - | |
| 2428 | - unset( $action ); | |
| 2429 | - } | |
| 2430 | - | |
| 2431 | - if ( $redirect_action ) { | |
| 2432 | - // Show script to delay the redirection. | |
| 2433 | - $args['force_delay_redirect'] = true; | |
| 2434 | - self::run_single_on_submit_action( $args, $redirect_action ); | |
| 2435 | - } | |
| 2436 | - } | |
| 2437 | - | |
| 2438 | - /** | |
| 2439 | - * Runs single On Submit action. | |
| 2440 | - * | |
| 2441 | - * @since 6.0 | |
| 2442 | - * | |
| 2443 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2444 | - * @param object $action On Submit action object. | |
| 2445 | - */ | |
| 2446 | - public static function run_single_on_submit_action( $args, $action ) { | |
| 2447 | - $new_args = self::get_run_success_action_args( $args, $action ); | |
| 2448 | - self::run_success_action( $new_args ); | |
| 2449 | - } | |
| 2450 | - | |
| 2451 | - /** | |
| 2452 | - * Gets run_success_action() args from the On Submit action. | |
| 2453 | - * | |
| 2454 | - * @since 6.0 | |
| 2455 | - * | |
| 2456 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2457 | - * @param object $action On Submit action object. | |
| 2458 | - * @return array | |
| 2459 | - */ | |
| 2460 | - private static function get_run_success_action_args( $args, $action ) { | |
| 2461 | - $new_args = $args; | |
| 2462 | - | |
| 2463 | - FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] ); | |
| 2464 | - | |
| 2465 | - $opt = 'update' === $args['action'] ? 'edit_' : 'success_'; | |
| 2466 | - | |
| 2467 | - $new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ]; | |
| 2468 | - | |
| 2469 | - /** | |
| 2470 | - * Filters the run success action args. | |
| 2471 | - * | |
| 2472 | - * @since 6.0 | |
| 2473 | - * | |
| 2474 | - * @param array $new_args The new args. | |
| 2475 | - * @param array $args The old args. See {@see FrmFormsController::run_success_action()}. | |
| 2476 | - * @param object $action On Submit action object. | |
| 2477 | - */ | |
| 2478 | - return apply_filters( 'frm_get_run_success_action_args', $new_args, $args, $action ); | |
| 2479 | - } | |
| 2480 | - | |
| 2481 | - /** | |
| 2482 | 2163 | * @since 3.0 |
| 2483 | 2164 | */ |
| 2484 | 2165 | private static function load_page_after_submit( $args ) { |
| 2485 | 2166 | global $post; |
| @@ -2488,22 +2169,9 @@ | ||
| 2488 | 2169 | $page = get_post( $args['form']->options[ $opt . '_page_id' ] ); |
| 2489 | 2170 | $old_post = $post; |
| 2490 | 2171 | $post = $page; |
| 2491 | 2172 | $content = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] ); |
| 2492 | - | |
| 2493 | - // Fix the On Submit page content doesn't show when previewing In theme. | |
| 2494 | - $has_preview_filter = has_filter( 'the_content', 'FrmFormsController::preview_content' ); | |
| 2495 | - | |
| 2496 | - if ( $has_preview_filter ) { | |
| 2497 | - remove_filter( 'the_content', 'FrmFormsController::preview_content', 9999 ); | |
| 2498 | - } | |
| 2499 | - | |
| 2500 | 2173 | echo apply_filters( 'the_content', $content ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped |
| 2501 | - | |
| 2502 | - if ( $has_preview_filter ) { | |
| 2503 | - add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 ); | |
| 2504 | - } | |
| 2505 | - | |
| 2506 | 2174 | $post = $old_post; |
| 2507 | 2175 | } |
| 2508 | 2176 | } |
| 2509 | 2177 | |
| @@ -2508,11 +2176,12 @@ | ||
| 2508 | 2176 | } |
| 2509 | 2177 | |
| 2510 | 2178 | /** |
| 2511 | 2179 | * @since 3.0 |
| 2512 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2513 | 2180 | */ |
| 2514 | 2181 | private static function redirect_after_submit( $args ) { |
| 2182 | + global $frm_vars; | |
| 2183 | + | |
| 2515 | 2184 | add_filter( 'frm_use_wpautop', '__return_false' ); |
| 2516 | 2185 | |
| 2517 | 2186 | $opt = $args['success_opt']; |
| 2518 | 2187 | $success_url = trim( $args['form']->options[ $opt . '_url' ] ); |
| @@ -2518,8 +2187,12 @@ | ||
| 2518 | 2187 | $success_url = trim( $args['form']->options[ $opt . '_url' ] ); |
| 2519 | 2188 | $success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] ); |
| 2520 | 2189 | $success_url = do_shortcode( $success_url ); |
| 2521 | 2190 | |
| 2191 | + $success_msg = isset( $args['form']->options[ $opt . '_msg' ] ) ? $args['form']->options[ $opt . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' ); | |
| 2192 | + | |
| 2193 | + $redirect_msg = self::get_redirect_message( $success_url, $success_msg, $args ); | |
| 2194 | + | |
| 2522 | 2195 | $args['id'] = $args['entry_id']; |
| 2523 | 2196 | FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args ); |
| 2524 | 2197 | |
| 2525 | 2198 | add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' ); |
| @@ -2526,122 +2199,19 @@ | ||
| 2526 | 2199 | $success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args ); |
| 2527 | 2200 | |
| 2528 | 2201 | $doing_ajax = FrmAppHelper::doing_ajax(); |
| 2529 | 2202 | |
| 2530 | - if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) { // Is AJAX submit and there is just one Redirect action runs. | |
| 2531 | - echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) ); | |
| 2203 | + if ( isset( $args['ajax'] ) && $args['ajax'] && $doing_ajax ) { | |
| 2204 | + echo json_encode( array( 'redirect' => $success_url ) ); | |
| 2532 | 2205 | wp_die(); |
| 2533 | - } | |
| 2534 | - | |
| 2535 | - if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) { // Not AJAX submit, no headers sent, and there is just one Redirect action runs. | |
| 2536 | - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) { | |
| 2537 | - self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args ); | |
| 2538 | - self::$redirected_in_new_tab[ $args['form']->id ] = 1; | |
| 2539 | - return; | |
| 2540 | - } | |
| 2541 | - | |
| 2206 | + } elseif ( ! headers_sent() ) { | |
| 2542 | 2207 | wp_redirect( esc_url_raw( $success_url ) ); |
| 2543 | 2208 | die(); // do not use wp_die or redirect fails |
| 2544 | - } | |
| 2545 | - | |
| 2546 | - // Redirect with a delay. | |
| 2547 | - self::redirect_after_submit_using_js( $args + compact( 'success_url', 'doing_ajax' ) ); | |
| 2548 | - } | |
| 2549 | - | |
| 2550 | - /** | |
| 2551 | - * Prints open in new tab js with fallback handler. | |
| 2552 | - * | |
| 2553 | - * @since 6.x | |
| 2554 | - * | |
| 2555 | - * @param string $success_url Success URL. | |
| 2556 | - * @param array $args See {@see FrmFormsController::redirect_after_submit()}. | |
| 2557 | - */ | |
| 2558 | - private static function print_open_in_new_tab_js_with_fallback_handler( $success_url, $args ) { | |
| 2559 | - echo '<script>var newTab = window.open("' . esc_url_raw( $success_url ) . '", "_blank");'; | |
| 2560 | - echo 'if ( ! newTab ) {'; | |
| 2561 | - | |
| 2562 | - $data = array( | |
| 2563 | - 'formId' => intval( $args['form']->id ), | |
| 2564 | - 'message' => self::get_redirect_fallback_message( $success_url, $args ), | |
| 2565 | - ); | |
| 2566 | - // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 2567 | - echo 'frmShowNewTabFallback = ' . FrmAppHelper::maybe_json_encode( $data ) . ';'; | |
| 2568 | - echo '}</script>'; | |
| 2569 | - } | |
| 2570 | - | |
| 2571 | - /** | |
| 2572 | - * Gets response data for redirect action when AJAX submitting. | |
| 2573 | - * | |
| 2574 | - * @since 6.x | |
| 2575 | - * | |
| 2576 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2577 | - * @return array | |
| 2578 | - */ | |
| 2579 | - private static function get_ajax_redirect_response_data( $args ) { | |
| 2580 | - $response_data = array( 'redirect' => $args['success_url'] ); | |
| 2581 | - | |
| 2582 | - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) { | |
| 2583 | - $response_data['openInNewTab'] = 1; | |
| 2584 | - | |
| 2585 | - $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg(); | |
| 2586 | - | |
| 2587 | - $args['form']->options['success_msg'] = $args['message']; | |
| 2588 | - $args['form']->options['edit_msg'] = $args['message']; | |
| 2589 | - if ( ! isset( $args['fields'] ) ) { | |
| 2590 | - $args['fields'] = FrmField::get_all_for_form( $args['form']->id ); | |
| 2591 | - } | |
| 2592 | - | |
| 2593 | - $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args ); | |
| 2594 | - | |
| 2595 | - ob_start(); | |
| 2596 | - self::show_lone_success_messsage( $args ); | |
| 2597 | - $response_data['content'] = ob_get_clean(); | |
| 2598 | - | |
| 2599 | - $response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args ); | |
| 2600 | - } | |
| 2601 | - | |
| 2602 | - return $response_data; | |
| 2603 | - } | |
| 2604 | - | |
| 2605 | - /** | |
| 2606 | - * Redirects after submitting using JS. This is used when showing message before redirecting. | |
| 2607 | - * | |
| 2608 | - * @since 6.0 | |
| 2609 | - * | |
| 2610 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2611 | - */ | |
| 2612 | - private static function redirect_after_submit_using_js( $args ) { | |
| 2613 | - $success_msg = FrmOnSubmitHelper::get_default_redirect_msg(); | |
| 2614 | - $redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args ); | |
| 2615 | - $success_url = esc_url_raw( $args['success_url'] ); | |
| 2616 | - | |
| 2617 | - /** | |
| 2618 | - * Filters the delay time before redirecting when On Submit Redirect action is delayed. | |
| 2619 | - * | |
| 2620 | - * @since 6.0 | |
| 2621 | - * | |
| 2622 | - * @param int $delay_time Delay time in miliseconds. | |
| 2623 | - */ | |
| 2624 | - $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 ); | |
| 2625 | - | |
| 2626 | - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) { | |
| 2627 | - $redirect_js = 'window.open("' . $success_url . '", "_blank")'; | |
| 2628 | 2209 | } else { |
| 2629 | - $redirect_js = 'window.location="' . $success_url . '";'; | |
| 2210 | + add_filter( 'frm_use_wpautop', '__return_true' ); | |
| 2211 | + echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 2212 | + echo "<script type='text/javascript'>window.onload = function(){setTimeout(window.location='" . esc_url_raw( $success_url ) . "', 8000);}</script>"; | |
| 2630 | 2213 | } |
| 2631 | - | |
| 2632 | - add_filter( 'frm_use_wpautop', '__return_true' ); | |
| 2633 | - | |
| 2634 | - echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 2635 | - echo '<script>'; | |
| 2636 | - if ( empty( $args['doing_ajax'] ) ) { // Not AJAX submit, delay JS until window.load. | |
| 2637 | - echo 'window.onload=function(){'; | |
| 2638 | - } | |
| 2639 | - echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 2640 | - if ( empty( $args['doing_ajax'] ) ) { | |
| 2641 | - echo '};'; | |
| 2642 | - } | |
| 2643 | - echo '</script>'; | |
| 2644 | 2214 | } |
| 2645 | 2215 | |
| 2646 | 2216 | /** |
| 2647 | 2217 | * @since 3.0 |
| @@ -2650,10 +2220,11 @@ | ||
| 2650 | 2220 | * @param string $success_msg |
| 2651 | 2221 | * @param array $args |
| 2652 | 2222 | */ |
| 2653 | 2223 | private static function get_redirect_message( $success_url, $success_msg, $args ) { |
| 2654 | - $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' . | |
| 2655 | - self::get_redirect_fallback_message( $success_url, $args ) . | |
| 2224 | + $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/>' . | |
| 2225 | + /* translators: %1$s: Start link HTML, %2$s: End link HTML */ | |
| 2226 | + sprintf( __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), '<a href="' . esc_url( $success_url ) . '">', '</a>' ) . | |
| 2656 | 2227 | '</div></div>'; |
| 2657 | 2228 | |
| 2658 | 2229 | $redirect_args = array( |
| 2659 | 2230 | 'entry_id' => $args['entry_id'], |
| @@ -2664,50 +2235,17 @@ | ||
| 2664 | 2235 | return apply_filters( 'frm_redirect_msg', $redirect_msg, $redirect_args ); |
| 2665 | 2236 | } |
| 2666 | 2237 | |
| 2667 | 2238 | /** |
| 2668 | - * Gets fallback message when redirecting failed. | |
| 2669 | - * | |
| 2670 | - * @since 6.x | |
| 2671 | - * | |
| 2672 | - * @param string $success_url Redirect URL. | |
| 2673 | - * @param array $args Contains `form` object. | |
| 2674 | - * @return string | |
| 2675 | - */ | |
| 2676 | - private static function get_redirect_fallback_message( $success_url, $args ) { | |
| 2677 | - $target = ''; | |
| 2678 | - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) { | |
| 2679 | - $target = ' target="_blank"'; | |
| 2680 | - } | |
| 2681 | - | |
| 2682 | - return sprintf( | |
| 2683 | - /* translators: %1$s: Start link HTML, %2$s: End link HTML */ | |
| 2684 | - __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), | |
| 2685 | - '<a href="' . esc_url( $success_url ) . '"' . $target . '>', | |
| 2686 | - '</a>' | |
| 2687 | - ); | |
| 2688 | - } | |
| 2689 | - | |
| 2690 | - /** | |
| 2691 | 2239 | * Prepare to show the success message and empty form after submit |
| 2692 | 2240 | * |
| 2693 | 2241 | * @since 2.05 |
| 2694 | 2242 | */ |
| 2695 | 2243 | public static function show_message_after_save( $atts ) { |
| 2696 | - $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts ); | |
| 2244 | + $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'] ); | |
| 2697 | 2245 | |
| 2698 | 2246 | if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) { |
| 2699 | - if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) { | |
| 2700 | - $entry = FrmEntry::getOne( $atts['entry_id'] ); | |
| 2701 | - if ( $entry ) { | |
| 2702 | - // This is copied from the Pro plugin. | |
| 2703 | - $atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts ); | |
| 2704 | - $atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] ); | |
| 2705 | - FrmProEntriesController::show_front_end_form_with_entry( $entry, $atts ); | |
| 2706 | - } | |
| 2707 | - } else { | |
| 2708 | - self::show_form_after_submit( $atts ); | |
| 2709 | - } | |
| 2247 | + self::show_form_after_submit( $atts ); | |
| 2710 | 2248 | } else { |
| 2711 | 2249 | self::show_lone_success_messsage( $atts ); |
| 2712 | 2250 | } |
| 2713 | 2251 | } |
| @@ -2777,16 +2315,8 @@ | ||
| 2777 | 2315 | * |
| 2778 | 2316 | * @since 2.05 |
| 2779 | 2317 | */ |
| 2780 | 2318 | private static function fill_atts_for_form_display( &$args ) { |
| 2781 | - if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) { | |
| 2782 | - $args['title'] = $args['show_title']; | |
| 2783 | - } | |
| 2784 | - | |
| 2785 | - if ( ! isset( $args['description'] ) && isset( $args['show_description'] ) ) { | |
| 2786 | - $args['description'] = $args['show_description']; | |
| 2787 | - } | |
| 2788 | - | |
| 2789 | 2319 | $defaults = array( |
| 2790 | 2320 | 'errors' => array(), |
| 2791 | 2321 | 'message' => '', |
| 2792 | 2322 | 'fields' => array(), |
| @@ -2820,21 +2350,14 @@ | ||
| 2820 | 2350 | /** |
| 2821 | 2351 | * Prepare the success message before it's shown |
| 2822 | 2352 | * |
| 2823 | 2353 | * @since 2.05 |
| 2824 | - * @since 6.0.x Added the third parameter. | |
| 2825 | - * | |
| 2826 | - * @param object $form Form object. | |
| 2827 | - * @param int $entry_id Entry ID. | |
| 2828 | - * @param array $args See {@see FrmFormsController::run_success_action()}. | |
| 2829 | - * @return string | |
| 2830 | 2354 | */ |
| 2831 | - private static function prepare_submit_message( $form, $entry_id, $args = array() ) { | |
| 2355 | + private static function prepare_submit_message( $form, $entry_id ) { | |
| 2832 | 2356 | $frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) ); |
| 2833 | - $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success'; | |
| 2834 | 2357 | |
| 2835 | 2358 | if ( $entry_id && is_numeric( $entry_id ) ) { |
| 2836 | - $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg; | |
| 2359 | + $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg; | |
| 2837 | 2360 | $class = 'frm_message'; |
| 2838 | 2361 | } else { |
| 2839 | 2362 | $message = $frm_settings->failed_msg; |
| 2840 | 2363 | $class = FrmFormsHelper::form_error_class(); |
| @@ -2844,11 +2367,8 @@ | ||
| 2844 | 2367 | |
| 2845 | 2368 | return apply_filters( 'frm_main_feedback', $message, $form, $entry_id ); |
| 2846 | 2369 | } |
| 2847 | 2370 | |
| 2848 | - /** | |
| 2849 | - * @return void | |
| 2850 | - */ | |
| 2851 | 2371 | public static function front_head() { |
| 2852 | 2372 | $version = FrmAppHelper::plugin_version(); |
| 2853 | 2373 | $suffix = FrmAppHelper::js_suffix(); |
| 2854 | 2374 | |
| @@ -3092,13 +2612,29 @@ | ||
| 3092 | 2612 | self::update( $values ); |
| 3093 | 2613 | } |
| 3094 | 2614 | |
| 3095 | 2615 | /** |
| 2616 | + * @deprecated 1.07.05 | |
| 2617 | + * @codeCoverageIgnore | |
| 2618 | + */ | |
| 2619 | + public static function add_default_templates( $path, $default = true, $template = true ) { | |
| 2620 | + FrmDeprecated::add_default_templates( $path, $default, $template ); | |
| 2621 | + } | |
| 2622 | + | |
| 2623 | + /** | |
| 3096 | 2624 | * @deprecated 3.0 |
| 3097 | 2625 | * @codeCoverageIgnore |
| 3098 | 2626 | */ |
| 3099 | 2627 | public static function bulk_create_template( $ids ) { |
| 3100 | 2628 | return FrmDeprecated::bulk_create_template( $ids ); |
| 2629 | + } | |
| 2630 | + | |
| 2631 | + /** | |
| 2632 | + * @deprecated 2.03 | |
| 2633 | + * @codeCoverageIgnore | |
| 2634 | + */ | |
| 2635 | + public static function register_pro_scripts() { | |
| 2636 | + FrmDeprecated::register_pro_scripts(); | |
| 3101 | 2637 | } |
| 3102 | 2638 | |
| 3103 | 2639 | /** |
| 3104 | 2640 | * @deprecated 3.0 |
