Merge "mail/noreplyaddress: Added option in site options to set noreplyaddress"

htdocs/admin/site/options.php

@@ -425,6 +425,14 @@ $siteoptionform = array(
                         ),
                     'help'          => true,
                 ),
+                'noreplyaddress' => array(
+                    'type'          => 'text',
+                    'title'         => get_string('emailnoreplyaddress', 'admin'),
+                    'description'   => get_string('emailnoreplyaddressdescription', 'admin'),
+                    'defaultvalue'  => get_config('noreplyaddress'),
+                    'disabled'      => in_array('noreplyaddress', $OVERRIDDEN),
+                    'help'          => true,
+                ),
             ),
         ),
         'generalsettings' => array(
@@ -541,7 +549,7 @@ function siteoptions_submit(Pieform $form, $values) {
         'tagssideblockmaxtags', 'country', 'viewmicroheaders', 'userscanchooseviewthemes',
         'remoteavatars', 'userscanhiderealnames', 'antispam', 'spamhaus', 'surbl', 'anonymouscomments', 'disableexternalresources',
         'proxyaddress', 'proxyauthmodel', 'proxyauthcredentials', 'smtphosts', 'smtpport', 'smtpuser', 'smtppass', 'smtpsecure',
-        'homepageinfo', 'showonlineuserssideblock', 'registerterms', 'allowmobileuploads',
+        'noreplyaddress', 'homepageinfo', 'showonlineuserssideblock', 'registerterms', 'allowmobileuploads',
         'creategroups', 'createpublicgroups', 'allowgroupcategories', 'wysiwyg',
     );
     $oldlanguage = get_config('lang');

htdocs/lang/en.utf8/admin.php

@@ -384,6 +384,8 @@ $string['emailsmtpsecure'] = 'SMTP Encryption';
 $string['emailsmtpsecuredescription'] = 'If the SMTP server supports encryption, enable it here.';
 $string['emailsmtpsecuressl'] = 'SSL';
 $string['emailsmtpsecuretls'] = 'TLS';
+$string['emailnoreplyaddress'] = 'System Mail Address';
+$string['emailnoreplyaddressdescription'] = 'Emails come out as from this address';
 
 
 

htdocs/lang/en.utf8/help/forms/siteoptions.noreplyaddress.html

+<h3>System Mail Address</h3>
+<p>This email address is the address that emails are sent from when using mahara.</p>
+<p>This field may be disabled if overridden by a setting in your config.php file.</p>