diff --git a/html/Game/ServerPing.php b/html/Game/ServerPing.php index a974cb2..421f6ec 100644 --- a/html/Game/ServerPing.php +++ b/html/Game/ServerPing.php @@ -1,5 +1,6 @@ rowCount() > 0) //atleast 1 player in job { - soapRenewLease($GLOBALS['gamesArbiter'], $jobid, 90); //add 1.50 min to the job + $jobRenew = new RccServiceHelper($GLOBALS['gamesArbiter']); + $jobRenew->RenewLease($jobid, 90); } $newping = $pdo->prepare("UPDATE open_servers SET lastPing = UNIX_TIMESTAMP() WHERE gameID = :g AND jobid = :j"); diff --git a/html_admin/lua-executer/executeScript.php b/html_admin/lua-executer/executeScript.php index 76822c5..cb7ba06 100644 --- a/html_admin/lua-executer/executeScript.php +++ b/html_admin/lua-executer/executeScript.php @@ -1,5 +1,6 @@ script; $output = ""; if (!isJobMarkedClosed($jobid)) { - $output = soapExecuteEx($GLOBALS['gamesArbiter'], $jobid, "Execution From ACP", $script); + $jobExecuteEx = new RccServiceHelper($GLOBALS['gamesArbiter']); + $jobExecuteEx->ExecuteEx( + $jobExecuteEx->ConstructGenericScriptExecute($jobid, "Execution From ACP", $script) + ); } -if (!$output->faultstring && $script) //logging +if (!$jobExecuteEx->faultstring && $script) //logging { $log = $GLOBALS['pdo']->prepare("INSERT INTO admin_job_execute_logs(userid, jobid, script, whenExecuted) VALUES (:uid, :jid, :script, UNIX_TIMESTAMP())"); $log->bindParam(":uid", $user->id, PDO::PARAM_INT); @@ -29,4 +33,4 @@ if (!$output->faultstring && $script) //logging $log->execute(); } -echo json_encode(array("result" => $output->faultstring)); \ No newline at end of file +echo json_encode(array("result" => $jobExecuteEx->faultstring)); \ No newline at end of file diff --git a/html_api/game/management/manageJob.php b/html_api/game/management/manageJob.php index 61e6477..64474b0 100644 --- a/html_api/game/management/manageJob.php +++ b/html_api/game/management/manageJob.php @@ -6,6 +6,9 @@ Alphaland 2021 */ //headers + +use Alphaland\Grid\RccServiceHelper; + header("Access-Control-Allow-Origin: https://www.alphaland.cc"); header("access-control-allow-credentials: true"); @@ -27,8 +30,9 @@ else { if ($shutdownserver) { - //soapclosejob doesnt have any return data, so we set message to true - soapCloseJob($GLOBALS['gamesArbiter'],$jobid); + //doesnt have any return data, so we set message to true + $jobClose = new RccServiceHelper($GLOBALS['gamesArbiter']); + $jobClose->CloseJob($jobid); $message = true; }