MDL-19812 Upgraded calls to choose_from_menu

diff --git a/mod/lesson/action/addbranchtable.php b/mod/lesson/action/addbranchtable.php
index b7e7309a7997d27a92d7306b0a95f1ac664732db..3f4019cbcb425afa196c343c7b299fe453ae13a3 100644 (file)
--- a/mod/lesson/action/addbranchtable.php
+++ b/mod/lesson/action/addbranchtable.php
@@ -65,10 +65,10 @@
         echo "<tr><td><strong>".get_string("jump", "lesson")." $iplus1:</strong> \n";
         if ($i) {
             // answers 2, 3, 4... jumpto this page
-            choose_from_menu($jump, "jumpto[$i]", 0, "");
+            echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", 0, false));
         } else {
             // answer 1 jumpto next page
-            choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, "");
+            echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", LESSON_NEXTPAGE, false));
         }
         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 3093d460c174558bbe0fbcbf942d62059e0f29b2..070cae350812473766fb6a6009418d1e09875755 100644 (file)
--- a/mod/lesson/action/addpage.php
+++ b/mod/lesson/action/addpage.php
@@ -90,10 +90,10 @@
                 echo "<tr><td><b>".get_string("jump", "lesson")." $iplus1:</b> \n";
                 if ($i) {
                     // answers 2, 3, 4... jumpto this page
-                    choose_from_menu($jump, "jumpto[$i]", 0, "");
+                    echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", 0, false));
                 } else {
                     // answer 1 jumpto next page
-                    choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, "");
+                    echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", LESSON_NEXTPAGE, false));
                 }
                 helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
                 if($lesson->custom) {
@@ -108,7 +108,7 @@
             break;
         case LESSON_ESSAY :
                 echo "<tr><td><b>".get_string("jump", "lesson").":</b> \n";
-                choose_from_menu($jump, "jumpto[0]", LESSON_NEXTPAGE, "");
+                echo $OUTPUT->select(html_select::make($jump, "jumpto[0]", LESSON_NEXTPAGE, false));
                 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\" />";
@@ -136,7 +136,7 @@
                 }
                 if ($i == 2) {
                     echo "<tr><td><b>".get_string("correctanswerjump", "lesson").":</b> \n";
-                    choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, "");
+                    echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", LESSON_NEXTPAGE, false));
                     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\" />";
@@ -144,7 +144,7 @@
                     echo "</td></tr>\n";
                 } elseif ($i == 3) {
                     echo "<tr><td><b>".get_string("wronganswerjump", "lesson").":</b> \n";
-                    choose_from_menu($jump, "jumpto[$i]", 0, "");
+                    echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", 0, false));
                     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\" />";
@@ -168,10 +168,10 @@
                 echo "<tr><td><b>".get_string("jump", "lesson")." $iplus1:</b> \n";
                 if ($i) {
                     // answers 2, 3, 4... jumpto this page
-                    choose_from_menu($jump, "jumpto[$i]", 0, "");
+                    echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", 0, false));
                 } else {
                     // answer 1 jumpto next page
-                    choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, "");
+                    echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", LESSON_NEXTPAGE, false));
                 }
                 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 9c9966b7475fa161a7f8aba29f5d64d862091974..14e548e54df4e193a2bdc5ecd7dcf6a175f94ed4 100644 (file)
--- a/mod/lesson/action/editpage.php
+++ b/mod/lesson/action/editpage.php
@@ -291,7 +291,7 @@
                 case LESSON_MATCHING :
                     if ($n == 2) {
                         echo "<tr><td><b>".get_string("correctanswerjump", "lesson").":</b> \n";
-                        choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, "");
+                        echo $OUTPUT->select(html_select::make($jump, "jumpto[$n]", $answer->jumpto, false));
                         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\" />";
@@ -299,7 +299,7 @@
                     }
                     if ($n == 3) {
                         echo "<tr><td><b>".get_string("wronganswerjump", "lesson").":</b> \n";
-                        choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, "");
+                        echo $OUTPUT->select(html_select::make($jump, "jumpto[$n]", $answer->jumpto, false);
                         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";
-                    choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, "");
+                    echo $OUTPUT->select(html_select::make($jump, "jumpto[$n]", $answer->jumpto, false));
                     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";
-                    choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, "");
+                    echo $OUTPUT->select(html_select::make($jump, "jumpto[$n]", $answer->jumpto, false));
                     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";
