fix: invio email con allegato per utenti senza permessi per il modulo Coda di invio, e duplicazione generazione allegato

Author: Pek5892

actions.php

@@ -352,7 +352,7 @@
 elseif (post('op') == 'send-email') {
     $template = Template::find(post('template'));
 
-    $mail = Modules\Emails\Mail::build($user, $template, $id_record);
+    $mail = Modules\Emails\Mail::build(user: $user, template: $template, id_record: $id_record, reset_from_template: false);
 
     // Rimozione allegati predefiniti
     $mail->resetPrints();

modules/emails/src/Mail.php

@@ -37,7 +37,7 @@ class Mail extends Model
 
     protected $options;
 
-    public static function build(?User $user = null, $template = null, $id_record = null, $account = null)
+    public static function build(?User $user = null, $template = null, $id_record = null, $account = null, $reset_from_template = true)
     {
         $model = new static();
 
@@ -52,7 +52,7 @@ public static function build(?User $user = null, $template = null, $id_record =
 
         $model->save();
 
-        if (!empty($template)) {
+        if (!empty($template) && $reset_from_template) {
             $model->resetFromTemplate();
         }
 
@@ -135,7 +135,7 @@ public function addPrint($print_id, $name = null)
             'id_category' => null,
             'id_module' => $id_module,
             'id_record' => $this->id,
-        ]);
+        ], true);
 
         // Verifica che l'upload sia stato eseguito correttamente
         if (!$upload) {

src/Models/Upload.php

@@ -82,10 +82,10 @@ public function setCategoryAttribute($value)
      *
      * @return self
      */
-    public static function build($source = null, $data = null, $name = null, $category = null)
+    public static function build($source = null, $data = null, $name = null, $category = null, $force = false)
     {
         // Verifica permessi prima del caricamento
-        if (!self::checkUploadPermissions($data)) {
+        if (!self::checkUploadPermissions($data) && !$force) {
             return false;
         }
 

src/Uploads.php

@@ -80,15 +80,15 @@ public static function getDirectory($id_module, $id_plugin = null)
      *
      * @return Upload
      */
-    public static function upload($source, $data, $options = [])
+    public static function upload($source, $data, $force = false)
     {
         // Se è attivo il task sul controllo dello spazio disponibile allora aggiorno la cache
         $task = Tasks\Task::where('enabled', 1)->where('name', 'Hook Spazio disponibile')->first();
         if (!empty($task)) {
             $task->execute();
         }
 
-        return Upload::build($source, $data);
+        return Upload::build(source: $source, data: $data, force: $force);
     }
 
     /**