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

Merged in release/3.3 (pull request #6651)

Browse Source 
HOR-4907

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2018-10-12 13:44:26 +00:00
committed by Julio Cesar Laura Avendaño
parent 651478eecd 847533554f
commit 2b22fdda44
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gulliver/system/class.monologProvider.php
View File

@@ -77,10 +77,6 @@ class MonologProvider
*/ */
public function __construct($channel, $fileLog, $readLoggingLevel = true) public function __construct($channel, $fileLog, $readLoggingLevel = true)
{ {
//Set the minimum levelDebug that will be saved
$levelDebug = $this->defineLevelDebug($readLoggingLevel);
$this->setLevelDebug($levelDebug);
//Set path where the file will be saved //Set path where the file will be saved
$pathFile = $this->definePathFile(); $pathFile = $this->definePathFile();
$this->setPathFile($pathFile); $this->setPathFile($pathFile);
@@ -98,7 +94,8 @@ class MonologProvider
$this->setFilePermission($permissionFile); $this->setFilePermission($permissionFile);
$this->setFormatter(); $this->setFormatter();
$this->setConfig($channel, $fileLog); //Set the config: channel, fileLog and levelDebug that will be saved
$this->setConfig($channel, $fileLog, $readLoggingLevel);
$this->testWriteLog($channel, $fileLog, [ $this->testWriteLog($channel, $fileLog, [
$pathFile $pathFile
@@ -447,7 +444,7 @@ class MonologProvider
if (self::$instance === null) { if (self::$instance === null) {
self::$instance = new MonologProvider($channel, $fileLog, $readLoggingLevel); self::$instance = new MonologProvider($channel, $fileLog, $readLoggingLevel);
} else { } else {
self::$instance->setConfig($channel, $fileLog); self::$instance->setConfig($channel, $fileLog, $readLoggingLevel);
} }
return self::$instance; return self::$instance;
} }
@@ -459,11 +456,14 @@ class MonologProvider
* *
* @param string $channel The logging channel * @param string $channel The logging channel
* @param string $fileLog name file * @param string $fileLog name file
* @param boolean $readLoggingLevel
*/ */
public function setConfig($channel, $fileLog) public function setConfig($channel, $fileLog, $readLoggingLevel = true)
{ {
$this->setStream($fileLog); $this->setStream($fileLog);
$this->setLogger($channel); $this->setLogger($channel);
$levelDebug = $this->defineLevelDebug($readLoggingLevel);
$this->setLevelDebug($levelDebug);
} }
/** /**

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

@@ -319,7 +319,11 @@ try {
$aUserProperty = $oUserProperty->loadOrCreateIfNotExists($_SESSION['USER_LOGGED'], array('USR_PASSWORD_HISTORY' => serialize(array(G::encryptOld($pwd))))); $aUserProperty = $oUserProperty->loadOrCreateIfNotExists($_SESSION['USER_LOGGED'], array('USR_PASSWORD_HISTORY' => serialize(array(G::encryptOld($pwd)))));
$aErrors = $oUserProperty->validatePassword($_POST['form']['USR_PASSWORD'], $aUserProperty['USR_LAST_UPDATE_DATE'], $aUserProperty['USR_LOGGED_NEXT_TIME'], true); $aErrors = $oUserProperty->validatePassword($_POST['form']['USR_PASSWORD'], $aUserProperty['USR_LAST_UPDATE_DATE'], $aUserProperty['USR_LOGGED_NEXT_TIME'], true);
if (!empty($aErrors) && in_array("ID_PPP_CHANGE_PASSWORD_AFTER_NEXT_LOGIN", $aErrors)) { if (!isset($enableChangePasswordAfterNextLogin)) {
$enableChangePasswordAfterNextLogin = true;
}
if ($enableChangePasswordAfterNextLogin && !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);
} }