Skip to content

Commit f9cc637

Browse files
gigamastergigamaster
committed
v2.65.0
1 parent 24a3d42 commit f9cc637

File tree

122 files changed

+4876
-4762
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+4876
-4762
lines changed

Diff for: ‎README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ MODULE | X-elFinder (elFinder)
1515
------------ | -------------
1616
Description | elFinder web-based file manager, web editors and cloud storage for XCL.
1717
Render Engine| Smarty v2 and XCube Layout
18-
Version | 2.64.0
18+
Version | 2.65.0
1919
Author | Nobuhiro Yasutomi @nbuy XCL PHP8
2020
Author | Nuno Luciano @gigamaster XCL PHP7
2121
Author | @nao-pon Naoki Sawada
22-
Copyright | 2005-2023 Authors
22+
Copyright | 2005-2024 Authors
2323
License | XCL module is distributed under a GPL 2 License.
2424
License | elFinder is distributed under a BSD 3-Clause License.
2525

@@ -28,9 +28,9 @@ License | elFinder is distributed under a BSD 3-Clause License.
2828

2929

3030

31-
Apache, Nginx, etc. PHP 7.2 - PHP 8.2
32-
MySQL 5.6, MariaDB InnoDB utf8 / utf8mb4
33-
XCL version 2.3.+
31+
Apache, Nginx, etc. PHP 8.x.x
32+
MySQL 5.7, MariaDB InnoDB utf8 / utf8mb4
33+
XCL version 2.4.0
3434

3535

3636

