Index: lang/en_utf8/admin.php =================================================================== RCS file: /cvsroot/moodle/moodle/lang/en_utf8/admin.php,v retrieving revision 1.224 diff -u -r1.224 admin.php --- lang/en_utf8/admin.php 2 Sep 2008 21:20:46 -0000 1.224 +++ lang/en_utf8/admin.php 8 Sep 2008 11:19:47 -0000 @@ -308,6 +308,7 @@ $string['deleteuser'] = 'Delete user'; $string['density'] = 'Density'; $string['denyemailaddresses'] = 'Denied email domains'; +$string['development'] = 'Development'; $string['digestmailtime'] = 'Hour to send digest emails'; $string['disablecourseajax'] = 'Disable AJAX course editing'; $string['disableuserimages'] = 'Disable User Profile Images'; @@ -659,6 +660,7 @@ $string['sessiontimeout'] = 'Timeout'; $string['showblocksonmodpages'] = 'Show blocks on module pages'; $string['simpletest'] = 'Unit tests'; +$string['dbtest'] = 'Functional DB tests'; $string['sitelangchanged'] = 'Site language setting changed successfully'; $string['sitemailcharset'] = 'Character set'; $string['sitemaintenance'] = 'The site is undergoing maintenance and is currently not available'; Index: admin/settings/misc.php =================================================================== RCS file: admin/settings/misc.php diff -N admin/settings/misc.php --- admin/settings/misc.php 2 Sep 2008 21:20:47 -0000 1.24 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,38 +0,0 @@ -add('misc', new admin_category('experimental', get_string('experimental','admin'))); - - $temp = new admin_settingpage('experimentalsettings', get_string('experimentalsettings', 'admin')); - $temp->add(new admin_setting_configcheckbox('enableglobalsearch', get_string('enableglobalsearch', 'admin'), get_string('configenableglobalsearch', 'admin'), 0)); - $temp->add(new admin_setting_configcheckbox('smartpix', get_string('smartpix', 'admin'), get_string('configsmartpix', 'admin'), 0)); - $item = new admin_setting_configcheckbox('enablehtmlpurifier', get_string('enablehtmlpurifier', 'admin'), get_string('configenablehtmlpurifier', 'admin'), 0); - $item->set_updatedcallback('reset_text_filters_cache'); - $temp->add($item); - - // Completion system - require_once($CFG->libdir.'/completionlib.php'); - $temp->add(new admin_setting_configcheckbox('enablecompletion', get_string('enablecompletion','completion'), get_string('configenablecompletion','completion'), COMPLETION_DISABLED)); - $temp->add(new admin_setting_pickroles('progresstrackedroles', get_string('progresstrackedroles','completion'), get_string('configprogresstrackedroles', 'completion'), array('moodle/legacy:student'))); - - $ADMIN->add('experimental', $temp); - - // DB transfer related pages - $ADMIN->add('experimental', new admin_externalpage('dbtransfer', get_string('dbtransfer', 'dbtransfer'), $CFG->wwwroot.'/'.$CFG->admin.'/dbtransfer/index.php', 'moodle/site:config', false)); - $ADMIN->add('experimental', new admin_externalpage('dbexport', get_string('dbexport', 'dbtransfer'), $CFG->wwwroot.'/'.$CFG->admin.'/dbtransfer/dbexport.php', 'moodle/site:config', false)); - - // XMLDB editor - $ADMIN->add('misc', new admin_externalpage('xmldbeditor', get_string('xmldbeditor'), "$CFG->wwwroot/$CFG->admin/xmldb/")); - - - // hidden scripts linked from elsewhere - $ADMIN->add('misc', new admin_externalpage('oacleanup', 'Online Assignment Cleanup', $CFG->wwwroot.'/'.$CFG->admin.'/oacleanup.php', 'moodle/site:config', true)); - $ADMIN->add('misc', new admin_externalpage('multilangupgrade', get_string('multilangupgrade', 'admin'), $CFG->wwwroot.'/'.$CFG->admin.'/multilangupgrade.php', 'moodle/site:config', !empty($CFG->filter_multilang_converted))); - -} // end of speedup - -?> Index: admin/settings/plugins.php =================================================================== RCS file: /cvsroot/moodle/moodle/admin/settings/plugins.php,v retrieving revision 1.22 diff -u -r1.22 plugins.php --- admin/settings/plugins.php 4 Sep 2008 07:36:53 -0000 1.22 +++ admin/settings/plugins.php 8 Sep 2008 11:19:46 -0000 @@ -33,6 +33,8 @@ } } + // hidden script for converting journals to online assignments (or something like that) linked from elsewhere + $ADMIN->add('modsettings', new admin_externalpage('oacleanup', 'Online Assignment Cleanup', $CFG->wwwroot.'/'.$CFG->admin.'/oacleanup.php', 'moodle/site:config', true)); $ADMIN->add('modules', new admin_category('blocksettings', get_string('blocks'))); $ADMIN->add('blocksettings', new admin_page_manageblocks()); Index: admin/settings/language.php =================================================================== RCS file: /cvsroot/moodle/moodle/admin/settings/language.php,v retrieving revision 1.12 diff -u -r1.12 language.php --- admin/settings/language.php 11 Jan 2008 17:21:53 -0000 1.12 +++ admin/settings/language.php 8 Sep 2008 11:19:46 -0000 @@ -14,16 +14,16 @@ $temp->add(new admin_setting_langlist()); $temp->add(new admin_setting_configcheckbox('langcache', get_string('langcache', 'admin'), get_string('configlangcache', 'admin'), 1)); $temp->add(new admin_setting_configtext('locale', get_string('localetext', 'admin'), get_string('configlocale', 'admin'), '', PARAM_FILE)); - - // new CFG variable for excel encoding $temp->add(new admin_setting_configselect('latinexcelexport', get_string('latinexcelexport', 'admin'), get_string('configlatinexcelexport', 'admin'), '0', array('0'=>'Unicode','1'=>'Latin'))); - $ADMIN->add('language', $temp); $ADMIN->add('language', new admin_externalpage('langedit', get_string('langedit', 'admin'), "$CFG->wwwroot/$CFG->admin/lang.php", array('moodle/site:langeditmaster', 'moodle/site:langeditlocal') )); $ADMIN->add('language', new admin_externalpage('langimport', get_string('langpacks', 'admin'), "$CFG->wwwroot/$CFG->admin/langimport.php")); + // Hidden multilang upgrade page. + $ADMIN->add('language', new admin_externalpage('multilangupgrade', get_string('multilangupgrade', 'admin'), $CFG->wwwroot.'/'.$CFG->admin.'/multilangupgrade.php', 'moodle/site:config', !empty($CFG->filter_multilang_converted))); + } // end of speedup ?> Index: admin/settings/top.php =================================================================== RCS file: /cvsroot/moodle/moodle/admin/settings/top.php,v retrieving revision 1.24 diff -u -r1.24 top.php --- admin/settings/top.php 26 Aug 2008 05:45:08 -0000 1.24 +++ admin/settings/top.php 8 Sep 2008 11:19:46 -0000 @@ -33,34 +33,11 @@ $ADMIN->add('root', new admin_category('appearance', get_string('appearance','admin'))); $ADMIN->add('root', new admin_category('frontpage', get_string('frontpage','admin'))); $ADMIN->add('root', new admin_category('server', get_string('server','admin'))); - $ADMIN->add('root', new admin_category('mnet', get_string('net','mnet'), (isset($CFG->mnet_dispatcher_mode) and $CFG->mnet_dispatcher_mode === 'off'))); - $ADMIN->add('root', new admin_category('reports', get_string('reports'))); -foreach (get_list_of_plugins($CFG->admin.'/report') as $plugin) { - $settingsfile = "$CFG->dirroot/$CFG->admin/report/$plugin/settings.php"; - if (file_exists($settingsfile)) { - include($settingsfile); - } else { - $reportname = get_string($plugin, 'report_' . $plugin); - if ($reportname[1] == '[') { - $reportname = get_string($plugin, 'admin'); - } - // ugly hack for special access control in reports - switch($plugin) { - case 'backups': $cap = 'moodle/site:backup'; break; - case 'stats': if (empty($CFG->enablestats)) {continue 2;}; - default: $cap = 'moodle/site:viewreports'; - } - $ADMIN->add('reports', new admin_externalpage('report'.$plugin, $reportname, "$CFG->wwwroot/$CFG->admin/report/$plugin/index.php",$cap)); - } -} - -$ADMIN->add('root', new admin_category('misc', get_string('miscellaneous'))); - +$ADMIN->add('root', new admin_category('development', get_string('development', 'admin'))); // hidden unsupported category $ADMIN->add('root', new admin_category('unsupported', get_string('unsupported', 'admin'), true)); - // hidden search script $ADMIN->add('root', new admin_externalpage('search', get_string('searchresults'), "$CFG->wwwroot/$CFG->admin/search.php", 'moodle/site:config', true)); Index: lib/adminlib.php =================================================================== RCS file: /cvsroot/moodle/moodle/lib/adminlib.php,v retrieving revision 1.260 diff -u -r1.260 adminlib.php --- lib/adminlib.php 5 Sep 2008 06:30:18 -0000 1.260 +++ lib/adminlib.php 8 Sep 2008 11:19:50 -0000 @@ -4950,6 +4950,22 @@ include($file); } } + + // Add all the report plugings. Do this last so they can choose where in the tree + // they want to be added. + foreach (get_list_of_plugins($CFG->admin.'/report') as $plugin) { + $settingsfile = "$CFG->dirroot/$CFG->admin/report/$plugin/settings.php"; + if (file_exists($settingsfile)) { + include($settingsfile); + } else { + $reportname = get_string($plugin, 'report_' . $plugin); + if ($reportname[1] == '[') { + $reportname = get_string($plugin, 'admin'); + } + $ADMIN->add('reports', new admin_externalpage('report'.$plugin, $reportname, "$CFG->wwwroot/$CFG->admin/report/$plugin/index.php",'moodle/site:viewreports')); + } + } + if (file_exists($CFG->dirroot.'/local/settings.php')) { include_once($CFG->dirroot.'/local/settings.php'); } Index: admin/report/simpletest/settings.php =================================================================== RCS file: /cvsroot/moodle/moodle/admin/report/simpletest/settings.php,v retrieving revision 1.3 diff -u -r1.3 settings.php --- admin/report/simpletest/settings.php 13 Jun 2008 08:41:29 -0000 1.3 +++ admin/report/simpletest/settings.php 8 Sep 2008 11:19:46 -0000 @@ -1,10 +1,3 @@ add('reports', new admin_externalpage('reportsimpletest', $reportname, "$CFG->wwwroot/$CFG->admin/report/simpletest/index.php",'moodle/site:config')); - -//TODO: localise -$ADMIN->add('reports', new admin_externalpage('reportdbtest', 'Functional DB tests', "$CFG->wwwroot/$CFG->admin/report/simpletest/dbtest.php",'moodle/site:config')); +$ADMIN->add('development', new admin_externalpage('reportsimpletest', get_string('simpletest', 'admin'), "$CFG->wwwroot/$CFG->admin/report/simpletest/index.php",'moodle/site:config')); +$ADMIN->add('development', new admin_externalpage('reportdbtest', get_string('dbtest', 'admin'), "$CFG->wwwroot/$CFG->admin/report/simpletest/dbtest.php",'moodle/site:config')); \ No newline at end of file Index: admin/report/backups/settings.php =================================================================== RCS file: admin/report/backups/settings.php diff -N admin/report/backups/settings.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ admin/report/backups/settings.php 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,3 @@ +add('reports', new admin_externalpage('reportbackups', get_string('backups', 'admin'), "$CFG->wwwroot/$CFG->admin/report/backups/index.php",'moodle/site:backup')); +?> Index: admin/report/capability/settings.php =================================================================== RCS file: admin/report/capability/settings.php diff -N admin/report/capability/settings.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ admin/report/capability/settings.php 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,3 @@ +add('roles', new admin_externalpage('reportcapability', get_string('capability', 'report_capability'), "$CFG->wwwroot/$CFG->admin/report/capability/index.php",'moodle/role:manage')); +?> Index: admin/settings/development.php =================================================================== RCS file: admin/settings/development.php diff -N admin/settings/development.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ admin/settings/development.php 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,33 @@ +add('development', new admin_category('experimental', get_string('experimental','admin'))); + + $temp = new admin_settingpage('experimentalsettings', get_string('experimentalsettings', 'admin')); + $temp->add(new admin_setting_configcheckbox('enableglobalsearch', get_string('enableglobalsearch', 'admin'), get_string('configenableglobalsearch', 'admin'), 0)); + $temp->add(new admin_setting_configcheckbox('smartpix', get_string('smartpix', 'admin'), get_string('configsmartpix', 'admin'), 0)); + $item = new admin_setting_configcheckbox('enablehtmlpurifier', get_string('enablehtmlpurifier', 'admin'), get_string('configenablehtmlpurifier', 'admin'), 0); + $item->set_updatedcallback('reset_text_filters_cache'); + $temp->add($item); + + // Completion system + require_once($CFG->libdir.'/completionlib.php'); + $temp->add(new admin_setting_configcheckbox('enablecompletion', get_string('enablecompletion','completion'), get_string('configenablecompletion','completion'), COMPLETION_DISABLED)); + $temp->add(new admin_setting_pickroles('progresstrackedroles', get_string('progresstrackedroles','completion'), get_string('configprogresstrackedroles', 'completion'), array('moodle/legacy:student'))); + + $ADMIN->add('experimental', $temp); + + // DB transfer related pages + $ADMIN->add('experimental', new admin_externalpage('dbtransfer', get_string('dbtransfer', 'dbtransfer'), $CFG->wwwroot.'/'.$CFG->admin.'/dbtransfer/index.php', 'moodle/site:config')); + $ADMIN->add('experimental', new admin_externalpage('dbexport', get_string('dbexport', 'dbtransfer'), $CFG->wwwroot.'/'.$CFG->admin.'/dbtransfer/dbexport.php', 'moodle/site:config')); + + // XMLDB editor + $ADMIN->add('development', new admin_externalpage('xmldbeditor', get_string('xmldbeditor'), "$CFG->wwwroot/$CFG->admin/xmldb/")); + +} // end of speedup + +?> Index: admin/report/stats/settings.php =================================================================== RCS file: admin/report/stats/settings.php diff -N admin/report/stats/settings.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ admin/report/stats/settings.php 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,5 @@ +enablestats)) { + $ADMIN->add('reports', new admin_externalpage('reportstats', get_string('stats', 'admin'), "$CFG->wwwroot/$CFG->admin/report/stats/index.php",'moodle/site:viewreports')); +} +?>