Cleaned some unused include

diff --git a/mod/scorm/aicc.php b/mod/scorm/aicc.php
index 79b60e2ecac81cdcd608b78191893cab07c71531..fd5c58b778b548106a7423d3ca8537d4dcfc4425 100755 (executable)
--- a/mod/scorm/aicc.php
+++ b/mod/scorm/aicc.php
@@ -1,8 +1,7 @@
-<?php\r
+<php\r
     require_once('../../config.php');\r
     require_once('locallib.php');\r
-       require_once('sequencinglib.php');\r
-       \r
+    \r
     $command = required_param('command', PARAM_ALPHA);\r
     $sessionid = required_param('session_id', PARAM_ALPHANUM);\r
     $aiccdata = optional_param('aicc_data', '', PARAM_RAW);\r

diff --git a/mod/scorm/api.php b/mod/scorm/api.php
index 5223fe66e36c4272cd15186af1a3a8e5d052c1af..4016ec0ae7304a737e017becc897c1550e9a979e 100644 (file)
--- a/mod/scorm/api.php
+++ b/mod/scorm/api.php
@@ -2,7 +2,6 @@
 \r
     require_once("../../config.php");\r
     require_once('locallib.php');\r
-       require_once('sequencinglib.php');\r
        \r
     $id = optional_param('id', '', PARAM_INT);       // Course Module ID, or\r
     $a = optional_param('a', '', PARAM_INT);         // scorm ID\r

diff --git a/mod/scorm/coefficientconfirm.php b/mod/scorm/coefficientconfirm.php
index bc41c389921dee166d8d8228d4ea1becb20a62cc..18224556fe3b6557d72b432d8f57b3c2b31b9292 100755 (executable)
--- a/mod/scorm/coefficientconfirm.php
+++ b/mod/scorm/coefficientconfirm.php
@@ -1,10 +1,7 @@
 <?php  // $Id$\r
 \r
-// This script uses installed report plugins to print quiz reports\r
-\r
     require_once("../../config.php");\r
     require_once('locallib.php');\r
-       require_once('sequencinglib.php');\r
        \r
     $id = optional_param('id', '', PARAM_INT);    // Course Module ID, or\r
     $a = optional_param('a', '', PARAM_INT);     // SCORM ID\r

diff --git a/mod/scorm/coefficientsetting.php b/mod/scorm/coefficientsetting.php
index ba949f9b972f8fca64d425019a3beadc8b3f6205..cec2b70553504cd27b359c7fedb07c745300b025 100755 (executable)
--- a/mod/scorm/coefficientsetting.php
+++ b/mod/scorm/coefficientsetting.php
@@ -1,10 +1,7 @@
 <?php  // $Id$\r
 \r
-// This script uses installed report plugins to print quiz reports\r
-\r
     require_once("../../config.php");\r
     require_once('locallib.php');\r
-       require_once('sequencinglib.php');\r
        \r
     $id = optional_param('id', '', PARAM_INT);    // Course Module ID, or\r
     $a = optional_param('a', '', PARAM_INT);     // SCORM ID\r

diff --git a/mod/scorm/datamodel.php b/mod/scorm/datamodel.php
index 7adc6b7ccff87c900bb25d930d6feebe19dd5421..676fbcfdda5d49e6572e77e7879d24e643da566e 100755 (executable)
--- a/mod/scorm/datamodel.php
+++ b/mod/scorm/datamodel.php
@@ -1,18 +1,12 @@
 <?php\r
     require_once('../../config.php');\r
     require_once('locallib.php');\r
-       require_once('sequencinglib.php');\r
-               \r
-       //$f = "D:\\test.txt";\r
-       //@$ft = fopen($f,"a");\r
-       //fwrite($ft,"Bat dau ghi tron datamodel.php \n");\r
-\r
+        \r
     $id = optional_param('id', '', PARAM_INT);       // Course Module ID, or\r
     $a = optional_param('a', '', PARAM_INT);         // scorm ID\r
     $scoid = required_param('scoid', PARAM_INT);  // sco ID\r
 //    $attempt = required_param('attempt', PARAM_INT);  // attempt number\r
