From dbf9e4bae304c2b138fd507a16208ae8dd1d77c4 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Tue, 13 Jul 2010 13:56:55 +0000 Subject: [PATCH] MDL-23234 finally standardised use of settings.php across all plugins - the only partial exceptions now are report and local plugins --- admin/report/backups/settings.php | 2 + admin/report/capability/settings.php | 2 + admin/report/configlog/settings.php | 2 + admin/report/courseoverview/settings.php | 2 + admin/report/log/settings.php | 2 + admin/report/questioninstances/settings.php | 2 + admin/report/security/settings.php | 2 + admin/report/spamcleaner/settings.php | 2 + admin/report/stats/settings.php | 2 + admin/report/unittest/settings.php | 2 + admin/settings/appearance.php | 4 + admin/settings/grades.php | 18 +-- admin/settings/plugins.php | 72 +++++----- blocks/course_list/settings.php | 14 +- blocks/online_users/settings.php | 7 +- blocks/rss_client/settings.php | 16 ++- blocks/section_links/settings.php | 51 ++++---- blocks/tags/settings.php | 7 +- blocks/upgrade.txt | 1 + filter/censor/filtersettings.php | 7 +- filter/mediaplugin/filtersettings.php | 27 ++-- filter/multilang/filtersettings.php | 7 +- filter/tex/filtersettings.php | 82 ++++++------ grade/report/grader/settings.php | 137 ++++++++++---------- grade/report/overview/settings.php | 15 ++- grade/report/user/settings.php | 27 ++-- lib/moodlelib.php | 1 + mod/assignment/settings.php | 30 +++-- mod/chat/settings.php | 68 +++++----- mod/data/settings.php | 22 ++-- mod/feedback/settings.php | 8 +- mod/folder/settings.php | 2 + mod/forum/settings.php | 131 ++++++++++--------- mod/glossary/settings.php | 135 +++++++++---------- mod/hotpot/settings.php | 12 +- mod/imscp/settings.php | 2 + mod/lesson/settings.php | 66 +++++----- mod/page/settings.php | 2 + mod/quiz/{settingstree.php => settings.php} | 5 + mod/resource/settings.php | 2 + mod/scorm/settings.php | 118 +++++++++-------- mod/upgrade.txt | 1 + mod/url/settings.php | 2 + mod/workshop/settings.php | 103 ++++++++------- theme/arialist/settings.php | 76 ++++++----- theme/formal_white/settings.php | 77 ++++++----- theme/nonzero/settings.php | 52 ++++---- 47 files changed, 760 insertions(+), 667 deletions(-) rename mod/quiz/{settingstree.php => settings.php} (98%) diff --git a/admin/report/backups/settings.php b/admin/report/backups/settings.php index bb162bfb00d..274768efd35 100644 --- a/admin/report/backups/settings.php +++ b/admin/report/backups/settings.php @@ -1,3 +1,5 @@ add('reports', new admin_externalpage('reportbackups', get_string('backups', 'admin'), "$CFG->wwwroot/$CFG->admin/report/backups/index.php",'moodle/backup:backupcourse')); diff --git a/admin/report/capability/settings.php b/admin/report/capability/settings.php index d0512e8ecb5..866b45cded1 100644 --- a/admin/report/capability/settings.php +++ b/admin/report/capability/settings.php @@ -1,3 +1,5 @@ add('roles', new admin_externalpage('reportcapability', get_string('capability', 'report_capability'), "$CFG->wwwroot/$CFG->admin/report/capability/index.php",'moodle/role:manage')); diff --git a/admin/report/configlog/settings.php b/admin/report/configlog/settings.php index ae14111d818..21fe2f816fe 100644 --- a/admin/report/configlog/settings.php +++ b/admin/report/configlog/settings.php @@ -1,3 +1,5 @@ add('reports', new admin_externalpage('reportconfiglog', get_string('configlog', 'report_configlog'), "$CFG->wwwroot/$CFG->admin/report/configlog/index.php")); diff --git a/admin/report/courseoverview/settings.php b/admin/report/courseoverview/settings.php index f7a9ea667d6..1e34a7af1f4 100644 --- a/admin/report/courseoverview/settings.php +++ b/admin/report/courseoverview/settings.php @@ -1,3 +1,5 @@ add('reports', new admin_externalpage('reportcourseoverview', get_string('courseoverview', 'admin'), "$CFG->wwwroot/$CFG->admin/report/courseoverview/index.php",'report/courseoverview:view')); diff --git a/admin/report/log/settings.php b/admin/report/log/settings.php index bc48cabb119..ecaae3b92f3 100644 --- a/admin/report/log/settings.php +++ b/admin/report/log/settings.php @@ -1,5 +1,7 @@ add('reports', new admin_externalpage('reportlog', get_string('log', 'admin'), "$CFG->wwwroot/course/report/log/index.php?id=".SITEID, 'coursereport/log:view')); $ADMIN->add('reports', new admin_externalpage('reportloglive', get_string('loglive', 'coursereport_log'), "$CFG->wwwroot/course/report/log/indexlive.php?id=".SITEID, 'coursereport/log:viewlive')); diff --git a/admin/report/questioninstances/settings.php b/admin/report/questioninstances/settings.php index e4f51569a34..919d192d44c 100644 --- a/admin/report/questioninstances/settings.php +++ b/admin/report/questioninstances/settings.php @@ -1,3 +1,5 @@ add('reports', new admin_externalpage('reportquestioninstances', get_string('questioninstances', 'report_questioninstances'), "$CFG->wwwroot/$CFG->admin/report/questioninstances/index.php", 'report/questioninstances:view')); diff --git a/admin/report/security/settings.php b/admin/report/security/settings.php index 74199cab616..82cce3653a2 100644 --- a/admin/report/security/settings.php +++ b/admin/report/security/settings.php @@ -1,3 +1,5 @@ add('reports', new admin_externalpage('reportsecurity', get_string('reportsecurity', 'report_security'), "$CFG->wwwroot/$CFG->admin/report/security/index.php",'report/security:view')); diff --git a/admin/report/spamcleaner/settings.php b/admin/report/spamcleaner/settings.php index 938f0158da9..974ac61501f 100644 --- a/admin/report/spamcleaner/settings.php +++ b/admin/report/spamcleaner/settings.php @@ -1,5 +1,7 @@ add('reports', new admin_externalpage('reportspamcleaner', get_string('spamcleaner', 'report_spamcleaner'), "$CFG->wwwroot/$CFG->admin/report/spamcleaner/index.php", 'moodle/site:config')); diff --git a/admin/report/stats/settings.php b/admin/report/stats/settings.php index e84cd2cb1ce..0283339b0ab 100644 --- a/admin/report/stats/settings.php +++ b/admin/report/stats/settings.php @@ -1,4 +1,6 @@ add('reports', new admin_externalpage('reportstats', get_string('stats', 'admin'), "$CFG->wwwroot/course/report/stats/index.php", 'coursereport/stats:view')); diff --git a/admin/report/unittest/settings.php b/admin/report/unittest/settings.php index 1a77bb4ed3f..8826c312661 100644 --- a/admin/report/unittest/settings.php +++ b/admin/report/unittest/settings.php @@ -1,5 +1,7 @@ add('development', new admin_externalpage('reportsimpletest', get_string('simpletest', 'admin'), "$CFG->wwwroot/$CFG->admin/report/unittest/index.php",'report/unittest:view')); $ADMIN->add('development', new admin_externalpage('reportdbtest', get_string('dbtest', 'admin'), "$CFG->wwwroot/$CFG->admin/report/unittest/dbtest.php",'report/unittest:view')); diff --git a/admin/settings/appearance.php b/admin/settings/appearance.php index 6759a2f85fe..5e8ebd7f99e 100644 --- a/admin/settings/appearance.php +++ b/admin/settings/appearance.php @@ -26,7 +26,11 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page foreach (get_plugin_list('theme') as $theme => $themedir) { $settings_path = "$themedir/settings.php"; if (file_exists($settings_path)) { + $settings = new admin_settingpage('themesetting'.$theme, get_string('pluginname', 'theme_'.$theme)); include($settings_path); + if ($settings) { + $ADMIN->add('themes', $settings); + } } } diff --git a/admin/settings/grades.php b/admin/settings/grades.php index 9c3907f17d8..0d42537c64e 100644 --- a/admin/settings/grades.php +++ b/admin/settings/grades.php @@ -176,10 +176,10 @@ if (has_capability('moodle/grade:manage', $systemcontext) // Include all the settings commands for this plugin if there are any if (file_exists($plugindir.'/settings.php')) { $settings = new admin_settingpage('gradereport'.$plugin, get_string('pluginname', 'gradereport_'.$plugin), 'moodle/grade:manage'); - if ($ADMIN->fulltree) { - include($plugindir.'/settings.php'); + include($plugindir.'/settings.php'); + if ($settings) { + $ADMIN->add('gradereports', $settings); } - $ADMIN->add('gradereports', $settings); } } @@ -190,10 +190,10 @@ if (has_capability('moodle/grade:manage', $systemcontext) // Include all the settings commands for this plugin if there are any if (file_exists($plugindir.'/settings.php')) { $settings = new admin_settingpage('gradeimport'.$plugin, get_string('pluginname', 'gradeimport_'.$plugin), 'moodle/grade:manage'); - if ($ADMIN->fulltree) { - include($plugindir.'/settings.php'); + include($plugindir.'/settings.php'); + if ($settings) { + $ADMIN->add('gradeimports', $settings); } - $ADMIN->add('gradeimports', $settings); } } @@ -204,10 +204,10 @@ if (has_capability('moodle/grade:manage', $systemcontext) // Include all the settings commands for this plugin if there are any if (file_exists($plugindir.'/settings.php')) { $settings = new admin_settingpage('gradeexport'.$plugin, get_string('pluginname', 'gradeexport_'.$plugin), 'moodle/grade:manage'); - if ($ADMIN->fulltree) { - include($plugindir.'/settings.php'); + include($plugindir.'/settings.php'); + if ($settings) { + $ADMIN->add('gradeexports', $settings); } - $ADMIN->add('gradeexports', $settings); } } diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php index 3425105e277..e1e8b4ac8cc 100644 --- a/admin/settings/plugins.php +++ b/admin/settings/plugins.php @@ -14,15 +14,13 @@ if ($hassiteconfig) { continue; } $strmodulename = get_string('modulename', 'mod_'.$modulename); - if (file_exists($CFG->dirroot.'/mod/'.$modulename.'/settingstree.php')) { - include($CFG->dirroot.'/mod/'.$modulename.'/settingstree.php'); - } else if (file_exists($CFG->dirroot.'/mod/'.$modulename.'/settings.php')) { + if (file_exists($CFG->dirroot.'/mod/'.$modulename.'/settings.php')) { // do not show disabled modules in tree, keep only settings link on manage page $settings = new admin_settingpage('modsetting'.$modulename, $strmodulename, 'moodle/site:config', !$module->visible); - if ($ADMIN->fulltree) { - include($CFG->dirroot.'/mod/'.$modulename.'/settings.php'); + include($CFG->dirroot.'/mod/'.$modulename.'/settings.php'); + if ($settings) { + $ADMIN->add('modsettings', $settings); } - $ADMIN->add('modsettings', $settings); } } @@ -40,13 +38,10 @@ if ($hassiteconfig) { $strblockname = get_string('pluginname', 'block_'.$blockname); if (file_exists($CFG->dirroot.'/blocks/'.$blockname.'/settings.php')) { $settings = new admin_settingpage('blocksetting'.$blockname, $strblockname, 'moodle/site:config', !$block->visible); - if ($ADMIN->fulltree) { - include($CFG->dirroot.'/blocks/'.$blockname.'/settings.php'); + include($CFG->dirroot.'/blocks/'.$blockname.'/settings.php'); + if ($settings) { + $ADMIN->add('blocksettings', $settings); } - $ADMIN->add('blocksettings', $settings); - - } else if (file_exists($CFG->dirroot.'/blocks/'.$blockname.'/config_global.html')) { - $ADMIN->add('blocksettings', new admin_externalpage('blocksetting'.$blockname, $strblockname, "$CFG->wwwroot/$CFG->admin/block.php?block=$block->id", 'moodle/site:config', !$block->visible)); } } @@ -74,29 +69,22 @@ if ($hassiteconfig) { $ADMIN->add('authsettings', $temp); - if ($auths = get_plugin_list('auth')) { - $authsenabled = get_enabled_auth_plugins(); - $authbyname = array(); - - foreach ($auths as $auth => $authdir) { - $strauthname = get_string('pluginname', "auth_{$auth}"); - $authbyname[$strauthname] = $auth; - } - ksort($authbyname); - - foreach ($authbyname as $strauthname=>$authname) { - if (file_exists($authdir.'/settings.php')) { - // do not show disabled auths in tree, keep only settings link on manage page - $settings = new admin_settingpage('authsetting'.$authname, $strauthname, 'moodle/site:config', !in_array($authname, $authsenabled)); - if ($ADMIN->fulltree) { - include($authdir.'/settings.php'); - } - // TODO: finish implementation of common settings - locking, etc. + $auths = get_plugin_list('auth'); + $authsenabled = get_enabled_auth_plugins(); + foreach ($auths as $authname => $authdir) { + $strauthname = get_string('pluginname', "auth_{$authname}"); + // do not show disabled auths in tree, keep only settings link on manage page + $enabled = in_array($authname, $authsenabled); + if (file_exists($authdir.'/settings.php')) { + // TODO: finish implementation of common settings - locking, etc. + $settings = new admin_settingpage('authsetting'.$authname, $strauthname, 'moodle/site:config', !$enabled); + include($authdir.'/settings.php'); + if ($settings) { $ADMIN->add('authsettings', $settings); - - } else { - $ADMIN->add('authsettings', new admin_externalpage('authsetting'.$authname, $strauthname, "$CFG->wwwroot/$CFG->admin/auth_config.php?auth=$authname", 'moodle/site:config', !in_array($authname, $authsenabled))); } + + } else { + $ADMIN->add('authsettings', new admin_externalpage('authsetting'.$authname, $strauthname, "$CFG->wwwroot/$CFG->admin/auth_config.php?auth=$authname", 'moodle/site:config', !$enabled)); } } @@ -212,10 +200,10 @@ if ($hassiteconfig) { if (file_exists("$CFG->dirroot/$filterpath/filtersettings.php")) { $settings = new admin_settingpage('filtersetting'.str_replace('/', '', $filterpath), $strfiltername, 'moodle/site:config', !isset($activefilters[$filterpath])); - if ($ADMIN->fulltree) { - include("$CFG->dirroot/$filterpath/filtersettings.php"); + include("$CFG->dirroot/$filterpath/filtersettings.php"); + if ($settings) { + $ADMIN->add('filtersettings', $settings); } - $ADMIN->add('filtersettings', $settings); } } @@ -353,10 +341,10 @@ if ($hassiteconfig) { if (file_exists("$location/settings.php")) { $name = get_string('pluginname', 'webservice_'.$webservice); $settings = new admin_settingpage('webservicesetting'.$webservice, $name, 'moodle/site:config', !in_array($webservice, $active_webservices) or empty($CFG->enablewebservices)); - if ($ADMIN->fulltree) { - include("$location/settings.php"); + include("$location/settings.php"); + if ($settings) { + $ADMIN->add('webservicesettings', $settings); } - $ADMIN->add('webservicesettings', $settings); } } /// manage token page link @@ -380,10 +368,10 @@ if ($hassiteconfig || has_capability('moodle/question:config', $systemcontext)) if (file_exists($settingsfile)) { $settings = new admin_settingpage('qtypesetting' . $qtype->name(), $qtype->local_name(), 'moodle/question:config'); - if ($ADMIN->fulltree) { - include($settingsfile); + include($settingsfile); + if ($settings) { + $ADMIN->add('qtypesettings', $settings); } - $ADMIN->add('qtypesettings', $settings); } } } diff --git a/blocks/course_list/settings.php b/blocks/course_list/settings.php index a76b50b6792..1af7620f5e2 100644 --- a/blocks/course_list/settings.php +++ b/blocks/course_list/settings.php @@ -1,13 +1,15 @@ get_string('allcourses', 'block_course_list'), 'own'=>get_string('owncourses', 'block_course_list')); +if ($ADMIN->fulltree) { + $options = array('all'=>get_string('allcourses', 'block_course_list'), 'own'=>get_string('owncourses', 'block_course_list')); -$settings->add(new admin_setting_configselect('block_course_list_adminview', get_string('adminview', 'block_course_list'), - get_string('configadminview', 'block_course_list'), 'all', $options)); - -$settings->add(new admin_setting_configcheckbox('block_course_list_hideallcourseslink', get_string('hideallcourseslink', 'block_course_list'), - get_string('confighideallcourseslink', 'block_course_list'), 0)); + $settings->add(new admin_setting_configselect('block_course_list_adminview', get_string('adminview', 'block_course_list'), + get_string('configadminview', 'block_course_list'), 'all', $options)); + $settings->add(new admin_setting_configcheckbox('block_course_list_hideallcourseslink', get_string('hideallcourseslink', 'block_course_list'), + get_string('confighideallcourseslink', 'block_course_list'), 0)); +} diff --git a/blocks/online_users/settings.php b/blocks/online_users/settings.php index 4b5de1596fe..eb7753c3bd7 100644 --- a/blocks/online_users/settings.php +++ b/blocks/online_users/settings.php @@ -1,6 +1,9 @@ add(new admin_setting_configtext('block_online_users_timetosee', get_string('timetosee', 'block_online_users'), +defined('MOODLE_INTERNAL') || die; + +if ($ADMIN->fulltree) { + $settings->add(new admin_setting_configtext('block_online_users_timetosee', get_string('timetosee', 'block_online_users'), get_string('configtimetosee', 'block_online_users'), 5, PARAM_INT)); - +} diff --git a/blocks/rss_client/settings.php b/blocks/rss_client/settings.php index 858a1121cc6..ff119ac6e4d 100644 --- a/blocks/rss_client/settings.php +++ b/blocks/rss_client/settings.php @@ -1,10 +1,14 @@ add(new admin_setting_configtext('block_rss_client_num_entries', get_string('numentries', 'block_rss_client'), - get_string('clientnumentries', 'block_rss_client'), 5, PARAM_INT)); +defined('MOODLE_INTERNAL') || die; -$settings->add(new admin_setting_configtext('block_rss_client_timeout', get_string('timeout2', 'block_rss_client'), - get_string('timeout', 'block_rss_client'), 30, PARAM_INT)); +if ($ADMIN->fulltree) { + $settings->add(new admin_setting_configtext('block_rss_client_num_entries', get_string('numentries', 'block_rss_client'), + get_string('clientnumentries', 'block_rss_client'), 5, PARAM_INT)); -$link =''.get_string('feedsaddedit', 'block_rss_client').''; -$settings->add(new admin_setting_heading('block_rss_addheading', '', $link)); + $settings->add(new admin_setting_configtext('block_rss_client_timeout', get_string('timeout2', 'block_rss_client'), + get_string('timeout', 'block_rss_client'), 30, PARAM_INT)); + + $link =''.get_string('feedsaddedit', 'block_rss_client').''; + $settings->add(new admin_setting_heading('block_rss_addheading', '', $link)); +} \ No newline at end of file diff --git a/blocks/section_links/settings.php b/blocks/section_links/settings.php index 42ff0bd037d..e7d2ce1289b 100755 --- a/blocks/section_links/settings.php +++ b/blocks/section_links/settings.php @@ -21,33 +21,38 @@ * @package moodlecore * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -$configs = array(); -$numberofsections = array(); +defined('MOODLE_INTERNAL') || die; -for ($i = 1; $i < 53; $i++){ - $numberofsections[$i] = $i; -} -$increments = array(); +if ($ADMIN->fulltree) { + $configs = array(); -for ($i = 1; $i < 11; $i++){ - $increments[$i] = $i; -} + $numberofsections = array(); -$selected = array(1 => array(22,2), - 2 => array(40,5)); + for ($i = 1; $i < 53; $i++){ + $numberofsections[$i] = $i; + } + $increments = array(); -for($i = 1; $i < 3; $i++){ - $configs[] = new admin_setting_configselect('numsections'.$i, get_string('numsections'.$i, 'block_section_links'), - get_string('numsectionsdesc'.$i, 'block_section_links'), - $selected[$i][0], $numberofsections); + for ($i = 1; $i < 11; $i++){ + $increments[$i] = $i; + } - $configs[] = new admin_setting_configselect('incby'.$i, get_string('incby'.$i, 'block_section_links'), - get_string('incbydesc'.$i, 'block_section_links'), - $selected[$i][1], $increments); -} + $selected = array(1 => array(22,2), + 2 => array(40,5)); -foreach ($configs as $config) { - $config->plugin = 'blocks/section_links'; - $settings->add($config); -} + for($i = 1; $i < 3; $i++){ + $configs[] = new admin_setting_configselect('numsections'.$i, get_string('numsections'.$i, 'block_section_links'), + get_string('numsectionsdesc'.$i, 'block_section_links'), + $selected[$i][0], $numberofsections); + + $configs[] = new admin_setting_configselect('incby'.$i, get_string('incby'.$i, 'block_section_links'), + get_string('incbydesc'.$i, 'block_section_links'), + $selected[$i][1], $increments); + } + + foreach ($configs as $config) { + $config->plugin = 'blocks/section_links'; + $settings->add($config); + } +} \ No newline at end of file diff --git a/blocks/tags/settings.php b/blocks/tags/settings.php index f5f6752d549..2e72e7e005e 100644 --- a/blocks/tags/settings.php +++ b/blocks/tags/settings.php @@ -1,6 +1,9 @@ add(new admin_setting_configcheckbox('block_tags_showcoursetags', get_string('showcoursetags', 'block_tags'), - get_string('showcoursetagsdef', 'block_tags'), 0)); +defined('MOODLE_INTERNAL') || die; +if ($ADMIN->fulltree) { + $settings->add(new admin_setting_configcheckbox('block_tags_showcoursetags', get_string('showcoursetags', 'block_tags'), + get_string('showcoursetagsdef', 'block_tags'), 0)); +} diff --git a/blocks/upgrade.txt b/blocks/upgrade.txt index 6d3f42a35e8..ce7766f4324 100644 --- a/blocks/upgrade.txt +++ b/blocks/upgrade.txt @@ -17,6 +17,7 @@ required changes in code: * remove '_utf8' from language pack names, use new {$a} syntax in language packs * use 'pluginname' lang pack identifier instead of 'blockname' * move cron and version number into standard version.php +* removed support for old config_global.html, use settings.php optional - no changes needed in older code: * diff --git a/filter/censor/filtersettings.php b/filter/censor/filtersettings.php index bd43273b3be..323d1ef1426 100644 --- a/filter/censor/filtersettings.php +++ b/filter/censor/filtersettings.php @@ -1,6 +1,9 @@ add(new admin_setting_configtextarea('filter_censor_badwords', get_string('badwordslist','admin'), - get_string('badwordsconfig', 'admin').'
'.get_string('badwordsdefault', 'admin'), '')); +defined('MOODLE_INTERNAL') || die; +if ($ADMIN->fulltree) { + $settings->add(new admin_setting_configtextarea('filter_censor_badwords', get_string('badwordslist','admin'), + get_string('badwordsconfig', 'admin').'
'.get_string('badwordsdefault', 'admin'), '')); +} diff --git a/filter/mediaplugin/filtersettings.php b/filter/mediaplugin/filtersettings.php index 0c05dafeecd..42e38791e56 100644 --- a/filter/mediaplugin/filtersettings.php +++ b/filter/mediaplugin/filtersettings.php @@ -1,27 +1,30 @@ add(new admin_setting_configcheckbox('filter_mediaplugin_enable_mp3', get_string('mediapluginmp3','admin'), '', 1)); +defined('MOODLE_INTERNAL') || die; -$settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_swf', get_string('mediapluginswf','admin'), get_string('mediapluginswfnote','admin'), 0)); +if ($ADMIN->fulltree) { -$settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_mov', get_string('mediapluginmov','admin'), '', 1)); + $settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_mp3', get_string('mediapluginmp3','admin'), '', 1)); -$settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_wmv', get_string('mediapluginwmv','admin'), '', 1)); + $settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_swf', get_string('mediapluginswf','admin'), get_string('mediapluginswfnote','admin'), 0)); -$settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_mpg', get_string('mediapluginmpg','admin'), '', 1)); + $settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_mov', get_string('mediapluginmov','admin'), '', 1)); -$settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_avi', get_string('mediapluginavi','admin'), '', 1)); + $settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_wmv', get_string('mediapluginwmv','admin'), '', 1)); -$settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_flv', get_string('mediapluginflv','admin'), '', 1)); + $settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_mpg', get_string('mediapluginmpg','admin'), '', 1)); -$settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_ram', get_string('mediapluginram','admin'), '', 1)); + $settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_avi', get_string('mediapluginavi','admin'), '', 1)); -$settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_rpm', get_string('mediapluginrpm','admin'), '', 1)); + $settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_flv', get_string('mediapluginflv','admin'), '', 1)); -$settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_rm', get_string('mediapluginrm','admin'), '', 1)); + $settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_ram', get_string('mediapluginram','admin'), '', 1)); -$settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_youtube', get_string('mediapluginyoutube','admin'), '', 1)); + $settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_rpm', get_string('mediapluginrpm','admin'), '', 1)); -$settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_img', get_string('mediapluginimg','admin'), '', 1)); + $settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_rm', get_string('mediapluginrm','admin'), '', 1)); + $settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_youtube', get_string('mediapluginyoutube','admin'), '', 1)); + $settings->add(new admin_setting_configcheckbox('filter_mediaplugin_enable_img', get_string('mediapluginimg','admin'), '', 1)); +} diff --git a/filter/multilang/filtersettings.php b/filter/multilang/filtersettings.php index 022c6cc23b1..a407911db71 100644 --- a/filter/multilang/filtersettings.php +++ b/filter/multilang/filtersettings.php @@ -1,6 +1,9 @@ add(new admin_setting_configcheckbox('filter_multilang_force_old', 'filter_multilang_force_old', - get_string('multilangforceold', 'admin'), 0)); +defined('MOODLE_INTERNAL') || die; +if ($ADMIN->fulltree) { + $settings->add(new admin_setting_configcheckbox('filter_multilang_force_old', 'filter_multilang_force_old', + get_string('multilangforceold', 'admin'), 0)); +} diff --git a/filter/tex/filtersettings.php b/filter/tex/filtersettings.php index 24d8e773627..29ca17d511e 100644 --- a/filter/tex/filtersettings.php +++ b/filter/tex/filtersettings.php @@ -1,50 +1,54 @@ dirroot.'/filter/tex/lib.php'); +defined('MOODLE_INTERNAL') || die; -$items = array(); -$items[] = new admin_setting_heading('filter_tex_latexheading', get_string('latexsettings', 'admin'), ''); -$items[] = new admin_setting_configtextarea('filter_tex_latexpreamble', get_string('latexpreamble','admin'), - '', "\\usepackage[latin1]{inputenc}\n\\usepackage{amsmath}\n\\usepackage{amsfonts}\n\\RequirePackage{amsmath,amssymb,latexsym}\n"); -$items[] = new admin_setting_configtext('filter_tex_latexbackground', get_string('backgroundcolour', 'admin'), '', '#FFFFFF'); -$items[] = new admin_setting_configtext('filter_tex_density', get_string('density', 'admin'), '', '120', PARAM_INT); +if ($ADMIN->fulltree) { -if (PHP_OS=='Linux') { - $default_filter_tex_pathlatex = "/usr/bin/latex"; - $default_filter_tex_pathdvips = "/usr/bin/dvips"; - $default_filter_tex_pathconvert = "/usr/bin/convert"; + require_once($CFG->dirroot.'/filter/tex/lib.php'); -} else if (PHP_OS=='Darwin') { - // most likely needs a fink install (fink.sf.net) - $default_filter_tex_pathlatex = "/sw/bin/latex"; - $default_filter_tex_pathdvips = "/sw/bin/dvips"; - $default_filter_tex_pathconvert = "/sw/bin/convert"; + $items = array(); + $items[] = new admin_setting_heading('filter_tex_latexheading', get_string('latexsettings', 'admin'), ''); + $items[] = new admin_setting_configtextarea('filter_tex_latexpreamble', get_string('latexpreamble','admin'), + '', "\\usepackage[latin1]{inputenc}\n\\usepackage{amsmath}\n\\usepackage{amsfonts}\n\\RequirePackage{amsmath,amssymb,latexsym}\n"); + $items[] = new admin_setting_configtext('filter_tex_latexbackground', get_string('backgroundcolour', 'admin'), '', '#FFFFFF'); + $items[] = new admin_setting_configtext('filter_tex_density', get_string('density', 'admin'), '', '120', PARAM_INT); -} else if (PHP_OS=='WINNT' or PHP_OS=='WIN32' or PHP_OS=='Windows') { - // note: you need Ghostscript installed (standard), miktex (standard) - // and ImageMagick (install at c:\ImageMagick) - $default_filter_tex_pathlatex = "\"c:\\texmf\\miktex\\bin\\latex.exe\" "; - $default_filter_tex_pathdvips = "\"c:\\texmf\\miktex\\bin\\dvips.exe\" "; - $default_filter_tex_pathconvert = "\"c:\\imagemagick\\convert.exe\" "; + if (PHP_OS=='Linux') { + $default_filter_tex_pathlatex = "/usr/bin/latex"; + $default_filter_tex_pathdvips = "/usr/bin/dvips"; + $default_filter_tex_pathconvert = "/usr/bin/convert"; -} else { - $default_filter_tex_pathlatex = ''; - $default_filter_tex_pathdvips = ''; - $default_filter_tex_pathconvert = ''; -} + } else if (PHP_OS=='Darwin') { + // most likely needs a fink install (fink.sf.net) + $default_filter_tex_pathlatex = "/sw/bin/latex"; + $default_filter_tex_pathdvips = "/sw/bin/dvips"; + $default_filter_tex_pathconvert = "/sw/bin/convert"; -$items[] = new admin_setting_configexecutable('filter_tex_pathlatex', get_string('pathlatex', 'admin'), '', $default_filter_tex_pathlatex); -$items[] = new admin_setting_configexecutable('filter_tex_pathdvips', get_string('pathdvips', 'admin'), '', $default_filter_tex_pathdvips); -$items[] = new admin_setting_configexecutable('filter_tex_pathconvert', get_string('pathconvert', 'admin'), '', $default_filter_tex_pathconvert); + } else if (PHP_OS=='WINNT' or PHP_OS=='WIN32' or PHP_OS=='Windows') { + // note: you need Ghostscript installed (standard), miktex (standard) + // and ImageMagick (install at c:\ImageMagick) + $default_filter_tex_pathlatex = "\"c:\\texmf\\miktex\\bin\\latex.exe\" "; + $default_filter_tex_pathdvips = "\"c:\\texmf\\miktex\\bin\\dvips.exe\" "; + $default_filter_tex_pathconvert = "\"c:\\imagemagick\\convert.exe\" "; -// Even if we offer GIF and PNG formats here, in the update callback we check whether -// all the paths actually point to executables. If they don't, we force the setting -// to GIF, as that's the only format mimeTeX can produce. -$formats = array('gif' => 'GIF', 'png' => 'PNG'); -$items[] = new admin_setting_configselect('filter_tex_convertformat', get_string('convertformat', 'admin'), get_string('configconvertformat', 'admin'), 'gif', $formats); + } else { + $default_filter_tex_pathlatex = ''; + $default_filter_tex_pathdvips = ''; + $default_filter_tex_pathconvert = ''; + } -foreach ($items as $item) { - $item->set_updatedcallback('filter_tex_updatedcallback'); - $settings->add($item); -} + $items[] = new admin_setting_configexecutable('filter_tex_pathlatex', get_string('pathlatex', 'admin'), '', $default_filter_tex_pathlatex); + $items[] = new admin_setting_configexecutable('filter_tex_pathdvips', get_string('pathdvips', 'admin'), '', $default_filter_tex_pathdvips); + $items[] = new admin_setting_configexecutable('filter_tex_pathconvert', get_string('pathconvert', 'admin'), '', $default_filter_tex_pathconvert); + // Even if we offer GIF and PNG formats here, in the update callback we check whether + // all the paths actually point to executables. If they don't, we force the setting + // to GIF, as that's the only format mimeTeX can produce. + $formats = array('gif' => 'GIF', 'png' => 'PNG'); + $items[] = new admin_setting_configselect('filter_tex_convertformat', get_string('convertformat', 'admin'), get_string('configconvertformat', 'admin'), 'gif', $formats); + + foreach ($items as $item) { + $item->set_updatedcallback('filter_tex_updatedcallback'); + $settings->add($item); + } +} \ No newline at end of file diff --git a/grade/report/grader/settings.php b/grade/report/grader/settings.php index f2f87c72447..a2acaaf7527 100644 --- a/grade/report/grader/settings.php +++ b/grade/report/grader/settings.php @@ -15,91 +15,94 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -$strinherit = get_string('inherit', 'grades'); -$strpercentage = get_string('percentage', 'grades'); -$strreal = get_string('real', 'grades'); -$strletter = get_string('letter', 'grades'); +defined('MOODLE_INTERNAL') || die; -/// Add settings for this module to the $settings object (it's already defined) -$settings->add(new admin_setting_configtext('grade_report_studentsperpage', get_string('studentsperpage', 'grades'), - get_string('studentsperpage_help', 'grades'), 100)); +if ($ADMIN->fulltree) { -$settings->add(new admin_setting_configcheckbox('grade_report_quickgrading', get_string('quickgrading', 'grades'), - get_string('quickgrading_help', 'grades'), 1)); + $strinherit = get_string('inherit', 'grades'); + $strpercentage = get_string('percentage', 'grades'); + $strreal = get_string('real', 'grades'); + $strletter = get_string('letter', 'grades'); -$settings->add(new admin_setting_configcheckbox('grade_report_showquickfeedback', get_string('quickfeedback', 'grades'), - get_string('showquickfeedback_help', 'grades'), 0)); + /// Add settings for this module to the $settings object (it's already defined) + $settings->add(new admin_setting_configtext('grade_report_studentsperpage', get_string('studentsperpage', 'grades'), + get_string('studentsperpage_help', 'grades'), 100)); -$settings->add(new admin_setting_configcheckbox('grade_report_fixedstudents', get_string('fixedstudents', 'grades'), - get_string('fixedstudents_help', 'grades'), 0)); + $settings->add(new admin_setting_configcheckbox('grade_report_quickgrading', get_string('quickgrading', 'grades'), + get_string('quickgrading_help', 'grades'), 1)); -$settings->add(new admin_setting_configselect('grade_report_meanselection', get_string('meanselection', 'grades'), - get_string('meanselection_help', 'grades'), GRADE_REPORT_MEAN_GRADED, - array(GRADE_REPORT_MEAN_ALL => get_string('meanall', 'grades'), - GRADE_REPORT_MEAN_GRADED => get_string('meangraded', 'grades')))); + $settings->add(new admin_setting_configcheckbox('grade_report_showquickfeedback', get_string('quickfeedback', 'grades'), + get_string('showquickfeedback_help', 'grades'), 0)); -$settings->add(new admin_setting_configcheckbox('grade_report_enableajax', get_string('enableajax', 'grades'), - get_string('enableajax_help', 'grades'), 0)); + $settings->add(new admin_setting_configcheckbox('grade_report_fixedstudents', get_string('fixedstudents', 'grades'), + get_string('fixedstudents_help', 'grades'), 0)); -$settings->add(new admin_setting_configcheckbox('grade_report_showcalculations', get_string('showcalculations', 'grades'), - get_string('showcalculations_help', 'grades'), 0)); + $settings->add(new admin_setting_configselect('grade_report_meanselection', get_string('meanselection', 'grades'), + get_string('meanselection_help', 'grades'), GRADE_REPORT_MEAN_GRADED, + array(GRADE_REPORT_MEAN_ALL => get_string('meanall', 'grades'), + GRADE_REPORT_MEAN_GRADED => get_string('meangraded', 'grades')))); -$settings->add(new admin_setting_configcheckbox('grade_report_showeyecons', get_string('showeyecons', 'grades'), - get_string('showeyecons_help', 'grades'), 0)); + $settings->add(new admin_setting_configcheckbox('grade_report_enableajax', get_string('enableajax', 'grades'), + get_string('enableajax_help', 'grades'), 0)); -$settings->add(new admin_setting_configcheckbox('grade_report_showaverages', get_string('showaverages', 'grades'), - get_string('showaverages_help', 'grades'), 1)); + $settings->add(new admin_setting_configcheckbox('grade_report_showcalculations', get_string('showcalculations', 'grades'), + get_string('showcalculations_help', 'grades'), 0)); -$settings->add(new admin_setting_configcheckbox('grade_report_showlocks', get_string('showlocks', 'grades'), - get_string('showlocks_help', 'grades'), 0)); + $settings->add(new admin_setting_configcheckbox('grade_report_showeyecons', get_string('showeyecons', 'grades'), + get_string('showeyecons_help', 'grades'), 0)); -$settings->add(new admin_setting_configcheckbox('grade_report_showranges', get_string('showranges', 'grades'), - get_string('showranges_help', 'grades'), 0)); + $settings->add(new admin_setting_configcheckbox('grade_report_showaverages', get_string('showaverages', 'grades'), + get_string('showaverages_help', 'grades'), 1)); -$settings->add(new admin_setting_configcheckbox('grade_report_showuserimage', get_string('showuserimage', 'grades'), - get_string('showuserimage_help', 'grades'), 1)); + $settings->add(new admin_setting_configcheckbox('grade_report_showlocks', get_string('showlocks', 'grades'), + get_string('showlocks_help', 'grades'), 0)); -$settings->add(new admin_setting_configcheckbox('grade_report_showuseridnumber', get_string('showuseridnumber', 'grades'), - get_string('showuseridnumber_help', 'grades'), 0)); + $settings->add(new admin_setting_configcheckbox('grade_report_showranges', get_string('showranges', 'grades'), + get_string('showranges_help', 'grades'), 0)); -$settings->add(new admin_setting_configcheckbox('grade_report_showactivityicons', get_string('showactivityicons', 'grades'), - get_string('showactivityicons_help', 'grades'), 1)); + $settings->add(new admin_setting_configcheckbox('grade_report_showuserimage', get_string('showuserimage', 'grades'), + get_string('showuserimage_help', 'grades'), 1)); -$settings->add(new admin_setting_configcheckbox('grade_report_shownumberofgrades', get_string('shownumberofgrades', 'grades'), - get_string('shownumberofgrades_help', 'grades'), 0)); + $settings->add(new admin_setting_configcheckbox('grade_report_showuseridnumber', get_string('showuseridnumber', 'grades'), + get_string('showuseridnumber_help', 'grades'), 0)); -$settings->add(new admin_setting_configselect('grade_report_averagesdisplaytype', get_string('averagesdisplaytype', 'grades'), - get_string('averagesdisplaytype_help', 'grades'), GRADE_REPORT_PREFERENCE_INHERIT, - array(GRADE_REPORT_PREFERENCE_INHERIT => $strinherit, - GRADE_DISPLAY_TYPE_REAL => $strreal, - GRADE_DISPLAY_TYPE_PERCENTAGE => $strpercentage, - GRADE_DISPLAY_TYPE_LETTER => $strletter))); + $settings->add(new admin_setting_configcheckbox('grade_report_showactivityicons', get_string('showactivityicons', 'grades'), + get_string('showactivityicons_help', 'grades'), 1)); -$settings->add(new admin_setting_configselect('grade_report_rangesdisplaytype', get_string('rangesdisplaytype', 'grades'), - get_string('rangesdisplaytype_help', 'grades'), GRADE_REPORT_PREFERENCE_INHERIT, - array(GRADE_REPORT_PREFERENCE_INHERIT => $strinherit, - GRADE_DISPLAY_TYPE_REAL => $strreal, - GRADE_DISPLAY_TYPE_PERCENTAGE => $strpercentage, - GRADE_DISPLAY_TYPE_LETTER => $strletter))); + $settings->add(new admin_setting_configcheckbox('grade_report_shownumberofgrades', get_string('shownumberofgrades', 'grades'), + get_string('shownumberofgrades_help', 'grades'), 0)); -$settings->add(new admin_setting_configselect('grade_report_averagesdecimalpoints', get_string('averagesdecimalpoints', 'grades'), - get_string('averagesdecimalpoints_help', 'grades'), GRADE_REPORT_PREFERENCE_INHERIT, - array(GRADE_REPORT_PREFERENCE_INHERIT => $strinherit, - '0' => '0', - '1' => '1', - '2' => '2', - '3' => '3', - '4' => '4', - '5' => '5'))); -$settings->add(new admin_setting_configselect('grade_report_rangesdecimalpoints', get_string('rangesdecimalpoints', 'grades'), - get_string('rangesdecimalpoints_help', 'grades'), GRADE_REPORT_PREFERENCE_INHERIT, - array(GRADE_REPORT_PREFERENCE_INHERIT => $strinherit, - '0' => '0', - '1' => '1', - '2' => '2', - '3' => '3', - '4' => '4', - '5' => '5'))); + $settings->add(new admin_setting_configselect('grade_report_averagesdisplaytype', get_string('averagesdisplaytype', 'grades'), + get_string('averagesdisplaytype_help', 'grades'), GRADE_REPORT_PREFERENCE_INHERIT, + array(GRADE_REPORT_PREFERENCE_INHERIT => $strinherit, + GRADE_DISPLAY_TYPE_REAL => $strreal, + GRADE_DISPLAY_TYPE_PERCENTAGE => $strpercentage, + GRADE_DISPLAY_TYPE_LETTER => $strletter))); + $settings->add(new admin_setting_configselect('grade_report_rangesdisplaytype', get_string('rangesdisplaytype', 'grades'), + get_string('rangesdisplaytype_help', 'grades'), GRADE_REPORT_PREFERENCE_INHERIT, + array(GRADE_REPORT_PREFERENCE_INHERIT => $strinherit, + GRADE_DISPLAY_TYPE_REAL => $strreal, + GRADE_DISPLAY_TYPE_PERCENTAGE => $strpercentage, + GRADE_DISPLAY_TYPE_LETTER => $strletter))); + $settings->add(new admin_setting_configselect('grade_report_averagesdecimalpoints', get_string('averagesdecimalpoints', 'grades'), + get_string('averagesdecimalpoints_help', 'grades'), GRADE_REPORT_PREFERENCE_INHERIT, + array(GRADE_REPORT_PREFERENCE_INHERIT => $strinherit, + '0' => '0', + '1' => '1', + '2' => '2', + '3' => '3', + '4' => '4', + '5' => '5'))); + $settings->add(new admin_setting_configselect('grade_report_rangesdecimalpoints', get_string('rangesdecimalpoints', 'grades'), + get_string('rangesdecimalpoints_help', 'grades'), GRADE_REPORT_PREFERENCE_INHERIT, + array(GRADE_REPORT_PREFERENCE_INHERIT => $strinherit, + '0' => '0', + '1' => '1', + '2' => '2', + '3' => '3', + '4' => '4', + '5' => '5'))); +} diff --git a/grade/report/overview/settings.php b/grade/report/overview/settings.php index cdcc47fc5a2..d99463728a6 100644 --- a/grade/report/overview/settings.php +++ b/grade/report/overview/settings.php @@ -17,12 +17,15 @@ /// Add settings for this module to the $settings object (it's already defined) -$settings->add(new admin_setting_configcheckbox('grade_report_overview_showrank', get_string('showrank', 'grades'), get_string('showrank_help', 'grades'), 0, PARAM_INT)); +defined('MOODLE_INTERNAL') || die; -$settings->add(new admin_setting_configselect('grade_report_overview_showtotalsifcontainhidden', get_string('hidetotalifhiddenitems', 'grades'), - get_string('hidetotalifhiddenitems_help', 'grades'), GRADE_REPORT_HIDE_TOTAL_IF_CONTAINS_HIDDEN, - array(GRADE_REPORT_HIDE_TOTAL_IF_CONTAINS_HIDDEN => get_string('hide'), - GRADE_REPORT_SHOW_TOTAL_IF_CONTAINS_HIDDEN => get_string('hidetotalshowexhiddenitems', 'grades'), - GRADE_REPORT_SHOW_REAL_TOTAL_IF_CONTAINS_HIDDEN => get_string('hidetotalshowinchiddenitems', 'grades') ))); +if ($ADMIN->fulltree) { + $settings->add(new admin_setting_configcheckbox('grade_report_overview_showrank', get_string('showrank', 'grades'), get_string('showrank_help', 'grades'), 0, PARAM_INT)); + $settings->add(new admin_setting_configselect('grade_report_overview_showtotalsifcontainhidden', get_string('hidetotalifhiddenitems', 'grades'), + get_string('hidetotalifhiddenitems_help', 'grades'), GRADE_REPORT_HIDE_TOTAL_IF_CONTAINS_HIDDEN, + array(GRADE_REPORT_HIDE_TOTAL_IF_CONTAINS_HIDDEN => get_string('hide'), + GRADE_REPORT_SHOW_TOTAL_IF_CONTAINS_HIDDEN => get_string('hidetotalshowexhiddenitems', 'grades'), + GRADE_REPORT_SHOW_REAL_TOTAL_IF_CONTAINS_HIDDEN => get_string('hidetotalshowinchiddenitems', 'grades') ))); +} diff --git a/grade/report/user/settings.php b/grade/report/user/settings.php index 7ac42697d88..d5de814fc7f 100644 --- a/grade/report/user/settings.php +++ b/grade/report/user/settings.php @@ -17,16 +17,21 @@ /// Add settings for this module to the $settings object (it's already defined) -$settings->add(new admin_setting_configcheckbox('grade_report_user_showrank', get_string('showrank', 'grades'), get_string('showrank_help', 'grades'), 0, PARAM_INT)); -$settings->add(new admin_setting_configcheckbox('grade_report_user_showpercentage', get_string('showpercentage', 'grades'), get_string('showpercentage_help', 'grades'), 2, PARAM_INT)); +defined('MOODLE_INTERNAL') || die; -$options = array(0 => get_string('shownohidden', 'grades'), - 1 => get_string('showhiddenuntilonly', 'grades'), - 2 => get_string('showallhidden', 'grades')); -$settings->add(new admin_setting_configselect('grade_report_user_showhiddenitems', get_string('showhiddenitems', 'grades'), get_string('showhiddenitems_help', 'grades'), 1, $options)); +if ($ADMIN->fulltree) { -$settings->add(new admin_setting_configselect('grade_report_user_showtotalsifcontainhidden', get_string('hidetotalifhiddenitems', 'grades'), - get_string('hidetotalifhiddenitems_help', 'grades'), GRADE_REPORT_HIDE_TOTAL_IF_CONTAINS_HIDDEN, - array(GRADE_REPORT_HIDE_TOTAL_IF_CONTAINS_HIDDEN => get_string('hide'), - GRADE_REPORT_SHOW_TOTAL_IF_CONTAINS_HIDDEN => get_string('hidetotalshowexhiddenitems', 'grades'), - GRADE_REPORT_SHOW_REAL_TOTAL_IF_CONTAINS_HIDDEN => get_string('hidetotalshowinchiddenitems', 'grades')))); + $settings->add(new admin_setting_configcheckbox('grade_report_user_showrank', get_string('showrank', 'grades'), get_string('showrank_help', 'grades'), 0, PARAM_INT)); + $settings->add(new admin_setting_configcheckbox('grade_report_user_showpercentage', get_string('showpercentage', 'grades'), get_string('showpercentage_help', 'grades'), 2, PARAM_INT)); + + $options = array(0 => get_string('shownohidden', 'grades'), + 1 => get_string('showhiddenuntilonly', 'grades'), + 2 => get_string('showallhidden', 'grades')); + $settings->add(new admin_setting_configselect('grade_report_user_showhiddenitems', get_string('showhiddenitems', 'grades'), get_string('showhiddenitems_help', 'grades'), 1, $options)); + + $settings->add(new admin_setting_configselect('grade_report_user_showtotalsifcontainhidden', get_string('hidetotalifhiddenitems', 'grades'), + get_string('hidetotalifhiddenitems_help', 'grades'), GRADE_REPORT_HIDE_TOTAL_IF_CONTAINS_HIDDEN, + array(GRADE_REPORT_HIDE_TOTAL_IF_CONTAINS_HIDDEN => get_string('hide'), + GRADE_REPORT_SHOW_TOTAL_IF_CONTAINS_HIDDEN => get_string('hidetotalshowexhiddenitems', 'grades'), + GRADE_REPORT_SHOW_REAL_TOTAL_IF_CONTAINS_HIDDEN => get_string('hidetotalshowinchiddenitems', 'grades')))); +} diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 834eb1adc39..ef0420a70ae 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -7090,6 +7090,7 @@ function get_plugin_list($plugintype) { unset($items); } + //TODO: implement better sorting once we migrated all plugin names to 'pluginname', ksort does not work for unicode, that is why we have to sort by the dir name, not the strings! ksort($result); return $result; } diff --git a/mod/assignment/settings.php b/mod/assignment/settings.php index 9db9cdf5a4d..05fa52c0c83 100644 --- a/mod/assignment/settings.php +++ b/mod/assignment/settings.php @@ -1,18 +1,20 @@ dirroot.'/mod/assignment/lib.php'); +defined('MOODLE_INTERNAL') || die; -if (isset($CFG->maxbytes)) { - $settings->add(new admin_setting_configselect('assignment_maxbytes', get_string('maximumsize', 'assignment'), - get_string('configmaxbytes', 'assignment'), 1048576, get_max_upload_sizes($CFG->maxbytes))); +if ($ADMIN->fulltree) { + require_once($CFG->dirroot.'/mod/assignment/lib.php'); + + if (isset($CFG->maxbytes)) { + $settings->add(new admin_setting_configselect('assignment_maxbytes', get_string('maximumsize', 'assignment'), + get_string('configmaxbytes', 'assignment'), 1048576, get_max_upload_sizes($CFG->maxbytes))); + } + + $options = array(ASSIGNMENT_COUNT_WORDS => trim(get_string('numwords', '', '?')), + ASSIGNMENT_COUNT_LETTERS => trim(get_string('numletters', '', '?'))); + $settings->add(new admin_setting_configselect('assignment_itemstocount', get_string('itemstocount', 'assignment'), + get_string('configitemstocount', 'assignment'), ASSIGNMENT_COUNT_WORDS, $options)); + + $settings->add(new admin_setting_configcheckbox('assignment_showrecentsubmissions', get_string('showrecentsubmissions', 'assignment'), + get_string('configshowrecentsubmissions', 'assignment'), 1)); } - -$options = array(ASSIGNMENT_COUNT_WORDS => trim(get_string('numwords', '')), - ASSIGNMENT_COUNT_LETTERS => trim(get_string('numletters', ''))); -$settings->add(new admin_setting_configselect('assignment_itemstocount', get_string('itemstocount', 'assignment'), - get_string('configitemstocount', 'assignment'), ASSIGNMENT_COUNT_WORDS, $options)); - -$settings->add(new admin_setting_configcheckbox('assignment_showrecentsubmissions', get_string('showrecentsubmissions', 'assignment'), - get_string('configshowrecentsubmissions', 'assignment'), 1)); - - diff --git a/mod/chat/settings.php b/mod/chat/settings.php index 0a041ac8972..dde4f83f7c3 100644 --- a/mod/chat/settings.php +++ b/mod/chat/settings.php @@ -1,48 +1,50 @@ add(new admin_setting_heading('chat_method_heading', get_string('generalconfig', 'chat'), - get_string('explaingeneralconfig', 'chat'))); +defined('MOODLE_INTERNAL') || die; -$options = array(); -$options['ajax'] = get_string('methodajax', 'chat'); -$options['header_js'] = get_string('methodnormal', 'chat'); -$options['sockets'] = get_string('methoddaemon', 'chat'); -$settings->add(new admin_setting_configselect('chat_method', get_string('method', 'chat'), - get_string('configmethod', 'chat'), 'ajax', $options)); +if ($ADMIN->fulltree) { + $settings->add(new admin_setting_heading('chat_method_heading', get_string('generalconfig', 'chat'), + get_string('explaingeneralconfig', 'chat'))); -$settings->add(new admin_setting_configtext('chat_refresh_userlist', get_string('refreshuserlist', 'chat'), - get_string('configrefreshuserlist', 'chat'), 10, PARAM_INT)); + $options = array(); + $options['ajax'] = get_string('methodajax', 'chat'); + $options['header_js'] = get_string('methodnormal', 'chat'); + $options['sockets'] = get_string('methoddaemon', 'chat'); + $settings->add(new admin_setting_configselect('chat_method', get_string('method', 'chat'), + get_string('configmethod', 'chat'), 'ajax', $options)); -$settings->add(new admin_setting_configtext('chat_old_ping', get_string('oldping', 'chat'), - get_string('configoldping', 'chat'), 35, PARAM_INT)); + $settings->add(new admin_setting_configtext('chat_refresh_userlist', get_string('refreshuserlist', 'chat'), + get_string('configrefreshuserlist', 'chat'), 10, PARAM_INT)); + + $settings->add(new admin_setting_configtext('chat_old_ping', get_string('oldping', 'chat'), + get_string('configoldping', 'chat'), 35, PARAM_INT)); -$settings->add(new admin_setting_heading('chat_normal_heading', get_string('methodnormal', 'chat'), - get_string('explainmethodnormal', 'chat'))); + $settings->add(new admin_setting_heading('chat_normal_heading', get_string('methodnormal', 'chat'), + get_string('explainmethodnormal', 'chat'))); -$settings->add(new admin_setting_configtext('chat_refresh_room', get_string('refreshroom', 'chat'), - get_string('configrefreshroom', 'chat'), 5, PARAM_INT)); + $settings->add(new admin_setting_configtext('chat_refresh_room', get_string('refreshroom', 'chat'), + get_string('configrefreshroom', 'chat'), 5, PARAM_INT)); -$options = array(); -$options['jsupdate'] = get_string('normalkeepalive', 'chat'); -$options['jsupdated'] = get_string('normalstream', 'chat'); -$settings->add(new admin_setting_configselect('chat_normal_updatemode', get_string('updatemethod', 'chat'), - get_string('confignormalupdatemode', 'chat'), 'jsupdate', $options)); + $options = array(); + $options['jsupdate'] = get_string('normalkeepalive', 'chat'); + $options['jsupdated'] = get_string('normalstream', 'chat'); + $settings->add(new admin_setting_configselect('chat_normal_updatemode', get_string('updatemethod', 'chat'), + get_string('confignormalupdatemode', 'chat'), 'jsupdate', $options)); -$settings->add(new admin_setting_heading('chat_daemon_heading', get_string('methoddaemon', 'chat'), - get_string('explainmethoddaemon', 'chat'))); + $settings->add(new admin_setting_heading('chat_daemon_heading', get_string('methoddaemon', 'chat'), + get_string('explainmethoddaemon', 'chat'))); -$settings->add(new admin_setting_configtext('chat_serverhost', get_string('serverhost', 'chat'), - get_string('configserverhost', 'chat'), get_host_from_url($CFG->wwwroot))); + $settings->add(new admin_setting_configtext('chat_serverhost', get_string('serverhost', 'chat'), + get_string('configserverhost', 'chat'), get_host_from_url($CFG->wwwroot))); -$settings->add(new admin_setting_configtext('chat_serverip', get_string('serverip', 'chat'), - get_string('configserverip', 'chat'), '127.0.0.1')); - -$settings->add(new admin_setting_configtext('chat_serverport', get_string('serverport', 'chat'), - get_string('configserverport', 'chat'), 9111, PARAM_INT)); - -$settings->add(new admin_setting_configtext('chat_servermax', get_string('servermax', 'chat'), - get_string('configservermax', 'chat'), 100, PARAM_INT)); + $settings->add(new admin_setting_configtext('chat_serverip', get_string('serverip', 'chat'), + get_string('configserverip', 'chat'), '127.0.0.1')); + $settings->add(new admin_setting_configtext('chat_serverport', get_string('serverport', 'chat'), + get_string('configserverport', 'chat'), 9111, PARAM_INT)); + $settings->add(new admin_setting_configtext('chat_servermax', get_string('servermax', 'chat'), + get_string('configservermax', 'chat'), 100, PARAM_INT)); +} diff --git a/mod/data/settings.php b/mod/data/settings.php index cfddead073e..ce1464722c2 100644 --- a/mod/data/settings.php +++ b/mod/data/settings.php @@ -1,14 +1,16 @@ enablerssfeeds)) { - $options = array(0 => get_string('rssglobaldisabled', 'admin')); - $str = get_string('configenablerssfeeds', 'data').'
'.get_string('configenablerssfeedsdisabled2', 'admin'); +defined('MOODLE_INTERNAL') || die; -} else { - $options = array(0=>get_string('no'), 1=>get_string('yes')); - $str = get_string('configenablerssfeeds', 'data'); +if ($ADMIN->fulltree) { + if (empty($CFG->enablerssfeeds)) { + $options = array(0 => get_string('rssglobaldisabled', 'admin')); + $str = get_string('configenablerssfeeds', 'data').'
'.get_string('configenablerssfeedsdisabled2', 'admin'); + + } else { + $options = array(0=>get_string('no'), 1=>get_string('yes')); + $str = get_string('configenablerssfeeds', 'data'); + } + $settings->add(new admin_setting_configselect('data_enablerssfeeds', get_string('enablerssfeeds', 'admin'), + $str, 0, $options)); } -$settings->add(new admin_setting_configselect('data_enablerssfeeds', get_string('enablerssfeeds', 'admin'), - $str, 0, $options)); - - diff --git a/mod/feedback/settings.php b/mod/feedback/settings.php index 8559405f13e..63ab63b521d 100644 --- a/mod/feedback/settings.php +++ b/mod/feedback/settings.php @@ -1,8 +1,10 @@ -fulltree) { $options = array(0=>get_string('no'), 1=>get_string('yes')); $str = get_string('configallowfullanonymous', 'feedback'); $settings->add(new admin_setting_configselect('feedback_allowfullanonymous', get_string('allowfullanonymous', 'feedback'), $str, 0, $options)); - -?> +} \ No newline at end of file diff --git a/mod/folder/settings.php b/mod/folder/settings.php index 0d4e41dda62..46839bf0c31 100644 --- a/mod/folder/settings.php +++ b/mod/folder/settings.php @@ -23,6 +23,8 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +defined('MOODLE_INTERNAL') || die; + if ($ADMIN->fulltree) { //--- general settings ----------------------------------------------------------------------------------- $settings->add(new admin_setting_configcheckbox('folder/requiremodintro', diff --git a/mod/forum/settings.php b/mod/forum/settings.php index f85f0426f81..46febbcf55e 100644 --- a/mod/forum/settings.php +++ b/mod/forum/settings.php @@ -21,75 +21,78 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -require_once($CFG->dirroot.'/mod/forum/lib.php'); +defined('MOODLE_INTERNAL') || die; -$settings->add(new admin_setting_configselect('forum_displaymode', get_string('displaymode', 'forum'), - get_string('configdisplaymode', 'forum'), FORUM_MODE_NESTED, forum_get_layout_modes())); +if ($ADMIN->fulltree) { + require_once($CFG->dirroot.'/mod/forum/lib.php'); -$settings->add(new admin_setting_configcheckbox('forum_replytouser', get_string('replytouser', 'forum'), - get_string('configreplytouser', 'forum'), 1)); + $settings->add(new admin_setting_configselect('forum_displaymode', get_string('displaymode', 'forum'), + get_string('configdisplaymode', 'forum'), FORUM_MODE_NESTED, forum_get_layout_modes())); -// Less non-HTML characters than this is short -$settings->add(new admin_setting_configtext('forum_shortpost', get_string('shortpost', 'forum'), - get_string('configshortpost', 'forum'), 300, PARAM_INT)); + $settings->add(new admin_setting_configcheckbox('forum_replytouser', get_string('replytouser', 'forum'), + get_string('configreplytouser', 'forum'), 1)); -// More non-HTML characters than this is long -$settings->add(new admin_setting_configtext('forum_longpost', get_string('longpost', 'forum'), - get_string('configlongpost', 'forum'), 600, PARAM_INT)); + // Less non-HTML characters than this is short + $settings->add(new admin_setting_configtext('forum_shortpost', get_string('shortpost', 'forum'), + get_string('configshortpost', 'forum'), 300, PARAM_INT)); -// Number of discussions on a page -$settings->add(new admin_setting_configtext('forum_manydiscussions', get_string('manydiscussions', 'forum'), - get_string('configmanydiscussions', 'forum'), 100, PARAM_INT)); + // More non-HTML characters than this is long + $settings->add(new admin_setting_configtext('forum_longpost', get_string('longpost', 'forum'), + get_string('configlongpost', 'forum'), 600, PARAM_INT)); -if (isset($CFG->maxbytes)) { - $settings->add(new admin_setting_configselect('forum_maxbytes', get_string('maxattachmentsize', 'forum'), - get_string('configmaxbytes', 'forum'), 512000, get_max_upload_sizes($CFG->maxbytes))); + // Number of discussions on a page + $settings->add(new admin_setting_configtext('forum_manydiscussions', get_string('manydiscussions', 'forum'), + get_string('configmanydiscussions', 'forum'), 100, PARAM_INT)); + + if (isset($CFG->maxbytes)) { + $settings->add(new admin_setting_configselect('forum_maxbytes', get_string('maxattachmentsize', 'forum'), + get_string('configmaxbytes', 'forum'), 512000, get_max_upload_sizes($CFG->maxbytes))); + } + + // Default number of attachments allowed per post in all forums + $settings->add(new admin_setting_configtext('forum_maxattachments', get_string('maxattachments', 'forum'), + get_string('configmaxattachments', 'forum'), 100, PARAM_INT)); + + // Default whether user needs to mark a post as read + $settings->add(new admin_setting_configcheckbox('forum_trackreadposts', get_string('trackforum', 'forum'), + get_string('configtrackreadposts', 'forum'), 1)); + + // Default number of days that a post is considered old + $settings->add(new admin_setting_configtext('forum_oldpostdays', get_string('oldpostdays', 'forum'), + get_string('configoldpostdays', 'forum'), 14, PARAM_INT)); + + // Default whether user needs to mark a post as read + $settings->add(new admin_setting_configcheckbox('forum_usermarksread', get_string('usermarksread', 'forum'), + get_string('configusermarksread', 'forum'), 0)); + + // Default time (hour) to execute 'clean_read_records' cron + $options = array(); + for ($i=0; $i<24; $i++) { + $options[$i] = $i; + } + $settings->add(new admin_setting_configselect('forum_cleanreadtime', get_string('cleanreadtime', 'forum'), + get_string('configcleanreadtime', 'forum'), 2, $options)); + + + if (empty($CFG->enablerssfeeds)) { + $options = array(0 => get_string('rssglobaldisabled', 'admin')); + $str = get_string('configenablerssfeeds', 'forum').'
'.get_string('configenablerssfeedsdisabled2', 'admin'); + + } else { + $options = array(0=>get_string('no'), 1=>get_string('yes')); + $str = get_string('configenablerssfeeds', 'forum'); + } + $settings->add(new admin_setting_configselect('forum_enablerssfeeds', get_string('enablerssfeeds', 'admin'), + $str, 0, $options)); + + $settings->add(new admin_setting_configcheckbox('forum_enabletimedposts', get_string('timedposts', 'forum'), + get_string('configenabletimedposts', 'forum'), 0)); + + $settings->add(new admin_setting_configcheckbox('forum_logblocked', get_string('logblocked', 'forum'), + get_string('configlogblocked', 'forum'), 1)); + + //no using the central ajax setting for ratings. MDL-21657 + //$settings->add(new admin_setting_configcheckbox('forum_ajaxrating', get_string('ajaxrating', 'forum'), + // get_string('configajaxrating', 'forum'), 0)); } -// Default number of attachments allowed per post in all forums -$settings->add(new admin_setting_configtext('forum_maxattachments', get_string('maxattachments', 'forum'), - get_string('configmaxattachments', 'forum'), 100, PARAM_INT)); - -// Default whether user needs to mark a post as read -$settings->add(new admin_setting_configcheckbox('forum_trackreadposts', get_string('trackforum', 'forum'), - get_string('configtrackreadposts', 'forum'), 1)); - -// Default number of days that a post is considered old -$settings->add(new admin_setting_configtext('forum_oldpostdays', get_string('oldpostdays', 'forum'), - get_string('configoldpostdays', 'forum'), 14, PARAM_INT)); - -// Default whether user needs to mark a post as read -$settings->add(new admin_setting_configcheckbox('forum_usermarksread', get_string('usermarksread', 'forum'), - get_string('configusermarksread', 'forum'), 0)); - -// Default time (hour) to execute 'clean_read_records' cron -$options = array(); -for ($i=0; $i<24; $i++) { - $options[$i] = $i; -} -$settings->add(new admin_setting_configselect('forum_cleanreadtime', get_string('cleanreadtime', 'forum'), - get_string('configcleanreadtime', 'forum'), 2, $options)); - - -if (empty($CFG->enablerssfeeds)) { - $options = array(0 => get_string('rssglobaldisabled', 'admin')); - $str = get_string('configenablerssfeeds', 'forum').'
'.get_string('configenablerssfeedsdisabled2', 'admin'); - -} else { - $options = array(0=>get_string('no'), 1=>get_string('yes')); - $str = get_string('configenablerssfeeds', 'forum'); -} -$settings->add(new admin_setting_configselect('forum_enablerssfeeds', get_string('enablerssfeeds', 'admin'), - $str, 0, $options)); - -$settings->add(new admin_setting_configcheckbox('forum_enabletimedposts', get_string('timedposts', 'forum'), - get_string('configenabletimedposts', 'forum'), 0)); - -$settings->add(new admin_setting_configcheckbox('forum_logblocked', get_string('logblocked', 'forum'), - get_string('configlogblocked', 'forum'), 1)); - -//no using the central ajax setting for ratings. MDL-21657 -//$settings->add(new admin_setting_configcheckbox('forum_ajaxrating', get_string('ajaxrating', 'forum'), -// get_string('configajaxrating', 'forum'), 0)); - - diff --git a/mod/glossary/settings.php b/mod/glossary/settings.php index ae01cd37edc..cc3216dc414 100644 --- a/mod/glossary/settings.php +++ b/mod/glossary/settings.php @@ -1,82 +1,85 @@ dirroot.'/mod/glossary/lib.php'); +defined('MOODLE_INTERNAL') || die; -$settings->add(new admin_setting_heading('glossary_normal_header', get_string('glossaryleveldefaultsettings', 'glossary'), '')); +if ($ADMIN->fulltree) { + require_once($CFG->dirroot.'/mod/glossary/lib.php'); -$settings->add(new admin_setting_configtext('glossary_entbypage', get_string('entbypage', 'glossary'), - get_string('entbypage', 'glossary'), 10, PARAM_INT)); + $settings->add(new admin_setting_heading('glossary_normal_header', get_string('glossaryleveldefaultsettings', 'glossary'), '')); + + $settings->add(new admin_setting_configtext('glossary_entbypage', get_string('entbypage', 'glossary'), + get_string('entbypage', 'glossary'), 10, PARAM_INT)); -$settings->add(new admin_setting_configcheckbox('glossary_dupentries', get_string('allowduplicatedentries', 'glossary'), - get_string('cnfallowdupentries', 'glossary'), 0)); + $settings->add(new admin_setting_configcheckbox('glossary_dupentries', get_string('allowduplicatedentries', 'glossary'), + get_string('cnfallowdupentries', 'glossary'), 0)); -$settings->add(new admin_setting_configcheckbox('glossary_allowcomments', get_string('allowcomments', 'glossary'), - get_string('cnfallowcomments', 'glossary'), 0)); + $settings->add(new admin_setting_configcheckbox('glossary_allowcomments', get_string('allowcomments', 'glossary'), + get_string('cnfallowcomments', 'glossary'), 0)); -$settings->add(new admin_setting_configcheckbox('glossary_linkbydefault', get_string('usedynalink', 'glossary'), - get_string('cnflinkglossaries', 'glossary'), 1)); + $settings->add(new admin_setting_configcheckbox('glossary_linkbydefault', get_string('usedynalink', 'glossary'), + get_string('cnflinkglossaries', 'glossary'), 1)); -$settings->add(new admin_setting_configcheckbox('glossary_defaultapproval', get_string('defaultapproval', 'glossary'), - get_string('cnfapprovalstatus', 'glossary'), 1)); + $settings->add(new admin_setting_configcheckbox('glossary_defaultapproval', get_string('defaultapproval', 'glossary'), + get_string('cnfapprovalstatus', 'glossary'), 1)); -if (empty($CFG->enablerssfeeds)) { - $options = array(0 => get_string('rssglobaldisabled', 'admin')); - $str = get_string('configenablerssfeeds', 'glossary').'
'.get_string('configenablerssfeedsdisabled2', 'admin'); + if (empty($CFG->enablerssfeeds)) { + $options = array(0 => get_string('rssglobaldisabled', 'admin')); + $str = get_string('configenablerssfeeds', 'glossary').'
'.get_string('configenablerssfeedsdisabled2', 'admin'); -} else { - $options = array(0=>get_string('no'), 1=>get_string('yes')); - $str = get_string('configenablerssfeeds', 'glossary'); -} -$settings->add(new admin_setting_configselect('glossary_enablerssfeeds', get_string('enablerssfeeds', 'admin'), - $str, 0, $options)); - - -$settings->add(new admin_setting_heading('glossary_levdev_header', get_string('entryleveldefaultsettings', 'glossary'), '')); - -$settings->add(new admin_setting_configcheckbox('glossary_linkentries', get_string('usedynalink', 'glossary'), - get_string('cnflinkentry', 'glossary'), 0)); - -$settings->add(new admin_setting_configcheckbox('glossary_casesensitive', get_string('casesensitive', 'glossary'), - get_string('cnfcasesensitive', 'glossary'), 0)); - -$settings->add(new admin_setting_configcheckbox('glossary_fullmatch', get_string('fullmatch', 'glossary'), - get_string('cnffullmatch', 'glossary'), 0)); - - -//Update and get available formats -$recformats = glossary_get_available_formats(); -$formats = array(); -//Take names -foreach ($recformats as $format) { - $formats[$format->id] = get_string("displayformat$format->name", "glossary"); -} -asort($formats); - -$str = ''; -$pixpath = "$CFG->wwwroot/pix"; // ugly temporary hack until we get this rewritten to new setting -// TODO MDL-19674 We cannot refer to $CFG->pixpath here. This code is executed -// when the structure of the admin tree is being build. $CFG->pixpath is only -// set up once output has started. -foreach ($formats as $formatid=>$formatname) { - $recformat = $DB->get_record('glossary_formats', array('id'=>$formatid)); - $str .= ''; - $str .= ''; - $eicon = "wwwroot/mod/glossary/formats.php?id=$formatid&mode=edit\">\"".get_string("edit")."\""; - if ( $recformat->visible ) { - $vtitle = get_string("hide"); - $vicon = "hide.gif"; } else { - $vtitle = get_string("show"); - $vicon = "show.gif"; + $options = array(0=>get_string('no'), 1=>get_string('yes')); + $str = get_string('configenablerssfeeds', 'glossary'); } - $vicon = "wwwroot/mod/glossary/formats.php?id=$formatid&mode=visible&sesskey=".sesskey()."\">\"$vtitle\""; + $settings->add(new admin_setting_configselect('glossary_enablerssfeeds', get_string('enablerssfeeds', 'admin'), + $str, 0, $options)); - $str .= ''; - $str .= ''; + + $settings->add(new admin_setting_heading('glossary_levdev_header', get_string('entryleveldefaultsettings', 'glossary'), '')); + + $settings->add(new admin_setting_configcheckbox('glossary_linkentries', get_string('usedynalink', 'glossary'), + get_string('cnflinkentry', 'glossary'), 0)); + + $settings->add(new admin_setting_configcheckbox('glossary_casesensitive', get_string('casesensitive', 'glossary'), + get_string('cnfcasesensitive', 'glossary'), 0)); + + $settings->add(new admin_setting_configcheckbox('glossary_fullmatch', get_string('fullmatch', 'glossary'), + get_string('cnffullmatch', 'glossary'), 0)); + + + //Update and get available formats + $recformats = glossary_get_available_formats(); + $formats = array(); + //Take names + foreach ($recformats as $format) { + $formats[$format->id] = get_string("displayformat$format->name", "glossary"); + } + asort($formats); + + $str = '
' . $formatname . ''.$eicon.'  '.$vicon.'
'; + $pixpath = "$CFG->wwwroot/pix"; // ugly temporary hack until we get this rewritten to new setting + // TODO MDL-19674 We cannot refer to $CFG->pixpath here. This code is executed + // when the structure of the admin tree is being build. $CFG->pixpath is only + // set up once output has started. + foreach ($formats as $formatid=>$formatname) { + $recformat = $DB->get_record('glossary_formats', array('id'=>$formatid)); + $str .= ''; + $str .= ''; + $eicon = "wwwroot/mod/glossary/formats.php?id=$formatid&mode=edit\">\"".get_string("edit")."\""; + if ( $recformat->visible ) { + $vtitle = get_string("hide"); + $vicon = "hide.gif"; + } else { + $vtitle = get_string("show"); + $vicon = "show.gif"; + } + $vicon = "wwwroot/mod/glossary/formats.php?id=$formatid&mode=visible&sesskey=".sesskey()."\">\"$vtitle\""; + + $str .= ''; + $str .= ''; + } + $str .= '
' . $formatname . ''.$eicon.'  '.$vicon.'
'; + + $settings->add(new admin_setting_heading('glossary_formats_header', get_string('displayformatssetup', 'glossary'), $str)); } -$str .= ''; - -$settings->add(new admin_setting_heading('glossary_formats_header', get_string('displayformatssetup', 'glossary'), $str)); - diff --git a/mod/hotpot/settings.php b/mod/hotpot/settings.php index 0d565ed2f81..85fde9d2274 100644 --- a/mod/hotpot/settings.php +++ b/mod/hotpot/settings.php @@ -1,9 +1,11 @@ add(new admin_setting_configcheckbox('hotpot_showtimes', get_string('showtimes', 'hotpot'), - get_string('configshowtimes', 'hotpot'), 0) ); - -$settings->add(new admin_setting_configtext('hotpot_excelencodings', get_string('excelencodings', 'hotpot'), - get_string('configexcelencodings', 'hotpot'), '') ); +defined('MOODLE_INTERNAL') || die; +if ($ADMIN->fulltree) { + $settings->add(new admin_setting_configcheckbox('hotpot_showtimes', get_string('showtimes', 'hotpot'), + get_string('configshowtimes', 'hotpot'), 0) ); + $settings->add(new admin_setting_configtext('hotpot_excelencodings', get_string('excelencodings', 'hotpot'), + get_string('configexcelencodings', 'hotpot'), '') ); +} diff --git a/mod/imscp/settings.php b/mod/imscp/settings.php index d28b52be8b7..7c14389ac1b 100644 --- a/mod/imscp/settings.php +++ b/mod/imscp/settings.php @@ -23,6 +23,8 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +defined('MOODLE_INTERNAL') || die; + if ($ADMIN->fulltree) { //--- general settings ----------------------------------------------------------------------------------- diff --git a/mod/lesson/settings.php b/mod/lesson/settings.php index 04243d1ba78..01e1076c0dc 100644 --- a/mod/lesson/settings.php +++ b/mod/lesson/settings.php @@ -23,43 +23,47 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or late **/ -require_once($CFG->dirroot.'/mod/lesson/locallib.php'); +defined('MOODLE_INTERNAL') || die; -/** Slideshow settings */ -$settings->add(new admin_setting_configtext('lesson_slideshowwidth', get_string('slideshowwidth', 'lesson'), - get_string('configslideshowwidth', 'lesson'), 640, PARAM_INT)); +if ($ADMIN->fulltree) { + require_once($CFG->dirroot.'/mod/lesson/locallib.php'); -$settings->add(new admin_setting_configtext('lesson_slideshowheight', get_string('slideshowheight', 'lesson'), - get_string('configslideshowheight', 'lesson'), 480, PARAM_INT)); + /** Slideshow settings */ + $settings->add(new admin_setting_configtext('lesson_slideshowwidth', get_string('slideshowwidth', 'lesson'), + get_string('configslideshowwidth', 'lesson'), 640, PARAM_INT)); -$settings->add(new admin_setting_configtext('lesson_slideshowbgcolor', get_string('slideshowbgcolor', 'lesson'), - get_string('configslideshowbgcolor', 'lesson'), '#FFFFFF', PARAM_TEXT)); + $settings->add(new admin_setting_configtext('lesson_slideshowheight', get_string('slideshowheight', 'lesson'), + get_string('configslideshowheight', 'lesson'), 480, PARAM_INT)); -/** Media file popup settings */ -$settings->add(new admin_setting_configtext('lesson_mediawidth', get_string('mediawidth', 'lesson'), - get_string('configmediawidth', 'lesson'), 640, PARAM_INT)); + $settings->add(new admin_setting_configtext('lesson_slideshowbgcolor', get_string('slideshowbgcolor', 'lesson'), + get_string('configslideshowbgcolor', 'lesson'), '#FFFFFF', PARAM_TEXT)); -$settings->add(new admin_setting_configtext('lesson_mediaheight', get_string('mediaheight', 'lesson'), - get_string('configmediaheight', 'lesson'), 480, PARAM_INT)); + /** Media file popup settings */ + $settings->add(new admin_setting_configtext('lesson_mediawidth', get_string('mediawidth', 'lesson'), + get_string('configmediawidth', 'lesson'), 640, PARAM_INT)); -$settings->add(new admin_setting_configcheckbox('lesson_mediaclose', get_string('mediaclose', 'lesson'), - get_string('configmediaclose', 'lesson'), false, PARAM_TEXT)); + $settings->add(new admin_setting_configtext('lesson_mediaheight', get_string('mediaheight', 'lesson'), + get_string('configmediaheight', 'lesson'), 480, PARAM_INT)); -/** Misc lesson settings */ -$settings->add(new admin_setting_configtext('lesson_maxhighscores', get_string('maxhighscores', 'lesson'), - get_string('configmaxhighscores','lesson'), 10, PARAM_INT)); + $settings->add(new admin_setting_configcheckbox('lesson_mediaclose', get_string('mediaclose', 'lesson'), + get_string('configmediaclose', 'lesson'), false, PARAM_TEXT)); -/** Default lesson settings */ -$numbers = array(); -for ($i=20; $i>1; $i--) { - $numbers[$i] = $i; -} -$settings->add(new admin_setting_configselect('lesson_maxanswers', get_string('maximumnumberofanswersbranches','lesson'), - get_string('configmaxanswers', 'lesson'), 4, $numbers)); + /** Misc lesson settings */ + $settings->add(new admin_setting_configtext('lesson_maxhighscores', get_string('maxhighscores', 'lesson'), + get_string('configmaxhighscores','lesson'), 10, PARAM_INT)); -$defaultnextpages = array(); -$defaultnextpages[0] = get_string("normal", "lesson"); -$defaultnextpages[LESSON_UNSEENPAGE] = get_string("showanunseenpage", "lesson"); -$defaultnextpages[LESSON_UNANSWEREDPAGE] = get_string("showanunansweredpage", "lesson"); -$settings->add(new admin_setting_configselect('lesson_defaultnextpage', get_string('actionaftercorrectanswer','lesson'), - get_string('configactionaftercorrectanswer', 'lesson'), 0, $defaultnextpages)); + /** Default lesson settings */ + $numbers = array(); + for ($i=20; $i>1; $i--) { + $numbers[$i] = $i; + } + $settings->add(new admin_setting_configselect('lesson_maxanswers', get_string('maximumnumberofanswersbranches','lesson'), + get_string('configmaxanswers', 'lesson'), 4, $numbers)); + + $defaultnextpages = array(); + $defaultnextpages[0] = get_string("normal", "lesson"); + $defaultnextpages[LESSON_UNSEENPAGE] = get_string("showanunseenpage", "lesson"); + $defaultnextpages[LESSON_UNANSWEREDPAGE] = get_string("showanunansweredpage", "lesson"); + $settings->add(new admin_setting_configselect('lesson_defaultnextpage', get_string('actionaftercorrectanswer','lesson'), + get_string('configactionaftercorrectanswer', 'lesson'), 0, $defaultnextpages)); +} \ No newline at end of file diff --git a/mod/page/settings.php b/mod/page/settings.php index da93ceee895..f3ee893cb00 100644 --- a/mod/page/settings.php +++ b/mod/page/settings.php @@ -23,6 +23,8 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +defined('MOODLE_INTERNAL') || die; + if ($ADMIN->fulltree) { require_once("$CFG->libdir/resourcelib.php"); diff --git a/mod/quiz/settingstree.php b/mod/quiz/settings.php similarity index 98% rename from mod/quiz/settingstree.php rename to mod/quiz/settings.php index 5091776c6ae..5866e92b026 100644 --- a/mod/quiz/settingstree.php +++ b/mod/quiz/settings.php @@ -7,6 +7,8 @@ * @package quiz */ +defined('MOODLE_INTERNAL') || die; + require_once($CFG->dirroot . '/mod/quiz/lib.php'); require_once($CFG->dirroot . '/mod/quiz/settingslib.php'); @@ -165,6 +167,7 @@ if (empty($reportsbyname)) { /// Add the report pages for the settings.php files in sub directories of mod/quiz/report foreach ($reportsbyname as $strreportname => $report) { $reportname = $report; + $settings = new admin_settingpage('modsettingsquizcat'.$reportname, $strreportname, 'moodle/site:config', !$module->visible); if ($ADMIN->fulltree) { include($CFG->dirroot."/mod/quiz/report/$reportname/settings.php"); @@ -172,3 +175,5 @@ if (empty($reportsbyname)) { $ADMIN->add('modsettingsquizcat', $settings); } } + +$settings = NULL; // we do not want standard settings link diff --git a/mod/resource/settings.php b/mod/resource/settings.php index 7f3189404f7..86237e26c65 100644 --- a/mod/resource/settings.php +++ b/mod/resource/settings.php @@ -23,6 +23,8 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +defined('MOODLE_INTERNAL') || die; + if ($ADMIN->fulltree) { require_once("$CFG->libdir/resourcelib.php"); diff --git a/mod/scorm/settings.php b/mod/scorm/settings.php index fad41def1fa..558f6213850 100644 --- a/mod/scorm/settings.php +++ b/mod/scorm/settings.php @@ -1,61 +1,65 @@ dirroot . '/mod/scorm/locallib.php'); -$yesno = array(0 => get_string('no'), - 1 => get_string('yes')); -$settings->add(new admin_setting_configselect('scorm/grademethod', get_string('grademethod', 'scorm'),get_string('grademethoddesc', 'scorm'), GRADEHIGHEST, scorm_get_grade_method_array())); +defined('MOODLE_INTERNAL') || die; + +if ($ADMIN->fulltree) { + require_once($CFG->dirroot . '/mod/scorm/locallib.php'); + $yesno = array(0 => get_string('no'), + 1 => get_string('yes')); + + $settings->add(new admin_setting_configselect('scorm/grademethod', get_string('grademethod', 'scorm'),get_string('grademethoddesc', 'scorm'), GRADEHIGHEST, scorm_get_grade_method_array())); + + for ($i=0; $i<=100; $i++) { + $grades[$i] = "$i"; + } + $settings->add(new admin_setting_configselect('scorm/maxgrade', get_string('maximumgrade'),get_string('maximumgradedesc','scorm'), 100, $grades)); + + $settings->add(new admin_setting_configtext('scorm/maxattempts', get_string('maximumattempts', 'scorm'), '', 0, PARAM_INT)); + + $settings->add(new admin_setting_configselect('scorm/displayattemptstatus', get_string('displayattemptstatus', 'scorm'),get_string('displayattemptstatusdesc', 'scorm'),0,$yesno)); + + $settings->add(new admin_setting_configselect('scorm/displaycoursestructure', get_string('displaycoursestructure', 'scorm'),get_string('displaycoursestructuredesc', 'scorm'),0,$yesno)); + + $settings->add(new admin_setting_configselect('scorm/forcecompleted', get_string('forcecompleted', 'scorm'),get_string('forcecompleteddesc', 'scorm'),0,$yesno)); + + $settings->add(new admin_setting_configselect('scorm/forcenewattempt', get_string('forcenewattempt', 'scorm'),get_string('forcenewattemptdesc', 'scorm'),0,$yesno)); + + $settings->add(new admin_setting_configselect('scorm/lastattemptlock', get_string('lastattemptlock', 'scorm'),get_string('lastattemptlockdesc', 'scorm'),0,$yesno)); + + $settings->add(new admin_setting_configselect('scorm/whatgrade', get_string('whatgrade', 'scorm'), get_string('whatgradedesc', 'scorm'), HIGHESTATTEMPT, scorm_get_what_grade_array())); + + $settings->add(new admin_setting_configtext('scorm/framewidth', get_string('width', 'scorm'), get_string('framewidth', 'scorm'), 100)); + + $settings->add(new admin_setting_configtext('scorm/frameheight', get_string('height', 'scorm'), get_string('frameheight', 'scorm'), 500)); + + $settings->add(new admin_setting_configselect('scorm/popup', get_string('display','scorm'), get_string('displaydesc','scorm'), 0, scorm_get_popup_display_array())); + + foreach(scorm_get_popup_options_array() as $key => $value){ + $settings->add(new admin_setting_configcheckbox('scorm/'.$key, get_string($key, 'scorm'),'',$value)); + } + + $settings->add(new admin_setting_configselect('scorm/skipview', get_string('skipview', 'scorm'), get_string('skipviewdesc', 'scorm'), 0, scorm_get_skip_view_array())); + + $settings->add(new admin_setting_configselect('scorm/hidebrowse', get_string('hidebrowse', 'scorm'), get_string('hidebrowsedesc', 'scorm'), 0, $yesno)); + + $settings->add(new admin_setting_configselect('scorm/hidetoc', get_string('hidetoc', 'scorm'), get_string('hidetocdesc', 'scorm'), 0, scorm_get_hidetoc_array())); + + $settings->add(new admin_setting_configselect('scorm/hidenav', get_string('hidenav', 'scorm'), get_string('hidenavdesc', 'scorm'), 0, $yesno)); + + $settings->add(new admin_setting_configselect('scorm/auto', get_string('autocontinue', 'scorm'), get_string('autocontinuedesc', 'scorm'), 0, $yesno)); + + $settings->add(new admin_setting_configselect('scorm/updatefreq', get_string('updatefreq', 'scorm'), get_string('updatefreqdesc', 'scorm'), 0, scorm_get_updatefreq_array())); + + $settings->add(new admin_setting_configtext('scorm/updatetime', get_string('updatetime', 'scorm'), '', 2, PARAM_INT)); + + $settings->add(new admin_setting_configcheckbox('scorm/allowtypeexternal', get_string('allowtypeexternal', 'scorm'), '', 0)); + + $settings->add(new admin_setting_configcheckbox('scorm/allowtypelocalsync', get_string('allowtypelocalsync', 'scorm'), '', 0)); + + $settings->add(new admin_setting_configcheckbox('scorm/allowtypeimsrepository', get_string('allowtypeimsrepository', 'scorm'), '', 0)); + + $settings->add(new admin_setting_configcheckbox('scorm/allowapidebug', get_string('allowapidebug', 'scorm'), '', 0)); + + $settings->add(new admin_setting_configtext('scorm/apidebugmask', get_string('apidebugmask', 'scorm'), '', '/.*/')); -for ($i=0; $i<=100; $i++) { - $grades[$i] = "$i"; } -$settings->add(new admin_setting_configselect('scorm/maxgrade', get_string('maximumgrade'),get_string('maximumgradedesc','scorm'), 100, $grades)); - -$settings->add(new admin_setting_configtext('scorm/maxattempts', get_string('maximumattempts', 'scorm'), '', 0, PARAM_INT)); - -$settings->add(new admin_setting_configselect('scorm/displayattemptstatus', get_string('displayattemptstatus', 'scorm'),get_string('displayattemptstatusdesc', 'scorm'),0,$yesno)); - -$settings->add(new admin_setting_configselect('scorm/displaycoursestructure', get_string('displaycoursestructure', 'scorm'),get_string('displaycoursestructuredesc', 'scorm'),0,$yesno)); - -$settings->add(new admin_setting_configselect('scorm/forcecompleted', get_string('forcecompleted', 'scorm'),get_string('forcecompleteddesc', 'scorm'),0,$yesno)); - -$settings->add(new admin_setting_configselect('scorm/forcenewattempt', get_string('forcenewattempt', 'scorm'),get_string('forcenewattemptdesc', 'scorm'),0,$yesno)); - -$settings->add(new admin_setting_configselect('scorm/lastattemptlock', get_string('lastattemptlock', 'scorm'),get_string('lastattemptlockdesc', 'scorm'),0,$yesno)); - -$settings->add(new admin_setting_configselect('scorm/whatgrade', get_string('whatgrade', 'scorm'), get_string('whatgradedesc', 'scorm'), HIGHESTATTEMPT, scorm_get_what_grade_array())); - -$settings->add(new admin_setting_configtext('scorm/framewidth', get_string('width', 'scorm'), get_string('framewidth', 'scorm'), 100)); - -$settings->add(new admin_setting_configtext('scorm/frameheight', get_string('height', 'scorm'), get_string('frameheight', 'scorm'), 500)); - -$settings->add(new admin_setting_configselect('scorm/popup', get_string('display','scorm'), get_string('displaydesc','scorm'), 0, scorm_get_popup_display_array())); - -foreach(scorm_get_popup_options_array() as $key => $value){ - $settings->add(new admin_setting_configcheckbox('scorm/'.$key, get_string($key, 'scorm'),'',$value)); -} - -$settings->add(new admin_setting_configselect('scorm/skipview', get_string('skipview', 'scorm'), get_string('skipviewdesc', 'scorm'), 0, scorm_get_skip_view_array())); - -$settings->add(new admin_setting_configselect('scorm/hidebrowse', get_string('hidebrowse', 'scorm'), get_string('hidebrowsedesc', 'scorm'), 0, $yesno)); - -$settings->add(new admin_setting_configselect('scorm/hidetoc', get_string('hidetoc', 'scorm'), get_string('hidetocdesc', 'scorm'), 0, scorm_get_hidetoc_array())); - -$settings->add(new admin_setting_configselect('scorm/hidenav', get_string('hidenav', 'scorm'), get_string('hidenavdesc', 'scorm'), 0, $yesno)); - -$settings->add(new admin_setting_configselect('scorm/auto', get_string('autocontinue', 'scorm'), get_string('autocontinuedesc', 'scorm'), 0, $yesno)); - -$settings->add(new admin_setting_configselect('scorm/updatefreq', get_string('updatefreq', 'scorm'), get_string('updatefreqdesc', 'scorm'), 0, scorm_get_updatefreq_array())); - -$settings->add(new admin_setting_configtext('scorm/updatetime', get_string('updatetime', 'scorm'), '', 2, PARAM_INT)); - -$settings->add(new admin_setting_configcheckbox('scorm/allowtypeexternal', get_string('allowtypeexternal', 'scorm'), '', 0)); - -$settings->add(new admin_setting_configcheckbox('scorm/allowtypelocalsync', get_string('allowtypelocalsync', 'scorm'), '', 0)); - -$settings->add(new admin_setting_configcheckbox('scorm/allowtypeimsrepository', get_string('allowtypeimsrepository', 'scorm'), '', 0)); - -$settings->add(new admin_setting_configcheckbox('scorm/allowapidebug', get_string('allowapidebug', 'scorm'), '', 0)); - -$settings->add(new admin_setting_configtext('scorm/apidebugmask', get_string('apidebugmask', 'scorm'), '', '/.*/')); - - diff --git a/mod/upgrade.txt b/mod/upgrade.txt index 4f5609ec05a..3d42ab59d43 100644 --- a/mod/upgrade.txt +++ b/mod/upgrade.txt @@ -38,6 +38,7 @@ required changes in code: * replace helps with new 'xxx_hlp' strings optional - no changes needed in older code: +* settingstree.php replaced by settings.php - just unset the $settings if you want to make custom part of settings admin tree * support for new mforms editor element and embedded files (not finished yet) * portfolio support diff --git a/mod/url/settings.php b/mod/url/settings.php index 862c429081c..4833b9b34cf 100644 --- a/mod/url/settings.php +++ b/mod/url/settings.php @@ -23,6 +23,8 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +defined('MOODLE_INTERNAL') || die; + if ($ADMIN->fulltree) { require_once("$CFG->libdir/resourcelib.php"); diff --git a/mod/workshop/settings.php b/mod/workshop/settings.php index e06febe5a68..a2900fcf46b 100644 --- a/mod/workshop/settings.php +++ b/mod/workshop/settings.php @@ -27,63 +27,66 @@ defined('MOODLE_INTERNAL') || die(); -require_once($CFG->dirroot.'/mod/workshop/locallib.php'); +if ($ADMIN->fulltree) { + require_once($CFG->dirroot.'/mod/workshop/locallib.php'); //TODO: do not include this here, we do not want ws code in each page!! -$grades = workshop::available_maxgrades_list(); + $grades = workshop::available_maxgrades_list(); -$settings->add(new admin_setting_configselect('workshop/grade', get_string('submissiongrade', 'workshop'), - get_string('configgrade', 'workshop'), 80, $grades)); + $settings->add(new admin_setting_configselect('workshop/grade', get_string('submissiongrade', 'workshop'), + get_string('configgrade', 'workshop'), 80, $grades)); -$settings->add(new admin_setting_configselect('workshop/gradinggrade', get_string('gradinggrade', 'workshop'), - get_string('configgradinggrade', 'workshop'), 20, $grades)); + $settings->add(new admin_setting_configselect('workshop/gradinggrade', get_string('gradinggrade', 'workshop'), + get_string('configgradinggrade', 'workshop'), 20, $grades)); -$options = array(); -for ($i = 5; $i >= 0; $i--) { - $options[$i] = $i; -} -$settings->add(new admin_setting_configselect('workshop/gradedecimals', get_string('gradedecimals', 'workshop'), - get_string('configgradedecimals', 'workshop'), 0, $options)); - -if (isset($CFG->maxbytes)) { - $options = get_max_upload_sizes($CFG->maxbytes); - $options[0] = get_string('courseuploadlimit'); - $settings->add(new admin_setting_configselect('workshop/maxbytes', get_string('maxbytes', 'workshop'), - get_string('configmaxbytes', 'workshop'), 0, $options)); -} - -$settings->add(new admin_setting_configselect('workshop/strategy', get_string('strategy', 'workshop'), - get_string('configstrategy', 'workshop'), 'accumulative', workshop::available_strategies_list())); - -$options = workshop::available_example_modes_list(); -$settings->add(new admin_setting_configselect('workshop/examplesmode', get_string('examplesmode', 'workshop'), - get_string('configexamplesmode', 'workshop'), workshop::EXAMPLES_VOLUNTARY, $options)); - -// include the settings of allocation subplugins -$allocators = get_plugin_list('workshopallocation'); -foreach ($allocators as $allocator => $path) { - if (file_exists($settingsfile = $path . '/settings.php')) { - $settings->add(new admin_setting_heading('workshopallocationsetting'.$allocator, - get_string('allocation', 'workshop') . ' - ' . get_string('pluginname', 'workshopallocation_' . $allocator), '')); - include($settingsfile); + $options = array(); + for ($i = 5; $i >= 0; $i--) { + $options[$i] = $i; } -} + $settings->add(new admin_setting_configselect('workshop/gradedecimals', get_string('gradedecimals', 'workshop'), + get_string('configgradedecimals', 'workshop'), 0, $options)); -// include the settings of grading strategy subplugins -$strategies = get_plugin_list('workshopform'); -foreach ($strategies as $strategy => $path) { - if (file_exists($settingsfile = $path . '/settings.php')) { - $settings->add(new admin_setting_heading('workshopformsetting'.$strategy, - get_string('strategy', 'workshop') . ' - ' . get_string('pluginname', 'workshopform_' . $strategy), '')); - include($settingsfile); + if (isset($CFG->maxbytes)) { + $options = get_max_upload_sizes($CFG->maxbytes); + $options[0] = get_string('courseuploadlimit'); + $settings->add(new admin_setting_configselect('workshop/maxbytes', get_string('maxbytes', 'workshop'), + get_string('configmaxbytes', 'workshop'), 0, $options)); } -} -// include the settings of grading evaluation subplugins -$evaluations = get_plugin_list('workshopeval'); -foreach ($evaluations as $evaluation => $path) { - if (file_exists($settingsfile = $path . '/settings.php')) { - $settings->add(new admin_setting_heading('workshopevalsetting'.$evaluation, - get_string('evaluation', 'workshop') . ' - ' . get_string('pluginname', 'workshopeval_' . $evaluation), '')); - include($settingsfile); + $settings->add(new admin_setting_configselect('workshop/strategy', get_string('strategy', 'workshop'), + get_string('configstrategy', 'workshop'), 'accumulative', workshop::available_strategies_list())); + + $options = workshop::available_example_modes_list(); + $settings->add(new admin_setting_configselect('workshop/examplesmode', get_string('examplesmode', 'workshop'), + get_string('configexamplesmode', 'workshop'), workshop::EXAMPLES_VOLUNTARY, $options)); + + // include the settings of allocation subplugins + $allocators = get_plugin_list('workshopallocation'); + foreach ($allocators as $allocator => $path) { + if (file_exists($settingsfile = $path . '/settings.php')) { + $settings->add(new admin_setting_heading('workshopallocationsetting'.$allocator, + get_string('allocation', 'workshop') . ' - ' . get_string('pluginname', 'workshopallocation_' . $allocator), '')); + include($settingsfile); + } } + + // include the settings of grading strategy subplugins + $strategies = get_plugin_list('workshopform'); + foreach ($strategies as $strategy => $path) { + if (file_exists($settingsfile = $path . '/settings.php')) { + $settings->add(new admin_setting_heading('workshopformsetting'.$strategy, + get_string('strategy', 'workshop') . ' - ' . get_string('pluginname', 'workshopform_' . $strategy), '')); + include($settingsfile); + } + } + + // include the settings of grading evaluation subplugins + $evaluations = get_plugin_list('workshopeval'); + foreach ($evaluations as $evaluation => $path) { + if (file_exists($settingsfile = $path . '/settings.php')) { + $settings->add(new admin_setting_heading('workshopevalsetting'.$evaluation, + get_string('evaluation', 'workshop') . ' - ' . get_string('pluginname', 'workshopeval_' . $evaluation), '')); + include($settingsfile); + } + } + } diff --git a/theme/arialist/settings.php b/theme/arialist/settings.php index e310fccdc44..68dc22256bb 100644 --- a/theme/arialist/settings.php +++ b/theme/arialist/settings.php @@ -4,47 +4,45 @@ * Settings for the arialist theme */ -// Create our admin page -$temp = new admin_settingpage('theme_arialist', get_string('configtitle','theme_arialist')); +defined('MOODLE_INTERNAL') || die; -// Logo file setting -$name = 'theme_arialist/logo'; -$title = get_string('logo','theme_arialist'); -$description = get_string('logodesc', 'theme_arialist'); -$setting = new admin_setting_configtext($name, $title, $description, '', PARAM_URL); -$temp->add($setting); +if ($ADMIN->fulltree) { + // Logo file setting + $name = 'theme_arialist/logo'; + $title = get_string('logo','theme_arialist'); + $description = get_string('logodesc', 'theme_arialist'); + $setting = new admin_setting_configtext($name, $title, $description, '', PARAM_URL); + $settings->add($setting); -// Tagline setting -$name = 'theme_arialist/tagline'; -$title = get_string('tagline','theme_arialist'); -$description = get_string('taglinedesc', 'theme_arialist'); -$setting = new admin_setting_configtext($name, $title, $description, ''); -$temp->add($setting); + // Tagline setting + $name = 'theme_arialist/tagline'; + $title = get_string('tagline','theme_arialist'); + $description = get_string('taglinedesc', 'theme_arialist'); + $setting = new admin_setting_configtext($name, $title, $description, ''); + $settings->add($setting); -// Link colour setting -$name = 'theme_arialist/linkcolor'; -$title = get_string('linkcolor','theme_arialist'); -$description = get_string('linkcolordesc', 'theme_arialist'); -$default = '#f25f0f'; -$previewconfig = array('selector'=>'.block .content', 'style'=>'linkcolor'); -$setting = new admin_setting_configcolourpicker($name, $title, $description, $default, $previewconfig); -$temp->add($setting); + // Link colour setting + $name = 'theme_arialist/linkcolor'; + $title = get_string('linkcolor','theme_arialist'); + $description = get_string('linkcolordesc', 'theme_arialist'); + $default = '#f25f0f'; + $previewconfig = array('selector'=>'.block .content', 'style'=>'linkcolor'); + $setting = new admin_setting_configcolourpicker($name, $title, $description, $default, $previewconfig); + $settings->add($setting); -// Block region width -$name = 'theme_arialist/regionwidth'; -$title = get_string('regionwidth','theme_arialist'); -$description = get_string('regionwidthdesc', 'theme_arialist'); -$default = 250; -$choices = array(180=>'180px', 190=>'190px', 200=>'200px', 210=>'210px', 220=>'220px', 240=>'240px', 250=>'250px'); -$setting = new admin_setting_configselect($name, $title, $description, $default, $choices); -$temp->add($setting); + // Block region width + $name = 'theme_arialist/regionwidth'; + $title = get_string('regionwidth','theme_arialist'); + $description = get_string('regionwidthdesc', 'theme_arialist'); + $default = 250; + $choices = array(180=>'180px', 190=>'190px', 200=>'200px', 210=>'210px', 220=>'220px', 240=>'240px', 250=>'250px'); + $setting = new admin_setting_configselect($name, $title, $description, $default, $choices); + $settings->add($setting); -// Custom CSS file -$name = 'theme_arialist/customcss'; -$title = get_string('customcss','theme_arialist'); -$description = get_string('customcssdesc', 'theme_arialist'); -$setting = new admin_setting_configtextarea($name, $title, $description, ''); -$temp->add($setting); - -// Add our page to the structure of the admin tree -$ADMIN->add('themes', $temp); \ No newline at end of file + // Custom CSS file + $name = 'theme_arialist/customcss'; + $title = get_string('customcss','theme_arialist'); + $description = get_string('customcssdesc', 'theme_arialist'); + $setting = new admin_setting_configtextarea($name, $title, $description, ''); + $settings->add($setting); +} \ No newline at end of file diff --git a/theme/formal_white/settings.php b/theme/formal_white/settings.php index 3e4f3fd525a..c159e042273 100644 --- a/theme/formal_white/settings.php +++ b/theme/formal_white/settings.php @@ -1,50 +1,49 @@ '.block .content', 'style'=>'backgroundColor'); -$setting = new admin_setting_configcolourpicker($name, $title, $description, $default, $previewconfig); -$temp->add($setting); +if ($ADMIN->fulltree) { -// Logo file setting -$name = 'theme_formal_white/logo'; -$title = get_string('logo','theme_formal_white'); -$description = get_string('logodesc', 'theme_formal_white'); -$setting = new admin_setting_configtext($name, $title, $description, '', PARAM_URL); -$temp->add($setting); + // Background colour setting + $name = 'theme_formal_white/backgroundcolor'; + $title = get_string('backgroundcolor','theme_formal_white'); + $description = get_string('backgroundcolordesc', 'theme_formal_white'); + $default = '#F7F6F1'; + $previewconfig = array('selector'=>'.block .content', 'style'=>'backgroundColor'); + $setting = new admin_setting_configcolourpicker($name, $title, $description, $default, $previewconfig); + $settings->add($setting); -// Block region width -$name = 'theme_formal_white/regionwidth'; -$title = get_string('regionwidth','theme_formal_white'); -$description = get_string('regionwidthdesc', 'theme_formal_white'); -$default = 200; -$choices = array(150=>'150px', 170=>'170px', 200=>'200px', 240=>'240px', 290=>'290px', 350=>'350px', 420=>'420px'); -$setting = new admin_setting_configselect($name, $title, $description, $default, $choices); -$temp->add($setting); + // Logo file setting + $name = 'theme_formal_white/logo'; + $title = get_string('logo','theme_formal_white'); + $description = get_string('logodesc', 'theme_formal_white'); + $setting = new admin_setting_configtext($name, $title, $description, '', PARAM_URL); + $settings->add($setting); -// Foot note setting -$name = 'theme_formal_white/footnote'; -$title = get_string('footnote','theme_formal_white'); -$description = get_string('footnotedesc', 'theme_formal_white'); -$setting = new admin_setting_confightmleditor($name, $title, $description, ''); -$temp->add($setting); + // Block region width + $name = 'theme_formal_white/regionwidth'; + $title = get_string('regionwidth','theme_formal_white'); + $description = get_string('regionwidthdesc', 'theme_formal_white'); + $default = 200; + $choices = array(150=>'150px', 170=>'170px', 200=>'200px', 240=>'240px', 290=>'290px', 350=>'350px', 420=>'420px'); + $setting = new admin_setting_configselect($name, $title, $description, $default, $choices); + $settings->add($setting); -// Custom CSS file -$name = 'theme_formal_white/customcss'; -$title = get_string('customcss','theme_formal_white'); -$description = get_string('customcssdesc', 'theme_formal_white'); -$setting = new admin_setting_configtextarea($name, $title, $description, ''); -$temp->add($setting); + // Foot note setting + $name = 'theme_formal_white/footnote'; + $title = get_string('footnote','theme_formal_white'); + $description = get_string('footnotedesc', 'theme_formal_white'); + $setting = new admin_setting_confightmleditor($name, $title, $description, ''); + $settings->add($setting); -// Add our page to the structure of the admin tree -$ADMIN->add('themes', $temp); \ No newline at end of file + // Custom CSS file + $name = 'theme_formal_white/customcss'; + $title = get_string('customcss','theme_formal_white'); + $description = get_string('customcssdesc', 'theme_formal_white'); + $setting = new admin_setting_configtextarea($name, $title, $description, ''); + $settings->add($setting); +} \ No newline at end of file diff --git a/theme/nonzero/settings.php b/theme/nonzero/settings.php index 9215590e1a9..6e201ae9a50 100755 --- a/theme/nonzero/settings.php +++ b/theme/nonzero/settings.php @@ -28,33 +28,31 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -// Create our admin page -$temp = new admin_settingpage('theme_nonzero', get_string('configtitle','theme_nonzero')); +defined('MOODLE_INTERNAL') || die; -// Block region-pre width -$name = 'theme_nonzero/regionprewidth'; -$title = get_string('regionprewidth','theme_nonzero'); -$description = get_string('regionprewidthdesc', 'theme_nonzero'); -$default = 200; -$choices = array(180=>'180px', 190=>'190px', 200=>'200px', 210=>'210px', 220=>'220px', 230=>'230px', 240=>'240px', 250=>'250px', 260=>'260px'); -$setting = new admin_setting_configselect($name, $title, $description, $default, $choices); -$temp->add($setting); +if ($ADMIN->fulltree) { + // Block region-pre width + $name = 'theme_nonzero/regionprewidth'; + $title = get_string('regionprewidth','theme_nonzero'); + $description = get_string('regionprewidthdesc', 'theme_nonzero'); + $default = 200; + $choices = array(180=>'180px', 190=>'190px', 200=>'200px', 210=>'210px', 220=>'220px', 230=>'230px', 240=>'240px', 250=>'250px', 260=>'260px'); + $setting = new admin_setting_configselect($name, $title, $description, $default, $choices); + $settings->add($setting); -// Block region-post width -$name = 'theme_nonzero/regionpostwidth'; -$title = get_string('regionpostwidth','theme_nonzero'); -$description = get_string('regionpostwidthdesc', 'theme_nonzero'); -$default = 200; -$choices = array(180=>'180px', 190=>'190px', 200=>'200px', 210=>'210px', 220=>'220px', 230=>'230px', 240=>'240px', 250=>'250px', 260=>'260px'); -$setting = new admin_setting_configselect($name, $title, $description, $default, $choices); -$temp->add($setting); + // Block region-post width + $name = 'theme_nonzero/regionpostwidth'; + $title = get_string('regionpostwidth','theme_nonzero'); + $description = get_string('regionpostwidthdesc', 'theme_nonzero'); + $default = 200; + $choices = array(180=>'180px', 190=>'190px', 200=>'200px', 210=>'210px', 220=>'220px', 230=>'230px', 240=>'240px', 250=>'250px', 260=>'260px'); + $setting = new admin_setting_configselect($name, $title, $description, $default, $choices); + $settings->add($setting); -// Custom CSS file -$name = 'theme_nonzero/customcss'; -$title = get_string('customcss','theme_nonzero'); -$description = get_string('customcssdesc', 'theme_nonzero'); -$setting = new admin_setting_configtextarea($name, $title, $description, ''); -$temp->add($setting); - -// Add our page to the structure of the admin tree -$ADMIN->add('themes', $temp); \ No newline at end of file + // Custom CSS file + $name = 'theme_nonzero/customcss'; + $title = get_string('customcss','theme_nonzero'); + $description = get_string('customcssdesc', 'theme_nonzero'); + $setting = new admin_setting_configtextarea($name, $title, $description, ''); + $settings->add($setting); +} \ No newline at end of file