Revert "Everything WebsiteSettings!"

This reverts commit b08cc53828.
This commit is contained in:
Astrologies 2021-12-31 14:30:53 -05:00
parent 41ee50596f
commit eb417b791d
19 changed files with 197 additions and 127 deletions

View File

@ -7,7 +7,6 @@ Alphaland 2021
//vars
use Alphaland\Web\WebContextManager;
use Alphaland\Web\WebsiteSettings;
$thumbalive = false;
$gamealive = false;
@ -20,14 +19,18 @@ function checkThumb($override)
{
if (!$GLOBALS['thumbalive'] or $override) //to prevent flooding mysql calls
{
WebsiteSettings::UpdateSetting('isThumbnailerAlive', true);
$GLOBALS['thumbalive'] = true;
$set = $GLOBALS['pdo']->prepare("UPDATE websettings SET isThumbnailerAlive = 1");
$set->execute();
}
}
else //thumb arbiter offline
{
if ($GLOBALS['thumbalive'] or $override) //to prevent flooding mysql calls
{
WebsiteSettings::UpdateSetting('isThumbnailerAlive', false);
$GLOBALS['thumbalive'] = false;
$set = $GLOBALS['pdo']->prepare("UPDATE websettings SET isThumbnailerAlive = 0");
$set->execute();
}
}
}
@ -39,14 +42,18 @@ function checkGame($override)
{
if (!$GLOBALS['gamealive'] or $override) //to prevent flooding mysql calls
{
WebsiteSettings::UpdateSetting('IsGameServerAlive', true);
$GLOBALS['gamealive'] = true;
$set = $GLOBALS['pdo']->prepare("UPDATE websettings SET IsGameServerAlive = 1");
$set->execute();
}
}
else //gameserver arbiter offline
{
if ($GLOBALS['gamealive'] or $override) //to prevent flooding mysql calls
{
WebsiteSettings::UpdateSetting('IsGameServerAlive', false);
$GLOBALS['gamealive'] = false;
$set = $GLOBALS['pdo']->prepare("UPDATE websettings SET IsGameServerAlive = 0");
$set->execute();
}
}
}

View File

