diff --git a/config/app.php b/config/app.php index 956946042..c74b539f3 100644 --- a/config/app.php +++ b/config/app.php @@ -9,7 +9,7 @@ return [ 'url' => env('APP_URL', 'http://localhost'), 'env' => env('APP_ENV', 'production'), 'debug' => env('APP_DEBUG', false), - 'cache_lifetime' => env('APP_CACHE_LIFETIME', 60), + 'cache_lifetime' => env('APP_CACHE_LIFETIME', 3600), //laravel 8.x the time parameter is in seconds. 'key' => env('APP_KEY', 'base64:rU28h/tElUn/eiLY0qC24jJq1rakvAFRoRl1DWxj/kM='), 'cipher' => 'AES-256-CBC', 'timezone' => 'UTC', diff --git a/workflow/engine/classes/LdapAdvanced.php b/workflow/engine/classes/LdapAdvanced.php index 37321fc67..d8daa3ebc 100644 --- a/workflow/engine/classes/LdapAdvanced.php +++ b/workflow/engine/classes/LdapAdvanced.php @@ -608,7 +608,7 @@ class LdapAdvanced if (empty($message)) { $message = G::LoadTranslation('ID_LDAP_ERROR_CONNECTION'); } - Cache::put('ldapMessageError', $message, 2); + Cache::put('ldapMessageError', $message, 120); //laravel 8.x the time parameter is in seconds. $this->log($linkIdentifier, $messageError); } @@ -1588,7 +1588,7 @@ class LdapAdvanced if ($error = ldap_errno($ldapcnn)) { $messageError = ldap_err2str($error); - Cache::put('ldapMessageError', $messageError, 2); + Cache::put('ldapMessageError', $messageError, 120); //laravel 8.x the time parameter is in seconds. // } else { if ($searchResult) { diff --git a/workflow/engine/methods/emailServer/emailServerGmailOAuth.php b/workflow/engine/methods/emailServer/emailServerGmailOAuth.php index b2ab32d32..4a6d84ec1 100644 --- a/workflow/engine/methods/emailServer/emailServerGmailOAuth.php +++ b/workflow/engine/methods/emailServer/emailServerGmailOAuth.php @@ -20,7 +20,7 @@ try { $googleClient = $gmailOAuth->getGoogleClient(); $result = $googleClient->authenticate($_GET['code']); if (isset($result["error"])) { - Cache::put('errorMessageIfNotAuthenticate', G::json_decode($result["error"]), 2); + Cache::put('errorMessageIfNotAuthenticate', G::json_decode($result["error"]), 120); //laravel 8.x the time parameter is in seconds. G::header($header); return; } @@ -34,7 +34,7 @@ try { * value in minutes for each session. We use 2 minutes, enough time to retrieve * the error message if there is one. */ - Cache::put('errorMessageIfNotAuthenticate', $e->getMessage(), 2); + Cache::put('errorMessageIfNotAuthenticate', $e->getMessage(), 120); //laravel 8.x the time parameter is in seconds. } G::header($header); diff --git a/workflow/engine/methods/emailServer/emailServerOffice365OAuth.php b/workflow/engine/methods/emailServer/emailServerOffice365OAuth.php index f9e1e5971..457efc8e2 100644 --- a/workflow/engine/methods/emailServer/emailServerOffice365OAuth.php +++ b/workflow/engine/methods/emailServer/emailServerOffice365OAuth.php @@ -34,7 +34,7 @@ try { * value in minutes for each session. We use 2 minutes, enough time to retrieve * the error message if there is one. */ - Cache::put('errorMessageIfNotAuthenticate', $e->getMessage(), 2); + Cache::put('errorMessageIfNotAuthenticate', $e->getMessage(), 120); //laravel 8.x the time parameter is in seconds. } G::header($header); diff --git a/workflow/engine/methods/login/authentication.php b/workflow/engine/methods/login/authentication.php index b8f3ed162..a4c8f3efa 100644 --- a/workflow/engine/methods/login/authentication.php +++ b/workflow/engine/methods/login/authentication.php @@ -52,7 +52,7 @@ try { $enterprise->setup(); } /*----------------------------------********---------------------------------*/ - Cache::put('ldapMessageError', '', 2); + Cache::put('ldapMessageError', '', 120); //laravel 8.x the time parameter is in seconds. $uid = $RBAC->VerifyLogin($usr, $pwd); $ldapMessageError = Cache::pull('ldapMessageError'); $RBAC->cleanSessionFiles(72); //cleaning session files older than 72 hours @@ -404,7 +404,7 @@ try { "browserTimeZoneOffset" => $_POST['form']['BROWSER_TIME_ZONE_OFFSET'] ]; $messPassword['__USR_PASSWORD_CHANGE__'] = G::generateUniqueID(); - Cache::put($messPassword['__USR_PASSWORD_CHANGE__'], $values, 2); + Cache::put($messPassword['__USR_PASSWORD_CHANGE__'], $values, 120); //laravel 8.x the time parameter is in seconds. $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/changePasswordpm3', '', $messPassword, 'sysLoginVerify'); G::RenderPage('publish'); session_destroy(); diff --git a/workflow/engine/skinEngine/neoclassic/layout.html b/workflow/engine/skinEngine/neoclassic/layout.html index ae13d3253..45a4e7c5e 100644 --- a/workflow/engine/skinEngine/neoclassic/layout.html +++ b/workflow/engine/skinEngine/neoclassic/layout.html @@ -7,7 +7,7 @@ {$header} - {if ($user_logged neq '' or $tracker neq '') and $timezone_status neq 'failed'} + {if ((isset($user_logged) && $user_logged neq '') or (isset($tracker) && $tracker neq '')) and $timezone_status neq 'failed'}