X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fforms%2FFormPageViewer.java;h=98566485963e8231e6fac23e5caed93b46f40640;hb=5c34a77d1949c26b2d52272e71a0e5141fce397b;hp=7460a00fdd30bc854bdaef0cbaaa6b1d8f71f84e;hpb=18b28c7b3bb716df83f9e2816ddd1146c8601cde;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/forms/FormPageViewer.java b/org.argeo.cms/src/org/argeo/cms/forms/FormPageViewer.java
index 7460a00fd..985664859 100644
--- a/org.argeo.cms/src/org/argeo/cms/forms/FormPageViewer.java
+++ b/org.argeo.cms/src/org/argeo/cms/forms/FormPageViewer.java
@@ -121,7 +121,7 @@ public class FormPageViewer extends AbstractPageViewer {
 			// JCR : Model
 			node = ept.getNode();
 			String propName = ept.getPropertyName();
-			if (FormUtils.notEmpty(txt)) {
+			if (EclipseUiUtils.isEmpty(txt)) {
 				if (node.hasProperty(propName))
 					node.getProperty(propName).remove();
 			} else {
@@ -461,8 +461,12 @@ public class FormPageViewer extends AbstractPageViewer {
 
 			if (name == null)
 				name = details.getFileName();
+
+			// TODO clean image name more carefully
+			String cleanedName = name.replaceAll("[^a-zA-Z0-9-.]", "_");
+
 			try {
-				imageManager().uploadImage(context, name, stream);
+				imageManager().uploadImage(context, cleanedName, stream);
 				// TODO clean refresh strategy
 				section.getDisplay().asyncExec(new Runnable() {
 					@Override