@ -8,7 +8,6 @@ namespace Alphaland\Games {
use Alphaland\Assets\Asset;
use Alphaland\Grid\RccServiceHelper;
use Alphaland\Web\WebsiteSettings;
use Exception;
use PDO;
@ -231,7 +230,12 @@ namespace Alphaland\Games {
public static function ArbiterOnline() //the main portion of this check is now a background script
{
return WebsiteSettings::GetSetting("isGameServerAlive");
$check = $GLOBALS['pdo']->prepare("SELECT COUNT(*) FROM websettings WHERE isGameServerAlive = 1");
$check->execute();
if ($check->fetchColumn() > 0) {
return true;
}
return false;
}
public static function RemovePersonalBuildServerRank(int $placeid, int $userid)

View File

@ -15,7 +15,7 @@ namespace Alphaland\Web {
public static function IsCurrentIpAddressWhitelisted()
{
$currentIp = WebContextManager::GetCurrentIPAddress();
$ipWhitelist = explode(";", WebsiteSettings::GetSetting("webservice_whitelist", "127.0.0.0/8;192.168.0.0/16;10.0.0.0/8"));
$ipWhitelist = explode(";", $GLOBALS['ws']->webservice_whitelist);
return IpHelper::IsIpInCidrNetmaskOrRangeList($currentIp, $ipWhitelist);
}
@ -27,10 +27,13 @@ namespace Alphaland\Web {
public static function IsUnderMaintenance(bool $status = false)
{
$isUnderMaintenance = WebsiteSettings::GetSetting('maintenance');
$query = $GLOBALS['pdo']->prepare("SELECT * FROM `websettings` WHERE `maintenance` = 1");
$query->execute();
if ($isUnderMaintenance === true) {
if ($status) return true;
if ($query->rowCount() > 0) {
if ($status) {
return true;
}
return !WebContextManager::CanBypassMaintenance();
}
return false;
@ -54,8 +57,13 @@ namespace Alphaland\Web {
if (!empty($accesskey))
{
if(WebContextManager::IsCurrentIpAddressWhitelisted())
return $accesskey == WebsiteSettings::GetSetting('webservice_key', null);
if(WebContextManager::IsCurrentIpAddressWhitelisted())
{
if($accesskey == $GLOBALS['ws']->webservice_key)
{
return true;
}
}
}
return false;
}

View File

@ -14,7 +14,7 @@ namespace Alphaland\Web {
use PDO;
class WebsiteSettings
/* public static */ class WebsiteSettings
{
// default return if no settings are found
// because there may be a NULL value in the database
@ -84,7 +84,7 @@ namespace Alphaland\Web {
*/
public static function GetSetting(string $name, $default = null)
{
$query = $GLOBALS['pdo']->prepare("SELECT `value`, `type` FROM `websettings_v2` WHERE `name` = :name");
$query = $GLOBALS['pdo']->prepare("SELECT `value`, `type` FROM `websettings` WHERE `name` = :name");
$query->bindParam(':name', $name);
if (!$query->execute()) {
@ -99,6 +99,24 @@ namespace Alphaland\Web {
return self::ConvertStringToValue($result['value'], $result['type']);
}
/**
* Gets or sets the value of a website setting.
*
* @param string $name The name of the setting.
* @param mixed $value The value of the setting.
* @param string $type The type of the setting.
*
* @return mixed The value of the setting.
*/
public static function GetOrCreateSetting(string $name, $value = null, string $type = null)
{
if (!self::SettingExists($name)) {
self::UpdateSetting($name, $value, $type);
}
return self::GetSetting($name);
}
/**
* Sets a website setting.
*
@ -133,9 +151,9 @@ namespace Alphaland\Web {
$query = null;
if ($remote === self::DOES_NOT_EXIST) {
$query = $GLOBALS['pdo']->prepare("INSERT INTO `websettings_v2` (`name`, `value`, `type`) VALUES (:name, :value, :type)");
$query = $GLOBALS['pdo']->prepare("INSERT INTO `websettings` (`name`, `value`, `type`) VALUES (:name, :value, :type)");
} else {
$query = $GLOBALS['pdo']->prepare("UPDATE `websettings_v2` SET `value` = :value, `type` = :type WHERE `name` = :name");
$query = $GLOBALS['pdo']->prepare("UPDATE `websettings` SET `value` = :value, `type` = :type WHERE `name` = :name");
}
if (gettype($value) === 'NULL') {
@ -161,7 +179,7 @@ namespace Alphaland\Web {
*/
public static function DeleteSetting(string $name): bool
{
$query = $GLOBALS['pdo']->prepare("DELETE FROM `websettings_v2` WHERE `name` = :name");
$query = $GLOBALS['pdo']->prepare("DELETE FROM `websettings` WHERE `name` = :name");
$query->bindParam(':name', $name);
return $query->execute();
@ -174,7 +192,7 @@ namespace Alphaland\Web {
*/
public static function GetAllSettings(): array
{
$query = $GLOBALS['pdo']->prepare("SELECT `name`, `value`, `type` FROM `websettings_v2`");
$query = $GLOBALS['pdo']->prepare("SELECT `name`, `value`, `type` FROM `websettings`");
if (!$query->execute()) {
return [];
@ -200,7 +218,7 @@ namespace Alphaland\Web {
*/
public static function SettingExists(string $name): bool
{
$query = $GLOBALS['pdo']->prepare("SELECT `name` FROM `websettings_v2` WHERE `name` = :name");
$query = $GLOBALS['pdo']->prepare("SELECT `name` FROM `websettings` WHERE `name` = :name");
$query->bindParam(':name', $name);
if (!$query->execute()) {
@ -219,7 +237,7 @@ namespace Alphaland\Web {
*/
public static function DeleteAllSettings(): bool
{
$query = $GLOBALS['pdo']->prepare("DELETE FROM `websettings_v2`");
$query = $GLOBALS['pdo']->prepare("DELETE FROM `websettings`");
return $query->execute();
}

View File

@ -42,7 +42,7 @@ try
$siteName = "Alphaland"; //site name
$domain = "alphaland.cc";
$url = "https://www.".$domain; //site URL
//websettings
$ws = $pdo->query("SELECT * FROM websettings WHERE id = 1")->fetch(PDO::FETCH_OBJ); //websettings
$clientUserAgent = "Roblox/WinInet";
$ROBLOXAssetAPI = "https://assetdelivery.roblox.com/v1/asset/?id=";
$ROBLOXProductInfoAPI = "https://api.roblox.com/marketplace/productinfo?assetId=";

View File

@ -12,7 +12,6 @@ use Alphaland\Games\Game;
use Alphaland\Moderation\Filter;
use Alphaland\Users\Render as UsersRender;
use Alphaland\Web\WebContextManager;
use Alphaland\Web\WebsiteSettings;
//safe generation utilities
@ -1496,7 +1495,14 @@ function rewardUserBadge($UserID, $BadgeID, $PlaceID)
function isThumbnailerAlive() //the main portion of this check is now a background script
{
return WebsiteSettings::GetSetting("isThumbnailerAlive");
$check = $GLOBALS['pdo']->prepare("SELECT * FROM websettings WHERE isThumbnailerAlive = 1");
$check->execute();
if ($check->rowCount() > 0)
{
return true;
}
return false;
}
function verifyLuaValue($value) //mostly due to booleans, but maybe something will come up in the future
@ -2376,18 +2382,22 @@ function userPlaceVisits($userid)
function enableMaintenance($custom)
{
if (!empty($custom))
WebsiteSettings::UpdateSetting("maintenance_text", $custom);
WebsiteSettings::UpdateSetting("maintenance", true);
if (!empty($custom)) {
$setmaintenance = $GLOBALS['pdo']->prepare("UPDATE websettings SET maintenance = 1, maintenance_text = :t");
$setmaintenance->bindParam(":t", $custom, PDO::PARAM_STR);
$setmaintenance->execute();
} else {
$setmaintenance = $GLOBALS['pdo']->prepare("UPDATE websettings SET maintenance = 1");
$setmaintenance->execute();
}
soapCloseAllJobs($GLOBALS['gamesArbiter']);
}
function disableMaintenance()
{
WebsiteSettings::UpdateSetting("maintenance", false);
WebsiteSettings::UpdateSetting("maintenance_text", "");
$setmaintenance = $GLOBALS['pdo']->prepare("UPDATE websettings SET maintenance = 0, maintenance_text = ''");
$setmaintenance->execute();
}
function setUserRank($rank, $userid)
@ -2841,36 +2851,43 @@ function getNav()
function fetchAnnouncement()
{
$announcement = WebsiteSettings::GetSetting("announcement");
if (empty($announcement)) return "";
$cleanAnnouncement = cleanOutput($announcement); //clean output
$announcement_color = WebsiteSettings::GetSetting("announcement_color");
$html = "";
switch ($announcement_color)
$announcementquery = $GLOBALS['pdo']->prepare("SELECT * FROM websettings");
$announcementquery->execute();
$announcementquery = $announcementquery->fetch(PDO::FETCH_OBJ);
$announcement = cleanOutput($announcementquery->announcement); //clean output
if (empty($announcementquery->announcement))
{
case "red":
$html = "<div style='margin:0 auto;Overflow:hidden;text-align: center' class='alert alert-danger' role='alert'>{$cleanAnnouncement}</div>";
break;
case "green":
$html = "<div style='margin:0 auto;Overflow:hidden;text-align: center' class='alert alert-success' role='alert'>{$cleanAnnouncement}</div>";
break;
case "blue":
default:
$html = "<div style='margin:0 auto;Overflow:hidden;text-align: center' class='alert alert-primary' role='alert'>{$cleanAnnouncement}</div>";
break;
return "";
}
else
{
$html = "";
if ($announcementquery->announcement_color == "red")
{
$html = "<div style='margin:0 auto;Overflow:hidden;text-align: center' class='alert alert-danger' role='alert'>{$announcement}</div>";
}
elseif ($announcementquery->announcement_color == "blue")
{
$html = "<div style='margin:0 auto;Overflow:hidden;text-align: center' class='alert alert-primary' role='alert'>{$announcement}</div>";
}
elseif ($announcementquery->announcement_color == "green")
{
$html = "<div style='margin:0 auto;Overflow:hidden;text-align: center' class='alert alert-success' role='alert'>{$announcement}</div>";
}
return $html;
}
return $html;
}
function canRegister()
{
return WebsiteSettings::GetSetting("registration", false);
$check = $GLOBALS['pdo']->prepare("SELECT * FROM websettings WHERE registration = 1");
$check->execute();
if($check->rowCount() > 0)
{
return true;
}
return false;
}
function adminPanelStats() {

View File

@ -32,6 +32,10 @@ function ReturnAsset($hash, $assettypeid) //this determines which cdn to grab an
ReturnAssetFromHash($hash);
}
}
$websettings = $pdo->prepare("SELECT * FROM websettings");
$websettings->execute();
$websettings = $websettings->fetch(PDO::FETCH_OBJ);
if ($id)
{

View File

@ -1,13 +1,8 @@
<?php
use Alphaland\Web\WebsiteSettings;
$alphalandVersion = WebsiteSettings::GetSetting("AlphalandVersion");
$alphalandStudioVersion = WebsiteSettings::GetSetting("AlphalandStudioVersion");
if (isset($_POST['SubmitClient']))
{
$loc = $GLOBALS['setupHtmlPath'].$alphalandVersion."-AlphalandLauncher.exe";
$loc = $GLOBALS['setupHtmlPath'].$ws->AlphalandVersion."-AlphalandLauncher.exe";
header("Content-type: application/octet-stream");
header("Content-Disposition: attachment; filename=AlphalandLauncher.exe");
echo file_get_contents($loc);
@ -15,7 +10,7 @@ if (isset($_POST['SubmitClient']))
if (isset($_POST['SubmitStudio']))
{
$loc = $GLOBALS['setupHtmlPath'].$alphalandStudioVersion."-AlphalandStudioLauncher.exe";
$loc = $GLOBALS['setupHtmlPath'].$ws->AlphalandStudioVersion."-AlphalandStudioLauncher.exe";
header("Content-type: application/octet-stream");
header("Content-Disposition: attachment; filename=AlphalandStudioLauncher.exe");
echo file_get_contents($loc);

View File

@ -1,12 +1,25 @@
<?php
use Alphaland\Web\WebContextManager;
use Alphaland\Web\WebsiteSettings;
if (!WebContextManager::IsUnderMaintenance())
{
WebContextManager::Redirect("/");
}
$maintenance_text = WebsiteSettings::GetSetting('maintenance_text') ?? WebsiteSettings::GetSetting("default_maintenance_text");
$websettings = $pdo->prepare("SELECT * FROM websettings");
$websettings->execute();
$websettings = $websettings->fetch(PDO::FETCH_OBJ);
$status = '';
if (!empty($websettings->maintenance_text))
{
$status = $websettings->maintenance_text; //use custom text
}
else
{
$status = $websettings->default_maintenance_text; //default maintenance text
}
$body = <<<EOT
<meta name="viewport" content="width=device-width, initial-scale=1.0">
@ -41,8 +54,8 @@ body {
</style>
<div class="container" style="flex-direction: column!important;justify-content: center!important;display: flex!important;">
<img style="max-width: 30rem;max-width: 30rem;margin-right: auto;margin-left: auto;" src="alphaland/cdn/imgs/alphaland-white-1024.png">
<h1 style="text-align:center; ">{$maintenance_text}</h1>
<h1 style="text-align:center; ">{$status}</h1>
</div>
EOT;
echo $body;
echo $body;

View File

@ -1,7 +1,6 @@
<?php
use Alphaland\Web\WebContextManager;
use Alphaland\Web\WebsiteSettings;
WebContextManager::ForceHttpsCloudflare();
@ -16,8 +15,9 @@ if (isset($_POST['setannouncement']))
{
if (empty($_POST['setannouncement']))
{
WebsiteSettings::UpdateSetting('announcement', "");
WebsiteSettings::UpdateSetting('announcement_color', "");
//clear current announcement
$setsecmd5 = $pdo->prepare('UPDATE websettings SET announcement = "", announcement_color = ""');
$setsecmd5->execute();
}
else
{
@ -47,8 +47,10 @@ if (isset($_POST['setannouncement']))
{
$color = "red";
}
WebsiteSettings::UpdateSetting('announcement', $_POST['setannouncement']);
WebsiteSettings::UpdateSetting('announcement_color', $color);
$setsecmd5 = $pdo->prepare("UPDATE websettings SET announcement = :m, announcement_color = :c");
$setsecmd5->bindParam(":m", $_POST['setannouncement'], PDO::PARAM_STR);
$setsecmd5->bindParam(":c", $color, PDO::PARAM_STR);
$setsecmd5->execute();
}
}
}

View File

@ -1,7 +1,6 @@
<?php
use Alphaland\Web\WebContextManager;
use Alphaland\Web\WebsiteSettings;
WebContextManager::ForceHttpsCloudflare();
@ -120,9 +119,9 @@ if ($pass) {
$previousdeployversion = "";
if ($deploytype == "client") {
$previousdeployversion = WebsiteSettings::GetSetting("AlphalandVersion");
$previousdeployversion = $ws->AlphalandVersion;
} else if ($deploytype == "studio") {
$previousdeployversion = WebsiteSettings::GetSetting("AlphalandStudioVersion");
$previousdeployversion = $ws->AlphalandStudioVersion;
}
//deploy type specific stuff
@ -169,13 +168,17 @@ if ($pass) {
//update in db
if ($deploytype == "client") {
WebsiteSettings::UpdateSetting("AlphalandVersion", $newgameversion);
WebsiteSettings::UpdateSetting("security_version", $gamesecurityversion);
WebsiteSettings::UpdateSetting("md5_hash", $gamemd5hash);
WebsiteSettings::UpdateSetting("GameFileVersion", $gamefileversion);
$updatewebsettings = $pdo->prepare("UPDATE websettings SET AlphalandVersion = :av, security_version = :sv, md5_hash = :mh, GameFileVersion = :gv");
$updatewebsettings->bindParam(":av", $newgameversion, PDO::PARAM_STR);
$updatewebsettings->bindParam(":sv", $gamesecurityversion, PDO::PARAM_STR);
$updatewebsettings->bindParam(":mh", $gamemd5hash, PDO::PARAM_STR);
$updatewebsettings->bindParam(":gv", $gamefileversion, PDO::PARAM_STR);
$updatewebsettings->execute();
} else if ($deploytype == "studio") {
WebsiteSettings::UpdateSetting("AlphalandStudioVersion", $newgameversion);
WebsiteSettings::UpdateSetting("StudioFileVersion", $gamefileversion);
$updatewebsettings = $pdo->prepare("UPDATE websettings SET AlphalandStudioVersion = :asv, StudioFileVersion = :sfv");
$updatewebsettings->bindParam(":asv", $newgameversion, PDO::PARAM_STR);
$updatewebsettings->bindParam(":sfv", $gamefileversion, PDO::PARAM_STR);
$updatewebsettings->execute();
}
//output the new version

View File

@ -1,11 +1,10 @@
<?php
use Alphaland\Web\WebContextManager;
use Alphaland\Web\WebsiteSettings;
WebContextManager::ForceHttpsCloudflare();
if (!($user->IsOwner())) {
if(!($user->IsOwner())) {
if ($user->IsAdmin()) {
WebContextManager::Redirect("/");
}
@ -14,14 +13,11 @@ if (!($user->IsOwner())) {
adminPanelStats();
$securityVersion = WebsiteSettings::GetSetting('security_version');
$md5Hash = WebsiteSettings::GetSetting('md5_hash');
$gameFileVersion = WebsiteSettings::GetSetting('GameFileVersion');
$studioFileVersion = WebsiteSettings::GetSetting('StudioFileVersion');
$body = <<<EOT
$alert = '';
$body = <<<EOT
<div class="container">
{$alert}
<h5>Network Security Key Generator<h5>
<h6>MAKE SURE TO DEPLOY RCC WITH UPDATED KEY</h6>
<div class="row">
@ -34,7 +30,7 @@ $body = <<<EOT
<h6>Game Security Version</h6>
<div class="row marg-bot-15">
<div class="col-sm">
<input style="width:100%!important;" type="text" autocomplete="off" id="newgamesecurityversion" value="{$securityVersion}" class="form-control">
<input style="width:100%!important;" type="text" autocomplete="off" id="newgamesecurityversion" value="{$ws->security_version}" class="form-control">
</div>
</div>
<h6>Generated Security Key</h6>
@ -79,19 +75,19 @@ $body = <<<EOT
<h6>Game Executable Security Version</h6>
<div class="row marg-bot-15">
<div class="col-sm">
<input style="width:100%!important;" type="text" autocomplete="off" id="gamesecurityver" value="{$securityVersion}" class="form-control">
<input style="width:100%!important;" type="text" autocomplete="off" id="gamesecurityver" value="{$ws->security_version}" class="form-control">
</div>
</div>
<h6>Game Executable MD5 Hash</h6>
<div class="row marg-bot-15">
<div class="col-sm">
<input style="width:100%!important;" type="text" autocomplete="off" id="gamemd5" value="{$md5Hash}" class="form-control">
<input style="width:100%!important;" type="text" autocomplete="off" id="gamemd5" value="{$ws->md5_hash}" class="form-control">
</div>
</div>
<h6>Game Executable Version (separated by '.')</h6>
<div class="row marg-bot-15">
<div class="col-sm">
<input style="width:100%!important;" type="text" autocomplete="off" id="gamefilever" value="{$gameFileVersion}" class="form-control">
<input style="width:100%!important;" type="text" autocomplete="off" id="gamefilever" value="{$ws->GameFileVersion}" class="form-control">
</div>
</div>
<h6>Game Launcher File Version (separated by ',') Ex:1, 2, 3, 4</h6>
@ -136,7 +132,7 @@ $body = <<<EOT
<h6>Studio Executable Version (separated by '.')</h6>
<div class="row marg-bot-15">
<div class="col-sm">
<input style="width:100%!important;" type="text" autocomplete="off" id="studiofilever" value="{$studioFileVersion}" class="form-control">
<input style="width:100%!important;" type="text" autocomplete="off" id="studiofilever" value="{$ws->StudioFileVersion}" class="form-control">
</div>
</div>
<h6>Studio Launcher File Version (separated by ',')</h6>
@ -206,8 +202,8 @@ $body = <<<EOT
EOT;
pageHandler();
$ph->pagetitle = "";
$ph->pagetitle = "";
$ph->navbar = "";
$ph->body = $body;
$ph->footer = "";
$ph->output();
$ph->output();

View File

@ -1,7 +1,6 @@
<?php
use Alphaland\Web\WebContextManager;
use Alphaland\Web\WebsiteSettings;
WebContextManager::ForceHttpsCloudflare();
@ -18,9 +17,15 @@ adminPanelStats();
$devmode = false;
////db queries
$isUnderMaitenance = WebsiteSettings::GetSetting('maintenance');
$rccKey = WebsiteSettings::GetSetting('webservice_key');
$ipWhitelist = WebsiteSettings::GetSetting("webservice_whitelist");
$maintenancequery = $pdo->prepare("SELECT * FROM websettings WHERE maintenance = 1");
$maintenancequery->execute();
$status = $pdo->prepare("SELECT * FROM websettings WHERE maintenance = 1");
$status->execute();
$websettings = $pdo->prepare("SELECT * FROM websettings");
$websettings->execute();
$websettings = $websettings->fetch(PDO::FETCH_OBJ);
////end db queries
////Third party web queries
@ -122,31 +127,43 @@ if (isset($_POST['clearcachesubmit']))
if (isset($_POST['submitwskey']))
{
$key = genHash(16);
WebsiteSettings::UpdateSetting("webservice_key", $key);
$setwskey = $pdo->prepare("UPDATE websettings SET webservice_key = :k");
$setwskey->bindParam(":k", $key, PDO::PARAM_STR);
$setwskey->execute();
WebContextManager::Redirect("configuration");
}
if (isset($_POST['setwsipwhitelist']))
{
WebsiteSettings::UpdateSetting("webservice_whitelist", $_POST['setwsipwhitelist']);
$setwsip = $pdo->prepare("UPDATE websettings SET webservice_whitelist = :w");
$setwsip->bindParam(":w", $_POST['setwsipwhitelist'], PDO::PARAM_STR);
$setwsip->execute();
WebContextManager::Redirect("configuration");
}
if (isset($_POST['cachingon']))
{
WebsiteSettings::UpdateSetting("avatarCaching", true);
$setapprovals = $pdo->prepare("UPDATE websettings SET avatarCaching = 1");
$setapprovals->execute();
WebContextManager::Redirect("configuration");
}
if (isset($_POST['cachingoff']))
{
WebsiteSettings::UpdateSetting("avatarCaching", false);
$setapprovals = $pdo->prepare("UPDATE websettings SET avatarCaching = 0");
$setapprovals->execute();
WebContextManager::Redirect("configuration");
}
$maintenancestatus = '<b style="background-color:#c9c9c9;color:red;padding:2px;">OFF</b>';
if ($isUnderMaitenance === true)
$maintenancestatus = "";
if ($maintenancequery->rowCount() > 0)
{
$maintenancestatus = '<b style="background-color:#c9c9c9;color:green;padding:2px;">ON</b>';
}
else
{
$maintenancestatus = '<b style="background-color:#c9c9c9;color:red;padding:2px;">OFF</b>';
}
$developmentmodestatus = "";
if ($devmode)
@ -219,7 +236,7 @@ $body = <<<EOT
<div class="col-sm">
<div class="input-group mb-3">
<form action="" method="post">
<input type="text" name="setwskey" class="form-control" value="{$rccKey}" autocomplete="off" disabled>
<input type="text" name="setwskey" class="form-control" value="{$websettings->webservice_key}" autocomplete="off" disabled>
<div class="input-group-append">
<button type="submit" name="submitwskey" class="btn btn-danger" type="button">Generate</button>
</div>
@ -245,7 +262,7 @@ $body = <<<EOT
</div>
</form>
<div class="container text-center marg-bot-15">
<h6>Current Backend Whitelisted IP's: <hr><b style="background-color:#c9c9c9;color:red;padding:2px;">{$ipWhitelist}</b></h6>
<h6>Current Backend Whitelisted IP's: <hr><b style="background-color:#c9c9c9;color:red;padding:2px;">{$websettings->webservice_whitelist}</b></h6>
</div>
<hr>
</div>

View File

@ -1,7 +1,3 @@
<?php
use Alphaland\Web\WebsiteSettings;
$gameFileVersion = WebsiteSettings::GetSetting('GameFileVersion');
echo '{"ExeVersion": "' . $gameFileVersion . '", "ValidateInstalledExeVersion": "True", "ShowInstallSuccessPrompt": "True"}';
echo '{"ExeVersion": "'.$ws->GameFileVersion.'", "ValidateInstalledExeVersion": "True", "ShowInstallSuccessPrompt": "True"}';

View File

@ -1,7 +1,3 @@
<?php
use Alphaland\Web\WebsiteSettings;
$gameFileVersion = WebsiteSettings::GetSetting('GameFileVersion');
echo '{"ExeVersion": "' . $gameFileVersion . '", "ValidateInstalledExeVersion": "True", "ShowInstallSuccessPrompt": "True"}';
echo '{"ExeVersion": "'.$ws->GameFileVersion.'", "ValidateInstalledExeVersion": "True", "ShowInstallSuccessPrompt": "True"}';

View File

@ -1,5 +1,3 @@
<?php
use Alphaland\Web\WebsiteSettings;
echo WebsiteSettings::GetSetting('AlphalandVersion');
echo $ws->AlphalandVersion;

View File

@ -1,5 +1,3 @@
<?php
use Alphaland\Web\WebsiteSettings;
echo WebsiteSettings::GetSetting('AlphalandStudioVersion');
echo $ws->AlphalandStudioVersion;

View File

@ -1,7 +1,6 @@
<?php
use Alphaland\Web\WebContextManager;
use Alphaland\Web\WebsiteSettings;
if (!WebContextManager::VerifyAccessKeyHeader())
{
@ -12,6 +11,6 @@ header('Content-Type: application/json');
echo json_encode(array(
"data" => array(
WebsiteSettings::GetSetting("md5_hash"),
$ws->md5_hash
)
), JSON_UNESCAPED_SLASHES);

View File

@ -1,7 +1,6 @@
<?php
use Alphaland\Web\WebContextManager;
use Alphaland\Web\WebsiteSettings;
if (!WebContextManager::VerifyAccessKeyHeader())
{
@ -12,6 +11,6 @@ header('Content-Type: application/json');
echo json_encode(array(
"data" => array(
WebsiteSettings::GetSetting("security_version"),
$ws->security_version
)
), JSON_UNESCAPED_SLASHES);