From: gustav_delius Date: Sun, 12 Sep 2004 21:43:59 +0000 (+0000) Subject: towards XHTML compliance X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=9a58f7cb85059c9231ca1fa8d41e854468174fb2;p=moodle.git towards XHTML compliance --- diff --git a/admin/lang.php b/admin/lang.php index 80e8efe132..e7bec6dbcb 100644 --- a/admin/lang.php +++ b/admin/lang.php @@ -62,7 +62,7 @@ echo ""; print_heading("$strmissingstrings"); print_heading("$strcomparelanguage"); - echo "
"; + echo "
"; $options["lang"] = $currentlang; print_single_button("http://moodle.org/download/lang/", $options, get_string("latestlanguagepack")); echo "
"; diff --git a/course/format/social/format.php b/course/format/social/format.php index 72a8f1dc1a..bc4295e824 100644 --- a/course/format/social/format.php +++ b/course/format/social/format.php @@ -38,13 +38,13 @@ } else { $subtext = get_string("subscribe", "forum"); } - $headertext = "
". + $headertext = "". "
". get_string("socialheadline"). - "". + "". "id\">$subtext
"; print_heading_block($headertext); - echo "\"\"
"; + echo "\"\"
"; forum_print_latest_discussions($social->id, 10, "plain", "", false); diff --git a/course/format/topics/format.php b/course/format/topics/format.php index 2d154eadf1..6bf29d8f54 100644 --- a/course/format/topics/format.php +++ b/course/format/topics/format.php @@ -57,9 +57,9 @@ /// Layout the whole page as three big columns. - echo ""; + echo "
"; - echo "\n"; + echo "\n"; /// The left column ... @@ -82,13 +82,13 @@ $stractivityclipboard = strip_tags(get_string("activityclipboard", "", addslashes($USER->activitycopyname))); $strcancel= get_string("cancel"); echo ""; - echo ""; echo ""; - echo ""; + echo ""; } @@ -99,8 +99,8 @@ if ($thissection->summary or $thissection->sequence or isediting($course->id)) { echo ''; - echo ""; - echo ""; + echo ""; - echo ""; - echo ""; + echo ""; } @@ -183,8 +183,8 @@ } echo ""; - echo ""; if (!isteacher($course->id) and !$thissection->visible) { // Hidden for students @@ -198,8 +198,8 @@ echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions); if (isediting($course->id)) { - echo " id>". - "pixpath/t/edit.gif\" border=0 height=11 width=11>
"; + echo " id\">". + "pixpath/t/edit.gif\" border=\"0\" height=\"11\" width=\"11\">
"; } echo '
'; @@ -212,50 +212,50 @@ echo ""; } - echo ""; echo ""; - echo ""; + echo ""; } $section++; diff --git a/course/loglive.php b/course/loglive.php index cc8022ea19..8ef2304fca 100644 --- a/course/loglive.php +++ b/course/loglive.php @@ -20,7 +20,7 @@ $strupdatesevery = get_string("updatesevery", "moodle", COURSE_LIVELOG_REFRESH); print_header("$strlivelogs ($strupdatesevery)", "$strlivelogs", "", "", - ""); + ''); $user=0; $date=time() - 3600; diff --git a/course/quickreport.php b/course/quickreport.php index 19233a35a9..d68b186946 100644 --- a/course/quickreport.php +++ b/course/quickreport.php @@ -251,7 +251,7 @@ $modname_value = array_flip($modnames); //get the names of each module instance and put in header foreach($mod_info as $thiscat=>$thismod){ $modname = ucwords($modnames[$thismod[module]]); - print (""); + print (""); } echo "\n"; foreach ($user_contribs as $userid=>$thisuser){ diff --git a/files/index.php b/files/index.php index c5fde28ba2..d928a44cc8 100644 --- a/files/index.php +++ b/files/index.php @@ -68,7 +68,7 @@ " -> $fullnav", $formfield); } - echo "
cellcontent\" class=\"topicoutlineclip\" width=\"100%\">"; - echo "

"; + echo "

cellcontent\" class=\"topicoutlineclip\" width=\"100%\">"; + echo "

"; echo "$stractivityclipboard  ($strcancel)"; echo "

