From 1d840de232c1ab9bf6e781f1ac4898bd7ec9df9e Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Thu, 16 Oct 2014 13:16:38 -0400
Subject: [PATCH] PM-680 configuracion email SOLVED

---
 workflow/engine/controllers/adminProxy.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index a84047818..76524d9e1 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -121,9 +121,9 @@ class adminProxy extends HttpProxyController
         $this->restart = $restart;
         $this->url     = "/sys" . SYS_SYS . "/" . (($sysConf["default_lang"] != "")? $sysConf["default_lang"] : ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en")) . "/" . $sysConf["default_skin"] . $urlPart;
         $this->message = 'Saved Successfully';
-        $msg = "";        
+        $msg = "";
         if($httpData->proxy_host != '' || $httpData->proxy_port != '' || $httpData->proxy_user != '') {
-            $msg = " Host -> ".$httpData->proxy_host." Port -> ".$httpData->proxy_port." User -> ".$httpData->proxy_user; 
+            $msg = " Host -> ".$httpData->proxy_host." Port -> ".$httpData->proxy_port." User -> ".$httpData->proxy_user;
         }
 
         G::auditLog("UploadSystemSettings", "Time Zone -> ".$httpData->time_zone." Memory Limit -> ".$httpData->memory_limit."  Cookie lifetime -> ".$httpData->max_life_time." Default Skin -> ".$httpData->default_skin." Default Language -> ". $httpData->default_lang. $msg);
@@ -654,6 +654,7 @@ class adminProxy extends HttpProxyController
         $oSpool->sendMail();
         $G_PUBLISH = new Publisher();
 
+        $o = new stdclass();
         if ($oSpool->status == 'sent') {
             $o->status = true;
             $o->success = true;
@@ -1073,7 +1074,7 @@ class adminProxy extends HttpProxyController
             }
         } elseif ($_FILES['img']['type'] != '') {
             $failed = "1";
-        }        
+        }
         echo '{success: true, failed: ' . $failed . ', uploaded: ' . $uploaded . ', type: "' . $_FILES['img']['type'] . '"}';
         exit();
     }