Pull latest master into seaside

.gitignore

@@ -11,3 +11,4 @@ connector-svn.php
 node_modules
 connector.php
 .jshintrc
+.idea

Jakefile.js

@@ -34,9 +34,26 @@ var dirmode = 0755,
 			.concat(grep(path.join(src, 'js', 'ui'), '\\.js$'))
 			.concat(grep(path.join(src, 'js', 'commands'), '\\.js$')),
 
+		'elfinder-minimal.full.js':
+			[
+				path.join(src, 'js', 'elFinder.js'),
+				path.join(src, 'js', 'elFinder.version.js'),
+				path.join(src, 'js', 'jquery.elfinder.js'),
+				//path.join(src, 'js', 'elFinder.mimetypes.js'),
+				path.join(src, 'js', 'elFinder.options.js'),
+				//path.join(src, 'js', 'elFinder.options.netmount.js'),
+				path.join(src, 'js', 'elFinder.history.js'),
+				path.join(src, 'js', 'elFinder.command.js'),
+				path.join(src, 'js', 'elFinder.resources.js'),
+				path.join(src, 'js', 'jquery.dialogelfinder.js'),
+				path.join(src, 'js', 'i18n', 'elfinder.en.js')
+			]
+			.concat(grep(path.join(src, 'js', 'ui'), '(button|contextmenu|cwd|dialog|navbar|navdock|overlay|panel|path|searchbutton|sortbutton|stat|toast|toolbar|tree|uploadbutton|viewbutton|workzone)\\.js$'))
+			.concat(grep(path.join(src, 'js', 'commands'), '(colwidth|copy|cut|duplicate|getfile|help|open|mkdir|paste|restore|rm|search|sort|upload|view)\\.js$')),
+
 		'elfinder.full.css': grep(path.join(src, 'css'), '\\.css$', 'elfinder|theme'),
 
-		'images':	grep(path.join(src, 'img'), '\\.png|\\.gif'),
+		'images':	grep(path.join(src, 'img'), '\\.png|\\.gif|\\.svg'),
 
 		'sounds':	grep(path.join(src, 'sounds'), '\\.wav'),
 
@@ -47,6 +64,7 @@ var dirmode = 0755,
 			[
 				path.join(src, 'php', 'autoload.php'),
 				path.join(src, 'php', 'connector.minimal.php-dist'),
+				path.join(src, 'php', 'connector.maximal.php-dist'),
 				path.join(src, 'php', 'mime.types'),
 				path.join(src, 'php', 'MySQLStorage.sql'),
 				path.join(src, 'php', 'elFinderPlugin.php'),
@@ -71,6 +89,17 @@ var dirmode = 0755,
 				path.join(src, 'main.default.js')
 			]
 			.concat(grep(path.join(src, 'js', 'extras'), '\\.js$'))
+			.concat(grep(path.join(src, 'js', 'worker'), '\\.js$')),
+		'misc-minimal' :
+			[
+				path.join(src, 'js', 'proxy', 'elFinderSupportVer1.js'),
+				path.join(src, 'Changelog'),
+				path.join(src, 'LICENSE.md'),
+				path.join(src, 'README.md'),
+				path.join(src, 'composer.json'),
+				path.join(src, 'elfinder-minimal.html'),
+				path.join(src, 'main-minimal.default.js')
+			]
 	};
 
 // editors files
