MDL-19794 Upgraded calls to choose_from_menu

diff --git a/course/lib.php b/course/lib.php
index 2e1b6187209e1ebbab7227d7b9d6d5e2643b2dd5..71c1fb057fdbc034061952464f28863e8e6e475a 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -1868,7 +1868,7 @@ function print_whole_category_list($category=NULL, $displaylist=NULL, $parentsli
 }
 
 /**
- * This function will return $options array for choose_from_menu, with whitespace to denote nesting.
+ * This function will return $options array for $OUTPUT->select(), with whitespace to denote nesting.
  */
 function make_categories_options() {
     make_categories_list($cats,$parents);
@@ -2952,7 +2952,7 @@ function print_standard_coursemodule_settings($form, $features=null) {
  * Print groupmode form element on module setup forms in mod/.../mod_form.php
  */
 function print_groupmode_setting($form, $course=NULL) {
-    global $DB;
+    global $DB, $OUTPUT;
 
     if (empty($course)) {
         if (!$course = $DB->get_record('course', array('id'=>$form->course))) {
@@ -2976,7 +2976,9 @@ function print_groupmode_setting($form, $course=NULL) {
         $choices[NOGROUPS] = get_string('groupsnone');
         $choices[SEPARATEGROUPS] = get_string('groupsseparate');
         $choices[VISIBLEGROUPS] = get_string('groupsvisible');
-        choose_from_menu($choices, 'groupmode', $groupmode, '', '', 0, false, $course->groupmodeforce);
+        $select = html_select::make($choices, 'groupmode', $groupmode, false);
+        $select->disabled = $course->groupmodeforce;
+        echo $OUTPUT->select($select);
         helpbutton('groupmode', get_string('groupmode'));
         echo '</td></tr>';
     }
@@ -2986,7 +2988,7 @@ function print_groupmode_setting($form, $course=NULL) {
  * Print groupmode form element on module setup forms in mod/.../mod_form.php
  */
 function print_grouping_settings($form, $course=NULL) {
-    global $DB;
+    global $DB, $OUTPUT;
 
     if (empty($course)) {
         if (! $course = $DB->get_record('course', array('id'=>$form->course))) {
@@ -3009,7 +3011,7 @@ function print_grouping_settings($form, $course=NULL) {
 
         $groupingid = isset($cm->groupingid) ? $cm->groupingid : 0;
 
-        choose_from_menu($groupings, 'groupingid', $groupingid, get_string('none'), '', 0, false);
+        echo $OUTPUT->select(html_select::make($groupings, 'groupingid', $groupingid, get_string('none')));
         echo '</td></tr>';
 
         $checked = empty($cm->groupmembersonly) ? '':'checked="checked"';
@@ -3026,7 +3028,7 @@ function print_grouping_settings($form, $course=NULL) {
  * Print visibility setting form element on module setup forms in mod/.../mod_form.php
  */
 function print_visible_setting($form, $course=NULL) {
-    global $DB;
+    global $DB, $OUTPUT;
     if (empty($course)) {
         if (!$course = $DB->get_record('course', array('id'=>$form->course))) {
             print_error("invalidcourseid");
@@ -3051,7 +3053,9 @@ function print_visible_setting($form, $course=NULL) {
     echo '<td align="right"><b>'.get_string('visible', '').':</b></td>';
     echo '<td align="left">';
     $choices = array(1 => get_string('show'), 0 => get_string('hide'));
-    choose_from_menu($choices, 'visible', $visible, '', '', 0, false, $hiddensection);
+    $select = html_select::make($choices, 'visible', $visible, false);
+    $select->disabled = $hiddensection;
+    echo $OUTPUT->select($select);
     echo '</td></tr>';
 }
 

diff --git a/course/report/log/lib.php b/course/report/log/lib.php
index a73f44820eba939fc7c2341ae8130477aeea1b4b..cf79b1ad4fdb842c62e5310494763f0ff4fa6017 100644 (file)
--- a/course/report/log/lib.php
+++ b/course/report/log/lib.php
@@ -3,7 +3,7 @@
 function print_mnet_log_selector_form($hostid, $course, $selecteduser=0, $selecteddate='today',
                                  $modname="", $modid=0, $modaction='', $selectedgroup=-1, $showcourses=0, $showusers=0, $logformat='showashtml') {
 
-    global $USER, $CFG, $SITE, $DB;
+    global $USER, $CFG, $SITE, $DB, $OUTPUT;
     require_once $CFG->dirroot.'/mnet/peer.php';
     
     $mnet_peer = new mnet_peer();
@@ -227,7 +227,7 @@ function print_mnet_log_selector_form($hostid, $course, $selecteduser=0, $select
     } else {
         $courses = array();
         $courses[$course->id] = $course->fullname . ((empty($course->category)) ? ' ('.get_string('site').') ' : '');
-        choose_from_menu($courses,"id",$course->id,false);
+        echo $OUTPUT->select(html_select::make($courses,"id",$course->id, false));
         if (has_capability('coursereport/log:view', $sitecontext)) {
             $a = new object();
             $a->url = "$CFG->wwwroot/course/report/log/index.php?chooselog=0&group=$selectedgroup&user=$selecteduser"
@@ -245,11 +245,11 @@ function print_mnet_log_selector_form($hostid, $course, $selecteduser=0, $select
         else {
             $groups = array();
         }
-        choose_from_menu ($groups, "group", $selectedgroup, get_string("allgroups") );
+        echo $OUTPUT->select(html_select::make($groups, "group", $selectedgroup, get_string("allgroups")));
     }
 
     if ($showusers) {
-        choose_from_menu ($users, "user", $selecteduser, get_string("allparticipants") );
+        echo $OUTPUT->select(html_select::make($users, "user", $selecteduser, get_string("allparticipants")));
     }
     else {
         $users = array();
@@ -260,20 +260,26 @@ function print_mnet_log_selector_form($hostid, $course, $selecteduser=0, $select
         else {
             $users[0] = get_string('allparticipants');
         }
-        choose_from_menu($users, 'user', $selecteduser, false);
+        echo $OUTPUT->select(html_select::make($users, "user", $selecteduser, false));
         $a->url = "$CFG->wwwroot/course/report/log/index.php?chooselog=0&group=$selectedgroup&user=$selecteduser"
             ."&id=$course->id&date=$selecteddate&modid=$selectedactivity&showusers=1&showcourses=$showcourses";
         print_string('logtoomanyusers','moodle',$a);
     }
-    choose_from_menu ($dates, "date", $selecteddate, get_string("alldays"));
-    choose_from_menu ($activities, "modid", $selectedactivity, get_string("allactivities"), "", "");
-    choose_from_menu ($actions, 'modaction', $modaction, get_string("allactions"));
+    
+    echo $OUTPUT->select(html_select::make($dates, "date", $selecteddate, get_string("alldays")));
+    
+    $select = html_select::make($activities, "modid", $selectedactivity);
+    $select->nothinglabel = get_string("allactivities");
+    $select->nothingvalue = '';
+    echo $OUTPUT->select($select);
+    
+    echo $OUTPUT->select(html_select::make($actions, 'modaction', $modaction, get_string("allactions")));
     
     $logformats = array('showashtml' => get_string('displayonpage'),
                         'downloadascsv' => get_string('downloadtext'),
                         'downloadasods' => get_string('downloadods'),
                         'downloadasexcel' => get_string('downloadexcel'));
-    choose_from_menu ($logformats, 'logformat', $logformat, false);
+    echo $OUTPUT->select(html_select::make($logformats, 'logformat', $logformat, false));
     echo '<input type="submit" value="'.get_string('gettheselogs').'" />';
     echo '</div>';
     echo '</form>';
@@ -282,7 +288,7 @@ function print_mnet_log_selector_form($hostid, $course, $selecteduser=0, $select
 function print_log_selector_form($course, $selecteduser=0, $selecteddate='today',
                                  $modname="", $modid=0, $modaction='', $selectedgroup=-1, $showcourses=0, $showusers=0, $logformat='showashtml') {
 
-    global $USER, $CFG, $DB;
+    global $USER, $CFG, $DB, $OUTPUT;
 
     // first check to see if we can override showcourses and showusers
     $numcourses =  $DB->count_records("course");
@@ -434,12 +440,12 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate='today'
     echo "<input type=\"hidden\" name=\"showusers\" value=\"$showusers\" />\n";
     echo "<input type=\"hidden\" name=\"showcourses\" value=\"$showcourses\" />\n";
     if (has_capability('coursereport/log:view', $sitecontext) && $showcourses) {
-        choose_from_menu ($courses, "id", $course->id, "");
+        echo $OUTPUT->select(html_select::make($courses, "id", $course->id, false));
     } else {
         //        echo '<input type="hidden" name="id" value="'.$course->id.'" />';
         $courses = array();
         $courses[$course->id] = $course->fullname . (($course->id == SITEID) ? ' ('.get_string('site').') ' : '');
-        choose_from_menu($courses,"id",$course->id,false);
+        echo $OUTPUT->select(html_select::make($courses,"id",$course->id, false));
         if (has_capability('coursereport/log:view', $sitecontext)) {
             $a = new object();
             $a->url = "$CFG->wwwroot/course/report/log/index.php?chooselog=0&group=$selectedgroup&user=$selecteduser"
@@ -457,11 +463,11 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate='today'
         else {
             $groups = array();
         }
-        choose_from_menu ($groups, "group", $selectedgroup, get_string("allgroups") );
+        echo $OUTPUT->select(html_select::make($groups, "group", $selectedgroup, get_string("allgroups")));
     }
 
     if ($showusers) {
-        choose_from_menu ($users, "user", $selecteduser, get_string("allparticipants") );
+        echo $OUTPUT->select(html_select::make($users, "user", $selecteduser, get_string("allparticipants")));
     }
     else {
         $users = array();
@@ -472,21 +478,27 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate='today'
         else {
             $users[0] = get_string('allparticipants');
         }
-        choose_from_menu($users, 'user', $selecteduser, false);
+        echo $OUTPUT->select(html_select::make($users, "user", $selecteduser, false));
         $a = new object();
         $a->url = "$CFG->wwwroot/course/report/log/index.php?chooselog=0&group=$selectedgroup&user=$selecteduser"
             ."&id=$course->id&date=$selecteddate&modid=$selectedactivity&showusers=1&showcourses=$showcourses";
         print_string('logtoomanyusers','moodle',$a);
     }
-    choose_from_menu ($dates, "date", $selecteddate, get_string("alldays"));
-    choose_from_menu ($activities, "modid", $selectedactivity, get_string("allactivities"), "", "");
-    choose_from_menu ($actions, 'modaction', $modaction, get_string("allactions"));
+    echo $OUTPUT->select(html_select::make($dates, "date", $selecteddate, get_string("alldays")));
+    
+    $select = html_select::make($activities, "modid", $selectedactivity);
+    $select->nothinglabel = get_string("allactivities");
+    $select->nothingvalue = '';
+    echo $OUTPUT->select($select);
+    
+    echo $OUTPUT->select(html_select::make($actions, 'modaction', $modaction, get_string("allactions")));
     
     $logformats = array('showashtml' => get_string('displayonpage'),
                         'downloadascsv' => get_string('downloadtext'),
                         'downloadasods' => get_string('downloadods'),
                         'downloadasexcel' => get_string('downloadexcel'));
-    choose_from_menu ($logformats, 'logformat', $logformat, false);
+    
+    echo $OUTPUT->select(html_select::make($logformats, 'logformat', $logformat, false));
     echo '<input type="submit" value="'.get_string('gettheselogs').'" />';
     echo '</div>';
     echo '</form>';

diff --git a/course/report/participation/index.php b/course/report/participation/index.php
index 4d8ece267fff1d2ae69da95b10ca53e6874fa99f..846376df8ff9c3d96e6635948ff8e48dc978bcec 100644 (file)
--- a/course/report/participation/index.php
+++ b/course/report/participation/index.php
@@ -121,11 +121,11 @@
     $select->nested = true;
     echo $OUTPUT->select($select);
     echo '<label for="menutimefrom">'.get_string('lookback').'</label>'."\n";
-    choose_from_menu($timeoptions,'timefrom',$timefrom);
+    echo $OUTPUT->select(html_select::make($timeoptions,'timefrom',$timefrom));
     echo '<label for="menuroleid">'.get_string('showonly').'</label>'."\n";
-    choose_from_menu($roleoptions,'roleid',$roleid,'');
+    echo $OUTPUT->select(html_select::make($roleoptions,'roleid',$roleid,false));
     echo '<label for="menuaction">'.get_string('showactions').'</label>'."\n";
-    choose_from_menu($actionoptions,'action',$action,'');
+    echo $OUTPUT->select(html_select::make($actionoptions,'action',$action,false));
     helpbutton('participationreport',get_string('participationreport'));
     echo '<input type="submit" value="'.get_string('go').'" />'."\n</div></form>\n";
 

diff --git a/course/report/stats/report.php b/course/report/stats/report.php
index 961724cdefc2f068f3a0e35606c4c0947f909ff8..274039c36b4a67aba799133697f7c8097d34546f 100644 (file)
--- a/course/report/stats/report.php
+++ b/course/report/stats/report.php
@@ -44,21 +44,21 @@
         }
 
         $table->align = array('left','left','left','left','left','left','left','left');
-        $table->data[] = array(get_string('course'),choose_from_menu($courseoptions,'course',$course->id,'','','',true),
-                               get_string('users'),choose_from_menu($users,'userid',$userid,'','','',true),
-                               get_string('statsreporttype'),choose_from_menu($reportoptions,'report',($report == 5) ? $report.$roleid : $report,'','','',true),
-                               get_string('statstimeperiod'),choose_from_menu($timeoptions,'time',$time,'','','',true),
+        $table->data[] = array(get_string('course'),$OUTPUT->select(html_select::make($courseoptions,'course',$course->id,false)),
+                               get_string('users'),$OUTPUT->select(html_select::make($users,'userid',$userid,false)),
+                               get_string('statsreporttype'),$OUTPUT->select(html_select::make($reportoptions,'report',($report == 5) ? $report.$roleid : $report,false)),
+                               get_string('statstimeperiod'),$OUTPUT->select(html_select::make($timeoptions,'time',$time,false)),
                                '<input type="submit" value="'.get_string('view').'" />') ;
     } else if ($mode == STATS_MODE_RANKED) {
         $table->align = array('left','left','left','left','left','left');
-        $table->data[] = array(get_string('statsreporttype'),choose_from_menu($reportoptions,'report',($report == 5) ? $report.$roleid : $report,'','','',true),
-                               get_string('statstimeperiod'),choose_from_menu($timeoptions,'time',$time,'','','',true),
+        $table->data[] = array(get_string('statsreporttype'),$OUTPUT->select(html_select::make($reportoptions,'report',($report == 5) ? $report.$roleid : $report,false)),
+                               get_string('statstimeperiod'),$OUTPUT->select(html_select::make($timeoptions,'time',$time,false)),
                                '<input type="submit" value="'.get_string('view').'" />') ;
     } else if ($mode == STATS_MODE_GENERAL) {
         $table->align = array('left','left','left','left','left','left','left');
-        $table->data[] = array(get_string('course'),choose_from_menu($courseoptions,'course',$course->id,'','','',true),
-                               get_string('statsreporttype'),choose_from_menu($reportoptions,'report',($report == 5) ? $report.$roleid : $report,'','','',true),
-                               get_string('statstimeperiod'),choose_from_menu($timeoptions,'time',$time,'','','',true),
+        $table->data[] = array(get_string('course'),$OUTPUT->select(html_select::make($courseoptions,'course',$course->id,false)),
+                               get_string('statsreporttype'),$OUTPUT->select(html_select::make($reportoptions,'report',($report == 5) ? $report.$roleid : $report,false)),
+                               get_string('statstimeperiod'),$OUTPUT->select(html_select::make($timeoptions,'time',$time,false)),
                                '<input type="submit" value="'.get_string('view').'" />') ;
     }
 

diff --git a/course/scales.php b/course/scales.php
index 7da197ef7cd8a55a41d8b53933066651b2ff0f83..adbcba7868c9c10aa8cffa7430ef2f224cb5d35a 100644 (file)
--- a/course/scales.php
+++ b/course/scales.php
@@ -37,7 +37,7 @@
                 print_simple_box_start("center");
                 echo $OUTPUT->heading($scale->name);
                 echo "<center>";
-                choose_from_menu($scalemenu, "", "", "");
+                echo $OUTPUT->select(html_select::make($scalemenu));
                 echo "</center>";
                 echo text_to_html($scale->description);
                 print_simple_box_end();
@@ -63,7 +63,7 @@
             print_simple_box_start("center");
             echo $OUTPUT->heading($scale->name);
             echo "<center>";
-            choose_from_menu($scalemenu, "", "", "");
+            echo $OUTPUT->select(html_select::make($scalemenu));
             echo "</center>";
             echo text_to_html($scale->description);
             print_simple_box_end();
@@ -86,7 +86,7 @@
             print_simple_box_start("center");
             echo $OUTPUT->heading($scale->name);
             echo "<center>";
-            choose_from_menu($scalemenu, "", "", "");
+            echo $OUTPUT->select(html_select::make($scalemenu));
             echo "</center>";
             echo text_to_html($scale->description);
             print_simple_box_end();