From 622a44764ea11cfe6270d444764f3f2d3d923577 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Wed, 15 Jan 2014 16:44:31 -0400
Subject: [PATCH] =?UTF-8?q?BUG-13709=20SOLVED=20Al=20activar=20la=20opci?=
 =?UTF-8?q?=C3=B3n=20ADMIN=20->=20Login=20/=20Enable=20Forgot=20password,?=
 =?UTF-8?q?=20el=20modulo=20de=20recuperaci=C3=B3n=20de=20password=20'Forg?=
 =?UTF-8?q?ot=20password'=20en=20la=20ventana=20de=20login,=20muestra=20el?=
 =?UTF-8?q?=20mensaje:=20'WARNING:=20Invalid=20email=20address=20in=20FROM?=
 =?UTF-8?q?=20parameter=20(<>)'=20despu=C3=A9s=20de=20ingresar=20los=20dat?=
 =?UTF-8?q?os=20de=20un=20usuario=20valido.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/methods/login/retrivePassword.php  | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/methods/login/retrivePassword.php b/workflow/engine/methods/login/retrivePassword.php
index 217107c93..99027a42d 100755
--- a/workflow/engine/methods/login/retrivePassword.php
+++ b/workflow/engine/methods/login/retrivePassword.php
@@ -11,7 +11,7 @@ $user = new Users();
 
 $userData = $rbacUser->getByUsername($data['USR_USERNAME']);
 
-if ($userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL']) {
+if ($userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL'] && $userData['USR_AUTH_TYPE'] === '' ) {
     $aSetup = getEmailConfiguration();
     if (count($aSetup) == 0 || !isset($aSetup['MESS_ENGINE'])) {
         G::SendTemporalMessage ('ID_EMAIL_ENGINE_IS_NOT_ENABLED', "warning");
@@ -27,7 +27,20 @@ if ($userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL'
       $rbacUser->update($aData);
       $user->update($aData);
     */
-    $sFrom    = ($aSetup['MESS_ACCOUNT'] != '' ? $aSetup['MESS_ACCOUNT'] . ' ' : '') . '<' . $aSetup['MESS_ACCOUNT'] . '>';
+    
+    if (trim($aSetup["MESS_FROM_NAME"]) === '') {
+        $aSetup["MESS_FROM_NAME"] = 'PROCESSMAKER';
+    }
+    if ($aSetup['MESS_ENGINE'] === 'MAIL') {
+        $sFrom = $aSetup["MESS_FROM_NAME"] . " <info@" . ((isset($_SERVER["HTTP_HOST"]) && $_SERVER["HTTP_HOST"] != "") ? $_SERVER["HTTP_HOST"] : "processmaker.com") . ">";
+    } else {
+        if (trim($aSetup["MESS_ACCOUNT"]) === '') {
+            $sFrom = $aSetup["MESS_FROM_NAME"] . " <info@" . ((isset($_SERVER["HTTP_HOST"]) && $_SERVER["HTTP_HOST"] != "") ? $_SERVER["HTTP_HOST"] : "processmaker.com") . ">";
+        } else {
+            $sFrom = $aSetup["MESS_FROM_NAME"] . " <" . $aSetup["MESS_ACCOUNT"] . ">";
+        }
+    }
+    
     $sSubject = G::LoadTranslation('ID_RESET_PASSWORD').' - ProcessMaker' ;
     $msg = '<h3>ProcessMaker Forgot password Service</h3>';
     $msg .='<p>'.G::LoadTranslation('ID_YOUR_USERMANE_IS').' :  <strong>'.$userData['USR_USERNAME'].'</strong></p>';
@@ -115,7 +128,11 @@ if ($userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL'
         G::SendTemporalMessage ($e->getMessage(), "warning", 'string');
     }
 } else {
+    if ($userData['USR_AUTH_TYPE'] === '') {
     $msg = G::LoadTranslation('ID_USER') . ' ' . htmlentities($data['USR_USERNAME'], ENT_QUOTES, 'UTF-8') . ' '. G::LoadTranslation('ID_IS_NOT_REGISTERED');
+    } else {
+        $msg = G::LoadTranslation('ID_USER_NOT_FUNCTIONALITY');
+    }
     G::SendTemporalMessage ($msg, "warning", 'string');
     G::header('location: forgotPassword');
 }