Saw several problems with lesson_choose_from_menu, so finally replaced its use with...

diff --git a/mod/lesson/action/addbranchtable.php b/mod/lesson/action/addbranchtable.php
index 75dc20e0af884f2883315d8654590aff47a799e8..f25b829278d369eae3ccfe6a1933137864393ed3 100644 (file)
--- a/mod/lesson/action/addbranchtable.php
+++ b/mod/lesson/action/addbranchtable.php
@@ -67,10 +67,10 @@
         echo "<tr><td><B>".get_string("jump", "lesson")." $iplus1:</b> \n";
         if ($i) {
             // answers 2, 3, 4... jumpto this page
-            lesson_choose_from_menu($jump, "jumpto[$i]", 0, "");
+            choose_from_menu($jump, "jumpto[$i]", 0, "");
         } else {
             // answer 1 jumpto next page
-            lesson_choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, "");
+            choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, "");
         }
         helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
         echo "</td></tr>\n";

diff --git a/mod/lesson/action/addpage.php b/mod/lesson/action/addpage.php
index 0ec6c61f75c0e4609db815e58d66b8d699bda8a4..223e1674a83f5630dce58989f86e5814d0f6ec84 100644 (file)
--- a/mod/lesson/action/addpage.php
+++ b/mod/lesson/action/addpage.php
@@ -94,10 +94,10 @@
                 echo "<tr><td><B>".get_string("jump", "lesson")." $iplus1:</b> \n";
                 if ($i) {
                     // answers 2, 3, 4... jumpto this page
-                    lesson_choose_from_menu($jump, "jumpto[$i]", 0, "");
+                    choose_from_menu($jump, "jumpto[$i]", 0, "");
                 } else {
                     // answer 1 jumpto next page
-                    lesson_choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, "");
+                    choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, "");
                 }
                 helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
                 if($lesson->custom) {
@@ -112,7 +112,7 @@
             break;
         case LESSON_ESSAY :
                 echo "<tr><td><B>".get_string("jump", "lesson").":</b> \n";
-                lesson_choose_from_menu($jump, "jumpto[0]", LESSON_NEXTPAGE, "");
+                choose_from_menu($jump, "jumpto[0]", LESSON_NEXTPAGE, "");
                 helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
                 if ($lesson->custom) {
                     echo get_string("score", "lesson").": <input type=\"text\" name=\"score[0]\" value=\"1\" size=\"5\">";
@@ -140,7 +140,7 @@
                 }
                 if ($i == 2) {
                     echo "<tr><td><B>".get_string("correctanswerjump", "lesson").":</b> \n";
-                    lesson_choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, "");
+                    choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, "");
                     helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
                     if($lesson->custom) {
                         echo get_string("correctanswerscore", "lesson").": <input type=\"text\" name=\"score[$i]\" value=\"1\" size=\"5\">";
@@ -148,7 +148,7 @@
                     echo "</td></tr>\n";
                 } elseif ($i == 3) {
                     echo "<tr><td><B>".get_string("wronganswerjump", "lesson").":</b> \n";
-                    lesson_choose_from_menu($jump, "jumpto[$i]", 0, "");
+                    choose_from_menu($jump, "jumpto[$i]", 0, "");
                     helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
                     if($lesson->custom) {
                         echo get_string("wronganswerscore", "lesson").": <input type=\"text\" name=\"score[$i]\" value=\"0\" size=\"5\">";
@@ -172,10 +172,10 @@
                 echo "<tr><td><B>".get_string("jump", "lesson")." $iplus1:</b> \n";
                 if ($i) {
                     // answers 2, 3, 4... jumpto this page
-                    lesson_choose_from_menu($jump, "jumpto[$i]", 0, "");
+                    choose_from_menu($jump, "jumpto[$i]", 0, "");
                 } else {
                     // answer 1 jumpto next page
-                    lesson_choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, "");
+                    choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, "");
                 }
                 helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
                 if($lesson->custom) {

diff --git a/mod/lesson/action/editpage.php b/mod/lesson/action/editpage.php
index 191186baee27e3aa5e828011f2dac0720693803d..ae2e7870d8ed6e95c3827064de4be632780b1d05 100644 (file)
--- a/mod/lesson/action/editpage.php
+++ b/mod/lesson/action/editpage.php
@@ -293,14 +293,14 @@
                 case LESSON_MATCHING :
                     if ($n == 2) {
                         echo "<tr><td><b>".get_string("correctanswerjump", "lesson").":</b> \n";
-                        lesson_choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, "");
+                        choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, "");
                         helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
                         if($lesson->custom)
                             echo get_string("correctanswerscore", "lesson").": <input type=\"text\" name=\"score[$n]\" value=\"$answer->score\" size=\"5\">";
                         }
                     if ($n == 3) {
                         echo "<tr><td><b>".get_string("wronganswerjump", "lesson").":</b> \n";
-                        lesson_choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, "");
+                        choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, "");
                         helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
                         if($lesson->custom)
                             echo get_string("wronganswerscore", "lesson").": <input type=\"text\" name=\"score[$n]\" value=\"$answer->score\" size=\"5\">";
@@ -309,7 +309,7 @@
                     break;
                 case LESSON_ESSAY :
                     echo "<tr><td><b>".get_string("jump", "lesson").":</b> \n";
