From 95cdbec95f8ef9b1b9f39dd64fb68db1bedc5909 Mon Sep 17 00:00:00 2001 From: vinkmar Date: Sat, 19 Aug 2006 05:34:25 +0000 Subject: [PATCH] Added paramtypes (mandatory) to all text field objects. --- admin/adminlib.php | 16 +++++++---- admin/settings/authenticationandsecurity.php | 6 ++-- admin/settings/courses.php | 8 +++--- admin/settings/maintenanceandauditing.php | 2 +- admin/settings/misc.php | 8 +++--- admin/settings/serverinterface.php | 30 ++++++++++---------- admin/settings/userinterface.php | 24 ++++++++-------- 7 files changed, 49 insertions(+), 45 deletions(-) diff --git a/admin/adminlib.php b/admin/adminlib.php index 5a3dc99476..60de9aae75 100644 --- a/admin/adminlib.php +++ b/admin/adminlib.php @@ -223,7 +223,11 @@ class admin_settingpage extends part_of_admin_tree { function write_settings($data) { $return = ''; foreach($this->settings as $setting) { - $return .= $setting->write_setting($data['s_' . $setting->name]); + if (isset($data['s_' . $setting->name])) { + $return .= $setting->write_setting($data['s_' . $setting->name]); + } else { + $return .= $setting->write_setting(''); + } } return $return; } @@ -264,7 +268,7 @@ class admin_setting_configtext extends admin_setting { var $paramtype; - function admin_setting_configtext($name, $visiblename, $description, $paramtype = PARAM_RAW) { + function admin_setting_configtext($name, $visiblename, $description, $paramtype) { $this->paramtype = $paramtype; parent::admin_setting($name, $visiblename, $description); } @@ -577,11 +581,11 @@ class admin_setting_sitesettext extends admin_setting_configtext { var $id; - function admin_setting_sitesettext($name, $visiblename, $description) { + function admin_setting_sitesettext($name, $visiblename, $description, $paramtype) { $site = get_site(); $this->id = $site->id; - parent::admin_setting_configtext($name, $visiblename, $description); + parent::admin_setting_configtext($name, $visiblename, $description, $paramtype); } @@ -700,7 +704,7 @@ class admin_setting_special_editorfontlist extends admin_setting { $result = ''; for ($i = 0; $i < count($keys); $i++) { if (($keys[$i] !== '') && ($values[$i] !== '')) { - $result .= $keys[$i] . ':' . $values[$i] . ';'; + $result .= clean_param($keys[$i],PARAM_NOTAGS) . ':' . clean_param($values[$i], PARAM_NOTAGS) . ';'; } } @@ -942,7 +946,7 @@ class admin_setting_special_backupsaveto extends admin_setting_configtext { $name = 'backup_sche_destination'; $visiblename = get_string('saveto'); $description = get_string('backupsavetohelp'); - parent::admin_setting_configtext($name, $visiblename, $description); + parent::admin_setting_configtext($name, $visiblename, $description, PARAM_PATH); } function get_setting() { diff --git a/admin/settings/authenticationandsecurity.php b/admin/settings/authenticationandsecurity.php index 5efecc5e8d..42dfc770d5 100644 --- a/admin/settings/authenticationandsecurity.php +++ b/admin/settings/authenticationandsecurity.php @@ -74,7 +74,7 @@ $temp->add(new admin_setting_configselect('showsiteparticipantslist', get_string $temp->add(new admin_setting_configcheckbox('forcelogin', get_string('forcelogin', 'admin'), get_string('configforcelogin', 'admin'))); $temp->add(new admin_setting_configcheckbox('forceloginforprofiles', get_string('forceloginforprofiles', 'admin'), get_string('configforceloginforprofiles', 'admin'))); $temp->add(new admin_setting_configcheckbox('opentogoogle', get_string('opentogoogle', 'admin'), get_string('configopentogoogle', 'admin'))); -$temp->add(new admin_setting_configtext('maxbytes', get_string('maxbytes', 'admin'), get_string('configmaxbytes', 'admin'))); +$temp->add(new admin_setting_configtext('maxbytes', get_string('maxbytes', 'admin'), get_string('configmaxbytes', 'admin'), PARAM_INT)); $temp->add(new admin_setting_configcheckbox('messaging', get_string('messaging', 'admin'), get_string('configmessaging','admin'))); $temp->add(new admin_setting_configcheckbox('allowobjectembed', get_string('allowobjectembed', 'admin'), get_string('configallowobjectembed', 'admin'))); $temp->add(new admin_setting_configselect('maxeditingtime', get_string('maxeditingtime','admin'), get_string('configmaxeditingtime','admin'), array(60 => get_string('numminutes', '', 1), @@ -113,8 +113,8 @@ $ADMIN->add('authenticationandsecurity', $temp); // "antivirus" settingpage $temp = new admin_settingpage('antivirus', get_string('antivirus', 'admin')); $temp->add(new admin_setting_configcheckbox('runclamavonupload', get_string('runclamavonupload', 'admin'), get_string('configrunclamavonupload', 'admin'))); -$temp->add(new admin_setting_configtext('pathtoclam', get_string('pathtoclam', 'admin'), get_string('configpathtoclam', 'admin'))); -$temp->add(new admin_setting_configtext('quarantinedir', get_string('quarantinedir', 'admin'), get_string('configquarantinedir', 'admin'))); +$temp->add(new admin_setting_configtext('pathtoclam', get_string('pathtoclam', 'admin'), get_string('configpathtoclam', 'admin'), PARAM_PATH)); +$temp->add(new admin_setting_configtext('quarantinedir', get_string('quarantinedir', 'admin'), get_string('configquarantinedir', 'admin'), PARAM_PATH)); $temp->add(new admin_setting_configselect('clamfailureonupload', get_string('clamfailureonupload', 'admin'), get_string('configclamfailureonupload', 'admin'), array('donothing' => get_string('configclamdonothing', 'admin'), 'actlikevirus' => get_string('configclamactlikevirus', 'admin')))); $ADMIN->add('authenticationandsecurity', $temp); diff --git a/admin/settings/courses.php b/admin/settings/courses.php index 995e8d3fd4..24fe2125d3 100644 --- a/admin/settings/courses.php +++ b/admin/settings/courses.php @@ -7,10 +7,10 @@ $temp = new admin_settingpage('courserequests', get_string('courserequests', 'ad $temp->add(new admin_setting_configcheckbox('enablecourserequests', get_string('enablecourserequests', 'admin'), get_string('configenablecourserequests', 'admin'))); require_once($CFG->dirroot.'/course/lib.php'); $temp->add(new admin_setting_configselect('defaultrequestcategory', get_string('defaultrequestcategory', 'admin'), get_string('configdefaultrequestcategory', 'admin'), make_categories_options())); -$temp->add(new admin_setting_configtext('requestedteachername', get_string('requestedteachername', 'admin'), get_string('configrequestedteachername', 'admin'))); -$temp->add(new admin_setting_configtext('requestedteachersname', get_string('requestedteachersname', 'admin'), get_string('configrequestedteachersname', 'admin'))); -$temp->add(new admin_setting_configtext('requestedstudentname', get_string('requestedstudentname', 'admin'), get_string('configrequestedstudentname', 'admin'))); -$temp->add(new admin_setting_configtext('requestedstudentsname', get_string('requestedstudentsname', 'admin'), get_string('configrequestedstudentsname', 'admin'))); +$temp->add(new admin_setting_configtext('requestedteachername', get_string('requestedteachername', 'admin'), get_string('configrequestedteachername', 'admin'), PARAM_ALPHA)); +$temp->add(new admin_setting_configtext('requestedteachersname', get_string('requestedteachersname', 'admin'), get_string('configrequestedteachersname', 'admin'), PARAM_ALPHA)); +$temp->add(new admin_setting_configtext('requestedstudentname', get_string('requestedstudentname', 'admin'), get_string('configrequestedstudentname', 'admin'), PARAM_ALPHA)); +$temp->add(new admin_setting_configtext('requestedstudentsname', get_string('requestedstudentsname', 'admin'), get_string('configrequestedstudentsname', 'admin'), PARAM_ALPHA)); $ADMIN->add('courses', $temp); diff --git a/admin/settings/maintenanceandauditing.php b/admin/settings/maintenanceandauditing.php index fc57f9be8d..53e39aeaa0 100644 --- a/admin/settings/maintenanceandauditing.php +++ b/admin/settings/maintenanceandauditing.php @@ -63,7 +63,7 @@ $temp->add(new admin_setting_configselect('statsmaxruntime', get_string('statsma 60*60*7 => '7 '.get_string('hours'), 60*60*8 => '8 '.get_string('hours') ))); $temp->add(new admin_setting_configtime('statsruntimestarthour', 'statsruntimestartminute', get_string('statsruntimestart', 'admin'), get_string('configstatsruntimestart', 'admin'))); -$temp->add(new admin_setting_configtext('statsuserthreshold', get_string('statsuserthreshold', 'admin'), get_string('configstatsuserthreshold', 'admin'))); +$temp->add(new admin_setting_configtext('statsuserthreshold', get_string('statsuserthreshold', 'admin'), get_string('configstatsuserthreshold', 'admin'), PARAM_INT)); $ADMIN->add('maintenanceandauditing', $temp); diff --git a/admin/settings/misc.php b/admin/settings/misc.php index ee177d5ef6..b778d9ddf7 100644 --- a/admin/settings/misc.php +++ b/admin/settings/misc.php @@ -31,8 +31,8 @@ $temp->add(new admin_setting_configselect('fullnamedisplay', get_string('fullnam 'firstname' => get_string('firstname')))); $temp->add(new admin_setting_configcheckbox('extendedusernamechars', get_string('extendedusernamechars', 'admin'), get_string('configextendedusernamechars', 'admin'))); $temp->add(new admin_setting_configcheckbox('mymoodleredirect', get_string('mymoodleredirect', 'admin'), get_string('configmymoodleredirect', 'admin'))); -$temp->add(new admin_setting_configtext('sitepolicy', get_string('sitepolicy', 'admin'), get_string('configsitepolicy', 'admin'))); -$temp->add(new admin_setting_configtext('docroot', get_string('docroot', 'admin'), get_string('configdocroot', 'admin'))); +$temp->add(new admin_setting_configtext('sitepolicy', get_string('sitepolicy', 'admin'), get_string('configsitepolicy', 'admin'), PARAM_URL)); +$temp->add(new admin_setting_configtext('docroot', get_string('docroot', 'admin'), get_string('configdocroot', 'admin'), PARAM_URL)); $temp->add(new admin_setting_configcheckbox('doctonewwindow', get_string('doctonewwindow', 'admin'), get_string('configdoctonewwindow', 'admin'))); $temp->add(new admin_setting_configselect('bloglevel', get_string('bloglevel', 'admin'), get_string('configbloglevel', 'admin'), array(5 => get_string('worldblogs','blog'), 4 => get_string('siteblogs','blog'), @@ -56,8 +56,8 @@ $temp->add(new admin_setting_configselect('startwday', get_string('startwday', ' 4 => get_string('thursday', 'calendar'), 5 => get_string('friday', 'calendar'), 6 => get_string('saturday', 'calendar')))); -$temp->add(new admin_setting_configtext('calendar_lookahead', get_string('calendar_lookahead', 'admin'), get_string('helpupcominglookahead', 'admin'))); -$temp->add(new admin_setting_configtext('calendar_maxevents', get_string('calendar_maxevents', 'admin'), get_string('helpupcomingmaxevents', 'admin'))); +$temp->add(new admin_setting_configtext('calendar_lookahead', get_string('calendar_lookahead', 'admin'), get_string('helpupcominglookahead', 'admin'), PARAM_INT)); +$temp->add(new admin_setting_configtext('calendar_maxevents', get_string('calendar_maxevents', 'admin'), get_string('helpupcomingmaxevents', 'admin'), PARAM_INT)); $temp->add(new admin_setting_special_calendar_weekend()); $ADMIN->add('unsorted', $temp); diff --git a/admin/settings/serverinterface.php b/admin/settings/serverinterface.php index 49dda2a9cd..edbbed2ebd 100644 --- a/admin/settings/serverinterface.php +++ b/admin/settings/serverinterface.php @@ -7,22 +7,22 @@ $temp = new admin_settingpage('systempaths', get_string('systempaths','admin')); $temp->add(new admin_setting_configselect('gdversion', get_string('gdversion','admin'), get_string('configgdversion', 'admin'), array('0' => get_string('gdnot'), '1' => get_string('gd1'), '2' => get_string('gd2')))); // we're not calling check_gd_version() here, but we probably should be... though there was a bug in the original version -$temp->add(new admin_setting_configtext('zip', get_string('pathtozip','admin'), get_string('configzip', 'admin'))); -$temp->add(new admin_setting_configtext('unzip', get_string('pathtounzip','admin'), get_string('configunzip', 'admin'))); -$temp->add(new admin_setting_configtext('pathtodu', get_string('pathtodu', 'admin'), get_string('configpathtodu', 'admin'))); -$temp->add(new admin_setting_configtext('aspellpath', get_string('aspellpath', 'admin'), get_string('edhelpaspellpath'))); +$temp->add(new admin_setting_configtext('zip', get_string('pathtozip','admin'), get_string('configzip', 'admin'), PARAM_PATH)); +$temp->add(new admin_setting_configtext('unzip', get_string('pathtounzip','admin'), get_string('configunzip', 'admin'), PARAM_PATH)); +$temp->add(new admin_setting_configtext('pathtodu', get_string('pathtodu', 'admin'), get_string('configpathtodu', 'admin'), PARAM_PATH)); +$temp->add(new admin_setting_configtext('aspellpath', get_string('aspellpath', 'admin'), get_string('edhelpaspellpath'), PARAM_PATH)); $ADMIN->add('serverinterface', $temp, 0); // "email" settingpage $temp = new admin_settingpage('mail', get_string('mail','admin')); -$temp->add(new admin_setting_configtext('smtphosts', get_string('smtphosts', 'admin'), get_string('configsmtphosts', 'admin'))); -$temp->add(new admin_setting_configtext('smtpuser', get_string('smtpuser', 'admin'), get_string('configsmtpuser', 'admin'))); -$temp->add(new admin_setting_configtext('smtppass', get_string('smtppass', 'admin'), get_string('configsmtpuser', 'admin'))); -$temp->add(new admin_setting_configtext('noreplyaddress', get_string('noreplyaddress', 'admin'), get_string('confignoreplyaddress', 'admin'))); -$temp->add(new admin_setting_configtext('allowemailaddresses', get_string('allowemailaddresses', 'admin'), get_string('configallowemailaddresses', 'admin'))); -$temp->add(new admin_setting_configtext('denyemailaddresses', get_string('denyemailaddresses', 'admin'), get_string('configdenyemailaddresses', 'admin'))); +$temp->add(new admin_setting_configtext('smtphosts', get_string('smtphosts', 'admin'), get_string('configsmtphosts', 'admin'), PARAM_HOST)); +$temp->add(new admin_setting_configtext('smtpuser', get_string('smtpuser', 'admin'), get_string('configsmtpuser', 'admin'), PARAM_NOTAGS)); +$temp->add(new admin_setting_configtext('smtppass', get_string('smtppass', 'admin'), get_string('configsmtpuser', 'admin'), PARAM_RAW)); +$temp->add(new admin_setting_configtext('noreplyaddress', get_string('noreplyaddress', 'admin'), get_string('confignoreplyaddress', 'admin'), PARAM_NOTAGS)); +$temp->add(new admin_setting_configtext('allowemailaddresses', get_string('allowemailaddresses', 'admin'), get_string('configallowemailaddresses', 'admin'), PARAM_NOTAGS)); +$temp->add(new admin_setting_configtext('denyemailaddresses', get_string('denyemailaddresses', 'admin'), get_string('configdenyemailaddresses', 'admin'), PARAM_NOTAGS)); $temp->add(new admin_setting_configselect('digestmailtime', get_string('digestmailtime', 'admin'), get_string('configdigestmailtime', 'admin'), array('00' => '00', '01' => '01', '02' => '02', @@ -72,8 +72,8 @@ $temp->add(new admin_setting_configselect('sessiontimeout', get_string('sessiont 1800 => get_string('numminutes', '', 30), 900 => get_string('numminutes', '', 15), 300 => get_string('numminutes', '', 5)))); -$temp->add(new admin_setting_configtext('sessioncookie', get_string('sessioncookie', 'admin'), get_string('configsessioncookie', 'admin'))); -$temp->add(new admin_setting_configtext('sessioncookiepath', get_string('sessioncookiepath', 'admin'), get_string('configsessioncookiepath', 'admin'))); +$temp->add(new admin_setting_configtext('sessioncookie', get_string('sessioncookie', 'admin'), get_string('configsessioncookie', 'admin'), PARAM_ALPHANUM)); +$temp->add(new admin_setting_configtext('sessioncookiepath', get_string('sessioncookiepath', 'admin'), get_string('configsessioncookiepath', 'admin'), PARAM_LOCALURL)); $ADMIN->add('serverinterface', $temp, 50); @@ -87,10 +87,10 @@ $ADMIN->add('serverinterface', $temp); // "http" settingpage $temp = new admin_settingpage('http', get_string('http', 'admin')); -$temp->add(new admin_setting_configtext('framename', get_string('framename', 'admin'), get_string('configframename', 'admin'))); +$temp->add(new admin_setting_configtext('framename', get_string('framename', 'admin'), get_string('configframename', 'admin'), PARAM_ALPHAEXT)); $temp->add(new admin_Setting_configcheckbox('slasharguments', get_string('slasharguments', 'admin'), get_string('configslasharguments', 'admin'))); -$temp->add(new admin_setting_configtext('proxyhost', get_string('proxyhost', 'admin'), get_string('configproxyhost', 'admin'))); -$temp->add(new admin_setting_configtext('proxyport', get_string('proxyport', 'admin'), get_string('configproxyport', 'admin'))); +$temp->add(new admin_setting_configtext('proxyhost', get_string('proxyhost', 'admin'), get_string('configproxyhost', 'admin'), PARAM_HOST)); +$temp->add(new admin_setting_configtext('proxyport', get_string('proxyport', 'admin'), get_string('configproxyport', 'admin'), PARAM_INT)); $ADMIN->add('serverinterface', $temp); diff --git a/admin/settings/userinterface.php b/admin/settings/userinterface.php index 8508c82024..a71ba18988 100644 --- a/admin/settings/userinterface.php +++ b/admin/settings/userinterface.php @@ -24,12 +24,12 @@ $ADMIN->add('userinterface', $temp); // "generalsettings" settingpage $temp = new admin_settingpage('generalsettings', get_string('generalsettings','admin')); -$temp->add(new admin_setting_sitesettext('fullname', get_string('fullsitename'), get_string('fullsitenamehelp'))); -$temp->add(new admin_setting_sitesettext('shortname', get_string('shortsitename'), get_string('shortsitenamehelp'))); -$temp->add(new admin_setting_sitesettext('teacher', get_string('wordforteacher'), get_string('wordforteachereg'))); -$temp->add(new admin_setting_sitesettext('teachers', get_string('wordforteachers'), get_string('wordforteacherseg'))); -$temp->add(new admin_setting_sitesettext('student', get_string('wordforstudent'), get_string('wordforstudenteg'))); -$temp->add(new admin_setting_sitesettext('students', get_string('wordforstudents'), get_string('wordforstudentseg'))); +$temp->add(new admin_setting_sitesettext('fullname', get_string('fullsitename'), get_string('fullsitenamehelp'), PARAM_NOTAGS)); +$temp->add(new admin_setting_sitesettext('shortname', get_string('shortsitename'), get_string('shortsitenamehelp'), PARAM_NOTAGS)); +$temp->add(new admin_setting_sitesettext('teacher', get_string('wordforteacher'), get_string('wordforteachereg'), PARAM_ALPHA)); +$temp->add(new admin_setting_sitesettext('teachers', get_string('wordforteachers'), get_string('wordforteacherseg'), PARAM_ALPHA)); +$temp->add(new admin_setting_sitesettext('student', get_string('wordforstudent'), get_string('wordforstudenteg'), PARAM_ALPHA)); +$temp->add(new admin_setting_sitesettext('students', get_string('wordforstudents'), get_string('wordforstudentseg'), PARAM_ALPHA)); $ADMIN->add('userinterface', $temp); @@ -67,7 +67,7 @@ $ADMIN->add('userinterface', $temp); // "themesettings" settingpage $temp = new admin_settingpage('themesettings', get_string('themes')); -$temp->add(new admin_setting_configtext('themelist', get_string('themelist', 'admin'), get_string('configthemelist','admin'))); +$temp->add(new admin_setting_configtext('themelist', get_string('themelist', 'admin'), get_string('configthemelist','admin'), PARAM_NOTAGS)); $temp->add(new admin_setting_configcheckbox('allowuserthemes', get_string('allowuserthemes', 'admin'), get_string('configallowuserthemes', 'admin'))); $temp->add(new admin_setting_configcheckbox('allowcoursethemes', get_string('allowcoursethemes', 'admin'), get_string('configallowcoursethemes', 'admin'))); $temp->add(new admin_setting_configcheckbox('allowuserblockhiding', get_string('allowuserblockhiding', 'admin'), get_string('configallowuserblockhiding', 'admin'))); @@ -80,9 +80,9 @@ $ADMIN->add('userinterface', $temp); // "htmleditor" settingpage $temp = new admin_settingpage('htmleditor', get_string('htmleditor', 'admin')); $temp->add(new admin_setting_configcheckbox('htmleditor', get_string('usehtmleditor', 'admin'), get_string('confightmleditor','admin'))); -$temp->add(new admin_setting_configtext('editorbackgroundcolor', get_string('editorbackgroundcolor', 'admin'), get_string('edhelpbgcolor'))); -$temp->add(new admin_setting_configtext('editorfontfamily', get_string('editorfontfamily', 'admin'), get_string('edhelpfontfamily'))); -$temp->add(new admin_setting_configtext('editorfontsize', get_string('editorfontsize', 'admin'), get_string('edhelpfontsize'))); +$temp->add(new admin_setting_configtext('editorbackgroundcolor', get_string('editorbackgroundcolor', 'admin'), get_string('edhelpbgcolor'), PARAM_NOTAGS)); +$temp->add(new admin_setting_configtext('editorfontfamily', get_string('editorfontfamily', 'admin'), get_string('edhelpfontfamily'), PARAM_NOTAGS)); +$temp->add(new admin_setting_configtext('editorfontsize', get_string('editorfontsize', 'admin'), get_string('edhelpfontsize'), PARAM_NOTAGS)); $temp->add(new admin_setting_special_editorfontlist()); $temp->add(new admin_setting_configcheckbox('editorkillword', get_string('editorkillword', 'admin'), get_string('edhelpcleanword'))); if ($CFG->aspellpath !== '') { // make aspell settings disappear if path isn't set @@ -98,9 +98,9 @@ $ADMIN->add('userinterface', $temp); $temp = new admin_settingpage('languageandlocation', get_string('languageandlocation', 'admin')); $temp->add(new admin_setting_configselect('lang', get_string('lang', 'admin'), get_string('configlang', 'admin'), get_list_of_languages())); $temp->add(new admin_setting_configcheckbox('langmenu', get_string('langmenu', 'admin'), get_string('configlangmenu', 'admin'))); -$temp->add(new admin_setting_configtext('langlist', get_string('langlist', 'admin'), get_string('configlanglist', 'admin'))); +$temp->add(new admin_setting_configtext('langlist', get_string('langlist', 'admin'), get_string('configlanglist', 'admin'), PARAM_NOTAGS)); $temp->add(new admin_setting_configcheckbox('langcache', get_string('langcache', 'admin'), get_string('configlangcache', 'admin'))); -$temp->add(new admin_setting_configtext('locale', get_string('localetext', 'admin'), get_string('configlocale', 'admin'))); +$temp->add(new admin_setting_configtext('locale', get_string('localetext', 'admin'), get_string('configlocale', 'admin'), PARAM_ALPHAEXT)); $temp->add(new admin_setting_configselect('timezone', get_string('timezone','admin'), get_string('configtimezone', 'admin'), get_list_of_timezones())); $temp->add(new admin_setting_configselect('country', get_string('country', 'admin'), get_string('configcountry', 'admin'), get_list_of_countries())); unset($options); -- 2.39.5