Updated XHTML tags and attributes in order to pass W3C validation

diff --git a/mod/scorm/cmi.php b/mod/scorm/cmi.php
index 254dd4aedf05dde4d167fbb8444cfcaf9865eed4..844fe126b38955b5a586559e932c2e77be987623 100755 (executable)
--- a/mod/scorm/cmi.php
+++ b/mod/scorm/cmi.php
@@ -72,7 +72,6 @@
        <input type="hidden" name="cmi_core_total_time"  />
        <input type="hidden" name="cmi_core_score_raw" />
        <input type="hidden" name="cmi_suspend_data" />
-       
    </form>
 </body>
 </html>

diff --git a/mod/scorm/coursefiles.php b/mod/scorm/coursefiles.php
index bc89638b5b36941a18bffe904bfebf410b3f6018..e944666d31045e4986cb67897f8050be5148923f 100755 (executable)
--- a/mod/scorm/coursefiles.php
+++ b/mod/scorm/coursefiles.php
@@ -4,7 +4,7 @@
 
 //  This file is a hack to files/index.php that removes
 //  the headers and adds some controls so that images
-//  can be selected within the Richtext editor.  
+//  can be selected within the Richtext editor.
 
 //  All the Moodle-specific stuff is in this top section
 //  Configuration and access control occurs here.
@@ -32,17 +32,17 @@
     function html_footer() {
         echo "</td></tr></table></body></html>";
     }
-    
+
     function html_header($course, $wdir, $formfield=""){
 
-        global $CFG,$THEME,$ME;
+        global $CFG, $THEME, $ME;
 
         if ($course->id == SITEID) {
             $strfiles = get_string("sitefiles");
         } else {
             $strfiles = get_string("files");
         }
-    
+
         if ($wdir == "/") {
             $fullnav = "$strfiles";
         } else {
@@ -97,11 +97,11 @@
 
 
     $regexp="\\.\\.";
-    if (ereg( $regexp, $file, $regs )| ereg( $regexp, $wdir,$regs )) {           
+    if (ereg( $regexp, $file, $regs )| ereg( $regexp, $wdir,$regs )) {
         $message = "Error: Directories can not contain \"..\"";
         $wdir = "/";
         $action = "";
-    }    
+    }
 
     if (!$wdir) {
         $wdir="/";
@@ -134,17 +134,17 @@
                 echo "<p>$struploadafile ($strmaxsize) --> <b>$wdir</b>";
                 echo "<table><tr><td colspan=\"2\">";
                 echo "<form enctype=\"multipart/form-data\" method=\"post\" action=\"".$ME."\">";
-                echo " <input type=\"hidden\" name=\"id\" value=$id />";
-                echo " <input type=\"hidden\" name=\"wdir\" value=$wdir />";
-                echo " <input type=\"hidden\" name=\"action\" value=\"upload\" />";
                 upload_print_form_fragment(1,array('userfile'),null,false,null,$course->maxbytes,0,false);
+                echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
+                echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
+                echo " <input type=\"hidden\" name=\"action\" value=\"upload\" />";
                 echo " </td><tr><td width=\"10\">";
                 echo " <input type=\"submit\" name=\"save\" value=\"$struploadthisfile\" />";
                 echo "</form>";
                 echo "</td><td width=\"100%\">";
                 echo "<form action=\"".$ME."\" method=\"get\">";
-                echo " <input type=\"hidden\" name=\"id\" value=$id />";
-                echo " <input type=\"hidden\" name=\"wdir\" value=$wdir />";
+                echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
+                echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
                 echo " <input type=\"hidden\" name=\"action\" value=\"cancel\" />";
                 echo " <input type=\"submit\" value=\"$strcancel\" />";
                 echo "</form>";
@@ -174,7 +174,7 @@
                     printfilelist($USER->filelist);
                     print_simple_box_end();
                     echo "<br />";
-                    notice_yesno (get_string("deletecheckfiles"), 
+                    notice_yesno (get_string("deletecheckfiles"),
                                 "".basename($ME)."?id=$id&amp;wdir=$wdir&amp;action=delete&amp;confirm=1",
                                 "".basename($ME)."?id=$id&amp;wdir=$wdir&amp;action=cancel");
                 } else {
@@ -224,7 +224,7 @@
                     echo "Error: could not rename $oldname to $name";
                 }
                 displaydir($wdir);
-                    
+
             } else {
                 $strrename = get_string("rename");
                 $strcancel = get_string("cancel");
@@ -233,8 +233,8 @@
                 echo "<p>$strrenamefileto:";
                 echo "<table><tr><td>";
                 echo "<form action=\"".$ME."\" method=\"post\" name=\"form\">";
-                echo " <input type=\"hidden\" name=\"id\" value=$id />";
-                echo " <input type=\"hidden\" name=\"wdir\" value=$wdir />";
+                echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
+                echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
                 echo " <input type=\"hidden\" name=\"action\" value=\"rename\" />";
                 echo " <input type=\"hidden\" name=\"oldname\" value=\"$file\" />";
                 echo " <input type=\"text\" name=\"name\" size=\"35\" value=\"$file\" />";
@@ -242,8 +242,8 @@
                 echo "</form>";
                 echo "</td><td>";
                 echo "<form action=\"".$ME."\" method=\"get\">";
-                echo " <input type=\"hidden\" name=\"id\" value=$id />";
-                echo " <input type=\"hidden\" name=\"wdir\" value=$wdir />";
+                echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
+                echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
                 echo " <input type=\"hidden\" name=\"action\" value=\"cancel\" />";
                 echo " <input type=\"submit\" value=\"$strcancel\" />";
                 echo "</form>";
@@ -262,7 +262,7 @@
                     echo "Error: could not create $name";
                 }
                 displaydir($wdir);
-                    
+
             } else {
                 $strcreate = get_string("create");
                 $strcancel = get_string("cancel");
@@ -271,16 +271,16 @@
                 echo "<p>$strcreatefolder:";
                 echo "<table><tr><td>";
                 echo "<form action=\"".$ME."\" method=\"post\" name=\"form\">";
-                echo " <input type=\"hidden\" name=\"id\" value=$id />";
-                echo " <input type=\"hidden\" name=\"wdir\" value=$wdir />";
+                echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
+                echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
                 echo " <input type=\"hidden\" name=\"action\" value=\"mkdir\" />";
                 echo " <input type=\"text\" name=\"name\" size=\"35\" />";
                 echo " <input type=\"submit\" value=\"$strcreate\" />";
                 echo "</form>";
                 echo "</td><td>";
                 echo "<form action=\"".$ME."\" method=\"get\">";
-                echo " <input type=\"hidden\" name=\"id\" value=$id />";
-                echo " <input type=\"hidden\" name=\"wdir\" value=$wdir />";
+                echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
+                echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
                 echo " <input type=\"hidden\" name=\"action\" value=\"cancel\" />";
                 echo " <input type=\"submit\" value=\"$strcancel\" />";
                 echo "</form>";
@@ -296,7 +296,7 @@
                 fputs($fileptr, stripslashes($text));
                 fclose($fileptr);
                 displaydir($wdir);
-                    
+
             } else {
                 $streditfile = get_string("edit", "", "<b>$file</b>");
                 $fileptr  = fopen($basedir.$file, "r");
@@ -319,7 +319,7 @@
 
                 echo "<table><tr><td colspan=\"2\">";
                 echo "<form action=\"".$ME."\" method=\"post\" name=\"form\" $onsubmit>";
-                echo " <input type=\"hidden\" name=\"id\" value=$id />";
+                echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
                 echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
                 echo " <input type=\"hidden\" name=\"file\" value=\"$file\" />";
                 echo " <input type=\"hidden\" name=\"action\" value=\"edit\" />";
@@ -329,14 +329,14 @@
                 echo "</form>";
                 echo "</td><td>";
                 echo "<form action=\"".$ME."\" method=\"get\">";
-                echo " <input type=\"hidden\" name=\"id\" value=$id />";
-                echo " <input type=\"hidden\" name=\"wdir\" value=$wdir />";
+                echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
+                echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
                 echo " <input type=\"hidden\" name=\"action\" value=\"cancel\" />";
                 echo " <input type=\"submit\" value=\"".get_string("cancel")."\" />";
                 echo "</form>";
                 echo "</td></tr></table>";
 
-                if ($usehtmleditor) { 
+                if ($usehtmleditor) {
                     print_richedit_javascript("form", "text", "yes");
                 }
 
@@ -370,7 +370,7 @@
                 }
                 clearfilelist();
                 displaydir($wdir);
-                    
+
             } else {
                 html_header($course, $wdir, "form.name");
 
@@ -383,7 +383,7 @@
                     echo "<p align=\"center\">".get_string("whattocallzip");
                     echo "<table><tr><td>";
                     echo "<form action=\"".$ME."\" method=\"post\" name=\"form\">";
-                    echo " <input type=\"hidden\" name=\"id\" value=$id />";
+                    echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
                     echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
                     echo " <input type=\"hidden\" name=\"action\" value=\"zip\" />";
                     echo " <input type=\"text\" name=\"name\" size=\"35\" value=\"new.zip\" />";
@@ -391,8 +391,8 @@
                     echo "</form>";
                     echo "</td><td>";
                     echo "<form action=\"".$ME."\" method=\"get\">";
-                    echo " <input type=\"hidden\" name=\"id\" value=$id />";
-                    echo " <input type=\"hidden\" name=\"wdir\" value=$wdir />";
+                    echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
+                    echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
                     echo " <input type=\"hidden\" name=\"action\" value=\"cancel\" />";
                     echo " <input type=\"submit\" value=\"".get_string("cancel")."\" />";
                     echo "</form>";
@@ -446,7 +446,7 @@
                         }
                         echo "</table>";
                     }
