fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-4133

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2018-01-18 14:27:58 -04:00
committed by Paula Quispe
parent d1f6a3126c
commit 726c7af619
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -10199,6 +10199,12 @@ msgstr "Issued to"
msgid "is not registered!" msgid "is not registered!"
msgstr "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 # TRANSLATION
# LABEL/ID_IS_REQUIRED # LABEL/ID_IS_REQUIRED
#: LABEL/ID_IS_REQUIRED #: LABEL/ID_IS_REQUIRED

1
workflow/engine/data/mysql/insert.sql
View File

@@ -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_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_ISSUED_TO','en','Issued to','2014-09-18') ,
( 'LABEL','ID_IS_NOT_REGISTERED','en','is not registered!','2014-01-15') , ( '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_IS_REQUIRED','en','is required','2014-01-15') ,
( 'LABEL','ID_IUD','en','#','2014-01-15') , ( 'LABEL','ID_IUD','en','#','2014-01-15') ,
( 'LABEL','ID_JAVASCRIPTS','en','JavaScripts','2014-01-15') , ( 'LABEL','ID_JAVASCRIPTS','en','JavaScripts','2014-01-15') ,

10
workflow/engine/methods/login/retrivePassword.php
View File

@@ -11,7 +11,7 @@ $data['USR_USERNAME'] = strip_tags($data['USR_USERNAME']);
$userData = $rbacUser->getByUsername($data['USR_USERNAME']); $userData = $rbacUser->getByUsername($data['USR_USERNAME']);
$userExists = $userData === false ? false : true; $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(); $aSetup = System::getEmailConfiguration();
if (count($aSetup) == 0 || !isset($aSetup['MESS_ENGINE'])) { if (count($aSetup) == 0 || !isset($aSetup['MESS_ENGINE'])) {
G::SendTemporalMessage('ID_EMAIL_ENGINE_IS_NOT_ENABLED', "warning"); 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'); G::SendTemporalMessage($e->getMessage(), "warning", 'string');
} }
} else { } 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'); $msg = G::LoadTranslation('ID_USER') . ' ' . htmlentities($data['USR_USERNAME'], ENT_QUOTES, 'UTF-8') . ' ' . G::LoadTranslation('ID_IS_NOT_REGISTERED');
} else { } 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::SendTemporalMessage($msg, "warning", 'string');
G::header('location: forgotPassword'); G::header('location: forgotPassword');