Revision: 1920
http://mrbs.svn.sourceforge.net/mrbs/?rev=1920&view=rev
Author: cimorrison
Date: 2011-09-02 13:10:54 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
Added a config setting to disable email sending, overriding any other settings.
Useful for testing MRBS without having to worry about sending mail to people
not expecting it.
Modified Paths:
--------------
mrbs/trunk/web/functions_mail.inc
mrbs/trunk/web/systemdefaults.inc.php
Modified: mrbs/trunk/web/functions_mail.inc
===================================================================
--- mrbs/trunk/web/functions_mail.inc 2011-09-01 14:18:50 UTC (rev 1919)
+++ mrbs/trunk/web/functions_mail.inc 2011-09-02 13:10:54 UTC (rev 1920)
@@ -1065,6 +1065,13 @@
global $mail_settings, $sendmail_settings, $smtp_settings, $enable_periods;
+ // Don't do aything if mail has been disabled. Useful for testing MRBS
without
+ // sending emails to those who don't want them
+ if ($mail_settings['disabled'])
+ {
+ return;
+ }
+
if ($mail_settings['debug'])
{
echo "[DEBUG] Preparing to send email ... <br>";
Modified: mrbs/trunk/web/systemdefaults.inc.php
===================================================================
--- mrbs/trunk/web/systemdefaults.inc.php 2011-09-01 14:18:50 UTC (rev
1919)
+++ mrbs/trunk/web/systemdefaults.inc.php 2011-09-02 13:10:54 UTC (rev
1920)
@@ -831,6 +831,9 @@
//(b) whether there are addresses to send email to and (c) the result of the
mail
// sending operation.
$mail_settings['debug'] = FALSE;
+// Set this to TRUE if you do not want any email sent, whatever the rest of
the settings.
+// This is a global setting that will override anything else. Useful when
testing MRBS.
+$mail_settings['disabled'] = FALSE;
/**********
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
