| @@ -9,13 +9,19 @@ | ||
| 9 | 9 | * @return void |
| 10 | 10 | */ |
| 11 | 11 | public static function menu() { |
| 12 | 12 | FrmAppHelper::maybe_add_permissions(); |
| 13 | + | |
| 13 | 14 | if ( ! current_user_can( 'frm_view_forms' ) ) { |
| 14 | 15 | return; |
| 15 | 16 | } |
| 16 | 17 | |
| 17 | 18 | $menu_name = FrmAppHelper::get_menu_name(); |
| 19 | + | |
| 20 | + if ( in_array( $menu_name, array( 'Formidable', 'Forms' ), true ) ) { | |
| 21 | + $menu_name .= wp_kses_post( FrmInboxController::get_notice_count() ); | |
| 22 | + } | |
| 23 | + | |
| 18 | 24 | add_menu_page( 'Formidable', $menu_name, 'frm_view_forms', 'formidable', 'FrmFormsController::route', self::menu_icon(), self::get_menu_position() ); |
| 19 | 25 | } |
| 20 | 26 | |
| 21 | 27 | /** |
| @@ -26,8 +32,10 @@ | ||
| 26 | 32 | } |
| 27 | 33 | |
| 28 | 34 | /** |
| 29 | 35 | * @since 3.05 |
| 36 | + * | |
| 37 | + * @return string | |
| 30 | 38 | */ |
| 31 | 39 | private static function menu_icon() { |
| 32 | 40 | $icon = FrmAppHelper::svg_logo( |
| 33 | 41 | array( |
| @@ -41,8 +49,12 @@ | ||
| 41 | 49 | } |
| 42 | 50 | |
| 43 | 51 | /** |
| 44 | 52 | * @since 3.0 |
| 53 | + * | |
| 54 | + * @param string $classes | |
| 55 | + * | |
| 56 | + * @return string | |
| 45 | 57 | */ |
| 46 | 58 | public static function add_admin_class( $classes ) { |
| 47 | 59 | if ( self::is_white_page() ) { |
| 48 | 60 | $classes .= ' frm-white-body '; |
| @@ -48,28 +60,38 @@ | ||
| 48 | 60 | $classes .= ' frm-white-body '; |
| 49 | 61 | $classes .= self::get_os(); |
| 50 | 62 | |
| 51 | 63 | $page = str_replace( 'formidable-', '', FrmAppHelper::simple_get( 'page', 'sanitize_title' ) ); |
| 52 | - if ( empty( $page ) || $page === 'formidable' ) { | |
| 64 | + | |
| 65 | + if ( ! $page || $page === 'formidable' ) { | |
| 53 | 66 | $action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ); |
| 54 | - if ( in_array( $action, array( 'settings', 'edit', 'list' ) ) ) { | |
| 67 | + | |
| 68 | + if ( in_array( $action, array( 'settings', 'edit', 'list' ), true ) ) { | |
| 55 | 69 | $page .= $action; |
| 56 | 70 | } else { |
| 57 | 71 | $page = $action; |
| 58 | 72 | } |
| 59 | 73 | } |
| 60 | - if ( ! empty( $page ) ) { | |
| 74 | + | |
| 75 | + if ( $page ) { | |
| 61 | 76 | $classes .= ' frm-admin-page-' . $page; |
| 62 | 77 | } |
| 63 | 78 | } |
| 64 | 79 | |
| 80 | + if ( self::is_grey_page() ) { | |
| 81 | + $classes .= ' frm-grey-body '; | |
| 82 | + } | |
| 83 | + | |
| 65 | 84 | if ( FrmAppHelper::is_full_screen() ) { |
| 66 | - $full_screen_on = self::get_full_screen_setting(); | |
| 67 | 85 | $add_class = ''; |
| 68 | - if ( $full_screen_on ) { | |
| 86 | + | |
| 87 | + if ( self::get_full_screen_setting() ) { | |
| 69 | 88 | $add_class = ' frm-full-screen is-fullscreen-mode'; |
| 70 | - wp_enqueue_style( 'wp-edit-post' ); // Load the CSS for .is-fullscreen-mode. | |
| 89 | + | |
| 90 | + // Load the CSS for .is-fullscreen-mode. | |
| 91 | + wp_enqueue_style( 'wp-edit-post' ); | |
| 71 | 92 | } |
| 93 | + | |
| 72 | 94 | $classes .= apply_filters( 'frm_admin_full_screen_class', $add_class ); |
| 73 | 95 | } |
| 74 | 96 | |
| 75 | 97 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| @@ -75,8 +97,12 @@ | ||
| 75 | 97 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| 76 | 98 | $classes .= ' frm-lite '; |
| 77 | 99 | } |
| 78 | 100 | |
| 101 | + if ( get_user_setting( 'unfold' ) && 'f' !== get_user_setting( 'mfold' ) ) { | |
| 102 | + $classes .= ' frm-unfold '; | |
| 103 | + } | |
| 104 | + | |
| 79 | 105 | return $classes; |
| 80 | 106 | } |
| 81 | 107 | |
| 82 | 108 | /** |
| @@ -88,10 +114,10 @@ | ||
| 88 | 114 | */ |
| 89 | 115 | private static function get_full_screen_setting() { |
| 90 | 116 | global $wpdb; |
| 91 | 117 | $meta_key = $wpdb->get_blog_prefix() . 'persisted_preferences'; |
| 118 | + $prefs = get_user_meta( get_current_user_id(), $meta_key, true ); | |
| 92 | 119 | |
| 93 | - $prefs = get_user_meta( get_current_user_id(), $meta_key, true ); | |
| 94 | 120 | if ( $prefs && isset( $prefs['core/edit-post']['fullscreenMode'] ) ) { |
| 95 | 121 | return $prefs['core/edit-post']['fullscreenMode']; |
| 96 | 122 | } |
| 97 | 123 | |
| @@ -105,20 +131,24 @@ | ||
| 105 | 131 | */ |
| 106 | 132 | private static function get_os() { |
| 107 | 133 | $agent = strtolower( FrmAppHelper::get_server_value( 'HTTP_USER_AGENT' ) ); |
| 108 | 134 | $os = ''; |
| 109 | - if ( strpos( $agent, 'mac' ) !== false ) { | |
| 135 | + | |
| 136 | + if ( str_contains( $agent, 'mac' ) ) { | |
| 110 | 137 | $os = ' osx'; |
| 111 | - } elseif ( strpos( $agent, 'linux' ) !== false ) { | |
| 138 | + } elseif ( str_contains( $agent, 'linux' ) ) { | |
| 112 | 139 | $os = ' linux'; |
| 113 | - } elseif ( strpos( $agent, 'windows' ) !== false ) { | |
| 140 | + } elseif ( str_contains( $agent, 'windows' ) ) { | |
| 114 | 141 | $os = ' windows'; |
| 115 | 142 | } |
| 143 | + | |
| 116 | 144 | return $os; |
| 117 | 145 | } |
| 118 | 146 | |
| 119 | 147 | /** |
| 120 | 148 | * @since 3.0 |
| 149 | + * | |
| 150 | + * @return bool | |
| 121 | 151 | */ |
| 122 | 152 | private static function is_white_page() { |
| 123 | 153 | $white_pages = array( |
| 124 | 154 | 'formidable', |
| @@ -124,9 +154,8 @@ | ||
| 124 | 154 | 'formidable', |
| 125 | 155 | 'formidable-entries', |
| 126 | 156 | 'formidable-views', |
| 127 | 157 | 'formidable-views-editor', |
| 128 | - 'formidable-pro-upgrade', | |
| 129 | 158 | 'formidable-addons', |
| 130 | 159 | 'formidable-import', |
| 131 | 160 | 'formidable-settings', |
| 132 | 161 | 'formidable-styles', |
| @@ -131,26 +160,18 @@ | ||
| 131 | 160 | 'formidable-settings', |
| 132 | 161 | 'formidable-styles', |
| 133 | 162 | 'formidable-styles2', |
| 134 | 163 | 'formidable-inbox', |
| 135 | - 'formidable-welcome', | |
| 136 | - 'formidable-applications', | |
| 164 | + FrmFormTemplatesController::PAGE_SLUG, | |
| 165 | + FrmOnboardingWizardController::PAGE_SLUG, | |
| 137 | 166 | ); |
| 138 | 167 | |
| 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. | |
| 168 | + if ( self::is_white_payments_page() ) { | |
| 142 | 169 | $white_pages[] = 'formidable-payments'; |
| 143 | 170 | } |
| 144 | 171 | |
| 145 | - $get_page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); | |
| 146 | - $is_white_page = in_array( $get_page, $white_pages, true ); | |
| 172 | + $is_white_page = self::is_page_in_list( $white_pages ) || self::is_grey_page() || FrmAppHelper::is_view_builder_page(); | |
| 147 | 173 | |
| 148 | - if ( ! $is_white_page ) { | |
| 149 | - $screen = get_current_screen(); | |
| 150 | - $is_white_page = ( $screen && strpos( $screen->id, 'frm_display' ) !== false ); | |
| 151 | - } | |
| 152 | - | |
| 153 | 174 | /** |
| 154 | 175 | * Allow another add on to style a page as a Formidable "white page", which adds a white background color. |
| 155 | 176 | * |
| 156 | 177 | * @since 5.3 |
| @@ -156,14 +177,68 @@ | ||
| 156 | 177 | * @since 5.3 |
| 157 | 178 | * |
| 158 | 179 | * @param bool $is_white_page |
| 159 | 180 | */ |
| 160 | - $is_white_page = apply_filters( 'frm_is_white_page', $is_white_page ); | |
| 181 | + return apply_filters( 'frm_is_white_page', $is_white_page ); | |
| 182 | + } | |
| 161 | 183 | |
| 162 | - return $is_white_page; | |
| 184 | + /** | |
| 185 | + * Check if the payments page should be styled as a white page. | |
| 186 | + * Fallback to the Stripe, Authorize.Net, or PayPal add on for the "edit" action since | |
| 187 | + * Stripe Lite does not have an edit view. Also fallback for bulk deleting, since that | |
| 188 | + * isn't built into Lite. The pages we fall back to should not be styled as white pages. | |
| 189 | + * | |
| 190 | + * @since 6.27 | |
| 191 | + * | |
| 192 | + * @return bool | |
| 193 | + */ | |
| 194 | + private static function is_white_payments_page() { | |
| 195 | + $action = FrmAppHelper::simple_get( 'action', 'sanitize_title' ); | |
| 196 | + $on_edit_page = in_array( $action, array( 'edit', 'new' ), true ); | |
| 197 | + return ! $on_edit_page && 'bulk_delete' !== $action; | |
| 163 | 198 | } |
| 164 | 199 | |
| 165 | 200 | /** |
| 201 | + * Add a grey bg instead of white. | |
| 202 | + * | |
| 203 | + * @since 6.8 | |
| 204 | + * | |
| 205 | + * @return bool | |
| 206 | + */ | |
| 207 | + private static function is_grey_page() { | |
| 208 | + $grey_pages = array( | |
| 209 | + 'formidable-applications', | |
| 210 | + 'formidable-dashboard', | |
| 211 | + 'formidable-views', | |
| 212 | + ); | |
| 213 | + | |
| 214 | + $is_grey_page = self::is_page_in_list( $grey_pages ); | |
| 215 | + | |
| 216 | + /** | |
| 217 | + * Filter to change FF wrapper background to grey. | |
| 218 | + * | |
| 219 | + * @since 6.8 | |
| 220 | + * | |
| 221 | + * @param bool $is_grey_page | |
| 222 | + * | |
| 223 | + * @return bool | |
| 224 | + */ | |
| 225 | + return apply_filters( 'frm_is_grey_page', $is_grey_page ); | |
| 226 | + } | |
| 227 | + | |
| 228 | + /** | |
| 229 | + * @since 6.8 | |
| 230 | + * | |
| 231 | + * @param array $pages A list of page names to check. | |
| 232 | + * | |
| 233 | + * @return bool | |
| 234 | + */ | |
| 235 | + private static function is_page_in_list( $pages ) { | |
| 236 | + $get_page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); | |
| 237 | + return in_array( $get_page, $pages, true ); | |
| 238 | + } | |
| 239 | + | |
| 240 | + /** | |
| 166 | 241 | * @return void |
| 167 | 242 | */ |
| 168 | 243 | public static function load_wp_admin_style() { |
| 169 | 244 | FrmAppHelper::load_font_style(); |
| @@ -169,10 +244,11 @@ | ||
| 169 | 244 | FrmAppHelper::load_font_style(); |
| 170 | 245 | } |
| 171 | 246 | |
| 172 | 247 | /** |
| 173 | - * @param bool $show_nav | |
| 174 | - * @param string $title | |
| 248 | + * @param int|object $form | |
| 249 | + * @param bool $show_nav | |
| 250 | + * @param string $title | |
| 175 | 251 | * |
| 176 | 252 | * @psalm-param 'hide'|'show' $title |
| 177 | 253 | * |
| 178 | 254 | * @return void |
| @@ -178,13 +254,15 @@ | ||
| 178 | 254 | * @return void |
| 179 | 255 | */ |
| 180 | 256 | public static function get_form_nav( $form, $show_nav = false, $title = 'show' ) { |
| 181 | 257 | $show_nav = FrmAppHelper::get_param( 'show_nav', $show_nav, 'get', 'absint' ); |
| 182 | - if ( empty( $show_nav ) || ! $form ) { | |
| 258 | + | |
| 259 | + if ( ! $show_nav || ! $form ) { | |
| 183 | 260 | return; |
| 184 | 261 | } |
| 185 | 262 | |
| 186 | 263 | FrmForm::maybe_get_form( $form ); |
| 264 | + | |
| 187 | 265 | if ( ! is_object( $form ) ) { |
| 188 | 266 | return; |
| 189 | 267 | } |
| 190 | 268 | |
| @@ -191,9 +269,9 @@ | ||
| 191 | 269 | $id = $form->id; |
| 192 | 270 | $current_page = self::get_current_page(); |
| 193 | 271 | $nav_items = self::get_form_nav_items( $form ); |
| 194 | 272 | |
| 195 | - include( FrmAppHelper::plugin_path() . '/classes/views/shared/form-nav.php' ); | |
| 273 | + include FrmAppHelper::plugin_path() . '/classes/views/shared/form-nav.php'; | |
| 196 | 274 | } |
| 197 | 275 | |
| 198 | 276 | /** |
| 199 | 277 | * @return string |
| @@ -198,21 +276,21 @@ | ||
| 198 | 276 | /** |
| 199 | 277 | * @return string |
| 200 | 278 | */ |
| 201 | 279 | private static function get_current_page() { |
| 202 | - $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); | |
| 203 | - $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title', 'None' ); | |
| 204 | - $current_page = isset( $_GET['page'] ) ? $page : $post_type; | |
| 205 | - | |
| 206 | 280 | if ( FrmAppHelper::is_view_builder_page() ) { |
| 207 | - $current_page = 'frm_display'; | |
| 281 | + return 'frm_display'; | |
| 208 | 282 | } |
| 209 | 283 | |
| 210 | - return $current_page; | |
| 284 | + $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); | |
| 285 | + $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title', 'None' ); | |
| 286 | + | |
| 287 | + return isset( $_GET['page'] ) ? $page : $post_type; | |
| 211 | 288 | } |
| 212 | 289 | |
| 213 | 290 | /** |
| 214 | 291 | * @param object $form |
| 292 | + * | |
| 215 | 293 | * @return array |
| 216 | 294 | */ |
| 217 | 295 | private static function get_form_nav_items( $form ) { |
| 218 | 296 | $id = $form->parent_form_id ? $form->parent_form_id : $form->id; |
| @@ -247,18 +325,18 @@ | ||
| 247 | 325 | 'permission' => 'frm_view_entries', |
| 248 | 326 | ), |
| 249 | 327 | ); |
| 250 | 328 | |
| 251 | - $views_installed = is_callable( 'FrmProAppHelper::views_is_installed' ) ? FrmProAppHelper::views_is_installed() : FrmAppHelper::pro_is_installed(); | |
| 329 | + $views_installed = is_callable( 'FrmProAppHelper::views_is_installed' ) && FrmProAppHelper::views_is_installed(); | |
| 252 | 330 | |
| 253 | 331 | if ( ! $views_installed ) { |
| 254 | 332 | $nav_items[] = array( |
| 255 | - 'link' => admin_url( 'admin.php?page=formidable-views&form=' . absint( $id ) ), | |
| 256 | - 'label' => __( 'Views', 'formidable' ), | |
| 257 | - 'current' => array(), | |
| 258 | - 'page' => 'formidable-views', | |
| 333 | + 'link' => admin_url( 'admin.php?page=formidable-views&form=' . absint( $id ) ), | |
| 334 | + 'label' => __( 'Views', 'formidable' ), | |
| 335 | + 'current' => array(), | |
| 336 | + 'page' => 'formidable-views', | |
| 259 | 337 | 'permission' => 'frm_view_entries', |
| 260 | - 'atts' => array( | |
| 338 | + 'atts' => array( | |
| 261 | 339 | 'class' => 'frm_noallow', |
| 262 | 340 | ), |
| 263 | 341 | ); |
| 264 | 342 | } |
| @@ -265,14 +343,14 @@ | ||
| 265 | 343 | |
| 266 | 344 | // Let people know reports and views exist. |
| 267 | 345 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| 268 | 346 | $nav_items[] = array( |
| 269 | - 'link' => admin_url( 'admin.php?page=formidable&frm_action=lite-reports&form=' . absint( $id ) ), | |
| 270 | - 'label' => __( 'Reports', 'formidable' ), | |
| 271 | - 'current' => array( 'reports' ), | |
| 272 | - 'page' => 'formidable', | |
| 347 | + 'link' => admin_url( 'admin.php?page=formidable&frm_action=lite-reports&form=' . absint( $id ) ), | |
| 348 | + 'label' => __( 'Reports', 'formidable' ), | |
| 349 | + 'current' => array( 'reports' ), | |
| 350 | + 'page' => 'formidable', | |
| 273 | 351 | 'permission' => 'frm_view_entries', |
| 274 | - 'atts' => array( | |
| 352 | + 'atts' => array( | |
| 275 | 353 | 'class' => 'frm_noallow', |
| 276 | 354 | ), |
| 277 | 355 | ); |
| 278 | 356 | } |
| @@ -284,10 +362,13 @@ | ||
| 284 | 362 | |
| 285 | 363 | return (array) apply_filters( 'frm_form_nav_list', $nav_items, $nav_args ); |
| 286 | 364 | } |
| 287 | 365 | |
| 288 | - // Adds a settings link to the plugins page | |
| 289 | 366 | /** |
| 367 | + * Adds a settings link to the plugins page | |
| 368 | + * | |
| 369 | + * @param array $links | |
| 370 | + * | |
| 290 | 371 | * @return array |
| 291 | 372 | */ |
| 292 | 373 | public static function settings_link( $links ) { |
| 293 | 374 | $settings = array(); |
| @@ -292,14 +373,39 @@ | ||
| 292 | 373 | public static function settings_link( $links ) { |
| 293 | 374 | $settings = array(); |
| 294 | 375 | |
| 295 | 376 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| 296 | - $label = FrmAddonsController::is_license_expired() ? __( 'Renew', 'formidable' ) : __( 'Upgrade to Pro', 'formidable' ); | |
| 297 | - $settings[] = '<a href="' . esc_url( FrmAppHelper::admin_upgrade_link( 'plugin-row' ) ) . '" target="_blank" rel="noopener"><b style="color:#1da867;font-weight:700;">' . esc_html( $label ) . '</b></a>'; | |
| 298 | - } | |
| 377 | + $is_expired = FrmAddonsController::is_license_expired(); | |
| 299 | 378 | |
| 300 | - $settings[] = '<a href="' . esc_url( admin_url( 'admin.php?page=formidable' ) ) . '">' . __( 'Build a Form', 'formidable' ) . '</a>'; | |
| 379 | + if ( $is_expired ) { | |
| 380 | + $label = __( 'Renew', 'formidable' ); | |
| 381 | + } else { | |
| 382 | + $label = FrmSalesApi::get_best_sale_value( 'plugin_page_cta_text' ); | |
| 301 | 383 | |
| 384 | + if ( ! $label ) { | |
| 385 | + $label = __( 'Upgrade to Pro', 'formidable' ); | |
| 386 | + } | |
| 387 | + } | |
| 388 | + | |
| 389 | + $upgrade_content = $is_expired ? 'renew' : 'upgrade'; | |
| 390 | + $upgrade_link = FrmSalesApi::get_best_sale_value( 'plugin_page_cta_link' ); | |
| 391 | + | |
| 392 | + $utm = array( | |
| 393 | + 'campaign' => 'plugin-row', | |
| 394 | + 'content' => $upgrade_content, | |
| 395 | + ); | |
| 396 | + | |
| 397 | + if ( $upgrade_link ) { | |
| 398 | + $upgrade_link = FrmAppHelper::maybe_add_missing_utm( $upgrade_link, $utm ); | |
| 399 | + } else { | |
| 400 | + $upgrade_link = FrmAppHelper::admin_upgrade_link( $utm ); | |
| 401 | + } | |
| 402 | + | |
| 403 | + $settings[] = '<a href="' . esc_url( $upgrade_link ) . '" target="_blank" rel="noopener"><b style="color:#1da867;font-weight:700;">' . esc_html( $label ) . '</b></a>'; | |
| 404 | + }//end if | |
| 405 | + | |
| 406 | + $settings[] = '<a href="' . esc_url( admin_url( 'admin.php?page=formidable' ) ) . '">' . esc_html__( 'Build a Form', 'formidable' ) . '</a>'; | |
| 407 | + | |
| 302 | 408 | return array_merge( $settings, $links ); |
| 303 | 409 | } |
| 304 | 410 | |
| 305 | 411 | /** |
| @@ -306,9 +412,9 @@ | ||
| 306 | 412 | * @return void |
| 307 | 413 | */ |
| 308 | 414 | public static function pro_get_started_headline() { |
| 309 | 415 | self::review_request(); |
| 310 | - FrmAppHelper::min_pro_version_notice( '4.0' ); | |
| 416 | + FrmAppHelper::min_pro_version_notice( '6.20' ); | |
| 311 | 417 | } |
| 312 | 418 | |
| 313 | 419 | /** |
| 314 | 420 | * Add admin notices as needed for reviews |
| @@ -375,78 +481,27 @@ | ||
| 375 | 481 | $shared_path = $plugin_path . '/classes/views/shared/'; |
| 376 | 482 | |
| 377 | 483 | include $shared_path . 'upgrade_overlay.php'; |
| 378 | 484 | include $shared_path . 'confirm-overlay.php'; |
| 379 | - | |
| 380 | - if ( FrmAppHelper::is_admin_page( 'formidable-welcome' ) || FrmAppHelper::on_form_listing_page() ) { | |
| 381 | - self::new_form_overlay_html(); | |
| 382 | - } | |
| 383 | 485 | } |
| 384 | 486 | |
| 385 | 487 | /** |
| 386 | - * @return void | |
| 387 | - */ | |
| 388 | - private static function new_form_overlay_html() { | |
| 389 | - FrmFormsController::before_list_templates(); | |
| 390 | - | |
| 391 | - $plugin_path = FrmAppHelper::plugin_path(); | |
| 392 | - $path = $plugin_path . '/classes/views/frm-forms/'; | |
| 393 | - $expired = FrmFormsController::expired(); | |
| 394 | - $expiring = FrmAddonsController::is_license_expiring(); | |
| 395 | - $user = wp_get_current_user(); // $user used in leave-email.php to determine a default value for field | |
| 396 | - $view_path = $path . 'new-form-overlay/'; | |
| 397 | - $modal_class = ''; | |
| 398 | - $upgrade_link = FrmAppHelper::admin_upgrade_link( | |
| 399 | - array( | |
| 400 | - 'medium' => 'new-template', | |
| 401 | - 'content' => 'upgrade', | |
| 402 | - ) | |
| 403 | - ); | |
| 404 | - $renew_link = FrmAppHelper::admin_upgrade_link( | |
| 405 | - array( | |
| 406 | - 'medium' => 'new-template', | |
| 407 | - 'content' => 'renew', | |
| 408 | - ) | |
| 409 | - ); | |
| 410 | - $blocks_to_render = array(); | |
| 411 | - | |
| 412 | - if ( ! FrmAppHelper::pro_is_installed() ) { | |
| 413 | - // avoid rendering the email and code blocks for users who have upgraded or have a free license already | |
| 414 | - $api = new FrmFormTemplateApi(); | |
| 415 | - if ( ! $api->has_free_access() ) { | |
| 416 | - array_push( $blocks_to_render, 'email', 'code' ); | |
| 417 | - } | |
| 418 | - } | |
| 419 | - | |
| 420 | - // avoid rendering the upgrade block for users with elite | |
| 421 | - if ( 'elite' !== FrmAddonsController::license_type() ) { | |
| 422 | - $blocks_to_render[] = 'upgrade'; | |
| 423 | - } | |
| 424 | - | |
| 425 | - // avoid rendering the renew block for users who are not currently expired | |
| 426 | - if ( $expired ) { | |
| 427 | - $blocks_to_render[] = 'renew'; | |
| 428 | - $modal_class = 'frm-expired'; | |
| 429 | - } elseif ( $expiring ) { | |
| 430 | - $modal_class = 'frm-expiring'; | |
| 431 | - } | |
| 432 | - | |
| 433 | - include $path . 'new-form-overlay.php'; | |
| 434 | - } | |
| 435 | - | |
| 436 | - /** | |
| 437 | 488 | * Create a basic form with an email field. |
| 438 | 489 | * |
| 439 | 490 | * @param string $form_key |
| 440 | 491 | * @param string $title |
| 441 | 492 | * @param string $description |
| 493 | + * | |
| 442 | 494 | * @return void |
| 443 | 495 | */ |
| 444 | - public static function api_email_form( $form_key, $title, $description ) { | |
| 445 | - $url = 'https://sandbox.formidableforms.com/api/wp-json/frm/v2/forms/' . $form_key . '?return=html&exclude_script=jquery&exclude_style=formidable-css'; | |
| 446 | - $view_path = FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new-form-overlay/'; | |
| 447 | - $user = wp_get_current_user(); | |
| 448 | - require $view_path . 'leave-email.php'; | |
| 496 | + public static function api_email_form( $form_key, $title = '', $description = '' ) { | |
| 497 | + $user = wp_get_current_user(); | |
| 498 | + $args = array( | |
| 499 | + 'api_url' => 'https://sandbox.formidableforms.com/api/wp-json/frm/v2/forms/' . $form_key . '?return=html&exclude_script=jquery&exclude_style=formidable-css', | |
| 500 | + 'title' => $title, | |
| 501 | + 'description' => $description, | |
| 502 | + ); | |
| 503 | + require FrmAppHelper::plugin_path() . '/classes/views/form-templates/modals/leave-email-modal.php'; | |
| 449 | 504 | } |
| 450 | 505 | |
| 451 | 506 | /** |
| 452 | 507 | * @return void |
| @@ -469,10 +524,9 @@ | ||
| 469 | 524 | * @return void |
| 470 | 525 | */ |
| 471 | 526 | public static function remove_upsells() { |
| 472 | 527 | remove_action( 'frm_before_settings', 'FrmSettingsController::license_box' ); |
| 473 | - remove_action( 'frm_after_settings', 'FrmSettingsController::settings_cta' ); | |
| 474 | - remove_action( 'frm_add_form_style_tab_options', 'FrmFormsController::add_form_style_tab_options' ); | |
| 528 | + remove_action( 'frm_after_settings_tabs', 'FrmSettingsController::settings_cta' ); | |
| 475 | 529 | remove_action( 'frm_after_field_options', 'FrmFormsController::logic_tip' ); |
| 476 | 530 | } |
| 477 | 531 | |
| 478 | 532 | /** |
| @@ -484,12 +538,14 @@ | ||
| 484 | 538 | * @return void |
| 485 | 539 | */ |
| 486 | 540 | public static function install_js_fallback() { |
| 487 | 541 | FrmAppHelper::load_admin_wide_js(); |
| 542 | + // phpcs:disable Generic.WhiteSpace.ScopeIndent | |
| 488 | 543 | ?> |
| 489 | 544 | <div id="frm_install_message"></div> |
| 490 | 545 | <script>jQuery(document).ready( frm_install_now );</script> |
| 491 | 546 | <?php |
| 547 | + // phpcs:enable Generic.WhiteSpace.ScopeIndent | |
| 492 | 548 | } |
| 493 | 549 | |
| 494 | 550 | /** |
| 495 | 551 | * Check if the database is outdated |
| @@ -494,9 +550,10 @@ | ||
| 494 | 550 | /** |
| 495 | 551 | * Check if the database is outdated |
| 496 | 552 | * |
| 497 | 553 | * @since 2.0.1 |
| 498 | - * @return boolean | |
| 554 | + * | |
| 555 | + * @return bool | |
| 499 | 556 | */ |
| 500 | 557 | public static function needs_update() { |
| 501 | 558 | $needs_upgrade = self::compare_for_update( |
| 502 | 559 | array( |
| @@ -506,9 +563,9 @@ | ||
| 506 | 563 | ) |
| 507 | 564 | ); |
| 508 | 565 | |
| 509 | 566 | if ( ! $needs_upgrade ) { |
| 510 | - $needs_upgrade = apply_filters( 'frm_db_needs_upgrade', $needs_upgrade ); | |
| 567 | + return apply_filters( 'frm_db_needs_upgrade', $needs_upgrade ); | |
| 511 | 568 | } |
| 512 | 569 | |
| 513 | 570 | return $needs_upgrade; |
| 514 | 571 | } |
| @@ -518,23 +575,27 @@ | ||
| 518 | 575 | * |
| 519 | 576 | * @since 3.0.04 |
| 520 | 577 | * |
| 521 | 578 | * @param array $atts |
| 579 | + * | |
| 522 | 580 | * @return bool |
| 523 | 581 | */ |
| 524 | 582 | public static function compare_for_update( $atts ) { |
| 525 | 583 | $db_version = get_option( $atts['option'] ); |
| 526 | 584 | |
| 527 | - if ( strpos( $db_version, '-' ) === false ) { | |
| 528 | - $needs_upgrade = true; | |
| 529 | - } else { | |
| 530 | - $last_upgrade = explode( '-', $db_version ); | |
| 531 | - $needs_db_upgrade = (int) $last_upgrade[1] < (int) $atts['new_db_version']; | |
| 532 | - $new_version = version_compare( $last_upgrade[0], $atts['new_plugin_version'], '<' ); | |
| 533 | - $needs_upgrade = $needs_db_upgrade || $new_version; | |
| 585 | + if ( ! str_contains( $db_version, '-' ) ) { | |
| 586 | + return true; | |
| 534 | 587 | } |
| 535 | 588 | |
| 536 | - return $needs_upgrade; | |
| 589 | + $last_upgrade = explode( '-', $db_version ); | |
| 590 | + $needs_db_upgrade = (int) $last_upgrade[1] < (int) $atts['new_db_version']; | |
| 591 | + | |
| 592 | + if ( $needs_db_upgrade ) { | |
| 593 | + return true; | |
| 594 | + } | |
| 595 | + | |
| 596 | + // New plugin version. | |
| 597 | + return version_compare( $last_upgrade[0], $atts['new_plugin_version'], '<' ); | |
| 537 | 598 | } |
| 538 | 599 | |
| 539 | 600 | /** |
| 540 | 601 | * Check for database update and trigger js loading |
| @@ -543,99 +604,95 @@ | ||
| 543 | 604 | * |
| 544 | 605 | * @return void |
| 545 | 606 | */ |
| 546 | 607 | public static function admin_init() { |
| 608 | + if ( FrmAppHelper::get_param( 'delete_all' ) && FrmAppHelper::is_admin_page( 'formidable' ) && 'trash' === FrmAppHelper::get_param( 'form_type' ) ) { | |
| 609 | + FrmFormsController::delete_all(); | |
| 610 | + } | |
| 611 | + | |
| 547 | 612 | if ( FrmAppHelper::is_admin_page( 'formidable' ) && 'duplicate' === FrmAppHelper::get_param( 'frm_action' ) ) { |
| 548 | 613 | FrmFormsController::duplicate(); |
| 549 | 614 | } |
| 550 | 615 | |
| 616 | + if ( FrmAppHelper::is_admin_page( 'formidable' ) && FrmAppHelper::simple_get( 'frm_add_tables' ) ) { | |
| 617 | + self::add_missing_tables(); | |
| 618 | + } | |
| 619 | + | |
| 551 | 620 | if ( FrmAppHelper::is_style_editor_page() && 'save' === FrmAppHelper::get_param( 'frm_action' ) ) { |
| 552 | 621 | // Hook in earlier than FrmStylesController::route so we can redirect before the headers have been sent. |
| 553 | 622 | FrmStylesController::save_style(); |
| 554 | 623 | } |
| 555 | 624 | |
| 556 | - new FrmPersonalData(); // register personal data hooks | |
| 625 | + if ( 'formidable-pro-upgrade' === FrmAppHelper::get_param( 'page' ) && ! FrmAppHelper::pro_is_installed() && current_user_can( 'frm_view_forms' ) ) { | |
| 626 | + $redirect = FrmSalesApi::get_best_sale_value( 'menu_cta_link' ); | |
| 627 | + $utm = array( | |
| 628 | + 'campaign' => 'upgrade', | |
| 629 | + 'content' => 'submenu-upgrade', | |
| 630 | + ); | |
| 557 | 631 | |
| 632 | + $redirect = $redirect ? FrmAppHelper::maybe_add_missing_utm( $redirect, $utm ) : FrmAppHelper::admin_upgrade_link( $utm ); | |
| 633 | + | |
| 634 | + wp_redirect( $redirect ); | |
| 635 | + die(); | |
| 636 | + } | |
| 637 | + | |
| 638 | + // Register personal data hooks. | |
| 639 | + new FrmPersonalData(); | |
| 640 | + | |
| 558 | 641 | if ( ! FrmAppHelper::doing_ajax() && self::needs_update() ) { |
| 559 | 642 | self::network_upgrade_site(); |
| 560 | 643 | } |
| 561 | 644 | |
| 562 | 645 | if ( ! FrmAppHelper::doing_ajax() ) { |
| 563 | - // don't continue during ajax calls | |
| 646 | + // Don't continue during ajax calls | |
| 564 | 647 | self::admin_js(); |
| 565 | 648 | } |
| 566 | 649 | |
| 567 | - if ( FrmAppHelper::is_admin_page( 'formidable' ) ) { | |
| 568 | - $action = FrmAppHelper::get_param( 'frm_action' ); | |
| 650 | + self::trigger_page_load_hooks(); | |
| 569 | 651 | |
| 570 | - if ( in_array( $action, array( 'add_new', 'list_templates' ), true ) ) { | |
| 571 | - wp_safe_redirect( admin_url( 'admin.php?page=formidable&triggerNewFormModal=1' ) ); | |
| 572 | - exit; | |
| 573 | - } | |
| 652 | + if ( ! FrmAppHelper::is_admin_page( 'formidable' ) ) { | |
| 653 | + return; | |
| 654 | + } | |
| 574 | 655 | |
| 575 | - FrmInbox::maybe_disable_screen_options(); | |
| 656 | + // Redirect to the "Form Templates" page if the 'frm_action' parameter matches specific actions. | |
| 657 | + // This provides backward compatibility for old addons that use legacy modal templates. | |
| 658 | + $action = FrmAppHelper::get_param( 'frm_action' ); | |
| 659 | + $trigger_name_modal = FrmAppHelper::get_param( 'triggerNewFormModal' ); | |
| 660 | + | |
| 661 | + if ( $trigger_name_modal || in_array( $action, array( 'add_new', 'list_templates' ), true ) ) { | |
| 662 | + $application_id = FrmAppHelper::simple_get( 'applicationId', 'absint' ); | |
| 663 | + $url_param = $application_id ? '&applicationId=' . $application_id : ''; | |
| 664 | + | |
| 665 | + wp_safe_redirect( admin_url( 'admin.php?page=' . FrmFormTemplatesController::PAGE_SLUG . $url_param ) ); | |
| 666 | + exit; | |
| 576 | 667 | } |
| 577 | 668 | |
| 578 | - self::maybe_add_ip_warning(); | |
| 669 | + FrmInbox::maybe_disable_screen_options(); | |
| 579 | 670 | } |
| 580 | 671 | |
| 581 | 672 | /** |
| 582 | - * Show a warning for the IP address setting if it hasn't been set. | |
| 673 | + * Get the current page and check for a possible function to trigger. | |
| 674 | + * If a class name matches the page name, and the class has a load_page() method, trigger it. | |
| 583 | 675 | * |
| 584 | - * @since 6.1 | |
| 676 | + * @since 6.8 | |
| 585 | 677 | * |
| 586 | 678 | * @return void |
| 587 | 679 | */ |
| 588 | - private static function maybe_add_ip_warning() { | |
| 589 | - $settings = FrmAppHelper::get_settings(); | |
| 590 | - if ( false !== $settings->custom_header_ip ) { | |
| 591 | - // The setting has been changed from the false default (to either 1 or 0), so stop showing the message. | |
| 592 | - return; | |
| 593 | - } | |
| 680 | + private static function trigger_page_load_hooks() { | |
| 681 | + $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); | |
| 594 | 682 | |
| 595 | - if ( ! self::is_behind_proxy() ) { | |
| 596 | - // This message is only applicable when using a reverse proxy. | |
| 683 | + if ( ! str_starts_with( $page, 'formidable-' ) ) { | |
| 684 | + // Only trigger hooks on Formidable pages. | |
| 597 | 685 | return; |
| 598 | 686 | } |
| 599 | 687 | |
| 600 | - if ( FrmAppHelper::get_post_param( 'frm_action', '', 'sanitize_text_field' ) ) { | |
| 601 | - // Avoid the message on a POST action. We don't want to show the message if we're saving global settings. | |
| 602 | - return; | |
| 603 | - } | |
| 688 | + $page = str_replace( array( 'formidable-', '-' ), array( '', ' ' ), $page ); | |
| 689 | + $page = str_replace( ' ', '', ucwords( $page ) ); | |
| 690 | + $class = 'Frm' . $page . 'Controller'; | |
| 604 | 691 | |
| 605 | - $global_settings_link = admin_url( 'admin.php?page=formidable-settings' ) . '#frm_custom_header_ip'; | |
| 606 | - $message = sprintf( | |
| 607 | - // Translators: 1: Global Settings Link | |
| 608 | - __( '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' ), | |
| 609 | - '<a href="' . esc_url( $global_settings_link ) . '">Global Settings</a>' | |
| 610 | - ); | |
| 611 | - $option_name = 'frm_dismiss_ip_address_notice'; | |
| 612 | - FrmAppHelper::add_dismissable_warning_message( $message, $option_name ); | |
| 613 | - } | |
| 614 | - | |
| 615 | - /** | |
| 616 | - * Check if any reverse proxy headers are set. | |
| 617 | - * | |
| 618 | - * @since 6.1 | |
| 619 | - * | |
| 620 | - * @return bool | |
| 621 | - */ | |
| 622 | - private static function is_behind_proxy() { | |
| 623 | - $custom_headers = FrmAppHelper::get_custom_header_keys_for_ip(); | |
| 624 | - foreach ( $custom_headers as $header ) { | |
| 625 | - if ( 'REMOTE_ADDR' === $header ) { | |
| 626 | - // We want to check every key but REMOTE_ADDR. REMOTE_ATTR is not unique to reverse proxy servers. | |
| 627 | - continue; | |
| 628 | - } | |
| 629 | - | |
| 630 | - $ip = trim( FrmAppHelper::get_server_value( $header ) ); | |
| 631 | - // Return true for anything that isn't empty but ignoring values like ::1. | |
| 632 | - if ( $ip && 0 !== strpos( $ip, '::' ) ) { | |
| 633 | - return true; | |
| 634 | - } | |
| 692 | + if ( class_exists( $class ) && method_exists( $class, 'load_page' ) ) { | |
| 693 | + call_user_func( array( $class, 'load_page' ) ); | |
| 635 | 694 | } |
| 636 | - | |
| 637 | - return false; | |
| 638 | 695 | } |
| 639 | 696 | |
| 640 | 697 | /** |
| 641 | 698 | * @return void |
| @@ -640,14 +697,23 @@ | ||
| 640 | 697 | /** |
| 641 | 698 | * @return void |
| 642 | 699 | */ |
| 643 | 700 | public static function admin_js() { |
| 644 | - $plugin_url = FrmAppHelper::plugin_url(); | |
| 645 | - $version = FrmAppHelper::plugin_version(); | |
| 701 | + $plugin_url = FrmAppHelper::plugin_url(); | |
| 702 | + $version = FrmAppHelper::plugin_version(); | |
| 703 | + $is_pro_min_v6_28 = FrmAppHelper::pro_is_installed() && FrmAppHelper::meets_min_pro_version( '6.28' ); | |
| 704 | + $frm_components_dependencies = $is_pro_min_v6_28 ? array( 'formidable_admin', 'formidable-pro-web-components' ) : array( 'formidable_admin' ); | |
| 646 | 705 | |
| 647 | 706 | FrmAppHelper::load_admin_wide_js(); |
| 648 | - FrmOverlayController::register_assets(); | |
| 707 | + // Register component assets early to ensure they can be enqueued later in controllers. | |
| 708 | + wp_register_style( 'formidable-animations', $plugin_url . '/css/admin/animations.css', array(), $version ); | |
| 649 | 709 | |
| 710 | + if ( class_exists( 'FrmOverlayController' ) ) { | |
| 711 | + // This should always exist. | |
| 712 | + // But it may not have loaded properly when updating the plugin. | |
| 713 | + FrmOverlayController::register_assets(); | |
| 714 | + } | |
| 715 | + | |
| 650 | 716 | wp_register_style( 'formidable_admin_global', $plugin_url . '/css/admin/frm_admin_global.css', array(), $version ); |
| 651 | 717 | wp_enqueue_style( 'formidable_admin_global' ); |
| 652 | 718 | |
| 653 | 719 | wp_register_style( 'formidable-admin', $plugin_url . '/css/frm_admin.css', array(), $version ); |
| @@ -654,85 +720,69 @@ | ||
| 654 | 720 | wp_register_style( 'formidable-grids', $plugin_url . '/css/frm_grids.css', array(), $version ); |
| 655 | 721 | |
| 656 | 722 | wp_register_script( 'formidable_dom', $plugin_url . '/js/admin/dom.js', array( 'jquery', 'jquery-ui-dialog', 'wp-i18n' ), $version, true ); |
| 657 | 723 | wp_register_script( 'formidable_embed', $plugin_url . '/js/admin/embed.js', array( 'formidable_dom', 'jquery-ui-autocomplete' ), $version, true ); |
| 658 | - self::register_popper1(); | |
| 659 | - wp_register_script( 'bootstrap_tooltip', $plugin_url . '/js/bootstrap.min.js', array( 'jquery', 'popper' ), '4.6.1', true ); | |
| 724 | + self::register_popper2(); | |
| 725 | + wp_register_script( 'bootstrap_tooltip', $plugin_url . '/js/bootstrap.min.js', array( 'jquery', 'popper' ), '5.0.2', true ); | |
| 726 | + | |
| 727 | + $settings_js_vars = array( | |
| 728 | + 'currencies' => FrmCurrencyHelper::get_currencies(), | |
| 729 | + ); | |
| 660 | 730 | wp_register_script( 'formidable_settings', $plugin_url . '/js/admin/settings.js', array(), $version, true ); |
| 731 | + wp_localize_script( 'formidable_settings', 'frmSettings', $settings_js_vars ); | |
| 732 | + wp_register_script( 'formidable-web-components', $plugin_url . '/js/formidable-web-components.js', $frm_components_dependencies, $version, true ); | |
| 661 | 733 | |
| 662 | - $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); | |
| 663 | - | |
| 664 | - // Enqueue Floating Links. | |
| 665 | - $is_valid_page = | |
| 666 | - FrmAppHelper::is_formidable_admin() && | |
| 667 | - ! FrmAppHelper::is_style_editor_page() && | |
| 668 | - ! FrmAppHelper::is_admin_page( 'formidable-views-editor' ) && | |
| 669 | - ! FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ); | |
| 670 | - if ( $is_valid_page && FrmAppHelper::is_formidable_branding() ) { | |
| 734 | + if ( self::should_show_floating_links() ) { | |
| 671 | 735 | self::enqueue_floating_links( $plugin_url, $version ); |
| 672 | 736 | } |
| 673 | - unset( $is_valid_page ); | |
| 674 | 737 | |
| 675 | - if ( 'formidable-applications' === $page ) { | |
| 676 | - FrmApplicationsController::load_assets(); | |
| 677 | - return; | |
| 678 | - } | |
| 738 | + wp_register_script( 'formidable_admin', $plugin_url . '/js/formidable_admin.js', self::get_admin_js_dependencies(), $version, true ); | |
| 679 | 739 | |
| 680 | - $dependencies = array( | |
| 681 | - 'formidable_admin_global', | |
| 682 | - 'jquery', | |
| 683 | - 'jquery-ui-core', | |
| 684 | - 'jquery-ui-draggable', | |
| 685 | - 'jquery-ui-sortable', | |
| 686 | - 'bootstrap_tooltip', | |
| 687 | - 'bootstrap-multiselect', | |
| 688 | - 'wp-i18n', | |
| 689 | - 'wp-hooks', // Required in WP versions older than 5.7 | |
| 690 | - 'formidable_dom', | |
| 691 | - 'formidable_embed', | |
| 740 | + wp_register_script( | |
| 741 | + 'formidable_forms_list', | |
| 742 | + $plugin_url . '/js/admin/forms-list.js', | |
| 743 | + array( | |
| 744 | + 'formidable_dom', | |
| 745 | + ), | |
| 746 | + $version, | |
| 747 | + true | |
| 692 | 748 | ); |
| 693 | 749 | |
| 694 | - if ( FrmAppHelper::is_style_editor_page( 'edit' ) ) { | |
| 695 | - // We only need to load the color picker when editing styles. | |
| 696 | - $dependencies[] = 'wp-color-picker'; | |
| 697 | - } | |
| 698 | - | |
| 699 | - wp_register_script( 'formidable_admin', $plugin_url . '/js/formidable_admin.js', $dependencies, $version, true ); | |
| 700 | - | |
| 701 | 750 | if ( FrmAppHelper::on_form_listing_page() ) { |
| 702 | 751 | // For the existing page dropdown in the Form embed modal. |
| 703 | 752 | wp_enqueue_script( 'jquery-ui-autocomplete' ); |
| 753 | + wp_enqueue_script( 'formidable_forms_list' ); | |
| 704 | 754 | } |
| 705 | 755 | |
| 706 | - wp_register_script( 'bootstrap-multiselect', $plugin_url . '/js/bootstrap-multiselect.js', array( 'jquery', 'bootstrap_tooltip', 'popper' ), '1.1.1', true ); | |
| 756 | + wp_register_script( 'bootstrap-multiselect', $plugin_url . '/js/bootstrap-multiselect.js', array( 'jquery', 'bootstrap_tooltip', 'popper' ), '2.0', true ); | |
| 707 | 757 | |
| 708 | 758 | if ( ! class_exists( 'FrmTransHooksController', false ) ) { |
| 709 | - /** | |
| 710 | - * Gateway fields are included for add-on compatibility but we do not want it to be visible. | |
| 711 | - * They do however need to be visible when the payments submodule is active. | |
| 712 | - */ | |
| 713 | - wp_add_inline_style( | |
| 714 | - 'formidable-admin', | |
| 715 | - '#frm_builder_page li[data-ftype="gateway"] { display: none; }' | |
| 716 | - ); | |
| 759 | + FrmTransLiteAppController::hide_gateway_fields_in_builder(); | |
| 717 | 760 | } |
| 718 | 761 | |
| 762 | + $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); | |
| 719 | 763 | $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title' ); |
| 720 | 764 | |
| 721 | 765 | global $pagenow; |
| 722 | - if ( strpos( $page, 'formidable' ) === 0 || ( $pagenow === 'edit.php' && $post_type === 'frm_display' ) ) { | |
| 723 | 766 | |
| 767 | + if ( str_starts_with( $page, 'formidable' ) || ( $pagenow === 'edit.php' && $post_type === 'frm_display' ) ) { | |
| 768 | + self::enqueue_global_settings_scripts( $page ); | |
| 769 | + | |
| 724 | 770 | wp_enqueue_script( 'admin-widgets' ); |
| 725 | 771 | wp_enqueue_style( 'widgets' ); |
| 726 | - self::maybe_deregister_popper2(); | |
| 772 | + self::maybe_deregister_popper1(); | |
| 727 | 773 | wp_enqueue_script( 'formidable_admin' ); |
| 774 | + wp_set_script_translations( 'formidable_admin', 'formidable' ); | |
| 728 | 775 | wp_enqueue_script( 'formidable_embed' ); |
| 776 | + wp_set_script_translations( 'formidable_embed', 'formidable' ); | |
| 729 | 777 | FrmAppHelper::localize_script( 'admin' ); |
| 730 | 778 | |
| 779 | + wp_enqueue_style( 'formidable-animations' ); | |
| 731 | 780 | wp_enqueue_style( 'formidable-admin' ); |
| 781 | + | |
| 732 | 782 | if ( 'formidable-styles' !== $page && 'formidable-styles2' !== $page ) { |
| 733 | 783 | wp_enqueue_style( 'formidable-grids' ); |
| 734 | - wp_enqueue_style( 'formidable-dropzone' ); | |
| 784 | + self::maybe_enqueue_dropzone_css( $page ); | |
| 735 | 785 | } else { |
| 736 | 786 | wp_enqueue_style( 'formidable-grids' ); |
| 737 | 787 | } |
| 738 | 788 | |
| @@ -738,11 +788,16 @@ | ||
| 738 | 788 | |
| 739 | 789 | if ( 'formidable-entries' === $page ) { |
| 740 | 790 | // Load front end js for entries. |
| 741 | 791 | wp_enqueue_script( 'formidable' ); |
| 792 | + | |
| 793 | + // Registers and enqueues the entries page scripts. | |
| 794 | + wp_register_script( 'formidable_entries', $plugin_url . '/js/admin/entries.js', array( 'formidable_admin', 'wp-dom-ready' ), $version, true ); | |
| 795 | + wp_enqueue_script( 'formidable_entries' ); | |
| 742 | 796 | } |
| 743 | 797 | |
| 744 | 798 | do_action( 'frm_enqueue_builder_scripts' ); |
| 799 | + self::maybe_enqueue_legacy_paypal_assets(); | |
| 745 | 800 | self::include_upgrade_overlay(); |
| 746 | 801 | self::include_info_overlay(); |
| 747 | 802 | } elseif ( FrmAppHelper::is_view_builder_page() ) { |
| 748 | 803 | if ( isset( $_REQUEST['post_type'] ) ) { |
| @@ -748,11 +803,13 @@ | ||
| 748 | 803 | if ( isset( $_REQUEST['post_type'] ) ) { |
| 749 | 804 | $post_type = sanitize_title( wp_unslash( $_REQUEST['post_type'] ) ); |
| 750 | 805 | } elseif ( isset( $_REQUEST['post'] ) && absint( $_REQUEST['post'] ) ) { |
| 751 | 806 | $post = get_post( absint( wp_unslash( $_REQUEST['post'] ) ) ); |
| 807 | + | |
| 752 | 808 | if ( ! $post ) { |
| 753 | 809 | return; |
| 754 | 810 | } |
| 811 | + | |
| 755 | 812 | $post_type = $post->post_type; |
| 756 | 813 | } else { |
| 757 | 814 | return; |
| 758 | 815 | } |
| @@ -759,13 +816,132 @@ | ||
| 759 | 816 | |
| 760 | 817 | if ( $post_type === 'frm_display' ) { |
| 761 | 818 | self::enqueue_legacy_views_assets(); |
| 762 | 819 | } |
| 820 | + }//end if | |
| 821 | + | |
| 822 | + if ( 'formidable-addons' === $page ) { | |
| 823 | + wp_register_script( 'formidable_addons', $plugin_url . '/js/admin/addons.js', array( 'formidable_admin', 'wp-dom-ready' ), $version, true ); | |
| 824 | + wp_enqueue_script( 'formidable_addons' ); | |
| 763 | 825 | } |
| 764 | 826 | |
| 827 | + self::enqueue_builder_assets( $plugin_url, $version ); | |
| 765 | 828 | } |
| 766 | 829 | |
| 767 | 830 | /** |
| 831 | + * @since 6.27 | |
| 832 | + * | |
| 833 | + * @return array | |
| 834 | + */ | |
| 835 | + private static function get_admin_js_dependencies() { | |
| 836 | + $dependencies = array( | |
| 837 | + 'formidable_admin_global', | |
| 838 | + 'jquery', | |
| 839 | + 'jquery-ui-core', | |
| 840 | + 'jquery-ui-draggable', | |
| 841 | + 'jquery-ui-sortable', | |
| 842 | + 'bootstrap_tooltip', | |
| 843 | + 'bootstrap-multiselect', | |
| 844 | + 'wp-i18n', | |
| 845 | + // Required in WP versions older than 5.7 | |
| 846 | + 'wp-hooks', | |
| 847 | + 'formidable_dom', | |
| 848 | + 'formidable_embed', | |
| 849 | + ); | |
| 850 | + | |
| 851 | + if ( FrmAppHelper::is_style_editor_page( 'edit' ) ) { | |
| 852 | + // We only need to load the color picker when editing styles. | |
| 853 | + $dependencies[] = 'wp-color-picker'; | |
| 854 | + } | |
| 855 | + | |
| 856 | + return $dependencies; | |
| 857 | + } | |
| 858 | + | |
| 859 | + /** | |
| 860 | + * Enqueue the Form Builder assets. | |
| 861 | + * | |
| 862 | + * @since 6.24 | |
| 863 | + * | |
| 864 | + * @param string $plugin_url The plugin URL. | |
| 865 | + * @param string $version The plugin version. | |
| 866 | + * | |
| 867 | + * @return void | |
| 868 | + */ | |
| 869 | + private static function enqueue_builder_assets( $plugin_url, $version ) { | |
| 870 | + wp_register_style( 'formidable-settings-components', $plugin_url . '/css/admin/frm-settings-components.css', array( 'formidable-admin', 'formidable-grids' ), $version ); | |
| 871 | + wp_register_script( 'formidable-settings-components', $plugin_url . '/js/formidable-settings-components.js', array( 'formidable_admin' ), $version, true ); | |
| 872 | + | |
| 873 | + if ( ! FrmAppHelper::is_form_builder_page() ) { | |
| 874 | + return; | |
| 875 | + } | |
| 876 | + | |
| 877 | + wp_enqueue_style( 'formidable-settings-components' ); | |
| 878 | + wp_enqueue_script( 'formidable-settings-components' ); | |
| 879 | + } | |
| 880 | + | |
| 881 | + /** | |
| 882 | + * Enqueues global settings scripts. | |
| 883 | + * | |
| 884 | + * @param string $page The `page` param in URL. | |
| 885 | + * | |
| 886 | + * @return void | |
| 887 | + */ | |
| 888 | + private static function enqueue_global_settings_scripts( $page ) { | |
| 889 | + if ( 'formidable-settings' !== $page ) { | |
| 890 | + return; | |
| 891 | + } | |
| 892 | + | |
| 893 | + wp_enqueue_style( 'wp-color-picker' ); | |
| 894 | + wp_enqueue_script( 'formidable_settings' ); | |
| 895 | + } | |
| 896 | + | |
| 897 | + /** | |
| 898 | + * Avoid loading dropzone CSS on the form list page. It isn't required there. | |
| 899 | + * | |
| 900 | + * @since 6.11 | |
| 901 | + * | |
| 902 | + * @param string $page | |
| 903 | + * | |
| 904 | + * @return void | |
| 905 | + */ | |
| 906 | + private static function maybe_enqueue_dropzone_css( $page ) { | |
| 907 | + if ( ! FrmAppHelper::pro_is_installed() ) { | |
| 908 | + return; | |
| 909 | + } | |
| 910 | + | |
| 911 | + $should_avoid_loading_dropzone = 'formidable' === $page && ! FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ); | |
| 912 | + | |
| 913 | + if ( ! $should_avoid_loading_dropzone ) { | |
| 914 | + wp_enqueue_style( 'formidable-dropzone' ); | |
| 915 | + } | |
| 916 | + } | |
| 917 | + | |
| 918 | + /** | |
| 919 | + * The floating links are not shown on every page. | |
| 920 | + * They are also not shown if white labeling is being used. | |
| 921 | + * | |
| 922 | + * @since 6.8.4 | |
| 923 | + * | |
| 924 | + * @return bool | |
| 925 | + */ | |
| 926 | + private static function should_show_floating_links() { | |
| 927 | + if ( ! FrmAppHelper::is_formidable_branding() ) { | |
| 928 | + return false; | |
| 929 | + } | |
| 930 | + | |
| 931 | + $should_show = FrmAppHelper::is_formidable_admin() && ! FrmAppHelper::is_style_editor_page() && ! FrmAppHelper::is_admin_page( 'formidable-views-editor' ) && ! FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 932 | + | |
| 933 | + /** | |
| 934 | + * Filters whether the floating links should be displayed. | |
| 935 | + * | |
| 936 | + * @since 6.25.1 | |
| 937 | + * | |
| 938 | + * @param bool $should_show Whether the floating links should be shown. | |
| 939 | + */ | |
| 940 | + return apply_filters( 'frm_should_show_floating_links', $should_show ); | |
| 941 | + } | |
| 942 | + | |
| 943 | + /** | |
| 768 | 944 | * @since 6.3.2 |
| 769 | 945 | * |
| 770 | 946 | * @return void |
| 771 | 947 | */ |
| @@ -771,11 +947,38 @@ | ||
| 771 | 947 | */ |
| 772 | 948 | public static function admin_enqueue_scripts() { |
| 773 | 949 | self::load_wp_admin_style(); |
| 774 | 950 | self::maybe_force_formidable_block_on_gutenberg_page(); |
| 951 | + | |
| 952 | + if ( FrmAppHelper::is_admin_page( 'formidable-settings' ) ) { | |
| 953 | + wp_enqueue_style( FrmDashboardController::PAGE_SLUG, FrmAppHelper::plugin_url() . '/css/admin/dashboard.css', array(), FrmAppHelper::plugin_version() ); | |
| 954 | + } | |
| 955 | + | |
| 956 | + FrmUsageController::load_scripts(); | |
| 775 | 957 | } |
| 776 | 958 | |
| 777 | 959 | /** |
| 960 | + * Enqueue legacy PayPal action settings styles when the PayPal add-on is active. | |
| 961 | + * | |
| 962 | + * @since 6.31 | |
| 963 | + * | |
| 964 | + * @return void | |
| 965 | + */ | |
| 966 | + private static function maybe_enqueue_legacy_paypal_assets() { | |
| 967 | + if ( ! FrmAppHelper::is_form_builder_page() || ! class_exists( 'FrmPaymentsController' ) ) { | |
| 968 | + return; | |
| 969 | + } | |
| 970 | + | |
| 971 | + wp_register_style( | |
| 972 | + 'formidable-legacy-paypal', | |
| 973 | + FrmAppHelper::plugin_url() . '/css/admin/frm-legacy-paypal.css', | |
| 974 | + array( 'formidable-admin' ), | |
| 975 | + FrmAppHelper::plugin_version() | |
| 976 | + ); | |
| 977 | + wp_enqueue_style( 'formidable-legacy-paypal' ); | |
| 978 | + } | |
| 979 | + | |
| 980 | + /** | |
| 778 | 981 | * Enqueue required assets for the Legacy Views editor (Views v4.x). |
| 779 | 982 | * |
| 780 | 983 | * @since 6.1.2 |
| 781 | 984 | * |
| @@ -783,9 +986,9 @@ | ||
| 783 | 986 | */ |
| 784 | 987 | private static function enqueue_legacy_views_assets() { |
| 785 | 988 | wp_enqueue_style( 'formidable-grids' ); |
| 786 | 989 | wp_enqueue_script( 'jquery-ui-draggable' ); |
| 787 | - self::maybe_deregister_popper2(); | |
| 990 | + self::maybe_deregister_popper1(); | |
| 788 | 991 | wp_enqueue_script( 'formidable_admin' ); |
| 789 | 992 | wp_add_inline_style( |
| 790 | 993 | 'formidable-admin', |
| 791 | 994 | ' |
| @@ -808,20 +1011,21 @@ | ||
| 808 | 1011 | } |
| 809 | 1012 | ' |
| 810 | 1013 | ); |
| 811 | 1014 | wp_enqueue_style( 'formidable-admin' ); |
| 1015 | + wp_enqueue_script( 'formidable_legacy_views', FrmAppHelper::plugin_url() . '/js/admin/legacy-views.js', array( 'jquery', 'formidable_admin' ), FrmAppHelper::plugin_version() ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 812 | 1016 | FrmAppHelper::localize_script( 'admin' ); |
| 813 | 1017 | self::include_info_overlay(); |
| 814 | 1018 | } |
| 815 | 1019 | |
| 816 | 1020 | /** |
| 817 | - * Fix a Duplicator Pro conflict because it uses Popper 2. See issue #3459. | |
| 1021 | + * Unregister Popper if the registered version is outdated. | |
| 818 | 1022 | * |
| 819 | - * @since 5.2.02.01 | |
| 1023 | + * @since 6.26 | |
| 820 | 1024 | * |
| 821 | 1025 | * @return void |
| 822 | 1026 | */ |
| 823 | - private static function maybe_deregister_popper2() { | |
| 1027 | + private static function maybe_deregister_popper1() { | |
| 824 | 1028 | global $wp_scripts; |
| 825 | 1029 | |
| 826 | 1030 | if ( ! array_key_exists( 'popper', $wp_scripts->registered ) ) { |
| 827 | 1031 | return; |
| @@ -827,26 +1031,65 @@ | ||
| 827 | 1031 | return; |
| 828 | 1032 | } |
| 829 | 1033 | |
| 830 | 1034 | $popper = $wp_scripts->registered['popper']; |
| 831 | - if ( version_compare( $popper->ver, '2.0', '>=' ) ) { | |
| 832 | - wp_deregister_script( 'popper' ); | |
| 833 | - self::register_popper1(); | |
| 1035 | + | |
| 1036 | + if ( ! version_compare( $popper->ver, '2.0', '<' ) ) { | |
| 1037 | + return; | |
| 834 | 1038 | } |
| 1039 | + | |
| 1040 | + wp_deregister_script( 'popper' ); | |
| 1041 | + self::register_popper2(); | |
| 835 | 1042 | } |
| 836 | 1043 | |
| 837 | 1044 | /** |
| 838 | - * Register Popper required for Bootstrap 4. | |
| 1045 | + * Register Popper required for Bootstrap 5. | |
| 839 | 1046 | * |
| 840 | - * @since 5.2.02.01 | |
| 1047 | + * @since 6.26 | |
| 841 | 1048 | * |
| 842 | 1049 | * @return void |
| 843 | 1050 | */ |
| 844 | - private static function register_popper1() { | |
| 845 | - wp_register_script( 'popper', FrmAppHelper::plugin_url() . '/js/popper.min.js', array( 'jquery' ), '1.16.0', true ); | |
| 1051 | + private static function register_popper2() { | |
| 1052 | + if ( ! self::should_register_popper() ) { | |
| 1053 | + return; | |
| 1054 | + } | |
| 1055 | + wp_register_script( 'popper', FrmAppHelper::plugin_url() . '/js/popper.min.js', array(), '2.11.8', true ); | |
| 846 | 1056 | } |
| 847 | 1057 | |
| 848 | 1058 | /** |
| 1059 | + * Only register popper on Formidable pages. | |
| 1060 | + * This helps to avoid popper conflicts on other plugin pages, including the WP Bakery page editor. | |
| 1061 | + * | |
| 1062 | + * @since 6.11.1 | |
| 1063 | + * | |
| 1064 | + * @return bool | |
| 1065 | + */ | |
| 1066 | + private static function should_register_popper() { | |
| 1067 | + global $pagenow; | |
| 1068 | + | |
| 1069 | + $post_id = FrmAppHelper::simple_get( 'post', 'absint' ); | |
| 1070 | + | |
| 1071 | + if ( 'post.php' === $pagenow && $post_id && 'frm_display' === get_post_type( $post_id ) ) { | |
| 1072 | + return true; | |
| 1073 | + } | |
| 1074 | + | |
| 1075 | + $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title' ); | |
| 1076 | + $is_views_post_type = 'frm_display' === $post_type; | |
| 1077 | + | |
| 1078 | + if ( in_array( $pagenow, array( 'post-new.php', 'edit.php' ), true ) && $is_views_post_type ) { | |
| 1079 | + return true; | |
| 1080 | + } | |
| 1081 | + | |
| 1082 | + $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); | |
| 1083 | + | |
| 1084 | + if ( str_starts_with( $page, 'formidable' ) ) { | |
| 1085 | + return true; | |
| 1086 | + } | |
| 1087 | + | |
| 1088 | + return in_array( $pagenow, array( 'term.php', 'edit-tags.php' ), true ) && FrmAppHelper::simple_get( 'taxonomy' ) === 'frm_application'; | |
| 1089 | + } | |
| 1090 | + | |
| 1091 | + /** | |
| 849 | 1092 | * Automatically insert a Formidable block when loading Gutenberg when $_GET['frmForm' is set. |
| 850 | 1093 | * |
| 851 | 1094 | * @since 5.2 |
| 852 | 1095 | * |
| @@ -853,13 +1096,15 @@ | ||
| 853 | 1096 | * @return void |
| 854 | 1097 | */ |
| 855 | 1098 | private static function maybe_force_formidable_block_on_gutenberg_page() { |
| 856 | 1099 | global $pagenow; |
| 1100 | + | |
| 857 | 1101 | if ( 'post.php' !== $pagenow ) { |
| 858 | 1102 | return; |
| 859 | 1103 | } |
| 860 | 1104 | |
| 861 | 1105 | $form_id = FrmAppHelper::simple_get( 'frmForm', 'absint' ); |
| 1106 | + | |
| 862 | 1107 | if ( ! $form_id ) { |
| 863 | 1108 | return; |
| 864 | 1109 | } |
| 865 | 1110 | |
| @@ -905,18 +1150,18 @@ | ||
| 905 | 1150 | * @return void |
| 906 | 1151 | */ |
| 907 | 1152 | public static function create_rest_routes() { |
| 908 | 1153 | $args = array( |
| 909 | - 'methods' => 'GET', | |
| 910 | - 'callback' => 'FrmAppController::api_install', | |
| 911 | - 'permission_callback' => __CLASS__ . '::can_update_db', | |
| 1154 | + 'methods' => 'GET', | |
| 1155 | + 'callback' => 'FrmAppController::api_install', | |
| 1156 | + 'permission_callback' => self::class . '::can_update_db', | |
| 912 | 1157 | ); |
| 913 | 1158 | |
| 914 | 1159 | register_rest_route( 'frm-admin/v1', '/install', $args ); |
| 915 | 1160 | |
| 916 | 1161 | $args = array( |
| 917 | - 'methods' => 'GET', | |
| 918 | - 'callback' => 'FrmAddonsController::install_addon_api', | |
| 1162 | + 'methods' => 'GET', | |
| 1163 | + 'callback' => 'FrmAddonsController::install_addon_api', | |
| 919 | 1164 | 'permission_callback' => 'FrmAddonsController::can_install_addon_api', |
| 920 | 1165 | ); |
| 921 | 1166 | |
| 922 | 1167 | register_rest_route( 'frm-admin/v1', '/install-addon', $args ); |
| @@ -926,8 +1171,10 @@ | ||
| 926 | 1171 | * Make sure the install is only being run when we tell it to. |
| 927 | 1172 | * We don't want to run manually by people calling the API. |
| 928 | 1173 | * |
| 929 | 1174 | * @since 4.06.02 |
| 1175 | + * | |
| 1176 | + * @return bool | |
| 930 | 1177 | */ |
| 931 | 1178 | public static function can_update_db() { |
| 932 | 1179 | return get_transient( 'frm_updating_api' ); |
| 933 | 1180 | } |
| @@ -957,9 +1204,9 @@ | ||
| 957 | 1204 | $response = rest_do_request( $request ); |
| 958 | 1205 | } |
| 959 | 1206 | |
| 960 | 1207 | if ( $response->is_error() ) { |
| 961 | - // if the remove post fails, use javascript instead | |
| 1208 | + // If the remove post fails, use javascript instead | |
| 962 | 1209 | add_action( 'admin_notices', 'FrmAppController::install_js_fallback' ); |
| 963 | 1210 | } |
| 964 | 1211 | } |
| 965 | 1212 | |
| @@ -969,14 +1216,17 @@ | ||
| 969 | 1216 | * |
| 970 | 1217 | * @return void |
| 971 | 1218 | */ |
| 972 | 1219 | private static function maybe_add_wp_site_health() { |
| 973 | - if ( ! class_exists( 'WP_Site_Health' ) ) { | |
| 974 | - $wp_site_health_path = ABSPATH . 'wp-admin/includes/class-wp-site-health.php'; | |
| 975 | - if ( file_exists( $wp_site_health_path ) ) { | |
| 976 | - require_once $wp_site_health_path; | |
| 977 | - } | |
| 1220 | + if ( class_exists( 'WP_Site_Health' ) ) { | |
| 1221 | + return; | |
| 978 | 1222 | } |
| 1223 | + | |
| 1224 | + $wp_site_health_path = ABSPATH . 'wp-admin/includes/class-wp-site-health.php'; | |
| 1225 | + | |
| 1226 | + if ( file_exists( $wp_site_health_path ) ) { | |
| 1227 | + require_once $wp_site_health_path; | |
| 1228 | + } | |
| 979 | 1229 | } |
| 980 | 1230 | |
| 981 | 1231 | /** |
| 982 | 1232 | * @since 3.0 |
| @@ -984,12 +1234,14 @@ | ||
| 984 | 1234 | * @return true |
| 985 | 1235 | */ |
| 986 | 1236 | public static function api_install() { |
| 987 | 1237 | delete_transient( 'frm_updating_api' ); |
| 1238 | + | |
| 988 | 1239 | if ( self::needs_update() ) { |
| 989 | 1240 | $running = get_option( 'frm_install_running' ); |
| 1241 | + | |
| 990 | 1242 | if ( false === $running || $running < strtotime( '-5 minutes' ) ) { |
| 991 | - update_option( 'frm_install_running', time(), 'no' ); | |
| 1243 | + update_option( 'frm_install_running', time(), false ); | |
| 992 | 1244 | self::install(); |
| 993 | 1245 | delete_option( 'frm_install_running' ); |
| 994 | 1246 | } |
| 995 | 1247 | } |
| @@ -1029,9 +1281,9 @@ | ||
| 1029 | 1281 | |
| 1030 | 1282 | $frmdb = new FrmMigrate(); |
| 1031 | 1283 | $frmdb->uninstall(); |
| 1032 | 1284 | |
| 1033 | - //disable the plugin and redirect after uninstall so the tables don't get added right back | |
| 1285 | + // Disable the plugin and redirect after uninstall so the tables don't get added right back. | |
| 1034 | 1286 | $plugins = array( FrmAppHelper::plugin_folder() . '/formidable.php', 'formidable-pro/formidable-pro.php' ); |
| 1035 | 1287 | deactivate_plugins( $plugins, false, false ); |
| 1036 | 1288 | echo esc_url_raw( admin_url( 'plugins.php?deactivate=true' ) ); |
| 1037 | 1289 | |
| @@ -1037,8 +1289,13 @@ | ||
| 1037 | 1289 | |
| 1038 | 1290 | wp_die(); |
| 1039 | 1291 | } |
| 1040 | 1292 | |
| 1293 | + /** | |
| 1294 | + * @param array $tables | |
| 1295 | + * | |
| 1296 | + * @return array | |
| 1297 | + */ | |
| 1041 | 1298 | public static function drop_tables( $tables ) { |
| 1042 | 1299 | global $wpdb; |
| 1043 | 1300 | $tables[] = $wpdb->prefix . 'frm_fields'; |
| 1044 | 1301 | $tables[] = $wpdb->prefix . 'frm_forms'; |
| @@ -1072,9 +1329,9 @@ | ||
| 1072 | 1329 | } |
| 1073 | 1330 | |
| 1074 | 1331 | /** |
| 1075 | 1332 | * The payment cron is unscheduled when Formidable is deactivated. |
| 1076 | - * We need to add it back again on activation if Stripe is configured. | |
| 1333 | + * We need to add it back again on activation if any payment gateway is configured. | |
| 1077 | 1334 | * |
| 1078 | 1335 | * @since 6.5 |
| 1079 | 1336 | * |
| 1080 | 1337 | * @return void |
| @@ -1079,9 +1336,13 @@ | ||
| 1079 | 1336 | * |
| 1080 | 1337 | * @return void |
| 1081 | 1338 | */ |
| 1082 | 1339 | private static function maybe_activate_payment_cron() { |
| 1083 | - if ( ! FrmStrpLiteConnectHelper::stripe_connect_is_setup() ) { | |
| 1340 | + $stripe_connected = FrmStrpLiteConnectHelper::at_least_one_mode_is_setup(); | |
| 1341 | + $square_connected = FrmSquareLiteConnectHelper::at_least_one_mode_is_setup(); | |
| 1342 | + $paypal_connected = FrmPayPalLiteConnectHelper::at_least_one_mode_is_setup(); | |
| 1343 | + | |
| 1344 | + if ( ! $stripe_connected && ! $square_connected && ! $paypal_connected ) { | |
| 1084 | 1345 | return; |
| 1085 | 1346 | } |
| 1086 | 1347 | |
| 1087 | 1348 | FrmTransLiteAppController::maybe_schedule_cron(); |
| @@ -1086,14 +1347,15 @@ | ||
| 1086 | 1347 | |
| 1087 | 1348 | FrmTransLiteAppController::maybe_schedule_cron(); |
| 1088 | 1349 | } |
| 1089 | 1350 | |
| 1351 | + /** | |
| 1352 | + * @param string $text | |
| 1353 | + * | |
| 1354 | + * @return string | |
| 1355 | + */ | |
| 1090 | 1356 | public static function set_footer_text( $text ) { |
| 1091 | - if ( FrmAppHelper::is_formidable_admin() ) { | |
| 1092 | - $text = ''; | |
| 1093 | - } | |
| 1094 | - | |
| 1095 | - return $text; | |
| 1357 | + return FrmAppHelper::is_formidable_admin() ? '' : $text; | |
| 1096 | 1358 | } |
| 1097 | 1359 | |
| 1098 | 1360 | /** |
| 1099 | 1361 | * Add admin footer links. |
| @@ -1102,63 +1364,77 @@ | ||
| 1102 | 1364 | * |
| 1103 | 1365 | * @return void |
| 1104 | 1366 | */ |
| 1105 | 1367 | public static function add_admin_footer_links() { |
| 1106 | - $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title' ); | |
| 1368 | + FrmFormsController::include_device_too_small_message(); | |
| 1107 | 1369 | |
| 1108 | - // Check admin privileges, screen mode, and branding | |
| 1109 | - $is_not_admin = ! FrmAppHelper::is_formidable_admin() && $post_type !== 'frm_logs'; | |
| 1110 | - $is_full_screen = FrmAppHelper::is_full_screen(); | |
| 1111 | - $is_not_formidable_branding = ! FrmAppHelper::is_formidable_branding(); | |
| 1112 | - | |
| 1113 | - // Exit if any of the above conditions are met | |
| 1114 | - if ( $is_not_admin || $is_full_screen || $is_not_formidable_branding ) { | |
| 1115 | - return; | |
| 1370 | + if ( self::should_show_footer_links() ) { | |
| 1371 | + include FrmAppHelper::plugin_path() . '/classes/views/shared/admin-footer-links.php'; | |
| 1116 | 1372 | } |
| 1117 | - | |
| 1118 | - include FrmAppHelper::plugin_path() . '/classes/views/shared/admin-footer-links.php'; | |
| 1119 | 1373 | } |
| 1120 | 1374 | |
| 1121 | 1375 | /** |
| 1122 | - * @deprecated 3.0.04 | |
| 1376 | + * Check if the footer links should be shown. | |
| 1123 | 1377 | * |
| 1124 | - * @codeCoverageIgnore | |
| 1378 | + * @since 6.7 | |
| 1125 | 1379 | * |
| 1126 | - * @return void | |
| 1380 | + * @return bool | |
| 1127 | 1381 | */ |
| 1128 | - public static function activation_install() { | |
| 1129 | - FrmDeprecated::activation_install(); | |
| 1130 | - } | |
| 1382 | + private static function should_show_footer_links() { | |
| 1383 | + $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title' ); | |
| 1384 | + $is_formidable_page = FrmAppHelper::is_formidable_admin() || 'frm_logs' === $post_type; | |
| 1385 | + $show_footer_links = $is_formidable_page; | |
| 1131 | 1386 | |
| 1132 | - /** | |
| 1133 | - * @deprecated 3.0 | |
| 1134 | - * @codeCoverageIgnore | |
| 1135 | - */ | |
| 1136 | - public static function page_route( $content ) { | |
| 1137 | - return FrmDeprecated::page_route( $content ); | |
| 1387 | + if ( FrmAppHelper::is_full_screen() || ! FrmAppHelper::is_formidable_branding() ) { | |
| 1388 | + $show_footer_links = false; | |
| 1389 | + } | |
| 1390 | + | |
| 1391 | + /** | |
| 1392 | + * Filter whether to show the Formidable footer links. | |
| 1393 | + * | |
| 1394 | + * @since 6.7 | |
| 1395 | + * | |
| 1396 | + * @param bool $show_footer_links | |
| 1397 | + * | |
| 1398 | + * @return bool | |
| 1399 | + */ | |
| 1400 | + return apply_filters( 'frm_show_footer_links', $show_footer_links ); | |
| 1138 | 1401 | } |
| 1139 | 1402 | |
| 1140 | 1403 | /** |
| 1141 | - * Include icons on page for Embed Form modal. | |
| 1404 | + * Show an error modal and terminate the script execution. | |
| 1142 | 1405 | * |
| 1143 | - * @since 5.2 | |
| 1406 | + * @since 6.7 | |
| 1144 | 1407 | * |
| 1408 | + * @param array $error_args Arguments that control the behavior of the error modal. | |
| 1409 | + * | |
| 1145 | 1410 | * @return void |
| 1146 | 1411 | */ |
| 1147 | - public static function include_embed_form_icons() { | |
| 1148 | - _deprecated_function( __METHOD__, '5.3' ); | |
| 1149 | - } | |
| 1412 | + public static function show_error_modal( $error_args ) { | |
| 1413 | + add_filter( 'frm_show_footer_links', '__return_false' ); | |
| 1150 | 1414 | |
| 1151 | - /** | |
| 1152 | - * @deprecated 1.07.05 This is still referenced in the API add on as of v1.13. | |
| 1153 | - * @codeCoverageIgnore | |
| 1154 | - * | |
| 1155 | - * @param array $atts | |
| 1156 | - * @return string | |
| 1157 | - */ | |
| 1158 | - public static function get_form_shortcode( $atts ) { | |
| 1159 | - _deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::get_form_shortcode' ); | |
| 1160 | - return FrmFormsController::get_form_shortcode( $atts ); | |
| 1415 | + $defaults = array( | |
| 1416 | + 'title' => '', | |
| 1417 | + 'body' => '', | |
| 1418 | + 'cancel_url' => '', | |
| 1419 | + 'cancel_classes' => '', | |
| 1420 | + 'continue_url' => '', | |
| 1421 | + 'continue_classes' => '', | |
| 1422 | + 'continue_target' => '', | |
| 1423 | + 'icon' => 'frm_lock_simple', | |
| 1424 | + ); | |
| 1425 | + | |
| 1426 | + $error_args = wp_parse_args( $error_args, $defaults ); | |
| 1427 | + | |
| 1428 | + if ( ! isset( $error_args['cancel_text'] ) && ! empty( $error_args['cancel_url'] ) ) { | |
| 1429 | + $error_args['cancel_text'] = __( 'Cancel', 'formidable' ); | |
| 1430 | + } | |
| 1431 | + | |
| 1432 | + if ( ! isset( $error_args['continue_text'] ) && ! empty( $error_args['continue_url'] ) ) { | |
| 1433 | + $error_args['continue_text'] = __( 'Continue', 'formidable' ); | |
| 1434 | + } | |
| 1435 | + | |
| 1436 | + include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/error-modal.php'; | |
| 1161 | 1437 | } |
| 1162 | 1438 | |
| 1163 | 1439 | /** |
| 1164 | 1440 | * Handles Floating Links' scripts and styles enqueueing. |
| @@ -1166,8 +1442,9 @@ | ||
| 1166 | 1442 | * @since 6.4 |
| 1167 | 1443 | * |
| 1168 | 1444 | * @param string $plugin_url URL of the plugin. |
| 1169 | 1445 | * @param string $version Current version of the plugin. |
| 1446 | + * | |
| 1170 | 1447 | * @return void |
| 1171 | 1448 | */ |
| 1172 | 1449 | private static function enqueue_floating_links( $plugin_url, $version ) { |
| 1173 | 1450 | if ( ! $plugin_url || ! $version ) { |
| @@ -1178,9 +1455,9 @@ | ||
| 1178 | 1455 | // Enqueue the Floating Links styles. |
| 1179 | 1456 | wp_enqueue_style( 's11-floating-links', $plugin_url . '/css/packages/s11-floating-links.css', array(), $version ); |
| 1180 | 1457 | |
| 1181 | 1458 | // Enqueue the Floating Links script. |
| 1182 | - wp_enqueue_script( 's11-floating-links', $plugin_url . '/js/packages/floating-links/s11-floating-links.js', array(), $version, true ); | |
| 1459 | + wp_enqueue_script( 's11-floating-links', $plugin_url . '/js/packages/floating-links/s11-floating-links.js', array( 'formidable_admin' ), $version, true ); | |
| 1183 | 1460 | |
| 1184 | 1461 | // Enqueue the config script. |
| 1185 | 1462 | wp_enqueue_script( 's11-floating-links-config', $plugin_url . '/js/packages/floating-links/config.js', array( 'wp-i18n' ), $version, true ); |
| 1186 | 1463 | |
| @@ -1187,10 +1464,284 @@ | ||
| 1187 | 1464 | if ( function_exists( 'wp_set_script_translations' ) ) { |
| 1188 | 1465 | wp_set_script_translations( 's11-floating-links-config', 's11-' ); |
| 1189 | 1466 | } |
| 1190 | 1467 | |
| 1468 | + $upgrade_utm = array( | |
| 1469 | + 'campaign' => 'floating-links', | |
| 1470 | + 'content' => 'floating-links-upgrade', | |
| 1471 | + ); | |
| 1472 | + $docs_utm = array( | |
| 1473 | + 'campaign' => 'floating-links', | |
| 1474 | + 'content' => 'floating-links-docs', | |
| 1475 | + ); | |
| 1191 | 1476 | $floating_links_data = array( |
| 1192 | - 'proIsInstalled' => FrmAppHelper::pro_is_installed(), | |
| 1477 | + 'proIsInstalled' => FrmAppHelper::pro_is_installed(), | |
| 1478 | + 'upgradeUrl' => FrmAppHelper::admin_upgrade_link( $upgrade_utm ), | |
| 1479 | + 'documentationUrl' => FrmAppHelper::admin_upgrade_link( $docs_utm, 'knowledgebase/' ), | |
| 1193 | 1480 | ); |
| 1194 | 1481 | wp_localize_script( 's11-floating-links-config', 's11FloatingLinksData', $floating_links_data ); |
| 1482 | + | |
| 1483 | + /** | |
| 1484 | + * Prompt Pro to load additional floating links scripts. | |
| 1485 | + * This is used to include images in the Inbox SlideIn when Pro is active. | |
| 1486 | + * | |
| 1487 | + * @since 6.8.4 | |
| 1488 | + */ | |
| 1489 | + do_action( 'frm_enqueue_floating_links' ); | |
| 1490 | + } | |
| 1491 | + | |
| 1492 | + /** | |
| 1493 | + * Check if we are in our admin pages. | |
| 1494 | + * | |
| 1495 | + * @return bool | |
| 1496 | + */ | |
| 1497 | + private static function in_our_pages() { | |
| 1498 | + global $current_screen, $pagenow; | |
| 1499 | + | |
| 1500 | + if ( FrmAppHelper::is_formidable_admin() ) { | |
| 1501 | + return true; | |
| 1502 | + } | |
| 1503 | + | |
| 1504 | + if ( ! empty( $current_screen->post_type ) && 'frm_logs' === $current_screen->post_type ) { | |
| 1505 | + return true; | |
| 1506 | + } | |
| 1507 | + | |
| 1508 | + return in_array( $pagenow, array( 'term.php', 'edit-tags.php' ), true ) && 'frm_application' === FrmAppHelper::simple_get( 'taxonomy' ); | |
| 1509 | + } | |
| 1510 | + | |
| 1511 | + /** | |
| 1512 | + * Handles actions related to the current screen. | |
| 1513 | + * | |
| 1514 | + * @since 6.19 | |
| 1515 | + * | |
| 1516 | + * @return void | |
| 1517 | + */ | |
| 1518 | + public static function handle_current_screen() { | |
| 1519 | + if ( ! self::in_our_pages() ) { | |
| 1520 | + return; | |
| 1521 | + } | |
| 1522 | + | |
| 1523 | + self::filter_admin_notices(); | |
| 1524 | + self::remember_custom_sort(); | |
| 1525 | + } | |
| 1526 | + | |
| 1527 | + /** | |
| 1528 | + * Hide all third-parties admin notices only in our admin pages. | |
| 1529 | + * | |
| 1530 | + * @return void | |
| 1531 | + */ | |
| 1532 | + public static function filter_admin_notices() { | |
| 1533 | + $actions = array( | |
| 1534 | + 'admin_notices', | |
| 1535 | + 'network_admin_notices', | |
| 1536 | + 'user_admin_notices', | |
| 1537 | + 'all_admin_notices', | |
| 1538 | + ); | |
| 1539 | + | |
| 1540 | + global $wp_filter; | |
| 1541 | + | |
| 1542 | + foreach ( $actions as $action ) { | |
| 1543 | + if ( empty( $wp_filter[ $action ]->callbacks ) ) { | |
| 1544 | + continue; | |
| 1545 | + } | |
| 1546 | + | |
| 1547 | + foreach ( $wp_filter[ $action ]->callbacks as $priority => $callbacks ) { | |
| 1548 | + foreach ( $callbacks as $callback_name => $callback ) { | |
| 1549 | + if ( self::is_our_callback_string( $callback_name ) || self::is_our_callback_array( $callback ) ) { | |
| 1550 | + continue; | |
| 1551 | + } | |
| 1552 | + unset( $wp_filter[ $action ]->callbacks[ $priority ][ $callback_name ] ); | |
| 1553 | + } | |
| 1554 | + } | |
| 1555 | + } | |
| 1556 | + } | |
| 1557 | + | |
| 1558 | + /** | |
| 1559 | + * Remembers and applies user-specific sorting preferences. | |
| 1560 | + * | |
| 1561 | + * @return void | |
| 1562 | + */ | |
| 1563 | + private static function remember_custom_sort() { | |
| 1564 | + $meta_key = self::get_sort_pref_user_meta_key(); | |
| 1565 | + | |
| 1566 | + if ( false === $meta_key ) { | |
| 1567 | + return; | |
| 1568 | + } | |
| 1569 | + | |
| 1570 | + $is_form_list = FrmAppHelper::is_admin_list_page(); | |
| 1571 | + $is_entry_list = FrmAppHelper::is_admin_list_page( 'formidable-entries' ); | |
| 1572 | + | |
| 1573 | + if ( ! $is_form_list && ! $is_entry_list ) { | |
| 1574 | + return; | |
| 1575 | + } | |
| 1576 | + | |
| 1577 | + $orderby = FrmAppHelper::get_param( 'orderby' ); | |
| 1578 | + | |
| 1579 | + if ( ! $orderby ) { | |
| 1580 | + return; | |
| 1581 | + } | |
| 1582 | + | |
| 1583 | + $user_id = get_current_user_id(); | |
| 1584 | + $order = FrmAppHelper::get_param( 'order' ); | |
| 1585 | + $new_sort = array( | |
| 1586 | + 'orderby' => $orderby, | |
| 1587 | + 'order' => $order, | |
| 1588 | + ); | |
| 1589 | + $previous_meta = get_user_meta( $user_id, $meta_key, true ); | |
| 1590 | + $current_sort = $previous_meta; | |
| 1591 | + $form_id = $is_entry_list ? FrmAppHelper::simple_get( 'form', 'absint' ) : 0; | |
| 1592 | + | |
| 1593 | + if ( is_array( $current_sort ) && $form_id && is_int( $form_id ) && isset( $current_sort[ $form_id ] ) ) { | |
| 1594 | + $current_sort = $current_sort[ $form_id ]; | |
| 1595 | + } | |
| 1596 | + | |
| 1597 | + if ( $new_sort === $current_sort ) { | |
| 1598 | + return; | |
| 1599 | + } | |
| 1600 | + | |
| 1601 | + $new_meta = $new_sort; | |
| 1602 | + | |
| 1603 | + if ( $is_entry_list && $form_id && is_int( $form_id ) ) { | |
| 1604 | + // Index meta by form ID. | |
| 1605 | + $temp_meta = is_array( $previous_meta ) ? $previous_meta : array(); | |
| 1606 | + $temp_meta[ $form_id ] = $new_meta; | |
| 1607 | + $new_meta = $temp_meta; | |
| 1608 | + unset( $temp_meta ); | |
| 1609 | + } | |
| 1610 | + | |
| 1611 | + update_user_meta( $user_id, $meta_key, $new_meta ); | |
| 1612 | + } | |
| 1613 | + | |
| 1614 | + /** | |
| 1615 | + * Retrieve and apply any saved sorting preferences for the current screen. | |
| 1616 | + * | |
| 1617 | + * @since 6.19 | |
| 1618 | + * | |
| 1619 | + * @param string $orderby Reference to the current 'orderby' parameter. | |
| 1620 | + * @param string $order Reference to the current 'order' parameter. | |
| 1621 | + * | |
| 1622 | + * @return void | |
| 1623 | + */ | |
| 1624 | + public static function apply_saved_sort_preference( &$orderby, &$order ) { | |
| 1625 | + $meta_key = self::get_sort_pref_user_meta_key(); | |
| 1626 | + | |
| 1627 | + if ( false === $meta_key ) { | |
| 1628 | + return; | |
| 1629 | + } | |
| 1630 | + | |
| 1631 | + $preferred_list_sort = get_user_meta( get_current_user_id(), $meta_key, true ); | |
| 1632 | + $form_id = FrmAppHelper::simple_get( 'form', 'absint' ); | |
| 1633 | + | |
| 1634 | + if ( is_array( $preferred_list_sort ) && $form_id && is_int( $form_id ) && isset( $preferred_list_sort[ $form_id ] ) ) { | |
| 1635 | + $preferred_list_sort = $preferred_list_sort[ $form_id ]; | |
| 1636 | + } | |
| 1637 | + | |
| 1638 | + if ( ! is_array( $preferred_list_sort ) || empty( $preferred_list_sort['orderby'] ) ) { | |
| 1639 | + return; | |
| 1640 | + } | |
| 1641 | + | |
| 1642 | + $orderby = $preferred_list_sort['orderby']; | |
| 1643 | + | |
| 1644 | + if ( ! empty( $preferred_list_sort['order'] ) ) { | |
| 1645 | + $order = $preferred_list_sort['order']; | |
| 1646 | + } | |
| 1647 | + } | |
| 1648 | + | |
| 1649 | + /** | |
| 1650 | + * Get a simple user meta key that only includes the screen ID. | |
| 1651 | + * | |
| 1652 | + * @since 6.25.1 | |
| 1653 | + * | |
| 1654 | + * @return false|string | |
| 1655 | + */ | |
| 1656 | + private static function get_sort_pref_user_meta_key() { | |
| 1657 | + if ( ! function_exists( 'get_current_screen' ) ) { | |
| 1658 | + return false; | |
| 1659 | + } | |
| 1660 | + | |
| 1661 | + $screen = get_current_screen(); | |
| 1662 | + return $screen ? 'frm_preferred_list_sort_' . $screen->id : false; | |
| 1663 | + } | |
| 1664 | + | |
| 1665 | + /** | |
| 1666 | + * Validate that the callback name is ours not from third-party. | |
| 1667 | + * | |
| 1668 | + * @param string $callback_name WordPress callback name. | |
| 1669 | + * | |
| 1670 | + * @return bool | |
| 1671 | + */ | |
| 1672 | + private static function is_our_callback_string( $callback_name ) { | |
| 1673 | + return 0 === stripos( $callback_name, 'frm' ); | |
| 1674 | + } | |
| 1675 | + | |
| 1676 | + /** | |
| 1677 | + * Validate that the callback array is ours not from third-party. | |
| 1678 | + * | |
| 1679 | + * @param array $callback WordPress callback array. | |
| 1680 | + * | |
| 1681 | + * @return bool | |
| 1682 | + */ | |
| 1683 | + private static function is_our_callback_array( $callback ) { | |
| 1684 | + return ! empty( $callback['function'] ) && is_array( $callback['function'] ) && ! empty( $callback['function'][0] ) && self::is_our_callback_string( is_object( $callback['function'][0] ) ? get_class( $callback['function'][0] ) : $callback['function'][0] ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 1685 | + } | |
| 1686 | + | |
| 1687 | + /** | |
| 1688 | + * In some cases, the DB tables may fail to install. | |
| 1689 | + * This function tries to add them again when the user clicks the link to try again | |
| 1690 | + * from the given inbox notice. | |
| 1691 | + * | |
| 1692 | + * @since 6.19 | |
| 1693 | + */ | |
| 1694 | + private static function add_missing_tables() { | |
| 1695 | + FrmAppHelper::permission_check( 'frm_view_forms' ); | |
| 1696 | + | |
| 1697 | + $error = FrmInbox::check_for_error(); | |
| 1698 | + | |
| 1699 | + if ( ! $error || 'failed-to-create-tables' !== $error['key'] ) { | |
| 1700 | + // Confirm the inbox item with this CTA exists. | |
| 1701 | + wp_safe_redirect( admin_url( 'admin.php?page=formidable' ) ); | |
| 1702 | + exit; | |
| 1703 | + } | |
| 1704 | + | |
| 1705 | + global $wpdb; | |
| 1706 | + $exists = $wpdb->get_results( $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->prefix . 'frm_forms' ) ); | |
| 1707 | + | |
| 1708 | + if ( $exists ) { | |
| 1709 | + // Exit early if the table already exists. | |
| 1710 | + wp_safe_redirect( admin_url( 'admin.php?page=formidable' ) ); | |
| 1711 | + exit; | |
| 1712 | + } | |
| 1713 | + | |
| 1714 | + delete_option( 'frm_db_version' ); | |
| 1715 | + wp_safe_redirect( admin_url( 'admin.php?page=formidable' ) ); | |
| 1716 | + exit; | |
| 1717 | + } | |
| 1718 | + | |
| 1719 | + /** | |
| 1720 | + * Handles the small screen proceed action. | |
| 1721 | + * | |
| 1722 | + * @since 6.21 | |
| 1723 | + * | |
| 1724 | + * @return void | |
| 1725 | + */ | |
| 1726 | + public static function small_screen_proceed() { | |
| 1727 | + FrmAppHelper::permission_check( 'frm_view_forms' ); | |
| 1728 | + check_ajax_referer( 'frm_ajax', 'nonce' ); | |
| 1729 | + update_user_option( get_current_user_id(), 'frm_ignore_small_screen_warning', true ); | |
| 1730 | + wp_send_json_success(); | |
| 1731 | + } | |
| 1732 | + | |
| 1733 | + /** | |
| 1734 | + * Enqueue the components scripts. | |
| 1735 | + * | |
| 1736 | + * @since 6.28 | |
| 1737 | + * | |
| 1738 | + * @return void | |
| 1739 | + */ | |
| 1740 | + public static function enqueue_components_scripts() { | |
| 1741 | + if ( is_callable( array( 'FrmProFormsController', 'enqueue_pro_web_components_script' ) ) ) { | |
| 1742 | + FrmProFormsController::enqueue_pro_web_components_script(); | |
| 1743 | + } | |
| 1744 | + | |
| 1745 | + wp_enqueue_script( 'formidable-web-components' ); | |
| 1195 | 1746 | } |
| 1196 | 1747 | } |
