extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-17 19:01:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

change checking admin-credentials to be no longer fatal, just display a info-message with the error

Browse Source 
checking admin credentials can fail for many reasons, not just they are wrong :(
This commit is contained in:
ralf 2024-07-06 10:38:49 +02:00
parent a893669641
commit 32ebee7229
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/inc/class.admin_mail.inc.php
View File

@ -1052,8 +1052,13 @@ class admin_mail
$account = new Mail\Account($content); $account = new Mail\Account($content);
if ($account->acc_imap_administration) if ($account->acc_imap_administration)
{ {
$imap = $account->imapServer(true); try {
if ($imap) $imap->checkAdminConnection(); $imap = $account->imapServer(true);
if ($imap) $imap->checkAdminConnection();
}
catch(\Horde_Imap_Client_Exception $e) {
Api\Json\Response::get()->message(lang('Checking admin credentials failed').': '.$e->getMessage(), 'info');
}
} }
// test sieve connection, if not called for other user, enabled and credentials available // test sieve connection, if not called for other user, enabled and credentials available
if (!$content['called_for'] && $account->acc_sieve_enabled && $account->acc_imap_username) if (!$content['called_for'] && $account->acc_sieve_enabled && $account->acc_imap_username)

4
admin/templates/default/mailaccount.xet
View File

@ -47,9 +47,9 @@
<grid width="100%"> <grid width="100%">
<columns> <columns>
<column width="115"/> <column width="115"/>
<column width="200"/> <column width="40%"/>
<column width="60"/> <column width="60"/>
<column/> <column width="30%"/>
</columns> </columns>
<rows> <rows>
<row class="emailadmin_no_single"> <row class="emailadmin_no_single">

1
mail/lang/egw_de.lang
View File

@ -100,6 +100,7 @@ check to receive a notification when the message is read (note: not all clients
check to save as calendar event on send mail de Nach dem Versenden als Termin erstellen check to save as calendar event on send mail de Nach dem Versenden als Termin erstellen
check to save as infolog on send mail de Nach dem Versenden als InfoLog erstellen check to save as infolog on send mail de Nach dem Versenden als InfoLog erstellen
check to save as tracker entry on send mail de Nach dem Versenden als Ticket erstellen check to save as tracker entry on send mail de Nach dem Versenden als Ticket erstellen
checking admin credentials failed mail de Überprüfung der Admin-Zugangsdaten fehlgeschlagen
choose file mail de Datei choose file mail de Datei
common acl mail de Berechtigung common acl mail de Berechtigung
compose mail de Verfassen compose mail de Verfassen

1
mail/lang/egw_en.lang
View File

@ -100,6 +100,7 @@ check to receive a notification when the message is read (note: not all clients
check to save as calendar event on send mail en Check button to create as event after sending check to save as calendar event on send mail en Check button to create as event after sending
check to save as infolog on send mail en Check button to create as InfoLog after sending check to save as infolog on send mail en Check button to create as InfoLog after sending
check to save as tracker entry on send mail en Check button to create as ticket after sending check to save as tracker entry on send mail en Check button to create as ticket after sending
checking admin credentials failed mail en Checking admin credentials failed
choose file mail en Choose file choose file mail en Choose file
common acl mail en Common access rights common acl mail en Common access rights
compose mail en Compose compose mail en Compose