Merge branch 'MDL-67076-master' of git://github.com/sarjona/moodle

diff --cc h5p/classes/player.php
index b3be57d,61252ac..fd1dac6
--- 1/h5p/classes/player.php
--- 2/h5p/classes/player.php
+++ b/h5p/classes/player.php
@@@ -80,11 -80,11 +80,16 @@@ class player 
       */
      private $factory;
  
 +    /**
 +     * @var stdClass The error, exception and info messages, raised while preparing and running the player.
 +     */
 +    private $messages;
 +
+     /**
+      * @var bool Set to true in scripts that can not redirect (CLI, RSS feeds, etc.), throws exceptions.
+      */
+     private $preventredirect;
+ 
      /**
       * Inits the H5P player for rendering the content.
       *
@@@ -359,54 -317,17 +366,54 @@@
              throw new \moodle_exception('h5pprivatefile', 'core_h5p');
          }
  
 -        // For CONTEXT_MODULE, check if the user is enrolled in the course and has permissions view this .h5p file.
 -        if ($this->context->contextlevel == CONTEXT_MODULE) {
 +        // For CONTEXT_COURSECAT No login necessary - unless login forced everywhere.
 +        if ($this->context->contextlevel == CONTEXT_COURSECAT) {
 +            if ($CFG->forcelogin) {
 +                require_login(null, true, null, false, true);
 +            }
 +        }
 +
 +        // For CONTEXT_BLOCK.
 +        if ($this->context->contextlevel == CONTEXT_BLOCK) {
 +            if ($this->context->get_course_context(false)) {
 +                // If block is in course context, then check if user has capability to access course.
 +                require_course_login($course, true, null, false, true);
 +            } else if ($CFG->forcelogin) {
 +                // No login necessary - unless login forced everywhere.
 +                require_login(null, true, null, false, true);
 +            } else {
 +                // Get parent context and see if user have proper permission.
 +                $parentcontext = $this->context->get_parent_context();
 +                if ($parentcontext->contextlevel === CONTEXT_COURSECAT) {
 +                    // Check if category is visible and user can view this category.
 +                    if (!core_course_category::get($parentcontext->instanceid, IGNORE_MISSING)) {
 +                        send_file_not_found();
 +                    }
 +                } else if ($parentcontext->contextlevel === CONTEXT_USER && $parentcontext->instanceid != $USER->id) {
 +                    // The block is in the context of a user, it is only visible to the user who it belongs to.
 +                    send_file_not_found();
 +                }
 +                if ($filearea !== 'content') {
 +                    send_file_not_found();
 +                }
 +            }
 +        }
 +
 +        // For CONTEXT_MODULE and CONTEXT_COURSE check if the user is enrolled in the course.
 +        // And for CONTEXT_MODULE has permissions view this .h5p file.
 +        if ($this->context->contextlevel == CONTEXT_MODULE ||
 +                $this->context->contextlevel == CONTEXT_COURSE) {
              // Require login to the course first (without login to the module).
-             require_course_login($course, true, null, false, true);
+             require_course_login($course, true, null, !$this->preventredirect, $this->preventredirect);
  
              // Now check if module is available OR it is restricted but the intro is shown on the course page.
 -            $cminfo = \cm_info::create($cm);
 -            if (!$cminfo->uservisible) {
 -                if (!$cm->showdescription || !$cminfo->is_visible_on_course_page()) {
 -                    // Module intro is not visible on the course page and module is not available, show access error.
 -                    require_course_login($course, true, $cminfo, !$this->preventredirect, $this->preventredirect);
 +            if ($this->context->contextlevel == CONTEXT_MODULE) {
 +                $cminfo = \cm_info::create($cm);
 +                if (!$cminfo->uservisible) {
 +                    if (!$cm->showdescription || !$cminfo->is_visible_on_course_page()) {
 +                        // Module intro is not visible on the course page and module is not available, show access error.
-                         require_course_login($course, true, $cminfo, false, true);
++                        require_course_login($course, true, $cminfo, !$this->preventredirect, $this->preventredirect);
 +                    }
                  }
              }
          }

diff --cc h5p/embed.php
Simple merge