]> git.mjollnir.org Git - moodle.git/commitdiff
* admin_setting defaults added
authorvinkmar <vinkmar>
Mon, 28 Aug 2006 01:32:11 +0000 (01:32 +0000)
committervinkmar <vinkmar>
Mon, 28 Aug 2006 01:32:11 +0000 (01:32 +0000)
admin/settings/authenticationandsecurity.php
admin/settings/courses.php
admin/settings/maintenanceandauditing.php
admin/settings/misc.php
admin/settings/serverinterface.php
admin/settings/userinterface.php

index 31c9c9977da0bcdbb17b12039426fb83ae4c4310..db5b486afd306cbc57d19abddc404ab3cde2bf01 100644 (file)
@@ -25,8 +25,8 @@ $ADMIN->add('roles', new admin_externalpage('assignsitewideroles', get_string('a
 
 // "httpsecurity" settingpage
 $temp = new admin_settingpage('httpsecurity', get_string('httpsecurity', 'admin'));
-$temp->add(new admin_setting_configcheckbox('loginhttps', get_string('loginhttps', 'admin'), get_string('configloginhttps', 'admin')));
-$temp->add(new admin_setting_configcheckbox('secureforms', get_string('secureforms', 'admin'), get_string('configsecureforms', 'admin')));
+$temp->add(new admin_setting_configcheckbox('loginhttps', get_string('loginhttps', 'admin'), get_string('configloginhttps', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('secureforms', get_string('secureforms', 'admin'), get_string('configsecureforms', 'admin'), 0));
 $ADMIN->add('authenticationandsecurity', $temp);
 
 
@@ -34,10 +34,10 @@ $ADMIN->add('authenticationandsecurity', $temp);
 
 // "modulesecurity" settingpage
 $temp = new admin_settingpage('modulesecurity', get_string('modulesecurity', 'admin'));
-$temp->add(new admin_setting_configselect('restrictmodulesfor', get_string('restrictmodulesfor', 'admin'), get_string('configrestrictmodulesfor', 'admin'), array('none' => 'No courses',
-                                                                                                                                                                  'all' => 'All courses',
-                                                                                                                                                                                                                                                                                                                                 'requested' => 'Requested courses')));
-$temp->add(new admin_setting_configcheckbox('restrictbydefault', get_string('restrictbydefault', 'admin'), get_string('configrestrictbydefault', 'admin')));                                                                                                                                                                                                                                                                                                                             
+$temp->add(new admin_setting_configselect('restrictmodulesfor', get_string('restrictmodulesfor', 'admin'), get_string('configrestrictmodulesfor', 'admin'), 'none', array('none' => 'No courses',
+                                                                                                                                                                          'all' => 'All courses',
+                                                                                                                                                                                                                                                                                                                                         'requested' => 'Requested courses')));
+$temp->add(new admin_setting_configcheckbox('restrictbydefault', get_string('restrictbydefault', 'admin'), get_string('configrestrictbydefault', 'admin'), 0));                                                                                                                                                                                                                                                                                                                                  
 if (!$options = get_records("modules")) {
     $options = array();
 }
@@ -45,66 +45,66 @@ $options2 = array();
 foreach ($options as $option) {
     $options2[$option->id] = $option->name;
 }
-$temp->add(new admin_setting_configmultiselect('defaultallowedmodules', get_string('defaultallowedmodules', 'admin'), get_string('configdefaultallowedmodules', 'admin'), $options2));
+$temp->add(new admin_setting_configmultiselect('defaultallowedmodules', get_string('defaultallowedmodules', 'admin'), get_string('configdefaultallowedmodules', 'admin'), array(), $options2));
 $ADMIN->add('authenticationandsecurity', $temp);
 
 
 
 // "notifications" settingpage
 $temp = new admin_settingpage('notifications', get_string('notifications', 'admin'));
-$temp->add(new admin_setting_configselect('displayloginfailures', get_string('displayloginfailures', 'admin'), get_string('configdisplayloginfailures', 'admin'), array('' => get_string('nobody'),
-                                                                                                                                                                        'admin' => get_string('administrators'),
-                                                                                                                                                                                                                                                                                                                                               'teacher' => get_string('administratorsandteachers'),
-                                                                                                                                                                                                                                                                                                                                               'everybody' => get_string('everybody'))));
-$temp->add(new admin_setting_configselect('notifyloginfailures', get_string('notifyloginfailures', 'admin'), get_string('confignotifyloginfailures', 'admin'), array('' => get_string('nobody'),
-                                                                                                                                                                     'mainadmin' => get_string('administrator'),
-                                                                                                                                                                                                                                                                                                                                        'alladmins' => get_string('administratorsall'))));
+$temp->add(new admin_setting_configselect('displayloginfailures', get_string('displayloginfailures', 'admin'), get_string('configdisplayloginfailures', 'admin'), '', array('' => get_string('nobody'),
+                                                                                                                                                                            'admin' => get_string('administrators'),
+                                                                                                                                                                                                                                                                                                                                               'teacher' => get_string('administratorsandteachers'),
+                                                                                                                                                                            'everybody' => get_string('everybody'))));
+$temp->add(new admin_setting_configselect('notifyloginfailures', get_string('notifyloginfailures', 'admin'), get_string('confignotifyloginfailures', 'admin'), '', array('' => get_string('nobody'),
+                                                                                                                                                                         'mainadmin' => get_string('administrator'),
+                                                                                                                                                                                                                                                                                                                                            'alladmins' => get_string('administratorsall'))));
 $options = array();
 for ($i = 1; $i <= 100; $i++) {
     $options[$i] = $i;
 }
-$temp->add(new admin_setting_configselect('notifyloginthreshold', get_string('notifyloginthreshold', 'admin'), get_string('confignotifyloginthreshold', 'admin'), $options));
+$temp->add(new admin_setting_configselect('notifyloginthreshold', get_string('notifyloginthreshold', 'admin'), get_string('confignotifyloginthreshold', 'admin'), '10', $options));
 $ADMIN->add('authenticationandsecurity', $temp);
 
 
 
 // "sitepolicies" settingpage
 $temp = new admin_settingpage('sitepolicies', get_string('sitepolicies', 'admin'));
-$temp->add(new admin_setting_configselect('showsiteparticipantslist', get_string('showsiteparticipantslist', 'admin'), get_string('configshowsiteparticipantslist', 'admin'),  array(0 => get_string('siteteachers'), 1 => get_string('allteachers'), 2 => get_string('studentsandteachers'))));
-$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'), 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_configcheckbox('enabletrusttext', get_string('enabletrusttext', 'admin'), get_string('configenabletrusttext', 'admin')));
-$temp->add(new admin_setting_configselect('maxeditingtime', get_string('maxeditingtime','admin'), get_string('configmaxeditingtime','admin'), array(60 => get_string('numminutes', '', 1),
-                                                                                                                                                    300 => get_string('numminutes', '', 5),
-                                                                                                                                                                                                                                                                                                       900 => get_string('numminutes', '', 15),
-                                                                                                                                                                                                                                                                                                       1800 => get_string('numminutes', '', 30),
-                                                                                                                                                                                                                                                                                                       2700 => get_string('numminutes', '', 45),
-                                                                                                                                                                                                                                                                                                       3600 => get_string('numminutes', '', 60))));
+$temp->add(new admin_setting_configselect('showsiteparticipantslist', get_string('showsiteparticipantslist', 'admin'), get_string('configshowsiteparticipantslist', 'admin'), 0, array(0 => get_string('siteteachers'), 1 => get_string('allteachers'), 2 => get_string('studentsandteachers'))));
+$temp->add(new admin_setting_configcheckbox('forcelogin', get_string('forcelogin', 'admin'), get_string('configforcelogin', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('forceloginforprofiles', get_string('forceloginforprofiles', 'admin'), get_string('configforceloginforprofiles', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('opentogoogle', get_string('opentogoogle', 'admin'), get_string('configopentogoogle', 'admin'), 0));
+$temp->add(new admin_setting_configtext('maxbytes', get_string('maxbytes', 'admin'), get_string('configmaxbytes', 'admin'), 0, PARAM_INT));
+$temp->add(new admin_setting_configcheckbox('messaging', get_string('messaging', 'admin'), get_string('configmessaging','admin'), 1));
+$temp->add(new admin_setting_configcheckbox('allowobjectembed', get_string('allowobjectembed', 'admin'), get_string('configallowobjectembed', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('enabletrusttext', get_string('enabletrusttext', 'admin'), get_string('configenabletrusttext', 'admin'), 1));
+$temp->add(new admin_setting_configselect('maxeditingtime', get_string('maxeditingtime','admin'), get_string('configmaxeditingtime','admin'), 1800, array(60 => get_string('numminutes', '', 1),
+                                                                                                                                                          300 => get_string('numminutes', '', 5),
+                                                                                                                                                                                                                                                                                                             900 => get_string('numminutes', '', 15),
+                                                                                                                                                                                                                                                                                                             1800 => get_string('numminutes', '', 30),
+                                                                                                                                                                                                                                                                                                             2700 => get_string('numminutes', '', 45),
+                                                                                                                                                                                                                                                                                                             3600 => get_string('numminutes', '', 60))));
 $ADMIN->add('authenticationandsecurity', $temp);
 
 
 
 // "userpolicies" settingpage
 $temp = new admin_settingpage('userpolicies', get_string('userpolicies', 'admin'));
-$temp->add(new admin_setting_configcheckbox('autologinguests', get_string('autologinguests', 'admin'), get_string('configautologinguests', 'admin')));
-$temp->add(new admin_setting_configmultiselect('hiddenuserfields', get_string('hiddenuserfields', 'admin'), get_string('confighiddenuserfields', 'admin'), array('none' => get_string('none'),
-                                                                                                                                                                 'description' => get_string('description'),
-                                                                                                                                                                                                                                                                                                                                'city' => get_string('city'),
-                                                                                                                                                                                                                                                                                                                                'country' => get_string('country'),
-                                                                                                                                                                                                                                                                                                                                'webpage' => get_string('webpage'),
-                                                                                                                                                                                                                                                                                                                                'icqnumber' => get_string('icqnumber'),
-                                                                                                                                                                                                                                                                                                                                'skypeid' => get_string('skypeid'),
-                                                                                                                                                                                                                                                                                                                                'yahooid' => get_string('yahooid'),
-                                                                                                                                                                                                                                                                                                                                'aimid' => get_string('aimid'),
-                                                                                                                                                                                                                                                                                                                                'msnid' => get_string('msnid'),
-                                                                                                                                                                                                                                                                                                                                'lastaccess' => get_string('lastaccess'))));
-$temp->add(new admin_setting_configcheckbox('teacherassignteachers', get_string('teacherassignteachers', 'admin'), get_string('configteacherassignteachers', 'admin')));
-$temp->add(new admin_setting_configcheckbox('allowunenroll', get_string('allowunenroll', 'admin'), get_string('configallowunenroll', 'admin')));
-$temp->add(new admin_setting_configcheckbox('allusersaresitestudents', get_string('allusersaresitestudents', 'admin'), get_string('configallusersaresitestudents','admin')));
+$temp->add(new admin_setting_configcheckbox('autologinguests', get_string('autologinguests', 'admin'), get_string('configautologinguests', 'admin'), 0));
+$temp->add(new admin_setting_configmultiselect('hiddenuserfields', get_string('hiddenuserfields', 'admin'), get_string('confighiddenuserfields', 'admin'), array(), array('none' => get_string('none'),
+                                                                                                                                                                          'description' => get_string('description'),
+                                                                                                                                                                                                                                                                                                                                         'city' => get_string('city'),
+                                                                                                                                                                                                                                                                                                                                         'country' => get_string('country'),
+                                                                                                                                                                                                                                                                                                                                         'webpage' => get_string('webpage'),
+                                                                                                                                                                                                                                                                                                                                         'icqnumber' => get_string('icqnumber'),
+                                                                                                                                                                                                                                                                                                                                         'skypeid' => get_string('skypeid'),
+                                                                                                                                                                                                                                                                                                                                         'yahooid' => get_string('yahooid'),
+                                                                                                                                                                                                                                                                                                                                         'aimid' => get_string('aimid'),
+                                                                                                                                                                                                                                                                                                                                         'msnid' => get_string('msnid'),
+                                                                                                                                                                                                                                                                                                                                         'lastaccess' => get_string('lastaccess'))));
+$temp->add(new admin_setting_configcheckbox('teacherassignteachers', get_string('teacherassignteachers', 'admin'), get_string('configteacherassignteachers', 'admin'), 1));
+$temp->add(new admin_setting_configcheckbox('allowunenroll', get_string('allowunenroll', 'admin'), get_string('configallowunenroll', 'admin'), 1));
+$temp->add(new admin_setting_configcheckbox('allusersaresitestudents', get_string('allusersaresitestudents', 'admin'), get_string('configallusersaresitestudents','admin'), 1));
 $temp->add(new admin_setting_special_adminseesall());
 $ADMIN->add('authenticationandsecurity', $temp);
 
@@ -113,14 +113,14 @@ $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'), 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'))));
+$temp->add(new admin_setting_configcheckbox('runclamavonupload', get_string('runclamavonupload', 'admin'), get_string('configrunclamavonupload', 'admin'), 0));
+$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'), 'donothing', array('donothing' => get_string('configclamdonothing', 'admin'),
+                                                                                                                                                                                  'actlikevirus' => get_string('configclamactlikevirus', 'admin'))));
 $ADMIN->add('authenticationandsecurity', $temp);
 
 
 $ADMIN->add('authenticationandsecurity', new admin_externalpage('userauthentication', get_string('authentication','admin'), $CFG->wwwroot . '/admin/auth.php'));
 
-?>
+?>
\ No newline at end of file
index 24fe2125d34fcffec91b199d7002a6033e4b2c73..35482af90da1df06a8b6205986c1e97dfd319c08 100644 (file)
@@ -4,13 +4,13 @@
 
 // "courserequests" settingpage
 $temp = new admin_settingpage('courserequests', get_string('courserequests', 'admin'));
-$temp->add(new admin_setting_configcheckbox('enablecourserequests', get_string('enablecourserequests', 'admin'), get_string('configenablecourserequests', 'admin')));
+$temp->add(new admin_setting_configcheckbox('enablecourserequests', get_string('enablecourserequests', 'admin'), get_string('configenablecourserequests', 'admin'), 0));
 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'), 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));
+$temp->add(new admin_setting_configselect('defaultrequestcategory', get_string('defaultrequestcategory', 'admin'), get_string('configdefaultrequestcategory', 'admin'), 1, make_categories_options()));
+$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);
 
 
index 53e39aeaa00d9cc906e841fd6abeff5be85f0f47..3fa029bef67f25c99334937dddd96bec52d09bf4 100644 (file)
@@ -6,30 +6,30 @@
 
 // "backups" settingpage
 $temp = new admin_settingpage('backups', get_string('backups','admin'));
-$temp->add(new admin_setting_backupcheckbox('backup_sche_modules', get_string('includemodules'), get_string('backupincludemoduleshelp')));
-$temp->add(new admin_setting_backupcheckbox('backup_sche_withuserdata', get_string('includemoduleuserdata'), get_string('backupincludemoduleuserdatahelp')));
-$temp->add(new admin_setting_backupcheckbox('backup_sche_metacourse', get_string('metacourse'), get_string('backupmetacoursehelp')));
-$temp->add(new admin_setting_backupselect('backup_sche_users', get_string('users'), get_string('backupusershelp'), array(0 => get_string('all'),
-                                                                                                                         1 => get_string('course'))));
-$temp->add(new admin_setting_backupcheckbox('backup_sche_logs', get_string('logs'), get_string('backuplogshelp')));
-$temp->add(new admin_setting_backupcheckbox('backup_sche_userfiles', get_string('userfiles'), get_string('backupuserfileshelp')));
-$temp->add(new admin_setting_backupcheckbox('backup_sche_coursefiles', get_string('coursefiles'), get_string('backupcoursefileshelp')));
-$temp->add(new admin_setting_backupcheckbox('backup_sche_messages', get_string('messages', 'message'), get_string('backupmessageshelp','message')));
-$temp->add(new admin_setting_backupselect('backup_sche_keep', get_string('keep'), get_string('backupkeephelp'), array(0 => get_string('all'),
-                                                                                                                      1 => '1',
-                                                                                                                                                                                                                                         2 => '2',
-                                                                                                                                                                                                                                         5 => '5',
-                                                                                                                                                                                                                                         10 => '10',
-                                                                                                                                                                                                                                         20 => '20',
-                                                                                                                                                                                                                                         30 => '30',
-                                                                                                                                                                                                                                         40 => '40',
-                                                                                                                                                                                                                                         50 => '50',
-                                                                                                                                                                                                                                         100 => '100',
-                                                                                                                                                                                                                                         200 => '200',
-                                                                                                                                                                                                                                         300 => '300',
-                                                                                                                                                                                                                                         400 => '400',
-                                                                                                                                                                                                                                         500 => '500')));
-$temp->add(new admin_setting_backupcheckbox('backup_sche_active', get_string('active'), get_string('backupactivehelp')));
+$temp->add(new admin_setting_backupcheckbox('backup_sche_modules', get_string('includemodules'), get_string('backupincludemoduleshelp'), 0));
+$temp->add(new admin_setting_backupcheckbox('backup_sche_withuserdata', get_string('includemoduleuserdata'), get_string('backupincludemoduleuserdatahelp'), 0));
+$temp->add(new admin_setting_backupcheckbox('backup_sche_metacourse', get_string('metacourse'), get_string('backupmetacoursehelp'), 0));
+$temp->add(new admin_setting_backupselect('backup_sche_users', get_string('users'), get_string('backupusershelp'), 0, array(0 => get_string('all'),
+                                                                                                                            1 => get_string('course'))));
+$temp->add(new admin_setting_backupcheckbox('backup_sche_logs', get_string('logs'), get_string('backuplogshelp'), 0));
+$temp->add(new admin_setting_backupcheckbox('backup_sche_userfiles', get_string('userfiles'), get_string('backupuserfileshelp'), 0));
+$temp->add(new admin_setting_backupcheckbox('backup_sche_coursefiles', get_string('coursefiles'), get_string('backupcoursefileshelp'), 0));
+$temp->add(new admin_setting_backupcheckbox('backup_sche_messages', get_string('messages', 'message'), get_string('backupmessageshelp','message'), 0));
+$temp->add(new admin_setting_backupselect('backup_sche_keep', get_string('keep'), get_string('backupkeephelp'), 1, array(0 => get_string('all'),
+                                                                                                                         1 => '1',
+                                                                                                                                                                                                                                            2 => '2',
+                                                                                                                                                                                                                                            5 => '5',
+                                                                                                                                                                                                                                            10 => '10',
+                                                                                                                                                                                                                                            20 => '20',
+                                                                                                                                                                                                                                            30 => '30',
+                                                                                                                                                                                                                                            40 => '40',
+                                                                                                                                                                                                                                            50 => '50',
+                                                                                                                                                                                                                                            100 => '100',
+                                                                                                                                                                                                                                            200 => '200',
+                                                                                                                                                                                                                                            300 => '300',
+                                                                                                                                                                                                                                            400 => '400',
+                                                                                                                                                                                                                                            500 => '500')));
+$temp->add(new admin_setting_backupcheckbox('backup_sche_active', get_string('active'), get_string('backupactivehelp'), 0));
 $temp->add(new admin_setting_special_backupdays());
 $temp->add(new admin_setting_special_backuptime());
 $temp->add(new admin_setting_special_backupsaveto());
@@ -41,29 +41,29 @@ $ADMIN->add('maintenanceandauditing', $temp);
 $temp = new admin_settingpage('performanceandstats', get_string('performanceandstats', 'admin'));
 $temp->add(new admin_setting_special_debug());
 $temp->add(new admin_setting_special_perfdebug());
-$temp->add(new admin_setting_configcheckbox('enablestats', get_string('enablestats', 'admin'), get_string('configenablestats', 'admin')));
-$temp->add(new admin_setting_configselect('statsfirstrun', get_string('statsfirstrun', 'admin'), get_string('configstatsfirstrun', 'admin'), array('none' => get_string('none'),
-                                                                                                                                                   60*60*24*7 => get_string('numweeks','moodle',1),
-                                                                                                                                                                                                                                                                                                  60*60*24*14 => get_string('numweeks','moodle',2),
-                                                                                                                                                                                                                                                                                                  60*60*24*21 => get_string('numweeks','moodle',3),
-                                                                                                                                                                                                                                                                                                  60*60*24*28 => get_string('nummonths','moodle',1),
-                                                                                                                                                                                                                                                                                                  60*60*24*56 => get_string('nummonths','moodle',2),
-                                                                                                                                                                                                                                                                                                  60*60*24*84 => get_string('nummonths','moodle',3),
-                                                                                                                                                                                                                                                                                                  60*60*24*112 => get_string('nummonths','moodle',4),
-                                                                                                                                                                                                                                                                                                  60*60*24*140 => get_string('nummonths','moodle',5),
-                                                                                                                                                                                                                                                                                                  60*60*24*168 => get_string('nummonths','moodle',6),
-                                                                                                                                                                                                                                                                                                  'all' => get_string('all') )));
-$temp->add(new admin_setting_configselect('statsmaxruntime', get_string('statsmaxruntime', 'admin'), get_string('configstatsmaxruntime', 'admin'), array(0 => get_string('untilcomplete'),
-                                                                                                                                                          60*60 => '1 '.get_string('hour'),
-                                                                                                                                                                                                                                                                                                                 60*60*2 => '2 '.get_string('hours'),
-                                                                                                                                                                                                                                                                                                                 60*60*3 => '3 '.get_string('hours'),
-                                                                                                                                                                                                                                                                                                                 60*60*4 => '4 '.get_string('hours'),
-                                                                                                                                                                                                                                                                                                                 60*60*5 => '5 '.get_string('hours'),
-                                                                                                                                                                                                                                                                                                                 60*60*6 => '6 '.get_string('hours'),
-                                                                                                                                                                                                                                                                                                                 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'), PARAM_INT));
+$temp->add(new admin_setting_configcheckbox('enablestats', get_string('enablestats', 'admin'), get_string('configenablestats', 'admin'), 0));
+$temp->add(new admin_setting_configselect('statsfirstrun', get_string('statsfirstrun', 'admin'), get_string('configstatsfirstrun', 'admin'), 'none', array('none' => get_string('none'),
+                                                                                                                                                           60*60*24*7 => get_string('numweeks','moodle',1),
+                                                                                                                                                                                                                                                                                                          60*60*24*14 => get_string('numweeks','moodle',2),
+                                                                                                                                                                                                                                                                                                          60*60*24*21 => get_string('numweeks','moodle',3),
+                                                                                                                                                                                                                                                                                                          60*60*24*28 => get_string('nummonths','moodle',1),
+                                                                                                                                                                                                                                                                                                          60*60*24*56 => get_string('nummonths','moodle',2),
+                                                                                                                                                                                                                                                                                                          60*60*24*84 => get_string('nummonths','moodle',3),
+                                                                                                                                                                                                                                                                                                          60*60*24*112 => get_string('nummonths','moodle',4),
+                                                                                                                                                                                                                                                                                                          60*60*24*140 => get_string('nummonths','moodle',5),
+                                                                                                                                                                                                                                                                                                          60*60*24*168 => get_string('nummonths','moodle',6),
+                                                                                                                                                                                                                                                                                                          'all' => get_string('all') )));
+$temp->add(new admin_setting_configselect('statsmaxruntime', get_string('statsmaxruntime', 'admin'), get_string('configstatsmaxruntime', 'admin'), 0, array(0 => get_string('untilcomplete'),
+                                                                                                                                                            60*60 => '1 '.get_string('hour'),
+                                                                                                                                                                                                                                                                                                                   60*60*2 => '2 '.get_string('hours'),
+                                                                                                                                                                                                                                                                                                               60*60*3 => '3 '.get_string('hours'),
+                                                                                                                                                                                                                                                                                                                   60*60*4 => '4 '.get_string('hours'),
+                                                                                                                                                                                                                                                                                                                   60*60*5 => '5 '.get_string('hours'),
+                                                                                                                                                                                                                                                                                                                   60*60*6 => '6 '.get_string('hours'),
+                                                                                                                                                                                                                                                                                                                   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'), array('h' => 0, 'm' => 0)));
+$temp->add(new admin_setting_configtext('statsuserthreshold', get_string('statsuserthreshold', 'admin'), get_string('configstatsuserthreshold', 'admin'), 0, PARAM_INT));
 $ADMIN->add('maintenanceandauditing', $temp);                                                                                                                                                                                                                                                                                             
 
 
index b778d9ddf74ee7dbd295359b8624205b889b263e..a9cf73573b8865de2e82c7856cac0912e74db0c2 100644 (file)
@@ -2,62 +2,62 @@
 
 // * Miscellaneous settings (still to be sorted)
 $temp = new admin_settingpage('misc', get_string('misc', 'admin'));
-$temp->add(new admin_setting_configselect('longtimenosee', get_string('longtimenosee', 'admin'), get_string('configlongtimenosee', 'admin'), array(0 => get_string('never'),
-                                                                                                                                                   1000 => get_string('numdays', '', 1000),
-                                                                                                                                                                                                                                                                                                  365 => get_string('numdays', '', 365),
-                                                                                                                                                                                                                                                                                                  180 => get_string('numdays', '', 180),
-                                                                                                                                                                                                                                                                                                  150 => get_string('numdays', '', 150),
-                                                                                                                                                                                                                                                                                                  120 => get_string('numdays', '', 120),
-                                                                                                                                                                                                                                                                                                  90 => get_string('numdays', '', 90),
-                                                                                                                                                                                                                                                                                                  60 => get_string('numdays', '', 60),
-                                                                                                                                                                                                                                                                                                  30 => get_string('numdays', '', 30),
-                                                                                                                                                                                                                                                                                                  21 => get_string('numdays', '', 21),
-                                                                                                                                                                                                                                                                                                  14 => get_string('numdays', '', 14),
-                                                                                                                                                                                                                                                                                                  7 => get_string('numdays', '', 7) )));
-$temp->add(new admin_setting_configselect('deleteunconfirmed', get_string('deleteunconfirmed', 'admin'), get_string('configdeleteunconfirmed', 'admin'), array(0 => get_string('never'),
-                                                                                                                                                               168 => get_string('numdays', '', 7),
-                                                                                                                                                               144 => get_string('numdays', '', 6),
-                                                                                                                                                               120 => get_string('numdays', '', 5),
-                                                                                                                                                               96 => get_string('numdays', '', 4),
-                                                                                                                                                               72 => get_string('numdays', '', 3),
-                                                                                                                                                               48 => get_string('numdays', '', 2),
-                                                                                                                                                               24 => get_string('numdays', '', 1),
-                                                                                                                                                               12 => get_string('numhours', '', 12),
-                                                                                                                                                               6 => get_string('numhours', '', 6),
-                                                                                                                                                               1 => get_string('numhours', '', 1))));
-$temp->add(new admin_setting_configselect('fullnamedisplay', get_string('fullnamedisplay', 'admin'), get_string('configfullnamedisplay', 'admin'), array('language' => get_string('language'),
-                                                                                                                                                         'firstname lastname' => get_string('firstname') . ' + ' . get_string('lastname'),
-                                                                                                                                                                                                                                                                                                                'lastname firstname' => get_string('lastname') . ' + ' . get_string('firstname'),
-                                                                                                                                                                                                                                                                                                                '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'), 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'),
-                                                                                                                                      3 => get_string('courseblogs','blog'),
-                                                                                                                                      2 => get_string('groupblogs','blog'),
-                                                                                                                                      1 => get_string('personalblogs','blog'),
-                                                                                                                                      0 => get_string('disableblogs','blog'))));
-$temp->add(new admin_setting_configselect('loglifetime', get_string('loglifetime', 'admin'), get_string('configloglifetime', 'admin'), array(0 => get_string('neverdeletelogs'),
-                                                                                                                                             1000 => get_string('numdays', '', 1000),
-                                                                                                                                             365 => get_string('numdays', '', 365),
-                                                                                                                                             180 => get_string('numdays', '', 180),
-                                                                                                                                             150 => get_string('numdays', '', 150),
-                                                                                                                                             120 => get_string('numdays', '', 120),
-                                                                                                                                             90 => get_string('numdays', '', 90),
-                                                                                                                                             60 => get_string('numdays', '', 60),
-                                                                                                                                             30 => get_string('numdays', '', 30))));
-$temp->add(new admin_setting_configselect('startwday', get_string('startwday', 'admin'), get_string('helpstartofweek', 'admin'), array(0 => get_string('sunday', 'calendar'), 
-                                                                                                                                       1 => get_string('monday', 'calendar'), 
-                                                                                                                                       2 => get_string('tuesday', 'calendar'), 
-                                                                                                                                       3 => get_string('wednesday', 'calendar'), 
-                                                                                                                                       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'), 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_configselect('longtimenosee', get_string('longtimenosee', 'admin'), get_string('configlongtimenosee', 'admin'), 120, array(0 => get_string('never'),
+                                                                                                                                                        1000 => get_string('numdays', '', 1000),
+                                                                                                                                                                                                                                                                                                       365 => get_string('numdays', '', 365),
+                                                                                                                                                                                                                                                                                                       180 => get_string('numdays', '', 180),
+                                                                                                                                                                                                                                                                                                       150 => get_string('numdays', '', 150),
+                                                                                                                                                                                                                                                                                                       120 => get_string('numdays', '', 120),
+                                                                                                                                                                                                                                                                                                       90 => get_string('numdays', '', 90),
+                                                                                                                                                                                                                                                                                                       60 => get_string('numdays', '', 60),
+                                                                                                                                                                                                                                                                                                       30 => get_string('numdays', '', 30),
+                                                                                                                                                                                                                                                                                                       21 => get_string('numdays', '', 21),
+                                                                                                                                                                                                                                                                                                       14 => get_string('numdays', '', 14),
+                                                                                                                                                                                                                                                                                                       7 => get_string('numdays', '', 7) )));
+$temp->add(new admin_setting_configselect('deleteunconfirmed', get_string('deleteunconfirmed', 'admin'), get_string('configdeleteunconfirmed', 'admin'), 168, array(0 => get_string('never'),
+                                                                                                                                                                    168 => get_string('numdays', '', 7),
+                                                                                                                                                                    144 => get_string('numdays', '', 6),
+                                                                                                                                                                    120 => get_string('numdays', '', 5),
+                                                                                                                                                                    96 => get_string('numdays', '', 4),
+                                                                                                                                                                    72 => get_string('numdays', '', 3),
+                                                                                                                                                                    48 => get_string('numdays', '', 2),
+                                                                                                                                                                    24 => get_string('numdays', '', 1),
+                                                                                                                                                                    12 => get_string('numhours', '', 12),
+                                                                                                                                                                    6 => get_string('numhours', '', 6),
+                                                                                                                                                                    1 => get_string('numhours', '', 1))));
+$temp->add(new admin_setting_configselect('fullnamedisplay', get_string('fullnamedisplay', 'admin'), get_string('configfullnamedisplay', 'admin'), 'firstname lastname', array('language' => get_string('language'),
+                                                                                                                                                                               'firstname lastname' => get_string('firstname') . ' + ' . get_string('lastname'),
+                                                                                                                                                                                                                                                                                                                                      'lastname firstname' => get_string('lastname') . ' + ' . get_string('firstname'),
+                                                                                                                                                                                                                                                                                                                                      'firstname' => get_string('firstname'))));
+$temp->add(new admin_setting_configcheckbox('extendedusernamechars', get_string('extendedusernamechars', 'admin'), get_string('configextendedusernamechars', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('mymoodleredirect', get_string('mymoodleredirect', 'admin'), get_string('configmymoodleredirect', 'admin'), 0));
+$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'), 'http://docs.moodle.org', PARAM_URL));
+$temp->add(new admin_setting_configcheckbox('doctonewwindow', get_string('doctonewwindow', 'admin'), get_string('configdoctonewwindow', 'admin'), 0));
+$temp->add(new admin_setting_configselect('bloglevel', get_string('bloglevel', 'admin'), get_string('configbloglevel', 'admin'), 4, array(5 => get_string('worldblogs','blog'),
+                                                                                                                                          4 => get_string('siteblogs','blog'),
+                                                                                                                                          3 => get_string('courseblogs','blog'),
+                                                                                                                                          2 => get_string('groupblogs','blog'),
+                                                                                                                                          1 => get_string('personalblogs','blog'),
+                                                                                                                                          0 => get_string('disableblogs','blog'))));
+$temp->add(new admin_setting_configselect('loglifetime', get_string('loglifetime', 'admin'), get_string('configloglifetime', 'admin'), 0, array(0 => get_string('neverdeletelogs'),
+                                                                                                                                                1000 => get_string('numdays', '', 1000),
+                                                                                                                                                365 => get_string('numdays', '', 365),
+                                                                                                                                                180 => get_string('numdays', '', 180),
+                                                                                                                                                150 => get_string('numdays', '', 150),
+                                                                                                                                                120 => get_string('numdays', '', 120),
+                                                                                                                                                90 => get_string('numdays', '', 90),
+                                                                                                                                                60 => get_string('numdays', '', 60),
+                                                                                                                                                30 => get_string('numdays', '', 30))));
+$temp->add(new admin_setting_configselect('startwday', get_string('startwday', 'admin'), get_string('helpstartofweek', 'admin'), 1, array(0 => get_string('sunday', 'calendar'), 
+                                                                                                                                          1 => get_string('monday', 'calendar'), 
+                                                                                                                                          2 => get_string('tuesday', 'calendar'), 
+                                                                                                                                          3 => get_string('wednesday', 'calendar'), 
+                                                                                                                                          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'), 10, PARAM_INT));
+$temp->add(new admin_setting_configtext('calendar_maxevents', get_string('calendar_maxevents', 'admin'), get_string('helpupcomingmaxevents', 'admin'), 5, PARAM_INT));
 $temp->add(new admin_setting_special_calendar_weekend());
 
 $ADMIN->add('unsorted', $temp);
index edbbed2ebd0769f013f2c31fabf649de485c6ad3..448c863852cd833b6008cbd63cc820705e313158 100644 (file)
@@ -4,57 +4,57 @@
 
 // "systempaths" settingpage
 $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'), 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));
+$temp->add(new admin_setting_configselect('gdversion', get_string('gdversion','admin'), get_string('configgdversion', 'admin'), check_gd_version(), array('0' => get_string('gdnot'), 
+                                                                                                                                                          '1' => get_string('gd1'), 
+                                                                                                                                                                                                                                                                                             '2' => get_string('gd2'))));
+$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'), 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', 
-                                                                                                                                                                                                                                                                                                         '03' => '03', 
-                                                                                                                                                                                                                                                                                                         '04' => '04', 
-                                                                                                                                                                                                                                                                                                         '05' => '05', 
-                                                                                                                                                                                                                                                                                                         '06' => '06', 
-                                                                                                                                                                                                                                                                                                         '07' => '07', 
-                                                                                                                                                                                                                                                                                                         '08' => '08', 
-                                                                                                                                                                                                                                                                                                         '09' => '09', 
-                                                                                                                                                                                                                                                                                                         '10' => '10', 
-                                                                                                                                                                                                                                                                                                         '11' => '11', 
-                                                                                                                                                                                                                                                                                                         '12' => '12', 
-                                                                                                                                                                                                                                                                                                         '13' => '13', 
-                                                                                                                                                                                                                                                                                                         '14' => '14', 
-                                                                                                                                                                                                                                                                                                         '15' => '15', 
-                                                                                                                                                                                                                                                                                                         '16' => '16', 
-                                                                                                                                                                                                                                                                                                         '17' => '17', 
-                                                                                                                                                                                                                                                                                                         '18' => '18', 
-                                                                                                                                                                                                                                                                                                         '19' => '19', 
-                                                                                                                                                                                                                                                                                                         '20' => '20', 
-                                                                                                                                                                                                                                                                                                         '21' => '21', 
-                                                                                                                                                                                                                                                                                                         '22' => '22', 
-                                                                                                                                                                                                                                                                                                         '23' => '23')));
+$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'), 'noreply@' . $_SERVER['HTTP_HOST'], 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'), 17, array('00' => '00', 
+                                                                                                                                                          '01' => '01', 
+                                                                                                                                                                                                                                                                                                             '02' => '02', 
+                                                                                                                                                                                                                                                                                                             '03' => '03', 
+                                                                                                                                                                                                                                                                                                             '04' => '04', 
+                                                                                                                                                                                                                                                                                                             '05' => '05', 
+                                                                                                                                                                                                                                                                                                             '06' => '06', 
+                                                                                                                                                                                                                                                                                                             '07' => '07', 
+                                                                                                                                                                                                                                                                                                             '08' => '08', 
+                                                                                                                                                                                                                                                                                                             '09' => '09', 
+                                                                                                                                                                                                                                                                                                             '10' => '10', 
+                                                                                                                                                                                                                                                                                                             '11' => '11', 
+                                                                                                                                                                                                                                                                                                             '12' => '12', 
+                                                                                                                                                                                                                                                                                                             '13' => '13', 
+                                                                                                                                                                                                                                                                                                             '14' => '14', 
+                                                                                                                                                                                                                                                                                                             '15' => '15', 
+                                                                                                                                                                                                                                                                                                             '16' => '16', 
+                                                                                                                                                                                                                                                                                                             '17' => '17', 
+                                                                                                                                                                                                                                                                                                             '18' => '18', 
+                                                                                                                                                                                                                                                                                                             '19' => '19', 
+                                                                                                                                                                                                                                                                                                             '20' => '20', 
+                                                                                                                                                                                                                                                                                                             '21' => '21', 
+                                                                                                                                                                                                                                                                                                             '22' => '22', 
+                                                                                                                                                                                                                                                                                                             '23' => '23')));
 if (!empty($CFG->unicodedb)) { // These options are only available if running under unicodedb
     unset($options);
     unset($charsets);
     $charsets = get_list_of_charsets();
     $options['0'] = get_string('none');
     $options = array_merge($options, $charsets);
-    $temp->add(new admin_setting_configselect('sitemailcharset', get_string('sitemailcharset', 'admin'), get_string('configsitemailcharset','admin'), $options));
-    $temp->add(new admin_setting_configcheckbox('allowusermailcharset', get_string('allowusermailcharset', 'admin'), get_string('configallowusermailcharset', 'admin')));
+    $temp->add(new admin_setting_configselect('sitemailcharset', get_string('sitemailcharset', 'admin'), get_string('configsitemailcharset','admin'), '', $options));
+    $temp->add(new admin_setting_configcheckbox('allowusermailcharset', get_string('allowusermailcharset', 'admin'), get_string('configallowusermailcharset', 'admin'), 0));
 }
 $ADMIN->add('serverinterface', $temp, 100);
 
@@ -62,8 +62,8 @@ $ADMIN->add('serverinterface', $temp, 100);
 
 // "sessionhandling" settingpage
 $temp = new admin_settingpage('sessionhandling', get_string('sessionhandling', 'admin'));
-$temp->add(new admin_setting_configcheckbox('dbsessions', get_string('dbsessions', 'admin'), get_string('configdbsessions', 'admin')));
-$temp->add(new admin_setting_configselect('sessiontimeout', get_string('sessiontimeout', 'admin'), get_string('configsessiontimeout', 'admin'), array(14400 => get_string('numhours', '', 4),
+$temp->add(new admin_setting_configcheckbox('dbsessions', get_string('dbsessions', 'admin'), get_string('configdbsessions', 'admin'), 0));
+$temp->add(new admin_setting_configselect('sessiontimeout', get_string('sessiontimeout', 'admin'), get_string('configsessiontimeout', 'admin'), 7200, array(14400 => get_string('numhours', '', 4),
                                                                                                                                                       10800 => get_string('numhours', '', 3),
                                                                                                                                                       7200 => get_string('numhours', '', 2),
                                                                                                                                                       5400 => get_string('numhours', '', '1.5'),
@@ -72,25 +72,25 @@ $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'), PARAM_ALPHANUM));
-$temp->add(new admin_setting_configtext('sessioncookiepath', get_string('sessioncookiepath', 'admin'), get_string('configsessioncookiepath', 'admin'), PARAM_LOCALURL));
+$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);
 
 
 
 // "rss" settingpage
 $temp = new admin_settingpage('rss', get_string('rss'));
-$temp->add(new admin_setting_configcheckbox('enablerssfeeds', get_string('enablerssfeeds', 'admin'), get_string('configenablerssfeeds', 'admin')));
+$temp->add(new admin_setting_configcheckbox('enablerssfeeds', get_string('enablerssfeeds', 'admin'), get_string('configenablerssfeeds', 'admin'), 0));
 $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'), 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'), PARAM_HOST));
-$temp->add(new admin_setting_configtext('proxyport', get_string('proxyport', 'admin'), get_string('configproxyport', 'admin'), PARAM_INT));
+$temp->add(new admin_setting_configtext('framename', get_string('framename', 'admin'), get_string('configframename', 'admin'), '_top', PARAM_ALPHAEXT));
+$temp->add(new admin_Setting_configcheckbox('slasharguments', get_string('slasharguments', 'admin'), get_string('configslasharguments', 'admin'), 1));
+$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); 
 
 
index 614cba7b01e0b8bb3d08a5017ec367287cd11d34..7e2ee2e201809c9887e5faefeceae917a92e0796 100644 (file)
@@ -5,8 +5,8 @@
 // "frontpage" settingpage
 $temp = new admin_settingpage('frontpage', get_string('frontpage','admin'));
 $temp->add(new admin_setting_special_frontpagedesc());
-$temp->add(new admin_setting_sitesetcheckbox('numsections', get_string('sitesection'), get_string('sitesectionhelp')));
-$temp->add(new admin_setting_sitesetselect('newsitems', get_string('newsitemsnumber'), get_string('newsitemsnumberhelp'), array('0' => '0 ' . get_string('newsitems'),
+$temp->add(new admin_setting_sitesetcheckbox('numsections', get_string('sitesection'), get_string('sitesectionhelp'), 1));
+$temp->add(new admin_setting_sitesetselect('newsitems', get_string('newsitemsnumber'), get_string('newsitemsnumberhelp'), 3, array('0' => '0 ' . get_string('newsitems'),
                                                                                                                                 '1' => '1 ' . get_string('newsitem'),
                                                                                                                                 '2' => '2 ' . get_string('newsitems'),
                                                                                                                                 '3' => '3 ' . get_string('newsitems'),
@@ -24,18 +24,18 @@ $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'), 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));
+$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);
 
 
 // "filtersettings" settingpage
 $temp = new admin_settingpage('filtersettings', get_string('filtersettings', 'admin'));
-$temp->add(new admin_setting_configselect('cachetext', get_string('cachetext', 'admin'), get_string('configcachetext', 'admin'), array(604800 => get_string('numdays','',7),
+$temp->add(new admin_setting_configselect('cachetext', get_string('cachetext', 'admin'), get_string('configcachetext', 'admin'), 60, array(604800 => get_string('numdays','',7),
                                                                                                                                        86400 => get_string('numdays','',1),
                                                                                                                                        43200 => get_string('numhours','',12),
                                                                                                                                        10800 => get_string('numhours','',3),
@@ -56,37 +56,37 @@ $temp->add(new admin_setting_configselect('cachetext', get_string('cachetext', '
                                                                                                                                        60 => get_string('numminutes','',1),
                                                                                                                                        30 => get_string('numseconds','',30),
                                                                                                                                        0 => get_string('no'))));
-$temp->add(new admin_setting_configselect('filteruploadedfiles', get_string('filteruploadedfiles', 'admin'), get_string('configfilteruploadedfiles', 'admin'), array('0' => get_string('none'),
+$temp->add(new admin_setting_configselect('filteruploadedfiles', get_string('filteruploadedfiles', 'admin'), get_string('configfilteruploadedfiles', 'admin'), 0, array('0' => get_string('none'),
                                                                                                                                                                      '1' => get_string('allfiles'),
                                                                                                                                                                                                                                                                 '2' => get_string('htmlfilesonly'))));
-$temp->add(new admin_setting_configcheckbox('filtermatchoneperpage', get_string('filtermatchoneperpage', 'admin'), get_string('configfiltermatchoneperpage', 'admin')));
-$temp->add(new admin_setting_configcheckbox('filtermatchonepertext', get_string('filtermatchonepertext', 'admin'), get_string('configfiltermatchonepertext', 'admin')));
-$temp->add(new admin_setting_configcheckbox('filterall', get_string('filterall', 'admin'), get_string('configfilterall', 'admin')));
+$temp->add(new admin_setting_configcheckbox('filtermatchoneperpage', get_string('filtermatchoneperpage', 'admin'), get_string('configfiltermatchoneperpage', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('filtermatchonepertext', get_string('filtermatchonepertext', 'admin'), get_string('configfiltermatchonepertext', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('filterall', get_string('filterall', 'admin'), get_string('configfilterall', 'admin'), 0));
 $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'), 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')));
-$temp->add(new admin_setting_configcheckbox('showblocksonmodpages', get_string('showblocksonmodpages', 'admin'), get_string('configshowblocksonmodpages', 'admin')));
-$temp->add(new admin_setting_configcheckbox('tabselectedtofront', get_string('tabselectedtofronttext', 'admin'), get_string('tabselectedtofront', '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'), 0));
+$temp->add(new admin_setting_configcheckbox('allowcoursethemes', get_string('allowcoursethemes', 'admin'), get_string('configallowcoursethemes', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('allowuserblockhiding', get_string('allowuserblockhiding', 'admin'), get_string('configallowuserblockhiding', 'admin'), 1));
+$temp->add(new admin_setting_configcheckbox('showblocksonmodpages', get_string('showblocksonmodpages', 'admin'), get_string('configshowblocksonmodpages', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('tabselectedtofront', get_string('tabselectedtofronttext', 'admin'), get_string('tabselectedtofront', 'admin'), 0));
 $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'), 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_configcheckbox('htmleditor', get_string('usehtmleditor', 'admin'), get_string('confightmleditor','admin'), 1));
+$temp->add(new admin_setting_configtext('editorbackgroundcolor', get_string('editorbackgroundcolor', 'admin'), get_string('edhelpbgcolor'), '#ffffff', PARAM_NOTAGS));
+$temp->add(new admin_setting_configtext('editorfontfamily', get_string('editorfontfamily', 'admin'), get_string('edhelpfontfamily'), 'Trebuchet MS,Verdana,Arial,Helvetica,sans-serif', 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')));
+$temp->add(new admin_setting_configcheckbox('editorkillword', get_string('editorkillword', 'admin'), get_string('edhelpcleanword'), 1));
 if ($CFG->aspellpath !== '') { // make aspell settings disappear if path isn't set
-  $temp->add(new admin_setting_configcheckbox('editorspelling', get_string('editorspelling', 'admin'), get_string('editorspellinghelp', 'admin')));
+  $temp->add(new admin_setting_configcheckbox('editorspelling', get_string('editorspelling', 'admin'), get_string('editorspellinghelp', 'admin'), 0));
   $temp->add(new admin_setting_special_editordictionary());
 }
 $temp->add(new admin_setting_special_editorhidebuttons());
@@ -96,17 +96,17 @@ $ADMIN->add('userinterface', $temp);
 
 // "languageandlocation" settingpage
 $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'), 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'), 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()));
+$temp->add(new admin_setting_configselect('lang', get_string('lang', 'admin'), get_string('configlang', 'admin'), (!empty($CFG->unicodedb) ? 'en_utf8' : 'en'), get_list_of_languages()));
+$temp->add(new admin_setting_configcheckbox('langmenu', get_string('langmenu', 'admin'), get_string('configlangmenu', 'admin'), 1));
+$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'), 1));
+$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'), 99, 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);
 $options = get_list_of_timezones();
 $options[99] = get_string('timezonenotforced', 'admin');
-$temp->add(new admin_setting_configselect('forcetimezone', get_string('forcetimezone', 'admin'), get_string('helpforcetimezone', 'admin'), $options));
+$temp->add(new admin_setting_configselect('forcetimezone', get_string('forcetimezone', 'admin'), get_string('helpforcetimezone', 'admin'), 99, $options));
 $ADMIN->add('userinterface', $temp);
 
 
@@ -116,4 +116,4 @@ $ADMIN->add('userinterface', new admin_externalpage('themeselector', get_string(
 $ADMIN->add('userinterface', new admin_externalpage('langedit', get_string('langedit', 'admin'), $CFG->wwwroot . '/admin/lang.php'));
 $ADMIN->add('userinterface', new admin_externalpage('langimport', get_string('langimport', 'admin'), $CFG->wwwroot . '/admin/langimport.php'));
 
-?>
+?>
\ No newline at end of file