"; echo "
cellheading\" class=\"topicsoutlineside\" valign=top width=20> cellcontent\" class=\"topicsoutlinecontent\" width=\"100%\">"; + echo "cellheading\" class=\"topicsoutlineside\" valign=\"top\" width=\"20\"> cellcontent\" class=\"topicsoutlinecontent\" width=\"100%\">"; $summaryformatoptions->noclean = true; echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions); @@ -108,7 +108,7 @@ if (isediting($course->id)) { echo "id\">pixpath/t/edit.gif\" ". - " height=11 width=11 border=0 alt=\"$streditsummary\">
"; + " height=\"11\" width=\"11\" border=\"0\" alt=\"$streditsummary\">
"; } echo '
'; @@ -120,9 +120,9 @@ } echo "		cellheading\" class=\"topicsoutlineside\" valign=top align=center width=10>"; + echo "cellheading\" class=\"topicsoutlineside\" valign=\"top\" align=\"center\" width=\"10\">"; echo " 
"; - echo "

$section

"; + echo "		"; + echo "

$section

"; echo "		"; - echo ""; + echo ""; + echo ""; if ($displaysection == $section) { // Show the zoom boxes echo "id&topic=all\" title=\"$strshowalltopics\">". - "pixpath/i/all.gif\" height=25 width=16 border=0>
"; + "pixpath/i/all.gif\" height=\"25\" width=\"16\" border=\"0\">
"; } else { $strshowonlytopic = get_string("showonlytopic", "", $section); echo "id&topic=$section\" title=\"$strshowonlytopic\">". - "pixpath/i/one.gif\" height=16 width=16 border=0>
"; + "pixpath/i/one.gif\" height=\"16\" width=\"16\" border=\"0\">
"; } if (isediting($course->id)) { if ($course->marker == $section) { // Show the "light globe" on/off echo "id&marker=0\" title=\"$strmarkedthistopic\">". - "pixpath/i/marked.gif\" vspace=3 height=16 width=16 border=0>
"; + "pixpath/i/marked.gif\" vspace=\"3\" height=\"16\" width=\"16\" border=\"0\">
"; } else { echo "id&marker=$section\" title=\"$strmarkthistopic\">". - "pixpath/i/marker.gif\" vspace=3 height=16 width=16 border=0>
"; + "pixpath/i/marker.gif\" vspace=\"3\" height=\"16\" width=\"16\" border=\"0\">
"; } if ($thissection->visible) { // Show the hide/show eye echo "id&hide=$section\" title=\"$strtopichide\">". - "pixpath/i/hide.gif\" vspace=3 height=16 width=16 border=0>
"; + "pixpath/i/hide.gif\" vspace=\"3\" height=\"16\" width=\"16\" border=\"0\">
"; } else { echo "id&show=$section\" title=\"$strtopicshow\">". - "pixpath/i/show.gif\" vspace=3 height=16 width=16 border=0>
"; + "pixpath/i/show.gif\" vspace=\"3\" height=\"16\" width=\"16\" border=\"0\">
"; } if ($section > 1) { // Add a arrow to move section up echo "id§ion=$section&move=-1\" title=\"$strmoveup\">". - "pixpath/t/up.gif\" vspace=3 height=11 width=11 border=0>
"; + "pixpath/t/up.gif\" vspace=\"3\" height=\"11\" width=\"11\" border=\"0\">
"; } if ($section < $course->numsections) { // Add a arrow to move section down echo "id§ion=$section&move=1\" title=\"$strmovedown\">". - "pixpath/t/down.gif\" vspace=3 height=11 width=11 border=0>
"; + "pixpath/t/down.gif\" vspace=\"3\" height=\"11\" width=\"11\" border=\"0\">
"; } } echo "
$modname
$thismod[name]		 $modname
$thismod[name]
"; + echo "
"; echo ""; echo "\n"; + echo ""; + echo "\n"; } function displaydir ($wdir) { @@ -681,16 +681,16 @@ function displaydir ($wdir) { $strrestore= get_string("restore"); - echo ""; - echo "
"; - echo "
"; } @@ -139,25 +139,25 @@ $strmaxsize = get_string("maxsize", "", $filesize); $strcancel = get_string("cancel"); - echo "

$struploadafile ($strmaxsize) --> $wdir"; - echo "
"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo " "; - echo ""; - echo ""; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "
"; + echo "

$struploadafile ($strmaxsize) --> $wdir"; + echo "
"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo " "; + echo ""; + echo ""; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "
"; } html_footer(); break; @@ -168,7 +168,7 @@ foreach ($USER->filelist as $file) { $fullfile = $basedir.$file; if (! fulldelete($fullfile)) { - echo "
Error: Could not delete: $fullfile"; + echo "
Error: Could not delete: $fullfile"; } } clearfilelist(); @@ -178,7 +178,7 @@ } else { html_header($course, $wdir); if (setfilelist($_POST)) { - echo "

".get_string("deletecheckwarning").":

"; + echo "

".get_string("deletecheckwarning").":

"; print_simple_box_start("center"); printfilelist($USER->filelist); print_simple_box_end(); @@ -198,7 +198,7 @@ if ($count = setfilelist($_POST)) { $USER->fileop = $action; $USER->filesource = $wdir; - echo "

"; + echo "

"; print_string("selectednowmove", "moodle", $count); echo "

"; } @@ -214,7 +214,7 @@ $oldfile = $basedir.$file; $newfile = $basedir.$wdir."/".$shortfile; if (!rename($oldfile, $newfile)) { - echo "

Error: $shortfile not moved"; + echo "

Error: $shortfile not moved"; } } } @@ -239,24 +239,24 @@ $strcancel = get_string("cancel"); $strrenamefileto = get_string("renamefileto", "moodle", $file); html_header($course, $wdir, "form.name"); - echo "

$strrenamefileto:"; - echo "
"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "		"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "
"; + echo "

$strrenamefileto:"; + echo "
"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "		"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "
"; } html_footer(); break; @@ -277,23 +277,23 @@ $strcancel = get_string("cancel"); $strcreatefolder = get_string("createfolder", "moodle", $wdir); html_header($course, $wdir, "form.name"); - echo "

$strcreatefolder:"; - echo "
"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "		"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "
"; + echo "

$strcreatefolder:"; + echo "
"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "		"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "
"; } html_footer(); break; @@ -307,7 +307,7 @@ displaydir($wdir); } else { - $streditfile = get_string("edit", "", "$file"); + $streditfile = get_string("edit", "", "$file"); $fileptr = fopen($basedir.$file, "r"); $contents = fread($fileptr, filesize($basedir.$file)); fclose($fileptr); @@ -321,24 +321,24 @@ print_heading("$streditfile"); - echo "
"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; + echo "
"; + echo ""; + echo " "; + echo " "; + echo " "; + echo " "; print_textarea($usehtmleditor, 25, 80, 680, 400, "text", $contents); - echo "
"; - echo " "; - echo ""; - echo ""; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "
"; + echo "
"; + echo " "; + echo ""; + echo ""; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "
"; if ($usehtmleditor) { use_html_editor(); @@ -379,28 +379,28 @@ html_header($course, $wdir, "form.name"); if (setfilelist($_POST)) { - echo "

".get_string("youareabouttocreatezip").":

"; + echo "

".get_string("youareabouttocreatezip").":

"; print_simple_box_start("center"); printfilelist($USER->filelist); print_simple_box_end(); - echo "
"; - echo "

".get_string("whattocallzip"); - echo "
"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "		"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "
"; + echo "
"; + echo "

".get_string("whattocallzip"); + echo "
"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "		"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "
"; } else { displaydir($wdir); clearfilelist(); @@ -419,7 +419,7 @@ $strok = get_string("ok"); $strunpacking = get_string("unpacking", "", $file); - echo "

$strunpacking:

"; + echo "

$strunpacking:

"; $file = basename($file); @@ -429,11 +429,11 @@ if (!$list = $archive->extract("$basedir/$wdir")) { error($archive->errorInfo(true)); } else { // print some output - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; + echo "
$strname$strsize$strmodified$strstatus
"; + echo ""; + echo ""; + echo ""; + echo ""; foreach ($list as $item) { echo ""; $item['filename'] = str_replace("$basedir/$wdir/", "", $item['filename']); @@ -453,20 +453,20 @@ } else { // Use external unzip program print_simple_box_start("center"); - echo "
";
+                    echo "
";
                     $command = "cd $basedir/$wdir ; $CFG->unzip -o $file 2>&1";
                     passthru($command);
-                    echo "
";
+                    echo "
"; print_simple_box_end(); } - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo ""; - echo "
"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo ""; + echo "
"; } else { displaydir($wdir); } @@ -482,7 +482,7 @@ $strok = get_string("ok"); $strlistfiles = get_string("listfiles", "", $file); - echo "

$strlistfiles:

"; + echo "

$strlistfiles:

"; $file = basename($file); include_once("$CFG->libdir/pclzip/pclzip.lib.php"); @@ -491,8 +491,8 @@ notify($archive->errorInfo(true)); } else { - echo "
$strname$strsize$strmodified$strstatus
"; - echo ""; + echo "
$strname$strsize$strmodified
"; + echo ""; foreach ($list as $item) { echo ""; print_cell("left", $item['filename']); @@ -507,13 +507,13 @@ } echo "
$strname$strsize$strmodified
"; } - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "
"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "
"; } else { displaydir($wdir); } @@ -523,12 +523,12 @@ case "restore": html_header($course, $wdir); if (!empty($file)) { - echo "

".get_string("youaregoingtorestorefrom").":

"; + echo "

".get_string("youaregoingtorestorefrom").":

"; print_simple_box_start("center"); echo $file; print_simple_box_end(); echo "
"; - echo "

".get_string("areyousuretorestorethisinfo")."

"; + echo "

".get_string("areyousuretorestorethisinfo")."

"; $restore_path = "../backup/restore.php"; notice_yesno (get_string("areyousuretorestorethis"), $restore_path."?id=".$id."&file=".$id.$wdir."/".$file, @@ -614,7 +614,7 @@ function printfilelist($filelist) { foreach ($filelist as $file) { if (is_dir($basedir.$file)) { - echo "pixpath/f/folder.gif\" height=16 width=16> $file
"; + echo "pixpath/f/folder.gif\" height=\"16\" width=\"16\"> $file
"; $subfilelist = array(); $currdir = opendir($basedir.$file); while ($subfile = readdir($currdir)) { @@ -626,18 +626,18 @@ function printfilelist($filelist) { } else { $icon = mimeinfo("icon", $file); - echo "pixpath/f/$icon\" height=16 width=16> $file
"; + echo "pixpath/f/$icon\" height=\"16\" width=\"16\"> $file
"; } } } function print_cell($alignment="center", $text=" ") { - echo "		"; - echo ""; + echo ""; + echo ""; echo "$text"; - echo ""; - echo "
"; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo "\n"; + echo ""; + echo "
"; + echo "
$strname$strsize$strmodified$straction
"; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo "\n"; if ($wdir == "/") { $wdir = ""; @@ -710,15 +710,15 @@ function displaydir ($wdir) { $filesize = display_size(get_directory_size("$fullpath/$dir")); $filedate = userdate(filemtime($filename), "%d %b %Y, %I:%M %p"); - echo ""; + echo ""; - print_cell("center", ""); - print_cell("left", "pixpath/f/folder.gif\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"Folder\">".htmlspecialchars($dir).""); + print_cell("center", ""); + print_cell("left", "pixpath/f/folder.gif\" height=\"16\" width=\"16\" border=\"0\" alt=\"Folder\">".htmlspecialchars($dir).""); print_cell("right", "$filesize"); print_cell("right", $filedate); - print_cell("right", "$strrename"); + print_cell("right", "$strrename"); - echo ""; + echo ""; } } @@ -738,15 +738,15 @@ function displaydir ($wdir) { echo ""; - print_cell("center", ""); - echo ""; + echo ""; } } - echo "
$strname$strsize$strmodified$straction
"; + print_cell("center", ""); + echo ""; if ($CFG->slasharguments) { $ffurl = "/file.php/$id$fileurl"; } else { $ffurl = "/file.php?file=/$id$fileurl"; } link_to_popup_window ($ffurl, "display", - "pixpath/f/$icon\" HEIGHT=16 WIDTH=16 BORDER=0 ALT=\"File\">", + "pixpath/f/$icon\" height=\"16\" width=\"16\" border=\"0\" alt=\"File\">", 480, 640); echo ""; link_to_popup_window ($ffurl, "display", @@ -768,22 +768,22 @@ function displaydir ($wdir) { } else { $edittext = ""; } - print_cell("right", "$edittext $strrename"); + print_cell("right", "$edittext $strrename"); - echo "
"; - echo "
"; + echo "
"; + echo "
"; if (empty($wdir)) { $wdir = "/"; } - echo ""; - echo ""; + echo ""; + echo "
"; - echo ""; - echo " "; + echo ""; + echo ""; - echo ""; - echo "
"; + echo ""; + echo " "; $options = array ( "move" => "$strmovetoanotherfolder", "delete" => "$strdeletecompletely", @@ -793,34 +793,34 @@ function displaydir ($wdir) { choose_from_menu ($options, "action", "", "$strwithchosenfiles...", "javascript:document.dirform.submit()"); } - echo ""; - echo ""; + echo ""; + echo ""; if (!empty($USER->fileop) and ($USER->fileop == "move") and ($USER->filesource <> $wdir)) { - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; } - echo "		"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "		"; - echo "
"; - echo " "; - echo " "; - echo " "; - echo " "; - echo "
"; - echo "
"; - echo "
"; + echo "		"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "		"; + echo "
"; + echo " "; + echo " "; + echo " "; + echo " "; + echo "
"; + echo "
"; + echo "
"; } diff --git a/filter/algebra/algebradebug.php b/filter/algebra/algebradebug.php index b14062b138..ea2f2e15e7 100644 --- a/filter/algebra/algebradebug.php +++ b/filter/algebra/algebradebug.php @@ -170,14 +170,14 @@ function outputText($texexp) { function tex2image($texexp, $md5) { global $CFG; $error_message1 = "Your system is not configured to run mimeTeX. "; - $error_message1 .= "You need to download the appropriate
executable "; + $error_message1 .= "You need to download the appropriate
executable "; $error_message1 .= "from "; $error_message1 .= "http://moodle.org/download/mimetex/, or obtain the "; - $error_message1 .= "C source
from "; + $error_message1 .= "C source
from "; $error_message1 .= "http://www.forkosh.com/mimetex.zip, compile it and "; - $error_message1 .= "put the executable into your
moodle/filter/tex/ directory. "; - $error_message1 .= "You also need to edit your moodle/filter/algebra/pix.php file
"; - $error_message1 .= ' by adding the line
       case "' . PHP_OS . "\":\n";
+  $error_message1 .= "put the executable into your
 moodle/filter/tex/ directory. ";
+  $error_message1 .= "You also need to edit your moodle/filter/algebra/pix.php file
";
+  $error_message1 .= ' by adding the line
       case "' . PHP_OS . "\":\n";
   $error_message1 .= "           \$cmd = \"\\\\\"\$CFG->dirroot/\$CFG->texfilterdir/";
   $error_message1 .= 'mimetex.' . strtolower(PHP_OS) . "\\\\\" -e \\\\\"\$pathname\\\\\" \". escapeshellarg(\$texexp);";
   $error_message1 .= "
You also need to add this to your algebradebug.php file.";
@@ -236,28 +236,28 @@ function tex2image($texexp, $md5) {
            readfile("$pathname");
    } else {
            $ecmd = "$cmd 2>&1";
-           echo `$ecmd` . "
\n";
-           echo "The shell command
$cmd
returned status = $status
\n";
+           echo `$ecmd` . "
\n";
+           echo "The shell command
$cmd
returned status = $status
\n";
            if ($status == 4) {
-             echo "Status corresponds to illegal instruction
\n";
+             echo "Status corresponds to illegal instruction
\n";
            } else if ($status == 11) {
-             echo "Status corresponds to bus error
\n";
+             echo "Status corresponds to bus error
\n";
            } else if ($status == 22) {
-             echo "Status corresponds to abnormal termination
\n";
+             echo "Status corresponds to abnormal termination
\n";
            }
            if (file_exists($commandpath)) {
-              echo "File size of mimetex executable  $commandpath is " . filesize($commandpath) . "
";
-              echo "The file permissions are: " . decoct(fileperms($commandpath)) . "
";
+              echo "File size of mimetex executable  $commandpath is " . filesize($commandpath) . "
";
+              echo "The file permissions are: " . decoct(fileperms($commandpath)) . "
";
               if (function_exists("md5_file")) {
-                echo "The md5 checksum of the file is " . md5_file($commandpath) . "
";
+                echo "The md5 checksum of the file is " . md5_file($commandpath) . "
";
               } else {
                 $handle = fopen($commandpath,"rb");
                 $contents = fread($handle,16384);
                 fclose($handle);
-                echo "The md5 checksum of the first 16384 bytes is " . md5($contents) . "
";
+                echo "The md5 checksum of the first 16384 bytes is " . md5($contents) . "
";
               }
            } else {
-              echo "mimetex executable $commandpath not found!
";
+              echo "mimetex executable $commandpath not found!
";
            }
            echo "Image not found!";
    }
@@ -272,7 +272,7 @@ function tex2image($texexp, $md5) {
           

             

-             
             

            
    
@@ -287,13 +287,13 @@ function tex2image($texexp, $md5) {
            
  1. Finally click on this button 
                to show a graphic image of the algebraic expression.
    2. 
            

-          
 
 

+           
 

        

           
-       
 

-

+

+

Debugging Help

 diff --git a/filter/algebra/pix.php b/filter/algebra/pix.php index adf1a86a5e..21366d20ef 100644 --- a/filter/algebra/pix.php +++ b/filter/algebra/pix.php @@ -93,8 +93,8 @@ header("Content-type: $filetype"); readfile("$pathname"); } else { - echo "The shell command
$cmd
returned status = $status
\n"; - echo "Image not found!
"; + echo "The shell command
$cmd
returned status = $status
\n"; + echo "Image not found!
"; echo "Please try the wwwroot/filter/algebra/algebradebug.php\">debugging script"; } diff --git a/filter/mediaplugin/filter.php b/filter/mediaplugin/filter.php index 58a446b0d1..4cc74a6132 100644 --- a/filter/mediaplugin/filter.php +++ b/filter/mediaplugin/filter.php @@ -24,11 +24,11 @@ function mediaplugin_filter($courseid, $text) { $replace = '\\0 wwwroot/filter/mediaplugin/mp3player.swf?src=\\2.mp3\">"; - $replace .= ' '; - $replace .= ' '; + $replace .= " wwwroot/filter/mediaplugin/mp3player.swf?src=\\2.mp3\">"; + $replace .= ' '; + $replace .= ' '; $replace .= " wwwroot/filter/mediaplugin/mp3player.swf?src=\\2.mp3\" "; - $replace .= " quality=high bgcolor=\"#333333\" width=\"35\" height=\"18\" name=\"mp3player\" "; + $replace .= " quality=\"high\" bgcolor=\"#333333\" width=\"35\" height=\"18\" name=\"mp3player\" "; $replace .= ' type="application/x-shockwave-flash" '; $replace .= ' pluginspage="http://www.macromedia.com/go/getflashplayer">'; $replace .= ''; @@ -43,10 +43,10 @@ function mediaplugin_filter($courseid, $text) { $replace = '\\0

"; - $replace .= ' '; + $replace .= " "; + $replace .= ' '; $replace .= " "; - $replace .= ''; - $replace .= ''; - $replace .= ''; + $replace .= ''; + $replace .= ''; + $replace .= ''; $replace .= ''; $replace .= "\n"; - $replace .= ''; - $replace .= ''; - $replace .= ''; - $replace .= ''; - $replace .= ''; - $replace .= ''; - $replace .= ''; - $replace .= ''; - $replace .= ''; + $replace .= ''; + $replace .= ''; + $replace .= ''; + $replace .= ''; + $replace .= ''; + $replace .= ''; + $replace .= ''; + $replace .= ''; + $replace .= ''; $replace .= "\n$cmd
returned status = $status
\n"; - echo "Image not found!
"; + echo "The shell command
$cmd
returned status = $status
\n"; + echo "Image not found!
"; echo "Please try the wwwroot/$CFG->texfilterdir/texdebug.php\">debugging script"; } diff --git a/filter/tex/texdebug.php b/filter/tex/texdebug.php index a911932226..2a628caecd 100644 --- a/filter/tex/texdebug.php +++ b/filter/tex/texdebug.php @@ -74,14 +74,14 @@ function tex2image($texexp) { global $CFG; $error_message1 = "Your system is not configured to run mimeTeX. "; - $error_message1 .= "You need to download the appropriate
executable "; + $error_message1 .= "You need to download the appropriate
executable "; $error_message1 .= "from "; $error_message1 .= "http://moodle.org/download/mimetex/, or obtain the "; - $error_message1 .= "C source
from "; + $error_message1 .= "C source
from "; $error_message1 .= "http://www.forkosh.com/mimetex.zip, compile it and "; - $error_message1 .= "put the executable into your
moodle/filter/tex/ directory. "; - $error_message1 .= "You also need to edit your moodle/filter/tex/pix.php file
"; - $error_message1 .= ' by adding the line
       case "' . PHP_OS . "\":\n";
+        $error_message1 .= "put the executable into your
 moodle/filter/tex/ directory. ";
+        $error_message1 .= "You also need to edit your moodle/filter/tex/pix.php file
";
+        $error_message1 .= ' by adding the line
       case "' . PHP_OS . "\":\n";
         $error_message1 .= "           \$cmd = \"\\\\\"\$CFG->dirroot/\$CFG->texfilterdir/";
         $error_message1 .= 'mimetex.' . strtolower(PHP_OS) . "\\\\\" -e \\\\\"\$pathname\\\\\" \". escapeshellarg(\$texexp);";
         $error_message1 .= "
You also need to add this to your texdebug.php file.";
@@ -140,28 +140,28 @@
             readfile("$pathname");
         } else {
             $ecmd = "$cmd 2>&1";
-            echo `$ecmd` . "
\n";
-            echo "The shell command
$cmd
returned status = $status
\n";
+            echo `$ecmd` . "
\n";
+            echo "The shell command
$cmd
returned status = $status
\n";
             if ($status == 4) {
-                echo "Status corresponds to illegal instruction
\n";
+                echo "Status corresponds to illegal instruction
\n";
             } else if ($status == 11) {
-                echo "Status corresponds to bus error
\n";
+                echo "Status corresponds to bus error
\n";
             } else if ($status == 22) {
-                echo "Status corresponds to abnormal termination
\n";
+                echo "Status corresponds to abnormal termination
\n";
             }
             if (file_exists($commandpath)) {
-                echo "File size of mimetex executable  $commandpath is " . filesize($commandpath) . "
";
-                echo "The file permissions are: " . decoct(fileperms($commandpath)) . "
";
+                echo "File size of mimetex executable  $commandpath is " . filesize($commandpath) . "
";
+                echo "The file permissions are: " . decoct(fileperms($commandpath)) . "
";
                 if (function_exists("md5_file")) {
-                    echo "The md5 checksum of the file is " . md5_file($commandpath) . "
";
+                    echo "The md5 checksum of the file is " . md5_file($commandpath) . "
";
                 } else {
                     $handle = fopen($commandpath,"rb");
                     $contents = fread($handle,16384);
                     fclose($handle);
-                    echo "The md5 checksum of the first 16384 bytes is " . md5($contents) . "
";
+                    echo "The md5 checksum of the first 16384 bytes is " . md5($contents) . "
";
                 }
             } else {
-                echo "mimetex executable $commandpath not found!
";
+                echo "mimetex executable $commandpath not found!
";
             }
             echo "Image not found!";
         }
@@ -177,7 +177,7 @@
           

             

-             
             

            
    
@@ -188,13 +188,13 @@
            
  1. Finally click on this button 
                to show a graphic image of the algebraic expression.
    2. 
            

-          
 
 

+           
 

        

           
-       
 

-

+        

+

 
 
Debugging Help

 
diff --git a/filter/tex/texed.php b/filter/tex/texed.php
index 10d5b28b99..112aa330fb 100644
--- a/filter/tex/texed.php
+++ b/filter/tex/texed.php
@@ -64,13 +64,13 @@
        

           

-             
              
-          
 
 

+           
 

           
-       
 

+        

 
 
diff --git a/index.php b/index.php
index 7a1cc0b3dc..696181c5c0 100644
--- a/index.php
+++ b/index.php
@@ -52,7 +52,7 @@
     }
 
     print_header(strip_tags($site->fullname), "$site->fullname", "home", "",
-                 "summary))."\">",
+                 "summary))."\" />",
                  true, "", "$loginstring$langmenu");
 
     $editing = isediting($site->id);
diff --git a/lib/blocklib.php b/lib/blocklib.php
index 7ccef7916c..4954dda26f 100644
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -649,7 +649,7 @@ function upgrade_blocks_plugins($continueto) {
                 $db->debug = false;
                 if ($block->id = insert_record('blocks', $block)) {
                     notify(get_string('blocksuccess', '', $blocktitle), 'green');
-                    echo "
";
+                    echo "
";
                 } else {
                     error("$block->name block could not be added to the block list!");
                 }
diff --git a/lib/weblib.php b/lib/weblib.php
index 680a0ce6dd..fbf61f9860 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2075,7 +2075,7 @@ function navmenu($course, $cm=NULL, $targetwindow="self") {
     if ($selectmod and $isteacher) {
         $logslink = "framename\" href=".
                     "\"$CFG->wwwroot/course/log.php?chooselog=1&user=0&date=0&id=$course->id&modid=$selectmod->cm\">".
-                    "pixpath/i/log.gif\">";
+                    "pixpath/i/log.gif\" />";
 
     }
     if ($backmod) {
diff --git a/login/change_password.php b/login/change_password.php
index 8b93c58c8b..6ae790b62a 100644
--- a/login/change_password.php
+++ b/login/change_password.php
@@ -1,4 +1,4 @@
-id, "user", "change password", "view.php?id=$user->id&course=$course->id", "$user->id");
                 $fullname = fullname($USER, true);
                 print_header($strpasswordchanged, $strpasswordchanged,
-                             "wwwroot/course/view.php?id=$course->id\">$course->shortname ->
-                              wwwroot/user/index.php?id=$course->id\">".get_string("participants")." ->
-                              wwwroot/user/view.php?id=$USER->id&course=$course->id\">$fullname -> $strpasswordchanged", $focus);
+                             "wwwroot/course/view.php?id=$course->id\">$course->shortname ->
+                              wwwroot/user/index.php?id=$course->id\">".get_string("participants")." ->
+                              wwwroot/user/view.php?id=$USER->id&course=$course->id\">$fullname -> $strpasswordchanged", $focus);
                 notice($strpasswordchanged, "$CFG->wwwroot/user/view.php?id=$USER->id&course=$id");
             } else {
                 add_to_log(SITEID, "user", "change password", "view.php?id=$user->id&course=".SITEID, "$course->id");
@@ -83,9 +83,9 @@
     if (!empty($course->id)) {
         $fullname = fullname($USER, true);
         print_header($strchangepassword, $strchangepassword,
-                     "wwwroot/course/view.php?id=$course->id\">$course->shortname ->
-                      wwwroot/user/index.php?id=$course->id\">".get_string("participants")." ->
-                      wwwroot/user/view.php?id=$USER->id&course=$course->id\">$fullname -> $strchangepassword", $focus);
+                     "wwwroot/course/view.php?id=$course->id\">$course->shortname ->
+                      wwwroot/user/index.php?id=$course->id\">".get_string("participants")." ->
+                      wwwroot/user/view.php?id=$USER->id&course=$course->id\">$fullname -> $strchangepassword", $focus);
     } else {
         print_header($strchangepassword, $strchangepassword, $strchangepassword, $focus);
     }
diff --git a/login/confirm.php b/login/confirm.php
index b3461cec9d..34478371a5 100644
--- a/login/confirm.php
+++ b/login/confirm.php
@@ -1,4 +1,4 @@
-auth/lib.php");
@@ -11,9 +11,9 @@
 
             if ($user->confirmed) {
                 print_header(get_string("alreadyconfirmed"), get_string("alreadyconfirmed"), "", "");
-                echo "
".get_string("thanks").", ". $user->firstname ." ". $user->lastname . "
\n";
-                echo "
".get_string("alreadyconfirmed")."
\n";
-                echo "
 -> wwwroot/course/\">".get_string("courses")."
\n";
+                echo "
".get_string("thanks").", ". $user->firstname ." ". $user->lastname . "
\n";
+                echo "
".get_string("alreadyconfirmed")."
\n";
+                echo "
 -> wwwroot/course/\">".get_string("courses")."
\n";
                 print_footer();
                 exit;
             }
@@ -50,9 +50,9 @@
                 }
  
                 print_header(get_string("confirmed"), get_string("confirmed"), "", "");