-                    
+
                 } else {                     // Use external unzip program
                     print_simple_box_start("center");
                     echo "<pre>";
@@ -457,8 +457,8 @@
                 }
 
                 echo "<center><form action=\"".$ME."\" method=\"get\">";
-                echo " <input type=\"hidden\" name=\"id\" value=$id />";
-                echo " <input type=\"hidden\" name=\"wdir\" value=$wdir />";
+                echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
+                echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
                 echo " <input type=\"hidden\" name=\"action\" value=\"cancel\" />";
                 echo " <input type=\"submit\" value=\"$strok\" />";
                 echo "</form>";
@@ -504,8 +504,8 @@
                     echo "</table>";
                 }
                 echo "<br /><center><form action=\"".$ME."\" method=\"get\">";
-                echo " <input type=\"hidden\" name=\"id\" value=$id />";
-                echo " <input type=\"hidden\" name=\"wdir\" value=$wdir />";
+                echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
+                echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
                 echo " <input type=\"hidden\" name=\"action\" value=\"cancel\" />";
                 echo " <input type=\"submit\" value=\"$strok\" />";
                 echo "</form>";
@@ -558,13 +558,13 @@
 /// FILE FUNCTIONS ///////////////////////////////////////////////////////////
 
 
-function fulldelete($location) { 
+function fulldelete($location) {
     if (is_dir($location)) {
         $currdir = opendir($location);
-        while ($file = readdir($currdir)) { 
+        while ($file = readdir($currdir)) {
             if ($file <> ".." && $file <> ".") {
                 $fullfile = $location."/".$file;
-                if (is_dir($fullfile)) { 
+                if (is_dir($fullfile)) {
                     if (!fulldelete($fullfile)) {
                         return false;
                     }
@@ -572,9 +572,9 @@ function fulldelete($location) {
                     if (!unlink($fullfile)) {
                         return false;
                     }
-                } 
+                }
             }
-        } 
+        }
         closedir($currdir);
         if (! rmdir($location)) {
             return false;
@@ -622,14 +622,14 @@ function printfilelist($filelist) {
             echo "<img src=\"$CFG->pixpath/f/folder.gif\" height=\"16\" width=\"16\" alt=\"\" /> $file<br />";
             $subfilelist = array();
             $currdir = opendir($basedir.$file);
-            while ($subfile = readdir($currdir)) { 
+            while ($subfile = readdir($currdir)) {
                 if ($subfile <> ".." && $subfile <> ".") {
                     $subfilelist[] = $file."/".$subfile;
                 }
             }
             printfilelist($subfilelist);
 
-        } else { 
+        } else {
             $icon = mimeinfo("icon", $file);
             echo "<img src=\"$CFG->pixpath/f/$icon\"  height=\"16\" width=\"16\" alt=\"\" /> $file<br />";
         }
@@ -646,6 +646,7 @@ function print_cell($alignment="center", $text="&nbsp;") {
 }
 
 function displaydir ($wdir) {
+
 //  $wdir == / or /a or /a/b/c/d  etc
 
     global $basedir;
@@ -659,12 +660,13 @@ function displaydir ($wdir) {
         if ($file == "." || $file == "..") {
             continue;
         }
-        
+
         if (is_dir($fullpath."/".$file)) {
             $dirlist[] = $file;
         } else {
-            if ((basename(strtolower($file),".zip") != basename(strtolower($file))) || (basename(strtolower($file),".pif") != basename(strtolower($file))))
-            $filelist[] = $file;
+            if ((basename(strtolower($file),".zip") != basename(strtolower($file))) || (basename(strtolower($file),".pif") != basename(strtolower($file)))) {
+                $filelist[] = $file;
+            }
         }
     }
     closedir($directory);
@@ -688,7 +690,7 @@ function displaydir ($wdir) {
 
 
     echo "<form action=\"".$ME."\" method=\"post\" name=\"dirform\">";
-    echo "<table border=\"0\" cellspacing=\"2\" cellpadding=\"2\" width=\"640\">";    
+    echo "<table border=\"0\" cellspacing=\"2\" cellpadding=\"2\" width=\"640\">";
     echo "<tr>";
     echo "<th width=\"5\"></th>";
     echo "<th align=\"left\">$strname</th>";
@@ -713,7 +715,7 @@ function displaydir ($wdir) {
             $fileurl  = rawurlencode($wdir."/".$dir);
             $filesafe = rawurlencode($dir);
             $filedate = userdate(filectime($filename), "%d %b %Y, %I:%M %p");
-    
+
             echo "<tr>";
 
             print_cell("center", "<input type=\"checkbox\" name=\"file$count\" value=\"$fileurl\" />");
@@ -721,12 +723,11 @@ function displaydir ($wdir) {
             print_cell("right", "-");
             print_cell("right", $filedate);
             print_cell("right", "<a href=\"".basename($ME)."?id=$id&amp;wdir=$wdir&amp;file=$filesafe&amp;action=rename\">$strrename</a>");
-    
+
             echo "</tr>";
         }
     }
 
-
     if (!empty($filelist)) {
         asort($filelist);
         foreach ($filelist as $file) {
@@ -756,8 +757,8 @@ function displaydir ($wdir) {
             print_cell("center", "<input type=\"checkbox\" name=\"file$count\" value=\"$fileurl\" />");
 
             echo "<td align=\"left\" nowrap=\"nowrap\">";
-            link_to_popup_window ($ffurl, "display", 
-                                  "<img src=\"$CFG->pixpath/f/$icon\" height=\"16\" width=\"16\" border=\"0\" alt=\"file\" />", 
+            link_to_popup_window ($ffurl, "display",
+                                  "<img src=\"$CFG->pixpath/f/$icon\" height=\"16\" width=\"16\" border=\"0\" alt=\"file\" />",
                                   480, 640);
             echo "<font size=\"-1\" face=\"Arial, Helvetica\">";
             link_to_popup_window ($ffurl, "display", htmlspecialchars($file), 480, 640);
@@ -767,7 +768,7 @@ function displaydir ($wdir) {
             print_cell("right", display_size($file_size));
             print_cell("right", $filedate);
 
-            $edittext = "<b><a onMouseDown=\"return set_value('$selectfile')\" href=\"\">$strchoose</a></b>&nbsp;";
+            $edittext = "<b><a onmousedown=\"return set_value('$selectfile')\" href=\"\">$strchoose</a></b>&nbsp;";
 
             if ($icon == "text.gif" || $icon == "html.gif") {
                 $edittext .= "<a href=\"".basename($ME)."?id=$id&amp;wdir=$wdir&amp;file=$fileurl&amp;action=edit\">$stredit</a>";
@@ -777,19 +778,19 @@ function displaydir ($wdir) {
             }
 
             print_cell("right", "$edittext <a href=\"".basename($ME)."?id=$id&amp;wdir=$wdir&amp;file=$filesafe&amp;action=rename\">$strrename</a>");
-    
+
             echo "</tr>";
         }
     }
     echo "</table>";
-    echo "<hr width=\"640\" align=\"center\" noshade=\"noshade\" size=\"1\" />";
+    echo "<hr width=\"640\" align=\"center\" size=\"1\" />";
 
     if (empty($wdir)) {
         $wdir = "/";
     }
 
-    echo "<table border=\"0\" cellspacing=\"2\" cellpadding=\"2\" width=\"640\">";    
-    echo "<tr><td>";
+    echo "<table border=\"0\" cellspacing=\"2\" cellpadding=\"2\" width=\"640\" align=\"center\">";
+    echo "<tr><td align=\"center\">";
     echo "<input type=\"hidden\" name=\"id\" value=\"$id\" />";
     echo "<input type=\"hidden\" name=\"wdir\" value=\"$wdir\" /> ";
     $options = array (
@@ -801,34 +802,36 @@ function displaydir ($wdir) {
         choose_from_menu ($options, "action", "", "$strwithchosenfiles...", "javascript:document.dirform.submit()");
     }
 
-    echo "</form>";
-    echo "<td align=\"center\">";
+    echo "</td></tr></table></form>";
+    echo "<table border=\"0\" cellspacing=\"2\" cellpadding=\"2\" width=\"640\" align=\"center\"><tr>";
     if (!empty($USER->fileop) and ($USER->fileop == "move") and ($USER->filesource <> $wdir)) {
+        echo "<td align=\"center\">";
         echo "<form action=\"".$ME."\" method=\"get\">";
-        echo " <input type=\"hidden\" name=\"id\" value=$id />";
+        echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
         echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
         echo " <input type=\"hidden\" name=\"action\" value=\"paste\" />";
         echo " <input type=\"submit\" value=\"$strmovefilestohere\" />";
         echo "</form>";
+        echo "</td>";
     }
-    echo "<td align=\"right\">";
+    echo "<td align=\"center\">";
         echo "<form action=\"".$ME."\" method=\"get\">";
-        echo " <input type=\"hidden\" name=\"id\" value=$id />";
+        echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
         echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
         echo " <input type=\"hidden\" name=\"action\" value=\"mkdir\" />";
         echo " <input type=\"submit\" value=\"$strmakeafolder\" />";
         echo "</form>";
     echo "</td>";
-    echo "<td align=\"right\">";
+    echo "<td align=\"center\">";
         echo "<form action=\"".$ME."\" method=\"get\">";
-        echo " <input type=\"hidden\" name=\"id\" value=$id />";
+        echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
         echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";
         echo " <input type=\"hidden\" name=\"action\" value=\"upload\" />";
         echo " <input type=\"submit\" value=\"$struploadafile\" />";
         echo "</form>";
     echo "</td></tr>";
     echo "</table>";
-    echo "<hr width=\"640\" align=\"center\" noshade=\"noshade\" size=\"1\" />";
+    echo "<hr width=\"640\" align=\"center\" size=\"1\" />";
 
 }
 

diff --git a/mod/scorm/details.php b/mod/scorm/details.php
index e3874ae354e76d71db2adb81300a8215fa1cdc27..a49ebdeeee7d22932fff9573cbf24536389a9491 100755 (executable)
--- a/mod/scorm/details.php
+++ b/mod/scorm/details.php
@@ -33,22 +33,22 @@
     $coursedir = "$CFG->dataroot/$course->id";
 
     if ($scormdir = make_upload_directory("$course->id/$CFG->moddata/scorm")) {
-            if ($tempdir = scorm_datadir($scormdir, $form->datadir)) {
-                copy ("$coursedir/$form->reference", $tempdir."/".basename($form->reference));
-                if (empty($CFG->unzip)) {    // Use built-in php-based unzip function
-                    include_once($CFG->dirroot.'/lib/pclzip/pclzip.lib.php');
-                    $archive = new PclZip($tempdir."/".basename($form->reference));
-                    if (!$list = $archive->extract($tempdir)) {
-                        error($archive->errorInfo(true));
-                    }
-                } else {
-                    $command = "cd $tempdir; $CFG->unzip -o ".basename($form->reference)." 2>&1";
-                    exec($command);
+        if ($tempdir = scorm_datadir($scormdir, $form->datadir)) {
+            copy ("$coursedir/$form->reference", $tempdir."/".basename($form->reference));
+            if (empty($CFG->unzip)) {    // Use built-in php-based unzip function
+                include_once($CFG->dirroot.'/lib/pclzip/pclzip.lib.php');
+                $archive = new PclZip($tempdir."/".basename($form->reference));
+                if (!$list = $archive->extract($tempdir)) {
+                    error($archive->errorInfo(true));
                 }
-                $result = scorm_validate($tempdir."/imsmanifest.xml");
             } else {
-                $result = "packagedir";
+                $command = "cd $tempdir; $CFG->unzip -o ".basename($form->reference)." 2>&1";
+                exec($command);
             }
+            $result = scorm_validate($tempdir."/imsmanifest.xml");
+        } else {
+            $result = "packagedir";
+        }
     } else {
         $result = "datadir";
     }
@@ -64,70 +64,72 @@
         //
         if (is_dir($tempdir))
             scorm_delete_files($tempdir);
-    } else {
-            //
+        } else {
+        //
         // Delete package file
         //
-            unlink ($tempdir."/".basename($form->reference));
-            if ($form->mode == "update") {
+        unlink ($tempdir."/".basename($form->reference));
+        if ($form->mode == "update") {
             $fp = fopen($coursedir."/".$form->reference,"r");
-        $fstat = fstat($fp);
-        fclose($fp);
-        if (get_field("scorm","timemodified","id",$form->instance) < $fstat["mtime"])
-            $form->launch = 0;
-        }
-        }
-        //
-        // Print validation result
-        //
-        print_simple_box_start("center", "", "$THEME->cellheading");
-        echo "<table cellpadding=\"5\" align=\"center\">\n";
-        echo "    <tr><td align=\"right\" nowrap=\"nowrap\"><p><b>$strname:</b></p></td><td><p>$form->name</p></a></td></tr>\n";
-        echo "    <tr><td align=\"right\" nowrap=\"nowrap\"><p><b>".get_string("validation","scorm").":</b></p></td><td><p>".get_string($result,"scorm")."</p></a></td></tr>\n";
-        if ($errorlogs != '') {
-            $lines = round(count($errors)/4);
-            if ($lines < 5) {
-                $lines = 5;
+            $fstat = fstat($fp);
+            fclose($fp);
+            if (get_field("scorm","timemodified","id",$form->instance) < $fstat["mtime"]) {
+                $form->launch = 0;
             }
-            echo "    <tr><td align=\"right\" nowrap=\"nowrap\"><p><b>".get_string("errorlogs","scorm").":</b></p></td><td><textarea rows=\"".$lines."\" cols=\"30\" readonly>".$errorlogs."</textarea></a></td></tr>\n";
         }
-        if (($form->mode == "update") && ($form->launch == 0) && (get_records("scorm_sco_users","scormid",$form->instance)))
+    }
+    //
+    // Print validation result
+    //
+    print_simple_box_start("center", "", "$THEME->cellheading");
+    echo "<table cellpadding=\"5\" align=\"center\">\n";
+    echo "    <tr><td align=\"right\" nowrap=\"nowrap\"><p><b>$strname:</b></p></td><td><p>$form->name</p></td></tr>\n";
+    echo "    <tr><td align=\"right\" nowrap=\"nowrap\"><p><b>".get_string("validation","scorm").":</b></p></td><td><p>".get_string($result,"scorm")."</p></td></tr>\n";
+    if ($errorlogs != '') {
+        $lines = round(count($errors)/4);
+        if ($lines < 5) {
+            $lines = 5;
+        }
+        echo "    <tr><td align=\"right\" nowrap=\"nowrap\"><p><b>".get_string("errorlogs","scorm").":</b></p></td><td><textarea rows=\"".$lines."\" cols=\"30\" readonly>".$errorlogs."</textarea></a></td></tr>\n";
+    }
+    if (($form->mode == "update") && ($form->launch == 0) && (get_records("scorm_sco_users","scormid",$form->instance))) {
         echo "    <tr><td align=\"center\" colspan=\"2\" nowrap=\"nowrap\"><p><b>".get_string("trackingloose","scorm")."</b></p></td></tr>\n";
-        echo "</table>\n";
-        if (($result == "regular") || ($result == "found")){
-            if (empty($form->auto)) {
-        $form->auto = "";
-            }
-            if (empty($form->maxgrade)) {
-        $form->maxgrade = "";
-            }
-            if (empty($form->grademethod)) {
-        $form->grademethod = "0";
-            }
+    }
+    echo "</table>\n";
+    if (($result == "regular") || ($result == "found")) {
+        if (empty($form->auto)) {
+            $form->auto = "";
+        }
+        if (empty($form->maxgrade)) {
+            $form->maxgrade = "";
+        }
+        if (empty($form->grademethod)) {
+            $form->grademethod = "0";
+        }
         echo "<form name=\"theform\" method=\"post\" action=\"$form->destination\">\n";
         
         //$form->popup = $CFG->scorm_popup;
         $strnewwindow     = get_string("newwindow", "scorm");
-            $strnewwindowopen = get_string("newwindowopen", "scorm");
+        $strnewwindowopen = get_string("newwindowopen", "scorm");
         foreach ($SCORM_WINDOW_OPTIONS as $optionname) {
             $stringname = "str$optionname";
             $$stringname = get_string("new$optionname", "scorm");
             $window->$optionname = "";
             $jsoption[] = "\"$optionname\"";
-            }
-            $alljsoptions = implode(",", $jsoption);
+        }
+        $alljsoptions = implode(",", $jsoption);
         
-            if ($form->instance) {     // Re-editing
+        if ($form->instance) {     // Re-editing
             if ($form->popup == "") {
-                    $newwindow = "";   // Disable the new window
-                    foreach ($SCORM_WINDOW_OPTIONS as $optionname) {
-                        $defaultvalue = "scorm_popup$optionname";
-                        $window->$optionname = $CFG->$defaultvalue;
+                $newwindow = "";   // Disable the new window
+                foreach ($SCORM_WINDOW_OPTIONS as $optionname) {
+                    $defaultvalue = "scorm_popup$optionname";
+                    $window->$optionname = $CFG->$defaultvalue;
                 }
             } else {
-                    $newwindow = "checked";
-                    $rawoptions = explode(',', $form->popup); 
-                    foreach ($rawoptions as $rawoption) {
+                $newwindow = "checked";
+                $rawoptions = explode(',', $form->popup); 
+                foreach ($rawoptions as $rawoption) {
                     $option = explode('=', trim($rawoption));
                     if (($option[0] != 'location') && ($option[0] != 'menubar') && ($option[0] != 'toolbar')) {
                         $optionname = $option[0];
@@ -138,56 +140,55 @@
                             $window->$optionname = "checked";
                         }
                     }
-                    }
+                }
             }
-            } else {
-                foreach ($SCORM_WINDOW_OPTIONS as $optionname) {
-                    $defaultvalue = "scorm_popup$optionname";
-                    $window->$optionname = $CFG->$defaultvalue;
+        } else {
+            foreach ($SCORM_WINDOW_OPTIONS as $optionname) {
+                $defaultvalue = "scorm_popup$optionname";
+                $window->$optionname = $CFG->$defaultvalue;
             }
             $newwindow = $CFG->scorm_popup;
-            }
-        
+        }    
 ?>
     <table cellpadding="5" align="center">
-      <tr valign="top">
+        <tr valign="top">
             <td align="right"><p><b><?php print_string("grademethod", "scorm") ?>:</b></p></td>
             <td>
-              <?php
-            $options = array();
-            $options[0] = get_string("gradescoes", "scorm");
-            $options[1] = get_string("gradehighest", "scorm");
-            $options[2] = get_string("gradeaverage", "scorm");
-            choose_from_menu($SCORM_GRADE_METHOD, "grademethod", "$form->grademethod", "");
-            helpbutton("grademethod", get_string("grademethod","scorm"), "scorm");
-              ?>
+            <?php
+                $options = array();
+                $options[0] = get_string("gradescoes", "scorm");
+                $options[1] = get_string("gradehighest", "scorm");
+                $options[2] = get_string("gradeaverage", "scorm");
+                choose_from_menu($SCORM_GRADE_METHOD, "grademethod", "$form->grademethod", "");
+                helpbutton("grademethod", get_string("grademethod","scorm"), "scorm");
+            ?>
             </td>
-      </tr>
-      <tr valign="top">
+        </tr>
+        <tr valign="top">
             <td align="right"><p><b><?php print_string("maximumgrade") ?>:</b></p></td>
             <td>
-              <?php
-            for ($i=100; $i>=1; $i--) {
+            <?php
+                for ($i=100; $i>=1; $i--) {
                     $grades[$i] = $i;
-            }
+                }
 
-            choose_from_menu($grades, "maxgrade", "$form->maxgrade", "");
-            helpbutton("maxgrade", get_string("maximumgrade"), "scorm");
-              ?>
+                choose_from_menu($grades, "maxgrade", "$form->maxgrade", "");
+                helpbutton("maxgrade", get_string("maximumgrade"), "scorm");
+            ?>
             </td>
-      </tr>
-      <tr valign="top">
-        <td align="right"><p><b><?php print_string("autocontinue","scorm") ?>:</b></p></td>
-        <td>
-        <?php
-            $options = array();
-            $options[0]=get_string("no");
-            $options[1]=get_string("yes");
-            choose_from_menu ($options, "auto", $form->auto);
-        ?>
-        </td>
-      </tr>
-      <tr valign="top">
+        </tr>
+        <tr valign="top">
+            <td align="right"><p><b><?php print_string("autocontinue","scorm") ?>:</b></p></td>
+            <td>
+            <?php
+                $options = array();
+                $options[0]=get_string("no");
+                $options[1]=get_string("yes");
+                choose_from_menu ($options, "auto", $form->auto);
+            ?>
+            </td>
+        </tr>
+        <tr valign="top">
             <td align="right" nowrap="nowrap">
                 <p><b><?php p($strnewwindow) ?></b></p>
             </td>
@@ -196,30 +197,36 @@
                     var subitems = [<?php echo $alljsoptions; ?>];
                     
                     function autowindow() {
-                        if (document.theform.newwindow.checked) 
+                        if (document.theform.newwindow.checked) {
                             document.theform.auto.disabled=true;
-                        else
+                        } else {
                             document.theform.auto.disabled=false;
+                        }
                     }
                     
                     <?php
-                        if ($newwindow == "checked")
+                        if ($newwindow == "checked") {
                             echo "document.theform.auto.disabled=true;\n";
+                            $newwindow = "checked='checked'";
+                        }
                     ?>
                 </script>
                 <input name="setnewwindow" type="hidden" value="1" />
-                <input name="newwindow" type="checkbox" value="1" <?php p($newwindow) ?> onclick="autowindow();return lockoptions('theform','newwindow', subitems);" /> 
-                <?php p($strnewwindowopen) ?>
-                <ul>
+                <input name="newwindow" type="checkbox" value="1" onclick="autowindow();return lockoptions('theform','newwindow', subitems);" <?php echo $newwindow ?> /> 
+                <?php echo $strnewwindowopen."\n"; ?>
+                <ul style='list-style-type:none;'><li>
                 <?php
-                    foreach ($window as $name => $value) {
-                        if ($name == "height" or $name == "width") {
-                            continue;
-                        }
-                        echo "\t\t<input name=\"h$name\" type=\"hidden\" value=\"0\" />\n";
-                        echo "\t\t<input name=\"$name\" type=\"checkbox\" value=\"1\" ".$window->$name." /> ";
-                        $stringname = "str$name";
-                        echo $$stringname."<br />\n";
+                     foreach ($window as $name => $value) {
+                         if ($name == "height" or $name == "width") {
+                             continue;
+                         }
+                         echo "\t\t<input name=\"h$name\" type=\"hidden\" value=\"0\" />\n";
+                         if ($window->$name == 'checked') {
+                             $window->$name = 'checked="checked"';
+                         }
+                         echo "\t\t<input name=\"$name\" type=\"checkbox\" value=\"1\" ".$window->$name." /> ";
+                         $stringname = "str$name";
+                         echo $$stringname."<br />\n";
                      }
                 ?>
 
@@ -227,46 +234,45 @@
                 <input name="width" type="text" size="4" value="<?php p($window->width) ?>" /> <?php p($strwidth) ?><br />
                 <input name="hheight" type="hidden" value="0" />
                 <input name="height" type="text" size="4" value="<?php p($window->height) ?>" /> <?php p($strheight) ?><br />
-                 <?php
+                <?php
                      if (!$newwindow) {
                          echo "<script>\n<!--\n";
                          echo "\tlockoptions('theform','newwindow', subitems);";
                          echo "\n-->\n</script>";
                      }
                  ?>
-                 </ul>
-                 </p>
+                 </li></ul>
              </td>
-           </tr>
-        </table>
-        <input type="hidden" name="reference"   value="<?php p($form->reference) ?>" />
-        <input type="hidden" name="datadir" value="<?php p(substr($tempdir,strlen($scormdir))) ?>" />
-        <input type="hidden" name="summary" value="<?php p($form->summary) ?>" />
-        <input type="hidden" name="name"    value="<?php p($form->name) ?>" />
-    <input type="hidden" name="launch"  value="<?php p($form->launch) ?>" />
-        <input type="hidden" name="course"  value="<?php p($form->course) ?>" />
-        <input type="hidden" name="coursemodule"    value="<?php p($form->coursemodule) ?>" />
-        <input type="hidden" name="section" value="<?php p($form->section) ?>" />
-        <input type="hidden" name="module"  value="<?php p($form->module) ?>" />
-        <input type="hidden" name="modulename"  value="<?php p($form->modulename) ?>" />
-        <input type="hidden" name="instance"    value="<?php p($form->instance) ?>" />
-        <input type="hidden" name="mode"    value="<?php p($form->mode) ?>" />
-    <div align="center">
-        <input type="submit" value="<?php print_string("savechanges") ?>" />
-        <input type="submit" name="cancel" value="<?php print_string("cancel") ?>" />
-    </div>
-        </form>
+         </tr>
+      </table>
+      <input type="hidden" name="reference"   value="<?php p($form->reference) ?>" />
+      <input type="hidden" name="datadir" value="<?php p(substr($tempdir,strlen($scormdir))) ?>" />
+      <input type="hidden" name="summary" value="<?php p($form->summary) ?>" />
+      <input type="hidden" name="name"    value="<?php p($form->name) ?>" />
+      <input type="hidden" name="launch"  value="<?php p($form->launch) ?>" />
+      <input type="hidden" name="course"  value="<?php p($form->course) ?>" />
+      <input type="hidden" name="coursemodule"    value="<?php p($form->coursemodule) ?>" />
+      <input type="hidden" name="section" value="<?php p($form->section) ?>" />
+      <input type="hidden" name="module"  value="<?php p($form->module) ?>" />
+      <input type="hidden" name="modulename"  value="<?php p($form->modulename) ?>" />
+      <input type="hidden" name="instance"    value="<?php p($form->instance) ?>" />
+      <input type="hidden" name="mode"    value="<?php p($form->mode) ?>" />
+      <div align="center">
+          <input type="submit" value="<?php print_string("savechanges") ?>" />
+          <input type="submit" name="cancel" value="<?php print_string("cancel") ?>" />
+      </div>
+  </form>
 <?php
         } else {
 ?>
-    <center>
-           <input type="button" value="<?php print_string("continue") ?>" onClick="document.location='<?php echo $CFG->wwwroot ?>/course/view.php?id=<?php echo $course->id ?>';" />
-        </center>
+  <div align="center">
+      <input type="button" value="<?php print_string("continue") ?>" onclick="document.location='<?php echo $CFG->wwwroot ?>/course/view.php?id=<?php echo $course->id ?>';" />
+  </div>
 <?php
-    }
-    print_simple_box_end();
+        }
+        print_simple_box_end();
         print_footer($course);
     } else {
-           error("This script was called incorrectly");
+        error("This script was called incorrectly");
     }
 ?>

diff --git a/mod/scorm/index.php b/mod/scorm/index.php
index ba3e8dd89ddfb83bea1261a0946def5bb498f929..49c612151175363b39bc88aed15c9ae6ce242c11 100755 (executable)
--- a/mod/scorm/index.php
+++ b/mod/scorm/index.php
@@ -41,13 +41,13 @@
 
     if ($course->format == "weeks") {
         $table->head  = array ($strweek, $strname, $strsummary);
-        $table->align = array ("CENTER", "LEFT", "LEFT");
+        $table->align = array ("center", "left", "left");
     } else if ($course->format == "topics") {
         $table->head  = array ($strtopic, $strname, $strsummary);
-        $table->align = array ("CENTER", "LEFT", "LEFT");
+        $table->align = array ("center", "left", "left");
     } else {
         $table->head  = array ($strlastmodified, $strname, $strsummary);
-        $table->align = array ("LEFT", "LEFT", "LEFT");
+        $table->align = array ("left", "left", "left");
     }
 
     foreach ($scorms as $scorm) {

diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index 310b3d001079d4e68b8cf0ffd8e857113a91347e..4e0ae3e72b98f167859a5fa403c66ff911e2ae41 100755 (executable)
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -588,7 +588,7 @@ function scorm_string_round($stringa) {
 // Crop a string to $len character and set an anchor title to the full string
     $len=11;
     if ( strlen($stringa)>$len ) {
-    return "<a name=\"\" title=\"$stringa\">".substr($stringa,0,$len-4).'...'.substr($stringa,strlen($stringa)-1,1).'</a>';
+    return "<a name=\"none\" title=\"$stringa\">".substr($stringa,0,$len-4).'...'.substr($stringa,strlen($stringa)-1,1).'</a>';
     } else
     return $stringa;
 }

diff --git a/mod/scorm/playscorm.php b/mod/scorm/playscorm.php
index 431c321d9cd38a6f81ebd28393305720de8ee590..8c1c910f9b5f10a8e5f800d2c5febf32aef490dd 100755 (executable)
--- a/mod/scorm/playscorm.php
+++ b/mod/scorm/playscorm.php
@@ -73,7 +73,7 @@
        //
        $bodyscripts = "";
        if ($scorm->popup != "") {
-           $bodyscripts = "onLoad='SCOInitialize();' onUnload='SCOFinish(); closeMain();' onbeforeUnload='SCOFinish();'";
+           $bodyscripts = "onload='SCOInitialize();' onunload='SCOFinish(); closeMain();'";
        }
        print_header($pagetitle, "$course->fullname",
                "$navigation <a target=\"{$CFG->framename}\" href=\"view.php?id=$cm->id\" title=\"$scorm->summary\">$scorm->name</a>",
@@ -91,7 +91,7 @@
                 $currentSCO = $_POST['scoid'];
         ?>
             <br />
-            <script language="Javascript">
+            <script language="Javascript" type="text/javascript">
             <!--
                 function playSCO(scoid) {
                    document.navform.scoid.value=scoid;
@@ -101,8 +101,8 @@
                function expandCollide(which,list) {
                    var nn=document.ids?true:false
                    var w3c=document.getElementById?true:false
-                   var beg=nn?"document.ids.":w3c?"document.getElementById(":"document.all.";
-                   var mid=w3c?").style":".style";
+                   var beg=nn?"document.ids.":w3c?"document.getElementById('":"document.all.";
+                   var mid=w3c?"').style":".style";
        
                    if (eval(beg+list+mid+".display") != "none") {
                        which.src = "pix/plus.gif";
@@ -115,14 +115,12 @@
                }
             -->
             </script>
-            <style type="text/css">
-                .scormlist { list-style-type:none; }
-            </style>
         <?php
-            print_simple_box_start("CENTER");
+            $liststyle = "style=\"list-style-type:none;\"";
+            print_simple_box_start("center");
            echo "<table>\n";
            echo "  <tr><th>".get_string("coursestruct","scorm")."</th></tr>\n";
-           echo "  <tr><td nowrap=\"nowrap\">\n<ul class=\"scormlist\"'>\n";
+           echo "  <tr><td nowrap=\"nowrap\">\n<ul $liststyle>\n";
            $incomplete = false;
            if ($scoes = get_records_select("scorm_scoes","scorm='$scorm->id' AND organization='$currentorg' order by id ASC")){
                $level=0;
@@ -141,7 +139,7 @@
                                $i--;
                            }
                            if (($i == 0) && ($sco->parent != $currentorg)) {
-                               echo "  <li><ul id='".$sublist."' class=\"scormlist\"'>\n";
+                               echo "  <li><ul id='s".$sublist."' $liststyle>\n";
                                $level++;
                            } else {
                                echo $closelist;
@@ -154,22 +152,22 @@
                    $nextsco = next($scoes);
                    if (($nextsco !== false) && ($sco->parent != $nextsco->parent) && (($level==0) || (($level>0) && ($nextsco->parent == $sco->identifier)))) {
                        $sublist++;
-                       echo "      <img src=\"pix/minus.gif\" onClick='expandCollide(this,".$sublist.");' alt=\"\" />\n";
+                       echo "      <img src=\"pix/minus.gif\" onclick='expandCollide(this,\"s".$sublist."\");' alt=\"-\" title=\"".get_string('collide','scorm')."\" />\n";
                    } else {
-                       echo "      <img src=\"pix/spacer.gif\" alt=\"\" />\n";
+                       echo "      <img src=\"pix/spacer.gif\" alt=\" \" />\n";
                    }
                    
                    if ($sco->launch) {
                        $startbold = '';
                        $endbold = '';
                        if ($sco->id == $currentSCO) {
-                           $startbold = '-> <b>';
-                           $endbold = '</b> <-';
+                           $startbold = '-&gt; <b>';
+                           $endbold = '</b> &lt;-';
                        }
                        if (($currentSCO == "") && ($mode != "normal")) {
                            $currentSCO = $sco->id;
-                           $startbold = '-> <b>';
-                           $endbold = '</b> <-';
+                           $startbold = '-&gt; <b>';
+                           $endbold = '</b> &gt;-';
                        }
                        $score = "";
                        if ($sco_user=get_record("scorm_sco_users","scoid",$sco->id,"userid",$USER->id)) {
@@ -190,10 +188,10 @@
                            }
                        } else {
                            if ($sco->type == 'sco') {
-                               echo "      <img src=\"pix/notattempted.gif\" alt=\"".get_string("notattempted","scorm")."\" />";
+                               echo "      <img src=\"pix/notattempted.gif\" alt=\"".get_string("notattempted","scorm")."\" title=\"".get_string("notattempted","scorm")."\" />";
                                $incomplete = true;
                            } else {
-                               echo "      <img src=\"pix/asset.gif\" alt=\"".get_string("asset","scorm")."\" />";
+                               echo "      <img src=\"pix/asset.gif\" alt=\"".get_string("asset","scorm")."\" title=\"".get_string("asset","scorm")."\" />";
                            }
                        }
                        echo "      &nbsp;$startbold<a href=\"javascript:playSCO(".$sco->id.");\">$sco->title</a> $score$endbold\n    </li>\n";
@@ -214,11 +212,11 @@
        echo "<table width=\"100%\">\n    <tr>\n";
        echo "          <td align=\"center\" nowrap=\"nowrap\">
                     <iframe name=\"cmi\" width=\"1\" height=\"1\" src=\"cmi.php?id=$cm->id\" style=\"visibility: hidden\"></iframe>
-                    <form name=\"navform\" method=\"POST\" action=\"playscorm.php?id=$cm->id\" target=\"_top\">
+                    <form name=\"navform\" method=\"post\" action=\"playscorm.php?id=$cm->id\" target=\"_top\">
                        <input name=\"scoid\" type=\"hidden\" />
                        <input name=\"currentorg\" type=\"hidden\" value=\"$currentorg\" />
                        <input name=\"mode\" type=\"hidden\" value=\"".$mode."\" />
-                       <input name=\"prev\" type=\"button\" value=\"".get_string("prev","scorm")."\" onClick=\"top.changeSco('previous');\" />&nbsp;\n";
+                       <input name=\"prev\" type=\"button\" value=\"".get_string("prev","scorm")."\" onclick=\"top.changeSco('previous');\" />&nbsp;\n";
                        
        if ($scorm->popup == "") {
            $currentorg = '';
@@ -254,7 +252,7 @@
            }
            choose_from_menu($options, "courseStructure", "", "", "document.navform.scoid.value=document.navform.courseStructure.options[document.navform.courseStructure.selectedIndex].value;document.navform.submit();");
        }
-       echo "          &nbsp;<input name=\"next\" type=\"button\" value=\"".get_string("next","scorm")."\" onClick=\"top.changeSco('continue')\" />\n";
+       echo "          &nbsp;<input name=\"next\" type=\"button\" value=\"".get_string("next","scorm")."\" onclick=\"top.changeSco('continue')\" />\n";
        echo "       </form>
                </td>\n";
        

diff --git a/mod/scorm/scormAPI.php b/mod/scorm/scormAPI.php
index 4fe90af14df86e393e83778890dd10564ff8df3d..703eeedbc3d9debfb4a104f1e60a5bd1132c2a62 100755 (executable)
--- a/mod/scorm/scormAPI.php
+++ b/mod/scorm/scormAPI.php
@@ -191,7 +191,7 @@ function SCOInitialize() {
 
 function SCOFinish(){
     if (typeof API != "undefined") {
-       SaveTotalTime();
+       API.SaveTotalTime();
     }
 }
 

diff --git a/mod/scorm/view.php b/mod/scorm/view.php
index 7aa2d6bf8598f87653e0b5927116e230c201ecd2..6655be17f1c2b55e08e5bf885e6dc2f65ee100ca 100755 (executable)
--- a/mod/scorm/view.php
+++ b/mod/scorm/view.php
@@ -64,7 +64,7 @@
     //
     if (!$cm->visible and !isteacher($course->id)) {
         print_header($pagetitle, "$course->fullname", "$navigation $scorm->name", "", "", true, 
-                     update_module_button($cm->id, $course->id, $strscorm), navmenu($course, $cm));
+                    update_module_button($cm->id, $course->id, $strscorm), navmenu($course, $cm));
         notice(get_string("activityiscurrentlyhidden"));
     } else {
        print_header($pagetitle, "$course->fullname","$navigation <a target=\"{$CFG->framename}\" href=\"$ME?id=$cm->id\" title=\"$scorm->summary\">$scorm->name</a>",
@@ -81,7 +81,7 @@
 
        print_heading($scorm->name);
 
-       print_simple_box(text_to_html($scorm->summary), "CENTER");
+       print_simple_box(text_to_html($scorm->summary), "center");
 
        if (isguest()) {
             print_heading(get_string("guestsno", "scorm"));
@@ -89,8 +89,8 @@
             exit;
        }
         echo "<br />";
-        echo "<style type=\"text/css\">.scormlist { list-style-type:none; }</style>\n";
-        print_simple_box_start("CENTER");
+        $liststyle = "style=\"list-style-type:none;\"";
+        print_simple_box_start("center");
        echo "<table>\n";
        echo "  <tr><th>".get_string("coursestruct","scorm")."</th></tr>\n";
        $organization = $scorm->launch;
@@ -99,7 +99,7 @@
                if (isset($_POST['organization'])) {
                    $organization = $_POST['organization'];
                }
-               echo "<tr><td align='center'><form name='changeorg' method='POST' action='view.php?id=$cm->id'>".get_string('organizations','scorm').": \n";
+               echo "<tr><td align='center'><form name='changeorg' method='post' action='view.php?id=$cm->id'>".get_string('organizations','scorm').": \n";
                choose_from_menu($orgs, 'organization', "$organization", '','submit()');
                echo "</form></td></tr>\n"; 
            }
@@ -112,7 +112,7 @@
                $orgidentifier = $org->organization;
            }
        }
-       echo "  <tr><td nowrap=\"nowrap\">\n<ul class=\"scormlist\"'>\n";
+       echo "  <tr><td nowrap=\"nowrap\">\n<ul $liststyle>\n";
        $incomplete = false;
        if ($scoes = get_records_select("scorm_scoes","scorm='$scorm->id' AND organization='$orgidentifier' order by id ASC")){
            $level=0;
@@ -131,7 +131,7 @@
                            $i--;
                        }
                        if (($i == 0) && ($sco->parent != $orgidentifier)) {
-                           echo "  <li><ul id='".$sublist."' class=\"scormlist\"'>\n";
+                           echo "  <li><ul id='s".$sublist."' $liststyle>\n";
                            $level++;
                        } else {
                            echo $closelist;
@@ -145,9 +145,9 @@
                $nextsco = next($scoes);
                if (($nextsco !== false) && ($sco->parent != $nextsco->parent) && (($level==0) || (($level>0) && ($nextsco->parent == $sco->identifier)))) {
                    $sublist++;
-                   echo "      <img src=\"pix/minus.gif\" onClick='expandCollide(this,".$sublist.");' alt=\"\" />\n";
+                   echo "      <img src=\"pix/minus.gif\" onclick='expandCollide(this,\"s".$sublist."\");' alt=\"-\" title=\"".get_string('collide','scorm')."\" />\n";
                } else {
-                   echo "      <img src=\"pix/spacer.gif\" alt=\"\" />\n";
+                   echo "      <img src=\"pix/spacer.gif\" alt=\" \" />\n";
                }
                if ($sco->launch) {
                    $score = "";
@@ -164,10 +164,10 @@
                        }
                    } else {
                        if ($sco->type == 'sco') {
-                           echo "      <img src=\"pix/notattempted.gif\" alt=\"".get_string("notattempted","scorm")."\" />";
+                           echo "      <img src=\"pix/notattempted.gif\" alt=\"".get_string("notattempted","scorm")."\" title=\"".get_string("notattempted","scorm")."\" />";
                            $incomplete = true;
                        } else {
-                           echo "      <img src=\"pix/asset.gif\" alt=\"".get_string("asset","scorm")."\" />";
+                           echo "      <img src=\"pix/asset.gif\" alt=\"".get_string("asset","scorm")."\" title=\"".get_string("asset","scorm")."\" />";
                        }
                    }
                    echo "      &nbsp;<a href=\"javascript:playSCO(".$sco->id.")\">$sco->title</a> $score\n    </li>\n";
@@ -182,8 +182,8 @@
        echo "</ul></td></tr>\n";
        echo "</table>\n";
        print_simple_box_end();
-       echo "<form name=\"theform\" method=\"POST\" action=\"playscorm.php?id=$cm->id\">\n";
-       echo "<table align=\"CENTER\">\n<tr>\n<td align=\"center\">";
+       echo "<form name=\"theform\" method=\"post\" action=\"playscorm.php?id=$cm->id\">\n";
+       echo "<table align=\"center\">\n<tr>\n<td align=\"center\">";
        print_string("mode","scorm");
         echo ": <input type=\"radio\" id=\"b\" name=\"mode\" value=\"browse\" /><label for=\"b\">".get_string("browse","scorm")."</label>\n";
         if ($incomplete === true) {
@@ -197,7 +197,7 @@
        <input type="submit" value="'.get_string("entercourse","scorm").'" />';
         echo "\n</td>\n</tr>\n</table>\n</form><br />";
 ?>
-<script language="javascript">
+<script language="javascript" type="text/javascript">
 <!--
     function playSCO(scoid,status) {
        document.theform.scoid.value = scoid;
@@ -207,14 +207,18 @@
     function expandCollide(which,list) {
        var nn=document.ids?true:false
        var w3c=document.getElementById?true:false
-       var beg=nn?"document.ids.":w3c?"document.getElementById(":"document.all.";
-       var mid=w3c?").style":".style";
-       
+       var beg=nn?"document.ids.":w3c?"document.getElementById('":"document.all.";
+       var mid=w3c?"').style":".style";
+       
        if (eval(beg+list+mid+".display") != "none") {
            which.src = "pix/plus.gif";
+           which.alt = "+";
+           which.title = "<?php echo get_string('expand','scorm') ?>";
            eval(beg+list+mid+".display='none';");
        } else {
            which.src = "pix/minus.gif";
+           which.alt = "-";
+           which.title = "<?php echo get_string('collide','scorm') ?>";
            eval(beg+list+mid+".display='block';");
        }