| @@ -4,11 +4,8 @@ | ||
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | class FrmAppController { |
| 7 | 7 | |
| 8 | - /** | |
| 9 | - * @return void | |
| 10 | - */ | |
| 11 | 8 | public static function menu() { |
| 12 | 9 | FrmAppHelper::maybe_add_permissions(); |
| 13 | 10 | if ( ! current_user_can( 'frm_view_forms' ) ) { |
| 14 | 11 | return; |
| @@ -62,47 +59,16 @@ | ||
| 62 | 59 | } |
| 63 | 60 | } |
| 64 | 61 | |
| 65 | 62 | if ( FrmAppHelper::is_full_screen() ) { |
| 66 | - $full_screen_on = self::get_full_screen_setting(); | |
| 67 | - $add_class = ''; | |
| 68 | - if ( $full_screen_on ) { | |
| 69 | - $add_class = ' frm-full-screen is-fullscreen-mode'; | |
| 70 | - wp_enqueue_style( 'wp-edit-post' ); // Load the CSS for .is-fullscreen-mode. | |
| 71 | - } | |
| 72 | - $classes .= apply_filters( 'frm_admin_full_screen_class', $add_class ); | |
| 63 | + $classes .= apply_filters( 'frm_admin_full_screen_class', ' frm-full-screen folded' ); | |
| 73 | 64 | } |
| 74 | 65 | |
| 75 | - if ( ! FrmAppHelper::pro_is_installed() ) { | |
| 76 | - $classes .= ' frm-lite '; | |
| 77 | - } | |
| 78 | - | |
| 79 | 66 | return $classes; |
| 80 | 67 | } |
| 81 | 68 | |
| 82 | 69 | /** |
| 83 | - * Get the full screen mode setting from the block editor. | |
| 84 | - * | |
| 85 | - * @since 6.1 | |
| 86 | - * | |
| 87 | - * @return bool | |
| 88 | - */ | |
| 89 | - private static function get_full_screen_setting() { | |
| 90 | - global $wpdb; | |
| 91 | - $meta_key = $wpdb->get_blog_prefix() . 'persisted_preferences'; | |
| 92 | - | |
| 93 | - $prefs = get_user_meta( get_current_user_id(), $meta_key, true ); | |
| 94 | - if ( $prefs && isset( $prefs['core/edit-post']['fullscreenMode'] ) ) { | |
| 95 | - return $prefs['core/edit-post']['fullscreenMode']; | |
| 96 | - } | |
| 97 | - | |
| 98 | - return true; | |
| 99 | - } | |
| 100 | - | |
| 101 | - /** | |
| 102 | 70 | * @since 4.0 |
| 103 | - * | |
| 104 | - * @return string | |
| 105 | 71 | */ |
| 106 | 72 | private static function get_os() { |
| 107 | 73 | $agent = strtolower( FrmAppHelper::get_server_value( 'HTTP_USER_AGENT' ) ); |
| 108 | 74 | $os = ''; |
| @@ -123,9 +89,8 @@ | ||
| 123 | 89 | $white_pages = array( |
| 124 | 90 | 'formidable', |
| 125 | 91 | 'formidable-entries', |
| 126 | 92 | 'formidable-views', |
| 127 | - 'formidable-views-editor', | |
| 128 | 93 | 'formidable-pro-upgrade', |
| 129 | 94 | 'formidable-addons', |
| 130 | 95 | 'formidable-import', |
| 131 | 96 | 'formidable-settings', |
| @@ -155,23 +120,12 @@ | ||
| 155 | 120 | |
| 156 | 121 | return $is_white_page; |
| 157 | 122 | } |
| 158 | 123 | |
| 159 | - /** | |
| 160 | - * @return void | |
| 161 | - */ | |
| 162 | 124 | public static function load_wp_admin_style() { |
| 163 | 125 | FrmAppHelper::load_font_style(); |
| 164 | 126 | } |
| 165 | 127 | |
| 166 | - /** | |
| 167 | - * @param bool $show_nav | |
| 168 | - * @param string $title | |
| 169 | - * | |
| 170 | - * @psalm-param 'hide'|'show' $title | |
| 171 | - * | |
| 172 | - * @return void | |
| 173 | - */ | |
| 174 | 128 | public static function get_form_nav( $form, $show_nav = false, $title = 'show' ) { |
| 175 | 129 | $show_nav = FrmAppHelper::get_param( 'show_nav', $show_nav, 'get', 'absint' ); |
| 176 | 130 | if ( empty( $show_nav ) || ! $form ) { |
| 177 | 131 | return; |
| @@ -188,11 +142,8 @@ | ||
| 188 | 142 | |
| 189 | 143 | include( FrmAppHelper::plugin_path() . '/classes/views/shared/form-nav.php' ); |
| 190 | 144 | } |
| 191 | 145 | |
| 192 | - /** | |
| 193 | - * @return string | |
| 194 | - */ | |
| 195 | 146 | private static function get_current_page() { |
| 196 | 147 | $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); |
| 197 | 148 | $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title', 'None' ); |
| 198 | 149 | $current_page = isset( $_GET['page'] ) ? $page : $post_type; |
| @@ -203,12 +154,8 @@ | ||
| 203 | 154 | |
| 204 | 155 | return $current_page; |
| 205 | 156 | } |
| 206 | 157 | |
| 207 | - /** | |
| 208 | - * @param object $form | |
| 209 | - * @return array | |
| 210 | - */ | |
| 211 | 158 | private static function get_form_nav_items( $form ) { |
| 212 | 159 | $id = $form->parent_form_id ? $form->parent_form_id : $form->id; |
| 213 | 160 | |
| 214 | 161 | $nav_items = array( |
| @@ -219,15 +166,8 @@ | ||
| 219 | 166 | 'page' => 'formidable', |
| 220 | 167 | 'permission' => 'frm_edit_forms', |
| 221 | 168 | ), |
| 222 | 169 | array( |
| 223 | - 'link' => FrmStylesHelper::get_list_url( $id ), | |
| 224 | - 'label' => __( 'Style', 'formidable' ), | |
| 225 | - 'current' => array(), | |
| 226 | - 'page' => 'formidable-styles', | |
| 227 | - 'permission' => 'frm_edit_forms', | |
| 228 | - ), | |
| 229 | - array( | |
| 230 | 170 | 'link' => admin_url( 'admin.php?page=formidable&frm_action=settings&id=' . absint( $id ) ), |
| 231 | 171 | 'label' => __( 'Settings', 'formidable' ), |
| 232 | 172 | 'current' => array( 'settings' ), |
| 233 | 173 | 'page' => 'formidable', |
| @@ -233,9 +173,9 @@ | ||
| 233 | 173 | 'page' => 'formidable', |
| 234 | 174 | 'permission' => 'frm_edit_forms', |
| 235 | 175 | ), |
| 236 | 176 | array( |
| 237 | - 'link' => admin_url( 'admin.php?page=formidable-entries&frm_action=list&form=' . absint( $id ) ), | |
| 177 | + 'link' => admin_url( 'admin.php?page=formidable-entries&frm-full=1&frm_action=list&form=' . absint( $id ) ), | |
| 238 | 178 | 'label' => __( 'Entries', 'formidable' ), |
| 239 | 179 | 'current' => array(), |
| 240 | 180 | 'page' => 'formidable-entries', |
| 241 | 181 | 'permission' => 'frm_view_entries', |
| @@ -245,9 +185,9 @@ | ||
| 245 | 185 | $views_installed = is_callable( 'FrmProAppHelper::views_is_installed' ) ? FrmProAppHelper::views_is_installed() : FrmAppHelper::pro_is_installed(); |
| 246 | 186 | |
| 247 | 187 | if ( ! $views_installed ) { |
| 248 | 188 | $nav_items[] = array( |
| 249 | - 'link' => admin_url( 'admin.php?page=formidable-views&form=' . absint( $id ) ), | |
| 189 | + 'link' => admin_url( 'admin.php?page=formidable-views&frm-full=1&form=' . absint( $id ) ), | |
| 250 | 190 | 'label' => __( 'Views', 'formidable' ), |
| 251 | 191 | 'current' => array(), |
| 252 | 192 | 'page' => 'formidable-views', |
| 253 | 193 | 'permission' => 'frm_view_entries', |
| @@ -259,9 +199,9 @@ | ||
| 259 | 199 | |
| 260 | 200 | // Let people know reports and views exist. |
| 261 | 201 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| 262 | 202 | $nav_items[] = array( |
| 263 | - 'link' => admin_url( 'admin.php?page=formidable&frm_action=lite-reports&form=' . absint( $id ) ), | |
| 203 | + 'link' => admin_url( 'admin.php?page=formidable&frm_action=lite-reports&frm-full=1&form=' . absint( $id ) ), | |
| 264 | 204 | 'label' => __( 'Reports', 'formidable' ), |
| 265 | 205 | 'current' => array( 'reports' ), |
| 266 | 206 | 'page' => 'formidable', |
| 267 | 207 | 'permission' => 'frm_view_entries', |
| @@ -275,15 +215,12 @@ | ||
| 275 | 215 | 'form_id' => $id, |
| 276 | 216 | 'form' => $form, |
| 277 | 217 | ); |
| 278 | 218 | |
| 279 | - return (array) apply_filters( 'frm_form_nav_list', $nav_items, $nav_args ); | |
| 219 | + return apply_filters( 'frm_form_nav_list', $nav_items, $nav_args ); | |
| 280 | 220 | } |
| 281 | 221 | |
| 282 | 222 | // Adds a settings link to the plugins page |
| 283 | - /** | |
| 284 | - * @return array | |
| 285 | - */ | |
| 286 | 223 | public static function settings_link( $links ) { |
| 287 | 224 | $settings = array(); |
| 288 | 225 | |
| 289 | 226 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| @@ -294,11 +231,8 @@ | ||
| 294 | 231 | |
| 295 | 232 | return array_merge( $settings, $links ); |
| 296 | 233 | } |
| 297 | 234 | |
| 298 | - /** | |
| 299 | - * @return void | |
| 300 | - */ | |
| 301 | 235 | public static function pro_get_started_headline() { |
| 302 | 236 | self::review_request(); |
| 303 | 237 | FrmAppHelper::min_pro_version_notice( '4.0' ); |
| 304 | 238 | } |
| @@ -306,10 +240,8 @@ | ||
| 306 | 240 | /** |
| 307 | 241 | * Add admin notices as needed for reviews |
| 308 | 242 | * |
| 309 | 243 | * @since 3.04.03 |
| 310 | - * | |
| 311 | - * @return void | |
| 312 | 244 | */ |
| 313 | 245 | private static function review_request() { |
| 314 | 246 | $reviews = new FrmReviews(); |
| 315 | 247 | $reviews->review_request(); |
| @@ -318,10 +250,8 @@ | ||
| 318 | 250 | /** |
| 319 | 251 | * Save the request to hide the review |
| 320 | 252 | * |
| 321 | 253 | * @since 3.04.03 |
| 322 | - * | |
| 323 | - * @return void | |
| 324 | 254 | */ |
| 325 | 255 | public static function dismiss_review() { |
| 326 | 256 | FrmAppHelper::permission_check( 'frm_change_settings' ); |
| 327 | 257 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| @@ -331,10 +261,8 @@ | ||
| 331 | 261 | } |
| 332 | 262 | |
| 333 | 263 | /** |
| 334 | 264 | * @since 3.04.02 |
| 335 | - * | |
| 336 | - * @return void | |
| 337 | 265 | */ |
| 338 | 266 | public static function include_upgrade_overlay() { |
| 339 | 267 | self::enqueue_dialog_assets(); |
| 340 | 268 | add_action( 'admin_footer', 'FrmAppController::upgrade_overlay_html' ); |
| @@ -353,10 +281,8 @@ | ||
| 353 | 281 | } |
| 354 | 282 | |
| 355 | 283 | /** |
| 356 | 284 | * @since 3.06.03 |
| 357 | - * | |
| 358 | - * @return void | |
| 359 | 285 | */ |
| 360 | 286 | public static function upgrade_overlay_html() { |
| 361 | 287 | $is_pro = FrmAppHelper::pro_is_installed(); |
| 362 | 288 | $upgrade_link = array( |
| @@ -374,11 +300,8 @@ | ||
| 374 | 300 | self::new_form_overlay_html(); |
| 375 | 301 | } |
| 376 | 302 | } |
| 377 | 303 | |
| 378 | - /** | |
| 379 | - * @return void | |
| 380 | - */ | |
| 381 | 304 | private static function new_form_overlay_html() { |
| 382 | 305 | FrmFormsController::before_list_templates(); |
| 383 | 306 | |
| 384 | 307 | $plugin_path = FrmAppHelper::plugin_path(); |
| @@ -425,19 +348,13 @@ | ||
| 425 | 348 | |
| 426 | 349 | include $path . 'new-form-overlay.php'; |
| 427 | 350 | } |
| 428 | 351 | |
| 429 | - /** | |
| 430 | - * @return void | |
| 431 | - */ | |
| 432 | 352 | public static function include_info_overlay() { |
| 433 | 353 | self::enqueue_dialog_assets(); |
| 434 | 354 | add_action( 'admin_footer', 'FrmAppController::info_overlay_html' ); |
| 435 | 355 | } |
| 436 | 356 | |
| 437 | - /** | |
| 438 | - * @return void | |
| 439 | - */ | |
| 440 | 357 | public static function info_overlay_html() { |
| 441 | 358 | include FrmAppHelper::plugin_path() . '/classes/views/shared/info-overlay.php'; |
| 442 | 359 | } |
| 443 | 360 | |
| @@ -442,10 +359,8 @@ | ||
| 442 | 359 | } |
| 443 | 360 | |
| 444 | 361 | /** |
| 445 | 362 | * @since 3.04.02 |
| 446 | - * | |
| 447 | - * @return void | |
| 448 | 363 | */ |
| 449 | 364 | public static function remove_upsells() { |
| 450 | 365 | remove_action( 'frm_before_settings', 'FrmSettingsController::license_box' ); |
| 451 | 366 | remove_action( 'frm_after_settings', 'FrmSettingsController::settings_cta' ); |
| @@ -450,8 +365,13 @@ | ||
| 450 | 365 | remove_action( 'frm_before_settings', 'FrmSettingsController::license_box' ); |
| 451 | 366 | remove_action( 'frm_after_settings', 'FrmSettingsController::settings_cta' ); |
| 452 | 367 | remove_action( 'frm_add_form_style_tab_options', 'FrmFormsController::add_form_style_tab_options' ); |
| 453 | 368 | remove_action( 'frm_after_field_options', 'FrmFormsController::logic_tip' ); |
| 369 | + | |
| 370 | + if ( is_callable( 'FrmProAddonsController::renewal_message' ) ) { | |
| 371 | + // These functions moved to Pro in 4.09.01 | |
| 372 | + remove_action( 'frm_page_footer', 'FrmAppHelper::renewal_message' ); | |
| 373 | + } | |
| 454 | 374 | } |
| 455 | 375 | |
| 456 | 376 | /** |
| 457 | 377 | * If there are CURL problems on this server, wp_remote_post won't work for installing |
| @@ -457,17 +377,12 @@ | ||
| 457 | 377 | * If there are CURL problems on this server, wp_remote_post won't work for installing |
| 458 | 378 | * Use a javascript fallback instead. |
| 459 | 379 | * |
| 460 | 380 | * @since 2.0.3 |
| 461 | - * | |
| 462 | - * @return void | |
| 463 | 381 | */ |
| 464 | 382 | public static function install_js_fallback() { |
| 465 | 383 | FrmAppHelper::load_admin_wide_js(); |
| 466 | - ?> | |
| 467 | - <div id="frm_install_message"></div> | |
| 468 | - <script>jQuery(document).ready( frm_install_now );</script> | |
| 469 | - <?php | |
| 384 | + echo '<div id="hidden frm_install_message"></div><script type="text/javascript">jQuery(document).ready(function(){frm_install_now();});</script>'; | |
| 470 | 385 | } |
| 471 | 386 | |
| 472 | 387 | /** |
| 473 | 388 | * Check if the database is outdated |
| @@ -494,11 +409,8 @@ | ||
| 494 | 409 | /** |
| 495 | 410 | * Check both version number and DB number for changes |
| 496 | 411 | * |
| 497 | 412 | * @since 3.0.04 |
| 498 | - * | |
| 499 | - * @param array $atts | |
| 500 | - * @return bool | |
| 501 | 413 | */ |
| 502 | 414 | public static function compare_for_update( $atts ) { |
| 503 | 415 | $db_version = get_option( $atts['option'] ); |
| 504 | 416 | |
| @@ -517,21 +429,10 @@ | ||
| 517 | 429 | /** |
| 518 | 430 | * Check for database update and trigger js loading |
| 519 | 431 | * |
| 520 | 432 | * @since 2.0.1 |
| 521 | - * | |
| 522 | - * @return void | |
| 523 | 433 | */ |
| 524 | 434 | public static function admin_init() { |
| 525 | - if ( FrmAppHelper::is_admin_page( 'formidable' ) && 'duplicate' === FrmAppHelper::get_param( 'frm_action' ) ) { | |
| 526 | - FrmFormsController::duplicate(); | |
| 527 | - } | |
| 528 | - | |
| 529 | - if ( FrmAppHelper::is_style_editor_page() && 'save' === FrmAppHelper::get_param( 'frm_action' ) ) { | |
| 530 | - // Hook in earlier than FrmStylesController::route so we can redirect before the headers have been sent. | |
| 531 | - FrmStylesController::save_style(); | |
| 532 | - } | |
| 533 | - | |
| 534 | 435 | new FrmPersonalData(); // register personal data hooks |
| 535 | 436 | |
| 536 | 437 | if ( ! FrmAppHelper::doing_ajax() && self::needs_update() ) { |
| 537 | 438 | self::network_upgrade_site(); |
| @@ -551,74 +452,13 @@ | ||
| 551 | 452 | } |
| 552 | 453 | |
| 553 | 454 | FrmInbox::maybe_disable_screen_options(); |
| 554 | 455 | } |
| 555 | - | |
| 556 | - self::maybe_add_ip_warning(); | |
| 557 | 456 | } |
| 558 | 457 | |
| 559 | 458 | /** |
| 560 | - * Show a warning for the IP address setting if it hasn't been set. | |
| 561 | - * | |
| 562 | - * @since 6.1 | |
| 563 | - * | |
| 564 | 459 | * @return void |
| 565 | 460 | */ |
| 566 | - private static function maybe_add_ip_warning() { | |
| 567 | - $settings = FrmAppHelper::get_settings(); | |
| 568 | - if ( false !== $settings->custom_header_ip ) { | |
| 569 | - // The setting has been changed from the false default (to either 1 or 0), so stop showing the message. | |
| 570 | - return; | |
| 571 | - } | |
| 572 | - | |
| 573 | - if ( ! self::is_behind_proxy() ) { | |
| 574 | - // This message is only applicable when using a reverse proxy. | |
| 575 | - return; | |
| 576 | - } | |
| 577 | - | |
| 578 | - if ( FrmAppHelper::get_post_param( 'frm_action', '', 'sanitize_text_field' ) ) { | |
| 579 | - // Avoid the message on a POST action. We don't want to show the message if we're saving global settings. | |
| 580 | - return; | |
| 581 | - } | |
| 582 | - | |
| 583 | - $global_settings_link = admin_url( 'admin.php?page=formidable-settings' ) . '#frm_custom_header_ip'; | |
| 584 | - $message = sprintf( | |
| 585 | - // Translators: 1: Global Settings Link | |
| 586 | - __( 'IP addresses in form submissions may no longer be accurate! If you are experiencing issues, we recommend going to %1$s and enabling the "Use custom headers when retrieving IPs with form submissions." setting.', 'formidable' ), | |
| 587 | - '<a href="' . esc_url( $global_settings_link ) . '">Global Settings</a>' | |
| 588 | - ); | |
| 589 | - $option_name = 'frm_dismiss_ip_address_notice'; | |
| 590 | - FrmAppHelper::add_dismissable_warning_message( $message, $option_name ); | |
| 591 | - } | |
| 592 | - | |
| 593 | - /** | |
| 594 | - * Check if any reverse proxy headers are set. | |
| 595 | - * | |
| 596 | - * @since 6.1 | |
| 597 | - * | |
| 598 | - * @return bool | |
| 599 | - */ | |
| 600 | - private static function is_behind_proxy() { | |
| 601 | - $custom_headers = FrmAppHelper::get_custom_header_keys_for_ip(); | |
| 602 | - foreach ( $custom_headers as $header ) { | |
| 603 | - if ( 'REMOTE_ADDR' === $header ) { | |
| 604 | - // We want to check every key but REMOTE_ADDR. REMOTE_ATTR is not unique to reverse proxy servers. | |
| 605 | - continue; | |
| 606 | - } | |
| 607 | - | |
| 608 | - $ip = trim( FrmAppHelper::get_server_value( $header ) ); | |
| 609 | - // Return true for anything that isn't empty but ignoring values like ::1. | |
| 610 | - if ( $ip && 0 !== strpos( $ip, '::' ) ) { | |
| 611 | - return true; | |
| 612 | - } | |
| 613 | - } | |
| 614 | - | |
| 615 | - return false; | |
| 616 | - } | |
| 617 | - | |
| 618 | - /** | |
| 619 | - * @return void | |
| 620 | - */ | |
| 621 | 461 | public static function admin_js() { |
| 622 | 462 | $plugin_url = FrmAppHelper::plugin_url(); |
| 623 | 463 | $version = FrmAppHelper::plugin_version(); |
| 624 | 464 | |
| @@ -633,9 +473,8 @@ | ||
| 633 | 473 | wp_register_script( 'formidable_dom', $plugin_url . '/js/admin/dom.js', array( 'jquery', 'jquery-ui-dialog', 'wp-i18n' ), $version, true ); |
| 634 | 474 | wp_register_script( 'formidable_embed', $plugin_url . '/js/admin/embed.js', array( 'formidable_dom', 'jquery-ui-autocomplete' ), $version, true ); |
| 635 | 475 | self::register_popper1(); |
| 636 | 476 | wp_register_script( 'bootstrap_tooltip', $plugin_url . '/js/bootstrap.min.js', array( 'jquery', 'popper' ), '4.6.1', true ); |
| 637 | - wp_register_script( 'formidable_settings', $plugin_url . '/js/admin/settings.js', array(), $version, true ); | |
| 638 | 477 | |
| 639 | 478 | $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); |
| 640 | 479 | |
| 641 | 480 | if ( 'formidable-applications' === $page ) { |
| @@ -651,15 +490,13 @@ | ||
| 651 | 490 | 'jquery-ui-sortable', |
| 652 | 491 | 'bootstrap_tooltip', |
| 653 | 492 | 'bootstrap-multiselect', |
| 654 | 493 | 'wp-i18n', |
| 655 | - 'wp-hooks', // Required in WP versions older than 5.7 | |
| 656 | 494 | 'formidable_dom', |
| 657 | 495 | 'formidable_embed', |
| 658 | 496 | ); |
| 659 | 497 | |
| 660 | - if ( FrmAppHelper::is_style_editor_page( 'edit' ) ) { | |
| 661 | - // We only need to load the color picker when editing styles. | |
| 498 | + if ( FrmAppHelper::is_admin_page( 'formidable-styles' ) || FrmAppHelper::is_admin_page( 'formidable-styles2' ) ) { | |
| 662 | 499 | $dependencies[] = 'wp-color-picker'; |
| 663 | 500 | } |
| 664 | 501 | |
| 665 | 502 | wp_register_script( 'formidable_admin', $plugin_url . '/js/formidable_admin.js', $dependencies, $version, true ); |
| @@ -712,9 +549,15 @@ | ||
| 712 | 549 | return; |
| 713 | 550 | } |
| 714 | 551 | |
| 715 | 552 | if ( $post_type === 'frm_display' ) { |
| 716 | - self::enqueue_legacy_views_assets(); | |
| 553 | + wp_enqueue_style( 'formidable-grids' ); | |
| 554 | + wp_enqueue_script( 'jquery-ui-draggable' ); | |
| 555 | + self::maybe_deregister_popper2(); | |
| 556 | + wp_enqueue_script( 'formidable_admin' ); | |
| 557 | + wp_enqueue_style( 'formidable-admin' ); | |
| 558 | + FrmAppHelper::localize_script( 'admin' ); | |
| 559 | + self::include_info_overlay(); | |
| 717 | 560 | } |
| 718 | 561 | } |
| 719 | 562 | |
| 720 | 563 | self::maybe_force_formidable_block_on_gutenberg_page(); |
| @@ -720,47 +563,8 @@ | ||
| 720 | 563 | self::maybe_force_formidable_block_on_gutenberg_page(); |
| 721 | 564 | } |
| 722 | 565 | |
| 723 | 566 | /** |
| 724 | - * Enqueue required assets for the Legacy Views editor (Views v4.x). | |
| 725 | - * | |
| 726 | - * @since 6.1.2 | |
| 727 | - * | |
| 728 | - * @return void | |
| 729 | - */ | |
| 730 | - private static function enqueue_legacy_views_assets() { | |
| 731 | - wp_enqueue_style( 'formidable-grids' ); | |
| 732 | - wp_enqueue_script( 'jquery-ui-draggable' ); | |
| 733 | - self::maybe_deregister_popper2(); | |
| 734 | - wp_enqueue_script( 'formidable_admin' ); | |
| 735 | - wp_add_inline_style( | |
| 736 | - 'formidable-admin', | |
| 737 | - ' | |
| 738 | - .frm-white-body.post-type-frm_display .columns-2 { | |
| 739 | - display: block; | |
| 740 | - overflow: visible; | |
| 741 | - } | |
| 742 | - | |
| 743 | - .frm-white-body.post-type-frm_display .columns-2 > div { | |
| 744 | - overflow-y: hidden; | |
| 745 | - } | |
| 746 | - | |
| 747 | - .frm-white-body.post-type-frm_display #titlediv #title-prompt-text { | |
| 748 | - padding: 3px 0 0 10px; | |
| 749 | - } | |
| 750 | - | |
| 751 | - .post-type-frm_display #field-search-input, | |
| 752 | - .post-type-frm_display #advanced-search-input { | |
| 753 | - flex: 1; | |
| 754 | - } | |
| 755 | - ' | |
| 756 | - ); | |
| 757 | - wp_enqueue_style( 'formidable-admin' ); | |
| 758 | - FrmAppHelper::localize_script( 'admin' ); | |
| 759 | - self::include_info_overlay(); | |
| 760 | - } | |
| 761 | - | |
| 762 | - /** | |
| 763 | 567 | * Fix a Duplicator Pro conflict because it uses Popper 2. See issue #3459. |
| 764 | 568 | * |
| 765 | 569 | * @since 5.2.02.01 |
| 766 | 570 | * |
| @@ -814,12 +618,8 @@ | ||
| 814 | 618 | |
| 815 | 619 | /** |
| 816 | 620 | * @since 5.3 |
| 817 | 621 | * |
| 818 | - * @param string $block_name | |
| 819 | - * @param string $object_key | |
| 820 | - * @param array|string $object_id | |
| 821 | - * | |
| 822 | 622 | * @return void |
| 823 | 623 | */ |
| 824 | 624 | public static function add_js_to_inject_gutenberg_block( $block_name, $object_key, $object_id ) { |
| 825 | 625 | require FrmAppHelper::plugin_path() . '/classes/views/shared/edit-page-js.php'; |
| @@ -824,11 +624,8 @@ | ||
| 824 | 624 | public static function add_js_to_inject_gutenberg_block( $block_name, $object_key, $object_id ) { |
| 825 | 625 | require FrmAppHelper::plugin_path() . '/classes/views/shared/edit-page-js.php'; |
| 826 | 626 | } |
| 827 | 627 | |
| 828 | - /** | |
| 829 | - * @return void | |
| 830 | - */ | |
| 831 | 628 | public static function load_lang() { |
| 832 | 629 | load_plugin_textdomain( 'formidable', false, FrmAppHelper::plugin_folder() . '/languages/' ); |
| 833 | 630 | } |
| 834 | 631 | |
| @@ -835,10 +632,8 @@ | ||
| 835 | 632 | /** |
| 836 | 633 | * Check if the styles are updated when a form is loaded on the front-end |
| 837 | 634 | * |
| 838 | 635 | * @since 3.0.1 |
| 839 | - * | |
| 840 | - * @return void | |
| 841 | 636 | */ |
| 842 | 637 | public static function maybe_update_styles() { |
| 843 | 638 | if ( self::needs_update() ) { |
| 844 | 639 | self::network_upgrade_site(); |
| @@ -846,10 +641,8 @@ | ||
| 846 | 641 | } |
| 847 | 642 | |
| 848 | 643 | /** |
| 849 | 644 | * @since 3.0 |
| 850 | - * | |
| 851 | - * @return void | |
| 852 | 645 | */ |
| 853 | 646 | public static function create_rest_routes() { |
| 854 | 647 | $args = array( |
| 855 | 648 | 'methods' => 'GET', |
| @@ -884,10 +677,8 @@ | ||
| 884 | 677 | * |
| 885 | 678 | * @since 2.0.1 |
| 886 | 679 | * |
| 887 | 680 | * @param int $blog_id Blog ID. |
| 888 | - * | |
| 889 | - * @return void | |
| 890 | 681 | */ |
| 891 | 682 | public static function network_upgrade_site( $blog_id = 0 ) { |
| 892 | 683 | // Flag to check if install is happening as intended. |
| 893 | 684 | set_transient( 'frm_updating_api', true, MINUTE_IN_SECONDS ); |
| @@ -911,10 +702,8 @@ | ||
| 911 | 702 | |
| 912 | 703 | /** |
| 913 | 704 | * Make sure WP_Site_Health has been included because it is required when calling rest_do_request. |
| 914 | 705 | * Check first that the file exists because WP_Site_Health was only introduced in WordPress 5.2. |
| 915 | - * | |
| 916 | - * @return void | |
| 917 | 706 | */ |
| 918 | 707 | private static function maybe_add_wp_site_health() { |
| 919 | 708 | if ( ! class_exists( 'WP_Site_Health' ) ) { |
| 920 | 709 | $wp_site_health_path = ABSPATH . 'wp-admin/includes/class-wp-site-health.php'; |
| @@ -925,10 +714,8 @@ | ||
| 925 | 714 | } |
| 926 | 715 | |
| 927 | 716 | /** |
| 928 | 717 | * @since 3.0 |
| 929 | - * | |
| 930 | - * @return true | |
| 931 | 718 | */ |
| 932 | 719 | public static function api_install() { |
| 933 | 720 | delete_transient( 'frm_updating_api' ); |
| 934 | 721 | if ( self::needs_update() ) { |
| @@ -947,29 +734,19 @@ | ||
| 947 | 734 | * Silent database upgrade (no redirect). |
| 948 | 735 | * Called via ajax request during network upgrade process. |
| 949 | 736 | * |
| 950 | 737 | * @since 2.0.1 |
| 951 | - * | |
| 952 | - * @return void | |
| 953 | 738 | */ |
| 954 | 739 | public static function ajax_install() { |
| 955 | - FrmAppHelper::permission_check( 'frm_change_settings' ); | |
| 956 | - check_ajax_referer( 'frm_ajax', 'nonce' ); | |
| 957 | 740 | self::api_install(); |
| 958 | 741 | wp_die(); |
| 959 | 742 | } |
| 960 | 743 | |
| 961 | - /** | |
| 962 | - * @return void | |
| 963 | - */ | |
| 964 | 744 | public static function install() { |
| 965 | 745 | $frmdb = new FrmMigrate(); |
| 966 | 746 | $frmdb->upgrade(); |
| 967 | 747 | } |
| 968 | 748 | |
| 969 | - /** | |
| 970 | - * @return void | |
| 971 | - */ | |
| 972 | 749 | public static function uninstall() { |
| 973 | 750 | FrmAppHelper::permission_check( 'administrator' ); |
| 974 | 751 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 975 | 752 | |
| @@ -993,11 +770,8 @@ | ||
| 993 | 770 | |
| 994 | 771 | return $tables; |
| 995 | 772 | } |
| 996 | 773 | |
| 997 | - /** | |
| 998 | - * @return void | |
| 999 | - */ | |
| 1000 | 774 | public static function deauthorize() { |
| 1001 | 775 | FrmAppHelper::permission_check( 'frm_change_settings' ); |
| 1002 | 776 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 1003 | 777 | |
| @@ -1016,13 +790,36 @@ | ||
| 1016 | 790 | return $text; |
| 1017 | 791 | } |
| 1018 | 792 | |
| 1019 | 793 | /** |
| 794 | + * @deprecated 1.07.05 | |
| 795 | + * @codeCoverageIgnore | |
| 796 | + */ | |
| 797 | + public static function get_form_shortcode( $atts ) { | |
| 798 | + return FrmDeprecated::get_form_shortcode( $atts ); | |
| 799 | + } | |
| 800 | + | |
| 801 | + /** | |
| 802 | + * @deprecated 2.5.4 | |
| 803 | + * @codeCoverageIgnore | |
| 804 | + */ | |
| 805 | + public static function widget_text_filter( $content ) { | |
| 806 | + return FrmDeprecated::widget_text_filter( $content ); | |
| 807 | + } | |
| 808 | + | |
| 809 | + /** | |
| 810 | + * Deprecated in favor of wpmu_upgrade_site | |
| 811 | + * | |
| 812 | + * @deprecated 2.3 | |
| 813 | + * @codeCoverageIgnore | |
| 814 | + */ | |
| 815 | + public static function front_head() { | |
| 816 | + FrmDeprecated::front_head(); | |
| 817 | + } | |
| 818 | + | |
| 819 | + /** | |
| 1020 | 820 | * @deprecated 3.0.04 |
| 1021 | - * | |
| 1022 | 821 | * @codeCoverageIgnore |
| 1023 | - * | |
| 1024 | - * @return void | |
| 1025 | 822 | */ |
| 1026 | 823 | public static function activation_install() { |
| 1027 | 824 | FrmDeprecated::activation_install(); |
| 1028 | 825 | } |
| @@ -1043,18 +840,6 @@ | ||
| 1043 | 840 | * @return void |
| 1044 | 841 | */ |
| 1045 | 842 | public static function include_embed_form_icons() { |
| 1046 | 843 | _deprecated_function( __METHOD__, '5.3' ); |
| 1047 | - } | |
| 1048 | - | |
| 1049 | - /** | |
| 1050 | - * @deprecated 1.07.05 This is still referenced in the API add on as of v1.13. | |
| 1051 | - * @codeCoverageIgnore | |
| 1052 | - * | |
| 1053 | - * @param array $atts | |
| 1054 | - * @return string | |
| 1055 | - */ | |
| 1056 | - public static function get_form_shortcode( $atts ) { | |
| 1057 | - _deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::get_form_shortcode' ); | |
| 1058 | - return FrmFormsController::get_form_shortcode( $atts ); | |
| 1059 | 844 | } |
| 1060 | 845 | } |
