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 1631)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ConnectorHandler.java	(revision 1632)
@@ -68,3 +68,12 @@
 		return PropertiesLoader.getProperty("connector.userFilesPath");
 	}
+	
+	/**
+	 * Getter for the value to instruct the Connector to check, if the uploaded image is really one.
+	 * 
+	 * @return
+	 */
+	public static boolean isSecureImageUploads() {
+		return Boolean.valueOf(PropertiesLoader.getProperty("connector.secureImageUploads"));
+	}
 }
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 1631)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tool/Utils.java	(revision 1632)
@@ -21,4 +21,5 @@
 package net.fckeditor.tool;
 
+import java.io.InputStream;
 import java.util.HashSet;
 import java.util.Set;
@@ -30,4 +31,5 @@
 
 import org.apache.commons.io.FilenameUtils;
+import org.devlib.schmidt.imageinfo.ImageInfo;
 
 /**
@@ -190,5 +192,10 @@
 		else
 			return request.getContextPath() + url;
-
+	}
+	
+	public static boolean isImage(final InputStream in) {
+		ImageInfo ii = new ImageInfo();
+		ii.setInput(in);
+		return ii.check();
 	}
 }
Index: /FCKeditor.Java/branches/2.4/src/main/resources/net/fckeditor/handlers/default.properties
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/resources/net/fckeditor/handlers/default.properties	(revision 1631)
+++ /FCKeditor.Java/branches/2.4/src/main/resources/net/fckeditor/handlers/default.properties	(revision 1632)
@@ -46,4 +46,7 @@
 connector.fullUrl = false
 
+# Instructs the Connector to check, if the uploaded image is really one
+connector.secureImageUploads = true
+
 # directory of the editor relative to the context root
 fckeditor.basePath = /fckeditor