Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java	(revision 1606)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java	(revision 1607)
@@ -37,5 +37,5 @@
 
 import net.fckeditor.handlers.ExtensionsHandler;
-import net.fckeditor.handlers.FCKEditorHandler;
+import net.fckeditor.handlers.ConnectorHandler;
 import net.fckeditor.handlers.ResourceTypeHandler;
 import net.fckeditor.handlers.SessionDataHandler;
@@ -82,5 +82,5 @@
 		// check, if 'baseDir' exists
 		String realDefaultUserFilesPath = getServletContext().getRealPath(
-		        FCKEditorHandler.getDefaultUserFilesPath());
+		        ConnectorHandler.getDefaultUserFilesPath());
 		
 		File defaultUserFilesDir = new File(realDefaultUserFilesPath);
@@ -256,5 +256,5 @@
 					else {
 
-						if (FCKEditorHandler.isForceSingleExtension()) {
+						if (ConnectorHandler.isForceSingleExtension()) {
 							filename = forceSingleExtension(filename);
 							baseName = FilenameUtils.removeExtension(filename);
@@ -298,5 +298,5 @@
 			final String currentFolderString, final HttpServletRequest request) {
 		StringBuffer sb = new StringBuffer();
-		sb.append(FCKEditorHandler.getUserFilesPath(request));
+		sb.append(ConnectorHandler.getUserFilesPath(request));
 		sb.append(fileType.getPath());
 		sb.append(currentFolderString);
Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ConnectorHandler.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ConnectorHandler.java	(revision 1607)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ConnectorHandler.java	(revision 1607)
@@ -0,0 +1,70 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * 
+ * == BEGIN LICENSE ==
+ * 
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ * 
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ * 
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ * 
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ * 
+ * == END LICENSE ==
+ */
+package net.fckeditor.handlers;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Handeler for some base properties.
+ * 
+ * @version $Id$
+ */
+public class ConnectorHandler {
+
+	/**
+     * Getter for the base dir (using for user files).
+     * 
+     * @return {@link SessionData#getUserFilesPath(HttpServletRequest)} or the default base dir, if
+     *         {@link SessionData}} isn't set.
+     */
+    public static String getUserFilesPath(final HttpServletRequest servletRequest) {
+    	String userFilePath = SessionDataHandler.getUserFilePath(servletRequest);
+    	return (userFilePath != null) ? userFilePath : getDefaultUserFilesPath();
+    }
+
+	/**
+	 * Getter for the default handling of single extensions.
+	 * 
+	 * @return the forceSingleExtension
+	 */
+	public static boolean isForceSingleExtension() {
+		return Boolean.valueOf(PropertiesLoader.getProperty("connector.forceSingleExtension"));
+	}
+
+	/**
+	 * Getter for the value to instruct the connector to return the full URL of a file/folder in the
+	 * XML response rather than the absolute URL.
+	 * 
+	 * @return
+	 */
+	public static boolean isFullUrl() {
+		return Boolean.valueOf(PropertiesLoader.getProperty("connector.fullUrl"));
+	}
+
+	/**
+	 * Getter for the default userFilesPath.
+	 * 
+	 * @return Default userfiles path (/userfiles)
+	 */
+	public static String getDefaultUserFilesPath() {
+		return PropertiesLoader.getProperty("connector.userFilesPath");
+	}
+}
Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tool/Utils.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tool/Utils.java	(revision 1606)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tool/Utils.java	(revision 1607)
@@ -27,5 +27,5 @@
 import javax.servlet.http.HttpServletRequest;
 
-import net.fckeditor.handlers.FCKEditorHandler;
+import net.fckeditor.handlers.ConnectorHandler;
 
 import org.apache.commons.io.FilenameUtils;
@@ -185,5 +185,5 @@
 		String address = request.getRequestURL().toString();
 
-		if (FCKEditorHandler.isFullUrl())
+		if (ConnectorHandler.isFullUrl())
 			return address.substring(0, address.indexOf('/', 8))
 					+ request.getContextPath() + url;