-       $attempt = $USER->attempt;\r
-       //fwrite($ft,"\n --------Gia tri attempt thu duoc tu datamodel.php-------- : ".$attempt);\r
+    $attempt = $USER->attempt;\r
 \r
 \r
     if (!empty($id)) {\r
@@ -42,7 +36,6 @@
     require_login($course->id, false, $cm);\r
 \r
     if (confirm_sesskey() && (!empty($scoid))) {\r
-               //fwrite($ft," --Ghi du lieu--- \n");\r
         $result = true;\r
         if (isstudent($course->id) || (isteacher($course->id) && !isadmin())) {\r
             foreach ($_POST as $element => $value) {\r
@@ -50,17 +43,13 @@
                     $element = str_replace('__','.',$element);\r
                     $element = preg_replace('/_(\d+)/',".\$1",$element);\r
                     $result = scorm_insert_track($USER->id, $scorm->id, $scoid, $attempt, $element, $value) && $result;\r
-                                       //fwrite($ft,"\n Ghi xong mot phan tu tai Datamodel.php-- ".$scoid);\r
-\r
                 }\r
             }\r
         }\r
         if ($result) {\r
             echo "true\n0";\r
-                       //fwrite($ft,"Ghi thanh cong trong  Datamodel.php-");\r
         } else {\r
             echo "false\n101";\r
-                       //fwrite($ft,"Ghi that bai trong  Datamodel.php-");\r
         }\r
     }\r
 ?>\r

diff --git a/mod/scorm/index.php b/mod/scorm/index.php
index 34c1489412cf4f3120d98c26bbd2fe23b31d7d00..2c67f540297237de160d9f6b6ab514caffc54be9 100755 (executable)
--- a/mod/scorm/index.php
+++ b/mod/scorm/index.php
@@ -1,7 +1,6 @@
 <?php // $Id$\r
 \r
     require_once("../../config.php");\r
-       require_once('sequencinglib.php');\r
 \r
     $id = required_param('id', PARAM_INT);   // course id\r
 \r
@@ -91,6 +90,5 @@
 \r
     print_footer($course);\r
 \r
-\r
 ?>\r
 \r

diff --git a/mod/scorm/loadSCO.php b/mod/scorm/loadSCO.php
index bce2b6f4fa0a52acc112bb991d225f0ef4df0c42..b822f36a66a0c3736c867b807be4c195a58e6b4d 100755 (executable)
--- a/mod/scorm/loadSCO.php
+++ b/mod/scorm/loadSCO.php
@@ -1,7 +1,6 @@
 <?php\r
     require_once("../../config.php");\r
     require_once('locallib.php');\r
-       require_once('sequencinglib.php');\r
        \r
     $id = optional_param('id', '', PARAM_INT);       // Course Module ID, or\r
     $a = optional_param('a', '', PARAM_INT);         // scorm ID\r

diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php
index 720544316a4a6a574f51b73eaa9e373ae1b16bff..0f9617ace92830a46aa6b595e37f48ee779e93ed 100755 (executable)
--- a/mod/scorm/locallib.php
+++ b/mod/scorm/locallib.php
@@ -337,12 +337,15 @@ function scorm_insert_trackmodel($userid,$scormid,$scoid,$attempt) {
     return $id;\r
 }\r
 \r
