Merge branch 'master' of ssh://10.150.0.134:7999/lmys/core into 1.1-dev

app/Http/Controllers/Extension/Sandbox/InternalController.php

@@ -108,6 +108,33 @@ class InternalController extends Controller
 
     public function internalExtensions()
     {
+        $extension = Extension::where([
+            "name" => request("target_extension_name"),
+        ])->first();
+        if (!$extension) {
+            return false;
+        }
+
+        $server = Server::where(["id" => request("target_server_id")])->first();
+        if (!$server) {
+            return false;
+        }
+
+        $newRequestData = [
+            "extension_id" => $extension->id,
+            "extension" => $extension,
+            "server" => $server,
+            "server_id" => $server->id,
+        ];
+
+        $newRequestData = array_merge(
+            $newRequestData,
+            json_decode(request('extra_params'), true)
+        );
+        request()->merge($newRequestData);
+        $controller = new MainController();
+        $controller->initializeClass();
+        return $controller->API();
     }
 
     /**

app/Http/Controllers/Server/OneController.php

@@ -631,7 +631,11 @@ class OneController extends Controller
             "title" => ["Servis Adı", "Aciklamasi", "Durumu"],
             "display" => ["name", "description", "status"],
             "menu" => [
-                "Baslat" => [
+                "Detaylar" => [
+                    "target" => "statusService",
+                    "icon" => "fa-info-circle",
+                ],
+                "Başlat" => [
                     "target" => "startService",
                     "icon" => "fa-play",
                 ],
@@ -639,7 +643,7 @@ class OneController extends Controller
                     "target" => "stopService",
                     "icon" => "fa-stop",
                 ],
-                "Yeniden Baslat" => [
+                "Yeniden Başlat" => [
                     "target" => "restartService",
                     "icon" => "fa-sync-alt",
                 ],
@@ -1145,6 +1149,23 @@ class OneController extends Controller
         return respond("Servis Yeniden Başlatıldı", 200);
     }
 
+    public function statusService()
+    {
+        if (
+            server()->type == "linux_ssh" ||
+            server()->type == "linux_certificate"
+        ) {
+            $command = sudo() . "systemctl status " . request('name');
+        } else {
+            return respond(
+                "Windows Sunucularda yalnızca servis durumu görüntülenmektedir.",
+                201
+            );
+        }
+        $output = server()->run($command);
+        return respond($output, 200);
+    }
+
     public function getOpenPorts()
     {
         if (

app/Http/Controllers/Server/_routes.php

@@ -202,6 +202,11 @@ Route::group(['middleware' => ['server']], function () {
         'Server\OneController@restartService'
     )->name('server_restart_service');
 
+    Route::post(
+        '/sunucu/servis/durum',
+        'Server\OneController@statusService'
+    )->name('server_service_status');
+
     Route::post(
         '/sunucu/acikPortlar',
         'Server\OneController@getOpenPorts'

database/migrations/2020_05_18_102502_add_support_to_extensions.php

@@ -14,7 +14,7 @@ class AddSupportToExtensions extends Migration
     public function up()
     {
         Schema::table('extensions', function (Blueprint $table) {
-            $table->string('support')->default('administrator@liman.app');
+            $table->string('support')->default('administrator@liman.dev');
         });
     }
 

resources/views/auth/login.blade.php

@@ -62,7 +62,7 @@
         <center><h6>Havelsan © 2020 <a href="https://liman.havelsan.com.tr" target="_blank">(İletişim)</a></h6></center>
     </div>
     <style>
-        .login-page, .card-body, input {
+        .login-page, .card-body {
             background: linear-gradient(261deg, #007bff, #343a40);
             background-size: 400% 400%;
 

resources/views/layouts/content.blade.php

 <!-- Content Wrapper. Contains page content -->
 <div class="content-wrapper">
-    @if(auth()->check() && user()->email == "administrator@liman.app")
+    @if(auth()->check() && user()->email == "administrator@liman.dev")
     <div class="alert alert-danger customAlert">
         <b>{{__("Tam yetkili yönetici hesabı ile giriş yaptınız, sisteme zarar verebilirsiniz.")}}</b>
     </div>

resources/views/server/one.blade.php

@@ -395,7 +395,7 @@
     @include('modal',[
         "id"=>"delete_extensions",
         "title" => "Eklentileri Sil",
-        "text" => "Secili eklentileri silmek istediginize emin misiniz?",
+        "text" => "Seçili eklentileri silmek istediğinize emin misiniz?",
         "type" => "danger",
         "onsubmit" => "removeExtensionFunc",
         "submit_text" => "Eklentileri Sil"
@@ -456,21 +456,21 @@
 
     @include('modal',[
         "id"=>"startService",
-        "title" => "Servisi Baslat",
-        "text" => "Secili servisi baslatmak istediginize emin misiniz?",
+        "title" => "Servisi Başlat",
+        "text" => "Seçili servisi başlatmak istediğinize emin misiniz?",
         "type" => "danger",
         "next" => "reload",
         "inputs" => [
             "name:-" => "name:hidden",
         ],
         "url" => route('server_start_service'),
-        "submit_text" => "Servisi Baslat"
+        "submit_text" => "Servisi Başlat"
     ])
 
     @include('modal',[
         "id"=>"stopService",
         "title" => "Servisi Durdur",
-        "text" => "Secili servisi durdurmak istediginize emin misiniz?",
+        "text" => "Seçili servisi durdurmak istediğinize emin misiniz?",
         "type" => "danger",
         "next" => "reload",
         "inputs" => [
@@ -482,15 +482,15 @@
 
     @include('modal',[
         "id"=>"restartService",
-        "title" => "Servisi Yeniden Baslat",
-        "text" => "Secili servisi yeniden baslatmak istediginize emin misiniz?",
+        "title" => "Servisi Yeniden Başlat",
+        "text" => "Seçili servisi yeniden başlatmak istediğinize emin misiniz?",
         "type" => "danger",
         "next" => "reload",
         "inputs" => [
             "name:-" => "name:hidden",
         ],
         "url" => route('server_restart_service'),
-        "submit_text" => "Servisi Yeniden Baslat"
+        "submit_text" => "Servisi Yeniden Başlat"
     ])
 
     @include('modal',[
@@ -573,6 +573,13 @@
         </div>
     @endcomponent
 
+    @component('modal-component',[
+        "id" => "serviceStatusModal",
+        "title" => "Servis Durumu"
+    ])
+        <pre id="serviceStatusWrapper"></pre>
+    @endcomponent
+
     @component('modal-component',[
         "id"=>"logDetailModal",
         "title" => "Log Detayı"
@@ -893,6 +900,24 @@
             })
         }
 
+        function statusService(element) {
+            let name = element.querySelector('#name').innerHTML;
+            showSwal('{{__("Okunuyor...")}}','info');
+            let form = new FormData();
+            form.append('name',name);
+            request('{{route('server_service_status')}}', form, function (response) {
+                let json = JSON.parse(response);
+                $("#serviceStatusWrapper").html(json.message);
+                $("#serviceStatusModal").modal('show');
+                setTimeout(function () {
+                    Swal.close();
+                }, 1500);
+            }, function(response){
+                let error = JSON.parse(response);
+                showSwal(error.message,'error',2000);
+            })
+        }
+
         $("#logQueryFilter").on('keyup', function (e) {
             if (e.keyCode === 13) {
                 getLogs();

routes/console.php

@@ -20,7 +20,7 @@ Artisan::command('administrator', function () {
     );
     $user = User::where([
         "name" => "Administrator",
-        "email" => "administrator@liman.app",
+        "email" => "administrator@liman.dev",
     ])->first();
     if ($user) {
         $user->update([
@@ -30,7 +30,7 @@ Artisan::command('administrator', function () {
         $user = new User();
         $user->fill([
             "name" => "Administrator",
-            "email" => "administrator@liman.app",
+            "email" => "administrator@liman.dev",
             "password" => Hash::make($password),
             "status" => 1,
         ]);
@@ -38,7 +38,7 @@ Artisan::command('administrator', function () {
     $user->save();
 
     $this->comment("Liman MYS Administrator Kullanıcısı");
-    $this->comment("Email  : administrator@liman.app");
+    $this->comment("Email  : administrator@liman.dev");
     $this->comment("Parola : " . $password . "");
 })->describe('Create administrator account to use');
 
@@ -99,7 +99,7 @@ Artisan::command('module:add {module_name}', function ($module_name) {
         return $this->error("Modul klasoru bulunamadi!");
     }
 
-    if(Module::where(["name" => $module_name])->exists()){
+    if (Module::where(["name" => $module_name])->exists()) {
         return $this->error("Boyle bir modul zaten var!");
     }
     $module = Module::create(["name" => $module_name, "enabled" => true]);

storage/VERSION

-1.1.0
\ No newline at end of file
+1.1.0