Merge pull request #20 from fabriceci/issue-18

PR - Issue 18
psolom · Aug 6, 2016 · c866e93 · c866e93
2 parents 3721025 + 5946ad4
commit c866e93
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 21 deletions.
diff --git a/connectors/php/LocalFilemanager.php b/connectors/php/LocalFilemanager.php
@@ -846,11 +846,8 @@ protected function get_file_info($relative_path, $thumbnail = false)
 
 				if($this->config['options']['showThumbs'] && in_array(strtolower($fileType), array_map('strtolower', $this->config['images']['imagesExt']))) {
 					// svg should not be previewed as raster formats images
-					if($fileType === 'svg') {
-						$thumbPath = $relative_path;
-					} else {
-						$thumbPath = $this->connector_script_url . '?mode=getimage&path=' . rawurlencode($relative_path) . '&time=' . time();
-						if($thumbnail) $thumbPath .= '&thumbnail=true';
+					if($thumbnail && $fileType !== 'svg'){
+						$thumbPath = $this->connector_script_url . '?mode=getimage&path=' . rawurlencode($relative_path) . '&time=' . time() . '&thumbnail=true' ;
 					}
 
 					if($item['Properties']['Size']) {
@@ -872,11 +869,7 @@ protected function get_file_info($relative_path, $thumbnail = false)
 		$item['File Type'] = $fileType;
 		$item['Protected'] = $protected;
 		$item['Thumbnail'] = $thumbPath;
-		// for preview mode only
-		if($thumbnail === false) {
-			$item['Preview'] = $this->getDynamicPath($current_path);
-		}
-
+		$item['Preview'] = $this->getDynamicPath($current_path);
 		$item['Properties']['Date Modified'] = $this->formatDate($filemtime);
 		//$item['Properties']['Date Created'] = $this->formatDate(filectime($current_path)); // PHP cannot get create timestamp
 		$item['Properties']['filemtime'] = $filemtime;
@@ -1271,4 +1264,4 @@ protected function createThumbnail($imagePath, $thumbnailPath)
 		}
 	}
 
-}
+}
diff --git a/scripts/filemanager.js b/scripts/filemanager.js
@@ -22,6 +22,29 @@ $.urlParam = function(name) {
 	}
 };
 
+// function to normalize a path (source: https://github.com/dfkaye/simple-path-normalize)
+var normalizePath = function(path){
+	var BLANK = ''; var SLASH = '/'; var DOT = '.';var DOTS = DOT.concat(DOT);
+ 	if (!path || path === SLASH) {
+		return SLASH;
+	}
+
+	var src = path.split(SLASH);
+	var target = (path[0] === SLASH || path[0] === DOT) ? [BLANK] : [];
+	var i, len, token;
+	for (i = 0, len = src.length; i < len; ++i) {
+		token = src[i] || BLANK;
+		if (token === DOTS) {
+			if (target.length > 1) {
+				target.pop();
+			}
+		} else if (token !== BLANK && token !== DOT) {
+			target.push(token);
+		}
+	}
+	return target.join(SLASH).replace(/[\/]{2, }/g, SLASH) || SLASH;
+};
+
 /*---------------------------------------------------------
   Setup, Layout, and Status Functions
 ---------------------------------------------------------*/
@@ -514,9 +537,13 @@ var isDocumentFile = function(filename) {
 	}
 };
 
-// Build url to preview office and media files
+// Build url to preview files
 var createPreviewUrl = function(path) {
-	return location.origin + location.pathname + path;
+	// already an absolute path
+	if(path.substr(0,4) === 'http' || path.substr(0,3) === 'ftp')
+		return path;
+
+	return location.origin + normalizePath(location.pathname + path);
 };
 
 // Return HTML video player
@@ -843,7 +870,6 @@ var createFileTree = function() {
 	});
 };
 
-
 /*---------------------------------------------------------
   Item Actions
 ---------------------------------------------------------*/
@@ -856,9 +882,9 @@ var createFileTree = function() {
 // NOTE: closes the window when finished.
 var selectItem = function(data) {
 	if(config.options.baseUrl !== false ) {
-		var url = smartPath(baseUrl, data['Path'].replace(fileRoot, ""));
+		var url = smartPath(baseUrl, data['Preview'].replace(fileRoot, ""));
 	} else {
-		var url = data['Path'];
+		var url = createPreviewUrl(data['Preview']);
 	}
 
 	if(window.opener || window.tinyMCEPopup || $.urlParam('field_name') || $.urlParam('CKEditorCleanUpFuncNum') || $.urlParam('CKEditor') || $.urlParam('ImperaviElementId')) {
@@ -1837,7 +1863,7 @@ var getFileInfo = function(file) {
 
 		$fileinfo.find('#main-title > h1').text(data['Filename']).attr('title', file);
 
-		$fileinfo.find('img').attr('src', data['Thumbnail']);
+		$fileinfo.find('img').attr('src', createPreviewUrl(data["Preview"]));
 		if(isVideoFile(data['Filename']) && config.videos.showVideoPlayer == true) {
 			getVideoPlayer(data);
 		}
@@ -1855,9 +1881,9 @@ var getFileInfo = function(file) {
 		}
 
 		if(config.options.baseUrl !== false ) {
-			var url = smartPath(baseUrl, data['Path'].replace(fileRoot, ""));
+			var url = smartPath(baseUrl, data['Preview'].replace(fileRoot, ""));
 		} else {
-			var url = data['Path'];
+			var url = createPreviewUrl(data['Preview']);
 		}
 		if(data['Protected']==0) {
 			$fileinfo.find('div#tools').append(' <a id="copy-button" data-clipboard-text="'+ url + '" title="' + lg.copy_to_clipboard + '" href="#"><span>' + lg.copy_to_clipboard + '</span></a>');