removing smarty - part XIV (only one more..)

- added some forgotten account-srings
- fixed an error handling ItemFilter /w upgradeItems + markdown appearing in tooltips
- relaxed session-regeneration (only regenerates on status changes (signin/-out)), fixes losing the session, when opening multiple tabs at once
- striped smarty from profiler (only cleanups remaining)
- moved profiler-ajax to AjaxHandler
- created a (dummy, for now) ProfileClass to handle Chars and Profiles
This commit is contained in:
Sarjuuk
2014-07-16 21:48:07 +02:00
parent a82aa2b6ae
commit 0af712a8ff
27 changed files with 1103 additions and 848 deletions

View File

@@ -178,7 +178,7 @@ class User
}
case AUTH_MODE_REALM:
{
if (!DB::isConnected(DB_AUTH))
if (!DB::isConnectable(DB_AUTH))
return AUTH_INTERNAL_ERR;
$wow = DB::Auth()->selectRow('SELECT a.id, a.sha_pass_hash, ab.active AS hasBan FROM account a LEFT JOIN account_banned ab ON ab.id = a.id WHERE username = ? AND ORDER BY ab.active DESC LIMIT 1', $name);
@@ -189,13 +189,12 @@ class User
if (!self::verifySHA1($pass))
return AUTH_WRONGPASS;
if ($wow && !$wow['hasBan'])
if (!self::checkOrCreateInDB($wow['id'], $name))
return AUTH_INTERNAL_ERR;
else if ($wow['hasBan'])
if ($wow['hasBan'])
return AUTH_BANNED;
if (!self::checkOrCreateInDB($wow['id'], $name))
return AUTH_INTERNAL_ERR;
$user = $wow['id'];
break;
}
@@ -395,7 +394,9 @@ class User
public static function destroy()
{
session_regenerate_id(true); // session itself is not destroyed; status changed => regenerate id
session_unset();
$_SESSION['locale'] = self::$localeId; // keep locale
$_SESSION['dataKey'] = self::$dataKey; // keep dataKey