Merge branch 'develop' into feature/app-rewrite

Removed old myaac_admin_menu code
Add logged() + accountLogged() functions

aac

@@ -3,34 +3,5 @@
 
 require_once __DIR__ . '/common.php';
 
-if(!IS_CLI) {
-	echo 'This script can be run only in command line mode.';
-	exit(1);
-}
-
-require_once SYSTEM . 'functions.php';
-
-define('SELF_NAME', basename(__FILE__));
-
-use MyAAC\Plugins;
-use Symfony\Component\Console\Application;
-
-$application = new Application('MyAAC', MYAAC_VERSION);
-
-$commandsGlob = glob(SYSTEM . 'src/Commands/*.php');
-foreach ($commandsGlob as $item) {
-	$name = pathinfo($item, PATHINFO_FILENAME);
-	if ($name == 'Command') { // ignore base Command class
-		continue;
-	}
-
-	$commandPre = '\\MyAAC\Commands\\';
-	$application->add(new ($commandPre . $name));
-}
-
-$pluginCommands = Plugins::getCommands();
-foreach ($pluginCommands as $item) {
-	$application->add(require $item);
-}
-
-$application->run();
+$console = new \MyAAC\App\Console();
+$console->run();

admin/index.php

@@ -1,67 +1,8 @@
 <?php
+require_once '../common.php';
+require_once SYSTEM . 'functions.php';
 
-// few things we'll need
-require '../common.php';
-
-const ADMIN_PANEL = true;
 const MYAAC_ADMIN = true;
 
-if(file_exists(BASE . 'install') && (!isset($config['installed']) || !$config['installed']))
-{
-	header('Location: ' . BASE_URL . 'install/');
-	throw new RuntimeException('Setup detected that <b>install/</b> directory exists. Please visit <a href="' . BASE_URL . 'install">this</a> url to start MyAAC Installation.<br/>Delete <b>install/</b> directory if you already installed MyAAC.<br/>Remember to REFRESH this page when you\'re done!');
-}
-
-$content = '';
-
-// validate page
-$page = $_GET['p'] ?? '';
-if(empty($page) || preg_match("/[^a-zA-Z0-9_\-\/.]/", $page))
-	$page = 'dashboard';
-
-$page = strtolower($page);
-define('PAGE', $page);
-
-require SYSTEM . 'functions.php';
-require SYSTEM . 'init.php';
-
-require __DIR__ . '/includes/debugbar.php';
-require SYSTEM . 'status.php';
-require SYSTEM . 'login.php';
-require __DIR__ . '/includes/functions.php';
-
-$twig->addGlobal('config', $config);
-$twig->addGlobal('status', $status);
-
-if (ACTION == 'logout') {
-	require SYSTEM . 'logout.php';
-}
-
-// if we're not logged in - show login box
-if(!$logged || !admin()) {
-	$page = 'login';
-}
-
-// include our page
-$file = __DIR__ . '/pages/' . $page . '.php';
-if(!@file_exists($file)) {
-	if (str_contains($page, 'plugins/')) {
-		$file = BASE . $page;
-	}
-	else {
-		$page = '404';
-		$file = SYSTEM . 'pages/404.php';
-	}
-}
-
-ob_start();
-if($hooks->trigger(HOOK_ADMIN_BEFORE_PAGE)) {
-	require $file;
-}
-
-$content .= ob_get_contents();
-ob_end_clean();
-
-// template
-$template_path = 'template/';
-require __DIR__ . '/' . $template_path . 'template.php';
+$admin = new \MyAAC\App\Admin();
+$admin->run();

admin/pages/accounts.php

@@ -9,6 +9,7 @@
  */
 
 use MyAAC\Models\Account as AccountModel;
+use MyAAC\Models\AccountAction;
 use MyAAC\Models\Player;
 
 defined('MYAAC') or die('Direct access not allowed!');
