| @@ -2,16 +2,10 @@ | ||
| 2 | 2 | namespace Elementor; |
| 3 | 3 | |
| 4 | 4 | use Elementor\Core\Common\Modules\Ajax\Module as Ajax; |
| 5 | 5 | use Elementor\Core\Utils\Collection; |
| 6 | +use Elementor\Core\Utils\Exceptions; | |
| 6 | 7 | use Elementor\Core\Utils\Force_Locale; |
| 7 | -use Elementor\Modules\AtomicWidgets\Elements\Atomic_Button\Atomic_Button; | |
| 8 | -use Elementor\Modules\AtomicWidgets\Elements\Atomic_Divider\Atomic_Divider; | |
| 9 | -use Elementor\Modules\AtomicWidgets\Elements\Atomic_Heading\Atomic_Heading; | |
| 10 | -use Elementor\Modules\AtomicWidgets\Elements\Atomic_Image\Atomic_Image; | |
| 11 | -use Elementor\Modules\AtomicWidgets\Elements\Atomic_Paragraph\Atomic_Paragraph; | |
| 12 | -use Elementor\Modules\AtomicWidgets\Elements\Atomic_Svg\Atomic_Svg; | |
| 13 | -use Elementor\Modules\NestedAccordion\Widgets\Nested_Accordion; | |
| 14 | 8 | use Elementor\Modules\NestedTabs\Widgets\NestedTabs; |
| 15 | 9 | |
| 16 | 10 | if ( ! defined( 'ABSPATH' ) ) { |
| 17 | 11 | exit; // Exit if accessed directly. |
| @@ -39,48 +33,19 @@ | ||
| 39 | 33 | */ |
| 40 | 34 | private $_widget_types = null; |
| 41 | 35 | |
| 42 | 36 | /** |
| 43 | - * Promoted widget types. | |
| 44 | - * | |
| 45 | - * Holds the list of all the Promoted widget types. | |
| 46 | - * | |
| 47 | - * @since 3.15.0 | |
| 48 | - * @access private | |
| 49 | - * | |
| 50 | - * @var Widget_Base[] | |
| 51 | - * | |
| 52 | - * @return array | |
| 53 | - */ | |
| 54 | - private array $promoted_widgets = [ | |
| 55 | - 'container' => [ | |
| 56 | - NestedTabs::class, | |
| 57 | - Nested_Accordion::class, | |
| 58 | - ], | |
| 59 | - 'atomic_widgets' => [ | |
| 60 | - Atomic_Heading::class, | |
| 61 | - Atomic_Image::class, | |
| 62 | - Atomic_Paragraph::class, | |
| 63 | - Atomic_Button::class, | |
| 64 | - Atomic_Svg::class, | |
| 65 | - Atomic_Divider::class, | |
| 66 | - ], | |
| 67 | - ]; | |
| 68 | - | |
| 69 | - /** | |
| 70 | 37 | * Init widgets. |
| 71 | 38 | * |
| 72 | - * Initialize Elementor widgets manager. Include all the widgets files | |
| 39 | + * Initialize Elementor widgets manager. Include all the the widgets files | |
| 73 | 40 | * and register each Elementor and WordPress widget. |
| 74 | 41 | * |
| 75 | 42 | * @since 2.0.0 |
| 76 | 43 | * @access private |
| 77 | - */ | |
| 44 | + */ | |
| 78 | 45 | private function init_widgets() { |
| 79 | 46 | $build_widgets_filename = [ |
| 80 | - 'common-base', | |
| 81 | 47 | 'common', |
| 82 | - 'common-optimized', | |
| 83 | 48 | 'inner-section', |
| 84 | 49 | 'heading', |
| 85 | 50 | 'image', |
| 86 | 51 | 'text-editor', |
| @@ -109,15 +74,12 @@ | ||
| 109 | 74 | 'html', |
| 110 | 75 | 'menu-anchor', |
| 111 | 76 | 'sidebar', |
| 112 | 77 | 'read-more', |
| 113 | - 'rating', | |
| 114 | 78 | ]; |
| 115 | 79 | |
| 116 | 80 | $this->_widget_types = []; |
| 117 | 81 | |
| 118 | - $this->register_promoted_widgets(); | |
| 119 | - | |
| 120 | 82 | foreach ( $build_widgets_filename as $widget_filename ) { |
| 121 | 83 | include ELEMENTOR_PATH . 'includes/widgets/' . $widget_filename . '.php'; |
| 122 | 84 | |
| 123 | 85 | $class_name = str_replace( '-', '_', $widget_filename ); |
| @@ -126,8 +88,10 @@ | ||
| 126 | 88 | |
| 127 | 89 | $this->register( new $class_name() ); |
| 128 | 90 | } |
| 129 | 91 | |
| 92 | + $this->register_promoted_widgets(); | |
| 93 | + | |
| 130 | 94 | $this->register_wp_widgets(); |
| 131 | 95 | |
| 132 | 96 | /** |
| 133 | 97 | * After widgets registered. |
| @@ -167,12 +131,27 @@ | ||
| 167 | 131 | * plugin authors can filter the black list. |
| 168 | 132 | * |
| 169 | 133 | * @since 2.0.0 |
| 170 | 134 | * @access private |
| 171 | - */ | |
| 135 | + */ | |
| 172 | 136 | private function register_wp_widgets() { |
| 173 | 137 | global $wp_widget_factory; |
| 174 | 138 | |
| 139 | + // Skip Pojo widgets. | |
| 140 | + $pojo_allowed_widgets = [ | |
| 141 | + 'Pojo_Widget_Recent_Posts', | |
| 142 | + 'Pojo_Widget_Posts_Group', | |
| 143 | + 'Pojo_Widget_Gallery', | |
| 144 | + 'Pojo_Widget_Recent_Galleries', | |
| 145 | + 'Pojo_Slideshow_Widget', | |
| 146 | + 'Pojo_Forms_Widget', | |
| 147 | + 'Pojo_Widget_News_Ticker', | |
| 148 | + | |
| 149 | + 'Pojo_Widget_WC_Products', | |
| 150 | + 'Pojo_Widget_WC_Products_Category', | |
| 151 | + 'Pojo_Widget_WC_Product_Categories', | |
| 152 | + ]; | |
| 153 | + | |
| 175 | 154 | // Allow themes/plugins to filter out their widgets. |
| 176 | 155 | $black_list = []; |
| 177 | 156 | |
| 178 | 157 | /** |
| @@ -191,8 +170,12 @@ | ||
| 191 | 170 | if ( in_array( $widget_class, $black_list ) ) { |
| 192 | 171 | continue; |
| 193 | 172 | } |
| 194 | 173 | |
| 174 | + if ( $widget_obj instanceof \Pojo_Widget_Base && ! in_array( $widget_class, $pojo_allowed_widgets ) ) { | |
| 175 | + continue; | |
| 176 | + } | |
| 177 | + | |
| 195 | 178 | $elementor_widget_class = __NAMESPACE__ . '\Widget_WordPress'; |
| 196 | 179 | |
| 197 | 180 | $this->register( |
| 198 | 181 | new $elementor_widget_class( [], [ |
| @@ -208,9 +191,9 @@ | ||
| 208 | 191 | * Require Elementor widget base class. |
| 209 | 192 | * |
| 210 | 193 | * @since 2.0.0 |
| 211 | 194 | * @access private |
| 212 | - */ | |
| 195 | + */ | |
| 213 | 196 | private function require_files() { |
| 214 | 197 | require ELEMENTOR_PATH . 'includes/base/widget-base.php'; |
| 215 | 198 | } |
| 216 | 199 | |
| @@ -231,19 +214,19 @@ | ||
| 231 | 214 | * Add a new widget type to the list of registered widget types. |
| 232 | 215 | * |
| 233 | 216 | * @since 1.0.0 |
| 234 | 217 | * @access public |
| 235 | - * @deprecated 3.5.0 Use `register()` method instead. | |
| 218 | + * @deprecated 3.5.0 Use `$this->register()` instead. | |
| 236 | 219 | * |
| 237 | 220 | * @param Widget_Base $widget Elementor widget. |
| 238 | 221 | * |
| 239 | 222 | * @return true True if the widget was registered. |
| 240 | - */ | |
| 223 | + */ | |
| 241 | 224 | public function register_widget_type( Widget_Base $widget ) { |
| 242 | 225 | Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( |
| 243 | 226 | __METHOD__, |
| 244 | 227 | '3.5.0', |
| 245 | - 'register()' | |
| 228 | + 'register' | |
| 246 | 229 | ); |
| 247 | 230 | |
| 248 | 231 | return $this->register( $widget ); |
| 249 | 232 | } |
| @@ -252,11 +235,12 @@ | ||
| 252 | 235 | * Register a new widget type. |
| 253 | 236 | * |
| 254 | 237 | * @param \Elementor\Widget_Base $widget_instance Elementor Widget. |
| 255 | 238 | * |
| 256 | - * @return bool True if the widget was registered. | |
| 239 | + * @return true True if the widget was registered. | |
| 257 | 240 | * @since 3.5.0 |
| 258 | 241 | * @access public |
| 242 | + * | |
| 259 | 243 | */ |
| 260 | 244 | public function register( Widget_Base $widget_instance ) { |
| 261 | 245 | if ( is_null( $this->_widget_types ) ) { |
| 262 | 246 | $this->init_widgets(); |
| @@ -261,38 +245,24 @@ | ||
| 261 | 245 | if ( is_null( $this->_widget_types ) ) { |
| 262 | 246 | $this->init_widgets(); |
| 263 | 247 | } |
| 264 | 248 | |
| 265 | - /** | |
| 266 | - * Should widget be registered. | |
| 267 | - * | |
| 268 | - * @since 3.18.0 | |
| 269 | - * | |
| 270 | - * @param bool $should_register Should widget be registered. Default is `true`. | |
| 271 | - * @param \Elementor\Widget_Base $widget_instance Widget instance. | |
| 272 | - */ | |
| 273 | - $should_register = apply_filters( 'elementor/widgets/is_widget_enabled', true, $widget_instance ); | |
| 274 | - | |
| 275 | - if ( ! $should_register ) { | |
| 276 | - return false; | |
| 277 | - } | |
| 278 | - | |
| 279 | 249 | $this->_widget_types[ $widget_instance->get_name() ] = $widget_instance; |
| 280 | 250 | |
| 281 | 251 | return true; |
| 282 | 252 | } |
| 283 | 253 | |
| 284 | - /** Register promoted widgets | |
| 254 | + /** register promoted widgets | |
| 285 | 255 | * |
| 286 | 256 | * Since we cannot allow widgets to place themselves is a specific |
| 287 | - * location on our widgets panel we need to use a hard coded solution for this. | |
| 257 | + * location on our widgets panel we need to use an hard coded solution fort his | |
| 288 | 258 | * |
| 289 | 259 | * @return void |
| 290 | 260 | */ |
| 291 | 261 | private function register_promoted_widgets() { |
| 292 | - | |
| 293 | - foreach ( $this->promoted_widgets as $experiment_name => $classes ) { | |
| 294 | - $this->register_promoted_active_widgets( $experiment_name, $classes ); | |
| 262 | + if ( Plugin::$instance->experiments->is_feature_active( 'nested-elements' ) ) { | |
| 263 | + $nested_tabs = new NestedTabs(); | |
| 264 | + $this->_widget_types = [ $nested_tabs->get_name() => $nested_tabs ] + $this->_widget_types; | |
| 295 | 265 | } |
| 296 | 266 | } |
| 297 | 267 | |
| 298 | 268 | /** |
| @@ -301,19 +271,19 @@ | ||
| 301 | 271 | * Removes widget type from the list of registered widget types. |
| 302 | 272 | * |
| 303 | 273 | * @since 1.0.0 |
| 304 | 274 | * @access public |
| 305 | - * @deprecated 3.5.0 Use `unregister()` method instead. | |
| 275 | + * @deprecated 3.5.0 Use `$this->unregister()` instead. | |
| 306 | 276 | * |
| 307 | 277 | * @param string $name Widget name. |
| 308 | 278 | * |
| 309 | 279 | * @return true True if the widget was unregistered, False otherwise. |
| 310 | - */ | |
| 280 | + */ | |
| 311 | 281 | public function unregister_widget_type( $name ) { |
| 312 | 282 | Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( |
| 313 | 283 | __METHOD__, |
| 314 | 284 | '3.5.0', |
| 315 | - 'unregister()' | |
| 285 | + 'unregister' | |
| 316 | 286 | ); |
| 317 | 287 | |
| 318 | 288 | return $this->unregister( $name ); |
| 319 | 289 | } |
| @@ -350,9 +320,9 @@ | ||
| 350 | 320 | * |
| 351 | 321 | * @param string $widget_name Optional. Widget name. Default is null. |
| 352 | 322 | * |
| 353 | 323 | * @return Widget_Base|Widget_Base[]|null Registered widget types. |
| 354 | - */ | |
| 324 | + */ | |
| 355 | 325 | public function get_widget_types( $widget_name = null ) { |
| 356 | 326 | if ( is_null( $this->_widget_types ) ) { |
| 357 | 327 | $this->init_widgets(); |
| 358 | 328 | } |
| @@ -372,9 +342,9 @@ | ||
| 372 | 342 | * @since 1.0.0 |
| 373 | 343 | * @access public |
| 374 | 344 | * |
| 375 | 345 | * @return array Registered widget types with each widget config. |
| 376 | - */ | |
| 346 | + */ | |
| 377 | 347 | public function get_widget_types_config() { |
| 378 | 348 | $config = []; |
| 379 | 349 | |
| 380 | 350 | foreach ( $this->get_widget_types() as $widget_key => $widget ) { |
| @@ -383,14 +353,9 @@ | ||
| 383 | 353 | |
| 384 | 354 | return $config; |
| 385 | 355 | } |
| 386 | 356 | |
| 387 | - /** | |
| 388 | - * @throws \Exception If current user don't have permissions to edit the post. | |
| 389 | - */ | |
| 390 | 357 | public function ajax_get_widget_types_controls_config( array $data ) { |
| 391 | - Plugin::$instance->documents->check_permissions( $data['editor_post_id'] ); | |
| 392 | - | |
| 393 | 358 | wp_raise_memory_limit( 'admin' ); |
| 394 | 359 | |
| 395 | 360 | $config = []; |
| 396 | 361 | |
| @@ -407,35 +372,8 @@ | ||
| 407 | 372 | |
| 408 | 373 | return $config; |
| 409 | 374 | } |
| 410 | 375 | |
| 411 | - /** | |
| 412 | - * @throws \Exception If current user don't have permissions to edit the post. | |
| 413 | - */ | |
| 414 | - public function ajax_refresh_widgets_config( array $data ) { | |
| 415 | - Plugin::$instance->documents->check_permissions( $data['editor_post_id'] ); | |
| 416 | - | |
| 417 | - wp_raise_memory_limit( 'admin' ); | |
| 418 | - | |
| 419 | - $widgets = []; | |
| 420 | - | |
| 421 | - foreach ( $this->get_widget_types() as $widget_key => $widget ) { | |
| 422 | - $widget_config = $widget->get_config(); | |
| 423 | - | |
| 424 | - // get_config() omits controls when the stack isn't initialized yet (see Widget_Base::get_initial_config). | |
| 425 | - // During an AJAX refresh the instances are fresh, so we force-initialize and merge them explicitly. | |
| 426 | - $widget_config['controls'] = $widget->get_stack( false )['controls']; | |
| 427 | - $widget_config['tabs_controls'] = $widget->get_tabs_controls(); | |
| 428 | - | |
| 429 | - $widgets[ $widget_key ] = $widget_config; | |
| 430 | - } | |
| 431 | - | |
| 432 | - return [ | |
| 433 | - 'widgets' => $widgets, | |
| 434 | - 'categories' => Plugin::$instance->elements_manager->get_categories(), | |
| 435 | - ]; | |
| 436 | - } | |
| 437 | - | |
| 438 | 376 | public function ajax_get_widgets_default_value_translations( array $data = [] ) { |
| 439 | 377 | $locale = empty( $data['locale'] ) |
| 440 | 378 | ? get_locale() |
| 441 | 379 | : $data['locale']; |
| @@ -481,10 +419,14 @@ | ||
| 481 | 419 | * @type string $render The rendered HTML. |
| 482 | 420 | * } |
| 483 | 421 | */ |
| 484 | 422 | public function ajax_render_widget( $request ) { |
| 485 | - $document = Plugin::$instance->documents->get_with_permissions( $request['editor_post_id'] ); | |
| 423 | + $document = Plugin::$instance->documents->get( $request['editor_post_id'] ); | |
| 486 | 424 | |
| 425 | + if ( ! $document->is_editable_by_current_user() ) { | |
| 426 | + throw new \Exception( 'Access denied.', Exceptions::FORBIDDEN ); | |
| 427 | + } | |
| 428 | + | |
| 487 | 429 | // Override the global $post for the render. |
| 488 | 430 | query_posts( |
| 489 | 431 | [ |
| 490 | 432 | 'p' => $request['editor_post_id'], |
| @@ -519,13 +461,10 @@ | ||
| 519 | 461 | * |
| 520 | 462 | * @param array $request Ajax request. |
| 521 | 463 | * |
| 522 | 464 | * @return bool|string Rendered widget form. |
| 523 | - * @throws \Exception If current user don't have permissions to edit the post. | |
| 524 | 465 | */ |
| 525 | 466 | public function ajax_get_wp_widget_form( $request ) { |
| 526 | - Plugin::$instance->documents->check_permissions( $request['editor_post_id'] ); | |
| 527 | - | |
| 528 | 467 | if ( empty( $request['widget_type'] ) ) { |
| 529 | 468 | return false; |
| 530 | 469 | } |
| 531 | 470 | |
| @@ -559,9 +498,9 @@ | ||
| 559 | 498 | * template, for all the registered widget types. |
| 560 | 499 | * |
| 561 | 500 | * @since 1.0.0 |
| 562 | 501 | * @access public |
| 563 | - */ | |
| 502 | + */ | |
| 564 | 503 | public function render_widgets_content() { |
| 565 | 504 | foreach ( $this->get_widget_types() as $widget ) { |
| 566 | 505 | $widget->print_template(); |
| 567 | 506 | } |
| @@ -576,9 +515,9 @@ | ||
| 576 | 515 | * @since 1.3.0 |
| 577 | 516 | * @access public |
| 578 | 517 | * |
| 579 | 518 | * @return array Registered widget types with settings keys for each widget. |
| 580 | - */ | |
| 519 | + */ | |
| 581 | 520 | public function get_widgets_frontend_settings_keys() { |
| 582 | 521 | $keys = []; |
| 583 | 522 | |
| 584 | 523 | foreach ( $this->get_widget_types() as $widget_type_name => $widget_type ) { |
| @@ -592,63 +531,8 @@ | ||
| 592 | 531 | return $keys; |
| 593 | 532 | } |
| 594 | 533 | |
| 595 | 534 | /** |
| 596 | - * Widgets with styles. | |
| 597 | - * | |
| 598 | - * This method returns the list of all the widgets in the `/includes/` | |
| 599 | - * folder that have styles. | |
| 600 | - * | |
| 601 | - * @since 3.24.0 | |
| 602 | - * @access public | |
| 603 | - * | |
| 604 | - * @return array The names of the widgets that have styles. | |
| 605 | - */ | |
| 606 | - public function widgets_with_styles(): array { | |
| 607 | - return [ | |
| 608 | - 'counter', | |
| 609 | - 'divider', | |
| 610 | - 'google_maps', | |
| 611 | - 'heading', | |
| 612 | - 'image', | |
| 613 | - 'image-carousel', | |
| 614 | - 'menu-anchor', | |
| 615 | - 'rating', | |
| 616 | - 'social-icons', | |
| 617 | - 'spacer', | |
| 618 | - 'testimonial', | |
| 619 | - 'text-editor', | |
| 620 | - 'video', | |
| 621 | - ]; | |
| 622 | - } | |
| 623 | - | |
| 624 | - /** | |
| 625 | - * Widgets with responsive styles. | |
| 626 | - * | |
| 627 | - * This method returns the list of all the widgets in the `/includes/` | |
| 628 | - * folder that have responsive styles. | |
| 629 | - * | |
| 630 | - * @since 3.24.0 | |
| 631 | - * @access public | |
| 632 | - * | |
| 633 | - * @return array The names of the widgets that have responsive styles. | |
| 634 | - */ | |
| 635 | - public function widgets_with_responsive_styles(): array { | |
| 636 | - return [ | |
| 637 | - 'accordion', | |
| 638 | - 'alert', | |
| 639 | - 'icon-box', | |
| 640 | - 'icon-list', | |
| 641 | - 'image-box', | |
| 642 | - 'image-gallery', | |
| 643 | - 'progress', | |
| 644 | - 'star-rating', | |
| 645 | - 'tabs', | |
| 646 | - 'toggle', | |
| 647 | - ]; | |
| 648 | - } | |
| 649 | - | |
| 650 | - /** | |
| 651 | 535 | * Enqueue widgets scripts. |
| 652 | 536 | * |
| 653 | 537 | * Enqueue all the scripts defined as a dependency for each widget. |
| 654 | 538 | * |
| @@ -653,9 +537,9 @@ | ||
| 653 | 537 | * Enqueue all the scripts defined as a dependency for each widget. |
| 654 | 538 | * |
| 655 | 539 | * @since 1.3.0 |
| 656 | 540 | * @access public |
| 657 | - */ | |
| 541 | + */ | |
| 658 | 542 | public function enqueue_widgets_scripts() { |
| 659 | 543 | foreach ( $this->get_widget_types() as $widget ) { |
| 660 | 544 | $widget->enqueue_scripts(); |
| 661 | 545 | } |
| @@ -660,14 +544,8 @@ | ||
| 660 | 544 | $widget->enqueue_scripts(); |
| 661 | 545 | } |
| 662 | 546 | } |
| 663 | 547 | |
| 664 | - public function register_frontend_handlers() { | |
| 665 | - foreach ( $this->get_widget_types() as $widget ) { | |
| 666 | - $widget->register_frontend_handlers(); | |
| 667 | - } | |
| 668 | - } | |
| 669 | - | |
| 670 | 548 | /** |
| 671 | 549 | * Enqueue widgets styles |
| 672 | 550 | * |
| 673 | 551 | * Enqueue all the styles defined as a dependency for each widget |
| @@ -742,9 +620,9 @@ | ||
| 742 | 620 | * Initializing Elementor widgets manager. |
| 743 | 621 | * |
| 744 | 622 | * @since 1.0.0 |
| 745 | 623 | * @access public |
| 746 | - */ | |
| 624 | + */ | |
| 747 | 625 | public function __construct() { |
| 748 | 626 | $this->require_files(); |
| 749 | 627 | |
| 750 | 628 | add_action( 'elementor/ajax/register_actions', [ $this, 'register_ajax_actions' ] ); |
| @@ -764,26 +642,9 @@ | ||
| 764 | 642 | $ajax_manager->register_ajax_action( 'render_widget', [ $this, 'ajax_render_widget' ] ); |
| 765 | 643 | $ajax_manager->register_ajax_action( 'editor_get_wp_widget_form', [ $this, 'ajax_get_wp_widget_form' ] ); |
| 766 | 644 | $ajax_manager->register_ajax_action( 'get_widgets_config', [ $this, 'ajax_get_widget_types_controls_config' ] ); |
| 767 | 645 | |
| 768 | - $ajax_manager->register_ajax_action( 'refresh_widgets_config', [ $this, 'ajax_refresh_widgets_config' ] ); | |
| 769 | - | |
| 770 | 646 | $ajax_manager->register_ajax_action( 'get_widgets_default_value_translations', function ( array $data ) { |
| 771 | 647 | return $this->ajax_get_widgets_default_value_translations( $data ); |
| 772 | 648 | } ); |
| 773 | - } | |
| 774 | - | |
| 775 | - /** | |
| 776 | - * @param string $experiment_name | |
| 777 | - * @param array $classes | |
| 778 | - * @return void | |
| 779 | - */ | |
| 780 | - public function register_promoted_active_widgets( string $experiment_name, array $classes ): void { | |
| 781 | - if ( ! Plugin::$instance->experiments->is_feature_active( $experiment_name ) || empty( $classes ) ) { | |
| 782 | - return; | |
| 783 | - } | |
| 784 | - | |
| 785 | - foreach ( $classes as $class_name ) { | |
| 786 | - $this->register( new $class_name() ); | |
| 787 | - } | |
| 788 | 649 | } |
| 789 | 650 | } |