From 1e2f5f2500d1f7ddcc89a3c53fea17902ef825d4 Mon Sep 17 00:00:00 2001
From: Deepak Srivastava <deepak.srivastava@webaccess.co.in>
Date: Wed, 17 Apr 2013 19:33:36 +0530
Subject: [PATCH] Fix for CRM-12362

---
 CRM/SMS/Form/Schedule.php                     |  61 +++++++++---------
 CRM/SMS/Provider.php                          |  12 ++++
 .../extensions/org.civicrm.sms.clickatell.zip | Bin 7426 -> 7430 bytes
 .../org_civicrm_sms_clickatell.php            |   6 +-
 4 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/CRM/SMS/Form/Schedule.php b/CRM/SMS/Form/Schedule.php
index 555973d5eb..ab7384c0af 100644
--- a/CRM/SMS/Form/Schedule.php
+++ b/CRM/SMS/Form/Schedule.php
@@ -162,42 +162,39 @@ class CRM_SMS_Form_Schedule extends CRM_Core_Form {
       CRM_Core_Error::fatal(ts('Could not find a mailing id'));
     }
 
-    foreach (array(
-      'now', 'start_date', 'start_date_time') as $parameter) {
-      $params[$parameter] = $this->controller->exportValue($this->_name,
-        $parameter
-      );
+    foreach (array('now', 'start_date', 'start_date_time') as $parameter) {
+      $params[$parameter] = $this->controller->exportValue($this->_name, $parameter);
     }
 
-    $mailing = new CRM_Mailing_BAO_Mailing();
-    $mailing->id = $ids['mailing_id'];
-    if ($mailing->find(TRUE)) {
-      $job             = new CRM_Mailing_BAO_Job();
-      $job->mailing_id = $mailing->id;
-      $job->is_test    = 0;
-      if ($job->find(TRUE)) {
-        CRM_Core_Error::fatal(ts('A job for this mailing already exists'));
-      }
-
-      if (empty($mailing->is_template)) {
-        $job->status = 'Scheduled';
-        if ($params['now']) {
-          $job->scheduled_date = date('YmdHis');
-        }
-        else {
-          $job->scheduled_date = CRM_Utils_Date::processDate($params['start_date'] . ' ' . $params['start_date_time']);
-        }
-        $job->save();
-      }
-
-      // also set the scheduled_id
-      $session = CRM_Core_Session::singleton();
-      $mailing->scheduled_id = $session->get('userID');
-      $mailing->scheduled_date = date('YmdHis');
-      $mailing->created_date = CRM_Utils_Date::isoToMysql($mailing->created_date);
-      $mailing->save();
+    if ($params['now']) {
+      $params['scheduled_date'] = date('YmdHis');
+    }
+    else {
+      $params['scheduled_date'] = CRM_Utils_Date::processDate($params['start_date'] . ' ' . $params['start_date_time']);
+    }
+
+    $session = CRM_Core_Session::singleton();
+    // set the scheduled_id
+    $params['scheduled_id'] = $session->get('userID');
+    $params['scheduled_date'] = date('YmdHis');
+
+    // set approval details if workflow is not enabled
+    if (!CRM_Mailing_Info::workflowEnabled()) {
+      $params['approver_id'] = $session->get('userID');
+      $params['approval_date'] = date('YmdHis');
+      $params['approval_status_id'] = 1;
     }
 
+    if ($params['now']) {
+      $params['scheduled_date'] = date('YmdHis');
+    }
+    else {
+      $params['scheduled_date'] = CRM_Utils_Date::processDate($params['start_date'] . ' ' . $params['start_date_time']);
+    }
+
+    /* Build the mailing object */
+    CRM_Mailing_BAO_Mailing::create($params, $ids);
+
     $session = CRM_Core_Session::singleton();
     $session->pushUserContext(CRM_Utils_System::url('civicrm/mailing/browse/scheduled',
         'reset=1&scheduled=true&sms=1'
diff --git a/CRM/SMS/Provider.php b/CRM/SMS/Provider.php
index f72ec43f9e..ae9cbeaee6 100644
--- a/CRM/SMS/Provider.php
+++ b/CRM/SMS/Provider.php
@@ -291,5 +291,17 @@ INNER JOIN civicrm_mailing_job mj ON mj.mailing_id = m.id AND mj.id = %1";
         return $phone;
     }
   }
+
+  function urlEncode($values) {
+    $uri = '';
+    foreach ($values as $key => $value) {
+      $value = urlencode($value);
+      $uri .= "&{$key}={$value}";
+    }
+    if (!empty($uri)) {
+      $uri = substr($uri, 1);
+    }
+    return $uri;
+  }
 }
 
diff --git a/tools/extensions/org.civicrm.sms.clickatell.zip b/tools/extensions/org.civicrm.sms.clickatell.zip
index c64f100796ead4c72ecdd54607c0cc17a9b90aa4..6d8308ce37692a18aaa3ded976c3c6b90dd911bf 100644
GIT binary patch
delta 4586
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

delta 4557
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

diff --git a/tools/extensions/org.civicrm.sms.clickatell/org_civicrm_sms_clickatell.php b/tools/extensions/org.civicrm.sms.clickatell/org_civicrm_sms_clickatell.php
index 1eeac0664d..6aeeb5d23e 100644
--- a/tools/extensions/org.civicrm.sms.clickatell/org_civicrm_sms_clickatell.php
+++ b/tools/extensions/org.civicrm.sms.clickatell/org_civicrm_sms_clickatell.php
@@ -184,8 +184,8 @@ class org_civicrm_sms_clickatell extends CRM_SMS_Provider {
         $this->_providerInfo['api_params']['is_test'] == 1 ) {
         $response = array('data' => 'OK:' . rand());
     } else {
-      $postData = CRM_Utils_Array::urlEncode($postDataArray);
-        $response = $this->curl($url, $postData);
+      $postData = $this->urlEncode($postDataArray);
+      $response = $this->curl($url, $postData);
     }
     if (PEAR::isError($response)) {
       return $response;
@@ -271,7 +271,7 @@ class org_civicrm_sms_clickatell extends CRM_SMS_Provider {
         $response = array('data' => 'ID:' . rand());
       }
       else {
-        $postData = CRM_Utils_Array::urlEncode($postDataArray);
+        $postData = $this->urlEncode($postDataArray);
         $response = $this->curl($url, $postData);
       }
       if (PEAR::isError($response)) {
-- 
2.25.1