Merge branch '2.x' of github.com:Studio-42/elFinder into 2.x

miguelitos · Nov 9, 2011 · 1cfd899 · 1cfd899
2 parents f6bd434 + 0a77ce5
commit 1cfd899
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 58 deletions.
diff --git a/elfinder.src.html b/elfinder.src.html
@@ -144,9 +144,9 @@
 				// url : 'php/connector.php',
 				url : 'php/connector.php',
 				// transport : new elFinderSupportVer1(),
-				getFileCallback : function(files, fm) {
-					console.log(files);
-				},
+				// getFileCallback : function(files, fm) {
+				// 	console.log(files);
+				// },
 				handlers : {
 					load : function(e, fm) {
 						// fm.error('All your base belongs to us >_<')

diff --git a/js/commands/open.js b/js/commands/open.js
@@ -64,7 +64,7 @@ elFinder.prototype.commands.open = function() {
 				return dfrd.reject(['errOpen', file.name, 'errPerm']);
 			}
 
-			if (!(url = fm.url(file.thash || file.hash))) {
+			if (!(url = fm.url(/*file.thash || */file.hash))) {
 				url = fm.options.url;
 				url = url + (url.indexOf('?') === -1 ? '?' : '&')
 					+ (fm.oldAPI ? 'cmd=open&current='+file.phash : 'cmd=file')

diff --git a/js/elFinder.js b/js/elFinder.js
@@ -234,7 +234,7 @@ window.elFinder = function(node, opts) {
 				f = data[l];
 				if (f.name && f.hash && f.mime) {
 					files[f.hash] = f;
-				}
+				} 
 			}
 		},
 
@@ -632,19 +632,7 @@ window.elFinder = function(node, opts) {
 		if (cwdOptions.url) {
 			return cwdOptions.url + $.map(this.path2array(hash), function(n) { return encodeURIComponent(n); }).slice(1).join('/')
 		}
-
-		var file = files[hash],
-			path = '';
 
-		if (file.url) {
-			return file.url;
-		}
-
-		if (cwdOptions.url && (path = this.path(hash))) {
-			path = path.split(cwdOptions.separator).join('/');
-			this.log(path)
-			return cwdOptions.url + path.substr(path.indexOf('/')+1);
-		}
 		return '';
 	}
 

diff --git a/js/elFinder.options.js b/js/elFinder.options.js
@@ -77,7 +77,7 @@ elFinder.prototype._options = {
 	 * @type Object
 	 * @default  {}
 	 */
-	customData : {token : '42', test : 'test'},
+	customData : {},
 
 	/**
 	 * Event listeners to bind on elFinder init

diff --git a/js/i18n/elfinder.en.js b/js/i18n/elfinder.en.js
@@ -73,6 +73,7 @@ if (elFinder && elFinder.prototype && typeof(elFinder.prototype.i18) == 'object'
 			'errArcMaxSize'        : 'Archive files exceeds maximum allowed size.',
 			'errResize'            : 'Unable to resize "$1".',
 			'errUsupportType'      : 'Unsupported file type.',
+			'errNotUTF8Content'    : 'File "$1" is not in UTF-8 and cannot be edited.',  // added 9.11.2011
 
 			/******************************* commands names ********************************/
 			'cmdarchive'   : 'Create archive',

diff --git a/php/connector.php b/php/connector.php
@@ -306,7 +306,7 @@ function validName($name) {
 
 		array(
 			'driver' => 'FTP',
-			'host' => '192.168.1.36',
+			'host' => '192.168.1.38',
 			'user' => 'dio',
 			'pass' => 'hane',
 			'path' => '/Users/dio/Documents',
@@ -322,13 +322,14 @@ function validName($name) {
 
 			)
 		),
-		// array(
-		// 	'driver' => 'FTP',
-		// 	'host' => 'work.std42.ru',
-		// 	'user' => 'dio',
-		// 	'pass' => '123456',
-		// 	'path' => '/'
-		// ),
+		array(
+			'driver' => 'FTP',
+			'host' => 'work.std42.ru',
+			'user' => 'dio',
+			'pass' => '123456',
+			'path' => '/',
+			'tmpPath' => '../files/ftp',
+		),
 		// array(
 		// 	'driver' => 'FTP',
 		// 	'host' => '192.168.1.35',

diff --git a/php/elFinder.class.php b/php/elFinder.class.php
@@ -158,6 +158,7 @@ class elFinder {
 	const ERROR_ARC_MAXSIZE       = 'errArcMaxSize';
 	const ERROR_RESIZE            = 'errResize';
 	const ERROR_UNSUPPORT_TYPE    = 'errUsupportType';
+	const ERROR_NOT_UTF8_CONTENT  = 'errNotUTF8Content';
 
 	/**
 	 * Constructor
@@ -885,9 +886,17 @@ protected function get($args) {
 			return array('error' => $this->error(self::ERROR_OPEN, '#'.$target, self::ERROR_FILE_NOT_FOUND));
 		}
 
-		return ($content = $volume->getContents($target)) === false
-			? array('error' => $this->error(self::ERROR_OPEN, $volume->path($target), $volume->error()))
-			: array('content' => $content);
+		if (($content = $volume->getContents($target)) === false) {
+			return array('error' => $this->error(self::ERROR_OPEN, $volume->path($target), $volume->error()));
+		}
+
+		$json = json_encode($content);
+
+		if ($json == 'null' && strlen($json) < strlen($content)) {
+			return array('error' => $this->error(self::ERROR_NOT_UTF8_CONTENT, $volume->path($target)));
+		}
+
+		return array('content' => $content);
 	}
 
 	/**

diff --git a/php/elFinderConnector.class.php b/php/elFinderConnector.class.php
@@ -105,7 +105,7 @@ public function run() {
 	protected function output(array $data) {
 		$header = isset($data['header']) ? $data['header'] : $this->header;
 		unset($data['header']);
-		ob_end_clean();
+		// ob_end_clean();
 		if ($header) {
 			if (is_array($header)) {
 				foreach ($header as $h) {

diff --git a/php/elFinderVolumeDriver.class.php b/php/elFinderVolumeDriver.class.php
@@ -1364,7 +1364,7 @@ public function upload($fp, $dst, $name, $tmpname) {
 			$w = $s[0];
 			$h = $s[1];
 		}
-
+		// $this->clearcache();
 		if (($path = $this->_save($fp, $dstpath, $name, $mime, $w, $h)) == false) {
 			return false;
 		}
@@ -1373,7 +1373,7 @@ public function upload($fp, $dst, $name, $tmpname) {
 		if (isset($removed)) {
 			$this->removed[] = $removed;
 		}
-		
+
 		return $this->stat($path);
 	}
 

diff --git a/php/elFinderVolumeFTP.class.php b/php/elFinderVolumeFTP.class.php
@@ -660,16 +660,13 @@ protected function _fopen($path, $mode='rb') {
 
 		if ($this->tmp) {
 			$local = $this->tmp.DIRECTORY_SEPARATOR.md5($path);
-			// $local = $this->tmp.DIRECTORY_SEPARATOR.basename($path);
-			// $mime = $this->mimetype(basename($path));
+
 			if (ftp_get($this->connect, $local, $path, FTP_BINARY)) {
-				return @fopen($local, 'r');
+				return @fopen($local, $mode);
 			}
 		}
 
 		return false;
-
-		return @fopen($path, $mode);
 	}
 
 	/**
@@ -834,20 +831,10 @@ protected function _rmdir($path) {
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _save($fp, $dir, $name, $mime, $w, $h) {
-		die('Not yet implemented. (_save)');
-		$path = $dir.DIRECTORY_SEPARATOR.$name;
-
-		if (!($target = @fopen($path, 'wb'))) {
-			return false;
-		}
-
-		while (!feof($fp)) {
-			fwrite($target, fread($fp, 8192));
-		}
-		fclose($target);
-		@chmod($path, $this->options['fileMode']);
-		clearstatcache();
-		return $path;
+		$path = $dir.'/'.$name;
+		return ftp_fput($this->connect, $path, $fp, strpos($this->mimetype($path), 'text/') === 0 ? FTP_ASCII : FTP_BINARY)
+			? $path
+			: false;
 	}
 
 	/**
@@ -858,8 +845,15 @@ protected function _save($fp, $dir, $name, $mime, $w, $h) {
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _getContents($path) {
-		ie('Not yet implemented. (_getContents)');
-		return file_get_contents($path);
+		$contents = '';
+		if (($fp = $this->_fopen($path))) {
+			while (!feof($fp)) {
+			  $contents .= fread($fp, 8192);
+			}
+			$this->_fclose($fp, $path);
+			return $contents;
+		}
+		return false;
 	}
 
 	/**
@@ -871,12 +865,22 @@ protected function _getContents($path) {
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _filePutContents($path, $content) {
-		die('Not yet implemented. (_filePutContents)');
-		if (@file_put_contents($path, $content, LOCK_EX) !== false) {
-			clearstatcache();
-			return true;
+		$res = false;
+
+		if ($this->tmp) {
+			$local = $this->tmp.DIRECTORY_SEPARATOR.md5($path).'.txt';
+
+			if (@file_put_contents($local, $content, LOCK_EX) !== false
+			&& ($fp = @fopen($local, 'rb'))) {
+				clearstatcache();
+				$mode = strpos($this->mimetype($path), 'text/') === 0 ? FTP_ASCII : FTP_BINARY;
+				$res  = ftp_fput($this->connect, $path, $fp, $mode);
+				@fclose($fp);
+			}
+			file_exists($local) && @unlink($local);
 		}
-		return false;
+
+		return $res;
 	}
 
 	/**