| @@ -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', |
| @@ -132,13 +97,12 @@ | ||
| 132 | 97 | 'formidable-styles', |
| 133 | 98 | 'formidable-styles2', |
| 134 | 99 | 'formidable-inbox', |
| 135 | 100 | 'formidable-welcome', |
| 136 | - 'formidable-applications', | |
| 137 | 101 | ); |
| 138 | 102 | |
| 139 | 103 | $get_page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); |
| 140 | - $is_white_page = in_array( $get_page, $white_pages, true ); | |
| 104 | + $is_white_page = in_array( $get_page, $white_pages ); | |
| 141 | 105 | |
| 142 | 106 | if ( ! $is_white_page ) { |
| 143 | 107 | $screen = get_current_screen(); |
| 144 | 108 | $is_white_page = ( $screen && strpos( $screen->id, 'frm_display' ) !== false ); |
| @@ -143,35 +107,15 @@ | ||
| 143 | 107 | $screen = get_current_screen(); |
| 144 | 108 | $is_white_page = ( $screen && strpos( $screen->id, 'frm_display' ) !== false ); |
| 145 | 109 | } |
| 146 | 110 | |
| 147 | - /** | |
| 148 | - * Allow another add on to style a page as a Formidable "white page", which adds a white background color. | |
| 149 | - * | |
| 150 | - * @since 5.3 | |
| 151 | - * | |
| 152 | - * @param bool $is_white_page | |
| 153 | - */ | |
| 154 | - $is_white_page = apply_filters( 'frm_is_white_page', $is_white_page ); | |
| 155 | - | |
| 156 | 111 | return $is_white_page; |
| 157 | 112 | } |
| 158 | 113 | |
| 159 | - /** | |
| 160 | - * @return void | |
| 161 | - */ | |
| 162 | 114 | public static function load_wp_admin_style() { |
| 163 | 115 | FrmAppHelper::load_font_style(); |
| 164 | 116 | } |
| 165 | 117 | |
| 166 | - /** | |
| 167 | - * @param bool $show_nav | |
| 168 | - * @param string $title | |
| 169 | - * | |
| 170 | - * @psalm-param 'hide'|'show' $title | |
| 171 | - * | |
| 172 | - * @return void | |
| 173 | - */ | |
| 174 | 118 | public static function get_form_nav( $form, $show_nav = false, $title = 'show' ) { |
| 175 | 119 | $show_nav = FrmAppHelper::get_param( 'show_nav', $show_nav, 'get', 'absint' ); |
| 176 | 120 | if ( empty( $show_nav ) || ! $form ) { |
| 177 | 121 | return; |
| @@ -188,11 +132,8 @@ | ||
| 188 | 132 | |
| 189 | 133 | include( FrmAppHelper::plugin_path() . '/classes/views/shared/form-nav.php' ); |
| 190 | 134 | } |
| 191 | 135 | |
| 192 | - /** | |
| 193 | - * @return string | |
| 194 | - */ | |
| 195 | 136 | private static function get_current_page() { |
| 196 | 137 | $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); |
| 197 | 138 | $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title', 'None' ); |
| 198 | 139 | $current_page = isset( $_GET['page'] ) ? $page : $post_type; |
| @@ -203,12 +144,8 @@ | ||
| 203 | 144 | |
| 204 | 145 | return $current_page; |
| 205 | 146 | } |
| 206 | 147 | |
| 207 | - /** | |
| 208 | - * @param object $form | |
| 209 | - * @return array | |
| 210 | - */ | |
| 211 | 148 | private static function get_form_nav_items( $form ) { |
| 212 | 149 | $id = $form->parent_form_id ? $form->parent_form_id : $form->id; |
| 213 | 150 | |
| 214 | 151 | $nav_items = array( |
| @@ -219,15 +156,8 @@ | ||
| 219 | 156 | 'page' => 'formidable', |
| 220 | 157 | 'permission' => 'frm_edit_forms', |
| 221 | 158 | ), |
| 222 | 159 | 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 | 160 | 'link' => admin_url( 'admin.php?page=formidable&frm_action=settings&id=' . absint( $id ) ), |
| 231 | 161 | 'label' => __( 'Settings', 'formidable' ), |
| 232 | 162 | 'current' => array( 'settings' ), |
| 233 | 163 | 'page' => 'formidable', |
| @@ -233,9 +163,9 @@ | ||
| 233 | 163 | 'page' => 'formidable', |
| 234 | 164 | 'permission' => 'frm_edit_forms', |
| 235 | 165 | ), |
| 236 | 166 | array( |
| 237 | - 'link' => admin_url( 'admin.php?page=formidable-entries&frm_action=list&form=' . absint( $id ) ), | |
| 167 | + 'link' => admin_url( 'admin.php?page=formidable-entries&frm-full=1&frm_action=list&form=' . absint( $id ) ), | |
| 238 | 168 | 'label' => __( 'Entries', 'formidable' ), |
| 239 | 169 | 'current' => array(), |
| 240 | 170 | 'page' => 'formidable-entries', |
| 241 | 171 | 'permission' => 'frm_view_entries', |
| @@ -245,9 +175,9 @@ | ||
| 245 | 175 | $views_installed = is_callable( 'FrmProAppHelper::views_is_installed' ) ? FrmProAppHelper::views_is_installed() : FrmAppHelper::pro_is_installed(); |
| 246 | 176 | |
| 247 | 177 | if ( ! $views_installed ) { |
| 248 | 178 | $nav_items[] = array( |
| 249 | - 'link' => admin_url( 'admin.php?page=formidable-views&form=' . absint( $id ) ), | |
| 179 | + 'link' => admin_url( 'admin.php?page=formidable-views&frm-full=1&form=' . absint( $id ) ), | |
| 250 | 180 | 'label' => __( 'Views', 'formidable' ), |
| 251 | 181 | 'current' => array(), |
| 252 | 182 | 'page' => 'formidable-views', |
| 253 | 183 | 'permission' => 'frm_view_entries', |
| @@ -259,9 +189,9 @@ | ||
| 259 | 189 | |
| 260 | 190 | // Let people know reports and views exist. |
| 261 | 191 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| 262 | 192 | $nav_items[] = array( |
| 263 | - 'link' => admin_url( 'admin.php?page=formidable&frm_action=lite-reports&form=' . absint( $id ) ), | |
| 193 | + 'link' => admin_url( 'admin.php?page=formidable&frm_action=lite-reports&frm-full=1&form=' . absint( $id ) ), | |
| 264 | 194 | 'label' => __( 'Reports', 'formidable' ), |
| 265 | 195 | 'current' => array( 'reports' ), |
| 266 | 196 | 'page' => 'formidable', |
| 267 | 197 | 'permission' => 'frm_view_entries', |
| @@ -275,15 +205,12 @@ | ||
| 275 | 205 | 'form_id' => $id, |
| 276 | 206 | 'form' => $form, |
| 277 | 207 | ); |
| 278 | 208 | |
| 279 | - return (array) apply_filters( 'frm_form_nav_list', $nav_items, $nav_args ); | |
| 209 | + return apply_filters( 'frm_form_nav_list', $nav_items, $nav_args ); | |
| 280 | 210 | } |
| 281 | 211 | |
| 282 | 212 | // Adds a settings link to the plugins page |
| 283 | - /** | |
| 284 | - * @return array | |
| 285 | - */ | |
| 286 | 213 | public static function settings_link( $links ) { |
| 287 | 214 | $settings = array(); |
| 288 | 215 | |
| 289 | 216 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| @@ -294,11 +221,8 @@ | ||
| 294 | 221 | |
| 295 | 222 | return array_merge( $settings, $links ); |
| 296 | 223 | } |
| 297 | 224 | |
| 298 | - /** | |
| 299 | - * @return void | |
| 300 | - */ | |
| 301 | 225 | public static function pro_get_started_headline() { |
| 302 | 226 | self::review_request(); |
| 303 | 227 | FrmAppHelper::min_pro_version_notice( '4.0' ); |
| 304 | 228 | } |
| @@ -306,10 +230,8 @@ | ||
| 306 | 230 | /** |
| 307 | 231 | * Add admin notices as needed for reviews |
| 308 | 232 | * |
| 309 | 233 | * @since 3.04.03 |
| 310 | - * | |
| 311 | - * @return void | |
| 312 | 234 | */ |
| 313 | 235 | private static function review_request() { |
| 314 | 236 | $reviews = new FrmReviews(); |
| 315 | 237 | $reviews->review_request(); |
| @@ -318,10 +240,8 @@ | ||
| 318 | 240 | /** |
| 319 | 241 | * Save the request to hide the review |
| 320 | 242 | * |
| 321 | 243 | * @since 3.04.03 |
| 322 | - * | |
| 323 | - * @return void | |
| 324 | 244 | */ |
| 325 | 245 | public static function dismiss_review() { |
| 326 | 246 | FrmAppHelper::permission_check( 'frm_change_settings' ); |
| 327 | 247 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| @@ -331,32 +251,18 @@ | ||
| 331 | 251 | } |
| 332 | 252 | |
| 333 | 253 | /** |
| 334 | 254 | * @since 3.04.02 |
| 335 | - * | |
| 336 | - * @return void | |
| 337 | 255 | */ |
| 338 | 256 | public static function include_upgrade_overlay() { |
| 339 | - self::enqueue_dialog_assets(); | |
| 340 | - add_action( 'admin_footer', 'FrmAppController::upgrade_overlay_html' ); | |
| 341 | - } | |
| 342 | - | |
| 343 | - /** | |
| 344 | - * Enqueue scripts and styles required for modals. | |
| 345 | - * | |
| 346 | - * @since 5.3 | |
| 347 | - * | |
| 348 | - * @return void | |
| 349 | - */ | |
| 350 | - public static function enqueue_dialog_assets() { | |
| 351 | 257 | wp_enqueue_script( 'jquery-ui-dialog' ); |
| 352 | 258 | wp_enqueue_style( 'jquery-ui-dialog' ); |
| 259 | + | |
| 260 | + add_action( 'admin_footer', 'FrmAppController::upgrade_overlay_html' ); | |
| 353 | 261 | } |
| 354 | 262 | |
| 355 | 263 | /** |
| 356 | 264 | * @since 3.06.03 |
| 357 | - * | |
| 358 | - * @return void | |
| 359 | 265 | */ |
| 360 | 266 | public static function upgrade_overlay_html() { |
| 361 | 267 | $is_pro = FrmAppHelper::pro_is_installed(); |
| 362 | 268 | $upgrade_link = array( |
| @@ -369,16 +275,13 @@ | ||
| 369 | 275 | |
| 370 | 276 | include $shared_path . 'upgrade_overlay.php'; |
| 371 | 277 | include $shared_path . 'confirm-overlay.php'; |
| 372 | 278 | |
| 373 | - if ( FrmAppHelper::is_admin_page( 'formidable-welcome' ) || FrmAppHelper::on_form_listing_page() ) { | |
| 279 | + if ( ( FrmAppHelper::is_admin_page( 'formidable' ) || FrmAppHelper::is_admin_page( 'formidable-welcome' ) ) && in_array( FrmAppHelper::get_param( 'frm_action' ), array( '', 'list', 'trash' ), true ) ) { | |
| 374 | 280 | self::new_form_overlay_html(); |
| 375 | 281 | } |
| 376 | 282 | } |
| 377 | 283 | |
| 378 | - /** | |
| 379 | - * @return void | |
| 380 | - */ | |
| 381 | 284 | private static function new_form_overlay_html() { |
| 382 | 285 | FrmFormsController::before_list_templates(); |
| 383 | 286 | |
| 384 | 287 | $plugin_path = FrmAppHelper::plugin_path(); |
| @@ -425,27 +328,21 @@ | ||
| 425 | 328 | |
| 426 | 329 | include $path . 'new-form-overlay.php'; |
| 427 | 330 | } |
| 428 | 331 | |
| 429 | - /** | |
| 430 | - * @return void | |
| 431 | - */ | |
| 432 | 332 | public static function include_info_overlay() { |
| 433 | - self::enqueue_dialog_assets(); | |
| 333 | + wp_enqueue_script( 'jquery-ui-dialog' ); | |
| 334 | + wp_enqueue_style( 'jquery-ui-dialog' ); | |
| 335 | + | |
| 434 | 336 | add_action( 'admin_footer', 'FrmAppController::info_overlay_html' ); |
| 435 | 337 | } |
| 436 | 338 | |
| 437 | - /** | |
| 438 | - * @return void | |
| 439 | - */ | |
| 440 | 339 | public static function info_overlay_html() { |
| 441 | - include FrmAppHelper::plugin_path() . '/classes/views/shared/info-overlay.php'; | |
| 340 | + include( FrmAppHelper::plugin_path() . '/classes/views/shared/info-overlay.php' ); | |
| 442 | 341 | } |
| 443 | 342 | |
| 444 | 343 | /** |
| 445 | 344 | * @since 3.04.02 |
| 446 | - * | |
| 447 | - * @return void | |
| 448 | 345 | */ |
| 449 | 346 | public static function remove_upsells() { |
| 450 | 347 | remove_action( 'frm_before_settings', 'FrmSettingsController::license_box' ); |
| 451 | 348 | remove_action( 'frm_after_settings', 'FrmSettingsController::settings_cta' ); |
| @@ -450,8 +347,13 @@ | ||
| 450 | 347 | remove_action( 'frm_before_settings', 'FrmSettingsController::license_box' ); |
| 451 | 348 | remove_action( 'frm_after_settings', 'FrmSettingsController::settings_cta' ); |
| 452 | 349 | remove_action( 'frm_add_form_style_tab_options', 'FrmFormsController::add_form_style_tab_options' ); |
| 453 | 350 | remove_action( 'frm_after_field_options', 'FrmFormsController::logic_tip' ); |
| 351 | + | |
| 352 | + if ( is_callable( 'FrmProAddonsController::renewal_message' ) ) { | |
| 353 | + // These functions moved to Pro in 4.09.01 | |
| 354 | + remove_action( 'frm_page_footer', 'FrmAppHelper::renewal_message' ); | |
| 355 | + } | |
| 454 | 356 | } |
| 455 | 357 | |
| 456 | 358 | /** |
| 457 | 359 | * If there are CURL problems on this server, wp_remote_post won't work for installing |
| @@ -457,17 +359,12 @@ | ||
| 457 | 359 | * If there are CURL problems on this server, wp_remote_post won't work for installing |
| 458 | 360 | * Use a javascript fallback instead. |
| 459 | 361 | * |
| 460 | 362 | * @since 2.0.3 |
| 461 | - * | |
| 462 | - * @return void | |
| 463 | 363 | */ |
| 464 | 364 | public static function install_js_fallback() { |
| 465 | 365 | FrmAppHelper::load_admin_wide_js(); |
| 466 | - ?> | |
| 467 | - <div id="frm_install_message"></div> | |
| 468 | - <script>jQuery(document).ready( frm_install_now );</script> | |
| 469 | - <?php | |
| 366 | + echo '<div id="hidden frm_install_message"></div><script type="text/javascript">jQuery(document).ready(function(){frm_install_now();});</script>'; | |
| 470 | 367 | } |
| 471 | 368 | |
| 472 | 369 | /** |
| 473 | 370 | * Check if the database is outdated |
| @@ -494,11 +391,8 @@ | ||
| 494 | 391 | /** |
| 495 | 392 | * Check both version number and DB number for changes |
| 496 | 393 | * |
| 497 | 394 | * @since 3.0.04 |
| 498 | - * | |
| 499 | - * @param array $atts | |
| 500 | - * @return bool | |
| 501 | 395 | */ |
| 502 | 396 | public static function compare_for_update( $atts ) { |
| 503 | 397 | $db_version = get_option( $atts['option'] ); |
| 504 | 398 | |
| @@ -517,21 +411,10 @@ | ||
| 517 | 411 | /** |
| 518 | 412 | * Check for database update and trigger js loading |
| 519 | 413 | * |
| 520 | 414 | * @since 2.0.1 |
| 521 | - * | |
| 522 | - * @return void | |
| 523 | 415 | */ |
| 524 | 416 | 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 | 417 | new FrmPersonalData(); // register personal data hooks |
| 535 | 418 | |
| 536 | 419 | if ( ! FrmAppHelper::doing_ajax() && self::needs_update() ) { |
| 537 | 420 | self::network_upgrade_site(); |
| @@ -551,100 +434,18 @@ | ||
| 551 | 434 | } |
| 552 | 435 | |
| 553 | 436 | FrmInbox::maybe_disable_screen_options(); |
| 554 | 437 | } |
| 555 | - | |
| 556 | - self::maybe_add_ip_warning(); | |
| 557 | 438 | } |
| 558 | 439 | |
| 559 | 440 | /** |
| 560 | - * Show a warning for the IP address setting if it hasn't been set. | |
| 561 | - * | |
| 562 | - * @since 6.1 | |
| 563 | - * | |
| 564 | 441 | * @return void |
| 565 | 442 | */ |
| 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 | 443 | public static function admin_js() { |
| 622 | - $plugin_url = FrmAppHelper::plugin_url(); | |
| 623 | - $version = FrmAppHelper::plugin_version(); | |
| 624 | - | |
| 444 | + $version = FrmAppHelper::plugin_version(); | |
| 625 | 445 | FrmAppHelper::load_admin_wide_js(); |
| 626 | 446 | |
| 627 | - wp_register_style( 'formidable_admin_global', $plugin_url . '/css/admin/frm_admin_global.css', array(), $version ); | |
| 628 | - wp_enqueue_style( 'formidable_admin_global' ); | |
| 629 | - | |
| 630 | - wp_register_style( 'formidable-admin', $plugin_url . '/css/frm_admin.css', array(), $version ); | |
| 631 | - wp_register_style( 'formidable-grids', $plugin_url . '/css/frm_grids.css', array(), $version ); | |
| 632 | - | |
| 633 | - wp_register_script( 'formidable_dom', $plugin_url . '/js/admin/dom.js', array( 'jquery', 'jquery-ui-dialog', 'wp-i18n' ), $version, true ); | |
| 634 | - wp_register_script( 'formidable_embed', $plugin_url . '/js/admin/embed.js', array( 'formidable_dom', 'jquery-ui-autocomplete' ), $version, true ); | |
| 635 | - self::register_popper1(); | |
| 636 | - 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 | - | |
| 639 | - $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); | |
| 640 | - | |
| 641 | - if ( 'formidable-applications' === $page ) { | |
| 642 | - FrmApplicationsController::load_assets(); | |
| 643 | - return; | |
| 644 | - } | |
| 645 | - | |
| 646 | - $dependencies = array( | |
| 447 | + $dependecies = array( | |
| 647 | 448 | 'formidable_admin_global', |
| 648 | 449 | 'jquery', |
| 649 | 450 | 'jquery-ui-core', |
| 650 | 451 | 'jquery-ui-draggable', |
| @@ -651,27 +452,32 @@ | ||
| 651 | 452 | 'jquery-ui-sortable', |
| 652 | 453 | 'bootstrap_tooltip', |
| 653 | 454 | 'bootstrap-multiselect', |
| 654 | 455 | 'wp-i18n', |
| 655 | - 'wp-hooks', // Required in WP versions older than 5.7 | |
| 656 | - 'formidable_dom', | |
| 657 | - 'formidable_embed', | |
| 658 | 456 | ); |
| 659 | 457 | |
| 660 | - if ( FrmAppHelper::is_style_editor_page( 'edit' ) ) { | |
| 661 | - // We only need to load the color picker when editing styles. | |
| 662 | - $dependencies[] = 'wp-color-picker'; | |
| 458 | + if ( FrmAppHelper::is_admin_page( 'formidable-styles' ) || FrmAppHelper::is_admin_page( 'formidable-styles2' ) ) { | |
| 459 | + $dependecies[] = 'wp-color-picker'; | |
| 663 | 460 | } |
| 664 | 461 | |
| 665 | - wp_register_script( 'formidable_admin', $plugin_url . '/js/formidable_admin.js', $dependencies, $version, true ); | |
| 462 | + wp_register_script( 'formidable_admin', FrmAppHelper::plugin_url() . '/js/formidable_admin.js', $dependecies, $version, true ); | |
| 463 | + wp_register_style( 'formidable-admin', FrmAppHelper::plugin_url() . '/css/frm_admin.css', array(), $version ); | |
| 464 | + wp_register_script( 'popper', FrmAppHelper::plugin_url() . '/js/popper.min.js', array( 'jquery' ), '1.16.0', true ); | |
| 465 | + wp_register_script( 'bootstrap_tooltip', FrmAppHelper::plugin_url() . '/js/bootstrap.min.js', array( 'jquery', 'popper' ), '4.6.1', true ); | |
| 466 | + wp_register_style( 'formidable-grids', FrmAppHelper::plugin_url() . '/css/frm_grids.css', array(), $version ); | |
| 666 | 467 | |
| 667 | - if ( FrmAppHelper::on_form_listing_page() ) { | |
| 668 | - // For the existing page dropdown in the Form embed modal. | |
| 669 | - wp_enqueue_script( 'jquery-ui-autocomplete' ); | |
| 468 | + if ( 'formidable' === FrmAppHelper::simple_get( 'page', 'sanitize_title' ) ) { | |
| 469 | + $action = FrmAppHelper::get_param( 'frm_action', '', 'sanitize_title' ); | |
| 470 | + $is_form_index = ! $action || in_array( $action, array( 'list', 'trash' ), true ); | |
| 471 | + if ( $is_form_index ) { | |
| 472 | + // For the existing page dropdown in the Form embed modal. | |
| 473 | + wp_enqueue_script( 'jquery-ui-autocomplete' ); | |
| 474 | + } | |
| 670 | 475 | } |
| 671 | 476 | |
| 672 | - wp_register_script( 'bootstrap-multiselect', $plugin_url . '/js/bootstrap-multiselect.js', array( 'jquery', 'bootstrap_tooltip', 'popper' ), '1.1.1', true ); | |
| 477 | + wp_register_script( 'bootstrap-multiselect', FrmAppHelper::plugin_url() . '/js/bootstrap-multiselect.js', array( 'jquery', 'bootstrap_tooltip', 'popper' ), '1.1.1', true ); | |
| 673 | 478 | |
| 479 | + $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); | |
| 674 | 480 | $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title' ); |
| 675 | 481 | |
| 676 | 482 | global $pagenow; |
| 677 | 483 | if ( strpos( $page, 'formidable' ) === 0 || ( $pagenow === 'edit.php' && $post_type === 'frm_display' ) ) { |
| @@ -677,11 +483,9 @@ | ||
| 677 | 483 | if ( strpos( $page, 'formidable' ) === 0 || ( $pagenow === 'edit.php' && $post_type === 'frm_display' ) ) { |
| 678 | 484 | |
| 679 | 485 | wp_enqueue_script( 'admin-widgets' ); |
| 680 | 486 | wp_enqueue_style( 'widgets' ); |
| 681 | - self::maybe_deregister_popper2(); | |
| 682 | 487 | wp_enqueue_script( 'formidable_admin' ); |
| 683 | - wp_enqueue_script( 'formidable_embed' ); | |
| 684 | 488 | FrmAppHelper::localize_script( 'admin' ); |
| 685 | 489 | |
| 686 | 490 | wp_enqueue_style( 'formidable-admin' ); |
| 687 | 491 | if ( 'formidable-styles' !== $page && 'formidable-styles2' !== $page ) { |
| @@ -712,9 +516,14 @@ | ||
| 712 | 516 | return; |
| 713 | 517 | } |
| 714 | 518 | |
| 715 | 519 | if ( $post_type === 'frm_display' ) { |
| 716 | - self::enqueue_legacy_views_assets(); | |
| 520 | + wp_enqueue_style( 'formidable-grids' ); | |
| 521 | + wp_enqueue_script( 'jquery-ui-draggable' ); | |
| 522 | + wp_enqueue_script( 'formidable_admin' ); | |
| 523 | + wp_enqueue_style( 'formidable-admin' ); | |
| 524 | + FrmAppHelper::localize_script( 'admin' ); | |
| 525 | + self::include_info_overlay(); | |
| 717 | 526 | } |
| 718 | 527 | } |
| 719 | 528 | |
| 720 | 529 | self::maybe_force_formidable_block_on_gutenberg_page(); |
| @@ -720,81 +529,10 @@ | ||
| 720 | 529 | self::maybe_force_formidable_block_on_gutenberg_page(); |
| 721 | 530 | } |
| 722 | 531 | |
| 723 | 532 | /** |
| 724 | - * Enqueue required assets for the Legacy Views editor (Views v4.x). | |
| 533 | + * Automatically insert a Formidable block when loading Gutenberg with a $_GET['frmForm'] value set. | |
| 725 | 534 | * |
| 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 | - * Fix a Duplicator Pro conflict because it uses Popper 2. See issue #3459. | |
| 764 | - * | |
| 765 | - * @since 5.2.02.01 | |
| 766 | - * | |
| 767 | - * @return void | |
| 768 | - */ | |
| 769 | - private static function maybe_deregister_popper2() { | |
| 770 | - global $wp_scripts; | |
| 771 | - | |
| 772 | - if ( ! array_key_exists( 'popper', $wp_scripts->registered ) ) { | |
| 773 | - return; | |
| 774 | - } | |
| 775 | - | |
| 776 | - $popper = $wp_scripts->registered['popper']; | |
| 777 | - if ( version_compare( $popper->ver, '2.0', '>=' ) ) { | |
| 778 | - wp_deregister_script( 'popper' ); | |
| 779 | - self::register_popper1(); | |
| 780 | - } | |
| 781 | - } | |
| 782 | - | |
| 783 | - /** | |
| 784 | - * Register Popper required for Bootstrap 4. | |
| 785 | - * | |
| 786 | - * @since 5.2.02.01 | |
| 787 | - * | |
| 788 | - * @return void | |
| 789 | - */ | |
| 790 | - private static function register_popper1() { | |
| 791 | - wp_register_script( 'popper', FrmAppHelper::plugin_url() . '/js/popper.min.js', array( 'jquery' ), '1.16.0', true ); | |
| 792 | - } | |
| 793 | - | |
| 794 | - /** | |
| 795 | - * Automatically insert a Formidable block when loading Gutenberg when $_GET['frmForm' is set. | |
| 796 | - * | |
| 797 | 535 | * @since 5.2 |
| 798 | 536 | * |
| 799 | 537 | * @return void |
| 800 | 538 | */ |
| @@ -808,27 +546,77 @@ | ||
| 808 | 546 | if ( ! $form_id ) { |
| 809 | 547 | return; |
| 810 | 548 | } |
| 811 | 549 | |
| 812 | - self::add_js_to_inject_gutenberg_block( 'formidable/simple-form', 'formId', $form_id ); | |
| 813 | - } | |
| 550 | + ?> | |
| 551 | + <script> | |
| 552 | + ( function() { | |
| 553 | + const handleDomReady = () => { | |
| 554 | + if ( 'undefined' === typeof wp || 'undefined' === typeof wp.data || 'function' !== typeof wp.data.subscribe ) { | |
| 555 | + return; | |
| 556 | + } | |
| 814 | 557 | |
| 815 | - /** | |
| 816 | - * @since 5.3 | |
| 817 | - * | |
| 818 | - * @param string $block_name | |
| 819 | - * @param string $object_key | |
| 820 | - * @param array|string $object_id | |
| 821 | - * | |
| 822 | - * @return void | |
| 823 | - */ | |
| 824 | - public static function add_js_to_inject_gutenberg_block( $block_name, $object_key, $object_id ) { | |
| 825 | - require FrmAppHelper::plugin_path() . '/classes/views/shared/edit-page-js.php'; | |
| 558 | + const closeListener = wp.data.subscribe( | |
| 559 | + () => { | |
| 560 | + const editor = wp.data.select( 'core/editor' ); | |
| 561 | + | |
| 562 | + if ( 'function' !== typeof editor.__unstableIsEditorReady ) { | |
| 563 | + closeListener(); | |
| 564 | + return; | |
| 565 | + } | |
| 566 | + | |
| 567 | + const isReady = editor.__unstableIsEditorReady(); | |
| 568 | + if ( isReady ) { | |
| 569 | + closeListener(); | |
| 570 | + requestAnimationFrame( () => injectFormidableBlock() ); | |
| 571 | + } | |
| 572 | + } | |
| 573 | + ); | |
| 574 | + } | |
| 575 | + | |
| 576 | + document.addEventListener( 'DOMContentLoaded', handleDomReady ); | |
| 577 | + | |
| 578 | + const injectFormidableBlock = () => { | |
| 579 | + insertedBlock = wp.blocks.createBlock( | |
| 580 | + 'formidable/simple-form', | |
| 581 | + { | |
| 582 | + formId: '<?php echo absint( $form_id ); ?>' | |
| 583 | + } | |
| 584 | + ); | |
| 585 | + | |
| 586 | + const getBlocks = () => wp.data.select( 'core/editor' ).getBlocks(); | |
| 587 | + const blockList = getBlocks(); | |
| 588 | + | |
| 589 | + const closeListener = wp.data.subscribe( | |
| 590 | + () => { | |
| 591 | + const currentBlocks = getBlocks(); | |
| 592 | + if ( currentBlocks === blockList ) { | |
| 593 | + return; | |
| 594 | + } | |
| 595 | + | |
| 596 | + closeListener(); | |
| 597 | + const block = currentBlocks[ currentBlocks.length - 1 ]; | |
| 598 | + const interval = setInterval( | |
| 599 | + () => { | |
| 600 | + const scrollTarget = document.getElementById( 'block-' + block.clientId ); | |
| 601 | + const form = scrollTarget.querySelector( 'form' ); | |
| 602 | + if ( form ) { | |
| 603 | + scrollTarget.scrollIntoView({ behavior: 'smooth' }); | |
| 604 | + clearInterval( interval ); | |
| 605 | + } | |
| 606 | + }, | |
| 607 | + 50 | |
| 608 | + ); | |
| 609 | + } | |
| 610 | + ); | |
| 611 | + | |
| 612 | + wp.data.dispatch( 'core/block-editor' ).insertBlocks( insertedBlock ); | |
| 613 | + }; | |
| 614 | + }() ); | |
| 615 | + </script> | |
| 616 | + <?php | |
| 826 | 617 | } |
| 827 | 618 | |
| 828 | - /** | |
| 829 | - * @return void | |
| 830 | - */ | |
| 831 | 619 | public static function load_lang() { |
| 832 | 620 | load_plugin_textdomain( 'formidable', false, FrmAppHelper::plugin_folder() . '/languages/' ); |
| 833 | 621 | } |
| 834 | 622 | |
| @@ -835,10 +623,8 @@ | ||
| 835 | 623 | /** |
| 836 | 624 | * Check if the styles are updated when a form is loaded on the front-end |
| 837 | 625 | * |
| 838 | 626 | * @since 3.0.1 |
| 839 | - * | |
| 840 | - * @return void | |
| 841 | 627 | */ |
| 842 | 628 | public static function maybe_update_styles() { |
| 843 | 629 | if ( self::needs_update() ) { |
| 844 | 630 | self::network_upgrade_site(); |
| @@ -846,10 +632,8 @@ | ||
| 846 | 632 | } |
| 847 | 633 | |
| 848 | 634 | /** |
| 849 | 635 | * @since 3.0 |
| 850 | - * | |
| 851 | - * @return void | |
| 852 | 636 | */ |
| 853 | 637 | public static function create_rest_routes() { |
| 854 | 638 | $args = array( |
| 855 | 639 | 'methods' => 'GET', |
| @@ -884,10 +668,8 @@ | ||
| 884 | 668 | * |
| 885 | 669 | * @since 2.0.1 |
| 886 | 670 | * |
| 887 | 671 | * @param int $blog_id Blog ID. |
| 888 | - * | |
| 889 | - * @return void | |
| 890 | 672 | */ |
| 891 | 673 | public static function network_upgrade_site( $blog_id = 0 ) { |
| 892 | 674 | // Flag to check if install is happening as intended. |
| 893 | 675 | set_transient( 'frm_updating_api', true, MINUTE_IN_SECONDS ); |
| @@ -911,10 +693,8 @@ | ||
| 911 | 693 | |
| 912 | 694 | /** |
| 913 | 695 | * Make sure WP_Site_Health has been included because it is required when calling rest_do_request. |
| 914 | 696 | * Check first that the file exists because WP_Site_Health was only introduced in WordPress 5.2. |
| 915 | - * | |
| 916 | - * @return void | |
| 917 | 697 | */ |
| 918 | 698 | private static function maybe_add_wp_site_health() { |
| 919 | 699 | if ( ! class_exists( 'WP_Site_Health' ) ) { |
| 920 | 700 | $wp_site_health_path = ABSPATH . 'wp-admin/includes/class-wp-site-health.php'; |
| @@ -925,10 +705,8 @@ | ||
| 925 | 705 | } |
| 926 | 706 | |
| 927 | 707 | /** |
| 928 | 708 | * @since 3.0 |
| 929 | - * | |
| 930 | - * @return true | |
| 931 | 709 | */ |
| 932 | 710 | public static function api_install() { |
| 933 | 711 | delete_transient( 'frm_updating_api' ); |
| 934 | 712 | if ( self::needs_update() ) { |
| @@ -947,29 +725,19 @@ | ||
| 947 | 725 | * Silent database upgrade (no redirect). |
| 948 | 726 | * Called via ajax request during network upgrade process. |
| 949 | 727 | * |
| 950 | 728 | * @since 2.0.1 |
| 951 | - * | |
| 952 | - * @return void | |
| 953 | 729 | */ |
| 954 | 730 | public static function ajax_install() { |
| 955 | - FrmAppHelper::permission_check( 'frm_change_settings' ); | |
| 956 | - check_ajax_referer( 'frm_ajax', 'nonce' ); | |
| 957 | 731 | self::api_install(); |
| 958 | 732 | wp_die(); |
| 959 | 733 | } |
| 960 | 734 | |
| 961 | - /** | |
| 962 | - * @return void | |
| 963 | - */ | |
| 964 | 735 | public static function install() { |
| 965 | 736 | $frmdb = new FrmMigrate(); |
| 966 | 737 | $frmdb->upgrade(); |
| 967 | 738 | } |
| 968 | 739 | |
| 969 | - /** | |
| 970 | - * @return void | |
| 971 | - */ | |
| 972 | 740 | public static function uninstall() { |
| 973 | 741 | FrmAppHelper::permission_check( 'administrator' ); |
| 974 | 742 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 975 | 743 | |
| @@ -993,11 +761,8 @@ | ||
| 993 | 761 | |
| 994 | 762 | return $tables; |
| 995 | 763 | } |
| 996 | 764 | |
| 997 | - /** | |
| 998 | - * @return void | |
| 999 | - */ | |
| 1000 | 765 | public static function deauthorize() { |
| 1001 | 766 | FrmAppHelper::permission_check( 'frm_change_settings' ); |
| 1002 | 767 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 1003 | 768 | |
| @@ -1016,45 +781,56 @@ | ||
| 1016 | 781 | return $text; |
| 1017 | 782 | } |
| 1018 | 783 | |
| 1019 | 784 | /** |
| 1020 | - * @deprecated 3.0.04 | |
| 785 | + * Include icons on page for Embed Form modal. | |
| 1021 | 786 | * |
| 1022 | - * @codeCoverageIgnore | |
| 787 | + * @since 5.2 | |
| 1023 | 788 | * |
| 1024 | 789 | * @return void |
| 1025 | 790 | */ |
| 1026 | - public static function activation_install() { | |
| 1027 | - FrmDeprecated::activation_install(); | |
| 791 | + public static function include_embed_form_icons() { | |
| 792 | + require_once FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_embed_form_icons.php'; | |
| 1028 | 793 | } |
| 1029 | 794 | |
| 1030 | 795 | /** |
| 1031 | - * @deprecated 3.0 | |
| 796 | + * @deprecated 1.07.05 | |
| 1032 | 797 | * @codeCoverageIgnore |
| 1033 | 798 | */ |
| 1034 | - public static function page_route( $content ) { | |
| 1035 | - return FrmDeprecated::page_route( $content ); | |
| 799 | + public static function get_form_shortcode( $atts ) { | |
| 800 | + return FrmDeprecated::get_form_shortcode( $atts ); | |
| 1036 | 801 | } |
| 1037 | 802 | |
| 1038 | 803 | /** |
| 1039 | - * Include icons on page for Embed Form modal. | |
| 804 | + * @deprecated 2.5.4 | |
| 805 | + * @codeCoverageIgnore | |
| 806 | + */ | |
| 807 | + public static function widget_text_filter( $content ) { | |
| 808 | + return FrmDeprecated::widget_text_filter( $content ); | |
| 809 | + } | |
| 810 | + | |
| 811 | + /** | |
| 812 | + * Deprecated in favor of wpmu_upgrade_site | |
| 1040 | 813 | * |
| 1041 | - * @since 5.2 | |
| 1042 | - * | |
| 1043 | - * @return void | |
| 814 | + * @deprecated 2.3 | |
| 815 | + * @codeCoverageIgnore | |
| 1044 | 816 | */ |
| 1045 | - public static function include_embed_form_icons() { | |
| 1046 | - _deprecated_function( __METHOD__, '5.3' ); | |
| 817 | + public static function front_head() { | |
| 818 | + FrmDeprecated::front_head(); | |
| 1047 | 819 | } |
| 1048 | 820 | |
| 1049 | 821 | /** |
| 1050 | - * @deprecated 1.07.05 This is still referenced in the API add on as of v1.13. | |
| 822 | + * @deprecated 3.0.04 | |
| 1051 | 823 | * @codeCoverageIgnore |
| 1052 | - * | |
| 1053 | - * @param array $atts | |
| 1054 | - * @return string | |
| 1055 | 824 | */ |
| 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 ); | |
| 825 | + public static function activation_install() { | |
| 826 | + FrmDeprecated::activation_install(); | |
| 827 | + } | |
| 828 | + | |
| 829 | + /** | |
| 830 | + * @deprecated 3.0 | |
| 831 | + * @codeCoverageIgnore | |
| 832 | + */ | |
| 833 | + public static function page_route( $content ) { | |
| 834 | + return FrmDeprecated::page_route( $content ); | |
| 1059 | 835 | } |
| 1060 | 836 | } |
