Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Chwala auth errors handling for built-in storage sources (Bifrost#T101400)

Browse source 
Instead of a non-working dialog, we display normal error message. No "Driver not found" errors.
This commit is contained in:
Aleksander Machniak 2018-08-10 11:48:50 +00:00
parent 8f7f68e9c4
commit f162bd2cf5
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/kolab_files/kolab_files.js
View file

@ -3771,6 +3771,16 @@ function kolab_files_ui()
if (!this.auth_errors)
this.auth_errors = {};
$.each(result.auth_errors || {}, function(i, v) {
// for normal errors we display only an error message, other will display a dialog
if (v.error) {
if (v.error == 580) {
rcmail.display_message(rcmail.gettext('kolab_files.storageautherror').replace('$title', i), 'error');
}
delete result.auth_errors[i];
}
});
$.extend(this.auth_errors, result.auth_errors);
}

2
plugins/kolab_files/lib/kolab_files_engine.php
View file

@ -1564,7 +1564,7 @@ class kolab_files_engine
$this->plugin->add_label(
'folderdeleting', 'folderdeleteconfirm', 'folderdeletenotice',
'collection_audio', 'collection_video', 'collection_image', 'collection_document',
'additionalfolders', 'listpermanent'
'additionalfolders', 'listpermanent', 'storageautherror'
);
$this->rc->output->add_label('foldersubscribing', 'foldersubscribed',
'folderunsubscribing', 'folderunsubscribed', 'searching'

1
plugins/kolab_files/localization/en_US.inc
View file

@ -154,6 +154,7 @@ $labels['invitationrequesting'] = 'Requesting an invitation...';
$labels['storepasswords'] = 'remember password';
$labels['storepasswordsdesc'] = 'Stored passwords will be encrypted. Enable this if you do not want to be asked for the password on every login or you want this storage to be available via WebDAV.';
$labels['storageautherror'] = 'Authentication failed for $title storage.';
$labels['arialabelsearchform'] = 'Files search form';
$labels['arialabelquicksearchbox'] = 'Search input';