[ofbiz-framework] branch release18.12 updated: Fixed: Secure the uploads (OFBIZ-12080)

[jleroux]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release18.12 by this push:
     new dbaf504  Fixed: Secure the uploads (OFBIZ-12080)
dbaf504 is described below

commit dbaf5049cfbca1598a29a79f20903a5f000153ca
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Sun Dec 6 11:09:53 2020 +0100

    Fixed: Secure the uploads (OFBIZ-12080)
    
    Replaces RESOURCE by resource, doh!
---
 .../java/org/apache/ofbiz/content/ContentManagementServices.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java
 
b/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java
index 6c0cc6b..39d7b9d 100644
--- 
a/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java
+++ 
b/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java
@@ -464,7 +464,7 @@ public class ContentManagementServices {
                       permResults = dispatcher.runSync("createContentRole", 
serviceContext);
                       if (ServiceUtil.isError(permResults)) {
                           return 
ServiceUtil.returnError(ServiceUtil.getErrorMessage(permResults));
-                      } 
+                        }
                   } catch (GenericServiceException e) {
                       Debug.logError(e, e.toString(), module);
                       return ServiceUtil.returnError(e.toString());
@@ -1465,7 +1465,7 @@ public class ContentManagementServices {
             }
             orderHeader = 
EntityQuery.use(delegator).from("OrderHeader").where("orderId", 
orderId).queryOne();
             if (orderHeader == null) {
-                String msg = UtilProperties.getMessage(resource, 
"ContentNoOrderHeaderFound", UtilMisc.toMap("orderId", orderId), locale);
+                String msg = UtilProperties.getMessage(resource, 
"ContentNoOrderHeaderFound", UtilMisc.toMap("orderId", orderId), locale);
                 return ServiceUtil.returnError(msg);
             }
             Timestamp orderCreatedDate = (Timestamp) 
orderHeader.get("orderDate");
@@ -1642,7 +1642,7 @@ public class ContentManagementServices {
                         errorMessage = 
UtilProperties.getMessage("SecurityUiLabels", 
"SupportedFileFormatsIncludingSvg", locale);
                     }
                 } catch (ImageReadException | IOException e) {
-                    errorMessage = UtilProperties.getMessage(RESOURCE, 
"ContentUnableToOpenFileForWriting", UtilMisc.toMap("fileName",
+                    errorMessage = UtilProperties.getMessage(resource, 
"ContentUnableToOpenFileForWriting", UtilMisc.toMap("fileName",
                             objectInfo), locale);
                 }
             }