| @@ -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)'; |
| @@ -149,9 +139,9 @@ | ||
| 149 | 139 | if ( ! $id || ! is_numeric( $id ) ) { |
| 150 | 140 | $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' ); |
| 151 | 141 | } |
| 152 | 142 | |
| 153 | - FrmOnSubmitHelper::maybe_migrate_submit_settings_to_action( $id ); | |
| 143 | + self::maybe_migrate_submit_settings_to_action( $id ); | |
| 154 | 144 | |
| 155 | 145 | return self::get_settings_vars( $id, array(), $message ); |
| 156 | 146 | } |
| 157 | 147 | |
| @@ -889,14 +879,14 @@ | ||
| 889 | 879 | * @return array<string,string> |
| 890 | 880 | */ |
| 891 | 881 | public static function get_columns( $columns ) { |
| 892 | 882 | $columns['cb'] = '<input type="checkbox" />'; |
| 893 | - $columns['name'] = esc_html__( 'Form Title', 'formidable' ); | |
| 894 | - $columns['entries'] = esc_html__( 'Entries', 'formidable' ); | |
| 883 | + $columns['name'] = __( 'Form Title', 'formidable' ); | |
| 884 | + $columns['entries'] = __( 'Entries', 'formidable' ); | |
| 895 | 885 | $columns['id'] = 'ID'; |
| 896 | - $columns['form_key'] = esc_html__( 'Key', 'formidable' ); | |
| 897 | - $columns['shortcode'] = esc_html__( 'Actions', 'formidable' ); | |
| 898 | - $columns['created_at'] = esc_html__( 'Date', 'formidable' ); | |
| 886 | + $columns['form_key'] = __( 'Key', 'formidable' ); | |
| 887 | + $columns['shortcode'] = __( 'Actions', 'formidable' ); | |
| 888 | + $columns['created_at'] = __( 'Date', 'formidable' ); | |
| 899 | 889 | |
| 900 | 890 | add_screen_option( |
| 901 | 891 | 'per_page', |
| 902 | 892 | array( |
| @@ -1332,9 +1322,9 @@ | ||
| 1332 | 1322 | |
| 1333 | 1323 | /** |
| 1334 | 1324 | * @param array $values |
| 1335 | 1325 | */ |
| 1336 | - public static function render_spam_settings( $values ) { | |
| 1326 | + private static function render_spam_settings( $values ) { | |
| 1337 | 1327 | if ( function_exists( 'akismet_http_post' ) ) { |
| 1338 | 1328 | include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php'; |
| 1339 | 1329 | } |
| 1340 | 1330 | include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php'; |
| @@ -1539,12 +1529,9 @@ | ||
| 1539 | 1529 | return $entry_shortcodes; |
| 1540 | 1530 | } |
| 1541 | 1531 | |
| 1542 | 1532 | /** |
| 1543 | - * Insert the form class setting into the form. | |
| 1544 | - * | |
| 1545 | - * @param stdClass $form | |
| 1546 | - * @return void | |
| 1533 | + * Insert the form class setting into the form | |
| 1547 | 1534 | */ |
| 1548 | 1535 | public static function form_classes( $form ) { |
| 1549 | 1536 | if ( isset( $form->options['form_class'] ) ) { |
| 1550 | 1537 | echo esc_attr( sanitize_text_field( $form->options['form_class'] ) ); |
| @@ -1553,12 +1540,8 @@ | ||
| 1553 | 1540 | if ( ! empty( $form->options['js_validate'] ) ) { |
| 1554 | 1541 | echo ' frm_js_validate '; |
| 1555 | 1542 | self::add_js_validate_form_to_global_vars( $form ); |
| 1556 | 1543 | } |
| 1557 | - | |
| 1558 | - if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) { | |
| 1559 | - echo ' frm_ajax_submit '; | |
| 1560 | - } | |
| 1561 | 1544 | } |
| 1562 | 1545 | |
| 1563 | 1546 | /** |
| 1564 | 1547 | * @since 5.0.03 |
| @@ -1615,17 +1598,13 @@ | ||
| 1615 | 1598 | * Replace any [form_name] shortcodes in a string. |
| 1616 | 1599 | * |
| 1617 | 1600 | * @since 5.5 |
| 1618 | 1601 | * |
| 1619 | - * @param string|array $string | |
| 1602 | + * @param string $string | |
| 1620 | 1603 | * @param stdClass|string|int $form |
| 1621 | - * @return string|array | |
| 1604 | + * @return string | |
| 1622 | 1605 | */ |
| 1623 | 1606 | public static function replace_form_name_shortcodes( $string, $form ) { |
| 1624 | - if ( ! is_string( $string ) ) { | |
| 1625 | - return $string; | |
| 1626 | - } | |
| 1627 | - | |
| 1628 | 1607 | if ( false === strpos( $string, '[form_name]' ) ) { |
| 1629 | 1608 | return $string; |
| 1630 | 1609 | } |
| 1631 | 1610 | |
| @@ -2066,11 +2045,8 @@ | ||
| 2066 | 2045 | $pass_args['action'] = $params['action']; |
| 2067 | 2046 | $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 2068 | 2047 | |
| 2069 | 2048 | if ( ! $handle_process_here ) { |
| 2070 | - FrmFormState::set_initial_value( 'title', $title ); | |
| 2071 | - FrmFormState::set_initial_value( 'description', $description ); | |
| 2072 | - | |
| 2073 | 2049 | do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description ); |
| 2074 | 2050 | if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) { |
| 2075 | 2051 | self::show_form_after_submit( $pass_args ); |
| 2076 | 2052 | } |
| @@ -2084,8 +2060,9 @@ | ||
| 2084 | 2060 | if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) { |
| 2085 | 2061 | $entry_id = self::just_created_entry( $form->id ); |
| 2086 | 2062 | $pass_args['entry_id'] = $entry_id; |
| 2087 | 2063 | $pass_args['reset'] = true; |
| 2064 | + $pass_args['conf_method'] = self::get_confirmation_method( compact( 'form', 'entry_id' ) ); | |
| 2088 | 2065 | |
| 2089 | 2066 | self::run_on_submit_actions( $pass_args ); |
| 2090 | 2067 | |
| 2091 | 2068 | do_action( |
| @@ -2147,20 +2124,18 @@ | ||
| 2147 | 2124 | * } |
| 2148 | 2125 | * @return string|array |
| 2149 | 2126 | */ |
| 2150 | 2127 | private static function get_confirmation_method( $atts ) { |
| 2151 | - $action = FrmOnSubmitHelper::current_event( $atts ); | |
| 2152 | - $opt = 'update' === $action ? 'edit_action' : 'success_action'; | |
| 2153 | - $method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message'; | |
| 2154 | - | |
| 2155 | - if ( ! empty( $atts['entry_id'] ) ) { | |
| 2156 | - $met_actions = self::get_met_on_submit_actions( $atts, $action ); | |
| 2128 | + if ( ! empty( $atts['entry_id'] ) ) { // Check against entry has already submitted error. | |
| 2129 | + $met_actions = self::get_met_on_submit_actions( $atts ); | |
| 2157 | 2130 | if ( $met_actions ) { |
| 2158 | - $method = $met_actions; | |
| 2131 | + return $met_actions; | |
| 2159 | 2132 | } |
| 2160 | 2133 | } |
| 2161 | 2134 | |
| 2162 | - $method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action ); | |
| 2135 | + $opt = 'success_action'; | |
| 2136 | + $method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message'; | |
| 2137 | + $method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' ); | |
| 2163 | 2138 | |
| 2164 | 2139 | if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) { |
| 2165 | 2140 | $method = 'message'; |
| 2166 | 2141 | } |
| @@ -2177,30 +2152,14 @@ | ||
| 2177 | 2152 | $conf_method = self::get_confirmation_method( |
| 2178 | 2153 | array( |
| 2179 | 2154 | 'form' => $form, |
| 2180 | 2155 | 'entry_id' => $params['id'], |
| 2181 | - 'action' => FrmOnSubmitHelper::current_event( $params ), | |
| 2182 | 2156 | ) |
| 2183 | 2157 | ); |
| 2184 | 2158 | |
| 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 | 2159 | if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) { |
| 2200 | 2160 | 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 ); | |
| 2161 | + FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0] ); | |
| 2203 | 2162 | $conf_method = 'redirect'; |
| 2204 | 2163 | } |
| 2205 | 2164 | } |
| 2206 | 2165 | |
| @@ -2271,17 +2230,8 @@ | ||
| 2271 | 2230 | * @param string $event Form event. Default is `create`. |
| 2272 | 2231 | * @return array Array of actions that meet the conditional logics. |
| 2273 | 2232 | */ |
| 2274 | 2233 | 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 | 2234 | $entry = FrmEntry::getOne( $args['entry_id'], true ); |
| 2285 | 2235 | $actions = FrmOnSubmitHelper::get_actions( $args['form']->id ); |
| 2286 | 2236 | $met_actions = array(); |
| 2287 | 2237 | $has_redirect = false; |
| @@ -2294,21 +2244,13 @@ | ||
| 2294 | 2244 | if ( FrmFormAction::action_conditions_met( $action, $entry ) ) { |
| 2295 | 2245 | continue; |
| 2296 | 2246 | } |
| 2297 | 2247 | |
| 2298 | - $action_type = FrmOnSubmitHelper::get_action_type( $action ); | |
| 2299 | - | |
| 2300 | - if ( 'redirect' === $action_type ) { | |
| 2248 | + if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) { | |
| 2301 | 2249 | if ( $has_redirect ) { // Do not process because we run the first redirect action only. |
| 2302 | 2250 | continue; |
| 2303 | 2251 | } |
| 2304 | - } | |
| 2305 | 2252 | |
| 2306 | - if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) { | |
| 2307 | - continue; | |
| 2308 | - } | |
| 2309 | - | |
| 2310 | - if ( 'redirect' === $action_type ) { | |
| 2311 | 2253 | $has_redirect = true; |
| 2312 | 2254 | } |
| 2313 | 2255 | |
| 2314 | 2256 | $met_actions[] = $action; |
| @@ -2324,57 +2266,12 @@ | ||
| 2324 | 2266 | * |
| 2325 | 2267 | * @param array $met_actions Actions that meet the conditional logics. |
| 2326 | 2268 | * @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added. |
| 2327 | 2269 | */ |
| 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; | |
| 2270 | + return apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args ); | |
| 2335 | 2271 | } |
| 2336 | 2272 | |
| 2337 | 2273 | /** |
| 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 | 2274 | * Runs On Submit actions. |
| 2378 | 2275 | * |
| 2379 | 2276 | * @since 6.0 |
| 2380 | 2277 | * |
| @@ -2379,16 +2276,9 @@ | ||
| 2379 | 2276 | * @since 6.0 |
| 2380 | 2277 | * |
| 2381 | 2278 | * @param array $args See inside {@see FrmFormsController::get_form_contents()} method. |
| 2382 | 2279 | */ |
| 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 | - ); | |
| 2280 | + private static function run_on_submit_actions( $args ) { | |
| 2391 | 2281 | if ( ! is_array( $args['conf_method'] ) ) { |
| 2392 | 2282 | self::run_success_action( $args ); |
| 2393 | 2283 | return; |
| 2394 | 2284 | } |
| @@ -2527,19 +2417,13 @@ | ||
| 2527 | 2417 | |
| 2528 | 2418 | $doing_ajax = FrmAppHelper::doing_ajax(); |
| 2529 | 2419 | |
| 2530 | 2420 | 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' ) ) ); | |
| 2421 | + echo json_encode( array( 'redirect' => $success_url ) ); | |
| 2532 | 2422 | wp_die(); |
| 2533 | 2423 | } |
| 2534 | 2424 | |
| 2535 | 2425 | 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 | - | |
| 2542 | 2426 | wp_redirect( esc_url_raw( $success_url ) ); |
| 2543 | 2427 | die(); // do not use wp_die or redirect fails |
| 2544 | 2428 | } |
| 2545 | 2429 | |
| @@ -2547,63 +2431,8 @@ | ||
| 2547 | 2431 | self::redirect_after_submit_using_js( $args + compact( 'success_url', 'doing_ajax' ) ); |
| 2548 | 2432 | } |
| 2549 | 2433 | |
| 2550 | 2434 | /** |
| 2551 | - * Prints open in new tab js with fallback handler. | |
| 2552 | - * | |
| 2553 | - * @since 6.3.1 | |
| 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.3.1 | |
| 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 | 2435 | * Redirects after submitting using JS. This is used when showing message before redirecting. |
| 2607 | 2436 | * |
| 2608 | 2437 | * @since 6.0 |
| 2609 | 2438 | * |
| @@ -2611,9 +2440,8 @@ | ||
| 2611 | 2440 | */ |
| 2612 | 2441 | private static function redirect_after_submit_using_js( $args ) { |
| 2613 | 2442 | $success_msg = FrmOnSubmitHelper::get_default_redirect_msg(); |
| 2614 | 2443 | $redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args ); |
| 2615 | - $success_url = esc_url_raw( $args['success_url'] ); | |
| 2616 | 2444 | |
| 2617 | 2445 | /** |
| 2618 | 2446 | * Filters the delay time before redirecting when On Submit Redirect action is delayed. |
| 2619 | 2447 | * |
| @@ -2622,14 +2450,8 @@ | ||
| 2622 | 2450 | * @param int $delay_time Delay time in miliseconds. |
| 2623 | 2451 | */ |
| 2624 | 2452 | $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 ); |
| 2625 | 2453 | |
| 2626 | - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) { | |
| 2627 | - $redirect_js = 'window.open("' . $success_url . '", "_blank")'; | |
| 2628 | - } else { | |
| 2629 | - $redirect_js = 'window.location="' . $success_url . '";'; | |
| 2630 | - } | |
| 2631 | - | |
| 2632 | 2454 | add_filter( 'frm_use_wpautop', '__return_true' ); |
| 2633 | 2455 | |
| 2634 | 2456 | echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped |
| 2635 | 2457 | echo '<script>'; |
| @@ -2635,9 +2457,9 @@ | ||
| 2635 | 2457 | echo '<script>'; |
| 2636 | 2458 | if ( empty( $args['doing_ajax'] ) ) { // Not AJAX submit, delay JS until window.load. |
| 2637 | 2459 | echo 'window.onload=function(){'; |
| 2638 | 2460 | } |
| 2639 | - echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 2461 | + echo 'setTimeout(function(){window.location="' . esc_url_raw( $args['success_url'] ) . '";}, ' . intval( $delay_time ) . ');'; | |
| 2640 | 2462 | if ( empty( $args['doing_ajax'] ) ) { |
| 2641 | 2463 | echo '};'; |
| 2642 | 2464 | } |
| 2643 | 2465 | echo '</script>'; |
| @@ -2651,9 +2473,10 @@ | ||
| 2651 | 2473 | * @param array $args |
| 2652 | 2474 | */ |
| 2653 | 2475 | private static function get_redirect_message( $success_url, $success_msg, $args ) { |
| 2654 | 2476 | $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 ) . | |
| 2477 | + /* translators: %1$s: Start link HTML, %2$s: End link HTML */ | |
| 2478 | + sprintf( __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), '<a href="' . esc_url( $success_url ) . '">', '</a>' ) . | |
| 2656 | 2479 | '</div></div>'; |
| 2657 | 2480 | |
| 2658 | 2481 | $redirect_args = array( |
| 2659 | 2482 | 'entry_id' => $args['entry_id'], |
| @@ -2664,50 +2487,17 @@ | ||
| 2664 | 2487 | return apply_filters( 'frm_redirect_msg', $redirect_msg, $redirect_args ); |
| 2665 | 2488 | } |
| 2666 | 2489 | |
| 2667 | 2490 | /** |
| 2668 | - * Gets fallback message when redirecting failed. | |
| 2669 | - * | |
| 2670 | - * @since 6.3.1 | |
| 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 | 2491 | * Prepare to show the success message and empty form after submit |
| 2692 | 2492 | * |
| 2693 | 2493 | * @since 2.05 |
| 2694 | 2494 | */ |
| 2695 | 2495 | public static function show_message_after_save( $atts ) { |
| 2696 | - $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts ); | |
| 2496 | + $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'] ); | |
| 2697 | 2497 | |
| 2698 | 2498 | 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 | - } | |
| 2499 | + self::show_form_after_submit( $atts ); | |
| 2710 | 2500 | } else { |
| 2711 | 2501 | self::show_lone_success_messsage( $atts ); |
| 2712 | 2502 | } |
| 2713 | 2503 | } |
| @@ -2777,16 +2567,8 @@ | ||
| 2777 | 2567 | * |
| 2778 | 2568 | * @since 2.05 |
| 2779 | 2569 | */ |
| 2780 | 2570 | 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 | 2571 | $defaults = array( |
| 2790 | 2572 | 'errors' => array(), |
| 2791 | 2573 | 'message' => '', |
| 2792 | 2574 | 'fields' => array(), |
| @@ -2820,21 +2602,14 @@ | ||
| 2820 | 2602 | /** |
| 2821 | 2603 | * Prepare the success message before it's shown |
| 2822 | 2604 | * |
| 2823 | 2605 | * @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 | 2606 | */ |
| 2831 | - private static function prepare_submit_message( $form, $entry_id, $args = array() ) { | |
| 2607 | + private static function prepare_submit_message( $form, $entry_id ) { | |
| 2832 | 2608 | $frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) ); |
| 2833 | - $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success'; | |
| 2834 | 2609 | |
| 2835 | 2610 | if ( $entry_id && is_numeric( $entry_id ) ) { |
| 2836 | - $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg; | |
| 2611 | + $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg; | |
| 2837 | 2612 | $class = 'frm_message'; |
| 2838 | 2613 | } else { |
| 2839 | 2614 | $message = $frm_settings->failed_msg; |
| 2840 | 2615 | $class = FrmFormsHelper::form_error_class(); |
| @@ -3077,8 +2852,105 @@ | ||
| 3077 | 2852 | ); |
| 3078 | 2853 | } |
| 3079 | 2854 | |
| 3080 | 2855 | /** |
| 2856 | + * Maybe migrate submit settings from the form options to On Submit action. | |
| 2857 | + * This is added after On Submit action is released. This might migrate the frontend editing submit settings too. | |
| 2858 | + * | |
| 2859 | + * @since 6.0 | |
| 2860 | + * | |
| 2861 | + * @param int $form_id Form ID. | |
| 2862 | + */ | |
| 2863 | + private static function maybe_migrate_submit_settings_to_action( $form_id ) { | |
| 2864 | + $form = FrmDb::get_row( 'frm_forms', array( 'id' => $form_id ), 'options,editable' ); | |
| 2865 | + if ( ! $form ) { | |
| 2866 | + return; | |
| 2867 | + } | |
| 2868 | + | |
| 2869 | + FrmAppHelper::unserialize_or_decode( $form->options ); | |
| 2870 | + | |
| 2871 | + $flag_key = 'on_submit_migrated'; | |
| 2872 | + if ( ! empty( $form->options[ $flag_key ] ) ) { | |
| 2873 | + return; | |
| 2874 | + } | |
| 2875 | + | |
| 2876 | + $form->id = $form_id; | |
| 2877 | + | |
| 2878 | + // Create On Submit action. | |
| 2879 | + $base_action = array(); | |
| 2880 | + | |
| 2881 | + $base_action['post_type'] = FrmFormActionsController::$action_post_type; | |
| 2882 | + $base_action['post_excerpt'] = FrmOnSubmitAction::$slug; | |
| 2883 | + $base_action['post_title'] = FrmOnSubmitAction::get_name(); | |
| 2884 | + $base_action['menu_order'] = $form_id; | |
| 2885 | + $base_action['post_status'] = 'publish'; | |
| 2886 | + $base_action['post_content'] = array( | |
| 2887 | + 'event' => array( 'create' ), | |
| 2888 | + ); | |
| 2889 | + | |
| 2890 | + $action_data = self::get_on_submit_action_data_from_form_options( $form->options ); | |
| 2891 | + | |
| 2892 | + // If frontend editing is enabled, migrate its settings too. | |
| 2893 | + if ( method_exists( 'FrmProFormActionsController', 'change_on_submit_action_ops' ) && FrmAppHelper::pro_is_connected() && $form->editable ) { | |
| 2894 | + $edit_data = self::get_on_submit_action_data_from_form_options( $form->options, 'update' ); | |
| 2895 | + | |
| 2896 | + if ( $action_data === $edit_data ) { | |
| 2897 | + // Just create one action for both create and update if they are the same. | |
| 2898 | + $base_action['post_content']['event'][] = 'update'; | |
| 2899 | + } else { | |
| 2900 | + // Create a separate action for update. | |
| 2901 | + $edit_action = $base_action; | |
| 2902 | + $edit_action['post_content'] += $edit_data; | |
| 2903 | + $edit_action['post_content']['event'] = array( 'update' ); | |
| 2904 | + | |
| 2905 | + $edit_action['post_content'] = FrmAppHelper::prepare_and_encode( $edit_action['post_content'] ); | |
| 2906 | + FrmDb::save_json_post( $edit_action ); | |
| 2907 | + } | |
| 2908 | + } | |
| 2909 | + | |
| 2910 | + $action = $base_action; | |
| 2911 | + $action['post_content'] += $action_data; | |
| 2912 | + | |
| 2913 | + $action['post_content'] = FrmAppHelper::prepare_and_encode( $action['post_content'] ); | |
| 2914 | + FrmDb::save_json_post( $action ); | |
| 2915 | + | |
| 2916 | + $form->options[ $flag_key ] = 1; | |
| 2917 | + FrmForm::update( $form->id, array( 'options' => $form->options ) ); | |
| 2918 | + } | |
| 2919 | + | |
| 2920 | + /** | |
| 2921 | + * Gets On Submit action data from form options to be used for the migration. | |
| 2922 | + * | |
| 2923 | + * @since 6.0 | |
| 2924 | + * | |
| 2925 | + * @param array $form_options Form options. | |
| 2926 | + * @param string $event Action event. Accepts `create` or `update`. Default is `create`. | |
| 2927 | + * @return array | |
| 2928 | + */ | |
| 2929 | + private static function get_on_submit_action_data_from_form_options( $form_options, $event = 'create' ) { | |
| 2930 | + $opt = 'update' === $event ? 'edit_' : 'success_'; | |
| 2931 | + $data = array( | |
| 2932 | + 'success_action' => isset( $form_options[ $opt . 'action' ] ) ? $form_options[ $opt . 'action' ] : FrmOnSubmitHelper::get_default_action_type(), | |
| 2933 | + ); | |
| 2934 | + | |
| 2935 | + switch ( $data['success_action'] ) { | |
| 2936 | + case 'redirect': | |
| 2937 | + $data['success_url'] = isset( $form_options[ $opt . 'url' ] ) ? $form_options[ $opt . 'url' ] : ''; | |
| 2938 | + break; | |
| 2939 | + | |
| 2940 | + case 'page': | |
| 2941 | + $data['success_page_id'] = isset( $form_options[ $opt . 'page_id' ] ) ? $form_options[ $opt . 'page_id' ] : ''; | |
| 2942 | + break; | |
| 2943 | + | |
| 2944 | + default: | |
| 2945 | + $data['success_msg'] = isset( $form_options[ $opt . 'msg' ] ) ? $form_options[ $opt . 'msg' ] : FrmOnSubmitHelper::get_default_msg(); | |
| 2946 | + $data['show_form'] = ! empty( $form_options['show_form'] ); | |
| 2947 | + } | |
| 2948 | + | |
| 2949 | + return $data; | |
| 2950 | + } | |
| 2951 | + | |
| 2952 | + /** | |
| 3081 | 2953 | * @deprecated 4.0 |
| 3082 | 2954 | */ |
| 3083 | 2955 | public static function new_form( $values = array() ) { |
| 3084 | 2956 | FrmDeprecated::new_form( $values ); |
| @@ -3092,13 +2964,29 @@ | ||
| 3092 | 2964 | self::update( $values ); |
| 3093 | 2965 | } |
| 3094 | 2966 | |
| 3095 | 2967 | /** |
| 2968 | + * @deprecated 1.07.05 | |
| 2969 | + * @codeCoverageIgnore | |
| 2970 | + */ | |
| 2971 | + public static function add_default_templates( $path, $default = true, $template = true ) { | |
| 2972 | + FrmDeprecated::add_default_templates( $path, $default, $template ); | |
| 2973 | + } | |
| 2974 | + | |
| 2975 | + /** | |
| 3096 | 2976 | * @deprecated 3.0 |
| 3097 | 2977 | * @codeCoverageIgnore |
| 3098 | 2978 | */ |
| 3099 | 2979 | public static function bulk_create_template( $ids ) { |
| 3100 | 2980 | return FrmDeprecated::bulk_create_template( $ids ); |
| 2981 | + } | |
| 2982 | + | |
| 2983 | + /** | |
| 2984 | + * @deprecated 2.03 | |
| 2985 | + * @codeCoverageIgnore | |
| 2986 | + */ | |
| 2987 | + public static function register_pro_scripts() { | |
| 2988 | + FrmDeprecated::register_pro_scripts(); | |
| 3101 | 2989 | } |
| 3102 | 2990 | |
| 3103 | 2991 | /** |
| 3104 | 2992 | * @deprecated 3.0 |
