Skip to content

Commit 9a1bcd4

Browse files
gigamastergigamaster
committed
xelfinder version 2.63.0 PHP8
1 parent 0ad4807 commit 9a1bcd4

18 files changed

+58
-66
lines changed

Diff for: ‎README.md

+17-13
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,34 @@
11

2-
[![UTD powered-by-electricity](http://ForTheBadge.com/images/badges/powered-by-electricity.svg)](https://github.com/gigamaster/xelfinder)
3-
[![UTD](https://forthebadge.com/images/badges/built-with-love.svg)](https://github.com/gigamaster/xelfinder)
2+
![X-Updare Store](https://img.shields.io/website?down_color=red&down_message=Offline&label=X-Update%20Store&style=for-the-badge&up_color=308311&up_message=online&url=https%3A%2F%2Fxoopscube.xyz%2Fuploads%2Fxupdatemaster%2Fstores_json_V1.txt)
3+
[![XOOPSCube powered-by-electricity](https://img.shields.io/badge/Powered%20by-Electricity-face74?style=for-the-badge&labelColor=203244&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IiNmYWNlNzQiIGQ9Ik0xNC42OSAyLjIxTDQuMzMgMTEuNDljLS42NC41OC0uMjggMS42NS41OCAxLjczTDEzIDE0bC00Ljg1IDYuNzZjLS4yMi4zMS0uMTkuNzQuMDggMS4wMWMuMy4zLjc3LjMxIDEuMDguMDJsMTAuMzYtOS4yOGMuNjQtLjU4LjI4LTEuNjUtLjU4LTEuNzNMMTEgMTBsNC44NS02Ljc2Yy4yMi0uMzEuMTktLjc0LS4wOC0xLjAxYS43Ny43NyAwIDAgMC0xLjA4LS4wMnoiLz48L3N2Zz4=)](https://github.com/xoopscube)
4+
[![XCL](https://img.shields.io/badge/XCL-Made%20with%20passion-b0201d?style=for-the-badge&labelColor=991015&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxZW0iIGhlaWdodD0iMWVtIiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGZpbGw9IndoaXRlIiBkPSJtMTIgMjEuMzVsLTEuNDUtMS4zMkM1LjQgMTUuMzYgMiAxMi4yNyAyIDguNUMyIDUuNDEgNC40MiAzIDcuNSAzYzEuNzQgMCAzLjQxLjgxIDQuNSAyLjA4QzEzLjA5IDMuODEgMTQuNzYgMyAxNi41IDNDMTkuNTggMyAyMiA1LjQxIDIyIDguNWMwIDMuNzctMy40IDYuODYtOC41NSAxMS41M0wxMiAyMS4zNVoiLz48L3N2Zz4=)](https://github.com/xoopscube)
45

5-
[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/2.0.0/active.svg)](https://github.com/xoopscube/xcl)
6+
[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/2.0.0/active.svg)](https://github.com/xoopscube/xelfinder)
67
![License GPL](https://img.shields.io/badge/License-GPL-green)
7-
![X-Updare Store](https://img.shields.io/badge/X--Update%20Store-Pending-red)
8+
![X-Updare Store](https://img.shields.io/badge/XOOPSCube%20Package-XCL-blue)
89

9-
## ///// — X-elFinder :: Web-based File manager and editors
10+
## ///// — X-elFinder :: Web-based File manager, editors and cloud storage
1011

1112
![alt text](https://repository-images.githubusercontent.com/469831419/6032bf18-5c1e-4f27-aa2f-2b8e60f4e5a0)
1213

1314
MODULE | X-elFinder (elFinder)
1415
------------ | -------------
15-
Description | elFinder web-based file manager running on JavaScript + PHP.
16+
Description | elFinder web-based file manager, web editors and cloud storage for XCL.
1617
Render Engine| Smarty v2 and XCube Layout
17-
Version | 2.62.1
18+
Version | 2.63.0
19+
Author | Nobuhiro Yasutomi @nbuy XCL PHP8
20+
Author | Nuno Luciano @gigamaster XCL PHP7
1821
Author | @nao-pon Naoki Sawada
19-
Maintainer | Update @gigamaster Nuno Luciano (XCL7)
20-
Copyright | 2005-2022 Author
21-
License | XCL module is distributed under a GPL 2.3 License.
22-
License | elFinder is distributed under a 3-Clause BSD License.
22+
Copyright | 2005-2023 Authors
23+
License | XCL module is distributed under a GPL 2 License.
24+
License | elFinder is distributed under a BSD 3-Clause License.
2325

2426

2527
##### :computer: The Minimum Requirements
2628

2729

2830

29-
Apache, Nginx, etc. PHP 7.2.x
31+
Apache, Nginx, etc. PHP 7.2 - PHP 8.2
3032
MySQL 5.6, MariaDB InnoDB utf8 / utf8mb4
3133
XCL version 2.3.+
3234

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

43-
This module is released by default with the package bundle XCL 2.3.x.
45+
This module is released by default with the XCL bundle package 2.3.x.
46+
47+
Web interface for easy management of editors (code, graphics) and cloud storage (gdrive, box, dropbox, etc.)
4448

4549
For topics, questions, and requests about elFinder, please refer to [elFinder](https://github.com/Studio-42/elFinder).
4650

Diff for: ‎html/modules/xelfinder/images/module_icon.svg

+1-3
Loading

Diff for: ‎html/modules/xelfinder/images/module_xelfinder.svg

+4-7
Loading

Diff for: ‎html/modules/xelfinder/include/js/openWithSelfMain_iframe.js

+6-7
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,17 @@ var XOOPS_URL = XELFINDER_URL.split( '/' ).slice( 0, -3 ).join( '/' );
66
// console.log("XOOPS_URL: " + XOOPS_URL);
77

88
// Requires xScriptLoader util
9-
var ScriptLoader = new xScriptLoader([
10-
// XOOPS_URL+"/common/elfinder/js/elfinder.min.js",
11-
XOOPS_URL+"/common/js/simplemodal/css/basic.css",
12-
XOOPS_URL+"/common/js/simplemodal/js/jquery.simplemodal.js",
13-
XOOPS_URL+"/common/js/simplemodal/js/basic.js",
14-
]);
9+
var ScriptLoader = new xScriptLoader([
10+
// XOOPS_URL+"/common/elfinder/js/elfinder.min.js",
11+
XOOPS_URL+"/common/js/simplemodal/css/basic.css",
12+
XOOPS_URL+"/common/js/simplemodal/js/jquery.simplemodal.js",
13+
XOOPS_URL+"/common/js/simplemodal/js/basic.js",
14+
]);
1515

1616
ScriptLoader.loadFiles();
1717

1818
function openWithSelfMain(url, name, w, h, returnwindow) {
1919

20-
2120
var $ = jQuery;
2221
var margin = $.mobile? 0 : 60;
2322

Diff for: ‎xoops_trust_path/libs/elfinder/php/elFinderVolumeBox.class.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Simple elFinder driver for BoxDrive
55
* Box.com API v2.0.
6-
*
6+
* @author Nobuhiro YASUTOMI, PHP8
77
* @author Dmitry (dio) Levashov
88
* @author Cem (discofever)
99
**/
@@ -377,7 +377,7 @@ protected function _bd_fetch($url, $contents = false)
377377
if (strpos($url, 'offset=') === false) {
378378
$url .= '&offset=' . $offset;
379379
} else {
380-
$url = preg_replace('/^(.+?offset=)\d+(.*)$/', '${1}' . $offset . '$2', $url);
380+
$url = preg_replace('/^(.+?offset=)\d+(.*)$/', '$1' . $offset . '$2', $url);
381381
}
382382
$more = $this->_bd_fetch($url);
383383
if (is_array($more)) {

Diff for: ‎xoops_trust_path/modules/xelfinder/admin.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
/**
33
* X-elFinder module for XCL
44
* @package XelFinder
5-
* @version XCL 2.3.1
5+
* @version XCL 2.3.3
66
* @author Naoki Sawada (aka Nao-pon) <https://github.com/nao-pon>
7-
* @copyright (c) 2005-2022 Author
8-
* @license https://github.com/xoopscube/xcl/blob/master/GPL_V2.txt
7+
* @copyright (c) 2005-2023 Authors
8+
* @license GPL v2.0
99
*/
1010

1111
ini_set( 'default_charset', _CHARSET );

Diff for: ‎xoops_trust_path/modules/xelfinder/admin/googledrive.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
/**
33
* X-elFinder module for XCL
44
* @package XelFinder
5-
* @version XCL 2.3.1
5+
* @version XCL 2.3.3
66
* @author Other authors Nuno Luciano (aka Gigamaster) 2020 XCL/PHP7
77
* @author Naoki Sawada (aka Nao-pon) <https://github.com/nao-pon>
8-
* @copyright (c) 2005-2022 Author
8+
* @copyright (c) 2005-2023 Authors
99
* @license https://github.com/xoopscube/xcl/blob/master/GPL_V2.txt
1010
*/
1111

Diff for: ‎xoops_trust_path/modules/xelfinder/admin/mymenu.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
/**
33
* mymenu for D3 modules always require altsys
44
* @package XelFinder
5-
* @version XCL 2.3.1
5+
* @version XCL 2.3.3
66
* @author Other authors gigamaster, 2020 XCL/PHP7
77
* @author Gijoe (Peak)
8-
* @copyright (c) 2005-2022 Author
9-
* @license https://github.com/xoopscube/xcl/blob/master/GPL_V2.txt
8+
* @copyright (c) 2005-2023 Authors
9+
* @license GPL v2.0
1010
*/
1111

1212
// Deny direct access

Diff for: ‎xoops_trust_path/modules/xelfinder/admin/vendorup.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
/**
33
* X-elFinder module for XCL
44
* @package XelFinder
5-
* @version XCL 2.3.1
5+
* @version XCL 2.3.3
66
* @author Other authors Nuno Luciano (aka Gigamaster) 2020 XCL/PHP7
77
* @author Naoki Sawada (aka Nao-pon) <https://github.com/nao-pon>
8-
* @copyright (c) 2005-2022 Author
8+
* @copyright (c) 2005-2023 Authors
99
* @license https://github.com/xoopscube/xcl/blob/master/GPL_V2.txt
1010
*/
1111

Diff for: ‎xoops_trust_path/modules/xelfinder/class/xoops_elFinder.class.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php
22
/*
3+
* @author Nobuhiro YASUTOMI, PHP8
34
* Created on 2012/01/20 by nao-pon http://xoops.hypweb.net/
45
* $Id: xoops_elFinder.class.php,v 1.1 2012/01/20 13:32:02 nao-pon Exp $
56
*/
@@ -591,7 +592,7 @@ public function notifyMail($cmd, $result, $args, $elfinder) {
591592
$head = <<<EOD
592593
USER: $uname
593594
UID: $uid
594-
IP: ${_SERVER['REMOTE_ADDR']}
595+
IP: {$_SERVER['REMOTE_ADDR']}
595596
CMD: $cmd
596597
DATE: $date
597598
EOD;

Diff for: ‎xoops_trust_path/modules/xelfinder/main/index.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
$_xoops_header = $xoopsTpl->get_template_vars( 'xoops_module_header' );
3232

33-
$_xoops_header .= '<link rel="stylesheet" href="' . XOOPS_MODULE_URL . '/' . $mydirname . '/include/css/main.css" type="text/css" media="all" />';
34-
$_xoops_header .= '<script type="text/javascript" src="' . XOOPS_MODULE_URL . '/' . $mydirname . '/include/js/openWithSelfMain_iframe.js"></script>';
33+
$_xoops_header .= '<link rel="stylesheet" href="' . XOOPS_MODULE_URL . '/' . $mydirname . '/include/css/main.css" type="text/css" media="all">';
34+
$_xoops_header .= '<script defer src="' . XOOPS_MODULE_URL . '/' . $mydirname . '/include/js/openWithSelfMain_iframe.js"></script>';
3535

3636
$xoopsTpl->assign( [
3737
'xoops_module_header' => $_xoops_header,

Diff for: ‎xoops_trust_path/modules/xelfinder/manager.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
/**
33
* X-elFinder module for XCL
44
* @package XelFinder
5-
* @version XCL 2.3.1
5+
* @version XCL 2.3.3
66
* @author Naoki Sawada (aka Nao-pon) <https://github.com/nao-pon>
7-
* @copyright (c) 2005-2022 Author
7+
* @copyright (c) 2005-2023 Authors
88
* @license https://github.com/xoopscube/xcl/blob/master/GPL_V2.txt
99
*/
1010

Diff for: ‎xoops_trust_path/modules/xelfinder/oninstall.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
/**
33
* X-elFinder module for XCL
44
* @package XelFinder
5-
* @version XCL 2.3.1
5+
* @version XCL 2.3.3
66
* @author Naoki Sawada (aka Nao-pon) <https://github.com/nao-pon>
7-
* @copyright (c) 2005-2022 Author
8-
* @license https://github.com/xoopscube/xcl/blob/master/GPL_V2.txt
7+
* @copyright (c) 2005-2023 Authors
8+
* @license GPL v2.0
99
*/
1010

1111
eval( ' function xoops_module_install_' . $mydirname . '( $module ) { return xelfinder_oninstall_base( $module , \'' . $mydirname . '\' ) ; } ' );

Diff for: ‎xoops_trust_path/modules/xelfinder/onuninstall.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* X-elFinder module for XCL
44
* @package XelFinder
5-
* @version XCL 2.3.1
5+
* @version XCL 2.3.3
66
* @author Naoki Sawada (aka Nao-pon) <https://github.com/nao-pon>
77
* @copyright (c) 2005-2022 Author
88
* @license https://github.com/xoopscube/xcl/blob/master/GPL_V2.txt

Diff for: ‎xoops_trust_path/modules/xelfinder/onupdate.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* X-elFinder module for XCL
44
* @package XelFinder
5-
* @version XCL 2.3.1
5+
* @version XCL 2.3.3
66
* @author Naoki Sawada (aka Nao-pon) <https://github.com/nao-pon>
77
* @copyright (c) 2005-2022 Author
88
* @license https://github.com/xoopscube/xcl/blob/master/GPL_V2.txt

Diff for: ‎xoops_trust_path/modules/xelfinder/preload.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
/**
33
* X-elFinder module for XCL
44
* @package XelFinder
5-
* @version XCL 2.3.1
5+
* @version XCL 2.3.3
66
* @author Naoki Sawada (aka Nao-pon) <https://github.com/nao-pon>
7-
* @copyright (c) 2005-2022 Author
8-
* @license https://github.com/xoopscube/xcl/blob/master/GPL_V2.txt
7+
* @copyright (c) 2005-2023 Authors
8+
* @license GPL v2.0
99
*/
1010

1111
if ( ! defined( 'XOOPS_ROOT_PATH' ) ) {

Diff for: ‎xoops_trust_path/modules/xelfinder/templates/main.html

+1-8
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ <h2><img class="svg tree" src="<{$xoops_url}>/images/icons/tree.svg" width="1em"
3737
</a>
3838
</div>
3939

40-
41-
42-
43-
4440
<{if $xoops_isadmin}>
4541
<hr>
4642

@@ -60,8 +56,6 @@ <h2><img class="svg tree" src="<{$xoops_url}>/images/icons/tree.svg" width="1em"
6056
</a>
6157
</div>
6258

63-
64-
6559
<footer class="action-control">
6660
<a role="button" class="primary" href="<{$mod_url}>/admin/index.php">
6761
<span><svg class="tools" xmlns="http://www.w3.org/2000/svg" width="1.25em" height="1.25em" viewBox="0 0 24 24">
@@ -72,6 +66,5 @@ <h2><img class="svg tree" src="<{$xoops_url}>/images/icons/tree.svg" width="1em"
7266
</footer>
7367
<{/if}>
7468

75-
76-
7769
</article>
70+

Diff for: ‎xoops_trust_path/modules/xelfinder/xoops_version.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* X-elFinder module for XCL
44
* @package XelFinder
5-
* @version XCL 2.3.1
5+
* @version XCL 2.3.3
66
* @author Other authors gigamaster, 2020 XCL/PHP7
77
* @author Naoki Sawada (aka Nao-pon) <https://github.com/nao-pon>
88
* @copyright (c) 2005-2022 Author
@@ -23,8 +23,8 @@
2323
$modversion['dirname'] = $mydirname;
2424
$modversion['trust_dirname'] = $mytrustdirname;
2525
$modversion['name'] = 'xelFinder';
26-
$modversion['version'] = '2.62';
27-
$modversion['detailed_version'] = '2.62.1';
26+
$modversion['version'] = '2.63';
27+
$modversion['detailed_version'] = '2.63.0';
2828
$modversion['description'] = constant( $constpref . '_DESC' );
2929
$modversion['author'] = 'Naoki Sawada (aka Nao-pon) <Hypweb.net>';
3030
$modversion['credits'] = 'Naoki Sawada (aka Nao-pon). Nuno Luciano (aka gigamaster) 2020 XCL PHP7';

0 commit comments

Comments
 (0)