shuber 2004/12/08 14:27:22 CET
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/engines/pages PageProperties_Engine.java
Log:
Added check in page URL key edition engine to only allow ASCII characters
from 32 to 127 when using a non-UTF8 setup.
Revision Changes Path
1.48.2.9 +14 -1
jahia/src/java/org/jahia/engines/pages/PageProperties_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/engines/pages/PageProperties_Engine.java.diff?r1=1.48.2.8&r2=1.48.2.9&f=h
Index: PageProperties_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/engines/pages/Attic/PageProperties_Engine.java,v
retrieving revision 1.48.2.8
retrieving revision 1.48.2.9
diff -u -r1.48.2.8 -r1.48.2.9
--- PageProperties_Engine.java 4 Nov 2004 15:28:05 -0000 1.48.2.8
+++ PageProperties_Engine.java 8 Dec 2004 13:27:22 -0000 1.48.2.9
@@ -1,4 +1,4 @@
-// $Id: PageProperties_Engine.java,v 1.48.2.8 2004/11/04 15:28:05 shuber Exp
$
+// $Id: PageProperties_Engine.java,v 1.48.2.9 2004/12/08 13:27:22 shuber Exp
$
//
//
// ____.
@@ -822,6 +822,19 @@
result = false;
}
+ if (!jParams.settings().isUtf8Encoding()) {
+ // let's check that the character is allowed. Since URL
encoding
+ // can cause problems with non-ASCII characters, we refuse
any
+ // non ASCII chars in non-UTF8 setup.
+ for (int i = 0; i < pageURLKey.length(); i++) {
+ int curChar = (int) pageURLKey.charAt(i);
+ if ((curChar < 32) || (curChar > 127)) {
+ engineMessages.add("pageProperties", new
EngineMessage("org.jahia.engines.pages.PageProperties_Engine.urlKeyHasInvalidChars.label",
pageURLKey));
+ result = false;
+ break;
+ }
+ }
+ }
engineMap.put("dataPageURLKey", pageURLKey);
}
String pageDef = jParams.getRequest ().getParameter ("pageTemplate");
