Merged fix for MDL-9077 and MDL-9557

diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php
index 986912e89f0647832994a0a7aaa49a81da2e6950..a4a57ea6d9c3bfa15180b5d45065deba40d6dafe 100755 (executable)
--- a/mod/scorm/locallib.php
+++ b/mod/scorm/locallib.php
@@ -85,6 +85,7 @@ $repositorybrowser = '/mod/resource/type/ims/finder.php';
 function scorm_delete_files($directory) {
     if (is_dir($directory)) {
         $files=scorm_scandir($directory);
+        set_time_limit(0);
         foreach($files as $file) {
             if (($file != '.') && ($file != '..')) {
                 if (!is_dir($directory.'/'.$file)) {
@@ -93,7 +94,6 @@ function scorm_delete_files($directory) {
                     scorm_delete_files($directory.'/'.$file);
                 }
             }
-         set_time_limit(5);
         }
         rmdir($directory);
         return true;
@@ -205,23 +205,22 @@ function scorm_external_link($link) {
 * @param integer $id The sco ID
 * @return mixed (false if sco id does not exists)
 */
+
 function scorm_get_sco($id,$what=SCO_ALL) {
     if ($sco = get_record('scorm_scoes','id',$id)) {
         $sco = ($what == SCO_DATA) ? new stdClass() : $sco;
         if (($what != SCO_ONLY) && ($scodatas = get_records('scorm_scoes_data','scoid',$id))) {
             foreach ($scodatas as $scodata) {
-                $sco->{$scodata->name} = $scodata->value;
+                $sco->{$scodata->name} = $scodata->value;              
             }
-        }
-        elseif (($what != SCO_ONLY) && (!($scodatas = get_records('scorm_scoes_data','scoid',$id)))){
-                $sco->parameters = ''; 
+        } else if (($what != SCO_ONLY) && (!($scodatas = get_records('scorm_scoes_data','scoid',$id)))) {
+            $sco->parameters = ''; 
         }
         return $sco;
     } else {
         return false;
     }
 }
-
 function scorm_insert_track($userid,$scormid,$scoid,$attempt,$element,$value) {
     $id = null;
     if ($track = get_record_select('scorm_scoes_track',"userid='$userid' AND scormid='$scormid' AND scoid='$scoid' AND attempt='$attempt' AND element='$element'")) {