Index: /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/Dispatcher.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/Dispatcher.java	(revision 2427)
+++ /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/Dispatcher.java	(revision 2428)
@@ -92,12 +92,6 @@
 		
 		GetResponse getResponse;
-		// check permissions for user actions !!!
-		if (!RequestCycleHandler.isEnabledForFileBrowsing())
-			getResponse = GetResponse.getErrorFileBrowsingDisabled();
-		else if (!RequestCycleHandler.isEnabledForFolderCreation())
-			getResponse = GetResponse.getErrorFolderCreationDisabled();
-		
 		// check parameters
-		else if (!CommandHandler.isValidForGet(commandStr))
+		if (!CommandHandler.isValidForGet(commandStr))
 			getResponse = GetResponse.getErrorInvalidCommand();
 		else if (!ResourceType.isValid(typeStr))
@@ -107,8 +101,16 @@
 		else {
 			
-			// call the right Connector method depending on the command
 			ResourceType type = ResourceType.getDefaultResourceType(typeStr);
 			CommandHandler command = CommandHandler.getCommand(commandStr);
-			if (command.equals(CommandHandler.GET_FOLDERS))
+			
+			// check permissions for user action
+			if ((command.equals(CommandHandler.GET_FOLDERS) || command.equals(CommandHandler.GET_FOLDERS_AND_FILES))
+					&& !RequestCycleHandler.isEnabledForFileBrowsing())
+				getResponse = GetResponse.getErrorFileBrowsingDisabled();
+			else if (command.equals(CommandHandler.CREATE_FOLDER) && !RequestCycleHandler.isEnabledForFolderCreation())
+				getResponse = GetResponse.getErrorFolderCreationDisabled();
+
+			// call the right Connector method depending on the command
+			else if (command.equals(CommandHandler.GET_FOLDERS))
 				getResponse = connector.getFolders(type, currentFolderStr);
 			else if (command.equals(CommandHandler.GET_FOLDERS_AND_FILES))