+ * + * This servlet accepts 4 commands which interact with the server-side + * filesystem.
+ * The allowed commands are: + *
-
+ *
GetFolders: Retrieves a list of folders in the current + * folder
+ * GetFoldersAndFiles: Retrives a list of files and folders + * in the current folder
+ * CreateFolder: Creates a new folder in the current folder
+ * FileUpload: Stores an uploaded file into the current + * folder. (must be sent with POST)
+ *
mkdir <DefaultUserFilesPath>
+ */
+ public void init() throws ServletException, IllegalArgumentException {
+ String realDefaultUserFilesPath = getServletContext().getRealPath(
+ ConnectorHandler.getDefaultUserFilesPath());
+
+ File defaultUserFilesDir = new File(realDefaultUserFilesPath);
+ UtilsFile.checkDirAndCreate(defaultUserFilesDir);
+
+ logger.info("ConnectorServlet successfully initialized!");
+ }
+
+ /**
+ * Manage the GET requests (GetFolders,
+ * GetFoldersAndFiles, CreateFolder).+ * + * The servlet accepts commands sent in the following format:
+ *
connector?Command=<CommandName>&Type=<ResourceType>&CurrentFolder=<FolderPath>
+ * + * It executes the commands and then returns the result to the client in XML + * format. + *
+ */ + public void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + logger.debug("Entering ConnectorServlet#doGet"); + + response.setCharacterEncoding("UTF-8"); + response.setContentType("application/xml; charset=UTF-8"); + response.setHeader("Cache-Control", "no-cache"); + PrintWriter out = response.getWriter(); + + String commandStr = request.getParameter("Command"); + String typeStr = request.getParameter("Type"); + String currentFolderStr = request.getParameter("CurrentFolder"); + + logger.debug("Parameter Command: {}", commandStr); + logger.debug("Parameter Type: {}", typeStr); + logger.debug("Parameter CurrentFolder: {}", currentFolderStr); + + XmlResponse xr; + + if (!RequestCycleHandler.isEnabledForFileBrowsing(request)) + xr = new XmlResponse(XmlResponse.EN_ERROR, Messages.NOT_AUTHORIZED_FOR_BROWSING); + else if (!CommandHandler.isValidForGet(commandStr)) + xr = new XmlResponse(XmlResponse.EN_ERROR, Messages.INVALID_COMMAND); + else if (typeStr != null && !ResourceTypeHandler.isValid(typeStr)) + xr = new XmlResponse(XmlResponse.EN_ERROR, Messages.INVALID_TYPE); + else if (!UtilsFile.isValidPath(currentFolderStr)) + xr = new XmlResponse(XmlResponse.EN_ERROR, Messages.INVALID_CURRENT_FOLDER); + else { + CommandHandler command = CommandHandler.getCommand(commandStr); + ResourceTypeHandler resourceType = ResourceTypeHandler.getDefaultResourceType(typeStr); + + String typePath = UtilsFile.constructServerSidePath(request, resourceType); + String typeDirPath = getServletContext().getRealPath(typePath); + + File typeDir = new File(typeDirPath); + UtilsFile.checkDirAndCreate(typeDir); + + File currentDir = new File(typeDir, currentFolderStr); + + if (!currentDir.exists()) + xr = new XmlResponse(XmlResponse.EN_INVALID_FOLDER_NAME); + else { + + xr = new XmlResponse(command, resourceType, currentFolderStr, UtilsResponse + .constructResponseUrl(request, resourceType, currentFolderStr, true, + ConnectorHandler.isFullUrl())); + + if (command.equals(CommandHandler.GET_FOLDERS)) + xr.setFolders(currentDir); + else if (command.equals(CommandHandler.GET_FOLDERS_AND_FILES)) + xr.setFoldersAndFiles(currentDir); + else if (command.equals(CommandHandler.CREATE_FOLDER)) { + String newFolderStr = UtilsFile.sanitizeFolderName(request + .getParameter("NewFolderName")); + logger.debug("Parameter NewFolderName: {}", newFolderStr); + + File newFolder = new File(currentDir, newFolderStr); + int errorNumber = XmlResponse.EN_UKNOWN; + + if (newFolder.exists()) + errorNumber = XmlResponse.EN_ALREADY_EXISTS; + else { + try { + errorNumber = (newFolder.mkdir()) ? XmlResponse.EN_OK + : XmlResponse.EN_INVALID_FOLDER_NAME; + } catch (SecurityException e) { + errorNumber = XmlResponse.EN_SECURITY_ERROR; + } + } + xr.setError(errorNumber); + } + } + } + + out.print(xr); + out.flush(); + out.close(); + logger.debug("Exiting ConnectorServlet#doGet"); + } + + /** + * Manage thePOST requests (FileUpload).+ * + * The servlet accepts commands sent in the following format:
+ *
connector?Command=<FileUpload>&Type=<ResourceType>&CurrentFolder=<FolderPath>
+ * with the file in the POST body.+ *
+ * It stores an uploaded file (renames a file if another exists with the + * same name) and then returns the JavaScript callback. + */ + @SuppressWarnings("unchecked") + public void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + logger.debug("Entering Connector#doPost"); + + response.setCharacterEncoding("UTF-8"); + response.setContentType("text/html; charset=UTF-8"); + response.setHeader("Cache-Control", "no-cache"); + PrintWriter out = response.getWriter(); + + String commandStr = request.getParameter("Command"); + String typeStr = request.getParameter("Type"); + String currentFolderStr = request.getParameter("CurrentFolder"); + + logger.debug("Parameter Command: {}", commandStr); + logger.debug("Parameter Type: {}", typeStr); + logger.debug("Parameter CurrentFolder: {}", currentFolderStr); + + UploadResponse ur; + + // if this is a QuickUpload request, 'commandStr' and 'currentFolderStr' + // are empty + if (Utils.isEmpty(commandStr) && Utils.isEmpty(currentFolderStr)) { + commandStr = "QuickUpload"; + currentFolderStr = "/"; + } + + if (!RequestCycleHandler.isEnabledForFileUpload(request)) + ur = new UploadResponse(UploadResponse.SC_SECURITY_ERROR, null, null, + Messages.NOT_AUTHORIZED_FOR_UPLOAD); + else if (!CommandHandler.isValidForPost(commandStr)) + ur = new UploadResponse(UploadResponse.SC_ERROR, null, null, Messages.INVALID_COMMAND); + else if (typeStr != null && !ResourceTypeHandler.isValid(typeStr)) + ur = new UploadResponse(UploadResponse.SC_ERROR, null, null, Messages.INVALID_TYPE); + else if (!UtilsFile.isValidPath(currentFolderStr)) + ur = UploadResponse.UR_INVALID_CURRENT_FOLDER; + else { + ResourceTypeHandler resourceType = ResourceTypeHandler.getDefaultResourceType(typeStr); + + String typePath = UtilsFile.constructServerSidePath(request, resourceType); + String typeDirPath = getServletContext().getRealPath(typePath); + + File typeDir = new File(typeDirPath); + UtilsFile.checkDirAndCreate(typeDir); + + File currentDir = new File(typeDir, currentFolderStr); + + if (!currentDir.exists()) + ur = UploadResponse.UR_INVALID_CURRENT_FOLDER; + else { + + String newFilename = null; + FileItemFactory factory = new DiskFileItemFactory(); + ServletFileUpload upload = new ServletFileUpload(factory); + + try { + + List
GET and POST commands.
+ *
+ * @version $Id$
+ */
+public class CommandHandler {
+
+ private String name;
+ private static Mapnull, empty, or does not exist.
+ */
+ public static CommandHandler valueOf(final String name) throws IllegalArgumentException {
+ if (Utils.isEmpty(name))
+ throw new IllegalArgumentException();
+
+ if (!isValidForGet(name) && !isValidForPost(name))
+ throw new IllegalArgumentException();
+ return (getCommands.get(name) != null) ? getCommands.get(name) : postCommands.get(name);
+ }
+
+
+ /**
+ * Checks if a specfied string represents a valid GET
+ * command.
+ *
+ * @param name
+ * A command string to check
+ * @return true if the string representation is valid else
+ * false.
+ */
+ public static boolean isValidForGet(final String name) {
+ return getCommands.containsKey(name);
+ }
+
+ /**
+ * Checks if a specfied string represents a valid POST
+ * command.
+ *
+ * @param name
+ * A command string to check
+ * @return true if the string representation is valid else
+ * false.
+ */
+ public static boolean isValidForPost(final String name) {
+ return postCommands.containsKey(name);
+ }
+
+
+ /**
+ * A wrapper for {@link #valueOf(String)}. It returns null instead of
+ * throwing an exception.
+ *
+ * @param name A command string to check
+ * @return A {@link CommandHandler} object holding the value represented by
+ * the string argument, or null.
+ */
+ public static CommandHandler getCommand(final String name) {
+ try {
+ return CommandHandler.valueOf(name);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null)
+ return false;
+ try {
+ CommandHandler rt = (CommandHandler) obj;
+ return name.equals(rt.getName());
+ } catch (ClassCastException e) {
+ return false;
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public int hashCode() {
+ return name.hashCode();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return name;
+ }
+}
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/handlers/ConnectorHandler.java
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/handlers/ConnectorHandler.java (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/handlers/ConnectorHandler.java (revision 3884)
@@ -0,0 +1,87 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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;
+
+import net.fckeditor.requestcycle.UserPathBuilder;
+
+/**
+ * Handler for Connector-related properties.+ * Wraps to the {@link PropertiesLoader}. + * + * @version $Id$ + */ +public class ConnectorHandler { + + /** + * Getter for the
UserFilesPath.
+ *
+ * @return {@link UserPathBuilder#getUserFilesPath(HttpServletRequest)} or
+ * the DefaultUserFilePath if {@link UserPathBuilder}
+ * isn't set.
+ */
+ public static String getUserFilesPath(final HttpServletRequest request) {
+ String userFilePath = RequestCycleHandler.getUserFilePath(request);
+ return (userFilePath != null) ? userFilePath : getDefaultUserFilesPath();
+ }
+
+ /**
+ * Getter for the default handling of files with multiple extensions.
+ *
+ * @return true if single extension only should be enforced
+ * else false.
+ */
+ 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 true if the property connector.fullUrl is
+ * set else false.
+ */
+ public static boolean isFullUrl() {
+ return Boolean.valueOf(PropertiesLoader.getProperty("connector.fullUrl"));
+ }
+
+ /**
+ * Getter for the default UserFilesPath.
+ *
+ * @return DefaultUserFilesPath (/userfiles)
+ */
+ public static String getDefaultUserFilesPath() {
+ return PropertiesLoader.getProperty("connector.userFilesPath");
+ }
+
+ /**
+ * Getter for the value to instruct the Connector to check if the uploaded
+ * image is really an image.
+ *
+ * @return Boolean value of the property
+ * connector.secureImageUploads.
+ */
+ public static boolean isSecureImageUploads() {
+ return Boolean.valueOf(PropertiesLoader.getProperty("connector.secureImageUploads"));
+ }
+}
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/handlers/ExtensionsHandler.java
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/handlers/ExtensionsHandler.java (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/handlers/ExtensionsHandler.java (revision 3884)
@@ -0,0 +1,148 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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 java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import net.fckeditor.tool.Utils;
+
+/**
+ * This handler manages the allowed and denied extensions for each resource
+ * type. The extensions are preset by the properties managed by
+ * {@link PropertiesLoader}.
+ * + * Hint: It's recommend to use either allowed or denied extensions for one file + * type. Never use both at the same time! That's why denied + * extensions of a file type will be deleted if you set the allowed one and vice + * versa. + *
+ * + * @version $Id$ + */ +public class ExtensionsHandler { + + private static Map+ * If
extensionsList is null, allowed
+ * extensions are kept untouched.
+ *
+ * @param type
+ * The file type.
+ * @param extensionsList
+ * Required format: ext1|ext2|ext3
+ */
+ public static void setExtensionsAllowed(final ResourceTypeHandler type, final String extensionsList) {
+ if (extensionsList != null) {
+ extensionsAllowed.put(type, Utils.getSet(extensionsList));
+ extensionsDenied.get(type).clear();
+ }
+ }
+
+ /**
+ * Getter for the denied extensions of a file type.
+ *
+ * @param type
+ * The file type.
+ * @return Set of denied extensions or an empty set.
+ */
+ public static Set+ * If
extensionsList is null, denied
+ * extensions are kept untouched.
+ *
+ * @param type
+ * The file type.
+ * @param extensionsList
+ * Required format: ext1|ext2|ext3
+ */
+ public static void setExtensionsDenied(final ResourceTypeHandler type, final String extensionsList) {
+ if (extensionsList != null) {
+ extensionsDenied.put(type, Utils.getSet(extensionsList));
+ extensionsAllowed.get(type).clear();
+ }
+ }
+
+ /**
+ * Checks if an extension is allowed for a file type.
+ *
+ * @param type
+ * The resource type you want to check.
+ * @param extension
+ * The extension you want to check.
+ * @return true is extension is allowed else
+ * false. Attention: false
+ * is always returned if 'type' or 'extensions' is null.
+ */
+ public static boolean isAllowed(final ResourceTypeHandler type, final String extension) {
+ if (type == null || extension == null)
+ return false;
+ String ext = extension.toLowerCase();
+ Set/net/fckeditor/handlers/default.properties and
+ * /fckeditor.properties.+ * This class loads the properties files as follows: + *
-
+ *
- Load
default.properties
+ * - Load
fckeditor.propertiesif present.
+ *
fckeditor.properties will override properties loaded from
+ * default.properties. (intended behavior)+ * Hint: You may set properties programmatically with + * {@link #setProperty(String, String)} instead or additionally. + * + * @version $Id$ + */ +public class PropertiesLoader { + private static final Logger logger = LoggerFactory.getLogger(PropertiesLoader.class); + private static Properties properties = new Properties(); + + static { + + // 1. load library defaults + InputStream in = PropertiesLoader.class + .getResourceAsStream("default.properties"); + + if (in == null) { + logger.error("default.properties not found"); + throw new RuntimeException("default.properties not found"); + } else { + if (!(in instanceof BufferedInputStream)) + in = new BufferedInputStream(in); + + try { + properties.load(in); + in.close(); + logger.debug("default.properties loaded"); + } catch (Exception e) { + logger.error("Error while processing default.properties"); + throw new RuntimeException( + "Error while processing default.properties", e); + } + } + + // 2. load user defaults if present + InputStream in2 = PropertiesLoader.class + .getResourceAsStream("/fckeditor.properties"); + + if (in2 == null) { + logger.info("fckeditor.properties not found"); + } else { + + if (!(in2 instanceof BufferedInputStream)) + in2 = new BufferedInputStream(in2); + + try { + properties.load(in2); + in2.close(); + logger.debug("fckeditor.properties loaded"); + } catch (Exception e) { + logger.error("Error while processing fckeditor.properties"); + throw new RuntimeException( + "Error while processing fckeditor.properties", e); + } + + } + } + + /** + * Getter for a property. + * + * @param key + * The property key. + * @return The value for the specified key. + * @see Properties#getProperty(String) + */ + public static String getProperty(final String key) { + return properties.getProperty(key); + } + + /** + * Setter for a property. If the property already exists, the value will be + * overridden.
+ * Hint: This method is intended as an alternative way to set + * properties programmatically instead of using the + *
fckeditor.properties. It should never used inside
+ * FCKeditor.Java!!!
+ *
+ * @param key
+ * The property key.
+ * @param value
+ * The property value.
+ * @see Properties#setProperty(String, String)
+ */
+ public static void setProperty(final String key, final String value) {
+ properties.setProperty(key, value);
+ }
+}
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/handlers/RequestCycleHandler.java
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/handlers/RequestCycleHandler.java (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/handlers/RequestCycleHandler.java (revision 3884)
@@ -0,0 +1,113 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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;
+
+import net.fckeditor.requestcycle.UserAction;
+import net.fckeditor.requestcycle.UserPathBuilder;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Handler for classes which implement the interfaces from package
+ * {@link net.fckeditor.requestcycle}.
+ *
+ * @version $Id$
+ */
+public class RequestCycleHandler {
+ private static Logger logger = LoggerFactory.getLogger(RequestCycleHandler.class);
+ private static UserAction userAction = null;
+ private static UserPathBuilder userPathBuilder = null;
+
+ static {
+ // If there are more objects to instantiate in future, we could solve the following by reflection!
+
+ // 1. try to instantiate the UserAction object
+ String fqcn = PropertiesLoader.getProperty("connector.userActionImpl");
+ if (fqcn == null)
+ logger.warn("No property found for UserAction implementation, any user action will be disabled!");
+ else {
+ try {
+ Class clazz = Class.forName(fqcn);
+ userAction = (UserAction) clazz.newInstance();
+ logger.info("UserAction implementation successfully instantiated!");
+ } catch (Exception e) {
+ logger.error("Couldn't instantiate class [".concat(fqcn).concat(
+ "], any user action will disabled!"), e);
+ }
+ }
+
+ // 2. try to instantiate the UserPathBuilder object
+ fqcn = PropertiesLoader.getProperty("connector.userPathBuilderImpl");
+ if (fqcn == null)
+ logger.warn("No property found for UserPathBuilder implementation! "
+ .concat("The 'DefaultUserFilesPath' will be used in the ConnectorServlet!"));
+ else {
+ try {
+ Class clazz = Class.forName(fqcn);
+ userPathBuilder = (UserPathBuilder) clazz.newInstance();
+ logger.info("UserPathBuilder object successfully instantiated!");
+ } catch (Exception e) {
+ logger.error("Couldn't instantiate class [".concat(fqcn)
+ .concat("], The 'DefaultUserFilesPath' will be used in the ConnectorServlet!"), e);
+ }
+ }
+ }
+
+ /**
+ * Just a wrapper to
+ * {@link UserAction#isEnabledForFileBrowsing(HttpServletRequest)}.
+ *
+ * @param request
+ * @return {@link UserAction#isEnabledForFileBrowsing(HttpServletRequest)}
+ * or false if userAction isn't set.
+ */
+ public static boolean isEnabledForFileBrowsing(final HttpServletRequest request) {
+ return (userAction != null && userAction.isEnabledForFileBrowsing(request));
+ }
+
+ /**
+ * Just a wrapper to
+ * {@link UserAction#isEnabledForFileUpload(HttpServletRequest)}.
+ *
+ * @param request
+ * @return {@link UserAction#isEnabledForFileUpload(HttpServletRequest)} or
+ * false if userAction isn't set.
+ */
+ public static boolean isEnabledForFileUpload(final HttpServletRequest request) {
+ return (userAction != null && userAction.isEnabledForFileUpload(request));
+ }
+
+ /**
+ * Getter for the UserFilesPath.+ * Method is used by other handlers only! + * + * @param request + * @return {@link UserPathBuilder#getUserFilesPath(HttpServletRequest)} or + *
null if userPathBuilder is
+ * null.
+ */
+ protected static String getUserFilePath(final HttpServletRequest request) {
+ return (userPathBuilder != null) ? userPathBuilder.getUserFilesPath(request) : null;
+ }
+}
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/handlers/ResourceTypeHandler.java
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/handlers/ResourceTypeHandler.java (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/handlers/ResourceTypeHandler.java (revision 3884)
@@ -0,0 +1,179 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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 java.util.HashMap;
+import java.util.Map;
+
+import net.fckeditor.tool.Utils;
+
+/**
+ * Handler for different resource types.
+ *
+ * @version $Id$
+ */
+public class ResourceTypeHandler {
+
+ private String name;
+ private static Mapnull, empty, or does not exist.
+ */
+ public static ResourceTypeHandler valueOf(final String name) throws IllegalArgumentException {
+ if (Utils.isEmpty(name))
+ throw new IllegalArgumentException();
+
+ ResourceTypeHandler rt = types.get(name);
+ if (rt == null)
+ throw new IllegalArgumentException();
+ return rt;
+ }
+
+ /**
+ *
+ * Checks if a specfied string represents a valid resource type.
+ *
+ * @param name
+ * A resource type string to check.
+ * @return true if the string representation is valid else
+ * false.
+ */
+ public static boolean isValid(final String name) {
+ return types.containsKey(name);
+ }
+
+ /**
+ * Tries to determine ResourceType from string and return {@link #FILE} if
+ * provided string is invalid.
+ *
+ * @param name
+ * @return resource type
+ */
+ public static ResourceTypeHandler getDefaultResourceType(final String name) {
+ ResourceTypeHandler rt = getResourceType(name);
+ return rt == null ? FILE : rt;
+ }
+
+ /**
+ * A wrapper for {@link #valueOf(String)}. It returns null
+ * instead of throwing an exception.
+ *
+ * @param name
+ * A resource type string to check.
+ * @return A {@link ResourceTypeHandler} object holding the value
+ * represented by the string argument, or null.
+ */
+ public static ResourceTypeHandler getResourceType(final String name) {
+ try {
+ return ResourceTypeHandler.valueOf(name);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null)
+ return false;
+ try {
+ ResourceTypeHandler rt = (ResourceTypeHandler) obj;
+ return name.equals(rt.getName());
+ } catch (ClassCastException e) {
+ return false;
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public int hashCode() {
+ return name.hashCode();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return name;
+ }
+}
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/requestcycle/UserAction.java
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/requestcycle/UserAction.java (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/requestcycle/UserAction.java (revision 3884)
@@ -0,0 +1,62 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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.requestcycle;
+
+import javax.servlet.http.HttpServletRequest;
+
+
+/**
+ * An interface which provides the authorization of server-side commands.+ * The commands are: + *
-
+ *
- {@link #isEnabledForFileBrowsing(HttpServletRequest)}: Enables the user + * to browse/select files. + *
- {@link #isEnabledForFileUpload(HttpServletRequest)}: Enables the user + * to upload files. + *
+ * If the implementation doesn't bother you, just return
true.
+ *
+ * @param request
+ * Servlet request from user
+ * @return true if user can upload to the server, or
+ * false
+ */
+ public boolean isEnabledForFileUpload(final HttpServletRequest request);
+
+ /**
+ * Authenticates/enables the current user for browsing files.+ * If the implementation doesn't bother you, just return
true.
+ *
+ * @param request
+ * Servlet request from user
+ * @return true if user can browse the server, or
+ * false
+ */
+ public boolean isEnabledForFileBrowsing(final HttpServletRequest request);
+
+}
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/requestcycle/UserPathBuilder.java
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/requestcycle/UserPathBuilder.java (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/requestcycle/UserPathBuilder.java (revision 3884)
@@ -0,0 +1,52 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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.requestcycle;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.fckeditor.handlers.ConnectorHandler;
+
+/**
+ * An interface which provides a way to build a user-dependent
+ * UserFilesPath.
+ *
+ * @version $Id$
+ */
+public interface UserPathBuilder {
+
+ /**
+ * Getter for the user-dependent UserFilesPath.+ * Important: + *
-
+ *
- If the implementation returns
null, + * {@link ConnectorHandler} will used the default one! That's useful, if the + * implementation doesn't bother you.
+ * - The returned directory string has to start with '/', but has to end + * without '/'. + *
- The path has to be within the context. + *
null or the UserFilesPath for the
+ * current user.
+ */
+ public String getUserFilesPath(final HttpServletRequest request);
+}
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/requestcycle/impl/UserActionImpl.java
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/requestcycle/impl/UserActionImpl.java (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/requestcycle/impl/UserActionImpl.java (revision 3884)
@@ -0,0 +1,49 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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.requestcycle.impl;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.fckeditor.requestcycle.UserAction;
+
+/**
+ * Standard implementation for {@link UserAction}. It always returns
+ * true.
+ *
+ * @version $Id$
+ */
+public class UserActionImpl implements UserAction {
+
+ /* (non-Javadoc)
+ * @see net.fckeditor.requestcycle.UserAction#isEnabledForFileBrowsing(javax.servlet.http.HttpServletRequest)
+ */
+ public boolean isEnabledForFileBrowsing(final HttpServletRequest request) {
+ return true;
+ }
+
+ /* (non-Javadoc)
+ * @see net.fckeditor.requestcycle.UserAction#isEnabledForFileUpload(javax.servlet.http.HttpServletRequest)
+ */
+ public boolean isEnabledForFileUpload(final HttpServletRequest request) {
+ return true;
+ }
+
+}
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/response/UploadResponse.java
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/response/UploadResponse.java (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/response/UploadResponse.java (revision 3884)
@@ -0,0 +1,161 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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.response;
+
+import net.fckeditor.connector.Messages;
+import net.fckeditor.tool.Utils;
+
+/**
+ * Simply abstracts from the JavaScript callback to a Java object.
+ *
+ *
+ * The usage is quite easy but can be tricky since varargs are used in the class
+ * constructor.
The requestor expects a JS method callback with variable
+ * arguments size.
+ *
+ * e.g.
+ * window.parent.OnUploadCompleted(101,'some/url/file.img','file.img','no error');
+ *
+ * The UploadResponse constructor behaves the same way by simply calling it
+ * with:
+ * UploadResponse ur = new UploadResonse(SC_SOME_ERROR,"/some/url/file.img","file.img","no error"):
+ *
+ * Put the desired parameters in the constructor. You may omit them from
+ * right to left but you have to remain the order.
e.g.
+ * UploadResponse(SC_OK,"/some/url/to/pic.jpg","pic") or
+ * UploadResponse(SC_OK) but not
+ * UploadResponse(SC_OK,"some error message")
+ *
+ * Use, if possible, the pre-defined error numbers or upload responses. + *
+ *
+ * If you need to set error number and message only, use constructor with
+ * one parameter and call {@link UploadResponse#setCustomMessage(String)}.
+ *
+ * @param arguments
+ * possible argument order:
+ *
+ * Use the class like this:
+ *
+ * Known limitations:
+ *
+ * Requirements:
+ *
+ * The latest version can be found at http://schmidt.devlib.org/image-info/.
+ *
+ * Written by Marco Schmidt.
+ *
+ * This class is contributed to the Public Domain.
+ * Use it at your own risk.
+ *
+ * History:
+ * This sample displays a normal HTML form with an FCKeditor with
+ full features enabled. Basic FCKeditor informations:int errorNumber, String fileUrl, String filename, String customMessage
+ * @throws IllegalArgumentException
+ * if amount of arguments is less than 1 and above 4
+ * @throws IllegalArgumentException
+ * if the first argument is not an error number (int)
+ */
+ public UploadResponse(Object... arguments) throws IllegalArgumentException {
+ if (arguments.length < 1 || arguments.length > 4)
+ throw new IllegalArgumentException(
+ "The amount of arguments has to be between 1 and 4");
+
+ parameters = new Object[arguments.length];
+
+ if (!(arguments[0] instanceof Integer))
+ throw new IllegalArgumentException(
+ "The first argument has to be an error number (int)");
+
+ System.arraycopy(arguments, 0, parameters, 0, arguments.length);
+ }
+
+ /**
+ * Sets the message in the UploadResponse.
+ *
+ * Methods automatically determines how many arguments are set and puts the
+ * message at the end.
+ *
+ * @param customMassage
+ * the message you want to pass to the user
+ */
+ public void setCustomMessage(final String customMassage) {
+ if (Utils.isNotEmpty(customMassage)) {
+ if (parameters.length == 1) {
+ Object errorNumber = parameters[0];
+ parameters = new Object[4];
+ parameters[0] = errorNumber;
+ parameters[1] = null;
+ parameters[2] = null;
+ }
+ parameters[3] = customMassage;
+ }
+ }
+
+ /**
+ * Assembles the JavaScript method for the user callback
+ */
+ @Override
+ public String toString() {
+ StringBuffer sb = new StringBuffer(400);
+ sb.append("");
+
+ return sb.toString();
+ }
+}
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/response/XmlResponse.java
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/response/XmlResponse.java (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/response/XmlResponse.java (revision 3884)
@@ -0,0 +1,253 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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.response;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.StringWriter;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import net.fckeditor.handlers.CommandHandler;
+import net.fckeditor.handlers.ResourceTypeHandler;
+import net.fckeditor.tool.Utils;
+
+import org.apache.commons.io.filefilter.DirectoryFileFilter;
+import org.apache.commons.io.filefilter.FileFileFilter;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * Creates an XML response for every GET request of the Connector
+ * servlet. This class maps directly to the XML layout descibed here.
+ *
+ * @version $Id$
+ *
+ */
+public class XmlResponse {
+
+ private Document document;
+ private Element errorElement;
+ private Element foldersElement;
+ private Element filesElement;
+
+ /** Error number OK */
+ public static final int EN_OK = 0;
+
+ /** Error number ERROR */
+ public static final int EN_ERROR = 1;
+
+ /** Error number ALREADY EXISTS */
+ public static final int EN_ALREADY_EXISTS = 101;
+
+ /** Error number INVALID FOLDER NAME */
+ public static final int EN_INVALID_FOLDER_NAME = 102;
+
+ /** Error number SECURITY ERROR */
+ public static final int EN_SECURITY_ERROR = 103;
+
+ /** Error number UNKNOWN ERROR */
+ public static final int EN_UKNOWN = 110;
+
+ /**
+ * Use this contructor if want to respond a positive message.
+ *
+ * @param command
+ * @param resourceType
+ * @param currentFolder
+ * @param constructedUrl
+ */
+ public XmlResponse(CommandHandler command, ResourceTypeHandler resourceType,
+ String currentFolder, String constructedUrl) {
+
+ try {
+ DocumentBuilderFactory factory = DocumentBuilderFactory
+ .newInstance();
+ DocumentBuilder builder = factory.newDocumentBuilder();
+ document = builder.newDocument();
+ } catch (ParserConfigurationException e) {
+ throw new RuntimeException(e);
+ }
+
+ Element root = document.createElement("Connector");
+ document.appendChild(root);
+ root.setAttribute("command", command.toString());
+ root.setAttribute("resourceType", resourceType.toString());
+
+ Element currentFolderElement = document.createElement("CurrentFolder");
+ currentFolderElement.setAttribute("path", currentFolder);
+
+ currentFolderElement.setAttribute("url", constructedUrl);
+ root.appendChild(currentFolderElement);
+
+ }
+
+ /**
+ *
+ * Use this contructor if want to respond a negative/error message with
+ * custom text.
+ *
+ * @param number
+ * @param text
+ */
+ public XmlResponse(int number, String text) {
+ try {
+ DocumentBuilderFactory factory = DocumentBuilderFactory
+ .newInstance();
+ DocumentBuilder builder = factory.newDocumentBuilder();
+ document = builder.newDocument();
+ } catch (ParserConfigurationException e) {
+ throw new RuntimeException(e);
+ }
+
+ Element root = document.createElement("Connector");
+ document.appendChild(root);
+ setError(number, text);
+ }
+
+ /**
+ * Use this contructor if want to respond a negative/error message only.
+ *
+ * @param number
+ */
+ public XmlResponse(int number) {
+ this(number, null);
+ }
+
+ /**
+ * Sets an error number with a custom message.
+ *
+ * @param number
+ * @param text
+ */
+ public void setError(int number, String text) {
+
+ if (errorElement == null) {
+ errorElement = document.createElement("Error");
+ document.getDocumentElement().appendChild(errorElement);
+ }
+
+ errorElement.setAttribute("number", String.valueOf(number));
+ if (Utils.isNotEmpty(text))
+ errorElement.setAttribute("text", text);
+
+ }
+
+ /**
+ * Sets an error number.
+ *
+ * @param number
+ */
+ public void setError(int number) {
+ setError(number, null);
+ }
+
+ /**
+ * Lists all folders in the given dir as XML tags.
+ * @param dir
+ */
+ public void setFolders(File dir) {
+
+ if (foldersElement != null) {
+ Element parent = (Element) foldersElement.getParentNode();
+ parent.removeChild(foldersElement);
+ }
+
+ foldersElement = document.createElement("Folders");
+ document.getDocumentElement().appendChild(foldersElement);
+
+ String[] fileList = dir.list(DirectoryFileFilter.DIRECTORY);
+ for (String file : fileList) {
+ Element folderElement = document.createElement("Folder");
+ folderElement.setAttribute("name", file);
+ foldersElement.appendChild(folderElement);
+ }
+ }
+
+ /**
+ * Lists all files in the given dir as XML tags.
+ *
+ * @param dir
+ */
+ public void setFiles(File dir) {
+
+ if (filesElement != null) {
+ Element parent = (Element) filesElement.getParentNode();
+ parent.removeChild(filesElement);
+ }
+
+ filesElement = document.createElement("Files");
+ document.getDocumentElement().appendChild(filesElement);
+
+ File[] fileList = dir.listFiles((FileFilter) FileFileFilter.FILE);
+ long length;
+ for (File file : fileList) {
+ Element fileElement = document.createElement("File");
+ fileElement.setAttribute("name", file.getName());
+ if (file.length() < 1024)
+ length = 1L;
+ else
+ length = file.length()/1024;
+ fileElement.setAttribute("size", String.valueOf(length));
+ filesElement.appendChild(fileElement);
+ }
+ }
+
+ /**
+ * Lists all folders and files in the given dir as XML tags.
+ *
+ * @param dir
+ */
+ public void setFoldersAndFiles(File dir) {
+ setFolders(dir);
+ setFiles(dir);
+ }
+
+ @Override
+ public String toString() {
+ document.getDocumentElement().normalize();
+ TransformerFactory factory = TransformerFactory.newInstance();
+
+ StringWriter sw = new StringWriter();
+
+ try {
+ Transformer transformer = factory.newTransformer();
+
+ DOMSource source = new DOMSource(document);
+ StreamResult result = new StreamResult(sw);
+
+ transformer.transform(source, result);
+ } catch (TransformerException e) {
+ throw new RuntimeException(e);
+ }
+
+ return sw.toString();
+ }
+
+}
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/tags/CheckTag.java
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/tags/CheckTag.java (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/tags/CheckTag.java (revision 3884)
@@ -0,0 +1,122 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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.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.PropertiesLoader;
+import net.fckeditor.handlers.RequestCycleHandler;
+import net.fckeditor.tool.Compatibility;
+
+/**
+ * This tag displays information about browser and user capabilities. There are
+ * tree available commands (CompatibleBrowser, FileBrowsing, FileUpload) which
+ * respond an English message.
+ * Hint: The message string cannot be localized at the moment.
+ *
+ * @version $Id$
+ */
+public class CheckTag 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 final String PROPERTY_MESSAGE_FILE_BROWSING_DISABLED = "message.enabled_tag.connector.file_browsing.disabled";
+ private static final String PROPERTY_MESSAGE_FILE_BROWSING_ENABLED = "message.enabled_tag.connector.file_browsing.enabled";
+ private static final String PROPERTY_MESSAGE_FILE_UPLOAD_DISABLED = "message.enabled_tag.connector.file_upload.disalbed";
+ private static final String PROPERTY_MESSAGE_FILE_UPLOAD_ENABLED = "message.enabled_tag.connector.file_upload.enabled";
+ private static final String PROPERTY_MESSAGE_NOT_COMPATIBLE_BROWSER = "message.enabled_tag.compatible_browser.no";
+ private static final String PROPERTY_MESSAGE_COMPATIBLE_BROWSER = "message.enabled_tag.compatible_browser.yes";
+ private static Set
+ * Attention: This tag can only be nested with an editor tag.
+ *
+ * @version $Id$
+ */
+public class ConfigTag extends TagSupport implements DynamicAttributes {
+
+ private Maptrue if compatible otherwise false
+ */
+ public static boolean check(final String userAgentString) {
+ if (Utils.isEmpty(userAgentString))
+ return false;
+
+ String userAgentStr = userAgentString.toLowerCase();
+
+ // IE 5.5+, check special keys like 'Opera' and 'mac', because there are some
+ // other browsers, containing 'MSIE' in there agent string!
+ if (userAgentStr.indexOf("opera") < 0 && userAgentStr.indexOf("mac") < 0) {
+ if (getBrowserVersion(userAgentStr, ".*msie ([\\d]+.[\\d]+).*") >= 5.5f)
+ return true;
+ }
+
+ // for all gecko based browsers
+ if (getBrowserVersion(userAgentStr, ".*rv:([\\d]+.[\\d]+).*") > 1.7f)
+ return true;
+
+ // Opera 9.5+
+ if (getBrowserVersion(userAgentStr, "opera/([\\d]+.[\\d]+).*") >= 9.5f
+ || getBrowserVersion(userAgentStr, ".*opera ([\\d]+.[\\d]+)") >= 9.5f)
+ return true;
+
+ // Safari 3+
+ if (getBrowserVersion(userAgentStr, ".*applewebkit/([\\d]+).*") >= 522f)
+ return true;
+
+ return false;
+ }
+
+ /**
+ * Just a wrapper to {@link #check(String)}.
+ *
+ * @param request
+ */
+ public static boolean isCompatibleBrowser(final HttpServletRequest request) {
+ return (request == null) ? false : check(request.getHeader("user-agent"));
+ }
+
+ /**
+ * Helper method to get the browser version from 'userAgent' with regex. The
+ * first matching group has to be the version number!
+ *
+ * @param userAgent
+ * @param regex
+ * @return The browser version, or -1f if version can't be determined.
+ */
+ private static float getBrowserVersion(final String userAgent, final String regex) {
+ Pattern pattern = Pattern.compile(regex);
+ Matcher matcher = pattern.matcher(userAgent);
+ if (matcher.matches()) {
+ try {
+ return Float.parseFloat(matcher.group(1));
+ } catch (NumberFormatException e) {
+ return -1f;
+ }
+ }
+ return -1f;
+ }
+
+}
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/tool/Utils.java
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/tool/Utils.java (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/tool/Utils.java (revision 3884)
@@ -0,0 +1,127 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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.tool;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+/**
+ * Some static helper methods.
+ *
+ * @version $Id$
+ */
+public class Utils {
+
+ /**
+ * Constructs a set of uppercased strings from a delimiter-separated string.
+ *
+ * @param stringList
+ * @param delimiter
+ * The delimiter.
+ * @return An emtpy list if 'stringList' is empty else a lowercased set of
+ * strings.
+ * @throws IllegalArgumentException
+ * if 'delimiter' is empty.
+ */
+ public static Setnull or empty.
+ *
+ * @param str
+ * to check
+ * @return true if the string is null or
+ * empty.
+ */
+ public static boolean isEmpty(final String str) {
+ return str == null || str.length() == 0;
+ }
+
+ /**
+ * Just a wrapper to {@link #isEmpty(String)}.
+ *
+ * @param str
+ * to ckeck
+ * @return true if the String is not empty or not
+ * null.
+ */
+ public static boolean isNotEmpty(final String str) {
+ return !isEmpty(str);
+ }
+
+ /**
+ * Checks if a String is whitespace, empty or null.
+ *
+ * @param str
+ * to check
+ * @return true if the string is null, empty
+ * or contains whitespace only.
+ */
+ public static boolean isBlank(final String str) {
+
+ if (isEmpty(str))
+ return true;
+
+ for (char c : str.toCharArray()) {
+ if (!Character.isWhitespace(c))
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Just a wrapper to {@link #isBlank(String)}.
+ *
+ * @param str
+ * to check
+ * @return true if the string is not null,
+ * not empty or does not contain whitespace only.
+ */
+ public static boolean isNotBlank(final String str) {
+ return !isBlank(str);
+ }
+}
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/tool/UtilsFile.java
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/tool/UtilsFile.java (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/tool/UtilsFile.java (revision 3884)
@@ -0,0 +1,166 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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.tool;
+
+import java.io.File;
+import java.io.InputStream;
+import java.util.regex.Pattern;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.io.FilenameUtils;
+import org.devlib.schmidt.imageinfo.ImageInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import net.fckeditor.handlers.ConnectorHandler;
+import net.fckeditor.handlers.ResourceTypeHandler;
+
+/**
+ * Some static helper methods in conjunction with files.
+ *
+ * @version $Id$
+ */
+public class UtilsFile {
+
+ protected static final Pattern ILLEGAL_CURRENT_FOLDER_PATTERN = Pattern
+ .compile("^[^/]|[^/]$|/\\.{1,2}|\\\\|\\||:|\\?|\\*|\"|<|>|\\p{Cntrl}");
+
+ private static final Logger logger = LoggerFactory.getLogger(UtilsFile.class);
+
+ /**
+ * Do a cleanup of the file name to avoid possible problems.
+ * The forceSingleExtension property will be respected!
+ *
+ * @param fileName
+ * @return folder name where \ / | : ? * " < > 'control chars' replaced by '_'
+ */
+ public static String sanitizeFileName(final String fileName) {
+ if (fileName == null)
+ return null;
+ if (fileName.equals(""))
+ return "";
+
+ String name = (ConnectorHandler.isForceSingleExtension()) ? UtilsFile.forceSingleExtension(fileName)
+ : fileName;
+
+ // Remove \ / | : ? * " < > with _
+ return name.replaceAll("\\/|\\/|\\||:|\\?|\\*|\"|<|>|\\p{Cntrl}", "_");
+ }
+
+ /**
+ * Do a cleanup of the folder name to avoid possible problems.
+ *
+ * @param folderName
+ * @return folder name where . \ / | : ? * " < > 'control chars'
+ * replaced by '_'
+ */
+ public static String sanitizeFolderName(final String folderName) {
+ if (folderName == null)
+ return null;
+ if (folderName.equals(""))
+ return "";
+
+ // Remove . \ / | : ? * " < > with _
+ return folderName.replaceAll("\\.|\\/|\\/|\\||:|\\?|\\*|\"|<|>|\\p{Cntrl}", "_");
+ }
+
+ /**
+ * Checks if the underlying file of the InputStream is an image.
+ *
+ * @param in An input stream
+ * @return true if the underlying file is an image else
+ * false.
+ */
+ public static boolean isImage(final InputStream in) {
+ ImageInfo ii = new ImageInfo();
+ ii.setInput(in);
+ return ii.check();
+ }
+
+ /**
+ * Checks if a path corresponds to the rules defined here.
+ *
+ * @param path
+ * @return true if path corresponds to rules or
+ * false.
+ */
+ public static boolean isValidPath(final String path) {
+ if (Utils.isEmpty(path))
+ return false;
+
+ if (ILLEGAL_CURRENT_FOLDER_PATTERN.matcher(path).find())
+ return false;
+
+ return true;
+ }
+
+ /**
+ * Replaces all dots except the last one with underscores in a filename.
+ *
+ * @param filename
+ * @return string with a single dot only
+ */
+ public static String forceSingleExtension(final String filename) {
+ return filename.replaceAll("\\.(?![^.]+$)", "_");
+ }
+
+ /**
+ * Checks if a filename contains more than one dot.
+ *
+ * @param filename
+ * @return true if filename contains severals dots else
+ * false
+ */
+ public static boolean isSingleExtension(final String filename) {
+ return filename.matches("[^\\.]+\\.[^\\.]+");
+ }
+
+ /**
+ * Checks for a dir and creates it if it does not exist.
+ *
+ * @param dir Directory to check/create.
+ */
+ public static void checkDirAndCreate(File dir) {
+ if (!dir.exists()) {
+ dir.mkdirs();
+ logger.debug("Dir '{}' successfully created", dir);
+ }
+ }
+
+ /**
+ * Compose server-side response path.
+ *
+ * @param request
+ * @param resourceType
+ * @return server-side path of resourceType.
+ */
+ public static String constructServerSidePath(HttpServletRequest request,
+ ResourceTypeHandler resourceType) {
+ StringBuffer sb = new StringBuffer(ConnectorHandler
+ .getUserFilesPath(request));
+ sb.append(resourceType.getPath());
+
+ return sb.toString();
+ }
+
+}
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/tool/UtilsResponse.java
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/tool/UtilsResponse.java (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/tool/UtilsResponse.java (revision 3884)
@@ -0,0 +1,70 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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.tool;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.fckeditor.handlers.ConnectorHandler;
+import net.fckeditor.handlers.ResourceTypeHandler;
+
+/**
+ * Some static helper methods in conjunction with the servlet response.
+ *
+ * @version $Id$
+ */
+public class UtilsResponse {
+
+ /**
+ * Constructs a URL from different parameters. This method is about to
+ * change in version 2.5.
+ *
+ * @param request
+ * @param resourceType
+ * @param urlPath
+ * @param prependContextPath
+ * @param fullUrl
+ * @return constructed url
+ */
+ 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 (Utils.isNotEmpty(urlPath))
+ sb.append(urlPath);
+
+ return sb.toString();
+ }
+
+}
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/tool/XHtmlTagTool.java
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/tool/XHtmlTagTool.java (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/java/net/fckeditor/tool/XHtmlTagTool.java (revision 3884)
@@ -0,0 +1,137 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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.tool;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Tool to construct a XHTML tag.
+ *
+ * Usage:
+ *
+ * XHtmlTagTool tag = XHtmlTagTool("a", "link");
+ * tag.addAttribute("href", "http://google.com");
+ * tag.toString();: <a href="http://google.com">link</a>
+ *
+ *
+ * Hint:
+ *
+ *
+ *
+ * @version $Id$
+ */
+public class XHtmlTagTool {
+
+ /** Name of the tag. */
+ private String name;
+
+ /** Container for the attributes. */
+ private Map
+ * ImageInfo ii = new ImageInfo();
+ * ii.setInput(in); // in can be InputStream or RandomAccessFile
+ * ii.setDetermineImageNumber(true); // default is false
+ * ii.setCollectComments(true); // default is false
+ * if (!ii.check()) {
+ * System.err.println("Not a supported image file format.");
+ * return;
+ * }
+ * System.out.println(ii.getFormatName() + ", " + ii.getMimeType() +
+ * ", " + ii.getWidth() + " x " + ii.getHeight() + " pixels, " +
+ * ii.getBitsPerPixel() + " bits per pixel, " + ii.getNumberOfImages() +
+ * " image(s), " + ii.getNumberOfComments() + " comment(s).");
+ * // there are other properties, check out the API documentation
+ *
+ * You can also use this class as a command line program.
+ * Call it with a number of image file names and URLs as parameters:
+ *
+ * java ImageInfo *.jpg *.png *.gif http://somesite.tld/image.jpg
+ *
+ * or call it without parameters and pipe data to it:
+ *
+ * java ImageInfo < image.jpg
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ * @author Marco Schmidt
+ */
+@SuppressWarnings("unchecked")
+public class ImageInfo {
+ /**
+ * Return value of {@link #getFormat()} for JPEG streams.
+ * ImageInfo can extract physical resolution and comments
+ * from JPEGs (only from APP0 headers).
+ * Only one image can be stored in a file.
+ * It is determined whether the JPEG stream is progressive
+ * (see {@link #isProgressive()}).
+ */
+ public static final int FORMAT_JPEG = 0;
+
+ /**
+ * Return value of {@link #getFormat()} for GIF streams.
+ * ImageInfo can extract comments from GIFs and count the number
+ * of images (GIFs with more than one image are animations).
+ * It is determined whether the GIF stream is interlaced (see {@link #isProgressive()}).
+ */
+ public static final int FORMAT_GIF = 1;
+
+ /**
+ * Return value of {@link #getFormat()} for PNG streams.
+ * PNG only supports one image per file.
+ * Both physical resolution and comments can be stored with PNG,
+ * but ImageInfo is currently not able to extract those.
+ * It is determined whether the PNG stream is interlaced (see {@link #isProgressive()}).
+ */
+ public static final int FORMAT_PNG = 2;
+
+ /**
+ * Return value of {@link #getFormat()} for BMP streams.
+ * BMP only supports one image per file.
+ * BMP does not allow for comments.
+ * The physical resolution can be stored.
+ */
+ public static final int FORMAT_BMP = 3;
+
+ /**
+ * Return value of {@link #getFormat()} for PCX streams.
+ * PCX does not allow for comments or more than one image per file.
+ * However, the physical resolution can be stored.
+ */
+ public static final int FORMAT_PCX = 4;
+
+ /**
+ * Return value of {@link #getFormat()} for IFF streams.
+ */
+ public static final int FORMAT_IFF = 5;
+
+ /**
+ * Return value of {@link #getFormat()} for RAS streams.
+ * Sun Raster allows for one image per file only and is not able to
+ * store physical resolution or comments.
+ */
+ public static final int FORMAT_RAS = 6;
+
+ /** Return value of {@link #getFormat()} for PBM streams. */
+ public static final int FORMAT_PBM = 7;
+
+ /** Return value of {@link #getFormat()} for PGM streams. */
+ public static final int FORMAT_PGM = 8;
+
+ /** Return value of {@link #getFormat()} for PPM streams. */
+ public static final int FORMAT_PPM = 9;
+
+ /** Return value of {@link #getFormat()} for PSD streams. */
+ public static final int FORMAT_PSD = 10;
+
+/* public static final int COLOR_TYPE_UNKNOWN = -1;
+ public static final int COLOR_TYPE_TRUECOLOR_RGB = 0;
+ public static final int COLOR_TYPE_PALETTED = 1;
+ public static final int COLOR_TYPE_GRAYSCALE= 2;
+ public static final int COLOR_TYPE_BLACK_AND_WHITE = 3;*/
+
+ /**
+ * The names of all supported file formats.
+ * The FORMAT_xyz int constants can be used as index values for
+ * this array.
+ */
+ private static final String[] FORMAT_NAMES =
+ {"JPEG", "GIF", "PNG", "BMP", "PCX",
+ "IFF", "RAS", "PBM", "PGM", "PPM",
+ "PSD"};
+
+ /**
+ * The names of the MIME types for all supported file formats.
+ * The FORMAT_xyz int constants can be used as index values for
+ * this array.
+ */
+ private static final String[] MIME_TYPE_STRINGS =
+ {"image/jpeg", "image/gif", "image/png", "image/bmp", "image/pcx",
+ "image/iff", "image/ras", "image/x-portable-bitmap", "image/x-portable-graymap", "image/x-portable-pixmap",
+ "image/psd"};
+
+ private int width;
+ private int height;
+ private int bitsPerPixel;
+ //private int colorType = COLOR_TYPE_UNKNOWN;
+ private boolean progressive;
+ private int format;
+ private InputStream in;
+ private DataInput din;
+ private boolean collectComments = true;
+ private Vector comments;
+ private boolean determineNumberOfImages;
+ private int numberOfImages;
+ private int physicalHeightDpi;
+ private int physicalWidthDpi;
+
+ private void addComment(String s) {
+ if (comments == null) {
+ comments = new Vector();
+ }
+ comments.addElement(s);
+ }
+
+ /**
+ * Call this method after you have provided an input stream or file
+ * using {@link #setInput(InputStream)} or {@link #setInput(DataInput)}.
+ * If true is returned, the file format was known and information
+ * on the file's content can be retrieved using the various getXyz methods.
+ * @return if information could be retrieved from input
+ */
+ public boolean check() {
+ format = -1;
+ width = -1;
+ height = -1;
+ bitsPerPixel = -1;
+ numberOfImages = 1;
+ physicalHeightDpi = -1;
+ physicalWidthDpi = -1;
+ comments = null;
+ try {
+ int b1 = read() & 0xff;
+ int b2 = read() & 0xff;
+ if (b1 == 0x47 && b2 == 0x49) {
+ return checkGif();
+ }
+ else
+ if (b1 == 0x89 && b2 == 0x50) {
+ return checkPng();
+ }
+ else
+ if (b1 == 0xff && b2 == 0xd8) {
+ return checkJpeg();
+ }
+ else
+ if (b1 == 0x42 && b2 == 0x4d) {
+ return checkBmp();
+ }
+ else
+ if (b1 == 0x0a && b2 < 0x06) {
+ return checkPcx();
+ }
+ else
+ if (b1 == 0x46 && b2 == 0x4f) {
+ return checkIff();
+ }
+ else
+ if (b1 == 0x59 && b2 == 0xa6) {
+ return checkRas();
+ }
+ else
+ if (b1 == 0x50 && b2 >= 0x31 && b2 <= 0x36) {
+ return checkPnm(b2 - '0');
+ }
+ else
+ if (b1 == 0x38 && b2 == 0x42) {
+ return checkPsd();
+ }
+ else {
+ return false;
+ }
+ } catch (IOException ioe) {
+ return false;
+ }
+ }
+
+ private boolean checkBmp() throws IOException {
+ byte[] a = new byte[44];
+ if (read(a) != a.length) {
+ return false;
+ }
+ width = getIntLittleEndian(a, 16);
+ height = getIntLittleEndian(a, 20);
+ if (width < 1 || height < 1) {
+ return false;
+ }
+ bitsPerPixel = getShortLittleEndian(a, 26);
+ if (bitsPerPixel != 1 && bitsPerPixel != 4 &&
+ bitsPerPixel != 8 && bitsPerPixel != 16 &&
+ bitsPerPixel != 24 && bitsPerPixel != 32) {
+ return false;
+ }
+ int x = (int)(getIntLittleEndian(a, 36) * 0.0254);
+ if (x > 0) {
+ setPhysicalWidthDpi(x);
+ }
+ int y = (int)(getIntLittleEndian(a, 40) * 0.0254);
+ if (y > 0) {
+ setPhysicalHeightDpi(y);
+ }
+ format = FORMAT_BMP;
+ return true;
+ }
+
+ private boolean checkGif() throws IOException {
+ final byte[] GIF_MAGIC_87A = {0x46, 0x38, 0x37, 0x61};
+ final byte[] GIF_MAGIC_89A = {0x46, 0x38, 0x39, 0x61};
+ byte[] a = new byte[11]; // 4 from the GIF signature + 7 from the global header
+ if (read(a) != 11) {
+ return false;
+ }
+ if ((!equals(a, 0, GIF_MAGIC_89A, 0, 4)) &&
+ (!equals(a, 0, GIF_MAGIC_87A, 0, 4))) {
+ return false;
+ }
+ format = FORMAT_GIF;
+ width = getShortLittleEndian(a, 4);
+ height = getShortLittleEndian(a, 6);
+ int flags = a[8] & 0xff;
+ bitsPerPixel = ((flags >> 4) & 0x07) + 1;
+ //progressive = (flags & 0x02) != 0;
+ if (!determineNumberOfImages) {
+ return true;
+ }
+ // skip global color palette
+ if ((flags & 0x80) != 0) {
+ int tableSize = (1 << ((flags & 7) + 1)) * 3;
+ skip(tableSize);
+ }
+ numberOfImages = 0;
+ int blockType;
+ do
+ {
+ blockType = read();
+ switch(blockType)
+ {
+ case(0x2c): // image separator
+ {
+ if (read(a, 0, 9) != 9) {
+ return false;
+ }
+ flags = a[8] & 0xff;
+ progressive = (flags & 0x40) != 0;
+ /*int locWidth = getShortLittleEndian(a, 4);
+ int locHeight = getShortLittleEndian(a, 6);
+ System.out.println("LOCAL: " + locWidth + " x " + locHeight);*/
+ int localBitsPerPixel = (flags & 0x07) + 1;
+ if (localBitsPerPixel > bitsPerPixel) {
+ bitsPerPixel = localBitsPerPixel;
+ }
+ if ((flags & 0x80) != 0) {
+ skip((1 << localBitsPerPixel) * 3);
+ }
+ skip(1); // initial code length
+ int n;
+ do
+ {
+ n = read();
+ if (n > 0) {
+ skip(n);
+ }
+ else
+ if (n == -1) {
+ return false;
+ }
+ }
+ while (n > 0);
+ numberOfImages++;
+ break;
+ }
+ case(0x21): // extension
+ {
+ int extensionType = read();
+ if (collectComments && extensionType == 0xfe) {
+ StringBuffer sb = new StringBuffer();
+ int n;
+ do
+ {
+ n = read();
+ if (n == -1) {
+ return false;
+ }
+ if (n > 0) {
+ for (int i = 0; i < n; i++) {
+ int ch = read();
+ if (ch == -1) {
+ return false;
+ }
+ sb.append((char)ch);
+ }
+ }
+ }
+ while (n > 0);
+ } else {
+ int n;
+ do
+ {
+ n = read();
+ if (n > 0) {
+ skip(n);
+ }
+ else
+ if (n == -1) {
+ return false;
+ }
+ }
+ while (n > 0);
+ }
+ break;
+ }
+ case(0x3b): // end of file
+ {
+ break;
+ }
+ default:
+ {
+ return false;
+ }
+ }
+ }
+ while (blockType != 0x3b);
+ return true;
+ }
+
+ private boolean checkIff() throws IOException {
+ byte[] a = new byte[10];
+ // read remaining 2 bytes of file id, 4 bytes file size
+ // and 4 bytes IFF subformat
+ if (read(a, 0, 10) != 10) {
+ return false;
+ }
+ final byte[] IFF_RM = {0x52, 0x4d};
+ if (!equals(a, 0, IFF_RM, 0, 2)) {
+ return false;
+ }
+ int type = getIntBigEndian(a, 6);
+ if (type != 0x494c424d && // type must be ILBM...
+ type != 0x50424d20) { // ...or PBM
+ return false;
+ }
+ // loop chunks to find BMHD chunk
+ do {
+ if (read(a, 0, 8) != 8) {
+ return false;
+ }
+ int chunkId = getIntBigEndian(a, 0);
+ int size = getIntBigEndian(a, 4);
+ if ((size & 1) == 1) {
+ size++;
+ }
+ if (chunkId == 0x424d4844) { // BMHD chunk
+ if (read(a, 0, 9) != 9) {
+ return false;
+ }
+ format = FORMAT_IFF;
+ width = getShortBigEndian(a, 0);
+ height = getShortBigEndian(a, 2);
+ bitsPerPixel = a[8] & 0xff;
+ return (width > 0 && height > 0 && bitsPerPixel > 0 && bitsPerPixel < 33);
+ } else {
+ skip(size);
+ }
+ } while (true);
+ }
+
+ private boolean checkJpeg() throws IOException {
+ byte[] data = new byte[12];
+ while (true) {
+ if (read(data, 0, 4) != 4) {
+ return false;
+ }
+ int marker = getShortBigEndian(data, 0);
+ int size = getShortBigEndian(data, 2);
+ if ((marker & 0xff00) != 0xff00) {
+ return false; // not a valid marker
+ }
+ if (marker == 0xffe0) { // APPx
+ if (size < 14) {
+ // not an APPx header as we know it, skip
+ skip(size - 2);
+ continue;
+ }
+ if (read(data, 0, 12) != 12) {
+ return false;
+ }
+ final byte[] APP0_ID = {0x4a, 0x46, 0x49, 0x46, 0x00};
+ if (equals(APP0_ID, 0, data, 0, 5)) {
+ //System.out.println("data 7=" + data[7]);
+ if (data[7] == 1) {
+ setPhysicalWidthDpi(getShortBigEndian(data, 8));
+ setPhysicalHeightDpi(getShortBigEndian(data, 10));
+ }
+ else
+ if (data[7] == 2) {
+ int x = getShortBigEndian(data, 8);
+ int y = getShortBigEndian(data, 10);
+ setPhysicalWidthDpi((int)(x * 2.54f));
+ setPhysicalHeightDpi((int)(y * 2.54f));
+ }
+ }
+ skip(size - 14);
+ }
+ else
+ if (collectComments && size > 2 && marker == 0xfffe) { // comment
+ size -= 2;
+ byte[] chars = new byte[size];
+ if (read(chars, 0, size) != size) {
+ return false;
+ }
+ String comment = new String(chars, "iso-8859-1");
+ comment = comment.trim();
+ addComment(comment);
+ }
+ else
+ if (marker >= 0xffc0 && marker <= 0xffcf && marker != 0xffc4 && marker != 0xffc8) {
+ if (read(data, 0, 6) != 6) {
+ return false;
+ }
+ format = FORMAT_JPEG;
+ bitsPerPixel = (data[0] & 0xff) * (data[5] & 0xff);
+ progressive = marker == 0xffc2 || marker == 0xffc6 ||
+ marker == 0xffca || marker == 0xffce;
+ width = getShortBigEndian(data, 3);
+ height = getShortBigEndian(data, 1);
+ return true;
+ } else {
+ skip(size - 2);
+ }
+ }
+ }
+
+ private boolean checkPcx() throws IOException {
+ byte[] a = new byte[64];
+ if (read(a) != a.length) {
+ return false;
+ }
+ if (a[0] != 1) { // encoding, 1=RLE is only valid value
+ return false;
+ }
+ // width / height
+ int x1 = getShortLittleEndian(a, 2);
+ int y1 = getShortLittleEndian(a, 4);
+ int x2 = getShortLittleEndian(a, 6);
+ int y2 = getShortLittleEndian(a, 8);
+ if (x1 < 0 || x2 < x1 || y1 < 0 || y2 < y1) {
+ return false;
+ }
+ width = x2 - x1 + 1;
+ height = y2 - y1 + 1;
+ // color depth
+ int bits = a[1];
+ int planes = a[63];
+ if (planes == 1 &&
+ (bits == 1 || bits == 2 || bits == 4 || bits == 8)) {
+ // paletted
+ bitsPerPixel = bits;
+ } else
+ if (planes == 3 && bits == 8) {
+ // RGB truecolor
+ bitsPerPixel = 24;
+ } else {
+ return false;
+ }
+ setPhysicalWidthDpi(getShortLittleEndian(a, 10));
+ setPhysicalHeightDpi(getShortLittleEndian(a, 10));
+ format = FORMAT_PCX;
+ return true;
+ }
+
+ private boolean checkPng() throws IOException {
+ final byte[] PNG_MAGIC = {0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a};
+ byte[] a = new byte[27];
+ if (read(a) != 27) {
+ return false;
+ }
+ if (!equals(a, 0, PNG_MAGIC, 0, 6)) {
+ return false;
+ }
+ format = FORMAT_PNG;
+ width = getIntBigEndian(a, 14);
+ height = getIntBigEndian(a, 18);
+ bitsPerPixel = a[22] & 0xff;
+ int colorType = a[23] & 0xff;
+ if (colorType == 2 || colorType == 6) {
+ bitsPerPixel *= 3;
+ }
+ progressive = (a[26] & 0xff) != 0;
+ return true;
+ }
+
+ private boolean checkPnm(int id) throws IOException {
+ if (id < 1 || id > 6) {
+ return false;
+ }
+ final int[] PNM_FORMATS = {FORMAT_PBM, FORMAT_PGM, FORMAT_PPM};
+ format = PNM_FORMATS[(id - 1) % 3];
+ boolean hasPixelResolution = false;
+ String s;
+ while (true)
+ {
+ s = readLine();
+ if (s != null) {
+ s = s.trim();
+ }
+ if (s == null || s.length() < 1) {
+ continue;
+ }
+ if (s.charAt(0) == '#') { // comment
+ if (collectComments && s.length() > 1) {
+ addComment(s.substring(1));
+ }
+ continue;
+ }
+ if (!hasPixelResolution) { // split "343 966" into width=343, height=966
+ int spaceIndex = s.indexOf(' ');
+ if (spaceIndex == -1) {
+ return false;
+ }
+ String widthString = s.substring(0, spaceIndex);
+ spaceIndex = s.lastIndexOf(' ');
+ if (spaceIndex == -1) {
+ return false;
+ }
+ String heightString = s.substring(spaceIndex + 1);
+ try {
+ width = Integer.parseInt(widthString);
+ height = Integer.parseInt(heightString);
+ } catch (NumberFormatException nfe) {
+ return false;
+ }
+ if (width < 1 || height < 1) {
+ return false;
+ }
+ if (format == FORMAT_PBM) {
+ bitsPerPixel = 1;
+ return true;
+ }
+ hasPixelResolution = true;
+ }
+ else
+ {
+ int maxSample;
+ try {
+ maxSample = Integer.parseInt(s);
+ } catch (NumberFormatException nfe) {
+ return false;
+ }
+ if (maxSample < 0) {
+ return false;
+ }
+ for (int i = 0; i < 25; i++) {
+ if (maxSample < (1 << (i + 1))) {
+ bitsPerPixel = i + 1;
+ if (format == FORMAT_PPM) {
+ bitsPerPixel *= 3;
+ }
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+ }
+
+ private boolean checkPsd() throws IOException {
+ byte[] a = new byte[24];
+ if (read(a) != a.length) {
+ return false;
+ }
+ final byte[] PSD_MAGIC = {0x50, 0x53};
+ if (!equals(a, 0, PSD_MAGIC, 0, 2)) {
+ return false;
+ }
+ format = FORMAT_PSD;
+ width = getIntBigEndian(a, 16);
+ height = getIntBigEndian(a, 12);
+ int channels = getShortBigEndian(a, 10);
+ int depth = getShortBigEndian(a, 20);
+ bitsPerPixel = channels * depth;
+ return (width > 0 && height > 0 && bitsPerPixel > 0 && bitsPerPixel <= 64);
+ }
+
+ private boolean checkRas() throws IOException {
+ byte[] a = new byte[14];
+ if (read(a) != a.length) {
+ return false;
+ }
+ final byte[] RAS_MAGIC = {0x6a, (byte)0x95};
+ if (!equals(a, 0, RAS_MAGIC, 0, 2)) {
+ return false;
+ }
+ format = FORMAT_RAS;
+ width = getIntBigEndian(a, 2);
+ height = getIntBigEndian(a, 6);
+ bitsPerPixel = getIntBigEndian(a, 10);
+ return (width > 0 && height > 0 && bitsPerPixel > 0 && bitsPerPixel <= 24);
+ }
+
+ /**
+ * Run over String list, return false iff at least one of the arguments
+ * equals true as argument to identify animated GIFs
+ * ({@link #getNumberOfImages()} will return a value larger than 1).-1.
+ * -c.
+ * @param args string list to check
+ */
+ private static boolean determineVerbosity(String[] args) {
+ if (args != null && args.length > 0) {
+ for (int i = 0; i < args.length; i++) {
+ if ("-c".equals(args[i])) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+ private static boolean equals(byte[] a1, int offs1, byte[] a2, int offs2, int num) {
+ while (num-- > 0) {
+ if (a1[offs1++] != a2[offs2++]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * If {@link #check()} was successful, returns the image's number of bits per pixel.
+ * Does not include transparency information like the alpha channel.
+ * @return number of bits per image pixel
+ */
+ public int getBitsPerPixel() {
+ return bitsPerPixel;
+ }
+
+ /**
+ * Returns the index'th comment retrieved from the file.
+ * @param index int index of comment to return
+ * @throws IllegalArgumentException if index is smaller than 0 or larger than or equal
+ * to the number of comments retrieved
+ * @see #getNumberOfComments
+ */
+ public String getComment(int index) {
+ if (comments == null || index < 0 || index >= comments.size()) {
+ throw new IllegalArgumentException("Not a valid comment index: " + index);
+ }
+ return (String)comments.elementAt(index);
+ }
+
+ /**
+ * If {@link #check()} was successful, returns the image format as one
+ * of the FORMAT_xyz constants from this class.
+ * Use {@link #getFormatName()} to get a textual description of the file format.
+ * @return file format as a FORMAT_xyz constant
+ */
+ public int getFormat() {
+ return format;
+ }
+
+ /**
+ * If {@link #check()} was successful, returns the image format's name.
+ * Use {@link #getFormat()} to get a unique number.
+ * @return file format name
+ */
+ public String getFormatName() {
+ if (format >= 0 && format < FORMAT_NAMES.length) {
+ return FORMAT_NAMES[format];
+ } else {
+ return "?";
+ }
+ }
+
+ /**
+ * If {@link #check()} was successful, returns one the image's vertical
+ * resolution in pixels.
+ * @return image height in pixels
+ */
+ public int getHeight() {
+ return height;
+ }
+
+ private static int getIntBigEndian(byte[] a, int offs) {
+ return
+ (a[offs] & 0xff) << 24 |
+ (a[offs + 1] & 0xff) << 16 |
+ (a[offs + 2] & 0xff) << 8 |
+ a[offs + 3] & 0xff;
+ }
+
+ private static int getIntLittleEndian(byte[] a, int offs) {
+ return
+ (a[offs + 3] & 0xff) << 24 |
+ (a[offs + 2] & 0xff) << 16 |
+ (a[offs + 1] & 0xff) << 8 |
+ a[offs] & 0xff;
+ }
+
+ /**
+ * If {@link #check()} was successful, returns a String with the
+ * MIME type of the format.
+ * @return MIME type, e.g. image/jpeg
+ */
+ public String getMimeType() {
+ if (format >= 0 && format < MIME_TYPE_STRINGS.length) {
+ if (format == FORMAT_JPEG && progressive)
+ {
+ return "image/pjpeg";
+ }
+ return MIME_TYPE_STRINGS[format];
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * If {@link #check()} was successful and {@link #setCollectComments(boolean)} was called with
+ * true as argument, returns the number of comments retrieved
+ * from the input image stream / file.
+ * Any number >= 0 and smaller than this number of comments is then a
+ * valid argument for the {@link #getComment(int)} method.
+ * @return number of comments retrieved from input image
+ */
+ public int getNumberOfComments()
+ {
+ if (comments == null) {
+ return 0;
+ } else {
+ return comments.size();
+ }
+ }
+
+ /**
+ * Returns the number of images in the examined file.
+ * Assumes that setDetermineImageNumber(true); was called before
+ * a successful call to {@link #check()}.
+ * This value can currently be only different from 1 for GIF images.
+ * @return number of images in file
+ */
+ public int getNumberOfImages()
+ {
+ return numberOfImages;
+ }
+
+ /**
+ * Returns the physical height of this image in dots per inch (dpi).
+ * Assumes that {@link #check()} was successful.
+ * Returns -1 on failure.
+ * @return physical height (in dpi)
+ * @see #getPhysicalWidthDpi()
+ * @see #getPhysicalHeightInch()
+ */
+ public int getPhysicalHeightDpi() {
+ return physicalHeightDpi;
+ }
+
+ /**
+ * If {@link #check()} was successful, returns the physical width of this image in dpi (dots per inch)
+ * or -1 if no value could be found.
+ * @return physical height (in dpi)
+ * @see #getPhysicalHeightDpi()
+ * @see #getPhysicalWidthDpi()
+ * @see #getPhysicalWidthInch()
+ */
+ public float getPhysicalHeightInch() {
+ int h = getHeight();
+ int ph = getPhysicalHeightDpi();
+ if (h > 0 && ph > 0) {
+ return ((float)h) / ((float)ph);
+ } else {
+ return -1.0f;
+ }
+ }
+
+ /**
+ * If {@link #check()} was successful, returns the physical width of this image in dpi (dots per inch)
+ * or -1 if no value could be found.
+ * @return physical width (in dpi)
+ * @see #getPhysicalHeightDpi()
+ * @see #getPhysicalWidthInch()
+ * @see #getPhysicalHeightInch()
+ */
+ public int getPhysicalWidthDpi() {
+ return physicalWidthDpi;
+ }
+
+ /**
+ * Returns the physical width of an image in inches, or
+ * -1.0f if width information is not available.
+ * Assumes that {@link #check} has been called successfully.
+ * @return physical width in inches or -1.0f on failure
+ * @see #getPhysicalWidthDpi
+ * @see #getPhysicalHeightInch
+ */
+ public float getPhysicalWidthInch() {
+ int w = getWidth();
+ int pw = getPhysicalWidthDpi();
+ if (w > 0 && pw > 0) {
+ return ((float)w) / ((float)pw);
+ } else {
+ return -1.0f;
+ }
+ }
+
+ private static int getShortBigEndian(byte[] a, int offs) {
+ return
+ (a[offs] & 0xff) << 8 |
+ (a[offs + 1] & 0xff);
+ }
+
+ private static int getShortLittleEndian(byte[] a, int offs) {
+ return (a[offs] & 0xff) | (a[offs + 1] & 0xff) << 8;
+ }
+
+ /**
+ * If {@link #check()} was successful, returns one the image's horizontal
+ * resolution in pixels.
+ * @return image width in pixels
+ */
+ public int getWidth() {
+ return width;
+ }
+
+ /**
+ * Returns whether the image is stored in a progressive (also called: interlaced) way.
+ * @return true for progressive/interlaced, false otherwise
+ */
+ public boolean isProgressive()
+ {
+ return progressive;
+ }
+
+ /**
+ * To use this class as a command line application, give it either
+ * some file names as parameters (information on them will be
+ * printed to standard output, one line per file) or call
+ * it with no parameters. It will then check data given to it
+ * via standard input.
+ * @param args the program arguments which must be file names
+ */
+ public static void main(String[] args) {
+ ImageInfo imageInfo = new ImageInfo();
+ imageInfo.setDetermineImageNumber(true);
+ boolean verbose = determineVerbosity(args);
+ if (args.length == 0) {
+ run(null, System.in, imageInfo, verbose);
+ } else {
+ int index = 0;
+ while (index < args.length) {
+ InputStream in = null;
+ try {
+ String name = args[index++];
+ System.out.print(name + ";");
+ if (name.startsWith("http://")) {
+ in = new URL(name).openConnection().getInputStream();
+ } else {
+ in = new FileInputStream(name);
+ }
+ run(name, in, imageInfo, verbose);
+ in.close();
+ } catch (IOException e) {
+ System.out.println(e);
+ try {
+ if (in != null) {
+ in.close();
+ }
+ } catch (IOException ee) {
+ }
+ }
+ }
+ }
+ }
+
+ private static void print(String sourceName, ImageInfo ii, boolean verbose) {
+ if (verbose) {
+ printVerbose(sourceName, ii);
+ } else {
+ printCompact(sourceName, ii);
+ }
+ }
+
+ private static void printCompact(String sourceName, ImageInfo imageInfo) {
+ final String SEP = "\t";
+ System.out.println(
+ sourceName + SEP +
+ imageInfo.getFormatName() + SEP +
+ imageInfo.getMimeType() + SEP +
+ imageInfo.getWidth() + SEP +
+ imageInfo.getHeight() + SEP +
+ imageInfo.getBitsPerPixel() + SEP +
+ imageInfo.getNumberOfImages() + SEP +
+ imageInfo.getPhysicalWidthDpi() + SEP +
+ imageInfo.getPhysicalHeightDpi() + SEP +
+ imageInfo.getPhysicalWidthInch() + SEP +
+ imageInfo.getPhysicalHeightInch() + SEP +
+ imageInfo.isProgressive()
+ );
+ }
+
+ private static void printLine(int indentLevels, String text, float value, float minValidValue) {
+ if (value < minValidValue) {
+ return;
+ }
+ printLine(indentLevels, text, Float.toString(value));
+ }
+
+ private static void printLine(int indentLevels, String text, int value, int minValidValue) {
+ if (value >= minValidValue) {
+ printLine(indentLevels, text, Integer.toString(value));
+ }
+ }
+
+ private static void printLine(int indentLevels, String text, String value) {
+ if (value == null || value.length() == 0) {
+ return;
+ }
+ while (indentLevels-- > 0) {
+ System.out.print("\t");
+ }
+ if (text != null && text.length() > 0) {
+ System.out.print(text);
+ System.out.print(" ");
+ }
+ System.out.println(value);
+ }
+
+ private static void printVerbose(String sourceName, ImageInfo ii) {
+ printLine(0, null, sourceName);
+ printLine(1, "File format: ", ii.getFormatName());
+ printLine(1, "MIME type: ", ii.getMimeType());
+ printLine(1, "Width (pixels): ", ii.getWidth(), 1);
+ printLine(1, "Height (pixels): ", ii.getHeight(), 1);
+ printLine(1, "Bits per pixel: ", ii.getBitsPerPixel(), 1);
+ printLine(1, "Progressive: ", ii.isProgressive() ? "yes" : "no");
+ printLine(1, "Number of images: ", ii.getNumberOfImages(), 1);
+ printLine(1, "Physical width (dpi): ", ii.getPhysicalWidthDpi(), 1);
+ printLine(1, "Physical height (dpi): ", ii.getPhysicalHeightDpi(), 1);
+ printLine(1, "Physical width (inches): ", ii.getPhysicalWidthInch(), 1.0f);
+ printLine(1, "Physical height (inches): ", ii.getPhysicalHeightInch(), 1.0f);
+ int numComments = ii.getNumberOfComments();
+ printLine(1, "Number of textual comments: ", numComments, 1);
+ if (numComments > 0) {
+ for (int i = 0; i < numComments; i++) {
+ printLine(2, null, ii.getComment(i));
+ }
+ }
+ }
+
+ private int read() throws IOException {
+ if (in != null) {
+ return in.read();
+ } else {
+ return din.readByte();
+ }
+ }
+
+ private int read(byte[] a) throws IOException {
+ if (in != null) {
+ return in.read(a);
+ } else {
+ din.readFully(a);
+ return a.length;
+ }
+ }
+
+ private int read(byte[] a, int offset, int num) throws IOException {
+ if (in != null) {
+ return in.read(a, offset, num);
+ } else {
+ din.readFully(a, offset, num);
+ return num;
+ }
+ }
+
+ private String readLine() throws IOException {
+ return readLine(new StringBuffer());
+ }
+
+ private String readLine(StringBuffer sb) throws IOException {
+ boolean finished;
+ do {
+ int value = read();
+ finished = (value == -1 || value == 10);
+ if (!finished) {
+ sb.append((char)value);
+ }
+ } while (!finished);
+ return sb.toString();
+ }
+
+ private static void run(String sourceName, InputStream in, ImageInfo imageInfo, boolean verbose) {
+ imageInfo.setInput(in);
+ imageInfo.setDetermineImageNumber(true);
+ imageInfo.setCollectComments(verbose);
+ if (imageInfo.check()) {
+ print(sourceName, imageInfo, verbose);
+ }
+ }
+
+ /**
+ * Specify whether textual comments are supposed to be extracted from input.
+ * Default is false.
+ * If enabled, comments will be added to an internal list.
+ * @param newValue if true, this class will read comments
+ * @see #getNumberOfComments
+ * @see #getComment
+ */
+ public void setCollectComments(boolean newValue)
+ {
+ collectComments = newValue;
+ }
+
+ /**
+ * Specify whether the number of images in a file is to be
+ * determined - default is false.
+ * This is a special option because some file formats require running over
+ * the entire file to find out the number of images, a rather time-consuming
+ * task.
+ * Not all file formats support more than one image.
+ * If this method is called with true as argument,
+ * the actual number of images can be queried via
+ * {@link #getNumberOfImages()} after a successful call to
+ * {@link #check()}.
+ * @param newValue will the number of images be determined?
+ * @see #getNumberOfImages
+ */
+ public void setDetermineImageNumber(boolean newValue)
+ {
+ determineNumberOfImages = newValue;
+ }
+
+ /**
+ * Set the input stream to the argument stream (or file).
+ * Note that {@link java.io.RandomAccessFile} implements
+ * {@link java.io.DataInput}.
+ * @param dataInput the input stream to read from
+ */
+ public void setInput(DataInput dataInput) {
+ din = dataInput;
+ in = null;
+ }
+
+ /**
+ * Set the input stream to the argument stream (or file).
+ * @param inputStream the input stream to read from
+ */
+ public void setInput(InputStream inputStream) {
+ in = inputStream;
+ din = null;
+ }
+
+ private void setPhysicalHeightDpi(int newValue) {
+ physicalWidthDpi = newValue;
+ }
+
+ private void setPhysicalWidthDpi(int newValue) {
+ physicalHeightDpi = newValue;
+ }
+
+ private void skip(int num) throws IOException {
+ while (num > 0) {
+ long result;
+ if (in != null) {
+ result = in.skip(num);
+ } else {
+ result = din.skipBytes(num);
+ }
+ if (result > 0) {
+ num -= result;
+ } else {
+ if (in != null) {
+ result = in.read();
+ } else {
+ result = din.readByte();
+ }
+ if (result == -1) {
+ throw new IOException("Premature end of input.");
+ } else {
+ num--;
+ }
+ }
+ }
+ }
+}
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/connector/package.html
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/connector/package.html (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/connector/package.html (revision 3884)
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+Connector used by the FCKeditor to list and create resources on the server.
+
+Related Documentation
+
+For overviews, tutorials, examples, guides, and tool documentation, please see:
+
+
+
+
+
+
+
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/handlers/package.html
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/handlers/package.html (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/handlers/package.html (revision 3884)
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+Different handlers for various purposes used in the entire system.
+
+
+
+
+
+
+
+
+
+
+
+
+Different handlers for various purposes used in the entire system.
+
+
+
+
+
+
+
+
+
+
+
+
+Different handlers for various purposes used in the entire system.
+
+
+
+
+
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/package.html
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/package.html (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/package.html (revision 3884)
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+Core objects to manage the FCKeditor text input form.
+
+Related Documentation
+
+For overviews, tutorials, examples, guides, and tool documentation, please see:
+
+
+
+
+
+
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/requestcycle/impl/package.html
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/requestcycle/impl/package.html (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/requestcycle/impl/package.html (revision 3884)
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+Basic/pre-defined implementations for the request cycle interfaces.
+
+
+
+
+
+
+
+
+
+
+
+
+Basic/pre-defined implementations for the request cycle interfaces.
+
+
+
+
+
+
+
+
+
+
+
+
+Basic/pre-defined implementations for the request cycle interfaces.
+
+
+
+
+
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/requestcycle/package.html
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/requestcycle/package.html (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/requestcycle/package.html (revision 3884)
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+Interfaces for the request life cycle.
+
+
+
+
+
+
+
+
+
+
+
+
+Interfaces for the request life cycle.
+
+
+
+
+
+
+
+
+
+
+
+
+Interfaces for the request life cycle.
+
+
+
+
+
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/response/package.html
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/response/package.html (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/response/package.html (revision 3884)
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+Response object wrappers for GET and POST requests.
+
+
+
+
+
+
+
+
+
+
+
+
+Response object wrappers for GET and POST requests.
+
+
+
+
+
+
+
+
+
+
+
+
+Response object wrappers for GET and POST requests.
+
+
+
+
+
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/tags/package.html
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/tags/package.html (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/tags/package.html (revision 3884)
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+JSP tags to access and modify the FCKeditor object.
+
+Related Documentation
+
+For overviews, tutorials, examples, guides, and tool documentation, please see:
+
+
+
+
+
+
+
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/tool/package.html
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/tool/package.html (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/net/fckeditor/tool/package.html (revision 3884)
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+Various tool classes.
+
+
+
+
+
+
+
+
+
+
+
+
+Various tool classes.
+
+
+
+
+
+
+
+
+
+
+
+
+Various tool classes.
+
+
+
+
+
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/org/devlib/schmidt/imageinfo/package.html
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/org/devlib/schmidt/imageinfo/package.html (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/javadoc/org/devlib/schmidt/imageinfo/package.html (revision 3884)
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+External image information application. See
+ImageInfo
+for more information.
+
+
+
+
+
+
+
+
+
+
+
+
+External image information application. See
+ImageInfo
+for more information.
+
+
+
+
+
+
+
+
+
+
+
+
+External image information application. See
+ImageInfo
+for more information.
+
+
+
+
+
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/main/resources/META-INF/FCKeditor.tld
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/main/resources/META-INF/FCKeditor.tld (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/main/resources/META-INF/FCKeditor.tld (revision 3884)
@@ -0,0 +1,128 @@
+
+
+ * User-Agent-Strings are taken from: http://www.useragentstring.com/pages/useragentstring.php
+ *
+ * @version $Id$
+ */
+public class CompatibilityTest {
+
+ @Test
+ public void testIE4Win() throws Exception {
+ assertFalse(Compatibility.check("Mozilla/4.0 (compatible; MSIE 4.01; Windows NT 5.0)"));
+ }
+
+ @Test
+ public void testIE522Mac() throws Exception {
+ assertFalse(Compatibility.check("Mozilla/4.0 (compatible; MSIE 5.22; Mac_PowerPC)"));
+ }
+
+ @Test
+ public void testIE55Win98() throws Exception {
+ assertTrue(Compatibility.check("Mozilla/4.0 (compatible; MSIE 5.5; Windows 98)"));
+ }
+
+ @Test
+ public void testIE60WinNT() throws Exception {
+ assertTrue(Compatibility.check("Mozilla/4.0 (compatible; MSIE 6.0; MSIE 5.5; Windows NT 5.1)"));
+ }
+
+ @Test
+ public void testIE70WinVista() throws Exception {
+ assertTrue(Compatibility.check("Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0;)"));
+ }
+
+ @Test
+ public void testIE70bWinVista() throws Exception {
+ assertTrue(Compatibility.check("Mozilla/4.0 (compatible; MSIE 7.0b; Windows NT 6.0)"));
+ }
+
+ @Test
+ public void testSafari204OSX() throws Exception {
+ assertFalse(Compatibility.check("Mozilla/5.0 (Macintosh; U; PPC Mac OS X; sv-se) AppleWebKit/419 (KHTML, like Gecko) Safari/419.3"));
+ }
+
+ @Test
+ public void testSafari30WinXP() throws Exception {
+ assertTrue(Compatibility.check("Mozilla/5.0 (Windows; U; Windows NT 5.2; pt) AppleWebKit/522.11.3 (KHTML, like Gecko) Version/3.0 Safari/522.11.3"));
+ }
+
+ @Test
+ public void testSafari302OSX() throws Exception {
+ assertTrue(Compatibility.check("Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en) AppleWebKit/522+ (KHTML, like Gecko) Version/3.0.2 Safari/522.12"));
+ }
+
+ @Test
+ public void testSafari31OSX() throws Exception {
+ assertTrue(Compatibility.check("Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_2; en-au) AppleWebKit/525.8+ (KHTML, like Gecko) Version/3.1 Safari/525.6"));
+ }
+
+ @Test
+ public void testFirefox200112OSX() throws Exception {
+ assertTrue(Compatibility.check("Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.12) Gecko/20080201 Firefox/2.0.0.12"));
+ }
+
+ @Test
+ public void testFirefox30Linux() throws Exception {
+ assertTrue(Compatibility.check("Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9pre) Gecko/2008040318 Firefox/3.0pre (Swiftfox)"));
+ }
+
+ @Test
+ public void testFirefox1509LinuxDebian() throws Exception {
+ assertTrue(Compatibility.check("Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.9) Gecko/20071025 Firefox/1.5.0.9 (Debian-2.0.0.9-2)"));
+ }
+
+ @Test
+ public void testOper925Win2k() throws Exception {
+ assertFalse(Compatibility.check("Opera/9.25 (Windows NT 5.0; U; en)"));
+ }
+
+ @Test
+ public void testOpera854WinNT() throws Exception {
+ assertFalse(Compatibility.check("Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; de) Opera 8.54"));
+ }
+
+ @Test
+ public void testOpera95OSX() throws Exception {
+ assertTrue(Compatibility.check("Opera/9.50 (Macintosh; Intel Mac OS X; U; en)"));
+ }
+
+ @Test
+ public void testOpera95WinVista() throws Exception {
+ assertTrue(Compatibility.check("Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 6.0; en) Opera 9.50"));
+ }
+
+ @Test
+ public void testEpaphany220Linux() throws Exception {
+ assertTrue(Compatibility.check("Mozilla/5.0 (X11; U; Linux i686; en; rv:1.9b3) Gecko Epiphany/2.20"));
+ }
+}
Index: /FCKeditor.Java/tags/2.4.2/java-core/src/test/java/net/fckeditor/tool/UtilsFileTest.java
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-core/src/test/java/net/fckeditor/tool/UtilsFileTest.java (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-core/src/test/java/net/fckeditor/tool/UtilsFileTest.java (revision 3884)
@@ -0,0 +1,213 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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.tool;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+
+/**
+ * Tests for {@link UtilsFile}.
+ *
+ * @version $Id$
+ */
+public class UtilsFileTest {
+
+ @Test
+ public void isSingleExtension01() {
+ boolean condition = UtilsFile.isSingleExtension("hacked.txt");
+ assertTrue(condition);
+ }
+
+ @Test
+ public void isSingleExtension02() {
+ boolean condition = UtilsFile.isSingleExtension("hacked.php_txt");
+ assertTrue(condition);
+ }
+
+ @Test
+ public void isSingleExtension03() {
+ boolean condition = UtilsFile.isSingleExtension("hacked.php.txt");
+ assertFalse(condition);
+ }
+
+ @Test
+ public void isSingleExtension04() {
+ boolean condition = UtilsFile.isSingleExtension("hacked.txt.");
+ assertFalse(condition);
+ }
+
+ @Test
+ public void isSingleExtension05() {
+ boolean condition = UtilsFile.isSingleExtension("hacked..txt");
+ assertFalse(condition);
+ }
+
+ @Test
+ public void forceSingleExtension01() {
+ String actual = UtilsFile.forceSingleExtension("hacked.txt");
+ assertEquals("hacked.txt", actual);
+ }
+
+ @Test
+ public void forceSingleExtension02() {
+ String actual = UtilsFile.forceSingleExtension("hacked.php_txt");
+ assertEquals("hacked.php_txt", actual);
+ }
+
+ @Test
+ public void forceSingleExtension03() {
+ String actual = UtilsFile.forceSingleExtension("hacked.php.txt");
+ assertEquals("hacked_php.txt", actual);
+ }
+
+ @Test
+ public void forceSingleExtension04() {
+ String actual = UtilsFile.forceSingleExtension("hacked..txt");
+ assertEquals("hacked_.txt", actual);
+ }
+
+ @Test
+ public void isValidPath00() {
+ String path = null;
+ boolean condition = UtilsFile.isValidPath(path);
+ assertFalse(condition);
+ }
+
+ @Test
+ public void isValidPath01() {
+ String path = "";
+ boolean condition = UtilsFile.isValidPath(path);
+ assertFalse(condition);
+ }
+
+ @Test
+ public void isValidPath02() {
+ String path = "/";
+ boolean condition = UtilsFile.isValidPath(path);
+ assertTrue(condition);
+ }
+
+ @Test
+ public void isValidPath03() {
+ String path = "/./";
+ boolean condition = UtilsFile.isValidPath(path);
+ assertFalse(condition);
+ }
+
+ @Test
+ public void isValidPath04() {
+ String path = "/newf/..";
+ boolean condition = UtilsFile.isValidPath(path);
+ assertFalse(condition);
+ }
+
+ @Test
+ public void isValidPath05() {
+ String path = "/../";
+ boolean condition = UtilsFile.isValidPath(path);
+ assertFalse(condition);
+ }
+
+ @Test
+ public void isValidPath06() {
+ String path = "/stuff/../..";
+ boolean condition = UtilsFile.isValidPath(path);
+ assertFalse(condition);
+ }
+
+ @Test
+ public void isValidPath07() {
+ String path = "/my/stuff/../";
+ boolean condition = UtilsFile.isValidPath(path);
+ assertFalse(condition);
+ }
+
+ @Test
+ public void isValidPath08() {
+ String path = "/my/stuff/";
+ boolean condition = UtilsFile.isValidPath(path);
+ assertTrue(condition);
+ }
+
+ @Test
+ public void isValidPath09() {
+ String path = "/my/stuff";
+ boolean condition = UtilsFile.isValidPath(path);
+ assertFalse(condition);
+ }
+
+ @Test
+ public void isValidPath10() {
+ String path = "my/stuff/";
+ boolean condition = UtilsFile.isValidPath(path);
+ assertFalse(condition);
+ }
+
+ @Test
+ public void isValidPath11() {
+ String path = "/some/pa\\th/";
+ boolean condition = UtilsFile.isValidPath(path);
+ assertFalse(condition);
+ }
+
+ @Test
+ public void isValidPath12() {
+ String path = "/\\/";
+ boolean condition = UtilsFile.isValidPath(path);
+ assertFalse(condition);
+ }
+
+ @Test
+ public void isValidPath13() {
+ String path = "/.hidden/";
+ boolean condition = UtilsFile.isValidPath(path);
+ assertFalse(condition);
+ }
+
+ @Test
+ public void sanitizeFolder01() {
+ assertEquals("a_b_c_d_e_f_g_h_i_", UtilsFile.sanitizeFolderName("a.b|cFCKeditor - JSP - Sample 1
+
+
+
+
+
+
Index: /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample02.jsp
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample02.jsp (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample02.jsp (revision 3884)
@@ -0,0 +1,61 @@
+
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.fckeditor.net" prefix="FCK" %>
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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 ==
+ * @version: $Id$
+--%>
+
+
+
+ FCKeditor - JSP - Sample 2
+ This sample displays a normal HTML form with an FCKeditor with full
+ features enabled.
+ This sample uses the FCKeditor Taglib: this method is preferred to
+ the API version
+ All other sample pages will use this method.
+
+
+
+
Index: /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample03.jsp
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample03.jsp (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample03.jsp (revision 3884)
@@ -0,0 +1,95 @@
+
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.fckeditor.net" prefix="FCK" %>
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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 ==
+ * @version: $Id$
+--%>
+
+
+
+ FCKeditor - JSP - Sample 3
+ This sample shows the editor in all it's available languages.
+ The Language dropdown is populated with JavaScript API.
+
+
+
+
+
+
+ Select a language:
+
+
+
+
+
+
+
+
Index: /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample04.jsp
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample04.jsp (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample04.jsp (revision 3884)
@@ -0,0 +1,77 @@
+
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.fckeditor.net" prefix="FCK" %>
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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 ==
+ * @version: $Id$
+--%>
+
+
+
+ FCKeditor - JSP - Sample 4
+ This sample shows how to change the editor toolbar.
+
+
+
+
+
+
+ Select the toolbar to load:
+
+
+
+
+
+
+
+
Index: /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample05.jsp
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample05.jsp (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample05.jsp (revision 3884)
@@ -0,0 +1,92 @@
+
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.fckeditor.net" prefix="FCK" %>
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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 ==
+ * @version: $Id$
+--%>
+
+
+
+ FCKeditor - JSP - Sample 5
+ This sample shows how to change the editor skin.
+
+
+
+
+
+
+ Select the skin to load:
+
+
+
+
+
+
+
+
Index: /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample06.config.js
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample06.config.js (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample06.config.js (revision 3884)
@@ -0,0 +1,43 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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 ==
+ * @version: $Id$
+ */
+
+// Set our sample toolbar.
+FCKConfig.ToolbarSets['PluginTest'] = [
+ ['Source'],
+ ['My_Find','My_Replace','-','Placeholder'],
+ //['Table','-','TableInsertRow','TableDeleteRows','TableInsertColumn','TableDeleteColumns','TableInsertCell','TableDeleteCells','TableMergeCells','TableSplitCell'],
+ ['Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink','-','About']
+] ;
+
+// Change the default plugin path.
+FCKConfig.PluginsPath = FCKConfig.BasePath.substr(0, FCKConfig.BasePath.length - 7) + '_samples/_plugins/' ;
+
+// Add our plugin to the plugins list.
+// FCKConfig.Plugins.Add( pluginName, availableLanguages )
+// pluginName: The plugin name. The plugin directory must match this name.
+// availableLanguages: a list of available language files for the plugin (separated by a comma).
+FCKConfig.Plugins.Add( 'findreplace', 'en,it' ) ;
+
+// If you want to use plugins found on other directories, just use the third parameter.
+var sOtherPluginPath = FCKConfig.BasePath.substr(0, FCKConfig.BasePath.length - 7) + 'editor/plugins/' ;
+FCKConfig.Plugins.Add( 'placeholder', 'en,it', sOtherPluginPath ) ;
+//FCKConfig.Plugins.Add( 'tablecommands', 'en,it', sOtherPluginPath ) ;
Index: /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample06.jsp
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample06.jsp (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample06.jsp (revision 3884)
@@ -0,0 +1,66 @@
+
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.fckeditor.net" prefix="FCK" %>
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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 ==
+ * @version: $Id$
+--%>
+
+
+
+ FCKeditor - JSP - Sample 6
+ This sample shows a sample plugin implementation.
+
+ These are sample "Find" and "Replace" plugin that do exactly the same
+ thing that the built in ones do. Use the green toolbar buttons the test then.
+
+ There is also another sample plugin that is available in the package:
+ the "Placeholder" command (use the yellow icon).
+
+
+
+
Index: /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample07.jsp
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample07.jsp (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sample07.jsp (revision 3884)
@@ -0,0 +1,70 @@
+
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.fckeditor.net" prefix="FCK" %>
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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 ==
+ * @version: $Id$
+--%>
+
+
+
+ FCKeditor - JSP - Sample 7
+ In this sample the user can edit the complete page contents and header (from
+ <HTML> to </HTML>).
+
+
+
+
Index: /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sampleposteddata.jsp
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sampleposteddata.jsp (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/jsp/sampleposteddata.jsp (revision 3884)
@@ -0,0 +1,62 @@
+
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8" import="java.util.Enumeration;"%>
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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 ==
+ * @version: $Id$
+--%>
+
+
+
+ FCKeditor - Samples - Posted Data
+ This page lists all data posted by the form.
+
+
+
+
+
Index: /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/sample.css
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/sample.css (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/sample.css (revision 3884)
@@ -0,0 +1,15 @@
+body, td, input, select, textarea {
+ font-size: 12px;
+ font-family: Arial, Verdana, Sans-Serif;
+}
+
+h1 {
+ font-weight: bold;
+ font-size: 180%;
+ margin-bottom: 10px;
+}
+
+form {
+ margin: 0px 0px 0px 0px;
+ padding: 0px 0px 0px 0px;
+}
Index: /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/sampleslist.jsp
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/sampleslist.jsp (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-demo/src/main/webapp/sampleslist.jsp (revision 3884)
@@ -0,0 +1,66 @@
+
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"%>
+<%--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2004-2009 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 ==
+ * @version: $Id$
+--%>
+
+
+
+
+
+ <%
+ String parameter;
+ while(params.hasMoreElements()) {
+ parameter = params.nextElement();
+ %>
+ Field Name
+ Value
+
+
+ <%
+ }
+ %>
+ <%=parameter%>
+ <%=request.getParameter(parameter)%>
+
+
+
+
Index: /FCKeditor.Java/tags/2.4.2/java-demo/src/site/resources/css/site.css
===================================================================
--- /FCKeditor.Java/tags/2.4.2/java-demo/src/site/resources/css/site.css (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/java-demo/src/site/resources/css/site.css (revision 3884)
@@ -0,0 +1,1 @@
+@import url(../../css/site.css);
Index: /FCKeditor.Java/tags/2.4.2/pom.xml
===================================================================
--- /FCKeditor.Java/tags/2.4.2/pom.xml (revision 3884)
+++ /FCKeditor.Java/tags/2.4.2/pom.xml (revision 3884)
@@ -0,0 +1,324 @@
+
+
+ Please select the sample you want to view:
+
+
+ #else
+ $banner.name
+ #end
+
+ #if( $banner.href )
+
+ #else
+
+ #end
+ #end
+#end
+
+#macro ( links $links )
+ #set ( $counter = 0 )
+ #foreach( $item in $links )
+ #set ( $counter = $counter + 1 )
+ #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+ #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
+ #link( $currentItemHref $item.name )
+ #if ( $links.size() > $counter )
+ |
+ #end
+ #end
+#end
+
+#macro ( breadcrumbs $breadcrumbs )
+ #set ( $counter = 0 )
+ #foreach( $item in $breadcrumbs )
+ #set ( $counter = $counter + 1 )
+ #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+ #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
+
+ #if ( $currentItemHref == $alignedFileName || $currentItemHref == "" )
+ $item.name
+ #else
+ #link( $currentItemHref $item.name )
+ #end
+ #if ( $breadcrumbs.size() > $counter )
+ >
+ #end
+ #end
+#end
+
+#macro ( displayTree $display $item )
+ #if ( $item && $item.items && $item.items.size() > 0 )
+ #foreach( $subitem in $item.items )
+ #set ( $subitemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) )
+ #set ( $subitemHref = $subitemHref.replaceAll( "\\", "/" ) )
+
+ #if ( $alignedFileName == $subitemHref )
+ #set ( $display = true )
+ #end
+
+ #displayTree( $display $subitem )
+ #end
+ #end
+#end
+
+#macro ( menuItem $item )
+ #set ( $collapse = "none" )
+ #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+ #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
+
+ #if ( $item && $item.items && $item.items.size() > 0 )
+ #if ( $item.collapse == false )
+ #set ( $collapse = "expanded" )
+ #else
+ ## By default collapsed
+ #set ( $collapse = "collapsed" )
+ #end
+
+ #set ( $display = false )
+ #displayTree( $display $item )
+
+ #if ( $alignedFileName == $currentItemHref || $display )
+ #set ( $collapse = "expanded" )
+ #end
+ #end
+
+ #else
+
+ #end
+ #end
+ #if ( $alignedFileName == $currentItemHref )
+ $item.name
+ #else
+ #link( $currentItemHref $item.name )
+ #end
+ #if ( $item && $item.items && $item.items.size() > 0 )
+ #if ( $collapse == "expanded" )
+
+ #foreach( $subitem in $item.items )
+ #menuItem( $subitem )
+ #end
+
+ #end
+ #end
+ $menu.name
+ #end
+ #if ( $menu.items && $menu.items.size() > 0 )
+
+ #foreach( $item in $menu.items )
+ #menuItem( $item )
+ #end
+
+ #end
+ #end
+#end
+
+#macro ( copyright )
+ #if ( $project )
+ #if ( ${project.organization} )
+ #set ( $period = "" )
+ #else
+ #set ( $period = "." )
+ #end
+ #set ( $currentYear = ${currentDate.year} + 1900 )
+ #if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
+ ${project.inceptionYear}-${currentYear}${period}
+ #else
+ ${currentYear}${period}
+ #end
+
+ #if ( ${project.organization} )
+ #if ( ${project.organization.name} && ${project.organization.url} )
+ $project.organization.name.
+ #elseif ( ${project.organization.name} )
+ $project.organization.name.
+ #end
+ #end
+ #end
+#end
+
+#macro ( publishDate $position $publishDate $version )
+ #if ( $publishDate && $publishDate.format )
+ #set ( $format = $publishDate.format )
+ #else
+ #set ( $format = "yyyy-MM-dd" )
+ #end
+
+ $dateFormat.applyPattern( $format )
+
+ #set ( $dateToday = $dateFormat.format( $currentDate ) )
+
+ #if ( $publishDate && $publishDate.position )
+ #set ( $datePosition = $publishDate.position )
+ #else
+ #set ( $datePosition = "left" )
+ #end
+
+ #if ( $version )
+ #if ( $version.position )
+ #set ( $versionPosition = $version.position )
+ #else
+ #set ( $versionPosition = "left" )
+ #end
+ #end
+
+ #set ( $breadcrumbs = $decoration.body.breadcrumbs )
+ #set ( $links = $decoration.body.links )
+
+ #if ( $datePosition.equalsIgnoreCase( "right" ) && $links && $links.size() > 0 )
+ #set ( $prefix = " |" )
+ #else
+ #set ( $prefix = "" )
+ #end
+
+ #if ( $datePosition.equalsIgnoreCase( $position ) )
+ #if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
+ $prefix $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
+ #if ( $versionPosition.equalsIgnoreCase( $position ) )
+ | $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+ #end
+ #elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $datePosition.equalsIgnoreCase( "navigation-top" ) ) )
+
+
+ #end
+ #if( $poweredBy.isEmpty() )
+
+
+
+ #end
+ #else
+
+
+
+ #end
+#end
+
+
+
+
+