url parameter in json is ready

Studio-42 · Nov 1, 2011 · 3bf4ce4 · 3bf4ce4
1 parent 6011719
commit 3bf4ce4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 25 deletions.
diff --git a/elfinder-servlet/pom.xml b/elfinder-servlet/pom.xml
@@ -3,7 +3,6 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.elfinder</groupId>
 	<artifactId>elfinder-servlet</artifactId>
-	<packaging>war</packaging>
 	<version>1.0.2-SNAPSHOT</version>
 	<description>Java backend for "elFinder".</description>
 	<build>
@@ -137,4 +136,5 @@
 			<version>1.4</version>
 		</dependency>
 	</dependencies>
+	<packaging>war</packaging>
 </project>
diff --git a/elfinder-servlet/src/main/java/my/elconnector/ElfinderConnectorServlet.java b/elfinder-servlet/src/main/java/my/elconnector/ElfinderConnectorServlet.java
@@ -13,7 +13,7 @@
 import org.elfinder.servlets.config.AbstractConnectorConfig;
 
 /**
- * @author Özkan Pakdil
+ * @author Özkan Pakdil
  * @date 29 aug. 2011
  * @version $Id$
  * @license BSD

diff --git a/elfinder-servlet/src/main/java/my/elconnector/Thumbnailer.java b/elfinder-servlet/src/main/java/my/elconnector/Thumbnailer.java
@@ -35,8 +35,15 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 	private void processRequest(HttpServletRequest request, HttpServletResponse response) throws IOException {
 		int width = (!StringUtils.isEmpty(request.getParameter("w"))) ? Integer.valueOf(request.getParameter("w")) : 150;
 		String path = request.getParameter("p");
+		Boolean real = request.getParameter("r") != null;
 		BufferedImage b = null;
 
+		if (real) {
+			b = ImageIO.read(new File(ElfinderConnectorServlet.HOME_SHARED_DOCS + path));
+			ImageIO.write(b, "png", response.getOutputStream());
+			return;
+		}
+
 		BufferedImage image = ImageIO.read(new File(ElfinderConnectorServlet.HOME_SHARED_DOCS + path));
 
 		ResampleOp rop = new ResampleOp(DimensionConstrain.createMaxDimension(width, -1));

diff --git a/elfinder-servlet/src/main/java/org/elfinder/servlets/commands/AbstractCommand.java b/elfinder-servlet/src/main/java/org/elfinder/servlets/commands/AbstractCommand.java
@@ -491,30 +491,12 @@ protected Map<String, Object> _info(File path) {
 		info.put("write", isDir ? config._isAllowedExistingDir(path, FileActionEnum.WRITE) : config._isAllowedExistingFile(path, FileActionEnum.WRITE));
 		info.put("rm", isDir ? config._isAllowedExistingDir(path, FileActionEnum.DELETE) : config._isAllowedExistingFile(path, FileActionEnum.WRITE));
 
-		if(mimeType.contains("image"))
-		    info.put("tmb", isDir ? "" : encodeFileNameForOutput(_path2url(path)));
-
-		//		if ($type == 'link') {
-		//			if (false == ($lpath = $this->_readlink($path))) {
-		//				$info['mime'] = 'symlink-broken';
-		//				return $info;
-		//			}
-		//			if (is_dir($lpath)) {
-		//				$info['mime']  = 'directory';
-		//			} else {
-		//				$info['parent'] = $this->_hash(dirname($lpath));
-		//				$info['mime']   = $this->_mimetype($lpath);
-		//			}
-		//			$info['link']   = $this->_hash($lpath);
-		//			$info['linkTo'] = ($this->_options['rootAlias'] ? $this->_options['rootAlias'] : basename($this->_options['root'])).substr($lpath, strlen($this->_options['root']));
-		//			$info['read']   = $this->_isAllowed($lpath, 'read');
-		//			$info['write']  = $this->_isAllowed($lpath, 'write');
-		//			$info['rm']     = $this->_isAllowed($lpath, 'rm');
-		//		} else {
-		//			$lpath = '';
-		//		}
+		if(mimeType.contains("image")){
+		    info.put("tmb", encodeFileNameForOutput(_path2url(path)));
+		    info.put("url", encodeFileNameForOutput(_path2url(path)) + "&r=1") ;
+		}
 
-		if (!isDir) {
+		if (!isDir && !mimeType.contains("image")) {
 			if (config.isFileUrlEnabled() && true == (Boolean) info.get("read")) {
 				info.put("url", encodeFileNameForOutput(_path2url(path)));
 			}

diff --git a/elfinder-servlet/src/main/webapp/WEB-INF/web.xml b/elfinder-servlet/src/main/webapp/WEB-INF/web.xml
@@ -15,6 +15,10 @@
 		<param-name>THUMBNAIL</param-name>
 		<param-value>/servlet/thumbnailer?p=</param-value>
 	</context-param>
+	<context-param>
+		<param-name>REALOBJECTURL</param-name>
+		<param-value>/servlet/thumbnailer?p=</param-value>
+	</context-param>
 	<context-param>
 		<param-name>SHARED_DOCS</param-name>
 		<param-value>Shared docsüğişçö</param-value>