diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/bg/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/bg/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/bg/etc/e-smith/web/functions/fetchmail 2012-06-03 22:27:57.000000000 +0200
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/bg/etc/e-smith/web/functions/fetchmail 2014-03-09 21:59:18.000000000 +0100
@@ -188,6 +188,10 @@
The user account password on the mail server
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
Server Mailbox Password
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Mail retrieval
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/da/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/da/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/da/etc/e-smith/web/functions/fetchmail 2014-03-09 18:45:54.000000000 +0100
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/da/etc/e-smith/web/functions/fetchmail 2014-03-09 22:02:30.000000000 +0100
@@ -188,6 +188,10 @@
Brugerkonto adgangskode på postserveren
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
Server Postkasse Adgangskode
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Modtagelse af mail
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/de/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/de/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/de/etc/e-smith/web/functions/fetchmail 2014-03-09 18:45:54.000000000 +0100
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/de/etc/e-smith/web/functions/fetchmail 2014-03-09 22:02:47.000000000 +0100
@@ -188,6 +188,10 @@
Benutzer-Passwort auf dem externen Mail-Server
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
POP
@@ -240,6 +244,10 @@
Server Mailbox Password
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
E-Mail mit FetchMail
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/el/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/el/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/el/etc/e-smith/web/functions/fetchmail 2012-06-03 22:27:58.000000000 +0200
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/el/etc/e-smith/web/functions/fetchmail 2014-03-09 22:01:19.000000000 +0100
@@ -188,6 +188,10 @@
The user account password on the mail server
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
Server Mailbox Password
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Mail retrieval
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail 2012-06-03 22:27:57.000000000 +0200
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail 2014-03-09 21:14:10.000000000 +0100
@@ -239,6 +239,10 @@
The user account password on the mail server
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -317,6 +321,10 @@
Server Mailbox Password
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Mail retrieval
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/es/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/es/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/es/etc/e-smith/web/functions/fetchmail 2014-03-09 18:45:54.000000000 +0100
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/es/etc/e-smith/web/functions/fetchmail 2014-03-09 21:59:05.000000000 +0100
@@ -188,6 +188,10 @@
La contraseña de cuenta de usuario en el servidor de correo
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
Contraseña de la Casilla del Servidor
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Recuperación de Correo
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/et/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/et/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/et/etc/e-smith/web/functions/fetchmail 2012-06-03 22:27:57.000000000 +0200
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/et/etc/e-smith/web/functions/fetchmail 2014-03-09 21:58:54.000000000 +0100
@@ -188,6 +188,10 @@
The user account password on the mail server
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
Server Mailbox Password
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Mail retrieval
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/fetchmail 2014-03-09 18:45:54.000000000 +0100
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/fetchmail 2014-03-09 22:00:03.000000000 +0100
@@ -188,6 +188,10 @@
Le mot de passe du compte de messagerie sur le serveur
+ LABEL_MAIL_OPTIONS
+ Options passées directement à fetchmail. Attention : il n'y a aucun contrôle sur les données passées, donc si vous ne savez pas de quoi il s'agit, il est sans doute plus prudent de laisser ce champ vide !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
mot de passe sur le serveur
+ MAIL_OPTIONS
+ Options 'brutes' pour fetchmail
+
+ fetchmail
Récupération de mails
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/he/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/he/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/he/etc/e-smith/web/functions/fetchmail 2012-06-03 22:27:58.000000000 +0200
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/he/etc/e-smith/web/functions/fetchmail 2014-03-09 22:00:47.000000000 +0100
@@ -188,6 +188,10 @@
The user account password on the mail server
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
Server Mailbox Password
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Mail retrieval
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/fetchmail 2012-06-03 22:27:58.000000000 +0200
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/fetchmail 2014-03-09 21:57:53.000000000 +0100
@@ -188,6 +188,10 @@
The user account password on the mail server
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
Server Mailbox Password
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Mail retrieval
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/id/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/id/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/id/etc/e-smith/web/functions/fetchmail 2012-06-03 22:27:57.000000000 +0200
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/id/etc/e-smith/web/functions/fetchmail 2014-03-09 21:56:57.000000000 +0100
@@ -188,6 +188,10 @@
The user account password on the mail server
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
Server Mailbox Password
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Mail retrieval
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/it/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/it/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/it/etc/e-smith/web/functions/fetchmail 2014-03-09 18:45:54.000000000 +0100
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/it/etc/e-smith/web/functions/fetchmail 2014-03-09 22:02:57.000000000 +0100
@@ -188,6 +188,10 @@
La password dell'account sul server email
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
Password della casella sul Server
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Recupero Email
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/ja/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/ja/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/ja/etc/e-smith/web/functions/fetchmail 2012-06-03 22:27:58.000000000 +0200
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/ja/etc/e-smith/web/functions/fetchmail 2014-03-09 22:01:53.000000000 +0100
@@ -188,6 +188,10 @@
The user account password on the mail server
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
Server Mailbox Password
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Mail retrieval
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/nb/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/nb/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/nb/etc/e-smith/web/functions/fetchmail 2012-06-03 22:27:58.000000000 +0200
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/nb/etc/e-smith/web/functions/fetchmail 2014-03-09 21:34:00.000000000 +0100
@@ -188,6 +188,10 @@
The user account password on the mail server
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
Server Mailbox Password
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Mail retrieval
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/nl/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/nl/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/nl/etc/e-smith/web/functions/fetchmail 2014-03-09 18:45:54.000000000 +0100
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/nl/etc/e-smith/web/functions/fetchmail 2014-03-09 22:00:31.000000000 +0100
@@ -188,6 +188,10 @@
Het gebruikersaccount wachtwoord op de mail server
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
Server postbuswachtwoord
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Post ophalen
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/fetchmail 2012-06-03 22:27:58.000000000 +0200
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/fetchmail 2014-03-09 21:40:30.000000000 +0100
@@ -188,6 +188,10 @@
The user account password on the mail server
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
Server Mailbox Password
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Mail retrieval
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/pt/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/pt/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/pt/etc/e-smith/web/functions/fetchmail 2014-03-09 18:45:54.000000000 +0100
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/pt/etc/e-smith/web/functions/fetchmail 2014-03-09 21:58:19.000000000 +0100
@@ -188,6 +188,10 @@
A senha do usuário no servidor de e-mail
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
Senha da caixa postal no servidor
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Busca de e-mail
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/fetchmail 2014-03-09 18:45:54.000000000 +0100
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/fetchmail 2014-03-09 21:59:30.000000000 +0100
@@ -188,6 +188,10 @@
A senha do usuário no servidor de e-mail
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
Senha da caixa postal no servidor
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Busca de e-mail
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/ro/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/ro/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/ro/etc/e-smith/web/functions/fetchmail 2014-03-09 18:45:54.000000000 +0100
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/ro/etc/e-smith/web/functions/fetchmail 2014-03-09 22:01:10.000000000 +0100
@@ -188,6 +188,10 @@
Parola utilizatorului pe serverul de mail
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
POP
@@ -240,6 +244,10 @@
Parolă căsuță poștală
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Inport mailuri
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/ru/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/ru/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/ru/etc/e-smith/web/functions/fetchmail 2012-06-03 22:27:58.000000000 +0200
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/ru/etc/e-smith/web/functions/fetchmail 2014-03-09 21:39:21.000000000 +0100
@@ -185,7 +185,11 @@
LABEL_MAIL_PASSWORD
- The user account password on the mail server
+ The user account password on the mail server
+
+
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !POP3
@@ -237,7 +241,11 @@
MAIL_PASSWORD
- Server Mailbox Password
+ Server Mailbox Password
+
+
+ MAIL_OPTIONS
+ 'Raw' options for fetchmailfetchmail
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/sl/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/sl/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/sl/etc/e-smith/web/functions/fetchmail 2012-06-03 22:27:58.000000000 +0200
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/sl/etc/e-smith/web/functions/fetchmail 2014-03-09 21:57:09.000000000 +0100
@@ -188,6 +188,10 @@
The user account password on the mail server
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
Server Mailbox Password
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Mail retrieval
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/fetchmail 2014-03-09 18:45:54.000000000 +0100
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/fetchmail 2014-03-09 22:02:20.000000000 +0100
@@ -188,6 +188,10 @@
Lösenordet för kontot på mailservern
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
POP
@@ -240,6 +244,10 @@
Mailkontots lösenord på servern
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Hämtning av mail
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/th/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/th/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/th/etc/e-smith/web/functions/fetchmail 2012-06-03 22:27:58.000000000 +0200
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/th/etc/e-smith/web/functions/fetchmail 2014-03-09 22:01:40.000000000 +0100
@@ -188,6 +188,10 @@
The user account password on the mail server
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
Server Mailbox Password
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Mail retrieval
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/tr/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/tr/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/tr/etc/e-smith/web/functions/fetchmail 2012-06-03 22:27:58.000000000 +0200
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/tr/etc/e-smith/web/functions/fetchmail 2014-03-09 21:58:42.000000000 +0100
@@ -188,6 +188,10 @@
The user account password on the mail server
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
Server Mailbox Password
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
Mail retrieval
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/fetchmail 2014-03-09 18:45:54.000000000 +0100
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/fetchmail 2014-03-09 21:58:32.000000000 +0100
@@ -188,6 +188,10 @@
邮件服务器上的用户密码
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
服务器邮箱密码
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
邮件检索
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/zh-tw/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/zh-tw/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/locale/zh-tw/etc/e-smith/web/functions/fetchmail 2014-03-09 18:45:54.000000000 +0100
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/locale/zh-tw/etc/e-smith/web/functions/fetchmail 2014-03-09 22:03:05.000000000 +0100
@@ -188,6 +188,10 @@
郵件伺服器上的使用者密碼
+ LABEL_MAIL_OPTIONS
+ Options you can pass directly to fetchmail. Warning : these options aren't checked, so if you dont know what this is, you should probably let this field blank !
+
+ POP3
Pop
@@ -240,6 +244,10 @@
伺服器郵箱密碼
+ MAIL_OPTIONS
+ 'Raw' options for fetchmail
+
+ fetchmail
郵件檢索
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/templates/etc/fetchmail/90fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/templates/etc/fetchmail/90fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/templates/etc/fetchmail/90fetchmail 2012-06-03 22:27:57.000000000 +0200
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/templates/etc/fetchmail/90fetchmail 2014-03-10 21:56:28.000000000 +0100
@@ -293,12 +293,18 @@
foreach my $FetchMailAcount ( @FetchMailAccounts ) {
$FetchN++ ;
- my ( $mserv, $mtype, $mname, $mpass ) = split FS, $FetchMailAcount ;
+ my ( $mserv, $mtype, $mname, $mpass, $moptions ) = split FS, $FetchMailAcount ;
if(not defined $mserv ) { $mserv='';}
if(not defined $mname ) { $mname='';}
if(not defined $mpass ) { $mpass='';}
if(not defined $mtype ) { $mtype='';}
+ if(not defined $moptions ) { $moptions='';}
+ # we need to convert the name, the password and the options from HEX to text
+ $mname = pack( "H*", $mname );
+ $mpass = pack( "H*", $mpass );
+ $moptions = pack( "H*", $moptions );
+
if ($mserv ne '') {
my $ServOpt = ' and options uidl no dns';
@@ -321,10 +324,6 @@
$staticvalue .= "set postmaster \"postmaster\@$dom\"\n" ;
$staticvalue .= "set bouncemail\nset properties \"\"\n" ;
- # we need to convert the name and the password from HEX to text
- $mname = pack( "H*", $mname ) ;
- $mpass = pack( "H*", $mpass ) ;
-
# special case : the \ must be changed to \x5c !
$mname =~ s/[\\]/\\x5c/g ;
$mpass =~ s/[\\]/\\x5c/g ;
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/web/functions/fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/web/functions/fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/web/functions/fetchmail 2012-06-03 22:27:57.000000000 +0200
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/web/functions/fetchmail 2014-03-10 22:08:31.000000000 +0100
@@ -141,10 +141,18 @@
validation="validate_account_data(Password)">
+
+
+
+
diff -rud smeserver-fetchmail-1.4.update/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/fetchmail.pm smeserver-fetchmail-1.4.3/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/fetchmail.pm
--- smeserver-fetchmail-1.4.update/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/fetchmail.pm 2012-06-03 22:27:57.000000000 +0200
+++ smeserver-fetchmail-1.4.3/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/fetchmail.pm 2014-03-09 21:19:11.000000000 +0100
@@ -419,6 +419,7 @@
esmith::cgi::genSmallCell($q, $self->localise('MAIL_TYPE'), "header",),
esmith::cgi::genSmallCell($q, $self->localise('MAIL_ACCOUNT'), "header",),
esmith::cgi::genSmallCell($q, $self->localise('MAIL_PASSWORD'), "header",),
+ esmith::cgi::genSmallCell($q, $self->localise('MAIL_OPTIONS'), "header",),
esmith::cgi::genSmallCell($q, $self->localise('ACTION'), "header", 2), "\n",
);
my @MailDatas = split ( RS, $DataHide ) ;
@@ -434,6 +435,7 @@
esmith::cgi::genSmallCell($q, $Rec[1]),
esmith::cgi::genSmallCell($q, CGI::escapeHTML( pack( "H*", $Rec[2] ))),
esmith::cgi::genSmallCell($q, CGI::escapeHTML( pack( "H*", $Rec[3] ))),
+ esmith::cgi::genSmallCell($q, CGI::escapeHTML( pack( "H*", $Rec[4] )) || ''),
esmith::cgi::genSmallCell($q, $nlink1),
esmith::cgi::genSmallCell($q, $nlink2),
"\n",
@@ -497,16 +499,19 @@
my $Flag = 1 ;
my $q = $self->{cgi} ;
my $user = $q->param('user') ;
- my $server = '' ; my $type = 'IMAP' ; my $account = '' ; my $password = '' ;
+ my $server = '' ; my $type = 'IMAP' ; my $account = '' ; my $password = '' ; my $options = '';
$server = $q->param('mail-server') if ( defined $q->param('mail-server') ) ;
$type = $q->param('mail-type') if ( defined $q->param('mail-type') ) ;
$account = $q->param('mail-account') if ( defined $q->param('mail-account') ) ;
$password = $q->param('mail-password') if ( defined $q->param('mail-password') ) ;
+ $options = $q->param('mail-options') if ( defined $q->param('mail-options') ) ;
$self->debug_msg("\$server = $server.");
+ $self->debug_msg("\$type = $type.");
$self->debug_msg("\$account = $account.");
$self->debug_msg("\$password = $password.");
- # if the three fields are blank, it's OK
- if ( ( $server . $account . $password ) ne '' ) {
+ $self->debug_msg("\$options = $options.");
+ # if the four fields are blank, it's OK
+ if ( ( $server . $account . $password . $options ) ne '' ) {
if ( $Tst eq 'Server' ) {
$self->debug_msg("'Server' test begins.");
my $IPPattern = "(([01]?[0-9]{1,2}|2([0-4][0-9]|5[0-5]))\.){3}([01]?[0-9]{1,2}|2([0-4][0-9]|5[0-5]))" ;
@@ -540,6 +545,7 @@
return $self->localise('ERR_FIELD_EMPTY');
}
}
+ # the $options field is completely free, so no tests here :-)
$self->debug_msg("After 3 tests, \$Flag = $Flag.");
}
$self->debug_msg("validate_account_data ends.");
@@ -682,6 +688,7 @@
return $Rec[1] if ( $Field eq 'Type' ) ;
return CGI::escapeHTML(pack("H*", $Rec[2] || '' )) if ( $Field eq 'Account' ) ;
return CGI::escapeHTML(pack("H*", $Rec[3] || '' )) if ( $Field eq 'Password' ) ;
+ return CGI::escapeHTML(pack("H*", $Rec[4] || '' )) if ( $Field eq 'Options' ) ;
$self->debug_msg("'display_account' ends.") ;
}
@@ -963,15 +970,19 @@
my $type = $q->param('mail-type') || 'POP3' ;
my $account = $q->param('mail-account') || '' ;
my $password = $q->param('mail-password') || '' ;
+ my $options = $q->param('mail-options') || '' ;
# it's better to store account and password in
# hex form (to avoid clash with some special characters)
$account = unpack( "H*", CGI::unescapeHTML( $account ) ) ;
$password = unpack( "H*", CGI::unescapeHTML( $password ) ) ;
+ # Finally, it's also better to store fetchmail options in hex (PS 2014-03-09)
+ $options = unpack( "H*", CGI::unescapeHTML( $options ) ) ;
# We need to clean-up the destination cases
- $q->delete('mail-server') ;
- $q->delete('mail-type') ;
- $q->delete('mail-account') ;
- $q->delete('mail-password') ;
+ $q->delete('mail-server');
+ $q->delete('mail-type');
+ $q->delete('mail-account');
+ $q->delete('mail-password');
+ $q->delete('mail-options');
$self->debug_msg("\$user = $user.");
$self->debug_msg("\$name = $name.");
@@ -979,6 +990,7 @@
$self->debug_msg("\$type = $type.");
$self->debug_msg("\$account = $account.");
$self->debug_msg("\$password = $password.");
+ $self->debug_msg("\$options = $options.");
my @accounts ;
my $DataHide = $rec->prop('DataHide') || '' ;
@@ -996,10 +1008,10 @@
delete $accountsort{ $AccountMod } if ( $server ne '' ) ;
$rec->delete_prop('AccountMod') ;
}
- # if $server is not empty, we need to store the 4 values in DataHide
+ # if $server is not empty, we need to store the 5 values in DataHide
# FormMagik has already checked if the data seems valids.
if ( $server ne '' ) {
- my $data = join( FS, $server, $type, $account, $password ) ;
+ my $data = join( FS, $server, $type, $account, $password, $options ) ;
$accountsort{ $data } = $data ;
}
# Special case : We already check if a 'REMOVE' button was depressed
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/templates/etc/fetchmail/90fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/templates/etc/fetchmail/90fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/templates/etc/fetchmail/90fetchmail 2016-03-22 05:19:21.382000000 -0400
+++ smeserver-fetchmail-1.4.update/root/etc/e-smith/templates/etc/fetchmail/90fetchmail.jp2 2016-03-22 05:27:58.942000000 -0400
@@ -315,8 +315,7 @@
# FetchMails service configuration
$ServOpt = ' timeout ' . ( $FM->prop('timeout') || 60 ) . $ServOpt;
- my $ssl = '';
- if ( $mtype =~ s/^S// ) { $ssl = 'options ssl' }
+ if ( $mtype =~ s/^S// ) { $moptions = "ssl $moptions" }
#We retrieve the $qmail{MaxMessageSize} to fix the max limit where emails won't be downloaded
my $size = $db->get_prop('qmail','MaxMessageSize') || '0';
diff -rud smeserver-fetchmail-1.4.update/root/etc/e-smith/templates/etc/fetchmail/90fetchmail smeserver-fetchmail-1.4.3/root/etc/e-smith/templates/etc/fetchmail/90fetchmail
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/templates/etc/fetchmail/90fetchmail 2016-03-22 06:24:07.844000000 -0400
+++ smeserver-fetchmail-1.4.update/root/etc/e-smith/templates/etc/fetchmail/90fetchmail.jp 2016-03-22 06:28:08.213000000 -0400
@@ -342,10 +342,13 @@
$OUT .= "#\n";
$OUT .= "# Mail N$FetchN Account for : $comment\n";
$OUT .= $staticvalue;
- $OUT .= "poll $mserv with proto $mtype$ServOpt\n" ;
- $OUT .= " user '$mname' $DestSMTPServer with password '" ;
- $OUT .= "$mpass' is $name here $keep $ssl\n" ;
- $OUT .= " smtphost 127.0.0.200/$tcpport" . "\n";
+ $OUT .= "poll $mserv with proto $mtype$ServOpt\n";
+ $OUT .= " user '$mname' $DestSMTPServer with password '";
+ $OUT .= "$mpass' is $name here $keep\n";
+ if ( $moptions ne '' ) {
+ $OUT .= " options $moptions\n";
+ }
+ $OUT .= " smtphost 127.0.0.200\n";
$OUT .="EOF\n";
}
}