MDL-19789 Upgraded calls to choose_from_menu

diff --git a/backup/backup_form.html b/backup/backup_form.html
index 06653c394e4e2aa188b230e6cccd5b130421921a..45d8854ab2aa29a60540bf6d0c17ee01cc81db0d 100644 (file)
--- a/backup/backup_form.html
+++ b/backup/backup_form.html
@@ -156,7 +156,6 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
                 $backup_options[0] = get_string("no");
                 $backup_options[1] = get_string("yes");
                 $var = "backup_".$modname;
-                //choose_from_menu($backup_options, $var, $$var, "");
                 //Print the checkbox
                 print_checkbox($var, $$var, $$var, get_string("modulenameplural",$modname),'','selectItemInCheckboxByName(\'form1\',\'backup_'.$modname.'\',this.checked)');
                 echo "</td><td align=\"right\">&nbsp;";
@@ -165,7 +164,6 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
                 if (empty($to)) {
                     $backup_user_options[0] = get_string("withoutuserdata");
                     $backup_user_options[1] = get_string("withuserdata");
-                    //choose_from_menu($backup_user_options, $var, $$var, "");
                     print_checkbox($var, $$var, $$var, get_string("userdata"),'','selectItemInCheckboxByName(\'form1\',\'backup_user_info_'.$modname.'\',this.checked)');
                 } else {
                     echo '<input type="hidden" name="'.$var.'" value="0" />';
@@ -203,7 +201,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             echo "</b></td><td colspan=\"2\">";
             $meta_options[0] = get_string("no");
             $meta_options[1] = get_string("yes");
-            choose_from_menu($meta_options, "backup_metacourse", $backup_metacourse, "");
+            echo $OUTPUT->select(html_select::make($meta_options, "backup_metacourse", $backup_metacourse, false));
             echo "</td></tr>";
         }
         else {
@@ -219,7 +217,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             $user_options[0] = get_string("all");
             $user_options[1] = get_string("course");
             $user_options[2] = get_string("none");
-            choose_from_menu($user_options, "backup_users", $backup_users, "");
+            echo $OUTPUT->select(html_select::make($user_options, "backup_users", $backup_users, false));
             echo "</td></tr>";
         }
         else {
@@ -234,7 +232,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             echo "</b></td><td colspan=\"2\">";
             $log_options[0] = get_string("no");
             $log_options[1] = get_string("yes");
-            choose_from_menu($log_options, "backup_logs", $backup_logs, "");
+            echo $OUTPUT->select(html_select::make($log_options, "backup_logs", $backup_logs, false));
             echo "</td></tr>";
         }
         else {
@@ -249,7 +247,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             echo "</b></td><td colspan=\"2\">";
             $user_file_options[0] = get_string("no");
             $user_file_options[1] = get_string("yes");
-            choose_from_menu($user_file_options, "backup_user_files", $backup_user_files, "");
+            echo $OUTPUT->select(html_select::make($user_file_options, "backup_user_files", $backup_user_files, false));
             echo "</td></tr>";
         }
         else {
@@ -263,7 +261,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
         echo "</b></td><td colspan=\"2\">";
         $course_file_options[0] = get_string("no");
         $course_file_options[1] = get_string("yes");
-        choose_from_menu($course_file_options, "backup_course_files", $backup_course_files, "");
+        echo $OUTPUT->select(html_select::make($course_file_options, "backup_course_files", $backup_course_files, false));
         echo "</td></tr>";
 
 
@@ -276,7 +274,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             echo "</b></td><td colspan=\"2\">";
             $course_file_options[0] = get_string("no");
             $course_file_options[1] = get_string("yes");
-            choose_from_menu($course_file_options, "backup_site_files", $backup_site_files, "");
+            echo $OUTPUT->select(html_select::make($course_file_options, "backup_site_files", $backup_site_files, false));
             echo "</td></tr>";
         }
 
@@ -288,7 +286,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             echo "</b></td><td colspan=\"2\">";
             $gradebook_history_options[0] = get_string("no");
             $gradebook_history_options[1] = get_string("yes");
