PluginProbe
Formidable Forms – WordPress Form Builder for Contact Forms, Calculators, Quizzes & More / 5.4.5
Formidable Forms – WordPress Form Builder for Contact Forms, Calculators, Quizzes & More v5.4.5
6.35 6.34 6.33.1 6.33 6.32.1 6.32 6.31 6.25 6.25.1 6.26 6.26.1 6.27 6.28 6.29 6.3 6.3.1 6.3.2 6.30 6.4 6.4.1 6.4.2 6.5 6.5.1 6.5.2 6.5.3 All 141 releases
← All changes | classes/controllers/FrmFormsController.php +472 -1310 6.25 → 5.4.5 View file →
@@ -4,28 +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 current 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 - /**
19 - * The HTML for the Formdiable TinyMCE button (That triggers a popup to insert shortcodes)
20 - * is stored here and re-used as an optimization.
21 - *
22 - * @since 6.11
23 - *
24 - * @var string|null
25 - */
26 - private static $formidable_tinymce_button;
27 -
28 8 public static function menu() {
29 9 $menu_label = __( 'Forms', 'formidable' );
30 10 if ( ! FrmAppHelper::pro_is_installed() ) {
31 11 $menu_label .= ' (Lite)';
@@ -64,12 +44,12 @@
64 44 */
65 45 public static function logic_tip() {
66 46 $images_url = FrmAppHelper::plugin_url() . '/images/';
67 47 $data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' );
68 - $data_message .= ' <img src="' . esc_url( $images_url ) . '/survey-logic.png" srcset="' . esc_url( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>';
69 - 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">';
70 - esc_html_e( 'Conditional Logic', 'formidable' );
71 - FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon', array( 'aria-hidden' => 'true' ) );
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" 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' );
72 52 echo '</a>';
73 53 }
74 54
75 55 /**
@@ -106,110 +86,28 @@
106 86 * Create the default email action
107 87 *
108 88 * @since 2.02.11
109 89 *
110 - * @param int|object $form
111 - * @return void
90 + * @param object|int $form
112 91 */
113 92 private static function create_default_email_action( $form ) {
114 93 FrmForm::maybe_get_form( $form );
115 - if ( ! is_object( $form ) ) {
116 - return;
117 - }
118 -
119 94 $create_email = apply_filters( 'frm_create_default_email_action', true, $form );
120 95
121 96 if ( $create_email ) {
122 - /**
123 - * @var FrmFormAction
124 - */
125 97 $action_control = FrmFormActionsController::get_form_actions( 'email' );
126 98 $action_control->create( $form->id );
127 99 }
128 100 }
129 101
130 - /**
131 - * Create the default On submit action
132 - *
133 - * @since 6.0.0
134 - *
135 - * @param int|object $form Form object or ID.
136 - * @return void
137 - */
138 - private static function create_default_on_submit_action( $form ) {
139 - FrmForm::maybe_get_form( $form );
140 - if ( ! is_object( $form ) ) {
141 - return;
142 - }
143 -
144 - /**
145 - * Enable or disable the default On Submit action.
146 - *
147 - * @since 6.0.0
148 - *
149 - * @param bool $create Set to `false` if you want to disable.
150 - * @param object $form Form object.
151 - */
152 - $create = apply_filters( 'frm_create_default_on_submit_action', true, $form );
153 -
154 - if ( $create ) {
155 - /**
156 - * @var FrmFormAction
157 - */
158 - $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
159 - $action_control->create( $form->id );
160 - }
161 - }
162 -
163 - /**
164 - * Creates submit button field.
165 - *
166 - * @since 6.9
167 - *
168 - * @param int|object $form Form ID or object.
169 - * @return void
170 - */
171 - private static function create_submit_button_field( $form ) {
172 - FrmForm::maybe_get_form( $form );
173 - if ( ! is_object( $form ) ) {
174 - return;
175 - }
176 -
177 - if ( FrmSubmitHelper::get_submit_field( $form->id ) ) {
178 - // Do not create submit button field if it exists.
179 - return;
180 - }
181 -
182 - FrmField::create(
183 - array(
184 - 'type' => FrmSubmitHelper::FIELD_TYPE,
185 - 'name' => __( 'Submit', 'formidable' ),
186 - 'field_order' => FrmSubmitHelper::DEFAULT_ORDER,
187 - 'form_id' => $form->id,
188 - 'field_options' => FrmFieldsHelper::get_default_field_options( FrmSubmitHelper::FIELD_TYPE ),
189 - 'description' => '',
190 - 'default_value' => '',
191 - 'options' => array(),
192 - )
193 - );
194 - }
195 -
196 - /**
197 - * @return void
198 - */
199 102 public static function edit( $values = false ) {
200 103 FrmAppHelper::permission_check( 'frm_edit_forms' );
201 104
202 105 $id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
203 106
204 - self::get_edit_vars( $id );
107 + return self::get_edit_vars( $id );
205 108 }
206 109
207 - /**
208 - * @param mixed $id
209 - * @param string $message
210 - * @return void
211 - */
212 110 public static function settings( $id = false, $message = '' ) {
213 111 FrmAppHelper::permission_check( 'frm_edit_forms' );
214 112
215 113 if ( ! $id || ! is_numeric( $id ) ) {
@@ -215,36 +113,21 @@
215 113 if ( ! $id || ! is_numeric( $id ) ) {
216 114 $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
217 115 }
218 116
219 - FrmOnSubmitHelper::maybe_migrate_submit_settings_to_action( $id );
220 -
221 - self::get_settings_vars( $id, array(), $message );
117 + return self::get_settings_vars( $id, array(), $message );
222 118 }
223 119
224 120 public static function update_settings() {
225 121 FrmAppHelper::permission_check( 'frm_edit_forms' );
226 - $process_form = FrmAppHelper::get_post_param( 'process_form', '', 'sanitize_text_field' );
227 122
228 - if ( ! wp_verify_nonce( $process_form, 'process_form_nonce' ) ) {
229 - $frm_settings = FrmAppHelper::get_settings();
230 - $error_args = array(
231 - 'title' => __( 'Verification failed', 'formidable' ),
232 - 'body' => $frm_settings->admin_permission,
233 - 'cancel_text' => __( 'Cancel', 'formidable' ),
234 - );
235 - FrmAppController::show_error_modal( $error_args );
236 - return;
237 - }
238 -
239 123 $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
240 124
241 - $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
125 + $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
242 126 $warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
243 127
244 128 if ( count( $errors ) > 0 ) {
245 - self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
246 - return;
129 + return self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
247 130 }
248 131
249 132 do_action( 'frm_before_update_form_settings', $id );
250 133
@@ -258,9 +141,9 @@
258 141 }
259 142
260 143 $message = __( 'Settings Successfully Updated', 'formidable' );
261 144
262 - self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
145 + return self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
263 146 }
264 147
265 148 /**
266 149 * @param int $form_id
@@ -270,11 +153,8 @@
270 153 $form = FrmForm::getOne( $form_id );
271 154 return ! empty( $form->options['antispam'] );
272 155 }
273 156
274 - /**
275 - * @return void
276 - */
277 157 public static function update( $values = array() ) {
278 158 if ( empty( $values ) ) {
279 159 $values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
280 160 }
@@ -292,72 +172,63 @@
292 172
293 173 $id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
294 174
295 175 if ( count( $errors ) > 0 ) {
296 - self::get_edit_vars( $id, $errors );
297 - return;
298 - }
176 + return self::get_edit_vars( $id, $errors );
177 + } else {
178 + FrmForm::update( $id, $values );
179 + $message = __( 'Form was successfully updated.', 'formidable' );
299 180
300 - self::maybe_remove_draft_option_from_fields( $id );
181 + if ( self::is_too_long( $values ) ) {
182 + $message .= '<br/> ' . sprintf(
183 + /* translators: %1$s: Start link HTML, %2$s: end link HTML */
184 + __( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
185 + '<a href="https://formidableforms.com/knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/?utm_source=WordPress&utm_medium=builder&utm_campaign=liteplugin" target="_blank" rel="noopener">',
186 + '</a>'
187 + );
188 + }
301 189
302 - FrmForm::update( $id, $values );
303 - $message = __( 'Form was successfully updated.', 'formidable' );
190 + if ( defined( 'DOING_AJAX' ) ) {
191 + wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
192 + }
304 193
305 - if ( self::is_too_long( $values ) ) {
306 - $message .= '<br/> ' . sprintf(
307 - /* translators: %1$s: Start link HTML, %2$s: end link HTML */
308 - __( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
309 - '<a href="https://formidableforms.com/knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/?utm_source=WordPress&utm_medium=builder&utm_campaign=liteplugin" target="_blank" rel="noopener">',
310 - '</a>'
311 - );
194 + return self::get_edit_vars( $id, array(), $message );
312 195 }
196 + }
313 197
314 - if ( defined( 'DOING_AJAX' ) ) {
315 - wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
316 - }
317 -
318 - self::get_edit_vars( $id, array(), $message );
198 + /**
199 + * Check if the value at the end of the form was included.
200 + * If it's missing, it means other values at the end of the form
201 + * were likely not saved either.
202 + *
203 + * @since 3.06.01
204 + */
205 + private static function is_too_long( $values ) {
206 + return ( ! isset( $values['frm_end'] ) ) || empty( $values['frm_end'] );
319 207 }
320 208
321 209 /**
322 - * Remove the draft flag from any new fields from this current session.
210 + * Redirect to the url for creating from a template
211 + * Also delete the current form
323 212 *
324 - * @since 6.8
325 - *
326 - * @param int $form_id
327 - * @return void
213 + * @since 2.0
214 + * @deprecated 3.06
328 215 */
329 - private static function maybe_remove_draft_option_from_fields( $form_id ) {
330 - $draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' );
331 - if ( ! $draft_field_ids_csv ) {
332 - // If the draft_fields input is empty there are no new fields in the session.
333 - return;
334 - }
216 + public static function _create_from_template() {
217 + _deprecated_function( __FUNCTION__, '3.06' );
335 218
336 - $draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
337 - if ( ! $draft_field_ids ) {
338 - // Exit early if the draft fields input is invalid. It should be a CSV of integer values.
339 - return;
340 - }
219 + FrmAppHelper::permission_check( 'frm_edit_forms' );
220 + check_ajax_referer( 'frm_ajax', 'nonce' );
341 221
342 - $draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids );
343 - foreach ( $draft_field_rows as $row ) {
344 - $row->field_options['draft'] = 0;
345 - FrmField::update( $row->id, array( 'field_options' => $row->field_options ) );
222 + $current_form = FrmAppHelper::get_param( 'this_form', '', 'get', 'absint' );
223 + $template_id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
224 +
225 + if ( $current_form ) {
226 + FrmForm::destroy( $current_form );
346 227 }
347 - }
348 228
349 - /**
350 - * Check if the value at the end of the form was included.
351 - * If it's missing, it means other values at the end of the form
352 - * were likely not saved either.
353 - *
354 - * @since 3.06.01
355 - *
356 - * @return bool
357 - */
358 - private static function is_too_long( $values ) {
359 - return empty( $values['frm_end'] );
229 + echo esc_url_raw( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template_id ) ) );
230 + wp_die();
360 231 }
361 232
362 233 public static function duplicate() {
363 234 FrmAppHelper::permission_check( 'frm_edit_forms' );
@@ -373,11 +244,10 @@
373 244 $url = admin_url( 'admin.php?page=formidable' );
374 245 $message = 'form_duplicate_error';
375 246
376 247 if ( $form ) {
377 - $new_template = FrmAppHelper::simple_get( 'new_template' ) ? '&new_template=true' : '';
378 - $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) . $new_template );
379 - $message = 'form_duplicated';
248 + $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) );
249 + $message = 'form_duplicated';
380 250 }
381 251
382 252 $url .= '&message=' . $message;
383 253
@@ -385,42 +255,27 @@
385 255 exit();
386 256 }
387 257
388 258 /**
389 - * @return string|null
259 + * @return string
390 260 */
391 261 public static function page_preview() {
392 262 $params = FrmForm::list_page_params();
393 - if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
394 - return null;
263 + if ( ! $params['form'] ) {
264 + return;
395 265 }
396 266
397 - self::maybe_block_preview( $params['form'] );
398 -
399 267 $form = FrmForm::getOne( $params['form'] );
400 - if ( ! $form ) {
401 - return null;
268 + if ( $form ) {
269 + return self::show_form( $form->id, '', 'auto', 'auto' );
402 270 }
403 -
404 - return self::show_form( $form->id, '', 'auto', 'auto' );
405 271 }
406 272
407 273 /**
408 274 * @since 3.0
409 - *
410 - * @return void
411 275 */
412 276 public static function show_page_preview() {
413 - $preview = self::page_preview();
414 - if ( is_null( $preview ) ) {
415 - wp_die(
416 - '<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>',
417 - '<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>',
418 - 404
419 - );
420 - }
421 -
422 - echo $preview; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
277 + echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
423 278 }
424 279
425 280 /**
426 281 * @return void
@@ -431,17 +286,8 @@
431 286
432 287 global $frm_vars;
433 288 $frm_vars['preview'] = true;
434 289
435 - // print_emoji_styles is deprecated.
436 - remove_action( 'wp_print_styles', 'print_emoji_styles' );
437 -
438 - if ( FrmTestModeController::should_add_test_mode_container() ) {
439 - do_action( 'frm_test_mode_init' );
440 - add_action( 'wp_enqueue_scripts', 'FrmTestModeController::register_and_enqueue_required_scripts' );
441 - add_filter( 'frm_filter_final_form', 'FrmTestModeController::maybe_add_test_mode_container', 99 );
442 - }
443 -
444 290 $include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
445 291 if ( $include_theme ) {
446 292 self::set_preview_query();
447 293 self::load_theme_preview();
@@ -451,67 +297,31 @@
451 297
452 298 wp_die();
453 299 }
454 300
455 - /**
456 - * Set the page global to any available page (except for the Blog Page).
457 - *
458 - * @return void
459 - */
460 301 private static function set_preview_query() {
461 - $page_query = array(
462 - 'numberposts' => 1,
463 - 'orderby' => 'date',
464 - 'order' => 'ASC',
465 - 'post_type' => 'page',
466 - );
467 -
468 - $page_for_posts = get_option( 'page_for_posts' );
469 - if ( is_numeric( $page_for_posts ) ) {
470 - // Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
471 - $page_query['post__not_in'] = array( $page_for_posts );
472 - }
473 -
474 - $random_page = get_posts( $page_query );
475 - if ( ! $random_page ) {
476 - return;
477 - }
478 -
479 - $random_page = reset( $random_page );
480 - if ( ! is_a( $random_page, 'WP_Post' ) ) {
481 - // The return type can also be int.
482 - return;
483 - }
484 -
485 - query_posts(
302 + $random_page = get_posts(
486 303 array(
487 - 'post_type' => 'page',
488 - 'page_id' => $random_page->ID,
304 + 'numberposts' => 1,
305 + 'orderby' => 'date',
306 + 'order' => 'ASC',
307 + 'post_type' => 'page',
489 308 )
490 309 );
491 310
492 - // Fixes Pro issue #3004. Prevent an undefined $post object.
493 - // Otherwise WordPress themes will trigger a warning "Attempt to read property "comment_count" on null".
494 - 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 + }
495 320 }
496 321
497 322 /**
498 - * Set the WP $post global object. Used for in-theme preview when defining a page.
499 - *
500 - * @since 5.5.2
501 - *
502 - * @param WP_Post $page The page object.
503 - * @return void
504 - */
505 - private static function set_post_global( $page ) {
506 - global $post;
507 - $post = $page; // phpcs:ignore WordPress.WP.GlobalVariablesOverride
508 - }
509 -
510 - /**
511 323 * @since 3.0
512 - *
513 - * @return void
514 324 */
515 325 private static function load_theme_preview() {
516 326 add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 );
517 327 add_filter( 'the_title', 'FrmFormsController::preview_page_title', 9999 );
@@ -520,39 +330,20 @@
520 330 add_filter( 'is_active_sidebar', '__return_false' );
521 331 FrmStylesController::enqueue_css( 'enqueue', true );
522 332
523 333 if ( false === get_template_part( 'page' ) ) {
524 - if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
525 - add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
526 - }
527 334 self::fallback_when_page_template_part_is_not_supported_by_theme();
528 335 }
529 336 }
530 337
531 338 /**
532 - * Add padding to the body for block themes.
533 - *
534 - * @since 6.5.2
535 - *
536 - * @param array $classes The body classes list.
537 - * @return array
538 - */
539 - public static function preview_block_theme_body_classnames( $classes ) {
540 - $classes[] = 'has-global-padding';
541 - return $classes;
542 - }
543 -
544 - /**
545 339 * Not every theme supports get_template_part( 'page' ).
546 340 * When this is not supported, false is returned, and we can handle a fallback.
547 - *
548 - * @return void
549 341 */
550 342 private static function fallback_when_page_template_part_is_not_supported_by_theme() {
551 343 if ( have_posts() ) {
552 344 the_post();
553 - self::get_template( 'header' );
554 -
345 + get_header( '' );
555 346 // add some generic class names to the container to add some natural padding to the content.
556 347 // .entry-content catches the WordPress TwentyTwenty theme.
557 348 // .container catches Customizr content.
558 349 echo '<div class="container entry-content">';
@@ -557,58 +348,13 @@
557 348 // .container catches Customizr content.
558 349 echo '<div class="container entry-content">';
559 350 the_content();
560 351 echo '</div>';
561 -
562 - // Prevent extra unexpected forms in the footer.
563 - // For some reason this happens in the Twenty Twenty Five theme.
564 - add_filter( 'frm_filter_final_form', '__return_empty_string' );
565 -
566 - self::get_template( 'footer' );
352 + get_footer();
567 353 }
568 354 }
569 355
570 356 /**
571 - * Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
572 - * and renders required html fragments calling required functions.
573 - *
574 - * @since 6.7.1
575 - * @param string $template
576 - * @return void
577 - */
578 - private static function get_template( $template ) {
579 - if ( self::should_try_getting_template( $template ) ) {
580 - call_user_func( 'get_' . $template );
581 - return;
582 - }
583 -
584 - if ( 'header' === $template ) {
585 - include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/preview/header.php';
586 - return;
587 - }
588 -
589 - if ( 'footer' === $template ) {
590 - include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/preview/footer.php';
591 - }
592 - }
593 -
594 - /**
595 - * Returns true if calling a template function doesn't trigger deprecation warnings.
596 - *
597 - * @since 6.7.1
598 - * @param string $template
599 - * @return bool
600 - */
601 - private static function should_try_getting_template( $template ) {
602 - $stylesheet_path = get_stylesheet_directory();
603 - $template_path = get_template_directory();
604 - $is_child_theme = $stylesheet_path !== $template_path;
605 - $template_name = $template . '.php';
606 -
607 - return file_exists( $stylesheet_path . '/' . $template_name ) || $is_child_theme && file_exists( $template_path . '/' . $template_name );
608 - }
609 -
610 - /**
611 357 * Set the page title for the theme preview page
612 358 *
613 359 * @since 3.0
614 360 */
@@ -620,14 +366,11 @@
620 366 return $title;
621 367 }
622 368
623 369 /**
624 - * Set the page title for the theme preview page.
370 + * Set the page title for the theme preview page
625 371 *
626 372 * @since 3.0
627 - *
628 - * @param string $title
629 - * @return string
630 373 */
631 374 public static function preview_title( $title ) {
632 375 return __( 'Form Preview', 'formidable' );
633 376 }
@@ -632,20 +375,15 @@
632 375 return __( 'Form Preview', 'formidable' );
633 376 }
634 377
635 378 /**
636 - * Set the page content for the theme preview page.
379 + * Set the page content for the theme preview page
637 380 *
638 381 * @since 3.0
639 - *
640 - * @param string $content
641 - * @return string
642 382 */
643 383 public static function preview_content( $content ) {
644 384 if ( in_the_loop() ) {
645 - self::show_page_preview();
646 - // Clear the content for the page we're using.
647 - $content = '';
385 + $content = self::show_page_preview();
648 386 }
649 387
650 388 return $content;
651 389 }
@@ -653,108 +391,34 @@
653 391 /**
654 392 * @since 3.0
655 393 */
656 394 private static function load_direct_preview() {
395 + header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
396 +
657 397 $key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
658 398 if ( $key == '' ) {
659 399 $key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
660 400 }
661 401
662 - if ( ! $key ) {
663 - $error = __( 'Form key is missing', 'formidable' );
664 - wp_die(
665 - '<h1>' . esc_html( $error ) . '</h1>',
666 - '<p>' . esc_html( $error ) . '</p>',
667 - 404
668 - );
669 - }
670 -
671 - self::maybe_block_preview( $key );
672 -
673 402 $form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
674 - if ( ! $form ) {
675 - $error = __( 'Form does not exist', 'formidable' );
676 - wp_die(
677 - '<h1>' . esc_html( $error ) . '</h1>',
678 - '<p>' . esc_html( $error ) . '</p>',
679 - 404
680 - );
403 + if ( empty( $form ) ) {
404 + $form = FrmForm::getAll( array(), '', 1 );
681 405 }
682 406
683 - header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
684 -
685 - self::fix_deprecated_null_param_warning();
686 -
687 - require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
407 + require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php' );
688 408 }
689 409
690 - /**
691 - * Block the form preview for the contact form by default if the user cannot view forms.
692 - * This is to prevent the contact form being exploited.
693 - * Since this form is added by default and every site uses the same key, it is too easy
694 - * to guess this form.
695 - *
696 - * @since 6.20
697 - *
698 - * @param string $form_key Form key.
699 - * @return void
700 - */
701 - public static function maybe_block_preview( $form_key ) {
702 - if ( FrmFormsHelper::should_block_preview( $form_key ) ) {
703 - $error = __( 'You do not have permission to view this form', 'formidable' );
704 - wp_die(
705 - '<h1>' . esc_html( $error ) . '</h1>',
706 - '<p>' . esc_html( $error ) . '</p>',
707 - 403
708 - );
709 - }
710 - }
711 -
712 - /**
713 - * Some themes have a null $src value.
714 - * This function adds a filter to ensure that $src is not null.
715 - * WP will call str_starts_with with the null value triggering a deprecated message otherwise.
716 - *
717 - * @since 6.10
718 - *
719 - * @return void
720 - */
721 - private static function fix_deprecated_null_param_warning() {
722 - add_filter(
723 - 'script_loader_src',
724 - /**
725 - * @param string|null $src
726 - * @return string
727 - */
728 - function ( $src ) {
729 - if ( is_null( $src ) ) {
730 - $src = '';
731 - }
732 - return $src;
733 - }
734 - );
735 - }
736 -
737 410 public static function untrash() {
738 411 self::change_form_status( 'untrash' );
739 412 }
740 413
741 - /**
742 - * @param array $ids
743 - * @return string
744 - */
745 414 public static function bulk_untrash( $ids ) {
746 415 FrmAppHelper::permission_check( 'frm_edit_forms' );
747 416
748 417 $count = FrmForm::set_status( $ids, 'published' );
749 418
750 - if ( ! $count ) {
751 - // Don't show "0 forms restored" on refresh.
752 - return '';
753 - }
754 -
755 419 /* translators: %1$s: Number of forms */
756 - $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 );
757 421
758 422 return $message;
759 423 }
760 424
@@ -797,14 +461,14 @@
797 461 FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
798 462
799 463 $params = FrmForm::list_page_params();
800 464
801 - // Check nonce url.
465 + //check nonce url
802 466 check_admin_referer( $status . '_form_' . $params['id'] );
803 467
804 468 $count = 0;
805 469 if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
806 - ++$count;
470 + $count ++;
807 471 }
808 472
809 473 $form_type = FrmAppHelper::get_simple_request(
810 474 array(
@@ -816,9 +480,9 @@
816 480 /* translators: %1$s: Number of forms */
817 481 $available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
818 482
819 483 /* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
820 - $available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' );
484 + $available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' );
821 485
822 486 $message = $available_status[ $status ]['message'];
823 487
824 488 self::display_forms_list( $params, $message );
@@ -823,12 +487,8 @@
823 487
824 488 self::display_forms_list( $params, $message );
825 489 }
826 490
827 - /**
828 - * @param array $ids
829 - * @return string
830 - */
831 491 public static function bulk_trash( $ids ) {
832 492 FrmAppHelper::permission_check( 'frm_delete_forms' );
833 493
834 494 $count = 0;
@@ -833,16 +493,12 @@
833 493
834 494 $count = 0;
835 495 foreach ( $ids as $id ) {
836 496 if ( FrmForm::trash( $id ) ) {
837 - ++$count;
497 + $count ++;
838 498 }
839 499 }
840 500
841 - if ( ! $count ) {
842 - return '';
843 - }
844 -
845 501 $current_page = FrmAppHelper::get_simple_request(
846 502 array(
847 503 'param' => 'form_type',
848 504 'type' => 'request',
@@ -868,9 +524,9 @@
868 524 check_admin_referer( 'destroy_form_' . $params['id'] );
869 525
870 526 $count = 0;
871 527 if ( FrmForm::destroy( $params['id'] ) ) {
872 - ++$count;
528 + $count ++;
873 529 }
874 530
875 531 /* translators: %1$s: Number of forms */
876 532 $message = sprintf( _n( '%1$s Form Permanently Deleted', '%1$s Forms Permanently Deleted', $count, 'formidable' ), $count );
@@ -877,12 +533,8 @@
877 533
878 534 self::display_forms_list( $params, $message );
879 535 }
880 536
881 - /**
882 - * @param array $ids
883 - * @return string
884 - */
885 537 public static function bulk_destroy( $ids ) {
886 538 FrmAppHelper::permission_check( 'frm_delete_forms' );
887 539
888 540 $count = 0;
@@ -888,24 +540,19 @@
888 540 $count = 0;
889 541 foreach ( $ids as $id ) {
890 542 $d = FrmForm::destroy( $id );
891 543 if ( $d ) {
892 - ++$count;
544 + $count ++;
893 545 }
894 546 }
895 547
896 - if ( $count ) {
897 - /* translators: %1$s: Number of forms */
898 - return sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
899 - }
548 + /* translators: %1$s: Number of forms */
549 + $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
900 550
901 - return '';
551 + return $message;
902 552 }
903 553
904 - /**
905 - * @since 6.7.1 Function went from private to public.
906 - */
907 - public static function delete_all() {
554 + private static function delete_all() {
908 555 // Check nonce url.
909 556 $permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
910 557 if ( $permission_error !== false ) {
911 558 self::display_forms_list( array(), '', array( $permission_error ) );
@@ -912,15 +559,14 @@
912 559
913 560 return;
914 561 }
915 562
916 - $count = FrmForm::scheduled_delete( time() );
917 - $url = remove_query_arg( array( 'delete_all' ) );
563 + $count = FrmForm::scheduled_delete( time() );
918 564
919 - $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
565 + /* translators: %1$s: Number of forms */
566 + $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
920 567
921 - wp_safe_redirect( $url );
922 - die();
568 + self::display_forms_list( array(), $message );
923 569 }
924 570
925 571 /**
926 572 * Create a new form from the modal.
@@ -927,8 +573,10 @@
927 573 *
928 574 * @since 4.0
929 575 */
930 576 public static function build_new_form() {
577 + global $wpdb;
578 +
931 579 FrmAppHelper::permission_check( 'frm_edit_forms' );
932 580 check_ajax_referer( 'frm_ajax', 'nonce' );
933 581
934 582 $new_values = self::get_modal_values();
@@ -933,10 +581,9 @@
933 581
934 582 $new_values = self::get_modal_values();
935 583 $new_values['form_key'] = $new_values['name'];
936 584 $new_values['options'] = array(
937 - 'antispam' => 1,
938 - 'on_submit_migrated' => 1,
585 + 'antispam' => 1,
939 586 );
940 587
941 588 /**
942 589 * Allows changing form values before creating from the modal.
@@ -954,14 +601,12 @@
954 601 * @param int $form_id
955 602 */
956 603 do_action( 'frm_build_new_form', $form_id );
957 604
958 - self::create_submit_button_field( $form_id );
959 - self::create_default_on_submit_action( $form_id );
960 605 self::create_default_email_action( $form_id );
961 606
962 607 $response = array(
963 - 'redirect' => FrmForm::get_edit_link( $form_id ) . '&new_template=true',
608 + 'redirect' => FrmForm::get_edit_link( $form_id ),
964 609 );
965 610
966 611 echo wp_json_encode( $response );
967 612 wp_die();
@@ -967,15 +612,46 @@
967 612 wp_die();
968 613 }
969 614
970 615 /**
616 + * Create a custom template from a form
617 + *
618 + * @since 3.06
619 + */
620 + public static function build_template() {
621 + global $wpdb;
622 +
623 + FrmAppHelper::permission_check( 'frm_edit_forms' );
624 + check_ajax_referer( 'frm_ajax', 'nonce' );
625 +
626 + $form_id = FrmAppHelper::get_param( 'xml', '', 'post', 'absint' );
627 + $new_form_id = FrmForm::duplicate( $form_id, 1, true );
628 + if ( ! $new_form_id ) {
629 + $response = array(
630 + 'message' => __( 'There was an error creating a template.', 'formidable' ),
631 + );
632 + } else {
633 + $new_values = self::get_modal_values();
634 + $query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', $new_values, array( 'id' => $new_form_id ) );
635 + if ( $query_results ) {
636 + FrmForm::clear_form_cache();
637 + }
638 +
639 + $response = array(
640 + 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . $new_form_id ) . '&_wpnonce=' . wp_create_nonce(),
641 + );
642 + }
643 +
644 + echo wp_json_encode( $response );
645 + wp_die();
646 + }
647 +
648 + /**
971 649 * Before creating a new form, get the name and description from the modal.
972 650 *
973 651 * @since 4.0
974 - *
975 - * @return array<string,string>
976 652 */
977 - public static function get_modal_values() {
653 + private static function get_modal_values() {
978 654 $name = FrmAppHelper::get_param( 'name', '', 'post', 'sanitize_text_field' );
979 655 $desc = FrmAppHelper::get_param( 'desc', '', 'post', 'sanitize_textarea_field' );
980 656
981 657 return array(
@@ -988,24 +664,17 @@
988 664 * Inserts Formidable button
989 665 * Hook exists since 2.5.0
990 666 *
991 667 * @since 2.0.15
992 - *
993 - * @return void
994 668 */
995 669 public static function insert_form_button() {
996 670 if ( current_user_can( 'frm_view_forms' ) ) {
997 - // Store the result in memory and re-use it when this function is called multiple times.
998 - // This helps speed up the form builder when there are a lot of HTML fields, where this
999 - // button is inserted once per HTML field.
1000 - // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
1001 - if ( ! isset( self::$formidable_tinymce_button ) ) {
1002 - FrmAppHelper::load_admin_wide_js();
1003 - $menu_name = FrmAppHelper::get_menu_name();
1004 - $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1005 - self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( $menu_name ) . '</a>';
1006 - }
1007 - echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
671 + FrmAppHelper::load_admin_wide_js();
672 + $menu_name = FrmAppHelper::get_menu_name();
673 + $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
674 + echo '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' .
675 + FrmAppHelper::kses( $icon, 'all' ) . // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
676 + ' ' . esc_html( $menu_name ) . '</a>';
1008 677 }
1009 678 }
1010 679
1011 680 /**
@@ -1093,9 +762,9 @@
1093 762 $form_id = $opts['form_id'];
1094 763 unset( $opts['form_id'] );
1095 764 }
1096 765
1097 - include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php';
766 + include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
1098 767
1099 768 echo '</div>';
1100 769
1101 770 wp_die();
@@ -1135,14 +804,8 @@
1135 804 wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1136 805 die();
1137 806 }
1138 807
1139 - $inbox = new FrmInbox();
1140 - $error = $inbox->check_for_error();
1141 - if ( $error ) {
1142 - $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1143 - }
1144 -
1145 808 require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
1146 809 }
1147 810
1148 811 /**
@@ -1149,18 +812,32 @@
1149 812 * @param array<string,string> $columns
1150 813 * @return array<string,string>
1151 814 */
1152 815 public static function get_columns( $columns ) {
1153 - $columns['cb'] = '<input type="checkbox" />';
1154 - $columns['name'] = esc_html__( 'Form Title', 'formidable' );
1155 - $columns['entries'] = esc_html__( 'Entries', 'formidable' );
1156 - $columns['id'] = 'ID';
1157 - $columns['form_key'] = esc_html__( 'Key', 'formidable' );
1158 - if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1159 - $columns['shortcode'] = esc_html__( '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' );
1160 836 }
1161 - $columns['created_at'] = esc_html__( 'Date', 'formidable' );
1162 837
838 + $columns['created_at'] = __( 'Date', 'formidable' );
839 +
1163 840 add_screen_option(
1164 841 'per_page',
1165 842 array(
1166 843 'label' => __( 'Forms', 'formidable' ),
@@ -1171,11 +848,8 @@
1171 848
1172 849 return $columns;
1173 850 }
1174 851
1175 - /**
1176 - * @return array<string,string>
1177 - */
1178 852 public static function get_sortable_columns() {
1179 853 return array(
1180 854 'id' => 'id',
1181 855 'name' => 'name',
@@ -1184,17 +858,9 @@
1184 858 'created_at' => 'created_at',
1185 859 );
1186 860 }
1187 861
1188 - /**
1189 - * @param mixed $hidden_columns
1190 - * @return array
1191 - */
1192 862 public static function hidden_columns( $hidden_columns ) {
1193 - if ( ! is_array( $hidden_columns ) ) {
1194 - $hidden_columns = array();
1195 - }
1196 -
1197 863 $type = FrmAppHelper::get_simple_request(
1198 864 array(
1199 865 'param' => 'form_type',
1200 866 'type' => 'request',
@@ -1209,9 +875,9 @@
1209 875 return $hidden_columns;
1210 876 }
1211 877
1212 878 public static function save_per_page( $save, $option, $value ) {
1213 - if ( $option === 'formidable_page_formidable_per_page' ) {
879 + if ( $option == 'formidable_page_formidable_per_page' ) {
1214 880 $save = (int) $value;
1215 881 }
1216 882
1217 883 return $save;
@@ -1217,49 +883,146 @@
1217 883 return $save;
1218 884 }
1219 885
1220 886 /**
1221 - * @param int|string $id
1222 - * @param array $errors
1223 - * @param string $message
1224 - * @param bool $create_link
887 + * @return bool
888 + */
889 + public static function expired() {
890 + global $frm_expired;
891 + return $frm_expired;
892 + }
893 +
894 + /**
895 + * Get data from api before rendering it so that we can flag the modal as expired
896 + *
1225 897 * @return void
1226 898 */
1227 - private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1228 - global $frm_vars;
899 + public static function before_list_templates() {
900 + global $frm_templates;
901 + global $frm_expired;
902 + global $frm_license_type;
1229 903
1230 - $form = FrmForm::getOne( $id );
1231 - $error_args = array(
1232 - 'title' => __( 'You can\'t edit the form', 'formidable' ),
1233 - 'body' => __( 'You are trying to edit a form that does not exist', 'formidable' ),
1234 - 'cancel_url' => admin_url( 'admin.php?page=formidable' ),
1235 - 'continue_url' => add_query_arg(
1236 - array(
1237 - 'page' => 'formidable',
1238 - )
1239 - ),
904 + $api = new FrmFormTemplateApi();
905 + $frm_templates = $api->get_api_info();
906 + $expired = false;
907 + $license_type = '';
908 + if ( isset( $frm_templates['error'] ) ) {
909 + $error = $frm_templates['error']['message'];
910 + $error = str_replace( 'utm_medium=addons', 'utm_medium=form-templates', $error );
911 + $expired = 'expired' === $frm_templates['error']['code'];
912 + $license_type = isset( $frm_templates['error']['type'] ) ? $frm_templates['error']['type'] : '';
913 + unset( $frm_templates['error'] );
914 + }
915 +
916 + $frm_expired = $expired;
917 + $frm_license_type = $license_type;
918 + }
919 +
920 + /**
921 + * @return void
922 + */
923 + public static function list_templates() {
924 + global $frm_templates;
925 + global $frm_license_type;
926 +
927 + $templates = $frm_templates;
928 + $custom_templates = array();
929 + $templates_by_category = array();
930 +
931 + self::add_user_templates( $custom_templates );
932 +
933 + foreach ( $templates as $template ) {
934 + if ( ! isset( $template['categories'] ) ) {
935 + continue;
936 + }
937 +
938 + foreach ( $template['categories'] as $category ) {
939 + if ( ! isset( $templates_by_category[ $category ] ) ) {
940 + $templates_by_category[ $category ] = array();
941 + }
942 +
943 + $templates_by_category[ $category ][] = $template;
944 + }
945 + }
946 + unset( $template );
947 +
948 + // Subcategories that are included elsewhere.
949 + $redundant_cats = array( 'PayPal', 'Stripe', 'Twilio' );
950 +
951 + $categories = array_keys( $templates_by_category );
952 + $categories = array_diff( $categories, FrmFormsHelper::ignore_template_categories() );
953 + $categories = array_diff( $categories, $redundant_cats );
954 + sort( $categories );
955 +
956 + array_walk(
957 + $custom_templates,
958 + function( &$template ) {
959 + $template['custom'] = true;
960 + }
1240 961 );
1241 - if ( ! $form ) {
1242 - FrmAppController::show_error_modal( $error_args );
1243 - return;
962 +
963 + $my_templates_translation = __( 'My Templates', 'formidable' );
964 + $categories = array_merge( array( $my_templates_translation ), $categories );
965 + $pricing = FrmAppHelper::admin_upgrade_link( 'form-templates' );
966 + $license_type = $frm_license_type;
967 + $args = compact( 'pricing', 'license_type' );
968 + $where = apply_filters( 'frm_forms_dropdown', array(), '' );
969 + $forms = FrmForm::get_published_forms( $where );
970 + $view_path = FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
971 +
972 + $templates_by_category[ $my_templates_translation ] = $custom_templates;
973 +
974 + unset( $pricing, $license_type, $where );
975 + wp_enqueue_script( 'accordion' ); // register accordion for template groups
976 + require $view_path . 'list-templates.php';
977 + }
978 +
979 + /**
980 + * @since 4.03.01
981 + */
982 + private static function get_template_categories( $templates ) {
983 + $categories = array();
984 + foreach ( $templates as $template ) {
985 + if ( isset( $template['categories'] ) ) {
986 + $categories = array_merge( $categories, $template['categories'] );
987 + }
1244 988 }
989 + $exclude_cats = FrmFormsHelper::ignore_template_categories();
990 + $categories = array_unique( $categories );
991 + $categories = array_diff( $categories, $exclude_cats );
992 + sort( $categories );
993 + return $categories;
994 + }
1245 995
1246 - if ( 'trash' === $form->status ) {
1247 - $error_args['body'] = __( 'The form you\'re trying to edit is in trash. You must restore it first before you can make changes', 'formidable' );
1248 - $error_args['continue_url'] = add_query_arg(
1249 - array(
1250 - 'page' => 'formidable',
1251 - '_wpnonce' => wp_create_nonce( 'untrash_form_' . $id ),
1252 - 'form_type' => 'trash',
1253 - 'frm_action' => 'untrash',
1254 - 'id' => $id,
1255 - )
996 + private static function add_user_templates( &$templates ) {
997 + $user_templates = array(
998 + 'is_template' => 1,
999 + 'default_template' => 0,
1000 + );
1001 + $user_templates = FrmForm::getAll( $user_templates, 'name' );
1002 + foreach ( $user_templates as $template ) {
1003 + $template = array(
1004 + 'id' => $template->id,
1005 + 'name' => $template->name,
1006 + 'key' => $template->form_key,
1007 + 'description' => $template->description,
1008 + 'url' => wp_nonce_url( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ) ),
1009 + 'released' => $template->created_at,
1010 + 'installed' => 1,
1256 1011 );
1257 - $error_args['continue_text'] = __( 'Restore form', 'formidable' );
1258 - FrmAppController::show_error_modal( $error_args );
1259 - return;
1012 + array_unshift( $templates, $template );
1013 + unset( $template );
1260 1014 }
1015 + }
1261 1016
1017 + private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1018 + global $frm_vars;
1019 +
1020 + $form = FrmForm::getOne( $id );
1021 + if ( ! $form ) {
1022 + wp_die( esc_html__( 'You are trying to edit a form that does not exist.', 'formidable' ) );
1023 + }
1024 +
1262 1025 if ( $form->parent_form_id ) {
1263 1026 /* translators: %1$s: Start link HTML, %2$s: End link HTML */
1264 1027 wp_die( sprintf( esc_html__( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( FrmForm::get_edit_link( $form->parent_form_id ) ) . '">', '</a>' ) );
1265 1028 }
@@ -1270,9 +1033,8 @@
1270 1033
1271 1034 // Automatically add end section fields if they don't exist (2.0 migration).
1272 1035 $reset_fields = false;
1273 1036 FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1274 - FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
1275 1037
1276 1038 if ( $reset_fields ) {
1277 1039 $fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
1278 1040 }
@@ -1298,21 +1060,18 @@
1298 1060 }
1299 1061
1300 1062 self::maybe_update_form_builder_message( $message );
1301 1063
1302 - $has_fields = ! empty( $values['fields'] ) && ! FrmSubmitHelper::only_contains_submit_field( $values['fields'] );
1064 + $all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
1065 + $has_fields = isset( $values['fields'] ) && ! empty( $values['fields'] );
1303 1066
1304 1067 if ( defined( 'DOING_AJAX' ) ) {
1305 1068 wp_die();
1069 + } else {
1070 + require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
1306 1071 }
1307 -
1308 - require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php';
1309 1072 }
1310 1073
1311 - /**
1312 - * @param array $fields
1313 - * @return array
1314 - */
1315 1074 public static function update_form_builder_fields( $fields, $form ) {
1316 1075 foreach ( $fields as $field ) {
1317 1076 $field->do_not_include_icons = true;
1318 1077 }
@@ -1324,21 +1083,13 @@
1324 1083 $message = __( 'Form was Successfully Copied', 'formidable' );
1325 1084 }
1326 1085 }
1327 1086
1328 - /**
1329 - * @param int|string $id
1330 - * @param array $errors
1331 - * @param array|string $args
1332 - * @return void
1333 - */
1334 1087 public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1335 1088 FrmAppHelper::permission_check( 'frm_edit_forms' );
1336 1089
1337 1090 global $frm_vars;
1338 1091
1339 - self::maybe_print_media_templates();
1340 -
1341 1092 if ( ! is_array( $args ) ) {
1342 1093 // For reverse compatibility.
1343 1094 $args = array(
1344 1095 'message' => $args,
@@ -1371,38 +1122,17 @@
1371 1122
1372 1123 $sections = self::get_settings_tabs( $values );
1373 1124 $current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
1374 1125
1375 - require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php';
1126 + require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
1376 1127 }
1377 1128
1378 1129 /**
1379 - * Print WordPress media templates email actions does not trigger a "Uncaught Error: Template not found: #tmpl-media-selection" error when the media button is clicked.
1380 - *
1381 - * @since 6.10
1382 - *
1383 - * @return void
1384 - */
1385 - private static function maybe_print_media_templates() {
1386 - if ( FrmAppHelper::pro_is_included() ) {
1387 - // This issue does not exist when Pro is active so exit early.
1388 - return;
1389 - }
1390 -
1391 - add_action(
1392 - 'wp_enqueue_editor',
1393 - function () {
1394 - wp_print_media_templates();
1395 - }
1396 - );
1397 - }
1398 -
1399 - /**
1400 1130 * @since 4.0
1401 1131 */
1402 1132 public static function form_publish_button( $atts ) {
1403 1133 $values = $atts['values'];
1404 - include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
1134 + include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php' );
1405 1135 }
1406 1136
1407 1137 /**
1408 1138 * Get a list of all the settings tabs for the form settings page.
@@ -1416,9 +1146,9 @@
1416 1146 $sections = array(
1417 1147 'advanced' => array(
1418 1148 'name' => __( 'General', 'formidable' ),
1419 1149 'title' => __( 'General Form Settings', 'formidable' ),
1420 - 'function' => array( self::class, 'advanced_settings' ),
1150 + 'function' => array( __CLASS__, 'advanced_settings' ),
1421 1151 'icon' => 'frm_icon_font frm_settings_icon',
1422 1152 ),
1423 1153 'email' => array(
1424 1154 'name' => __( 'Actions & Notifications', 'formidable' ),
@@ -1427,9 +1157,9 @@
1427 1157 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1428 1158 ),
1429 1159 'permissions' => array(
1430 1160 'name' => __( 'Form Permissions', 'formidable' ),
1431 - 'icon' => 'frm_icon_font frm_lock_closed_icon',
1161 + 'icon' => 'frm_icon_font frm_lock_icon',
1432 1162 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1433 1163 'data' => array(
1434 1164 'medium' => 'permissions',
1435 1165 'upgrade' => __( 'Form Permissions', 'formidable' ),
@@ -1436,9 +1166,9 @@
1436 1166 'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1437 1167 'screenshot' => 'permissions.png',
1438 1168 ),
1439 1169 ),
1440 - 'scheduling' => array(
1170 + 'scheduling' => array(
1441 1171 'name' => __( 'Form Scheduling', 'formidable' ),
1442 1172 'icon' => 'frm_icon_font frm_calendar_icon',
1443 1173 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1444 1174 'data' => array(
@@ -1447,12 +1177,12 @@
1447 1177 'screenshot' => 'scheduling.png',
1448 1178 ),
1449 1179 ),
1450 1180 'buttons' => array(
1451 - 'name' => __( 'Buttons', 'formidable' ),
1452 - 'class' => self::class,
1181 + 'name' => __( 'Styling & Buttons', 'formidable' ),
1182 + 'class' => __CLASS__,
1453 1183 'function' => 'buttons_settings',
1454 - 'icon' => 'frm_icon_font frm_button_icon',
1184 + 'icon' => 'frm_icon_font frm_pallet_icon',
1455 1185 ),
1456 1186 'landing' => array(
1457 1187 'name' => __( 'Form Landing Page', 'formidable' ),
1458 1188 'icon' => 'frm_icon_font frm_file_text_icon',
@@ -1471,34 +1201,17 @@
1471 1201 'screenshot' => 'chat.png',
1472 1202 )
1473 1203 ),
1474 1204 ),
1475 - 'abandonment' => array(
1476 - 'name' => __( 'Form Abandonment', 'formidable' ),
1477 - 'icon' => 'frm_icon_font frm_abandoned_icon',
1478 - 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1479 - 'data' => FrmAppHelper::get_upgrade_data_params(
1480 - 'abandonment',
1481 - array(
1482 - 'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1483 - 'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1484 - 'screenshot' => 'abandonment.png',
1485 - )
1486 - ),
1487 - ),
1488 1205 'html' => array(
1489 1206 'name' => __( 'Customize HTML', 'formidable' ),
1490 - 'class' => self::class,
1207 + 'class' => __CLASS__,
1491 1208 'function' => 'html_settings',
1492 1209 'icon' => 'frm_icon_font frm_code_icon',
1493 1210 ),
1494 1211 );
1495 1212
1496 - if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1497 - unset( $sections['buttons'] );
1498 - }
1499 -
1500 - foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
1213 + foreach ( array( 'landing', 'chat' ) as $feature ) {
1501 1214 if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
1502 1215 unset( $sections[ $feature ] );
1503 1216 }
1504 1217 }
@@ -1504,8 +1217,13 @@
1504 1217 }
1505 1218
1506 1219 $sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1507 1220
1221 + if ( FrmAppHelper::pro_is_installed() && ! FrmAppHelper::meets_min_pro_version( '4.0' ) ) {
1222 + // Prevent settings from showing in 2 spots.
1223 + unset( $sections['permissions'], $sections['scheduling'] );
1224 + }
1225 +
1508 1226 foreach ( $sections as $key => $section ) {
1509 1227 $defaults = array(
1510 1228 'html_class' => '',
1511 1229 'name' => ucfirst( $key ),
@@ -1527,9 +1245,9 @@
1527 1245 $section['id'] = $section['anchor'];
1528 1246 }
1529 1247
1530 1248 $sections[ $key ] = $section;
1531 - }//end foreach
1249 + }
1532 1250
1533 1251 return $sections;
1534 1252 }
1535 1253
@@ -1536,9 +1254,8 @@
1536 1254 /**
1537 1255 * @since 4.0
1538 1256 *
1539 1257 * @param array $values
1540 - * @return void
1541 1258 */
1542 1259 public static function advanced_settings( $values ) {
1543 1260 $first_h3 = 'frm_first_h3';
1544 1261
@@ -1546,15 +1263,14 @@
1546 1263 }
1547 1264
1548 1265 /**
1549 1266 * @param array $values
1550 - * @return void
1551 1267 */
1552 - public static function render_spam_settings( $values ) {
1268 + private static function render_spam_settings( $values ) {
1553 1269 if ( function_exists( 'akismet_http_post' ) ) {
1554 1270 include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1555 1271 }
1556 - include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/stopforumspam.php';
1272 + include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
1557 1273 include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1558 1274 }
1559 1275
1560 1276 /**
@@ -1560,12 +1276,16 @@
1560 1276 /**
1561 1277 * @since 4.0
1562 1278 *
1563 1279 * @param array $values
1564 - * @return void
1565 1280 */
1566 1281 public static function buttons_settings( $values ) {
1567 - include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
1282 + $styles = apply_filters( 'frm_get_style_opts', array() );
1283 +
1284 + $frm_settings = FrmAppHelper::get_settings();
1285 + $no_global_style = $frm_settings->load_style === 'none';
1286 +
1287 + include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php' );
1568 1288 }
1569 1289
1570 1290 /**
1571 1291 * @since 4.0
@@ -1570,12 +1290,11 @@
1570 1290 /**
1571 1291 * @since 4.0
1572 1292 *
1573 1293 * @param array $values
1574 - * @return void
1575 1294 */
1576 1295 public static function html_settings( $values ) {
1577 - include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
1296 + include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php' );
1578 1297 }
1579 1298
1580 1299 /**
1581 1300 * Replace old Submit Button href with new href to avoid errors in Chrome
@@ -1581,10 +1300,9 @@
1581 1300 * Replace old Submit Button href with new href to avoid errors in Chrome
1582 1301 *
1583 1302 * @since 2.03.08
1584 1303 *
1585 - * @param array|bool $values
1586 - * @return void
1304 + * @param array|boolean $values
1587 1305 */
1588 1306 private static function clean_submit_html( &$values ) {
1589 1307 if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
1590 1308 $values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
@@ -1590,28 +1308,8 @@
1590 1308 $values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
1591 1309 }
1592 1310 }
1593 1311
1594 - /**
1595 - * Updates classes used in submit and prev buttons to avoid conflict with twenty twenty-one theme.
1596 - *
1597 - * @param array $classes
1598 - *
1599 - * @return array
1600 - */
1601 - public static function update_button_classes( $classes ) {
1602 - if ( function_exists( 'twenty_twenty_one_setup' ) ) {
1603 - $classes[] = 'has-text-color has-background';
1604 - }
1605 -
1606 - return $classes;
1607 - }
1608 -
1609 - /**
1610 - * @param int|string $form_id
1611 - * @param string $class
1612 - * @return void
1613 - */
1614 1312 public static function mb_tags_box( $form_id, $class = '' ) {
1615 1313 $fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1616 1314
1617 1315 /**
@@ -1624,9 +1322,9 @@
1624 1322 */
1625 1323 $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1626 1324 $linked_forms = array();
1627 1325 $col = 'one';
1628 - $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
1326 + $settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
1629 1327
1630 1328 $cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1631 1329 $entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
1632 1330
@@ -1631,9 +1329,9 @@
1631 1329 $entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
1632 1330
1633 1331 $advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1634 1332
1635 - include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1333 + include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
1636 1334 }
1637 1335
1638 1336 /**
1639 1337 * @since 3.04.01
@@ -1646,9 +1344,9 @@
1646 1344 ),
1647 1345 );
1648 1346
1649 1347 $user_fields = self::user_shortcodes();
1650 - if ( $user_fields ) {
1348 + if ( ! empty( $user_fields ) ) {
1651 1349 $user_helpers = array();
1652 1350 foreach ( $user_fields as $uk => $uf ) {
1653 1351 $user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1654 1352 unset( $uk, $uf );
@@ -1654,9 +1352,9 @@
1654 1352 unset( $uk, $uf );
1655 1353 }
1656 1354
1657 1355 $advanced_helpers['user_id'] = array(
1658 - 'codes' => $user_helpers,
1356 + 'codes' => $user_helpers,
1659 1357 );
1660 1358 }
1661 1359
1662 1360 /**
@@ -1733,16 +1431,20 @@
1733 1431 'updated-at' => __( 'Entry updated', 'formidable' ),
1734 1432 '' => '',
1735 1433 'siteurl' => __( 'Site URL', 'formidable' ),
1736 1434 'sitename' => __( 'Site Name', 'formidable' ),
1737 - 'form_name' => __( 'Form Name', 'formidable' ),
1738 1435 );
1739 1436
1740 - $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1741 1437 if ( ! FrmAppHelper::pro_is_installed() ) {
1742 1438 unset( $entry_shortcodes['post_id'] );
1743 1439 }
1744 1440
1441 + if ( $settings_tab ) {
1442 + $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
1443 + $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
1444 + $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
1445 + }
1446 +
1745 1447 /**
1746 1448 * Use this hook to add or remove buttons in the helpers section
1747 1449 * in the customization panel
1748 1450 *
@@ -1753,12 +1455,9 @@
1753 1455 return $entry_shortcodes;
1754 1456 }
1755 1457
1756 1458 /**
1757 - * Insert the form class setting into the form.
1758 - *
1759 - * @param stdClass $form
1760 - * @return void
1459 + * Insert the form class setting into the form
1761 1460 */
1762 1461 public static function form_classes( $form ) {
1763 1462 if ( isset( $form->options['form_class'] ) ) {
1764 1463 echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
@@ -1767,12 +1466,8 @@
1767 1466 if ( ! empty( $form->options['js_validate'] ) ) {
1768 1467 echo ' frm_js_validate ';
1769 1468 self::add_js_validate_form_to_global_vars( $form );
1770 1469 }
1771 -
1772 - if ( FrmForm::is_ajax_on( $form ) ) {
1773 - echo ' frm_ajax_submit ';
1774 - }
1775 1470 }
1776 1471
1777 1472 /**
1778 1473 * @since 5.0.03
@@ -1792,25 +1487,17 @@
1792 1487 check_ajax_referer( 'frm_ajax', 'nonce' );
1793 1488
1794 1489 echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1795 1490 array(
1796 - 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1491 + 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
1797 1492 'default_email' => true,
1798 - 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1493 + 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
1799 1494 )
1800 1495 );
1801 1496 wp_die();
1802 1497 }
1803 1498
1804 - /**
1805 - * @param string $content
1806 - * @param int|stdClass|string $form
1807 - * @param false|int|stdClass|string $entry
1808 - * @return string
1809 - */
1810 1499 public static function filter_content( $content, $form, $entry = false ) {
1811 - $content = self::replace_form_name_shortcodes( $content, $form );
1812 -
1813 1500 self::get_entry_by_param( $entry );
1814 1501 if ( ! $entry ) {
1815 1502 return $content;
1816 1503 }
@@ -1818,16 +1505,8 @@
1818 1505 if ( is_object( $form ) ) {
1819 1506 $form = $form->id;
1820 1507 }
1821 1508
1822 - /*
1823 - * Repeater actions adds `parent_entry` to `$entry` store the parent entry data. If `parent_entry` is not empty,
1824 - * use the parent form ID instead of repeater form ID to fix the parent form field shortcodes doesn't work.
1825 - */
1826 - if ( ! empty( $entry->parent_entry ) ) {
1827 - $form = $entry->parent_entry->form_id;
1828 - }
1829 -
1830 1509 $shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
1831 1510 $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1832 1511
1833 1512 return $content;
@@ -1832,38 +1511,8 @@
1832 1511
1833 1512 return $content;
1834 1513 }
1835 1514
1836 - /**
1837 - * Replace any [form_name] shortcodes in a string.
1838 - *
1839 - * @since 5.5
1840 - *
1841 - * @param array|string $string
1842 - * @param int|stdClass|string $form
1843 - * @return array|string
1844 - */
1845 - public static function replace_form_name_shortcodes( $string, $form ) {
1846 - if ( ! is_string( $string ) ) {
1847 - return $string;
1848 - }
1849 -
1850 - if ( false === strpos( $string, '[form_name]' ) ) {
1851 - return $string;
1852 - }
1853 -
1854 - if ( ! is_object( $form ) ) {
1855 - $form = FrmForm::getOne( $form );
1856 - }
1857 -
1858 - $form_name = is_object( $form ) ? $form->name : '';
1859 - return str_replace( '[form_name]', $form_name, $string );
1860 - }
1861 -
1862 - /**
1863 - * @param false|int|stdClass|string $entry
1864 - * @return void
1865 - */
1866 1515 private static function get_entry_by_param( &$entry ) {
1867 1516 if ( ! $entry || ! is_object( $entry ) ) {
1868 1517 if ( ! $entry || ! is_numeric( $entry ) ) {
1869 1518 $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
@@ -1876,12 +1525,8 @@
1876 1525 public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
1877 1526 return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
1878 1527 }
1879 1528
1880 - /**
1881 - * @param array $errors
1882 - * @return array
1883 - */
1884 1529 public static function process_bulk_form_actions( $errors ) {
1885 1530 if ( ! $_REQUEST ) {
1886 1531 return $errors;
1887 1532 }
@@ -1925,9 +1570,9 @@
1925 1570 case 'untrash':
1926 1571 $message = self::bulk_untrash( $ids );
1927 1572 }
1928 1573
1929 - if ( ! empty( $message ) ) {
1574 + if ( isset( $message ) && ! empty( $message ) ) {
1930 1575 $errors['message'] = $message;
1931 1576 }
1932 1577
1933 1578 return $errors;
@@ -1932,26 +1577,13 @@
1932 1577
1933 1578 return $errors;
1934 1579 }
1935 1580
1936 - /**
1937 - * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
1938 - *
1939 - * @since 6.20
1940 - * @return void
1941 - */
1942 - public static function include_device_too_small_message() {
1943 - if ( ! FrmAppHelper::is_formidable_admin() ) {
1944 - return;
1945 - }
1946 -
1947 - include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
1948 - }
1949 -
1950 1581 public static function route() {
1951 1582 $action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
1952 1583 $vars = array();
1953 1584 FrmAppHelper::include_svg();
1585 +
1954 1586 if ( isset( $_POST['frm_compact_fields'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1955 1587 FrmAppHelper::permission_check( 'frm_edit_forms' );
1956 1588
1957 1589 // Javascript needs to be allowed in some field settings.
@@ -1960,9 +1592,9 @@
1960 1592 $json_vars = json_decode( $json_vars, true );
1961 1593 if ( empty( $json_vars ) ) {
1962 1594 // json decoding failed so we should return an error message.
1963 1595 $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
1964 - if ( 'edit' === $action ) {
1596 + if ( 'edit' == $action ) {
1965 1597 $action = 'update';
1966 1598 }
1967 1599
1968 1600 add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
@@ -1978,14 +1610,16 @@
1978 1610 if ( isset( $_REQUEST['delete_all'] ) ) {
1979 1611 // Override the action for this page.
1980 1612 $action = 'delete_all';
1981 1613 }
1982 - }//end if
1614 + }
1983 1615
1984 1616 add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
1985 1617 FrmAppHelper::trigger_hook_load( 'form' );
1986 1618
1987 1619 switch ( $action ) {
1620 + case 'new':
1621 + return self::new_form( $vars );
1988 1622 case 'create':
1989 1623 case 'edit':
1990 1624 case 'update':
1991 1625 case 'trash':
@@ -1990,17 +1624,16 @@
1990 1624 case 'update':
1991 1625 case 'trash':
1992 1626 case 'untrash':
1993 1627 case 'destroy':
1628 + case 'delete_all':
1994 1629 case 'settings':
1995 1630 case 'update_settings':
1996 1631 return self::$action( $vars );
1997 1632 case 'lite-reports':
1998 - self::no_reports( $vars );
1999 - return;
1633 + return self::no_reports( $vars );
2000 1634 case 'views':
2001 - self::no_views( $vars );
2002 - return;
1635 + return self::no_views( $vars );
2003 1636 default:
2004 1637 do_action( 'frm_form_action_' . $action );
2005 1638 if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2006 1639 return;
@@ -2023,65 +1656,12 @@
2023 1656 self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2024 1657 return;
2025 1658 }
2026 1659
2027 - if ( 'forms_permanently_deleted' === $message ) {
2028 - $count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2029 - /* translators: %1$s: Number of forms */
2030 - $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2031 - self::display_forms_list( array(), $message, '' );
2032 - return;
2033 - }
2034 -
2035 1660 self::display_forms_list();
2036 1661
2037 1662 return;
2038 - }//end switch
2039 - }
2040 -
2041 - /**
2042 - * Rename a form.
2043 - *
2044 - * Handles the AJAX request for renaming a form.
2045 - *
2046 - * @since 6.7
2047 - *
2048 - * @return void
2049 - */
2050 - public static function rename_form() {
2051 - // Check permission and nonce
2052 - FrmAppHelper::permission_check( 'frm_edit_forms' );
2053 - check_ajax_referer( 'frm_ajax', 'nonce' );
2054 -
2055 - // Get posted data
2056 - $form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2057 - $name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2058 -
2059 - $form = FrmForm::getOne( $form_id );
2060 - if ( ! $form ) {
2061 - wp_send_json_error( __( 'Form not found', 'formidable' ) );
2062 1663 }
2063 -
2064 - if ( $name === $form->name ) {
2065 - // Nothing to change so exit early.
2066 - wp_send_json_success();
2067 - }
2068 -
2069 - $to_update = array(
2070 - 'name' => $name,
2071 - );
2072 -
2073 - if ( '' !== $name ) {
2074 - // Only update form_key if name is not empty.
2075 - $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2076 - $to_update['form_key'] = $form_key;
2077 - } else {
2078 - $form_key = $form->form_key;
2079 - }
2080 -
2081 - FrmForm::update( $form_id, $to_update );
2082 -
2083 - wp_send_json_success( compact( 'form_key' ) );
2084 1664 }
2085 1665
2086 1666 public static function json_error( $errors ) {
2087 1667 $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
@@ -2089,13 +1669,20 @@
2089 1669 return $errors;
2090 1670 }
2091 1671
2092 1672 /**
1673 + * Education for premium features.
1674 + *
1675 + * @since 4.05
1676 + */
1677 + public static function add_form_style_tab_options() {
1678 + include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php' );
1679 + }
1680 +
1681 + /**
2093 1682 * Add education about views.
2094 1683 *
2095 1684 * @since 4.07
2096 - *
2097 - * @return void
2098 1685 */
2099 1686 public static function no_views( $values = array() ) {
2100 1687 FrmAppHelper::include_svg();
2101 1688 $id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
@@ -2107,10 +1694,8 @@
2107 1694 /**
2108 1695 * Add education about reports.
2109 1696 *
2110 1697 * @since 4.07
2111 - *
2112 - * @return void
2113 1698 */
2114 1699 public static function no_reports( $values = array() ) {
2115 1700 $id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
2116 1701 $form = $id ? FrmForm::getOne( $id ) : false;
@@ -2117,11 +1702,9 @@
2117 1702
2118 1703 include FrmAppHelper::plugin_path() . '/classes/views/shared/reports-info.php';
2119 1704 }
2120 1705
2121 - /**
2122 - * FRONT-END FORMS.
2123 - */
1706 + /* FRONT-END FORMS */
2124 1707 public static function admin_bar_css() {
2125 1708 if ( is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
2126 1709 return;
2127 1710 }
@@ -2195,9 +1778,9 @@
2195 1778 $wp_admin_bar->add_node(
2196 1779 array(
2197 1780 'parent' => 'frm-forms',
2198 1781 'id' => 'edit_form_' . $form_id,
2199 - 'title' => empty( $name ) ? FrmFormsHelper::get_no_title_text() : $name,
1782 + 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
2200 1783 'href' => FrmForm::get_edit_link( $form_id ),
2201 1784 )
2202 1785 );
2203 1786 }
@@ -2210,10 +1793,10 @@
2210 1793 * @return string
2211 1794 */
2212 1795 public static function get_form_shortcode( $atts ) {
2213 1796 global $frm_vars;
2214 - if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2215 - $sc = '[formidable';
1797 + if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
1798 + $sc = '[formidable';
2216 1799 $sc .= FrmAppHelper::array_to_html_params( $atts );
2217 1800 return $sc . ']';
2218 1801 }
2219 1802
@@ -2238,11 +1821,11 @@
2238 1821
2239 1822 /**
2240 1823 * @since 5.2.01
2241 1824 *
2242 - * @param false|int|string $id
2243 - * @param false|string $key
2244 - * @return false|stdClass
1825 + * @param string|int|false $id
1826 + * @param string|false $key
1827 + * @return stdClass|false
2245 1828 */
2246 1829 private static function maybe_get_form_by_id_or_key( $id, $key ) {
2247 1830 if ( ! $id ) {
2248 1831 $id = $key;
@@ -2250,12 +1833,12 @@
2250 1833 return self::maybe_get_form_to_show( $id );
2251 1834 }
2252 1835
2253 1836 /**
2254 - * @param false|int|string $id
2255 - * @param false|string $key
2256 - * @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2257 - * @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
1837 + * @param string|int|false $id
1838 + * @param string|false $key
1839 + * @param string|int|bool $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
1840 + * @param string|int|bool $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2258 1841 * @param array $atts
2259 1842 * @return string
2260 1843 */
2261 1844 public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
@@ -2303,16 +1886,15 @@
2303 1886 return $form;
2304 1887 }
2305 1888
2306 1889 /**
2307 - * @param false|int|string $id
2308 - * @return false|stdClass
1890 + * @param string|int|false $id
1891 + * @return stdClass|false
2309 1892 */
2310 1893 private static function maybe_get_form_to_show( $id ) {
2311 1894 $form = false;
2312 1895
2313 - if ( ! empty( $id ) ) {
2314 - // Form id or key is set.
1896 + if ( ! empty( $id ) ) { // form id or key is set
2315 1897 $form = FrmForm::getOne( $id );
2316 1898 if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2317 1899 $form = false;
2318 1900 }
@@ -2351,15 +1933,11 @@
2351 1933 $fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
2352 1934 $reset = false;
2353 1935 $pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2354 1936
2355 - $pass_args['action'] = $params['action'];
2356 1937 $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2357 1938
2358 1939 if ( ! $handle_process_here ) {
2359 - FrmFormState::set_initial_value( 'title', $title );
2360 - FrmFormState::set_initial_value( 'description', $description );
2361 -
2362 1940 do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2363 1941 if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2364 1942 self::show_form_after_submit( $pass_args );
2365 1943 }
@@ -2370,13 +1948,14 @@
2370 1948
2371 1949 do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2372 1950
2373 1951 if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2374 - $entry_id = self::just_created_entry( $form->id );
2375 - $pass_args['entry_id'] = $entry_id;
2376 - $pass_args['reset'] = true;
1952 + $entry_id = self::just_created_entry( $form->id );
1953 + $pass_args['entry_id'] = $entry_id;
1954 + $pass_args['reset'] = true;
1955 + $pass_args['conf_method'] = self::get_confirmation_method( compact( 'form', 'entry_id' ) );
2377 1956
2378 - self::run_on_submit_actions( $pass_args );
1957 + self::run_success_action( $pass_args );
2379 1958
2380 1959 do_action(
2381 1960 'frm_after_entry_processed',
2382 1961 array(
@@ -2384,9 +1963,9 @@
2384 1963 'form' => $form,
2385 1964 )
2386 1965 );
2387 1966 }
2388 - }//end if
1967 + }
2389 1968 }
2390 1969
2391 1970 /**
2392 1971 * If the form was processed earlier (init), get the generated errors
@@ -2418,40 +1997,20 @@
2418 1997 */
2419 1998 public static function just_created_entry( $form_id ) {
2420 1999 global $frm_vars;
2421 2000
2422 - 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;
2001 + 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;
2423 2002 }
2424 2003
2425 2004 /**
2426 - * Gets confirmation method.
2427 - *
2428 2005 * @since 3.0
2429 - * @since 6.0 This method can return an array of met On Submit actions.
2430 - *
2431 - * @param array $atts {
2432 - * Atts.
2433 - *
2434 - * @type object $form Form object.
2435 - * @type int $entry_id Entry ID.
2436 - * }
2437 - * @return array|string
2438 2006 */
2439 2007 private static function get_confirmation_method( $atts ) {
2440 - $action = FrmOnSubmitHelper::current_event( $atts );
2441 - $opt = 'update' === $action ? 'edit_action' : 'success_action';
2442 - $method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2008 + $opt = 'success_action';
2009 + $method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
2010 + $method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' );
2443 2011
2444 - if ( ! empty( $atts['entry_id'] ) ) {
2445 - $met_actions = self::get_met_on_submit_actions( $atts, $action );
2446 - if ( $met_actions ) {
2447 - $method = $met_actions;
2448 - }
2449 - }
2450 -
2451 - $method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2452 -
2453 - if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2012 + if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2454 2013 $method = 'message';
2455 2014 }
2456 2015
2457 2016 return $method;
@@ -2466,34 +2025,11 @@
2466 2025 $conf_method = self::get_confirmation_method(
2467 2026 array(
2468 2027 'form' => $form,
2469 2028 'entry_id' => $params['id'],
2470 - 'action' => FrmOnSubmitHelper::current_event( $params ),
2471 2029 )
2472 2030 );
2473 2031
2474 - self::maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args );
2475 - }
2476 -
2477 - /**
2478 - * Maybe trigger redirect with the new Confirmation action.
2479 - *
2480 - * @since 6.1.1
2481 - *
2482 - * @param array|string $conf_method Array of confirmation actions or the action type string.
2483 - * @param object $form Form object.
2484 - * @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2485 - * @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2486 - */
2487 - public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2488 - if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
2489 - if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) {
2490 - $event = FrmOnSubmitHelper::current_event( $params );
2491 - FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2492 - $conf_method = 'redirect';
2493 - }
2494 - }
2495 -
2496 2032 if ( 'redirect' === $conf_method ) {
2497 2033 self::trigger_redirect( $form, $params, $args );
2498 2034 }
2499 2035 }
@@ -2516,33 +2052,18 @@
2516 2052 /**
2517 2053 * Used when the success action is not 'message'
2518 2054 *
2519 2055 * @since 2.05
2520 - * @since 6.0 `$args['force_delay_redirect']` is added.
2521 - *
2522 - * @param array $args {
2523 - * The args.
2524 - *
2525 - * @type string $conf_method The method.
2526 - * @type object $form Form object.
2527 - * @type int $entry_id Entry ID.
2528 - * @type string $action The action event. Accepts `create` or `update`.
2529 - * @type array $fields The array of fields.
2530 - * @type int $force_delay_redirect Force to show the message before redirecting in case redirect method runs.
2531 - * }
2532 2056 */
2533 2057 public static function run_success_action( $args ) {
2534 - global $frm_vars;
2535 2058 $extra_args = $args;
2536 2059 unset( $extra_args['form'] );
2537 2060
2538 2061 do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args );
2539 2062
2540 - $opt = ! isset( $args['action'] ) || $args['action'] === 'create' ? 'success' : 'edit';
2063 + $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
2541 2064
2542 2065 $args['success_opt'] = $opt;
2543 - $args['ajax'] = ! empty( $frm_vars['ajax'] );
2544 -
2545 2066 if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
2546 2067 self::load_page_after_submit( $args );
2547 2068 } elseif ( $args['conf_method'] === 'redirect' ) {
2548 2069 self::redirect_after_submit( $args );
@@ -2551,225 +2072,8 @@
2551 2072 }
2552 2073 }
2553 2074
2554 2075 /**
2555 - * Gets met On Submit actions.
2556 - *
2557 - * @since 6.0
2558 - *
2559 - * @param array $args See {@see FrmFormsController::run_success_action()}.
2560 - * @param string $event Form event. Default is `create`.
2561 - * @return array Array of actions that meet the conditional logics.
2562 - */
2563 - public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2564 - if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
2565 - return array();
2566 - }
2567 -
2568 - // If a redirect action has already opened the URL in a new tab, we show the default message in the current tab.
2569 - if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2570 - return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2571 - }
2572 -
2573 - $entry = FrmEntry::getOne( $args['entry_id'], true );
2574 - $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
2575 - $met_actions = array();
2576 - $has_redirect = false;
2577 -
2578 - foreach ( $actions as $action ) {
2579 - if ( ! in_array( $event, $action->post_content['event'], true ) ) {
2580 - continue;
2581 - }
2582 -
2583 - if ( FrmFormAction::action_conditions_met( $action, $entry ) ) {
2584 - continue;
2585 - }
2586 -
2587 - $action_type = FrmOnSubmitHelper::get_action_type( $action );
2588 -
2589 - if ( 'redirect' === $action_type ) {
2590 - if ( $has_redirect ) {
2591 - // Do not process because we run the first redirect action only.
2592 - continue;
2593 - }
2594 - }
2595 -
2596 - if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2597 - continue;
2598 - }
2599 -
2600 - if ( 'redirect' === $action_type ) {
2601 - $has_redirect = true;
2602 - }
2603 -
2604 - $met_actions[] = $action;
2605 - unset( $action );
2606 - }//end foreach
2607 -
2608 - $args['event'] = $event;
2609 -
2610 - /**
2611 - * Filters the On Submit actions that meet the conditional logics.
2612 - *
2613 - * @since 6.0
2614 - *
2615 - * @param array $met_actions Actions that meet the conditional logics.
2616 - * @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2617 - */
2618 - $met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2619 -
2620 - if ( empty( $met_actions ) ) {
2621 - $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2622 - }
2623 -
2624 - return $met_actions;
2625 - }
2626 -
2627 - /**
2628 - * Checks if a Confirmation action has the valid data.
2629 - *
2630 - * @since 6.1.2
2631 - *
2632 - * @param object $action Form action object.
2633 - * @param array $args See {@see FrmFormsController::run_success_action()}.
2634 - * @param string $event Form event. Default is `create`.
2635 - * @return bool
2636 - */
2637 - private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2638 - $action_type = FrmOnSubmitHelper::get_action_type( $action );
2639 -
2640 - if ( 'redirect' === $action_type ) {
2641 - // Run through frm_redirect_url filter. This is used for the valid action check.
2642 - $action->post_content['success_url'] = apply_filters(
2643 - 'frm_redirect_url',
2644 - $action->post_content['success_url'],
2645 - $args['form'],
2646 - $args + array( 'action' => $event )
2647 - );
2648 -
2649 - return ! empty( $action->post_content['success_url'] );
2650 - }
2651 -
2652 - if ( 'page' === $action_type ) {
2653 - if ( empty( $action->post_content['success_page_id'] ) ) {
2654 - return false;
2655 - }
2656 -
2657 - $page = get_post( $action->post_content['success_page_id'] );
2658 - if ( ! $page || 'trash' === $page->post_status ) {
2659 - return false;
2660 - }
2661 - }
2662 -
2663 - return true;
2664 - }
2665 -
2666 - /**
2667 - * Runs On Submit actions.
2668 - *
2669 - * @since 6.0
2670 - *
2671 - * @param array $args See inside {@see FrmFormsController::get_form_contents()} method.
2672 - */
2673 - public static function run_on_submit_actions( $args ) {
2674 - $args['conf_method'] = self::get_confirmation_method(
2675 - array(
2676 - 'form' => $args['form'],
2677 - 'entry_id' => $args['entry_id'],
2678 - 'action' => FrmOnSubmitHelper::current_event( $args ),
2679 - )
2680 - );
2681 - if ( ! is_array( $args['conf_method'] ) ) {
2682 - self::run_success_action( $args );
2683 - return;
2684 - }
2685 -
2686 - // If conf_method is an array, run On Submit actions.
2687 - if ( ! $args['conf_method'] ) {
2688 - // Use default message.
2689 - FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options );
2690 - self::run_success_action( $args );
2691 - } elseif ( 1 === count( $args['conf_method'] ) ) {
2692 - FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options, reset( $args['conf_method'] ) );
2693 - $args['conf_method'] = $args['form']->options['success_action'];
2694 - self::run_success_action( $args );
2695 - } else {
2696 - self::run_multi_on_submit_actions( $args );
2697 - }
2698 - }
2699 -
2700 - /**
2701 - * Runs multiple success actions.
2702 - *
2703 - * @since 6.0
2704 - *
2705 - * @param array $args See {@see FrmFormsController::run_success_action()}.
2706 - */
2707 - public static function run_multi_on_submit_actions( $args ) {
2708 - $redirect_action = null;
2709 - foreach ( $args['conf_method'] as $action ) {
2710 - if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2711 - // We catch the redirect action to run it last.
2712 - $redirect_action = $action;
2713 - continue;
2714 - }
2715 -
2716 - self::run_single_on_submit_action( $args, $action );
2717 -
2718 - unset( $action );
2719 - }
2720 -
2721 - if ( $redirect_action ) {
2722 - // Show script to delay the redirection.
2723 - $args['force_delay_redirect'] = true;
2724 - self::run_single_on_submit_action( $args, $redirect_action );
2725 - }
2726 - }
2727 -
2728 - /**
2729 - * Runs single On Submit action.
2730 - *
2731 - * @since 6.0
2732 - *
2733 - * @param array $args See {@see FrmFormsController::run_success_action()}.
2734 - * @param object $action On Submit action object.
2735 - */
2736 - public static function run_single_on_submit_action( $args, $action ) {
2737 - $new_args = self::get_run_success_action_args( $args, $action );
2738 - self::run_success_action( $new_args );
2739 - }
2740 -
2741 - /**
2742 - * Gets run_success_action() args from the On Submit action.
2743 - *
2744 - * @since 6.0
2745 - *
2746 - * @param array $args See {@see FrmFormsController::run_success_action()}.
2747 - * @param object $action On Submit action object.
2748 - * @return array
2749 - */
2750 - private static function get_run_success_action_args( $args, $action ) {
2751 - $new_args = $args;
2752 -
2753 - FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2754 -
2755 - $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
2756 -
2757 - $new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2758 -
2759 - /**
2760 - * Filters the run success action args.
2761 - *
2762 - * @since 6.0
2763 - *
2764 - * @param array $new_args The new args.
2765 - * @param array $args The old args. See {@see FrmFormsController::run_success_action()}.
2766 - * @param object $action On Submit action object.
2767 - */
2768 - return apply_filters( 'frm_get_run_success_action_args', $new_args, $args, $action );
2769 - }
2770 -
2771 - /**
2772 2076 * @since 3.0
2773 2077 */
2774 2078 private static function load_page_after_submit( $args ) {
2775 2079 global $post;
@@ -2778,31 +2082,19 @@
2778 2082 $page = get_post( $args['form']->options[ $opt . '_page_id' ] );
2779 2083 $old_post = $post;
2780 2084 $post = $page;
2781 2085 $content = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] );
2782 -
2783 - // Fix the On Submit page content doesn't show when previewing In theme.
2784 - $has_preview_filter = has_filter( 'the_content', 'FrmFormsController::preview_content' );
2785 -
2786 - if ( $has_preview_filter ) {
2787 - remove_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
2788 - }
2789 -
2790 2086 echo apply_filters( 'the_content', $content ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2791 -
2792 - if ( $has_preview_filter ) {
2793 - add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
2794 - }
2795 -
2796 2087 $post = $old_post;
2797 - }//end if
2088 + }
2798 2089 }
2799 2090
2800 2091 /**
2801 2092 * @since 3.0
2802 - * @param array $args See {@see FrmFormsController::run_success_action()}.
2803 2093 */
2804 2094 private static function redirect_after_submit( $args ) {
2095 + global $frm_vars;
2096 +
2805 2097 add_filter( 'frm_use_wpautop', '__return_false' );
2806 2098
2807 2099 $opt = $args['success_opt'];
2808 2100 $success_url = trim( $args['form']->options[ $opt . '_url' ] );
@@ -2808,8 +2100,12 @@
2808 2100 $success_url = trim( $args['form']->options[ $opt . '_url' ] );
2809 2101 $success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] );
2810 2102 $success_url = do_shortcode( $success_url );
2811 2103
2104 + $success_msg = isset( $args['form']->options[ $opt . '_msg' ] ) ? $args['form']->options[ $opt . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' );
2105 +
2106 + $redirect_msg = self::get_redirect_message( $success_url, $success_msg, $args );
2107 +
2812 2108 $args['id'] = $args['entry_id'];
2813 2109 FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
2814 2110
2815 2111 add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
@@ -2816,144 +2112,19 @@
2816 2112 $success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
2817 2113
2818 2114 $doing_ajax = FrmAppHelper::doing_ajax();
2819 2115
2820 - if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
2821 - // Is AJAX submit and there is just one Redirect action runs.
2822 - echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
2116 + if ( isset( $args['ajax'] ) && $args['ajax'] && $doing_ajax ) {
2117 + echo json_encode( array( 'redirect' => $success_url ) );
2823 2118 wp_die();
2824 - }
2825 -
2826 - if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) {
2827 - // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
2828 - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2829 - self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
2830 - self::$redirected_in_new_tab[ $args['form']->id ] = 1;
2831 - return;
2832 - }
2833 -
2119 + } elseif ( ! headers_sent() ) {
2834 2120 wp_redirect( esc_url_raw( $success_url ) );
2835 - // Do not use wp_die or redirect fails.
2836 - die();
2837 - }
2838 -
2839 - // Redirect with a delay.
2840 - self::redirect_after_submit_using_js( $args + compact( 'success_url', 'doing_ajax' ) );
2841 - }
2842 -
2843 - /**
2844 - * Prints open in new tab js with fallback handler.
2845 - *
2846 - * @since 6.3.1
2847 - *
2848 - * @param string $success_url Success URL.
2849 - * @param array $args See {@see FrmFormsController::redirect_after_submit()}.
2850 - */
2851 - private static function print_open_in_new_tab_js_with_fallback_handler( $success_url, $args ) {
2852 - echo '<script>var newTab = window.open("' . esc_url_raw( $success_url ) . '", "_blank");';
2853 - echo 'if ( ! newTab ) {';
2854 -
2855 - $data = array(
2856 - 'formId' => intval( $args['form']->id ),
2857 - 'message' => self::get_redirect_fallback_message( $success_url, $args ),
2858 - );
2859 - // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2860 - echo 'frmShowNewTabFallback = ' . FrmAppHelper::maybe_json_encode( $data ) . ';';
2861 - echo '}</script>';
2862 - }
2863 -
2864 - /**
2865 - * Gets response data for redirect action when AJAX submitting.
2866 - *
2867 - * @since 6.3.1
2868 - *
2869 - * @param array $args See {@see FrmFormsController::run_success_action()}.
2870 - * @return array
2871 - */
2872 - private static function get_ajax_redirect_response_data( $args ) {
2873 - $response_data = array(
2874 - 'redirect' => $args['success_url'],
2875 - 'content' => '',
2876 - );
2877 - $unset_content = true;
2878 -
2879 - if ( ! empty( $args['form']->options['redirect_delay'] ) ) {
2880 - $response_data['delay'] = $args['form']->options['redirect_delay_time'];
2881 - $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args );
2882 - $unset_content = false;
2883 - }
2884 -
2885 - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2886 - $response_data['openInNewTab'] = 1;
2887 -
2888 - // Only show open in new tab text if there is no delay.
2889 - if ( empty( $response_data['content'] ) ) {
2890 - $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
2891 -
2892 - $args['form']->options['success_msg'] = $args['message'];
2893 - $args['form']->options['edit_msg'] = $args['message'];
2894 - if ( ! isset( $args['fields'] ) ) {
2895 - $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
2896 - }
2897 -
2898 - $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
2899 -
2900 - ob_start();
2901 - self::show_lone_success_message( $args );
2902 - $response_data['content'] .= ob_get_clean();
2903 - $unset_content = false;
2904 - }//end if
2905 -
2906 - $response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
2907 - }//end if
2908 -
2909 - if ( $unset_content && '' === $response_data['content'] ) {
2910 - unset( $response_data['content'] );
2911 - }
2912 -
2913 - return $response_data;
2914 - }
2915 -
2916 - /**
2917 - * Redirects after submitting using JS. This is used when showing message before redirecting.
2918 - *
2919 - * @since 6.0
2920 - *
2921 - * @param array $args See {@see FrmFormsController::run_success_action()}.
2922 - */
2923 - private static function redirect_after_submit_using_js( $args ) {
2924 - $success_msg = $args['form']->options['redirect_delay_msg'];
2925 - $redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
2926 - $success_url = esc_url_raw( $args['success_url'] );
2927 -
2928 - /**
2929 - * Filters the delay time before redirecting when On Submit Redirect action is delayed.
2930 - *
2931 - * @since 6.0
2932 - *
2933 - * @param int $delay_time Delay time in milliseconds.
2934 - */
2935 - $delay_time = apply_filters( 'frm_redirect_delay_time', 1000 * $args['form']->options['redirect_delay_time'] );
2936 -
2937 - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2938 - $redirect_js = 'window.open("' . $success_url . '", "_blank")';
2121 + die(); // do not use wp_die or redirect fails
2939 2122 } else {
2940 - $redirect_js = 'window.location="' . $success_url . '";';
2123 + add_filter( 'frm_use_wpautop', '__return_true' );
2124 + echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2125 + echo "<script type='text/javascript'>window.onload = function(){setTimeout(window.location='" . esc_url_raw( $success_url ) . "', 8000);}</script>";
2941 2126 }
2942 -
2943 - add_filter( 'frm_use_wpautop', '__return_true' );
2944 -
2945 - echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2946 - echo '<script>';
2947 - if ( empty( $args['doing_ajax'] ) ) {
2948 - // Not AJAX submit, delay JS until window.load.
2949 - echo 'window.onload=function(){';
2950 - }
2951 - echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2952 - if ( empty( $args['doing_ajax'] ) ) {
2953 - echo '};';
2954 - }
2955 - echo '</script>';
2956 2127 }
2957 2128
2958 2129 /**
2959 2130 * @since 3.0
@@ -2959,15 +2130,14 @@
2959 2130 * @since 3.0
2960 2131 *
2961 2132 * @param string $success_url
2962 2133 * @param string $success_msg
2963 - * @param array $args
2134 + * @param array $args
2964 2135 */
2965 2136 private static function get_redirect_message( $success_url, $success_msg, $args ) {
2966 - $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
2967 - $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
2968 - $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
2969 - self::get_redirect_fallback_message( $success_url, $args ) .
2137 + $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/>' .
2138 + /* translators: %1$s: Start link HTML, %2$s: End link HTML */
2139 + sprintf( __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), '<a href="' . esc_url( $success_url ) . '">', '</a>' ) .
2970 2140 '</div></div>';
2971 2141
2972 2142 $redirect_args = array(
2973 2143 'entry_id' => $args['entry_id'],
@@ -2978,52 +2148,19 @@
2978 2148 return apply_filters( 'frm_redirect_msg', $redirect_msg, $redirect_args );
2979 2149 }
2980 2150
2981 2151 /**
2982 - * Gets fallback message when redirecting failed.
2983 - *
2984 - * @since 6.3.1
2985 - *
2986 - * @param string $success_url Redirect URL.
2987 - * @param array $args Contains `form` object.
2988 - * @return string
2989 - */
2990 - private static function get_redirect_fallback_message( $success_url, $args ) {
2991 - $target = '';
2992 - if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2993 - $target = ' target="_blank"';
2994 - }
2995 -
2996 - return sprintf(
2997 - /* translators: %1$s: Start link HTML, %2$s: End link HTML */
2998 - __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ),
2999 - '<a href="' . esc_url( $success_url ) . '"' . $target . '>',
3000 - '</a>'
3001 - );
3002 - }
3003 -
3004 - /**
3005 2152 * Prepare to show the success message and empty form after submit
3006 2153 *
3007 2154 * @since 2.05
3008 2155 */
3009 2156 public static function show_message_after_save( $atts ) {
3010 - $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
2157 + $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'] );
3011 2158
3012 2159 if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3013 - if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3014 - $entry = FrmEntry::getOne( $atts['entry_id'] );
3015 - if ( $entry ) {
3016 - // This is copied from the Pro plugin.
3017 - $atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3018 - $atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
3019 - FrmProEntriesController::show_front_end_form_with_entry( $entry, $atts );
3020 - }
3021 - } else {
3022 - self::show_form_after_submit( $atts );
3023 - }
2160 + self::show_form_after_submit( $atts );
3024 2161 } else {
3025 - self::show_lone_success_message( $atts );
2162 + self::show_lone_success_messsage( $atts );
3026 2163 }
3027 2164 }
3028 2165
3029 2166 /**
@@ -3051,9 +2188,9 @@
3051 2188
3052 2189 $include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3053 2190
3054 2191 $frm_settings = FrmAppHelper::get_settings();
3055 - $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
2192 + $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
3056 2193
3057 2194 global $frm_vars;
3058 2195 self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3059 2196
@@ -3062,10 +2199,11 @@
3062 2199 include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3063 2200 }
3064 2201
3065 2202 /**
2203 + * @return string - 'before', 'after', or 'submit'
2204 + *
3066 2205 * @since 4.05.02
3067 - * @return string - 'before', 'after', or 'submit'
3068 2206 */
3069 2207 private static function message_placement( $form, $message ) {
3070 2208 $place = 'before';
3071 2209
@@ -3077,10 +2215,11 @@
3077 2215 }
3078 2216 }
3079 2217
3080 2218 /**
2219 + * @return string - 'before' or 'after'
2220 + *
3081 2221 * @since 4.05.02
3082 - * @return string - 'before' or 'after'
3083 2222 */
3084 2223 return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3085 2224 }
3086 2225
@@ -3089,16 +2228,8 @@
3089 2228 *
3090 2229 * @since 2.05
3091 2230 */
3092 2231 private static function fill_atts_for_form_display( &$args ) {
3093 - if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3094 - $args['title'] = $args['show_title'];
3095 - }
3096 -
3097 - if ( ! isset( $args['description'] ) && isset( $args['show_description'] ) ) {
3098 - $args['description'] = $args['show_description'];
3099 - }
3100 -
3101 2232 $defaults = array(
3102 2233 'errors' => array(),
3103 2234 'message' => '',
3104 2235 'fields' => array(),
@@ -3114,9 +2245,9 @@
3114 2245 * Show the success message without the form
3115 2246 *
3116 2247 * @since 2.05
3117 2248 */
3118 - private static function show_lone_success_message( $atts ) {
2249 + private static function show_lone_success_messsage( $atts ) {
3119 2250 global $frm_vars;
3120 2251 $values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3121 2252 self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3122 2253
@@ -3125,9 +2256,9 @@
3125 2256 $errors = array();
3126 2257 $form = $atts['form'];
3127 2258 $message = $atts['message'];
3128 2259
3129 - include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
2260 + include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' );
3130 2261 }
3131 2262
3132 2263 /**
3133 2264 * Prepare the success message before it's shown
@@ -3132,21 +2263,14 @@
3132 2263 /**
3133 2264 * Prepare the success message before it's shown
3134 2265 *
3135 2266 * @since 2.05
3136 - * @since 6.0.x Added the third parameter.
3137 - *
3138 - * @param object $form Form object.
3139 - * @param int $entry_id Entry ID.
3140 - * @param array $args See {@see FrmFormsController::run_success_action()}.
3141 - * @return string
3142 2267 */
3143 - private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
2268 + private static function prepare_submit_message( $form, $entry_id ) {
3144 2269 $frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3145 - $opt = $args['success_opt'] ?? 'success';
3146 2270
3147 2271 if ( $entry_id && is_numeric( $entry_id ) ) {
3148 - $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
2272 + $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg;
3149 2273 $class = 'frm_message';
3150 2274 } else {
3151 2275 $message = $frm_settings->failed_msg;
3152 2276 $class = FrmFormsHelper::form_error_class();
@@ -3156,11 +2280,8 @@
3156 2280
3157 2281 return apply_filters( 'frm_main_feedback', $message, $form, $entry_id );
3158 2282 }
3159 2283
3160 - /**
3161 - * @return void
3162 - */
3163 2284 public static function front_head() {
3164 2285 $version = FrmAppHelper::plugin_version();
3165 2286 $suffix = FrmAppHelper::js_suffix();
3166 2287
@@ -3235,9 +2356,9 @@
3235 2356 return ! function_exists( 'aioseo' );
3236 2357 }
3237 2358
3238 2359 public static function defer_script_loading( $tag, $handle ) {
3239 - if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
2360 + if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
3240 2361 $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3241 2362 }
3242 2363
3243 2364 return $tag;
@@ -3247,13 +2368,11 @@
3247 2368 global $frm_vars;
3248 2369
3249 2370 FrmStylesController::enqueue_css();
3250 2371
3251 - if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
2372 + if ( ! FrmAppHelper::is_admin() && $location != 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
3252 2373 // load formidable js
3253 2374 wp_enqueue_script( 'formidable' );
3254 -
3255 - FrmHoneypot::maybe_print_honeypot_js();
3256 2375 }
3257 2376 }
3258 2377
3259 2378 /**
@@ -3267,12 +2386,12 @@
3267 2386 }
3268 2387
3269 2388 /**
3270 2389 * @since 2.0.8
3271 - * @return bool
2390 + * @return boolean
3272 2391 */
3273 2392 private static function is_minification_on( $atts ) {
3274 - return ! empty( $atts['minimize'] );
2393 + return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] );
3275 2394 }
3276 2395
3277 2396 /**
3278 2397 * @since 5.0.16
@@ -3300,9 +2419,9 @@
3300 2419 * Create a page with an embedded formidable Gutenberg block.
3301 2420 *
3302 2421 * @since 5.2
3303 2422 *
3304 - * @return void
2423 + * @return never
3305 2424 */
3306 2425 public static function create_page_with_shortcode() {
3307 2426 if ( ! current_user_can( 'publish_posts' ) ) {
3308 2427 die( 0 );
@@ -3347,9 +2466,10 @@
3347 2466
3348 2467 /**
3349 2468 * @since 5.3
3350 2469 *
3351 - * @param int $form_id
2470 + * @param string $content
2471 + * @param int $form_id
3352 2472 * @return string
3353 2473 */
3354 2474 private static function get_page_shortcode_content_for_form( $form_id ) {
3355 2475 $shortcode = '[formidable id="' . $form_id . '"]';
@@ -3360,9 +2480,9 @@
3360 2480
3361 2481 /**
3362 2482 * Get page dropdown for AJAX request for embedding form in an existing page.
3363 2483 *
3364 - * @return void
2484 + * @return never
3365 2485 */
3366 2486 public static function get_page_dropdown() {
3367 2487 if ( ! current_user_can( 'publish_posts' ) ) {
3368 2488 die( 0 );
@@ -3370,9 +2490,9 @@
3370 2490
3371 2491 check_ajax_referer( 'frm_ajax', 'nonce' );
3372 2492
3373 2493 $html = FrmAppHelper::clip(
3374 - function () {
2494 + function() {
3375 2495 FrmAppHelper::maybe_autocomplete_pages_options(
3376 2496 array(
3377 2497 'field_name' => 'frm_page_dropdown',
3378 2498 'page_id' => '',
@@ -3392,8 +2512,15 @@
3392 2512
3393 2513 /**
3394 2514 * @deprecated 4.0
3395 2515 */
2516 + public static function new_form( $values = array() ) {
2517 + FrmDeprecated::new_form( $values );
2518 + }
2519 +
2520 + /**
2521 + * @deprecated 4.0
2522 + */
3396 2523 public static function create( $values = array() ) {
3397 2524 _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3398 2525 self::update( $values );
3399 2526 }
@@ -3398,16 +2525,51 @@
3398 2525 self::update( $values );
3399 2526 }
3400 2527
3401 2528 /**
3402 - * Education for premium features.
3403 - *
3404 - * @since 4.05
3405 - * @deprecated 6.16.3
3406 - *
3407 - * @return void
2529 + * @deprecated 1.07.05
2530 + * @codeCoverageIgnore
3408 2531 */
3409 - public static function add_form_style_tab_options() {
3410 - _deprecated_function( __METHOD__, '6.16.3' );
3411 - include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php';
2532 + public static function add_default_templates( $path, $default = true, $template = true ) {
2533 + FrmDeprecated::add_default_templates( $path, $default, $template );
2534 + }
2535 +
2536 + /**
2537 + * @deprecated 3.0
2538 + * @codeCoverageIgnore
2539 + */
2540 + public static function bulk_create_template( $ids ) {
2541 + return FrmDeprecated::bulk_create_template( $ids );
2542 + }
2543 +
2544 + /**
2545 + * @deprecated 2.03
2546 + * @codeCoverageIgnore
2547 + */
2548 + public static function register_pro_scripts() {
2549 + FrmDeprecated::register_pro_scripts();
2550 + }
2551 +
2552 + /**
2553 + * @deprecated 3.0
2554 + * @codeCoverageIgnore
2555 + */
2556 + public static function edit_key() {
2557 + FrmDeprecated::edit_key();
2558 + }
2559 +
2560 + /**
2561 + * @deprecated 3.0
2562 + * @codeCoverageIgnore
2563 + */
2564 + public static function edit_description() {
2565 + FrmDeprecated::edit_description();
2566 + }
2567 +
2568 + /**
2569 + * @deprecated 4.08
2570 + * @since 3.06
2571 + */
2572 + public static function add_new() {
2573 + _deprecated_function( __FUNCTION__, '4.08' );
3412 2574 }
3413 2575 }