Skip to content

Commit 03b0723

Browse files
dlefflerdleffler
committed
update elFinder to 2.1.64
1 parent d613253 commit 03b0723

69 files changed

Lines changed: 3388 additions & 4487 deletions

Some content is hidden

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

‎external/ExtPrograms.csv‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ Facebook PHP SDK4,4.0.23,github.com/facebook/php-graph-sdk,5.7.0,
4949
Respond,1.4.2,github.com/scottjehl/Respond,1.4.2,IE6-8 shim
5050
html5shiv,3.7.3,github.com/aFarkas/html5shiv,3.7.3,IE6-8 shim
5151
csshover.htc,3.11,peterned.home.xs4all.nl/csshover.html,3.11,IE6 shim
52-
CKEditor,4.22.1,ckeditor.com,4.22.1/40.0.0,"add fieldinsert (exp), autosave, sourcedialog & kama and moono skins"
52+
CKEditor,4.22.1,ckeditor.com,4.22.1/40.2.0,"add fieldinsert (exp), autosave, sourcedialog & kama and moono skins"
5353
TinyMCE,4.9.11,tiny.cloud,4.9.11,"add localautosave, fieldinsert (exp) & quickupload (exp) plugins, & xenmce skin"
54-
TinyMCE v5,5.10.7,tiny.cloud,5.10.7/6.7.0,"add localautosave, fieldinsert (exp) & quickupload (exp) plugins"
54+
TinyMCE v5,5.10.7,tiny.cloud,5.10.7/6.8.2,"add localautosave, fieldinsert (exp) & quickupload (exp) plugins"
5555
PLUpload,2.3.9,github.com/moxiecode/plupload,2.3.9/3.1.5,"needed for TinyMCE Quick Upload, placed in that plugin folder"
56-
elFinder,2.1.62,elfinder.org,2.1.62,customized in /framework with Exponent php classes and .js files
56+
elFinder,2.1.64,elfinder.org,2.1.64,customized in /framework with Exponent php classes and .js files
5757
jQuery1,1.12.4,jquery.com,1.12.4,v1.11.3 still needed for old firefox
5858
jQuery2,2.2.4,jquery.com,2.2.4,
5959
jQuery2 Migrate,1.4.1,jquery.com,1.4.1,renamed to migrate.js for easy loading as an addon

