Upgrade to 2018-04-22b 'Greebo'

This commit is contained in:
Niklas Keller
2019-02-17 21:18:33 +01:00
parent 65994a731c
commit ed52dad119
978 changed files with 106855 additions and 8306 deletions

View File

@ -230,7 +230,10 @@ function auth_login($user, $pass, $sticky = false, $silent = false) {
return true;
} else {
//invalid credentials - log off
if(!$silent) msg($lang['badlogin'], -1);
if(!$silent) {
http_status(403, 'Login failed');
msg($lang['badlogin'], -1);
}
auth_logoff();
return false;
}
@ -305,6 +308,9 @@ function auth_browseruid() {
* @return string
*/
function auth_cookiesalt($addsession = false, $secure = false) {
if (defined('SIMPLE_TEST')) {
return 'test';
}
global $conf;
$file = $conf['metadir'].'/_htcookiesalt';
if ($secure || !file_exists($file)) {