diff --git a/modules/anagrafiche/actions.php b/modules/anagrafiche/actions.php index 5ed2605c1..69783367f 100755 --- a/modules/anagrafiche/actions.php +++ b/modules/anagrafiche/actions.php @@ -329,15 +329,35 @@ switch (post('op')) { break; } -// Operazioni aggiuntive per il logo +// Operazioni aggiuntive per il logo e filigrana stampe if (filter('op') == 'link_file') { - $nome = filter('nome_allegato'); - if ($nome == 'Logo stampe' or $nome = 'Filigrana stampe') { - if (setting('Azienda predefinita') == $id_record && filter('nome_allegato') == $nome) { - Settings::setValue($nome, $upload); + $nome = filter('nome_allegato'); + + $logo_stampe = array("logo stampe", "logo_stampe", "logo stampe.jpg", "logo stampe.png"); + if (in_array(strtolower($nome), $logo_stampe)) { + $nome = 'Logo stampe'; + $uploads = $structure->uploads($id_record)->where('filename', $upload); + foreach ($uploads as $logo) { + $logo->name = $nome; + $logo->save(); } } + + $filigrana_stampe = array("filigrana stampe", "filigrana_stampe", "filigrana stampe.jpg", "filigrana stampe.png"); + if (in_array(strtolower($nome), $filigrana_stampe)) { + $nome = 'Filigrana stampe'; + $uploads = $structure->uploads($id_record)->where('filename', $upload); + foreach ($uploads as $filigrana) { + $filigrana->name = $nome; + $filigrana->save(); + } + } + + + if (($nome == 'Logo stampe' || $nome = 'Filigrana stampe' ) && (setting('Azienda predefinita') == $id_record)) { + Settings::setValue($nome, $upload); + } } // Operazioni aggiuntive per il logo diff --git a/src/HTMLBuilder/Manager/FileManager.php b/src/HTMLBuilder/Manager/FileManager.php index b528dd9ec..c91330bd0 100755 --- a/src/HTMLBuilder/Manager/FileManager.php +++ b/src/HTMLBuilder/Manager/FileManager.php @@ -187,7 +187,7 @@ class FileManager implements ManagerInterface '.$options['label'].'