Bug 1813101: use correct email syntax for noreply address

If the default noreply email address is invalid set it to a valid format
and make sure warnings still display to user

behatnotneeded

Change-Id: I390d2d62ac39aef49144a69d4edb1f0a3918fd8e
Signed-off-by: Lisa Seeto <lisaseeto@catalyst.net.nz>

htdocs/init.php

@@ -278,7 +278,11 @@ if ($CFG->sslproxy === false && isset($_SERVER['REMOTE_ADDR']) && (!isset($_SERV
 }
 if (!isset($CFG->noreplyaddress) && isset($CFG->wwwroot)) {
     $noreplyaddress = 'noreply@' . parse_url($CFG->wwwroot, PHP_URL_HOST);
+
     try {
+      if (!sanitize_email($noreplyaddress)) {
+          $noreplyaddress = 'noreply@example.org';
+      }
       set_config('noreplyaddress', $noreplyaddress);
     }
     catch (Exception $e) {

htdocs/lib/upgrade.php

@@ -1571,7 +1571,7 @@ function site_warnings() {
     }
 
     // Check noreply address is valid.
-    if (!sanitize_email(get_config('noreplyaddress'))) {
+    if (!sanitize_email(get_config('noreplyaddress')) || get_config('noreplyaddress') == 'noreply@example.org') {
         $warnings[] = get_string('noreplyaddressmissingorinvalid', 'error', get_config('wwwroot') . 'admin/site/options.php?fs=emailsettings');
     }