-            choose_from_menu($gradebook_history_options, "backup_gradebook_history", $backup_gradebook_history, "");
+            echo $OUTPUT->select(html_select::make($gradebook_history_options, "backup_gradebook_history", $backup_gradebook_history, false));
             echo "</td></tr>";
         } else {
             $hidden_options .= '<input type="hidden" name="backup_gradebook_history" value="0" />';
@@ -302,7 +300,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             echo "</b></td><td colspan=\"2\">";
             $mess_options[0] = get_string("no");
             $mess_options[1] = get_string("yes");
-            choose_from_menu($mess_options, "backup_messages", $backup_messages, "");
+            echo $OUTPUT->select(html_select::make($mess_options, "backup_messages", $backup_messages, false));
             echo "</td></tr>";
         }
         else {
@@ -317,7 +315,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             echo "</b></td><td colspan=\"2\">";
             $blog_options[0] = get_string("no");
             $blog_options[1] = get_string("yes");
-            choose_from_menu($blog_options, "backup_blogs", $backup_blogs, "");
+            echo $OUTPUT->select(html_select::make($blog_options, "backup_blogs", $backup_blogs, false));
             echo "</td></tr>";
         }
         else {

diff --git a/backup/restore_form.html b/backup/restore_form.html
index 0f82f4d4714ace984d0a969d7cb03afdc59d8199..027866164397b4a34131c471e9b0df37f52ea4e1 100644 (file)
--- a/backup/restore_form.html
+++ b/backup/restore_form.html
@@ -229,7 +229,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
 /// Acummulator for hidden options and proper XHTML output
     $hidden_options = '';
 
-    choose_from_menu($restore_restoreto_options, "restore_restoreto", $restore_restoreto, "");
+    echo $OUTPUT->select(html_select::make($restore_restoreto_options, "restore_restoreto", $restore_restoreto, false));
     echo "</td></tr>";
     if ($cancreatecourses) {  //display these fields conditionally
 
@@ -255,7 +255,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
                 $category_default = $fromcat;
             }
         }
-        choose_from_menu($categories, 'restore_restorecatto', $category_default, "");
+        echo $OUTPUT->select(html_select::make($categories, 'restore_restorecatto', $category_default, false));
         echo "</td>";
         echo "</tr>";
 
@@ -414,7 +414,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             $metacourse_options = array();
             $metacourse_options[0] = get_string("no");
             $metacourse_options[1] = get_string("yes");
-            choose_from_menu($metacourse_options, "restore_metacourse", $restore_metacourse, "");
+            echo $OUTPUT->select(html_select::make($metacourse_options, "restore_metacourse", $restore_metacourse, false));
         } else {
             echo get_string("no");
             echo "<input type=\"hidden\" id=\"menurestore_metacourse\" name=\"restore_metacourse\" value=\"0\" />";
@@ -434,7 +434,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             }
             $user_options[1] = get_string("course");
             $user_options[2] = get_string("none");
-            choose_from_menu($user_options, "restore_users", $restore_users, "");
+            echo $OUTPUT->select(html_select::make($user_options, "restore_users", $restore_users, false));
         } else {
             echo get_string("none");
             echo "<input type=\"hidden\" id=\"menurestore_users\" name=\"restore_users\" value=\"2\" />";
@@ -463,7 +463,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             echo get_string('none');
             echo "<input type=\"hidden\" name=\"restore_groups\" value=\"2\" />";
         }*/
-        choose_from_menu($group_options, 'restore_groups', $restore_groups, '');
+        echo $OUTPUT->select(html_select::make($group_options, 'restore_groups', $restore_groups, false));
         echo "</td></tr>";
 
         //Now print the Logs tr
@@ -476,7 +476,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             $log_options = array();
             $log_options[0] = get_string("no");
             $log_options[1] = get_string("yes");
