r978 - xwiki/trunk/src/main/java/com/xpn/xwiki/web

[Nguyen Viet Chung]

Author: chungnv
Date: 2006-03-27 06:55:57 +0200 (Mon, 27 Mar 2006)
New Revision: 978

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/web/UploadAction.java
Log:
Fix bug XWIKI-130, saying message not support characters '\' '/' ';' when upload attachment .

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/web/UploadAction.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/web/UploadAction.java	2006-03-21 09:35:22 UTC (rev 977)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/web/UploadAction.java	2006-03-27 04:55:57 UTC (rev 978)
@@ -31,8 +31,8 @@
 import com.xpn.xwiki.plugin.fileupload.FileUploadPlugin;
 
 public class UploadAction extends XWikiAction {
-    
-	public boolean action(XWikiContext context) throws XWikiException {
+
+    public boolean action(XWikiContext context) throws XWikiException {
         XWikiResponse response = context.getResponse();
         XWikiDocument doc = context.getDoc();
 
@@ -41,13 +41,17 @@
         FileUploadPlugin fileupload = (FileUploadPlugin) context.get("fileuploadplugin");
 
         String filename = fileupload.getFileItem("filename", context);
+        if(filename.indexOf("/") != -1 || filename.indexOf("\\") != -1 || filename.indexOf(";") != -1){
+             context.put("message","notsupportcharacters");
+             return true ;
+        }
         byte[] data = fileupload.getFileItemData("filepath", context);
 
         if (filename==null) {
             String fname = fileupload.getFileName("filepath", context);
             int i = fname.indexOf("\\");
             if (i==-1)
-                i = fname.indexOf("/");
+                i = fname.indexOf ("/");
             filename = fname.substring(i+1);
         }
         filename = filename.replaceAll("\\+"," ");
@@ -77,4 +81,7 @@
         sendRedirect(response, redirect);
         return false;
     }
-}
+    public String render(XWikiContext context) throws XWikiException {
+        return "exception";
+    }
+}
\ No newline at end of file