Skip to content

Commit

Permalink
Update elFinder to 2.1.24.
Browse files Browse the repository at this point in the history
  • Loading branch information
rob006 committed Jun 4, 2017
1 parent e0a15c3 commit 6a75223
Show file tree
Hide file tree
Showing 104 changed files with 28,336 additions and 8,384 deletions.
7 changes: 1 addition & 6 deletions ElFinderConnectorAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,7 @@ public function run() {
Yii::import('elFindervendor.php.elFinderSessionInterface');

$php_path = Yii::getPathOfAlias('elFindervendor.php');
require_once($php_path . '/elFinder.class.php');
require_once($php_path . '/elFinderConnector.class.php');
require_once($php_path . '/elFinderVolumeDriver.class.php');
require_once($php_path . '/elFinderVolumeLocalFileSystem.class.php');
require_once($php_path . '/elFinderVolumeMySQL.class.php');
require_once($php_path . '/elFinderVolumeFTP.class.php');
require_once($php_path . '/autoload.php');

header("Content-Type: application/json");
$fm = new elFinderConnector(new elFinder($this->settings));
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"yiisoft/yii": "~1.1.18"
},
"replace": {
"studio-42/elfinder": "2.0.9"
"studio-42/elfinder": "2.1.24"
},
"autoload": {
"classmap": [
Expand Down
328 changes: 328 additions & 0 deletions vendor/Changelog

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions vendor/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
elFinder is issued under a 3-clauses BSD license.

Copyright (c) 2009-2016, 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:

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

3. Neither the name of the Studio 42 Ltd. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL "STUDIO 42" OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
105 changes: 39 additions & 66 deletions vendor/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
elFinder
========

**WARNING: IF YOU HAVE OLDER 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>
_ ______ _ _
| | ____(_) | |
Expand All @@ -13,7 +16,7 @@ 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)
[![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/)
[![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)
Expand All @@ -38,19 +41,22 @@ Branches
--------
- [master](https://github.com/Studio-42/elFinder/tree/master) - Main development branch
- [2.1-src](https://github.com/Studio-42/elFinder/tree/2.1-src) - 2.1 development branch, auto build to 2.1 on commit
- [2.0-src](https://github.com/Studio-42/elFinder/tree/2.0-src) - 2.0 development branch (Security fix only), auto build to 2.0 on commit
- [2.1](https://github.com/Studio-42/elFinder/tree/2.1) - 2.1 nightly build branch
- [2.0](https://github.com/Studio-42/elFinder/tree/2.0) - 2.0 nightly build branch

Features
--------
**2.0.x**
* Usability like the MacOS Finder or Windows Explorer
* Mobile friendly view for touch devices
* All operations with files and folders on a remote server (copy, move,
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
* Background file upload with Drag & Drop HTML5 support
* Cloud strage (Box, Dropbox, GoogleDrive and OneDrive) drivers
* Background file/folder upload with Drag & Drop HTML5 support
* Chunked file upload for large file
* Upload directly to the folder
* Upload form URL (or list)
* List and Icons view
* Keyboard shortcuts
* Standard methods of file/group selection using mouse or keyboard
Expand All @@ -61,43 +67,38 @@ Features
* Edit text files and images
* "Places" for your favorites
* Calculate directory sizes
* Thumbnails for image files
* Thumbnails for image, movie files
* Easy to integrate with web editors (elRTE, CKEditor, TinyMCE)
* Flexible configuration of access rights, upload file types, user interface
and other
* Extensibility
* Extensibility by event handling of backend and client side
* Simple client-server API based on JSON

**2.1.x**
* More High performance server backend and light client UI
* Supports custom information in info dialog
* Configuable columns of list view
* Supports custom CSS class function for the custom folder icon
* Connector plugin
* [AutoRotate](https://github.com/Studio-42/elFinder/blob/2.1-src/php/plugins/AutoRotate/plugin.php) : Auto rotation on file upload of JPEG file by EXIF Orientation.
* [AutoResize](https://github.com/Studio-42/elFinder/blob/2.1-src/php/plugins/AutoResize/plugin.php) : Auto resize on file upload.
* [Normalizer](https://github.com/Studio-42/elFinder/blob/2.1-src/php/plugins/Normalizer/plugin.php) : UTF-8 Normalizer of file-name and file-path etc.
* [Sanitizer](https://github.com/Studio-42/elFinder/blob/2.1-src/php/plugins/Sanitizer/plugin.php) : Sanitizer of file-name and file-path etc.
* [Watermark](https://github.com/Studio-42/elFinder/blob/2.1-src/php/plugins/Watermark/plugin.php) : Print watermark on file upload.
* Folder upload with Chrome
* Chunked file upload
* Upload directly to the folder
* Upload form URL (or list)
* Creating the archive by specifying the file name
* Direct extraction to the current working directory (you do not want to create a folder)
* Supports Dropbox.com&copy; (Configurable & As network volume)
* Supports custom information in info dialog
* Configuable columns of list view
* Supports custom CSS class function of tree view
* For more details, see the [Changelog](https://github.com/Studio-42/elFinder/blob/master/Changelog)

Requirements
------------
### jQuery / jQuery UI
* jQuery 1.8.0+
* jQuery UI 1.9.0+

**However, we recommend newest version.**

### Client
* Modern browser. elFinder was tested in Firefox 12, Internet Explorer 8+,
Safari 6, Opera 12 and Chrome 19
* Modern browser. elFinder was tested in Internet Explorer 8
and newest Firefox, Chrome, IE, Edge and Opera

### Server
* Any web server
* PHP 5.2+ (for thumbnails - mogrify utility or GD/Imagick module)
* PHP 5.2+ (Recommend PHP 5.4 or higher) And for thumbnails - GD / Imagick module / convert(imagemagick) require

Installation
------------
Expand All @@ -122,29 +123,20 @@ Installation
Downloads
------------
**Stable releases** ([Changelog](https://github.com/Studio-42/elFinder/blob/master/Changelog))
+ [elFinder 2.1.10](https://github.com/Studio-42/elFinder/archive/2.1.10.zip)
+ [elFinder 2.0.6](https://github.com/Studio-42/elFinder/archive/2.0.6.zip)
+ [elFinder 2.1.24](https://github.com/Studio-42/elFinder/archive/2.1.24.zip)
+ [elFinder 2.0.9](https://github.com/Studio-42/elFinder/archive/2.0.9.zip) (deprecated)
**Nightly builds**
+ [elFinder 2.1.x (Nightly)](https://github.com/Studio-42/elFinder/archive/2.1.zip)
+ [elFinder 2.0.x (Nightly)](https://github.com/Studio-42/elFinder/archive/2.0.zip)
Demo sites
------------
**2.1.x Nightly**
+ http://studio-42.github.io/elFinder/ (with CORS)
+ http://hypweb.net/elFinder-nightly/demo/2.1/
**2.0**
+ http://elfinder.org/ (rc1)
+ http://hypweb.net/elFinder-nightly/demo/2.0/ (2.0.x Nightly)
+ https://studio-42.github.io/elFinder/ (with CORS)
+ https://hypweb.net/elFinder-nightly/demo/2.1/
FAQs
------------
### Which version of elFinder should I use?
* **2.0.x** if you want to use 2.0 with legacy connectors.
* **2.1.x** if you want to try the experimental (*bleeding edge, but connector is PHP only*).
### Should I use elFinder builds (compressed) or source (uncompressed)?
Expand All @@ -157,33 +149,39 @@ Check out the [wiki](https://github.com/studio-42/elFinder/wiki#howtos) for indi
You can create or modify the language file to use translation tool. Please refer to the pull request the results to the respective branch.
* [2.1 branch translation tool](http://studio-42.github.io/elFinder/tools/langman/#2.1)
* [2.0 branch translation tool](http://studio-42.github.io/elFinder/tools/langman/#2.0)
3rd party connectors
--------------------
* [ASP.NET](https://github.com/leniel/elFinder.Net)
* [ASP.NET Core](https://github.com/gordon-matt/elFinder.NetCore)
* [Java Servlet](https://github.com/trustsystems/elfinder-java-connector)
* [Python](https://github.com/Studio-42/elfinder-python)
* [Django](https://github.com/mikery/django-elfinder)
* [Ruby/Rails](https://github.com/phallstrom/el_finder)
* [Java Servlet](https://github.com/Studio-42/elfinder-servlet)
* [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+)
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)
Support
-------
* [Homepage](http://elfinder.org)
* [Wiki](https://github.com/Studio-42/elFinder/wiki)
* [Issues](https://github.com/Studio-42/elFinder/issues)
* [Forum](http://elfinder.org/forum/)
* <[email protected]>
Expand All @@ -203,29 +201,4 @@ License
elFinder is issued under a 3-clauses BSD license.
<pre>
Copyright (c) 2009-2016, 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:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the Studio 42 Ltd. nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL "STUDIO 42" BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</pre>
* [License terms](https://github.com/Studio-42/elFinder/blob/master/LICENSE.md)
Loading

0 comments on commit 6a75223

Please sign in to comment.