Merge branch 'master_MDL-41434' of https://github.com/danmarsden/moodle

diff --cc mod/scorm/lib.php
index 8fc726e,c09508a..a3d17cd
--- 1/mod/scorm/lib.php
--- 2/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@@ -1370,37 -1370,3 +1370,37 @@@ function scorm_validate_package($file) 
      }
      return $errors;
  }
- }
 +
 +/**
 + * Check and set the correct mode and attempt when entering a SCORM package.
 + *
 + * @param object $scorm object
 + * @param string $newattempt should a new attempt be generated here.
 + * @param int $attempt the attempt number this is for.
 + * @param int $userid the userid of the user.
 + * @param string $mode the current mode that has been selected.
 + */
 +function scorm_check_mode($scorm, $newattempt, &$attempt, $userid, &$mode) {
 +    global $DB;
 +    if (($newattempt == 'on') && (($attempt < $scorm->maxattempt) || ($scorm->maxattempt == 0))) {
 +        $attempt++;
 +        $mode = 'normal';
 +    } else if ($mode != 'browse') { // Check if review mode should be set.
 +        $mode = 'normal'; // Set to normal mode by default.
 +
 +        // If all tracks == passed, failed or completed then use review mode.
 +        $tracks = $DB->get_recordset('scorm_scoes_track', array('scormid' => $scorm->id, 'userid' => $userid,
 +            'attempt' => $attempt, 'element' => 'cmi.core.lesson_status'));
 +        foreach ($tracks as $track) {
 +            if (($track->value == 'completed') || ($track->value == 'passed') || ($track->value == 'failed')) {
 +                $mode = 'review';
 +            } else { // Found an incomplete sco so exit and use normal mode.
 +                $mode = 'normal';
 +                break;
 +            }
 +        }
 +        $tracks->close();
 +    } else if (($mode == 'browse') && ($scorm->hidebrowse == 1)) { // Prevent Browse mode if hidebrowse is set.
 +        $mode = 'normal';
 +    }
++}

diff --cc mod/scorm/locallib.php
Simple merge