From 20e127c854532361127628311c102bb2eced1423 Mon Sep 17 00:00:00 2001
From: Dasc3er <Dasc3er@users.noreply.github.com>
Date: Mon, 22 Mar 2021 20:45:14 +0100
Subject: [PATCH] Spostamento in URL legacy per versione retro-compatibile

---
 app/Http/Controllers/LegacyController.php     |  8 +++++---
 config/modules.php                            |  8 ++++----
 legacy                                        |  2 +-
 .../views/auth/forgot-password.blade.php      |  2 +-
 resources/views/auth/login.blade.php          |  2 +-
 resources/views/auth/password-reset.blade.php |  2 +-
 .../views/components/inputs/editor.blade.php  |  2 +-
 .../components/inputs/password.blade.php      |  2 +-
 resources/views/components/widget.blade.php   |  2 +-
 .../views/config/configuration.blade.php      |  2 +-
 .../views/config/initialization.blade.php     |  2 +-
 resources/views/layouts/base.blade.php        | 20 +++++++++----------
 routes/legacy.php                             |  4 +++-
 13 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/app/Http/Controllers/LegacyController.php b/app/Http/Controllers/LegacyController.php
index 081fb3c65..deaab78b3 100644
--- a/app/Http/Controllers/LegacyController.php
+++ b/app/Http/Controllers/LegacyController.php
@@ -11,9 +11,9 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class LegacyController extends Controller
 {
-    public function index(Request $request)
+    public function index(Request $request, $path)
     {
-        $path = substr($request->getPathInfo(), 1);
+        //$path = substr($request->getPathInfo(), 1);
 
         // Gestione dell'output
         $output = self::simulate($path);
@@ -27,7 +27,9 @@ class LegacyController extends Controller
         }
         // Correzione header per API
         elseif (self::isApiRequest($path)) {
-            $response = $response->header('Content-Type', 'application/json');
+            $output = json_decode($output, true);
+            $response = $response->header('Content-Type', 'application/json')
+                ->setStatusCode($output['status']);
         }
 
         return $response;
diff --git a/config/modules.php b/config/modules.php
index 4e7f633ab..099d9b312 100644
--- a/config/modules.php
+++ b/config/modules.php
@@ -56,7 +56,7 @@ return [
                 'PROVIDER_NAMESPACE',
             ],
         ],
-        'gitkeep' => true,
+        'gitkeep' => false,
     ],
     'paths' => [
         /*
@@ -209,10 +209,10 @@ return [
     */
 
     'composer' => [
-        'vendor' => 'nwidart',
+        'vendor' => 'devcode-it',
         'author' => [
-            'name' => 'Nicolas Widart',
-            'email' => 'n.widart@gmail.com',
+            'name' => 'DevCode s.r.l.',
+            'email' => 'infot@devcode.it',
         ],
     ],
 
diff --git a/legacy b/legacy
index 767e211f4..9a3a78520 160000
--- a/legacy
+++ b/legacy
@@ -1 +1 @@
-Subproject commit 767e211f4c616315618e222b6d55338f92d247a5
+Subproject commit 9a3a78520b0a3be853c2c47908e060f7d608983f
diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php
index fef805b90..6873b9dec 100644
--- a/resources/views/auth/forgot-password.blade.php
+++ b/resources/views/auth/forgot-password.blade.php
@@ -7,7 +7,7 @@
     <div class="login-box box-center-large">
         <div class="login-logo">
             <a href="//openstamanager.com" target="_blank">
-                <img src="{{ base_url() }}/assets/img/full_logo.png" style="max-width: 360px">
+                <img src="{{ url('/') }}/assets/img/full_logo.png" style="max-width: 360px">
             </a>
         </div>
 
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index e8a55a040..d5027a85b 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -7,7 +7,7 @@
     <div class="login-box">
         <div class="login-logo">
             <a href="//openstamanager.com" target="_blank">
-                <img src="{{ base_url() }}/assets/img/full_logo.png" style="max-width: 360px">
+                <img src="{{ url('/') }}/assets/img/full_logo.png" style="max-width: 360px">
             </a>
         </div>
 
diff --git a/resources/views/auth/password-reset.blade.php b/resources/views/auth/password-reset.blade.php
index 430dc3750..a488c8353 100644
--- a/resources/views/auth/password-reset.blade.php
+++ b/resources/views/auth/password-reset.blade.php
@@ -7,7 +7,7 @@
     <div class="login-box box-center-large">
         <div class="login-logo">
             <a href="//openstamanager.com" target="_blank">
-                <img src="{{ base_url() }}/assets/img/full_logo.png" style="max-width: 360px">
+                <img src="{{ url('/') }}/assets/img/full_logo.png" style="max-width: 360px">
             </a>
         </div>
 
diff --git a/resources/views/components/inputs/editor.blade.php b/resources/views/components/inputs/editor.blade.php
index 3a1921c7b..3b099594b 100644
--- a/resources/views/components/inputs/editor.blade.php
+++ b/resources/views/components/inputs/editor.blade.php
@@ -8,7 +8,7 @@
         'class' => $class,
         'data-parsley-errors-container' => '#'.$unique_id.'-errors'
      ]) }}>{{ $value }}</textarea>
