Merge branch 'MDL-49827-noemailever-ui' of https://github.com/NagaSir…

…ishaGarapati/moodle
mgleeson · Aug 17, 2023 · 59a6134 · 59a6134
2 parents 2870637 + 5c203e8
commit 59a6134
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/admin/settings/server.php b/admin/settings/server.php
@@ -453,6 +453,12 @@
     // Outgoing mail configuration.
     $temp = new admin_settingpage('outgoingmailconfig', new lang_string('outgoingmailconfig', 'admin'));
 
+    if (!empty($CFG->noemailever)) {
+        $noemaileverwarning = new \core\output\notification(get_string('noemaileverwarning', 'admin'),
+        \core\output\notification::NOTIFY_ERROR);
+        $temp->add(new admin_setting_heading('outgoingmaildisabled', '', $OUTPUT->render($noemaileverwarning)));
+    }
+
     $temp->add(new admin_setting_heading('smtpheading', new lang_string('smtp', 'admin'),
         new lang_string('smtpdetail', 'admin')));
 

diff --git a/admin/testoutgoingmailconf.php b/admin/testoutgoingmailconf.php
@@ -40,6 +40,12 @@
 echo $OUTPUT->header();
 echo $OUTPUT->heading($headingtitle);
 
+// Displaying noemailever warning.
+if (!empty($CFG->noemailever)) {
+    $msg = get_string('noemaileverwarning', 'admin');
+    echo $OUTPUT->notification($msg, \core\output\notification::NOTIFY_ERROR);
+}
+
 $data = $form->get_data();
 if ($data) {
     $emailuser = new stdClass();

diff --git a/lang/en/admin.php b/lang/en/admin.php
@@ -948,6 +948,7 @@
 $string['newestdocindexed'] = 'Newest document indexed';
 $string['nobookmarksforuser'] = 'You do not have any bookmarks.';
 $string['nodatabase'] = 'No database';
+$string['noemaileverwarning'] = '<strong>Note:</strong> All outgoing emails have been disabled';
 $string['nohttpsformobilewarning'] = 'It is recommended to enable HTTPS with a valid certificate. The Moodle app will always try to use a secured connection first.';
 $string['nomissingstrings'] = 'No missing strings';
 $string['none'] = 'None';