From: Dave Greenberg <dave@civicrm.org>
Date: Sun, 6 Oct 2013 21:57:20 +0000 (+0100)
Subject: CRM-13442 - Adding warning for 4.3 when admin switches from Redirect DB mode to a... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=32c8492f73bcbd5b317021dea1bb03d58d0690f0;p=civicrm-core.git

CRM-13442 - Adding warning for 4.3 when admin switches from Redirect DB mode to a live mode telling them to check for Scheduled test mailings.

----------------------------------------
* CRM-13442: Update Outbound Email help text
  http://issues.civicrm.org/jira/browse/CRM-13442
---

diff --git a/templates/CRM/Admin/Form/Setting/Smtp.tpl b/templates/CRM/Admin/Form/Setting/Smtp.tpl
index 4edb6d7374..17c29c20a8 100644
--- a/templates/CRM/Admin/Form/Setting/Smtp.tpl
+++ b/templates/CRM/Admin/Form/Setting/Smtp.tpl
@@ -100,6 +100,10 @@
 {literal}
 <script type="text/javascript">
     cj( function( ) {
+			var mailSetting = cj("input[name='outBound_option']:checked").val( );
+
+			var archiveWarning = "{/literal}{ts escape='js'}WARNING: You are switching from a testing mode (Redirect to Database) to a live mode. Check Mailings > Archived Mailings, and delete any test mailings that are not in Completed status prior to running the mailing cron job for the first time. This will ensure that test mailings are not actually sent out.{/ts}{literal}"
+
         showHideMailOptions( cj("input[name='outBound_option']:checked").val( ) ) ;
         
         function showHideMailOptions( value ) {
@@ -108,15 +112,24 @@
                 cj("#bySMTP").show( );
                 cj("#bySendmail").hide( );
                 cj("#_qf_Smtp_refresh_test").show( );
+								if (mailSetting == '5') {
+									alert(archiveWarning);
+								}
               break;
               case "1":
                 cj("#bySMTP").hide( );
                 cj("#bySendmail").show( );
                 cj("#_qf_Smtp_refresh_test").show( );
+								if (mailSetting == '5') {
+									alert(archiveWarning);
+								}
               break;
               case "3":
                 cj('.mailoption').hide();
                 cj("#_qf_Smtp_refresh_test").show( );
+								if (mailSetting == '5') {
+									alert(archiveWarning);
+								}
               break;
               default:
                 cj("#bySMTP").hide( );