[WIP] nikic/fast-route implementation

I will describe it more in Pull Request

system/pages/405.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * 405 error page
+ *
+ * @package   MyAAC
+ * @author    Slawkens <slawkens@gmail.com>
+ * @copyright 2021 MyAAC
+ * @link      https://my-aac.org
+ */
+defined('MYAAC') or die('Direct access not allowed!');
+$title = '405 Method Not Allowed';
+
+header('HTTP/1.0 405 Method Not Allowed');
+?>
+<h1>Method not allowed</h1>
+<p>The requested method: <?php echo $_SERVER['REQUEST_METHOD']; ?> for URL <?php echo $_SERVER['REQUEST_URI']; ?> was not found on this server.</p>

system/pages/account/base.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Account confirm mail
+ * Keept for compability
+ *
+ * @package   MyAAC
+ * @author    Slawkens <slawkens@gmail.com>
+ * @copyright 2019 MyAAC
+ * @link      https://my-aac.org
+ */
+defined('MYAAC') or die('Direct access not allowed!');
+
+if(!$logged)
+{
+	if(!empty($errors))
+		$twig->display('error_box.html.twig', array('errors' => $errors));
+
+	$twig->display('account.login.html.twig', array(
+		'redirect' => isset($_REQUEST['redirect']) ? $_REQUEST['redirect'] : null,
+		'account' => USE_ACCOUNT_NAME ? 'Name' : 'Number',
+		'error' => isset($errors[0]) ? $errors[0] : null
+	));
+
+	return;
+}
+else {
+	$show_form = true;
+	$config_salt_enabled = $db->hasColumn('accounts', 'salt');
+}

system/pages/account/change_comment.php

@@ -10,6 +10,13 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+$title = 'Change Comment';
+require __DIR__ . '/base.php';
+
+if(!$logged) {
+	return;
+}
+
 $player_name = isset($_REQUEST['name']) ? stripslashes(urldecode($_REQUEST['name'])) : null;
 $new_comment = isset($_POST['comment']) ? htmlspecialchars(stripslashes(substr($_POST['comment'],0,2000))) : NULL;
 $new_hideacc = isset($_POST['accountvisible']) ? (int)$_POST['accountvisible'] : NULL;
@@ -56,4 +63,4 @@ if($show_form) {
 		));
 	}
 }
-?>
+?>

system/pages/account/change_email.php

@@ -10,6 +10,13 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+$title = 'Change E-Mail';
+require __DIR__ . '/base.php';
+
+if(!$logged) {
+	return;
+}
+
 $email_new_time = $account_logged->getCustomField("email_new_time");
 
 if($email_new_time > 10) {
@@ -159,4 +166,4 @@ if(isset($_POST['emailchangecancel']) && $_POST['emailchangecancel'] == 1) {
 		'custom_buttons' => $custom_buttons
 	));
 }
-?>
+?>

system/pages/account/change_info.php

@@ -10,6 +10,16 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+$title = 'Change Info';
+require __DIR__ . '/base.php';
+
+if(!$logged) {
+	return;
+}
+
+if($config['account_country'])
+	require SYSTEM . 'countries.conf.php';
+
 $show_form = true;
 $new_rlname = isset($_POST['info_rlname']) ? htmlspecialchars(stripslashes($_POST['info_rlname'])) : NULL;
 $new_location = isset($_POST['info_location']) ? htmlspecialchars(stripslashes($_POST['info_location'])) : NULL;
@@ -59,4 +69,4 @@ if($show_form) {
 		'account_country' => isset($account_country) ? $account_country : ''
 	));
 }
-?>
+?>

system/pages/account/change_name.php

@@ -10,6 +10,13 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+$title = 'Change Name';
+require __DIR__ . '/base.php';
+
+if(!$logged) {
+	return;
+}
+
 $player_id = isset($_POST['player_id']) ? (int)$_POST['player_id'] : NULL;
 $name = isset($_POST['name']) ? stripslashes(ucwords(strtolower($_POST['name']))) : NULL;
 if((!$config['account_change_character_name']))
@@ -83,4 +90,4 @@ else
 	}
 }
 
-?>
+?>

system/pages/account/change_password.php

@@ -10,6 +10,13 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+$title = 'Change Password';
+require __DIR__ . '/base.php';
+
+if(!$logged) {
+	return;
+}
+
 $new_password = isset($_POST['newpassword']) ? $_POST['newpassword'] : NULL;
 $new_password2 = isset($_POST['newpassword2']) ? $_POST['newpassword2'] : NULL;
 $old_password = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : NULL;
@@ -82,4 +89,4 @@ else
 	}
 }
 
-?>
+?>

system/pages/account/change_sex.php

@@ -10,6 +10,13 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+$title = 'Change Sex';
+require __DIR__ . '/base.php';
+
+if(!$logged) {
+	return;
+}
+
 $sex_changed = false;
 $player_id = isset($_POST['player_id']) ? (int)$_POST['player_id'] : NULL;
 $new_sex = isset($_POST['new_sex']) ? (int)$_POST['new_sex'] : NULL;
@@ -85,4 +92,4 @@ else
 	}
 }
 
-?>
+?>

system/pages/account/confirm_email.php

@@ -11,7 +11,7 @@ defined('MYAAC') or die('Direct access not allowed!');
 
 $title = 'Confirm Email';
 
