Skip to content
This repository has been archived by the owner on Sep 24, 2022. It is now read-only.

Commit

Permalink
fix logic mistakes
Browse files Browse the repository at this point in the history
  • Loading branch information
fmohican committed Mar 26, 2022
1 parent 78225b9 commit 415a82b
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 13 deletions.
34 changes: 25 additions & 9 deletions app/Http/Controllers/ServersController.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,30 @@ public function check(Request $request) {
}
}

public function export($server_source, Request $request) {
$server_s = filter_var($server_source, FILTER_SANITIZE_URL);
$server_s = Servers::where('nameSlug', $server_s)->first();
public function serverlink(Request $request) {
switch ($request->input('cmd')) {
case "export":
return $this->export($request);
case "import":
return $this->import($request);
default:
$this->anwser(400, "Error");
}
}

private function export(Request $request) {
$server_s = filter_var($request->input('srv'), FILTER_SANITIZE_URL);
$server_s = Servers::where('nameSlug', $server_s);
$server_d = filter_var($request->input('prm'), FILTER_SANITIZE_URL);
$server_d = Servers::where('nameSlug', $server_d)->first();
$server_d = Servers::where('nameSlug', $server_d);
if($server_s->doesntExist()) {
return $this->anwser(400, "cannot export - unknown source server '".strip_tags($server_s)."'");
return $this->anwser(400, "cannot export - unknown source server");
}
$server_s = $server_s->first();
if($server_d->doesntExist()) {
return $this->anwser(400, "cannot export - unknown destination server '".strip_tags($server_d)."'");
return $this->anwser(400, "cannot export - unknown destination server");
}
$server_d = $server_d->first();
try {
$rcon = new RCONController($server_s->rconIp, $server_s->rconPassword, $server_s->rconPort);
$result = $rcon->send('ast export "'.$request->input('fid').'"');
Expand All @@ -127,7 +140,7 @@ public function export($server_source, Request $request) {
$json_data .= $result;
} while ($result != " ");
$json = json_decode($json_data, true);
if($json->dosentExist())
if(is_bool($json))
throw new \Exception("cannot export - invalid json received");
PlayerTransfer::create([
"funcomId" => $request->input('fid'),
Expand All @@ -141,7 +154,6 @@ public function export($server_source, Request $request) {
} catch (\Exception $e) {
return $this->anwser(400, $e->getMessage());
}

}

/**
Expand All @@ -150,6 +162,10 @@ public function export($server_source, Request $request) {
* @return string
*/
private function anwser(int $code,string $message) {
return response()->setStatusCode($code)->content($message);
return response($message, $code);
}

private function import(Request $request)
{
}
}
2 changes: 1 addition & 1 deletion app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

class User extends Authenticatable
{
use HasApiTokens, HasFactory, Notifiable;
use HasFactory;

/**
* The attributes that are mass assignable.
Expand Down
5 changes: 2 additions & 3 deletions routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
| contains the "web" middleware group. Now create something great!
|
*/
Route::prefix('public/{server_source}')->name('public.')->group(function() {
Route::get('', [\App\Http\Controllers\ServersController::class, 'serverlink']);
Route::get('export', [\App\Http\Controllers\ServersController::class, 'export'])->name('export');
Route::prefix('public')->name('public.')->group(function() {
Route::get('/', [\App\Http\Controllers\ServersController::class, 'serverlink']);
});

Auth::routes();
Expand Down

0 comments on commit 415a82b

Please sign in to comment.