From 651e01de0fc78d87d0cc2bc8d64c044cb22079a9 Mon Sep 17 00:00:00 2001 From: Graphictoria Date: Tue, 6 Dec 2022 16:09:13 -0500 Subject: [PATCH] Rename Finobe to Fobe --- FinobeUtilityJsSource.js | 2 +- FinobeRawKey.txt => FobeRawKey.txt | 0 IsAliveCheck.php | 4 +- README.md | 4 +- .../RenderTools/backgroundRenderJob.php | 6 +- .../Administration/Maintenance.php | 6 +- .../Dependencies/Administration/SignupKey.php | 4 +- globals/Dependencies/Assets/Asset.php | 6 +- globals/Dependencies/Assets/AssetType.php | 4 +- globals/Dependencies/Assets/Render.php | 10 +- .../Dependencies/Client/ClientSettings.php | 24 +--- .../Dependencies/Common/ContentDelivery.php | 4 +- globals/Dependencies/Common/Email.php | 4 +- .../Dependencies/Common/HashingUtiltity.php | 2 +- globals/Dependencies/Common/Signing.php | 2 +- globals/Dependencies/Common/System.php | 2 +- .../Dependencies/Economy/EconomyHelper.php | 8 +- globals/Dependencies/Games/Game.php | 8 +- globals/Dependencies/Games/Persistence.php | 4 +- globals/Dependencies/Games/Ticket.php | 6 +- .../Dependencies/Grid/RccServiceHelper.php | 4 +- globals/Dependencies/Groups/Group.php | 10 +- .../Moderation/AssetModerationManager.php | 2 +- globals/Dependencies/Moderation/Filter.php | 2 +- .../Moderation/UserModerationManager.php | 6 +- globals/Dependencies/UI/ImageHelper.php | 2 +- globals/Dependencies/Users/Activation.php | 21 ++-- globals/Dependencies/Users/Badge.php | 4 +- globals/Dependencies/Users/Outfit.php | 8 +- .../Dependencies/Users/ReferralProgram.php | 12 +- globals/Dependencies/Users/Render.php | 10 +- globals/Dependencies/Users/Session.php | 14 +-- globals/Dependencies/Users/TwoFactor.php | 6 +- globals/Dependencies/Users/User.php | 4 +- globals/Dependencies/Web/IpRange.php | 4 +- .../Dependencies/Web/WebContextManager.php | 2 +- globals/Dependencies/Web/WebsiteSettings.php | 2 +- globals/config.php | 34 +++--- globals/functions.php | 64 +++++----- globals/pageHandler.php | 6 +- html/2fa.php | 4 +- html/Game/AdminScript.php | 4 +- html/Game/ClientPresence.php | 9 +- html/Game/Join.php | 8 +- html/Game/KillServer.php | 2 +- html/Game/Negotiate.php | 2 +- html/Game/PlaceLauncher.php | 6 +- html/Game/RegisterServer.php | 2 +- html/Game/ServerPing.php | 4 +- html/Game/Tools/ThumbnailAsset.ashx | 4 +- html/MCP/approveasset.php | 6 +- html/MCP/asset-management.php | 2 +- html/MCP/chat-logs/index.php | 4 +- html/MCP/chat-logs/loggedChats.php | 4 +- html/MCP/index.php | 2 +- html/MCP/invite-logs/index.php | 2 +- html/MCP/invite-logs/inviteLogs.php | 2 +- html/MCP/moderateasset.php | 6 +- html/MCP/pendingassets.php | 4 +- html/MCP/reports/data/close.php | 4 +- html/MCP/reports/data/index.php | 4 +- html/MCP/reports/data/reports.php | 4 +- html/MCP/reports/index.php | 4 +- html/MCP/reports/view.php | 6 +- html/MCP/user-management/ban.php | 6 +- html/MCP/user-management/banlist.php | 4 +- html/MCP/user-management/index.php | 2 +- html/MCP/user-management/unban.php | 6 +- html/Studio/Data/UploadData.php | 6 +- html/Studio/IDE/Publish/UploadNewImage.php | 2 +- html/Studio/IDE/Publish/UploadNewMesh.php | 2 +- html/Studio/IDE/Publish/UploadNewMeshPart.php | 2 +- html/Studio/IDE/Publish/uploadnewasset.php | 6 +- html/Studio/IDE/UploadModel.php | 4 +- html/Studio/IDE/toolbox/ClientToolbox.php | 2 +- html/Studio/IDE/toolbox/items.php | 2 +- html/Studio/Places.php | 2 +- html/activate.php | 6 +- html/asset/index.php | 4 +- html/avatar/changebc.php | 2 +- html/avatar/renderstatus.php | 2 +- html/badges/view.php | 2 +- html/ban.php | 4 +- html/catalog/config.php | 10 +- html/catalog/index.php | 2 +- html/catalog/view.php | 10 +- html/create/index.php | 20 +-- html/donate/index.php | 2 +- html/download.php | 4 +- .../cdn/imgs/Previews/Baseplate.png | Bin .../cdn/imgs/Previews/Happy Home.png | Bin .../cdn/imgs/Previews/Rugged.png | Bin .../cdn/imgs/Previews/Superflat.png | Bin html/{finobe => fobe}/cdn/imgs/Thumbs.db | Bin .../cdn/imgs/addmodelicon.png | Bin .../cdn/imgs/admin-icon-1024.png | Bin .../imgs/alpha-christmas/finobechristmas.png | Bin .../cdn/imgs/alpha-spooky/finobezombie.png | Bin .../cdn/imgs/alphabux-black-1024.png | Bin .../cdn/imgs/alphabux-grey-1024.png | Bin .../cdn/imgs/alphabux-red-1024.png | Bin .../cdn/imgs/alphabux-white-1024.png | Bin .../cdn/imgs/alphatester-icon-1024.png | Bin html/{finobe => fobe}/cdn/imgs/arrows.svg | 0 .../cdn/imgs/asset-template.png | Bin .../{finobe => fobe}/cdn/imgs/download-bg.png | Bin .../{finobe => fobe}/cdn/imgs/finobe-1024.png | Bin .../cdn/imgs/finobe-150x150-w.png | Bin .../cdn/imgs/finobe-150x150.png | Bin .../cdn/imgs/finobe-256x256.png | Bin .../cdn/imgs/finobe-50x50.png | Bin .../{finobe => fobe}/cdn/imgs/finobe-logo.svg | 0 .../{finobe => fobe}/cdn/imgs/finobe-long.png | Bin .../cdn/imgs/finobe-white-1024.png | Bin .../cdn/imgs/forgot-password-1024.png | Bin .../cdn/imgs/loading-dark.gif | Bin .../cdn/imgs/loading-light.gif | Bin html/{finobe => fobe}/cdn/imgs/mem/Thumbs.db | Bin html/{finobe => fobe}/cdn/imgs/mem/bsc-av.png | Bin html/{finobe => fobe}/cdn/imgs/mem/bsc.png | Bin .../cdn/imgs/mem/finobe basic.png | Bin .../cdn/imgs/mem/finobe plus.png | Bin .../cdn/imgs/mem/finobe premium.png | Bin html/{finobe => fobe}/cdn/imgs/mem/pls-av.png | Bin html/{finobe => fobe}/cdn/imgs/mem/pls.png | Bin html/{finobe => fobe}/cdn/imgs/mem/prm-av.png | Bin html/{finobe => fobe}/cdn/imgs/mem/prm.png | Bin .../cdn/imgs/mod-icon-1024.png | Bin .../cdn/imgs/treeholder-icon-1024.png | Bin .../cdn/imgs/verified-icon-1024.png | Bin html/{finobe => fobe}/cdn/vids/index-vid.m4v | Bin html/{finobe => fobe}/css/bootstrap-grid.css | 0 .../css/bootstrap-grid.css.map | 0 .../css/bootstrap-grid.min.css | 0 .../css/bootstrap-grid.min.css.map | 0 .../{finobe => fobe}/css/bootstrap-reboot.css | 0 .../css/bootstrap-reboot.css.map | 0 .../css/bootstrap-reboot.min.css | 0 .../css/bootstrap-reboot.min.css.map | 0 html/{finobe => fobe}/css/bootstrap.css | 0 html/{finobe => fobe}/css/bootstrap.css.map | 0 html/{finobe => fobe}/css/bootstrap.min.css | 0 .../css/bootstrap.min.css-dark | 0 .../css/bootstrap.min.css.map | 0 html/{finobe => fobe}/css/stylesheet-dark.css | 0 html/{finobe => fobe}/css/stylesheet.css | 0 html/{finobe => fobe}/js/Lodash.js | 0 html/{finobe => fobe}/js/bootstrap.bundle.js | 0 .../js/bootstrap.bundle.js.map | 0 .../js/bootstrap.bundle.min.js | 0 .../js/bootstrap.bundle.min.js.map | 0 html/{finobe => fobe}/js/bootstrap.js | 0 html/{finobe => fobe}/js/bootstrap.js.map | 0 html/{finobe => fobe}/js/bootstrap.min.js | 0 html/{finobe => fobe}/js/bootstrap.min.js.map | 0 html/{finobe => fobe}/js/jquery-3.5.1.min.js | 0 .../js/jquery-3.5.1.slim.min.js | 0 .../js/snowfall/canvas-snow.js | 0 html/{finobe => fobe}/js/utilities.js | 0 html/friends/friend-requests.php | 2 +- html/friends/view.php | 2 +- html/games/config.php | 12 +- html/games/index.php | 2 +- html/games/pbs/config.php | 4 +- html/games/view.php | 8 +- html/groups/config.php | 2 +- html/groups/index.php | 2 +- html/index.php | 6 +- html/login/forgotpassword.php | 4 +- html/login/index.php | 4 +- html/logout.php | 2 +- html/maintenance.php | 4 +- html/noJS.php | 2 +- html/profile/view.php | 6 +- html/register.php | 114 +++++++++++------- html/secret/localtesting.php | 2 +- html/secret/test.php | 2 +- html/settings/changeemail.php | 2 +- html/settings/changepassword.php | 2 +- html/settings/index.php | 2 +- html/settings/resetpassword.php | 2 +- html/verifyemail.php | 2 +- html_admin/announcements.php | 2 +- html_admin/client-deployer-upload.php | 2 +- html_admin/client-deployer.php | 2 +- html_admin/configuration.php | 2 +- html_admin/create-asset.php | 18 +-- html_admin/create-signupkey.php | 4 +- html_admin/generateSecurityKey.php | 2 +- html_admin/give-asset.php | 4 +- html_admin/index.php | 2 +- html_admin/lua-executer/activeJobs.php | 4 +- html_admin/lua-executer/executeScript.php | 6 +- html_admin/lua-executer/index.php | 2 +- html_admin/rank-management.php | 4 +- html_admin/rendermanagement.php | 4 +- html_api/RoleSets/GetRoleSetForUser.php | 4 +- .../RoleSets/PrivilegedSetUserRoleSetRank.php | 4 +- html_api/catalog/items.php | 2 +- html_api/comments/index.php | 2 +- html_api/comments/newcomment.php | 2 +- html_api/game/info.php | 4 +- html_api/game/jobExists.php | 2 +- html_api/game/jobList.php | 4 +- html_api/game/management/manageJob.php | 4 +- html_api/game/pbs/configure.php | 4 +- html_api/game/pbs/users.php | 4 +- html_api/games/sitegames.php | 4 +- html_api/group/create.php | 4 +- html_api/group/info.php | 4 +- html_api/group/join.php | 4 +- html_api/group/joinrequests.php | 2 +- html_api/group/leave.php | 4 +- html_api/group/members.php | 4 +- html_api/group/posts.php | 4 +- html_api/group/roles.php | 4 +- html_api/group/submitpost.php | 4 +- html_api/group/update.php | 4 +- html_api/groups/index.php | 4 +- html_api/logo.php | 2 +- html_api/marketplace/productinfo.php | 4 +- .../AbuseReport/InGameChatHandler.php | 4 +- html_api/moderation/filtertext.php | 4 +- html_api/moderation/v2/filtertext.php | 4 +- html_api/ownership/hasasset.php | 2 +- html_api/referrals/activeUserKeys.php | 4 +- html_api/settings/index.php | 8 +- html_api/settings/twofactor/activate.php | 4 +- html_api/settings/twofactor/disable.php | 4 +- html_api/settings/twofactor/settings.php | 4 +- html_api/settings/update/blurb.php | 2 +- html_api/settings/update/inventoryprivacy.php | 4 +- html_api/settings/update/joinprivacy.php | 4 +- html_api/settings/update/theme.php | 2 +- html_api/sitepresence/ping.php | 2 +- html_api/user/avatar/assets/remove.php | 4 +- html_api/user/avatar/assets/wear.php | 4 +- html_api/user/avatar/bodycolors.php | 2 +- html_api/user/avatar/outfits/apply.php | 4 +- html_api/user/avatar/outfits/create.php | 4 +- html_api/user/avatar/outfits/update.php | 4 +- html_api/user/avatar/renderstatus.php | 4 +- html_api/user/avatar/settings.php | 2 +- html_api/user/avatar/updatesettings.php | 6 +- html_api/user/feed/index.php | 4 +- html_api/user/feed/post.php | 2 +- html_api/user/games/recents.php | 4 +- html_api/users/canmanage.php | 4 +- html_api/users/get-by-username.php | 2 +- html_api/users/groups.php | 4 +- html_api/users/index.php | 2 +- html_api/users/profile/badges.php | 2 +- html_api/users/profile/friends.php | 2 +- html_api/users/profile/games.php | 2 +- html_api/users/profile/info.php | 4 +- html_api/users/profile/inventory.php | 4 +- html_api/users/profile/outfits.php | 2 +- html_api/users/profile/wearing.php | 2 +- html_api/users/siteusers.php | 4 +- html_api/users/thumbnail.php | 4 +- html_assetgame/Asset/index.php | 2 +- html_assetgame/Game/Badge/AwardBadge.php | 2 +- html_assetgame/Game/Badge/HasBadge.php | 2 +- html_assetgame/Game/Badge/IsBadgeDisabled.php | 2 +- html_assetgame/Game/BreakFriend.php | 2 +- html_assetgame/Game/CreateFriend.php | 2 +- .../LuaWebService/HandleSocialRequest.ashx | 2 +- html_assetgame/Game/PlaceLauncher.php | 2 +- html_assetgame/Game/Tools/InsertAsset.ashx | 4 +- html_assetgame/Game/Visit.ashx | 2 +- .../Setting/QuietGet/RCCGames.php | 2 +- .../Setting/QuietGet/RCCThumbnailers.php | 2 +- html_data/Data/AutoSave.ashx | 8 +- .../Persistence/getSortedValues.php | 2 +- html_gamepersistence/Persistence/getV2.php | 2 +- html_gamepersistence/Persistence/set.php | 2 +- .../GetAllowedMD5Hashes.php | 2 +- .../GetAllowedSecurityKeys.php | 2 +- luascripts/game/gameserver.lua | 2 +- luascripts/thumbnails/AvatarCloseupScript.lua | 2 +- ratelimit.php | 2 +- sendEmail.php | 2 +- 282 files changed, 543 insertions(+), 519 deletions(-) rename FinobeRawKey.txt => FobeRawKey.txt (100%) rename html/{finobe => fobe}/cdn/imgs/Previews/Baseplate.png (100%) rename html/{finobe => fobe}/cdn/imgs/Previews/Happy Home.png (100%) rename html/{finobe => fobe}/cdn/imgs/Previews/Rugged.png (100%) rename html/{finobe => fobe}/cdn/imgs/Previews/Superflat.png (100%) rename html/{finobe => fobe}/cdn/imgs/Thumbs.db (100%) rename html/{finobe => fobe}/cdn/imgs/addmodelicon.png (100%) rename html/{finobe => fobe}/cdn/imgs/admin-icon-1024.png (100%) rename html/{finobe => fobe}/cdn/imgs/alpha-christmas/finobechristmas.png (100%) rename html/{finobe => fobe}/cdn/imgs/alpha-spooky/finobezombie.png (100%) rename html/{finobe => fobe}/cdn/imgs/alphabux-black-1024.png (100%) rename html/{finobe => fobe}/cdn/imgs/alphabux-grey-1024.png (100%) rename html/{finobe => fobe}/cdn/imgs/alphabux-red-1024.png (100%) rename html/{finobe => fobe}/cdn/imgs/alphabux-white-1024.png (100%) rename html/{finobe => fobe}/cdn/imgs/alphatester-icon-1024.png (100%) rename html/{finobe => fobe}/cdn/imgs/arrows.svg (100%) rename html/{finobe => fobe}/cdn/imgs/asset-template.png (100%) rename html/{finobe => fobe}/cdn/imgs/download-bg.png (100%) rename html/{finobe => fobe}/cdn/imgs/finobe-1024.png (100%) rename html/{finobe => fobe}/cdn/imgs/finobe-150x150-w.png (100%) rename html/{finobe => fobe}/cdn/imgs/finobe-150x150.png (100%) rename html/{finobe => fobe}/cdn/imgs/finobe-256x256.png (100%) rename html/{finobe => fobe}/cdn/imgs/finobe-50x50.png (100%) rename html/{finobe => fobe}/cdn/imgs/finobe-logo.svg (100%) rename html/{finobe => fobe}/cdn/imgs/finobe-long.png (100%) rename html/{finobe => fobe}/cdn/imgs/finobe-white-1024.png (100%) rename html/{finobe => fobe}/cdn/imgs/forgot-password-1024.png (100%) rename html/{finobe => fobe}/cdn/imgs/loading-dark.gif (100%) rename html/{finobe => fobe}/cdn/imgs/loading-light.gif (100%) rename html/{finobe => fobe}/cdn/imgs/mem/Thumbs.db (100%) rename html/{finobe => fobe}/cdn/imgs/mem/bsc-av.png (100%) rename html/{finobe => fobe}/cdn/imgs/mem/bsc.png (100%) rename html/{finobe => fobe}/cdn/imgs/mem/finobe basic.png (100%) rename html/{finobe => fobe}/cdn/imgs/mem/finobe plus.png (100%) rename html/{finobe => fobe}/cdn/imgs/mem/finobe premium.png (100%) rename html/{finobe => fobe}/cdn/imgs/mem/pls-av.png (100%) rename html/{finobe => fobe}/cdn/imgs/mem/pls.png (100%) rename html/{finobe => fobe}/cdn/imgs/mem/prm-av.png (100%) rename html/{finobe => fobe}/cdn/imgs/mem/prm.png (100%) rename html/{finobe => fobe}/cdn/imgs/mod-icon-1024.png (100%) rename html/{finobe => fobe}/cdn/imgs/treeholder-icon-1024.png (100%) rename html/{finobe => fobe}/cdn/imgs/verified-icon-1024.png (100%) rename html/{finobe => fobe}/cdn/vids/index-vid.m4v (100%) rename html/{finobe => fobe}/css/bootstrap-grid.css (100%) rename html/{finobe => fobe}/css/bootstrap-grid.css.map (100%) rename html/{finobe => fobe}/css/bootstrap-grid.min.css (100%) rename html/{finobe => fobe}/css/bootstrap-grid.min.css.map (100%) rename html/{finobe => fobe}/css/bootstrap-reboot.css (100%) rename html/{finobe => fobe}/css/bootstrap-reboot.css.map (100%) rename html/{finobe => fobe}/css/bootstrap-reboot.min.css (100%) rename html/{finobe => fobe}/css/bootstrap-reboot.min.css.map (100%) rename html/{finobe => fobe}/css/bootstrap.css (100%) rename html/{finobe => fobe}/css/bootstrap.css.map (100%) rename html/{finobe => fobe}/css/bootstrap.min.css (100%) rename html/{finobe => fobe}/css/bootstrap.min.css-dark (100%) rename html/{finobe => fobe}/css/bootstrap.min.css.map (100%) rename html/{finobe => fobe}/css/stylesheet-dark.css (100%) rename html/{finobe => fobe}/css/stylesheet.css (100%) rename html/{finobe => fobe}/js/Lodash.js (100%) rename html/{finobe => fobe}/js/bootstrap.bundle.js (100%) rename html/{finobe => fobe}/js/bootstrap.bundle.js.map (100%) rename html/{finobe => fobe}/js/bootstrap.bundle.min.js (100%) rename html/{finobe => fobe}/js/bootstrap.bundle.min.js.map (100%) rename html/{finobe => fobe}/js/bootstrap.js (100%) rename html/{finobe => fobe}/js/bootstrap.js.map (100%) rename html/{finobe => fobe}/js/bootstrap.min.js (100%) rename html/{finobe => fobe}/js/bootstrap.min.js.map (100%) rename html/{finobe => fobe}/js/jquery-3.5.1.min.js (100%) rename html/{finobe => fobe}/js/jquery-3.5.1.slim.min.js (100%) rename html/{finobe => fobe}/js/snowfall/canvas-snow.js (100%) rename html/{finobe => fobe}/js/utilities.js (100%) 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()
- Finobe | '.$year.' + Fobe | '.$year.'
@@ -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()
    • diff --git a/html/secret/localtesting.php b/html/secret/localtesting.php index b960aa1..a983206 100644 --- a/html/secret/localtesting.php +++ b/html/secret/localtesting.php @@ -1,6 +1,6 @@ isUserActivated(2))// diff --git a/html/settings/changeemail.php b/html/settings/changeemail.php index cbfb19f..9489b8e 100644 --- a/html/settings/changeemail.php +++ b/html/settings/changeemail.php @@ -1,6 +1,6 @@ exec("UNLOCK TABLES"); //unlock since we are done with sensitive asset stuff - //give the hat to the user Finobe + //give the hat to the user Fobe $c = $GLOBALS['pdo']->prepare("INSERT into owned_assets (uid, aid, stock, when_sold, givenby) VALUES(1, :a, 0, UNIX_TIMESTAMP(), 1)"); //give asset 8 $c->bindParam(":a", $autoincrement, PDO::PARAM_INT); //catalog asset id $c->execute(); @@ -244,7 +244,7 @@ $alert = ''; $GLOBALS['pdo']->exec("UNLOCK TABLES"); //unlock since we are done with sensitive asset stuff // ... - //give the face to the user Finobe + //give the face to the user Fobe $c = $GLOBALS['pdo']->prepare("INSERT into owned_assets (uid, aid, stock, when_sold, givenby) VALUES(1, :a, 0, UNIX_TIMESTAMP(), 1)"); //give asset 8 $c->bindParam(":a", $autoincrement, PDO::PARAM_INT); //catalog asset id $c->execute(); @@ -391,7 +391,7 @@ $alert = ''; $GLOBALS['pdo']->exec("UNLOCK TABLES"); //unlock since we are done with sensitive asset stuff // ... - //give the Head to the user Finobe + //give the Head to the user Fobe $c = $GLOBALS['pdo']->prepare("INSERT into owned_assets (uid, aid, stock, when_sold, givenby) VALUES(1, :a, 0, UNIX_TIMESTAMP(), 1)"); //give asset $c->bindParam(":a", $autoincrement, PDO::PARAM_INT); //catalog asset id $c->execute(); @@ -491,7 +491,7 @@ $alert = '';
    - +
    @@ -562,7 +562,7 @@ $alert = '';
    - +
    @@ -610,7 +610,7 @@ $alert = '';
    - +
    @@ -676,7 +676,7 @@ $alert = '';
    - +
    diff --git a/html_admin/create-signupkey.php b/html_admin/create-signupkey.php index 27e95f4..d8c49c1 100644 --- a/html_admin/create-signupkey.php +++ b/html_admin/create-signupkey.php @@ -1,7 +1,7 @@ $assetInfo->TargetId, diff --git a/html_api/moderation/AbuseReport/InGameChatHandler.php b/html_api/moderation/AbuseReport/InGameChatHandler.php index 3310df6..4846f2b 100644 --- a/html_api/moderation/AbuseReport/InGameChatHandler.php +++ b/html_api/moderation/AbuseReport/InGameChatHandler.php @@ -1,11 +1,11 @@ id; echo json_encode(array("success" => $twofactor::deleteUser2FA($userid))); \ No newline at end of file diff --git a/html_api/settings/twofactor/settings.php b/html_api/settings/twofactor/settings.php index 98bbcce..7eeda12 100644 --- a/html_api/settings/twofactor/settings.php +++ b/html_api/settings/twofactor/settings.php @@ -2,12 +2,12 @@ /* -Finobe 2021 +Fobe 2021 */ //headers -use Finobe\Users\TwoFactor; +use Fobe\Users\TwoFactor; header("Access-Control-Allow-Origin: https://www.idk16.xyz"); header("access-control-allow-credentials: true"); diff --git a/html_api/settings/update/blurb.php b/html_api/settings/update/blurb.php index 55c9618..bac48ed 100644 --- a/html_api/settings/update/blurb.php +++ b/html_api/settings/update/blurb.php @@ -1,7 +1,7 @@ id)) { diff --git a/html_api/user/avatar/settings.php b/html_api/user/avatar/settings.php index 771b342..b4fffde 100644 --- a/html_api/user/avatar/settings.php +++ b/html_api/user/avatar/settings.php @@ -2,7 +2,7 @@ /* -Finobe 2021 +Fobe 2021 */ //headers diff --git a/html_api/user/avatar/updatesettings.php b/html_api/user/avatar/updatesettings.php index 96b96af..41355d9 100644 --- a/html_api/user/avatar/updatesettings.php +++ b/html_api/user/avatar/updatesettings.php @@ -2,13 +2,13 @@ /* -Finobe 2021 +Fobe 2021 */ //headers -use Finobe\Users\Render; -use Finobe\Users\User; +use Fobe\Users\Render; +use Fobe\Users\User; header("Access-Control-Allow-Origin: https://www.idk16.xyz"); header("access-control-allow-credentials: true"); diff --git a/html_api/user/feed/index.php b/html_api/user/feed/index.php index 0fa1ac9..583f9d7 100644 --- a/html_api/user/feed/index.php +++ b/html_api/user/feed/index.php @@ -2,12 +2,12 @@ /* -Finobe 2021 +Fobe 2021 */ //headers -use Finobe\Users\User; +use Fobe\Users\User; header("Access-Control-Allow-Origin: https://www.idk16.xyz"); diff --git a/html_api/user/feed/post.php b/html_api/user/feed/post.php index 1f430fc..dd7d551 100644 --- a/html_api/user/feed/post.php +++ b/html_api/user/feed/post.php @@ -1,7 +1,7 @@ Name - Finobe Flag + Fobe Flag AssetId diff --git a/html_assetgame/Game/Visit.ashx b/html_assetgame/Game/Visit.ashx index 39e7e12..80d6f90 100644 --- a/html_assetgame/Game/Visit.ashx +++ b/html_assetgame/Game/Visit.ashx @@ -1,6 +1,6 @@ AssetTypeId == 9) //personal server place { diff --git a/html_gamepersistence/Persistence/getSortedValues.php b/html_gamepersistence/Persistence/getSortedValues.php index 976e2d4..b588c48 100644 --- a/html_gamepersistence/Persistence/getSortedValues.php +++ b/html_gamepersistence/Persistence/getSortedValues.php @@ -1,7 +1,7 @@