-$hash = isset($_GET['v']) ? $_GET['v'] : '';
+$hash = isset($_GET['hash']) ? $_GET['hash'] : '';
 if(empty($hash)) {
 	warning('Please enter email hash code.<br/>If you copied the link, please try again with full link.');
 	return;

system/pages/account/create_character.php

@@ -10,6 +10,13 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+$title = 'Create Character';
+require __DIR__ . '/base.php';
+
+if(!$logged) {
+	return;
+}
+
 $character_name = isset($_POST['name']) ? stripslashes($_POST['name']) : null;
 $character_sex = isset($_POST['sex']) ? (int)$_POST['sex'] : null;
 $character_vocation = isset($_POST['vocation']) ? (int)$_POST['vocation'] : null;

system/pages/account/delete_character.php

@@ -10,6 +10,13 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+$title = 'Delete Character';
+require __DIR__ . '/base.php';
+
+if(!$logged) {
+	return;
+}
+
 $player_name = isset($_POST['delete_name']) ? stripslashes($_POST['delete_name']) : null;
 $password_verify = isset($_POST['delete_password']) ? $_POST['delete_password'] : null;
 $password_verify = encrypt(($config_salt_enabled ? $account_logged->getCustomField('salt') : '') . $password_verify);

system/pages/account/logout.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Logout Account
+ *
+ * @package   MyAAC
+ * @author    Slawkens <slawkens@gmail.com>
+ * @copyright 2021 MyAAC
+ * @link      https://my-aac.org
+ */
+defined('MYAAC') or die('Direct access not allowed!');
+
+$title = 'Logout';
+
+require __DIR__ . '/base.php';
+
+if(!$logged) {
+	return;
+}
+
+if(isset($account_logged) && $account_logged->isLoaded()) {
+	if($hooks->trigger(HOOK_LOGOUT, array('account' => $account_logged, 'password' => getSession('password')))) {
+		unsetSession('account');
+		unsetSession('password');
+		unsetSession('remember_me');
+
+		$logged = false;
+		unset($account_logged);
+
+		if(isset($_REQUEST['redirect']))
+		{
+			header('Location: ' . urldecode($_REQUEST['redirect']));
+			exit;
+		}
+	}
+}
+
+$twig->display('account.logout.html.twig');

system/pages/account/manage.php

@@ -0,0 +1,97 @@
+<?php
+/**
+ * Account management
+ *
+ * @package   MyAAC
+ * @author    Gesior <jerzyskalski@wp.pl>
+ * @author    Slawkens <slawkens@gmail.com>
+ * @copyright 2019 MyAAC
+ * @link      https://my-aac.org
+ */
+defined('MYAAC') or die('Direct access not allowed!');
+
+$title = 'Account Management';
+require __DIR__ . '/base.php';
+
+if(!$logged) {
+	return;
+}
+
+$groups = new OTS_Groups_List();
+
+$freePremium = isset($config['lua']['freePremium']) && getBoolean($config['lua']['freePremium']) || $account_logged->getPremDays() == OTS_Account::GRATIS_PREMIUM_DAYS;
+$dayOrDays = $account_logged->getPremDays() == 1 ? 'day' : 'days';
+/**
+ * @var OTS_Account $account_logged
+ */
+if(!$account_logged->isPremium())
+	$account_status = '<b><span style="color: red">Free Account</span></b>';
+else
+	$account_status = '<b><span style="color: green">' . ($freePremium ? 'Gratis Premium Account' : 'Premium Account, ' . $account_logged->getPremDays() . ' '.$dayOrDays.' left') . '</span></b>';
+
+$recovery_key = $account_logged->getCustomField('key');
+if(empty($recovery_key))
+	$account_registered = '<b><span style="color: red">No</span></b>';
+else
+{
+	if($config['generate_new_reckey'] && $config['mail_enabled'])
+		$account_registered = '<b><span style="color: green">Yes ( <a href="' . getLink('account/register/new') . '"> Buy new Recovery Key </a> )</span></b>';
+	else
+		$account_registered = '<b><span style="color: green">Yes</span></b>';
+}
+
+$account_created = $account_logged->getCreated();
+$account_email = $account_logged->getEMail();
+$email_new_time = $account_logged->getCustomField("email_new_time");
+if($email_new_time > 1)
+	$email_new = $account_logged->getCustomField("email_new");
+$account_rlname = $account_logged->getRLName();
+$account_location = $account_logged->getLocation();
+if($account_logged->isBanned())
+	if($account_logged->getBanTime() > 0)
+		$welcome_message = '<span style="color: red">Your account is banished until '.date("j F Y, G:i:s", $account_logged->getBanTime()).'!</span>';
+	else
+		$welcome_message = '<span style="color: red">Your account is banished FOREVER!</span>';
+else
+	$welcome_message = 'Welcome to your account!';
+
+$email_change = '';
+$email_request = false;
+if($email_new_time > 1)
+{
+	if($email_new_time < time())
+		$email_change = '<br>(You can accept <b>'.$email_new.'</b> as a new email.)';
+	else
+	{
+		$email_change = ' <br>You can accept <b>new e-mail after '.date("j F Y", $email_new_time).".</b>";
+		$email_request = true;
+	}
+}
+
+$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']));
+}
+
+$players = array();
+/** @var OTS_Players_List $account_players */
+$account_players = $account_logged->getPlayersList();
+$account_players->orderBy('id');
+
+$twig->display('account.management.html.twig', array(
+	'welcome_message' => $welcome_message,
+	'recovery_key' => $recovery_key,
+	'email_change' => $email_change,
+	'email_request' => $email_request,
+	'email_new_time' => $email_new_time,
+	'email_new' => isset($email_new) ? $email_new : '',
+	'account' => USE_ACCOUNT_NAME ? $account_logged->getName() : $account_logged->getId(),
+	'account_email' => $account_email,
+	'account_created' => $account_created,
+	'account_status' => $account_status,
+	'account_registered' => $account_registered,
+	'account_rlname' => $account_rlname,
+	'account_location' => $account_location,
+	'actions' => $actions,
+	'players' => $account_players
+));

