Fix paths.
This commit is contained in:
parent
6bffdc4bfa
commit
18218e32d9
|
|
@ -16,7 +16,7 @@ namespace Finobe\Assets {
|
|||
public static function RenderHat(int $assetid, bool $fork=false)
|
||||
{
|
||||
if ($fork) {
|
||||
$job = popen("cd D:/Finobe/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." hat", "r"); //throwaway background process
|
||||
$job = popen("cd C:/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." hat", "r"); //throwaway background process
|
||||
if ($job !== FALSE); {
|
||||
pclose($job);
|
||||
return true;
|
||||
|
|
@ -47,7 +47,7 @@ namespace Finobe\Assets {
|
|||
public static function RenderTShirt(int $assetid, bool $fork=false)
|
||||
{
|
||||
if ($fork) {
|
||||
$job = popen("cd D:/Finobe/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." tshirt", "r"); //throwaway background process
|
||||
$job = popen("cd C:/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." tshirt", "r"); //throwaway background process
|
||||
if ($job !== FALSE); {
|
||||
pclose($job);
|
||||
return true;
|
||||
|
|
@ -79,7 +79,7 @@ namespace Finobe\Assets {
|
|||
public static function RenderShirt(int $assetid, bool $fork=false)
|
||||
{
|
||||
if ($fork) {
|
||||
$job = popen("cd D:/Finobe/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." shirt", "r"); //throwaway background process
|
||||
$job = popen("cd C:/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." shirt", "r"); //throwaway background process
|
||||
if ($job !== FALSE); {
|
||||
pclose($job);
|
||||
return true;
|
||||
|
|
@ -111,7 +111,7 @@ namespace Finobe\Assets {
|
|||
public static function RenderPants(int $assetid, bool $fork=false)
|
||||
{
|
||||
if ($fork) {
|
||||
$job = popen("cd D:/Finobe/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." pants", "r"); //throwaway background process
|
||||
$job = popen("cd C:/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." pants", "r"); //throwaway background process
|
||||
if ($job !== FALSE); {
|
||||
pclose($job);
|
||||
return true;
|
||||
|
|
@ -143,7 +143,7 @@ namespace Finobe\Assets {
|
|||
public static function RenderFace(int $assetid, bool $fork=false)
|
||||
{
|
||||
if ($fork) {
|
||||
$job = popen("cd D:/Finobe/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." face", "r"); //throwaway background process
|
||||
$job = popen("cd C:/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." face", "r"); //throwaway background process
|
||||
if ($job !== FALSE); {
|
||||
pclose($job);
|
||||
return true;
|
||||
|
|
@ -174,7 +174,7 @@ namespace Finobe\Assets {
|
|||
public static function RenderHead(int $assetid, bool $fork=false)
|
||||
{
|
||||
if ($fork) {
|
||||
$job = popen("cd D:/Finobe/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." head", "r"); //throwaway background process
|
||||
$job = popen("cd C:/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." head", "r"); //throwaway background process
|
||||
if ($job !== FALSE); {
|
||||
pclose($job);
|
||||
return true;
|
||||
|
|
@ -206,7 +206,7 @@ namespace Finobe\Assets {
|
|||
public static function RenderGear(int $assetid, bool $fork=false)
|
||||
{
|
||||
if ($fork) {
|
||||
$job = popen("cd D:/Finobe/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." gear", "r"); //throwaway background process
|
||||
$job = popen("cd C:/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." gear", "r"); //throwaway background process
|
||||
if ($job !== FALSE); {
|
||||
pclose($job);
|
||||
return true;
|
||||
|
|
@ -237,7 +237,7 @@ namespace Finobe\Assets {
|
|||
public static function RenderPackage(int $assetid, bool $fork=false)
|
||||
{
|
||||
if ($fork) {
|
||||
$job = popen("cd D:/Finobe/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." package", "r"); //throwaway background process
|
||||
$job = popen("cd C:/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." package", "r"); //throwaway background process
|
||||
if ($job !== FALSE); {
|
||||
pclose($job);
|
||||
return true;
|
||||
|
|
@ -270,7 +270,7 @@ namespace Finobe\Assets {
|
|||
public static function RenderModel(int $assetid, bool $fork=false)
|
||||
{
|
||||
if ($fork) {
|
||||
$job = popen("cd D:/Finobe/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." model", "r"); //throwaway background process
|
||||
$job = popen("cd C:/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." model", "r"); //throwaway background process
|
||||
if ($job !== FALSE); {
|
||||
pclose($job);
|
||||
return true;
|
||||
|
|
@ -301,7 +301,7 @@ namespace Finobe\Assets {
|
|||
public static function RenderMesh(int $assetid, bool $fork=false)
|
||||
{
|
||||
if ($fork) {
|
||||
$job = popen("cd D:/Finobe/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." mesh", "r"); //throwaway background process
|
||||
$job = popen("cd C:/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." mesh", "r"); //throwaway background process
|
||||
if ($job !== FALSE); {
|
||||
pclose($job);
|
||||
return true;
|
||||
|
|
@ -332,7 +332,7 @@ namespace Finobe\Assets {
|
|||
public static function RenderPlace(int $assetid, bool $fork=false)
|
||||
{
|
||||
if ($fork) {
|
||||
$job = popen("cd D:/Finobe/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." place", "r"); //throwaway background process
|
||||
$job = popen("cd C:/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$assetid." place", "r"); //throwaway background process
|
||||
if ($job !== FALSE); {
|
||||
pclose($job);
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ namespace Finobe\Users {
|
|||
{
|
||||
if ($fork)
|
||||
{
|
||||
$job = popen("cd D:/Finobe/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$userid." avatarcloseup", "r"); //throwaway background process
|
||||
$job = popen("cd C:/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$userid." avatarcloseup", "r"); //throwaway background process
|
||||
if ($job !== FALSE);
|
||||
{
|
||||
pclose($job);
|
||||
|
|
@ -128,7 +128,7 @@ namespace Finobe\Users {
|
|||
{
|
||||
if ($fork)
|
||||
{
|
||||
$job = popen("cd D:/Finobe/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$userid." avatar", "r"); //throwaway background process
|
||||
$job = popen("cd C:/Alphaland/WebserviceTools/RenderTools && start /B php backgroundRenderJob.php ".$userid." avatar", "r"); //throwaway background process
|
||||
if ($job !== FALSE);
|
||||
{
|
||||
pclose($job);
|
||||
|
|
|
|||
|
|
@ -58,36 +58,36 @@ try
|
|||
$thumbnailCDN = "https://tcdn.idk16.xyz"; //endpoint for thumbnails
|
||||
|
||||
//cdn paths
|
||||
$renderCDNPath = "D:/Finobe/html_renders_cdn/"; //path to where renders are stored
|
||||
$thumbnailCDNPath = "D:/Finobe/html_thumbs_cdn/"; //path to where thumbnails are stored
|
||||
$assetCDNPath = "D:/Finobe/html_assets_cdn/"; //path to where assets are stored
|
||||
$renderCDNPath = "C:/Alphaland/html_renders_cdn/"; //path to where renders are stored
|
||||
$thumbnailCDNPath = "C:/Alphaland/html_thumbs_cdn/"; //path to where thumbnails are stored
|
||||
$assetCDNPath = "C:/Alphaland/html_assets_cdn/"; //path to where assets are stored
|
||||
|
||||
//lua script paths
|
||||
$avatarthumbnailscript = "D:/Finobe/luascripts/thumbnails/AvatarScript.lua";
|
||||
$facethumbnailscript = "D:/Finobe/luascripts/thumbnails/FaceScript.lua";
|
||||
$hatthumbnailscript = "D:/Finobe/luascripts/thumbnails/HatScript.lua";
|
||||
$tshirtthumbnailscript = "D:/Finobe/luascripts/thumbnails/TShirtScript.lua";
|
||||
$shirtthumbnailscript = "D:/Finobe/luascripts/thumbnails/ShirtScript.lua";
|
||||
$pantsthumbnailscript = "D:/Finobe/luascripts/thumbnails/PantsScript.lua";
|
||||
$headthumbnailscript = "D:/Finobe/luascripts/thumbnails/HeadScript.lua";
|
||||
$placethumbnailscript = "D:/Finobe/luascripts/thumbnails/PlaceScript.lua";
|
||||
$modelthumbnailscript = "D:/Finobe/luascripts/thumbnails/ModelScript.lua";
|
||||
$gearthumbnailscript = "D:/Finobe/luascripts/thumbnails/GearScript.lua";
|
||||
$avatarcloseupthumbnailscript = "D:/Finobe/luascripts/thumbnails/AvatarCloseupScript.lua";
|
||||
$meshthumbnailscript = "D:/Finobe/luascripts/thumbnails/MeshScript.lua";
|
||||
$packagescript = "D:/Finobe/luascripts/thumbnails/PackageScript.lua";
|
||||
$gameserverscript = "D:/Finobe/luascripts/game/gameserver.lua";
|
||||
$avatarthumbnailscript = "C:/Alphaland/luascripts/thumbnails/AvatarScript.lua";
|
||||
$facethumbnailscript = "C:/Alphaland/luascripts/thumbnails/FaceScript.lua";
|
||||
$hatthumbnailscript = "C:/Alphaland/luascripts/thumbnails/HatScript.lua";
|
||||
$tshirtthumbnailscript = "C:/Alphaland/luascripts/thumbnails/TShirtScript.lua";
|
||||
$shirtthumbnailscript = "C:/Alphaland/luascripts/thumbnails/ShirtScript.lua";
|
||||
$pantsthumbnailscript = "C:/Alphaland/luascripts/thumbnails/PantsScript.lua";
|
||||
$headthumbnailscript = "C:/Alphaland/luascripts/thumbnails/HeadScript.lua";
|
||||
$placethumbnailscript = "C:/Alphaland/luascripts/thumbnails/PlaceScript.lua";
|
||||
$modelthumbnailscript = "C:/Alphaland/luascripts/thumbnails/ModelScript.lua";
|
||||
$gearthumbnailscript = "C:/Alphaland/luascripts/thumbnails/GearScript.lua";
|
||||
$avatarcloseupthumbnailscript = "C:/Alphaland/luascripts/thumbnails/AvatarCloseupScript.lua";
|
||||
$meshthumbnailscript = "C:/Alphaland/luascripts/thumbnails/MeshScript.lua";
|
||||
$packagescript = "C:/Alphaland/luascripts/thumbnails/PackageScript.lua";
|
||||
$gameserverscript = "C:/Alphaland/luascripts/game/gameserver.lua";
|
||||
|
||||
//soap paths
|
||||
$RCCwsdl = "D:/Finobe/RCCService.wsdl"; //wsdl path for SOAP
|
||||
$RCCwsdl = "C:/Alphaland/RCCService.wsdl"; //wsdl path for SOAP
|
||||
|
||||
//misc paths
|
||||
$pbsOverlayPath = "D:/Finobe/PersonalServerOverlay.png";
|
||||
$setupHtmlPath = "D:/Finobe/html_setup/";
|
||||
$defaultPlacesPath = "D:/Finobe/default_places/"; //path to where the default places are stored
|
||||
$defaultPbsPlacesPath = "D:/Finobe/default_pbs_places/"; //path to where the default pbs places are stored
|
||||
$defaultXmlsPath = "D:/Finobe/default_xmls/"; //path to where the default xmls stored
|
||||
$privateKeyPath = "D:/Finobe/FinobeRawKey.txt"; //path to where the private key is stored
|
||||
$pbsOverlayPath = "C:/Alphaland/PersonalServerOverlay.png";
|
||||
$setupHtmlPath = "C:/Alphaland/html_setup/";
|
||||
$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
|
||||
|
||||
//machine ip's
|
||||
$gameMachine = "167.114.96.92"; //IP address of the machine that runs gameservers
|
||||
|
|
@ -98,35 +98,35 @@ try
|
|||
$thumbnailArbiter = $renderMachine.":64989"; //IP address/port of the Arbiter running on the render machine
|
||||
|
||||
//autoloader include
|
||||
require 'D:/Finobe/vendor/autoload.php';
|
||||
require 'C:/vendor/autoload.php';
|
||||
|
||||
//finobe specfic dependencies (listing manually for now due to active rewrite of stuff)
|
||||
include "D:/Finobe/globals/Dependencies/Users/Activation.php";
|
||||
include "D:/Finobe/globals/Dependencies/Users/TwoFactor.php";
|
||||
include "D:/Finobe/globals/Dependencies/Users/ReferralProgram.php";
|
||||
include "D:/Finobe/globals/Dependencies/Moderation/UserModerationManager.php";
|
||||
include "D:/Finobe/globals/Dependencies/Common/HashingUtiltity.php";
|
||||
include "D:/Finobe/globals/Dependencies/Web/WebContextManager.php";
|
||||
include "D:/Finobe/globals/Dependencies/Common/System.php";
|
||||
include "D:/Finobe/globals/Dependencies/Assets/Asset.php";
|
||||
include "D:/Finobe/globals/Dependencies/Games/Game.php";
|
||||
include "D:/Finobe/globals/Dependencies/Grid/RccServiceHelper.php";
|
||||
include "D:/Finobe/globals/Dependencies/Assets/Render.php";
|
||||
include "D:/Finobe/globals/Dependencies/UI/ImageHelper.php";
|
||||
include "D:/Finobe/globals/Dependencies/Users/Render.php";
|
||||
include "D:/Finobe/globals/Dependencies/Common/Signing.php";
|
||||
include "D:/Finobe/globals/Dependencies/Common/Email.php";
|
||||
include "D:/Finobe/globals/Dependencies/Games/Ticket.php";
|
||||
include "D:/Finobe/globals/Dependencies/Users/User.php";
|
||||
include "D:/Finobe/globals/Dependencies/Users/Session.php";
|
||||
include "D:/Finobe/globals/Dependencies/Users/Outfit.php";
|
||||
include "D:/Finobe/globals/Dependencies/Moderation/Filter.php";
|
||||
include "D:/Finobe/globals/Dependencies/Users/Badge.php";
|
||||
include "D:/Finobe/globals/Dependencies/Administration/SignupKey.php";
|
||||
include "D:/Finobe/globals/Dependencies/Economy/EconomyHelper.php";
|
||||
include "D:/Finobe/globals/Dependencies/Groups/Group.php";
|
||||
include "D:/Finobe/globals/Dependencies/Web/WebsiteSettings.php";
|
||||
include "D:/Finobe/globals/Dependencies/Web/IpRange.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Users/Activation.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Users/TwoFactor.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Users/ReferralProgram.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Moderation/UserModerationManager.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Common/HashingUtiltity.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Web/WebContextManager.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Common/System.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Assets/Asset.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Games/Game.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Grid/RccServiceHelper.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Assets/Render.php";
|
||||
include "C:/Alphaland/globals/Dependencies/UI/ImageHelper.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Users/Render.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Common/Signing.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Common/Email.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Games/Ticket.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Users/User.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Users/Session.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Users/Outfit.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Moderation/Filter.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Users/Badge.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Administration/SignupKey.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Economy/EconomyHelper.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Groups/Group.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Web/WebsiteSettings.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Web/IpRange.php";
|
||||
|
||||
//authenticator
|
||||
$authenticator = new PHPGangsta_GoogleAuthenticator();
|
||||
|
|
|
|||
|
|
@ -1097,7 +1097,7 @@ function canJoinUser($uid) //
|
|||
|
||||
function sendMail($from, $recipient, $subject, $body, $altbody)
|
||||
{
|
||||
$job = popen("cd D:/Finobe && start /B php sendEmail.php ".$from." ".$recipient." ".base64_encode($subject)." ".base64_encode($body)." ".base64_encode($altbody), "r");
|
||||
$job = popen("cd C:/Alphaland && start /B php sendEmail.php ".$from." ".$recipient." ".base64_encode($subject)." ".base64_encode($body)." ".base64_encode($altbody), "r");
|
||||
if ($job !== FALSE);
|
||||
{
|
||||
pclose($job);
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ file_put_contents("finished.txt", $html);
|
|||
*/
|
||||
|
||||
/*
|
||||
include "D:/Finobe/globals/Dependencies/Users/Activation.php";
|
||||
include "C:/Alphaland/globals/Dependencies/Users/Activation.php";
|
||||
|
||||
$test = new Finobe\Users\Activation();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue