From 59f84568f1bdf9e1203de2b681826b57b8c3156a Mon Sep 17 00:00:00 2001
From: Lncvrt <lncvrtreal@gmail.com>
Date: Sun, 6 Jul 2025 16:19:12 -0700
Subject: [PATCH] I dunno what I was doing

---
 config/general.php         |  4 ++--
 database/canLoadClient.php | 18 ------------------
 incl/util.php              | 24 ++++++++++++++++++++----
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/config/general.php b/config/general.php
index d6329df..9b3ff37 100644
--- a/config/general.php
+++ b/config/general.php
@@ -1,5 +1,5 @@
 <?php
 $latestVersion = "1.5.2";
 $latestBetaVersion = "1.6-dev";
-$allowedVersions = [$latestVersion, $allowedVersions];
-$allowedDatabaseVersions = [$latestVersion, $allowedVersions];
\ No newline at end of file
+$allowedVersions = [$latestVersion, $latestBetaVersion];
+$allowedDatabaseVersions = [$latestVersion, $latestBetaVersion];
\ No newline at end of file
diff --git a/database/canLoadClient.php b/database/canLoadClient.php
index a59fee8..17e3450 100644
--- a/database/canLoadClient.php
+++ b/database/canLoadClient.php
@@ -3,24 +3,6 @@ require __DIR__ . '/../config/general.php';
 require __DIR__ . '/../incl/util.php';
 setPlainHeader();
 
-function isSupportedVersion($version) {
-    global $latestVersion;
-    if (!isset($latestVersion)) require __DIR__ . '/../config/general.php';
-    return $version === $latestVersion || $version === $latestBetaVersion;
-}
-
-function isAllowedVersion($version) {
-    global $allowedVersions;
-    if (!isset($allowedVersions)) require __DIR__ . '/../config/general.php';
-    return in_array($version, $allowedVersions);
-}
-
-function isAllowedDatabaseVersion($version) {
-    global $allowedDatabaseVersions;
-    if (!isset($allowedDatabaseVersions)) require __DIR__ . '/../config/general.php';
-    return in_array($version, $allowedDatabaseVersions);
-}
-
 $clientVersion = $_SERVER['HTTP_CLIENTVERSION'] ?? "0";
 if (($_SERVER['HTTP_REQUESTER'] ?? "0") != "BerryDashClient") {
     exitWithMessage("-1", false);
diff --git a/incl/util.php b/incl/util.php
index 1e71b35..ab2ddb4 100644
--- a/incl/util.php
+++ b/incl/util.php
@@ -1,6 +1,4 @@
 <?php
-$requester = $_SERVER['HTTP_REQUESTER'] ?? '';
-
 function setPlainHeader() {
     header("Content-Type: text/plain");
 }
@@ -51,12 +49,30 @@ function exitWithMessage($message, $encrypt = true) {
     exit;
 }
 
+function isSupportedVersion($version) {
+    global $latestVersion;
+    if (!isset($latestVersion)) require __DIR__ . '/../config/general.php';
+    return $version === $latestVersion || $version === $latestBetaVersion;
+}
+
+function isAllowedVersion($version) {
+    global $allowedVersions;
+    if (!isset($allowedVersions)) require __DIR__ . '/../config/general.php';
+    return in_array($version, $allowedVersions);
+}
+
+function isAllowedDatabaseVersion($version) {
+    global $allowedDatabaseVersions;
+    if (!isset($allowedDatabaseVersions)) require __DIR__ . '/../config/general.php';
+    return in_array($version, $allowedDatabaseVersions);
+}
+
 function checkClientDatabaseVersion() {
     global $allowedDatabaseVersions;
     if (!isset($allowedDatabaseVersions)) require __DIR__ . '/../config/general.php';
     if (!isset($_SERVER['HTTP_REQUESTER'])) exitWithMessage("-998");
-    if ($_SERVER['HTTP_REQUESTER'] != "BerryDashClient") return;
-    if (!in_array($_SERVER['HTTP_CLIENTVERSION'] ?? '', $allowedDatabaseVersions) || $_SERVER['HTTP_REQUESTER'] != "BerryDashClient") exitWithMessage("-998");
+    if ($_SERVER['HTTP_REQUESTER'] != "BerryDashClient") exitWithMessage("-998");
+    if (!in_array($_SERVER['HTTP_CLIENTVERSION'] ?? '', $allowedDatabaseVersions)) exitWithMessage("-998");
 }
 
 function getPostData() {