system/pages/account/redirect.php

@@ -1,16 +1,17 @@
 <?php
 /**
- * Account confirm mail
- * Keept for compability
+ * Change comment
  *
  * @package   MyAAC
+ * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
  * @copyright 2019 MyAAC
  * @link      https://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-if($action == 'confirm_email') {
-	require_once PAGES . 'account/confirm_email.php';
-}
-?>
+$redirect = urldecode($_REQUEST['redirect']);
+
+$twig->display('account.redirect.html.twig', array(
+	'redirect' => $redirect
+));

system/pages/account/register.php

@@ -10,6 +10,13 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+$title = 'Register Account';
+require __DIR__ . '/base.php';
+
+if(!$logged) {
+	return;
+}
+
 $_POST['reg_password'] = isset($_POST['reg_password']) ? $_POST['reg_password'] : '';
 $reg_password = encrypt(($config_salt_enabled ? $account_logged->getCustomField('salt') : '') . $_POST['reg_password']);
 $old_key = $account_logged->getCustomField("key");
@@ -55,4 +62,4 @@ if($show_form) {
 	$twig->display('account.generate_recovery_key.html.twig');
 }
 
-?>
+?>

system/pages/account/register_new.php

@@ -10,6 +10,13 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+$title = 'Register Account';
+require __DIR__ . '/base.php';
+
+if(!$logged) {
+	return;
+}
+
 if(isset($_POST['reg_password']))
 	$reg_password = encrypt(($config_salt_enabled ? $account_logged->getCustomField('salt') : '') . $_POST['reg_password']);
 
@@ -68,4 +75,4 @@ else
 	}
 }
 
-?>
+?>

system/pages/accountmanagement.php

@@ -1,151 +0,0 @@
-<?php
-/**
- * Account management
- *
- * @package   MyAAC
- * @author    Gesior <jerzyskalski@wp.pl>
- * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2019 MyAAC
- * @link      https://my-aac.org
- */
-defined('MYAAC') or die('Direct access not allowed!');
-$title = 'Account Management';
-
-if($config['account_country'])
-	require SYSTEM . 'countries.conf.php';
-
-$groups = new OTS_Groups_List();
-
-$show_form = true;
-$config_salt_enabled = $db->hasColumn('accounts', 'salt');
-
-if(ACTION == "logout" && !isset($_REQUEST['account_login'])) {
-	if(!defined('HOOK_LOGOUT_DISPLAY') || HOOK_LOGOUT_DISPLAY) { // plugin will take care of this message
-		$twig->display('account.logout.html.twig');
-	}
-
-	return;
-}
-
-if(!$logged)
-{
-	if(ACTION == 'confirm_email') {
-		require PAGES . 'account/' . ACTION . '.php';
-		return;
-	}
-
-	if(!empty($errors))
-		$twig->display('error_box.html.twig', array('errors' => $errors));
-
-	$twig->display('account.login.html.twig', array(
-		'redirect' => isset($_REQUEST['redirect']) ? $_REQUEST['redirect'] : null,
-		'account' => USE_ACCOUNT_NAME ? 'Name' : 'Number',
-		'error' => isset($errors[0]) ? $errors[0] : null
-	));
-
-	return;
-}
-
-$errors = array();
-
-	if(isset($_REQUEST['redirect']))
-	{
-		$redirect = urldecode($_REQUEST['redirect']);
-
-		$twig->display('account.redirect.html.twig', array(
-			'redirect' => $redirect
-		));
-		return;
-	}
-
-	if($action == '')
-	{
-		$freePremium = isset($config['lua']['freePremium']) && getBoolean($config['lua']['freePremium']) || $account_logged->getPremDays() == OTS_Account::GRATIS_PREMIUM_DAYS;
-		$dayOrDays = $account_logged->getPremDays() == 1 ? 'day' : 'days';
-		/**
-		 * @var OTS_Account $account_logged
-		 */
-		if(!$account_logged->isPremium())
-			$account_status = '<b><span style="color: red">Free Account</span></b>';
-		else
-			$account_status = '<b><span style="color: green">' . ($freePremium ? 'Gratis Premium Account' : 'Premium Account, ' . $account_logged->getPremDays() . ' '.$dayOrDays.' left') . '</span></b>';
-
-		$recovery_key = $account_logged->getCustomField('key');
-		if(empty($recovery_key))
-			$account_registered = '<b><span style="color: red">No</span></b>';
-		else
-		{
-			if($config['generate_new_reckey'] && $config['mail_enabled'])
-				$account_registered = '<b><span style="color: green">Yes ( <a href="' . getLink('account/register/new') . '"> Buy new Recovery Key </a> )</span></b>';
-			else
-				$account_registered = '<b><span style="color: green">Yes</span></b>';
-		}
-
-		$account_created = $account_logged->getCreated();
-		$account_email = $account_logged->getEMail();
-		$email_new_time = $account_logged->getCustomField("email_new_time");
-		if($email_new_time > 1)
-			$email_new = $account_logged->getCustomField("email_new");
-		$account_rlname = $account_logged->getRLName();
-		$account_location = $account_logged->getLocation();
-		if($account_logged->isBanned())
-			if($account_logged->getBanTime() > 0)
-				$welcome_message = '<span style="color: red">Your account is banished until '.date("j F Y, G:i:s", $account_logged->getBanTime()).'!</span>';
-			else
-				$welcome_message = '<span style="color: red">Your account is banished FOREVER!</span>';
-		else
-			$welcome_message = 'Welcome to your account!';
-
-		$email_change = '';
-		$email_request = false;
-		if($email_new_time > 1)
-		{
-			if($email_new_time < time())
-				$email_change = '<br>(You can accept <b>'.$email_new.'</b> as a new email.)';
-			else
-			{
-				$email_change = ' <br>You can accept <b>new e-mail after '.date("j F Y", $email_new_time).".</b>";
-				$email_request = true;
-			}
-		}
-
-		$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']));
-		}
-
-		$players = array();
-		/** @var OTS_Players_List $account_players */
-		$account_players = $account_logged->getPlayersList();
-		$account_players->orderBy('id');
-
-		$twig->display('account.management.html.twig', array(
-			'welcome_message' => $welcome_message,
-			'recovery_key' => $recovery_key,
-			'email_change' => $email_change,
-			'email_request' => $email_request,
-			'email_new_time' => $email_new_time,
-			'email_new' => isset($email_new) ? $email_new : '',
-			'account' => USE_ACCOUNT_NAME ? $account_logged->getName() : $account_logged->getId(),
-			'account_email' => $account_email,
-			'account_created' => $account_created,
-			'account_status' => $account_status,
-			'account_registered' => $account_registered,
-			'account_rlname' => $account_rlname,
-			'account_location' => $account_location,
-			'actions' => $actions,
-			'players' => $account_players
-		));
-	}
-	else {
-		if(!ctype_alnum(str_replace(array('-', '_'), '', $action))) {
-			error('Error: Action contains illegal characters.');
-		}
-		else if(file_exists(PAGES . 'account/' . $action . '.php')) {
-			require PAGES . 'account/' . $action . '.php';
-		}
-		else {
-			error('This page does not exists.');
-		}
-	}
-?>

