MDL-19795 Upgraded calls to choose_from_menu

This commit is contained in:
nicolasconnault
2009-08-17 15:18:35 +00:00
parent 5387640a12
commit f147f547cb
7 changed files with 37 additions and 20 deletions
+11 -2
View File
@@ -64,7 +64,12 @@ if (!isset($frm->acceptechecktypes)) {
<tr valign="top">
<td align="right">enrol_currency:</td>
<td><?php choose_from_menu(get_list_of_currencies(), "enrol_currency", $frm->enrol_currency, "","", "") ?><br />
<td><?php
$select = html_select::make(get_list_of_currencies(), "enrol_currency", $frm->enrol_currency, false);
$select->nothingvalue = '';
echo $OUTPUT->select($select);
?>
<br />
<?php print_string("currency") ?>
</td>
</tr>
@@ -209,7 +214,11 @@ if (!isset($frm->acceptechecktypes)) {
<td><?php
$sorts = array('ttl' => get_string('adminemailexpiredsortsum', 'enrol_authorize'),
'cnt' => get_string('adminemailexpiredsortcount', 'enrol_authorize'));
choose_from_menu($sorts, "an_sorttype", $frm->an_sorttype, "","", "") ?><br />
$select = html_select::make($sorts, "an_sorttype", $frm->an_sorttype, false);
$select->nothingvalue = '';
echo $OUTPUT->select($select);
?>
<br />
<?php print_string("adminemailexpiredsort", "enrol_authorize") ?></td>
</tr>
+3 -1
View File
@@ -27,7 +27,9 @@ function authorize_print_orders($courseid, $userid) {
$searchmenu = array('orderid' => $authstrs->orderid, 'transid' => $authstrs->transid, 'cclastfour' => $authstrs->cclastfour);
$buttons = "<form method='post' action='index.php' autocomplete='off'><div>";
$buttons .= choose_from_menu($searchmenu, 'searchtype', $searchtype, '', '', '0', true);
$select = html_select::make($searchmenu, 'searchtype', $searchtype, false);
$select->nothingvalue = '';
$buttons .= $OUTPUT->select($select);
$buttons .= "<input type='text' size='16' name='searchquery' value='' />";
$buttons .= "<input type='submit' value='$strs->search' />";
$buttons .= "</div></form>";
+8 -6
View File
@@ -19,7 +19,9 @@
if (!isset($frm->enrol_dbtype)) {
$frm->enrol_dbtype = 'mysql';
}
choose_from_menu($dboptions, "enrol_dbtype", $frm->enrol_dbtype, '', '', '');
$select = html_select::make($dboptions, "enrol_dbtype", $frm->enrol_dbtype, false);
$select->nothingvalue = '';
echo $OUTPUT->select($select);
?>
</td>
@@ -160,7 +162,7 @@
$assignableroles = get_assignable_roles($sitecontext);
$assignableroles = array('' => get_string('default')) + $assignableroles;
choose_from_menu($assignableroles, 'enrol_db_defaultcourseroleid', $frm->enrol_db_defaultcourseroleid, '');
echo $OUTPUT->select(html_select::make($assignableroles, 'enrol_db_defaultcourseroleid', $frm->enrol_db_defaultcourseroleid, false));
if (isset($err['enrol_db_defaultcourseroleid'])) formerr($err['enrol_db_defaultcourseroleid']);
?>
</td>
@@ -178,7 +180,7 @@
<td align="right">enrol_db_autocreate:</td>
<td>
<?php
choose_from_menu($yesno, "enrol_db_autocreate", $frm->enrol_db_autocreate, "");
echo $OUTPUT->select(html_select::make($yesno, "enrol_db_autocreate", $frm->enrol_db_autocreate, false));
if (isset($err["enrol_db_autocreate"])) formerr($err["enrol_db_autocreate"]);
?>
</td>
@@ -194,7 +196,7 @@
$displaylist = array();
$parentlist = array();
make_categories_list($displaylist, $parentlist);
choose_from_menu($displaylist, "enrol_db_category", $frm->enrol_db_category, "");
echo $OUTPUT->select(html_select::make($displaylist, "enrol_db_category", $frm->enrol_db_category, false));
?>
<?php if (isset($err["enrol_db_category"])) formerr($err["enrol_db_category"]); ?>
@@ -223,7 +225,7 @@
<td align="right">enrol_db_ignorehiddencourse:</td>
<td>
<?php
choose_from_menu($yesno, "enrol_db_ignorehiddencourse", $frm->enrol_db_ignorehiddencourse, "");
echo $OUTPUT->select(html_select::make($yesno, "enrol_db_ignorehiddencourse", $frm->enrol_db_ignorehiddencourse, false));
if (isset($err['enrol_db_ignorehiddencourse'])) {
formerr($err['enrol_db_ignorehiddencourse']);
}
@@ -238,7 +240,7 @@
<td align="right">enrol_db_disableunenrol:</td>
<td>
<?php
choose_from_menu($yesno, "enrol_db_disableunenrol", $frm->enrol_db_disableunenrol, "");
echo $OUTPUT->select(html_select::make($yesno, "enrol_db_disableunenrol", $frm->enrol_db_disableunenrol, false));
if (isset($err['enrol_db_disableunenrol'])) {
formerr($err['enrol_db_disableunenrol']);
}
+2 -2
View File
@@ -117,8 +117,8 @@ foreach($this->imsroles as $imsrolenum=>$imsrolename){
$configref = "enrol_imse_imsrolemap" . $imsrolenum;
choose_from_menu($assignableroles, 'enrol_imse_imsrolemap'.$imsrolenum,
strlen($frm->$configref) ? $frm->$configref : $this->determine_default_rolemapping($imsrolenum), '');
echo $OUTPUT->select(html_select::make($assignableroles, 'enrol_imse_imsrolemap'.$imsrolenum,
strlen($frm->$configref) ? $frm->$configref : $this->determine_default_rolemapping($imsrolenum), false));
?>
</td>
<td>
+4 -4
View File
@@ -108,7 +108,7 @@ if (!isset($frm->enrol_ldap_template)) {
<?php
$versions[2] = "2";
$versions[3] = "3";
choose_from_menu($versions, "enrol_ldap_version", $frm->enrol_ldap_version, "");
echo $OUTPUT->select(html_select::make($versions, "enrol_ldap_version", $frm->enrol_ldap_version, false));
if (isset($err["enrol_ldap_version"])) formerr($err["enrol_ldap_version"]);
?>
</td>
@@ -144,7 +144,7 @@ if (!isset($frm->enrol_ldap_template)) {
$choices = array();
$choices["0"] = get_string("no");
$choices["1"] = get_string("yes");
choose_from_menu ($choices, "enrol_ldap_search_sub", $frm->enrol_ldap_search_sub, "");
echo $OUTPUT->select(html_select::make ($choices, "enrol_ldap_search_sub", $frm->enrol_ldap_search_sub, false));
?>
<?php if (isset($err["enrol_ldap_search_sub"])) formerr($err["enrol_ldap_search_sub"]); ?>
</td><td>
@@ -351,7 +351,7 @@ if (!isset($frm->enrol_ldap_template)) {
<td align="right">enrol_ldap_autocreate:</td>
<td>
<?php
choose_from_menu(array('0'=>'no','1'=>'yes'), "enrol_ldap_autocreate", $frm->enrol_ldap_autocreate, "");
echo $OUTPUT->select(html_select::make(array('0'=>'no','1'=>'yes'), "enrol_ldap_autocreate", $frm->enrol_ldap_autocreate, false));
if (isset($err["enrol_ldap_autocreate"])) formerr($err["enrol_ldap_autocreate"]);
?>
</td>
@@ -366,7 +366,7 @@ if (!isset($frm->enrol_ldap_template)) {
$displaylist = array();
$parentlist = array();
make_categories_list($displaylist, $parentlist);
choose_from_menu($displaylist, "enrol_ldap_category", $frm->enrol_ldap_category, "");
echo $OUTPUT->select(html_select::make($displaylist, "enrol_ldap_category", $frm->enrol_ldap_category, false));
?>
<?php if (isset($err["enrol_ldap_category"])) formerr($err["enrol_ldap_category"]); ?>
+4 -4
View File
@@ -9,7 +9,7 @@
foreach ($roles as $id=>$role) {
$rolenames[$id]=$role->name;
}
choose_from_menu($rolenames, 'enrol_manual_keyholderrole', $frm->enrol_manual_keyholderrole);
echo $OUTPUT->select(html_select::make($rolenames, 'enrol_manual_keyholderrole', $frm->enrol_manual_keyholderrole));
?>
</td>
<td>
@@ -24,7 +24,7 @@
$choices = array();
$choices['0'] = get_string('no');
$choices['1'] = get_string('yes');
choose_from_menu ($choices, 'enrol_manual_showhint', $frm->enrol_manual_showhint, '');
echo $OUTPUT->select(html_select::make($choices, 'enrol_manual_showhint', $frm->enrol_manual_showhint, false));
?>
</td><td>
<?php print_string('enrol_manual_showhint', 'enrol_manual') ?>
@@ -38,7 +38,7 @@
$choices = array();
$choices['0'] = get_string('no');
$choices['1'] = get_string('yes');
choose_from_menu ($choices, 'enrol_manual_usepasswordpolicy', $frm->enrol_manual_usepasswordpolicy, '');
echo $OUTPUT->select(html_select::make($choices, 'enrol_manual_usepasswordpolicy', $frm->enrol_manual_usepasswordpolicy, false));
?>
</td><td>
<?php print_string('enrol_manual_usepasswordpolicy', 'enrol_manual') ?>
@@ -52,7 +52,7 @@
$choices = array();
$choices['0'] = get_string('no');
$choices['1'] = get_string('yes');
choose_from_menu ($choices, 'enrol_manual_requirekey', $frm->enrol_manual_requirekey, '');
echo $OUTPUT->select(html_select::make($choices, 'enrol_manual_requirekey', $frm->enrol_manual_requirekey, false));
?>
</td><td>
<?php print_string('enrol_manual_requirekey', 'enrol_manual') ?>
+5 -1
View File
@@ -13,7 +13,11 @@
<tr valign="top">
<td align="right">enrol_currency:</td>
<td>
<?php choose_from_menu ($paypalcurrencies, "enrol_currency", $frm->enrol_currency, "","", "") ?>
<?php
$select = html_select::make($paypalcurrencies, "enrol_currency", $frm->enrol_currency, false);
$select->nothingvalue = '';
echo $OUTPUT->select($select);
?>
</td>
<td>
<?php print_string("currency") ?>