MediaManager: improve error handling

joomla · Aug 19, 2022 · 3ba695b · 3ba695b
1 parent aa1f62a
commit 3ba695b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/administrator/components/com_media/resources/scripts/app/Api.es6.js b/administrator/components/com_media/resources/scripts/app/Api.es6.js
@@ -278,6 +278,18 @@ class Api {
     const response = JSON.parse(error.response);
     if (response.message) {
       notifications.error(response.message);
+      // Check for App messages queue
+      if (response.messages) {
+        Object.keys(response.messages).forEach((type) => {
+          response.messages[type].forEach((message) => {
+            if (type === 'error') {
+              notifications.error(message);
+            } else {
+              notifications.notify(message);
+            }
+          })
+        })
+      }
     } else {
       switch (error.status) {
         case 409:

diff --git a/administrator/language/en-GB/lib_joomla.ini b/administrator/language/en-GB/lib_joomla.ini
@@ -681,7 +681,7 @@ JLIB_MEDIA_ERROR_UPLOAD_INPUT="Unable to upload file."
 JLIB_MEDIA_ERROR_WARNFILENAME="File name must only have alphanumeric characters and no spaces."
 JLIB_MEDIA_ERROR_WARNFILETOOLARGE="This file is too large to upload."
 JLIB_MEDIA_ERROR_WARNFILETYPE="This file type is not supported."
-JLIB_MEDIA_ERROR_WARNIEXSS="Possible IE XSS Attack found."
+JLIB_MEDIA_ERROR_WARNIEXSS="The file looks suspicious, therefore cannot be uploaded."
 JLIB_MEDIA_ERROR_WARNINVALID_IMG="Not a valid image."
 JLIB_MEDIA_ERROR_WARNINVALID_MIME="Invalid mime type detected."
 JLIB_MEDIA_ERROR_WARNINVALID_MIMETYPE="Illegal mime type detected: %s"

diff --git a/language/en-GB/lib_joomla.ini b/language/en-GB/lib_joomla.ini
@@ -678,7 +678,7 @@ JLIB_MEDIA_ERROR_UPLOAD_INPUT="Unable to upload file."
 JLIB_MEDIA_ERROR_WARNFILENAME="File name must only have alphanumeric characters and no spaces."
 JLIB_MEDIA_ERROR_WARNFILETOOLARGE="This file is too large to upload."
 JLIB_MEDIA_ERROR_WARNFILETYPE="This file type is not supported."
-JLIB_MEDIA_ERROR_WARNIEXSS="Possible IE XSS Attack found."
+JLIB_MEDIA_ERROR_WARNIEXSS="The file looks suspicious, therefore cannot be uploaded."
 JLIB_MEDIA_ERROR_WARNINVALID_IMG="Not a valid image."
 JLIB_MEDIA_ERROR_WARNINVALID_MIME="Invalid mime type detected."
 JLIB_MEDIA_ERROR_WARNINVALID_MIMETYPE="Illegal mime type detected: %s"