system/pages/forum.php

@@ -5,198 +5,59 @@
  * @package   MyAAC
  * @author    Gesior <jerzyskalski@wp.pl>
  * @author    Slawkens <slawkens@gmail.com>
- * @copyright 2019 MyAAC
+ * @copyright 2021 MyAAC
  * @link      https://my-aac.org
  */
-defined('MYAAC') or die('Direct access not allowed!');
-$title = 'Forum';
+defined('MYAAC') or exit;
 
-if(strtolower($config['forum']) != 'site')
+require __DIR__ . '/forum/base.php';
+require __DIR__ . '/forum/admin.php';
+
+$errors = [];
+if(!empty($action))
 {
-	if($config['forum'] != '')
-	{
-		header('Location: ' . $config['forum']);
-		exit;
+	if(!ctype_alnum(str_replace(array('-', '_'), '', $action))) {
+		error('Error: Action contains illegal characters.');
 	}
-
-	echo 'Forum is disabled on this site.';
-	return;
-}
-
-if(!$logged)
-	echo  'You are not logged in. <a href="?subtopic=accountmanagement&redirect=' . BASE_URL . urlencode('?subtopic=forum') . '">Log in</a> to post on the forum.<br /><br />';
-
-require_once LIBS . 'forum.php';
-
-$canEdit = Forum::isModerator();
-if($canEdit)
-{
-	$groups = new OTS_Groups_List();
-
-	if(!empty($action))
-	{
-		if($action == 'delete_board' || $action == 'edit_board' || $action == 'hide_board' || $action == 'moveup_board' || $action == 'movedown_board')
-			$id = $_REQUEST['id'];
-
-		if(isset($_REQUEST['access']))
-			$access = $_REQUEST['access'];
-
-		if(isset($_REQUEST['guild']))
-			$guild = $_REQUEST['guild'];
-
-		if(isset($_REQUEST['name']))
-			$name = $_REQUEST['name'];
-
-		if(isset($_REQUEST['description']))
-			$description = stripslashes($_REQUEST['description']);
-
-		$errors = array();
-
-		if($action == 'add_board') {
-			if(Forum::add_board($name, $description, $access, $guild, $errors))
-				$action = $name = $description = '';
-		}
-		else if($action == 'delete_board') {
-			Forum::delete_board($id, $errors);
-			$action = '';
-		}
-		else if($action == 'edit_board')
-		{
-			if(isset($id) && !isset($name)) {
-				$board = Forum::get_board($id);
-				$name = $board['name'];
-				$access = $board['access'];
-				$guild = $board['guild'];
-				$description = $board['description'];
-			}
-			else {
-				Forum::update_board($id, $name, $access, $guild, $description);
-				$action = $name = $description = '';
-				$access = $guild = 0;
-			}
-		}
-		else if($action == 'hide_board') {
-			Forum::toggleHidden_board($id, $errors);
-			$action = '';
-		}
-		else if($action == 'moveup_board') {
-			Forum::move_board($id, -1, $errors);
-			$action = '';
-		}
-		else if($action == 'movedown_board') {
-			Forum::move_board($id, 1, $errors);
-			$action = '';
-		}
-
-		if(!empty($errors)) {
-			$twig->display('error_box.html.twig', array('errors' => $errors));
-			$action = '';
-		}
-	}
-
-	if(empty($action) || $action == 'edit_board') {
-		$guilds = $db->query('SELECT `id`, `name` FROM `guilds`')->fetchAll();
-		$twig->display('forum.add_board.html.twig', array(
-			'link' => getLink('forum', ($action == 'edit_board' ? 'edit_board' : 'add_board')),
-			'action' => $action,
-			'id' => isset($id) ? $id : null,
-			'name' => isset($name) ? $name : null,
-			'description' => isset($description) ? $description : null,
-			'access' => isset($access) ? $access : 0,
-			'guild' => isset($guild) ? $guild : null,
-			'groups' => $groups,
-			'guilds' => $guilds
-		));
-
-		if($action == 'edit_board')
-			$action = '';
-	}
-}
-
-$sections = array();
-foreach(getForumBoards() as $section)
-{
-	$sections[$section['id']] = array(
-		'id' => $section['id'],
-		'name' => $section['name'],
-		'description' => $section['description'],
-		'closed' => $section['closed'] == '1',
-		'guild' => $section['guild'],
-		'access' => $section['access']
-	);
-
-	if($canEdit) {
-		$sections[$section['id']]['hidden'] = $section['hidden'];
+	else if(file_exists(PAGES . 'forum/' . $action . '.php')) {
+		require PAGES . 'forum/' . $action . '.php';
+		return;
 	}
 	else {
-		$sections[$section['id']]['hidden'] = 0;
+		error('This page does not exists.');
 	}
 }
 
-$number_of_rows = 0;
-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();
+$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)
-		$counters[$data['section']] = array('threads' => $data['threads'], 'posts' => $data['replies'] + $data['threads']);
-	foreach($sections as $id => $section)
-	{
-		$show = true;
-		if(Forum::hasAccess($id)) {
-			$last_post = $db->query("SELECT `players`.`name`, `" . FORUM_TABLE_PREFIX . "forum`.`post_date` FROM `players`, `" . FORUM_TABLE_PREFIX . "forum` WHERE `" . FORUM_TABLE_PREFIX . "forum`.`section` = ".(int) $id." AND `players`.`id` = `" . FORUM_TABLE_PREFIX . "forum`.`author_guid` ORDER BY `post_date` DESC LIMIT 1")->fetch();
-			$boards[] = array(
-				'id' => $id,
-				'link' => getForumBoardLink($id),
-				'name' => $section['name'],
-				'description' => $section['description'],
-				'hidden' => $section['hidden'],
-				'posts' => isset($counters[$id]['posts']) ? $counters[$id]['posts'] : 0,
-				'threads' => isset($counters[$id]['threads']) ? $counters[$id]['threads'] : 0,
-				'last_post' => array(
-					'name' => isset($last_post['name']) ? $last_post['name'] : null,
-					'date' => isset($last_post['post_date']) ? $last_post['post_date'] : null,
-					'player_link' => isset($last_post['name']) ? getPlayerLink($last_post['name']) : null,
-				)
-			);
-		}
+$boards = array();
+foreach($info as $data)
+	$counters[$data['section']] = array('threads' => $data['threads'], 'posts' => $data['replies'] + $data['threads']);
+
+foreach($sections as $id => $section)
+{
+	$show = true;
+	if(Forum::hasAccess($id)) {
+		$last_post = $db->query("SELECT `players`.`name`, `" . FORUM_TABLE_PREFIX . "forum`.`post_date` FROM `players`, `" . FORUM_TABLE_PREFIX . "forum` WHERE `" . FORUM_TABLE_PREFIX . "forum`.`section` = ".(int) $id." AND `players`.`id` = `" . FORUM_TABLE_PREFIX . "forum`.`author_guid` ORDER BY `post_date` DESC LIMIT 1")->fetch();
+		$boards[] = array(
+			'id' => $id,
+			'link' => getForumBoardLink($id),
+			'name' => $section['name'],
+			'description' => $section['description'],
+			'hidden' => $section['hidden'],
+			'posts' => isset($counters[$id]['posts']) ? $counters[$id]['posts'] : 0,
+			'threads' => isset($counters[$id]['threads']) ? $counters[$id]['threads'] : 0,
+			'last_post' => array(
+				'name' => isset($last_post['name']) ? $last_post['name'] : null,
+				'date' => isset($last_post['post_date']) ? $last_post['post_date'] : null,
+				'player_link' => isset($last_post['name']) ? getPlayerLink($last_post['name']) : null,
+			)
+		);
 	}
-
-	$twig->display('forum.boards.html.twig', array(
-		'boards' => $boards,
-		'canEdit' => $canEdit,
-		'last' => count($sections)
-	));
-
-	return;
 }
 
-$errors = array();
-if($action == 'show_board' || $action == 'show_thread')
-{
-	require PAGES . 'forum/' . $action . '.php';
-	return;
-}
-
-if(!$logged)
-{
-	$extra_url = '';
-	if($action == 'new_post' && isset($_GET['thread_id'])) {
-		$extra_url = '&action=new_post&thread_id=' . $_GET['thread_id'];
-	}
-
-	header('Location: ' . BASE_URL . '?subtopic=accountmanagement&redirect=' . BASE_URL . urlencode('?subtopic=forum' . $extra_url));
-	return;
-}
-
-if(!ctype_alnum(str_replace(array('-', '_'), '', $action))) {
-	error('Error: Action contains illegal characters.');
-}
-else if(file_exists(PAGES . 'forum/' . $action . '.php')) {
-	require PAGES . 'forum/' . $action . '.php';
-}
-else {
-	error('This page does not exists.');
-}
-?>
+$twig->display('forum.boards.html.twig', array(
+	'boards' => $boards,
+	'canEdit' => $canEdit,
+	'last' => count($sections)
+));

system/pages/forum/admin.php

@@ -0,0 +1,95 @@
+<?php
+/**
+ * Forum admin
+ *
+ * @package   MyAAC
+ * @author    Gesior <jerzyskalski@wp.pl>
+ * @author    Slawkens <slawkens@gmail.com>
+ * @copyright 2021 MyAAC
+ * @link      https://my-aac.org
+ */
+defined('MYAAC') or exit('Direct access not allowed!');
+
+$canEdit = Forum::isModerator();
+if($canEdit) {
+	$groups = new OTS_Groups_List();
+
+	if(!empty($action))
+	{
+		if($action == 'delete_board' || $action == 'edit_board' || $action == 'hide_board' || $action == 'moveup_board' || $action == 'movedown_board')
+			$id = $_REQUEST['id'];
+
+		if(isset($_REQUEST['access']))
+			$access = $_REQUEST['access'];
+
+		if(isset($_REQUEST['guild']))
+			$guild = $_REQUEST['guild'];
+
+		if(isset($_REQUEST['name']))
+			$name = $_REQUEST['name'];
+
+		if(isset($_REQUEST['description']))
+			$description = stripslashes($_REQUEST['description']);
+
+		$errors = array();
+
+		if($action == 'add_board') {
+			if(Forum::add_board($name, $description, $access, $guild, $errors))
+				$action = $name = $description = '';
+		}
+		else if($action == 'delete_board') {
+			Forum::delete_board($id, $errors);
+			$action = '';
+		}
+		else if($action == 'edit_board')
+		{
+			if(isset($id) && !isset($name)) {
+				$board = Forum::get_board($id);
+				$name = $board['name'];
+				$access = $board['access'];
+				$guild = $board['guild'];
+				$description = $board['description'];
+			}
+			else {
+				Forum::update_board($id, $name, $access, $guild, $description);
+				$action = $name = $description = '';
+				$access = $guild = 0;
+			}
+		}
+		else if($action == 'hide_board') {
+			Forum::toggleHidden_board($id, $errors);
+			$action = '';
+		}
+		else if($action == 'moveup_board') {
+			Forum::move_board($id, -1, $errors);
+			$action = '';
+		}
+		else if($action == 'movedown_board') {
+			Forum::move_board($id, 1, $errors);
+			$action = '';
+		}
+
+		if(!empty($errors)) {
+			$twig->display('error_box.html.twig', array('errors' => $errors));
+			$action = '';
+		}
+	}
+
+	if(empty($action) || $action == 'edit_board') {
+		$guilds = $db->query('SELECT `id`, `name` FROM `guilds`')->fetchAll();
+		$twig->display('forum.add_board.html.twig', array(
+			'link' => getLink('forum', ($action == 'edit_board' ? 'edit_board' : 'add_board')),
+			'action' => $action,
+			'id' => isset($id) ? $id : null,
+			'name' => isset($name) ? $name : null,
+			'description' => isset($description) ? $description : null,
+			'access' => isset($access) ? $access : 0,
+			'guild' => isset($guild) ? $guild : null,
+			'groups' => $groups,
+			'guilds' => $guilds
+		));
+
+		if($action == 'edit_board')
+			$action = '';
+	}
+}

system/pages/forum/base.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Forum base
+ *
+ * @package   MyAAC
+ * @author    Gesior <jerzyskalski@wp.pl>
+ * @author    Slawkens <slawkens@gmail.com>
+ * @copyright 2021 MyAAC
+ * @link      https://my-aac.org
+ */
+defined('MYAAC') or die('Direct access not allowed!');
+$title = 'Forum';
+
+if(strtolower($config['forum']) != 'site')
+{
+	if($config['forum'] != '')
+	{
+		header('Location: ' . $config['forum']);
+		exit;
+	}
+
+	echo 'Forum is disabled on this site.';
+	return;
+}
+
+if(!$logged)
+	echo  'You are not logged in. <a href="?subtopic=accountmanagement&redirect=' . BASE_URL . urlencode('?subtopic=forum') . '">Log in</a> to post on the forum.<br /><br />';
+
+require_once LIBS . 'forum.php';
+
+$sections = array();
+foreach(getForumBoards() as $section)
+{
+	$sections[$section['id']] = array(
+		'id' => $section['id'],
+		'name' => $section['name'],
+		'description' => $section['description'],
+		'closed' => $section['closed'] == '1',
+		'guild' => $section['guild'],
+		'access' => $section['access']
+	);
+
+	if($canEdit) {
+		$sections[$section['id']]['hidden'] = $section['hidden'];
+	}
+	else {
+		$sections[$section['id']]['hidden'] = 0;
+	}
+}
+
+$number_of_rows = 0;

system/pages/forum/edit_post.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 if(Forum::canPost($account_logged))
 {
 	$post_id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : false;
@@ -113,4 +115,4 @@ if(Forum::canPost($account_logged))
 else
 	echo "<br/>Your account is banned, deleted or you don't have any player with level " . $config['forum_level_required'] . " on your account. You can't post.";
 
-?>
+?>

system/pages/forum/move_thread.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 if(!Forum::isModerator()) {
 	echo 'You are not logged in or you are not moderator.';
 }
@@ -61,4 +63,4 @@ else {
 	else
 		echo 'Post with ID ' . $post_id . ' does not exist.';
 }
-?>
+?>

system/pages/forum/new_post.php

@@ -10,6 +10,19 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
+if(!$logged)
+{
+	$extra_url = '';
+	if(isset($_GET['thread_id'])) {
+		$extra_url = '&action=new_post&thread_id=' . $_GET['thread_id'];
+	}
+
+	header('Location: ' . BASE_URL . '?subtopic=accountmanagement&redirect=' . BASE_URL . urlencode('?subtopic=forum' . $extra_url));
+	return;
+}
+
 if(Forum::canPost($account_logged))
 {
 	$players_from_account = $db->query("SELECT `players`.`name`, `players`.`id` FROM `players` WHERE `players`.`account_id` = ".(int) $account_logged->getId())->fetchAll();
@@ -116,4 +129,4 @@ if(Forum::canPost($account_logged))
 else
 	echo "Your account is banned, deleted or you don't have any player with level " . $config['forum_level_required'] . " on your account. You can't post.";
 
-$twig->display('forum.fullscreen.html.twig');
+$twig->display('forum.fullscreen.html.twig');

system/pages/forum/new_thread.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 if(Forum::canPost($account_logged))
 {
 	$players_from_account = $db->query('SELECT `players`.`name`, `players`.`id` FROM `players` WHERE `players`.`account_id` = '.(int) $account_logged->getId())->fetchAll();
@@ -102,4 +104,4 @@ if(Forum::canPost($account_logged))
 else
 	echo 'Your account is banned, deleted or you don\'t have any player with level '.$config['forum_level_required'].' on your account. You can\'t post.';
 
-?>
+?>

system/pages/forum/remove_post.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 if(Forum::isModerator())
 {
 	$id = (int) $_REQUEST['id'];
@@ -33,4 +35,4 @@ if(Forum::isModerator())
 		echo 'Post with ID ' . $id . ' does not exist.';
 }
 else
-	echo 'You are not logged in or you are not moderator.';
+	echo 'You are not logged in or you are not moderator.';

system/pages/forum/show_board.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 $links_to_pages = '';
 $section_id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : null;
 

system/pages/forum/show_thread.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 $links_to_pages = '';
 $thread_id = (int) $_REQUEST['id'];
 $_page = (int) (isset($_REQUEST['page']) ? $_REQUEST['page'] : 0);

system/pages/guilds.php

@@ -11,16 +11,9 @@
 defined('MYAAC') or die('Direct access not allowed!');
 $title = 'Guilds';
 
-if($db->hasTable('guild_members'))
-	define('GUILD_MEMBERS_TABLE', 'guild_members');
-else
-	define('GUILD_MEMBERS_TABLE', 'guild_membership');
-
-define('MOTD_EXISTS', $db->hasColumn('guilds', 'motd'));
-
 //show list of guilds
 if(empty($action)) {
-	require PAGES . 'guilds/list_of_guilds.php';
+	require PAGES . 'guilds/list.php';
 }
 else {
 	if(!ctype_alnum(str_replace(array('-', '_'), '', $action))) {

system/pages/guilds/accept_invite.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+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;
@@ -124,4 +126,4 @@ else {
 	}
 }
 
-?>
+?>

system/pages/guilds/add_rank.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 $rank_name = isset($_REQUEST['rank_name']) ? $_REQUEST['rank_name'] : null;
 if(!Validator::guildName($guild_name)) {
@@ -74,4 +76,4 @@ else
 	}
 }
 
-?>
+?>

system/pages/guilds/base.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Guilds base
+ *
+ * @package   MyAAC
+ * @author    Slawkens <slawkens@gmail.com>
+ * @copyright 2021 MyAAC
+ * @link      https://my-aac.org
+ */
+defined('MYAAC') or die('Direct access not allowed!');
+
+if($db->hasTable('guild_members'))
+	define('GUILD_MEMBERS_TABLE', 'guild_members');
+else
+	define('GUILD_MEMBERS_TABLE', 'guild_membership');
+
+define('MOTD_EXISTS', $db->hasColumn('guilds', 'motd'));

system/pages/guilds/change_description.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 if(!Validator::guildName($guild_name)) {
 	$errors[] = Validator::getLastError();

system/pages/guilds/change_logo.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 if(!Validator::guildName($guild_name)) {
 	$errors[] = Validator::getLastError();
@@ -122,4 +124,4 @@ if(!empty($errors)) {
 		'action' => '?subtopic=guilds'
 	));
 }
-?>
+?>

system/pages/guilds/change_motd.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 if(!MOTD_EXISTS)
 	return;
 
@@ -74,4 +76,4 @@ if(!empty($errors)) {
 	));
 }
 
-?>
+?>

system/pages/guilds/change_nick.php

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

system/pages/guilds/change_rank.php

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

system/pages/guilds/cleanup_guilds.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 if(!$logged)
 {
 	echo "You are not logged in.";
@@ -64,4 +66,4 @@ else
 	echo "0 guilds found.";
 
 $twig->display('guilds.back_button.html.twig');
-?>
+?>

system/pages/guilds/cleanup_players.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 if(!$logged)
 {
 	echo "You are not logged in.";
@@ -66,4 +68,4 @@ else
 	echo "0 players found.";
 
 $twig->display('guilds.back_button.html.twig');
-?>
+?>

system/pages/guilds/create.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+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;
@@ -131,4 +133,4 @@ else {
 	));
 }
 
-?>
+?>

system/pages/guilds/delete_by_admin.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 if(!Validator::guildName($guild_name)) {
 	$errors[] = Validator::getLastError();
@@ -65,4 +67,4 @@ if(!empty($errors)) {
 	));
 }
 
-?>
+?>

system/pages/guilds/delete_guild.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 if(!Validator::guildName($guild_name)) {
 	$errors[] = Validator::getLastError();
@@ -77,4 +79,4 @@ if(!empty($errors)) {
 	));
 }
 
-?>
+?>

system/pages/guilds/delete_invite.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 $name = stripslashes($_REQUEST['name']);
 
@@ -113,4 +115,4 @@ else
 			'guild_name' => $guild->getName()
 		));
 	}