-                    choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, "");
+                    echo $OUTPUT->select(html_select::make($jump, "jumpto[$n]", $answer->jumpto, false));
                     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";
-                        choose_from_menu($jump, "jumpto[$i]", 0, "");
+                        echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", 0, false));
                         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,7 +423,7 @@
                 case LESSON_MATCHING :
                     if ($i == 2) {
                         echo "<tr><td><b>".get_string("correctanswerjump", "lesson").":</b> \n";
-                        choose_from_menu($jump, "jumpto[$i]", $answer->jumpto, "");
+                        echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", $answer->jumpto, false));
                         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\" />";
@@ -432,7 +432,7 @@
                     }
                     if ($i == 3) {
                         echo "<tr><td><b>".get_string("wronganswerjump", "lesson").":</b> \n";
-                        choose_from_menu($jump, "jumpto[$i]", $answer->jumpto, "");
+                        echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", $answer->jumpto, false));
                         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\" />";
@@ -446,7 +446,7 @@
                 case LESSON_SHORTANSWER:
                 case LESSON_NUMERICAL:
                     echo "<tr><td><b>".get_string("jump", "lesson")." $iplus1:</b> \n";
-                    choose_from_menu($jump, "jumpto[$i]", 0, "");
+                    echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", 0, false));
                     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\" />";
@@ -455,7 +455,7 @@
                     break;
                 case LESSON_BRANCHTABLE :
                     echo "<tr><td><b>".get_string("jump", "lesson")." $iplus1:</b> \n";
-                    choose_from_menu($jump, "jumpto[$i]", 0, "");
+                    echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", 0, false));
                     helpbutton("jumpto", get_string("jump", "lesson"), "lesson");
                     echo "</td></tr>\n";
                     break;

diff --git a/mod/lesson/essay.php b/mod/lesson/essay.php
index 1c9d218d186699264d3e97c466f9972b80eca6d9..a72a769363d6a19a80addcf56f755d340da79b68 100644 (file)
--- a/mod/lesson/essay.php
+++ b/mod/lesson/essay.php
@@ -369,7 +369,9 @@
                 $options[0] = get_string('nocredit', 'lesson');
                 $options[1] = get_string('credit', 'lesson');
             }
-            $table->data[] = array(get_string('essayscore', 'lesson').': '.choose_from_menu($options, 'score', $essayinfo->score, '', '', '', true));
+            $select = html_select::make($options, 'score', $essayinfo->score, false);
+            $select->nothingvalue = '';
+            $table->data[] = array(get_string('essayscore', 'lesson').': '.$OUTPUT->select($select));
 
             print_table($table);
             echo '<div class="buttons">

diff --git a/mod/lesson/import.php b/mod/lesson/import.php
index a4f60151b1456a631dbaaabac79cba8cf3b3964e..7d8540a4724c4d3ade6f963f490b929c5eff30cd 100644 (file)
--- a/mod/lesson/import.php
+++ b/mod/lesson/import.php
@@ -95,7 +95,7 @@
     echo "<tr><td align=\"right\">";
     print_string("fileformat", "lesson");
     echo ":</td><td>";
-    choose_from_menu($fileformatnames, "format", "gift", "");
+    echo $OUTPUT->select(html_select::make($fileformatnames, "format", "gift", false));
     echo "</td></tr>";
 
     echo "<tr><td align=\"right\">";

diff --git a/mod/lesson/view.php b/mod/lesson/view.php
index 6f605198edd19ab594f6f76320652afbcae2699d..88f11a45f13b152325bb198a53d64927ec50724f 100644 (file)
--- a/mod/lesson/view.php
+++ b/mod/lesson/view.php
@@ -684,10 +684,10 @@
 
                             if (isset($USER->modattempts[$lesson->id])) {
                                 $selected = htmlspecialchars(trim($answers[$useranswers[$t]]->response));  // gets the user's previous answer
-                                choose_from_menu ($responseoptions, "response[$answer->id]", $selected);
+                                echo $OUTPUT->select(html_select::make ($responseoptions, "response[$answer->id]", $selected));
                                 $t++;
                             } else {
-                                choose_from_menu ($responseoptions, "response[$answer->id]");
+                                echo $OUTPUT->select(html_select::make ($responseoptions, "response[$answer->id]"));
                             }
                             echo '</td></tr>';
                             if ($answer != end($answers)) {