From 726c7af619a0787fcb635662dca2d5a9c9d94aa4 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Thu, 18 Jan 2018 14:27:58 -0400
Subject: [PATCH] HOR-4133

---
 .../content/translations/english/processmaker.en.po    |  6 ++++++
 workflow/engine/data/mysql/insert.sql                  |  1 +
 workflow/engine/methods/login/retrivePassword.php      | 10 +++++++---
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po
index 5d2851201..ea7a42982 100644
--- a/workflow/engine/content/translations/english/processmaker.en.po
+++ b/workflow/engine/content/translations/english/processmaker.en.po
@@ -10199,6 +10199,12 @@ msgstr "Issued to"
 msgid "is not registered!"
 msgstr "is not registered!"
 
+# TRANSLATION
+# LABEL/ID_THE_USERNAME_EMAIL_IS_INCORRECT
+#: LABEL/ID_THE_USERNAME_EMAIL_IS_INCORRECT
+msgid "The username or email is incorrect"
+msgstr "The username or email is incorrect"
+
 # TRANSLATION
 # LABEL/ID_IS_REQUIRED
 #: LABEL/ID_IS_REQUIRED
diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql
index f61a01a8f..2be38b78c 100644
--- a/workflow/engine/data/mysql/insert.sql
+++ b/workflow/engine/data/mysql/insert.sql
@@ -58532,6 +58532,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_ISO8601_INVALID_FORMAT','en','Invalid value for "{0}", this has not the format ISO 8601.','2015-11-04') ,
 ( 'LABEL','ID_ISSUED_TO','en','Issued to','2014-09-18') ,
 ( 'LABEL','ID_IS_NOT_REGISTERED','en','is not registered!','2014-01-15') ,
+( 'LABEL','ID_THE_USERNAME_EMAIL_IS_INCORRECT','en','The username or email is incorrect','2018-01-18') ,
 ( 'LABEL','ID_IS_REQUIRED','en','is required','2014-01-15') ,
 ( 'LABEL','ID_IUD','en','#','2014-01-15') ,
 ( 'LABEL','ID_JAVASCRIPTS','en','JavaScripts','2014-01-15') ,
diff --git a/workflow/engine/methods/login/retrivePassword.php b/workflow/engine/methods/login/retrivePassword.php
index 07a7d4da6..59b705325 100644
--- a/workflow/engine/methods/login/retrivePassword.php
+++ b/workflow/engine/methods/login/retrivePassword.php
@@ -11,7 +11,7 @@ $data['USR_USERNAME'] = strip_tags($data['USR_USERNAME']);
 $userData = $rbacUser->getByUsername($data['USR_USERNAME']);
 $userExists = $userData === false ? false : true;
 
-if ($userExists && $userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL'] && ($userData['USR_AUTH_TYPE'] === '' || $userData['USR_AUTH_TYPE'] == 'MYSQL')) {
+if ($userExists === true && $userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL'] && ($userData['USR_AUTH_TYPE'] === '' || $userData['USR_AUTH_TYPE'] == 'MYSQL')) {
     $aSetup = System::getEmailConfiguration();
     if (count($aSetup) == 0 || !isset($aSetup['MESS_ENGINE'])) {
         G::SendTemporalMessage('ID_EMAIL_ENGINE_IS_NOT_ENABLED', "warning");
@@ -91,10 +91,14 @@ if ($userExists && $userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $d
         G::SendTemporalMessage($e->getMessage(), "warning", 'string');
     }
 } else {
-    if ($userExists === false || $userData['USR_AUTH_TYPE'] === '' || $userData['USR_AUTH_TYPE'] === 'MYSQL') {
+    if ($userExists === true || $userData['USR_AUTH_TYPE'] === '' || $userData['USR_AUTH_TYPE'] === 'MYSQL') {
         $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');
+        if ($userExists === false) {
+            $msg = G::LoadTranslation('ID_THE_USERNAME_EMAIL_IS_INCORRECT');
+        } else {
+            $msg = G::LoadTranslation('ID_USER_NOT_FUNCTIONALITY');
+        }
     }
     G::SendTemporalMessage($msg, "warning", 'string');
     G::header('location: forgotPassword');