From 4b9210f31bdefdefc2944c1e64d0580d58c293ab Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sat, 16 Jan 2010 18:25:51 +0000 Subject: [PATCH] MDL-21235 more conversion to new select --- admin/auth_config.php | 8 ++-- admin/enrol.php | 2 +- admin/mnet/access_control.php | 4 +- admin/register.php | 22 +++------- admin/report/courseoverview/index.php | 9 +--- admin/report/questioninstances/index.php | 4 +- admin/roles/assign.php | 4 +- admin/roles/lib.php | 2 +- admin/timezone.php | 4 +- .../actions/edit_field/edit_field.class.php | 20 ++++----- .../actions/edit_index/edit_index.class.php | 5 +-- .../xmldb/actions/edit_key/edit_key.class.php | 5 +-- .../new_statement/new_statement.class.php | 2 +- .../new_table_from_mysql.class.php | 2 +- .../view_structure_php.class.php | 2 +- .../view_table_php/view_table_php.class.php | 2 +- auth/cas/config.html | 24 ++++------- auth/db/config.html | 10 ++--- auth/email/config.html | 2 +- auth/imap/config.html | 2 +- auth/ldap/config.html | 28 ++++++------ auth/mnet/config.html | 2 +- auth/pop3/config.html | 2 +- auth/radius/config.html | 2 +- backup/backup_form.html | 18 ++++---- backup/restore_form.html | 24 +++++------ blocks/loancalc/block_loancalc.php | 2 +- calendar/lib.php | 3 +- calendar/preferences.html | 20 +++------ course/lib.php | 2 +- course/report/log/lib.php | 43 ++++++++----------- course/report/participation/index.php | 6 +-- course/report/stats/report.php | 18 ++++---- enrol/authorize/config_form.php | 8 +--- enrol/authorize/locallib.php | 4 +- enrol/database/config.html | 14 +++--- enrol/imsenterprise/config.html | 4 +- enrol/ldap/config.html | 6 +-- enrol/manual/config.html | 8 ++-- enrol/paypal/config.html | 4 +- filter/manage.php | 4 +- lib/outputcomponents.php | 2 +- lib/tablelib.php | 4 +- lib/weblib.php | 2 +- message/lib.php | 7 ++- mod/data/field.php | 2 +- mod/data/field/file/mod.html | 5 +-- mod/data/field/latlong/field.class.php | 2 +- mod/data/field/menu/field.class.php | 8 +--- mod/data/field/picture/mod.html | 5 +-- mod/data/field/radiobutton/field.class.php | 2 +- mod/data/lib.php | 10 ++--- mod/forum/lib.php | 4 +- mod/forum/search.php | 2 +- mod/glossary/lib.php | 5 +-- mod/hotpot/report.php | 4 +- mod/quiz/report/statistics/report.php | 4 +- mod/wiki/checklinks.html | 2 +- .../ewiki/plugins/moodle/moodle_wikidump.php | 8 +--- mod/wiki/revertpages.html | 2 +- question/type/calculated/questiontype.php | 15 +++---- 61 files changed, 180 insertions(+), 272 deletions(-) diff --git a/admin/auth_config.php b/admin/auth_config.php index fe379912556..9e99e04a02a 100644 --- a/admin/auth_config.php +++ b/admin/auth_config.php @@ -147,23 +147,23 @@ function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts, echo "$varname}\" />"; echo '
'; echo ' '; - echo $OUTPUT->select(html_select::make($updatelocaloptions, "lockconfig_field_updatelocal_{$field}", $pluginconfig->{"field_updatelocal_$field"}, false)); + echo html_writer::input_select($updatelocaloptions, "lockconfig_field_updatelocal_{$field}", $pluginconfig->{"field_updatelocal_$field"}, false); echo '
'; if ($updateopts) { echo ' '; - echo $OUTPUT->select(html_select::make($updateextoptions, "lockconfig_field_updateremote_{$field}", $pluginconfig->{"field_updateremote_$field"}, false)); + echo html_writer::input_select($updateextoptions, "lockconfig_field_updateremote_{$field}", $pluginconfig->{"field_updateremote_$field"}, false); echo '
'; } echo ' '; - echo $OUTPUT->select(html_select::make($lockoptions, "lockconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, false)); + echo html_writer::input_select($lockoptions, "lockconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, false); echo '
'; } else { echo ''; echo ''; echo ''; - echo $OUTPUT->select(html_select::make($lockoptions, "lockconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, false)); + echo html_writer::input_select($lockoptions, "lockconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, false); } echo ''; if (!empty($helptext)) { diff --git a/admin/enrol.php b/admin/enrol.php index 00562e190d7..62f705a7b27 100644 --- a/admin/enrol.php +++ b/admin/enrol.php @@ -125,7 +125,7 @@ echo 'sendcoursewelcomemessage'; echo ''; echo '
'; - echo $OUTPUT->select(html_select::make($yesnooptions, 'sendcoursewelcomemessage', $CFG->sendcoursewelcomemessage, false)); + echo html_writer::input_select($yesnooptions, 'sendcoursewelcomemessage', $CFG->sendcoursewelcomemessage, false); echo '
'.get_string('defaultsettinginfo', 'admin', get_string('yes')).'
'; echo '
' . get_string('configsendcoursewelcomemessage', 'admin') . '
'; echo ''; diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php index 17a769f1da0..2386bf3633b 100644 --- a/admin/mnet/access_control.php +++ b/admin/mnet/access_control.php @@ -214,7 +214,7 @@ echo " " . get_string('remotehost', 'mnet') . ":\n"; if (!empty($formerror['mnet_host_id'])) { echo ' * '; } -echo $OUTPUT->select(html_select::make($mnethosts, 'mnet_host_id')); +echo html_writer::input_select($mnethosts, 'mnet_host_id'); // choose an access level echo " " . get_string('accesslevel', 'mnet') . ":\n"; @@ -223,7 +223,7 @@ if (!empty($formerror['accessctrl'])) { } $accessmenu['allow'] = get_string('allow', 'mnet'); $accessmenu['deny'] = get_string('deny', 'mnet'); -echo $OUTPUT->select(html_select::make($accessmenu, 'accessctrl')); +echo html_writer::input_select($accessmenu, 'accessctrl'); // submit button echo ''; diff --git a/admin/register.php b/admin/register.php index 9f1b293557f..d6fa8fa0007 100644 --- a/admin/register.php +++ b/admin/register.php @@ -71,34 +71,28 @@ echo '
'; echo '
'; echo '
'; - $select = html_select::make(get_list_of_countries(), "country", $admin->country, get_string("selectacountry")."..."); - $select->nothingvalue = ''; - echo $OUTPUT->select($select); + echo html_writer::input_select(get_list_of_countries(), "country", $admin->country, array(''=>get_string("selectacountry")."...")); echo '
'; echo '
'; echo '
'; echo '
'; echo '
'; + $options = array(); $options[0] = get_string("publicdirectory0"); $options[1] = get_string("publicdirectory1"); $options[2] = get_string("publicdirectory2"); - $select = html_select::make($options, "public", "2", false); - $select->nothingvalue = ''; - echo $OUTPUT->select($select); - unset($options); + echo html_writer::input_select($options, "public", "2", false); echo '
'; echo '
'; echo '
'; echo '
'; echo '
'; + $options = array(); $options[0] = get_string("registrationcontactno"); $options[1] = get_string("registrationcontactyes"); - $select = html_select::make($options, "contact", "1", false); - $select->nothingvalue = ''; - echo $OUTPUT->select($select); - unset($options); + echo html_writer::input_select($options, "contact", "1", false); echo '
'; echo '
'; @@ -170,12 +164,10 @@ echo '
'; echo '
'; echo '
'; + $options = array(); $options[0] = get_string("registrationno"); $options[1] = get_string("registrationyes"); - $select = html_select::make($options, "mailme", "1", false); - $select->nothingvalue = ''; - echo $OUTPUT->select($select); - unset($options); + echo html_writer::input_select($options, "mailme", "1", false); echo '
'; echo '
'; diff --git a/admin/report/courseoverview/index.php b/admin/report/courseoverview/index.php index af60b502d4f..01b41c33222 100644 --- a/admin/report/courseoverview/index.php +++ b/admin/report/courseoverview/index.php @@ -52,13 +52,8 @@ $table->width = '*'; $table->align = array('left','left','left','left','left','left'); - $select = html_select::make($reportoptions,'report',$report, false); - $select->nothingvalue = ''; - $reporttypemenu = $OUTPUT->select($select); - - $select = html_select::make($timeoptions,'time',$time, false); - $select->nothingvalue = ''; - $timeoptionsmenu = $OUTPUT->select($select); + $reporttypemenu = html_writer::input_select($reportoptions,'report',$report, false); + $timeoptionsmenu = html_writer::input_select($timeoptions,'time',$time, false); $table->data[] = array(get_string('statsreporttype'),$reporttypemenu, get_string('statstimeperiod'),$timeoptionsmenu, diff --git a/admin/report/questioninstances/index.php b/admin/report/questioninstances/index.php index 3408fd30ccb..ef7134bfde1 100644 --- a/admin/report/questioninstances/index.php +++ b/admin/report/questioninstances/index.php @@ -33,9 +33,7 @@ echo '
'; echo $OUTPUT->heading(get_string('reportsettings', 'report_questioninstances')); echo '

