Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ConfigurationHandler.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ConfigurationHandler.java	(revision 1490)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ConfigurationHandler.java	(revision 1491)
@@ -65,4 +65,11 @@
 	private static String fckEditorToolbarSet;
 	private static boolean forceSingleExtension;
+	
+	public static final String PROPERTY_MESSAGE_COMPATIBLE_BROWSER = "message.enabled_tag.compatible_browser.yes";
+	public static final String PROPERTY_MESSAGE_NOT_COMPATIBLE_BROWSER = "message.enabled_tag.compatible_browser.no";
+	public static final String PROPERTY_MESSAGE_FILE_UPLOAD_ENABLED = "message.enabled_tag.connector.file_upload.enabled";
+	public static final String PROPERTY_MESSAGE_FILE_UPLOAD_DISABLED = "message.enabled_tag.connector.file_upload.disalbed";
+	public static final String PROPERTY_MESSAGE_FILE_BROWSING_ENABLED = "message.enabled_tag.connector.file_browsing.enabled";
+	public static final String PROPERTY_MESSAGE_FILE_BROWSING_DISABLED = "message.enabled_tag.connector.file_browsing.disabled";
 
 	static {
Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tags/EnabledTag.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tags/EnabledTag.java	(revision 1491)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tags/EnabledTag.java	(revision 1491)
@@ -0,0 +1,84 @@
+package net.fckeditor.tags;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import net.fckeditor.handlers.ConfigurationHandler;
+import net.fckeditor.tool.Compatibility;
+
+public class EnabledTag extends TagSupport {
+
+	private static final long serialVersionUID = -6834095891675681686L;
+
+	private static final String FILE_UPLOAD = "FileUpload";
+	private static final String FILE_BROWSING = "FileBrowsing";
+	private static final String COMPATIBLE_BROWSER = "CompatibleBrowser";
+	private static Set<String> commands = new HashSet<String>(3);
+
+	static {
+		commands.add(FILE_UPLOAD);
+		commands.add(FILE_BROWSING);
+		commands.add(COMPATIBLE_BROWSER);
+	}
+
+	private String command;
+
+	public void setCommand(String command) throws JspTagException {
+		if (!commands.contains(command))
+			throw new JspTagException(
+					"You have to provide one of the following commands: "
+							+ commands);
+		this.command = command;
+	}
+
+	@Override
+	public int doStartTag() throws JspException {
+		JspWriter out = pageContext.getOut();
+
+		HttpServletRequest request = (HttpServletRequest) pageContext
+				.getRequest();
+		String response = new String();
+
+		if (command.equals(FILE_UPLOAD)) {
+			if (ConfigurationHandler.isEnabledForFileUpload(request))
+				response = ConfigurationHandler
+						.getDefaultProperty(ConfigurationHandler.PROPERTY_MESSAGE_FILE_UPLOAD_ENABLED);
+			else
+				response = ConfigurationHandler
+						.getDefaultProperty(ConfigurationHandler.PROPERTY_MESSAGE_FILE_UPLOAD_DISABLED);
+		}
+
+		if (command.equals(FILE_BROWSING)) {
+			if (ConfigurationHandler.isEnabledForFileBrowsing(request))
+				response = ConfigurationHandler
+						.getDefaultProperty(ConfigurationHandler.PROPERTY_MESSAGE_FILE_BROWSING_ENABLED);
+			else
+				response = ConfigurationHandler
+						.getDefaultProperty(ConfigurationHandler.PROPERTY_MESSAGE_FILE_BROWSING_DISABLED);
+		}
+		if (command.equals(COMPATIBLE_BROWSER)) {
+			if (Compatibility.isCompatibleBrowser(request))
+				response = ConfigurationHandler
+						.getDefaultProperty(ConfigurationHandler.PROPERTY_MESSAGE_COMPATIBLE_BROWSER);
+			else
+				response = ConfigurationHandler
+						.getDefaultProperty(ConfigurationHandler.PROPERTY_MESSAGE_NOT_COMPATIBLE_BROWSER);
+		}
+
+		try {
+			out.print(response);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+
+		return SKIP_BODY;
+	}
+
+}
Index: /FCKeditor.Java/branches/2.4/src/main/resources/META-INF/FCKeditor.tld
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/resources/META-INF/FCKeditor.tld	(revision 1490)
+++ /FCKeditor.Java/branches/2.4/src/main/resources/META-INF/FCKeditor.tld	(revision 1491)
@@ -29,5 +29,5 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
-			<attribute>
+		<attribute>
 			<name>basePath</name>
 			<rtexprvalue>true</rtexprvalue>
@@ -47,8 +47,17 @@
 			<required>yes</required>
 		</attribute>
-			<attribute>
+		<attribute>
 			<name>value</name>
 			<required>yes</required>
 		</attribute>
 	</tag>
+	<tag>
+		<name>enabled</name>
+		<tag-class>net.fckeditor.tags.EnabledTag</tag-class>
+		<body-content>empty</body-content>
+		<attribute>
+			<name>command</name>
+			<required>yes</required>
+		</attribute>
+	</tag>
 </taglib>
Index: /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample01.jsp
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample01.jsp	(revision 1490)
+++ /FCKeditor.Java/branches/2.4/src/main/webapp/jsp/sample01.jsp	(revision 1491)
@@ -2,4 +2,5 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 	pageEncoding="UTF-8" import="net.fckeditor.*" %>
+<%@ taglib uri="http://www.fckeditor.net/tags" prefix="FCK" %>
 <%--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
@@ -45,5 +46,7 @@
 		<p>Basic FCKeditor informations:</p>
 		<ul>
-			<li>Browser is compatible: <%out.print(fckEditor.isCompatibleBrowser());%></li>
+			<li><FCK:enabled command="CompatibleBrowser" /></li>
+			<li><FCK:enabled command="FileBrowsing" /></li>
+			<li><FCK:enabled command="FileUpload" /></li>
 		</ul>
 		<hr />