-            choose_from_menu($log_options, "restore_logs", $restore_logs, "");
+            echo $OUTPUT->select(html_select::make($log_options, "restore_logs", $restore_logs, false));
         } else {
             echo get_string("no");
             echo "<input type=\"hidden\" id=\"menurestore_logs\" name=\"restore_logs\" value=\"0\" />";
@@ -493,7 +493,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             $user_file_options = array();
             $user_file_options[0] = get_string("no");
             $user_file_options[1] = get_string("yes");
-            choose_from_menu($user_file_options, "restore_user_files", $restore_user_files, "");
+            echo $OUTPUT->select(html_select::make($user_file_options, "restore_user_files", $restore_user_files, false));
         } else {
             echo get_string("no");
             echo "<input type=\"hidden\" id=\"menurestore_user_files\" name=\"restore_user_files\" value=\"0\" />";
@@ -512,7 +512,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             $course_file_options = array();
             $course_file_options[0] = get_string("no");
             $course_file_options[1] = get_string("yes");
-            choose_from_menu($course_file_options, "restore_course_files", $restore_course_files, "");
+            echo $OUTPUT->select(html_select::make($course_file_options, "restore_course_files", $restore_course_files, false));
         } else {
             echo get_string("no");
             echo "<input type=\"hidden\" id=\"menurestore_course_files\" name=\"restore_course_files\" value=\"0\" />";
@@ -530,7 +530,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             $site_file_options = array();
             $site_file_options[0] = get_string("no");
             $site_file_options[1] = get_string("yes");
-            choose_from_menu($site_file_options, "restore_site_files", $restore_site_files, "");
+            echo $OUTPUT->select(html_select::make($site_file_options, "restore_site_files", $restore_site_files, false));
         } else {
             echo get_string("no");
             echo "<input type=\"hidden\" id=\"menurestore_site_files\" name=\"restore_site_files\" value=\"0\" />";
@@ -547,7 +547,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
                 $gradebook_history_options = array();
                 $gradebook_history_options[0] = get_string("no");
                 $gradebook_history_options[1] = get_string("yes");
-                choose_from_menu($gradebook_history_options, "restore_gradebook_history", $restore_gradebook_history, "");
+                echo $OUTPUT->select(html_select::make($gradebook_history_options, "restore_gradebook_history", $restore_gradebook_history, false));
             } else {
                 echo get_string("no");
                 echo "<input type=\"hidden\" id=\"menurestore_gradebook_history\" name=\"restore_gradebook_history\" value=\"0\" />";
@@ -569,7 +569,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             $message_options = array();
             $message_options[0] = get_string("no");
             $message_options[1] = get_string("yes");
-            choose_from_menu($message_options, "restore_messages", $restore_messages, "");
+            echo $OUTPUT->select(html_select::make($message_options, "restore_messages", $restore_messages, false));
             echo "</td></tr>";
         } else {
             $hidden_options .= '<input type="hidden" name="restore_messages" value="0" />';
@@ -587,7 +587,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             $blog_options = array();
             $blog_options[0] = get_string("no");
             $blog_options[1] = get_string("yes");
-            choose_from_menu($blog_options, "restore_blogs", $restore_blogs, "");
+            echo $OUTPUT->select(html_select::make($blog_options, "restore_blogs", $restore_blogs, false));
             echo "</td></tr>";
         } else {
             $hidden_options .= '<input type="hidden" name="restore_blogs" value="0" />';
@@ -624,7 +624,7 @@ if ($info->backup_moodle_version < 2006092801) {
     $roles = get_roles_with_capability('moodle/legacy:editingteacher', CAP_ALLOW, get_context_instance(CONTEXT_SYSTEM));
 
     $editteacher = reset($roles);
-    choose_from_menu ($siterolesarray, "defaultteacheredit", $editteacher->id, 'new role', '', '0');
+    echo $OUTPUT->select(html_select::make ($siterolesarray, "defaultteacheredit", $editteacher->id, 'new role'));
     echo ('</td></tr>');
 
     /// Non-editting teacher
@@ -637,7 +637,7 @@ if ($info->backup_moodle_version < 2006092801) {
     $roles = get_roles_with_capability('moodle/legacy:teacher', CAP_ALLOW, get_context_instance(CONTEXT_SYSTEM));
     $teacher = reset($roles);
 
-    choose_from_menu ($siterolesarray, "defaultteacher", $teacher->id, 'new role', '', '0');
+    echo $OUTPUT->select(html_select::make ($siterolesarray, "defaultteacher", $teacher->id, 'new role'));
     echo ('</td></tr>');
 
 
@@ -650,7 +650,7 @@ if ($info->backup_moodle_version < 2006092801) {
     $roles = get_roles_with_capability('moodle/legacy:student', CAP_ALLOW, get_context_instance(CONTEXT_SYSTEM));
     $studentrole = array_shift($roles);
 
-    choose_from_menu ($siterolesarray, "defaultstudent", $studentrole->id, 'new role', '', '0');
+    echo $OUTPUT->select(html_select::make ($siterolesarray, "defaultstudent", $studentrole->id, 'new role'));
     echo ('</td></tr>');
 
 } else {
@@ -685,7 +685,7 @@ if ($info->backup_moodle_version < 2006092801) {
                     }
                 }
             }
-            choose_from_menu ($mappableroles, "roles_".$roleid, $matchrole, 'new role', '', '0');
+            echo $OUTPUT->select(html_select::make ($mappableroles, "roles_".$roleid, $matchrole, 'new role'));
             echo ('</td></tr>');
         }
     }