From 50999a0b942b49a64e9f828d0e6b1567477fb7a8 Mon Sep 17 00:00:00 2001 From: skodak Date: Sun, 3 Sep 2006 13:10:56 +0000 Subject: [PATCH] new admin block fixes and reorganisation - I guess we need something more traditional for now --- admin/auth.php | 2 +- admin/blocks.php | 2 +- admin/configure.php | 57 ----- admin/courses.php | 33 --- admin/cron.php | 2 +- admin/enrol.php | 2 +- admin/filters.php | 2 +- admin/index.php | 20 +- admin/maintenance.php | 2 +- admin/misc.php | 57 ----- admin/modules.php | 2 +- admin/settings.php | 1 + ...nterface.php => advancedconfiguration.php} | 178 +++++++++------- admin/settings/authenticationandsecurity.php | 122 ----------- admin/settings/courses.php | 6 +- admin/settings/devel.php | 10 + admin/settings/first.php | 36 ---- admin/settings/legacy.php | 13 -- admin/settings/maintenance.php | 80 +++++++ admin/settings/maintenanceandauditing.php | 77 ------- admin/settings/misc.php | 54 ++--- admin/settings/serverinterface.php | 101 --------- admin/settings/settings.php | 196 ++++++++++++++++++ admin/settings/top.php | 18 ++ admin/settings/users.php | 15 ++ admin/timezoneimport.php | 2 +- admin/users.php | 53 ----- blocks/admin/block_admin.php | 4 +- lang/en_utf8/admin.php | 4 +- lib/adminlib.php | 8 +- 30 files changed, 459 insertions(+), 700 deletions(-) delete mode 100644 admin/configure.php delete mode 100644 admin/courses.php delete mode 100644 admin/misc.php rename admin/settings/{userinterface.php => advancedconfiguration.php} (51%) delete mode 100644 admin/settings/authenticationandsecurity.php create mode 100644 admin/settings/devel.php delete mode 100644 admin/settings/first.php delete mode 100644 admin/settings/legacy.php create mode 100644 admin/settings/maintenance.php delete mode 100644 admin/settings/maintenanceandauditing.php delete mode 100644 admin/settings/serverinterface.php create mode 100644 admin/settings/settings.php create mode 100644 admin/settings/top.php create mode 100644 admin/settings/users.php delete mode 100644 admin/users.php diff --git a/admin/auth.php b/admin/auth.php index 42a757323b..5e7c37b450 100644 --- a/admin/auth.php +++ b/admin/auth.php @@ -6,7 +6,7 @@ require_once($CFG->libdir.'/adminlib.php'); $adminroot = admin_get_root(); - admin_externalpage_setup('userauthentication', $adminroot); + admin_externalpage_setup('authentication', $adminroot); $auth = optional_param('auth', '', PARAM_SAFEDIR); diff --git a/admin/blocks.php b/admin/blocks.php index 553c09dfbe..4ae730ed57 100644 --- a/admin/blocks.php +++ b/admin/blocks.php @@ -5,7 +5,7 @@ require_once('../config.php'); require_once($CFG->libdir.'/adminlib.php'); $adminroot = admin_get_root(); - admin_externalpage_setup('blockmanagement', $adminroot); + admin_externalpage_setup('manageblocks', $adminroot); require_once($CFG->libdir.'/blocklib.php'); require_once($CFG->libdir.'/tablelib.php'); diff --git a/admin/configure.php b/admin/configure.php deleted file mode 100644 index db6efa46c7..0000000000 --- a/admin/configure.php +++ /dev/null @@ -1,57 +0,0 @@ -shortname: $stradministration: $strconfiguration", "$site->fullname", - ''. "$stradministration -> $strconfiguration"); - - print_heading($strconfiguration); - - $table->align = array ('right', 'left'); - - $table->data[] = array("". get_string('configvariables', 'admin') .'', - get_string('adminhelpconfigvariables')); - $table->data[] = array("". get_string('sitesettings') .'', - get_string('adminhelpsitesettings')); - $table->data[] = array("". get_string('themes') .'', - get_string('adminhelpthemes')); - $table->data[] = array("". get_string('language') .'', - get_string('adminhelplanguage')); - $table->data[] = array("".get_string('managemodules'). ' ', - get_string('adminhelpmanagemodules')); - $table->data[] = array("". get_string('manageblocks') .'', - get_string('adminhelpmanageblocks')); - $table->data[] = array("". get_string('managefilters') .'', - get_string('adminhelpmanagefilters')); - if (!isset($CFG->disablescheduledbackups)) { - $table->data[] = array("".get_string("backup")."", - get_string('adminhelpbackup')); - } - - $table->data[]= array("". get_string('editorsettings') ."", - get_string('adminhelpeditorsettings')); - $table->data[]= array("". get_string('calendarsettings', 'admin') ."", - get_string('helpcalendarsettings', 'admin')); - $table->data[]= array("". get_string('sitemaintenancemode', 'admin') ."", - get_string('helpsitemaintenance', 'admin')); - print_table($table); - - print_footer($site); - -?> - - diff --git a/admin/courses.php b/admin/courses.php deleted file mode 100644 index 5c4ce1903b..0000000000 --- a/admin/courses.php +++ /dev/null @@ -1,33 +0,0 @@ -shortname: $stradministration: $strcourses", "$site->fullname", - "$stradministration -> $strcourses"); - - print_heading($strcourses); - - $table->align = array ("right", "left"); - - $table->data[] = array(''.get_string("managecourses")."", - get_string("adminhelpcourses")); - $table->data[] = array("sesskey\">".get_string("enrolmentplugins")."", - get_string("adminhelpenrolments")); - $table->data[] = array(''. - get_string('assignsiteroles').'', get_string('adminhelpassignsiteroles')); - - print_table($table); - - print_footer($site); - -?> diff --git a/admin/cron.php b/admin/cron.php index 222c1d0a58..821c069313 100644 --- a/admin/cron.php +++ b/admin/cron.php @@ -218,7 +218,7 @@ } // End of occasional clean-up tasks - if (!isset($CFG->disablescheduledbackups)) { // Defined in config.php + if (empty($CFG->disablescheduledbackups)) { // Defined in config.php //Execute backup's cron //Perhaps a long time and memory could help in large sites @set_time_limit(0); diff --git a/admin/enrol.php b/admin/enrol.php index 9e1da25dca..8c00b8e3a5 100644 --- a/admin/enrol.php +++ b/admin/enrol.php @@ -9,7 +9,7 @@ $CFG->pagepath = 'enrol'; $adminroot = admin_get_root(); - admin_externalpage_setup('enrolment', $adminroot); + admin_externalpage_setup('enrolmentplugins', $adminroot); diff --git a/admin/filters.php b/admin/filters.php index 9646db530a..9d7832e9b6 100644 --- a/admin/filters.php +++ b/admin/filters.php @@ -10,7 +10,7 @@ define('FILTER_TABLE','filter_administration_table'); $adminroot = admin_get_root(); - admin_externalpage_setup('filtermanagement', $adminroot); + admin_externalpage_setup('managefilters', $adminroot); // get values from page $params = new object(); diff --git a/admin/index.php b/admin/index.php index b1d479bd8c..9261b2c92d 100644 --- a/admin/index.php +++ b/admin/index.php @@ -258,10 +258,6 @@ upgrade_log_finish(); } } else { - $strcurrentversion = get_string("currentversion"); - print_header($strcurrentversion, $stradministration, $strcurrentversion, - "", "", false, " ", " "); - if (!set_config("version", $version)) { error("A problem occurred inserting current version into databases"); } @@ -274,9 +270,7 @@ print_header($strcurrentrelease, $strcurrentrelease, $strcurrentrelease, "", "", false, " ", " "); print_heading("Moodle $release"); if (!set_config("release", $release)) { - upgrade_log_start(); notify("ERROR: Could not update release version in database!!"); - upgrade_log_finish(); } notice(get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes'), 'index.php'); exit; @@ -504,7 +498,7 @@ ' - '.get_string('adminhelpmanageblocks').''; $configdata .= '
'.get_string('managefilters'). ' - '.get_string('adminhelpmanagefilters').'
'; - if (!isset($CFG->disablescheduledbackups)) { + if (empty($CFG->disablescheduledbackups)) { $configdata .= '
'.get_string('backup'). ' - '.get_string('adminhelpbackup').'
'; } @@ -515,7 +509,7 @@ $configdata .= '
'.get_string('sitemaintenancemode', 'admin'). ' - '.get_string('helpsitemaintenance', 'admin').'
'; - $table->data[] = array(''.get_string('configuration').'', $configdata); + $table->data[] = array(''.get_string('configuration').'', $configdata); $userdata = '
'.get_string("authentication"). ' - '.get_string('adminhelpauthentication').'
'; @@ -532,7 +526,7 @@ get_string('assignsiteroles').' - '.get_string('adminhelpassignsiteroles'). ''; - $table->data[] = array(''.get_string('users').'', $userdata); + $table->data[] = array(''.get_string('users').'', $userdata); $coursedata = '
'.get_string('managecourses'). ' - '.get_string('adminhelpcourses').'
'; @@ -540,7 +534,7 @@ ' - '.get_string('adminhelpenrolments').''; - $table->data[] = array(''.get_string('courses').'', $coursedata); + $table->data[] = array(''.get_string('courses').'', $coursedata); $miscdata = '
'.get_string('sitefiles'). ' - '.get_string('adminhelpsitefiles').'
'; @@ -564,9 +558,9 @@ ' - '.get_string('adminhelpxmldbeditor').''; } - $table->data[] = array(''.get_string('miscellaneous').'', $miscdata); - + $table->data[] = array(''.get_string('miscellaneous').'', $miscdata); +/* /// Hooks for Matt Oquists contrib code for repositories and portfolio. /// The eventual official versions may not look like this if (isset($CFG->portfolio) && file_exists("$CFG->dirroot/$CFG->portfolio")) { @@ -580,7 +574,7 @@ repository').'', '
'.get_string('adminhelprepository','repository').'
'); } - +*/ print_table($table); diff --git a/admin/maintenance.php b/admin/maintenance.php index 9b4f2d9bb7..9763989ed7 100644 --- a/admin/maintenance.php +++ b/admin/maintenance.php @@ -7,7 +7,7 @@ $action = optional_param('action', '', PARAM_ALPHA); $adminroot = admin_get_root(); - admin_externalpage_setup('maintenancemode', $adminroot); + admin_externalpage_setup('sitemaintenancemode', $adminroot); //Check folder exists if (! make_upload_directory(SITEID)) { // Site folder diff --git a/admin/misc.php b/admin/misc.php deleted file mode 100644 index 7f714d0f28..0000000000 --- a/admin/misc.php +++ /dev/null @@ -1,57 +0,0 @@ -shortname: $stradministration: $strmisc", "$site->fullname", - "$stradministration -> $strmisc"); - - print_heading($strmisc); - - $table->align = array ("right", "left"); - - $table->data[] = array(''.get_string('sitefiles').'', - get_string("adminhelpsitefiles")); - $table->data[] = array(''.get_string('stickyblocks','admin')."", - get_string('adminhelpstickyblocks')); - - if (has_capability('moodle/site:viewreports', $context)) { - $table->data[] = array(''.get_string('reports')."", - get_string('adminhelpreports')); - } -// to be enabled later -/* $table->data[] = array(''.get_string('healthcenter')."", - get_string('adminhelphealthcenter'));*/ - - if (has_capability('moodle/site:config', $context)) { - $table->data[] = array(''.get_string('environment', 'admin')."", - get_string('adminhelpenvironment')); - } - - if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype") && has_capability('moodle/site:accessdb', $context)) { - $table->data[] = array(''.get_string('managedatabase')."", - get_string('adminhelpmanagedatabase')); - } -/// Hack to show the XMLDB editor - if (file_exists("$CFG->dirroot/$CFG->admin/xmldb")) { - $table->data[] = array(''.get_string('xmldbeditor')."", - get_string('adminhelpxmldbeditor')); - } - - print_table($table); - - print_footer($site); - -?> - - diff --git a/admin/modules.php b/admin/modules.php index 623d66db97..f383073b85 100644 --- a/admin/modules.php +++ b/admin/modules.php @@ -4,7 +4,7 @@ require_once('../config.php'); require_once($CFG->libdir.'/adminlib.php'); $adminroot = admin_get_root(); - admin_externalpage_setup('modulemanagement', $adminroot); + admin_externalpage_setup('managemodules', $adminroot); require_once('../course/lib.php'); $show = optional_param('show', '', PARAM_SAFEDIR); diff --git a/admin/settings.php b/admin/settings.php index 28a61a61f6..4fc8d87885 100644 --- a/admin/settings.php +++ b/admin/settings.php @@ -89,6 +89,7 @@ echo '
'; echo ''; echo ''; echo ''; +print_heading($root->visiblename); print_simple_box_start('','100%','',5,'generalbox',''); echo $root->output_html(); diff --git a/admin/settings/userinterface.php b/admin/settings/advancedconfiguration.php similarity index 51% rename from admin/settings/userinterface.php rename to admin/settings/advancedconfiguration.php index 8228cb1eea..ec4301b5a5 100644 --- a/admin/settings/userinterface.php +++ b/admin/settings/advancedconfiguration.php @@ -1,30 +1,80 @@ 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_special_frontpagedesc()); -$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'), - '4' => '4 ' . get_string('newsitems'), - '5' => '5 ' . get_string('newsitems'), - '6' => '6 ' . get_string('newsitems'), - '7' => '7 ' . get_string('newsitems'), - '8' => '8 ' . get_string('newsitems'), - '9' => '9 ' . get_string('newsitems'), - '10' => '10 ' . get_string('newsitems')))); -$temp->add(new admin_setting_courselist_frontpage(false)); // non-loggedin version of the setting (that's what the parameter is for :) ) -$temp->add(new admin_setting_courselist_frontpage(true)); // loggedin version of the setting -$ADMIN->add('userinterface', $temp); - - -// "filtersettings" settingpage +// This file defines settingpages and externalpages under the "advancedconfiguration" category + +// "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'), 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'), '')); +$temp->add(new admin_setting_configtext('unzip', get_string('pathtounzip','admin'), get_string('configunzip', 'admin'), '')); +$temp->add(new admin_setting_configtext('pathtodu', get_string('pathtodu', 'admin'), get_string('configpathtodu', 'admin'), '')); +$temp->add(new admin_setting_configtext('aspellpath', get_string('aspellpath', 'admin'), get_string('edhelpaspellpath'), '')); +$ADMIN->add('advancedconfiguration', $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'), 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'), 1)); +if (!empty($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'), 0)); + $temp->add(new admin_setting_special_editordictionary()); +} +$temp->add(new admin_setting_special_editorhidebuttons()); +$ADMIN->add('advancedconfiguration', $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'), 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('advancedconfiguration', $temp); + + +// "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'), 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'), + 3600 => get_string('numminutes', '', 60), + 2700 => get_string('numminutes', '', 45), + 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)); +$ADMIN->add('advancedconfiguration', $temp); + + + +// "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'), 0)); +$ADMIN->add('advancedconfiguration', $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'), '_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('advancedconfiguration', $temp); + +// filters +$ADMIN->add('advancedconfiguration', new admin_externalpage('managefilters', get_string('managefilters'), $CFG->wwwroot . '/admin/filters.php')); $temp = new admin_settingpage('filtersettings', get_string('filtersettings', 'admin')); $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), @@ -49,65 +99,37 @@ $temp->add(new admin_setting_configselect('cachetext', get_string('cachetext', ' 0 => get_string('no')))); $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')))); + '2' => get_string('htmlfilesonly')))); $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); - +$ADMIN->add('advancedconfiguration', $temp); + +// blocks +$ADMIN->add('advancedconfiguration', new admin_externalpage('manageblocks', get_string('manageblocks'), $CFG->wwwroot . '/admin/blocks.php')); +$ADMIN->add('advancedconfiguration', new admin_externalpage('stickyblocks', get_string('stickyblocks','admin'), $CFG->wwwroot . '/admin/stickyblocks.php')); + +// modules +$ADMIN->add('advancedconfiguration', new admin_externalpage('managemodules', get_string('managemodules'), $CFG->wwwroot . '/admin/modules.php')); +$temp = new admin_settingpage('modulerestrictions', get_string('modulerestrictions', '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(); +} +$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'), array(), $options2)); +$ADMIN->add('advancedconfiguration', $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'), 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); +$ADMIN->add('advancedconfiguration', new admin_externalpage('langedit', get_string('langedit', 'admin'), $CFG->wwwroot . '/admin/lang.php')); +$ADMIN->add('advancedconfiguration', new admin_externalpage('langimport', get_string('langimport', 'admin'), $CFG->wwwroot . '/admin/langimport.php')); -// "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'), 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'), 1)); -if (!empty($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'), 0)); - $temp->add(new admin_setting_special_editordictionary()); -} -$temp->add(new admin_setting_special_editorhidebuttons()); -$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'), $CFG->lang, get_list_of_languages())); // $CFG->lang might be set in installer already, default en or en_utf8 is in setup.php -$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_FILE)); -$options = get_list_of_timezones(); -$options[99] = get_string('serverlocaltime'); -$temp->add(new admin_setting_configselect('timezone', get_string('timezone','admin'), get_string('configtimezone', 'admin'), 99, $options)); -$options = get_list_of_timezones(); -$options[0] = get_string('choose') .'...'; -$temp->add(new admin_setting_configselect('country', get_string('country', 'admin'), get_string('configcountry', 'admin'), 0, $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'), 99, $options)); -$ADMIN->add('userinterface', $temp); - - - -$ADMIN->add('userinterface', new admin_externalpage('timezoneimport', get_string('updatetimezones', 'admin'), $CFG->wwwroot . '/admin/timezoneimport.php')); -$ADMIN->add('userinterface', new admin_externalpage('themeselector', get_string('themeselector','admin'), $CFG->wwwroot . '/theme/index.php')); -$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 diff --git a/admin/settings/authenticationandsecurity.php b/admin/settings/authenticationandsecurity.php deleted file mode 100644 index 084201a44b..0000000000 --- a/admin/settings/authenticationandsecurity.php +++ /dev/null @@ -1,122 +0,0 @@ -add('authenticationandsecurity', new admin_category('usermanagement', get_string('users')), 0); -$ADMIN->add('usermanagement', new admin_externalpage('editusers', get_string('userlist','admin'), $CFG->wwwroot . '/admin/user.php'), 1); -$ADMIN->add('usermanagement', new admin_externalpage('addnewuser', get_string('addnewuser'), $CFG->wwwroot . '/admin/user.php?newuser=true&sesskey='. (isset($USER->sesskey) ? $USER->sesskey : '')), 0); -$ADMIN->add('usermanagement', new admin_externalpage('uploadusers', get_string('uploadusers'), $CFG->wwwroot . '/admin/uploaduser.php'), 2); - - -// stuff under the "roles" subcategory -$ADMIN->add('authenticationandsecurity', new admin_category('roles', get_string('roles'))); -$ADMIN->add('roles', new admin_externalpage('manageroles', get_string('manageroles'), $CFG->wwwroot . '/admin/roles/manage.php')); -$ADMIN->add('roles', new admin_externalpage('assignsitewideroles', get_string('assignsiteroles'), $CFG->wwwroot . '/admin/roles/assign.php?contextid=' . SITEID)); - - - -// "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'), 0)); -$temp->add(new admin_setting_configcheckbox('secureforms', get_string('secureforms', 'admin'), get_string('configsecureforms', 'admin'), 0)); -$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'), '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(); -} -$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'), 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')))); -$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'), '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'), 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'), 0)); -$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'), 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); - - - - -// "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'), 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 diff --git a/admin/settings/courses.php b/admin/settings/courses.php index 35482af90d..ed40f920e4 100644 --- a/admin/settings/courses.php +++ b/admin/settings/courses.php @@ -3,7 +3,7 @@ // This file defines settingpages and externalpages under the "courses" category // "courserequests" settingpage -$temp = new admin_settingpage('courserequests', get_string('courserequests', 'admin')); +$temp = new admin_settingpage('courserequest', get_string('courserequest')); $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'), 1, make_categories_options())); @@ -15,8 +15,8 @@ $ADMIN->add('courses', $temp); -$ADMIN->add('courses', new admin_externalpage('coursemgmt', get_string('coursemgmt', 'admin'), $CFG->wwwroot . '/course/index.php?categoryedit=on')); -$ADMIN->add('courses', new admin_externalpage('enrolment', get_string('enrolment', 'admin'), $CFG->wwwroot . '/admin/enrol.php')); +$ADMIN->add('courses', new admin_externalpage('managecourses', get_string('managecourses'), $CFG->wwwroot . '/course/index.php?categoryedit=on')); +$ADMIN->add('courses', new admin_externalpage('enrolmentplugins', get_string('enrolmentplugins'), $CFG->wwwroot . '/admin/enrol.php')); diff --git a/admin/settings/devel.php b/admin/settings/devel.php new file mode 100644 index 0000000000..958cce2d8e --- /dev/null +++ b/admin/settings/devel.php @@ -0,0 +1,10 @@ +debug > 7) { + + if (file_exists($CFG->dirroot . '/admin/mysql/frame.php')) { + $ADMIN->add('devel', new admin_externalpage('database', get_string('managedatabase'), $CFG->wwwroot . '/' . $CFG->admin . '/mysql/frame.php')); + } + $ADMIN->add('devel', new admin_externalpage('xmldbeditor', get_string('xmldbeditor'), $CFG->wwwroot . '/' . $CFG->admin . '/xmldb/')); + +} +?> diff --git a/admin/settings/first.php b/admin/settings/first.php deleted file mode 100644 index bc5327f8b0..0000000000 --- a/admin/settings/first.php +++ /dev/null @@ -1,36 +0,0 @@ -add('root', new admin_category('userinterface', get_string('userinterface','admin')), 1); -$ADMIN->add('root', new admin_category('serverinterface', get_string('serverinterface','admin')), 10); -$ADMIN->add('root', new admin_category('authenticationandsecurity', get_string('authenticationandsecurity','admin')), 2); -$ADMIN->add('root', new admin_category('maintenanceandauditing', get_string('maintenanceandauditing','admin')), 3); -$ADMIN->add('root', new admin_category('courses', get_string('courses','admin')), 4); -$ADMIN->add('root', new admin_category('reports', get_string('reports')), 5); -foreach(get_list_of_plugins('admin/report') as $plugin) { - $ADMIN->add('reports', new admin_externalpage('report' . $plugin, get_string($plugin), $CFG->wwwroot . '/admin/report/' . $plugin . '/index.php')); -} - -$ADMIN->add('root', new admin_externalpage('adminnotifications', get_string('notifications'), $CFG->wwwroot . '/admin/index.php'), 0); -$ADMIN->add('root', new admin_category('plugins', get_string('plugins'))); -$ADMIN->add('plugins', new admin_externalpage('filtermanagement', get_string('filtermanagement', 'admin'), $CFG->wwwroot . '/admin/filters.php')); -$ADMIN->add('plugins', new admin_externalpage('blockmanagement', get_string('blockmanagement', 'admin'), $CFG->wwwroot . '/admin/blocks.php')); -$ADMIN->add('plugins', new admin_externalpage('modulemanagement', get_string('modulemanagement', 'admin'), $CFG->wwwroot . '/admin/modules.php')); - -if (file_exists($CFG->dirroot . '/admin/mysql/frame.php')) { - $ADMIN->add('root', new admin_externalpage('database', get_string('managedatabase'), $CFG->wwwroot . '/' . $CFG->admin . '/mysql/frame.php')); -} - -$ADMIN->add('root', new admin_category('legacy', get_string('legacy','admin'))); - -// the following is TEMPORARY - -$ADMIN->add('root', new admin_category('unsorted', 'Unsorted', 999)); - -$ADMIN->add('unsorted', new admin_externalpage('sitefiles', get_string('sitefiles'), $CFG->wwwroot . '/files/index.php?id=' . SITEID)); -$ADMIN->add('unsorted', new admin_externalpage('stickyblocks', get_string('stickyblocks'), $CFG->wwwroot . '/admin/stickyblocks.php')); - -?> \ No newline at end of file diff --git a/admin/settings/legacy.php b/admin/settings/legacy.php deleted file mode 100644 index 092c5d1c6c..0000000000 --- a/admin/settings/legacy.php +++ /dev/null @@ -1,13 +0,0 @@ -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('legacy', $temp); - - -?> \ No newline at end of file diff --git a/admin/settings/maintenance.php b/admin/settings/maintenance.php new file mode 100644 index 0000000000..5c107d93c6 --- /dev/null +++ b/admin/settings/maintenance.php @@ -0,0 +1,80 @@ +disablescheduledbackups)) { // Defined in config.php + $temp = new admin_settingpage('backup', get_string('backup')); + $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()); + $ADMIN->add('maintenance', $temp); +} + +$ADMIN->add('maintenance', new admin_externalpage('reports', get_string('reports'), $CFG->wwwroot . '/admin/report.php')); + + +// "performanceandstats" settingpage +$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'), 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('maintenance', $temp); + + + + + +$ADMIN->add('maintenance', new admin_externalpage('environment', get_string('environment', 'admin'), $CFG->wwwroot . '/admin/environment.php')); +$ADMIN->add('maintenance', new admin_externalpage('sitemaintenancemode', get_string('sitemaintenancemode', 'admin'), $CFG->wwwroot . '/admin/maintenance.php')); + + +?> \ No newline at end of file diff --git a/admin/settings/maintenanceandauditing.php b/admin/settings/maintenanceandauditing.php deleted file mode 100644 index 3fa029bef6..0000000000 --- a/admin/settings/maintenanceandauditing.php +++ /dev/null @@ -1,77 +0,0 @@ -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()); -$ADMIN->add('maintenanceandauditing', $temp); - - - -// "performanceandstats" settingpage -$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'), 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); - - - - - -$ADMIN->add('maintenanceandauditing', new admin_externalpage('environment', get_string('environment'), $CFG->wwwroot . '/admin/environment.php')); -$ADMIN->add('maintenanceandauditing', new admin_externalpage('maintenancemode', get_string('maintenancemode','admin'), $CFG->wwwroot . '/admin/maintenance.php')); - - -?> \ No newline at end of file diff --git a/admin/settings/misc.php b/admin/settings/misc.php index a9cf73573b..01a5e0dcbd 100644 --- a/admin/settings/misc.php +++ b/admin/settings/misc.php @@ -1,37 +1,15 @@ 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 = new admin_settingpage('legacy', get_string('legacy','admin')); +$temp->add(new admin_setting_configcheckbox('teacherassignteachers', get_string('teacherassignteachers', 'admin'), get_string('configteacherassignteachers', 'admin'), 1)); +$temp->add(new admin_setting_sitesettext('teacher', get_string('wordforteacher'), get_string('wordforteachereg'), '')); +$temp->add(new admin_setting_sitesettext('teachers', get_string('wordforteachers'), get_string('wordforteacherseg'), '')); +$temp->add(new admin_setting_sitesettext('student', get_string('wordforstudent'), get_string('wordforstudenteg'), '')); +$temp->add(new admin_setting_sitesettext('students', get_string('wordforstudents'), get_string('wordforstudentseg'), '')); +$ADMIN->add('misc', $temp); + +$temp = new admin_settingpage('unsorted', get_string('unsorted', 'admin')); $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'), @@ -49,17 +27,9 @@ $temp->add(new admin_setting_configselect('loglifetime', get_string('loglifetime 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('misc', $temp); + +$ADMIN->add('misc', new admin_externalpage('sitefiles', get_string('sitefiles'), $CFG->wwwroot . '/files/index.php?id=' . SITEID)); -$ADMIN->add('unsorted', $temp); ?> \ No newline at end of file diff --git a/admin/settings/serverinterface.php b/admin/settings/serverinterface.php deleted file mode 100644 index 448c863852..0000000000 --- a/admin/settings/serverinterface.php +++ /dev/null @@ -1,101 +0,0 @@ -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'), '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'), 0)); -} -$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'), 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'), - 3600 => get_string('numminutes', '', 60), - 2700 => get_string('numminutes', '', 45), - 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)); -$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'), 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'), '_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); - - - - - - -?> \ No newline at end of file diff --git a/admin/settings/settings.php b/admin/settings/settings.php new file mode 100644 index 0000000000..da5b2adbf3 --- /dev/null +++ b/admin/settings/settings.php @@ -0,0 +1,196 @@ +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_special_frontpagedesc()); +$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'), + '4' => '4 ' . get_string('newsitems'), + '5' => '5 ' . get_string('newsitems'), + '6' => '6 ' . get_string('newsitems'), + '7' => '7 ' . get_string('newsitems'), + '8' => '8 ' . get_string('newsitems'), + '9' => '9 ' . get_string('newsitems'), + '10' => '10 ' . get_string('newsitems')))); +$temp->add(new admin_setting_courselist_frontpage(false)); // non-loggedin version of the setting (that's what the parameter is for :) ) +$temp->add(new admin_setting_courselist_frontpage(true)); // loggedin version of the setting +$temp->add(new admin_setting_configcheckbox('mymoodleredirect', get_string('mymoodleredirect', 'admin'), get_string('configmymoodleredirect', 'admin'), 0)); +$temp->add(new admin_setting_configcheckbox('allusersaresitestudents', get_string('allusersaresitestudents', 'admin'), get_string('configallusersaresitestudents','admin'), 1)); +$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')))); +$ADMIN->add('settings', $temp); + + +// user settings +$temp = new admin_settingpage('usersettings', get_string('usersettings','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('allowunenroll', get_string('allowunenroll', 'admin'), get_string('configallowunenroll', 'admin'), 1)); +$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_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)))); +$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)); +$ADMIN->add('settings', $temp); + + + +// "themesettings" settingpage +$temp = new admin_settingpage('themesettings', get_string('themesettings')); +$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('settings', $temp); +$ADMIN->add('settings', new admin_externalpage('themeselector', get_string('defaulttheme','admin'), $CFG->wwwroot . '/theme/index.php')); + + + + +// calendar settingpage +$temp = new admin_settingpage('calendar', get_string('calendar', 'calendar')); +$temp->add(new admin_setting_special_adminseesall()); +$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('settings', $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'), $CFG->lang, get_list_of_languages())); // $CFG->lang might be set in installer already, default en or en_utf8 is in setup.php +$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_FILE)); +$options = get_list_of_timezones(); +$options[99] = get_string('serverlocaltime'); +$temp->add(new admin_setting_configselect('timezone', get_string('timezone','admin'), get_string('configtimezone', 'admin'), 99, $options)); +$options = get_list_of_timezones(); +$options[0] = get_string('choose') .'...'; +$temp->add(new admin_setting_configselect('country', get_string('country', 'admin'), get_string('configcountry', 'admin'), 0, $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'), 99, $options)); +$ADMIN->add('settings', $temp); + + + +$ADMIN->add('settings', new admin_externalpage('timezoneimport', get_string('updatetimezones', 'admin'), $CFG->wwwroot . '/admin/timezoneimport.php')); + +// "email" settingpage +$temp = new admin_settingpage('emailsettings', get_string('emailsettings','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'), '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'), 0)); +} +$ADMIN->add('settings', $temp); + +// security related settings +$temp = new admin_settingpage('security', get_string('security','admin')); +$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_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'), 0)); +$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'), '10', $options)); + +$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)); +$temp->add(new admin_setting_configtext('sitepolicy', get_string('sitepolicy', 'admin'), get_string('configsitepolicy', 'admin'), '', PARAM_URL)); + + +$ADMIN->add('settings', $temp); + +?> \ No newline at end of file diff --git a/admin/settings/top.php b/admin/settings/top.php new file mode 100644 index 0000000000..c2bf6fad5c --- /dev/null +++ b/admin/settings/top.php @@ -0,0 +1,18 @@ +add('root', new admin_externalpage('adminnotifications', get_string('notifications'), $CFG->wwwroot . '/admin/index.php')); +$ADMIN->add('root', new admin_category('settings', get_string('sitesettings'))); +$ADMIN->add('root', new admin_category('advancedconfiguration', get_string('advancedconfiguration','admin'))); +$ADMIN->add('root', new admin_category('users', get_string('users'))); +$ADMIN->add('root', new admin_category('courses', get_string('courses'))); +$ADMIN->add('root', new admin_category('maintenance', get_string('maintenance','admin'))); +$ADMIN->add('root', new admin_category('misc', get_string('miscellaneous'))); +if ($CFG->debug > 7) { + $ADMIN->add('root', new admin_category('devel', get_string('developers','admin'))); +} + +?> \ No newline at end of file diff --git a/admin/settings/users.php b/admin/settings/users.php new file mode 100644 index 0000000000..fd44c50d0e --- /dev/null +++ b/admin/settings/users.php @@ -0,0 +1,15 @@ +add('users', new admin_externalpage('authentication', get_string('authentication'), $CFG->wwwroot . '/admin/auth.php')); +$ADMIN->add('users', new admin_externalpage('edituser', get_string('edituser'), $CFG->wwwroot . '/admin/user.php')); +$ADMIN->add('users', new admin_externalpage('addnewuser', get_string('addnewuser'), $CFG->wwwroot . '/admin/user.php?newuser=true&sesskey='. (isset($USER->sesskey) ? $USER->sesskey : ''))); +$ADMIN->add('users', new admin_externalpage('uploadusers', get_string('uploadusers'), $CFG->wwwroot . '/admin/uploaduser.php')); +$ADMIN->add('users', new admin_externalpage('manageroles', get_string('manageroles'), $CFG->wwwroot . '/admin/roles/manage.php')); +$ADMIN->add('users', new admin_externalpage('assignsitewideroles', get_string('assignsiteroles'), $CFG->wwwroot . '/admin/roles/assign.php?contextid=' . SITEID)); + +?> \ No newline at end of file diff --git a/admin/timezoneimport.php b/admin/timezoneimport.php index 5f8ff9e020..480c1ca219 100644 --- a/admin/timezoneimport.php +++ b/admin/timezoneimport.php @@ -3,7 +3,7 @@ // Automatic update of Timezones from a new source require_once('../config.php'); - require_once($CFG->dirroot .'/admin/adminlib.php'); + require_once($CFG->libdir.'/adminlib.php'); require_once($CFG->libdir.'/filelib.php'); require_once($CFG->libdir.'/olson.php'); diff --git a/admin/users.php b/admin/users.php deleted file mode 100644 index 81b84e05f9..0000000000 --- a/admin/users.php +++ /dev/null @@ -1,53 +0,0 @@ -shortname: $stradministration: $strusers", "$site->fullname", - "$stradministration -> $strusers"); - - print_heading($strusers); - - $table->align = array ("right", "left"); - - $table->data[] = array("sesskey\">".get_string("authentication")."", - get_string("adminhelpauthentication")); - - if (has_capability('moodle/user:update', $context)) { - $table->data[] = array("".get_string("edituser")."", - get_string("adminhelpedituser")); - } - - if (has_capability('moodle/user:create', $context)) { - $table->data[] = array("wwwroot/$CFG->admin/user.php?newuser=true&sesskey=$USER->sesskey\">".get_string("addnewuser")."", - get_string("adminhelpaddnewuser")); - } - - if (has_capability('moodle/user:create', $context)) { - $table->data[] = array("wwwroot/$CFG->admin/uploaduser.php?sesskey=$USER->sesskey\">".get_string("uploadusers")."", - get_string("adminhelpuploadusers")); - } - - $table->data[] = array('', '
'); - $table->data[] = array("sesskey\">".get_string("enrolmentplugins")."", - get_string("adminhelpenrolments")); - $table->data[]= array(''. - get_string('assignsiteroles').'', get_string('adminhelpassignsiteroles')); - - print_table($table); - - print_footer($site); - -?> - - diff --git a/blocks/admin/block_admin.php b/blocks/admin/block_admin.php index 74aa15bcf8..34c884a0b3 100644 --- a/blocks/admin/block_admin.php +++ b/blocks/admin/block_admin.php @@ -33,7 +33,7 @@ class block_admin extends block_list { global $CFG, $USER; $context = get_context_instance(CONTEXT_SYSTEM, SITEID); - if (has_capability('moodle/site:config', $context)) { +/* if (has_capability('moodle/site:config', $context)) { $this->content->items[] = ''.get_string('configuration').''; $this->content->icons[] = ''; @@ -42,7 +42,7 @@ class block_admin extends block_list { if (has_capability('moodle/site:config', $context)) { $this->content->items[] = ''.get_string('users').''; $this->content->icons[] = ''; - } + }*/ if (has_capability('moodle/site:backup', $context)) { $this->content->items[]=''.get_string('backup').''; diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php index c47bd1de4c..e84ff09288 100644 --- a/lang/en_utf8/admin.php +++ b/lang/en_utf8/admin.php @@ -1,7 +1,7 @@ paramtype = $paramtype; parent::admin_setting($name, $visiblename, $description, $defaultsetting); } @@ -1554,7 +1554,7 @@ class admin_setting_sitesettext extends admin_setting_configtext { var $id; - function admin_setting_sitesettext($name, $visiblename, $description, $defaultsetting, $paramtype) { + function admin_setting_sitesettext($name, $visiblename, $description, $defaultsetting, $paramtype=PARAM_RAW) { $this->id = SITEID; parent::admin_setting_configtext($name, $visiblename, $description, $defaultsetting, $paramtype); @@ -2261,12 +2261,12 @@ function admin_get_root() { // start the admin tree! $ADMIN = new admin_category('root','Administration'); // we process this file first to get categories up and running - include($CFG->dirroot . '/admin/settings/first.php'); + include($CFG->dirroot . '/admin/settings/top.php'); // now we process all other files in admin/settings to build the // admin tree foreach (glob($CFG->dirroot . '/admin/settings/*.php') as $file) { - if ($file != $CFG->dirroot . '/admin/settings/first.php') { + if ($file != $CFG->dirroot . '/admin/settings/top.php') { include_once($file); } } -- 2.39.5