Index: lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java,v diff -u -r1.4 -r1.5 --- lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java 11 Sep 2006 06:44:32 -0000 1.4 +++ lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java 30 Oct 2006 04:09:17 -0000 1.5 @@ -242,7 +242,7 @@ String retVal="0"; String newName=""; - if(!commandStr.equals("FileUpload")) + if(!commandStr.equals("FileUpload") || !isEnabled(currentFolderStr)) retVal="203"; else { DiskFileUpload upload = new DiskFileUpload(); @@ -355,6 +355,13 @@ private String getExtension(String fileName) { return fileName.substring(fileName.lastIndexOf(".")+1); } + + private boolean isEnabled(String contentID) { + if(contentID.equals("/-1/")) + return false; + else + return true; + } } Index: lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java,v diff -u -r1.4 -r1.5 --- lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java 11 Sep 2006 06:44:32 -0000 1.4 +++ lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java 30 Oct 2006 04:09:17 -0000 1.5 @@ -140,10 +140,25 @@ response.setHeader("Cache-Control","no-cache"); PrintWriter out = response.getWriter(); - + String retVal="0"; + String newName=""; + String fileUrl=""; + String errorMessage=""; + String typeStr=request.getParameter("Type"); String currentFolderStr=request.getParameter("CurrentFolder"); + if(!isEnabled(currentFolderStr)) { + retVal="203"; + out.println(""); + out.flush(); + out.close(); + return; + } + + //String currentPath=baseDir+typeStr; //String currentDirPath=getServletContext().getRealPath(currentPath); //currentPath=request.getContextPath()+currentPath; @@ -169,11 +184,6 @@ if (debug) System.out.println(currentDirPath); - String retVal="0"; - String newName=""; - String fileUrl=""; - String errorMessage=""; - if(enabled) { DiskFileUpload upload = new DiskFileUpload(); try { @@ -298,6 +308,13 @@ return false; } + + private boolean isEnabled(String contentID) { + if(contentID.equals("/-1/")) + return false; + else + return true; + } }