-                echo "
".get_string("thanks").", ". $USER->firstname ." ". $USER->lastname . "
\n";
-                echo "
".get_string("confirmed")."
\n";
-                echo "
 -> wwwroot/course/\">".get_string("courses")."
\n";
+                echo "
".get_string("thanks").", ". $USER->firstname ." ". $USER->lastname . "
\n";
+                echo "
".get_string("confirmed")."
\n";
+                echo "
 -> wwwroot/course/\">".get_string("courses")."
\n";
                 print_footer();
                 exit;
 
diff --git a/login/forgot_password.php b/login/forgot_password.php
index d83341a6d1..1cc8245dac 100644
--- a/login/forgot_password.php
+++ b/login/forgot_password.php
@@ -1,4 +1,4 @@
-wwwroot/login/index.php\">".get_string("login")." -> ".get_string("senddetails"), 
+                 "wwwroot/login/index.php\">".get_string("login")." -> ".get_string("senddetails"), 
                  "form.email");
 	include("forgot_password_form.html");
     print_footer();
diff --git a/login/index.php b/login/index.php
index 3a85746125..625e8e7762 100644
--- a/login/index.php
+++ b/login/index.php
@@ -1,4 +1,4 @@
-fullname: $loginsite", "$site->fullname", $loginsite, $focus, "", true, "
$langmenu
"); 
+    print_header("$site->fullname: $loginsite", "$site->fullname", $loginsite, $focus, "", true, "
$langmenu
"); 
     include("index_form.html");
     print_footer();
 
diff --git a/login/logout.php b/login/logout.php
index ec50a1ab0c..256840ff24 100644
--- a/login/logout.php
+++ b/login/logout.php
@@ -1,4 +1,4 @@
-auth/lib.php");
@@ -70,7 +70,7 @@
         $langmenu = popup_form ("$CFG->wwwroot/login/signup.php?lang=", $langs, "chooselang", $currlang, "", "", "", true);
     }
 