@@ -172,7 +201,7 @@ task('prebuild', function(){
 	console.log('build dir:  ' + path.resolve());
 	console.log('src dir:    ' + src);
 	var dir = ['css', 'js', 'img', 'sounds',
-			path.join('js', 'i18n'), path.join('js', 'i18n', 'help'), path.join('js', 'extras'), path.join('js', 'proxy'),
+			path.join('js', 'i18n'), path.join('js', 'i18n', 'help'), path.join('js', 'extras'), path.join('js', 'worker'), path.join('js', 'proxy'), path.join('js', 'worker'),
 			'php',
 			path.join('php', '.tmp'), path.join('php', 'libs'), path.join('php', 'resources'),
 			'files', path.join('files', '.trash')],
@@ -200,7 +229,12 @@ task('prebuild', function(){
 });
 
 desc('build elFinder');
-task({'elfinder': ['prebuild', 'css/elfinder.min.css', 'js/elfinder.min.js', 'misc', 'js/extras']}, function(){
+task({'elfinder': ['clean', 'prebuild', 'css/elfinder.min.css', 'js/elfinder.min.js', 'misc', 'js/extras', 'js/worker']}, function(){
+	console.log('elFinder build done');
+});
+
+desc('minimal build elFinder');
+task({'elfinder-minimal': ['clean', 'prebuild', 'css/elfinder.min.css', 'js/elfinder-minimal.min.js', 'misc-minimal']}, function(){
 	console.log('elFinder build done');
 });
 
@@ -260,6 +294,40 @@ file({'js/elfinder.full.js': files['elfinder.full.js']}, function(){
 	fs.writeFileSync(this.name, buildComment() + data);
 });
 
+desc('concat elfinder-minimal.full.js');
+file({'js/elfinder-minimal.full.js': files['elfinder-minimal.full.js']}, function(){
+	console.log('concat elfinder-minimal.full.js');
+	var strict = new RegExp('"use strict"\;?\n?');
+	var elf = files['elfinder-minimal.full.js'];
+	var data = '';
+	for (var f in elf) {
+		file = elf[f];
+		console.log('\t' + file);
+		data += '\n\n/*\n * File: ' + file.replace(src, '') + '\n */\n\n';
+		data += fs.readFileSync(file);
+		data = data.replace(strict, '');
+	}
+	data = "(function(root, factory) {\n" +
+	"	if (typeof define === 'function' && define.amd) {\n" +
+	"		// AMD\n" +
+	"		define(['jquery','jquery-ui'], factory);\n" +
+	"	} else if (typeof exports !== 'undefined') {\n" +
+	"		// CommonJS\n" +
+	"		var $, ui;\n" +
+	"		try {\n" +
+	"			$ = require('jquery');\n" +
+	"			ui = require('jquery-ui');\n" +
+	"		} catch (e) {}\n" +
+	"		module.exports = factory($, ui);\n" +
+	"	} else {\n" +
+	"		// Browser globals (Note: root is window)\n" +
+	"		factory(root.jQuery, root.jQuery.ui, true);\n" +
+	"	}\n" +
+	"}(this, function($, _ui, toGlobal) {\n" +
+	"toGlobal = toGlobal || false;\n" + data + '\nreturn elFinder;\n}));'; // add UMD closure
+	fs.writeFileSync(this.name, buildComment() + data);
+});
+
 desc('uglify elfinder.min.js');
 file({'js/elfinder.min.js': ['js/elfinder.full.js']}, function () {
 	console.log('uglify elfinder.min.js');
@@ -277,6 +345,23 @@ file({'js/elfinder.min.js': ['js/elfinder.full.js']}, function () {
 	fs.writeFileSync(this.name, buildComment() + result);
 });
 
+desc('uglify elfinder-minimal.min.js');
+file({'js/elfinder-minimal.min.js': ['js/elfinder-minimal.full.js']}, function () {
+	console.log('uglify elfinder-minimal.min.js');
+	var result;
+	if (typeof ugjs.minify == 'undefined') {
+		var ugp  = ugjs.parser;
+		var ugu  = ugjs.uglify;
+		var ast = ugp.parse(fs.readFileSync('js/elfinder-minimal.full.js').toString()); // parse code and get the initial AST
+		ast = ugu.ast_mangle(ast); // get a new AST with mangled names
+		ast = ugu.ast_squeeze(ast); // get an AST with compression optimizations
+		result = ugu.split_lines(ugu.gen_code(ast), 1024 * 8); // insert new line every 8 kb
+	} else {
+		result = ugjs.minify('js/elfinder-minimal.full.js').code;
+	}
+	fs.writeFileSync(this.name, buildComment() + result);
+});
+
 // IMG + SOUNDS + I18N + PHP
 desc('copy misc files');
 task('misc', function(){
@@ -305,6 +390,25 @@ task('misc', function(){
 	//copyFile(cs, cd);
 });
 
+// IMG + SOUNDS + I18N + PHP
+desc('copy misc files');
+task('misc-minimal', function(){
+	console.log('copy misc files');
+	var cf = files['images']
+		.concat(files['sounds'])
+		.concat(files['i18n'])
+		.concat(path.join(src, 'css', 'theme.css'))
+		.concat(files['php'])
+		.concat(files['misc-minimal'])
+		.concat(path.join(src, 'files', '.gitignore'))
+		.concat(path.join(src, 'files', '.trash', '.gitignore'));
+	for (i in cf)
+	{
+		var dst = cf[i].replace(src, '').substr(1);
+		copyFile(cf[i], dst);
+	}
+});
+
 desc('uglify js/extras');
 task('js/extras', function(){
 	var files = grep(path.join(src, 'js', 'extras'), '\\.js$');
@@ -366,7 +470,7 @@ task('clean', function(){
 	if (src != path.resolve()) {
 		var ud = [
 			'css', 'img', 'sounds', path.join('files', '.trash'), 'files',
-			path.join('js', 'proxy'), path.join('js', 'i18n', 'help'), path.join('js', 'i18n'), path.join('js', 'extras'), 'js',
+			path.join('js', 'proxy'), path.join('js', 'i18n', 'help'), path.join('js', 'i18n'), path.join('js', 'extras'), path.join('js', 'worker'), 'js',
 			path.join('php', '.tmp'), path.join('php', 'libs'), path.join('php', 'resources')]
 			.concat(grep(path.join('php', 'editors')))
 			.concat(grep(path.join('php', 'plugins')))

LICENSE.md

@@ -1,6 +1,6 @@
 elFinder is issued under a 3-clauses BSD license.
 
-Copyright (c) 2009-2016, Studio 42
+Copyright (c) 2009-2018, Studio 42
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

README.md

@@ -1,23 +1,16 @@
 elFinder
 ========
 
-**WARNING: IF YOU HAVE OLDER (IN PARTICULAR 2.1.20 OR EARLIER) VERSIONS OF ELFINDER ON PUBLIC SERVERS, IT MAY CAUSE SERIOUS DAMAGE TO YOUR SERVER AND VISITED USER. YOU SHOULD UPDATE TO THE LATEST VERSION OR REMOVE IT FROM THE SERVER.**
+**WARNING: IF YOU HAVE OLDER (IN PARTICULAR 2.1.48 OR EARLIER) VERSIONS OF ELFINDER ON PUBLIC SERVERS, IT MAY CAUSE SERIOUS DAMAGE TO YOUR SERVER AND VISITED USER. YOU SHOULD UPDATE TO THE LATEST VERSION OR REMOVE IT FROM THE SERVER.**
 
-<pre>
-      _ ______ _           _           
-     | |  ____(_)         | |          
-  ___| | |__   _ _ __   __| | ___ _ __ 
- / _ \ |  __| | | '_ \ / _` |/ _ \ '__|
-|  __/ | |    | | | | | (_| |  __/ |   
- \___|_|_|    |_|_| |_|\__,_|\___|_|   
-</pre>
+[![elFinder file manager for the Web](https://studio-42.github.io/elFinder/images/elFinderScr.png "elFinder file manager for the Web")](https://studio-42.github.io/elFinder/)
 
 elFinder is an open-source file manager for web, written in JavaScript using
 jQuery UI. Creation is inspired by simplicity and convenience of Finder program
 used in Mac OS X operating system.
 
-[![Download now!](http://studio-42.github.io/elFinder/images/download-icon.png)](https://github.com/Studio-42/elFinder/releases/latest)
-[![Packagist License](https://poser.pugx.org/studio-42/elfinder/license.png)](http://choosealicense.com/licenses/bsd-3-clause/)
+[![Download now!](https://studio-42.github.io/elFinder/images/download-icon.png)](https://github.com/Studio-42/elFinder/releases/latest)
+[![Packagist License](https://poser.pugx.org/studio-42/elfinder/license.png)](https://choosealicense.com/licenses/bsd-3-clause/)
 [![Latest Stable Version](https://poser.pugx.org/studio-42/elfinder/version.png)](https://packagist.org/packages/studio-42/elfinder)
 [![Total Downloads](https://poser.pugx.org/studio-42/elfinder/d/total.png)](https://packagist.org/packages/studio-42/elfinder)
 [![CDNJS version](https://img.shields.io/cdnjs/v/elfinder.svg)](https://cdnjs.com/libraries/elfinder)
@@ -54,7 +47,8 @@ Features
    upload, create folder/file, rename, etc.)
  * High performance server backend and light client UI
  * Multi-root support
- * Local file system, MySQL, FTP volume storage drivers
+ * Local file system, MySQL, FTP, Box, Dropbox, GoogleDrive and OneDrive volume storage drivers
+ * Support AWS S3, Azure, Digital Ocean Spaces and more with [League\Flysystem](https://github.com/barryvdh/elfinder-flysystem-driver) Flysystem driver
  * Cloud storage (Box, Dropbox, GoogleDrive and OneDrive) drivers
  * Background file/folder upload with Drag & Drop HTML5 support
  * Chunked file upload for large file
@@ -92,17 +86,20 @@ Requirements
 ------------
 ### jQuery / jQuery UI
  * jQuery 1.8.0+
- * jQuery UI 1.9.0+ (require selectable, draggable, droppable and resizable)
+ * jQuery UI 1.9.0+
+    * Required: draggable, droppable, resizable, selectable, button and slider
+    * Recommend: sorter (To make sortable the List column and the Places)
 
 **However, we recommend newest version.**
 
 ### Client
- * Modern browser. elFinder was tested in Internet Explorer 8
-   and newest Firefox, Chrome, IE, Edge and Opera
+ * Modern browsers both of desktop or mobile. elFinder was tested in newest Chrome, Edge, Firefox, IE and Opera
+     - **Caution**: Web App mode ("apple-mobile-web-app-capable" meta tag) on iOS is not work perfectly in elFinder
 
 ### Server
  * Any web server
  * PHP 5.2+ (Recommend PHP 5.4 or higher) And for thumbnails - GD / Imagick module / convert(imagemagick) require
+     * Recommend PHP 7.1 or higher to supports non-ASCII character of file path/name on the Windows server
 
 Installation
 ------------
@@ -127,7 +124,7 @@ Installation
 Downloads
 ------------
 **Stable releases** ([Changelog](https://github.com/Studio-42/elFinder/blob/master/Changelog))
- + [elFinder 2.1.30](https://github.com/Studio-42/elFinder/archive/2.1.30.zip)
+ + [elFinder 2.1.56](https://github.com/Studio-42/elFinder/archive/2.1.56.zip)
  + [elFinder 2.0.9](https://github.com/Studio-42/elFinder/archive/2.0.9.zip) (deprecated)
 
 **Nightly builds**
@@ -157,28 +154,39 @@ You can create or modify the language file to use translation tool. Please refer
 
 3rd party connectors
 --------------------
- * [ASP.NET](https://github.com/leniel/elFinder.Net)
  * [ASP.NET Core](https://github.com/gordon-matt/elFinder.NetCore)
+ * [ASP.NET](https://github.com/leniel/elFinder.Net)
  * [Java Servlet](https://github.com/trustsystems/elfinder-java-connector)
+ * [JavaScript/Efw](https://github.com/efwGrp/efw3.X/blob/master/help/tag.elfinder.md)
+ * [Nodejs](https://github.com/dekyfin/elfinder-node)
  * [Python](https://github.com/Studio-42/elfinder-python)
  * [Ruby/Rails](https://github.com/phallstrom/el_finder)
- * [Django](https://github.com/mikery/django-elfinder)
- * [Laravel](https://github.com/barryvdh/laravel-elfinder)
- * [JavaScript/Efw](https://github.com/efwGrp/efw3.X/blob/master/help/api_efw_tag.md#elfinder-tag)
- * [Symfony](https://github.com/helios-ag/FMElfinderBundle) 
 
 3rd party Volume Drivers
 --------------------
- * [League\Flysystem (PHP)](https://github.com/barryvdh/elfinder-flysystem-driver) (for elFinder 2.1+)
+ * [League\Flysystem (PHP)](https://github.com/barryvdh/elfinder-flysystem-driver) (for elFinder 2.1+) driver for the [Flysystem](https://github.com/thephpleague/flysystem)
 
 3rd party Themes
 --------------------
 Hint: [How to load CSS with RequireJS?](https://github.com/Studio-42/elFinder/wiki/How-to-load-CSS-with-RequireJS%3F)
 
  * [lokothodida/elfinder-theme-moono](https://github.com/lokothodida/elfinder-theme-moono)
  * [lokothodida/elfinder-theme-windows-10](https://github.com/lokothodida/elfinder-theme-windows-10)
- * [StudioJunkyard/elfinder-boostrap-theme](https://github.com/StudioJunkyard/LibreICONS/tree/master/themes/elFinder)
  * [RobiNN1/elFinder-Material-Theme](https://github.com/RobiNN1/elFinder-Material-Theme)
+ * [StudioJunkyard/elfinder-boostrap-theme](https://github.com/StudioJunkyard/LibreICONS/tree/master/themes/elFinder)
+
+3rd party Integrations
+--------------------
+ * [Django](https://github.com/mikery/django-elfinder)
+ * [Drupal](https://www.drupal.org/project/elfinder)
+ * [Laravel](https://github.com/barryvdh/laravel-elfinder)
+ * [Roundcube](https://github.com/Offerel/roundcube_elfinder)
+ * [Symfony](https://github.com/helios-ag/FMElfinderBundle)
+ * [Tiki Wiki](https://doc.tiki.org/elFinder)
+ * [WordPress](https://wordpress.org/plugins/file-manager/)
+ * [XOOPS](https://github.com/nao-pon/xelfinder)
+ * [Yii](http://www.yiiframework.com/extension/elfinder/)
+ * [Zenphoto](http://www.zenphoto.org/news/elfinder/)
 
 Support
 -------
@@ -192,10 +200,11 @@ Support
 Authors
 -------
 
+ * Current main developer: Naoki Sawada <hypweb+elfinder@gmail.com>
  * Chief developer: Dmitry "dio" Levashov <dio@std42.ru>
  * Maintainer: Troex Nevelin <troex@fury.scancode.ru>
- * Developers: Alexey Sukhotin <strogg@yandex.ru>, Naoki Sawada <hypweb@gmail.com>
- * Icons: [PixelMixer](http://pixelmixer.ru), [Yusuke Kamiyamane](http://p.yusukekamiyamane.com)
+ * Developers: Alexey Sukhotin <strogg@yandex.ru>, Naoki Sawada <hypweb+elfinder@gmail.com>
+ * Icons: PixelMixer, [Yusuke Kamiyamane](http://p.yusukekamiyamane.com), [Icons8](https://icons8.com)
 
 We hope our tools will be helpful for you.
 

composer.json

@@ -17,7 +17,7 @@
         {
             "name":     "Naoki Sawada",
             "homepage": "http://xoops.hypweb.net",
-            "email":    "hypweb@gmail.com"
+            "email":    "hypweb+elfinder@gmail.com"
         },
         {
             "name":     "Community contributions",