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

Merge pull request #2449 from gproly/BUG-14775

Browse Source 
BUG-14775 In the source code /workflow/engine/classes/model/UsersPropert...
This commit is contained in:
julceslauhub
2014-06-16 13:32:41 -04:00
parent b57e1ab42f 9a5fffa7e4
commit 8ad545a2a4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/model/UsersProperties.php
View File

@@ -123,7 +123,7 @@ class UsersProperties extends BaseUsersProperties
return $aUserProperty; return $aUserProperty;
} }
public function validatePassword ($sPassword, $sLastUpdate, $iChangePasswordNextTime) public function validatePassword ($sPassword, $sLastUpdate, $iChangePasswordNextTime, $nowLogin = false)
{ {
if (! defined( 'PPP_MINIMUM_LENGTH' )) { if (! defined( 'PPP_MINIMUM_LENGTH' )) {
define( 'PPP_MINIMUM_LENGTH', 5 ); define( 'PPP_MINIMUM_LENGTH', 5 );
@@ -149,10 +149,10 @@ class UsersProperties extends BaseUsersProperties
$iLength = strlen( $sPassword ); $iLength = strlen( $sPassword );
} }
$aErrors = array (); $aErrors = array ();
if ($iLength < PPP_MINIMUM_LENGTH) { if ($iLength < PPP_MINIMUM_LENGTH || $nowLogin) {
$aErrors[] = 'ID_PPP_MINIMUM_LENGTH'; $aErrors[] = 'ID_PPP_MINIMUM_LENGTH';
} }
if ($iLength > PPP_MAXIMUM_LENGTH) { if ($iLength > PPP_MAXIMUM_LENGTH || $nowLogin) {
$aErrors[] = 'ID_PPP_MAXIMUM_LENGTH'; $aErrors[] = 'ID_PPP_MAXIMUM_LENGTH';
} }
if (PPP_NUMERICAL_CHARACTER_REQUIRED == 1) { if (PPP_NUMERICAL_CHARACTER_REQUIRED == 1) {
@@ -180,7 +180,7 @@ class UsersProperties extends BaseUsersProperties
} }
$fDays = $oCalendar->calculateDuration( date( 'Y-m-d H:i:s' ), $sLastUpdate ); $fDays = $oCalendar->calculateDuration( date( 'Y-m-d H:i:s' ), $sLastUpdate );
if ($fDays > (PPP_EXPIRATION_IN * 24)) { if ($fDays > (PPP_EXPIRATION_IN * 24) || $nowLogin) {
$aErrors[] = 'ID_PPP_EXPIRATION_IN'; $aErrors[] = 'ID_PPP_EXPIRATION_IN';
} }
} }

4
workflow/engine/methods/login/authentication.php
View File

@@ -262,9 +262,9 @@ try {
} }
$aUserProperty = $oUserProperty->loadOrCreateIfNotExists($_SESSION['USER_LOGGED'], array('USR_PASSWORD_HISTORY' => serialize(array(md5($pwd))))); $aUserProperty = $oUserProperty->loadOrCreateIfNotExists($_SESSION['USER_LOGGED'], array('USR_PASSWORD_HISTORY' => serialize(array(md5($pwd)))));
$aErrors = $oUserProperty->validatePassword($_POST['form']['USR_PASSWORD'], $aUserProperty['USR_LAST_UPDATE_DATE'], $aUserProperty['USR_LOGGED_NEXT_TIME']); $aErrors = $oUserProperty->validatePassword($_POST['form']['USR_PASSWORD'], $aUserProperty['USR_LAST_UPDATE_DATE'], $aUserProperty['USR_LOGGED_NEXT_TIME'], true);
if (!empty($aErrors)) { if (!empty($aErrors) && in_array("ID_PPP_CHANGE_PASSWORD_AFTER_NEXT_LOGIN", $aErrors)) {
if (!defined('NO_DISPLAY_USERNAME')) { if (!defined('NO_DISPLAY_USERNAME')) {
define('NO_DISPLAY_USERNAME', 1); define('NO_DISPLAY_USERNAME', 1);
} }