Compare commits

...

2 commits

Author SHA1 Message Date
Julius Härtl
357a1678b3
Bump bundles
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-03-03 18:19:46 +01:00
Julius Härtl
d612aeec2d
Fix regex to not take email uids as federated ids
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-03-03 18:19:46 +01:00
3 changed files with 20 additions and 21 deletions

Binary file not shown.

View file

@ -28,10 +28,11 @@
/** /**
* Regular expression for splitting parts of remote share owners: * Regular expression for splitting parts of remote share owners:
* "user@example.com/"
* "user@example.com/path/to/owncloud" * "user@example.com/path/to/owncloud"
* "user@anotherexample.com@example.com/path/to/owncloud * "user@anotherexample.com@example.com/path/to/owncloud
*/ */
_REMOTE_OWNER_REGEXP: new RegExp('^([^@]*)@(([^@]*)@)?([^/]*)([/](.*)?)?$'), _REMOTE_OWNER_REGEXP: new RegExp('^(([^@]*)@(([^@^/^\\s]*)@)?)([^[\\s/]*)([/](.*))?$'),
/** /**
* Initialize the sharing plugin. * Initialize the sharing plugin.
@ -350,24 +351,22 @@
*/ */
_formatRemoteShare: function(shareWith, shareWithDisplayName, message) { _formatRemoteShare: function(shareWith, shareWithDisplayName, message) {
var parts = OCA.Sharing.Util._REMOTE_OWNER_REGEXP.exec(shareWith) var parts = OCA.Sharing.Util._REMOTE_OWNER_REGEXP.exec(shareWith)
if (!parts) { if (!parts || !parts[6]) {
// display avatar of the user // display avatar of the user
var avatar = '<span class="avatar" data-username="' + escapeHTML(shareWith) + '" title="' + message + ' ' + escapeHTML(shareWithDisplayName) + '"></span>' var avatar = '<span class="avatar" data-username="' + escapeHTML(shareWith) + '" title="' + message + ' ' + escapeHTML(shareWithDisplayName) + '"></span>'
var hidden = '<span class="hidden-visually">' + message + ' ' + escapeHTML(shareWithDisplayName) + '</span> ' var hidden = '<span class="hidden-visually">' + message + ' ' + escapeHTML(shareWithDisplayName) + '</span> '
return avatar + hidden return avatar + hidden
} }
var userName = parts[1] var userName = parts[2]
var userDomain = parts[3] var userDomain = parts[4]
var server = parts[4] var server = parts[5]
var tooltip = message + ' ' + userName var tooltip = message + ' ' + userName
if (userDomain) { if (userDomain) {
tooltip += '@' + userDomain tooltip += '@' + userDomain
} }
if (server) { if (server) {
if (!userDomain) {
userDomain = '…'
}
tooltip += '@' + server tooltip += '@' + server
} }