CRM-15578 - Redirect "civicrm/mailing/send" to "civicrm/a/#/mailing/new"

diff --git a/CRM/Mailing/Controller/Send.php b/CRM/Mailing/Controller/Send.php
index 9ccf52cc086eeade48da111b50555fcaba6d83c7..e8180db5b9d7d5e539aaa5991742fc54eae07bdb 100644 (file)
--- a/CRM/Mailing/Controller/Send.php
+++ b/CRM/Mailing/Controller/Send.php
@@ -40,6 +40,24 @@ class CRM_Mailing_Controller_Send extends CRM_Core_Controller {
   function __construct($title = NULL, $action = CRM_Core_Action::NONE, $modal = TRUE) {
     parent::__construct($title, $modal, NULL, FALSE, TRUE);
 
+    if (!defined('CIVICRM_CIVIMAIL_UI_LEGACY')) {
+      // New:            civicrm/mailing/send?reset=1
+      // Re-use:         civicrm/mailing/send?reset=1&mid=%%mid%%
+      // Continue:       civicrm/mailing/send?reset=1&mid=%%mid%%&continue=true
+      $mid = CRM_Utils_Request::retrieve('mid', 'Positive');
+      $continue = CRM_Utils_Request::retrieve('continue', 'String');
+      if (!$mid) {
+        CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/a/', NULL, TRUE, '/mailing/new'));
+      }
+      if ($mid && $continue) {
+        CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/a/', NULL, TRUE, '/mailing/' . $mid));
+      }
+      if ($mid && !$continue) {
+        CRM_Core_Error::fatal('Not implemented: Re-use mailing');
+        // CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/a/', NULL, TRUE, '/mailing/' . $mid));
+      }
+    }
+
     $mailingID = CRM_Utils_Request::retrieve('mid', 'String', $this, FALSE, NULL);
 
     // also get the text and html file