holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Filemanager/WebDAV: fix mounting WebDAV URL as webdavs://user:pass@host/path

Browse Source
This commit is contained in:
Ralf Becker 2021-09-10 14:08:42 +02:00
parent f2f1af58ce
commit 47e35c4034
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -94,7 +94,7 @@
"egroupware/status": "self.version", "egroupware/status": "self.version",
"egroupware/swoolepush": "self.version", "egroupware/swoolepush": "self.version",
"egroupware/tracker": "self.version", "egroupware/tracker": "self.version",
"egroupware/webdav": "dev-master", "egroupware/webdav": "^v0.3.1",
"egroupware/z-push-dev": "^2.5", "egroupware/z-push-dev": "^2.5",
"giggsey/libphonenumber-for-php": "^8.12", "giggsey/libphonenumber-for-php": "^8.12",
"npm-asset/as-jqplot": "1.0.*", "npm-asset/as-jqplot": "1.0.*",

15
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "11c4709df1fbb8c2d7b55b3f2916a428", "content-hash": "210ce7c8e74551a16bebace0ffa679b8",
"packages": [ "packages": [
{ {
"name": "adldap2/adldap2", "name": "adldap2/adldap2",
@ -1583,16 +1583,16 @@
}, },
{ {
"name": "egroupware/webdav", "name": "egroupware/webdav",
"version": "dev-master", "version": "v0.3.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/EGroupware/WebDAV.git", "url": "https://github.com/EGroupware/WebDAV.git",
"reference": "889da78b6489965df8a379ccdc25853fe74da199" "reference": "554b8ed3fb3bc98427f0c1edbba7f9bab9894d4c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/EGroupware/WebDAV/zipball/889da78b6489965df8a379ccdc25853fe74da199", "url": "https://api.github.com/repos/EGroupware/WebDAV/zipball/554b8ed3fb3bc98427f0c1edbba7f9bab9894d4c",
"reference": "889da78b6489965df8a379ccdc25853fe74da199", "reference": "554b8ed3fb3bc98427f0c1edbba7f9bab9894d4c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1631,7 +1631,7 @@
"stream", "stream",
"wrapper" "wrapper"
], ],
"time": "2020-09-23T16:16:07+00:00" "time": "2021-09-10T11:59:20+00:00"
}, },
{ {
"name": "egroupware/z-push-dev", "name": "egroupware/z-push-dev",
@ -10718,8 +10718,7 @@
"egroupware/smallpart": 20, "egroupware/smallpart": 20,
"egroupware/status": 20, "egroupware/status": 20,
"egroupware/swoolepush": 20, "egroupware/swoolepush": 20,
"egroupware/tracker": 20, "egroupware/tracker": 20
"egroupware/webdav": 20
}, },
"prefer-stable": true, "prefer-stable": true,
"prefer-lowest": false, "prefer-lowest": false,

5
filemanager/cli.php
View File

@ -484,11 +484,6 @@ function load_wrapper($url)
{ {
switch($scheme) switch($scheme)
{ {
case 'webdav':
case 'webdavs':
require_once('HTTP/WebDAV/Client.php');
break;
default: default:
if (!isset($GLOBALS['egw']) && !in_array($scheme,array('smb','imap')) && if (!isset($GLOBALS['egw']) && !in_array($scheme,array('smb','imap')) &&
($user = parse_url($url,PHP_URL_USER)) && ($pass = parse_url($url,PHP_URL_PASS))) ($user = parse_url($url,PHP_URL_USER)) && ($pass = parse_url($url,PHP_URL_PASS)))

2
filemanager/inc/class.filemanager_admin.inc.php
View File

@ -261,7 +261,7 @@ class filemanager_admin extends filemanager_ui
{ {
$content['mounts'][$n++] = array( $content['mounts'][$n++] = array(
'path' => $path, 'path' => $path,
'url' => $url, 'url' => preg_replace('#://([^:@/]+):([^@/]+)@#', '://$1:****@', $url),
); );
$readonlys["disable[$path]"] = !$this->versioning || !Vfs::$is_root || $readonlys["disable[$path]"] = !$this->versioning || !Vfs::$is_root ||
Vfs::parse_url($url,PHP_URL_SCHEME) != $this->versioning; Vfs::parse_url($url,PHP_URL_SCHEME) != $this->versioning;