WebSVN – Moodle – Diff – /lib/blocklib.php

      * @param string $blockname - the basic name of a block (eg "navigation")
      * @return boolean - is there one of these blocks in the current page?
      */
     public function is_block_present($blockname) {
-        if (empty($this->blockinstances)) {
+        if (empty($this->birecordsbyregion)) {
             return false;
+        }
         $requiredbythemeblocks = $this->get_required_by_theme_block_types();
-        foreach ($this->blockinstances as $region) {
+        foreach ($this->birecordsbyregion as $region) {
             foreach ($region as $instance) {
-                if (empty($instance->instance->blockname)) {
+                if (empty($instance->blockname)) {
                     continue;
                 }
-                if ($instance->instance->blockname == $blockname) {
+                if ($instance->blockname == $blockname) {
-                    if ($instance->instance->requiredbytheme) {
+                    if ($instance->requiredbytheme) {
                         if (!in_array($blockname, $requiredbythemeblocks)) {
                             continue;
+                        }
         if (empty($pagetypepattern)) {
             $pagetypepattern = $this->page->pagetype;
+        }
+        if (!empty($this->birecordsbyregion)) {
+            $addableblocks = $this->get_addable_blocks();
+            if (!array_key_exists($blockname, $addableblocks)) {
+                throw new moodle_exception('blockcannotadd');
+            }
+        }
         $blockinstance = new stdClass;
         $blockinstance->blockname = $blockname;
         $blockinstance->parentcontextid = $this->page->context->id;
+            }
+        }
+    }
+    /**
+     * Given an array of blocks in the format used by {@see add_blocks}, removes any blocks from
+     * the list if they are not installed in the system.
+     *
+     * @param array $blocks Array keyed by region
+     * @return array Updated array
+     */
+    public function filter_nonexistent_blocks(array $blocks): array {
+        $installed = array_fill_keys(
+            array_map(fn($block) => $block->name, $this->get_installed_blocks()),
+            true,
+        );
+        $result = [];
+        foreach ($blocks as $region => $regionblocks) {
+            $result[$region] = [];
+            foreach ($regionblocks as $blockname) {
+                if (array_key_exists($blockname, $installed)) {
+                    $result[$region][] = $blockname;
+                }
+            }
+        }
+        return $result;
+    }
     /**
      * Move a block to a new position on this page.
+     *
      * If this block cannot appear on any other pages, then we change defaultposition/weight
      * in the block_instances table. Otherwise we just set the position on this page.
                 $editactionurl->param('cache', 1);
+            }
             $controls[] = new action_menu_link_secondary(
                 $editactionurl,
-                new pix_icon('t/edit', $str, 'moodle', array('class' => 'iconsmall', 'title' => '')),
+                new pix_icon('i/settings', $str, 'moodle', ['class' => 'iconsmall', 'title' => '']),
                 $str,
+                [
                     'class' => 'editing_edit',
                     'data-action' => 'editblock',
             $deleteconfirmationurl = new moodle_url($actionurl, [
                 'bui_deleteid' => $block->instance->id,
                 'bui_confirm' => 1,
                 'sesskey' => sesskey(),
             ]);
+            $deleteblockmessage = json_encode(['deleteblockcheck', 'block', $blocktitle]);
+            // If the block is being shown in sub contexts display a warning.
+            if ($block->instance->showinsubcontexts == 1) {
+                $parentcontext = context::instance_by_id($block->instance->parentcontextid);
+                $systemcontext = context_system::instance();
-            $blocktitle = $block->get_title();
+                $messagestring = new stdClass();
+                $messagestring->location = $parentcontext->get_context_name();
+                // Checking for blocks that may have visibility on the front page and pages added on that.
+                if ($parentcontext->id != $systemcontext->id && is_inside_frontpage($parentcontext)) {
+                    $messagestring->pagetype = get_string('showonfrontpageandsubs', 'block');
+                } else {
+                    $pagetypes = generate_page_type_patterns($this->page->pagetype, $parentcontext);
+                    $messagestring->pagetype = $block->instance->pagetypepattern;
+                    if (isset($pagetypes[$block->instance->pagetypepattern])) {
+                        $messagestring->pagetype = $pagetypes[$block->instance->pagetypepattern];
+                    }
+                }
+                $deleteblockmessage = json_encode(['deleteblockwarning', 'block', $messagestring]);
+            }
             $controls[] = new action_menu_link_secondary(
                 $deleteactionurl,
                 new pix_icon('t/delete', $str, 'moodle', array('class' => 'iconsmall', 'title' => '')),
                 $str,
+                [
                     'class' => 'editing_delete',
                     'data-modal' => 'confirmation',
                     'data-modal-title-str' => json_encode(['deletecheck_modal', 'block']),
-                    'data-modal-content-str' => json_encode(['deleteblockcheck', 'block', $blocktitle]),
+                    'data-modal-content-str' => $deleteblockmessage,
                     'data-modal-yes-button-str' => json_encode(['delete', 'core']),
                     'data-modal-toast' => 'true',
                     'data-modal-toast-confirmation-str' => json_encode(['deleteblockinprogress', 'block', $blocktitle]),
                     'data-modal-destination' => $deleteconfirmationurl->out(false),
     /**
      * Convenience function to check whether a block is implementing a secondary nav class and return it
      * initialised to the calling function
-     *
      * @todo MDL-74939 Remove support for old 'local\views\secondary' class location
      * @param block_base $block
      * @return \core\navigation\views\secondary
      */
     protected function get_secondarynav(block_base $block): \core\navigation\views\secondary {
+        $class = "core_block\\navigation\\views\\secondary";
-        $class = "core_block\\navigation\\views\\secondary";
+        // Check whether block defines its own secondary navigation.
         if (class_exists("block_{$block->name()}\\navigation\\views\\secondary")) {
-            $class = "block_{$block->name()}\\navigation\\views\\secondary";
-        } else if (class_exists("block_{$block->name()}\\local\\views\\secondary")) {
-            // For backwards compatibility, support the old location for this class (it was in a
-            // 'local' namespace which shouldn't be used for core APIs).
-            debugging("The class block_{$block->name()}\\local\\views\\secondary uses a deprecated " .
-                    "namespace. Please move it to block_{$block->name()}\\navigation\\views\\secondary.",
-                    DEBUG_DEVELOPER);
-            $class = "block_{$block->name()}\\local\\views\\secondary";
+            $class = "block_{$block->name()}\\navigation\\views\\secondary";
+        }
         $secondarynav = new $class($this->page);
         $secondarynav->initialise();
         return $secondarynav;
+}
 /**
  * Add the default blocks to a course.
+ *
+ * Because this function is used on install, we skip over any default blocks that do not exist
+ * so that install can complete successfully even if blocks are removed.
+ *
  * @param object $course a course object.
  */
 function blocks_add_default_course_blocks($course) {
     } else {
         $pagetypepattern = 'course-view-*';
+    }
     $page = new moodle_page();
     $page->set_course($course);
+    $page->blocks->add_blocks(
-    $page->blocks->add_blocks($blocknames, $pagetypepattern);
+        $page->blocks->filter_nonexistent_blocks($blocknames),
+        $pagetypepattern,
+    );
+}
 /**
+ * Add the default system-context blocks. E.g. the admin tree.
+ *
+ * Because this function is used on install, we skip over any default blocks that do not exist
- * Add the default system-context blocks. E.g. the admin tree.
+ * so that install can complete successfully even if blocks are removed.
  */
 function blocks_add_default_system_blocks() {
     global $DB;
     $page = new moodle_page();
+    $page->set_context(context_system::instance());
-    $page->set_context(context_system::instance());
+    // We don't add blocks required by the theme, they will be auto-created.
+    $page->blocks->add_blocks(
+        $page->blocks->filter_nonexistent_blocks([
+            BLOCK_POS_LEFT => [
+                'admin_bookmarks',
+            ],
+        ]),
+        'admin-*',
+        null,
+        false,
-    // We don't add blocks required by the theme, they will be auto-created.
+,
-    $page->blocks->add_blocks(array(BLOCK_POS_LEFT => array('admin_bookmarks')), 'admin-*', null, null, 2);
+    );
     if ($defaultmypage = $DB->get_record('my_pages', array('userid' => null, 'name' => '__default', 'private' => 1))) {
         $mycoursesubpagepattern = $defaultmycoursespage->id;
     } else {
         $mycoursesubpagepattern = null;
+    }
-    $page->blocks->add_blocks([
+    $page->blocks->add_blocks($page->blocks->filter_nonexistent_blocks([
         BLOCK_POS_RIGHT => [
             'recentlyaccesseditems',
         ],
         'content' => [
             'timeline',
             'calendar_month',
-        ]],
+        ]]),
         'my-index',
         $subpagepattern
     );
-    $page->blocks->add_blocks([
+    $page->blocks->add_blocks($page->blocks->filter_nonexistent_blocks([
         'content' => [
             'myoverview'
-        ]],
+        ]]),
         'my-index',
         $mycoursesubpagepattern

Proyectos de Subversion Moodle

(root)/lib/blocklib.php – Rev 11 → 1441