', get_string('intro', 'report_questioninstances') , '

'; echo '

'; -$select = html_select::make($qtypechoices, 'qtype', $requestedqtype, get_string('all')); -$select->nothingvalue = '_all_'; -echo $OUTPUT->select($select); +echo html_writer::input_select($qtypechoices, 'qtype', $requestedqtype, array('_all_'=>get_string('all'))); echo '

'; echo '

'; diff --git a/admin/roles/assign.php b/admin/roles/assign.php index b3e11a9af62..c603f0fb3c1 100755 --- a/admin/roles/assign.php +++ b/admin/roles/assign.php @@ -331,10 +331,10 @@


- select(html_select::make($periodmenu, 'extendperiod', $defaultperiod, $unlimitedperiod)); ?>

+


- select(html_select::make($basemenu, 'extendbase', $extendbase, false)); ?>

+

diff --git a/admin/roles/lib.php b/admin/roles/lib.php index 171640777bf..bcba27884a4 100644 --- a/admin/roles/lib.php +++ b/admin/roles/lib.php @@ -645,7 +645,7 @@ class define_role_table_advanced extends capability_table_with_risks { foreach($this->legacyroles as $type => $cap) { $options[$type] = get_string('legacy:'.$type, 'role'); } - return $OUTPUT->select(html_select::make($options, 'legacytype', $this->role->legacytype, false)); + return html_writer::input_select($options, 'legacytype', $this->role->legacytype, false); } protected function get_assignable_levels_control() { diff --git a/admin/timezone.php b/admin/timezone.php index bff4d6b049a..89baaf0f359 100644 --- a/admin/timezone.php +++ b/admin/timezone.php @@ -43,9 +43,7 @@ echo '
'; echo "$strusers ($strall): "; - $select = html_select::make($timezones, "zone", $current, get_string("serverlocaltime")); - $select->nothingvalue ="99"; - echo $OUTPUT->select($select); + echo html_writer::input_select($timezones, "zone", $current, array('99'=>get_string("serverlocaltime"))); echo ""; echo ''; echo "
"; diff --git a/admin/xmldb/actions/edit_field/edit_field.class.php b/admin/xmldb/actions/edit_field/edit_field.class.php index 68effcfa204..86276c87510 100644 --- a/admin/xmldb/actions/edit_field/edit_field.class.php +++ b/admin/xmldb/actions/edit_field/edit_field.class.php @@ -147,10 +147,9 @@ class edit_field extends XMLDBAction { if ($field->getType() != XMLDB_TYPE_DATETIME) { unset ($typeoptions[XMLDB_TYPE_DATETIME]); } - $select = html_select::make($typeoptions, 'type', $field->getType(), false); - $select->nothingvalue = ''; + $select = html_writer::input_select($typeoptions, 'type', $field->getType(), false); $o.= ' '; - $o.= ' ' . $OUTPUT->select($select) . ''; + $o.= ' ' . $select . ''; /// xmldb_field Length $o.= ' '; $o.= ' '; @@ -159,22 +158,19 @@ class edit_field extends XMLDBAction { $o.= ' '; /// xmldb_field Unsigned $unsignedoptions = array (0 => 'signed', 1 => 'unsigned'); - $select = html_select::make($unsignedoptions, 'unsigned', $field->getUnsigned(), false); - $select->nothingvalue = ''; + $select = html_writer::input_select($unsignedoptions, 'unsigned', $field->getUnsigned(), false); $o.= ' '; - $o.= ' ' . $OUTPUT->select($select) . ''; + $o.= ' ' . $select . ''; /// xmldb_field NotNull $notnulloptions = array (0 => 'null', 'not null'); - $select = html_select::make($notnulloptions, 'notnull', $field->getNotNull(), false); - $select->nothingvalue = ''; + $select = html_writer::input_select($notnulloptions, 'notnull', $field->getNotNull(), false); $o.= ' '; - $o.= ' ' . $OUTPUT->select($select) . ''; + $o.= ' ' . $select . ''; /// xmldb_field Sequence $sequenceoptions = array (0 => $this->str['no'], 1 => 'auto-numbered'); - $select = html_select::make($sequenceoptions, 'sequence', $field->getSequence(), false); - $select->nothingvalue = ''; + $select = html_writer::input_select($sequenceoptions, 'sequence', $field->getSequence(), false); $o.= ' '; - $o.= ' ' . $OUTPUT->select($select) . ''; + $o.= ' ' . $select . ''; /// xmldb_field Default $o.= ' '; $o.= ' '; diff --git a/admin/xmldb/actions/edit_index/edit_index.class.php b/admin/xmldb/actions/edit_index/edit_index.class.php index 721ca4810b8..44c96c6c145 100644 --- a/admin/xmldb/actions/edit_index/edit_index.class.php +++ b/admin/xmldb/actions/edit_index/edit_index.class.php @@ -123,9 +123,8 @@ class edit_index extends XMLDBAction { $typeoptions = array (0 => 'not unique', 1 => 'unique'); $o.= ' '; - $select = html_select::make($typeoptions, 'unique', $index->getUnique(), false); - $select->nothingvalue = ''; - $o.= ' ' . $OUTPUT->select($select) . ''; + $select = html_writer::input_select($typeoptions, 'unique', $index->getUnique(), false); + $o.= ' ' . $select . ''; /// xmldb_index Fields $o.= ' '; $o.= ' '; diff --git a/admin/xmldb/actions/edit_key/edit_key.class.php b/admin/xmldb/actions/edit_key/edit_key.class.php index bc9c878bc69..90d1957914e 100644 --- a/admin/xmldb/actions/edit_key/edit_key.class.php +++ b/admin/xmldb/actions/edit_key/edit_key.class.php @@ -128,11 +128,10 @@ class edit_key extends XMLDBAction { /// if ($key->getType() != XMLDB_KEY_FOREIGN_UNIQUE) { /// unset ($typeoptions[XMLDB_KEY_FOREIGN_UNIQUE); /// } - $select = html_select::make($typeoptions, 'type', $key->getType(), false); - $select->nothingvalue = ''; + $select = html_writer::input_select($typeoptions, 'type', $key->getType(), false); $o.= ' '; - $o.= ' ' . $OUTPUT->select($select) . ''; + $o.= ' ' . $select . ''; /// xmldb_key Fields $o.= ' '; $o.= ' '; diff --git a/admin/xmldb/actions/new_statement/new_statement.class.php b/admin/xmldb/actions/new_statement/new_statement.class.php index 844713614a9..b51aaa45643 100644 --- a/admin/xmldb/actions/new_statement/new_statement.class.php +++ b/admin/xmldb/actions/new_statement/new_statement.class.php @@ -106,7 +106,7 @@ class new_statement extends XMLDBAction { $o.= ' '; $o.= ' '; $o.= ' '; - $o.= ' '; + $o.= ' '; $o.= ' '; $o.= ' '; $o.= '
' . $OUTPUT->select(html_select::make($typeoptions, 'type')) . '' .$OUTPUT->select(html_select::make($selecttables, 'table')) . '
' . html_writer::input_select($typeoptions, 'type') . '' .html_writer::input_select($selecttables, 'table') . '
[' . $this->str['back'] . ']
'; diff --git a/admin/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php b/admin/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php index cacb6305a4d..63d9fb3103d 100644 --- a/admin/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php +++ b/admin/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php @@ -114,7 +114,7 @@ class new_table_from_mysql extends XMLDBAction { $o.= ' '; $o.= ' '; $o.= ' '; - $o.= ' '; + $o.= ' '; $o.= ' '; $o.= ' '; $o.= '
' . $OUTPUT->select(html_select::make($selecttables, 'table')) . '' .$OUTPUT->select(html_select::make($aftertables, 'after')) . '
' . html_writer::input_select($selecttables, 'table') . '' .html_writer::input_select($aftertables, 'after') . '
[' . $this->str['back'] . ']
'; diff --git a/admin/xmldb/actions/view_structure_php/view_structure_php.class.php b/admin/xmldb/actions/view_structure_php/view_structure_php.class.php index d2ad4c5e9e2..dda5a4c97f3 100644 --- a/admin/xmldb/actions/view_structure_php/view_structure_php.class.php +++ b/admin/xmldb/actions/view_structure_php/view_structure_php.class.php @@ -116,7 +116,7 @@ class view_structure_php extends XMLDBAction { $o.= ' '; $o.= ' '; $o.= ' '; - $o.= ' '; + $o.= ' '; $o.= ' '; $o.= '
' . $OUTPUT->select(html_select::make($popcommands, 'command', $commandparam, false)) . ' ' .$OUTPUT->select(html_select::make($poptables, 'table', $tableparam, false)) . '
' . html_writer::input_select($popcommands, 'command', $commandparam, false) . ' ' .html_writer::input_select($poptables, 'table', $tableparam, false) . '
'; $o.= ''; diff --git a/admin/xmldb/actions/view_table_php/view_table_php.class.php b/admin/xmldb/actions/view_table_php/view_table_php.class.php index ceba42948b4..413bcdad9a8 100644 --- a/admin/xmldb/actions/view_table_php/view_table_php.class.php +++ b/admin/xmldb/actions/view_table_php/view_table_php.class.php @@ -167,7 +167,7 @@ class view_table_php extends XMLDBAction { $o.= ' '; $o.= ' '; $o.= ' '; - $o.= ' '; + $o.= ' '; $o.= ' '; $o.= '
' . $OUTPUT->select(html_select::make($popcommands, 'command', $commandparam, false)) . ' ' .$OUTPUT->select(html_select::make($popfields, 'fieldkeyindex', $origfieldkeyindexparam, false)) . '
' . html_writer::input_select($popcommands, 'command', $commandparam, false) . ' ' .html_writer::input_select($popfields, 'fieldkeyindex', $origfieldkeyindexparam, false) . '
'; $o.= ''; diff --git a/auth/cas/config.html b/auth/cas/config.html index 1bb2fe8d1f7..24fb45e58b0 100644 --- a/auth/cas/config.html +++ b/auth/cas/config.html @@ -278,7 +278,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? - echo $OUTPUT->select(html_select::make($CASLANGUAGES, 'language', $config->language, false)); + echo html_writer::input_select($CASLANGUAGES, 'language', $config->language, false); @@ -303,9 +303,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? unset($options); $options[1] = get_string('yes'); - $select = html_select::make($options, 'proxycas', $config->proxycas, get_string('no')); - $select->nothingvalue = ''; - echo $OUTPUT->select($select); + echo html_writer::input_select($options, 'proxycas', $config->proxycas, get_string('no')); ?> @@ -329,9 +327,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? $options[1] = get_string('yes'); - $select = html_select::make($options, 'logoutcas', $config->logoutcas, get_string('no')); - $select->nothingvalue = ''; - echo $OUTPUT->select($select); + echo html_writer::input_select($options, 'logoutcas', $config->logoutcas, get_string('no')); ?> @@ -355,9 +351,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? $options[1] = get_string('yes'); - $select = html_select::make($options, 'multiauth', $config->multiauth, get_string('no')); - $select->nothingvalue = ''; - echo $OUTPUT->select($select); + echo html_writer::input_select($options, 'multiauth', $config->multiauth, get_string('no')); ?> @@ -417,7 +411,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? $versions[3] = '3'; - echo $OUTPUT->select(html_select::make($versions, 'version', $config->version, false)); + echo html_writer::input_select($versions, 'version', $config->version, false); if (isset($err['version'])) echo $OUTPUT->error_text($err['version']); @@ -535,7 +529,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? - select(html_select::make($this->ldap_suppported_usertypes(), 'user_type', $config->user_type, false)); ?> + ldap_suppported_usertypes(), 'user_type', $config->user_type, false); ?> error_text($err['user_type']); ?> @@ -579,7 +573,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? - select(html_select::make($yesno, 'search_sub', $config->search_sub, false)); ?> + search_sub, false); ?> @@ -607,7 +601,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? $opt_deref[LDAP_DEREF_ALWAYS] = get_string('yes'); - echo $OUTPUT->select(html_select::make($opt_deref, 'opt_deref', $config->opt_deref, LDAP_DEREF_NEVER, false)); + echo html_writer::input_select($opt_deref, 'opt_deref', $config->opt_deref, LDAP_DEREF_NEVER, false); if (isset($err['opt_deref'])) echo $OUTPUT->error_text($err['opt_deref']); @@ -793,7 +787,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? $deleteopt[AUTH_REMOVEUSER_FULLDELETE] = get_string('auth_remove_delete','auth'); - echo $OUTPUT->select(html_select::make($deleteopt, 'removeuser', $config->removeuser, false)); + echo html_writer::input_select($deleteopt, 'removeuser', $config->removeuser, false); ?> diff --git a/auth/db/config.html b/auth/db/config.html index 86be9cb7848..4eb91789dfd 100644 --- a/auth/db/config.html +++ b/auth/db/config.html @@ -74,7 +74,7 @@ foreach ($dbtypes as $dbtype) { $dboptions[$dbtype] = $dbtype; } - echo $OUTPUT->select(html_select::make($dboptions, "type", $config->type, false)); + echo html_writer::input_select($dboptions, "type", $config->type, false); ?> @@ -86,7 +86,7 @@ - select(html_select::make($yesno, 'sybasequoting', $config->sybasequoting, false)); ?> + sybasequoting, false); ?> @@ -192,7 +192,7 @@ $passtype["md5"] = get_string("md5", "auth"); $passtype["sha1"] = get_string("sha1", "auth"); $passtype["internal"] = get_string("internal", "auth"); - echo $OUTPUT->select(html_select::make($passtype, "passtype", $config->passtype, false)); + echo html_writer::input_select($passtype, "passtype", $config->passtype, false); ?> @@ -225,7 +225,7 @@ - select(html_select::make($yesno, 'debugauthdb', $config->debugauthdb, false)); ?> + debugauthdb, false); ?> @@ -259,7 +259,7 @@ $deleteopt[AUTH_REMOVEUSER_KEEP] = get_string('auth_remove_keep','auth'); $deleteopt[AUTH_REMOVEUSER_SUSPEND] = get_string('auth_remove_suspend','auth'); $deleteopt[AUTH_REMOVEUSER_FULLDELETE] = get_string('auth_remove_delete','auth'); - echo $OUTPUT->select(html_select::make($deleteopt, 'removeuser', $config->removeuser, false)); + echo html_writer::input_select($deleteopt, 'removeuser', $config->removeuser, false); ?> diff --git a/auth/email/config.html b/auth/email/config.html index b7a558d9c1e..84ef491bfad 100644 --- a/auth/email/config.html +++ b/auth/email/config.html @@ -19,7 +19,7 @@ select(html_select::make($yesno, 'recaptcha', $config->recaptcha, false)); + echo html_writer::input_select($yesno, 'recaptcha', $config->recaptcha, false); ?> diff --git a/auth/imap/config.html b/auth/imap/config.html index 31c104093ee..48e5bf73284 100644 --- a/auth/imap/config.html +++ b/auth/imap/config.html @@ -48,7 +48,7 @@ if (!isset($config->changepasswordurl)) { foreach ($imaptypes as $imaptype) { $imapoptions[$imaptype] = $imaptype; } - echo $OUTPUT->select(html_select::make($imapoptions, 'type', $config->type, false)); + echo html_writer::input_select($imapoptions, 'type', $config->type, false); ?> diff --git a/auth/ldap/config.html b/auth/ldap/config.html index 51f26b878a4..27bc9dd3824 100644 --- a/auth/ldap/config.html +++ b/auth/ldap/config.html @@ -95,7 +95,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? $versions = array(); $versions[2] = '2'; $versions[3] = '3'; - echo $OUTPUT->select(html_select::make($versions, 'version', $config->version, false)); + echo html_writer::input_select($versions, 'version', $config->version, false); if (isset($err['version'])) echo $OUTPUT->error_text($err['version']); ?> @@ -128,7 +128,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? - select(html_select::make($yesno, 'preventpassindb', $config->preventpassindb, false)); ?> + preventpassindb, false); ?> @@ -163,7 +163,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? - select(html_select::make($this->ldap_suppported_usertypes(), 'user_type', $config->user_type, false)); ?> + ldap_suppported_usertypes(), 'user_type', $config->user_type, false); ?> error_text($err['user_type']); ?> @@ -185,7 +185,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? - select(html_select::make($yesno, 'search_sub', $config->search_sub, false)); ?> + search_sub, false); ?> @@ -199,7 +199,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? $opt_deref = array(); $opt_deref[LDAP_DEREF_NEVER] = get_string('no'); $opt_deref[LDAP_DEREF_ALWAYS] = get_string('yes'); - echo $OUTPUT->select(html_select::make($opt_deref, 'opt_deref', $config->opt_deref, LDAP_DEREF_NEVER, false)); + echo html_writer::input_select($opt_deref, 'opt_deref', $config->opt_deref, LDAP_DEREF_NEVER, false); if (isset($err['opt_deref'])) echo $OUTPUT->error_text($err['opt_deref']); ?> @@ -261,7 +261,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? - select(html_select::make($yesno, 'forcechangepassword', $config->forcechangepassword, false)); ?> + forcechangepassword, false); ?>

@@ -271,7 +271,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? - select(html_select::make($yesno, 'stdchangepassword', $config->stdchangepassword, false)); ?> + stdchangepassword, false); ?>

