| @@ -9,9 +9,8 @@ | ||
| 9 | 9 | * @return void |
| 10 | 10 | */ |
| 11 | 11 | public static function menu() { |
| 12 | 12 | FrmAppHelper::maybe_add_permissions(); |
| 13 | - | |
| 14 | 13 | if ( ! current_user_can( 'frm_view_forms' ) ) { |
| 15 | 14 | return; |
| 16 | 15 | } |
| 17 | 16 | |
| @@ -32,10 +31,8 @@ | ||
| 32 | 31 | } |
| 33 | 32 | |
| 34 | 33 | /** |
| 35 | 34 | * @since 3.05 |
| 36 | - * | |
| 37 | - * @return string | |
| 38 | 35 | */ |
| 39 | 36 | private static function menu_icon() { |
| 40 | 37 | $icon = FrmAppHelper::svg_logo( |
| 41 | 38 | array( |
| @@ -49,12 +46,8 @@ | ||
| 49 | 46 | } |
| 50 | 47 | |
| 51 | 48 | /** |
| 52 | 49 | * @since 3.0 |
| 53 | - * | |
| 54 | - * @param string $classes | |
| 55 | - * | |
| 56 | - * @return string | |
| 57 | 50 | */ |
| 58 | 51 | public static function add_admin_class( $classes ) { |
| 59 | 52 | if ( self::is_white_page() ) { |
| 60 | 53 | $classes .= ' frm-white-body '; |
| @@ -60,20 +53,17 @@ | ||
| 60 | 53 | $classes .= ' frm-white-body '; |
| 61 | 54 | $classes .= self::get_os(); |
| 62 | 55 | |
| 63 | 56 | $page = str_replace( 'formidable-', '', FrmAppHelper::simple_get( 'page', 'sanitize_title' ) ); |
| 64 | - | |
| 65 | - if ( ! $page || $page === 'formidable' ) { | |
| 57 | + if ( empty( $page ) || $page === 'formidable' ) { | |
| 66 | 58 | $action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ); |
| 67 | - | |
| 68 | - if ( in_array( $action, array( 'settings', 'edit', 'list' ), true ) ) { | |
| 59 | + if ( in_array( $action, array( 'settings', 'edit', 'list' ) ) ) { | |
| 69 | 60 | $page .= $action; |
| 70 | 61 | } else { |
| 71 | 62 | $page = $action; |
| 72 | 63 | } |
| 73 | 64 | } |
| 74 | - | |
| 75 | - if ( $page ) { | |
| 65 | + if ( ! empty( $page ) ) { | |
| 76 | 66 | $classes .= ' frm-admin-page-' . $page; |
| 77 | 67 | } |
| 78 | 68 | } |
| 79 | 69 | |
| @@ -83,9 +73,8 @@ | ||
| 83 | 73 | |
| 84 | 74 | if ( FrmAppHelper::is_full_screen() ) { |
| 85 | 75 | $full_screen_on = self::get_full_screen_setting(); |
| 86 | 76 | $add_class = ''; |
| 87 | - | |
| 88 | 77 | if ( $full_screen_on ) { |
| 89 | 78 | $add_class = ' frm-full-screen is-fullscreen-mode'; |
| 90 | 79 | |
| 91 | 80 | // Load the CSS for .is-fullscreen-mode. |
| @@ -90,9 +79,8 @@ | ||
| 90 | 79 | |
| 91 | 80 | // Load the CSS for .is-fullscreen-mode. |
| 92 | 81 | wp_enqueue_style( 'wp-edit-post' ); |
| 93 | 82 | } |
| 94 | - | |
| 95 | 83 | $classes .= apply_filters( 'frm_admin_full_screen_class', $add_class ); |
| 96 | 84 | } |
| 97 | 85 | |
| 98 | 86 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| @@ -115,10 +103,10 @@ | ||
| 115 | 103 | */ |
| 116 | 104 | private static function get_full_screen_setting() { |
| 117 | 105 | global $wpdb; |
| 118 | 106 | $meta_key = $wpdb->get_blog_prefix() . 'persisted_preferences'; |
| 119 | - $prefs = get_user_meta( get_current_user_id(), $meta_key, true ); | |
| 120 | 107 | |
| 108 | + $prefs = get_user_meta( get_current_user_id(), $meta_key, true ); | |
| 121 | 109 | if ( $prefs && isset( $prefs['core/edit-post']['fullscreenMode'] ) ) { |
| 122 | 110 | return $prefs['core/edit-post']['fullscreenMode']; |
| 123 | 111 | } |
| 124 | 112 | |
| @@ -132,24 +120,20 @@ | ||
| 132 | 120 | */ |
| 133 | 121 | private static function get_os() { |
| 134 | 122 | $agent = strtolower( FrmAppHelper::get_server_value( 'HTTP_USER_AGENT' ) ); |
| 135 | 123 | $os = ''; |
| 136 | - | |
| 137 | - if ( str_contains( $agent, 'mac' ) ) { | |
| 124 | + if ( strpos( $agent, 'mac' ) !== false ) { | |
| 138 | 125 | $os = ' osx'; |
| 139 | - } elseif ( str_contains( $agent, 'linux' ) ) { | |
| 126 | + } elseif ( strpos( $agent, 'linux' ) !== false ) { | |
| 140 | 127 | $os = ' linux'; |
| 141 | - } elseif ( str_contains( $agent, 'windows' ) ) { | |
| 128 | + } elseif ( strpos( $agent, 'windows' ) !== false ) { | |
| 142 | 129 | $os = ' windows'; |
| 143 | 130 | } |
| 144 | - | |
| 145 | 131 | return $os; |
| 146 | 132 | } |
| 147 | 133 | |
| 148 | 134 | /** |
| 149 | 135 | * @since 3.0 |
| 150 | - * | |
| 151 | - * @return bool | |
| 152 | 136 | */ |
| 153 | 137 | private static function is_white_page() { |
| 154 | 138 | $white_pages = array( |
| 155 | 139 | 'formidable', |
| @@ -165,10 +149,17 @@ | ||
| 165 | 149 | FrmFormTemplatesController::PAGE_SLUG, |
| 166 | 150 | FrmOnboardingWizardController::PAGE_SLUG, |
| 167 | 151 | ); |
| 168 | 152 | |
| 169 | - if ( self::is_white_payments_page() ) { | |
| 170 | - $white_pages[] = 'formidable-payments'; | |
| 153 | + if ( ! class_exists( 'FrmTransHooksController', false ) && ! FrmTransLiteAppHelper::should_fallback_to_paypal() ) { | |
| 154 | + // Only consider the payments page as a "white page" when the Payments submodule is off. | |
| 155 | + // Otherwise this causes a lot of styling issues when the Stripe add-on (or Authorize.Net) is active. | |
| 156 | + | |
| 157 | + // Add an extra check to avoid white page styling on the PayPal "edit" action. | |
| 158 | + // We fallback to the PayPal add on for the "edit" action since Stripe Lite does not have an edit view. | |
| 159 | + if ( ! in_array( FrmAppHelper::simple_get( 'action' ), array( 'edit', 'new' ), true ) || ! is_callable( 'FrmPaymentsController::route' ) ) { | |
| 160 | + $white_pages[] = 'formidable-payments'; | |
| 161 | + } | |
| 171 | 162 | } |
| 172 | 163 | |
| 173 | 164 | $is_white_page = self::is_page_in_list( $white_pages ) || self::is_grey_page() || FrmAppHelper::is_view_builder_page(); |
| 174 | 165 | |
| @@ -178,25 +169,11 @@ | ||
| 178 | 169 | * @since 5.3 |
| 179 | 170 | * |
| 180 | 171 | * @param bool $is_white_page |
| 181 | 172 | */ |
| 182 | - return apply_filters( 'frm_is_white_page', $is_white_page ); | |
| 183 | - } | |
| 173 | + $is_white_page = apply_filters( 'frm_is_white_page', $is_white_page ); | |
| 184 | 174 | |
| 185 | - /** | |
| 186 | - * Check if the payments page should be styled as a white page. | |
| 187 | - * Fallback to the Stripe, Authorize.Net, or PayPal add on for the "edit" action since | |
| 188 | - * Stripe Lite does not have an edit view. Also fallback for bulk deleting, since that | |
| 189 | - * isn't built into Lite. The pages we fall back to should not be styled as white pages. | |
| 190 | - * | |
| 191 | - * @since 6.27 | |
| 192 | - * | |
| 193 | - * @return bool | |
| 194 | - */ | |
| 195 | - private static function is_white_payments_page() { | |
| 196 | - $action = FrmAppHelper::simple_get( 'action', 'sanitize_title' ); | |
| 197 | - $on_edit_page = in_array( $action, array( 'edit', 'new' ), true ); | |
| 198 | - return ! $on_edit_page && 'bulk_delete' !== $action; | |
| 175 | + return $is_white_page; | |
| 199 | 176 | } |
| 200 | 177 | |
| 201 | 178 | /** |
| 202 | 179 | * Add a grey bg instead of white. |
| @@ -219,9 +196,8 @@ | ||
| 219 | 196 | * |
| 220 | 197 | * @since 6.8 |
| 221 | 198 | * |
| 222 | 199 | * @param bool $is_grey_page |
| 223 | - * | |
| 224 | 200 | * @return bool |
| 225 | 201 | */ |
| 226 | 202 | return apply_filters( 'frm_is_grey_page', $is_grey_page ); |
| 227 | 203 | } |
| @@ -229,9 +205,8 @@ | ||
| 229 | 205 | /** |
| 230 | 206 | * @since 6.8 |
| 231 | 207 | * |
| 232 | 208 | * @param array $pages A list of page names to check. |
| 233 | - * | |
| 234 | 209 | * @return bool |
| 235 | 210 | */ |
| 236 | 211 | private static function is_page_in_list( $pages ) { |
| 237 | 212 | $get_page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); |
| @@ -255,15 +230,13 @@ | ||
| 255 | 230 | * @return void |
| 256 | 231 | */ |
| 257 | 232 | public static function get_form_nav( $form, $show_nav = false, $title = 'show' ) { |
| 258 | 233 | $show_nav = FrmAppHelper::get_param( 'show_nav', $show_nav, 'get', 'absint' ); |
| 259 | - | |
| 260 | - if ( ! $show_nav || ! $form ) { | |
| 234 | + if ( empty( $show_nav ) || ! $form ) { | |
| 261 | 235 | return; |
| 262 | 236 | } |
| 263 | 237 | |
| 264 | 238 | FrmForm::maybe_get_form( $form ); |
| 265 | - | |
| 266 | 239 | if ( ! is_object( $form ) ) { |
| 267 | 240 | return; |
| 268 | 241 | } |
| 269 | 242 | |
| @@ -277,21 +250,21 @@ | ||
| 277 | 250 | /** |
| 278 | 251 | * @return string |
| 279 | 252 | */ |
| 280 | 253 | private static function get_current_page() { |
| 281 | - $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); | |
| 282 | - $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title', 'None' ); | |
| 254 | + $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); | |
| 255 | + $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title', 'None' ); | |
| 256 | + $current_page = isset( $_GET['page'] ) ? $page : $post_type; | |
| 283 | 257 | |
| 284 | 258 | if ( FrmAppHelper::is_view_builder_page() ) { |
| 285 | - return 'frm_display'; | |
| 259 | + $current_page = 'frm_display'; | |
| 286 | 260 | } |
| 287 | 261 | |
| 288 | - return isset( $_GET['page'] ) ? $page : $post_type; | |
| 262 | + return $current_page; | |
| 289 | 263 | } |
| 290 | 264 | |
| 291 | 265 | /** |
| 292 | 266 | * @param object $form |
| 293 | - * | |
| 294 | 267 | * @return array |
| 295 | 268 | */ |
| 296 | 269 | private static function get_form_nav_items( $form ) { |
| 297 | 270 | $id = $form->parent_form_id ? $form->parent_form_id : $form->id; |
| @@ -367,9 +340,8 @@ | ||
| 367 | 340 | /** |
| 368 | 341 | * Adds a settings link to the plugins page |
| 369 | 342 | * |
| 370 | 343 | * @param array $links |
| 371 | - * | |
| 372 | 344 | * @return array |
| 373 | 345 | */ |
| 374 | 346 | public static function settings_link( $links ) { |
| 375 | 347 | $settings = array(); |
| @@ -378,9 +350,8 @@ | ||
| 378 | 350 | if ( FrmAddonsController::is_license_expired() ) { |
| 379 | 351 | $label = __( 'Renew', 'formidable' ); |
| 380 | 352 | } else { |
| 381 | 353 | $label = FrmSalesApi::get_best_sale_value( 'plugin_page_cta_text' ); |
| 382 | - | |
| 383 | 354 | if ( ! $label ) { |
| 384 | 355 | $label = __( 'Upgrade to Pro', 'formidable' ); |
| 385 | 356 | } |
| 386 | 357 | } |
| @@ -385,9 +356,8 @@ | ||
| 385 | 356 | } |
| 386 | 357 | } |
| 387 | 358 | |
| 388 | 359 | $upgrade_link = FrmSalesApi::get_best_sale_value( 'plugin_page_cta_link' ); |
| 389 | - | |
| 390 | 360 | if ( $upgrade_link ) { |
| 391 | 361 | $upgrade_link = FrmAppHelper::maybe_add_missing_utm( $upgrade_link, array( 'medium' => 'plugin-row' ) ); |
| 392 | 362 | } else { |
| 393 | 363 | $upgrade_link = FrmAppHelper::admin_upgrade_link( 'plugin-row' ); |
| @@ -393,9 +363,9 @@ | ||
| 393 | 363 | $upgrade_link = FrmAppHelper::admin_upgrade_link( 'plugin-row' ); |
| 394 | 364 | } |
| 395 | 365 | |
| 396 | 366 | $settings[] = '<a href="' . esc_url( $upgrade_link ) . '" target="_blank" rel="noopener"><b style="color:#1da867;font-weight:700;">' . esc_html( $label ) . '</b></a>'; |
| 397 | - }//end if | |
| 367 | + } | |
| 398 | 368 | |
| 399 | 369 | $settings[] = '<a href="' . esc_url( admin_url( 'admin.php?page=formidable' ) ) . '">' . __( 'Build a Form', 'formidable' ) . '</a>'; |
| 400 | 370 | |
| 401 | 371 | return array_merge( $settings, $links ); |
| @@ -405,9 +375,9 @@ | ||
| 405 | 375 | * @return void |
| 406 | 376 | */ |
| 407 | 377 | public static function pro_get_started_headline() { |
| 408 | 378 | self::review_request(); |
| 409 | - FrmAppHelper::min_pro_version_notice( '6.20' ); | |
| 379 | + FrmAppHelper::min_pro_version_notice( '6.0' ); | |
| 410 | 380 | } |
| 411 | 381 | |
| 412 | 382 | /** |
| 413 | 383 | * Add admin notices as needed for reviews |
| @@ -482,9 +452,8 @@ | ||
| 482 | 452 | * |
| 483 | 453 | * @param string $form_key |
| 484 | 454 | * @param string $title |
| 485 | 455 | * @param string $description |
| 486 | - * | |
| 487 | 456 | * @return void |
| 488 | 457 | */ |
| 489 | 458 | public static function api_email_form( $form_key, $title = '', $description = '' ) { |
| 490 | 459 | $user = wp_get_current_user(); |
| @@ -541,9 +510,8 @@ | ||
| 541 | 510 | /** |
| 542 | 511 | * Check if the database is outdated |
| 543 | 512 | * |
| 544 | 513 | * @since 2.0.1 |
| 545 | - * | |
| 546 | 514 | * @return bool |
| 547 | 515 | */ |
| 548 | 516 | public static function needs_update() { |
| 549 | 517 | $needs_upgrade = self::compare_for_update( |
| @@ -566,23 +534,23 @@ | ||
| 566 | 534 | * |
| 567 | 535 | * @since 3.0.04 |
| 568 | 536 | * |
| 569 | 537 | * @param array $atts |
| 570 | - * | |
| 571 | 538 | * @return bool |
| 572 | 539 | */ |
| 573 | 540 | public static function compare_for_update( $atts ) { |
| 574 | 541 | $db_version = get_option( $atts['option'] ); |
| 575 | 542 | |
| 576 | - if ( ! str_contains( $db_version, '-' ) ) { | |
| 577 | - return true; | |
| 543 | + if ( strpos( $db_version, '-' ) === false ) { | |
| 544 | + $needs_upgrade = true; | |
| 545 | + } else { | |
| 546 | + $last_upgrade = explode( '-', $db_version ); | |
| 547 | + $needs_db_upgrade = (int) $last_upgrade[1] < (int) $atts['new_db_version']; | |
| 548 | + $new_version = version_compare( $last_upgrade[0], $atts['new_plugin_version'], '<' ); | |
| 549 | + $needs_upgrade = $needs_db_upgrade || $new_version; | |
| 578 | 550 | } |
| 579 | 551 | |
| 580 | - $last_upgrade = explode( '-', $db_version ); | |
| 581 | - $needs_db_upgrade = (int) $last_upgrade[1] < (int) $atts['new_db_version']; | |
| 582 | - $new_version = version_compare( $last_upgrade[0], $atts['new_plugin_version'], '<' ); | |
| 583 | - | |
| 584 | - return $needs_db_upgrade || $new_version; | |
| 552 | + return $needs_upgrade; | |
| 585 | 553 | } |
| 586 | 554 | |
| 587 | 555 | /** |
| 588 | 556 | * Check for database update and trigger js loading |
| @@ -611,13 +579,17 @@ | ||
| 611 | 579 | |
| 612 | 580 | if ( 'formidable-pro-upgrade' === FrmAppHelper::get_param( 'page' ) && ! FrmAppHelper::pro_is_installed() && current_user_can( 'frm_view_forms' ) ) { |
| 613 | 581 | $redirect = FrmSalesApi::get_best_sale_value( 'menu_cta_link' ); |
| 614 | 582 | $utm = array( |
| 615 | - 'campaign' => 'upgrade', | |
| 616 | - 'content' => 'submenu-upgrade', | |
| 583 | + 'medium' => 'upgrade', | |
| 584 | + 'content' => 'submenu-upgrade', | |
| 617 | 585 | ); |
| 618 | 586 | |
| 619 | - $redirect = $redirect ? FrmAppHelper::maybe_add_missing_utm( $redirect, $utm ) : FrmAppHelper::admin_upgrade_link( $utm ); | |
| 587 | + if ( $redirect ) { | |
| 588 | + $redirect = FrmAppHelper::maybe_add_missing_utm( $redirect, $utm ); | |
| 589 | + } else { | |
| 590 | + $redirect = FrmAppHelper::admin_upgrade_link( $utm ); | |
| 591 | + } | |
| 620 | 592 | |
| 621 | 593 | wp_redirect( $redirect ); |
| 622 | 594 | die(); |
| 623 | 595 | } |
| @@ -640,9 +612,8 @@ | ||
| 640 | 612 | // Redirect to the "Form Templates" page if the 'frm_action' parameter matches specific actions. |
| 641 | 613 | // This provides backward compatibility for old addons that use legacy modal templates. |
| 642 | 614 | $action = FrmAppHelper::get_param( 'frm_action' ); |
| 643 | 615 | $trigger_name_modal = FrmAppHelper::get_param( 'triggerNewFormModal' ); |
| 644 | - | |
| 645 | 616 | if ( $trigger_name_modal || in_array( $action, array( 'add_new', 'list_templates' ), true ) ) { |
| 646 | 617 | $application_id = FrmAppHelper::simple_get( 'applicationId', 'absint' ); |
| 647 | 618 | $url_param = $application_id ? '&applicationId=' . $application_id : ''; |
| 648 | 619 | |
| @@ -663,10 +634,9 @@ | ||
| 663 | 634 | * @return void |
| 664 | 635 | */ |
| 665 | 636 | private static function trigger_page_load_hooks() { |
| 666 | 637 | $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); |
| 667 | - | |
| 668 | - if ( ! str_starts_with( $page, 'formidable-' ) ) { | |
| 638 | + if ( strpos( $page, 'formidable-' ) !== 0 ) { | |
| 669 | 639 | // Only trigger hooks on Formidable pages. |
| 670 | 640 | return; |
| 671 | 641 | } |
| 672 | 642 | |
| @@ -672,9 +642,8 @@ | ||
| 672 | 642 | |
| 673 | 643 | $page = str_replace( array( 'formidable-', '-' ), array( '', ' ' ), $page ); |
| 674 | 644 | $page = str_replace( ' ', '', ucwords( $page ) ); |
| 675 | 645 | $class = 'Frm' . $page . 'Controller'; |
| 676 | - | |
| 677 | 646 | if ( class_exists( $class ) && method_exists( $class, 'load_page' ) ) { |
| 678 | 647 | call_user_func( array( $class, 'load_page' ) ); |
| 679 | 648 | } |
| 680 | 649 | } |
| @@ -704,10 +673,10 @@ | ||
| 704 | 673 | wp_register_style( 'formidable-grids', $plugin_url . '/css/frm_grids.css', array(), $version ); |
| 705 | 674 | |
| 706 | 675 | wp_register_script( 'formidable_dom', $plugin_url . '/js/admin/dom.js', array( 'jquery', 'jquery-ui-dialog', 'wp-i18n' ), $version, true ); |
| 707 | 676 | wp_register_script( 'formidable_embed', $plugin_url . '/js/admin/embed.js', array( 'formidable_dom', 'jquery-ui-autocomplete' ), $version, true ); |
| 708 | - self::register_popper2(); | |
| 709 | - wp_register_script( 'bootstrap_tooltip', $plugin_url . '/js/bootstrap.min.js', array( 'jquery', 'popper' ), '5.0.2', true ); | |
| 677 | + self::register_popper1(); | |
| 678 | + wp_register_script( 'bootstrap_tooltip', $plugin_url . '/js/bootstrap.min.js', array( 'jquery', 'popper' ), '4.6.1', true ); | |
| 710 | 679 | |
| 711 | 680 | $settings_js_vars = array( |
| 712 | 681 | 'currencies' => FrmCurrencyHelper::get_currencies(), |
| 713 | 682 | ); |
| @@ -713,22 +682,40 @@ | ||
| 713 | 682 | ); |
| 714 | 683 | wp_register_script( 'formidable_settings', $plugin_url . '/js/admin/settings.js', array(), $version, true ); |
| 715 | 684 | wp_localize_script( 'formidable_settings', 'frmSettings', $settings_js_vars ); |
| 716 | 685 | |
| 717 | - wp_register_script( 'formidable-web-components', $plugin_url . '/js/formidable-web-components.js', array( 'formidable_admin' ), $version, true ); | |
| 718 | - | |
| 719 | 686 | if ( self::should_show_floating_links() ) { |
| 720 | 687 | self::enqueue_floating_links( $plugin_url, $version ); |
| 721 | 688 | } |
| 722 | 689 | |
| 723 | - wp_register_script( 'formidable_admin', $plugin_url . '/js/formidable_admin.js', self::get_admin_js_dependencies(), $version, true ); | |
| 690 | + $dependencies = array( | |
| 691 | + 'formidable_admin_global', | |
| 692 | + 'jquery', | |
| 693 | + 'jquery-ui-core', | |
| 694 | + 'jquery-ui-draggable', | |
| 695 | + 'jquery-ui-sortable', | |
| 696 | + 'bootstrap_tooltip', | |
| 697 | + 'bootstrap-multiselect', | |
| 698 | + 'wp-i18n', | |
| 699 | + // Required in WP versions older than 5.7 | |
| 700 | + 'wp-hooks', | |
| 701 | + 'formidable_dom', | |
| 702 | + 'formidable_embed', | |
| 703 | + ); | |
| 724 | 704 | |
| 705 | + if ( FrmAppHelper::is_style_editor_page( 'edit' ) ) { | |
| 706 | + // We only need to load the color picker when editing styles. | |
| 707 | + $dependencies[] = 'wp-color-picker'; | |
| 708 | + } | |
| 709 | + | |
| 710 | + wp_register_script( 'formidable_admin', $plugin_url . '/js/formidable_admin.js', $dependencies, $version, true ); | |
| 711 | + | |
| 725 | 712 | if ( FrmAppHelper::on_form_listing_page() ) { |
| 726 | 713 | // For the existing page dropdown in the Form embed modal. |
| 727 | 714 | wp_enqueue_script( 'jquery-ui-autocomplete' ); |
| 728 | 715 | } |
| 729 | 716 | |
| 730 | - wp_register_script( 'bootstrap-multiselect', $plugin_url . '/js/bootstrap-multiselect.js', array( 'jquery', 'bootstrap_tooltip', 'popper' ), '2.0', true ); | |
| 717 | + wp_register_script( 'bootstrap-multiselect', $plugin_url . '/js/bootstrap-multiselect.js', array( 'jquery', 'bootstrap_tooltip', 'popper' ), '1.1.1', true ); | |
| 731 | 718 | |
| 732 | 719 | if ( ! class_exists( 'FrmTransHooksController', false ) ) { |
| 733 | 720 | /** |
| 734 | 721 | * Gateway fields are included for add-on compatibility but we do not want it to be visible. |
| @@ -743,15 +730,12 @@ | ||
| 743 | 730 | $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); |
| 744 | 731 | $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title' ); |
| 745 | 732 | |
| 746 | 733 | global $pagenow; |
| 747 | - | |
| 748 | - if ( str_starts_with( $page, 'formidable' ) || ( $pagenow === 'edit.php' && $post_type === 'frm_display' ) ) { | |
| 749 | - self::enqueue_global_settings_scripts( $page ); | |
| 750 | - | |
| 734 | + if ( strpos( $page, 'formidable' ) === 0 || ( $pagenow === 'edit.php' && $post_type === 'frm_display' ) ) { | |
| 751 | 735 | wp_enqueue_script( 'admin-widgets' ); |
| 752 | 736 | wp_enqueue_style( 'widgets' ); |
| 753 | - self::maybe_deregister_popper1(); | |
| 737 | + self::maybe_deregister_popper2(); | |
| 754 | 738 | wp_enqueue_script( 'formidable_admin' ); |
| 755 | 739 | wp_set_script_translations( 'formidable_admin', 'formidable' ); |
| 756 | 740 | wp_enqueue_script( 'formidable_embed' ); |
| 757 | 741 | wp_set_script_translations( 'formidable_embed', 'formidable' ); |
| @@ -758,9 +742,8 @@ | ||
| 758 | 742 | FrmAppHelper::localize_script( 'admin' ); |
| 759 | 743 | |
| 760 | 744 | wp_enqueue_style( 'formidable-animations' ); |
| 761 | 745 | wp_enqueue_style( 'formidable-admin' ); |
| 762 | - | |
| 763 | 746 | if ( 'formidable-styles' !== $page && 'formidable-styles2' !== $page ) { |
| 764 | 747 | wp_enqueue_style( 'formidable-grids' ); |
| 765 | 748 | self::maybe_enqueue_dropzone_css( $page ); |
| 766 | 749 | } else { |
| @@ -783,13 +766,11 @@ | ||
| 783 | 766 | if ( isset( $_REQUEST['post_type'] ) ) { |
| 784 | 767 | $post_type = sanitize_title( wp_unslash( $_REQUEST['post_type'] ) ); |
| 785 | 768 | } elseif ( isset( $_REQUEST['post'] ) && absint( $_REQUEST['post'] ) ) { |
| 786 | 769 | $post = get_post( absint( wp_unslash( $_REQUEST['post'] ) ) ); |
| 787 | - | |
| 788 | 770 | if ( ! $post ) { |
| 789 | 771 | return; |
| 790 | 772 | } |
| 791 | - | |
| 792 | 773 | $post_type = $post->post_type; |
| 793 | 774 | } else { |
| 794 | 775 | return; |
| 795 | 776 | } |
| @@ -802,84 +783,16 @@ | ||
| 802 | 783 | if ( 'formidable-addons' === $page ) { |
| 803 | 784 | wp_register_script( 'formidable_addons', $plugin_url . '/js/admin/addons.js', array( 'formidable_admin', 'wp-dom-ready' ), $version, true ); |
| 804 | 785 | wp_enqueue_script( 'formidable_addons' ); |
| 805 | 786 | } |
| 806 | - | |
| 807 | - self::enqueue_builder_assets( $plugin_url, $version ); | |
| 808 | 787 | } |
| 809 | 788 | |
| 810 | 789 | /** |
| 811 | - * @since 6.27 | |
| 812 | - * | |
| 813 | - * @return array | |
| 814 | - */ | |
| 815 | - private static function get_admin_js_dependencies() { | |
| 816 | - $dependencies = array( | |
| 817 | - 'formidable_admin_global', | |
| 818 | - 'jquery', | |
| 819 | - 'jquery-ui-core', | |
| 820 | - 'jquery-ui-draggable', | |
| 821 | - 'jquery-ui-sortable', | |
| 822 | - 'bootstrap_tooltip', | |
| 823 | - 'bootstrap-multiselect', | |
| 824 | - 'wp-i18n', | |
| 825 | - // Required in WP versions older than 5.7 | |
| 826 | - 'wp-hooks', | |
| 827 | - 'formidable_dom', | |
| 828 | - 'formidable_embed', | |
| 829 | - ); | |
| 830 | - | |
| 831 | - if ( FrmAppHelper::is_style_editor_page( 'edit' ) ) { | |
| 832 | - // We only need to load the color picker when editing styles. | |
| 833 | - $dependencies[] = 'wp-color-picker'; | |
| 834 | - } | |
| 835 | - | |
| 836 | - return $dependencies; | |
| 837 | - } | |
| 838 | - | |
| 839 | - /** | |
| 840 | - * Enqueue the Form Builder assets. | |
| 841 | - * | |
| 842 | - * @since 6.24 | |
| 843 | - * | |
| 844 | - * @param string $plugin_url The plugin URL. | |
| 845 | - * @param string $version The plugin version. | |
| 846 | - * | |
| 847 | - * @return void | |
| 848 | - */ | |
| 849 | - private static function enqueue_builder_assets( $plugin_url, $version ) { | |
| 850 | - wp_register_style( 'formidable-settings-components', $plugin_url . '/css/admin/frm-settings-components.css', array( 'formidable-admin', 'formidable-grids' ), $version ); | |
| 851 | - wp_register_script( 'formidable-settings-components', $plugin_url . '/js/formidable-settings-components.js', array( 'formidable_admin' ), $version, true ); | |
| 852 | - | |
| 853 | - if ( ! FrmAppHelper::is_form_builder_page() ) { | |
| 854 | - return; | |
| 855 | - } | |
| 856 | - | |
| 857 | - wp_enqueue_style( 'formidable-settings-components' ); | |
| 858 | - wp_enqueue_script( 'formidable-settings-components' ); | |
| 859 | - } | |
| 860 | - | |
| 861 | - /** | |
| 862 | - * Enqueues global settings scripts. | |
| 863 | - * | |
| 864 | - * @param string $page The `page` param in URL. | |
| 865 | - * | |
| 866 | - * @return void | |
| 867 | - */ | |
| 868 | - private static function enqueue_global_settings_scripts( $page ) { | |
| 869 | - if ( 'formidable-settings' === $page ) { | |
| 870 | - wp_enqueue_style( 'wp-color-picker' ); | |
| 871 | - wp_enqueue_script( 'formidable_settings' ); | |
| 872 | - } | |
| 873 | - } | |
| 874 | - | |
| 875 | - /** | |
| 876 | 790 | * Avoid loading dropzone CSS on the form list page. It isn't required there. |
| 877 | 791 | * |
| 878 | 792 | * @since 6.11 |
| 879 | 793 | * |
| 880 | 794 | * @param string $page |
| 881 | - * | |
| 882 | 795 | * @return void |
| 883 | 796 | */ |
| 884 | 797 | private static function maybe_enqueue_dropzone_css( $page ) { |
| 885 | 798 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| @@ -886,9 +799,8 @@ | ||
| 886 | 799 | return; |
| 887 | 800 | } |
| 888 | 801 | |
| 889 | 802 | $should_avoid_loading_dropzone = 'formidable' === $page && ! FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ); |
| 890 | - | |
| 891 | 803 | if ( ! $should_avoid_loading_dropzone ) { |
| 892 | 804 | wp_enqueue_style( 'formidable-dropzone' ); |
| 893 | 805 | } |
| 894 | 806 | } |
| @@ -905,21 +817,12 @@ | ||
| 905 | 817 | if ( ! FrmAppHelper::is_formidable_branding() ) { |
| 906 | 818 | return false; |
| 907 | 819 | } |
| 908 | 820 | |
| 909 | - $should_show = FrmAppHelper::is_formidable_admin() && | |
| 821 | + return FrmAppHelper::is_formidable_admin() && | |
| 910 | 822 | ! FrmAppHelper::is_style_editor_page() && |
| 911 | 823 | ! FrmAppHelper::is_admin_page( 'formidable-views-editor' ) && |
| 912 | 824 | ! FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ); |
| 913 | - | |
| 914 | - /** | |
| 915 | - * Filters whether the floating links should be displayed. | |
| 916 | - * | |
| 917 | - * @since 6.25.1 | |
| 918 | - * | |
| 919 | - * @param bool $should_show Whether the floating links should be shown. | |
| 920 | - */ | |
| 921 | - return apply_filters( 'frm_should_show_floating_links', $should_show ); | |
| 922 | 825 | } |
| 923 | 826 | |
| 924 | 827 | /** |
| 925 | 828 | * @since 6.3.2 |
| @@ -946,9 +849,9 @@ | ||
| 946 | 849 | */ |
| 947 | 850 | private static function enqueue_legacy_views_assets() { |
| 948 | 851 | wp_enqueue_style( 'formidable-grids' ); |
| 949 | 852 | wp_enqueue_script( 'jquery-ui-draggable' ); |
| 950 | - self::maybe_deregister_popper1(); | |
| 853 | + self::maybe_deregister_popper2(); | |
| 951 | 854 | wp_enqueue_script( 'formidable_admin' ); |
| 952 | 855 | wp_add_inline_style( |
| 953 | 856 | 'formidable-admin', |
| 954 | 857 | ' |
| @@ -971,21 +874,21 @@ | ||
| 971 | 874 | } |
| 972 | 875 | ' |
| 973 | 876 | ); |
| 974 | 877 | wp_enqueue_style( 'formidable-admin' ); |
| 975 | - wp_enqueue_script( 'formidable_legacy_views', FrmAppHelper::plugin_url() . '/js/admin/legacy-views.js', array( 'jquery', 'formidable_admin' ), FrmAppHelper::plugin_version() ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 878 | + wp_enqueue_script( 'formidable_legacy_views', FrmAppHelper::plugin_url() . '/js/admin/legacy-views.js', array( 'jquery', 'formidable_admin' ), FrmAppHelper::plugin_version() ); | |
| 976 | 879 | FrmAppHelper::localize_script( 'admin' ); |
| 977 | 880 | self::include_info_overlay(); |
| 978 | 881 | } |
| 979 | 882 | |
| 980 | 883 | /** |
| 981 | - * Unregister Popper if the registered version is outdated. | |
| 884 | + * Fix a Duplicator Pro conflict because it uses Popper 2. See issue #3459. | |
| 982 | 885 | * |
| 983 | - * @since 6.26 | |
| 886 | + * @since 5.2.02.01 | |
| 984 | 887 | * |
| 985 | 888 | * @return void |
| 986 | 889 | */ |
| 987 | - private static function maybe_deregister_popper1() { | |
| 890 | + private static function maybe_deregister_popper2() { | |
| 988 | 891 | global $wp_scripts; |
| 989 | 892 | |
| 990 | 893 | if ( ! array_key_exists( 'popper', $wp_scripts->registered ) ) { |
| 991 | 894 | return; |
| @@ -991,27 +894,26 @@ | ||
| 991 | 894 | return; |
| 992 | 895 | } |
| 993 | 896 | |
| 994 | 897 | $popper = $wp_scripts->registered['popper']; |
| 995 | - | |
| 996 | - if ( version_compare( $popper->ver, '2.0', '<' ) ) { | |
| 898 | + if ( version_compare( $popper->ver, '2.0', '>=' ) ) { | |
| 997 | 899 | wp_deregister_script( 'popper' ); |
| 998 | - self::register_popper2(); | |
| 900 | + self::register_popper1(); | |
| 999 | 901 | } |
| 1000 | 902 | } |
| 1001 | 903 | |
| 1002 | 904 | /** |
| 1003 | - * Register Popper required for Bootstrap 5. | |
| 905 | + * Register Popper required for Bootstrap 4. | |
| 1004 | 906 | * |
| 1005 | - * @since 6.26 | |
| 907 | + * @since 5.2.02.01 | |
| 1006 | 908 | * |
| 1007 | 909 | * @return void |
| 1008 | 910 | */ |
| 1009 | - private static function register_popper2() { | |
| 911 | + private static function register_popper1() { | |
| 1010 | 912 | if ( ! self::should_register_popper() ) { |
| 1011 | 913 | return; |
| 1012 | 914 | } |
| 1013 | - wp_register_script( 'popper', FrmAppHelper::plugin_url() . '/js/popper.min.js', array(), '2.11.8', true ); | |
| 915 | + wp_register_script( 'popper', FrmAppHelper::plugin_url() . '/js/popper.min.js', array( 'jquery' ), '1.16.0', true ); | |
| 1014 | 916 | } |
| 1015 | 917 | |
| 1016 | 918 | /** |
| 1017 | 919 | * Only register popper on Formidable pages. |
| @@ -1024,9 +926,8 @@ | ||
| 1024 | 926 | private static function should_register_popper() { |
| 1025 | 927 | global $pagenow; |
| 1026 | 928 | |
| 1027 | 929 | $post_id = FrmAppHelper::simple_get( 'post', 'absint' ); |
| 1028 | - | |
| 1029 | 930 | if ( 'post.php' === $pagenow && $post_id && 'frm_display' === get_post_type( $post_id ) ) { |
| 1030 | 931 | return true; |
| 1031 | 932 | } |
| 1032 | 933 | |
| @@ -1031,16 +932,14 @@ | ||
| 1031 | 932 | } |
| 1032 | 933 | |
| 1033 | 934 | $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title' ); |
| 1034 | 935 | $is_views_post_type = 'frm_display' === $post_type; |
| 1035 | - | |
| 1036 | 936 | if ( in_array( $pagenow, array( 'post-new.php', 'edit.php' ), true ) && $is_views_post_type ) { |
| 1037 | 937 | return true; |
| 1038 | 938 | } |
| 1039 | 939 | |
| 1040 | 940 | $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); |
| 1041 | - | |
| 1042 | - if ( str_starts_with( $page, 'formidable' ) ) { | |
| 941 | + if ( strpos( $page, 'formidable' ) === 0 ) { | |
| 1043 | 942 | return true; |
| 1044 | 943 | } |
| 1045 | 944 | |
| 1046 | 945 | return in_array( $pagenow, array( 'term.php', 'edit-tags.php' ), true ) && FrmAppHelper::simple_get( 'taxonomy' ) === 'frm_application'; |
| @@ -1054,15 +953,13 @@ | ||
| 1054 | 953 | * @return void |
| 1055 | 954 | */ |
| 1056 | 955 | private static function maybe_force_formidable_block_on_gutenberg_page() { |
| 1057 | 956 | global $pagenow; |
| 1058 | - | |
| 1059 | 957 | if ( 'post.php' !== $pagenow ) { |
| 1060 | 958 | return; |
| 1061 | 959 | } |
| 1062 | 960 | |
| 1063 | 961 | $form_id = FrmAppHelper::simple_get( 'frmForm', 'absint' ); |
| 1064 | - | |
| 1065 | 962 | if ( ! $form_id ) { |
| 1066 | 963 | return; |
| 1067 | 964 | } |
| 1068 | 965 | |
| @@ -1110,9 +1007,9 @@ | ||
| 1110 | 1007 | public static function create_rest_routes() { |
| 1111 | 1008 | $args = array( |
| 1112 | 1009 | 'methods' => 'GET', |
| 1113 | 1010 | 'callback' => 'FrmAppController::api_install', |
| 1114 | - 'permission_callback' => self::class . '::can_update_db', | |
| 1011 | + 'permission_callback' => __CLASS__ . '::can_update_db', | |
| 1115 | 1012 | ); |
| 1116 | 1013 | |
| 1117 | 1014 | register_rest_route( 'frm-admin/v1', '/install', $args ); |
| 1118 | 1015 | |
| @@ -1129,10 +1026,8 @@ | ||
| 1129 | 1026 | * Make sure the install is only being run when we tell it to. |
| 1130 | 1027 | * We don't want to run manually by people calling the API. |
| 1131 | 1028 | * |
| 1132 | 1029 | * @since 4.06.02 |
| 1133 | - * | |
| 1134 | - * @return bool | |
| 1135 | 1030 | */ |
| 1136 | 1031 | public static function can_update_db() { |
| 1137 | 1032 | return get_transient( 'frm_updating_api' ); |
| 1138 | 1033 | } |
| @@ -1176,9 +1071,8 @@ | ||
| 1176 | 1071 | */ |
| 1177 | 1072 | private static function maybe_add_wp_site_health() { |
| 1178 | 1073 | if ( ! class_exists( 'WP_Site_Health' ) ) { |
| 1179 | 1074 | $wp_site_health_path = ABSPATH . 'wp-admin/includes/class-wp-site-health.php'; |
| 1180 | - | |
| 1181 | 1075 | if ( file_exists( $wp_site_health_path ) ) { |
| 1182 | 1076 | require_once $wp_site_health_path; |
| 1183 | 1077 | } |
| 1184 | 1078 | } |
| @@ -1190,12 +1084,10 @@ | ||
| 1190 | 1084 | * @return true |
| 1191 | 1085 | */ |
| 1192 | 1086 | public static function api_install() { |
| 1193 | 1087 | delete_transient( 'frm_updating_api' ); |
| 1194 | - | |
| 1195 | 1088 | if ( self::needs_update() ) { |
| 1196 | 1089 | $running = get_option( 'frm_install_running' ); |
| 1197 | - | |
| 1198 | 1090 | if ( false === $running || $running < strtotime( '-5 minutes' ) ) { |
| 1199 | 1091 | update_option( 'frm_install_running', time(), 'no' ); |
| 1200 | 1092 | self::install(); |
| 1201 | 1093 | delete_option( 'frm_install_running' ); |
| @@ -1245,13 +1137,8 @@ | ||
| 1245 | 1137 | |
| 1246 | 1138 | wp_die(); |
| 1247 | 1139 | } |
| 1248 | 1140 | |
| 1249 | - /** | |
| 1250 | - * @param array $tables | |
| 1251 | - * | |
| 1252 | - * @return array | |
| 1253 | - */ | |
| 1254 | 1141 | public static function drop_tables( $tables ) { |
| 1255 | 1142 | global $wpdb; |
| 1256 | 1143 | $tables[] = $wpdb->prefix . 'frm_fields'; |
| 1257 | 1144 | $tables[] = $wpdb->prefix . 'frm_forms'; |
| @@ -1299,13 +1186,8 @@ | ||
| 1299 | 1186 | |
| 1300 | 1187 | FrmTransLiteAppController::maybe_schedule_cron(); |
| 1301 | 1188 | } |
| 1302 | 1189 | |
| 1303 | - /** | |
| 1304 | - * @param string $text | |
| 1305 | - * | |
| 1306 | - * @return string | |
| 1307 | - */ | |
| 1308 | 1190 | public static function set_footer_text( $text ) { |
| 1309 | 1191 | if ( FrmAppHelper::is_formidable_admin() ) { |
| 1310 | 1192 | $text = ''; |
| 1311 | 1193 | } |
| @@ -1321,9 +1203,8 @@ | ||
| 1321 | 1203 | * @return void |
| 1322 | 1204 | */ |
| 1323 | 1205 | public static function add_admin_footer_links() { |
| 1324 | 1206 | FrmFormsController::include_device_too_small_message(); |
| 1325 | - | |
| 1326 | 1207 | if ( self::should_show_footer_links() ) { |
| 1327 | 1208 | include FrmAppHelper::plugin_path() . '/classes/views/shared/admin-footer-links.php'; |
| 1328 | 1209 | } |
| 1329 | 1210 | } |
| @@ -1338,9 +1219,8 @@ | ||
| 1338 | 1219 | private static function should_show_footer_links() { |
| 1339 | 1220 | $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title' ); |
| 1340 | 1221 | $is_formidable_page = FrmAppHelper::is_formidable_admin() || 'frm_logs' === $post_type; |
| 1341 | 1222 | $show_footer_links = $is_formidable_page; |
| 1342 | - | |
| 1343 | 1223 | if ( FrmAppHelper::is_full_screen() || ! FrmAppHelper::is_formidable_branding() ) { |
| 1344 | 1224 | $show_footer_links = false; |
| 1345 | 1225 | } |
| 1346 | 1226 | |
| @@ -1349,9 +1229,8 @@ | ||
| 1349 | 1229 | * |
| 1350 | 1230 | * @since 6.7 |
| 1351 | 1231 | * |
| 1352 | 1232 | * @param bool $show_footer_links |
| 1353 | - * | |
| 1354 | 1233 | * @return bool |
| 1355 | 1234 | */ |
| 1356 | 1235 | return apply_filters( 'frm_show_footer_links', $show_footer_links ); |
| 1357 | 1236 | } |
| @@ -1378,9 +1257,8 @@ | ||
| 1378 | 1257 | 'icon' => 'frm_lock_simple', |
| 1379 | 1258 | ); |
| 1380 | 1259 | |
| 1381 | 1260 | $error_args = wp_parse_args( $error_args, $defaults ); |
| 1382 | - | |
| 1383 | 1261 | if ( ! isset( $error_args['cancel_text'] ) && ! empty( $error_args['cancel_url'] ) ) { |
| 1384 | 1262 | $error_args['cancel_text'] = __( 'Cancel', 'formidable' ); |
| 1385 | 1263 | } |
| 1386 | 1264 | |
| @@ -1397,9 +1275,8 @@ | ||
| 1397 | 1275 | * @since 6.4 |
| 1398 | 1276 | * |
| 1399 | 1277 | * @param string $plugin_url URL of the plugin. |
| 1400 | 1278 | * @param string $version Current version of the plugin. |
| 1401 | - * | |
| 1402 | 1279 | * @return void |
| 1403 | 1280 | */ |
| 1404 | 1281 | private static function enqueue_floating_links( $plugin_url, $version ) { |
| 1405 | 1282 | if ( ! $plugin_url || ! $version ) { |
| @@ -1419,20 +1296,10 @@ | ||
| 1419 | 1296 | if ( function_exists( 'wp_set_script_translations' ) ) { |
| 1420 | 1297 | wp_set_script_translations( 's11-floating-links-config', 's11-' ); |
| 1421 | 1298 | } |
| 1422 | 1299 | |
| 1423 | - $upgrade_utm = array( | |
| 1424 | - 'campaign' => 'floating-links', | |
| 1425 | - 'content' => 'floating-links-upgrade', | |
| 1426 | - ); | |
| 1427 | - $docs_utm = array( | |
| 1428 | - 'campaign' => 'floating-links', | |
| 1429 | - 'content' => 'floating-links-docs', | |
| 1430 | - ); | |
| 1431 | 1300 | $floating_links_data = array( |
| 1432 | - 'proIsInstalled' => FrmAppHelper::pro_is_installed(), | |
| 1433 | - 'upgradeUrl' => FrmAppHelper::admin_upgrade_link( $upgrade_utm ), | |
| 1434 | - 'documentationUrl' => FrmAppHelper::admin_upgrade_link( $docs_utm, 'knowledgebase/' ), | |
| 1301 | + 'proIsInstalled' => FrmAppHelper::pro_is_installed(), | |
| 1435 | 1302 | ); |
| 1436 | 1303 | wp_localize_script( 's11-floating-links-config', 's11FloatingLinksData', $floating_links_data ); |
| 1437 | 1304 | |
| 1438 | 1305 | /** |
| @@ -1450,9 +1317,8 @@ | ||
| 1450 | 1317 | * @return bool |
| 1451 | 1318 | */ |
| 1452 | 1319 | private static function in_our_pages() { |
| 1453 | 1320 | global $current_screen, $pagenow; |
| 1454 | - | |
| 1455 | 1321 | if ( FrmAppHelper::is_formidable_admin() ) { |
| 1456 | 1322 | return true; |
| 1457 | 1323 | } |
| 1458 | 1324 | |
| @@ -1459,9 +1325,13 @@ | ||
| 1459 | 1325 | if ( ! empty( $current_screen->post_type ) && 'frm_logs' === $current_screen->post_type ) { |
| 1460 | 1326 | return true; |
| 1461 | 1327 | } |
| 1462 | 1328 | |
| 1463 | - return in_array( $pagenow, array( 'term.php', 'edit-tags.php' ), true ) && 'frm_application' === FrmAppHelper::simple_get( 'taxonomy' ); | |
| 1329 | + if ( in_array( $pagenow, array( 'term.php', 'edit-tags.php' ), true ) && 'frm_application' === FrmAppHelper::simple_get( 'taxonomy' ) ) { | |
| 1330 | + return true; | |
| 1331 | + } | |
| 1332 | + | |
| 1333 | + return false; | |
| 1464 | 1334 | } |
| 1465 | 1335 | |
| 1466 | 1336 | /** |
| 1467 | 1337 | * Handles actions related to the current screen. |
| @@ -1497,9 +1367,8 @@ | ||
| 1497 | 1367 | foreach ( $actions as $action ) { |
| 1498 | 1368 | if ( empty( $wp_filter[ $action ]->callbacks ) ) { |
| 1499 | 1369 | continue; |
| 1500 | 1370 | } |
| 1501 | - | |
| 1502 | 1371 | foreach ( $wp_filter[ $action ]->callbacks as $priority => $callbacks ) { |
| 1503 | 1372 | foreach ( $callbacks as $callback_name => $callback ) { |
| 1504 | 1373 | if ( self::is_our_callback_string( $callback_name ) || self::is_our_callback_array( $callback ) ) { |
| 1505 | 1374 | continue; |
| @@ -1515,18 +1384,14 @@ | ||
| 1515 | 1384 | * |
| 1516 | 1385 | * @return void |
| 1517 | 1386 | */ |
| 1518 | 1387 | private static function remember_custom_sort() { |
| 1519 | - $meta_key = self::get_sort_pref_user_meta_key(); | |
| 1520 | - | |
| 1521 | - if ( false === $meta_key ) { | |
| 1388 | + $screen = get_current_screen(); | |
| 1389 | + if ( ! $screen ) { | |
| 1522 | 1390 | return; |
| 1523 | 1391 | } |
| 1524 | 1392 | |
| 1525 | - $is_form_list = FrmAppHelper::is_admin_list_page(); | |
| 1526 | - $is_entry_list = FrmAppHelper::is_admin_list_page( 'formidable-entries' ); | |
| 1527 | - | |
| 1528 | - if ( ! $is_form_list && ! $is_entry_list ) { | |
| 1393 | + if ( ! FrmAppHelper::is_admin_list_page() && ! FrmAppHelper::is_admin_list_page( 'formidable-entries' ) ) { | |
| 1529 | 1394 | return; |
| 1530 | 1395 | } |
| 1531 | 1396 | |
| 1532 | 1397 | $orderby = FrmAppHelper::get_param( 'orderby' ); |
| @@ -1534,34 +1399,28 @@ | ||
| 1534 | 1399 | if ( ! $orderby ) { |
| 1535 | 1400 | return; |
| 1536 | 1401 | } |
| 1537 | 1402 | |
| 1538 | - $user_id = get_current_user_id(); | |
| 1539 | - $order = FrmAppHelper::get_param( 'order' ); | |
| 1540 | - $new_sort = array( | |
| 1403 | + $user_id = get_current_user_id(); | |
| 1404 | + $meta_key = 'frm_preferred_list_sort_' . $screen->id; | |
| 1405 | + $order = FrmAppHelper::get_param( 'order' ); | |
| 1406 | + | |
| 1407 | + $new_sort = array( | |
| 1541 | 1408 | 'orderby' => $orderby, |
| 1542 | 1409 | 'order' => $order, |
| 1543 | 1410 | ); |
| 1544 | - $previous_meta = get_user_meta( $user_id, $meta_key, true ); | |
| 1545 | - $current_sort = $previous_meta; | |
| 1546 | - $form_id = $is_entry_list ? FrmAppHelper::simple_get( 'form', 'absint' ) : 0; | |
| 1547 | 1411 | |
| 1548 | - if ( is_array( $current_sort ) && $form_id && is_int( $form_id ) && isset( $current_sort[ $form_id ] ) ) { | |
| 1549 | - $current_sort = $current_sort[ $form_id ]; | |
| 1550 | - } | |
| 1412 | + $current_sort = get_user_meta( $user_id, $meta_key, true ); | |
| 1551 | 1413 | |
| 1552 | 1414 | if ( $new_sort !== $current_sort ) { |
| 1553 | - $new_meta = $new_sort; | |
| 1554 | - | |
| 1555 | - if ( $is_entry_list && $form_id && is_int( $form_id ) ) { | |
| 1556 | - // Index meta by form ID. | |
| 1557 | - $temp_meta = is_array( $previous_meta ) ? $previous_meta : array(); | |
| 1558 | - $temp_meta[ $form_id ] = $new_meta; | |
| 1559 | - $new_meta = $temp_meta; | |
| 1560 | - unset( $temp_meta ); | |
| 1561 | - } | |
| 1562 | - | |
| 1563 | - update_user_meta( $user_id, $meta_key, $new_meta ); | |
| 1415 | + update_user_meta( | |
| 1416 | + $user_id, | |
| 1417 | + $meta_key, | |
| 1418 | + array( | |
| 1419 | + 'orderby' => $orderby, | |
| 1420 | + 'order' => $order, | |
| 1421 | + ) | |
| 1422 | + ); | |
| 1564 | 1423 | } |
| 1565 | 1424 | } |
| 1566 | 1425 | |
| 1567 | 1426 | /** |
| @@ -1570,26 +1429,23 @@ | ||
| 1570 | 1429 | * @since 6.19 |
| 1571 | 1430 | * |
| 1572 | 1431 | * @param string &$orderby Reference to the current 'orderby' parameter. |
| 1573 | 1432 | * @param string &$order Reference to the current 'order' parameter. |
| 1574 | - * | |
| 1575 | 1433 | * @return void |
| 1576 | 1434 | */ |
| 1577 | 1435 | public static function apply_saved_sort_preference( &$orderby, &$order ) { |
| 1578 | - $meta_key = self::get_sort_pref_user_meta_key(); | |
| 1436 | + if ( ! function_exists( 'get_current_screen' ) ) { | |
| 1437 | + return; | |
| 1438 | + } | |
| 1579 | 1439 | |
| 1580 | - if ( false === $meta_key ) { | |
| 1440 | + $screen = get_current_screen(); | |
| 1441 | + if ( ! $screen ) { | |
| 1581 | 1442 | return; |
| 1582 | 1443 | } |
| 1583 | 1444 | |
| 1584 | 1445 | $user_id = get_current_user_id(); |
| 1585 | - $preferred_list_sort = get_user_meta( $user_id, $meta_key, true ); | |
| 1586 | - $form_id = FrmAppHelper::simple_get( 'form', 'absint' ); | |
| 1446 | + $preferred_list_sort = get_user_meta( $user_id, 'frm_preferred_list_sort_' . $screen->id, true ); | |
| 1587 | 1447 | |
| 1588 | - if ( is_array( $preferred_list_sort ) && $form_id && is_int( $form_id ) && isset( $preferred_list_sort[ $form_id ] ) ) { | |
| 1589 | - $preferred_list_sort = $preferred_list_sort[ $form_id ]; | |
| 1590 | - } | |
| 1591 | - | |
| 1592 | 1448 | if ( is_array( $preferred_list_sort ) && ! empty( $preferred_list_sort['orderby'] ) ) { |
| 1593 | 1449 | $orderby = $preferred_list_sort['orderby']; |
| 1594 | 1450 | |
| 1595 | 1451 | if ( ! empty( $preferred_list_sort['order'] ) ) { |
| @@ -1598,24 +1454,8 @@ | ||
| 1598 | 1454 | } |
| 1599 | 1455 | } |
| 1600 | 1456 | |
| 1601 | 1457 | /** |
| 1602 | - * Get a simple user meta key that only includes the screen ID. | |
| 1603 | - * | |
| 1604 | - * @since 6.25.1 | |
| 1605 | - * | |
| 1606 | - * @return false|string | |
| 1607 | - */ | |
| 1608 | - private static function get_sort_pref_user_meta_key() { | |
| 1609 | - if ( ! function_exists( 'get_current_screen' ) ) { | |
| 1610 | - return false; | |
| 1611 | - } | |
| 1612 | - | |
| 1613 | - $screen = get_current_screen(); | |
| 1614 | - return $screen ? 'frm_preferred_list_sort_' . $screen->id : false; | |
| 1615 | - } | |
| 1616 | - | |
| 1617 | - /** | |
| 1618 | 1458 | * Validate that the callback name is ours not from third-party. |
| 1619 | 1459 | * |
| 1620 | 1460 | * @param string $callback_name WordPress callback name. |
| 1621 | 1461 | * |
| @@ -1648,9 +1488,10 @@ | ||
| 1648 | 1488 | */ |
| 1649 | 1489 | private static function add_missing_tables() { |
| 1650 | 1490 | FrmAppHelper::permission_check( 'frm_view_forms' ); |
| 1651 | 1491 | |
| 1652 | - $error = FrmInbox::check_for_error(); | |
| 1492 | + $inbox = new FrmInbox(); | |
| 1493 | + $error = $inbox->check_for_error(); | |
| 1653 | 1494 | |
| 1654 | 1495 | if ( ! $error || 'failed-to-create-tables' !== $error['key'] ) { |
| 1655 | 1496 | // Confirm the inbox item with this CTA exists. |
| 1656 | 1497 | wp_safe_redirect( admin_url( 'admin.php?page=formidable' ) ); |