-    print_header($newaccount, $newaccount, "$login -> $newaccount", $focus, "", true, "
$langmenu
");
+    print_header($newaccount, $newaccount, "$login -> $newaccount", $focus, "", true, "
$langmenu
");
     include("signup_form.html");
     print_footer();
 
@@ -126,7 +126,7 @@ function validate_form($user, &$err) {
         $err->email = get_string("invalidemail");
     
     } else if (record_exists("user", "email", $user->email)) {
-        $err->email = get_string("emailexists")." ".get_string("newpassword")."?";
+        $err->email = get_string("emailexists")." ".get_string("newpassword")."?";
     }
     
 
diff --git a/login/signup_form.html b/login/signup_form.html
index 14cd3f1fdc..2859ddf594 100644
--- a/login/signup_form.html
+++ b/login/signup_form.html
@@ -1,96 +1,192 @@
-username)) {
-       $user->username = "";
-   }
-   if (empty($user->password)) {
-       $user->password = "";
-   }
-   if (empty($user->email)) {
-       $user->email = "";
-   }
-   if (empty($user->email2)) {
-       $user->email2 = "";
-   }
-   if (empty($user->firstname)) {
-       $user->firstname = "";
-   }
-   if (empty($user->lastname)) {
-       $user->lastname = "";
-   }
-   if (empty($user->city)) {
-       $user->city = "";
-   }
-   if (empty($user->country)) {
-       $user->country = "";
-   }
-
-?>
-
 
 
-
-

-
-
-	
-
-
-	
-	
-
-
-	
-	
-
-
-	
-            
-
-	
-	
-
-
-	
-	
-
-
-	
-	
-
-
-	
-	
-
-
-	
-	
-
-
-	
-	
-
-
-	
-	
-
-
:
:

-	username)) { formerr($err->username); } ?>
-	
:

-	password)) { formerr($err->password); } ?>
-	


-                  :

-                  ()

-              
:

-	email)) { formerr($err->email); } ?>
-	
:

-	email2)) { formerr($err->email2); } ?>
-	
:

-	firstname)) { formerr($err->firstname);} ?>
-	
:

-	lastname)) { formerr($err->lastname);} ?>
-	
:

-	city)) { formerr($err->city);} ?>
-	
:
country, get_string("selectacountry"), "", "") ?>
-	country)) { formerr($err->country);} ?>
-	
" />

-

-
-

+username)) {
+
+       $user->username = "";
+
+   }
+
+   if (empty($user->password)) {
+
+       $user->password = "";
+
+   }
+
+   if (empty($user->email)) {
+
+       $user->email = "";
+
+   }
+
+   if (empty($user->email2)) {
+
+       $user->email2 = "";
+
+   }
+
+   if (empty($user->firstname)) {
+
+       $user->firstname = "";
+
+   }
+
+   if (empty($user->lastname)) {
+
+       $user->lastname = "";
+
+   }
+
+   if (empty($user->city)) {
+
+       $user->city = "";
+
+   }
+
+   if (empty($user->country)) {
+
+       $user->country = "";
+
+   }
+
+
+
+?>
+
+
 
 
+
+
+
+

+
+
+
+
+
+	
+
+
+
+
+
+	
+
+	
+
+
+
+
+
+	
+
+	
+
+
+
+
+
+	
+
+            
+
+
+
+	
+
+	
+
+
+
+
+
+	
+
+	
+
+
+
+
+
+	
+
+	
+
+
+
+
+
+	
+
+	
+
+
+
+
+
+	
+
+	
+
+
+
+
+
+	
+
+	
+
+
+
+
+
+	
+
+	
+
+
+
+
:
:

+
+	username)) { formerr($err->username); } ?>
+
+	
:

+
+	password)) { formerr($err->password); } ?>
+
+	


+
+                  :

+
+                  ()

+
+              
:

+
+	email)) { formerr($err->email); } ?>
+
+	
:

+
+	email2)) { formerr($err->email2); } ?>
+
+	
:

+
+	firstname)) { formerr($err->firstname);} ?>
+
+	
:

+
+	lastname)) { formerr($err->lastname);} ?>
+
+	
:

+
+	city)) { formerr($err->city);} ?>
+
+	
:
country, get_string("selectacountry"), "", "") ?>
+
+	country)) { formerr($err->country);} ?>
+
+	
" />

+
+

+
+
+
+

+
diff --git a/mod/assignment/backuplib.php b/mod/assignment/backuplib.php
index eced064756..9a9b9df462 100644
--- a/mod/assignment/backuplib.php
+++ b/mod/assignment/backuplib.php
@@ -1,4 +1,4 @@
-dirroot/files/mimetypes.php");
 
@@ -534,7 +534,7 @@ function assignment_get_submission($assignment, $user) {
 function assignment_print_difference($time) {
     if ($time < 0) {
         $timetext = get_string("late", "assignment", format_time($time));
-        return " ($timetext)";
+        return " ($timetext)";
     } else {
         $timetext = get_string("early", "assignment", format_time($time));
         return " ($timetext)";
@@ -544,45 +544,45 @@ function assignment_print_difference($time) {
 function assignment_print_submission($assignment, $user, $submission, $teachers, $grades) {
     global $THEME, $USER;
 
-    echo "\n";
+    echo "\n
";
 
-    echo "\n";
+    echo "\n";
     if ($assignment->type == OFFLINE) {
-        echo "\n";
-    echo "";
+    echo "";
+    echo "";
 
     if ($assignment->type != OFFLINE) {
-        echo "\n";
+        echo "";
     }
 
-    echo "\n";
-    echo "";
+    echo "";
+    echo "
";
+    echo "";
    
-    echo "
body\" WIDTH=35 VALIGN=TOP>";
+        echo "\nbody\" WIDTH=35 VALIGN=TOP>";
     } else {
-        echo "\nbody\" WIDTH=35 VALIGN=TOP>";
+        echo "\nbody\" WIDTH=35 VALIGN=TOP>";
     }
     print_user_picture($user->id, $assignment->course, $user->picture);
-    echo "cellheading\">".fullname($user, true);
+    echo "cellheading\">".fullname($user, true);
     if ($assignment->type != OFFLINE and $submission->timemodified) {
-        echo "  ".get_string("lastmodified").": ";
+        echo "  ".get_string("lastmodified").": ";
         echo userdate($submission->timemodified);
         echo assignment_print_difference($assignment->timedue - $submission->timemodified);
-        echo "";
+        echo "";
     }
-    echo "
cellcontent\">";
+        echo "\n
cellcontent\">";
         if ($submission->timemodified) {
             assignment_print_user_files($assignment, $user);
         } else {
             print_string("notsubmittedyet", "assignment");
         }
-        echo "
";
+    echo "\n
";
     if (!$submission->teacher) {
         $submission->teacher = $USER->id;
     }
     print_user_picture($submission->teacher, $assignment->course, $teachers[$submission->teacher]->picture);
     if ($submission->timemodified > $submission->timemarked) {
-        echo "cellheading2\">";
+        echo "cellheading2\">";
     } else {
-        echo "cellheading\">";
+        echo "cellheading\">";
     }
     if (!$submission->grade and !$submission->timemarked) {
         $submission->grade = -1;   /// Hack to stop zero being selected on the menu below (so it shows 'no grade')
@@ -590,14 +590,14 @@ function assignment_print_submission($assignment, $user, $submission, $teachers,
     echo get_string("feedback", "assignment").":";
     choose_from_menu($grades, "g$submission->id", $submission->grade, get_string("nograde"));
     if ($submission->timemarked) {
-        echo "  ".userdate($submission->timemarked)."";
+        echo "  ".userdate($submission->timemarked)."";
     }
-    echo "

";
-    echo "

\n";
+    echo "
\n";
 }
 
 function assignment_print_feedback($course, $submission, $assignment) {
@@ -607,20 +607,20 @@ function assignment_print_feedback($course, $submission, $assignment) {
         error("Weird assignment error");
     }
 
-    echo "\n
";
-    echo "\n";
+    echo "\n
";
+    echo "\n";
 
-    echo "\n";
-    echo "\n";
+    echo "\n";
-    echo "";
+    echo "";
+    echo "";
 
-    echo "\n
body\" WIDTH=35 VALIGN=TOP>";
+    echo "\n
body\" width=35 valign=TOP>";
     print_user_picture($teacher->id, $course->id, $teacher->picture);
-    echo "cellheading\">".fullname($teacher);
-    echo "  ".userdate($submission->timemarked)."";
-    echo "
cellheading\">".fullname($teacher);
+    echo "  ".userdate($submission->timemarked)."";
+    echo "
cellcontent\">";
+    echo "\n
cellcontent\">";
 
-    echo "
";
+    echo "
";
     if ($assignment->grade) {
         if ($submission->grade or $submission->timemarked) {
             echo get_string("grade").": $submission->grade";
@@ -628,11 +628,11 @@ function assignment_print_feedback($course, $submission, $assignment) {
             echo get_string("nograde");
         }
     }
-    echo "
";
+    echo "
";
 
     echo text_to_html($submission->comment);
-    echo "
";
-    echo "
";
+    echo "
";
+    echo "";
 }
 
 
@@ -680,14 +680,14 @@ function assignment_delete_user_files($assignment, $user, $exception) {
 function assignment_print_upload_form($assignment) {
 // Arguments are objects
 
-    echo "
";
-    echo "
id\">";
-    echo " maxbytes\" />";
-    echo " id\" />";
-    echo " ";
-    echo " ";
-    echo "
";
-    echo "
";
+    echo "
";
+    echo "
id\">";
+    echo " maxbytes\" />";
+    echo " id\" />";
+    echo " ";
+    echo " ";
+    echo "
";
+    echo "
";
 }
 
 function assignment_get_recent_mod_activity(&$activities, &$index, $sincetime, $courseid, $assignment="0", $user="", $groupid="")  {
@@ -780,7 +780,7 @@ function assignment_print_recent_mod_activity($activity, $course, $detail=false)
         if ($activity->content->type == UPLOADSINGLE) {
             $file = assignment_get_user_file($assignment, $user);
             echo "pixpath/f/$file->icon\" height=16 width=16 border=0 alt=\"file\">";
-            echo " wwwroot/$file->url\">$file->name";
+            echo " wwwroot/$file->url\">$file->name";
         }
         echo "
";
     }
diff --git a/mod/assignment/restorelib.php b/mod/assignment/restorelib.php
index 2956885eae..ebbaa968de 100644
--- a/mod/assignment/restorelib.php
+++ b/mod/assignment/restorelib.php
@@ -1,4 +1,4 @@
-name : $strupload", "",
-                 "id>$strassignments -> 
-                  id\">$assignment->name -> $strupload", 
+                 "id>$strassignments -> 
+                  id\">$assignment->name -> $strupload", 
                   "", "", true);
 
     if ($submission = get_record("assignment_submissions", "assignment", $assignment->id, "userid", $USER->id)) {
diff --git a/mod/assignment/version.php b/mod/assignment/version.php
index fa67847064..c0e8b819c7 100644
--- a/mod/assignment/version.php
+++ b/mod/assignment/version.php
@@ -1,4 +1,4 @@
-name, "",
-                 "id>$strassignments -> $assignment->name", 
+                 "id>$strassignments -> $assignment->name", 
                   "", "", true, update_module_button($cm->id, $course->id, $strassignment), navmenu($course, $cm));
 
     if (isteacher($course->id)) {
diff --git a/mod/attendance/add.php b/mod/attendance/add.php
index c9f982659b..8ed49418c2 100644
--- a/mod/attendance/add.php
+++ b/mod/attendance/add.php
@@ -132,8 +132,8 @@ if (isset($_POST["course"]))  {
 
     if ($course->category) {
         print_header("$course->shortname: $streditinga", "$course->fullname",
-                     "wwwroot/course/view.php?id=$course->id\">$course->shortname -> 
-                      wwwroot/mod/$module->name/index.php?id=$course->id\">$strmodulenameplural -> 
+                     "wwwroot/course/view.php?id=$course->id\">$course->shortname -> 
+                      wwwroot/mod/$module->name/index.php?id=$course->id\">$strmodulenameplural -> 
                       $streditinga", "form.name", "", false);
     } else {
         print_header("$course->shortname: $streditinga", "$course->fullname",
@@ -164,24 +164,24 @@ $form->maxgrade = isset($CFG->attendance_maxgrade)?$CFG->attendance_maxgrade:0;
 $form->hours = isset($CFG->attendance_default_hours)?$CFG->attendance_default_hours:1;
 
 ?>
-

-

-" />
-" />
-
-
-
-    
-    
-
-
-    
-    
-
-
-
-    
-    
:
startdate) ?>
:
enddate) ?>
:

+
+

+" />
+" />
+
+
+
+    
+    
+
+
+    
+    
+
+
+
+    
+    
-
+    
+
-    
-    
+    
+
-    
-    
+    
+    
-
-    
-    
+    
+    
-    
-    
+    
+    
-
-    
-    
+    
+    
 
 
-
:
startdate) ?>
:
enddate) ?>
:

     
     
     
@@ -197,12 +197,12 @@ $form->hours = isset($CFG->attendance_default_hours)?$CFG->attendance_default_ho
     
     
 
-    

 
 
:

+    
:

 hours = isset($CFG->attendance_default_hours)?$CFG->attendance_default_ho
         helpbutton("dynsection", get_string("dynamicsectionmulti","attendance"), "attendance");
 ?>
 
-
 

 
:

+    
:

 hours = isset($CFG->attendance_default_hours)?$CFG->attendance_default_ho
 
 
 
-    
 

 
:
hours, "1","","1") ?>
+
:
hours, "1","","1") ?>
 
 
 

 
 
:

+    
:

 
 ?>
 
 
-    
 

 
:
maxgrade, "0","","0"); 
+
:
maxgrade, "0","","0"); 
    helpbutton("maxgrade", get_string("maxgradevalue","attendance"), "attendance");
 ?>
 

+

 
-
-
-
-
-
-
-
-
-

-" />
-" />
-

-

+
+
+
+
+
+
+
+
+

+" />
+" />
+

+
 
 prefix}attendance` ADD `edited` TINYINT( 1 ) DEFAULT '0' NOT NULL;");
-		execute_sql("UPDATE `{$CFG->prefix}attendance` set `edited` = 1;");
-    }
-    if ($oldversion < 2003092500) {
-        execute_sql("ALTER TABLE `{$CFG->prefix}attendance` ADD `autoattend` TINYINT( 1 ) DEFAULT '0' NOT NULL;");
-    }
-
-    if ($oldversion < 2004050301) {
-        modify_database("", "INSERT INTO {$CFG->prefix}log_display VALUES ('attendance', 'view', 'attendance', 'name');");
-        modify_database("", "INSERT INTO {$CFG->prefix}log_display VALUES ('attendance', 'viewall', 'attendance', 'name');");
-        modify_database("", "INSERT INTO {$CFG->prefix}log_display VALUES ('attendance', 'viewweek', 'attendance', 'name');");
-    }
-
-
-
-    return true;
-}
-
-?>
+prefix}attendance` ADD `edited` TINYINT( 1 ) DEFAULT '0' NOT NULL;");
+
+		execute_sql("UPDATE `{$CFG->prefix}attendance` set `edited` = 1;");
+
+    }
+
+    if ($oldversion < 2003092500) {
+
+        execute_sql("ALTER TABLE `{$CFG->prefix}attendance` ADD `autoattend` TINYINT( 1 ) DEFAULT '0' NOT NULL;");
+
+    }
+
+
+
+    if ($oldversion < 2004050301) {
+
+        modify_database("", "INSERT INTO {$CFG->prefix}log_display VALUES ('attendance', 'view', 'attendance', 'name');");
+
+        modify_database("", "INSERT INTO {$CFG->prefix}log_display VALUES ('attendance', 'viewall', 'attendance', 'name');");
+
+        modify_database("", "INSERT INTO {$CFG->prefix}log_display VALUES ('attendance', 'viewweek', 'attendance', 'name');");
+
+    }
+
+
+
+
+
+
+
+    return true;
+
+}
+
+
+
+?>
+
diff --git a/mod/attendance/db/oci8po.php b/mod/attendance/db/oci8po.php
index 8d14e8e899..451707bdbd 100755
--- a/mod/attendance/db/oci8po.php
+++ b/mod/attendance/db/oci8po.php
@@ -1,11 +1,22 @@
-
+
+
diff --git a/mod/attendance/index.php b/mod/attendance/index.php
index 7922744f01..eacdeeb725 100644
--- a/mod/attendance/index.php
+++ b/mod/attendance/index.php
@@ -1,4 +1,4 @@
-visible) {
             //Show dimmed if the mod is hidden
-            $link = "coursemodule\">$attendance->name";
+            $link = "coursemodule\">$attendance->name";
         } else {
             //Show normal if the mod is visible
-            $link = "coursemodule\">$attendance->name";
+            $link = "coursemodule\">$attendance->name";
         }
 
         if ($course->format == "weeks" or $course->format == "topics") {
@@ -69,7 +69,7 @@
         }
     }
 