@@ -287,7 +287,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? $passtype['plaintext'] = get_string('plaintext', 'auth'); $passtype['md5'] = get_string('md5', 'auth'); $passtype['sha1'] = get_string('sha1', 'auth'); - echo $OUTPUT->select(html_select::make($passtype, 'passtype', $config->passtype, false)); + echo html_writer::input_select($passtype, 'passtype', $config->passtype, false); ?> @@ -322,7 +322,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? $expiration = array(); $expiration['0'] = 'no'; $expiration['1'] = 'LDAP'; - echo $OUTPUT->select(html_select::make($expiration, 'expiration', $config->expiration, false)); + echo html_writer::input_select($expiration, 'expiration', $config->expiration, false); if (isset($err['expiration'])) echo $OUTPUT->error_text($err['expiration']); ?> @@ -359,7 +359,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? - select(html_select::make($yesno, 'gracelogins', $config->gracelogins, false)); ?> + gracelogins, false); ?> @@ -389,7 +389,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? - select(html_select::make($yesno, 'auth_user_create', $config->auth_user_create, false)); ?> + auth_user_create, false); ?> @@ -437,7 +437,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? $deleteopt[AUTH_REMOVEUSER_KEEP] = get_string('auth_remove_keep','auth'); $deleteopt[AUTH_REMOVEUSER_SUSPEND] = get_string('auth_remove_suspend','auth'); $deleteopt[AUTH_REMOVEUSER_FULLDELETE] = get_string('auth_remove_delete','auth'); - echo $OUTPUT->select(html_select::make($deleteopt, 'removeuser', $config->removeuser, false)); + echo html_writer::input_select($deleteopt, 'removeuser', $config->removeuser, false); ?> @@ -455,7 +455,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? select(html_select::make($yesno, 'ntlmsso_enabled', $config->ntlmsso_enabled)); + echo html_writer::input_select($yesno, 'ntlmsso_enabled', $config->ntlmsso_enabled); ?> @@ -474,7 +474,7 @@ if (!function_exists('ldap_connect')) { // Is php4-ldap really there? select(html_select::make($yesno, 'ntlmsso_ie_fastpath', $config->ntlmsso_ie_fastpath)); + echo html_writer::input_select($yesno, 'ntlmsso_ie_fastpath', $config->ntlmsso_ie_fastpath); ?> diff --git a/auth/mnet/config.html b/auth/mnet/config.html index c0f32f64ef5..480de6ae803 100644 --- a/auth/mnet/config.html +++ b/auth/mnet/config.html @@ -44,7 +44,7 @@ if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict' select(html_select::make($yesno, 'auto_add_remote_users', $config->auto_add_remote_users, false)); + echo html_writer::input_select($yesno, 'auto_add_remote_users', $config->auto_add_remote_users, false); ?> diff --git a/auth/pop3/config.html b/auth/pop3/config.html index cdc30cfcee9..635a57d7669 100644 --- a/auth/pop3/config.html +++ b/auth/pop3/config.html @@ -51,7 +51,7 @@ if (!isset($config->changepasswordurl)) { foreach ($pop3types as $pop3type) { $pop3options[$pop3type] = $pop3type; } - echo $OUTPUT->select(html_select::make($pop3options, 'type', $config->type, false)); + echo html_writer::input_select($pop3options, 'type', $config->type, false); ?> diff --git a/auth/radius/config.html b/auth/radius/config.html index 65ae8b6b598..8cf357a8e2e 100644 --- a/auth/radius/config.html +++ b/auth/radius/config.html @@ -69,7 +69,7 @@ if (!isset($config->changepasswordurl)) { $radiustype['CHAP_MD5'] = get_string('auth_radiustypechapmd5', 'auth_radius'); $radiustype['MSCHAPv1'] = get_string('auth_radiustypemschapv1', 'auth_radius'); $radiustype['MSCHAPv2'] = get_string('auth_radiustypemschapv2', 'auth_radius'); - echo $OUTPUT->select(html_select::make($radiustype, 'radiustype', $config->radiustype, false)); + echo html_writer::input_select($radiustype, 'radiustype', $config->radiustype, false); if (isset($err['radiustype'])) { echo $OUTPUT->error_text($err['radiustype']); diff --git a/backup/backup_form.html b/backup/backup_form.html index 64583f866c9..7b89d2ee1ce 100644 --- a/backup/backup_form.html +++ b/backup/backup_form.html @@ -210,7 +210,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { echo ""; $meta_options[0] = get_string("no"); $meta_options[1] = get_string("yes"); - echo $OUTPUT->select(html_select::make($meta_options, "backup_metacourse", $backup_metacourse, false)); + echo html_writer::input_select($meta_options, "backup_metacourse", $backup_metacourse, false); echo ""; } else { @@ -228,7 +228,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { } $user_options[1] = get_string("course"); $user_options[2] = get_string("none"); - echo $OUTPUT->select(html_select::make($user_options, "backup_users", $backup_users, false)); + echo html_writer::input_select($user_options, "backup_users", $backup_users, false); echo ""; } else { @@ -243,7 +243,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { echo ""; $log_options[0] = get_string("no"); $log_options[1] = get_string("yes"); - echo $OUTPUT->select(html_select::make($log_options, "backup_logs", $backup_logs, false)); + echo html_writer::input_select($log_options, "backup_logs", $backup_logs, false); echo ""; } else { @@ -258,7 +258,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { echo ""; $user_file_options[0] = get_string("no"); $user_file_options[1] = get_string("yes"); - echo $OUTPUT->select(html_select::make($user_file_options, "backup_user_files", $backup_user_files, false)); + echo html_writer::input_select($user_file_options, "backup_user_files", $backup_user_files, false); echo ""; } else { @@ -272,7 +272,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { echo ""; $course_file_options[0] = get_string("no"); $course_file_options[1] = get_string("yes"); - echo $OUTPUT->select(html_select::make($course_file_options, "backup_course_files", $backup_course_files, false)); + echo html_writer::input_select($course_file_options, "backup_course_files", $backup_course_files, false); echo ""; @@ -285,7 +285,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { echo ""; $course_file_options[0] = get_string("no"); $course_file_options[1] = get_string("yes"); - echo $OUTPUT->select(html_select::make($course_file_options, "backup_site_files", $backup_site_files, false)); + echo html_writer::input_select($course_file_options, "backup_site_files", $backup_site_files, false); echo ""; } @@ -297,7 +297,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { echo ""; $gradebook_history_options[0] = get_string("no"); $gradebook_history_options[1] = get_string("yes"); - echo $OUTPUT->select(html_select::make($gradebook_history_options, "backup_gradebook_history", $backup_gradebook_history, false)); + echo html_writer::input_select($gradebook_history_options, "backup_gradebook_history", $backup_gradebook_history, false); echo ""; } else { $hidden_options .= ''; @@ -311,7 +311,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { echo ""; $mess_options[0] = get_string("no"); $mess_options[1] = get_string("yes"); - echo $OUTPUT->select(html_select::make($mess_options, "backup_messages", $backup_messages, false)); + echo html_writer::input_select($mess_options, "backup_messages", $backup_messages, false); echo ""; } else { @@ -326,7 +326,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { echo ""; $blog_options[0] = get_string("no"); $blog_options[1] = get_string("yes"); - echo $OUTPUT->select(html_select::make($blog_options, "backup_blogs", $backup_blogs, false)); + echo html_writer::input_select($blog_options, "backup_blogs", $backup_blogs, false); echo ""; } else { diff --git a/backup/restore_form.html b/backup/restore_form.html index 443886cb11d..1e16c9f4fe9 100644 --- a/backup/restore_form.html +++ b/backup/restore_form.html @@ -234,7 +234,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { /// Acummulator for hidden options and proper XHTML output $hidden_options = ''; - echo $OUTPUT->select(html_select::make($restore_restoreto_options, "restore_restoreto", $restore_restoreto, false)); + echo html_writer::input_select($restore_restoreto_options, "restore_restoreto", $restore_restoreto, false); echo ""; if ($cancreatecourses) { //display these fields conditionally @@ -260,7 +260,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { $category_default = $fromcat; } } - echo $OUTPUT->select(html_select::make($categories, 'restore_restorecatto', $category_default, false)); + echo html_writer::input_select($categories, 'restore_restorecatto', $category_default, false); echo ""; echo ""; @@ -432,7 +432,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { $metacourse_options = array(); $metacourse_options[0] = get_string("no"); $metacourse_options[1] = get_string("yes"); - echo $OUTPUT->select(html_select::make($metacourse_options, "restore_metacourse", $restore_metacourse, false)); + echo html_writer::input_select($metacourse_options, "restore_metacourse", $restore_metacourse, false); } else { echo get_string("no"); echo ""; @@ -452,7 +452,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { } $user_options[1] = get_string("course"); $user_options[2] = get_string("none"); - echo $OUTPUT->select(html_select::make($user_options, "restore_users", $restore_users, false)); + echo html_writer::input_select($user_options, "restore_users", $restore_users, false); } else { echo get_string("none"); echo ""; @@ -475,7 +475,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { $group_options[RESTORE_GROUPINGS_ONLY] = get_string('groupingsonly', 'group'); $group_options[RESTORE_GROUPS_GROUPINGS] = get_string('groupsgroupings', 'group'); //all. } - echo $OUTPUT->select(html_select::make($group_options, 'restore_groups', $restore_groups, false)); + echo html_writer::input_select($group_options, 'restore_groups', $restore_groups, false); echo ""; //Now print the Logs tr @@ -488,7 +488,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { $log_options = array(); $log_options[0] = get_string("no"); $log_options[1] = get_string("yes"); - echo $OUTPUT->select(html_select::make($log_options, "restore_logs", $restore_logs, false)); + echo html_writer::input_select($log_options, "restore_logs", $restore_logs, false); } else { echo get_string("no"); echo ""; @@ -505,7 +505,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { $user_file_options = array(); $user_file_options[0] = get_string("no"); $user_file_options[1] = get_string("yes"); - echo $OUTPUT->select(html_select::make($user_file_options, "restore_user_files", $restore_user_files, false)); + echo html_writer::input_select($user_file_options, "restore_user_files", $restore_user_files, false); } else { echo get_string("no"); echo ""; @@ -524,7 +524,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { $course_file_options = array(); $course_file_options[0] = get_string("no"); $course_file_options[1] = get_string("yes"); - echo $OUTPUT->select(html_select::make($course_file_options, "restore_course_files", $restore_course_files, false)); + echo html_writer::input_select($course_file_options, "restore_course_files", $restore_course_files, false); } else { echo get_string("no"); echo ""; @@ -542,7 +542,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { $site_file_options = array(); $site_file_options[0] = get_string("no"); $site_file_options[1] = get_string("yes"); - echo $OUTPUT->select(html_select::make($site_file_options, "restore_site_files", $restore_site_files, false)); + echo html_writer::input_select($site_file_options, "restore_site_files", $restore_site_files, false); } else { echo get_string("no"); echo ""; @@ -559,7 +559,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { $gradebook_history_options = array(); $gradebook_history_options[0] = get_string("no"); $gradebook_history_options[1] = get_string("yes"); - echo $OUTPUT->select(html_select::make($gradebook_history_options, "restore_gradebook_history", $restore_gradebook_history, false)); + echo html_writer::input_select($gradebook_history_options, "restore_gradebook_history", $restore_gradebook_history, false); } else { echo get_string("no"); echo ""; @@ -581,7 +581,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { $message_options = array(); $message_options[0] = get_string("no"); $message_options[1] = get_string("yes"); - echo $OUTPUT->select(html_select::make($message_options, "restore_messages", $restore_messages, false)); + echo html_writer::input_select($message_options, "restore_messages", $restore_messages, false); echo ""; } else { $hidden_options .= ''; @@ -599,7 +599,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) { $blog_options = array(); $blog_options[0] = get_string("no"); $blog_options[1] = get_string("yes"); - echo $OUTPUT->select(html_select::make($blog_options, "restore_blogs", $restore_blogs, false)); + echo html_writer::input_select($blog_options, "restore_blogs", $restore_blogs, false); echo ""; } else { $hidden_options .= ''; diff --git a/blocks/loancalc/block_loancalc.php b/blocks/loancalc/block_loancalc.php index 4416ad9bc12..e27f9bf8286 100644 --- a/blocks/loancalc/block_loancalc.php +++ b/blocks/loancalc/block_loancalc.php @@ -188,7 +188,7 @@ function comp(v) { // general entry point for all cases $options[52] = get_string('weekly','block_loancalc'); $options[26] = get_string('fortnightly','block_loancalc'); $options[12] = get_string('monthly','block_loancalc'); - $this->content->text .= $OUTPUT->select(html_select::make($options,'LOANPAYPERIOD','12')); + $this->content->text .= html_writer::input_select($options,'LOANPAYPERIOD','12'); $this->content->text .= ' diff --git a/calendar/lib.php b/calendar/lib.php index 8e2ee1a547f..d2afe7a4a58 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -1531,14 +1531,13 @@ function calendar_format_event_time($event, $now, $morehref, $usecommonwords = t } function calendar_print_month_selector($name, $selected) { - global $OUTPUT; $months = array(); for ($i=1; $i<=12; $i++) { $months[$i] = userdate(gmmktime(12, 0, 0, $i, 15, 2000), '%B'); } - echo $OUTPUT->select(html_select::make($months, $name, $selected, false)); + echo html_writer::input_select($months, $name, $selected, false); } function calendar_get_filters_status() { diff --git a/calendar/preferences.html b/calendar/preferences.html index 646f776f075..b8e12999437 100644 --- a/calendar/preferences.html +++ b/calendar/preferences.html @@ -9,9 +9,7 @@ $options['0'] = get_string('default', 'calendar'); $options[CALENDAR_TF_12] = get_string('timeformat_12', 'calendar'); $options[CALENDAR_TF_24] = get_string('timeformat_24', 'calendar'); - $select = html_select::make($options, "timeformat", $prefs->timeformat, false); - $select->nothingvalue = ''; - echo $OUTPUT->select($select); + echo html_writer::input_select($options, "timeformat", $prefs->timeformat, false); ?>

@@ -29,9 +27,7 @@ $options[4] = get_string('thursday', 'calendar'); $options[5] = get_string('friday', 'calendar'); $options[6] = get_string('saturday', 'calendar'); - $select = html_select::make($options, 'startwday', $prefs->startwday, false); - $select->nothingvalue = ''; - echo $OUTPUT->select($select); + echo html_writer::input_select($options, 'startwday', $prefs->startwday, false); ?>

@@ -45,9 +41,7 @@ for ($i=1; $i<=20; $i++) { $options[$i] = $i; } - $select = html_select::make($options, "maxevents", $prefs->maxevents, false); - $select->nothingvalue = ''; - echo $OUTPUT->select($select); + echo html_writer::input_select($options, "maxevents", $prefs->maxevents, false); ?>

@@ -61,9 +55,7 @@ for ($i=1; $i<=200; $i++) { $options[$i] = $i; } - $select = html_select::make($options, "lookahead", $prefs->lookahead, false); - $select->nothingvalue = ''; - echo $OUTPUT->select($select); + echo html_writer::input_select($options, "lookahead", $prefs->lookahead, false); ?>

@@ -73,9 +65,7 @@ : get_string('no'), 1 => get_string('yes')), 'persistflt', $prefs->persistflt, false); - $select->nothingvalue = ''; - echo $OUTPUT->select($select); + echo html_writer::input_select(array(0 => get_string('no'), 1 => get_string('yes')), 'persistflt', $prefs->persistflt, false); ?>

