Kaydet (Commit) 81757caa authored tarafından mertcelen's avatar mertcelen

Bug fixes.

üst 54f4ef27
......@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Server;
use App\Key;
use App\Permission;
use App\Server;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
class MainController extends Controller
......@@ -35,9 +34,19 @@ class MainController extends Controller
}
public function upload(){
request()->file('files')->move('/tmp/',request()->file('files')->getClientOriginalName());
server()->putFile('/tmp/' .request()->file('files')->getClientOriginalName(), \request('path'));
// Store file in /tmp directory.
request()->file('file')->move('/tmp/',request()->file('file')->getClientOriginalName());
return respond("Dosya başarıyla yüklendi.");
// Send file to the server.
server()->putFile('/tmp/' .request()->file('file')->getClientOriginalName(), \request('path'));
// Build query to check if file exists in server to validate.
$query = '[[ -f ' . request('path') .
request()->file('file')->getClientOriginalName() . ' ]] && echo "1" || echo "0"';
$flag = server()->run($query);
if($flag == "1\n"){
return respond("Dosya başarıyla yüklendi.");
}
return respond('Dosya yüklenemedi.');
}
}
......@@ -66,6 +66,8 @@ class ServerController extends Controller
return respond('btn-success');
} else if ($output === "inactive\n") {
return respond('btn-secondary');
} else{
return respond('btn-danger');
}
}
......@@ -156,10 +158,6 @@ class ServerController extends Controller
return respond("Kurulum talebi başarıyla alındı. Gelişmeleri bildirim üzerinden takip edebilirsiniz.");
}
public function enableInstalledExtension(){
}
public function update()
{
Notification::new(
......
......@@ -203,7 +203,7 @@
"url" => route('server_upload'),
"next" => "debug",
"inputs" => [
"Yüklenecek Dosya(lar)" => "files:file",
"Yüklenecek Dosya(lar)" => "file:file",
"Yol" => "path:text",
"Sunucu Id:$server->_id" => "server_id:hidden"
],
......
......@@ -45,10 +45,6 @@ Route::group(['middleware' => ['auth','permissions']],function () {
Route::get('/sunucular/{server_id}', 'Server\OneController@main')->name('server_one');
// Remove Server Route
Route::post('/sunucu/sil', 'Server\MainController@remove')->name('server_remove')->middleware('parameters:server_id');
// Server Update Route
Route::post('/sunucu/guncelle', 'ServerController@update')->name('server_update')->middleware('parameters:server_id,name,control_port,city');
......@@ -77,9 +73,14 @@ Route::group(['middleware' => ['auth','permissions']],function () {
Route::post('/sunucu/eklenti', 'ServerController@enableExtension')->name('server_extension');
Route::post('/sunucu/yukle','Server\MainController@upload')->name('server_upload')->middleware('parameters:files,path');
// Server File Upload Route
Route::post('/sunucu/yukle','Server\MainController@upload')->name('server_upload')->middleware('parameters:file,path');
});
// Remove Server Route
Route::post('/sunucu/sil', 'Server\MainController@remove')->name('server_remove')->middleware('parameters:server_id');
// SSH Key List Route
Route::get('/anahtarlar', 'SshController@index')->name('keys');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment