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

* eMail: give hint about sieve server port usage and its impact on connection

Browse Source
This commit is contained in:
Klaus Leithoff 2013-05-16 11:44:15 +00:00
parent 6bb9b81eed
commit ee864de158
5 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
felamimail/inc/class.uipreferences.inc.php
View File

@ -245,7 +245,7 @@
'menuaction' => 'felamimail.uipreferences.editForwardingAddress'
);
$this->t->set_var('form_action',$GLOBALS['egw']->link('/index.php',$linkData));
$this->t->set_var('forwarding_address',(count($userData['mailForwardingAddress'])>1?implode(';',$userData['mailForwardingAddress']):$userData['mailForwardingAddress'][0]));
$this->t->set_var('forwarding_address',(count($userData['mailForwardingAddress'])>1?implode(';',$userData['mailForwardingAddress']):(!empty($userData['mailForwardingAddress'][0])?$userData['mailForwardingAddress'][0]:'')));
#deliveryMode checked_keep_local_copy
if($userData['deliveryMode'] != 'forwardOnly') {
@ -894,6 +894,7 @@
$this->t->set_var('lang_username',lang('username'));
$this->t->set_var('lang_password',lang('password'));
$this->t->set_var('lang_port',lang('port'));
$this->t->set_var('lang_sieve_ssl_usage_message',lang('note:').' '.lang('if you specify port 5190 as sieve server port, you enforce ssl for sieve (server must support that)'));
$this->t->set_var('lang_apply',lang('apply'));
$this->t->set_var('lang_use_costum_settings',lang('use custom settings'));
$this->t->set_var('lang_use_custom_ids',lang('use custom identities'));

1
felamimail/inc/class.uiwidgets.inc.php
View File

@ -515,7 +515,6 @@ class uiwidgets
'onExecute' => 'javaScript:mail_openAsHtml',
'allowOnMultiple' => false,
),
),
),
/*

1
felamimail/lang/egw_de.lang
View File

@ -286,6 +286,7 @@ if using ssl or tls, you must have the php openssl extension loaded. felamimail
if you choose NOT to keep a copy, you are setting your mailbox to FORWARD ONLY! felamimail de Wenn Sie KEINE Kopie der eingehenden E-Mail(s) behalten, stellen Sie Ihre Mailkonto auf NUR WEITERLEITEN um!
if you leave this page without saving to draft, the message will be discarded completely felamimail de Wenn Sie diese Seite verlassen, ohne die Nachricht als Entwurf zu speichern, wird diese komplett verworfen.
if you select all messages there will be no pagination for mail message list. beware, as some actions on all selected messages may be problematic depending on the amount of selected messages. felamimail de Wenn Sie alle Nachrichten wählen, können Sie mit der Maus nach unten Scrollen und sehen dann automatisch weitere E-Mails. Die Blätterfunktion mit Pfeilen wird dadurch deaktiviert.
if you specify port 5190 as sieve server port, you enforce ssl for sieve (server must support that) felamimail de Wenn Sie als SIEVE Server Port 5190 eintragen, wird für die Kommunikation mit dem SIEVE-Server eine SSL-Verbindung verwendet (der Server muss das natürlich unterstützen)
if you want to see a preview of a mail by single clicking onto the subject, set the height for the message-list and the preview area here. 300 seems to be a good working value. the preview will be displayed at the end of the message list when a message is selected. felamimail de Um eine E-Mail Vorschau zu erhalten, wählen Sie hier die Höhe des Vorschaufensters. Das Vorschaufenster wird dann unterhalb der Liste von E-Mails eingeblendet.
if you want to see a preview of a mail by single clicking onto the subject, set the height for the message-list and the preview area here. 300 seems to be a good working value. the preview will be displayed at the end of the message when a message is selected. felamimail de Um eine E-Mail Vorschau zu erhalten, wählen Sie hier die Höhe des Vorschaufensters. Das Vorschaufenster wird dann unterhalb der Liste von E-Mails eingeblendet.
illegal folder name. please select a different name. felamimail de ungültiger Ordnername. Bitte wählen Sie einen anderen Namen.

1
felamimail/lang/egw_en.lang
View File

@ -287,6 +287,7 @@ if using ssl or tls, you must have the php openssl extension loaded. felamimail
if you choose NOT to keep a copy, you are setting your mailbox to FORWARD ONLY! felamimail en if you choose NOT to keep a copy, you are setting your mailbox to FORWARD ONLY!
if you leave this page without saving to draft, the message will be discarded completely felamimail en If you leave this page without saving to draft, the message will be discarded completely
if you select all messages there will be no pagination for mail message list. beware, as some actions on all selected messages may be problematic depending on the amount of selected messages. felamimail en If you select all messages there will be no pagination for mail message list. Beware, as some actions on all selected messages may be problematic depending on the amount of selected messages.
if you specify port 5190 as sieve server port, you enforce ssl for sieve (server must support that) felamimail en if you specify port 5190 as sieve server port, you enforce ssl for sieve (server must support that)
if you want to see a preview of a mail by single clicking onto the subject, set the height for the message-list and the preview area here. 300 seems to be a good working value. the preview will be displayed at the end of the message list when a message is selected. felamimail en If you want to see a preview of a mail by single clicking onto the subject, set the height for the message-list and the preview area here. 300 seems to be a good working value. The preview will be displayed at the end of the message list when a message is selected.
if you want to see a preview of a mail by single clicking onto the subject, set the height for the message-list and the preview area here. 300 seems to be a good working value. the preview will be displayed at the end of the message when a message is selected. felamimail en If you want to see a preview of a mail by single clicking onto the subject, set the height for the message-list and the preview area here. 300 seems to be a good working value. The preview will be displayed at the end of the message list when a message is selected.
illegal folder name. please select a different name. felamimail en Invalid folder name. Please select a different name.

3
felamimail/templates/default/edit_account_data.tpl
View File

@ -159,6 +159,9 @@ div.inactivetab{ display:none; }
<input type="text" style="width: 5em;" id="ic[sievePort]" name="ic[sievePort]" value="{ic[sievePort]}" maxlength="5">
</td>
</tr>
<tr>
<td colspan='2'>{lang_sieve_ssl_usage_message}</td>
</tr>
</table>
</fieldset>
</div>