Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-06-12 15:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Patching some changes from master

Browse Source
This commit is contained in:
slawkens 2023-06-19 08:05:58 +02:00
parent 76bfab1303
commit cc7703766e
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system/login.php
View File

@ -10,12 +10,12 @@
defined('MYAAC') or die('Direct access not allowed!'); defined('MYAAC') or die('Direct access not allowed!');
$logged = false; $logged = false;
$logged_flags = 0; $logged_flags = 0;
$account_logged = new OTS_Account();
// stay-logged with sessions // stay-logged with sessions
$current_session = getSession('account'); $current_session = getSession('account');
if($current_session !== false) if($current_session !== false)
{ {
$account_logged = new OTS_Account();
$account_logged->load($current_session); $account_logged->load($current_session);
if($account_logged->isLoaded() && $account_logged->getPassword() == getSession('password') if($account_logged->isLoaded() && $account_logged->getPassword() == getSession('password')
//&& (!isset($_SESSION['admin']) || admin()) //&& (!isset($_SESSION['admin']) || admin())

4
system/pages/account/change_password.php
View File

@ -89,6 +89,4 @@ else
)); ));
setSession('password', $new_password); setSession('password', $new_password);
} }
} }
?>

4
system/pages/online.php
View File

@ -54,9 +54,9 @@ if($config['online_vocations']) {
} }
if($db->hasTable('players_online')) // tfs 1.0 if($db->hasTable('players_online')) // tfs 1.0
$playersOnline = $db->query('SELECT `accounts`.`country`, `players`.`name`, `level`, `vocation`' . $outfit . ', `' . $skull_time . '` as `skulltime`, `' . $skull_type . '` as `skull` FROM `accounts`, `players`, `players_online` WHERE `players`.`id` = `players_online`.`player_id` AND `accounts`.`id` = `players`.`account_id` ORDER BY ' . $order); $playersOnline = $db->query('SELECT `accounts`.`country`, `players`.`name`, `players`.`level`, `players`.`vocation`' . $outfit . ', `' . $skull_time . '` as `skulltime`, `' . $skull_type . '` as `skull` FROM `accounts`, `players`, `players_online` WHERE `players`.`id` = `players_online`.`player_id` AND `accounts`.`id` = `players`.`account_id` ORDER BY ' . $order);
else else
$playersOnline = $db->query('SELECT `accounts`.`country`, `players`.`name`, `level`, `vocation`' . $outfit . ', ' . $promotion . ' `' . $skull_time . '` as `skulltime`, `' . $skull_type . '` as `skull` FROM `accounts`, `players` WHERE `players`.`online` > 0 AND `accounts`.`id` = `players`.`account_id` ORDER BY ' . $order); $playersOnline = $db->query('SELECT `accounts`.`country`, `players`.`name`, `players`.`level`, `players`.`vocation`' . $outfit . ', ' . $promotion . ' `' . $skull_time . '` as `skulltime`, `' . $skull_type . '` as `skull` FROM `accounts`, `players` WHERE `players`.`online` > 0 AND `accounts`.`id` = `players`.`account_id` ORDER BY ' . $order);
$players_data = array(); $players_data = array();
$players = 0; $players = 0;

2
system/templates/characters.html.twig
View File

@ -237,11 +237,13 @@
</td> </td>
<!-- EQUIPMENT_END --> <!-- EQUIPMENT_END -->
{% endif %} {% endif %}
{{ hook(constant('HOOK_CHARACTERS_AFTER_EQUIPMENT')) }} {{ hook(constant('HOOK_CHARACTERS_AFTER_EQUIPMENT')) }}
</tr> </tr>
</table> </table>
{{ hook(constant('HOOK_CHARACTERS_BEFORE_DEATHS')) }} {{ hook(constant('HOOK_CHARACTERS_BEFORE_DEATHS')) }}
{% if deaths|length > 0 %} {% if deaths|length > 0 %}
<!-- DEATHS --> <!-- DEATHS -->
<br/> <br/>