gestion erreur upload format .ico

3 files changed, 11 insertions, 5 deletions

diff --git a/public/js/Input.js b/public/js/Input.js
index 9a131c8..be7cd8d 100644
--- a/public/js/Input.js
+++ b/public/js/Input.js
@@ -98,7 +98,8 @@ class InputFile extends InputToggler{
                                 this.close();
                 }
                 else{
-                    console.error("Erreur: le serveur n'a pas enregistré l'image'.");
+                        this.onFailure(data);
+                    console.error(data.message);
                 }
             })
             .catch(error => {
@@ -108,6 +109,11 @@ class InputFile extends InputToggler{
         onSuccess(data){
                 this.content_elem.src = data.location;
         }
+        onFailure(data){
+                if(data.format === 'ico'){
+                toastNotify("Format ICO mal géré par le serveur, essayez avec un PNG.");
+        }
+        }
 }
 
 class InputFileFavicon extends InputFile{
diff --git a/src/controller/HeadFootController.php b/src/controller/HeadFootController.php
index 5945c87..d3e75ee 100644
--- a/src/controller/HeadFootController.php
+++ b/src/controller/HeadFootController.php
@@ -71,7 +71,7 @@ class HeadFootController
                         /* -- écriture du fichier sur le disque -- */
                         if(!ImageUploadController::imagickCleanImage(file_get_contents($file['tmp_name']), Asset::USER_PATH . $name, $extension)){ // recréer l’image pour la nettoyer
                                 http_response_code(500);
-                    echo json_encode(['success' => false, 'message' => 'Erreur image non valide.']);
+                    echo json_encode(['success' => false, 'message' => 'Erreur image non valide.', 'format' => $extension]);
                         }
                         else{
                                 $params_array = explode('_', $request_params); // head_favicon, header_logo, header_background, footer_logo
diff --git a/src/controller/ImageUploadController.php b/src/controller/ImageUploadController.php
index b085e11..77f0a47 100644
--- a/src/controller/ImageUploadController.php
+++ b/src/controller/ImageUploadController.php
@@ -88,7 +88,7 @@ class ImageUploadController
                 }
                 else{
                     http_response_code(500);
-                    echo json_encode(['message' => 'Erreur image non valide']);
+                    echo json_encode(['message' => 'Erreur image non valide', 'format' => $extension]);
                 }
             }
             else{
@@ -131,7 +131,7 @@ class ImageUploadController
                 }
                 else{
                     http_response_code(500);
-                    echo json_encode(['message' => 'Erreur image non valide']);
+                    echo json_encode(['message' => 'Erreur image non valide', 'format' => $extension]);
                 }
             }
             else{
@@ -177,7 +177,7 @@ class ImageUploadController
             }
             else{
                 http_response_code(500);
-                echo json_encode(['message' => 'Erreur image non valide']);
+                echo json_encode(['message' => 'Erreur image non valide', 'format' => $extension]);
             }
             die;
         }