-    echo "
";
+    echo "
";
 
     print_table($table);
 
diff --git a/mod/attendance/lib.php b/mod/attendance/lib.php
index da704bef82..1ed9c07177 100755
--- a/mod/attendance/lib.php
+++ b/mod/attendance/lib.php
@@ -1,4 +1,4 @@
-category) {
         print_header("$course->shortname: $streditinga", "$course->fullname",
-                     "wwwroot/course/view.php?id=$course->id\">$course->shortname -> 
-                      wwwroot/mod/$module->name/index.php?id=$course->id\">$strmodulenameplural -> 
+                     "wwwroot/course/view.php?id=$course->id\">$course->shortname -> 
+                      wwwroot/mod/$module->name/index.php?id=$course->id\">$strmodulenameplural -> 
                       $streditinga", $focuscursor, "", false);
     } else {
         print_header("$course->shortname: $streditinga", "$course->fullname",
@@ -109,10 +109,10 @@ if (empty($form->id)) {
  	$form->notes = "";
 }
     ?>
-
wwwroot/course/mod.php"; ?>">
-

-" />
-" />
+wwwroot/course/mod.php"; ?>">
+

+" />
+" />
 
 hours >1) {
 } // if ($form->id)
 ?>
 
-
-
-
-
-
-
-
-

+
+
+
+
+
+
+
+

 course . "§ion=".$form->section ."\">Add multiple rolls

";
 ?>
-" />
-" />
-

-
+" />
+" />
+

+
 
 
 
diff --git a/mod/attendance/version.php b/mod/attendance/version.php
index c9038f4a6c..8b87c48a3d 100644
--- a/mod/attendance/version.php
+++ b/mod/attendance/version.php
@@ -1,4 +1,4 @@
-name, "",
-                 "id>$strattendances -> $attendance->name", 
+                 "id>$strattendances -> $attendance->name", 
                   "", "", true, update_module_button($cm->id, $course->id, $strattendance), 
                   navmenu($course, $cm));
 
diff --git a/mod/attendance/viewall.php b/mod/attendance/viewall.php
index bba4108817..d2a2025a90 100644
--- a/mod/attendance/viewall.php
+++ b/mod/attendance/viewall.php
@@ -437,8 +437,8 @@ if ($onepage) {$page++; echo "
 
\n"; }
   if (!$onepage) { attendance_print_pagenav(); }
 
 
-  echo "
";
-  echo "
";
+  echo "
";
+  echo "
";
   if (($numhours-4) > 255) {
     echo "
 
\n"; }
     $options["dlsub"] = "all";  
     print_single_button("viewall.php", $options, get_string("downloadexcelfull", "attendance"));
   }
-  echo "
";
+  echo "";
   $options["id"] = "$course->id";
   $options["download"] = "xls";
   $options["dlsub"] = "totals";  
   print_single_button("viewall.php", $options, get_string("downloadexceltotals", "attendance"));
-  echo "";
+  echo "";
   $options["download"] = "txt";
   $options["dlsub"] = "all";  
   print_single_button("viewall.php", $options, get_string("downloadtextfull", "attendance"));
-  echo "";
+  echo "";
   $options["dlsub"] = "totals";  
   print_single_button("viewall.php", $options, get_string("downloadtexttotals", "attendance"));
-  echo "
";
+  echo "
";
 
   
 } else { error("There are no attendance rolls in this course.");} // for no attendance rolls  
@@ -479,7 +479,7 @@ function attendance_print_header() {
     $strattendance  = get_string("modulename", "attendance");
     $strallattendance  = get_string("allmodulename", "attendance");
     print_header_simple("$strallattendance", "",
-                 "id>$strattendances -> $strallattendance", 
+                 "id>$strattendances -> $strallattendance", 
                   "", "", true, " ", 
                   navmenu($course, $cm));
 }
diff --git a/mod/attendance/viewweek.php b/mod/attendance/viewweek.php
index 798e8d82a3..e5880a3837 100644
--- a/mod/attendance/viewweek.php
+++ b/mod/attendance/viewweek.php
@@ -444,8 +444,8 @@ if ($onepage) {$page++; echo "
 
\n"; }
   if (!$onepage) { attendance_print_pagenav(); }
 
 
-  echo "
";
-  echo "
";
+  echo "
";
+  echo "
";
   if (($numhours-4) > 255) {
     echo " 
\n"; }
     $options["dlsub"] = "all";  
     print_single_button("viewweek.php", $options, get_string("downloadexcelfull", "attendance"));
   }
-  echo "		";
+  echo "";
   $options["id"] = "$id";
   $options["download"] = "xls";
   $options["dlsub"] = "totals";  
   print_single_button("viewweek.php", $options, get_string("downloadexceltotals", "attendance"));
-  echo "";
+  echo "";
   $options["download"] = "txt";
   $options["dlsub"] = "all";  
   print_single_button("viewweek.php", $options, get_string("downloadtextfull", "attendance"));
-  echo "";
+  echo "";
   $options["dlsub"] = "totals";  
   print_single_button("viewweek.php", $options, get_string("downloadtexttotals", "attendance"));
-  echo "
";
+  echo "
";
 
 
 
@@ -521,7 +521,7 @@ function attendance_print_header()  {
     $strattendance  = get_string("modulename", "attendance");
     $strweekattendance  = get_string("weekmodulename", "attendance");
     print_header_simple("$strallattendance", "",
-                 "id>$strattendances -> $strweekattendance", 
+                 "id>$strattendances -> $strweekattendance", 
                   "", "", true, " ", 
                   navmenu($course, $cm));
 }
diff --git a/mod/dialogue/backuplib.php b/mod/dialogue/backuplib.php
index 9b5798a0da..40bdbf8136 100644
--- a/mod/dialogue/backuplib.php
+++ b/mod/dialogue/backuplib.php
@@ -1,4 +1,4 @@
- 0, 7 => 7, 14 => 14, 30 => 30, 150 => 150, 365 => 365 );
 
diff --git a/mod/dialogue/locallib.php b/mod/dialogue/locallib.php
index 1c90021202..bcc84cfc61 100644
--- a/mod/dialogue/locallib.php
+++ b/mod/dialogue/locallib.php
@@ -1,4 +1,4 @@
-category) {
-        $navigation = "id\">$course->shortname ->";
+        $navigation = "id\">$course->shortname ->";
     }
 
     $strworkshops = get_string("modulenameplural", "workshop");
@@ -58,8 +58,8 @@
 
     // ... print the header and...
     print_header_simple("$workshop->name", "",
-                 "id>$strworkshops -> 
-                  id\">$workshop->name -> $strassessments", 
+                 "id>$strworkshops -> 
+                  id\">$workshop->name -> $strassessments", 
                   "", "", true);
 
 	//...get the action 
