From 1fe292698a17df20b7c9b0ac3a49fb23e027090d Mon Sep 17 00:00:00 2001 From: Graphictoria Date: Thu, 23 Jun 2022 23:45:51 -0400 Subject: [PATCH] Update config, change a few more logos, and update the private key. --- FinobeRawKey.txt | 2 +- globals/config.php | 10 +++++----- globals/functions.php | 19 ++++++------------- html/finobe/cdn/imgs/finobe-256x256.png | Bin 0 -> 14916 bytes html/finobe/cdn/imgs/finobe-50x50.png | Bin 0 -> 2676 bytes html/index.php | 2 +- 6 files changed, 13 insertions(+), 20 deletions(-) create mode 100644 html/finobe/cdn/imgs/finobe-256x256.png create mode 100644 html/finobe/cdn/imgs/finobe-50x50.png diff --git a/FinobeRawKey.txt b/FinobeRawKey.txt index 2b9551c..1b945e2 100644 --- a/FinobeRawKey.txt +++ b/FinobeRawKey.txt @@ -1 +1 @@ -MIICWwIBAAKBgQCdVAXab8B6pYnAdVdQCYj9t+KLRQZzgOmEkQDYCY/nj3+O8JMTdL+pZpXtgl0VzQ8PgjjgGz0w8ZxRzkfkE2hfsy7bY/b9nFWEl8OmqP5FrcuWuivpGOdvqI/KN4UsBxp5dxGw3/vCt3T5L9VudUh8n1Kl0cCiqziEkZFGf+7uIQIDAQABAoGAdwMgimUPDbg7xEL/kaQk5Qk9bm0AvE9AVu/523MgUOLUc6S5HXarpdHciJadI+jDA9BWhfEVEPk0bw3EhFvKD6sxvALBl8oHNKfDR7XzrrBhTXaY+3UICleA7tj4dTv667c3sLGvtlge3oicHv1AdHJg+2Us0l5h8T27l/5viSECQQDJzwMDLsydJZzxpS3q20YoWyeseDAhJDpLBEL45+yrdXk/6s+sVM7NY1BkWC0tiTChex2l1TfomuTj+ltVP46rAkEAx5NH2fUftd3T/ZLDTS1Cq7vgqEsSqasA/H19xlJ8L2Z/+ikHPc/5SRjas08dC0WWgDBxdd0q1iyu7FsyFghGYwJAXXwXAidww69D17DT54KyKkmnxD5c1U1p74xG1fTh7r9ZbqGAmG0k64IBIKq0Ku7tZzCYGFUANDFkrLMyEfiCRwJAUhAZh2HnvByOwsHKVL27oGoMoqbb8bBDI49mXFomfkcjcHXWaHBQDOKPaxOo2a2viN5iiRh8OLz+4GlPWwfkCQJALjCq0vhddumD7W/rnXWXsg+Imtqh+CX3yVQ55+Ji6Rmd6bNjMysA1jWHWHYycFFBz5SThCwInBffugHzP+hbLw== \ No newline at end of file +BwIAAACkAABSU0EyAAQAAAEAAQCBkEcup1VE5QqMNond57r9eTvrNp716Zi5tiaGiIMU6GWmEXJARnr9ZAJQR+r8MDmMEf8YfVlCHADFCfFqn4lDICfJVdYW3OliqAgUL9Dndp73J+sZ11V4qtBwHxyzuaTuRADpXrd0F+5VgG+c3vbcFXuuNsSu66GIQJfNvJZbugt1BrEB4YcQjJOTdTvCmFVP//uJP7exfHlzYPIDd9An5IquR8S8xFCgiLeNL6lj8alUNFyS8wQazUjygt+PIcgjsIqW+HBy3VBxvNUKtAi0TxWCJoZfJ1rvsjvawl9OwsYgLPVmhzvw984L/KzPENUucoftrU8nJoZuvWn6tWHus595XuAiAlIjk5AOK32jJzbyWzbWcR5p8mew5nQuK2mL4gcSRnucMZ0KPFuMZDpHKNfwlVRjsSPNonixRJbWZQOfQ4FTHp2y9rLKFoAfHCfWH+jIJxIE8xPAjrLt0Y88LjCjVhJ5cZwZOKkz9yVQQZOiKniGy68+ODvAUQuQs2iJlW8ZJOu2V2+mlN3rGUHS+pynN0rfLccyYPArfHtZEeh0YrpnczRcYak4cCYosS/JkhL117AXRdZfWqU0d65S/WD7REliC01XFhKIBFe1HMDNCJRPMu2Wrz2Hs5rOTicLLAmSY0inGW3EdVi0igsBmTpYZRXZjYcJuNJv89N397gPSCWOHTnxW96w/c+YXCCDrHquMO93VE8terSlqvR1VdN9zJVMvJIVXlK+Eu47iM7WfIEF21iwvw2/5kk4jmM= \ No newline at end of file diff --git a/globals/config.php b/globals/config.php index 54d1ff9..37f5aed 100644 --- a/globals/config.php +++ b/globals/config.php @@ -91,10 +91,10 @@ try //machine ip's $gameMachine = "76.190.219.176"; //IP address of the machine that runs gameservers - $renderMachine = "192.168.1.234"; //IP address of the machine that renders thumbnails + $renderMachine = "192.168.0.24"; //IP address of the machine that renders thumbnails //arbiter ip's - $gamesArbiter = "192.168.1.169:64989"; //IP address/port of the Arbiter running on the gameserver machine + $gamesArbiter = "192.168.0.23:64989"; //IP address/port of the Arbiter running on the gameserver machine $thumbnailArbiter = $renderMachine.":64989"; //IP address/port of the Arbiter running on the render machine //autoloader include @@ -167,7 +167,7 @@ try } //account status checks - $activated = Activation::IsUserActivated($GLOBALS['user']->id); + //$activated = Activation::IsUserActivated($GLOBALS['user']->id); $twofactor = TwoFactor::IsSession2FAUnlocked(); $banned = UserModerationManager::IsBanned($GLOBALS['user']->id); $maintenance = WebContextManager::IsUnderMaintenance(); @@ -181,12 +181,12 @@ try $accesseddirectory != "/logout.php") { WebContextManager::Redirect($url . "/ban"); } - } else if ($GLOBALS['user']->logged_in && !$activated) { //check if activated + }/* else if ($GLOBALS['user']->logged_in && !$activated) { //check if activated if ($accesseddirectory != "/activate.php" && $accesseddirectory != "/logout.php") { WebContextManager::Redirect($url . "/activate"); } - } else if ($GLOBALS['user']->logged_in && !$twofactor) { //check if 2fa is unlocked + }*/ else if ($GLOBALS['user']->logged_in && !$twofactor) { //check if 2fa is unlocked if ($accesseddirectory != "/2fa.php") { WebContextManager::Redirect($url . "/2fa"); } diff --git a/globals/functions.php b/globals/functions.php index 005c390..f23e85c 100644 --- a/globals/functions.php +++ b/globals/functions.php @@ -1802,25 +1802,25 @@ function setBlurb($newblurb) function setDefaults($uid) //gives default shirt and pants, body colors and wears the shirt and pants { - $check = $GLOBALS['pdo']->prepare("INSERT into owned_assets (uid, aid, stock, when_sold, givenby) VALUES(:u, 133, 0, UNIX_TIMESTAMP(), 1)"); //give asset 133 + /*$check = $GLOBALS['pdo']->prepare("INSERT into owned_assets (uid, aid, stock, when_sold, givenby) VALUES(:u, 133, 0, UNIX_TIMESTAMP(), 1)"); //give asset 133 $check->bindParam(":u", $uid, PDO::PARAM_INT); $check->execute(); $check2 = $GLOBALS['pdo']->prepare("INSERT into owned_assets (uid, aid, stock, when_sold, givenby) VALUES(:u, 135, 0, UNIX_TIMESTAMP(), 1)"); //give asset 135 $check2->bindParam(":u", $uid, PDO::PARAM_INT); - $check2->execute(); + $check2->execute();*/ $check3 = $GLOBALS['pdo']->prepare("INSERT into owned_assets (uid, aid, stock, when_sold, givenby) VALUES(:u, 1, 0, UNIX_TIMESTAMP(), 1)"); //give asset 1 $check3->bindParam(":u", $uid, PDO::PARAM_INT); $check3->execute(); - $check4 = $GLOBALS['pdo']->prepare("INSERT into wearing_items (uid, aid, whenWorn) VALUES(:u, 133, UNIX_TIMESTAMP())"); //wear asset 133 + /*$check4 = $GLOBALS['pdo']->prepare("INSERT into wearing_items (uid, aid, whenWorn) VALUES(:u, 133, UNIX_TIMESTAMP())"); //wear asset 133 $check4->bindParam(":u", $uid, PDO::PARAM_INT); $check4->execute(); $check5 = $GLOBALS['pdo']->prepare("INSERT into wearing_items (uid, aid, whenWorn) VALUES(:u, 135, UNIX_TIMESTAMP())"); //wear asset 135 $check5->bindParam(":u", $uid, PDO::PARAM_INT); - $check5->execute(); + $check5->execute();*/ $check6 = $GLOBALS['pdo']->prepare("INSERT into wearing_items (uid, aid, whenWorn) VALUES(:u, 1, UNIX_TIMESTAMP())"); //wear asset 1 $check6->bindParam(":u", $uid, PDO::PARAM_INT); @@ -2574,14 +2574,7 @@ function getCurrentThemeLogo() //grabs the finobe logo for the users selected th //return $GLOBALS['url'] . "/finobe/cdn/imgs/alpha-christmas/finobechristmas.png"; //force christmas logo - if ($currenttheme == 0) //light theme dark logo - { - return $GLOBALS['url'] . "/finobe/cdn/imgs/finobe-logo.svg"; - } - elseif ($currenttheme == 1) //dark theme light logo - { - return $GLOBALS['url'] . "/finobe/cdn/imgs/finobe-white-1024.png"; - } + return $GLOBALS['url'] . "/finobe/cdn/imgs/finobe-50x50.png"; } function getCurrentThemeAlphabuxLogo() //grabs the finobe alphabux logo for the users selected theme @@ -2828,7 +2821,7 @@ function getNav()