From cc7703766ef3c11dc635d931fd84a0a3c318397e Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Mon, 19 Jun 2023 08:05:58 +0200
Subject: [PATCH] Patching some changes from master

---
 system/login.php                         | 2 +-
 system/pages/account/change_password.php | 4 +---
 system/pages/online.php                  | 4 ++--
 system/templates/characters.html.twig    | 2 ++
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/login.php b/system/login.php
index 5d55cd18..e018c043 100644
--- a/system/login.php
+++ b/system/login.php
@@ -10,12 +10,12 @@
 defined('MYAAC') or die('Direct access not allowed!');
 $logged = false;
 $logged_flags = 0;
+$account_logged = new OTS_Account();
 
 // stay-logged with sessions
 $current_session = getSession('account');
 if($current_session !== false)
 {
-	$account_logged = new OTS_Account();
 	$account_logged->load($current_session);
 	if($account_logged->isLoaded() && $account_logged->getPassword() == getSession('password')
 		//&& (!isset($_SESSION['admin']) || admin())
diff --git a/system/pages/account/change_password.php b/system/pages/account/change_password.php
index 01190497..deef3602 100644
--- a/system/pages/account/change_password.php
+++ b/system/pages/account/change_password.php
@@ -89,6 +89,4 @@ else
 		));
 		setSession('password', $new_password);
 	}
-}
-
-?>
+}
\ No newline at end of file
diff --git a/system/pages/online.php b/system/pages/online.php
index ca629a3b..2d96a405 100644
--- a/system/pages/online.php
+++ b/system/pages/online.php
@@ -54,9 +54,9 @@ if($config['online_vocations']) {
 }
 
 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
-	$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 = 0;
diff --git a/system/templates/characters.html.twig b/system/templates/characters.html.twig
index 3bbb0159..94f64803 100644
--- a/system/templates/characters.html.twig
+++ b/system/templates/characters.html.twig
@@ -237,11 +237,13 @@
 				</td>
 				<!-- EQUIPMENT_END -->
 				{% endif %}
+
 				{{ hook(constant('HOOK_CHARACTERS_AFTER_EQUIPMENT')) }}
 			</tr>
 		</table>
 
 		{{ hook(constant('HOOK_CHARACTERS_BEFORE_DEATHS')) }}
+
 		{% if deaths|length > 0 %}
 		<!-- DEATHS -->
 		<br/>