gtoriadotnet
/
fobe-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update config, change a few more logos, and update the private key.

This commit is contained in:
Graphictoria 2022-06-23 23:45:51 -04:00
parent ffacc7a8f9
commit 1fe292698a
6 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FinobeRawKey.txt
View File

@ -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== BwIAAACkAABSU0EyAAQAAAEAAQCBkEcup1VE5QqMNond57r9eTvrNp716Zi5tiaGiIMU6GWmEXJARnr9ZAJQR+r8MDmMEf8YfVlCHADFCfFqn4lDICfJVdYW3OliqAgUL9Dndp73J+sZ11V4qtBwHxyzuaTuRADpXrd0F+5VgG+c3vbcFXuuNsSu66GIQJfNvJZbugt1BrEB4YcQjJOTdTvCmFVP//uJP7exfHlzYPIDd9An5IquR8S8xFCgiLeNL6lj8alUNFyS8wQazUjygt+PIcgjsIqW+HBy3VBxvNUKtAi0TxWCJoZfJ1rvsjvawl9OwsYgLPVmhzvw984L/KzPENUucoftrU8nJoZuvWn6tWHus595XuAiAlIjk5AOK32jJzbyWzbWcR5p8mew5nQuK2mL4gcSRnucMZ0KPFuMZDpHKNfwlVRjsSPNonixRJbWZQOfQ4FTHp2y9rLKFoAfHCfWH+jIJxIE8xPAjrLt0Y88LjCjVhJ5cZwZOKkz9yVQQZOiKniGy68+ODvAUQuQs2iJlW8ZJOu2V2+mlN3rGUHS+pynN0rfLccyYPArfHtZEeh0YrpnczRcYak4cCYosS/JkhL117AXRdZfWqU0d65S/WD7REliC01XFhKIBFe1HMDNCJRPMu2Wrz2Hs5rOTicLLAmSY0inGW3EdVi0igsBmTpYZRXZjYcJuNJv89N397gPSCWOHTnxW96w/c+YXCCDrHquMO93VE8terSlqvR1VdN9zJVMvJIVXlK+Eu47iM7WfIEF21iwvw2/5kk4jmM=

10
globals/config.php
View File

@ -91,10 +91,10 @@ try
//machine ip's //machine ip's
$gameMachine = "76.190.219.176"; //IP address of the machine that runs gameservers $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 //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 $thumbnailArbiter = $renderMachine.":64989"; //IP address/port of the Arbiter running on the render machine
//autoloader include //autoloader include
@ -167,7 +167,7 @@ try
} }
//account status checks //account status checks
$activated = Activation::IsUserActivated($GLOBALS['user']->id); //$activated = Activation::IsUserActivated($GLOBALS['user']->id);
$twofactor = TwoFactor::IsSession2FAUnlocked(); $twofactor = TwoFactor::IsSession2FAUnlocked();
$banned = UserModerationManager::IsBanned($GLOBALS['user']->id); $banned = UserModerationManager::IsBanned($GLOBALS['user']->id);
$maintenance = WebContextManager::IsUnderMaintenance(); $maintenance = WebContextManager::IsUnderMaintenance();
@ -181,12 +181,12 @@ try
$accesseddirectory != "/logout.php") { $accesseddirectory != "/logout.php") {
WebContextManager::Redirect($url . "/ban"); 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" && if ($accesseddirectory != "/activate.php" &&
$accesseddirectory != "/logout.php") { $accesseddirectory != "/logout.php") {
WebContextManager::Redirect($url . "/activate"); 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") { if ($accesseddirectory != "/2fa.php") {
WebContextManager::Redirect($url . "/2fa"); WebContextManager::Redirect($url . "/2fa");
} }

19
globals/functions.php
View File

@ -1802,25 +1802,25 @@ function setBlurb($newblurb)
function setDefaults($uid) //gives default shirt and pants, body colors and wears the shirt and pants 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->bindParam(":u", $uid, PDO::PARAM_INT);
$check->execute(); $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 = $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->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 = $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->bindParam(":u", $uid, PDO::PARAM_INT);
$check3->execute(); $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->bindParam(":u", $uid, PDO::PARAM_INT);
$check4->execute(); $check4->execute();
$check5 = $GLOBALS['pdo']->prepare("INSERT into wearing_items (uid, aid, whenWorn) VALUES(:u, 135, UNIX_TIMESTAMP())"); //wear asset 135 $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->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 = $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); $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 //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-50x50.png";
{
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";
}
} }
function getCurrentThemeAlphabuxLogo() //grabs the finobe alphabux logo for the users selected theme function getCurrentThemeAlphabuxLogo() //grabs the finobe alphabux logo for the users selected theme
@ -2828,7 +2821,7 @@ function getNav()
<header> <header>
<nav class="navbar navbar-expand-lg navbar-light bg-light" style="padding-right:10%;padding-left:10%;"> <nav class="navbar navbar-expand-lg navbar-light bg-light" style="padding-right:10%;padding-left:10%;">
<a class="navbar-brand" href="/"> <a class="navbar-brand" href="/">
<img src="/finobe/cdn/imgs/finobe-logo.svg" width="40" height="40" class="d-inline-block align-top" alt="" loading="lazy"> <img src="/finobe/cdn/imgs/finobe-50x50.png" width="40" height="40" class="d-inline-block align-top" alt="" loading="lazy">
</a> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>

BIN
html/finobe/cdn/imgs/finobe-256x256.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
html/finobe/cdn/imgs/finobe-50x50.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

2
html/index.php
View File

@ -126,7 +126,7 @@ if(!isLoggedIn())
<div class="viewport-header"> <div class="viewport-header">
<div class="index-container"> <div class="index-container">
<div class="index-row"> <div class="index-row">
<img class="img-fluid" style="width:50rem;padding:10px;" src="/finobe/cdn/imgs/finobe-long.png"> <img class="img-fluid" style="width:15rem;padding:10px;" src="/finobe/cdn/imgs/finobe-256x256.png">
</div> </div>
<div class="index-row"> <div class="index-row">
<div style="margin-top:20px;"> <div style="margin-top:20px;">