‎external/elFinder/Changelog‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
2023-12-20 Naoki Sawada <hypweb+elfinder@gmail.com>
2+
* elFinder (2.1.64):
3+
- [css] re-fix #3584 css error and CI
4+
5+
6+
2023-12-20 Naoki Sawada <hypweb+elfinder@gmail.com>
7+
* elFinder (2.1.63):
8+
- [php:core] fix download a file via context menu the windows download popup don't close (#3619)
9+
- [VD:MySQL] Use prepared statements instead of escaping when saving file (#3604)
10+
- [VD:core] fix #3617 Filename Restriction Bypass Leading To Persistent Cross-site Scripting
11+
- [js] fix #3614 $.isFunction() is deprecated in jQuery
12+
- [js] Update to jQuery 3.7.1 and Jquery UI 1.13.2
13+
- [VD:LocalFileSystem] fix #3615 Using .php8 in PHP handler leading to RCE
14+
- [cmd:upload] fix #3575 Drag&Drop Upload Issue with Firefox
15+
116
2023-06-14 Naoki Sawada <hypweb+elfinder@gmail.com>
217
* elFinder (2.1.62):
318
- [php:core] prevent garbled file name when URL upload

‎external/elFinder/LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
elFinder is issued under a 3-clauses BSD license.
22

3-
Copyright (c) 2009-2020, Studio 42
3+
Copyright (c) 2009-2023, Studio 42
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

‎external/elFinder/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.62](https://github.com/Studio-42/elFinder/archive/2.1.62.zip)
128+
+ [elFinder 2.1.64](https://github.com/Studio-42/elFinder/archive/2.1.64.zip)
129129
+ [elFinder 2.0.9](https://github.com/Studio-42/elFinder/archive/2.0.9.zip) (deprecated)
130130
131131
**Nightly builds**

‎external/elFinder/css/fonts.css‎

Lines changed: 24 additions & 60 deletions
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-

‎external/elFinder/js/commands/upload.js‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,15 @@ elFinder.prototype.commands.upload = function() {
198198
idx, errors;
199199

200200
if (trf) {
201-
if (trf.types && trf.types.length && (idx = $.inArray('Files', trf.types)) !== -1) {
202-
kind = 'file';
201+
if (trf.types && trf.types.length) {
202+
if ((idx = $.inArray('application/x-moz-file', trf.types)) !== -1) {
203+
kind = 'file';
204+
} else if ((idx = $.inArray('Files', trf.types)) !== -1) {
205+
kind = 'file';
206+
}
203207
}
204208
else if (trf.items && trf.items.length && trf.items[0].kind) {
205-
kind = trf.items[0].kind;
209+
kind = trf.items[0].kind;
206210
}
207211

208212
try {

‎external/elFinder/js/elFinder.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3228,7 +3228,7 @@ var elFinder = function(elm, opts, bootCallback) {
32283228
this.shortcut = function(s) {
32293229
var patterns, pattern, code, i, parts;
32303230

3231-
if (this.options.allowShortcuts && s.pattern && $.isFunction(s.callback)) {
3231+
if (this.options.allowShortcuts && s.pattern && typeof s.callback === 'function') {
32323232
patterns = s.pattern.toUpperCase().split(/\s+/);
32333233

32343234
for (i= 0; i < patterns.length; i++) {
@@ -5248,10 +5248,10 @@ var elFinder = function(elm, opts, bootCallback) {
52485248
$.each(self.commands, function(name, cmd) {
52495249
var proto = Object.assign({}, cmd.prototype),
52505250
extendsCmd, opts;
5251-
if ($.isFunction(cmd) && !self._commands[name] && (cmd.prototype.forceLoad || $.inArray(name, self.options.commands) !== -1)) {
5251+
if (typeof cmd === 'function' && !self._commands[name] && (cmd.prototype.forceLoad || $.inArray(name, self.options.commands) !== -1)) {
52525252
extendsCmd = cmd.prototype.extendsCmd || '';
52535253
if (extendsCmd) {
5254-
if ($.isFunction(self.commands[extendsCmd])) {
5254+
if (typeof self.commands[extendsCmd] === 'function') {
52555255
cmd.prototype = Object.assign({}, base, new self.commands[extendsCmd](), cmd.prototype);
52565256
} else {
52575257
return true;
@@ -5270,7 +5270,7 @@ var elFinder = function(elm, opts, bootCallback) {
52705270
if (self._commands[name].linkedCmds.length) {
52715271
$.each(self._commands[name].linkedCmds, function(i, n) {
52725272
var lcmd = self.commands[n];
5273-
if ($.isFunction(lcmd) && !self._commands[n]) {
5273+
if (typeof lcmd === 'function' && !self._commands[n]) {
52745274
lcmd.prototype = base;
52755275
self._commands[n] = new lcmd();
52765276
self._commands[n].setup(n, self.options.commandsOptions[n]||{});
@@ -8611,7 +8611,7 @@ elFinder.prototype = {
86118611

86128612
if (cnt > 0) {
86138613
if (cancel && button.length) {
8614-
if ($.isFunction(cancel) || (typeof cancel === 'object' && cancel.promise)) {
8614+
if (typeof cancel === 'function' || (typeof cancel === 'object' && cancel.promise)) {
86158615
notify._esc = function(e) {
86168616
if (e.type == 'keydown' && e.keyCode != $.ui.keyCode.ESCAPE) {
86178617
return;
@@ -8768,7 +8768,7 @@ elFinder.prototype = {
87688768
};
87698769
}
87708770

8771-
if (opts.optionsCallback && $.isFunction(opts.optionsCallback)) {
8771+
if (opts.optionsCallback && typeof opts.optionsCallback === 'function') {
87728772
opts.optionsCallback(options);
87738773
}
87748774

@@ -9262,7 +9262,7 @@ elFinder.prototype = {
92629262
* @return void
92639263
*/
92649264
registRawStringDecoder : function(rawStringDecoder) {
9265-
if ($.isFunction(rawStringDecoder)) {
9265+
if (typeof rawStringDecoder === 'function') {
92669266
this.decodeRawString = this.options.rawStringDecoder = rawStringDecoder;
92679267
}
92689268
},
@@ -9754,7 +9754,7 @@ elFinder.prototype = {
97549754
}
97559755
});
97569756
if (!hasError) {
9757-
if ($.isFunction(callback)) {
9757+
if (typeof callback === 'function') {
97589758
if (check) {
97599759
if (typeof check.obj[check.name] === 'undefined') {
97609760
cnt = check.timeout? (check.timeout / 10) : 1;
@@ -9772,7 +9772,7 @@ elFinder.prototype = {
97729772
}
97739773
}
97749774
} else {
9775-
if (opts.error && $.isFunction(opts.error)) {
9775+
if (opts.error && typeof opts.error === 'function') {
97769776
opts.error({ loadResults: results });
97779777
}
97789778
}

‎external/elFinder/js/elFinder.options.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1344,7 +1344,7 @@ elFinder.prototype._options = {
13441344
*
13451345
* @type Null|Function
13461346
*/
1347-
rawStringDecoder : typeof Encoding === 'object' && $.isFunction(Encoding.convert)? function(str) {
1347+
rawStringDecoder : typeof Encoding === 'object' && typeof Encoding.convert === 'function'? function(str) {
13481348
return Encoding.convert(str, {
13491349
to: 'UNICODE',
13501350
type: 'string'

‎external/elFinder/js/elFinder.version.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
*
44
* @type String
55
**/
6-
elFinder.prototype.version = '2.1.62';
6+
elFinder.prototype.version = '2.1.64';
77

0 commit comments

Comments
 (0)