| @@ -19,11 +19,8 @@ | ||
| 19 | 19 | * @var string|null |
| 20 | 20 | */ |
| 21 | 21 | private static $message; |
| 22 | 22 | |
| 23 | - /** | |
| 24 | - * @return void | |
| 25 | - */ | |
| 26 | 23 | public static function load_pro_hooks() { |
| 27 | 24 | if ( FrmAppHelper::pro_is_installed() ) { |
| 28 | 25 | FrmProStylesController::load_pro_hooks(); |
| 29 | 26 | } |
| @@ -28,11 +25,8 @@ | ||
| 28 | 25 | FrmProStylesController::load_pro_hooks(); |
| 29 | 26 | } |
| 30 | 27 | } |
| 31 | 28 | |
| 32 | - /** | |
| 33 | - * @return void | |
| 34 | - */ | |
| 35 | 29 | public static function register_post_types() { |
| 36 | 30 | register_post_type( |
| 37 | 31 | self::$post_type, |
| 38 | 32 | array( |
| @@ -101,9 +95,9 @@ | ||
| 101 | 95 | * |
| 102 | 96 | * @return void |
| 103 | 97 | */ |
| 104 | 98 | private static function disable_form_css() { |
| 105 | - add_filter( 'get_frm_stylesheet', '__return_empty_array' ); | |
| 99 | + add_filter( 'get_frm_stylesheet', '__return_false' ); | |
| 106 | 100 | } |
| 107 | 101 | |
| 108 | 102 | /** |
| 109 | 103 | * Removing this action prevents front end JavaScript from loading. |
| @@ -125,12 +119,12 @@ | ||
| 125 | 119 | if ( ! FrmAppHelper::is_style_editor_page() ) { |
| 126 | 120 | return; |
| 127 | 121 | } |
| 128 | 122 | |
| 129 | - FrmStyleComponent::register_assets(); | |
| 130 | 123 | self::load_pro_hooks(); |
| 131 | 124 | |
| 132 | 125 | $version = FrmAppHelper::plugin_version(); |
| 126 | + wp_enqueue_script( 'jquery-ui-datepicker' ); | |
| 133 | 127 | |
| 134 | 128 | if ( FrmAppHelper::is_style_editor_page( 'edit' ) ) { |
| 135 | 129 | wp_enqueue_style( 'wp-color-picker' ); |
| 136 | 130 | } |
| @@ -137,9 +131,8 @@ | ||
| 137 | 131 | |
| 138 | 132 | wp_enqueue_style( 'frm-custom-theme', admin_url( 'admin-ajax.php?action=frmpro_css' ), array(), $version ); |
| 139 | 133 | |
| 140 | 134 | $style = apply_filters( 'frm_style_head', false ); |
| 141 | - | |
| 142 | 135 | if ( $style ) { |
| 143 | 136 | wp_enqueue_style( 'frm-single-custom-theme', admin_url( 'admin-ajax.php?action=frmpro_load_css&flat=1' ) . '&' . http_build_query( $style->post_content ), array(), $version ); |
| 144 | 137 | } |
| 145 | 138 | } |
| @@ -168,9 +161,8 @@ | ||
| 168 | 161 | |
| 169 | 162 | /** |
| 170 | 163 | * @param string $register Either 'enqueue' or 'register'. |
| 171 | 164 | * @param bool $force True to enqueue/register the style if a form has not been loaded. |
| 172 | - * | |
| 173 | 165 | * @return void |
| 174 | 166 | */ |
| 175 | 167 | public static function enqueue_css( $register = 'enqueue', $force = false ) { |
| 176 | 168 | global $frm_vars; |
| @@ -182,9 +174,8 @@ | ||
| 182 | 174 | return; |
| 183 | 175 | } |
| 184 | 176 | |
| 185 | 177 | $frm_settings = FrmAppHelper::get_settings(); |
| 186 | - | |
| 187 | 178 | if ( $frm_settings->load_style === 'none' ) { |
| 188 | 179 | return; |
| 189 | 180 | } |
| 190 | 181 | |
| @@ -200,9 +191,8 @@ | ||
| 200 | 191 | wp_register_style( $css_key, $file, array(), $this_version ); |
| 201 | 192 | } |
| 202 | 193 | |
| 203 | 194 | $load_on_all = ! FrmAppHelper::is_admin() && 'all' === $frm_settings->load_style; |
| 204 | - | |
| 205 | 195 | if ( $load_on_all || $register !== 'register' ) { |
| 206 | 196 | wp_enqueue_style( $css_key ); |
| 207 | 197 | } |
| 208 | 198 | unset( $css_key, $file ); |
| @@ -233,14 +223,12 @@ | ||
| 233 | 223 | } |
| 234 | 224 | |
| 235 | 225 | /** |
| 236 | 226 | * @param array $stylesheet_urls |
| 237 | - * | |
| 238 | 227 | * @return void |
| 239 | 228 | */ |
| 240 | 229 | private static function get_url_to_custom_style( &$stylesheet_urls ) { |
| 241 | 230 | $file_name = '/css/' . self::get_file_name(); |
| 242 | - | |
| 243 | 231 | if ( is_readable( FrmAppHelper::plugin_path() . $file_name ) ) { |
| 244 | 232 | $url = FrmAppHelper::plugin_url() . $file_name; |
| 245 | 233 | } else { |
| 246 | 234 | $url = admin_url( 'admin-ajax.php?action=frmpro_css' ); |
| @@ -251,10 +239,8 @@ | ||
| 251 | 239 | /** |
| 252 | 240 | * Use a different stylesheet per site in a multisite install |
| 253 | 241 | * |
| 254 | 242 | * @since 3.0.03 |
| 255 | - * | |
| 256 | - * @return string | |
| 257 | 243 | */ |
| 258 | 244 | public static function get_file_name() { |
| 259 | 245 | if ( is_multisite() ) { |
| 260 | 246 | $blog_id = get_current_blog_id(); |
| @@ -265,18 +251,11 @@ | ||
| 265 | 251 | |
| 266 | 252 | return $name; |
| 267 | 253 | } |
| 268 | 254 | |
| 269 | - /** | |
| 270 | - * @param string $css_key | |
| 271 | - * @param string $version | |
| 272 | - * | |
| 273 | - * @return string | |
| 274 | - */ | |
| 275 | 255 | private static function get_css_version( $css_key, $version ) { |
| 276 | - if ( 'formidable' === $css_key ) { | |
| 256 | + if ( 'formidable' == $css_key ) { | |
| 277 | 257 | $this_version = get_option( 'frm_last_style_update' ); |
| 278 | - | |
| 279 | 258 | if ( ! $this_version ) { |
| 280 | 259 | $this_version = $version; |
| 281 | 260 | } |
| 282 | 261 | } else { |
| @@ -288,15 +267,16 @@ | ||
| 288 | 267 | |
| 289 | 268 | /** |
| 290 | 269 | * @param string $tag |
| 291 | 270 | * @param string $handle |
| 292 | - * | |
| 293 | 271 | * @return string |
| 294 | 272 | */ |
| 295 | 273 | public static function add_tags_to_css( $tag, $handle ) { |
| 296 | 274 | if ( ( 'formidable' === $handle || 'jquery-theme' === $handle ) && strpos( $tag, ' property=' ) === false ) { |
| 297 | 275 | $frm_settings = FrmAppHelper::get_settings(); |
| 298 | - $tag = str_replace( ' type="', ' property="stylesheet" type="', $tag ); | |
| 276 | + if ( $frm_settings->use_html ) { | |
| 277 | + $tag = str_replace( ' type="', ' property="stylesheet" type="', $tag ); | |
| 278 | + } | |
| 299 | 279 | } |
| 300 | 280 | |
| 301 | 281 | return $tag; |
| 302 | 282 | } |
| @@ -344,35 +324,20 @@ | ||
| 344 | 324 | |
| 345 | 325 | self::setup_styles_and_scripts_for_styler(); |
| 346 | 326 | |
| 347 | 327 | $style_id = self::get_style_id_for_styler(); |
| 348 | - | |
| 349 | 328 | if ( ! $style_id ) { |
| 350 | - $error_args = array( | |
| 351 | - 'title' => __( 'No styles', 'formidable' ), | |
| 352 | - 'body' => __( 'You must have a style to use the Visual Styler.', 'formidable' ), | |
| 353 | - 'cancel_url' => admin_url( 'admin.php?page=formidable' ), | |
| 354 | - ); | |
| 355 | - FrmAppController::show_error_modal( $error_args ); | |
| 356 | - return; | |
| 329 | + wp_die( esc_html__( 'Invalid route', 'formidable' ), esc_html__( 'Invalid route', 'formidable' ), 400 ); | |
| 357 | 330 | } |
| 358 | 331 | |
| 359 | 332 | $form_id = FrmAppHelper::simple_get( 'form', 'absint', 0 ); |
| 360 | - | |
| 361 | 333 | if ( ! $form_id ) { |
| 362 | 334 | $form_id = self::get_form_id_for_style( $style_id ); |
| 363 | 335 | } |
| 364 | 336 | |
| 365 | 337 | $form = FrmForm::getOne( $form_id ); |
| 366 | - | |
| 367 | 338 | if ( ! is_object( $form ) ) { |
| 368 | - $error_args = array( | |
| 369 | - 'title' => __( 'No forms', 'formidable' ), | |
| 370 | - 'body' => __( 'You must have a form to use the Visual Styler.', 'formidable' ), | |
| 371 | - 'cancel_url' => admin_url( 'admin.php?page=formidable' ), | |
| 372 | - ); | |
| 373 | - FrmAppController::show_error_modal( $error_args ); | |
| 374 | - return; | |
| 339 | + wp_die( esc_html__( 'Invalid route', 'formidable' ), esc_html__( 'Invalid route', 'formidable' ), 400 ); | |
| 375 | 340 | } |
| 376 | 341 | |
| 377 | 342 | $frm_style = new FrmStyle( $style_id ); |
| 378 | 343 | $active_style = $frm_style->get_one(); |
| @@ -382,9 +347,11 @@ | ||
| 382 | 347 | |
| 383 | 348 | /** |
| 384 | 349 | * @since 6.0 |
| 385 | 350 | * |
| 386 | - * @param array{form:\stdClass} $data | |
| 351 | + * @param array { | |
| 352 | + * @type stdClass $form | |
| 353 | + * } | |
| 387 | 354 | */ |
| 388 | 355 | do_action( 'frm_before_render_style_page', compact( 'form' ) ); |
| 389 | 356 | |
| 390 | 357 | self::render_style_page( $active_style, $form, $default_style ); |
| @@ -396,9 +363,8 @@ | ||
| 396 | 363 | * @return int |
| 397 | 364 | */ |
| 398 | 365 | private static function get_style_id_for_styler() { |
| 399 | 366 | $action = FrmAppHelper::simple_get( 'frm_action' ); |
| 400 | - | |
| 401 | 367 | if ( 'duplicate' === $action ) { |
| 402 | 368 | // The duplicate action uses style_id instead of id for better backward compatibility. |
| 403 | 369 | return FrmAppHelper::simple_get( 'style_id', 'absint', 0 ); |
| 404 | 370 | } |
| @@ -403,9 +369,8 @@ | ||
| 403 | 369 | return FrmAppHelper::simple_get( 'style_id', 'absint', 0 ); |
| 404 | 370 | } |
| 405 | 371 | |
| 406 | 372 | $style_id = FrmAppHelper::simple_get( 'id', 'absint', 0 ); |
| 407 | - | |
| 408 | 373 | if ( $style_id ) { |
| 409 | 374 | // Always use the style ID from the URL if one is specified. |
| 410 | 375 | return $style_id; |
| 411 | 376 | } |
| @@ -410,9 +375,8 @@ | ||
| 410 | 375 | return $style_id; |
| 411 | 376 | } |
| 412 | 377 | |
| 413 | 378 | $request_form_id = FrmAppHelper::simple_get( 'form', 'absint', 0 ); |
| 414 | - | |
| 415 | 379 | if ( $request_form_id && is_callable( 'FrmProStylesController::get_active_style_for_form' ) ) { |
| 416 | 380 | return FrmProStylesController::get_active_style_for_form( $request_form_id )->ID; |
| 417 | 381 | } |
| 418 | 382 | |
| @@ -424,9 +388,8 @@ | ||
| 424 | 388 | * |
| 425 | 389 | * @since 6.0 |
| 426 | 390 | * |
| 427 | 391 | * @param int $style_id |
| 428 | - * | |
| 429 | 392 | * @return int |
| 430 | 393 | */ |
| 431 | 394 | private static function get_form_id_for_style( $style_id ) { |
| 432 | 395 | $check = serialize( array( 'custom_style' => (string) $style_id ) ); |
| @@ -487,15 +450,13 @@ | ||
| 487 | 450 | * @return void |
| 488 | 451 | */ |
| 489 | 452 | private static function save_form_style() { |
| 490 | 453 | $permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form_style', 'frm_save_form_style_nonce' ); |
| 491 | - | |
| 492 | 454 | if ( $permission_error !== false ) { |
| 493 | 455 | wp_die( 'Unable to save form', '', 403 ); |
| 494 | 456 | } |
| 495 | 457 | |
| 496 | 458 | $style_id = FrmAppHelper::get_post_param( 'style_id', 0, 'absint' ); |
| 497 | - | |
| 498 | 459 | if ( $style_id && ! self::confirm_style_exists_before_setting( $style_id ) ) { |
| 499 | 460 | wp_die( esc_html__( 'Invalid target style', 'formidable' ), esc_html__( 'Invalid target style', 'formidable' ), 400 ); |
| 500 | 461 | return; |
| 501 | 462 | } |
| @@ -515,9 +476,8 @@ | ||
| 515 | 476 | return; |
| 516 | 477 | } |
| 517 | 478 | |
| 518 | 479 | $form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' ); |
| 519 | - | |
| 520 | 480 | if ( ! $form_id ) { |
| 521 | 481 | wp_die( esc_html__( 'No form specified', 'formidable' ), esc_html__( 'No form specified', 'formidable' ), 400 ); |
| 522 | 482 | return; |
| 523 | 483 | } |
| @@ -522,21 +482,17 @@ | ||
| 522 | 482 | return; |
| 523 | 483 | } |
| 524 | 484 | |
| 525 | 485 | $form = FrmForm::getOne( $form_id ); |
| 526 | - | |
| 527 | 486 | if ( ! $form ) { |
| 528 | 487 | wp_die( esc_html__( 'Form does not exist', 'formidable' ), esc_html__( 'Form does not exist', 'formidable' ), 400 ); |
| 529 | 488 | return; |
| 530 | 489 | } |
| 531 | 490 | |
| 532 | - $previous_style_id = $form->options['custom_style']; | |
| 533 | - | |
| 534 | 491 | // If the default style is selected, use the "Always use default" legacy option instead of the default style. |
| 535 | 492 | // There's also a check here for conversational forms. |
| 536 | 493 | // Without the check it isn't possible to select "Default" because "Always use default" will convert to "Lines" dynamically. |
| 537 | 494 | $default_style = self::get_default_style(); |
| 538 | - | |
| 539 | 495 | if ( $style_id === $default_style->ID && empty( $form->options['chat'] ) ) { |
| 540 | 496 | $style_id = 1; |
| 541 | 497 | } |
| 542 | 498 | |
| @@ -542,27 +498,13 @@ | ||
| 542 | 498 | |
| 543 | 499 | // We want to save a string for consistency. FrmStylesHelper::get_form_count_for_style expects the custom style ID is a string. |
| 544 | 500 | $form->options['custom_style'] = (string) $style_id; |
| 545 | 501 | |
| 546 | - if ( $previous_style_id === $form->options['custom_style'] ) { | |
| 547 | - // Exit early before updating DB if nothing actually changed. | |
| 548 | - self::$message = __( 'Successfully updated style.', 'formidable' ); | |
| 549 | - return; | |
| 550 | - } | |
| 551 | - | |
| 552 | 502 | global $wpdb; |
| 553 | 503 | $wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => maybe_serialize( $form->options ) ), array( 'id' => $form->id ) ); |
| 554 | 504 | |
| 555 | 505 | FrmForm::clear_form_cache(); |
| 556 | 506 | |
| 557 | - /** | |
| 558 | - * @since 6.25.1 | |
| 559 | - * | |
| 560 | - * @param int $form_id | |
| 561 | - * @param int $style_id | |
| 562 | - */ | |
| 563 | - do_action( 'frm_after_changed_form_style', absint( $form_id ), absint( $style_id ) ); | |
| 564 | - | |
| 565 | 507 | self::$message = __( 'Successfully updated style.', 'formidable' ); |
| 566 | 508 | } |
| 567 | 509 | |
| 568 | 510 | /** |
| @@ -568,9 +510,8 @@ | ||
| 568 | 510 | /** |
| 569 | 511 | * Validate that we're assigning a form to a style that actually exists before assigning it to a form. |
| 570 | 512 | * |
| 571 | 513 | * @param int $style_id |
| 572 | - * | |
| 573 | 514 | * @return bool True if the style actually exists. |
| 574 | 515 | */ |
| 575 | 516 | private static function confirm_style_exists_before_setting( $style_id ) { |
| 576 | 517 | global $wpdb; |
| @@ -589,9 +530,9 @@ | ||
| 589 | 530 | $plugin_url = FrmAppHelper::plugin_url(); |
| 590 | 531 | $version = FrmAppHelper::plugin_version(); |
| 591 | 532 | $js_dependencies = array( 'wp-i18n', 'wp-hooks', 'formidable_dom' ); |
| 592 | 533 | |
| 593 | - if ( FrmAppHelper::pro_is_installed() && is_callable( 'FrmProAppHelper::use_jquery_datepicker' ) && FrmProAppHelper::use_jquery_datepicker() ) { | |
| 534 | + if ( FrmAppHelper::pro_is_installed() ) { | |
| 594 | 535 | $js_dependencies[] = 'jquery-ui-datepicker'; |
| 595 | 536 | } |
| 596 | 537 | |
| 597 | 538 | wp_register_script( 'formidable_style', $plugin_url . '/js/admin/style.js', $js_dependencies, $version ); |
| @@ -610,9 +551,8 @@ | ||
| 610 | 551 | * |
| 611 | 552 | * @param stdClass|WP_Post $active_style |
| 612 | 553 | * @param stdClass $form |
| 613 | 554 | * @param WP_Post $default_style |
| 614 | - * | |
| 615 | 555 | * @return void |
| 616 | 556 | */ |
| 617 | 557 | private static function render_style_page( $active_style, $form, $default_style ) { |
| 618 | 558 | $style_views_path = self::get_views_path(); |
| @@ -687,9 +627,8 @@ | ||
| 687 | 627 | * |
| 688 | 628 | * @since 6.0 |
| 689 | 629 | * |
| 690 | 630 | * @param stdClass|WP_Post $style A new style is not a WP_Post object. |
| 691 | - * | |
| 692 | 631 | * @return void |
| 693 | 632 | */ |
| 694 | 633 | private static function force_form_style( $style ) { |
| 695 | 634 | add_filter( |
| @@ -728,9 +667,8 @@ | ||
| 728 | 667 | return; |
| 729 | 668 | } |
| 730 | 669 | |
| 731 | 670 | $id = $frm_style->update( $post_id ); |
| 732 | - | |
| 733 | 671 | if ( ! $post_id && $id ) { |
| 734 | 672 | self::maybe_redirect_after_save( $id ); |
| 735 | 673 | // Set the post id to the new style so it will be loaded for editing. |
| 736 | 674 | $post_id = reset( $id ); |
| @@ -735,15 +673,8 @@ | ||
| 735 | 673 | // Set the post id to the new style so it will be loaded for editing. |
| 736 | 674 | $post_id = reset( $id ); |
| 737 | 675 | } |
| 738 | 676 | |
| 739 | - /** | |
| 740 | - * @since 6.25.1 | |
| 741 | - * | |
| 742 | - * @param int $post_id | |
| 743 | - */ | |
| 744 | - do_action( 'frm_after_saved_style', absint( $post_id ) ); | |
| 745 | - | |
| 746 | 677 | self::$message = __( 'Your styling settings have been saved.', 'formidable' ); |
| 747 | 678 | } |
| 748 | 679 | |
| 749 | 680 | /** |
| @@ -762,9 +693,8 @@ | ||
| 762 | 693 | * |
| 763 | 694 | * @since 6.0 |
| 764 | 695 | * |
| 765 | 696 | * @param array $ids |
| 766 | - * | |
| 767 | 697 | * @return void |
| 768 | 698 | */ |
| 769 | 699 | private static function maybe_redirect_after_save( $ids ) { |
| 770 | 700 | $referer = FrmAppHelper::get_server_value( 'HTTP_REFERER' ); |
| @@ -772,9 +702,8 @@ | ||
| 772 | 702 | $query = $parsed['query']; |
| 773 | 703 | |
| 774 | 704 | $current_action = false; |
| 775 | 705 | $actions_to_redirect = array( 'duplicate', 'new_style' ); |
| 776 | - | |
| 777 | 706 | foreach ( $actions_to_redirect as $action ) { |
| 778 | 707 | if ( false !== strpos( $query, 'frm_action=' . $action ) ) { |
| 779 | 708 | $current_action = $action; |
| 780 | 709 | break; |
| @@ -799,9 +728,8 @@ | ||
| 799 | 728 | * @since 6.0 |
| 800 | 729 | * |
| 801 | 730 | * @param string $message |
| 802 | 731 | * @param array|object $forms |
| 803 | - * | |
| 804 | 732 | * @return void |
| 805 | 733 | */ |
| 806 | 734 | public static function manage( $message = '', $forms = array() ) { |
| 807 | 735 | $frm_style = new FrmStyle(); |
| @@ -806,9 +734,8 @@ | ||
| 806 | 734 | public static function manage( $message = '', $forms = array() ) { |
| 807 | 735 | $frm_style = new FrmStyle(); |
| 808 | 736 | $styles = $frm_style->get_all(); |
| 809 | 737 | $default_style = $frm_style->get_default_style( $styles ); |
| 810 | - $frm_settings = FrmAppHelper::get_settings(); | |
| 811 | 738 | |
| 812 | 739 | if ( ! $forms ) { |
| 813 | 740 | $forms = FrmForm::get_published_forms(); |
| 814 | 741 | } |
| @@ -825,16 +752,15 @@ | ||
| 825 | 752 | private static function manage_styles() { |
| 826 | 753 | global $wpdb; |
| 827 | 754 | |
| 828 | 755 | $forms = FrmForm::get_published_forms(); |
| 829 | - | |
| 830 | 756 | foreach ( $forms as $form ) { |
| 831 | - if ( ! isset( $_POST['style'] ) || ! isset( $_POST['style'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 757 | + $new_style = isset( $_POST['style'] ) && isset( $_POST['style'][ $form->id ] ) ? sanitize_text_field( wp_unslash( $_POST['style'][ $form->id ] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 758 | + $previous_style = isset( $_POST['prev_style'] ) && isset( $_POST['prev_style'][ $form->id ] ) ? sanitize_text_field( wp_unslash( $_POST['prev_style'][ $form->id ] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 759 | + if ( $new_style == $previous_style ) { | |
| 832 | 760 | continue; |
| 833 | 761 | } |
| 834 | 762 | |
| 835 | - $new_style = sanitize_text_field( wp_unslash( $_POST['style'][ $form->id ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing | |
| 836 | - | |
| 837 | 763 | $form->options['custom_style'] = $new_style; |
| 838 | 764 | $wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => maybe_serialize( $form->options ) ), array( 'id' => $form->id ) ); |
| 839 | 765 | unset( $form ); |
| 840 | 766 | } |
| @@ -843,27 +769,15 @@ | ||
| 843 | 769 | /** |
| 844 | 770 | * Echo content for the Custom CSS page. |
| 845 | 771 | * |
| 846 | 772 | * @param string $message |
| 847 | - * @param array $extra_args An array of extra arguments. | |
| 848 | - * | |
| 849 | 773 | * @return void |
| 850 | 774 | */ |
| 851 | - public static function custom_css( $message = '', $extra_args = array() ) { | |
| 852 | - $id = $extra_args['id'] ?? 'frm_codemirror_box'; | |
| 853 | - $settings = self::enqueue_codemirror( $id, $extra_args['placeholder'] ?? '' ); | |
| 854 | - $id = $settings ? $id : 'frm_custom_css_box'; | |
| 855 | - $show_errors = $extra_args['show_errors'] ?? true; | |
| 856 | - $custom_css = $extra_args['custom_css'] ?? self::get_custom_css(); | |
| 857 | - $heading = $extra_args['heading'] ?? __( 'You can add custom css here or in your theme style.css. Any CSS added here will be used anywhere the Formidable CSS is loaded.', 'formidable' ); | |
| 858 | - $textarea_params = ! empty( $extra_args['textarea_params'] ) ? $extra_args['textarea_params'] : array( | |
| 859 | - 'name' => 'frm_custom_css', | |
| 860 | - 'id' => $id, | |
| 861 | - ); | |
| 775 | + public static function custom_css( $message = '' ) { | |
| 776 | + $settings = self::enqueue_codemirror(); | |
| 777 | + $id = $settings ? 'frm_codemirror_box' : 'frm_custom_css_box'; | |
| 778 | + $custom_css = self::get_custom_css(); | |
| 862 | 779 | |
| 863 | - if ( ! empty( $settings ) ) { | |
| 864 | - $textarea_params['class'] = 'hide-if-js'; | |
| 865 | - } | |
| 866 | 780 | include FrmAppHelper::plugin_path() . '/classes/views/styles/custom_css.php'; |
| 867 | 781 | } |
| 868 | 782 | |
| 869 | 783 | /** |
| @@ -870,20 +784,12 @@ | ||
| 870 | 784 | * Get custom CSS code entered in the Custom CSS page. |
| 871 | 785 | * |
| 872 | 786 | * @since 6.0 |
| 873 | 787 | * |
| 874 | - * @param array|null $single_style_settings The single style settings. | |
| 875 | - * | |
| 876 | 788 | * @return string |
| 877 | 789 | */ |
| 878 | - public static function get_custom_css( $single_style_settings = null ) { | |
| 879 | - // If the single style settings are passed, return the custom CSS from the single style settings. | |
| 880 | - if ( ! empty( $single_style_settings['single_style_custom_css'] ) && ! empty( $single_style_settings['enable_style_custom_css'] ) ) { | |
| 881 | - return $single_style_settings['single_style_custom_css']; | |
| 882 | - } | |
| 883 | - | |
| 790 | + public static function get_custom_css() { | |
| 884 | 791 | $settings = FrmAppHelper::get_settings(); |
| 885 | - | |
| 886 | 792 | if ( is_string( $settings->custom_css ) ) { |
| 887 | 793 | return $settings->custom_css; |
| 888 | 794 | } |
| 889 | 795 | |
| @@ -900,14 +806,11 @@ | ||
| 900 | 806 | * The Custom CSS page uses codemirror. |
| 901 | 807 | * |
| 902 | 808 | * @since 6.0 Previously this code was embedded in self::custom_css. |
| 903 | 809 | * |
| 904 | - * @param string $id The ID of the codemirror box. | |
| 905 | - * @param string $placeholder The placeholder text for the codemirror box. | |
| 906 | - * | |
| 907 | 810 | * @return array|false |
| 908 | 811 | */ |
| 909 | - private static function enqueue_codemirror( $id = 'frm_codemirror_box', $placeholder = '' ) { | |
| 812 | + private static function enqueue_codemirror() { | |
| 910 | 813 | if ( ! function_exists( 'wp_enqueue_code_editor' ) ) { |
| 911 | 814 | // The WordPress version is likely older than 4.9. |
| 912 | 815 | return false; |
| 913 | 816 | } |
| @@ -920,9 +823,8 @@ | ||
| 920 | 823 | 'tabSize' => 2, |
| 921 | 824 | // As the codemirror box only appears once you click into the Custom CSS tab, we need to auto-refresh. |
| 922 | 825 | // Otherwise the line numbers all end up with a 1px width causing overlap issues with the text in the content. |
| 923 | 826 | 'autoRefresh' => true, |
| 924 | - 'placeholder' => $placeholder, | |
| 925 | 827 | ), |
| 926 | 828 | ) |
| 927 | 829 | ); |
| 928 | 830 | |
| @@ -929,11 +831,9 @@ | ||
| 929 | 831 | if ( $settings ) { |
| 930 | 832 | wp_add_inline_script( |
| 931 | 833 | 'code-editor', |
| 932 | 834 | sprintf( |
| 933 | - 'jQuery( function() { window.%s_wp_editor = wp.codeEditor.initialize( \'%s\', %s ); } );', | |
| 934 | - $id, | |
| 935 | - $id, | |
| 835 | + 'jQuery( function() { wp.codeEditor.initialize( \'frm_codemirror_box\', %s ); } );', | |
| 936 | 836 | wp_json_encode( $settings ) |
| 937 | 837 | ) |
| 938 | 838 | ); |
| 939 | 839 | } |
| @@ -985,9 +885,8 @@ | ||
| 985 | 885 | FrmAppHelper::permission_check( 'frm_change_settings' ); |
| 986 | 886 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 987 | 887 | |
| 988 | 888 | $style_id = FrmAppHelper::get_post_param( 'style_id', '', 'absint' ); |
| 989 | - | |
| 990 | 889 | if ( ! $style_id ) { |
| 991 | 890 | // A style ID is not sent when resetting on the edit page. |
| 992 | 891 | // Instead of resetting the style, send the defaults back so the inputs can be updated with JavaScript. |
| 993 | 892 | $frm_style = new FrmStyle(); |
| @@ -995,26 +894,23 @@ | ||
| 995 | 894 | echo json_encode( $defaults ); |
| 996 | 895 | wp_die(); |
| 997 | 896 | } |
| 998 | 897 | |
| 999 | - $frm_style = new FrmStyle(); | |
| 1000 | - $default_template_style = $frm_style->get_default_template_style( $style_id ); | |
| 1001 | - $where = array( | |
| 898 | + $frm_style = new FrmStyle(); | |
| 899 | + $defaults = $frm_style->get_defaults(); | |
| 900 | + $default_post_content = FrmAppHelper::prepare_and_encode( $defaults ); | |
| 901 | + $where = array( | |
| 1002 | 902 | 'ID' => $style_id, |
| 1003 | 903 | 'post_type' => self::$post_type, |
| 1004 | 904 | ); |
| 1005 | - | |
| 1006 | - $style_object = $frm_style->get_new(); | |
| 1007 | - $style_object->post_content = json_decode( $default_template_style, true ); | |
| 1008 | - | |
| 1009 | 905 | global $wpdb; |
| 1010 | - $wpdb->update( $wpdb->posts, array( 'post_content' => $default_template_style ), $where ); | |
| 906 | + $wpdb->update( $wpdb->posts, array( 'post_content' => $default_post_content ), $where ); | |
| 1011 | 907 | |
| 1012 | 908 | // Save the settings after resetting to default or the old style will still appear. |
| 1013 | 909 | $frm_style->save_settings(); |
| 1014 | 910 | |
| 1015 | 911 | $data = array( |
| 1016 | - 'style' => FrmStylesCardHelper::get_style_param_for_card( $style_object ), | |
| 912 | + 'style' => FrmStylesCardHelper::get_style_param_for_card( $frm_style->get_new() ), | |
| 1017 | 913 | ); |
| 1018 | 914 | wp_send_json_success( $data ); |
| 1019 | 915 | wp_die(); |
| 1020 | 916 | } |
| @@ -1029,10 +925,9 @@ | ||
| 1029 | 925 | public static function change_styling() { |
| 1030 | 926 | FrmAppHelper::permission_check( 'frm_change_settings' ); |
| 1031 | 927 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 1032 | 928 | |
| 1033 | - $is_loaded_via_ajax = true; | |
| 1034 | - $frm_style = new FrmStyle(); | |
| 929 | + $frm_style = new FrmStyle(); | |
| 1035 | 930 | |
| 1036 | 931 | // Intentionally avoid defaults here so nothing gets removed from our style. |
| 1037 | 932 | $defaults = array(); |
| 1038 | 933 | $style = ''; |
| @@ -1078,9 +973,8 @@ | ||
| 1078 | 973 | |
| 1079 | 974 | /** |
| 1080 | 975 | * @param array $atts |
| 1081 | 976 | * @param array $sec |
| 1082 | - * | |
| 1083 | 977 | * @return void |
| 1084 | 978 | */ |
| 1085 | 979 | public static function include_style_section( $atts, $sec ) { |
| 1086 | 980 | extract( $atts ); // phpcs:ignore WordPress.PHP.DontExtract |
| @@ -1143,9 +1037,9 @@ | ||
| 1143 | 1037 | } |
| 1144 | 1038 | |
| 1145 | 1039 | /** |
| 1146 | 1040 | * Add an extra style rule to hide a broken style warning. |
| 1147 | - * To avoid cluttering the front end with any unnecessary styles this is only added when the referer URL matches the styler. | |
| 1041 | + * To avoid cluttering the front end with any unecessary styles this is only added when the referer URL matches the styler. | |
| 1148 | 1042 | * |
| 1149 | 1043 | * @since 6.2.3 |
| 1150 | 1044 | * |
| 1151 | 1045 | * @return void |
| @@ -1151,9 +1045,8 @@ | ||
| 1151 | 1045 | * @return void |
| 1152 | 1046 | */ |
| 1153 | 1047 | public static function maybe_hide_sample_form_error_message() { |
| 1154 | 1048 | $referer = FrmAppHelper::get_server_value( 'HTTP_REFERER' ); |
| 1155 | - | |
| 1156 | 1049 | if ( false !== strpos( $referer, 'admin.php?page=formidable-styles' ) ) { |
| 1157 | 1050 | echo '#frm_broken_styles_warning { display: none; }'; |
| 1158 | 1051 | } |
| 1159 | 1052 | } |
| @@ -1163,9 +1056,8 @@ | ||
| 1163 | 1056 | * |
| 1164 | 1057 | * @since 4.11.03 |
| 1165 | 1058 | * |
| 1166 | 1059 | * @param string $css CSS content. |
| 1167 | - * | |
| 1168 | 1060 | * @return string |
| 1169 | 1061 | */ |
| 1170 | 1062 | public static function replace_relative_url( $css ) { |
| 1171 | 1063 | $plugin_url = trailingslashit( FrmAppHelper::plugin_url() ); |
| @@ -1188,10 +1080,8 @@ | ||
| 1188 | 1080 | * Check if the Formidable styling should be loaded, |
| 1189 | 1081 | * then enqueue it for the footer |
| 1190 | 1082 | * |
| 1191 | 1083 | * @since 2.0 |
| 1192 | - * | |
| 1193 | - * @return void | |
| 1194 | 1084 | */ |
| 1195 | 1085 | public static function enqueue_style() { |
| 1196 | 1086 | global $frm_vars; |
| 1197 | 1087 | |
| @@ -1200,9 +1090,8 @@ | ||
| 1200 | 1090 | return; |
| 1201 | 1091 | } |
| 1202 | 1092 | |
| 1203 | 1093 | $frm_settings = FrmAppHelper::get_settings(); |
| 1204 | - | |
| 1205 | 1094 | if ( $frm_settings->load_style !== 'none' ) { |
| 1206 | 1095 | wp_enqueue_style( 'formidable' ); |
| 1207 | 1096 | $frm_vars['css_loaded'] = true; |
| 1208 | 1097 | } |
| @@ -1223,9 +1112,8 @@ | ||
| 1223 | 1112 | /** |
| 1224 | 1113 | * Get the style post object for a target form. |
| 1225 | 1114 | * |
| 1226 | 1115 | * @param bool|object|string $form |
| 1227 | - * | |
| 1228 | 1116 | * @return WP_Post|null |
| 1229 | 1117 | */ |
| 1230 | 1118 | public static function get_form_style( $form = 'default' ) { |
| 1231 | 1119 | $style = FrmFormsHelper::get_form_style( $form ); |
| @@ -1240,10 +1128,8 @@ | ||
| 1240 | 1128 | |
| 1241 | 1129 | /** |
| 1242 | 1130 | * @param string $class |
| 1243 | 1131 | * @param string $style |
| 1244 | - * | |
| 1245 | - * @return string | |
| 1246 | 1132 | */ |
| 1247 | 1133 | public static function get_form_style_class( $class, $style ) { |
| 1248 | 1134 | if ( 1 == $style ) { |
| 1249 | 1135 | $style = 'default'; |
| @@ -1261,17 +1147,13 @@ | ||
| 1261 | 1147 | } |
| 1262 | 1148 | |
| 1263 | 1149 | /** |
| 1264 | 1150 | * @since 3.0 |
| 1265 | - * | |
| 1266 | 1151 | * @param object $style |
| 1267 | 1152 | * @param string $class |
| 1268 | - * | |
| 1269 | - * @return void | |
| 1270 | 1153 | */ |
| 1271 | 1154 | private static function maybe_add_rtl_class( $style, &$class ) { |
| 1272 | 1155 | $is_rtl = isset( $style->post_content['direction'] ) && 'rtl' === $style->post_content['direction']; |
| 1273 | - | |
| 1274 | 1156 | if ( $is_rtl ) { |
| 1275 | 1157 | $class .= ' frm_rtl'; |
| 1276 | 1158 | } |
| 1277 | 1159 | } |
| @@ -1276,26 +1158,17 @@ | ||
| 1276 | 1158 | } |
| 1277 | 1159 | } |
| 1278 | 1160 | |
| 1279 | 1161 | /** |
| 1280 | - * @param string $val Style setting key. | |
| 1281 | - * @param int|string $form Form ID or 'default'. | |
| 1282 | - * | |
| 1283 | - * @return mixed | |
| 1162 | + * @param string $val | |
| 1284 | 1163 | */ |
| 1285 | 1164 | public static function get_style_val( $val, $form = 'default' ) { |
| 1286 | 1165 | $style = self::get_form_style( $form ); |
| 1287 | - | |
| 1288 | 1166 | if ( $style && isset( $style->post_content[ $val ] ) ) { |
| 1289 | 1167 | return $style->post_content[ $val ]; |
| 1290 | 1168 | } |
| 1291 | 1169 | } |
| 1292 | 1170 | |
| 1293 | - /** | |
| 1294 | - * @param array $default_styles | |
| 1295 | - * | |
| 1296 | - * @return array | |
| 1297 | - */ | |
| 1298 | 1171 | public static function show_entry_styles( $default_styles ) { |
| 1299 | 1172 | $frm_style = new FrmStyle( 'default' ); |
| 1300 | 1173 | $style = $frm_style->get_one(); |
| 1301 | 1174 | |
| @@ -1304,9 +1177,8 @@ | ||
| 1304 | 1177 | } |
| 1305 | 1178 | |
| 1306 | 1179 | foreach ( $default_styles as $name => $val ) { |
| 1307 | 1180 | $setting = $name; |
| 1308 | - | |
| 1309 | 1181 | if ( 'border_width' == $name ) { |
| 1310 | 1182 | $setting = 'field_border_width'; |
| 1311 | 1183 | } elseif ( 'alt_bg_color' == $name ) { |
| 1312 | 1184 | $setting = 'bg_color_active'; |
| @@ -1317,14 +1189,8 @@ | ||
| 1317 | 1189 | |
| 1318 | 1190 | return $default_styles; |
| 1319 | 1191 | } |
| 1320 | 1192 | |
| 1321 | - /** | |
| 1322 | - * @param string $important | |
| 1323 | - * @param array $field | |
| 1324 | - * | |
| 1325 | - * @return string | |
| 1326 | - */ | |
| 1327 | 1193 | public static function &important_style( $important, $field ) { |
| 1328 | 1194 | $important = self::get_style_val( 'important_style', $field['form_id'] ); |
| 1329 | 1195 | |
| 1330 | 1196 | return $important; |
| @@ -1334,12 +1200,8 @@ | ||
| 1334 | 1200 | * Duplicate of WordPress do_accordion_section function, it adds an additional svg icon support. |
| 1335 | 1201 | * |
| 1336 | 1202 | * @since 6.8.3 |
| 1337 | 1203 | * |
| 1338 | - * @param string|WP_Screen $screen Screen ID or screen object. | |
| 1339 | - * @param string $context Meta box context. | |
| 1340 | - * @param mixed $data_object Data object passed to callbacks. | |
| 1341 | - * | |
| 1342 | 1204 | * @return int |
| 1343 | 1205 | */ |
| 1344 | 1206 | public static function do_accordion_sections( $screen, $context, $data_object ) { |
| 1345 | 1207 | global $wp_meta_boxes; |
| @@ -1378,27 +1240,22 @@ | ||
| 1378 | 1240 | ++$i; |
| 1379 | 1241 | $icon_id = array_key_exists( $box['id'], $icon_ids ) ? $icon_ids[ $box['id'] ] : 'frm-' . $box['id']; |
| 1380 | 1242 | |
| 1381 | 1243 | $open_class = ''; |
| 1382 | - | |
| 1383 | 1244 | if ( ! $first_open ) { |
| 1384 | 1245 | $first_open = true; |
| 1385 | 1246 | $open_class = 'open'; |
| 1386 | 1247 | } |
| 1387 | - | |
| 1388 | - $accordion_content_id = 'frm_style_section_' . $box['id']; | |
| 1389 | 1248 | ?> |
| 1390 | 1249 | <li class="control-section accordion-section <?php echo esc_attr( $open_class ); ?> <?php echo esc_attr( $box['id'] ); ?>" id="<?php echo esc_attr( $box['id'] ); ?>"> |
| 1391 | - <h3 class="accordion-section-title hndle"> | |
| 1250 | + <h3 class="accordion-section-title hndle" tabindex="0"> | |
| 1392 | 1251 | <?php |
| 1393 | - FrmAppHelper::icon_by_class( 'frmfont ' . $icon_id . ' frm_svg24' ); | |
| 1252 | + FrmAppHelper::icon_by_class( 'frmfont ' . $icon_id ); | |
| 1394 | 1253 | echo esc_html( $box['title'] ); |
| 1254 | + FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon' ); | |
| 1395 | 1255 | ?> |
| 1396 | - <button type="button" aria-expanded="<?php echo esc_attr( 'open' === $open_class ? 'true' : 'false' ); ?>" aria-controls="<?php echo esc_attr( $accordion_content_id ); ?>" aria-label="<?php echo esc_attr( $box['title'] ); ?>"> | |
| 1397 | - <?php FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon' ); ?> | |
| 1398 | - </button> | |
| 1399 | 1256 | </h3> |
| 1400 | - <div class="accordion-section-content <?php postbox_classes( $box['id'], $page ); ?>" id="<?php echo esc_attr( $accordion_content_id ); ?>"> | |
| 1257 | + <div class="accordion-section-content <?php postbox_classes( $box['id'], $page ); ?>"> | |
| 1401 | 1258 | <div class="inside"> |
| 1402 | 1259 | <?php call_user_func( $box['callback'], $data_object, $box ); ?> |
| 1403 | 1260 | </div><!-- .inside --> |
| 1404 | 1261 | </div><!-- .accordion-section-content --> |
| @@ -1423,9 +1280,8 @@ | ||
| 1423 | 1280 | * @return void |
| 1424 | 1281 | */ |
| 1425 | 1282 | public static function rename_style() { |
| 1426 | 1283 | $permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'nonce', 'frm_ajax' ); |
| 1427 | - | |
| 1428 | 1284 | if ( $permission_error !== false ) { |
| 1429 | 1285 | $data = array( |
| 1430 | 1286 | 'message' => __( 'Unable to rename style', 'formidable' ), |
| 1431 | 1287 | ); |
| @@ -1444,9 +1300,8 @@ | ||
| 1444 | 1300 | die(); |
| 1445 | 1301 | } |
| 1446 | 1302 | |
| 1447 | 1303 | $post = get_post( $style_id ); |
| 1448 | - | |
| 1449 | 1304 | if ( ! $post || $post->post_type !== self::$post_type ) { |
| 1450 | 1305 | $data = array( |
| 1451 | 1306 | 'message' => __( 'The style you are renaming either does not exist or it is not a style', 'formidable' ), |
| 1452 | 1307 | ); |
| @@ -1467,9 +1322,8 @@ | ||
| 1467 | 1322 | * |
| 1468 | 1323 | * @since 6.0 |
| 1469 | 1324 | * |
| 1470 | 1325 | * @param WP_Styles $styles |
| 1471 | - * | |
| 1472 | 1326 | * @return void |
| 1473 | 1327 | */ |
| 1474 | 1328 | public static function disable_conflicting_wp_admin_css( $styles ) { |
| 1475 | 1329 | if ( ! FrmAppHelper::is_style_editor_page() ) { |