-}
+}

system/pages/guilds/delete_rank.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 $rank_to_delete = isset($_REQUEST['rankid']) ? (int) $_REQUEST['rankid'] : null;
 

system/pages/guilds/invite.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+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;
@@ -122,4 +124,4 @@ if($show) {
 
 $twig->display('guilds.back_button.html.twig', array(
 	'action' => getLink('guilds') . '/' . $guild_name
-));
+));

system/pages/guilds/kick_player.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+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;
@@ -118,4 +120,4 @@ else
 		));
 	}
 }
-?>
+?>

system/pages/guilds/leave.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+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;

system/pages/guilds/list.php

@@ -11,6 +11,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 $guilds_list = new OTS_Guilds_List();
 $guilds_list->orderBy("name");
 

system/pages/guilds/manager.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 if(!Validator::guildName($guild_name)) {
 	$errors[] = Validator::getLastError();
@@ -56,5 +58,3 @@ if(empty($errors)) {
 if(!empty($errors)) {
 	$twig->display('error_box.html.twig', array('errors' => $errors));
 }
-
-?>

system/pages/guilds/pass_leadership.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : NULL;
 $pass_to = isset($_REQUEST['player']) ? stripslashes($_REQUEST['player']) : NULL;
 if(!Validator::guildName($guild_name)) {
@@ -116,4 +118,4 @@ if(!empty($guild_errors)) {
 	echo '<br/><div style="text-align:center"><form action="?subtopic=guilds" method="post">' . $twig->render('buttons.back.html.twig') . '</form></div>';
 }
 
-?>
+?>

system/pages/guilds/save_ranks.php

@@ -10,6 +10,8 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
+require __DIR__ . '/base.php';
+
 $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 if(!Validator::guildName($guild_name)) {
 	$errors[] = Validator::getLastError();

system/pages/guilds/show.php

@@ -12,6 +12,9 @@
 defined('MYAAC') or die('Direct access not allowed!');
 
 $title = 'Guilds';
+
+require __DIR__ . '/base.php';
+
 $guild_name = isset($_REQUEST['guild']) ? urldecode($_REQUEST['guild']) : null;
 if(!Validator::guildName($guild_name))
 	$errors[] = Validator::getLastError();
@@ -159,4 +162,4 @@ $twig->display('guilds.view.html.twig', array(
     'invited_list' => $invited_list,
     'show_accept_invite' => $show_accept_invite,
     'useGuildNick' => $useGuildNick
-));
+));

system/pages/highscores.php

@@ -16,11 +16,11 @@ if(config('account_country') && $configHighscoresCountryBox)
 	require SYSTEM . 'countries.conf.php';
 
 $list = isset($_GET['list']) ? $_GET['list'] : 'experience';
-$_page = isset($_GET['page']) ? $_GET['page'] : 1;
+$page = isset($_GET['page']) ? $_GET['page'] : 1;
 $vocation = isset($_GET['vocation']) ? $_GET['vocation'] : 'all';
 
-if(!is_numeric($_page) || $_page < 1 || $_page > PHP_INT_MAX) {
-	$_page = 1;
+if(!is_numeric($page) || $page < 1 || $page > PHP_INT_MAX) {
+	$page = 1;
 }
 
 $add_sql = '';
@@ -139,7 +139,7 @@ $configHighscoresPerPage = config('highscores_per_page');
 $limit = $configHighscoresPerPage + 1;
 
 $needReCache = true;
-$cacheKey = 'highscores_' . $skill . '_' . $vocation . '_' . $_page . '_' . $configHighscoresPerPage;
+$cacheKey = 'highscores_' . $skill . '_' . $vocation . '_' . $page . '_' . $configHighscoresPerPage;
 
 $cache = Cache::getInstance();
 if ($cache->enabled()) {
@@ -150,7 +150,7 @@ if ($cache->enabled()) {
 	}
 }
 
-$offset = ($_page - 1) * $configHighscoresPerPage;
+$offset = ($page - 1) * $configHighscoresPerPage;
 if (!isset($highscores) || empty($highscores)) {
 	if ($skill >= POT::SKILL_FIRST && $skill <= POT::SKILL_LAST) { // skills
 		if ($db->hasColumn('players', 'skill_fist')) {// tfs 1.0
@@ -280,14 +280,14 @@ foreach($highscores as $id => &$player)
 
 //link to previous page if actual page is not first
 $linkPreviousPage = '';
-if($_page > 1) {
-	$linkPreviousPage = getLink('highscores') . '/' . $list . ($vocation !== 'all' ? '/' . $vocation : '') . '/' . ($_page - 1);
+if($page > 1) {
+	$linkPreviousPage = getLink('highscores') . '/' . $list . ($vocation !== 'all' ? '/' . $vocation : '') . '/' . ($page - 1);
 }
 
 //link to next page if any result will be on next page
 $linkNextPage = '';
 if($show_link_to_next_page) {
-	$linkNextPage = getLink('highscores') . '/' . $list . ($vocation !== 'all' ? '/' . $vocation : '') . '/' . ($_page + 1);
+	$linkNextPage = getLink('highscores') . '/' . $list . ($vocation !== 'all' ? '/' . $vocation : '') . '/' . ($page + 1);
 }
 
 $types = array(