Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-26 17:29:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support for downgraded TFS 7.72 (with accounts.number)

Browse Source 
Part 2
This commit is contained in:
slawkens 2021-06-09 01:54:22 +02:00
parent eb091e487d
commit 9ad367370a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
system/init.php
View File

@ -127,6 +127,8 @@ $ots = POT::getInstance();
require_once SYSTEM . 'database.php'; require_once SYSTEM . 'database.php';
define('USE_ACCOUNT_NAME', $db->hasColumn('accounts', 'name')); define('USE_ACCOUNT_NAME', $db->hasColumn('accounts', 'name'));
define('USE_ACCOUNT_NUMBER', $db->hasColumn('accounts', 'number'));
// load vocation names // load vocation names
$tmp = ''; $tmp = '';
if($cache->enabled() && $cache->fetch('vocations', $tmp)) { if($cache->enabled() && $cache->fetch('vocations', $tmp)) {
@ -158,4 +160,4 @@ else {
unset($tmp, $id, $vocation); unset($tmp, $id, $vocation);
require LIBS . 'Towns.php'; require LIBS . 'Towns.php';
Towns::load(); Towns::load();

2
system/login.php
View File

@ -102,7 +102,7 @@ else
&& (!isset($t) || $t['attempts'] < 5) && (!isset($t) || $t['attempts'] < 5)
) )
{ {
setSession('account', $account_logged->getId()); setSession('account', $account_logged->getNumber());
setSession('password', encrypt(($config_salt_enabled ? $account_logged->getCustomField('salt') : '') . $login_password)); setSession('password', encrypt(($config_salt_enabled ? $account_logged->getCustomField('salt') : '') . $login_password));
if($remember_me) { if($remember_me) {
setSession('remember_me', true); setSession('remember_me', true);

2
system/pages/accountmanagement.php
View File

@ -127,7 +127,7 @@ $errors = array();
'email_request' => $email_request, 'email_request' => $email_request,
'email_new_time' => $email_new_time, 'email_new_time' => $email_new_time,
'email_new' => isset($email_new) ? $email_new : '', 'email_new' => isset($email_new) ? $email_new : '',
'account' => USE_ACCOUNT_NAME ? $account_logged->getName() : $account_logged->getId(), 'account' => USE_ACCOUNT_NAME ? $account_logged->getName() : $account_logged->getNumber(),
'account_email' => $account_email, 'account_email' => $account_email,
'account_created' => $account_created, 'account_created' => $account_created,
'account_status' => $account_status, 'account_status' => $account_status,