| @@ -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', |
| @@ -135,14 +100,8 @@ | ||
| 135 | 100 | 'formidable-welcome', |
| 136 | 101 | 'formidable-applications', |
| 137 | 102 | ); |
| 138 | 103 | |
| 139 | - if ( ! class_exists( 'FrmTransHooksController', false ) ) { | |
| 140 | - // Only consider the payments page as a "white page" when the Payments submodule is off. | |
| 141 | - // Otherwise this causes a lot of styling issues when the Stripe add-on (or Authorize.Net) is active. | |
| 142 | - $white_pages[] = 'formidable-payments'; | |
| 143 | - } | |
| 144 | - | |
| 145 | 104 | $get_page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); |
| 146 | 105 | $is_white_page = in_array( $get_page, $white_pages, true ); |
| 147 | 106 | |
| 148 | 107 | if ( ! $is_white_page ) { |
| @@ -161,23 +120,12 @@ | ||
| 161 | 120 | |
| 162 | 121 | return $is_white_page; |
| 163 | 122 | } |
| 164 | 123 | |
| 165 | - /** | |
| 166 | - * @return void | |
| 167 | - */ | |
| 168 | 124 | public static function load_wp_admin_style() { |
| 169 | 125 | FrmAppHelper::load_font_style(); |
| 170 | 126 | } |
| 171 | 127 | |
| 172 | - /** | |
| 173 | - * @param bool $show_nav | |
| 174 | - * @param string $title | |
| 175 | - * | |
| 176 | - * @psalm-param 'hide'|'show' $title | |
| 177 | - * | |
| 178 | - * @return void | |
| 179 | - */ | |
| 180 | 128 | public static function get_form_nav( $form, $show_nav = false, $title = 'show' ) { |
| 181 | 129 | $show_nav = FrmAppHelper::get_param( 'show_nav', $show_nav, 'get', 'absint' ); |
| 182 | 130 | if ( empty( $show_nav ) || ! $form ) { |
| 183 | 131 | return; |
| @@ -194,11 +142,8 @@ | ||
| 194 | 142 | |
| 195 | 143 | include( FrmAppHelper::plugin_path() . '/classes/views/shared/form-nav.php' ); |
| 196 | 144 | } |
| 197 | 145 | |
| 198 | - /** | |
| 199 | - * @return string | |
| 200 | - */ | |
| 201 | 146 | private static function get_current_page() { |
| 202 | 147 | $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); |
| 203 | 148 | $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title', 'None' ); |
| 204 | 149 | $current_page = isset( $_GET['page'] ) ? $page : $post_type; |
| @@ -209,12 +154,8 @@ | ||
| 209 | 154 | |
| 210 | 155 | return $current_page; |
| 211 | 156 | } |
| 212 | 157 | |
| 213 | - /** | |
| 214 | - * @param object $form | |
| 215 | - * @return array | |
| 216 | - */ | |
| 217 | 158 | private static function get_form_nav_items( $form ) { |
| 218 | 159 | $id = $form->parent_form_id ? $form->parent_form_id : $form->id; |
| 219 | 160 | |
| 220 | 161 | $nav_items = array( |
| @@ -225,15 +166,8 @@ | ||
| 225 | 166 | 'page' => 'formidable', |
| 226 | 167 | 'permission' => 'frm_edit_forms', |
| 227 | 168 | ), |
| 228 | 169 | array( |
| 229 | - 'link' => FrmStylesHelper::get_list_url( $id ), | |
| 230 | - 'label' => __( 'Style', 'formidable' ), | |
| 231 | - 'current' => array(), | |
| 232 | - 'page' => 'formidable-styles', | |
| 233 | - 'permission' => 'frm_edit_forms', | |
| 234 | - ), | |
| 235 | - array( | |
| 236 | 170 | 'link' => admin_url( 'admin.php?page=formidable&frm_action=settings&id=' . absint( $id ) ), |
| 237 | 171 | 'label' => __( 'Settings', 'formidable' ), |
| 238 | 172 | 'current' => array( 'settings' ), |
| 239 | 173 | 'page' => 'formidable', |
| @@ -239,9 +173,9 @@ | ||
| 239 | 173 | 'page' => 'formidable', |
| 240 | 174 | 'permission' => 'frm_edit_forms', |
| 241 | 175 | ), |
| 242 | 176 | array( |
| 243 | - '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 ) ), | |
| 244 | 178 | 'label' => __( 'Entries', 'formidable' ), |
| 245 | 179 | 'current' => array(), |
| 246 | 180 | 'page' => 'formidable-entries', |
| 247 | 181 | 'permission' => 'frm_view_entries', |
| @@ -251,9 +185,9 @@ | ||
| 251 | 185 | $views_installed = is_callable( 'FrmProAppHelper::views_is_installed' ) ? FrmProAppHelper::views_is_installed() : FrmAppHelper::pro_is_installed(); |
| 252 | 186 | |
| 253 | 187 | if ( ! $views_installed ) { |
| 254 | 188 | $nav_items[] = array( |
| 255 | - '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 ) ), | |
| 256 | 190 | 'label' => __( 'Views', 'formidable' ), |
| 257 | 191 | 'current' => array(), |
| 258 | 192 | 'page' => 'formidable-views', |
| 259 | 193 | 'permission' => 'frm_view_entries', |
| @@ -265,9 +199,9 @@ | ||
| 265 | 199 | |
| 266 | 200 | // Let people know reports and views exist. |
| 267 | 201 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| 268 | 202 | $nav_items[] = array( |
| 269 | - '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 ) ), | |
| 270 | 204 | 'label' => __( 'Reports', 'formidable' ), |
| 271 | 205 | 'current' => array( 'reports' ), |
| 272 | 206 | 'page' => 'formidable', |
| 273 | 207 | 'permission' => 'frm_view_entries', |
| @@ -281,20 +215,17 @@ | ||
| 281 | 215 | 'form_id' => $id, |
| 282 | 216 | 'form' => $form, |
| 283 | 217 | ); |
| 284 | 218 | |
| 285 | - return (array) apply_filters( 'frm_form_nav_list', $nav_items, $nav_args ); | |
| 219 | + return apply_filters( 'frm_form_nav_list', $nav_items, $nav_args ); | |
| 286 | 220 | } |
| 287 | 221 | |
| 288 | 222 | // Adds a settings link to the plugins page |
| 289 | - /** | |
| 290 | - * @return array | |
| 291 | - */ | |
| 292 | 223 | public static function settings_link( $links ) { |
| 293 | 224 | $settings = array(); |
| 294 | 225 | |
| 295 | 226 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| 296 | - $settings[] = '<a href="' . esc_url( FrmAppHelper::admin_upgrade_link( 'plugin-row' ) ) . '" target="_blank" rel="noopener"><b style="color:#1da867;font-weight:700;">' . esc_html__( 'Upgrade to Pro', 'formidable' ) . '</b></a>'; | |
| 227 | + $settings[] = '<a href="' . esc_url( FrmAppHelper::admin_upgrade_link( 'plugin-row' ) ) . '" target="_blank" rel="noopener"><b>' . esc_html__( 'Upgrade to Pro', 'formidable' ) . '</b></a>'; | |
| 297 | 228 | } |
| 298 | 229 | |
| 299 | 230 | $settings[] = '<a href="' . esc_url( admin_url( 'admin.php?page=formidable' ) ) . '">' . __( 'Build a Form', 'formidable' ) . '</a>'; |
| 300 | 231 | |
| @@ -300,11 +231,8 @@ | ||
| 300 | 231 | |
| 301 | 232 | return array_merge( $settings, $links ); |
| 302 | 233 | } |
| 303 | 234 | |
| 304 | - /** | |
| 305 | - * @return void | |
| 306 | - */ | |
| 307 | 235 | public static function pro_get_started_headline() { |
| 308 | 236 | self::review_request(); |
| 309 | 237 | FrmAppHelper::min_pro_version_notice( '4.0' ); |
| 310 | 238 | } |
| @@ -312,10 +240,8 @@ | ||
| 312 | 240 | /** |
| 313 | 241 | * Add admin notices as needed for reviews |
| 314 | 242 | * |
| 315 | 243 | * @since 3.04.03 |
| 316 | - * | |
| 317 | - * @return void | |
| 318 | 244 | */ |
| 319 | 245 | private static function review_request() { |
| 320 | 246 | $reviews = new FrmReviews(); |
| 321 | 247 | $reviews->review_request(); |
| @@ -324,10 +250,8 @@ | ||
| 324 | 250 | /** |
| 325 | 251 | * Save the request to hide the review |
| 326 | 252 | * |
| 327 | 253 | * @since 3.04.03 |
| 328 | - * | |
| 329 | - * @return void | |
| 330 | 254 | */ |
| 331 | 255 | public static function dismiss_review() { |
| 332 | 256 | FrmAppHelper::permission_check( 'frm_change_settings' ); |
| 333 | 257 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| @@ -337,10 +261,8 @@ | ||
| 337 | 261 | } |
| 338 | 262 | |
| 339 | 263 | /** |
| 340 | 264 | * @since 3.04.02 |
| 341 | - * | |
| 342 | - * @return void | |
| 343 | 265 | */ |
| 344 | 266 | public static function include_upgrade_overlay() { |
| 345 | 267 | self::enqueue_dialog_assets(); |
| 346 | 268 | add_action( 'admin_footer', 'FrmAppController::upgrade_overlay_html' ); |
| @@ -359,10 +281,8 @@ | ||
| 359 | 281 | } |
| 360 | 282 | |
| 361 | 283 | /** |
| 362 | 284 | * @since 3.06.03 |
| 363 | - * | |
| 364 | - * @return void | |
| 365 | 285 | */ |
| 366 | 286 | public static function upgrade_overlay_html() { |
| 367 | 287 | $is_pro = FrmAppHelper::pro_is_installed(); |
| 368 | 288 | $upgrade_link = array( |
| @@ -380,11 +300,8 @@ | ||
| 380 | 300 | self::new_form_overlay_html(); |
| 381 | 301 | } |
| 382 | 302 | } |
| 383 | 303 | |
| 384 | - /** | |
| 385 | - * @return void | |
| 386 | - */ | |
| 387 | 304 | private static function new_form_overlay_html() { |
| 388 | 305 | FrmFormsController::before_list_templates(); |
| 389 | 306 | |
| 390 | 307 | $plugin_path = FrmAppHelper::plugin_path(); |
| @@ -431,19 +348,13 @@ | ||
| 431 | 348 | |
| 432 | 349 | include $path . 'new-form-overlay.php'; |
| 433 | 350 | } |
| 434 | 351 | |
| 435 | - /** | |
| 436 | - * @return void | |
| 437 | - */ | |
| 438 | 352 | public static function include_info_overlay() { |
| 439 | 353 | self::enqueue_dialog_assets(); |
| 440 | 354 | add_action( 'admin_footer', 'FrmAppController::info_overlay_html' ); |
| 441 | 355 | } |
| 442 | 356 | |
| 443 | - /** | |
| 444 | - * @return void | |
| 445 | - */ | |
| 446 | 357 | public static function info_overlay_html() { |
| 447 | 358 | include FrmAppHelper::plugin_path() . '/classes/views/shared/info-overlay.php'; |
| 448 | 359 | } |
| 449 | 360 | |
| @@ -448,10 +359,8 @@ | ||
| 448 | 359 | } |
| 449 | 360 | |
| 450 | 361 | /** |
| 451 | 362 | * @since 3.04.02 |
| 452 | - * | |
| 453 | - * @return void | |
| 454 | 363 | */ |
| 455 | 364 | public static function remove_upsells() { |
| 456 | 365 | remove_action( 'frm_before_settings', 'FrmSettingsController::license_box' ); |
| 457 | 366 | remove_action( 'frm_after_settings', 'FrmSettingsController::settings_cta' ); |
| @@ -456,8 +365,13 @@ | ||
| 456 | 365 | remove_action( 'frm_before_settings', 'FrmSettingsController::license_box' ); |
| 457 | 366 | remove_action( 'frm_after_settings', 'FrmSettingsController::settings_cta' ); |
| 458 | 367 | remove_action( 'frm_add_form_style_tab_options', 'FrmFormsController::add_form_style_tab_options' ); |
| 459 | 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 | + } | |
| 460 | 374 | } |
| 461 | 375 | |
| 462 | 376 | /** |
| 463 | 377 | * If there are CURL problems on this server, wp_remote_post won't work for installing |
| @@ -463,17 +377,12 @@ | ||
| 463 | 377 | * If there are CURL problems on this server, wp_remote_post won't work for installing |
| 464 | 378 | * Use a javascript fallback instead. |
| 465 | 379 | * |
| 466 | 380 | * @since 2.0.3 |
| 467 | - * | |
| 468 | - * @return void | |
| 469 | 381 | */ |
| 470 | 382 | public static function install_js_fallback() { |
| 471 | 383 | FrmAppHelper::load_admin_wide_js(); |
| 472 | - ?> | |
| 473 | - <div id="frm_install_message"></div> | |
| 474 | - <script>jQuery(document).ready( frm_install_now );</script> | |
| 475 | - <?php | |
| 384 | + echo '<div id="hidden frm_install_message"></div><script type="text/javascript">jQuery(document).ready(function(){frm_install_now();});</script>'; | |
| 476 | 385 | } |
| 477 | 386 | |
| 478 | 387 | /** |
| 479 | 388 | * Check if the database is outdated |
| @@ -500,11 +409,8 @@ | ||
| 500 | 409 | /** |
| 501 | 410 | * Check both version number and DB number for changes |
| 502 | 411 | * |
| 503 | 412 | * @since 3.0.04 |
| 504 | - * | |
| 505 | - * @param array $atts | |
| 506 | - * @return bool | |
| 507 | 413 | */ |
| 508 | 414 | public static function compare_for_update( $atts ) { |
| 509 | 415 | $db_version = get_option( $atts['option'] ); |
| 510 | 416 | |
| @@ -523,21 +429,10 @@ | ||
| 523 | 429 | /** |
| 524 | 430 | * Check for database update and trigger js loading |
| 525 | 431 | * |
| 526 | 432 | * @since 2.0.1 |
| 527 | - * | |
| 528 | - * @return void | |
| 529 | 433 | */ |
| 530 | 434 | public static function admin_init() { |
| 531 | - if ( FrmAppHelper::is_admin_page( 'formidable' ) && 'duplicate' === FrmAppHelper::get_param( 'frm_action' ) ) { | |
| 532 | - FrmFormsController::duplicate(); | |
| 533 | - } | |
| 534 | - | |
| 535 | - if ( FrmAppHelper::is_style_editor_page() && 'save' === FrmAppHelper::get_param( 'frm_action' ) ) { | |
| 536 | - // Hook in earlier than FrmStylesController::route so we can redirect before the headers have been sent. | |
| 537 | - FrmStylesController::save_style(); | |
| 538 | - } | |
| 539 | - | |
| 540 | 435 | new FrmPersonalData(); // register personal data hooks |
| 541 | 436 | |
| 542 | 437 | if ( ! FrmAppHelper::doing_ajax() && self::needs_update() ) { |
| 543 | 438 | self::network_upgrade_site(); |
| @@ -557,74 +452,13 @@ | ||
| 557 | 452 | } |
| 558 | 453 | |
| 559 | 454 | FrmInbox::maybe_disable_screen_options(); |
| 560 | 455 | } |
| 561 | - | |
| 562 | - self::maybe_add_ip_warning(); | |
| 563 | 456 | } |
| 564 | 457 | |
| 565 | 458 | /** |
| 566 | - * Show a warning for the IP address setting if it hasn't been set. | |
| 567 | - * | |
| 568 | - * @since 6.1 | |
| 569 | - * | |
| 570 | 459 | * @return void |
| 571 | 460 | */ |
| 572 | - private static function maybe_add_ip_warning() { | |
| 573 | - $settings = FrmAppHelper::get_settings(); | |
| 574 | - if ( false !== $settings->custom_header_ip ) { | |
| 575 | - // The setting has been changed from the false default (to either 1 or 0), so stop showing the message. | |
| 576 | - return; | |
| 577 | - } | |
| 578 | - | |
| 579 | - if ( ! self::is_behind_proxy() ) { | |
| 580 | - // This message is only applicable when using a reverse proxy. | |
| 581 | - return; | |
| 582 | - } | |
| 583 | - | |
| 584 | - if ( FrmAppHelper::get_post_param( 'frm_action', '', 'sanitize_text_field' ) ) { | |
| 585 | - // Avoid the message on a POST action. We don't want to show the message if we're saving global settings. | |
| 586 | - return; | |
| 587 | - } | |
| 588 | - | |
| 589 | - $global_settings_link = admin_url( 'admin.php?page=formidable-settings' ) . '#frm_custom_header_ip'; | |
| 590 | - $message = sprintf( | |
| 591 | - // Translators: 1: Global Settings Link | |
| 592 | - __( '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' ), | |
| 593 | - '<a href="' . esc_url( $global_settings_link ) . '">Global Settings</a>' | |
| 594 | - ); | |
| 595 | - $option_name = 'frm_dismiss_ip_address_notice'; | |
| 596 | - FrmAppHelper::add_dismissable_warning_message( $message, $option_name ); | |
| 597 | - } | |
| 598 | - | |
| 599 | - /** | |
| 600 | - * Check if any reverse proxy headers are set. | |
| 601 | - * | |
| 602 | - * @since 6.1 | |
| 603 | - * | |
| 604 | - * @return bool | |
| 605 | - */ | |
| 606 | - private static function is_behind_proxy() { | |
| 607 | - $custom_headers = FrmAppHelper::get_custom_header_keys_for_ip(); | |
| 608 | - foreach ( $custom_headers as $header ) { | |
| 609 | - if ( 'REMOTE_ADDR' === $header ) { | |
| 610 | - // We want to check every key but REMOTE_ADDR. REMOTE_ATTR is not unique to reverse proxy servers. | |
| 611 | - continue; | |
| 612 | - } | |
| 613 | - | |
| 614 | - $ip = trim( FrmAppHelper::get_server_value( $header ) ); | |
| 615 | - // Return true for anything that isn't empty but ignoring values like ::1. | |
| 616 | - if ( $ip && 0 !== strpos( $ip, '::' ) ) { | |
| 617 | - return true; | |
| 618 | - } | |
| 619 | - } | |
| 620 | - | |
| 621 | - return false; | |
| 622 | - } | |
| 623 | - | |
| 624 | - /** | |
| 625 | - * @return void | |
| 626 | - */ | |
| 627 | 461 | public static function admin_js() { |
| 628 | 462 | $plugin_url = FrmAppHelper::plugin_url(); |
| 629 | 463 | $version = FrmAppHelper::plugin_version(); |
| 630 | 464 | |
| @@ -639,23 +473,11 @@ | ||
| 639 | 473 | wp_register_script( 'formidable_dom', $plugin_url . '/js/admin/dom.js', array( 'jquery', 'jquery-ui-dialog', 'wp-i18n' ), $version, true ); |
| 640 | 474 | wp_register_script( 'formidable_embed', $plugin_url . '/js/admin/embed.js', array( 'formidable_dom', 'jquery-ui-autocomplete' ), $version, true ); |
| 641 | 475 | self::register_popper1(); |
| 642 | 476 | wp_register_script( 'bootstrap_tooltip', $plugin_url . '/js/bootstrap.min.js', array( 'jquery', 'popper' ), '4.6.1', true ); |
| 643 | - wp_register_script( 'formidable_settings', $plugin_url . '/js/admin/settings.js', array(), $version, true ); | |
| 644 | 477 | |
| 645 | 478 | $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); |
| 646 | 479 | |
| 647 | - // Enqueue Floating Links. | |
| 648 | - $is_valid_page = | |
| 649 | - FrmAppHelper::is_formidable_admin() && | |
| 650 | - ! FrmAppHelper::is_style_editor_page() && | |
| 651 | - ! FrmAppHelper::is_admin_page( 'formidable-views-editor' ) && | |
| 652 | - ! FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ); | |
| 653 | - if ( $is_valid_page && FrmAppHelper::is_formidable_branding() ) { | |
| 654 | - self::enqueue_floating_links( $plugin_url, $version ); | |
| 655 | - } | |
| 656 | - unset( $is_valid_page ); | |
| 657 | - | |
| 658 | 480 | if ( 'formidable-applications' === $page ) { |
| 659 | 481 | FrmApplicationsController::load_assets(); |
| 660 | 482 | return; |
| 661 | 483 | } |
| @@ -668,15 +490,13 @@ | ||
| 668 | 490 | 'jquery-ui-sortable', |
| 669 | 491 | 'bootstrap_tooltip', |
| 670 | 492 | 'bootstrap-multiselect', |
| 671 | 493 | 'wp-i18n', |
| 672 | - 'wp-hooks', // Required in WP versions older than 5.7 | |
| 673 | 494 | 'formidable_dom', |
| 674 | 495 | 'formidable_embed', |
| 675 | 496 | ); |
| 676 | 497 | |
| 677 | - if ( FrmAppHelper::is_style_editor_page( 'edit' ) ) { | |
| 678 | - // 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' ) ) { | |
| 679 | 499 | $dependencies[] = 'wp-color-picker'; |
| 680 | 500 | } |
| 681 | 501 | |
| 682 | 502 | wp_register_script( 'formidable_admin', $plugin_url . '/js/formidable_admin.js', $dependencies, $version, true ); |
| @@ -729,64 +549,22 @@ | ||
| 729 | 549 | return; |
| 730 | 550 | } |
| 731 | 551 | |
| 732 | 552 | if ( $post_type === 'frm_display' ) { |
| 733 | - 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(); | |
| 734 | 560 | } |
| 735 | 561 | } |
| 736 | 562 | |
| 737 | - } | |
| 738 | - | |
| 739 | - /** | |
| 740 | - * @since 6.3.2 | |
| 741 | - * | |
| 742 | - * @return void | |
| 743 | - */ | |
| 744 | - public static function admin_enqueue_scripts() { | |
| 745 | - self::load_wp_admin_style(); | |
| 746 | 563 | self::maybe_force_formidable_block_on_gutenberg_page(); |
| 747 | 564 | } |
| 748 | 565 | |
| 749 | 566 | /** |
| 750 | - * Enqueue required assets for the Legacy Views editor (Views v4.x). | |
| 751 | - * | |
| 752 | - * @since 6.1.2 | |
| 753 | - * | |
| 754 | - * @return void | |
| 755 | - */ | |
| 756 | - private static function enqueue_legacy_views_assets() { | |
| 757 | - wp_enqueue_style( 'formidable-grids' ); | |
| 758 | - wp_enqueue_script( 'jquery-ui-draggable' ); | |
| 759 | - self::maybe_deregister_popper2(); | |
| 760 | - wp_enqueue_script( 'formidable_admin' ); | |
| 761 | - wp_add_inline_style( | |
| 762 | - 'formidable-admin', | |
| 763 | - ' | |
| 764 | - .frm-white-body.post-type-frm_display .columns-2 { | |
| 765 | - display: block; | |
| 766 | - overflow: visible; | |
| 767 | - } | |
| 768 | - | |
| 769 | - .frm-white-body.post-type-frm_display .columns-2 > div { | |
| 770 | - overflow-y: hidden; | |
| 771 | - } | |
| 772 | - | |
| 773 | - .frm-white-body.post-type-frm_display #titlediv #title-prompt-text { | |
| 774 | - padding: 3px 0 0 10px; | |
| 775 | - } | |
| 776 | - | |
| 777 | - .post-type-frm_display #field-search-input, | |
| 778 | - .post-type-frm_display #advanced-search-input { | |
| 779 | - flex: 1; | |
| 780 | - } | |
| 781 | - ' | |
| 782 | - ); | |
| 783 | - wp_enqueue_style( 'formidable-admin' ); | |
| 784 | - FrmAppHelper::localize_script( 'admin' ); | |
| 785 | - self::include_info_overlay(); | |
| 786 | - } | |
| 787 | - | |
| 788 | - /** | |
| 789 | 567 | * Fix a Duplicator Pro conflict because it uses Popper 2. See issue #3459. |
| 790 | 568 | * |
| 791 | 569 | * @since 5.2.02.01 |
| 792 | 570 | * |
| @@ -840,12 +618,8 @@ | ||
| 840 | 618 | |
| 841 | 619 | /** |
| 842 | 620 | * @since 5.3 |
| 843 | 621 | * |
| 844 | - * @param string $block_name | |
| 845 | - * @param string $object_key | |
| 846 | - * @param array|string $object_id | |
| 847 | - * | |
| 848 | 622 | * @return void |
| 849 | 623 | */ |
| 850 | 624 | public static function add_js_to_inject_gutenberg_block( $block_name, $object_key, $object_id ) { |
| 851 | 625 | require FrmAppHelper::plugin_path() . '/classes/views/shared/edit-page-js.php'; |
| @@ -850,11 +624,8 @@ | ||
| 850 | 624 | public static function add_js_to_inject_gutenberg_block( $block_name, $object_key, $object_id ) { |
| 851 | 625 | require FrmAppHelper::plugin_path() . '/classes/views/shared/edit-page-js.php'; |
| 852 | 626 | } |
| 853 | 627 | |
| 854 | - /** | |
| 855 | - * @return void | |
| 856 | - */ | |
| 857 | 628 | public static function load_lang() { |
| 858 | 629 | load_plugin_textdomain( 'formidable', false, FrmAppHelper::plugin_folder() . '/languages/' ); |
| 859 | 630 | } |
| 860 | 631 | |
| @@ -861,10 +632,8 @@ | ||
| 861 | 632 | /** |
| 862 | 633 | * Check if the styles are updated when a form is loaded on the front-end |
| 863 | 634 | * |
| 864 | 635 | * @since 3.0.1 |
| 865 | - * | |
| 866 | - * @return void | |
| 867 | 636 | */ |
| 868 | 637 | public static function maybe_update_styles() { |
| 869 | 638 | if ( self::needs_update() ) { |
| 870 | 639 | self::network_upgrade_site(); |
| @@ -872,10 +641,8 @@ | ||
| 872 | 641 | } |
| 873 | 642 | |
| 874 | 643 | /** |
| 875 | 644 | * @since 3.0 |
| 876 | - * | |
| 877 | - * @return void | |
| 878 | 645 | */ |
| 879 | 646 | public static function create_rest_routes() { |
| 880 | 647 | $args = array( |
| 881 | 648 | 'methods' => 'GET', |
| @@ -910,10 +677,8 @@ | ||
| 910 | 677 | * |
| 911 | 678 | * @since 2.0.1 |
| 912 | 679 | * |
| 913 | 680 | * @param int $blog_id Blog ID. |
| 914 | - * | |
| 915 | - * @return void | |
| 916 | 681 | */ |
| 917 | 682 | public static function network_upgrade_site( $blog_id = 0 ) { |
| 918 | 683 | // Flag to check if install is happening as intended. |
| 919 | 684 | set_transient( 'frm_updating_api', true, MINUTE_IN_SECONDS ); |
| @@ -937,10 +702,8 @@ | ||
| 937 | 702 | |
| 938 | 703 | /** |
| 939 | 704 | * Make sure WP_Site_Health has been included because it is required when calling rest_do_request. |
| 940 | 705 | * Check first that the file exists because WP_Site_Health was only introduced in WordPress 5.2. |
| 941 | - * | |
| 942 | - * @return void | |
| 943 | 706 | */ |
| 944 | 707 | private static function maybe_add_wp_site_health() { |
| 945 | 708 | if ( ! class_exists( 'WP_Site_Health' ) ) { |
| 946 | 709 | $wp_site_health_path = ABSPATH . 'wp-admin/includes/class-wp-site-health.php'; |
| @@ -951,10 +714,8 @@ | ||
| 951 | 714 | } |
| 952 | 715 | |
| 953 | 716 | /** |
| 954 | 717 | * @since 3.0 |
| 955 | - * | |
| 956 | - * @return true | |
| 957 | 718 | */ |
| 958 | 719 | public static function api_install() { |
| 959 | 720 | delete_transient( 'frm_updating_api' ); |
| 960 | 721 | if ( self::needs_update() ) { |
| @@ -973,29 +734,19 @@ | ||
| 973 | 734 | * Silent database upgrade (no redirect). |
| 974 | 735 | * Called via ajax request during network upgrade process. |
| 975 | 736 | * |
| 976 | 737 | * @since 2.0.1 |
| 977 | - * | |
| 978 | - * @return void | |
| 979 | 738 | */ |
| 980 | 739 | public static function ajax_install() { |
| 981 | - FrmAppHelper::permission_check( 'frm_change_settings' ); | |
| 982 | - check_ajax_referer( 'frm_ajax', 'nonce' ); | |
| 983 | 740 | self::api_install(); |
| 984 | 741 | wp_die(); |
| 985 | 742 | } |
| 986 | 743 | |
| 987 | - /** | |
| 988 | - * @return void | |
| 989 | - */ | |
| 990 | 744 | public static function install() { |
| 991 | 745 | $frmdb = new FrmMigrate(); |
| 992 | 746 | $frmdb->upgrade(); |
| 993 | 747 | } |
| 994 | 748 | |
| 995 | - /** | |
| 996 | - * @return void | |
| 997 | - */ | |
| 998 | 749 | public static function uninstall() { |
| 999 | 750 | FrmAppHelper::permission_check( 'administrator' ); |
| 1000 | 751 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 1001 | 752 | |
| @@ -1019,11 +770,8 @@ | ||
| 1019 | 770 | |
| 1020 | 771 | return $tables; |
| 1021 | 772 | } |
| 1022 | 773 | |
| 1023 | - /** | |
| 1024 | - * @return void | |
| 1025 | - */ | |
| 1026 | 774 | public static function deauthorize() { |
| 1027 | 775 | FrmAppHelper::permission_check( 'frm_change_settings' ); |
| 1028 | 776 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 1029 | 777 | |
| @@ -1033,33 +781,8 @@ | ||
| 1033 | 781 | delete_site_option( 'frmpro-authorized' ); |
| 1034 | 782 | wp_die(); |
| 1035 | 783 | } |
| 1036 | 784 | |
| 1037 | - /** | |
| 1038 | - * This is triggered when Formidable is activated. | |
| 1039 | - * | |
| 1040 | - * @return void | |
| 1041 | - */ | |
| 1042 | - public static function handle_activation() { | |
| 1043 | - self::maybe_activate_payment_cron(); | |
| 1044 | - } | |
| 1045 | - | |
| 1046 | - /** | |
| 1047 | - * The payment cron is unscheduled when Formidable is deactivated. | |
| 1048 | - * We need to add it back again on activation if Stripe is configured. | |
| 1049 | - * | |
| 1050 | - * @since 6.5 | |
| 1051 | - * | |
| 1052 | - * @return void | |
| 1053 | - */ | |
| 1054 | - private static function maybe_activate_payment_cron() { | |
| 1055 | - if ( ! FrmStrpLiteConnectHelper::stripe_connect_is_setup() ) { | |
| 1056 | - return; | |
| 1057 | - } | |
| 1058 | - | |
| 1059 | - FrmTransLiteAppController::maybe_schedule_cron(); | |
| 1060 | - } | |
| 1061 | - | |
| 1062 | 785 | public static function set_footer_text( $text ) { |
| 1063 | 786 | if ( FrmAppHelper::is_formidable_admin() ) { |
| 1064 | 787 | $text = ''; |
| 1065 | 788 | } |
| @@ -1067,36 +790,36 @@ | ||
| 1067 | 790 | return $text; |
| 1068 | 791 | } |
| 1069 | 792 | |
| 1070 | 793 | /** |
| 1071 | - * Add admin footer links. | |
| 1072 | - * | |
| 1073 | - * @since 6.4.1 | |
| 1074 | - * | |
| 1075 | - * @return void | |
| 794 | + * @deprecated 1.07.05 | |
| 795 | + * @codeCoverageIgnore | |
| 1076 | 796 | */ |
| 1077 | - public static function add_admin_footer_links() { | |
| 1078 | - $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title' ); | |
| 797 | + public static function get_form_shortcode( $atts ) { | |
| 798 | + return FrmDeprecated::get_form_shortcode( $atts ); | |
| 799 | + } | |
| 1079 | 800 | |
| 1080 | - // Check admin privileges, screen mode, and branding | |
| 1081 | - $is_not_admin = ! FrmAppHelper::is_formidable_admin() && $post_type !== 'frm_logs'; | |
| 1082 | - $is_full_screen = FrmAppHelper::is_full_screen(); | |
| 1083 | - $is_not_formidable_branding = ! FrmAppHelper::is_formidable_branding(); | |
| 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 | + } | |
| 1084 | 808 | |
| 1085 | - // Exit if any of the above conditions are met | |
| 1086 | - if ( $is_not_admin || $is_full_screen || $is_not_formidable_branding ) { | |
| 1087 | - return; | |
| 1088 | - } | |
| 1089 | - | |
| 1090 | - include FrmAppHelper::plugin_path() . '/classes/views/shared/admin-footer-links.php'; | |
| 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(); | |
| 1091 | 817 | } |
| 1092 | 818 | |
| 1093 | 819 | /** |
| 1094 | 820 | * @deprecated 3.0.04 |
| 1095 | - * | |
| 1096 | 821 | * @codeCoverageIgnore |
| 1097 | - * | |
| 1098 | - * @return void | |
| 1099 | 822 | */ |
| 1100 | 823 | public static function activation_install() { |
| 1101 | 824 | FrmDeprecated::activation_install(); |
| 1102 | 825 | } |
| @@ -1117,48 +840,6 @@ | ||
| 1117 | 840 | * @return void |
| 1118 | 841 | */ |
| 1119 | 842 | public static function include_embed_form_icons() { |
| 1120 | 843 | _deprecated_function( __METHOD__, '5.3' ); |
| 1121 | - } | |
| 1122 | - | |
| 1123 | - /** | |
| 1124 | - * @deprecated 1.07.05 This is still referenced in the API add on as of v1.13. | |
| 1125 | - * @codeCoverageIgnore | |
| 1126 | - * | |
| 1127 | - * @param array $atts | |
| 1128 | - * @return string | |
| 1129 | - */ | |
| 1130 | - public static function get_form_shortcode( $atts ) { | |
| 1131 | - _deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::get_form_shortcode' ); | |
| 1132 | - return FrmFormsController::get_form_shortcode( $atts ); | |
| 1133 | - } | |
| 1134 | - | |
| 1135 | - /** | |
| 1136 | - * Handles Floating Links' scripts and styles enqueueing. | |
| 1137 | - * | |
| 1138 | - * @since 6.4 | |
| 1139 | - * | |
| 1140 | - * @param string $plugin_url URL of the plugin. | |
| 1141 | - * @param string $version Current version of the plugin. | |
| 1142 | - * @return void | |
| 1143 | - */ | |
| 1144 | - private static function enqueue_floating_links( $plugin_url, $version ) { | |
| 1145 | - if ( ! $plugin_url || ! $version ) { | |
| 1146 | - // If any required parameters are missing, exit early. | |
| 1147 | - return; | |
| 1148 | - } | |
| 1149 | - | |
| 1150 | - // Enqueue the Floating Links styles. | |
| 1151 | - wp_enqueue_style( 's11-floating-links', $plugin_url . '/css/packages/s11-floating-links.css', array(), $version ); | |
| 1152 | - | |
| 1153 | - // Enqueue the Floating Links script. | |
| 1154 | - wp_enqueue_script( 's11-floating-links', $plugin_url . '/js/packages/floating-links/s11-floating-links.js', array(), $version, true ); | |
| 1155 | - | |
| 1156 | - // Enqueue the config script. | |
| 1157 | - wp_enqueue_script( 's11-floating-links-config', $plugin_url . '/js/packages/floating-links/config.js', array( 'wp-i18n' ), $version, true ); | |
| 1158 | - wp_set_script_translations( 's11-floating-links-config', 's11-' ); | |
| 1159 | - $floating_links_data = array( | |
| 1160 | - 'proIsInstalled' => FrmAppHelper::pro_is_installed(), | |
| 1161 | - ); | |
| 1162 | - wp_localize_script( 's11-floating-links-config', 's11FloatingLinksData', $floating_links_data ); | |
| 1163 | 844 | } |
| 1164 | 845 | } |