-                    lesson_choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, "");
+                    choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, "");
                     helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
                     if($lesson->custom) {
                         echo get_string("score", "lesson").": <input type=\"text\" name=\"score[$n]\" value=\"$answer->score\" size=\"5\">";
@@ -321,7 +321,7 @@
                 case LESSON_SHORTANSWER:
                 case LESSON_NUMERICAL:
                     echo "<tr><td><b>".get_string("jump", "lesson")." $nplus1:</b> \n";
-                    lesson_choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, "");
+                    choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, "");
                     helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
                     if($lesson->custom) {
                         echo get_string("score", "lesson")." $nplus1: <input type=\"text\" name=\"score[$n]\" value=\"$answer->score\" size=\"5\">";
@@ -333,7 +333,7 @@
                 case LESSON_ENDOFCLUSTER:
                 case LESSON_ENDOFBRANCH:
                     echo "<tr><td><b>".get_string("jump", "lesson")." $nplus1:</b> \n";
-                    lesson_choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, "");
+                    choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, "");
                     helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
                     echo "</td></tr>\n";
                     break;
@@ -412,7 +412,7 @@
                 case LESSON_ESSAY :
                     if ($i < 1) {
                         echo "<tr><td><B>".get_string("jump", "lesson").":</b> \n";
-                        lesson_choose_from_menu($jump, "jumpto[$i]", 0, "");
+                        choose_from_menu($jump, "jumpto[$i]", 0, "");
                         helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
                         if($lesson->custom) {
                             echo get_string("score", "lesson").": <input type=\"text\" name=\"score[$i]\" value=\"1\" size=\"5\">";
@@ -423,14 +423,14 @@
                 case LESSON_MATCHING :
                     if ($i == 2) {
                         echo "<tr><td><b>".get_string("correctanswerjump", "lesson").":</b> \n";
-                        lesson_choose_from_menu($jump, "jumpto[$i]", $answer->jumpto, "");
+                        choose_from_menu($jump, "jumpto[$i]", $answer->jumpto, "");
                         helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
                         if($lesson->custom)
                             echo get_string("correctanswerscore", "lesson").": <input type=\"text\" name=\"score[$i]\" value=\"$answer->score\" size=\"5\">";
                         }
                     if ($i == 3) {
                         echo "<tr><td><b>".get_string("wronganswerjump", "lesson").":</b> \n";
-                        lesson_choose_from_menu($jump, "jumpto[$i]", $answer->jumpto, "");
+                        choose_from_menu($jump, "jumpto[$i]", $answer->jumpto, "");
                         helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
                         if($lesson->custom)
                             echo get_string("wronganswerscore", "lesson").": <input type=\"text\" name=\"score[$i]\" value=\"$answer->score\" size=\"5\">";
@@ -443,7 +443,7 @@
                 case LESSON_SHORTANSWER:
                 case LESSON_NUMERICAL:
                     echo "<tr><td><B>".get_string("jump", "lesson")." $iplus1:</b> \n";
-                    lesson_choose_from_menu($jump, "jumpto[$i]", 0, "");
+                    choose_from_menu($jump, "jumpto[$i]", 0, "");
                     helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
                     if($lesson->custom) {
                         echo get_string("score", "lesson")." $iplus1: <input type=\"text\" name=\"score[$i]\" value=\"0\" size=\"5\">";
@@ -452,7 +452,7 @@
                     break;
                 case LESSON_BRANCHTABLE :
                     echo "<tr><td><B>".get_string("jump", "lesson")." $iplus1:</b> \n";
-                    lesson_choose_from_menu($jump, "jumpto[$i]", 0, "");
+                    choose_from_menu($jump, "jumpto[$i]", 0, "");
                     helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
                     echo "</td></tr>\n";
                     break;

diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index b28c7288ae7eb811f3d796bb6c2ef56c1326b187..ae828bf07105c2af77039cb7d81540acc3bdd8e1 100644 (file)
--- a/mod/lesson/locallib.php
+++ b/mod/lesson/locallib.php
@@ -947,63 +947,6 @@ function lesson_save_question_options($question) {
     return true;
 }
 
-/**
- * Given an array of value, creates a popup menu to be part of a form.
- * 
- * @param array $options Used to create the popup menu values ( $options["value"]["label"] ).
- * @param string $name Name of the select form element.
- * @param string $selected Current value selected in the popup menu.
- * @param string $nothing If set, used as the first value in the popup menu.
- * @param string $script OnChange javascript code.
- * @param string|int $nothingvalue Value of the $nothing parameter.
- * @param boolean $return False: Print out the popup menu automatically  True: Return the popup menu.
- * @return string May return the popup menu as a string.
- * @todo replace the use of this function with choose_from_menu in lib/weblib.php
- **/
-function lesson_choose_from_menu ($options, $name, $selected="", $nothing="choose", $script="", $nothingvalue="0", $return=false) {    
-    if ($nothing == "choose") {
-        $nothing = get_string("choose")."...";
-    }
-
-    if ($script) {
-        $javascript = "onChange=\"$script\"";
-    } else {
-        $javascript = "";
-    }
-
-    $output = "<label for=$name class=hidden-label>$name</label><SELECT id=$name NAME=$name $javascript>\n";
-    if ($nothing) {
-        $output .= "   <OPTION VALUE=\"$nothingvalue\"\n";
-        if ($nothingvalue == $selected) {
-            $output .= " SELECTED";
-        }
-        $output .= ">$nothing</OPTION>\n";
-    }
-    if (!empty($options)) {
-        foreach ($options as $value => $label) {
-            $output .= "   <OPTION VALUE=\"$value\"";
-            if ($value == $selected) {
-                $output .= " SELECTED";
-            }
-            // stop zero label being replaced by array index value
-            // if ($label) {
-            //    $output .= ">$label</OPTION>\n";
-            // } else {
-            //     $output .= ">$value</OPTION>\n";
-            //  }
-            $output .= ">$label</OPTION>\n";
-            
-        }
-    }
-    $output .= "</SELECT>\n";
-
-    if ($return) {
-        return $output;
-    } else {
-        echo $output;
-    }
-}   
-
 /**
  * Determins if a jumpto value is correct or not.
  *