From dceb8b035af4a5a868f91d8c6fd00708b2898ffe Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Mon, 30 Mar 2015 17:04:18 -0400
Subject: [PATCH] I solved the issue PM-1955 new parameter in sendMessage

---
 workflow/engine/classes/class.wsBase.php      | 12 ++++++++++
 workflow/engine/classes/model/EmailServer.php | 22 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index 3818d684f..3609135d0 100755
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -923,6 +923,18 @@ class wsBase
             $licensedFeatures = & PMLicensedFeatures::getSingleton();
             /*----------------------------------********---------------------------------*/
             if (!empty($config) && $licensedFeatures->verifyfeature('nKaNTNuT1MzK0RsMEtXTnYzR09ucHF2WGNuS0hRdDBBak42WXJhNVVOOG1INEVoaU1EaTllbjBBeEJNeG9wRVJ6NmxQelhyVTBvdThzPQ==')) {
+                if(!is_array($config)){
+                    $emailServer = new EmailServer();
+                    $criteria = $emailServer->getSelAllColumns();
+                    $criteria->add(EmailServerPeer::MESS_UID, $config, CRITERIA::EQUAL);
+                    $criteria = EmailServerPeer::doSelectRS($criteria);
+                    $criteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+                    while ($criteria->next()) {
+                      $row = $criteria->getRow();
+                      $config = $row;
+                      $config['SMTPSecure'] = $row['SMTPSECURE'];
+                    }
+                }
                 $aSetup = $config;
             } else {
             /*----------------------------------********---------------------------------*/
diff --git a/workflow/engine/classes/model/EmailServer.php b/workflow/engine/classes/model/EmailServer.php
index f961d4f1a..8f0a58caf 100644
--- a/workflow/engine/classes/model/EmailServer.php
+++ b/workflow/engine/classes/model/EmailServer.php
@@ -1,5 +1,27 @@
 <?php
 class EmailServer extends BaseEmailServer
 {
+    /**
+     * Get all columns by EMAIL_SERVER
+     *
+     * @return object criteria 
+     */
+    public function getSelAllColumns(){
+        $criteria = new Criteria("workflow");
+        $criteria->addSelectColumn( EmailServerPeer::MESS_UID);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_ENGINE);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_SERVER);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_PORT);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_RAUTH);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_ACCOUNT);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_PASSWORD);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_FROM_MAIL);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_FROM_NAME);
+        $criteria->addSelectColumn( EmailServerPeer::SMTPSECURE);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_TRY_SEND_INMEDIATLY);
+        $criteria->addSelectColumn( EmailServerPeer::MAIL_TO);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_DEFAULT);
+        return $criteria;
+    }
 }