-    <script src="{{ base_url() }}/assets/js/ckeditor/ckeditor.js"></script>
+    <script src="{{ url('/') }}/assets/js/ckeditor/ckeditor.js"></script>
 
     <x-slot name="before">{{ isset($before) ? $before : null }}</x-slot>
     <x-slot name="after">{{ isset($after) ? $after : null }}</x-slot>
diff --git a/resources/views/components/inputs/password.blade.php b/resources/views/components/inputs/password.blade.php
index 330c27e0f..646f7d9e3 100644
--- a/resources/views/components/inputs/password.blade.php
+++ b/resources/views/components/inputs/password.blade.php
@@ -37,7 +37,7 @@
 @if($attributes->has('strength-trigger'))
     <div id="{{ $id }}_viewport_progress"></div>
 
-    <script src="{{ base_url()  }}/assets/dist/password-strength/password.min.js"></script>
+    <script src="{{ url('/') }}/assets/dist/password-strength/password.min.js"></script>
     <script>
         $(document).ready(function(){
             $("#{{ $id }}").pwstrength({
diff --git a/resources/views/components/widget.blade.php b/resources/views/components/widget.blade.php
index 58557df7a..665b6de46 100644
--- a/resources/views/components/widget.blade.php
+++ b/resources/views/components/widget.blade.php
@@ -1,6 +1,6 @@
 <a class="clickable" {!! $attrs !!}>
     <div class="info-box">
-        <button type="button" class="close" onclick="if(confirm('Disabilitare questo widget?')) { $.post('{{ base_url() }}/actions.php?id_module={{ $widget->module->id }}', { op: 'disable_widget', id: '{{ $widget->id }}' }, function(response){ location.reload(); }); }" >
+        <button type="button" class="close" onclick="if(confirm('Disabilitare questo widget?')) { $.post('{{ url('/') }}/actions.php?id_module={{ $widget->module->id }}', { op: 'disable_widget', id: '{{ $widget->id }}' }, function(response){ location.reload(); }); }" >
             <span aria-hidden="true">&times;</span><span class="sr-only">{{ tr('Chiudi') }}</span>
         </button>
 
diff --git a/resources/views/config/configuration.blade.php b/resources/views/config/configuration.blade.php
index c6d64c00c..3aadd2b66 100644
--- a/resources/views/config/configuration.blade.php
+++ b/resources/views/config/configuration.blade.php
@@ -9,7 +9,7 @@
         @csrf
 
         <div class="py-5 text-center">
-            <img class="d-block mx-auto mb-4" src="{{ base_url() }}/assets/img/full_logo.png" alt="{{ tr('Logo OpenSTAManager') }}">
+            <img class="d-block mx-auto mb-4" src="{{ url('/') }}/assets/img/full_logo.png" alt="{{ tr('Logo OpenSTAManager') }}">
             <h2>{!! tr('Benvenuto in _NAME_!', ['_NAME_' => '<strong>'.tr('OpenSTAManager').'</strong>']) !!}</h2>
             <p class="lead">{!! tr('Puoi procedere alla configurazione tecnica del software attraverso i parametri seguenti, che potranno essere corretti secondo necessità tramite il file _FILE_', ['_FILE_' => '<i>.env</i>']) !!}. </p>
 
diff --git a/resources/views/config/initialization.blade.php b/resources/views/config/initialization.blade.php
index 0d2a93dc4..73c2a5a07 100644
--- a/resources/views/config/initialization.blade.php
+++ b/resources/views/config/initialization.blade.php
@@ -6,7 +6,7 @@
 @section('body')
 <div class="container pb-5">
     <div class="py-5 text-center">
-        <img class="d-block mx-auto mb-4" src="{{ base_url() }}/assets/img/full_logo.png" alt="{{ tr('Logo OpenSTAManager') }}">
+        <img class="d-block mx-auto mb-4" src="{{ url('/') }}/assets/img/full_logo.png" alt="{{ tr('Logo OpenSTAManager') }}">
         <h2>{!! tr('Inizializzazione di _NAME_!', ['_NAME_' => '<strong>'.tr('OpenSTAManager').'</strong>']) !!}</h2>
         <p class="lead">{{ tr("Completa la configurazione del gestionale inserendo le ultime informazioni di base") }}. </p>
     </div>
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 7bf1201ce..899658fe2 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -10,19 +10,19 @@
 
         <meta name="csrf-token" content="{{ csrf_token() }}">
 
-        <link href="{{ base_url() }}/assets/img/favicon.png" rel="icon" type="image/x-icon" />
-        <link rel="manifest" href="{{ base_url() }}/manifest.json">
+        <link href="{{ url('/') }}/assets/img/favicon.png" rel="icon" type="image/x-icon" />
+        <link rel="manifest" href="{{ url('/') }}/manifest.json">
 
-        <!--link rel="stylesheet" type="text/css" media="all" href="{{ base_url() }}{{ asset('/css/app.css') }}"/>
-        <link rel="stylesheet" type="text/css" media="all" href="{{ base_url() }}{{ asset('/css/style.css') }}"/>
-        <link rel="stylesheet" type="text/css" media="all" href="{{ base_url() }}{{ asset('/css/themes.css') }}"/>
+        <!--link rel="stylesheet" type="text/css" media="all" href="{{ asset('/css/app.css') }}"/>
+        <link rel="stylesheet" type="text/css" media="all" href="{{ asset('/css/style.css') }}"/>
+        <link rel="stylesheet" type="text/css" media="all" href="{{ asset('/css/themes.css') }}"/>
 
-        <link rel="stylesheet" type="text/css" media="print" href="{{ base_url() }}{{ asset('/css/print.css') }}"/>
+        <link rel="stylesheet" type="text/css" media="print" href="{{ asset('/css/print.css') }}"/>
 
-        <script type="text/javascript" charset="utf-8" src="{{ base_url() }}{{ asset('/js/manifest.js') }}"></script>
-        <script type="text/javascript" charset="utf-8" src="{{ base_url() }}{{ asset('/js/vendor.js') }}"></script>
-        <script type="text/javascript" charset="utf-8" src="{{ base_url() }}{{ asset('/js/app.js') }}"></script>
-        <script type="text/javascript" charset="utf-8" src="{{ base_url() }}{{ asset('/js/base.js') }}"></script--->
+        <script type="text/javascript" charset="utf-8" src="{{ asset('/js/manifest.js') }}"></script>
+        <script type="text/javascript" charset="utf-8" src="{{ asset('/js/vendor.js') }}"></script>
+        <script type="text/javascript" charset="utf-8" src="{{ asset('/js/app.js') }}"></script>
+        <script type="text/javascript" charset="utf-8" src="{{ asset('/js/base.js') }}"></script--->
 
         @foreach (AppLegacy::getAssets()['css'] as $css)
         <link rel="stylesheet" type="text/css" media="all" href="{{ $css }}"/>
diff --git a/routes/legacy.php b/routes/legacy.php
index d363ebc6d..241b35a1e 100644
--- a/routes/legacy.php
+++ b/routes/legacy.php
@@ -4,4 +4,6 @@ use App\Http\Controllers\LegacyController;
 use Illuminate\Support\Facades\Route;
 
 // Route di fallback generale
-Route::fallback([LegacyController::class, 'index']);
+Route::any('/legacy/{path}', [LegacyController::class, 'index'])
+    ->name('legacy')
+    ->where('path', '.*');