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

release/3.2.2 to develop conflicts

Browse Source
This commit is contained in:
Paula Quispe
2017-10-23 11:37:41 -04:00
parent e7ca3e6887 294707cb42
commit 81c90278bd
185 changed files with 2479 additions and 2209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,7 +146,7 @@ try {
$errLabel = G::LoadTranslation('ID_ACCOUNT') . ' "' . $usr . '" ' . G::LoadTranslation('ID_ACCOUNT_DISABLED_CONTACT_ADMIN');
}
//Log failed authentications
$message = "| Many failed authentication attempts for USER: " . $usr . " | IP: " . G::getIpAddress() . " | WS: " . SYS_SYS;
$message = "| Many failed authentication attempts for USER: " . $usr . " | IP: " . G::getIpAddress() . " | WS: " . config("system.workspace");
$message .= " | BROWSER: " . $_SERVER['HTTP_USER_AGENT'];
G::log($message, PATH_DATA, 'loginFailed.log');
@@ -171,7 +171,7 @@ try {
}
if (!isset( $_SESSION['WORKSPACE'] ) ) {
$_SESSION['WORKSPACE'] = SYS_SYS;
$_SESSION['WORKSPACE'] = config("system.workspace");
}
//Execute the SSO Script from plugin
@@ -246,7 +246,7 @@ try {
$userTimeZone = $user->getUsrTimeZone();
if (trim($userTimeZone) == '') {
$arraySystemConfiguration = System::getSystemConfiguration('', '', SYS_SYS);
$arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));
$userTimeZone = $arraySystemConfiguration['time_zone'];
}
@@ -407,7 +407,7 @@ try {
die;
}
$configS = System::getSystemConfiguration('', '', SYS_SYS);
$configS = System::getSystemConfiguration('', '', config("system.workspace"));
$activeSession = isset($configS['session_block']) ? !(int)$configS['session_block']:true;
if ($activeSession){
setcookie("PM-TabPrimary", 101010010, time() + (24 * 60 * 60), '/');