Feature/new router (#165)

* Remove unneeded escape

* Fix guild back buttons (change logo & motd)

* small adjustment in news.php

* Fix create character when admin (any case is allowed now)

* Fix forum table style (boards & thread view)

* Small improvement to plugins.enabled check

* [WIP] nikic/fast-route implementation

I will describe it more in Pull Request

* Optimisations & fixes.

* Fix path - should not be absolute

* Add PLUGINS to Twig path

* Don't hide "Install Plugin" Box by default

* Update package-lock.json

* nothing important, just early exit & fixes

Fix creature display

* fix premium_ends_at for tfs 1.3+

* Move pages

* Move pages tbc

* $db->select: make $where parameter optional, allows to get all records

* Add some error box to error

* fix parse error

* Rewriting the router v2

To be more flexible

* small fixes

* fix & add admin icons

* Move mass_* pages to correct folder

* fix logout hook 2

* Delete accountmanagement.php

* This code wasn't used

* Add missing var

* Add redirect_from && redirect_to to router options

+ Also add * for all methods shortcut

* Remove comments

Not allowed in normal json

* Allow admin pages included into plugins dir

* block access to some files

* Fix admin logout

* Fix #178

* feature: mail confirmed reward

Suggested by @EPuncker

# Conflicts:
#	system/hooks.php

* remove misleading comment

* adjust required version according to composer.json

* fix duplicated word

* Adjustments & fixed to mass actions

* Add password confirm, and change text type to password

* Add list of Open Source Software MyAAC is using

* Fix signature

* Show First, Second instead of numbers

* fix base dir detection

* fix double ACTION define + undefined URI in template

* new function> escapeHtml + fix css in admin menus

* fix changelog add

* fix news adding, rename const to NEWS_*

* Add verify to pages, add messages, limits, fix add

* fix "Please fill all input"

* add required input to admin pages

* shorten some expressions with ??

* shorten code + fix conversion (int)

* Move account_types to config, account.web_flags to common.php

* Update example.json

* feature: router aliases

* shorten some code + const convert

* remove wrong char

* fix signature on custom basedir

* fix: mass teleport position validation (#214)

* fix: mass teleport position validation

* fix: max position

* Fix execute in CLI

* fix warning in reload cache in dev mode

* Configurable admin panel folder

* feature: plugin require more options with comma

* $config_account_salt -> USE_ACCOUNT_SALT

* fix forum show_thread

* Update show_thread.php

---------

Co-authored-by: Gabriel Pedro <gpedro@users.noreply.github.com>

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,9 +10,11 @@
  */
 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);
+$_page = (int) ($_REQUEST['page'] ?? 0);
 $thread_starter = $db->query("SELECT `players`.`name`, `" . FORUM_TABLE_PREFIX . "forum`.`post_topic`, `" . FORUM_TABLE_PREFIX . "forum`.`section` FROM `players`, `" . FORUM_TABLE_PREFIX . "forum` WHERE `" . FORUM_TABLE_PREFIX . "forum`.`first_post` = ".(int) $thread_id." AND `" . FORUM_TABLE_PREFIX . "forum`.`id` = `" . FORUM_TABLE_PREFIX . "forum`.`first_post` AND `players`.`id` = `" . FORUM_TABLE_PREFIX . "forum`.`author_guid` LIMIT 1")->fetch();
 
 if(empty($thread_starter['name'])) {