Some small robustness things, and a new style for quiz feedback text

diff --git a/files/index.php b/files/index.php
index 11fc1d8af67439f61539220a16d3c0f97f78ffcf..aa5d8fc7d184cd1aa907db9c327c9a6de3f435b5 100644 (file)
--- a/files/index.php
+++ b/files/index.php
@@ -654,7 +654,7 @@ function displaydir ($wdir) {
 
     echo "</FORM>";
     echo "<TD ALIGN=center>";
-    if (($USER->fileop == "move") && $USER->filesource <> $wdir) {
+    if (!empty($USER->fileop) and ($USER->fileop == "move") and ($USER->filesource <> $wdir)) {
         echo "<FORM ACTION=index.php METHOD=get>";
         echo " <INPUT TYPE=hidden NAME=id VALUE=$id>";
         echo " <INPUT TYPE=hidden NAME=wdir VALUE=\"$wdir\">";

diff --git a/files/mimetypes.php b/files/mimetypes.php
index f4091332d7b45c1327067534f8b93d01e1aa8869..7ecfc86997323594af2ef7d7264421ec7a0a09ea 100644 (file)
--- a/files/mimetypes.php
+++ b/files/mimetypes.php
@@ -27,7 +27,7 @@ function mimeinfo($element, $filename) {
         $result = $mimeinfo[strtolower($match[1])][$element];
     }
 
-    if ($result) {
+    if (!empty($result)) {
         return $result;
     } else {
         return $mimeinfo["xxx"][$element];   // By default

diff --git a/mod/choice/index.php b/mod/choice/index.php
index bd901b1aaa7711b307be3e54da387b69b6523b1c..6e043dc7427e0cecb292b66c673eb3f7ebb32fbf 100644 (file)
--- a/mod/choice/index.php
+++ b/mod/choice/index.php
@@ -15,6 +15,8 @@
 
     if ($course->category) {
         $navigation = "<A HREF=\"../../course/view.php?id=$course->id\">$course->shortname</A> ->";
+    } else {
+        $navigation = "";
     }
 
     $strchoice = get_string("modulename", "choice");

diff --git a/mod/choice/view.php b/mod/choice/view.php
index ed8e75075c46b26f07e2e476301bd36a5953d786..dc255b8afa20741a719de4c3e4552aab9f454a65 100644 (file)
--- a/mod/choice/view.php
+++ b/mod/choice/view.php
@@ -57,6 +57,8 @@
 
     if ($course->category) {
         $navigation = "<A HREF=\"../../course/view.php?id=$course->id\">$course->shortname</A> ->";
+    } else {
+        $navigation = "";
     }
     print_header("$course->shortname: $choice->name", "$course->fullname",
                  "$navigation <A HREF=index.php?id=$course->id>$strchoices</A> -> $choice->name", "", "", true,

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index 8830a5606e4ec794b561b954819209f2b5b12e8b..4cec88a6116b5bae0f661fa46a299b5cd1877ee4 100644 (file)
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -310,7 +310,7 @@ function quiz_get_attempt_responses($attempt) {
 function quiz_print_comment($text) {
     global $THEME;
 
-    echo "<FONT COLOR=\"$THEME->cellheading2\">".text_to_html($text, true, false)."</FONT>";
+    echo "<SPAN CLASS=feedbacktext>".text_to_html($text, true, false)."</SPAN>";
 }
 
 function quiz_print_correctanswer($text) {

diff --git a/theme/standard/styles.php b/theme/standard/styles.php
index 2500203a2f19506770ee20530203b371ed057c91..d6ade57eaf8068fa775ee665cb7dbe0c45bcdd21 100644 (file)
--- a/theme/standard/styles.php
+++ b/theme/standard/styles.php
@@ -187,3 +187,6 @@ form {
 .generalboxcontent {\r
 }\r
 \r
+.feedbacktext {\r
+    color: <?PHP echo $THEME->cellheading2?>;\r
+}\r

diff --git a/theme/standardblue/styles.php b/theme/standardblue/styles.php
index 2500203a2f19506770ee20530203b371ed057c91..d6ade57eaf8068fa775ee665cb7dbe0c45bcdd21 100644 (file)
--- a/theme/standardblue/styles.php
+++ b/theme/standardblue/styles.php
@@ -187,3 +187,6 @@ form {
 .generalboxcontent {\r
 }\r
 \r
+.feedbacktext {\r
+    color: <?PHP echo $THEME->cellheading2?>;\r
+}\r

diff --git a/theme/standardgreen/styles.php b/theme/standardgreen/styles.php
index 2500203a2f19506770ee20530203b371ed057c91..d6ade57eaf8068fa775ee665cb7dbe0c45bcdd21 100644 (file)
--- a/theme/standardgreen/styles.php
+++ b/theme/standardgreen/styles.php
@@ -187,3 +187,6 @@ form {
 .generalboxcontent {\r
 }\r
 \r
+.feedbacktext {\r
+    color: <?PHP echo $THEME->cellheading2?>;\r
+}\r

diff --git a/theme/standardlogo/styles.php b/theme/standardlogo/styles.php
index 2500203a2f19506770ee20530203b371ed057c91..d6ade57eaf8068fa775ee665cb7dbe0c45bcdd21 100644 (file)
--- a/theme/standardlogo/styles.php
+++ b/theme/standardlogo/styles.php
@@ -187,3 +187,6 @@ form {
 .generalboxcontent {\r
 }\r
 \r
+.feedbacktext {\r
+    color: <?PHP echo $THEME->cellheading2?>;\r
+}\r

diff --git a/theme/standardred/styles.php b/theme/standardred/styles.php
index 2500203a2f19506770ee20530203b371ed057c91..d6ade57eaf8068fa775ee665cb7dbe0c45bcdd21 100644 (file)
--- a/theme/standardred/styles.php
+++ b/theme/standardred/styles.php
@@ -187,3 +187,6 @@ form {
 .generalboxcontent {\r
 }\r
 \r
+.feedbacktext {\r
+    color: <?PHP echo $THEME->cellheading2?>;\r
+}\r

diff --git a/theme/standardwhite/styles.php b/theme/standardwhite/styles.php
index 2500203a2f19506770ee20530203b371ed057c91..d6ade57eaf8068fa775ee665cb7dbe0c45bcdd21 100644 (file)
--- a/theme/standardwhite/styles.php
+++ b/theme/standardwhite/styles.php
@@ -187,3 +187,6 @@ form {
 .generalboxcontent {\r
 }\r
 \r
+.feedbacktext {\r
+    color: <?PHP echo $THEME->cellheading2?>;\r
+}\r