Merge branch 'develop' into feature/login-by-email

2025-10-15 02:04:54 +02:00 · 2021-06-09 00:08:13 +02:00
parent 02f993baea 0f3d2424ce
commit 6f3ba9c34b
18 changed files with 89 additions and 83 deletions
--- a/system/libs/DataLoader.php
+++ b/system/libs/DataLoader.php
@@ -63,7 +63,7 @@ class DataLoader

 		self::$startTime = microtime(true);

-		require LIBS . 'npc.php';
+		require_once LIBS . 'npc.php';
 		if(NPCs::loadFromXML()) {
 			success(self::$locale['step_database_loaded_npcs'] . self::getLoadedTime());
 		}
--- a/system/libs/plugins.php
+++ b/system/libs/plugins.php
@@ -66,7 +66,7 @@ class Plugins {
 				continue;
 			}

-			if(isset($plugin['enabled']) && $plugin['enabled'] === 0) {
+			if(isset($plugin['enabled']) && !getBoolean($plugin['enabled'])) {
 				self::$warnings[] = 'Skipping ' . $filename . '... The plugin is disabled.';
 				continue;
 			}
--- a/system/libs/validator.php
+++ b/system/libs/validator.php
@@ -223,7 +223,7 @@ class Validator

 		$npcCheck = config('character_name_npc_check');
 		if ($npcCheck) {
-			require LIBS . 'npc.php';
+			require_once LIBS . 'npc.php';
 			NPCS::load();
 			if(NPCS::$npcs && in_array(strtolower($name), NPCS::$npcs)) {
 				self::$lastError = "Invalid name format. Do not use NPC Names";
@@ -346,7 +346,7 @@ class Validator

 		$npcCheck = config('character_name_npc_check');
 		if ($npcCheck) {
-			require LIBS . 'npc.php';
+			require_once LIBS . 'npc.php';
 			NPCS::load();
 			if(NPCS::$npcs && in_array($name_lower, NPCS::$npcs)) {
 				self::$lastError = "Invalid name format. Do not use NPC Names";
--- a/system/pages/account/create_character.php
+++ b/system/pages/account/create_character.php
@@ -10,7 +10,7 @@
 */
 defined('MYAAC') or die('Direct access not allowed!');

-$character_name = isset($_POST['name']) ? stripslashes(ucwords(strtolower($_POST['name']))) : null;
+$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;
 $character_town = isset($_POST['town']) ? (int)$_POST['town'] : null;
@@ -42,4 +42,4 @@ if(!$character_created) {
 		'save' => $save,
 		'errors' => $errors
 	));
-}
+}
--- a/system/pages/creatures.php
+++ b/system/pages/creatures.php
@@ -54,16 +54,14 @@ if (empty($_REQUEST['creature'])) {
 		$loot = json_decode($creature['loot'], true);
 		usort($loot, 'sort_by_chance');

-		$loot_list = [];
-		foreach ($loot as $item) {
+		foreach ($loot as &$item) {
 			$item['name'] = getItemNameById($item['id']);
 			$item['rarity_chance'] = round($item['chance'] / 1000, 2);
 			$item['rarity'] = getItemRarity($item['chance']);
 			$item['tooltip'] = ucfirst($item['name']) . '<br/>Chance: ' . $item['rarity'] . (config('creatures_loot_percentage') ? ' ('. $item['rarity_chance'] .'%)' : '') . '<br/>Max count: ' . $item['count'];
-			$loot_list[] =  $item;
 		}

-		$creature['loot'] = isset($loot_list) ? $loot_list : null;
+		$creature['loot'] = isset($loot) ? $loot : null;
 		$creature['voices'] = isset($voices) ? $voices : null;
 		$creature['summons'] = isset($summons) ? $summons : null;
 		$creature['elements'] = isset($elements) ? $elements : null;
--- a/system/pages/forum/show_board.php
+++ b/system/pages/forum/show_board.php
@@ -43,7 +43,15 @@ echo '<br /><br />Page: '.$links_to_pages.'<br />';
 $last_threads = $db->query("SELECT `players`.`id` as `player_id`, `players`.`name`, `" . FORUM_TABLE_PREFIX . "forum`.`post_text`, `" . FORUM_TABLE_PREFIX . "forum`.`post_topic`, `" . FORUM_TABLE_PREFIX . "forum`.`id`, `" . FORUM_TABLE_PREFIX . "forum`.`last_post`, `" . FORUM_TABLE_PREFIX . "forum`.`replies`, `" . FORUM_TABLE_PREFIX . "forum`.`views`, `" . FORUM_TABLE_PREFIX . "forum`.`post_date` FROM `players`, `" . FORUM_TABLE_PREFIX . "forum` WHERE `players`.`id` = `" . FORUM_TABLE_PREFIX . "forum`.`author_guid` AND `" . FORUM_TABLE_PREFIX . "forum`.`section` = ".(int) $section_id." AND `" . FORUM_TABLE_PREFIX . "forum`.`first_post` = `" . FORUM_TABLE_PREFIX . "forum`.`id` ORDER BY `" . FORUM_TABLE_PREFIX . "forum`.`last_post` DESC LIMIT ".$config['forum_threads_per_page']." OFFSET ".($_page * $config['forum_threads_per_page']))->fetchAll();
 if(isset($last_threads[0]))
 {
-	echo '<table width="100%"><tr bgcolor="'.$config['vdarkborder'].'" align="center"><td><span style="color: white; font-size: 10px"><b>Thread</b></span></td><td><span style="color: white; font-size: 10px"><b>Thread Starter</b></span></td><td><span style="color: white; font-size: 10px"><b>Replies</b></span></td><td><span style="color: white; font-size: 10px"><b>Views</b></span></td><td><span style="color: white; font-size: 10px"><b>Last Post</b></span></td></tr>';
+	echo '<table width="100%">
+<tr bgcolor="'.$config['vdarkborder'].'" align="center">
+<td class="white">
+<span style="font-size: 10px"><b>Thread</b></span></td>
+<td><span style="font-size: 10px"><b>Thread Starter</b></span></td>
+<td><span style="font-size: 10px"><b>Replies</b></span></td>
+<td><span style="font-size: 10px"><b>Views</b></span></td>
+<td><span style="font-size: 10px"><b>Last Post</b></span></td>
+</tr>';

 	$player = new OTS_Player();
 	foreach($last_threads as $thread)
@@ -83,4 +91,4 @@ if(isset($last_threads[0]))
 else
 	echo '<h3>No threads in this board.</h3>';

-?>
+?>
--- a/system/pages/news.php
+++ b/system/pages/news.php
@@ -29,11 +29,13 @@ if(isset($_GET['archive']))
 	// display big news by id
 	if(isset($_GET['id']))
 	{
+		$id = (int)$_GET['id'];
+
 		$field_name = 'date';
-		if($_REQUEST['id'] < 100000)
+		if($id < 100000)
 			$field_name = 'id';

-		$news = $db->query('SELECT * FROM `'.TABLE_PREFIX . 'news` WHERE `hidden` != 1 AND `' . $field_name . '` = ' . (int)$_REQUEST['id']  . '');
+		$news = $db->query('SELECT * FROM `'.TABLE_PREFIX . 'news` WHERE `hidden` != 1 AND `' . $field_name . '` = ' . $id  . '');
 		if($news->rowCount() == 1)
 		{
 			$news = $news->fetch();
@@ -227,4 +229,4 @@ if(!$news_cached)
 	echo $tmp_content;
 }
 else
-	echo $news_cached;
+	echo $news_cached;
--- a/system/pages/team.php
+++ b/system/pages/team.php
@@ -9,7 +9,7 @@
 * @link      https://my-aac.org
 */
 defined('MYAAC') or die('Direct access not allowed!');
-$title = 'Gamemasters List';
+$title = 'Support in game';

 if($config['account_country'])
 	require SYSTEM . 'countries.conf.php';
--- a/system/template.php
+++ b/system/template.php
@@ -80,6 +80,7 @@ else {
 		}

 		$template_ini = parse_ini_file($file);
+		unset($file);

 		if ($cache->enabled()) {
 			$cache->set('template_ini_' . $template_name, serialize($template_ini));
--- a/system/templates/forum.boards.html.twig
+++ b/system/templates/forum.boards.html.twig
@@ -1,21 +1,21 @@
 <b>Boards</b>
 <table width="100%">
-	<tr bgcolor="{{ config.vdarkborder }}">
+	<tr bgcolor="{{ config.vdarkborder }}" class="white">
 		<td>
-			<span style="color: white; font-size: 10px"><b>Board</b></span>
+			<span style="font-size: 10px"><b>Board</b></span>
 		</td>
 		<td>
-			<span style="color: white; font-size: 10px"><b>Posts</b></span>
+			<span style="font-size: 10px"><b>Posts</b></span>
 		</td>
 		<td>
-			<span style="color: white; font-size: 10px"><b>Threads</b></span>
+			<span style="font-size: 10px"><b>Threads</b></span>
 		</td>
 		<td align="center">
-			<span style="color: white; font-size: 10px"><b>Last Post</b></span>
+			<span style="font-size: 10px"><b>Last Post</b></span>
 		</td>
 		{% if canEdit %}
 			<td>
-				<span style="color: white; font-size: 10px"><b>Options</b></span>
+				<span style="font-size: 10px"><b>Options</b></span>
 			</td>
 		{% endif %}
 	</tr>
--- a/system/templates/forum.show_thread.html.twig
+++ b/system/templates/forum.show_thread.html.twig
@@ -12,8 +12,8 @@ Page: {{ links_to_pages|raw }}<br/>
 		</td>
 	</tr>
 	<tr bgcolor="{{ config.vdarkborder }}">
-		<td width="200">
-			<span style="color: white; font-size: 10px"><b>Author</b></span>
+		<td width="200" class="white">
+			<span style="font-size: 10px"><b>Author</b></span>
 		</td>
 		<td>&nbsp;</td>
 	</tr>
--- a/system/templates/guilds.change_logo.html.twig
+++ b/system/templates/guilds.change_logo.html.twig
@@ -8,15 +8,11 @@ Here you can change logo of your guild.<br/>Actuall logo: <img src="images/guild
 </form>
 Only <b>jpg, gif, png, bmp</b> pictures. Max. size: <b>{{ config.guild_image_size_kb }} KB</b><br>
 <br/>
-{% spaceless %}
 <div style="text-align:center">
 	<form action="?subtopic=guilds&guild={{ guild.getName() }}&action=manager" method="post">
-		<div class="BigButton" style="background-image:url({{ template_path }}/images/global/buttons/sbutton.gif)">
-			{{ include('buttons.back.html.twig') }}
-		</div>
+		{{ include('buttons.back.html.twig') }}
 	</form>
 </div>
-{% endspaceless %}
 <script type="text/javascript">
 	$(function() {
 		$('#upload_form').submit(function (event) {
@@ -34,4 +30,4 @@ Only <b>jpg, gif, png, bmp</b> pictures. Max. size: <b>{{ config.guild_image_siz
 			return true;
 		});
 	});
-</script>
+</script>
--- a/system/templates/guilds.change_motd.html.twig
+++ b/system/templates/guilds.change_motd.html.twig
@@ -5,12 +5,8 @@ Here you can change MOTD (Message of the Day, showed in game!) of your guild.<br
 	<textarea name="motd" cols="60" rows="3">{{ guild.getCustomField('motd')|raw }}</textarea><br/>
 	(max. {{ config.guild_motd_chars_limit }} chars) <input type="submit" value="Save MOTD" /></form><br/>
 <br/>
-{% spaceless %}
 <div style="text-align:center">
 	<form action="?subtopic=guilds&guild={{ guild.getName() }}&action=manager" method="post">
-		<div class="BigButton" style="background-image:url({{ template_path }}/images/global/buttons/sbutton.gif)">
-			{{ include('buttons.back.html.twig') }}
-		</div>
+		{{ include('buttons.back.html.twig') }}
 	</form>
 </div>
-{% endspaceless %}
--- a/system/templates/spells.html.twig
+++ b/system/templates/spells.html.twig
@@ -28,7 +28,6 @@
 		cursor: pointer;
 		font-weight: 600;
 		background-color: {{ config.vdarkborder }};
-		color: #fff;
 	}
 </style>

@@ -61,13 +60,13 @@

 <div class="ts_Spells">
 	<input type="radio" name="ts_Spells" id="tab_instant" aria-controls="instant" checked>
-	<label for="tab_instant">Instant</label>
+	<label for="tab_instant" class="white">Instant</label>

 	<input type="radio" name="ts_Spells" id="tab_conjure" aria-controls="conjure">
-	<label for="tab_conjure">Conjure</label>
+	<label for="tab_conjure" class="white">Conjure</label>

 	<input type="radio" name="ts_Spells" id="tab_rune" aria-controls="rune">
-	<label for="tab_rune">Rune</label>
+	<label for="tab_rune" class="white">Rune</label>

 	<div class="tab-panels">
 		<section id="instant" class="tab-panel">