From c2f55791c0e46b8beaaf0ead8844894ce6832c70 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Mon, 3 Mar 2025 20:07:54 +0100
Subject: [PATCH 1/9] Nothing important, just better code style

---
 system/functions.php | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/system/functions.php b/system/functions.php
index 7aa43935..947dd5bd 100644
--- a/system/functions.php
+++ b/system/functions.php
@@ -982,31 +982,29 @@ function load_config_lua($filename)
 				continue;
 			}
 			$tmp_exp = explode('=', $line, 2);
-			if(strpos($line, 'dofile') !== false)
-			{
+			if(str_contains($line, 'dofile')) {
 				$delimiter = '"';
-				if(strpos($line, $delimiter) === false)
+				if(!str_contains($line, $delimiter)) {
 					$delimiter = "'";
+				}
 
 				$tmp = explode($delimiter, $line);
 				$result = array_merge($result, load_config_lua($config['server_path'] . $tmp[1]));
 			}
-			else if(count($tmp_exp) >= 2)
-			{
+			else if(count($tmp_exp) >= 2) {
 				$key = trim($tmp_exp[0]);
-				if(0 !== strpos($key, '--'))
-				{
+				if(!str_starts_with($key, '--')) {
 					$value = trim($tmp_exp[1]);
-					if(strpos($value, '--') !== false) {// found some deep comment
+					if(str_contains($value, '--')) {// found some deep comment
 						$value = preg_replace('/--.*$/i', '', $value);
 					}
 
 					if(is_numeric($value))
 						$result[$key] = (float) $value;
 					elseif(in_array(@$value[0], array("'", '"')) && in_array(@$value[strlen($value) - 1], array("'", '"')))
-						$result[$key] = (string) substr(substr($value, 1), 0, -1);
+						$result[$key] = substr(substr($value, 1), 0, -1);
 					elseif(in_array($value, array('true', 'false')))
-						$result[$key] = ($value === 'true') ? true : false;
+						$result[$key] = $value === 'true';
 					elseif(@$value[0] === '{') {
 						// arrays are not supported yet
 						// just ignore the error
@@ -1014,7 +1012,7 @@ function load_config_lua($filename)
 					}
 					else
 					{
-						foreach($result as $tmp_key => $tmp_value) // load values definied by other keys, like: dailyFragsToBlackSkull = dailyFragsToRedSkull
+						foreach($result as $tmp_key => $tmp_value) // load values defined by other keys, like: dailyFragsToBlackSkull = dailyFragsToRedSkull
 							$value = str_replace($tmp_key, $tmp_value, $value);
 						$ret = @eval("return $value;");
 						if((string) $ret == '' && trim($value) !== '""') // = parser error
@@ -1028,8 +1026,7 @@ function load_config_lua($filename)
 		}
 	}
 
-	$result = array_merge($result, isset($config['lua']) ? $config['lua'] : array());
-	return $result;
+	return array_merge($result, $config['lua'] ?? []);
 }
 
 function str_replace_first($search,$replace, $subject) {

From 00fe1adc15ea7646596d755f6e6e1f7854ffc1d5 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Mon, 10 Mar 2025 10:48:12 +0100
Subject: [PATCH 2/9] Fix: add possibility to remove all menu items

---
 admin/pages/menus.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin/pages/menus.php b/admin/pages/menus.php
index e2608b0b..572be25e 100644
--- a/admin/pages/menus.php
+++ b/admin/pages/menus.php
@@ -27,11 +27,11 @@ $pluginThemes = Plugins::getThemes();
 if (isset($_POST['template'])) {
 	$template = $_POST['template'];
 
-	if (isset($_POST['menu'])) {
-		$post_menu = $_POST['menu'];
-		$post_menu_link = $_POST['menu_link'];
-		$post_menu_blank = $_POST['menu_blank'];
-		$post_menu_color = $_POST['menu_color'];
+	if (isset($_POST['save'])) {
+		$post_menu = $_POST['menu'] ?? [];
+		$post_menu_link = $_POST['menu_link'] ?? [];
+		$post_menu_blank = $_POST['menu_blank'] ?? [];
+		$post_menu_color = $_POST['menu_color'] ?? [];
 		if (count($post_menu) != count($post_menu_link)) {
 			echo 'Menu count is not equal menu links. Something went wrong when sending form.';
 			return;
@@ -135,7 +135,7 @@ if (isset($_POST['template'])) {
 	<form method="post" id="menus-form" action="?p=menus">
 		<?php csrf(); ?>
 		<input type="hidden" name="template" value="<?php echo $template ?>"/>
-		<button type="submit" class="btn btn-info">Save</button><br/><br/>
+		<button type="submit" name="save" class="btn btn-info">Save</button><br/><br/>
 		<div class="row">
 			<?php foreach ($config['menu_categories'] as $id => $cat): ?>
 				<div class="col-md-12 col-lg-6">

From cc26b5c74445076e13b886ed3b26ad62eac38418 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Mon, 10 Mar 2025 10:48:12 +0100
Subject: [PATCH 3/9] Fix: add possibility to remove all menu items

---
 admin/pages/menus.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin/pages/menus.php b/admin/pages/menus.php
index e2608b0b..572be25e 100644
--- a/admin/pages/menus.php
+++ b/admin/pages/menus.php
@@ -27,11 +27,11 @@ $pluginThemes = Plugins::getThemes();
 if (isset($_POST['template'])) {
 	$template = $_POST['template'];
 
-	if (isset($_POST['menu'])) {
-		$post_menu = $_POST['menu'];
-		$post_menu_link = $_POST['menu_link'];
-		$post_menu_blank = $_POST['menu_blank'];
-		$post_menu_color = $_POST['menu_color'];
+	if (isset($_POST['save'])) {
+		$post_menu = $_POST['menu'] ?? [];
+		$post_menu_link = $_POST['menu_link'] ?? [];
+		$post_menu_blank = $_POST['menu_blank'] ?? [];
+		$post_menu_color = $_POST['menu_color'] ?? [];
 		if (count($post_menu) != count($post_menu_link)) {
 			echo 'Menu count is not equal menu links. Something went wrong when sending form.';
 			return;
@@ -135,7 +135,7 @@ if (isset($_POST['template'])) {
 	<form method="post" id="menus-form" action="?p=menus">
 		<?php csrf(); ?>
 		<input type="hidden" name="template" value="<?php echo $template ?>"/>
-		<button type="submit" class="btn btn-info">Save</button><br/><br/>
+		<button type="submit" name="save" class="btn btn-info">Save</button><br/><br/>
 		<div class="row">
 			<?php foreach ($config['menu_categories'] as $id => $cat): ?>
 				<div class="col-md-12 col-lg-6">

From 9239a4f4198c3ad260802ac3b47e9c41b80b754e Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Mon, 10 Mar 2025 12:46:33 +0100
Subject: [PATCH 4/9] Fix the second "Save" button -> addition to previous
 commit

---
 admin/pages/menus.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/pages/menus.php b/admin/pages/menus.php
index 572be25e..19d7b486 100644
--- a/admin/pages/menus.php
+++ b/admin/pages/menus.php
@@ -168,7 +168,7 @@ if (isset($_POST['template'])) {
 		</div>
 		<div class="row pb-2">
 			<div class="col-md-12">
-				<button type="submit" class="btn btn-info">Save</button>
+				<button type="submit" name="save" class="btn btn-info">Save</button>
 				<?php
 				echo '<button type="button" class="btn btn-danger float-right" value="Cancel" onclick="window.location = \'' . ADMIN_URL . '?p=menus\';"><i class="fas fa-cancel"></i> Cancel</button>';
 				?>

From 08b8a716d451fe2338a46a83b4266727722bbe32 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Mon, 10 Mar 2025 12:46:33 +0100
Subject: [PATCH 5/9] Fix the second "Save" button -> addition to previous
 commit

---
 admin/pages/menus.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/pages/menus.php b/admin/pages/menus.php
index 572be25e..19d7b486 100644
--- a/admin/pages/menus.php
+++ b/admin/pages/menus.php
@@ -168,7 +168,7 @@ if (isset($_POST['template'])) {
 		</div>
 		<div class="row pb-2">
 			<div class="col-md-12">
-				<button type="submit" class="btn btn-info">Save</button>
+				<button type="submit" name="save" class="btn btn-info">Save</button>
 				<?php
 				echo '<button type="button" class="btn btn-danger float-right" value="Cancel" onclick="window.location = \'' . ADMIN_URL . '?p=menus\';"><i class="fas fa-cancel"></i> Cancel</button>';
 				?>

From 0852fba6f03b5da55d0177a3e3edd01cf0a93271 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Mon, 10 Mar 2025 20:26:25 +0100
Subject: [PATCH 6/9] Release v1.3

---
 CHANGELOG.md | 12 ++++++++++++
 common.php   |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b90ab4f..37a1b73d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.3 - 10.03.2025]
+
+### Changed
+* Use latest outfit-images host from @gesior (https://github.com/slawkens/myaac/commit/529bdcf016dd0f9dffbc34d81f99a046a9ddb70d)
+* Change monster link to $_GET ?name= (https://github.com/slawkens/myaac/commit/4c5cc8b573b2b3e7ec00a22b7ede30a68083a924)
+
+### Fixed
+* Fixed house links (https://github.com/slawkens/myaac/commit/887b5068ad11c4cdab614afd34525caba785ce13)
+* Fixed long title on headline.php (https://github.com/slawkens/myaac/commit/3e3f4bb5a514158ec8777684ca6c7f1c2a37bed5)
+* Fixed menu colors once again, plus add !important tag (https://github.com/slawkens/myaac/commit/aa52df6e2ec92cafc25b655ae907bf2e1746d9cc)
+* Fix: add possibility to remove all menu items in admin panel (https://github.com/slawkens/myaac/commit/00fe1adc15ea7646596d755f6e6e1f7854ffc1d5, https://github.com/slawkens/myaac/commit/9239a4f4198c3ad260802ac3b47e9c41b80b754e)
+
 ## [1.2 - 09.02.2025]
 
 ### Added
diff --git a/common.php b/common.php
index 0c390ac7..4b8a64f6 100644
--- a/common.php
+++ b/common.php
@@ -26,7 +26,7 @@
 if (version_compare(phpversion(), '8.1', '<')) die('PHP version 8.1 or higher is required.');
 
 const MYAAC = true;
-const MYAAC_VERSION = '1.2';
+const MYAAC_VERSION = '1.3';
 const DATABASE_VERSION = 43;
 const TABLE_PREFIX = 'myaac_';
 define('START_TIME', microtime(true));

From 4a6896b4469968b9904292734cf6c14ba5eeef14 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sat, 15 Mar 2025 22:48:59 +0100
Subject: [PATCH 7/9] getPremDays: returns -1 if freePremium

---
 system/libs/pot/OTS_Account.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/libs/pot/OTS_Account.php b/system/libs/pot/OTS_Account.php
index 07f31c82..fe134a71 100644
--- a/system/libs/pot/OTS_Account.php
+++ b/system/libs/pot/OTS_Account.php
@@ -443,19 +443,19 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
 			throw new E_OTS_NotLoaded();
 		}
 
+		$configFreePremium = configLua('freePremium');
+		if(isset($configFreePremium) && getBoolean($configFreePremium)) {return -1;}
+
 		if(isset($this->data['premium_ends_at']) || isset($this->data['premend'])) {
 			$col = isset($this->data['premium_ends_at']) ? 'premium_ends_at' : 'premend';
 			$ret = ceil(($this->data[$col] - time()) / (24 * 60 * 60));
-			return $ret > 0 ? $ret : 0;
+			return max($ret, 0);
 		}
 
 		if($this->data['premdays'] == 0) {
 			return 0;
 		}
 
-		global $config;
-		if(isset($config['lua']['freePremium']) && getBoolean($config['lua']['freePremium'])) return -1;
-
 		if($this->data['premdays'] == self::GRATIS_PREMIUM_DAYS){
 			return self::GRATIS_PREMIUM_DAYS;
 		}