Changeset 1699

Timestamp:

2008-03-15 17:23:28 (8 months ago)

Author:

mosipov

Message:

CLOSED - #2007: Rework response url handling

Location:

FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor

Files:

• connector/ConnectorServlet.java (modified) (5 diffs)
• response/XmlResponse.java (modified) (3 diffs)
• tool/Utils.java (modified) (2 diffs)

FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java

@@ -129 +129 @@
                                         .getDefaultResourceType(typeStr);
 
-                        String typePath = constructResourceTypeUrl(resourceType, request);
+                        String typePath = Utils.constructResponseUrl(request, resourceType, 
+                                        currentFolderStr, false, false);
                         String typeDirPath = getServletContext().getRealPath(typePath);
-                        String currentPath = typePath + currentFolderStr;
 
                         File typeDir = new File(typeDirPath);
@@ -143 +143 @@
 
                                 xr = new XmlResponse(command, resourceType, currentFolderStr,
-                                                currentPath, request);
+                                                Utils.constructResponseUrl(request, resourceType, 
+                                                                currentFolderStr, true, 
+                                                                ConnectorHandler.isFullUrl()));
 
                                 if (command.equals(CommandHandler.GET_FOLDERS))
@@ -228 +230 @@
                         ResourceTypeHandler resourceType = ResourceTypeHandler.getDefaultResourceType(typeStr);
                         
-                        String typePath = constructResourceTypeUrl(resourceType, request);
+                        String typePath = Utils.constructResponseUrl(request, resourceType, 
+                                        currentFolderStr, false, false);
                         String typeDirPath = getServletContext().getRealPath(typePath);
-                        String currentPath = typePath + currentFolderStr;
 
                         File typeDir = new File(typeDirPath);
@@ -273 +275 @@
                                                 if (Utils.isEmpty(newFilename))
                                                         ur = new UploadResponse(UploadResponse.EN_OK, Utils
-                                                                        .constructServerAddress(request,
-                                                                                        currentPath).concat(filename));
+                                                                        .constructResponseUrl(request,
+                                                                                        resourceType, currentFolderStr,
+                                                                                        true, ConnectorHandler.isFullUrl())
+                                                                        .concat(filename));
                                                 else
                                                         ur = new UploadResponse(UploadResponse.EN_RENAMED,
-                                                                        Utils.constructServerAddress(request,
-                                                                                        currentPath).concat(newFilename),
-                                                                        newFilename);
+                                                                        Utils.constructResponseUrl(request,
+                                                                                        resourceType, currentFolderStr,
+                                                                                        true, ConnectorHandler.isFullUrl())
+                                                                                        .concat(newFilename), newFilename);
 
                                                 // secure image check
@@ -309 +314 @@
         }
 
-        private String constructResponseUrl(final ResourceTypeHandler fileType,
-                final String currentFolderString, final HttpServletRequest request) {
-                StringBuffer sb = new StringBuffer();
-                sb.append(ConnectorHandler.getUserFilesPath(request));
-                sb.append(fileType.getPath());
-                if (Utils.isNotEmpty(currentFolderString))
-                        sb.append(currentFolderString);
-                return Utils.replaceAll(sb.toString(), "//", "/");
-        }
-        
-        /**
-         * TODO document me!
-         * @param resourceType
-         * @param request
-         * @return
-         */
-        private String constructResourceTypeUrl(final ResourceTypeHandler resourceType,
-                        final HttpServletRequest request) {
-                return constructResponseUrl(resourceType, null, request);
-        }
-
 }

FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/response/XmlResponse.java

@@ -25 +25 @@
 import java.io.StringWriter;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -78 +77 @@
 
         /**
+         * 
          * @param command
-         *            file browser
+         * @param resourceType
+         * @param currentFolder
          * @param constructedUrl
-         *            TODO
          */
-        public XmlResponse(CommandHandler command, ResourceTypeHandler type, String currentFolder,
-                        String constructedUrl, HttpServletRequest request) {
+        public XmlResponse(CommandHandler command, ResourceTypeHandler resourceType, 
+                        String currentFolder, String constructedUrl) {
 
                 try {
@@ -98 +98 @@
                 document.appendChild(root);
                 root.setAttribute("command", command.toString());
-                root.setAttribute("resourceType", type.toString());
+                root.setAttribute("resourceType", resourceType.toString());
 
                 Element currentFolderElement = document.createElement("CurrentFolder");
                 currentFolderElement.setAttribute("path", currentFolder);
 
-                currentFolderElement.setAttribute("url", Utils.constructServerAddress(
-                                request, constructedUrl));
+                currentFolderElement.setAttribute("url", constructedUrl);
                 root.appendChild(currentFolderElement);
 

FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tool/Utils.java

@@ -28 +28 @@
 
 import net.fckeditor.handlers.ConnectorHandler;
+import net.fckeditor.handlers.ResourceTypeHandler;
 
 
@@ -146 +147 @@
                 else
                         return request.getContextPath() + url;
-        }       
+        }
+        
+        /**
+         * 
+         * @param request
+         * @param resourceType
+         * @param urlPath TODO
+         * @param prependContextPath
+         * @param fullUrl
+         * @return
+         */
+        public static String constructResponseUrl(HttpServletRequest request,
+                        ResourceTypeHandler resourceType, String urlPath,
+                        boolean prependContextPath, boolean fullUrl) {
+                        
+                StringBuffer sb = new StringBuffer();
+                
+                if (fullUrl) {
+                        String address = request.getRequestURL().toString();
+                        sb.append(address.substring(0, address.indexOf('/', 8))
+                                        + request.getContextPath());
+                }
+                
+                if (prependContextPath && !fullUrl)
+                        sb.append(request.getContextPath());
+                
+                sb.append(ConnectorHandler.getUserFilesPath(request));
+                sb.append(resourceType.getPath());
+                
+                if (isNotEmpty(urlPath))
+                        sb.append(urlPath);
+                
+                return sb.toString();
+        }
+        
+        public static String constructResponseUrl(HttpServletRequest request,
+                        ResourceTypeHandler resourceType, boolean prependContextPath, 
+                        boolean fullUrl) {
+                return constructResponseUrl(request, resourceType, null, 
+                                prependContextPath, fullUrl);
+        }
 }