@@ -79,28 +79,28 @@
 			error("Submission not found");
 			}
 		?>
-		
-		
-		
-		
-		

-		
-		
+		
+		
+		
+		

+		

+		\n";
+		echo "\n";
 
-		echo "	\n";
+		echo "	\n";
 
-		echo "	
". get_string("comment", "workshop").":
". get_string("comment", "workshop").":
\n";
+		echo "	\n";
 
 		echo "		\n";
 
-		echo "	
\n";
-		echo "\n";
-		echo "
\n";
-		echo "
".get_string("assessment", "workshop"). "
\n";
+		echo "	\n";
+		echo "\n";
+		echo "
\n";
+		echo "
".get_string("assessment", "workshop"). "
\n";
 		workshop_print_assessment($workshop, $assessment);
 		}
 
@@ -183,7 +183,7 @@
 			}
 		//save time of agreement
 		set_field("workshop_assessments", "timeagreed", $timenow, "id", $assessment->id);
-		echo "".get_string("savedok", "workshop")."
\n";
+		echo "".get_string("savedok", "workshop")."
\n";
 			
 		add_to_log($course->id, "workshop", "agree", "assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id", "$assessment->id");
 		print_continue("view.php?id=$cm->id");
@@ -255,26 +255,26 @@
 			error("Edit Comment: Submission not found");
 			}
 		?>
-		

-		
-		
-		
-		

-		
-		
+		
+		
+		
+		

+		

+		\n";
-		echo "	\n";
-		echo "	\n";
+		echo "	\n";
+		echo "	
". get_string("comment", "workshop").":
\n";
+		echo "
". get_string("comment", "workshop").":
\n";
 		echo "		\n";
-		echo "	
\n";
-		echo "\n";
-		echo "
\n";
+		echo "	\n";
+		echo "\n";
+		echo "\n";
 		workshop_print_assessment($workshop, $assessment);
 		}
 
@@ -294,10 +294,10 @@
 		print_heading_with_help(get_string("editingassessmentelements", "workshop"), "elements", "workshop");
 		?>
 		

-		
+		
 		
-		

-		

+		id, "elementno ASC" )) {
@@ -319,13 +319,13 @@
 			case 0: // no grading
 				for ($i=0; $i<$workshop->nelements; $i++) {
 					$iplus1 = $i+1;
-					echo "\n";
-					echo "	\n";
-					echo "\n";
-					echo "\n";
-					echo "	\n";
-					echo "\n";
+					echo "\n";
+					echo "	\n";
+					echo "\n";
+					echo "\n";
+					echo "	\n";
+					echo "\n";
 				}
 				break;
 
@@ -336,65 +336,65 @@
 				}
 				for ($i=0; $i<$workshop->nelements; $i++) {
 					$iplus1 = $i+1;
-					echo "\n";
-					echo "	\n";
-					echo "\n";
-					echo "\n";
-					echo "	\n";
-					echo "\n";
+					echo "	\n";
+					echo "\n";
+					echo "\n";
+					echo "	\n";
+					echo "\n";
-					echo "\n";
+					echo "\n";
-					echo "\n";
-					echo "\n";
-					echo "	\n";
-					echo "\n";
+					echo "		\n";
+					echo "\n";
+					echo "\n";
+					echo "	\n";
+					echo "\n";
 				}
 				break;
 				
 			case 2: // error banded grading
 				for ($i=0; $i<$workshop->nelements; $i++) {
 					$iplus1 = $i+1;
-					echo "\n";
-					echo "	\n";
-					echo "\n";
+					echo "\n";
+					echo "	\n";
+					echo "\n";
 					if ($elements[$i]->weight == '') { // not set
 						$elements[$i]->weight = 11; // unity
 						}
-					echo "\n";
-					echo "\n";
+					echo "\n";
-					echo "\n";
-					echo "\n";
-					echo "	\n";
-					echo "\n";
+					echo "		\n";
+					echo "\n";
+					echo "\n";
+					echo "	\n";
+					echo "\n";
 				}
-				echo "
". get_string("element","workshop")." $iplus1:
\n";
-					echo "	
cellheading2\"> 
". get_string("element","workshop")." $iplus1:
\n";
+					echo "	
cellheading2\"> 
". get_string("element","workshop")." $iplus1:
\n";
-					echo "	
". get_string("typeofscale", "workshop"). ":
\n";
+					echo "
". get_string("element","workshop")." $iplus1:
\n";
+					echo "	
". get_string("typeofscale", "workshop"). ":
\n";
 					choose_from_menu($SCALES, "scale[]", $elements[$i]->scale, "");
 					if ($elements[$i]->weight == '') { // not set
 						$elements[$i]->weight = 11; // unity
 					}
-					echo "
".get_string("elementweight", "workshop").":\n";
+					echo "
".get_string("elementweight", "workshop").":\n";
 					workshop_choose_from_menu($WORKSHOP_EWEIGHTS, "weight[]", $elements[$i]->weight, "");
-					echo "		
cellheading2\"> 
cellheading2\"> 
". get_string("element","workshop")." $iplus1:
\n";
-					echo "	
". get_string("element","workshop")." $iplus1:
\n";
+					echo "	
".get_string("elementweight", "workshop").":\n";
+					echo "
".get_string("elementweight", "workshop").":\n";
 					workshop_choose_from_menu($WORKSHOP_EWEIGHTS, "weight[]", $elements[$i]->weight, "");
-					echo "		
cellheading2\"> 
cellheading2\"> 

\n";
-				echo "
".get_string("gradetable","workshop")."
\n";
-				echo "
".
+				echo "

\n";
+				echo "
".get_string("gradetable","workshop")."
\n";
+				echo "
\n";
+				echo "\n";
 				for ($j = $workshop->grade; $j >= 0; $j--) {
 					$numbers[$j] = $j;
 				}
 				for ($i=0; $i<=$workshop->nelements; $i++) {
-					echo "\n";
+					echo "\n";
 				}
-				echo "
".
 					get_string("numberofnegativeresponses", "workshop");
-				echo "". get_string("suggestedgrade", "workshop")."
". get_string("suggestedgrade", "workshop")."
$i";
+					echo "
$i";
 					if (!isset($elements[$i])) {  // the "last one" will be!
 						$elements[$i]->description = "";
 						$elements[$i]->maxscore = 0;
 					}
 					choose_from_menu($numbers, "maxscore[$i]", $elements[$i]->maxscore, "");
-					echo "
\n";
+				echo "
\n";
 				break;
 				
 			case 3: // criterion grading
@@ -403,16 +403,16 @@
 				}
 				for ($i=0; $i<$workshop->nelements; $i++) {
 					$iplus1 = $i+1;
-					echo "\n";
-					echo "	
". get_string("criterion","workshop")." $iplus1:\n";
-					echo "\n";
-					echo "	\n";
-					echo "". get_string("suggestedgrade", "workshop").":\n";
+					echo "\n";
+					echo "	
". get_string("criterion","workshop")." $iplus1:\n";
+					echo "\n";
+					echo "	\n";
+					echo "". get_string("suggestedgrade", "workshop").":\n";
 					choose_from_menu($numbers, "maxscore[$i]", $elements[$i]->maxscore, "");
-					echo "\n";
-					echo "\n";
-					echo "	cellheading2\"> \n";
-					echo "\n";
+					echo "\n";
+					echo "\n";
+					echo "	cellheading2\"> \n";
+					echo "\n";
 				}
 				break;
 
@@ -427,40 +427,40 @@
 				}
 				for ($i=0; $i<$workshop->nelements; $i++) {
 					$iplus1 = $i+1;
-					echo "\n";
-					echo "	
". get_string("element","workshop")." $iplus1:\n";
-					echo "\n";
-					echo "	\n";
-					echo "".get_string("elementweight", "workshop").":\n";
+					echo "\n";
+					echo "	
". get_string("element","workshop")." $iplus1:\n";
+					echo "\n";
+					echo "	\n";
+					echo "".get_string("elementweight", "workshop").":\n";
 					workshop_choose_from_menu($WORKSHOP_EWEIGHTS, "weight[]", $elements[$i]->weight, "");
-					echo "		\n";
-					echo "\n";
+					echo "		\n";
+					echo "\n";
 
 					for ($j=0; $j<5; $j++) {
 						$jplus1 = $j+1;
 						if (empty($rubrics[$i][$j])) {
 							$rubrics[$i][$j] = "";
 						}
-						echo "\n";
-						echo "	
". get_string("grade","workshop")." $j:\n";
-						echo "\n";
-						echo "	\n";
+						echo "\n";
+						echo "	
". get_string("grade","workshop")." $j:\n";
+						echo "\n";
+						echo "	\n";
 						}
-					echo "\n";
-					echo "	cellheading2\"> \n";
-					echo "\n";
+					echo "\n";
+					echo "	cellheading2\"> \n";
+					echo "\n";
 					}
 				break;
 			}
 		// close table and form
 
 		?>
-		
+		
 		" />
 		" />
-		

-		

-		
+		
+		
".get_string("teacherassessments", "workshop", $course->teacher)."
\n";
+			echo "
".get_string("teacherassessments", "workshop", $course->teacher)."
\n";
 			workshop_print_assessment($workshop, $teachersassessment);
 		}
 		// now the student's assessment (don't allow changes)
 		$user = get_record("user", "id", $assessment->userid);
-		echo "
".get_string("assessmentby", "workshop", $user->firstname." ".$user->lastname)."
\n";
+		echo "
".get_string("assessmentby", "workshop", $user->firstname." ".$user->lastname)."
\n";
 		workshop_print_assessment($workshop, $assessment);
 		
 		?>
-		

-		
-		
-		
-		
-		

-		
-		
+		
+		
+		
+		
+		