@@ -93,7 +94,7 @@ else if (isset($_REQUEST['search'])) {
 ?>
 <div class="row">
 	<?php
-	$groups = new OTS_Groups_List();
+	$groups = app()->get('groups');
 	if ($id > 0) {
 		$account = new OTS_Account();
 		$account->load($id);
@@ -466,9 +467,8 @@ else if (isset($_REQUEST['search'])) {
 									</thead>
 									<tbody>
 										<?php
-											$accountActions = \MyAAC\Models\AccountAction::where('account_id', $account->getId())->orderByDesc('date')->get();
+											$accountActions = AccountAction::where('account_id', $account->getId())->orderByDesc('date')->get();
 											foreach ($accountActions as $i => $log):
-												$log->ip = ($log->ip != 0 ? long2ip($log->ip) : inet_ntop($log->ipv6));
 												?>
 											<tr>
 												<td><?php echo $i + 1; ?></td>

admin/pages/changelog.php

@@ -110,7 +110,7 @@ if($action == 'edit' || $action == 'new') {
 		$player->load($player_id);
 	}
 
-	$account_players = $account_logged->getPlayersList();
+	$account_players = accountLogged()->getPlayersList();
 	$account_players->orderBy('group_id', POT::ORDER_DESC);
 	$twig->display('admin.changelog.form.html.twig', array(
 		'action' => $action,

admin/pages/login.php

@@ -13,7 +13,7 @@ $title = 'Login';
 csrfProtect();
 
 require PAGES . 'account/login.php';
-if ($logged) {
+if (logged()) {
 	header('Location: ' . (admin() ? ADMIN_URL : BASE_URL));
 	return;
 }

admin/pages/mass_account.php

@@ -57,13 +57,14 @@ function admin_give_coins($coins)
 
 function admin_give_premdays($days)
 {
-	global $db, $freePremium;
+	global $freePremium;
 
 	if ($freePremium) {
 		displayMessage('Premium days not supported. Free Premium enabled.');
 		return;
 	}
 
+	$db = app()->get('database');
 	$value = $days * 86400;
 	$now = time();
 	// othire
@@ -174,10 +175,12 @@ else {
 }
 
 function displayMessage($message, $success = false) {
-	global $twig, $hasCoinsColumn, $hasPointsColumn, $freePremium;
+	global $hasCoinsColumn, $hasPointsColumn, $freePremium;
 
 	$success ? success($message): error($message);
 
+	$twig = app()->get('twig');
+
 	$twig->display('admin.tools.account.html.twig', array(
 		'hasCoinsColumn' => $hasCoinsColumn,
 		'hasPointsColumn' => $hasPointsColumn,

admin/pages/mass_teleport.php

@@ -99,9 +99,9 @@ else {
 }
 
 
-function displayMessage($message, $success = false) {
-	global $twig;
-
+function displayMessage($message, $success = false)
+{
+	$twig = app()->get('twig');
 	$success ? success($message): error($message);
 	$twig->display('admin.tools.teleport.html.twig', array());
 }

admin/pages/menus.php

@@ -203,7 +203,7 @@ if (isset($_POST['template'])) {
 
 function onTemplateMenusChange(): void
 {
-	$cache = Cache::getInstance();
+	$cache = app()->get('cache');
 	if ($cache->enabled()) {
 		$cache->delete('template_menus');
 	}

admin/pages/modules/statistics.php

@@ -7,6 +7,8 @@ use MyAAC\Models\Monster;
 use MyAAC\Models\Player;
 
 defined('MYAAC') or die('Direct access not allowed!');
+
+global $eloquentConnection;
 $count = $eloquentConnection->query()
 	->select([
 		'total_accounts' => Account::selectRaw('COUNT(id)'),

admin/pages/news.php

@@ -50,7 +50,7 @@ if(!empty($action))
 	if (isRequestMethod('post')) {
 		if ($action == 'new') {
 			if (isset($forum_section) && $forum_section != '-1') {
-				$forum_add = Forum::add_thread($p_title, $body, $forum_section, $player_id, $account_logged->getId(), $errors);
+				$forum_add = Forum::add_thread($p_title, $body, $forum_section, $player_id, accountLogged()->getId(), $errors);
 			}
 
 			if (isset($p_title) && News::add($p_title, $body, $type, $category, $player_id, isset($forum_add) && $forum_add != 0 ? $forum_add : 0, $article_text, $article_image, $errors)) {
@@ -113,7 +113,7 @@ if($action == 'edit' || $action == 'new') {
 		$player->load($player_id);
 	}
 
-	$account_players = $account_logged->getPlayersList();
+	$account_players = accountLogged()->getPlayersList();
 	$account_players->orderBy('group_id', POT::ORDER_DESC);
 	$twig->display('admin.news.form.html.twig', array(
 		'action' => $action,

admin/pages/notepad.php

@@ -15,21 +15,18 @@ $title = 'Notepad';
 
 csrfProtect();
 
-/**
- * @var OTS_Account $account_logged
- */
 $_content = '';
-$notepad = ModelsNotepad::where('account_id', $account_logged->getId())->first();
+$notepad = ModelsNotepad::where('account_id', accountLogged()->getId())->first();
 if (isset($_POST['content'])) {
 	$_content = html_entity_decode(stripslashes($_POST['content']));
 	if (!$notepad) {
 		ModelsNotepad::create([
-			'account_id' => $account_logged->getId(),
+			'account_id' => accountLogged()->getId(),
 			'content' => $_content
 		]);
 	}
 	else {
-		ModelsNotepad::where('account_id', $account_logged->getId())->update(['content' => $_content]);
+		ModelsNotepad::where('account_id', accountLogged()->getId())->update(['content' => $_content]);
 	}
 
 	success('Saved at ' . date('H:i'));

admin/pages/pages.php

@@ -25,7 +25,7 @@ if (!hasFlag(FLAG_CONTENT_PAGES) && !superAdmin()) {
 header('X-XSS-Protection:0');
 
 $name = $p_title = null;
-$groups = new OTS_Groups_List();
+$groups = app()->get('groups');
 
 $php = false;
 $enable_tinymce = true;

admin/pages/players.php

@@ -71,7 +71,7 @@ else if (isset($_REQUEST['search'])) {
 ?>
 <div class="row">
 	<?php
-	$groups = new OTS_Groups_List();
+	$groups = app()->get('groups');
 	if ($id > 0) {
 		$player = new OTS_Player();
 		$player->load($id);

admin/template/menus.php

@@ -1,5 +1,7 @@
 <?php
 
+global $menus;
+
 $menus = [
 	['name' => 'Dashboard', 'icon' => 'tachometer-alt', 'order' => 10, 'link' => 'dashboard'],
 	['name' => 'Settings', 'icon' => 'edit', 'order' => 19, 'link' =>

admin/template/template.php

@@ -21,7 +21,7 @@
 </head>
 <body class="sidebar-mini ">
 <?php $hooks->trigger(HOOK_ADMIN_BODY_START); ?>
-<?php if ($logged && admin()) { ?>
+<?php if (admin()) { ?>
 	<div class="wrapper">
 		<nav class="main-header navbar navbar-expand navbar-white navbar-light">
 			<ul class="navbar-nav">
@@ -40,7 +40,7 @@
 		</nav>
 		<aside class="main-sidebar sidebar-dark-info elevation-4">
 			<a href="<?php echo ADMIN_URL; ?>" class="brand-link navbar-info">
-				<img src="<?php echo ADMIN_URL; ?>images/logo.png" class="brand-image img-circle elevation-3" style="opacity: .8">
+				<img src="<?php echo ADMIN_URL; ?>images/logo.png" class="brand-image img-circle elevation-3" style="opacity: .8" alt="MyAAC">
 				<span class="brand-text"><b>My</b>AAC</span>
 			</a>
 			<div class="sidebar">
@@ -97,20 +97,6 @@
 								<?php
 							}
 						}
-
-						$query = $db->query('SELECT `name`, `page`, `flags` FROM `' . TABLE_PREFIX . 'admin_menu` ORDER BY `ordering`');
-						$menu_db = $query->fetchAll();
-						foreach ($menu_db as $item) {
-							if ($item['flags'] == 0 || hasFlag($item['flags'])) { ?>
-								<li class="nav-item">
-									<a class="nav-link<?php echo($page == $item['page'] ? ' active' : '') ?>" href="?p=<?php echo $item['page'] ?>">
-										<i class="nav-icon fas fa-link"></i>
-										<p><?php echo $item['name'] ?></p>
-									</a>
-								</li>
-								<?php
-							}
-						}
 						?>
 					</ul>
 				</nav>
@@ -122,7 +108,7 @@
 				<div class="container-fluid">
 					<div class="row mb-2">
 						<div class="col-sm-6">
-							<h3 class="m-0 text-dark"><?php echo(isset($title) ? $title : ''); ?><small> - Admin Panel</small></h3>
+							<h3 class="m-0 text-dark"><?php echo($title ?? ''); ?><small> - Admin Panel</small></h3>
 						</div>
 						<div class="col-sm-6">
 							<div class="float-sm-right d-none d-sm-inline">
@@ -177,17 +163,14 @@
 		<div id="sidebar-overlay"></div>
 	</div>
 
-<?php } else if (!$logged && !admin()) {
+<?php } else if (!logged() && !admin()) {
 	echo $content;
 }
 ?>
 <?php
-/**
- * @var OTS_Account $account_logged
- */
-if ($logged && admin()) {
+if (admin()) {
 	$twig->display('admin-bar.html.twig', [
-		'username' => USE_ACCOUNT_NAME ? $account_logged->getName() : $account_logged->getId()
+		'username' => USE_ACCOUNT_NAME ? accountLogged()->getName() : accountLogged()->getId()
 	]);
 }
 ?>

admin/tools/phpinfo.php

@@ -1,15 +1,22 @@
 <?php
+
+use MyAAC\Services\LoginService;
+
 define('MYAAC_ADMIN', true);
 
 require '../../common.php';
 require SYSTEM . 'functions.php';
 require SYSTEM . 'init.php';
-require SYSTEM . 'login.php';
 
-if(!admin())
+$loginService = new LoginService();
+$loginService->checkLogin();
+
+if(!admin()) {
 	die('Access denied.');
+}
 
-if(!function_exists('phpinfo'))
+if(!function_exists('phpinfo')) {
 	die('phpinfo() disabled on this web server.');
+}
 
 phpinfo();

admin/tools/reload_data.php

@@ -24,16 +24,20 @@
  */
 
 use MyAAC\DataLoader;
+use MyAAC\Services\LoginService;
 
 const MYAAC_ADMIN = true;
 
 require '../../common.php';
 require SYSTEM . 'functions.php';
 require SYSTEM . 'init.php';
-require SYSTEM . 'login.php';
 
-if (!admin())
+$loginService = new LoginService();
+$loginService->checkLogin();
+
+if (!admin()) {
 	die('Access denied.');
+}
 
 ini_set('max_execution_time', 300);
 ob_implicit_flush();

admin/tools/settings_save.php

@@ -1,6 +1,6 @@
 <?php
 
-use MyAAC\Hooks;
+use MyAAC\Services\LoginService;
 use MyAAC\Settings;
 
 const MYAAC_ADMIN = true;
@@ -8,7 +8,9 @@ const MYAAC_ADMIN = true;
 require '../../common.php';
 require SYSTEM . 'functions.php';
 require SYSTEM . 'init.php';
-require SYSTEM . 'login.php';
+
+$loginService = new LoginService();
+$loginService->checkLogin();
 
 if(!admin()) {
 	http_response_code(500);
@@ -27,7 +29,7 @@ if (!isset($_POST['settings'])) {
 	die('Please enter settings.');
 }
 
-$settings = Settings::getInstance();
+$settings = app()->get('settings');
 
 $success = $settings->save($_REQUEST['plugin'], $_POST['settings']);
 

admin/tools/status.php

@@ -1,14 +1,20 @@
 <?php
+
+use MyAAC\Services\LoginService;
+
 define('MYAAC_ADMIN', true);
 
 require '../../common.php';
 require SYSTEM . 'init.php';
 require SYSTEM . 'functions.php';
 require SYSTEM . 'status.php';
-require SYSTEM . 'login.php';
 
-if(!admin())
+$loginService = new LoginService();
+$loginService->checkLogin();
+
+if(!admin()) {
 	die('Access denied.');
+}
 
 if(!$status['online'])
 	die('Offline');

admin/tools/upload_image.php

@@ -1,13 +1,19 @@
 <?php
+
+use MyAAC\Services\LoginService;
+
 define('MYAAC_ADMIN', true);
 
 require '../../common.php';
 require SYSTEM . 'functions.php';
 require SYSTEM . 'init.php';
-require SYSTEM . 'login.php';
 
-if(!admin())
+$loginService = new LoginService();
+$loginService->checkLogin();
+
+if(!admin()) {
 	die('Access denied.');
+}
 
 // Don't attempt to process the upload on an OPTIONS request
 if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {

common.php

@@ -26,8 +26,8 @@
 if (version_compare(phpversion(), '8.1', '<')) die('PHP version 8.1 or higher is required.');
 
 const MYAAC = true;
-const MYAAC_VERSION = '1.3.1';
-const DATABASE_VERSION = 43;
+const MYAAC_VERSION = '2.0-dev';
+const DATABASE_VERSION = 44;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));
 define('MYAAC_OS', stripos(PHP_OS, 'WIN') === 0 ? 'WINDOWS' : (strtoupper(PHP_OS) === 'DARWIN' ? 'MAC' : 'LINUX'));

index.php

@@ -24,160 +24,7 @@
  * @link      https://my-aac.org
  */
 
-use MyAAC\UsageStatistics;
-use MyAAC\Visitors;
-
 require_once 'common.php';
 require_once SYSTEM . 'functions.php';
 
-$uri = $_SERVER['REQUEST_URI'];
-if(false !== strpos($uri, 'index.php')) {
-	$uri = str_replace_first('/index.php', '', $uri);
-}
-
-if(0 === strpos($uri, '/')) {
-	$uri = str_replace_first('/', '', $uri);
-}
-
-if(preg_match("/^[A-Za-z0-9-_%'+\/]+\.png$/i", $uri)) {
-	if (!empty(BASE_DIR)) {
-		$tmp = explode('.', str_replace_first(str_replace_first('/', '', BASE_DIR) . '/', '', $uri));
-	}
-	else {
-		$tmp = explode('.', $uri);
-	}
-
-	$_REQUEST['name'] = urldecode($tmp[0]);
-
-	chdir(TOOLS . 'signature');
-	include TOOLS . 'signature/index.php';
-	exit();
-}
-
-if(preg_match("/^(.*)\.(gif|jpg|png|jpeg|tiff|bmp|css|js|less|map|html|zip|rar|gz|ttf|woff|ico)$/i", $_SERVER['REQUEST_URI'])) {
-	http_response_code(404);
-	exit;
-}
-
-if((!isset($config['installed']) || !$config['installed']) && file_exists(BASE . 'install'))
-{
-	header('Location: ' . BASE_URL . 'install/');
-	exit();
-}
-
-$template_place_holders = array();
-
-require_once SYSTEM . 'init.php';
-
-require_once SYSTEM . 'template.php';
-require_once SYSTEM . 'login.php';
-require_once SYSTEM . 'status.php';
-
-$twig->addGlobal('config', $config);
-$twig->addGlobal('status', $status);
-
-$hooks->trigger(HOOK_STARTUP);
-
-// backward support for gesior
-if(setting('core.backward_support')) {
-	define('INITIALIZED', true);
-	$SQL = $db;
-	$layout_header = template_header();
-	$layout_name = $template_path;
-	$news_content = '';
-	$tickers_content = '';
-	$main_content = '';
-
-	$config['access_admin_panel'] = 2;
-	$group_id_of_acc_logged = 0;
-	if($logged && $account_logged)
-		$group_id_of_acc_logged = $account_logged->getGroupId();
-
-	$config['site'] = &$config;
-	$config['server'] = &$config['lua'];
-	$config['site']['shop_system'] = setting('core.gifts_system');
-	$config['site']['gallery_page'] = true;
-
-	if(!isset($config['vdarkborder']))
-		$config['vdarkborder'] = '#505050';
-	if(!isset($config['darkborder']))
-		$config['darkborder'] = '#D4C0A1';
-	if(!isset($config['lightborder']))
-		$config['lightborder'] = '#F1E0C6';
-
-	$config['site']['download_page'] = true;
-	$config['site']['serverinfo_page'] = true;
-	$config['site']['screenshot_page'] = true;
-
-	$forumSetting = setting('core.forum');
-	if($forumSetting != '')
-		$config['forum_link'] = (strtolower($forumSetting) === 'site' ? getLink('forum') : $forumSetting);
-
-	foreach($status as $key => $value)
-		$config['status']['serverStatus_' . $key] = $value;
-}
-
-require_once SYSTEM . 'router.php';
-
-// anonymous usage statistics
-// sent only when user agrees
-if(setting('core.anonymous_usage_statistics')) {
-	$report_time = 30 * 24 * 60 * 60; // report one time per 30 days
-	$should_report = true;
-
-	$value = '';
-	if($cache->enabled() && $cache->fetch('last_usage_report', $value)) {
-		$should_report = time() > (int)$value + $report_time;
-	}
-	else {
-		$value = '';
-		if(fetchDatabaseConfig('last_usage_report', $value)) {
-			$should_report = time() > (int)$value + $report_time;
-			if($cache->enabled()) {
-				$cache->set('last_usage_report', $value, 60 * 60);
-			}
-		}
-		else {
-			registerDatabaseConfig('last_usage_report', time() - ($report_time - (7 * 24 * 60 * 60))); // first report after a week
-			$should_report = false;
-		}
-	}
-
-	if($should_report) {
-		UsageStatistics::report();
-
-		updateDatabaseConfig('last_usage_report', time());
-		if($cache->enabled()) {
-			$cache->set('last_usage_report', time(), 60 * 60);
-		}
-	}
-}
-
-if(setting('core.views_counter'))
-	require_once SYSTEM . 'counter.php';
-
-if(setting('core.visitors_counter')) {
-	$visitors = new Visitors(setting('core.visitors_counter_ttl'));
-}
-
-/**
- * @var OTS_Account $account_logged
- */
-if ($logged && admin()) {
-	$content .= $twig->render('admin-bar.html.twig', [
-		'username' => USE_ACCOUNT_NAME ? $account_logged->getName() : $account_logged->getId()
-	]);
-}
-$title_full =  (isset($title) ? $title . ' - ' : '') . $config['lua']['serverName'];
-require $template_path . '/' . $template_index;
-
-echo base64_decode('PCEtLSBQb3dlcmVkIGJ5IE15QUFDIDo6IGh0dHBzOi8vd3d3Lm15LWFhYy5vcmcvIC0tPg==') . PHP_EOL;
-if(superAdmin()) {
-	echo '<!-- Generated in: ' . round(microtime(true) - START_TIME, 4) . 'ms -->';
-	echo PHP_EOL . '<!-- Queries done: ' . $db->queries() . ' -->';
-	if(function_exists('memory_get_peak_usage')) {
-		echo PHP_EOL . '<!-- Peak memory usage: ' . convert_bytes(memory_get_peak_usage(true)) . ' -->';
-	}
-}
-
-$hooks->trigger(HOOK_FINISH);
+app()->run();

install/includes/functions.php

@@ -2,7 +2,9 @@
 defined('MYAAC') or die('Direct access not allowed!');
 function query($query)
 {
-	global $db, $error;
+	global $error;
+
+	$db = app()->get('database');
 
 	try {
 		$db->query($query);

install/includes/schema.sql

@@ -2,12 +2,12 @@ SET @myaac_database_version = 43;
 
 CREATE TABLE `myaac_account_actions`
 (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`account_id` INT(11) NOT NULL,
-	`ip` INT(10) UNSIGNED NOT NULL DEFAULT 0,
-	`ipv6` BINARY(16) NOT NULL DEFAULT 0,
+	`ip` VARCHAR(45) NOT NULL DEFAULT '',
 	`date` INT(11) NOT NULL DEFAULT 0,
 	`action` VARCHAR(255) NOT NULL DEFAULT '',
-	KEY (`account_id`)
+	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8mb4;
 
 CREATE TABLE `myaac_admin_menu`

install/steps/7-finish.php

@@ -12,7 +12,7 @@ if(isset($config['installed']) && $config['installed'] && !isset($_SESSION['save
 	return;
 }
 
-$cache = Cache::getInstance();
+$cache = app()->get('cache');
 if ($cache->enabled()) {
 	// clear plugin_hooks to have fresh hooks
 	$cache->delete('plugins_hooks');
@@ -58,7 +58,7 @@ if ($db->hasTable('players')) {
 		$player_used = &$player_db;
 	}
 
-	$groups = new OTS_Groups_List();
+	$groups = app()->get('groups');
 	$player_used->setGroupId($groups->getHighestId());
 }
 

install/tools/7-finish.php

@@ -33,7 +33,9 @@ if ($db->hasTable('players')) {
 	$time = time();
 	function insert_sample_if_not_exist($p)
 	{
-		global $db, $success, $deleted, $time;
+		global $success, $deleted, $time;
+
+		$db = app()->get('database');
 
 		$query = $db->query('SELECT `id` FROM `players` WHERE `name` = ' . $db->quote($p['name']));
 		if ($query->rowCount() == 0) {

system/compat/base.php

@@ -9,72 +9,6 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-class Validator extends \MyAAC\Validator {}
-
-function check_name($name, &$errors = '') {
-	if(Validator::characterName($name))
-		return true;
-
-	$errors = Validator::getLastError();
-	return false;
-}
-
-function check_account_id($id, &$errors = '') {
-	if(Validator::accountId($id))
-		return true;
-
-	$errors = Validator::getLastError();
-	return false;
-}
-
-function check_account_name($name, &$errors = '') {
-	if(Validator::accountName($name))
-		return true;
-
-	$errors = Validator::getLastError();
-	return false;
-}
-
-function check_name_new_char($name, &$errors = '') {
-	if(Validator::newCharacterName($name))
-		return true;
-
-	$errors = Validator::getLastError();
-	return false;
-}
-
-function check_rank_name($name, &$errors = '') {
-	if(Validator::rankName($name))
-		return true;
-
-	$errors = Validator::getLastError();
-	return false;
-}
-
-function check_guild_name($name, &$errors = '') {
-	if(Validator::guildName($name))
-		return true;
-
-	$errors = Validator::getLastError();
-	return false;
-}
-
-function news_place() {
-	return tickers();
-}
-
-function tableExist($table)
-{
-	global $db;
-	return $db->hasTable($table);
-}
-
-function fieldExist($field, $table)
-{
-	global $db;
-	return $db->hasColumn($table, $field);
-}
-
 function getCreatureImgPath($creature): string {
 	return getMonsterImgPath($creature);
 }

system/compat/classes.php

@@ -38,3 +38,4 @@ class GuildRank extends OTS_GuildRank {}
 class House extends OTS_House {}
 
 class Cache extends \MyAAC\Cache\Cache {}
+class Validator extends \MyAAC\Validator {}

system/compat/pages.php

@@ -1,60 +0,0 @@
-<?php
-/**
- * Compat pages (backward support for Gesior AAC)
- *
- * @package   MyAAC
- * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2019 MyAAC
- * @link      https://my-aac.org
- */
-defined('MYAAC') or die('Direct access not allowed!');
-switch($page)
-{
-	case 'adminpanel':
-		header('Location: ' . ADMIN_URL);
-		die;
-
-	case 'createaccount':
-		$page = 'account/create';
-		break;
-
-	case 'accountmanagement':
-		$page = 'account/manage';
-		break;
-
-	case 'lostaccount':
-		$page = 'account/lost';
-		break;
-
-	case 'whoisonline':
-		$page = 'online';
-		break;
-
-	case 'latestnews':
-		$page = 'news';
-		break;
-
-	case 'archive':
-	case 'newsarchive':
-		$page = 'news/archive';
-		break;
-
-	case 'tibiarules':
-		$page = 'rules';
-		break;
-
-	case 'killstatistics':
-		$page = 'last-kills';
-		break;
-
-	case 'buypoints':
-		$page = 'points';
-		break;
-
-	case 'shopsystem':
-		$page = 'gifts';
-		break;
-
-	default:
-		break;
-}

system/counter.php

@@ -15,7 +15,7 @@ define('COUNTER_SYNC', 10); // how often counter is synchronized with database (
 
 $views_counter = 1; // default value, must be here!
 
-$cache = Cache::getInstance();
+$cache = app()->get('cache');
 if($cache->enabled())
 {
 	$value = 0;

system/database.php

@@ -1,141 +0,0 @@
-<?php
-/**
- * Database connection
- *
- * @package   MyAAC
- * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2019 MyAAC
- * @link      https://my-aac.org
- */
-
-use Illuminate\Database\Capsule\Manager as Capsule;
-
-defined('MYAAC') or die('Direct access not allowed!');
-
-if (!isset($config['database_overwrite'])) {
-	$config['database_overwrite'] = false;
-}
-
-if(!$config['database_overwrite'] && !isset($config['database_user'][0], $config['database_password'][0], $config['database_name'][0]))
-{
-	if(isset($config['lua']['sqlType'])) {// tfs 0.3
-		if(isset($config['lua']['mysqlHost'])) {// tfs 0.2
-			$config['otserv_version'] = TFS_02;
-			$config['database_type'] = 'mysql';
-			$config['database_host'] = $config['lua']['mysqlHost'];
-			$config['database_port'] = $config['lua']['mysqlPort'];
-			$config['database_user'] = $config['lua']['mysqlUser'];
-			$config['database_password'] = $config['lua']['mysqlPass'];
-			$config['database_name'] = $config['lua']['mysqlDatabase'];
-			$config['database_encryption'] = $config['lua']['passwordType'];
-		}
-		else {
-			$config['otserv_version'] = TFS_03;
-			$config['database_type'] = $config['lua']['sqlType'];
-			$config['database_host'] = $config['lua']['sqlHost'];
-			$config['database_port'] = $config['lua']['sqlPort'];
-			$config['database_user'] = $config['lua']['sqlUser'];
-			$config['database_password'] = $config['lua']['sqlPass'];
-			$config['database_name'] = $config['lua']['sqlDatabase'];
-
-			$config['database_encryption'] = $config['lua']['encryptionType'];
-			if(!isset($config['database_encryption']) || empty($config['database_encryption'])) // before 0.3.6
-				$config['database_encryption'] = $config['lua']['passwordType'];
-		}
-	}
-	else if(isset($config['lua']['mysqlHost'])) // tfs 1.0
-	{
-		$config['otserv_version'] = TFS_02;
-		$config['database_type'] = 'mysql';
-		$config['database_host'] = $config['lua']['mysqlHost'];
-		$config['database_port'] = $config['lua']['mysqlPort'];
-		$config['database_user'] = $config['lua']['mysqlUser'];
-		$config['database_password'] = $config['lua']['mysqlPass'];
-		$config['database_name'] = $config['lua']['mysqlDatabase'];
-		if(!isset($config['database_socket'][0])) {
-			$config['database_socket'] = isset($config['lua']['mysqlSock']) ? trim($config['lua']['mysqlSock']) : '';
-		}
-		$config['database_encryption'] = 'sha1';
-	}
-	else if(isset($config['lua']['database_type'])) // otserv
-	{
-		$config['otserv_version'] = OTSERV;
-		$config['database_type'] = $config['lua']['database_type'];
-		$config['database_host'] = $config['lua']['database_host'];
-		$config['database_port'] = $config['lua']['database_port'];
-		$config['database_user'] = $config['lua']['database_username'];
-		$config['database_password'] = $config['lua']['database_password'];
-		$config['database_name'] = $config['lua']['database_schema'];
-		$config['database_encryption'] = isset($config['lua']['passwordtype']) ? $config['lua']['passwordtype'] : $config['lua']['password_type'];
-		$config['database_salt'] = isset($config['lua']['passwordsalt']) ? $config['lua']['passwordsalt'] : $config['lua']['password_salt'];
-	}
-	else if(isset($config['lua']['sql_host'])) // otserv 0.6.3 / 0.6.4
-	{
-		$config['otserv_version'] = OTSERV_06;
-		$config['database_type'] = $config['lua']['sql_type'];
-		$config['database_host'] = $config['lua']['sql_host'];
-		$config['database_port'] = $config['lua']['sql_port'];
-		$config['database_user'] = $config['lua']['sql_user'];
-		$config['database_password'] = $config['lua']['sql_pass'];
-		$config['database_name'] = $config['lua']['sql_db'];
-		$config['database_encryption'] = isset($config['lua']['passwordtype']) ? $config['lua']['passwordtype'] : $config['lua']['password_type'];
-		$config['database_salt'] = isset($config['lua']['passwordsalt']) ? $config['lua']['passwordsalt'] : $config['lua']['password_salt'];
-	}
-}
-
-if(isset($config['lua']['useMD5Passwords']) && getBoolean($config['lua']['useMD5Passwords']))
-	$config['database_encryption'] = 'md5';
-
-if(!isset($config['database_log'])) {
-	$config['database_log'] = false;
-}
-
-if(!isset($config['database_socket'])) {
-	$config['database_socket'] = '';
-}
-
-
-try {
-	$ots->connect(array(
-		'host' => $config['database_host'],
-		'user' => $config['database_user'],
-		'password' => $config['database_password'],
-		'database' => $config['database_name'],
-		'log' => $config['database_log'],
-		'socket' => @$config['database_socket'],
-		'persistent' => @$config['database_persistent']
-	));
-
-	global $db;
-	$db = POT::getInstance()->getDBHandle();
-	$capsule = new Capsule;
-	$capsule->addConnection([
-		'driver' => 'mysql',
-		'database' => $config['database_name'],
-	]);
-
-	$capsule->getConnection()->setPdo($db);
-	$capsule->getConnection()->setReadPdo($db);
-
-	$capsule->setAsGlobal();
-	$capsule->bootEloquent();
-
-	$eloquentConnection = $capsule->getConnection();
-
-} catch (Exception $e) {
-	if(isset($cache) && $cache->enabled()) {
-		$cache->delete('config_lua');
-	}
-
-	if(defined('MYAAC_INSTALL')) {
-		$error = $e->getMessage();
-		return; // installer will take care of this
-	}
-
-	throw new RuntimeException('ERROR: Cannot connect to MySQL database.<br/>' .
-		'Possible reasons:' .
-		'<ul>' .
-			'<li>MySQL is not configured propertly in <i>config.lua</i>.</li>' .
-			'<li>MySQL server is not running.</li>' .
-		'</ul>' . $e->getMessage());
-}

system/functions.php

@@ -9,6 +9,7 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+use MyAAC\App\App;
 use MyAAC\Cache\Cache;
 use MyAAC\CsrfToken;
 use MyAAC\Items;
@@ -274,7 +275,10 @@ function generateRandomString($length, $lowCase = true, $upCase = false, $numeri
  */
 function getForumBoards()
 {
-	global $db, $canEdit;
+	global $canEdit;
+
+	$db = app()->get('database');
+
 	$sections = $db->query('SELECT `id`, `name`, `description`, `closed`, `guild`, `access`' . ($canEdit ? ', `hide`, `ordering`' : '') . ' FROM `' . TABLE_PREFIX . 'forum_boards` ' . (!$canEdit ? ' WHERE `hide` != 1' : '') .
 		' ORDER BY `ordering`;');
 	if($sections)
@@ -350,13 +354,12 @@ function updateDatabaseConfig($name, $value)
  */
 function encrypt($str)
 {
-	global $config;
-	if(isset($config['database_salt'])) // otserv
-		$str .= $config['database_salt'];
+	$configDatabaseSalt = config('database_salt');
+	if(isset($configDatabaseSalt)) // otserv
+		$str .= $configDatabaseSalt;
 
-	$encryptionType = $config['database_encryption'];
-	if(isset($encryptionType) && strtolower($encryptionType) !== 'plain')
-	{
+	$encryptionType = config('database_encryption');
+	if(isset($encryptionType) && strtolower($encryptionType) !== 'plain') {
 		if($encryptionType === 'vahash')
 			return base64_encode(hash('sha256', $str));
 
@@ -432,7 +435,7 @@ function delete_guild($id)
 	if(count($rank_list) > 0) {
 		$rank_list->orderBy('level');
 
-		global $db;
+		$db = app()->get('database');
 		/**
 		 * @var OTS_GuildRank $rank_in_guild
 		 */
@@ -494,9 +497,11 @@ function tickers()
  */
 function template_place_holder($type): string
 {
-	global $twig, $template_place_holders, $debugBar;
+	global $template_place_holders, $debugBar;
 	$ret = '';
 
+	$twig = app()->get('twig');
+
 	if (isset($debugBar)) {
 		$debugBarRenderer = $debugBar->getJavascriptRenderer();
 	}
@@ -528,9 +533,11 @@ function template_place_holder($type): string
  */
 function template_header($is_admin = false): string
 {
-	global $title_full, $twig;
+	global $title_full;
 	$charset = setting('core.charset') ?? 'utf-8';
 
+	$twig = app()->get('twig');
+
 	return $twig->render('templates.header.html.twig',
 		[
 			'charset' => $charset,
@@ -545,38 +552,44 @@ function template_header($is_admin = false): string
  */
 function template_footer(): string
 {
-	global $views_counter;
-	$ret = '';
+	$footer = [];
+
 	if(admin()) {
-		$ret .= generateLink(ADMIN_URL, 'Admin Panel', true);
+		$footer[] = generateLink(ADMIN_URL, 'Admin Panel', true);
 	}
 
 	if(setting('core.visitors_counter')) {
 		global $visitors;
 		$amount = $visitors->getAmountVisitors();
-		$ret .= '<br/>Currently there ' . ($amount > 1 ? 'are' : 'is') . ' ' . $amount . ' visitor' . ($amount > 1 ? 's' : '') . '.';
+		$footer[] = 'Currently there ' . ($amount > 1 ? 'are' : 'is') . ' ' . $amount . ' visitor' . ($amount > 1 ? 's' : '') . '.';
 	}
 
 	if(setting('core.views_counter')) {
-		$ret .= '<br/>Page has been viewed ' . $views_counter . ' times.';
+		global $views_counter;
+		$footer[] = 'Page has been viewed ' . $views_counter . ' times.';
 	}
 
 	if(setting('core.footer_load_time')) {
-		$ret .= '<br/>Load time: ' . round(microtime(true) - START_TIME, 4) . ' seconds.';
+		$footer[] = 'Load time: ' . round(microtime(true) - START_TIME, 4) . ' seconds.';
 	}
 
 	$settingFooter = setting('core.footer');
 	if(isset($settingFooter[0])) {
-		$ret .= '<br/>' . $settingFooter;
+		$footer[] = '' . $settingFooter;
 	}
 
 	// please respect my work and help spreading the word, thanks!
-	return $ret . '<br/>' . base64_decode('UG93ZXJlZCBieSA8YSBocmVmPSJodHRwOi8vbXktYWFjLm9yZyIgdGFyZ2V0PSJfYmxhbmsiPk15QUFDLjwvYT4=');
+	$footer[] = base64_decode('UG93ZXJlZCBieSA8YSBocmVmPSJodHRwOi8vbXktYWFjLm9yZyIgdGFyZ2V0PSJfYmxhbmsiPk15QUFDLjwvYT4=');
+
+	$hooks = app()->get('hooks');
+	$footer = $hooks->triggerFilter(HOOK_FILTER_THEME_FOOTER, $footer);
+
+	return implode('<br/>', $footer);
 }
 
 function template_ga_code()
 {
-	global $twig;
+	$twig = app()->get('twig');
 	if(!isset(setting('core.google_analytics_id')[0]))
 		return '';
 
@@ -595,14 +608,12 @@ function template_form()
 	foreach($templates as $value)
 		$options .= '<option ' . ($template_name == $value ? 'SELECTED' : '') . '>' . $value . '</option>';
 
-	global $twig;
+	$twig = app()->get('twig');
 	return $twig->render('forms.change_template.html.twig', ['options' => $options]);
 }
 
-function getStyle($i)
-{
-	global $config;
-	return is_int($i / 2) ? $config['darkborder'] : $config['lightborder'];
+function getStyle($i) {
+	return is_int($i / 2) ? config('darkborder') : config('lightborder');
 }
 
 $vowels = array('e', 'y', 'u', 'i', 'o', 'a');
@@ -712,13 +723,20 @@ function getSkillName($skillId, $suffix = true)
 	return 'unknown';
 }
 
+function logged(): bool {
+	return app()->isLoggedIn();
+}
+
+function accountLogged(): OTS_Account {
+	$loggedAccount = app()->getAccountLogged();
+	return $loggedAccount ?? new OTS_Account();
+}
 /**
  * Performs flag check on the current logged in user.
  * Table in database: accounts, field: website_flags
  */
 function hasFlag(int $flag): bool {
-	global $logged, $logged_flags;
-	return ($logged && ($logged_flags & $flag) == $flag);
+	return (logged() && (accountLogged()->getWebFlags() & $flag) == $flag);
 }
 /**
  * Check if current logged user have got admin flag set.
@@ -861,7 +879,7 @@ function getWorldName($id)
  */
 function _mail($to, $subject, $body, $altBody = '', $add_html_tags = true)
 {
-	global $mailer, $config;
+	global $mailer;
 
 	if (!setting('core.mail_enabled')) {
 		log_append('mailer-error.log', '_mail() function has been used, but Mail Support is disabled.');
@@ -913,7 +931,7 @@ function _mail($to, $subject, $body, $altBody = '', $add_html_tags = true)
 	$mailer->From = setting('core.mail_address');
 	$mailer->Sender = setting('core.mail_address');
 	$mailer->CharSet = 'utf-8';
-	$mailer->FromName = $config['lua']['serverName'];
+	$mailer->FromName = configLua('serverName');
 	$mailer->Subject = $subject;
 	$mailer->addAddress($to);
 	$mailer->Body = $tmp_body;
@@ -1105,7 +1123,7 @@ function csrfProtect(): void
 }
 
 function getTopPlayers($limit = 5, $skill = 'level') {
-	global $db;
+	$db = app()->get('database');
 
 	if ($skill === 'level') {
 		$skill = 'experience';
@@ -1210,7 +1228,7 @@ function clearCache()
 {
 	News::clearCache();
 
-	$cache = Cache::getInstance();
+	$cache = app()->get('cache');
 	if($cache->enabled()) {
 		$keysToClear = [
 			'status', 'templates',
@@ -1248,7 +1266,7 @@ function clearCache()
 			}
 		}
 
-		global $db;
+		$db = app()->get('database');
 		$db->setClearCacheAfter(true);
 	}
 
@@ -1260,7 +1278,7 @@ function clearCache()
 	// routes cache
 	clearRouteCache();
 
-	global $hooks;
+	$hooks = app()->get('hooks');
 	$hooks->trigger(HOOK_CACHE_CLEAR, ['cache' => Cache::getInstance()]);
 
 	return true;
@@ -1276,7 +1294,8 @@ function clearRouteCache(): void
 
 function getCustomPageInfo($name)
 {
-	global $logged_access;
+	$logged_access = logged() ? accountLogged()->getAccess() : 0;
+
 	$page = Pages::isPublic()
 		->where('name', 'LIKE', $name)
 		->where('access', '<=', $logged_access)
@@ -1290,7 +1309,9 @@ function getCustomPageInfo($name)
 }
 function getCustomPage($name, &$success): string
 {
-	global $twig, $title, $ignore;
+	global $title, $ignore;
+
+	$twig = app()->get('twig');
 
 	$success = false;
 	$content = '';
@@ -1314,9 +1335,6 @@ function getCustomPage($name, &$success): string
 				$tmp = $page['body'];
 
 			global $config;
-			if(setting('core.backward_support')) {
-				global $SQL, $main_content, $subtopic;
-			}
 
 			ob_start();
 			eval($tmp);
@@ -1507,8 +1525,7 @@ function verify_number($number, $name, $max_length)
 
 function Outfits_loadfromXML()
 {
-	global $config;
-	$file_path = $config['data_path'] . 'XML/outfits.xml';
+	$file_path = config('data_path') . 'XML/outfits.xml';
 	if (!file_exists($file_path)) {	return null; }
 
 	$xml = new DOMDocument;
@@ -1533,8 +1550,7 @@ function Outfits_loadfromXML()
 
 function Mounts_loadfromXML()
 {
-	global $config;
-	$file_path = $config['data_path'] . 'XML/mounts.xml';
+	$file_path = config('data_path') . 'XML/mounts.xml';
 	if (!file_exists($file_path)) {	return null; }
 
 	$xml = new DOMDocument;
@@ -1657,8 +1673,10 @@ function getGuildLogoById($id)
 	return BASE_URL . GUILD_IMAGES_DIR . $logo;
 }
 
-function displayErrorBoxWithBackButton($errors, $action = null) {
-	global $twig;
+function displayErrorBoxWithBackButton($errors, $action = null)
+{
+	$twig = app()->get('twig');
+
 	$twig->display('error_box.html.twig', ['errors' => $errors]);
 	$twig->display('account.back_button.html.twig', [
 		'action' => $action ?: getLink('')
@@ -1685,6 +1703,15 @@ function getAccountIdentityColumn(): string
 	return 'id';
 }
 
+function app() {
+	static $__app;
+	if (!isset($__app)) {
+		$__app = new App();
+	}
+
+	return $__app;
+}
+
 // validator functions
 require_once SYSTEM . 'compat/base.php';
 

system/init.php

@@ -17,8 +17,8 @@ use MyAAC\Settings;
 
 defined('MYAAC') or die('Direct access not allowed!');
 
-global $config;
-if(!isset($config['installed']) || !$config['installed']) {
+$configInstalled = config('installed');
+if(!isset($configInstalled) || !$configInstalled) {
 	throw new RuntimeException('MyAAC has not been installed yet or there was error during installation. Please install again.');
 }
 
@@ -30,32 +30,28 @@ if (config('env') === 'dev' || getBoolean(config('enable_debugbar'))) {
 	$debugBar = new StandardDebugBar();
 }
 
-if(empty($config['server_path'])) {
+$configServerPath = config('server_path');
+if(empty($configServerPath)) {
 	throw new RuntimeException('Server Path has been not set. Go to config.php and set it.');
 }
 
 // take care of trailing slash at the end
-if($config['server_path'][strlen($config['server_path']) - 1] !== '/')
-	$config['server_path'] .= '/';
+if($configServerPath[strlen($configServerPath) - 1] !== '/') {
+	config(['server_path', $configServerPath . '/']);
+}
 
 // enable gzip compression if supported by the browser
 if(isset($config['gzip_output']) && $config['gzip_output'] && isset($_SERVER['HTTP_ACCEPT_ENCODING']) && str_contains($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('ob_gzhandler'))
 	ob_start('ob_gzhandler');
 
-// cache
-global $cache;
-$cache = Cache::getInstance();
-
 // event system
-global $hooks;
-$hooks = new Hooks();
-$hooks->load();
-$hooks->trigger(HOOK_INIT);
+$hooks = app()->get('hooks');
 
 // twig
 require_once SYSTEM . 'twig.php';
 
 // action, used by many pages
+global $action;
 $action = $_REQUEST['action'] ?? '';
 define('ACTION', $action);
 
@@ -81,9 +77,11 @@ foreach($_REQUEST as $var => $value) {
 
 // load otserv config file
 $config_lua_reload = true;
+global $cache;
+$cache = app()->get('cache');
 if($cache->enabled()) {
 	$tmp = null;
-	if($cache->fetch('server_path', $tmp) && $tmp == $config['server_path']) {
+	if($cache->fetch('server_path', $tmp) && $tmp == config('server_path')) {
 		$tmp = null;
 		if($cache->fetch('config_lua', $tmp) && $tmp) {
 			$config['lua'] = unserialize($tmp);
@@ -93,31 +91,33 @@ if($cache->enabled()) {
 }
 
 if($config_lua_reload) {
-	$config['lua'] = load_config_lua($config['server_path'] . 'config.lua');
+	config(['lua', load_config_lua(config('server_path') . 'config.lua')]);
 
 	// cache config
 	if($cache->enabled()) {
-		$cache->set('config_lua', serialize($config['lua']), 2 * 60);
-		$cache->set('server_path', $config['server_path'], 10 * 60);
+		$cache->set('config_lua', serialize(config('lua')), 2 * 60);
+		$cache->set('server_path', config('server_path'), 10 * 60);
 	}
 }
 unset($tmp);
 
-if(isset($config['lua']['servername']))
-	$config['lua']['serverName'] = $config['lua']['servername'];
+if(configLua('servername') !== null) {
+	$config['lua']['serverName'] = configLua('servername');
+}
 
-if(isset($config['lua']['houserentperiod']))
-	$config['lua']['houseRentPeriod'] = $config['lua']['houserentperiod'];
+if(configLua('houserentperiod') !== null) {
+	$config['lua']['houseRentPeriod'] = configLua('houserentperiod');
+}
 
 // localize data/ directory based on data directory set in config.lua
 foreach(array('dataDirectory', 'data_directory', 'datadir') as $key) {
-	if(!isset($config['lua'][$key][0])) {
+	if(!isset(configLua($key)[0])) {
 		break;
 	}
 
-	$foundValue = $config['lua'][$key];
+	$foundValue = configLua('lua')[$key];
 	if($foundValue[0] !== '/') {
-		$foundValue = $config['server_path'] . $foundValue;
+		$foundValue = config('server_path') . $foundValue;
 	}
 
 	if($foundValue[strlen($foundValue) - 1] !== '/') {// do not forget about trailing slash
@@ -126,17 +126,17 @@ foreach(array('dataDirectory', 'data_directory', 'datadir') as $key) {
 }
 
 if(!isset($foundValue)) {
-	$foundValue = $config['server_path'] . 'data/';
+	$foundValue = config('server_path') . 'data/';
 }
 
-$config['data_path'] = $foundValue;
+config(['data_path', $foundValue]);
 unset($foundValue);
 
 // POT
 require_once SYSTEM . 'libs/pot/OTS.php';
-$ots = POT::getInstance();
 $eloquentConnection = null;
-require_once SYSTEM . 'database.php';
+global $db;
+$db = app()->get('db');
 
 // verify myaac tables exists in database
 if(!defined('MYAAC_INSTALL') && !$db->hasTable('myaac_account_actions')) {
@@ -150,8 +150,7 @@ if (!isset($configDatabaseAutoMigrate) || $configDatabaseAutoMigrate) {
 }
 
 // settings
-$settings = Settings::getInstance();
-$settings->load();
+$settings = app()->get('settings');
 
 // csrf protection
 $token = getSession('csrf_token');

system/libs/pot/OTS_Account.php

@@ -12,6 +12,8 @@
  * @license http://www.gnu.org/licenses/lgpl-3.0.txt GNU Lesser General Public License, Version 3
  */
 
+use MyAAC\Models\AccountAction;
+
 /**
  * OTServ account abstraction.
  *
@@ -476,8 +478,8 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
 
     public function isPremium()
     {
-		global $config;
-        if(isset($config['lua']['freePremium']) && getBoolean($config['lua']['freePremium'])) return true;
+		$configFreePremium = configLua('freePremium');
+		if(isset($configFreePremium) && getBoolean($configFreePremium)) return true;
 
 		if(isset($this->data['premium_ends_at'])) {
 			return $this->data['premium_ends_at'] > time();
@@ -770,7 +772,7 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
         $filter->compareField('account_id', (int) $this->data['id']);
 
 		if(!$withDeleted) {
-			global $db;
+			$db = app()->get('database');
 			if($db->hasColumn('players', 'deletion')) {
 				$filter->compareField('deletion', 0);
 			} else {
@@ -934,7 +936,7 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
 			return $this->data['group_id'];
 		}
 
-		global $db;
+		$db = app()->get('database');
 		if($db->hasColumn('accounts', 'group_id')) {
 			$query = $this->db->query('SELECT `group_id` FROM `accounts` WHERE `id` = ' . (int) $this->getId())->fetch();
 			// if anything was found
@@ -961,7 +963,7 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
 			return $this->data['group_id'];
 		}
 
-		global $db;
+		$db = app()->get('database');
 		if($db->hasColumn('accounts', 'group_id')) {
 			$query = $this->db->query('SELECT `group_id` FROM `accounts` WHERE `id` = ' . (int) $this->getId())->fetch();
 			// if anything was found
@@ -1010,26 +1012,16 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
 
 	public function logAction($action)
 	{
-		$ip = get_browser_real_ip();
-		if(!str_contains($ip, ":")) {
-			$ipv6 = '0';
-		}
-		else {
-			$ipv6 = $ip;
-			$ip = '';
+		AccountAction::create([
+			'account_id' => $this->getId(),
+			'ip' => get_browser_real_ip(),
+			'date' => time(),
+			'action' => $action,
+		]);
 	}
 
-		return $this->db->exec('INSERT INTO `' . TABLE_PREFIX . 'account_actions` (`account_id`, `ip`, `ipv6`, `date`, `action`) VALUES (' . $this->db->quote($this->getId()).', ' . ($ip == '' ? '0' : $this->db->quote(ip2long($ip))) . ', (' . ($ipv6 == '0' ? $this->db->quote('') : $this->db->quote(inet_pton($ipv6))) . '), UNIX_TIMESTAMP(NOW()), ' . $this->db->quote($action).')');
-	}
-
-	public function getActionsLog($limit1, $limit2)
-	{
-		$actions = array();
-
-		foreach($this->db->query('SELECT `ip`, `ipv6`, `date`, `action` FROM `' . TABLE_PREFIX . 'account_actions` WHERE `account_id` = ' . $this->data['id'] . ' ORDER by `date` DESC LIMIT ' . $limit1 . ', ' . $limit2 . '')->fetchAll() as $a)
-			$actions[] = array('ip' => $a['ip'], 'ipv6' => $a['ipv6'], 'date' => $a['date'], 'action' => $a['action']);
-
-		return $actions;
+	public function getActionsLog($limit) {
+		return AccountAction::where('account_id', $this->data['id'])->orderByDesc('date')->limit($limit)->get()->toArray();
 	}
 /**
  * Returns players iterator.

system/libs/pot/OTS_DB_MySQL.php

@@ -97,14 +97,13 @@ class OTS_DB_MySQL extends OTS_Base_DB
 			$params['persistent'] = false;
 		}
 
-		global $config;
-		$cache = Cache::getInstance();
+		$cache = app()->get('cache');
 		if($cache->enabled()) {
 			$tmp = null;
 			$need_revalidation = true;
 			if($cache->fetch('database_checksum', $tmp) && $tmp) {
 				$tmp = unserialize($tmp);
-				if(sha1($config['database_host'] . '.' . $config['database_name']) === $tmp) {
+				if(sha1(config('database_host') . '.' . config('database_name')) === $tmp) {
 					$need_revalidation = false;
 				}
 			}
@@ -148,9 +147,7 @@ class OTS_DB_MySQL extends OTS_Base_DB
 
 	public function __destruct()
 	{
-		global $config;
-
-		$cache = Cache::getInstance();
+		$cache = app()->get('cache');
 		if($cache->enabled()) {
 			if ($this->clearCacheAfter) {
 				$cache->delete('database_tables');
@@ -160,7 +157,7 @@ class OTS_DB_MySQL extends OTS_Base_DB
 			else {
 				$cache->set('database_tables', serialize($this->has_table_cache), 3600);
 				$cache->set('database_columns', serialize($this->has_column_cache), 3600);
-				$cache->set('database_checksum', serialize(sha1($config['database_host'] . '.' . $config['database_name'])), 3600);
+				$cache->set('database_checksum', serialize(sha1(config('database_host') . '.' . config('database_name'))), 3600);
 			}
 		}
 
@@ -218,8 +215,7 @@ class OTS_DB_MySQL extends OTS_Base_DB
 	}
 
 	private function hasTableInternal($name) {
-		global $config;
-		return ($this->has_table_cache[$name] = $this->query('SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `TABLE_SCHEMA` = ' . $this->quote($config['database_name']) . ' AND `TABLE_NAME` = ' . $this->quote($name) . ' LIMIT 1;')->rowCount() > 0);
+		return ($this->has_table_cache[$name] = $this->query('SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `TABLE_SCHEMA` = ' . $this->quote(config('database_name')) . ' AND `TABLE_NAME` = ' . $this->quote($name) . ' LIMIT 1;')->rowCount() > 0);
 	}
 
 	public function hasColumn($table, $column) {

system/libs/pot/OTS_Group.php

@@ -490,7 +490,9 @@ class OTS_Group extends OTS_Row_DAO implements IteratorAggregate, Countable
         // creates filter
         $filter = new OTS_SQLFilter();
         $filter->compareField('group_id', (int) $this->data['id']);
-		global $db;
+
+	    $db = app()->get('database');
+
 		if($db->hasColumn('players', 'deletion'))
 			$filter->compareField('deletion', 0);
 		else

system/libs/pot/OTS_Groups_List.php

@@ -33,7 +33,7 @@ class OTS_Groups_List implements IteratorAggregate, Countable
  */
     public function __construct($file = '')
     {
-		global $db;
+		$db = app()->get('db');
 		if($db->hasTable('groups')) { // read groups from database
 			foreach($db->query('SELECT `id`, `name`, `access` FROM `groups`;') as $group)
 			{
@@ -47,10 +47,8 @@ class OTS_Groups_List implements IteratorAggregate, Countable
 			return;
 		}
 
-		if(!isset($file[0]))
-		{
-			global $config;
-			$file = $config['data_path'] . 'XML/groups.xml';
+		if(!isset($file[0])) {
+			$file = config('data_path') . 'XML/groups.xml';
 		}
 
 		if(!@file_exists($file)) {
@@ -59,7 +57,7 @@ class OTS_Groups_List implements IteratorAggregate, Countable
 			return;
 		}
 
-		$cache = Cache::getInstance();
+		$cache = app()->get('cache');
 
 		$data = array();
 		if($cache->enabled())

system/libs/pot/OTS_Guild.php

@@ -284,8 +284,6 @@ class OTS_Guild extends OTS_Row_DAO implements IteratorAggregate, Countable
     }
 
     public function hasMember(OTS_Player $player) {
-        global $db;
-
         if(!$player || !$player->isLoaded()) {
             return false;
         }

system/libs/pot/OTS_Player.php

@@ -655,18 +655,19 @@ class OTS_Player extends OTS_Row_DAO
 		//if($path == '')
 		//	$path = $config['data_path'].'XML/groups.xml';
 
-		if( !isset($this->data['group_id']) )
-		{
+		if(!isset($this->data['group_id'])) {
 			throw new E_OTS_NotLoaded();
 		}
 
 		//$groups = new DOMDocument();
 		//$groups->load($path);
 
-		global $groups;
+		$groups = app()->get('groups');
 		$tmp = $groups->getGroup($this->data['group_id']);
-		if($tmp)
+
+		if($tmp) {
 			return $tmp;
+		}
 
 		return new OTS_Group();
 			// echo 'error while loading group..';
@@ -853,9 +854,8 @@ class OTS_Player extends OTS_Row_DAO
 		}
 
 		if(isset($this->data['promotion'])) {
-			global $config;
 			if((int)$this->data['promotion'] > 0)
-				return ($this->data['vocation'] + ($this->data['promotion'] * $config['vocations_amount']));
+				return ($this->data['vocation'] + ($this->data['promotion'] * config('vocations_amount')));
 		}
 
 		return $this->data['vocation'];

system/login.php

@@ -1,41 +0,0 @@
-<?php
-/**
- * Login manager
- *
- * @package   MyAAC
- * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2019 MyAAC
- * @link      https://my-aac.org
- */
-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)
-{
-	$account_logged->load($current_session);
-	if($account_logged->isLoaded() && $account_logged->getPassword() == getSession('password')
-		//&& (!isset($_SESSION['admin']) || admin())
-		&& (getSession('remember_me') || getSession('last_visit') > time() - 15 * 60)) {  // login for 15 minutes if "remember me" is not used
-			$logged = true;
-	}
-	else {
-		unsetSession('account');
-		unset($account_logged);
-	}
-}
-
-if($logged) {
-	$logged_flags = $account_logged->getWebFlags();
-	$twig->addGlobal('logged', true);
-	$twig->addGlobal('account_logged', $account_logged);
-}
-
-setSession('last_visit', time());
-if(defined('PAGE')) {
-	setSession('last_page', PAGE);
-}
-setSession('last_uri', $_SERVER['REQUEST_URI']);

system/logout.php

@@ -12,7 +12,10 @@ use MyAAC\CsrfToken;
 
 defined('MYAAC') or die('Direct access not allowed!');
 
-if(isset($account_logged) && $account_logged->isLoaded()) {
+$account_logged = accountLogged();
+$hooks = app()->get('hooks');
+
+if($account_logged !== null && $account_logged->isLoaded()) {
 	if($hooks->trigger(HOOK_LOGOUT, ['account_id' => $account_logged->getId()])) {
 		unsetSession('account');
 		unsetSession('password');
@@ -20,7 +23,11 @@ if(isset($account_logged) && $account_logged->isLoaded()) {
 
 		CsrfToken::generate();
 
+		global $logged, $account_logged;
 		$logged = false;
-		unset($account_logged);
+		$account_logged = new OTS_Account();
+
+		app()->setLoggedIn($logged);
+		app()->setAccountLogged($account_logged);
 	}
 }

system/migrations/20.php

@@ -4,7 +4,7 @@ use MyAAC\Settings;
 
 function updateHighscoresIdsHidden(): void
 {
-	global $db;
+	$db = app()->get('database');
 
 	if (!$db->hasTable('players')) {
 		return;

system/migrations/28.php

@@ -3,12 +3,10 @@
  * @var OTS_DB_MySQL $db
  */
 
-use MyAAC\Cache\Cache;
-
 $up = function () use ($db) {
 	$db->dropTable(TABLE_PREFIX . 'hooks');
 
-	$cache = Cache::getInstance();
+	$cache = app()->get('cache');
 	if($cache->enabled()) {
 		$cache->delete('hooks');
 	}
@@ -17,7 +15,7 @@ $up = function () use ($db) {
 $down = function () use ($db) {
 	$db->exec(file_get_contents(__DIR__ . '/28-hooks.sql'));
 
-	$cache = Cache::getInstance();
+	$cache = app()->get('cache');
 	if($cache->enabled()) {
 		$cache->delete('hooks');
 	}

system/migrations/44.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * @var OTS_DB_MySQL $db
+ */
+
+// 2025-02-27
+// remove ipv6, change to ip (for both ipv4 + ipv6) as VARCHAR(45)
+$up = function () use ($db) {
+	$db->query("ALTER TABLE `myaac_account_actions` DROP KEY `account_id`;");
+	$db->query("ALTER TABLE  `myaac_account_actions` ADD COLUMN `id` INT(11) NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (`id`);");
+
+	$db->modifyColumn(TABLE_PREFIX . 'account_actions', 'ip', "VARCHAR(45) NOT NULL DEFAULT ''");
+	$db->query("UPDATE `" . TABLE_PREFIX . "account_actions` SET `ip` = INET_NTOA(`ip`) WHERE `ip` != '0';");
+	$db->query("UPDATE `" . TABLE_PREFIX . "account_actions` SET `ip` = INET6_NTOA(`ipv6`) WHERE `ip` = '0';");
+	$db->dropColumn(TABLE_PREFIX . 'account_actions', 'ipv6');
+};
+
+$down = function () use ($db) {
+	$db->query("ALTER TABLE `" . TABLE_PREFIX . "account_actions` DROP `id`;");
+	$db->query("ALTER TABLE  `" . TABLE_PREFIX . "account_actions` ADD KEY (`account_id`);");
+
+	$db->addColumn(TABLE_PREFIX . 'account_actions', 'ipv6', "BINARY(16) NOT NULL DEFAULT 0x00000000000000000000000000000000 AFTER ip");
+	$db->query("UPDATE `" . TABLE_PREFIX . "account_actions` SET `ipv6` = INET6_ATON(ip) WHERE NOT IS_IPV4(`ip`);");
+	$db->query("UPDATE `" . TABLE_PREFIX . "account_actions` SET `ip` = INET_ATON(`ip`) WHERE IS_IPV4(`ip`);");
+	$db->query("UPDATE `" . TABLE_PREFIX . "account_actions` SET `ip` = 0 WHERE `ipv6` != 0x00000000000000000000000000000000;");
+	$db->modifyColumn(TABLE_PREFIX . 'account_actions', 'ip', "INT(11) UNSIGNED NOT NULL DEFAULT 0;");
+};

system/pages/account/base.php

@@ -10,7 +10,7 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-if(!$logged)
+if(!logged())
 {
 	$title = 'Login';
 

system/pages/account/change-email.php

@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Change E-Mail';
 require __DIR__ . '/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/change-info.php

@@ -16,7 +16,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Change Info';
 require __DIR__ . '/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/change-password.php

@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Change Password';
 require __DIR__ . '/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/characters/change-comment.php

@@ -16,7 +16,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Change Comment';
 require PAGES . 'account/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/characters/change-name.php

@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Change Name';
 require PAGES . 'account/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/characters/change-sex.php

@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Change Sex';
 require PAGES . 'account/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/characters/create.php

@@ -16,7 +16,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Create Character';
 require PAGES . 'account/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/characters/delete.php

@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Delete Character';
 require PAGES . 'account/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/create.php

@@ -17,8 +17,7 @@ $title = 'Create Account';
 if (setting('core.account_country'))
 	require SYSTEM . 'countries.conf.php';
 
-if($logged)
-{
+if(logged()) {
 	echo 'Please logout before attempting to create a new account.';
 	return;
 }

system/pages/account/login.php

@@ -29,6 +29,7 @@ if(!empty($login_account) && !empty($login_password))
 	$limiter->enabled = setting('core.account_login_ipban_protection');
 	$limiter->load();
 
+	global $logged, $account_logged, $logged_flags;
 	$account_logged = new OTS_Account();
 	if (config('account_login_by_email')) {
 		$account_logged->findByEMail($login_account);
@@ -69,6 +70,9 @@ if(!empty($login_account) && !empty($login_password))
 				$account_logged->setCustomField('web_lastlogin', time());
 			}
 
+			app()->setLoggedIn($logged);
+			app()->setAccountLogged($account_logged);
+
 			$hooks->trigger(HOOK_LOGIN, array('account' => $account_logged, 'password' => $login_password, 'remember_me' => $remember_me));
 		}
 

system/pages/account/logout.php

@@ -13,7 +13,7 @@ $title = 'Logout';
 
 require __DIR__ . '/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/manage.php

@@ -14,7 +14,7 @@ $title = 'Account Management';
 require __DIR__ . '/login.php';
 require __DIR__ . '/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 
@@ -34,7 +34,7 @@ if(isset($_REQUEST['redirect']))
 	return;
 }
 
-$groups = new OTS_Groups_List();
+$groups = app()->get('groups');
 
 $freePremium = isset($config['lua']['freePremium']) && getBoolean($config['lua']['freePremium']) || $account_logged->getPremDays() == OTS_Account::GRATIS_PREMIUM_DAYS;
 $dayOrDays = $account_logged->getPremDays() == 1 ? 'day' : 'days';
@@ -85,12 +85,8 @@ if($email_new_time > 1)
 	}
 }
 
-$actions = array();
-foreach($account_logged->getActionsLog(0, 1000) as $action) {
-	$actions[] = array('action' => $action['action'], 'date' => $action['date'], 'ip' => $action['ip'] != 0 ? long2ip($action['ip']) : inet_ntop($action['ipv6']));
-}
+$actions = $account_logged->getActionsLog(1000);
 
-$players = array();
 /** @var OTS_Players_List $account_players */
 $account_players = $account_logged->getPlayersList();
 $account_players->orderBy('id');

system/pages/account/register-new.php

@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Register Account';
 require __DIR__ . '/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/account/register.php

@@ -13,7 +13,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Register Account';
 require __DIR__ . '/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	return;
 }
 

system/pages/characters.php

@@ -14,10 +14,10 @@ use MyAAC\Models\PlayerDeath;
 defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Characters';
 
-$groups = new OTS_Groups_List();
-function generate_search_form($autofocus = false)
+$groups = app()->get('groups');
+function generate_search_form($autofocus = false): string
 {
-	global $config, $twig;
+	$twig = app()->get('twig');
 	return $twig->render('characters.form.html.twig', array(
 		'link' => getLink('characters'),
 		'autofocus' => $autofocus
@@ -26,7 +26,9 @@ function generate_search_form($autofocus = false)
 
 function retrieve_former_name($name)
 {
-	global $oldName, $db;
+	global $oldName;
+
+	$db = app()->get('db');
 
 	if($db->hasTable('player_namelocks') && $db->hasColumn('player_namelocks', 'name')) {
 		$newNameSql = $db->query('SELECT `name`, `new_name` FROM `player_namelocks` WHERE `name` = ' . $db->quote($name));
@@ -42,8 +44,9 @@ function retrieve_former_name($name)
 }
 
 $name = '';
-if(isset($_REQUEST['name']))
+if(isset($_REQUEST['name'])) {
 	$name = urldecode(stripslashes(ucwords(strtolower($_REQUEST['name']))));
+}
 
 if(empty($name))
 {
@@ -63,15 +66,15 @@ if(!$player->isLoaded())
 {
 	$tmp_zmienna = "";
 	$tmp_name = retrieve_former_name($name);
-	while(!empty($tmp_name))
-	{
+	while(!empty($tmp_name)) {
 		$tmp_zmienna = $tmp_name;
 		$tmp_name = retrieve_former_name($tmp_zmienna);
 	}
 
-	if(!empty($tmp_zmienna))
+	if(!empty($tmp_zmienna)) {
 		$player->find($tmp_zmienna);
 	}
+}
 
 if($player->isLoaded() && !$player->isDeleted())
 {

system/pages/faq.php

@@ -168,10 +168,8 @@ class FAQ
 
 	static public function move($id, $i, &$errors)
 	{
-		global $db;
 		$row = ModelsFAQ::find($id);
-		if($row)
-		{
+		if($row) {
 			$ordering = $row->ordering + $i;
 			$old_record = ModelsFAQ::where('ordering', $ordering)->first();
 			if($old_record) {
@@ -182,8 +180,9 @@ class FAQ
 			$row->ordering = $ordering;
 			$row->save();
 		}
-		else
+		else {
 			$errors[] = 'FAQ with id ' . $id . ' does not exists.';
+		}
 
 		return !count($errors);
 	}

system/pages/forum.php

@@ -39,9 +39,10 @@ if(!empty($action))
 
 $info = $db->query("SELECT `section`, COUNT(`id`) AS 'threads', SUM(`replies`) AS 'replies' FROM `" . FORUM_TABLE_PREFIX . "forum` WHERE `first_post` = `id` GROUP BY `section`")->fetchAll();
 
-$boards = array();
-foreach($info as $data)
+$boards = [];
+foreach($info as $data) {
 	$counters[$data['section']] = array('threads' => $data['threads'], 'posts' => $data['replies'] + $data['threads']);
+}
 
 foreach($sections as $id => $section)
 {

system/pages/forum/admin.php

@@ -17,7 +17,7 @@ if(!$canEdit) {
 	return;
 }
 
-$groupsList = new OTS_Groups_List();
+$groupsList = app()->get('groups');
 $groups = [
 	['id' => 0, 'name' => 'Guest'],
 ];

system/pages/forum/base.php

@@ -29,7 +29,8 @@ if(strtolower($forumSetting) != 'site') {
 
 $canEdit = Forum::isModerator();
 
-$sections = array();
+global $sections;
+$sections = [];
 foreach(getForumBoards() as $section) {
 	$sections[$section['id']] = array(
 		'id' => $section['id'],

system/pages/forum/edit_post.php

@@ -18,7 +18,7 @@ if ($ret === false) {
 	return;
 }
 
-if(!$logged) {
+if(!logged()) {
 	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . urlencode(getLink('forum')) . '">Log in</a> to post on the forum.<br /><br />';
 	return;
 }

system/pages/forum/move_thread.php

@@ -18,7 +18,7 @@ if ($ret === false) {
 	return;
 }
 
-if(!$logged) {
+if(!logged()) {
 	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . urlencode(getLink('forum')) . '">Log in</a> to post on the forum.<br /><br />';
 	return;
 }

system/pages/forum/new_post.php

@@ -18,7 +18,7 @@ if ($ret === false) {
 	return;
 }
 
-if(!$logged) {
+if(!logged()) {
 	$extra_url = '';
 	if(isset($_GET['thread_id'])) {
 		$extra_url = '?action=new_post&thread_id=' . $_GET['thread_id'];

system/pages/forum/new_thread.php

@@ -18,7 +18,7 @@ if ($ret === false) {
 	return;
 }
 
-if(!$logged) {
+if(!logged()) {
 	$extra_url = '';
 	if(isset($_GET['section_id'])) {
 		$extra_url = '?action=new_thread&section_id=' . $_GET['section_id'];

system/pages/forum/remove_post.php

@@ -18,7 +18,7 @@ if ($ret === false) {
 	return;
 }
 
-if(!$logged) {
+if(!logged()) {
 	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . urlencode(getLink('forum')) . '">Log in</a> to post on the forum.<br /><br />';
 	return;
 }

system/pages/forum/show_board.php

@@ -44,7 +44,7 @@ for($i = 0; $i < $threads_count['threads_count'] / setting('core.forum_threads_p
 
 echo '<a href="' . getLink('forum') . '">Boards</a> >> <b>'.$sections[$section_id]['name'].'</b>';
 
-if($logged && (!$sections[$section_id]['closed'] || Forum::isModerator())) {
+if(logged() && (!$sections[$section_id]['closed'] || Forum::isModerator())) {
 	echo '<br /><br />
 		<a href="' . getLink('forum') . '?action=new_thread&section_id='.$section_id.'"><img src="images/forum/topic.gif" border="0" /></a>';
 }
@@ -94,7 +94,7 @@ if(isset($last_threads[0])) {
 	}
 
 	echo '</table>';
-	if($logged && (!$sections[$section_id]['closed'] || Forum::isModerator())) {
+	if(logged() && (!$sections[$section_id]['closed'] || Forum::isModerator())) {
 		echo '<br /><a href="' . getLink('forum') . '?action=new_thread&section_id=' . $section_id . '"><img src="images/forum/topic.gif" border="0" /></a>';
 	}
 }

system/pages/forum/show_thread.php

@@ -50,7 +50,7 @@ if(isset($posts[0]['player_id'])) {
 }
 
 $lookaddons = $db->hasColumn('players', 'lookaddons');
-$groups = new OTS_Groups_List();
+$groups = app()->get('groups');
 foreach($posts as &$post) {
 	$post['player'] = new OTS_Player();
 	$player = $post['player'];

system/pages/gallery.php

@@ -132,7 +132,7 @@ class Gallery
 {
 	static public function add($comment, $image, $author, &$errors)
 	{
-		global $db;
+		$db = app()->get('database');
 		if(isset($comment[0]) && isset($image[0]) && isset($author[0]))
 		{
 			$query =
@@ -225,7 +225,7 @@ class Gallery
 
 	static public function move($id, $i, &$errors)
 	{
-		global $db;
+		$db = app()->get('database');
 		$query = self::get($id);
 		if($query !== false)
 		{

system/pages/guilds/accept_invite.php

@@ -15,7 +15,7 @@ require __DIR__ . '/base.php';
 //set rights in guild
 $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 $name = isset($_REQUEST['name']) ? stripslashes($_REQUEST['name']) : null;
-if(!$logged) {
+if(!logged()) {
 	$errors[] = 'You are not logged in. You can\'t accept invitations.';
 }
 

system/pages/guilds/add_rank.php

@@ -22,7 +22,7 @@ if(empty($errors)) {
 	if(!Validator::rankName($rank_name)) {
 		$errors[] = 'Invalid rank name format.';
 	}
-	if(!$logged) {
+	if(!logged()) {
 		$errors[] = 'You are not logged.';
 	}
 	$guild = new OTS_Guild();

system/pages/guilds/change_description.php

@@ -26,7 +26,7 @@ if(empty($errors)) {
 }
 
 if(empty($errors)) {
-	if($logged) {
+	if(logged()) {
 		$guild_leader_char = $guild->getOwner();
 		$rank_list = $guild->getGuildRanksList();
 		$rank_list->orderBy('level', POT::ORDER_DESC);

system/pages/guilds/change_logo.php

@@ -27,7 +27,7 @@ if(empty($errors)) {
 }
 
 if(empty($errors)) {
-	if($logged) {
+	if(logged()) {
 		$guild_leader_char = $guild->getOwner();
 		$guild_leader = false;
 		$account_players = $account_logged->getPlayers();

system/pages/guilds/change_motd.php

@@ -29,7 +29,7 @@ if(empty($errors)) {
 }
 
 if(empty($errors)) {
-	if($logged) {
+	if(logged()) {
 		$guild_leader_char = $guild->getOwner();
 		$rank_list = $guild->getGuildRanksList();
 		$rank_list->orderBy('level', POT::ORDER_DESC);

system/pages/guilds/change_nick.php

@@ -12,7 +12,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 
 require __DIR__ . '/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	$errors[] = "You are not logged in. You can't change nick.";
 	$twig->display('error_box.html.twig', array('errors' => $errors));
 	$twig->display('guilds.back_button.html.twig');

system/pages/guilds/change_rank.php

@@ -12,7 +12,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 
 require __DIR__ . '/base.php';
 
-if(!$logged) {
+if(!logged()) {
 	$errors[] = "You are not logged in. You can't change rank.";
 }
 else {

system/pages/guilds/cleanup_guilds.php

@@ -12,7 +12,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 
 require __DIR__ . '/base.php';
 
-if(!$logged)
+if(!logged())
 {
 	echo "You are not logged in.";
 	$twig->display('guilds.back_button.html.twig');

system/pages/guilds/cleanup_players.php

@@ -12,7 +12,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 
 require __DIR__ . '/base.php';
 
-if(!$logged)
+if(!logged())
 {
 	echo "You are not logged in.";
 	$twig->display('guilds.back_button.html.twig');

system/pages/guilds/create.php

@@ -17,7 +17,7 @@ require __DIR__ . '/base.php';
 $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : NULL;
 $name = isset($_REQUEST['name']) ? stripslashes($_REQUEST['name']) : NULL;
 $todo = isset($_REQUEST['todo']) ? $_REQUEST['todo'] : NULL;
-if(!$logged) {
+if(!logged()) {
 	$guild_errors[] = 'You are not logged in. You can\'t create guild.';
 }
 

system/pages/guilds/delete_by_admin.php

@@ -26,7 +26,7 @@ if(empty($errors)) {
 }
 
 if(empty($errors)) {
-	if($logged) {
+	if(logged()) {
 		if(admin()) {
 			$saved = false;
 			if(isset($_POST['todo']) && $_POST['todo'] == 'save') {

system/pages/guilds/delete_guild.php

@@ -26,7 +26,7 @@ if(empty($errors)) {
 }
 
 if(empty($errors)) {
-	if($logged) {
+	if(logged()) {
 		$guild_leader_char = $guild->getOwner();
 		$rank_list = $guild->getGuildRanksList();
 		$rank_list->orderBy('level', POT::ORDER_DESC);

system/pages/guilds/delete_invite.php

@@ -15,7 +15,7 @@ require __DIR__ . '/base.php';
 $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 $name = stripslashes($_REQUEST['name']);
 
-if(!$logged)
+if(!logged())
 	$errors[] = 'You are not logged in. You can\'t delete invitations.';
 
 if(!Validator::guildName($guild_name))

system/pages/guilds/delete_rank.php

@@ -26,7 +26,7 @@ if(empty($guild_errors)) {
 	}
 }
 if(empty($guild_errors)) {
-	if($logged) {
+	if(logged()) {
 		$guild_leader_char = $guild->getOwner();
 		$rank_list = $guild->getGuildRanksList();
 		$rank_list->orderBy('level', POT::ORDER_DESC);

system/pages/guilds/invite.php

@@ -15,7 +15,7 @@ require __DIR__ . '/base.php';
 //set rights in guild
 $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : NULL;
 $name = isset($_REQUEST['name']) ? stripslashes($_REQUEST['name']) : NULL;
-if(!$logged) {
+if(!logged()) {
 	$errors[] = "You are not logged in. You can't invite players.";
 }
 

system/pages/guilds/kick_player.php

@@ -16,7 +16,7 @@ require __DIR__ . '/base.php';
 $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 $name = isset($_REQUEST['name']) ? stripslashes($_REQUEST['name']) : null;
 
-if(!$logged) {
+if(!logged()) {
 	$errors[] = 'You are not logged in. You can\'t kick characters.';
 }
 

system/pages/guilds/leave.php

@@ -15,7 +15,7 @@ require __DIR__ . '/base.php';
 //set rights in guild
 $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : NULL;
 $name = isset($_REQUEST['name']) ? stripslashes($_REQUEST['name']) : NULL;
-if(!$logged) {
+if(!logged()) {
 	$errors[] = "You are not logged in. You can't leave guild.";
 }
 

system/pages/guilds/list.php

@@ -39,6 +39,6 @@ if(count($guilds_list) > 0)
 
 $twig->display('guilds.list.html.twig', array(
 	'guilds' => $guilds,
-	'logged' => isset($logged) ? $logged : false,
+	'logged' => logged(),
 	'isAdmin' => admin(),
 ));

system/pages/guilds/manager.php

@@ -26,7 +26,7 @@ if(empty($errors)) {
 }
 
 if(empty($errors)) {
-	if($logged) {
+	if(logged()) {
 		$guild_leader_char = $guild->getOwner();
 		$rank_list = $guild->getGuildRanksList();
 		$rank_list->orderBy('level', POT::ORDER_DESC);

system/pages/guilds/pass_leadership.php

@@ -56,7 +56,7 @@ if(empty($guild_errors)) {
 	}
 }
 if(empty($guild_errors) && empty($guild_errors2)) {
-	if($logged) {
+	if(logged()) {
 		$guild_leader_char = $guild->getOwner();
 		$guild_leader = false;
 		$account_players = $account_logged->getPlayers();

system/pages/guilds/save_ranks.php

@@ -26,7 +26,7 @@ if(empty($errors)) {
 }
 
 if(empty($errors)) {
-	if($logged) {
+	if(logged()) {
 		$guild_leader_char = $guild->getOwner();
 		$rank_list = $guild->getGuildRanksList();
 		$rank_list->orderBy('level', POT::ORDER_DESC);

system/pages/guilds/show.php

@@ -47,8 +47,7 @@ $level_in_guild = 0;
 
 $players_from_account_in_guild = array();
 $players_from_account_ids = array();
-if($logged)
-{
+if(logged()) {
 	$account_players = $account_logged->getPlayers();
 	foreach($account_players as $player)
 	{
@@ -127,7 +126,7 @@ include(SYSTEM . 'libs/pot/InvitesDriver.php');
 new InvitesDriver($guild);
 $invited_list = $guild->listInvites();
 $show_accept_invite = 0;
-if($logged && count($invited_list) > 0)
+if(logged() && count($invited_list) > 0)
 {
 	foreach($invited_list as $invited_player)
 	{

system/pages/highscores.php

@@ -139,7 +139,7 @@ $highscores = [];
 $needReCache = true;
 $cacheKey = 'highscores_' . $skill . '_' . $vocation . '_' . $page . '_' . $configHighscoresPerPage;
 
-$cache = Cache::getInstance();
+$cache = app()->get('cache');
 if ($cache->enabled()) {
 	$tmp = '';
 	if ($cache->fetch($cacheKey, $tmp)) {

system/pages/last-kills.php

@@ -15,6 +15,7 @@ $last_kills = array();
 $players_deaths_count = 0;
 
 $tmp = null;
+$cache = app()->get('cache');
 if($cache->enabled() && $cache->fetch('last_kills', $tmp)) {
 	$last_kills = unserialize($tmp);
 }

system/pages/news.php

@@ -105,7 +105,7 @@ if(isset($_GET['archive']))
 header('X-XSS-Protection: 0');
 $title = 'Latest News';
 
-$cache = Cache::getInstance();
+$cache = app()->get('cache');
 
 $news_cached = false;
 if($cache->enabled())

system/pages/polls.php

@@ -48,7 +48,7 @@ function getColorByPercent($percent)
 			<tr BGCOLOR="'.$bgcolor.'">
 				<td>
 					<a href="';
-					if($logged)
+					if(logged())
 						echo $link.'?id='.$poll['id'];
 					else
 						echo getLink('account/manage') . '?redirect=' . urlencode($link.'?id='.$poll['id']);
@@ -77,7 +77,7 @@ function getColorByPercent($percent)
 			<tr BGCOLOR="'.$bgcolor.'">
 				<td>
 					<a href="';
-					if($logged)
+					if(logged())
 						echo $link.'?id='.$poll['id'];
 					else
 						echo getLink('account/manage') . '?redirect=' . urlencode($link.'?id='.$poll['id']);
@@ -98,8 +98,7 @@ function getColorByPercent($percent)
 		$showed=true;
 	}
 
-	if(!$logged)
-	{
+	if(!logged()) {
 		echo  'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . BASE_URL . urlencode('?subtopic=polls') . '">Log in</a> to vote in polls.<br /><br />';
 		return;
 	}

system/pages/signature.php

@@ -0,0 +1,6 @@
+<?php
+defined('MYAAC') or die('Direct access not allowed!');
+
+chdir(TOOLS . 'signature');
+include TOOLS . 'signature/index.php';
+exit;

system/pages/team.php

@@ -14,7 +14,7 @@ $title = 'Support in game';
 if(setting('core.account_country'))
 	require SYSTEM . 'countries.conf.php';
 
-$groups = new OTS_Groups_List();
+$groups = app()->get('groups');
 if(!$groups->count())
 {
 	echo 'Error while reading groups.xml';