diff --git a/FinobeUtilityJsSource.js b/FinobeUtilityJsSource.js
index 4f090c0..3ff8679 100644
--- a/FinobeUtilityJsSource.js
+++ b/FinobeUtilityJsSource.js
@@ -1,5 +1,5 @@
/*
- Finobe JS Utilities 2021
+ Fobe JS Utilities 2021
*/
//utility for populating HTML with data from object OR calling a function with the objects current position and replacing the marker with returned data
diff --git a/FinobeRawKey.txt b/FobeRawKey.txt
similarity index 100%
rename from FinobeRawKey.txt
rename to FobeRawKey.txt
diff --git a/IsAliveCheck.php b/IsAliveCheck.php
index 08ae473..d117196 100644
--- a/IsAliveCheck.php
+++ b/IsAliveCheck.php
@@ -1,12 +1,12 @@
prepare("UPDATE websettingsdeprecated SET maintenance = 1, maintenance_text = :t");
$setmaintenance->bindParam(":t", $text, PDO::PARAM_STR);
diff --git a/globals/Dependencies/Administration/SignupKey.php b/globals/Dependencies/Administration/SignupKey.php
index b939ffe..7a23cec 100644
--- a/globals/Dependencies/Administration/SignupKey.php
+++ b/globals/Dependencies/Administration/SignupKey.php
@@ -1,8 +1,8 @@
bindParam(":wb", $GLOBALS['user']->id, PDO::PARAM_INT);
$ban->execute();
if ($ban->rowCount() > 0) {
- kickUserIfInGame($uid, "You've been banned from Finobe, '".$reason."'");
+ kickUserIfInGame($uid, "You've been banned from Fobe, '".$reason."'");
UserModerationManager::LogAction("Banned User ".$uid);
//ban user from discord with bot
diff --git a/globals/Dependencies/UI/ImageHelper.php b/globals/Dependencies/UI/ImageHelper.php
index 6cea5b8..b6afb78 100644
--- a/globals/Dependencies/UI/ImageHelper.php
+++ b/globals/Dependencies/UI/ImageHelper.php
@@ -1,6 +1,6 @@
prepare("SELECT COUNT(*) FROM `finobe_verification` WHERE `isactivated` = 1 AND `uid` = :uid");
- $query->bindParam(":uid", $userid, PDO::PARAM_INT);
- $query->execute();
- if ($query->fetchColumn(0) > 0) {
- return true;
- }
- return false;
+ return true;
+ //$query = $GLOBALS['pdo']->prepare("SELECT COUNT(*) FROM `finobe_verification` WHERE `isactivated` = 1 AND `uid` = :uid");
+ //$query->bindParam(":uid", $userid, PDO::PARAM_INT);
+ //$query->execute();
+ //if ($query->fetchColumn(0) > 0) {
+ // return true;
+ //}
+ //return false;
}
public static function SetupUserActivation(int $userid) //this should be ran when the user first signs up
diff --git a/globals/Dependencies/Users/Badge.php b/globals/Dependencies/Users/Badge.php
index 3531ed4..fae29ee 100644
--- a/globals/Dependencies/Users/Badge.php
+++ b/globals/Dependencies/Users/Badge.php
@@ -1,10 +1,10 @@
bindParam(":i", $ip, PDO::PARAM_STR);
$session->bindParam(":ua", $user_agent, PDO::PARAM_STR);
if($session->execute()) {
- setcookie("token", $token, time() + (86400 * 30), "/", ".idk16.xyz"); //30 day expiration on token for (hopefully) all finobe paths
+ setcookie("token", $token, time() + (86400 * 30), "/", ".idk16.xyz"); //30 day expiration on token for (hopefully) all fobe paths
$this->ValidateSession($token);
return true;
} else {
diff --git a/globals/Dependencies/Users/TwoFactor.php b/globals/Dependencies/Users/TwoFactor.php
index 1c30aa9..fceca5c 100644
--- a/globals/Dependencies/Users/TwoFactor.php
+++ b/globals/Dependencies/Users/TwoFactor.php
@@ -1,10 +1,10 @@
getQRCodeGoogleUrl($username, $secret, "Finobe");
+ $qrcode = $GLOBALS['authenticator']->getQRCodeGoogleUrl($username, $secret, "Fobe");
$new2fa = $GLOBALS['pdo']->prepare("INSERT INTO `twofactor`(`userid`, `secret`, `qr`, `whenGenerated`) VALUES (:uid, :secret, :qr, UNIX_TIMESTAMP())");
$new2fa->bindParam(":uid", $userid, PDO::PARAM_INT);
$new2fa->bindParam(":secret", $secret, PDO::PARAM_STR);
diff --git a/globals/Dependencies/Users/User.php b/globals/Dependencies/Users/User.php
index f932db2..9abf62a 100644
--- a/globals/Dependencies/Users/User.php
+++ b/globals/Dependencies/Users/User.php
@@ -1,8 +1,8 @@
PDO::ERRMODE_EXCEPTION, //bad for prod?
- //PDO::ATTR_ERRMODE => PDO::ERRMODE_WARNING,
+ //PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, //bad for prod?
+ PDO::ATTR_ERRMODE => PDO::ERRMODE_WARNING,
PDO::ATTR_EMULATE_PREPARES => false,
- //PDO::ATTR_PERSISTENT => true
+ PDO::ATTR_PERSISTENT => false
);
+ // attr_persistent was set to true, fuck you astro
//host //db name //db user //db password //options
$pdo = new PDO("mysql:host=localhost;dbname=finobe", "service-finobe", "135zZsjV3_K2j-VC", $pdoOptions);
@@ -39,7 +40,7 @@ try
$jsversion = "12.00"; //update this after updating JS, this will re-cache the latest js for users
$cssversion = "12.00"; //update this after updating CSS, this will re-cache the latest css for users
- $siteName = "Finobe"; //site name
+ $siteName = "Fobe"; //site name
$domain = "idk16.xyz";
$url = "https://www.".$domain; //site URL
$ws = $pdo->query("SELECT * FROM websettings WHERE id = 1")->fetch(PDO::FETCH_OBJ); //websettings
@@ -48,6 +49,9 @@ try
$ROBLOXProductInfoAPI = "https://api.roblox.com/marketplace/productinfo?assetId=";
$ROBLOXAssetThumbnailAPI = "https://thumbnails.roblox.com/v1/assets?assetIds=";
+ $recaptchaSecretKey = '6LfGhE8jAAAAAGYp7AYCnwJSNzJRPRT45YXNHI_s';
+ $recaptchaSiteKey = '6LfGhE8jAAAAAI3Xa7K1jyFlPvfVklWZAN4l06-j';
+
//default character hashes
$defaultOutfitHash = "95432e22e7ebc8868415fd186096917f"; //default render hash for characters
$defaultHeadshotHash = "80a426e19403b3fefaa7fcf5efde22c0"; //default headshot render for characters
@@ -87,20 +91,20 @@ try
$defaultPlacesPath = "C:/Alphaland/default_places/"; //path to where the default places are stored
$defaultPbsPlacesPath = "C:/Alphaland/default_pbs_places/"; //path to where the default pbs places are stored
$defaultXmlsPath = "C:/Alphaland/default_xmls/"; //path to where the default xmls stored
- $privateKeyPath = "C:/Alphaland/FinobeRawKey.txt"; //path to where the private key is stored
+ $privateKeyPath = "C:/Alphaland/FobeRawKey.txt"; //path to where the private key is stored
//machine ip's
$gameMachine = "76.189.132.114"; //IP address of the machine that runs gameservers
$renderMachine = "192.168.1.117"; //IP address of the machine that renders thumbnails
//arbiter ip's
- $gamesArbiter = "192.168.1.118:64989"; //IP address/port of the Arbiter running on the gameserver machine
+ $gamesArbiter = "192.168.1.121: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
require 'C:/vendor/autoload.php';
- //finobe specfic dependencies (listing manually for now due to active rewrite of stuff)
+ //fobe specfic dependencies (listing manually for now due to active rewrite of stuff)
include "C:/Alphaland/globals/Dependencies/Users/Activation.php";
include "C:/Alphaland/globals/Dependencies/Users/TwoFactor.php";
include "C:/Alphaland/globals/Dependencies/Users/ReferralProgram.php";
@@ -233,5 +237,5 @@ try
}
catch (Exception $e)
{
- die("Finobe is currently unavailable.");
+ die("Fobe is currently unavailable.");
}
\ No newline at end of file
diff --git a/globals/functions.php b/globals/functions.php
index be46b56..fdc3f31 100644
--- a/globals/functions.php
+++ b/globals/functions.php
@@ -1,17 +1,17 @@
AssetTypeId == 3) //audio
+ {
+ unlink($assetscdn . $assetinfo->Hash);
+ setAssetModerated($id);
+ return true;
+ }
else
{
$validXML = true;
@@ -1153,7 +1159,7 @@ function sendVerificationEmail($from, $recipient) //1 = success, 2 = cooldown, 3
$email_html = '
-

+
Click the button below to verify your email!
@@ -1318,7 +1324,7 @@ function sendPasswordReset($from, $recipient, $recipientuid) //1 = success, 2 =
$email_html = '
-

+
Click the button below to reset your password!
@@ -2606,40 +2612,40 @@ function getCurrentTheme() //returns the theme set (integer)
}
}
-function getCurrentThemeLogo() //grabs the finobe logo for the users selected theme
+function getCurrentThemeLogo() //grabs the fobe logo for the users selected theme
{
$currenttheme = getCurrentTheme();
- //return $GLOBALS['url'] . "/finobe/cdn/imgs/alpha-christmas/finobechristmas.png"; //force christmas logo
+ //return $GLOBALS['url'] . "/fobe/cdn/imgs/alpha-christmas/finobechristmas.png"; //force christmas logo
- return $GLOBALS['url'] . "/finobe/cdn/imgs/finobe-50x50.png";
+ return $GLOBALS['url'] . "/fobe/cdn/imgs/finobe-50x50.png";
}
-function getCurrentThemeAlphabuxLogo() //grabs the finobe alphabux logo for the users selected theme
+function getCurrentThemeAlphabuxLogo() //grabs the fobe alphabux logo for the users selected theme
{
$currenttheme = getCurrentTheme();
if ($currenttheme == 0) //light theme dark logo
{
- return $GLOBALS['url'] . "/finobe/cdn/imgs/alphabux-black-1024.png";
+ return $GLOBALS['url'] . "/fobe/cdn/imgs/alphabux-black-1024.png";
}
elseif ($currenttheme == 1) //dark theme light logo
{
- return $GLOBALS['url'] . "/finobe/cdn/imgs/alphabux-grey-1024.png";
+ return $GLOBALS['url'] . "/fobe/cdn/imgs/alphabux-grey-1024.png";
}
}
-function getCurrentThemeAnimatedLogo() //grabs the finobe animated logo for the users selected theme
+function getCurrentThemeAnimatedLogo() //grabs the fobe animated logo for the users selected theme
{
$currenttheme = getCurrentTheme();
if ($currenttheme == 0) //light theme dark logo
{
- return $GLOBALS['url'] . "/finobe/cdn/imgs/loading-dark.gif";
+ return $GLOBALS['url'] . "/fobe/cdn/imgs/loading-dark.gif";
}
elseif ($currenttheme == 1) //dark theme light logo
{
- return $GLOBALS['url'] . "/finobe/cdn/imgs/loading-light.gif";
+ return $GLOBALS['url'] . "/fobe/cdn/imgs/loading-light.gif";
}
}
@@ -2655,7 +2661,7 @@ function getCurrentThemeStyle() //grabs the style sheet for the users selected t
if ($currenttheme == 1) //dark theme
{
- return '
';
+ return '
';
}
}
}
@@ -2669,16 +2675,16 @@ function getCSS($studio=false)
}
return '
-
-
+
+
'.$theme.'
-
- ';
+
+ ';
}
//end theme stuff
@@ -2698,7 +2704,7 @@ function getFooter()
@@ -2708,7 +2714,7 @@ function getFooter()
-
Finobe is not affiliated with Lego, ROBLOX, MegaBloks, Bionicle, Pokemon, Nintendo, Lincoln Logs, Yu Gi Oh, K\'nex, Tinkertoys, Erector Set, or the Pirates of the Caribbean. ARrrr!
+
Fobe is not affiliated with Lego, ROBLOX, MegaBloks, Bionicle, Pokemon, Nintendo, Lincoln Logs, Yu Gi Oh, K\'nex, Tinkertoys, Erector Set, or the Pirates of the Caribbean. ARrrr!
@@ -2831,7 +2837,7 @@ function getNav()
-
'.$user->currency.'
+
'.$user->currency.'
@@ -2858,7 +2864,7 @@ function getNav()