+		

+		\n";
-		echo "	\n";
-		echo "	\n";
+		echo "	\n";
+		echo "	\n";
-		echo "\n";
-		echo "\n";
+		echo "\n";
+		echo "
". get_string("teacherscomment", "workshop").":
\n";
+		echo "
". get_string("teacherscomment", "workshop").":
\n";
 		echo "		\n";
-		echo "	
".get_string("gradeforstudentsassessment", "workshop")."\n";
+		echo "	
".get_string("gradeforstudentsassessment", "workshop")."\n";
 		choose_from_menu($num, "gradinggrade", $assessment->gradinggrade, "");
-		echo "
\n";
-		echo "\n";
-		echo "
\n";
+		echo "\n";
+		echo "\n";
+		echo "\n";
 	}
 
 
@@ -776,7 +776,7 @@
 						$totalweight += $weight;
 					}
 					$rawgrade += ($grade / $maxscore) * $weight;
-					// echo "\$key, \$maxscore, \$weight, \$totalweight, \$grade, \$rawgrade : $key, $maxscore, $weight, $totalweight, $grade, $rawgrade
";
+					// echo "\$key, \$maxscore, \$weight, \$totalweight, \$grade, \$rawgrade : $key, $maxscore, $weight, $totalweight, $grade, $rawgrade
";
 				}
 				$grade = 100.0 * ($rawgrade / $totalweight);
 				break;
@@ -815,7 +815,7 @@
                 } elseif ($grade > 100) {
                     $grade = 100;
                 }
-				echo "
".get_string("weightederrorcount", "workshop", intval($error + 0.5))."\n";
+				echo "
".get_string("weightederrorcount", "workshop", intval($error + 0.5))."\n";
 				break;
 			
 			case 3: // criteria grading
@@ -932,7 +932,7 @@
             set_field("workshop_comments", "timecreated", $timenow, "id", $comment->id);
             // ..and kick to comment into life (probably not needed but just in case)
             set_field("workshop_comments", "mailed", 0, "id", $comment->id);
-            echo "".get_string("savedok", "workshop")."
\n";
+            echo "".get_string("savedok", "workshop")."
\n";
             
             add_to_log($course->id, "workshop", "comment", 
                     "assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id", "$comment->id");
@@ -961,7 +961,7 @@
             set_field("workshop_assessments", "gradinggrade", $form->gradinggrade, "id", $assessment->id);
             set_field("workshop_assessments", "timegraded", $timenow, "id", $assessment->id);
             set_field("workshop_assessments", "mailed", 0, "id", $assessment->id);
-            echo "".get_string("savedok", "workshop")."
\n";
+            echo "".get_string("savedok", "workshop")."
\n";
             
             add_to_log($course->id, "workshop", "grade", 
                  "assessments.php?action=viewassessment&id=$cm->id&aid=$assessment->id", "$assessment->id", "$cm->id");
diff --git a/mod/workshop/backuplib.php b/mod/workshop/backuplib.php
index 1d16030ee4..19794b0d79 100644
--- a/mod/workshop/backuplib.php
+++ b/mod/workshop/backuplib.php
@@ -1,4 +1,4 @@
-timecreated);
                 } 
                 else {
-                    $submitted = "".userdate($submission->timecreated)."";
+                    $submitted = "".userdate($submission->timecreated)."";
                 }
                 $due = userdate($workshop->deadline);
                 if (!$workshop->visible) {
                     //Show dimmed if the mod is hidden
-                    $link = "coursemodule\">$workshop->name
";
+                    $link = "coursemodule\">$workshop->name
";
                 } else {
                     //Show normal if the mod is visible
-                    $link = "coursemodule\">$workshop->name
";
+                    $link = "coursemodule\">$workshop->name
";
                 }
                 if (isstudent($course->id)) {
                     $link .= " ($submission->title)"; // show students the title of their submission(s)
@@ -100,10 +100,10 @@
             $due = userdate($workshop->deadline);
             if (!$workshop->visible) {
                 //Show dimmed if the mod is hidden
-                $link = "coursemodule\">$workshop->name";
+                $link = "coursemodule\">$workshop->name";
             } else {
                 //Show normal if the mod is visible
-                $link = "coursemodule\">$workshop->name";
+                $link = "coursemodule\">$workshop->name";
             }
             if ($course->format == "weeks" or $course->format == "topics") {
                     $table->data[] = array ($workshop->section, $link, $info, $submitted, $due);
diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index df2a628150..c6079ceb74 100644
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -1,4 +1,4 @@
-wwwroot/mod/workshop/view.php?id=$cm->id\n";
             $posttext .= "---------------------------------------------------------------------\n";
             if ($sendto->mailformat == 1) {  // HTML
-                $posthtml = "
".
-                    "wwwroot/course/view.php?id=$course->id\">$course->shortname ->".
-                    "wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops ->".
-                    "wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name
";
-                $posthtml .= "
";
-                $posthtml .= "
$msg
";
-                $posthtml .= "
".get_string("mail3", "workshop").
-                    " wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name.
";
+                $posthtml = "
".
+                    "wwwroot/course/view.php?id=$course->id\">$course->shortname ->".
+                    "wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops ->".
+                    "wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name
";
+                $posthtml .= "
";
+                $posthtml .= "
$msg
";
+                $posthtml .= "
".get_string("mail3", "workshop").
+                    " wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name.
";
             } else {
                 $posthtml = "";
             }
@@ -291,14 +291,14 @@ function workshop_cron () {
             $posttext .= "   $CFG->wwwroot/mod/workshop/view.php?id=$cm->id\n";
             $posttext .= "---------------------------------------------------------------------\n";
             if ($sendto->mailformat == 1) {  // HTML
-                $posthtml = "
".
-                  "wwwroot/course/view.php?id=$course->id\">$course->shortname ->".
-                  "wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops ->".
-                  "wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name
";
-                $posthtml .= "
";
-                $posthtml .= "
$msg
";
-                $posthtml .= "
".get_string("mail3", "workshop").
-                  " wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name.
";
+                $posthtml = "
".
+                  "wwwroot/course/view.php?id=$course->id\">$course->shortname ->".
+                  "wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops ->".
+                  "wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name
";
+                $posthtml .= "
";
+                $posthtml .= "
$msg
";
+                $posthtml .= "
".get_string("mail3", "workshop").
+                  " wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name.
";
             } 
             else {
               $posthtml = "";
@@ -391,15 +391,15 @@ function workshop_cron () {
                 $posttext .= "   $CFG->wwwroot/mod/workshop/view.php?id=$cm->id\n";
                 $posttext .= "---------------------------------------------------------------------\n";
                 if ($sendto->mailformat == 1) {  // HTML
-                    $posthtml = "
".
-                    "wwwroot/course/view.php?id=$course->id\">$course->shortname ->".
-                    "wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops ->".
-                    "wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name
";
-                    $posthtml .= "
";
-                    $posthtml .= "
$msg
";
-                    $posthtml .= "
".get_string("mail3", "workshop").
-                        " wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name
-                        .
";
+                    $posthtml = "
".
+                    "wwwroot/course/view.php?id=$course->id\">$course->shortname ->".
+                    "wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops ->".
+                    "wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name
";
+                    $posthtml .= "
";
+                    $posthtml .= "
$msg
";
+                    $posthtml .= "
".get_string("mail3", "workshop").
+                        " wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name
+                        .
";
                     } 
                 else {
                     $posthtml = "";
@@ -438,14 +438,14 @@ function workshop_cron () {
                 $posttext .= "   $CFG->wwwroot/mod/workshop/view.php?id=$cm->id\n";
                 $posttext .= "---------------------------------------------------------------------\n";
                 if ($sendto->mailformat == 1) {  // HTML
-                    $posthtml = "
".
-                    "wwwroot/course/view.php?id=$course->id\">$course->shortname ->".
-                    "wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops ->".
-                    "wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name
";
-                    $posthtml .= "
";
-                    $posthtml .= "
$msg
";
-                    $posthtml .= "
".get_string("mail3", "workshop").
-                        " wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name.
";
+                    $posthtml = "
".
+                    "wwwroot/course/view.php?id=$course->id\">$course->shortname ->".
+                    "wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops ->".
+                    "wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name
";
+                    $posthtml .= "
";
+                    $posthtml .= "
$msg
";
+                    $posthtml .= "
".get_string("mail3", "workshop").
+                        " wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name.
";
                     } 
                 else {
                     $posthtml = "";
@@ -534,14 +534,14 @@ function workshop_cron () {
             $posttext .= "   $CFG->wwwroot/mod/workshop/view.php?id=$cm->id\n";
             $posttext .= "---------------------------------------------------------------------\n";
             if ($sendto->mailformat == 1) {  // HTML
-                $posthtml = "
".
-                    "wwwroot/course/view.php?id=$course->id\">$course->shortname ->".
-                    "wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops ->".
-                    "wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name
";
-                $posthtml .= "
";
-                $posthtml .= "
$msg
";
-                $posthtml .= "
".get_string("mail3", "workshop").
-                    " wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name.
";
+                $posthtml = "
".
+                    "wwwroot/course/view.php?id=$course->id\">$course->shortname ->".
+                    "wwwroot/mod/workshop/index.php?id=$course->id\">$strworkshops ->".
+                    "wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name
";
+                $posthtml .= "
";
+                $posthtml .= "
$msg
";
+                $posthtml .= "
".get_string("mail3", "workshop").
+                    " wwwroot/mod/workshop/view.php?id=$cm->id\">$workshop->name.
";
             } else {
               $posthtml = "";
             }
diff --git a/mod/workshop/locallib.php b/mod/workshop/locallib.php
index bfdeadfbd8..97396458c2 100644
--- a/mod/workshop/locallib.php
+++ b/mod/workshop/locallib.php
@@ -1,4 +1,4 @@
-\n";
+    $output = "