From df946f7c800103032fd9a28c5791874a3756c3c5 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 10 Sep 2021 14:08:42 +0200 Subject: [PATCH] * Filemanager/WebDAV: fix mounting WebDAV URL as webdavs://user:pass@host/path --- composer.json | 2 +- composer.lock | 871 +++++------------- filemanager/cli.php | 5 - .../inc/class.filemanager_admin.inc.php | 2 +- 4 files changed, 217 insertions(+), 663 deletions(-) diff --git a/composer.json b/composer.json index fe7bf8388c..0d58292407 100644 --- a/composer.json +++ b/composer.json @@ -93,7 +93,7 @@ "egroupware/status": "self.version", "egroupware/swoolepush": "self.version", "egroupware/tracker": "self.version", - "egroupware/webdav": "dev-master", + "egroupware/webdav": "^v0.3.1", "egroupware/z-push-dev": "^2.5", "giggsey/libphonenumber-for-php": "^8.12", "npm-asset/as-jqplot": "1.0.*", diff --git a/composer.lock b/composer.lock index e3ab293e45..4bd908134f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "248556c07e4f1fd832c970489cdc9a5a", + "content-hash": "75e07178544cf7f50260755a37724799", "packages": [ { "name": "adldap2/adldap2", @@ -207,7 +207,7 @@ "version": "v2.3.4", "source": { "type": "git", - "url": "https://github.com/fengyuanchen/cropper.git", + "url": "git@github.com:fengyuanchen/cropper.git", "reference": "30c58b29ee21010e17e58ebab165fbd84285c685" }, "dist": { @@ -215,9 +215,48 @@ "url": "https://api.github.com/repos/fengyuanchen/cropper/zipball/30c58b29ee21010e17e58ebab165fbd84285c685", "reference": "30c58b29ee21010e17e58ebab165fbd84285c685" }, - "type": "bower-asset", + "type": "bower-asset-library", + "extra": { + "bower-asset-main": [ + "dist/cropper.js", + "dist/cropper.css" + ], + "bower-asset-ignore": [ + "**/.*", + "node_modules", + "bower_components", + "tests", + "test", + "examples", + "assets", + "demo", + "docs", + "gulpfile.js", + "CONTRIBUTING.md", + "ISSUE_TEMPLATE.md" + ] + }, "license": [ "MIT" + ], + "description": "A simple jQuery image cropping plugin.", + "keywords": [ + "crop", + "cropper", + "cropping", + "css", + "development", + "front-end", + "html", + "image", + "javascript", + "jquery", + "move", + "plugin", + "rotate", + "scale", + "web", + "zoom" ] }, { @@ -225,7 +264,7 @@ "version": "v2.9.0", "source": { "type": "git", - "url": "https://github.com/rtfpessoa/diff2html.git", + "url": "git@github.com:rtfpessoa/diff2html.git", "reference": "4c15a9ca93e50c78f8d02e37273076994888d499" }, "dist": { @@ -233,14 +272,14 @@ "url": "https://api.github.com/repos/rtfpessoa/diff2html/zipball/4c15a9ca93e50c78f8d02e37273076994888d499", "reference": "4c15a9ca93e50c78f8d02e37273076994888d499" }, - "type": "bower-asset" + "type": "bower-asset-library" }, { "name": "bower-asset/fastclick", "version": "v1.0.6", "source": { "type": "git", - "url": "https://github.com/ftlabs/fastclick.git", + "url": "git@github.com:ftlabs/fastclick.git", "reference": "9977a916739360ad4ffd7aa19b0016bf375e934b" }, "dist": { @@ -248,7 +287,18 @@ "url": "https://api.github.com/repos/ftlabs/fastclick/zipball/9977a916739360ad4ffd7aa19b0016bf375e934b", "reference": "9977a916739360ad4ffd7aa19b0016bf375e934b" }, - "type": "bower-asset" + "type": "bower-asset-library", + "extra": { + "bower-asset-main": "lib/fastclick.js", + "bower-asset-ignore": [ + "**/.*", + "component.json", + "package.json", + "Makefile", + "tests", + "examples" + ] + } }, { "name": "bower-asset/jquery", @@ -263,9 +313,21 @@ "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/5e89585e0121e72ff47de177c5ef604f3089a53d", "reference": "5e89585e0121e72ff47de177c5ef604f3089a53d" }, - "type": "bower-asset", + "type": "bower-asset-library", + "extra": { + "bower-asset-main": "dist/jquery.js", + "bower-asset-ignore": [ + "package.json" + ] + }, "license": [ "MIT" + ], + "keywords": [ + "browser", + "javascript", + "jquery", + "library" ] }, { @@ -273,7 +335,7 @@ "version": "1.6.19", "source": { "type": "git", - "url": "https://github.com/mattbryson/TouchSwipe-Jquery-Plugin.git", + "url": "git@github.com:mattbryson/TouchSwipe-Jquery-Plugin.git", "reference": "f0d71bf645779358e1458e212102c5d59b7702ec" }, "dist": { @@ -281,7 +343,10 @@ "url": "https://api.github.com/repos/mattbryson/TouchSwipe-Jquery-Plugin/zipball/f0d71bf645779358e1458e212102c5d59b7702ec", "reference": "f0d71bf645779358e1458e212102c5d59b7702ec" }, - "type": "bower-asset" + "type": "bower-asset-library", + "extra": { + "bower-asset-main": "./jquery.touchSwipe.js" + } }, { "name": "celtic/lti", @@ -994,12 +1059,12 @@ { "name": "Chuck Hagenbuch", "email": "chuck@horde.org", - "role": "Lead" + "role": "lead" }, { "name": "Jan Schneider", "email": "jan@horde.org", - "role": "Lead" + "role": "lead" }, { "name": "Michael J Rubinsky", @@ -1113,7 +1178,7 @@ ], "description": "Compiled version of magicsuggest customized for EGroupware project.", "homepage": "https://github.com/EGroupware/magicsuggest", - "time": "2018-06-21T13:36:37+00:00" + "time": "2018-06-21T10:14:03+00:00" }, { "name": "egroupware/news_admin", @@ -1494,16 +1559,16 @@ }, { "name": "egroupware/webdav", - "version": "dev-master", + "version": "v0.3.1", "source": { "type": "git", "url": "https://github.com/EGroupware/WebDAV.git", - "reference": "889da78b6489965df8a379ccdc25853fe74da199" + "reference": "554b8ed3fb3bc98427f0c1edbba7f9bab9894d4c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EGroupware/WebDAV/zipball/889da78b6489965df8a379ccdc25853fe74da199", - "reference": "889da78b6489965df8a379ccdc25853fe74da199", + "url": "https://api.github.com/repos/EGroupware/WebDAV/zipball/554b8ed3fb3bc98427f0c1edbba7f9bab9894d4c", + "reference": "554b8ed3fb3bc98427f0c1edbba7f9bab9894d4c", "shasum": "" }, "require": { @@ -1542,7 +1607,7 @@ "stream", "wrapper" ], - "time": "2020-09-23T16:16:07+00:00" + "time": "2021-09-10T11:59:20+00:00" }, { "name": "egroupware/z-push-dev", @@ -2069,16 +2134,6 @@ "JWS", "jwt" ], - "funding": [ - { - "url": "https://github.com/lcobucci", - "type": "github" - }, - { - "url": "https://www.patreon.com/lcobucci", - "type": "patreon" - } - ], "time": "2021-02-16T09:40:01+00:00" }, { @@ -2337,36 +2392,112 @@ "version": "1.0.8", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/as-jqplot/-/as-jqplot-1.0.8.tgz" + "url": "https://registry.npmjs.org/as-jqplot/-/as-jqplot-1.0.8.tgz", + "shasum": "97061e0f32167597b87c98dfd42c93f10a2fb249" + }, + "type": "npm-asset-library", + "extra": { + "npm-asset-main": "index.js", + "npm-asset-directories": [], + "npm-asset-scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + } }, - "type": "npm-asset", "license": [ "ISC" - ] + ], + "authors": [ + "" + ], + "description": "AS jqPlot Shim" }, { "name": "npm-asset/dhtmlx-gantt", "version": "6.2.7", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/dhtmlx-gantt/-/dhtmlx-gantt-6.2.7.tgz" + "url": "https://registry.npmjs.org/dhtmlx-gantt/-/dhtmlx-gantt-6.2.7.tgz", + "shasum": "86689f36c1f10e2bfaa5126445b4c560d82b4587" + }, + "type": "npm-asset-library", + "extra": { + "npm-asset-bugs": { + "url": "https://github.com/DHTMLX/gantt/issues" + }, + "npm-asset-main": "codebase/dhtmlxgantt.js", + "npm-asset-directories": [], + "npm-asset-repository": { + "type": "git", + "url": "git+https://github.com/DHTMLX/gantt.git" + } }, - "type": "npm-asset", "license": [ "GPL-2.0" - ] + ], + "authors": [ + { + "name": "DHTMLX" + } + ], + "description": "An open source JavaScript Gantt chart that helps you illustrate a project schedule in a nice-looking chart.", + "homepage": "https://github.com/DHTMLX/gantt#readme", + "keywords": [ + "browser", + "calendar", + "chart", + "dhtmlx", + "dhtmlxgantt", + "gantt", + "gantt chart", + "scheduler", + "timeline" + ], + "time": "2019-10-11T10:48:39+00:00" }, { "name": "npm-asset/gridster", "version": "0.5.6", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/gridster/-/gridster-0.5.6.tgz" + "url": "https://registry.npmjs.org/gridster/-/gridster-0.5.6.tgz", + "shasum": "4024713aabd559093a72e9b713f1e41f9bded76f" }, "require": { "npm-asset/jquery": "2.0.3" }, - "type": "npm-asset" + "require-dev": { + "npm-asset/bower": "~0.9.2", + "npm-asset/grunt": "~0.4.1", + "npm-asset/grunt-bump": "0.0.11", + "npm-asset/grunt-contrib-concat": "~0.1.3", + "npm-asset/grunt-contrib-cssmin": "~0.5.0", + "npm-asset/grunt-contrib-jshint": "~0.3.0", + "npm-asset/grunt-contrib-uglify": "~0.2.0", + "npm-asset/grunt-contrib-watch": "~0.3.1", + "npm-asset/grunt-contrib-yuidoc": "~0.4.0", + "npm-asset/grunt-conventional-changelog": "~1.0.0", + "npm-asset/qunitjs": "~1.11.0" + }, + "type": "npm-asset-library", + "extra": { + "npm-asset-bugs": { + "url": "https://github.com/ducksboard/gridster.js/issues" + }, + "npm-asset-directories": [], + "npm-asset-repository": { + "type": "git", + "url": "git://github.com/ducksboard/gridster.js.git" + }, + "npm-asset-scripts": [] + }, + "authors": [ + { + "name": "ducksboard", + "email": "hackers@ducksboard.com" + } + ], + "description": "a drag-and-drop multi-column jQuery grid plugin", + "homepage": "http://gridster.net/" }, { "name": "npm-asset/jquery", @@ -2381,7 +2512,36 @@ "url": "https://api.github.com/repos/jquery/jquery/zipball/f852e631ba85af7da4ad7594785e122504e7b233", "reference": "f852e631ba85af7da4ad7594785e122504e7b233" }, - "type": "npm-asset" + "require-dev": { + "npm-asset/archiver": "~0.4.2", + "npm-asset/grunt": "0.4.1", + "npm-asset/grunt-compare-size": "~0.4.0", + "npm-asset/grunt-contrib-jshint": "0.3.0", + "npm-asset/grunt-contrib-uglify": "0.2.0", + "npm-asset/grunt-contrib-watch": "0.3.1", + "npm-asset/grunt-git-authors": "1.2.0", + "npm-asset/grunt-update-submodules": "0.2.0", + "npm-asset/gzip-js": "0.3.1", + "npm-asset/testswarm": "~1.1.0" + }, + "type": "npm-asset-library", + "extra": { + "npm-asset-bugs": { + "url": "http://bugs.jquery.com" + }, + "npm-asset-repository": { + "type": "git", + "url": "https://github.com/jquery/jquery.git" + } + }, + "authors": [ + { + "name": "jQuery Foundation and other contributors", + "url": "https://github.com/jquery/jquery/blob/master/AUTHORS.txt" + } + ], + "description": "JavaScript library for DOM operations", + "homepage": "http://jquery.com" }, { "name": "oomphinc/composer-installers-extender", @@ -3976,12 +4136,6 @@ } ], "description": "PHPMailer is a full-featured email creation and transfer class for PHP", - "funding": [ - { - "url": "https://github.com/Synchro", - "type": "github" - } - ], "time": "2021-06-16T14:33:43+00:00" }, { @@ -4073,20 +4227,6 @@ "x.509", "x509" ], - "funding": [ - { - "url": "https://github.com/terrafrost", - "type": "github" - }, - { - "url": "https://www.patreon.com/phpseclib", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib", - "type": "tidelift" - } - ], "time": "2021-04-06T13:56:45+00:00" }, { @@ -4506,16 +4646,16 @@ }, { "name": "psr/log", - "version": "1.1.3", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", "shasum": "" }, "require": { @@ -4539,7 +4679,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for logging libraries", @@ -4549,7 +4689,7 @@ "psr", "psr-3" ], - "time": "2020-03-23T09:12:05+00:00" + "time": "2021-05-03T11:20:27+00:00" }, { "name": "robrichards/xmlseclibs", @@ -6367,20 +6507,6 @@ "caching", "psr6" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2021-03-16T09:10:13+00:00" }, { @@ -6443,20 +6569,6 @@ "interoperability", "standards" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2021-03-23T23:28:01+00:00" }, { @@ -6521,20 +6633,6 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:54:36+00:00" }, { @@ -6607,20 +6705,6 @@ ], "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2021-03-26T09:23:24+00:00" }, { @@ -6678,20 +6762,6 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-08-10T07:47:39+00:00" }, { @@ -6765,20 +6835,6 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-30T10:09:30+00:00" }, { @@ -6836,39 +6892,26 @@ ], "description": "Symfony ErrorHandler Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-08-17T09:56:45+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.4.13", + "version": "v4.4.30", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "3e8ea5ccddd00556b86d69d42f99f1061a704030" + "reference": "2fe81680070043c4c80e7cedceb797e34f377bac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3e8ea5ccddd00556b86d69d42f99f1061a704030", - "reference": "3e8ea5ccddd00556b86d69d42f99f1061a704030", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2fe81680070043c4c80e7cedceb797e34f377bac", + "reference": "2fe81680070043c4c80e7cedceb797e34f377bac", "shasum": "" }, "require": { "php": ">=7.1.3", - "symfony/event-dispatcher-contracts": "^1.1" + "symfony/event-dispatcher-contracts": "^1.1", + "symfony/polyfill-php80": "^1.16" }, "conflict": { "symfony/dependency-injection": "<3.4" @@ -6878,9 +6921,10 @@ "symfony/event-dispatcher-implementation": "1.1" }, "require-dev": { - "psr/log": "~1.0", + "psr/log": "^1|^2|^3", "symfony/config": "^3.4|^4.0|^5.0", "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/error-handler": "~3.4|~4.4", "symfony/expression-language": "^3.4|^4.0|^5.0", "symfony/http-foundation": "^3.4|^4.0|^5.0", "symfony/service-contracts": "^1.1|^2", @@ -6891,11 +6935,6 @@ "symfony/http-kernel": "" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\EventDispatcher\\": "" @@ -6918,7 +6957,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony EventDispatcher Component", + "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "funding": [ { @@ -6934,7 +6973,7 @@ "type": "tidelift" } ], - "time": "2020-08-13T14:18:44+00:00" + "time": "2021-08-04T20:31:23+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -6996,20 +7035,6 @@ "interoperability", "standards" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-06T13:19:58+00:00" }, { @@ -7060,20 +7085,6 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:54:36+00:00" }, { @@ -7118,20 +7129,6 @@ ], "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2021-02-15T18:55:04+00:00" }, { @@ -7258,20 +7255,6 @@ ], "description": "Symfony FrameworkBundle", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-11T16:32:02+00:00" }, { @@ -7327,20 +7310,6 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-08-17T07:39:58+00:00" }, { @@ -7432,20 +7401,6 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-09-02T08:09:29+00:00" }, { @@ -7508,20 +7463,6 @@ "mime", "mime-type" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-08-17T09:56:45+00:00" }, { @@ -7584,20 +7525,6 @@ "polyfill", "portable" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2021-01-07T16:49:33+00:00" }, { @@ -7669,20 +7596,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-08-04T06:02:08+00:00" }, { @@ -7750,20 +7663,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -7827,20 +7726,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -7960,20 +7845,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8033,20 +7904,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8109,20 +7966,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8189,20 +8032,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8331,20 +8160,6 @@ "uri", "url" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-30T11:41:10+00:00" }, { @@ -8480,20 +8295,6 @@ "debug", "dump" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-08-17T07:31:35+00:00" }, { @@ -8550,20 +8351,6 @@ "instantiate", "serialize" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2021-01-27T10:01:46+00:00" }, { @@ -8623,20 +8410,6 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-30T11:41:10+00:00" }, { @@ -8974,74 +8747,8 @@ "constructor", "instantiate" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" - } - ], "time": "2020-11-10T18:47:58+00:00" }, - { - "name": "grale/webdav", - "version": "v0.2.1", - "source": { - "type": "git", - "url": "https://github.com/gletournel/WebDAV.git", - "reference": "c4d592e90f68806e491544d780fb44c78e3961cb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/gletournel/WebDAV/zipball/c4d592e90f68806e491544d780fb44c78e3961cb", - "reference": "c4d592e90f68806e491544d780fb44c78e3961cb", - "shasum": "" - }, - "require": { - "guzzle/http": "~3.0", - "php": ">=5.3.0", - "psr/log": "~1.0" - }, - "require-dev": { - "phpunit/phpunit": "~3.7.0" - }, - "suggest": { - "monolog/monolog": "Adds support for logging HTTP requests and responses", - "symfony/finder": "Allows you to more easily filter the files that the stream wrapper returns" - }, - "type": "library", - "autoload": { - "psr-0": { - "Grale\\WebDav": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Geoffroy Letournel", - "email": "geoffroy.letournel@gmail.com" - } - ], - "description": "A simple PHP WebDAV client and stream wrapper", - "homepage": "https://github.com/gletournel/WebDAV", - "keywords": [ - "WebDAV", - "php", - "stream", - "wrapper" - ], - "time": "2017-09-26T13:31:13+00:00" - }, { "name": "guzzlehttp/guzzle", "version": "6.5.2", @@ -9277,12 +8984,6 @@ "object", "object graph" ], - "funding": [ - { - "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", - "type": "tidelift" - } - ], "time": "2020-11-13T09:40:50+00:00" }, { @@ -9715,12 +9416,6 @@ "testing", "xunit" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2021-03-28T07:26:59+00:00" }, { @@ -9771,12 +9466,6 @@ "filesystem", "iterator" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-09-28T05:57:25+00:00" }, { @@ -9830,12 +9519,6 @@ "keywords": [ "process" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-09-28T05:58:55+00:00" }, { @@ -9885,12 +9568,6 @@ "keywords": [ "template" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-10-26T05:33:50+00:00" }, { @@ -9940,12 +9617,6 @@ "keywords": [ "timer" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-10-26T13:16:10+00:00" }, { @@ -10035,16 +9706,6 @@ "testing", "xunit" ], - "funding": [ - { - "url": "https://phpunit.de/donate.html", - "type": "custom" - }, - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-10-02T03:54:37+00:00" }, { @@ -10131,12 +9792,6 @@ ], "description": "Library for parsing CLI options", "homepage": "https://github.com/sebastianbergmann/cli-parser", - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-09-28T06:08:49+00:00" }, { @@ -10183,12 +9838,6 @@ ], "description": "Collection of value objects that represent the PHP code units", "homepage": "https://github.com/sebastianbergmann/code-unit", - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-10-26T13:08:54+00:00" }, { @@ -10234,12 +9883,6 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-09-28T05:30:19+00:00" }, { @@ -10304,12 +9947,6 @@ "compare", "equality" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-10-26T15:49:45+00:00" }, { @@ -10357,12 +9994,6 @@ ], "description": "Library for calculating the complexity of PHP code units", "homepage": "https://github.com/sebastianbergmann/complexity", - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-10-26T15:52:27+00:00" }, { @@ -10419,12 +10050,6 @@ "unidiff", "unified diff" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-10-26T13:10:38+00:00" }, { @@ -10478,12 +10103,6 @@ "environment", "hhvm" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-09-28T05:52:38+00:00" }, { @@ -10551,12 +10170,6 @@ "export", "exporter" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-09-28T05:24:23+00:00" }, { @@ -10611,12 +10224,6 @@ "keywords": [ "global state" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-10-26T15:55:19+00:00" }, { @@ -10664,12 +10271,6 @@ ], "description": "Library for counting the lines of code in PHP source code", "homepage": "https://github.com/sebastianbergmann/lines-of-code", - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-11-28T06:42:11+00:00" }, { @@ -10717,12 +10318,6 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-10-26T13:12:34+00:00" }, { @@ -10768,12 +10363,6 @@ ], "description": "Allows reflection of object attributes, including inherited and non-public ones", "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-10-26T13:14:26+00:00" }, { @@ -10827,12 +10416,6 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-10-26T13:17:30+00:00" }, { @@ -10878,12 +10461,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], + "abandoned": true, "time": "2020-09-28T06:45:17+00:00" }, { @@ -10930,12 +10508,6 @@ ], "description": "Collection of value objects that represent the types of the PHP type system", "homepage": "https://github.com/sebastianbergmann/type", - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-10-26T13:18:59+00:00" }, { @@ -10979,12 +10551,6 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-09-28T06:39:44+00:00" }, { @@ -11025,12 +10591,6 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "funding": [ - { - "url": "https://github.com/theseer", - "type": "github" - } - ], "time": "2020-07-12T23:59:07+00:00" }, { @@ -11094,8 +10654,7 @@ "egroupware/smallpart": 20, "egroupware/status": 20, "egroupware/swoolepush": 20, - "egroupware/tracker": 20, - "egroupware/webdav": 20 + "egroupware/tracker": 20 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/filemanager/cli.php b/filemanager/cli.php index 3819b78de4..e0db48ca3b 100755 --- a/filemanager/cli.php +++ b/filemanager/cli.php @@ -484,11 +484,6 @@ function load_wrapper($url) { switch($scheme) { - case 'webdav': - case 'webdavs': - require_once('HTTP/WebDAV/Client.php'); - break; - default: if (!isset($GLOBALS['egw']) && !in_array($scheme,array('smb','imap')) && ($user = parse_url($url,PHP_URL_USER)) && ($pass = parse_url($url,PHP_URL_PASS))) diff --git a/filemanager/inc/class.filemanager_admin.inc.php b/filemanager/inc/class.filemanager_admin.inc.php index 690845225d..047a7671e9 100644 --- a/filemanager/inc/class.filemanager_admin.inc.php +++ b/filemanager/inc/class.filemanager_admin.inc.php @@ -261,7 +261,7 @@ class filemanager_admin extends filemanager_ui { $content['mounts'][$n++] = array( 'path' => $path, - 'url' => $url, + 'url' => preg_replace('#://([^:@/]+):([^@/]+)@#', '://$1:****@', $url), ); $readonlys["disable[$path]"] = !$this->versioning || !Vfs::$is_root || Vfs::parse_url($url,PHP_URL_SCHEME) != $this->versioning;