File Upload

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.9.4.2 -r1.9.4.2.4.1 --- lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java 30 Apr 2009 02:54:04 -0000 1.9.4.2 +++ lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java 8 Nov 2010 20:30:40 -0000 1.9.4.2.4.1 @@ -145,6 +145,7 @@ String currentFolderStr=request.getParameter("CurrentFolder"); String designFolder=request.getParameter("DesignFolder"); + currentFolderStr = new String(currentFolderStr.getBytes("ISO-8859-1"), "UTF-8"); // create content directory if non-existant String currentDirPath=realBaseDir + designFolder + typeStr +"/" + currentFolderStr; String validCurrentDirPath = currentDirPath.replace('/', File.separatorChar); @@ -179,6 +180,7 @@ } else if (commandStr.equals("CreateFolder")) { String newFolderStr=request.getParameter("NewFolderName"); + newFolderStr = new String(newFolderStr.getBytes("ISO-8859-1"), "UTF-8"); File newFolder=new File(currentDir,newFolderStr); String retValue="110"; @@ -200,12 +202,14 @@ setCreateFolderResponse(retValue,root,document); } else if (commandStr.equals("DeleteFile")) { String fileName=request.getParameter("fileName"); + fileName = new String(fileName.getBytes("ISO-8859-1"), "UTF-8"); File fileToDelete = new File(currentDir,fileName); if(fileToDelete.isFile()) fileToDelete.delete(); } else if(commandStr.equals("DeleteFolder")) { String folderName=request.getParameter("folderName"); + folderName = new String(folderName.getBytes("ISO-8859-1"), "UTF-8"); File folderToDelete = new File(currentDir,folderName); if(folderToDelete.isDirectory()) folderToDelete.delete(); @@ -261,6 +265,7 @@ String currentFolderStr=request.getParameter("CurrentFolder"); String designFolder=request.getParameter("DesignFolder"); + currentFolderStr = new String(currentFolderStr.getBytes("ISO-8859-1"), "UTF-8"); String currentDirPath=realBaseDir + designFolder + typeStr +"/" + currentFolderStr; String validCurrentDirPath = currentDirPath.replace("/", File.separator); @@ -320,6 +325,8 @@ FileItem uplFile = (FileItem)fields.get("NewFile"); String fileNameLong = uplFile.getName(); + //decode fileName using UTF-8 + fileNameLong = new String(fileNameLong.getBytes(), "UTF-8"); fileNameLong = fileNameLong.replace('\\','/'); String[] pathParts = fileNameLong.split("/"); String fileName = pathParts[pathParts.length-1]; Index: lams_central/web/fckeditor/editor/filemanager/browser/default/frmupload.html =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/fckeditor/editor/filemanager/browser/default/Attic/frmupload.html,v diff -u -r1.6 -r1.6.10.1 --- lams_central/web/fckeditor/editor/filemanager/browser/default/frmupload.html 9 Jan 2008 05:40:11 -0000 1.6 +++ lams_central/web/fckeditor/editor/filemanager/browser/default/frmupload.html 8 Nov 2010 20:30:40 -0000 1.6.10.1 @@ -1,115 +1,116 @@ - - - - - File Upload - - - + - - - - - + + document.getElementById('frmUpload').action = sUrl ; +} + +function OnSubmit() +{ + if ( document.getElementById('NewFile').value.length == 0 ) + { + alert( 'Please select a file from your computer' ) ; + return false ; + } + + // Set the interface elements. + document.getElementById('eUploadMessage').innerHTML = 'Upload a new file in this folder (Upload in progress, please wait...)' ; + document.getElementById('btnUpload').disabled = true ; + + return true ; +} + +function OnUploadCompleted( errorNumber, data ) +{ + // Reset the Upload Worker Frame. + window.parent.frames['frmUploadWorker'].location = 'javascript:void(0)' ; + + // Reset the upload form (On IE we must do a little trick to avoid problems). + if ( document.all ) + document.getElementById('NewFile').outerHTML = '' ; + else + document.getElementById('frmUpload').reset() ; + + // Reset the interface elements. + document.getElementById('eUploadMessage').innerHTML = 'Upload a new file in this folder' ; + document.getElementById('btnUpload').disabled = false ; + + switch ( errorNumber ) + { + case 0 : + window.parent.frames['frmResourcesList'].Refresh() ; + break ; + case 1 : // Custom error. + alert( data ) ; + break ; + case 201 : + window.parent.frames['frmResourcesList'].Refresh() ; + alert( 'A file with the same name is already available. The uploaded file has been renamed to "' + data + '"' ) ; + break ; + case 202 : + alert( 'Invalid file' ) ; + break ; + default : + alert( 'Error on file upload. Error number: ' + errorNumber ) ; + break ; + } +} + +window.onload = function() +{ + window.top.IsLoadedUpload = true ; +} + + + + + +