Index: lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java =================================================================== diff -u -r2e4e96faf6744c4567822df3d80485975e792691 -r783b49b1837120fb31aa8e03b9e51a7cecf0224c --- lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java (.../LAMSConnectorServlet.java) (revision 2e4e96faf6744c4567822df3d80485975e792691) +++ lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java (.../LAMSConnectorServlet.java) (revision 783b49b1837120fb31aa8e03b9e51a7cecf0224c) @@ -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 =================================================================== diff -u -r2e4e96faf6744c4567822df3d80485975e792691 -r783b49b1837120fb31aa8e03b9e51a7cecf0224c --- lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java (.../LAMSUploadServlet.java) (revision 2e4e96faf6744c4567822df3d80485975e792691) +++ lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java (.../LAMSUploadServlet.java) (revision 783b49b1837120fb31aa8e03b9e51a7cecf0224c) @@ -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; + } }