MDL-19825 Upgraded calls to choose_from_menu

diff --git a/user/addnote.php b/user/addnote.php
index c75f88afa470337e09f1f68e9294db57264db431..5807f4bca2bdf6824782c9eef348d2a47ade6d6a 100644 (file)
--- a/user/addnote.php
+++ b/user/addnote.php
@@ -81,7 +81,7 @@ foreach ($users as $k => $v) {
     if(!$user = $DB->get_record('user', array('id'=>$v))) {
         continue;
     }
-    $checkbox = choose_from_menu($state_names, 'states[' . $k . ']', empty($states[$k]) ? NOTES_STATE_PUBLIC : $states[$k], '', '', '0', true);
+    $checkbox = $OUTPUT->select(html_select::make($state_names, 'states[' . $k . ']', empty($states[$k]) ? NOTES_STATE_PUBLIC : $states[$k], false));
     $table->data[] = array(
         '<input type="hidden" name="userid['.$k.']" value="'.$v.'" />'. fullname($user, true),
         '<textarea name="contents['. $k . ']" rows="2" cols="40">' . strip_tags(@$contents[$k]) . '</textarea>',

diff --git a/user/extendenrol.php b/user/extendenrol.php
index 54eab5a27cd4c71577ac8d7dd9df80696af2f911..b4d1b0fef75c68fae02d83e23e5b993aaed5f1f5 100644 (file)
--- a/user/extendenrol.php
+++ b/user/extendenrol.php
@@ -143,15 +143,15 @@ foreach ($_POST as $k => $v) {
             $timeend = $unlimited;
             unset($userbasemenu[2]);
         }
-        $checkbox = choose_from_menu($periodmenu, "extendperiod[{$m[1]}]", "0", $nochange, '', '0', true);
-        $checkbox2 = choose_from_menu($userbasemenu, "extendbase[{$m[1]}]", "2", "", '', '0', true);
+        
+        $checkbox = $OUTPUT->select(html_select::make($periodmenu, "extendperiod[{$m[1]}]", "0", $nochange));
+        $checkbox2 = $OUTPUT->select(html_select::make($userbasemenu, "extendbase[{$m[1]}]", "2", false));
         $table->data[] = array(
-        fullname($user, true),
-        $timestart,
-        $timeend,
-        '<input type="hidden" name="userid['.$m[1].']" value="'.$m[1].'" />'.$checkbox,
-        $checkbox2
-        );
+                fullname($user, true),
+                $timestart,
+                $timeend,
+                '<input type="hidden" name="userid['.$m[1].']" value="'.$m[1].'" />'.$checkbox,
+                $checkbox2);
     }
 }
 print_table($table);

diff --git a/user/groupaddnote.php b/user/groupaddnote.php
index f3801f4592939bf3d8bb243b84f3a6dcd3733e07..060026fdd33095c761296ba82cc91dc28118e27d 100644 (file)
--- a/user/groupaddnote.php
+++ b/user/groupaddnote.php
@@ -89,7 +89,7 @@ echo '<br /><textarea name="content" rows="5" cols="50">' . strip_tags(@$content
 
 echo '<p>' . $strpublishstate;
 helpbutton('status', $strpublishstate, 'notes');
-choose_from_menu($state_names, 'state', empty($state) ? NOTES_STATE_PUBLIC : $state, '');
+echo $OUTPUT->select(html_select::make($state_names, 'state', empty($state) ? NOTES_STATE_PUBLIC : $state, false));
 echo '</p>';
 
 echo '<input type="submit" value="' . get_string('savechanges'). '" /></div></form>';

diff --git a/user/groupextendenrol.php b/user/groupextendenrol.php
index 7841f3e2a88349e5b023b301ede777e6ac110c7f..9900ec8dec6238cf5d199d004338c58341a65fdb 100755 (executable)
--- a/user/groupextendenrol.php
+++ b/user/groupextendenrol.php
@@ -148,9 +148,9 @@ foreach ($_POST as $k => $v) {
 print_table($table);
 echo '<div style="width:100%;text-align:center;"><strong>';
 echo get_string('extendperiod') . ' ';
-choose_from_menu($periodmenu, "extendperiod");
+echo $OUTPUT->select(html_select::make($periodmenu, 'extendperiod'));
 echo ' ' . get_string('startingfrom') . ' ';
-choose_from_menu($basemenu, "extendbase", "2", "");
+echo $OUTPUT->select(html_select::make($basemenu, 'extendbase', '2', false));
 echo '</strong><br />';
 echo '<input type="submit" value="'.get_string('savechanges').'" />';
 echo '</div></form>';