elFinder up to newly ( nao-pon/elFinder@75f5da2 )

nao-pon · Jan 23, 2013 · 41a6794 · 41a6794
1 parent f7c80c9
commit 41a6794
Show file tree

Hide file tree

Showing 11 changed files with 378 additions and 18 deletions.
diff --git a/html/common/elfinder/README.md b/html/common/elfinder/README.md
@@ -25,8 +25,8 @@ Features
  * Local file system, MySQL, FTP volume storage drivers
  * Background file upload with Drag & Drop HTML5 support
  * List and Icons view
- * Kayboard shortcuts
- * Standart methods of file/group selection using mouse or keyboard
+ * Keyboard shortcuts
+ * Standard methods of file/group selection using mouse or keyboard
  * Move/Copy files with Drag & Drop
  * Archives create/extract (zip, rar, 7z, tar, gzip, bzip2)
  * Rich context menu and toolbar

diff --git a/html/common/elfinder/css/elfinder.full.css b/html/common/elfinder/css/elfinder.full.css
@@ -1,6 +1,6 @@
 /*!
  * elFinder - file manager for web
- * Version 2.0 rc1 (2013-01-16)
+ * Version 2.x_n (Nightly: 75f5da2) (2013-01-23)
  * http://elfinder.org
  * 
  * Copyright 2009-2012, Studio 42

diff --git a/html/common/elfinder/css/elfinder.min.css b/html/common/elfinder/css/elfinder.min.css
diff --git a/html/common/elfinder/js/elFinder.js b/html/common/elfinder/js/elFinder.js
@@ -477,7 +477,7 @@ window.elFinder = function(node, opts) {
 		}
 	})();
 
-	this.viewType = this.storage('view') || this.options.defaultView || 'icons',
+	this.viewType = this.storage('view') || this.options.defaultView || 'icons';
 
 	this.sortType = this.storage('sortType') || this.options.sortType || 'name';
 

diff --git a/html/common/elfinder/js/elFinder.version.js b/html/common/elfinder/js/elFinder.version.js
@@ -3,5 +3,5 @@
  *
  * @type String
  **/
-elFinder.prototype.version = '2.x_n (Nightly: bd66a81)';
+elFinder.prototype.version = '2.x_n (Nightly: 75f5da2)';
 
diff --git a/html/common/elfinder/js/elfinder.full.js b/html/common/elfinder/js/elfinder.full.js
@@ -1,6 +1,6 @@
 /*!
  * elFinder - file manager for web
- * Version 2.x_n (Nightly: bd66a81) (2013-01-16)
+ * Version 2.x_n (Nightly: 75f5da2) (2013-01-23)
  * http://elfinder.org
  * 
  * Copyright 2009-2012, Studio 42
@@ -491,7 +491,7 @@ window.elFinder = function(node, opts) {
 		}
 	})();
 
-	this.viewType = this.storage('view') || this.options.defaultView || 'icons',
+	this.viewType = this.storage('view') || this.options.defaultView || 'icons';
 
 	this.sortType = this.storage('sortType') || this.options.sortType || 'name';
 
@@ -2933,7 +2933,7 @@ elFinder.prototype = {
  *
  * @type String
  **/
-elFinder.prototype.version = '2.x_n (Nightly: bd66a81)';
+elFinder.prototype.version = '2.x_n (Nightly: 75f5da2)';
 
 
 

diff --git a/html/common/elfinder/js/elfinder.min.js b/html/common/elfinder/js/elfinder.min.js
diff --git a/html/common/elfinder/js/i18n/elfinder.el.js b/html/common/elfinder/js/i18n/elfinder.el.js
diff --git a/html/common/elfinder/js/i18n/elfinder.pt_BR.js b/html/common/elfinder/js/i18n/elfinder.pt_BR.js
@@ -1,7 +1,7 @@
 /**
  * Brazilian Portuguese translation
  * @author Leandro Carvalho <contato@leandrowebdev.net>
- * @version 2011-07-09
+ * @version 2013-01-22
  */
 if (elFinder && elFinder.prototype && typeof(elFinder.prototype.i18) == 'object') {
 	elFinder.prototype.i18.pt_BR = {
@@ -167,7 +167,7 @@ if (elFinder && elFinder.prototype && typeof(elFinder.prototype.i18) == 'object'
 			'apllyAll'        : 'Aplicar a todos',
 			'name'            : 'Nome',
 			'size'            : 'Tamanho',
-			'perms'           : 'Permições',
+			'perms'           : 'Permissões',
 			'modify'          : 'Modificado',
 			'kind'            : 'Tipo',
 			'read'            : 'Ler',

diff --git a/xoops_trust_path/libs/elfinder/README.md b/xoops_trust_path/libs/elfinder/README.md
@@ -25,8 +25,8 @@ Features
  * Local file system, MySQL, FTP volume storage drivers
  * Background file upload with Drag & Drop HTML5 support
  * List and Icons view
- * Kayboard shortcuts
- * Standart methods of file/group selection using mouse or keyboard
+ * Keyboard shortcuts
+ * Standard methods of file/group selection using mouse or keyboard
  * Move/Copy files with Drag & Drop
  * Archives create/extract (zip, rar, 7z, tar, gzip, bzip2)
  * Rich context menu and toolbar

diff --git a/xoops_trust_path/libs/elfinder/php/elFinderVolumeDriver.class.php b/xoops_trust_path/libs/elfinder/php/elFinderVolumeDriver.class.php
@@ -674,10 +674,15 @@ public function mount(array $opts) {
 		$type = strtolower($this->options['mimeDetect']);
 		$type = preg_match('/^(finfo|mime_content_type|internal|auto)$/i', $type) ? $type : 'auto';
 		$regexp = '/text\/x\-(php|c\+\+)/';
-		
+
 		if (($type == 'finfo' || $type == 'auto') 
-		&& class_exists('finfo')
-		&& preg_match($regexp, array_shift(($tmp = explode(';', @finfo_file(finfo_open(FILEINFO_MIME), __FILE__)))))) {
+		&& class_exists('finfo')) {
+			$tmpFileInfo = @explode(';', @finfo_file(finfo_open(FILEINFO_MIME), __FILE__));
+		} else {
+			$tmpFileInfo = false;
+		}
+
+		if ($tmpFileInfo && preg_match($regexp, array_shift($tmpFileInfo))) {
 			$type = 'finfo';
 			$this->finfo = finfo_open(FILEINFO_MIME);
 		} elseif (($type == 'mime_content_type' || $type == 'auto')