fix: aggiornamento libreria image

Author: Pek5892

composer.json

@@ -38,7 +38,7 @@
         "guzzlehttp/guzzle": "^7.0.1",
         "ifsnop/mysqldump-php": "^2.3",
         "illuminate/database": "^8.0",
-        "intervention/image": "^2.3",
+        "intervention/image": "^3.11",
         "jurosh/pdf-merge": "^2.1",
         "league/csv": "^9.7.0",
         "league/flysystem": "^3.0",

gulpfile.js

@@ -279,7 +279,7 @@ function wacom(){
         'poly2tri/dist/poly2tri.js',
         'protobufjs/dist/protobuf.min.js',
         'jszip/dist/jszip.min.js',
-        'gl-matrix/dist/gl-matrix.min.js',
+        'gl-matrix/gl-matrix-min.js',
         'rbush/rbush.min.js',
         'sjcl/sjcl.js',
         'node-forge/dist/forge.min.js'

modules/interventi/actions.php

@@ -41,6 +41,8 @@
 use Plugins\ComponentiImpianti\Componente;
 use Plugins\ListinoClienti\DettaglioPrezzo;
 use Plugins\PianificazioneInterventi\Promemoria;
+use Intervention\Image\ImageManager;
+use Intervention\Image\Drivers\Imagick\Driver;
 
 $id_modulo_impianti = Module::where('name', 'Impianti')->first()->id;
 $plugin_impianti = Plugin::where('name', 'Impianti')->first()->id;
@@ -745,14 +747,14 @@
 
                 $data = explode(',', post('firma_base64'));
 
-                $img = Intervention\Image\ImageManagerStatic::make(base64_decode($data[1]));
-                $img->resize(680, 202, function ($constraint) {
-                    $constraint->aspectRatio();
-                });
+                $manager = ImageManager::gd();
+                $img = $manager->read(base64_decode($data[1]));
+
+                $img->scale(680, 202);
 
                 if (setting('Sistema di firma') == 'Tavoletta Wacom') {
-                    $img->brightness(setting('Luminosità firma Wacom'));
-                    $img->contrast(setting('Contrasto firma Wacom'));
+                    $img->brightness((float)setting('Luminosità firma Wacom'));
+                    $img->contrast((float)setting('Contrasto firma Wacom'));
                 }
 
                 if (!$img->save(base_dir().'/files/interventi/'.$firma_file)) {
@@ -833,10 +835,9 @@
 
                     $data = explode(',', post('firma_base64'));
 
-                    $img = Intervention\Image\ImageManagerStatic::make(base64_decode($data[1]));
-                    $img->resize(680, 202, function ($constraint) {
-                        $constraint->aspectRatio();
-                    });
+                    $manager = ImageManager::gd();
+                    $img = $manager->read(base64_decode($data[1]));
+                    $img->scale(680, 202);
 
                     if (!$img->save(base_dir().'/files/interventi/'.$firma_file)) {
                         flash()->error(tr('Impossibile creare il file!'));

src/API/App/v1/Interventi.php

@@ -22,11 +22,12 @@
 
 use API\App\AppResource;
 use Carbon\Carbon;
-use Intervention\Image\ImageManagerStatic;
 use Modules\Anagrafiche\Anagrafica;
 use Modules\Interventi\Intervento;
 use Modules\Interventi\Stato;
 use Modules\TipiIntervento\Tipo as TipoSessione;
+use Intervention\Image\ImageManager;
+use Intervention\Image\Drivers\Imagick\Driver;
 
 class Interventi extends AppResource
 {
@@ -378,10 +379,9 @@ protected function salvaFirma($firma_base64)
 
         $data = explode(',', (string) $firma_base64);
 
-        $img = ImageManagerStatic::make(base64_decode($data[1]));
-        $img->resize(680, 202, function ($constraint) {
-            $constraint->aspectRatio();
-        });
+        $manager = ImageManager::gd();
+        $img = $manager->read(base64_decode($data[1]));
+        $img->scale(680, 202);
 
         $img->save(base_dir().'/files/interventi/'.$firma_file);
 

src/Models/Upload.php

@@ -22,9 +22,10 @@
 
 use Common\SimpleModelTrait;
 use Illuminate\Database\Eloquent\Model;
-use Intervention\Image\ImageManagerStatic;
 use Modules\FileAdapters\FileAdapter;
 use Modules\FileAdapters\OSMFilesystem;
+use Intervention\Image\ImageManager;
+use Intervention\Image\Drivers\Imagick\Driver;
 
 class Upload extends Model
 {
@@ -374,6 +375,28 @@ public static function getInfo($file)
         return pathinfo((string) $file);
     }
 
+    public static function ridimensionaImmagini($upload)
+    {
+        $info = $upload->info;
+        $directory = $upload->attachments_directory;
+
+        $filepath = base_dir().'/'.$info['dirname'].'/'.$info['filename'].'.'.$info['extension'];
+
+        if (!in_array(mime_content_type($filepath), ['image/png', 'image/gif', 'image/jpeg'])) {
+            return;
+        }
+
+        $manager = ImageManager::gd(autoOrientation: true);
+        $img = $manager->read($filepath);
+        $img->scale(setting('Larghezza per ridimensionamento immagini'), null);
+
+        $img->save(slashes($filepath));
+
+        clearstatcache();
+        $upload->size = filesize(slashes($filepath));
+        $upload->save([], true);
+    }
+
     /**
      * Genera le thumbnails per le immagini.
      */
@@ -388,24 +411,16 @@ protected static function generateThumbnails($upload)
             return;
         }
 
-        $driver = extension_loaded('gd') ? 'gd' : 'imagick';
-        ImageManagerStatic::configure(['driver' => $driver]);
-
-        $img = ImageManagerStatic::make($filepath);
+        $manager = ImageManager::gd();
+        $img = $manager->read($filepath);
+        $img->scale(600, null);
 
-        $img->resize(600, null, function ($constraint) {
-            $constraint->aspectRatio();
-        });
         $img->save(slashes($directory.'/'.$info['filename'].'_thumb600.'.$info['extension']));
 
-        $img->resize(250, null, function ($constraint) {
-            $constraint->aspectRatio();
-        });
+        $img->scale(250, null);
         $img->save(slashes($directory.'/'.$info['filename'].'_thumb250.'.$info['extension']));
 
-        $img->resize(100, null, function ($constraint) {
-            $constraint->aspectRatio();
-        });
+        $img->scale(100, null);
         $img->save(slashes($directory.'/'.$info['filename'].'_thumb100.'.$info['extension']));
     }
 

src/Models/User.php

@@ -22,7 +22,8 @@
 
 use Common\SimpleModelTrait;
 use Illuminate\Database\Eloquent\Model;
-use Intervention\Image\ImageManagerStatic;
+use Intervention\Image\ImageManager;
+use Intervention\Image\Drivers\Imagick\Driver;
 use Modules\Anagrafiche\Anagrafica;
 
 class User extends Model
@@ -171,12 +172,9 @@ public function setPhotoAttribute($value)
         $file = base_dir().'/files/temp_photo.'.$info['extension'];
 
         // Ridimensionamento
-        $driver = extension_loaded('gd') ? 'gd' : 'imagick';
-        ImageManagerStatic::configure(['driver' => $driver]);
-
-        $img = ImageManagerStatic::make($filepath)->resize(100, 100, function ($constraint) {
-            $constraint->aspectRatio();
-        });
+        $manager = ImageManager::gd();
+        $img = $manager->read($filepath);
+        $img->scale(100, 100);
         $img->save(slashes($file));
 
         // Aggiunta nuova foto