extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into web-components

Browse Source
This commit is contained in:
nathan 2021-11-04 09:24:37 -06:00
commit b7daf84d90
6 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/jquery/blueimp/js/blueimp-gallery.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
api/src/Vfs/Base.php
View File

@ -86,10 +86,10 @@ class Base
if ($check_url === true || !isset($check_url) && strpos($url, '$') === false) if ($check_url === true || !isset($check_url) && strpos($url, '$') === false)
{ {
$check_url = strtr($url, [ $check_url = strtr($url, [
'user' => $GLOBALS['egw_info']['user']['account_lid'], '$user' => $GLOBALS['egw_info']['user']['account_lid'],
'pass' => urlencode($GLOBALS['egw_info']['user']['passwd']), '$pass' => urlencode($GLOBALS['egw_info']['user']['passwd']),
'host' => $GLOBALS['egw_info']['user']['domain'], '$host' => $GLOBALS['egw_info']['user']['domain'],
'home' => str_replace(array('\\\\', '\\'), array('', '/'), $GLOBALS['egw_info']['user']['homedirectory']), '$home' => str_replace(array('\\\\', '\\'), array('', '/'), $GLOBALS['egw_info']['user']['homedirectory']),
]); ]);
} }

6
composer.json
View File

@ -54,6 +54,10 @@
"type": "vcs", "type": "vcs",
"url": "https://github.com/egroupware/Compress" "url": "https://github.com/egroupware/Compress"
}, },
{
"type": "vcs",
"url": "https://github.com/egroupware/Imap_Client"
},
{ {
"type": "vcs", "type": "vcs",
"url": "https://github.com/IMSGlobal/lti-1-3-php-library" "url": "https://github.com/IMSGlobal/lti-1-3-php-library"
@ -93,6 +97,7 @@
"egroupware/crypt": "^2.7.13", "egroupware/crypt": "^2.7.13",
"egroupware/guzzlestream": "dev-master", "egroupware/guzzlestream": "dev-master",
"egroupware/icalendar": "^2.1.9", "egroupware/icalendar": "^2.1.9",
"egroupware/imap-client": "2.30.4",
"egroupware/magicsuggest": "^2.1", "egroupware/magicsuggest": "^2.1",
"egroupware/news_admin": "self.version", "egroupware/news_admin": "self.version",
"egroupware/openid": "self.version", "egroupware/openid": "self.version",
@ -109,7 +114,6 @@
"npm-asset/as-jqplot": "1.0.*", "npm-asset/as-jqplot": "1.0.*",
"npm-asset/gridster": "0.5.*", "npm-asset/gridster": "0.5.*",
"oomphinc/composer-installers-extender": "^1.1", "oomphinc/composer-installers-extender": "^1.1",
"pear-pear.horde.org/horde_imap_client": "^2.30.3",
"pear-pear.horde.org/horde_mail": "^2.1.2", "pear-pear.horde.org/horde_mail": "^2.1.2",
"pear-pear.horde.org/horde_managesieve": "^1.0.2", "pear-pear.horde.org/horde_managesieve": "^1.0.2",
"pear-pear.horde.org/horde_mapi": "^1.0.9", "pear-pear.horde.org/horde_mapi": "^1.0.9",

18
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": "c413807814d716c0662b69272da98ba2", "content-hash": "5a9ac5a19bb28961cbb8215f95ea72b9",
"packages": [ "packages": [
{ {
"name": "adldap2/adldap2", "name": "adldap2/adldap2",
@ -207,7 +207,7 @@
"version": "v2.3.4", "version": "v2.3.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "git@github.com:fengyuanchen/cropper.git", "url": "https://github.com/fengyuanchen/cropper.git",
"reference": "30c58b29ee21010e17e58ebab165fbd84285c685" "reference": "30c58b29ee21010e17e58ebab165fbd84285c685"
}, },
"dist": { "dist": {
@ -305,7 +305,7 @@
"version": "1.12.4", "version": "1.12.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "git@github.com:jquery/jquery-dist.git", "url": "https://github.com/jquery/jquery-dist.git",
"reference": "5e89585e0121e72ff47de177c5ef604f3089a53d" "reference": "5e89585e0121e72ff47de177c5ef604f3089a53d"
}, },
"dist": { "dist": {
@ -1211,16 +1211,16 @@
}, },
{ {
"name": "egroupware/imap-client", "name": "egroupware/imap-client",
"version": "2.30.2", "version": "2.30.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/EGroupware/Imap_Client.git", "url": "https://github.com/EGroupware/Imap_Client.git",
"reference": "8d80312313188082733e45e6d674ecfe15b7eb8e" "reference": "f7dd50133871e34a5a7560ac08626ee11e9ccc3e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/EGroupware/Imap_Client/zipball/8d80312313188082733e45e6d674ecfe15b7eb8e", "url": "https://api.github.com/repos/EGroupware/Imap_Client/zipball/f7dd50133871e34a5a7560ac08626ee11e9ccc3e",
"reference": "8d80312313188082733e45e6d674ecfe15b7eb8e", "reference": "f7dd50133871e34a5a7560ac08626ee11e9ccc3e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1261,7 +1261,6 @@
"Horde_Imap_Client": "lib/" "Horde_Imap_Client": "lib/"
} }
}, },
"notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"LGPL-2.1" "LGPL-2.1"
], ],
@ -1274,6 +1273,9 @@
], ],
"description": "IMAP client library", "description": "IMAP client library",
"homepage": "https://www.horde.org/libraries/Horde_Imap_Client", "homepage": "https://www.horde.org/libraries/Horde_Imap_Client",
"support": {
"source": "https://github.com/EGroupware/Imap_Client/tree/2.30.4"
},
"time": "2019-09-29T00:00:00+00:00" "time": "2019-09-29T00:00:00+00:00"
}, },
{ {

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

@ -154,9 +154,9 @@ class filemanager_admin extends filemanager_ui
throw new Api\Exception\NoPermission(); throw new Api\Exception\NoPermission();
} }
$url = $content['mounts']['url']['scheme'] . '://'; $url = $content['mounts']['url']['scheme'] . '://';
if (in_array($content['mounts']['url']['scheme'], ['smb', 'webdavs', 'vfs'])) if (in_array($content['mounts']['url']['scheme'], ['smb', 'vfs']) || !empty(trim($content['mounts']['url']['user'])))
{ {
if (empty(trim($content['mounts']['url']['user']))) if (in_array($content['mounts']['url']['scheme'], ['smb', 'vfs']) && empty(trim($content['mounts']['url']['user'])))
{ {
throw new Api\Exception\WrongUserinput(lang('SMB, WebDAVs and VFS require a username!')); throw new Api\Exception\WrongUserinput(lang('SMB, WebDAVs and VFS require a username!'));
} }

19
importexport/inc/class.importexport_arrayxml.inc.php
View File

@ -74,15 +74,26 @@ class importexport_arrayxml {
* @param string $_xml * @param string $_xml
* @return array * @return array
*/ */
public static function xml2array( $_xml ) { public static function xml2array( $_xml )
if ( $_xml instanceof DOMElement ) { {
if($_xml instanceof DOMElement)
{
$n = &$_xml; $n = &$_xml;
} else { }
elseif($_xml)
{
$n = new DOMDocument; $n = new DOMDocument;
$loaded = $n->loadXML($_xml); $loaded = $n->loadXML($_xml);
if(!$loaded) return array(); if(!$loaded)
{
return array();
}
} }
$xml_array = array(); $xml_array = array();
if(!$_xml || !$n)
{
return $xml_array;
}
foreach($n->childNodes as $nc) { foreach($n->childNodes as $nc) {