L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-44467 core: mail settings and navigation improvements

Browse Source 
This commit groups all mail settings under Server node, splitting into
two categories: Outgoing mail configuration and Incoming mail configuration.
Also, it make maildomain setting available on the Email settings page.
This commit is contained in:
Simey Lameze
2016-10-28 13:04:09 +08:00
committed by Adrian Greeve
parent 577bd70d38
commit ff2abc4b7d
5 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/settings/plugins.php
-11
View File
@@ -69,17 +69,6 @@ if ($hassiteconfig) {
$plugin->load_settings($ADMIN, 'blocksettings', $hassiteconfig);
}
// message outputs
$ADMIN->add('modules', new admin_category('messageoutputs', new lang_string('messageoutputs', 'message')));
$ADMIN->add('messageoutputs', new admin_page_managemessageoutputs());
$ADMIN->add('messageoutputs', new admin_page_defaultmessageoutputs());
$plugins = core_plugin_manager::instance()->get_plugins_of_type('message');
core_collator::asort_objects_by_property($plugins, 'displayname');
foreach ($plugins as $plugin) {
/** @var \core\plugininfo\message $plugin */
$plugin->load_settings($ADMIN, 'messageoutputs', $hassiteconfig);
}
// authentication plugins
$ADMIN->add('modules', new admin_category('authsettings', new lang_string('authentication', 'admin')));
admin/settings/server.php
+12
View File
@@ -213,6 +213,18 @@ $ADMIN->add('server', $temp);
$ADMIN->add('server', new admin_externalpage('adminregistration', new lang_string('hubs', 'admin'),
"$CFG->wwwroot/$CFG->admin/registration/index.php"));
// E-mail settings.
$ADMIN->add('server', new admin_category('email', new lang_string('categoryemail', 'message_email')));
$ADMIN->add('email', new admin_category('outgoingmailconfig', new lang_string('outgoingmailconfig', 'message_email')));
$ADMIN->add('outgoingmailconfig', new admin_page_managemessageoutputs());
$ADMIN->add('outgoingmailconfig', new admin_page_defaultmessageoutputs());
$plugins = core_plugin_manager::instance()->get_plugins_of_type('message');
core_collator::asort_objects_by_property($plugins, 'displayname');
foreach ($plugins as $plugin) {
/** @var \core\plugininfo\message $plugin */
$plugin->load_settings($ADMIN, 'outgoingmailconfig', $hassiteconfig);
}
// "update notifications" settingpage
if (empty($CFG->disableupdatenotifications)) {
$temp = new admin_settingpage('updatenotifications', new lang_string('updatenotifications', 'core_admin'));
admin/tool/messageinbound/settings.php
+1 -1
View File
@@ -83,5 +83,5 @@ if ($hassiteconfig) {
"$CFG->wwwroot/$CFG->admin/tool/messageinbound/index.php"));
// Add the category to the admin tree.
$ADMIN->add('server', $category);
$ADMIN->add('email', $category);
}