diff --git a/course/lib.php b/course/lib.php index d692e8cb1f8..31c61f29ba7 100644 --- a/course/lib.php +++ b/course/lib.php @@ -3057,7 +3057,7 @@ function print_grouping_settings($form, $course=NULL) { $groupingid = isset($cm->groupingid) ? $cm->groupingid : 0; - echo $OUTPUT->select(html_select::make($groupings, 'groupingid', $groupingid, get_string('none'))); + echo html_writer::input_select($groupings, 'groupingid', $groupingid, get_string('none')); echo ''; $checked = empty($cm->groupmembersonly) ? '':'checked="checked"'; diff --git a/course/report/log/lib.php b/course/report/log/lib.php index 29f2e79cd61..e8fa3d46867 100644 --- a/course/report/log/lib.php +++ b/course/report/log/lib.php @@ -261,7 +261,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').') ' : ''); - echo $OUTPUT->select(html_select::make($courses,"id",$course->id, false)); + echo html_writer::input_select($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" @@ -279,11 +279,11 @@ function print_mnet_log_selector_form($hostid, $course, $selecteduser=0, $select else { $groups = array(); } - echo $OUTPUT->select(html_select::make($groups, "group", $selectedgroup, get_string("allgroups"))); + echo html_writer::input_select($groups, "group", $selectedgroup, get_string("allgroups")); } if ($showusers) { - echo $OUTPUT->select(html_select::make($users, "user", $selecteduser, get_string("allparticipants"))); + echo html_writer::input_select($users, "user", $selecteduser, get_string("allparticipants")); } else { $users = array(); @@ -294,26 +294,21 @@ function print_mnet_log_selector_form($hostid, $course, $selecteduser=0, $select else { $users[0] = get_string('allparticipants'); } - echo $OUTPUT->select(html_select::make($users, "user", $selecteduser, false)); + echo html_writer::input_select($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); } - 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"))); + echo html_writer::input_select($dates, "date", $selecteddate, get_string("alldays")); + echo html_writer::input_select($activities, "modid", $selectedactivity, get_string("allactivities")); + echo html_writer::input_select($actions, 'modaction', $modaction, get_string("allactions")); $logformats = array('showashtml' => get_string('displayonpage'), 'downloadascsv' => get_string('downloadtext'), 'downloadasods' => get_string('downloadods'), 'downloadasexcel' => get_string('downloadexcel')); - echo $OUTPUT->select(html_select::make($logformats, 'logformat', $logformat, false)); + echo html_writer::input_select($logformats, 'logformat', $logformat, false); echo ''; echo ''; echo ''; @@ -485,12 +480,12 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate='today' echo "\n"; echo "\n"; if (has_capability('coursereport/log:view', $sitecontext) && $showcourses) { - echo $OUTPUT->select(html_select::make($courses, "id", $course->id, false)); + echo html_writer::input_select($courses, "id", $course->id, false); } else { // echo ''; $courses = array(); $courses[$course->id] = $course->fullname . (($course->id == SITEID) ? ' ('.get_string('site').') ' : ''); - echo $OUTPUT->select(html_select::make($courses,"id",$course->id, false)); + echo html_writer::input_select($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" @@ -508,11 +503,11 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate='today' else { $groups = array(); } - echo $OUTPUT->select(html_select::make($groups, "group", $selectedgroup, get_string("allgroups"))); + echo html_writer::input_select($groups, "group", $selectedgroup, get_string("allgroups")); } if ($showusers) { - echo $OUTPUT->select(html_select::make($users, "user", $selecteduser, get_string("allparticipants"))); + echo html_writer::input_select($users, "user", $selecteduser, get_string("allparticipants")); } else { $users = array(); @@ -523,27 +518,23 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate='today' else { $users[0] = get_string('allparticipants'); } - echo $OUTPUT->select(html_select::make($users, "user", $selecteduser, false)); + echo html_writer::input_select($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); } - echo $OUTPUT->select(html_select::make($dates, "date", $selecteddate, get_string("alldays"))); + echo html_writer::input_select($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"))); + echo html_writer::input_select($activities, "modid", $selectedactivity, get_string("allactivities")); + echo html_writer::input_select($actions, 'modaction', $modaction, get_string("allactions")); $logformats = array('showashtml' => get_string('displayonpage'), 'downloadascsv' => get_string('downloadtext'), 'downloadasods' => get_string('downloadods'), 'downloadasexcel' => get_string('downloadexcel')); - echo $OUTPUT->select(html_select::make($logformats, 'logformat', $logformat, false)); + echo html_writer::input_select($logformats, 'logformat', $logformat, false); echo ''; echo ''; echo ''; diff --git a/course/report/participation/index.php b/course/report/participation/index.php index d3060c2a05e..8987ce8f0a6 100644 --- a/course/report/participation/index.php +++ b/course/report/participation/index.php @@ -121,11 +121,11 @@ $select->nested = true; echo $OUTPUT->select($select); echo ''."\n"; - echo $OUTPUT->select(html_select::make($timeoptions,'timefrom',$timefrom)); + echo html_writer::input_select($timeoptions,'timefrom',$timefrom); echo ''."\n"; - echo $OUTPUT->select(html_select::make($roleoptions,'roleid',$roleid,false)); + echo html_writer::input_select($roleoptions,'roleid',$roleid,false); echo ''."\n"; - echo $OUTPUT->select(html_select::make($actionoptions,'action',$action,false)); + echo html_writer::input_select($actionoptions,'action',$action,false); echo $OUTPUT->help_icon('participationreport', get_string('participationreport')); echo ''."\n\n"; diff --git a/course/report/stats/report.php b/course/report/stats/report.php index 4be01a4b6fd..1eeee588331 100644 --- a/course/report/stats/report.php +++ b/course/report/stats/report.php @@ -45,21 +45,21 @@ } $table->align = array('left','left','left','left','left','left','left','left'); - $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)), + $table->data[] = array(get_string('course'),html_writer::input_select($courseoptions,'course',$course->id,false), + get_string('users'),html_writer::input_select($users,'userid',$userid,false), + get_string('statsreporttype'),html_writer::input_select($reportoptions,'report',($report == 5) ? $report.$roleid : $report,false), + get_string('statstimeperiod'),html_writer::input_select($timeoptions,'time',$time,false), '') ; } else if ($mode == STATS_MODE_RANKED) { $table->align = array('left','left','left','left','left','left'); - $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)), + $table->data[] = array(get_string('statsreporttype'),html_writer::input_select($reportoptions,'report',($report == 5) ? $report.$roleid : $report,false), + get_string('statstimeperiod'),html_writer::input_select($timeoptions,'time',$time,false), '') ; } else if ($mode == STATS_MODE_GENERAL) { $table->align = array('left','left','left','left','left','left','left'); - $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)), + $table->data[] = array(get_string('course'),html_writer::input_select($courseoptions,'course',$course->id,false), + get_string('statsreporttype'),html_writer::input_select($reportoptions,'report',($report == 5) ? $report.$roleid : $report,false), + get_string('statstimeperiod'),html_writer::input_select($timeoptions,'time',$time,false), '') ; } diff --git a/enrol/authorize/config_form.php b/enrol/authorize/config_form.php index a7d4466ac6d..650bd503025 100755 --- a/enrol/authorize/config_form.php +++ b/enrol/authorize/config_form.php @@ -65,9 +65,7 @@ if (!isset($frm->acceptechecktypes)) { enrol_currency: enrol_currency, false); - $select->nothingvalue = ''; - echo $OUTPUT->select($select); + echo html_writer::input_select(get_list_of_currencies(), "enrol_currency", $frm->enrol_currency, false); ?>
@@ -214,9 +212,7 @@ if (!isset($frm->acceptechecktypes)) { get_string('adminemailexpiredsortsum', 'enrol_authorize'), 'cnt' => get_string('adminemailexpiredsortcount', 'enrol_authorize')); - $select = html_select::make($sorts, "an_sorttype", $frm->an_sorttype, false); - $select->nothingvalue = ''; - echo $OUTPUT->select($select); + echo html_writer::input_select($sorts, "an_sorttype", $frm->an_sorttype, false); ?>
diff --git a/enrol/authorize/locallib.php b/enrol/authorize/locallib.php index 10dd33e4e03..0095bc78289 100644 --- a/enrol/authorize/locallib.php +++ b/enrol/authorize/locallib.php @@ -27,9 +27,7 @@ function authorize_print_orders($courseid, $userid) { $searchmenu = array('orderid' => $authstrs->orderid, 'transid' => $authstrs->transid, 'cclastfour' => $authstrs->cclastfour); $buttons = "
"; - $select = html_select::make($searchmenu, 'searchtype', $searchtype, false); - $select->nothingvalue = ''; - $buttons .= $OUTPUT->select($select); + $buttons .= html_writer::input_select($searchmenu, 'searchtype', $searchtype, false); $buttons .= ""; $buttons .= ""; $buttons .= "
"; diff --git a/enrol/database/config.html b/enrol/database/config.html index aa838ddeb88..e67c233d3f4 100644 --- a/enrol/database/config.html +++ b/enrol/database/config.html @@ -19,9 +19,7 @@ if (!isset($frm->enrol_dbtype)) { $frm->enrol_dbtype = 'mysql'; } - $select = html_select::make($dboptions, "enrol_dbtype", $frm->enrol_dbtype, false); - $select->nothingvalue = ''; - echo $OUTPUT->select($select); + echo html_writer::input_select($dboptions, "enrol_dbtype", $frm->enrol_dbtype, false); ?> @@ -162,7 +160,7 @@ $assignableroles = get_assignable_roles($sitecontext); $assignableroles = array('' => get_string('default')) + $assignableroles; - echo $OUTPUT->select(html_select::make($assignableroles, 'enrol_db_defaultcourseroleid', $frm->enrol_db_defaultcourseroleid, false)); + echo html_writer::input_select($assignableroles, 'enrol_db_defaultcourseroleid', $frm->enrol_db_defaultcourseroleid, false); if (isset($err['enrol_db_defaultcourseroleid'])) echo $OUTPUT->error_text($err['enrol_db_defaultcourseroleid']); ?> @@ -180,7 +178,7 @@ enrol_db_autocreate: select(html_select::make($yesno, "enrol_db_autocreate", $frm->enrol_db_autocreate, false)); + echo html_writer::input_select($yesno, "enrol_db_autocreate", $frm->enrol_db_autocreate, false); if (isset($err["enrol_db_autocreate"])) echo $OUTPUT->error_text($err["enrol_db_autocreate"]); ?> @@ -196,7 +194,7 @@ $displaylist = array(); $parentlist = array(); make_categories_list($displaylist, $parentlist); - echo $OUTPUT->select(html_select::make($displaylist, "enrol_db_category", $frm->enrol_db_category, false)); + echo html_writer::input_select($displaylist, "enrol_db_category", $frm->enrol_db_category, false); ?> error_text($err["enrol_db_category"]); ?> @@ -225,7 +223,7 @@ enrol_db_ignorehiddencourse: select(html_select::make($yesno, "enrol_db_ignorehiddencourse", $frm->enrol_db_ignorehiddencourse, false)); + echo html_writer::input_select($yesno, "enrol_db_ignorehiddencourse", $frm->enrol_db_ignorehiddencourse, false); if (isset($err['enrol_db_ignorehiddencourse'])) { echo $OUTPUT->error_text($err['enrol_db_ignorehiddencourse']); } @@ -240,7 +238,7 @@ enrol_db_disableunenrol: select(html_select::make($yesno, "enrol_db_disableunenrol", $frm->enrol_db_disableunenrol, false)); + echo html_writer::input_select($yesno, "enrol_db_disableunenrol", $frm->enrol_db_disableunenrol, false); if (isset($err['enrol_db_disableunenrol'])) { echo $OUTPUT->error_text($err['enrol_db_disableunenrol']); } diff --git a/enrol/imsenterprise/config.html b/enrol/imsenterprise/config.html index 40275ba1def..374131e25b5 100644 --- a/enrol/imsenterprise/config.html +++ b/enrol/imsenterprise/config.html @@ -117,8 +117,8 @@ foreach($this->imsroles as $imsrolenum=>$imsrolename){ $configref = "enrol_imse_imsrolemap" . $imsrolenum; - echo $OUTPUT->select(html_select::make($assignableroles, 'enrol_imse_imsrolemap'.$imsrolenum, - strlen($frm->$configref) ? $frm->$configref : $this->determine_default_rolemapping($imsrolenum), false)); + echo html_writer::input_select($assignableroles, 'enrol_imse_imsrolemap'.$imsrolenum, + strlen($frm->$configref) ? $frm->$configref : $this->determine_default_rolemapping($imsrolenum), false); ?> diff --git a/enrol/ldap/config.html b/enrol/ldap/config.html index 0dc63920b72..87734a0ad90 100755 --- a/enrol/ldap/config.html +++ b/enrol/ldap/config.html @@ -108,7 +108,7 @@ if (!isset($frm->enrol_ldap_template)) { select(html_select::make($versions, "enrol_ldap_version", $frm->enrol_ldap_version, false)); + echo html_writer::input_select($versions, "enrol_ldap_version", $frm->enrol_ldap_version, false); if (isset($err["enrol_ldap_version"])) echo $OUTPUT->error_text($err["enrol_ldap_version"]); ?> @@ -351,7 +351,7 @@ if (!isset($frm->enrol_ldap_template)) { enrol_ldap_autocreate: select(html_select::make(array('0'=>'no','1'=>'yes'), "enrol_ldap_autocreate", $frm->enrol_ldap_autocreate, false)); + echo html_writer::input_select('0'=>'no','1'=>'yes'), "enrol_ldap_autocreate", $frm->enrol_ldap_autocreate, false); if (isset($err["enrol_ldap_autocreate"])) echo $OUTPUT->error_text($err["enrol_ldap_autocreate"]); ?> @@ -366,7 +366,7 @@ if (!isset($frm->enrol_ldap_template)) { $displaylist = array(); $parentlist = array(); make_categories_list($displaylist, $parentlist); - echo $OUTPUT->select(html_select::make($displaylist, "enrol_ldap_category", $frm->enrol_ldap_category, false)); + echo html_writer::input_select($displaylist, "enrol_ldap_category", $frm->enrol_ldap_category, false); ?> error_text($err["enrol_ldap_category"]); ?> diff --git a/enrol/manual/config.html b/enrol/manual/config.html index d116442fd49..2c96ef6f461 100644 --- a/enrol/manual/config.html +++ b/enrol/manual/config.html @@ -9,7 +9,7 @@ foreach ($roles as $id=>$role) { $rolenames[$id]=$role->name; } - echo $OUTPUT->select(html_select::make($rolenames, 'enrol_manual_keyholderrole', $frm->enrol_manual_keyholderrole)); + echo html_writer::input_select($rolenames, 'enrol_manual_keyholderrole', $frm->enrol_manual_keyholderrole); ?> @@ -24,7 +24,7 @@ $choices = array(); $choices['0'] = get_string('no'); $choices['1'] = get_string('yes'); - echo $OUTPUT->select(html_select::make($choices, 'enrol_manual_showhint', $frm->enrol_manual_showhint, false)); + echo html_writer::input_select($choices, 'enrol_manual_showhint', $frm->enrol_manual_showhint, false); ?> @@ -38,7 +38,7 @@ $choices = array(); $choices['0'] = get_string('no'); $choices['1'] = get_string('yes'); - echo $OUTPUT->select(html_select::make($choices, 'enrol_manual_usepasswordpolicy', $frm->enrol_manual_usepasswordpolicy, false)); + echo html_writer::input_select($choices, 'enrol_manual_usepasswordpolicy', $frm->enrol_manual_usepasswordpolicy, false); ?> @@ -52,7 +52,7 @@ $choices = array(); $choices['0'] = get_string('no'); $choices['1'] = get_string('yes'); - echo $OUTPUT->select(html_select::make($choices, 'enrol_manual_requirekey', $frm->enrol_manual_requirekey, false)); + echo html_writer::input_select($choices, 'enrol_manual_requirekey', $frm->enrol_manual_requirekey, false); ?> diff --git a/enrol/paypal/config.html b/enrol/paypal/config.html index aca9a54c2af..4debfdf08bb 100644 --- a/enrol/paypal/config.html +++ b/enrol/paypal/config.html @@ -15,9 +15,7 @@ enrol_currency, false); - $select->nothingvalue = ''; - echo $OUTPUT->select($select); + echo html_writer::input_select($paypalcurrencies, "enrol_currency", $frm->enrol_currency, false); ?> diff --git a/filter/manage.php b/filter/manage.php index e134881a85a..900cbe7ece0 100644 --- a/filter/manage.php +++ b/filter/manage.php @@ -179,9 +179,7 @@ if (empty($availablefilters)) { } else { $activechoices[TEXTFILTER_INHERIT] = $strdefaultoff; } - $select = html_select::make($activechoices, str_replace('/', '_', $filter), $filterinfo->localstate, false); - $select->nothingvalue = ''; - $row[] = $OUTPUT->select($select); + $row[] = html_writer::input_select($activechoices, str_replace('/', '_', $filter), $filterinfo->localstate, false); // Settings link, if required if ($settingscol) { diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php index 107802f8267..17566ba203b 100644 --- a/lib/outputcomponents.php +++ b/lib/outputcomponents.php @@ -442,7 +442,7 @@ class html_writer { $attributes = (array)$attributes; if (is_array($nothing)) { foreach ($nothing as $k=>$v) { - if ($v === 'choose') { + if ($v === 'choose' or $v === 'choosedots') { $nothing[$k] = get_string('choosedots'); } } diff --git a/lib/tablelib.php b/lib/tablelib.php index 938bb4b7e6e..0bfa0a62a1a 100644 --- a/lib/tablelib.php +++ b/lib/tablelib.php @@ -917,9 +917,7 @@ class flexible_table { $html = '
'; $html .= '
'; $html .= ''; - $select = html_select::make($downloadoptions, 'download', $this->defaultdownloadformat, false); - $select->nothingvalue = ''; - $html .= $OUTPUT->select($select); + $html .= html_writer::input_select($downloadoptions, 'download', $this->defaultdownloadformat, false); $html .= $OUTPUT->help_icon('tableexportformats', get_string('tableexportformats', 'table')); $html .= '
'; diff --git a/lib/weblib.php b/lib/weblib.php index 56720c3bed9..dbd87d910e5 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -2420,7 +2420,7 @@ function print_grade_menu($courseid, $name, $current, $includenograde=true, $ret for ($i=100; $i>=1; $i--) { $grades[$i] = $i; } - $output .= $OUTPUT->select(html_select::make($grades, $name, $current, false)); + $output .= html_writer::input_select($grades, $name, $current, false); $linkobject = ''.$strscales.''; $link = html_link::make('/course/scales.php?id='. $courseid .'&list=true', $linkobject); diff --git a/message/lib.php b/message/lib.php index 1da4e1d9ada..c0f4bc1b630 100644 --- a/message/lib.php +++ b/message/lib.php @@ -254,10 +254,9 @@ function message_print_settings() { $cbemailmessages = (get_user_preferences('message_emailmessages', 1) == '1') ? 'checked="checked"' : ''; $txemailaddress = get_user_preferences('message_emailaddress', $USER->email); $txemailtimenosee = get_user_preferences('message_emailtimenosee', 10); - $format_select = $OUTPUT->select(html_select::make( array(FORMAT_PLAIN => get_string('formatplain'), - FORMAT_HTML => get_string('formathtml')), - 'emailformat', - get_user_preferences('message_emailformat', FORMAT_PLAIN))); + $format_select = html_writer::input_select(array(FORMAT_PLAIN => get_string('formatplain'), + FORMAT_HTML => get_string('formathtml')), + 'emailformat', get_user_preferences('message_emailformat', FORMAT_PLAIN)); include('settings.html'); } diff --git a/mod/data/field.php b/mod/data/field.php index 962b43a84ca..861a0ea03db 100755 --- a/mod/data/field.php +++ b/mod/data/field.php @@ -350,7 +350,7 @@ if (($mode == 'new') && (!empty($newtype)) && confirm_sesskey()) { /// $options = array(0 => get_string('ascending', 'data'), 1 => get_string('descending', 'data')); - echo $OUTPUT->select(html_select::make($options, 'defaultsortdir', $data->defaultsortdir, false)); + echo html_writer::input_select($options, 'defaultsortdir', $data->defaultsortdir, false); echo ''; echo ''; echo ''; diff --git a/mod/data/field/file/mod.html b/mod/data/field/file/mod.html index 7b8dbe80974..7f31e7bdbec 100755 --- a/mod/data/field/file/mod.html +++ b/mod/data/field/file/mod.html @@ -14,10 +14,7 @@ maxbytes = $DB->get_field('course', 'maxbytes', array('id'=>$this->data->course)); $choices = get_max_upload_sizes($CFG->maxbytes, $course->maxbytes); - $select = html_select::make($choices, 'param3', $this->field->param3, false); - $select->id = 'param3'; - - echo $OUTPUT->select($select); + echo html_writer::input_select($choices, 'param3', $this->field->param3, false, array('id' => 'param3')); ?> diff --git a/mod/data/field/latlong/field.class.php b/mod/data/field/latlong/field.class.php index 1de85467976..8ac9b9326b0 100755 --- a/mod/data/field/latlong/field.class.php +++ b/mod/data/field/latlong/field.class.php @@ -77,7 +77,7 @@ class data_field_latlong extends data_field_base { $options[$temp.','.$longs[$key]] = $temp.','.$longs[$key]; } } - return $OUTPUT->select(html_select::make($options, 'f_'.$this->field->id, $value)); + return html_writer::input_select($options, 'f_'.$this->field->id, $value); } function parse_search_field() { diff --git a/mod/data/field/menu/field.class.php b/mod/data/field/menu/field.class.php index c4431ce34f6..5ee33181d41 100755 --- a/mod/data/field/menu/field.class.php +++ b/mod/data/field/menu/field.class.php @@ -47,11 +47,7 @@ class data_field_menu extends data_field_base { } - $select = html_select::make($options, 'field_'.$this->field->id, $content, get_string('menuchoose', 'data')); - $select->nothingvalue = ''; - $select->id = 'field_'.$this->field->id; - - $str .= $OUTPUT->select($select); + $str .= html_writer::input_select($options, 'field_'.$this->field->id, $content, array(''=>get_string('menuchoose', 'data')), array('id'=>'field_'.$this->field->id)); $str .= ''; @@ -88,7 +84,7 @@ class data_field_menu extends data_field_base { return ''; } - return $OUTPUT->select(html_select::make($options, 'f_'.$this->field->id, $content, ' ')); + return html_writer::input_select($options, 'f_'.$this->field->id, $content, array(''=>' ')); } function parse_search_field() { diff --git a/mod/data/field/picture/mod.html b/mod/data/field/picture/mod.html index 6086967fb2d..c5c4fe589f7 100755 --- a/mod/data/field/picture/mod.html +++ b/mod/data/field/picture/mod.html @@ -46,10 +46,7 @@ maxbytes = $DB->get_field('course', 'maxbytes', array('id'=>$this->data->course)); $choices = get_max_upload_sizes($CFG->maxbytes, $course->maxbytes); - $select = html_select::make($choices, 'param3', $this->field->param3, false); - $select->id = 'param3'; - - echo $OUTPUT->select($select); + echo html_writer::input_select($choices, 'param3', $this->field->param3, false, array('id'=>'param3')); ?> diff --git a/mod/data/field/radiobutton/field.class.php b/mod/data/field/radiobutton/field.class.php index df5dcfba30d..4d9d25e61c1 100755 --- a/mod/data/field/radiobutton/field.class.php +++ b/mod/data/field/radiobutton/field.class.php @@ -72,7 +72,7 @@ class data_field_radiobutton extends data_field_base { $options[$key] = $key; //Build following indicies from the sql. } } - return $OUTPUT->select(html_select::make($options, 'f_'.$this->field->id, $value)); + return html_writer::input_select($options, 'f_'.$this->field->id, $value); } function parse_search_field() { diff --git a/mod/data/lib.php b/mod/data/lib.php index c4024149d4a..5062cf7bbe8 100755 --- a/mod/data/lib.php +++ b/mod/data/lib.php @@ -1365,10 +1365,8 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order=' echo ' '; $pagesizes = array(2=>2,3=>3,4=>4,5=>5,6=>6,7=>7,8=>8,9=>9,10=>10,15=>15, 20=>20,30=>30,40=>40,50=>50,100=>100,200=>200,300=>300,400=>400,500=>500,1000=>1000); - $select = html_select::make($pagesizes, 'perpage', $perpage, false); - $select->id = 'pref_perpage'; - echo $OUTPUT->select($select); - echo '