@@ -42,7 +42,7 @@ License | elFinder is distributed under a BSD 3-Clause License.
4242
* Author : [nao-pon/xelfinder - GitHub](https://github.com/nao-pon/xelfinder)
4343
* Maintainer : [gigamaster - XCL ^2.3.x](https://github.com/xoopscube/xelfinder)
4444

45-
This module is released with the XCL bundle package 2.3.x.
45+
This module is released with the XCL bundle package 2.4.0.
4646

4747
GUI-based control panel for easy management of editors (code, graphics) and cloud storage (gdrive, box, dropbox, etc.)
4848

Diff for: ‎html/common/elfinder/README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
elFinder
22
========
33

4-
**WARNING: IF YOU HAVE OLDER (IN PARTICULAR 2.1.60 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.**
4+
**WARNING: IF YOU HAVE OLDER (IN PARTICULAR 2.1.62 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.**
55

66
[![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/)
77

@@ -16,7 +16,7 @@ used in Mac OS X operating system.
1616
[![CDNJS version](https://img.shields.io/cdnjs/v/elfinder.svg)](https://cdnjs.com/libraries/elfinder)
1717
[![Donate Paypal(nao-pon)](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FF5FKRSMKYDVA)
1818
[![Donate Bitcoin(nao-pon)](https://img.shields.io/badge/Donate-Bitcoin-orange.svg)](https://studio-42.github.io/elFinder/tools/donate-bitcoin/)
19-
[![Buy me a coffee](https://img.shields.io/static/v1.svg?label=Buy%20me%20a%20coffee&message=🥨&color=black&logo=buy%20me%20a%20coffee&logoColor=white&labelColor=6f4e37)](https://www.buymeacoffee.com/naopon)
19+
[![Buy me a coffee](https://img.shields.io/static/v1.svg?label=Buy%20me%20a%20coffee&message=?&color=black&logo=buy%20me%20a%20coffee&logoColor=white&labelColor=6f4e37)](https://www.buymeacoffee.com/naopon)
2020

2121
Contents
2222
--------
@@ -125,7 +125,7 @@ Installation
125125
Downloads
126126
------------
127127
**Stable releases** ([Changelog](https://github.com/Studio-42/elFinder/blob/master/Changelog))
128-
+ [elFinder 2.1.61](https://github.com/Studio-42/elFinder/archive/2.1.61.zip)
128+
+ [elFinder 2.1.65](https://github.com/Studio-42/elFinder/archive/2.1.65.zip)
129129
+ [elFinder 2.0.9](https://github.com/Studio-42/elFinder/archive/2.0.9.zip) (deprecated)
130130
131131
**Nightly builds**
@@ -184,6 +184,7 @@ Hint: [How to load CSS with RequireJS?](https://github.com/Studio-42/elFinder/wi
184184
* [Tiki Wiki](https://doc.tiki.org/elFinder)
185185
* [WordPress](https://wordpress.org/plugins/file-manager/)
186186
* [XOOPS](https://github.com/nao-pon/xelfinder)
187+
* [XOOPSCube](https://github.com/xoopscube/xelfinder) GUI-based control panel: FTP, cloud storage and editors
187188
* [Yii](http://www.yiiframework.com/extension/elfinder/)
188189
* [Zenphoto](http://www.zenphoto.org/news/elfinder/)
189190
@@ -199,7 +200,7 @@ Support
199200
Authors
200201
-------
201202
202-
* Current main developer: Naoki Sawada <[email protected]> [![Buy me a coffee](https://img.shields.io/static/v1.svg?label=Buy%20me%20a%20coffee&message=🥨&color=black&logo=buy%20me%20a%20coffee&logoColor=white&labelColor=6f4e37)](https://www.buymeacoffee.com/naopon)
203+
* Current main developer: Naoki Sawada <[email protected]> [![Buy me a coffee](https://img.shields.io/static/v1.svg?label=Buy%20me%20a%20coffee&message=?&color=black&logo=buy%20me%20a%20coffee&logoColor=white&labelColor=6f4e37)](https://www.buymeacoffee.com/naopon)
203204
* Chief developer: Dmitry "dio" Levashov <[email protected]>
204205
* Maintainer: Troex Nevelin <[email protected]>
205206
* Developers: Alexey Sukhotin, Naoki Sawada <[email protected]>

Diff for: ‎html/common/elfinder/css/elfinder.full.css

+26-62
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*!
22
* elFinder - file manager for web
3-
* Version 2.1.61 (2.1 Nightly: 1733024) (2022-03-15)
3+
* Version 2.1.65 (2.1 Nightly: c81d9f8) (2024-01-05)
44
* http://elfinder.org
55
*
6-
* Copyright 2009-2022, Studio 42
6+
* Copyright 2009-2024, Studio 42
77
* Licensed under a 3-clauses BSD license
88
*/
99

@@ -3437,93 +3437,57 @@ button.elfinder-info-button {
34373437
}
34383438

34393439
/* File: /css/fonts.css */
3440-
.elfinder-font-mono {
3441-
font-family: "Ricty Diminished", "Myrica M", Consolas, "Courier New", Courier, Monaco, monospace;
3442-
font-size: 1.1em;
3443-
}
3444-
3445-
.elfinder-contextmenu .elfinder-contextmenu-item span {
3446-
font-size: .72em;
3447-
}
3448-
3449-
.elfinder-cwd-view-icons .elfinder-cwd-filename {
3450-
font-size: .7em;
3451-
}
3452-
3453-
.elfinder-cwd-view-list td {
3454-
font-size: .7em;
3440+
.dialogelfinder .dialogelfinder-drag,
3441+
.elfinder-place-drag .elfinder-navbar-dir,
3442+
.elfinder-quicklook-preview-text-wrapper,
3443+
.elfinder-info-tb {
3444+
font-size: .9em;
34553445
}
34563446

34573447
.std42-dialog .ui-dialog-titlebar {
34583448
font-size: .82em;
34593449
}
34603450

3461-
.std42-dialog .ui-dialog-content {
3462-
font-size: .72em;
3451+
.elfinder-button-search input {
3452+
font-size: .8em;
34633453
}
34643454

3465-
.std42-dialog .ui-dialog-buttonpane {
3455+
.std42-dialog .ui-dialog-buttonpane, .elfinder-toast {
34663456
font-size: .76em;
34673457
}
34683458

3469-
.elfinder-info-tb {
3470-
font-size: .9em;
3471-
}
3472-
3473-
.elfinder-upload-dropbox {
3474-
font-size: 1.2em;
3475-
}
3476-
3477-
.elfinder-upload-dialog-or {
3478-
font-size: 1.2em;
3479-
}
3480-
3481-
.dialogelfinder .dialogelfinder-drag {
3482-
font-size: .9em;
3483-
}
3484-
3485-
.elfinder .elfinder-navbar {
3459+
.elfinder-contextmenu .elfinder-contextmenu-item span,
3460+
.std42-dialog .ui-dialog-content,
3461+
.elfinder .elfinder-navbar,
3462+
.elfinder-quicklook-info-data,
3463+
.elfinder-button-menu-item {
34863464
font-size: .72em;
34873465
}
34883466

3489-
.elfinder-place-drag .elfinder-navbar-dir {
3490-
font-size: .9em;
3491-
}
3492-
3493-
.elfinder-quicklook-title {
3467+
.elfinder-cwd-view-icons .elfinder-cwd-filename,
3468+
.elfinder-cwd-view-list td,
3469+
.elfinder-quicklook-title,
3470+
.elfinder-statusbar div {
34943471
font-size: .7em;
3495-
font-weight: normal;
3496-
}
3497-
3498-
.elfinder-quicklook-info-data {
3499-
font-size: .72em;
3500-
}
3501-
3502-
.elfinder-quicklook-preview-text-wrapper {
3503-
font-size: .9em;
3504-
}
3505-
3506-
.elfinder-button-menu-item {
3507-
font-size: .72em;
35083472
}
35093473

3510-
.elfinder-button-search input {
3511-
font-size: .8em;
3474+
.elfinder-upload-dropbox, .elfinder-upload-dialog-or {
3475+
font-size: 1.2em;
35123476
}
35133477

3514-
.elfinder-statusbar div {
3515-
font-size: .7em;
3478+
.elfinder-font-mono {
3479+
font-family: "Ricty Diminished", "Myrica M", Consolas, "Courier New", Courier, Monaco, monospace;
3480+
font-size: 1.1em;
35163481
}
35173482

35183483
.elfinder-drag-num {
35193484
font-size: 12px;
35203485
}
35213486

3522-
.elfinder-toast {
3523-
font-size: .76em;
3487+
.elfinder-quicklook-title {
3488+
font-weight: normal;
35243489
}
35253490

3526-
35273491
/* File: /css/navbar.css */
35283492
/*********************************************/
35293493
/* NAVIGATION PANEL */

Diff for: ‎html/common/elfinder/css/elfinder.min.css

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎html/common/elfinder/css/fonts.css

+24-60
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,50 @@
1-
.elfinder-font-mono {
2-
font-family: "Ricty Diminished", "Myrica M", Consolas, "Courier New", Courier, Monaco, monospace;
3-
font-size: 1.1em;
4-
}
5-
6-
.elfinder-contextmenu .elfinder-contextmenu-item span {
7-
font-size: .72em;
8-
}
9-
10-
.elfinder-cwd-view-icons .elfinder-cwd-filename {
11-
font-size: .7em;
12-
}
13-
14-
.elfinder-cwd-view-list td {
15-
font-size: .7em;
1+
.dialogelfinder .dialogelfinder-drag,
2+
.elfinder-place-drag .elfinder-navbar-dir,
3+
.elfinder-quicklook-preview-text-wrapper,
4+
.elfinder-info-tb {
5+
font-size: .9em;
166
}
177

188
.std42-dialog .ui-dialog-titlebar {
199
font-size: .82em;
2010
}
2111

22-
.std42-dialog .ui-dialog-content {
23-
font-size: .72em;
12+
.elfinder-button-search input {
13+
font-size: .8em;
2414
}
2515

26-
.std42-dialog .ui-dialog-buttonpane {
16+
.std42-dialog .ui-dialog-buttonpane, .elfinder-toast {
2717
font-size: .76em;
2818
}
2919

30-
.elfinder-info-tb {
31-
font-size: .9em;
32-
}
33-
34-
.elfinder-upload-dropbox {
35-
font-size: 1.2em;
36-
}
37-
38-
.elfinder-upload-dialog-or {
39-
font-size: 1.2em;
40-
}
41-
42-
.dialogelfinder .dialogelfinder-drag {
43-
font-size: .9em;
44-
}
45-
46-
.elfinder .elfinder-navbar {
20+
.elfinder-contextmenu .elfinder-contextmenu-item span,
21+
.std42-dialog .ui-dialog-content,
22+
.elfinder .elfinder-navbar,
23+
.elfinder-quicklook-info-data,
24+
.elfinder-button-menu-item {
4725
font-size: .72em;
4826
}
4927

50-
.elfinder-place-drag .elfinder-navbar-dir {
51-
font-size: .9em;
52-
}
53-
54-
.elfinder-quicklook-title {
28+
.elfinder-cwd-view-icons .elfinder-cwd-filename,
29+
.elfinder-cwd-view-list td,
30+
.elfinder-quicklook-title,
31+
.elfinder-statusbar div {
5532
font-size: .7em;
56-
font-weight: normal;
5733
}
5834

59-
.elfinder-quicklook-info-data {
60-
font-size: .72em;
61-
}
62-
63-
.elfinder-quicklook-preview-text-wrapper {
64-
font-size: .9em;
65-
}
66-
67-
.elfinder-button-menu-item {
68-
font-size: .72em;
69-
}
70-
71-
.elfinder-button-search input {
72-
font-size: .8em;
35+
.elfinder-upload-dropbox, .elfinder-upload-dialog-or {
36+
font-size: 1.2em;
7337
}
7438

75-
.elfinder-statusbar div {
76-
font-size: .7em;
39+
.elfinder-font-mono {
40+
font-family: "Ricty Diminished", "Myrica M", Consolas, "Courier New", Courier, Monaco, monospace;
41+
font-size: 1.1em;
7742
}
7843

7944
.elfinder-drag-num {
8045
font-size: 12px;
8146
}
8247

83-
.elfinder-toast {
84-
font-size: .76em;
48+
.elfinder-quicklook-title {
49+
font-weight: normal;
8550
}
86-

Diff for: ‎html/common/elfinder/css/index.html

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<script>history.go(-1);</script>

Diff for: ‎html/common/elfinder/img/index.html

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<script>history.go(-1);</script>

Diff for: ‎html/common/elfinder/index.html

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<script>history.go(-1);</script>

Diff for: ‎html/common/elfinder/js/commands/help.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474

7575
html.push(sep);
7676
html.push('<div class="'+lic+'">Licence: 3-clauses BSD Licence</div>');
77-
html.push('<div class="'+lic+'">Copyright © 2009-2022, Studio 42 / nao-pon</div>');
77+
html.push('<div class="'+lic+'">Copyright © 2009-2024, Studio 42 / nao-pon</div>');
7878
html.push('<div class="'+lic+'">„ …'+fm.i18n('dontforget')+' ”</div>');
7979
html.push('</div>');
8080
},

Diff for: ‎html/common/elfinder/js/commands/quicklook.plugins.js

+10-3
Original file line numberDiff line numberDiff line change
@@ -852,12 +852,16 @@ elFinder.prototype.commands.quicklook.plugins = [
852852
}
853853
},
854854
err = 0,
855+
cssClass = '',
855856
canPlay;
856857
//reset();
857858
pDash = null;
858859
opts = opts || {};
860+
if (opts.cssClass) {
861+
cssClass = ' ' + opts.cssClass;
862+
}
859863
ql.hideinfo();
860-
node = $('<video class="elfinder-quicklook-preview-video" controls' + controlsList + ' preload="auto" autobuffer playsinline>'
864+
node = $('<video class="elfinder-quicklook-preview-video' + cssClass + '" controls' + controlsList + ' preload="auto" autobuffer playsinline>'
861865
+'</video>')
862866
.on('change', function(e) {
863867
// Firefox fire change event on seek or volume change
@@ -964,10 +968,13 @@ elFinder.prototype.commands.quicklook.plugins = [
964968
opDfd = fm.openUrl(file.hash, false, function(url) {
965969
loading.remove();
966970
if (url) {
967-
render(file);
971+
render(file, {
972+
src: url,
973+
cssClass: 'video-js'
974+
});
968975
node[0].src = url;
969976
cVideojs(node[0], {
970-
src: url
977+
autoplay: true
971978
});
972979
}
973980
}, { progressBar: prog });

Diff for: ‎html/common/elfinder/js/commands/resize.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,7 @@ elFinder.prototype.commands.resize = function() {
920920
if (! animate || fm.UA.Opera || fm.UA.ltIE8) {
921921
imgr.rotate(value);
922922
} else {
923-
imgr.animate({rotate: value + 'deg'});
923+
imgr.animate({rotate: value + (fm.UA.Chrome? '' : 'deg')});
924924
}
925925
value = value % 360;
926926
if (value < 0) {

0 commit comments

Comments
 (0)