Correzione per log di accesso e upload tramite Laravel

lib/util.php

@@ -550,7 +550,7 @@ if (!function_exists('temp_file')) {
 
         // $base_directory = trim(sys_get_temp_dir(), DIRECTORY_SEPARATOR);
         $base_directory = implode(DIRECTORY_SEPARATOR, [
-            rtrim(base_dir(), DIRECTORY_SEPARATOR),
+            rtrim(base_path(), DIRECTORY_SEPARATOR),
             'files',
             'temp',
         ]);

modules/aggiornamenti/src/UpdateHook.php

@@ -21,7 +21,6 @@ namespace Modules\Aggiornamenti;
 
 use GuzzleHttp\Client;
 use Hooks\CachedManager;
-use Modules;
 use Update;
 
 /**

modules/checklists/src/Check.php

@@ -19,12 +19,12 @@
 
 namespace Modules\Checklists;
 
+use App\Models\User;
 use Common\SimpleModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use Models\Group;
 use Models\Module;
 use Models\Plugin;
-use App\Models\User;
 use Modules\Checklists\Traits\ChecklistTrait;
 use Traits\HierarchyTrait;
 

modules/checklists/src/Checklist.php

@@ -19,11 +19,11 @@
 
 namespace Modules\Checklists;
 
+use App\Models\User;
 use Common\SimpleModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use Models\Module;
 use Models\Plugin;
-use App\Models\User;
 
 class Checklist extends Model
 {

modules/emails/src/Mail.php

@@ -19,11 +19,11 @@
 
 namespace Modules\Emails;
 
+use App\Models\User;
 use Common\SimpleModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use Models\PrintTemplate;
 use Models\Upload;
-use App\Models\User;
 use Modules\Newsletter\Newsletter;
 
 class Mail extends Model

modules/interventi/src/API/v1/Interventi.php

@@ -23,7 +23,6 @@ use API\Interfaces\CreateInterface;
 use API\Interfaces\RetrieveInterface;
 use API\Interfaces\UpdateInterface;
 use API\Resource;
-use Auth;
 use Modules;
 use Modules\Anagrafiche\Anagrafica;
 use Modules\Interventi\Intervento;

modules/newsletter/src/Newsletter.php

@@ -19,10 +19,10 @@
 
 namespace Modules\Newsletter;
 
+use App\Models\User;
 use Common\SimpleModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use App\Models\User;
 use Modules\Anagrafiche\Anagrafica;
 use Modules\Anagrafiche\Referente;
 use Modules\Anagrafiche\Sede;

modules/utenti/user.php

@@ -19,8 +19,8 @@
 
 include_once __DIR__.'/../../core.php';
 
-use Models\Group;
 use App\Models\User;
+use Models\Group;
 
 Permissions::check('rw');
 

plugins/importFE/src/FatturaElettronica.php

@@ -19,7 +19,6 @@
 
 namespace Plugins\ImportFE;
 
-use Modules;
 use Modules\Anagrafiche\Anagrafica;
 use Modules\Anagrafiche\Nazione;
 use Modules\Anagrafiche\Tipo as TipoAnagrafica;

plugins/importFE/src/InvoiceHook.php

@@ -20,7 +20,6 @@
 namespace Plugins\ImportFE;
 
 use Hooks\CachedManager;
-use Modules;
 
 /**
  * Hook dedicato all'importazione automatica delle Fatture Elettroniche di acquisto rilevate dal sistema automatico di gestione.

src/API/App/v1/AllegatiInterventi.php

@@ -22,7 +22,6 @@ namespace API\App\v1;
 use API\App\AppResource;
 use API\Exceptions\InternalError;
 use Models\Upload;
-use Modules;
 
 class AllegatiInterventi extends AppResource
 {

src/API/App/v1/Interventi.php

@@ -20,7 +20,6 @@
 namespace API\App\v1;
 
 use API\App\AppResource;
-use Auth;
 use Carbon\Carbon;
 use Intervention\Image\ImageManagerStatic;
 use Modules\Anagrafiche\Anagrafica;

src/API/App/v1/RigheInterventi.php

@@ -21,7 +21,6 @@ namespace API\App\v1;
 
 use API\App\AppResource;
 use API\Exceptions\InternalError;
-use Auth;
 use Carbon\Carbon;
 use Modules\Articoli\Articolo as ArticoloOriginale;
 use Modules\Interventi\Components\Articolo;

src/API/App/v1/SessioniInterventi.php

@@ -20,7 +20,6 @@
 namespace API\App\v1;
 
 use API\App\AppResource;
-use Auth;
 use Carbon\Carbon;
 use Modules\Anagrafiche\Anagrafica;
 use Modules\Interventi\Components\Sessione;

src/API/Common/Allegato.php

@@ -23,7 +23,6 @@ use API\Interfaces\CreateInterface;
 use API\Interfaces\RetrieveInterface;
 use API\Resource;
 use Models\Upload;
-use Modules;
 
 class Allegato extends Resource implements RetrieveInterface, CreateInterface
 {

src/API/Response.php

@@ -22,7 +22,6 @@ namespace API;
 use API\Exceptions\InternalError;
 use API\Exceptions\ResourceNotFound;
 use API\Exceptions\ServiceError;
-use App\Models\User;
 use Auth;
 use Exception;
 use Filter;

src/HTMLBuilder/Manager/WidgetManager.php

@@ -80,7 +80,7 @@ class WidgetManager implements ManagerInterface
 
     protected static function getModule()
     {
-        return \module('Stato dei servizi');
+        return module('Stato dei servizi');
     }
 
     protected function prints($widget)

src/HTMLBuilder/Wrapper/HTMLWrapper.php

@@ -19,8 +19,6 @@
 
 namespace HTMLBuilder\Wrapper;
 
-use Modules;
-
 /**
  * @since 2.3
  */

src/Models/Log.php

@@ -27,34 +27,18 @@ class Log extends Model
     use SimpleModelTrait;
 
     /** @var array Stati previsti dal sistema di autenticazione */
-    protected static $status = [
-        'success' => [
-            'code' => 1,
-            'message' => 'Login riuscito!',
-            'color' => 'success',
-        ],
-        'failed' => [
-            'code' => 0,
-            'message' => 'Autenticazione fallita!',
-            'color' => 'danger',
-        ],
-        'disabled' => [
-            'code' => 2,
-            'message' => 'Utente non abilitato!',
-            'color' => 'info',
-        ],
-        'unauthorized' => [
-            'code' => 5,
-            'message' => "L'utente non ha nessun permesso impostato!",
-            'color' => 'warning',
-        ],
-    ];
+    protected static $status;
 
     protected $table = 'zz_logs';
 
     public function getCodeAttribute()
     {
-        return $this->getStatus()['code'];
+        return $this->stato;
+    }
+
+    public function getStateAttribute()
+    {
+        return $this->getStatus()['state'];
     }
 
     public function getMessageAttribute()
@@ -69,7 +53,68 @@ class Log extends Model
 
     public function getStatus()
     {
-        return self::$status[$this->stato];
+        return self::getAvailableStatus()[$this->stato];
+    }
+
+    public function setStatus($name)
+    {
+        $code = self::getStatusCode($name);
+
+        $this->stato = $code;
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return int
+     */
+    public static function getStatusCode($name)
+    {
+        $status = self::getAvailableStatus();
+        $code = 0;
+
+        foreach ($status as $c => $s) {
+            if ($s['state'] == $name) {
+                $code = $c;
+            }
+        }
+
+        return $code;
+    }
+
+    /**
+     * Restituisce un elenco di stati previsti dal sistema di autenticazione.
+     *
+     * @return string[][]
+     */
+    public static function getAvailableStatus()
+    {
+        if (!isset(self::$status)) {
+            self::$status = [
+                1 => [
+                    'state' => 'success',
+                    'message' => tr('Login riuscito!'),
+                    'color' => 'success',
+                ],
+                0 => [
+                    'state' => 'failed',
+                    'message' => tr('Autenticazione fallita!'),
+                    'color' => 'danger',
+                ],
+                2 => [
+                    'state' => 'disabled',
+                    'message' => tr('Utente non abilitato!'),
+                    'color' => 'info',
+                ],
+                5 => [
+                    'state' => 'unauthorized',
+                    'message' => tr("L'utente non ha nessun permesso impostato!"),
+                    'color' => 'warning',
+                ],
+            ];
+        }
+
+        return self::$status;
     }
 
     /* Relazioni Eloquent */

src/Models/Module.php

@@ -54,6 +54,7 @@ class Module extends Model
         'options',
         'options2',
     ];
+
     /**
      * Costruisce un link HTML per il modulo e il record indicati.
      */

src/Models/Setting.php

@@ -21,8 +21,8 @@ namespace Models;
 
 use Common\SimpleModelTrait;
 use Illuminate\Database\Eloquent\Model;
-use Traits\LocalPoolTrait;
 use Respect\Validation\Validator as v;
+use Traits\LocalPoolTrait;
 
 class Setting extends Model
 {
@@ -95,7 +95,7 @@ class Setting extends Model
             return true;
         }
 
-        return  false;
+        return false;
     }
 
     /**

src/Models/Upload.php

@@ -21,6 +21,7 @@ namespace Models;
 
 use Common\SimpleModelTrait;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\UploadedFile;
 use Intervention\Image\ImageManagerStatic;
 use UnexpectedValueException;
 use Util\FileSystem;
@@ -86,10 +87,16 @@ class Upload extends Model
         $model = new static();
 
         // Informazioni di base
-        $original_name = isset($source['name']) ? $source['name'] : basename($source);
+        if (is_string($source)) {
+            $original_name = basename($source);
+        } elseif (is_array($source)) {
+            $original_name = $source['name'];
+        } else {
+            $original_name = $source->getClientOriginalName();
+        }
         $name = isset($data['name']) ? $data['name'] : $name;
         $category = isset($data['category']) ? $data['category'] : $category;
-
+        
         // Nome e categoria dell'allegato
         $model->name = !empty($name) ? $name : $original_name;
         $model->category = $category;
@@ -118,6 +125,7 @@ class Upload extends Model
             (is_array($source) && is_uploaded_file($source['tmp_name']) && !move_uploaded_file($source['tmp_name'], $file)) ||
             (is_string($source) && is_file($source) && !copy($source, $file)) ||
             (is_string($source) && !is_file($source) && file_put_contents($file, $source) === false)
+            ($source instanceof UploadedFile && !$source->storeAs($directory, $filename))
         ) {
             throw new UnexpectedValueException("Errore durante il salvataggio dell'allegato");
         }