-function scorm_get_suspendscoid($scormid,$userid)\r
-{\r
-        $sco = get_record("scorm_suspendtrack","scormid",$scormid,"userid",$userid);\r
+function scorm_get_suspendscoid($scormid,$userid) {\r
+    if ($sco = get_record("scorm_suspendtrack","scormid",$scormid,"userid",$userid)) {\r
         $suspendscoid = $sco->suspendscoid;\r
         return $suspendscoid;\r
+    } else {\r
+        return 0;\r
+    }\r
 }\r
+\r
 function scorm_add_time($a, $b) {\r
     $aes = explode(':',$a);\r
     $bes = explode(':',$b);\r
@@ -744,8 +747,7 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n
                 //Neu la sco suspend thi hien thi anh khac\r
                 if ($suspendscoid == $sco->id){\r
                     $result->toc .= '<img src="'.$scormpixdir.'/suspend.gif" alt="Dang tam dung o day" title="Dang dung o day" />';                \r
-                }\r
-                else{\r
+                } else {\r
                 //-----------------------\r
                     if (isset($usertracks[$sco->identifier])) {\r
                         $usertrack = $usertracks[$sco->identifier];\r

diff --git a/mod/scorm/player.php b/mod/scorm/player.php
index 17dc67327e0f8d8190f8df29ab7fc9933121d929..6805b2ec7c964032d8c9900494f1267758540daa 100755 (executable)
--- a/mod/scorm/player.php
+++ b/mod/scorm/player.php
@@ -49,28 +49,25 @@
     $strscorm  = get_string('modulename', 'scorm');\r
     $strpopup = get_string('popup','scorm');\r
 \r
-\r
     $attempt = scorm_get_last_attempt($scorm->id,$USER->id);    \r
     \r
     //Kiem tra xem co phai la tiep tuc khong \r
-    if ($mode=='continue')\r
-    {\r
+    if ($mode=='continue') {\r
         $scoid = scorm_get_suspendscoid($scorm->id,$USER->id);\r
         $USER->setAttempt = 'set';\r
         $mode = 'normal';\r
     }\r
-    if (($mode == 'normal') && ($USER->setAttempt == 'notset')){\r
+    if (($mode == 'normal') && ($USER->setAttempt == 'notset')) {\r
         $attempt++;\r
         $USER->setAttempt = 'set';\r
     }\r
     //Thuc hien Sequencing\r
 \r
-    if ($mode!='review')\r
-    {\r
-    $sequencingResult = scorm_sequecingrule_implement($scorm->id,$scoid,$USER->id);\r
-    //echo "<script language='JavaScript'>";\r
-    //    echo "alert('Sequencing');";\r
-    //echo "<script>";\r
+    if ($mode!='review') {\r
+        $sequencingResult = scorm_sequecingrule_implement($scorm->id,$scoid,$USER->id);\r
+        //echo "<script language='JavaScript'>";\r
+        //    echo "alert('Sequencing');";\r
+        //echo "<script>";\r
         if (($sequencingResult->rule == 'pre') && ($sequencingResult->action == 'disabled')){\r
             echo "<script language='JavaScript'>";\r
             echo "alert('Disabling');";\r
@@ -86,22 +83,20 @@
             echo "alert('Exiting');";\r
             echo "location.href='".$CFG->wwwroot.'/mod/scorm/player.php?id='.$cm->id.$orgstr.$modepop.$scostr."';";\r
             echo "</script>";                \r
-            \r
         }        \r
     }    \r
 \r
     //Thiet lap attempt_status cho scoid\r
     scorm_set_attempt($scoid,$USER->id);\r
     //Ket thuc thiet lap attemp_status\r
-    if ($mode!='review')\r
-    {\r
-    //Update trang thai\r
-    scorm_rollup_updatestatus($scorm->id,$scoid,$USER->id);\r
-    //------------------------------\r
+    if ($mode!='review') {\r
+        //Update trang thai\r
+        scorm_rollup_updatestatus($scorm->id,$scoid,$USER->id);\r
+        //------------------------------\r
     }    \r
     //Thiet lap thong tin lien quan truy xuat Scorm\r
     $statistic = get_record('scorm_statistic',"scormid",$scorm->id,"userid",$USER->id);\r
-    if (empty($statistic)){\r
+    if (empty($statistic)) {\r
         $statisticInput->accesstime = time();\r
         $statisticInput->durationtime = 0;\r
         $statisticInput->status = 'during';\r
@@ -109,15 +104,14 @@
         $statisticInput->scormid = $scorm->id;\r
         $statisticInput->userid = $USER->id;\r
         $statisticid = scorm_insert_statistic($statisticInput);\r
-    }\r
-    else{\r
-        if ($statistic->status=='suspend'){\r
-        $statisticInput->accesstime = time();\r
-        $statisticInput->durationtime = $statistic->durationtime;\r
-        $statisticInput->status = 'during';\r
-        $statisticInput->attemptnumber = $attempt;\r
-        $statisticInput->scormid = $scorm->id;\r
-        $statisticInput->userid = $USER->id;\r
+    } else {\r
+        if ($statistic->status=='suspend') {\r
+            $statisticInput->accesstime = time();\r
+            $statisticInput->durationtime = $statistic->durationtime;\r
+            $statisticInput->status = 'during';\r
+            $statisticInput->attemptnumber = $attempt;\r
+            $statisticInput->scormid = $scorm->id;\r
+            $statisticInput->userid = $USER->id;\r
         }\r
     }    \r
 \r
@@ -125,8 +119,7 @@
 \r
     //Lay thoi gian toi da cho phep\r
     $absoluteTimeLimit = scorm_get_AbsoluteTimeLimit($scoid);\r
-    if ($absoluteTimeLimit > 0)\r
-    {    \r
+    if ($absoluteTimeLimit > 0) {    \r
         echo "<script type='text/javascript'>"; \r
         echo "alert('Bai nay co thoi gian lam la: ".$absoluteTimeLimit."');";\r
         echo "function remind(msg1) {"; \r
@@ -175,8 +168,8 @@
     //}\r
     if (($newattempt=='on') && (($attempt < $scorm->maxattempt) || ($scorm->maxattempt == 0))) {\r
         $attempt++;\r
-        $f = "D:\\test.txt";\r
-        @$ft = fopen($f,"a");\r
+        //$f = "D:\\test.txt";\r
+        //@$ft = fopen($f,"a");\r
         //fwrite($ft,"\n ----New attempt------- ".$attempt);\r
 \r
     }\r
@@ -198,7 +191,6 @@
             } else {\r
                 $mode = 'normal';\r
                 ////fwrite($ft,"\n ++ ++ + ++ Gia tri $mode ".$mode);\r
-\r
             }\r
         }\r
     }\r
@@ -234,12 +226,10 @@
     }\r
 \r
     // Kiem tra xem co duoc exit khong\r
-    if (scorm_isChoiceexit($sco->scorm,$sco->id)){\r
-    $exitlink = '(<a href="'.$CFG->wwwroot.'/course/view.php?id='.$cm->course.'">'.get_string('exit','scorm').'</a>)&nbsp;';\r
-    }\r
-    else\r
-    {\r
-    $exitlink = get_string('exitisnotallowed','scorm');\r
+    if (scorm_isChoiceexit($sco->scorm,$sco->id)) {\r
+        $exitlink = '(<a href="'.$CFG->wwwroot.'/course/view.php?id='.$cm->course.'">'.get_string('exit','scorm').'</a>)&nbsp;';\r
+    } else {\r
+        $exitlink = get_string('exitisnotallowed','scorm');\r
     }\r
 \r
     //Luu giu khoa hoc thoat ra\r

diff --git a/mod/scorm/report.php b/mod/scorm/report.php
index 6145e401543650681eb94bc165336fa1516db759..43ca58300114feed39e028eb68db8570b9a886ca 100755 (executable)
--- a/mod/scorm/report.php
+++ b/mod/scorm/report.php
@@ -4,7 +4,6 @@
 \r
     require_once("../../config.php");\r
     require_once('locallib.php');\r
-       require_once('sequencinglib.php');\r
        \r
     $id = optional_param('id', '', PARAM_INT);    // Course Module ID, or\r
     $a = optional_param('a', '', PARAM_INT);     // SCORM ID\r

diff --git a/mod/scorm/suspend.php b/mod/scorm/suspend.php
index e32dbebb82df634207a4e051255b04fbb7e5a0c9..260a98a5f31ccc8550e5c81665d5a67452396d4f 100755 (executable)
--- a/mod/scorm/suspend.php
+++ b/mod/scorm/suspend.php
@@ -1,36 +1,29 @@
 <?php\r
     require_once('../../config.php');\r
     require_once('locallib.php');\r
-       require_once('sequencinglib.php');\r
-               \r
-//     $f = "D:\\test.txt";\r
-//     @$ft = fopen($f,"a");\r
-//     fwrite($ft,"Bat dau ghi tron datamodel.php \n");\r
 \r
     $id = required_param('id', PARAM_INT);         // course ID\r
     $scormid = required_param('scorm', PARAM_INT);         // scorm ID\r
     $scoid = required_param('sco', PARAM_INT);  // suspend sco ID\r
     $userid = required_param('userid', PARAM_INT);  // user ID\r
 \r
-       $attempt = scorm_get_last_attempt($scormid,$userid);\r
-       $statistic = get_record('scorm_statistic',"scormid",$scormid,"userid",$userid);\r
-       $statisticInput->accesstime = $statistic->accesstime;\r
-       $statisticInput->durationtime = $statistic->durationtime + time()- $statistic->accesstime;\r
-       $statisticInput->status = 'suspend';\r
-       $statisticInput->attemptnumber = $attempt;\r
-       $statisticInput->scormid = $statistic->scormid;\r
-       $statisticInput->userid = $statistic->userid;   \r
-       $statisticid = scorm_insert_statistic($statisticInput);\r
+    $attempt = scorm_get_last_attempt($scormid,$userid);\r
+    $statistic = get_record('scorm_statistic',"scormid",$scormid,"userid",$userid);\r
+    $statisticInput->accesstime = $statistic->accesstime;\r
+    $statisticInput->durationtime = $statistic->durationtime + time()- $statistic->accesstime;\r
+    $statisticInput->status = 'suspend';\r
+    $statisticInput->attemptnumber = $attempt;\r
+    $statisticInput->scormid = $statistic->scormid;\r
+    $statisticInput->userid = $statistic->userid;    \r
+    $statisticid = scorm_insert_statistic($statisticInput);\r
 \r
     $result = scorm_insert_trackmodel($userid, $scormid, $scoid,$attempt);\r
-        if ($result) {\r
-                       echo "<script language='Javascript' type='text/javascript'>";\r
-                       echo "location.href='".$CFG->wwwroot." /course/view.php?id=".$id."';";      \r
-                       echo "</script>";\r
-        } \r
-               else {\r
-                       echo "Suspend failed";\r
-        }\r
-\r
+    if ($result) {\r
+        echo "<script language='Javascript' type='text/javascript'>";\r
+        echo "location.href='".$CFG->wwwroot." /course/view.php?id=".$id."';";        \r
+        echo "</script>";\r
+    } else {\r
+        echo "Suspend failed";\r
+    }\r
 ?>\r
 \r

diff --git a/mod/scorm/timePassReport.htm b/mod/scorm/timePassReport.htm
deleted file mode 100755 (executable)
index 8c0e3a0..0000000
--- a/mod/scorm/timePassReport.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">\r
-<html>\r
-<head>\r
-<title></title>\r
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">\r
-</head>\r
-<body>\r
-Thời gian làm bài đã hết... Mời bạn chọn bài khác.\r
-</body>\r
-</html>\r

diff --git a/mod/scorm/validate.php b/mod/scorm/validate.php
index ab06ff7d04a220b3ff3d9bc050a4dc326fdce0cb..dfd3bf0162da823acb00ba481587b8be98255690 100755 (executable)
--- a/mod/scorm/validate.php
+++ b/mod/scorm/validate.php
@@ -2,7 +2,6 @@
 \r
     require_once("../../config.php");\r
     require_once('locallib.php');\r
-       require_once('sequencinglib.php');\r
        \r
     $courseid = required_param('id', PARAM_INT);             // Course Module ID, or\r
     $reference = required_param('reference', PARAM_PATH);    // Package path\r

diff --git a/mod/scorm/view.php b/mod/scorm/view.php
index ea17ce03e7e93bde3daa37ccd45676cbb7719fa5..427e4f066e14daae59e9dc2ff09121934d936bd1 100755 (executable)
--- a/mod/scorm/view.php
+++ b/mod/scorm/view.php
@@ -1,11 +1,7 @@
 <?php  // $Id$\r
 \r
-/// This page prints a particular instance of scorm\r
-/// (Replace scorm with the name of your module)\r
-\r
     require_once("../../config.php");\r
     require_once('locallib.php');\r
-    require_once('sequencinglib.php');\r
     \r
     $id = optional_param('id', '', PARAM_INT);       // Course Module ID, or\r
     $a = optional_param('a', '', PARAM_INT);         // scorm ID\r