| 1 |
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 |
| 2 |
--- 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 |
| 3 |
+++ 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 |
| 4 |
@@ -188,6 +188,10 @@ |
| 5 |
<trans>The user account password on the mail server</trans> |
| 6 |
</entry> |
| 7 |
<entry> |
| 8 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 9 |
+ <trans>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 !</trans> |
| 10 |
+ </entry> |
| 11 |
+ <entry> |
| 12 |
<base>POP3</base> |
| 13 |
<trans>Pop</trans> |
| 14 |
</entry> |
| 15 |
@@ -240,6 +244,10 @@ |
| 16 |
<trans>Server Mailbox Password</trans> |
| 17 |
</entry> |
| 18 |
<entry> |
| 19 |
+ <base>MAIL_OPTIONS</base> |
| 20 |
+ <trans>'Raw' options for fetchmail</trans> |
| 21 |
+ </entry> |
| 22 |
+ <entry> |
| 23 |
<base>fetchmail</base> |
| 24 |
<trans>Mail retrieval</trans> |
| 25 |
</entry> |
| 26 |
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 |
| 27 |
--- 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 |
| 28 |
+++ 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 |
| 29 |
@@ -188,6 +188,10 @@ |
| 30 |
<trans>Brugerkonto adgangskode på postserveren</trans> |
| 31 |
</entry> |
| 32 |
<entry> |
| 33 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 34 |
+ <trans>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 !</trans> |
| 35 |
+ </entry> |
| 36 |
+ <entry> |
| 37 |
<base>POP3</base> |
| 38 |
<trans>Pop</trans> |
| 39 |
</entry> |
| 40 |
@@ -240,6 +244,10 @@ |
| 41 |
<trans>Server Postkasse Adgangskode</trans> |
| 42 |
</entry> |
| 43 |
<entry> |
| 44 |
+ <base>MAIL_OPTIONS</base> |
| 45 |
+ <trans>'Raw' options for fetchmail</trans> |
| 46 |
+ </entry> |
| 47 |
+ <entry> |
| 48 |
<base>fetchmail</base> |
| 49 |
<trans>Modtagelse af mail</trans> |
| 50 |
</entry> |
| 51 |
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 |
| 52 |
--- 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 |
| 53 |
+++ 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 |
| 54 |
@@ -188,6 +188,10 @@ |
| 55 |
<trans>Benutzer-Passwort auf dem externen Mail-Server</trans> |
| 56 |
</entry> |
| 57 |
<entry> |
| 58 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 59 |
+ <trans>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 !</trans> |
| 60 |
+ </entry> |
| 61 |
+ <entry> |
| 62 |
<base>POP3</base> |
| 63 |
<trans>POP</trans> |
| 64 |
</entry> |
| 65 |
@@ -240,6 +244,10 @@ |
| 66 |
<trans>Server Mailbox Password</trans> |
| 67 |
</entry> |
| 68 |
<entry> |
| 69 |
+ <base>MAIL_OPTIONS</base> |
| 70 |
+ <trans>'Raw' options for fetchmail</trans> |
| 71 |
+ </entry> |
| 72 |
+ <entry> |
| 73 |
<base>fetchmail</base> |
| 74 |
<trans>E-Mail mit FetchMail</trans> |
| 75 |
</entry> |
| 76 |
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 |
| 77 |
--- 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 |
| 78 |
+++ 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 |
| 79 |
@@ -188,6 +188,10 @@ |
| 80 |
<trans>The user account password on the mail server</trans> |
| 81 |
</entry> |
| 82 |
<entry> |
| 83 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 84 |
+ <trans>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 !</trans> |
| 85 |
+ </entry> |
| 86 |
+ <entry> |
| 87 |
<base>POP3</base> |
| 88 |
<trans>Pop</trans> |
| 89 |
</entry> |
| 90 |
@@ -240,6 +244,10 @@ |
| 91 |
<trans>Server Mailbox Password</trans> |
| 92 |
</entry> |
| 93 |
<entry> |
| 94 |
+ <base>MAIL_OPTIONS</base> |
| 95 |
+ <trans>'Raw' options for fetchmail</trans> |
| 96 |
+ </entry> |
| 97 |
+ <entry> |
| 98 |
<base>fetchmail</base> |
| 99 |
<trans>Mail retrieval</trans> |
| 100 |
</entry> |
| 101 |
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 |
| 102 |
--- 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 |
| 103 |
+++ 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 |
| 104 |
@@ -239,6 +239,10 @@ |
| 105 |
<trans>The user account password on the mail server</trans> |
| 106 |
</entry> |
| 107 |
<entry> |
| 108 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 109 |
+ <trans>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 !</trans> |
| 110 |
+ </entry> |
| 111 |
+ <entry> |
| 112 |
<base>POP3</base> |
| 113 |
<trans>Pop</trans> |
| 114 |
</entry> |
| 115 |
@@ -317,6 +321,10 @@ |
| 116 |
<trans>Server Mailbox Password</trans> |
| 117 |
</entry> |
| 118 |
<entry> |
| 119 |
+ <base>MAIL_OPTIONS</base> |
| 120 |
+ <trans>'Raw' options for fetchmail</trans> |
| 121 |
+ </entry> |
| 122 |
+ <entry> |
| 123 |
<base>fetchmail</base> |
| 124 |
<trans>Mail retrieval</trans> |
| 125 |
</entry> |
| 126 |
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 |
| 127 |
--- 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 |
| 128 |
+++ 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 |
| 129 |
@@ -188,6 +188,10 @@ |
| 130 |
<trans>La contraseña de cuenta de usuario en el servidor de correo</trans> |
| 131 |
</entry> |
| 132 |
<entry> |
| 133 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 134 |
+ <trans>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 !</trans> |
| 135 |
+ </entry> |
| 136 |
+ <entry> |
| 137 |
<base>POP3</base> |
| 138 |
<trans>Pop</trans> |
| 139 |
</entry> |
| 140 |
@@ -240,6 +244,10 @@ |
| 141 |
<trans>Contraseña de la Casilla del Servidor</trans> |
| 142 |
</entry> |
| 143 |
<entry> |
| 144 |
+ <base>MAIL_OPTIONS</base> |
| 145 |
+ <trans>'Raw' options for fetchmail</trans> |
| 146 |
+ </entry> |
| 147 |
+ <entry> |
| 148 |
<base>fetchmail</base> |
| 149 |
<trans>Recuperación de Correo</trans> |
| 150 |
</entry> |
| 151 |
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 |
| 152 |
--- 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 |
| 153 |
+++ 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 |
| 154 |
@@ -188,6 +188,10 @@ |
| 155 |
<trans>The user account password on the mail server</trans> |
| 156 |
</entry> |
| 157 |
<entry> |
| 158 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 159 |
+ <trans>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 !</trans> |
| 160 |
+ </entry> |
| 161 |
+ <entry> |
| 162 |
<base>POP3</base> |
| 163 |
<trans>Pop</trans> |
| 164 |
</entry> |
| 165 |
@@ -240,6 +244,10 @@ |
| 166 |
<trans>Server Mailbox Password</trans> |
| 167 |
</entry> |
| 168 |
<entry> |
| 169 |
+ <base>MAIL_OPTIONS</base> |
| 170 |
+ <trans>'Raw' options for fetchmail</trans> |
| 171 |
+ </entry> |
| 172 |
+ <entry> |
| 173 |
<base>fetchmail</base> |
| 174 |
<trans>Mail retrieval</trans> |
| 175 |
</entry> |
| 176 |
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 |
| 177 |
--- 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 |
| 178 |
+++ 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 |
| 179 |
@@ -188,6 +188,10 @@ |
| 180 |
<trans>Le mot de passe du compte de messagerie sur le serveur</trans> |
| 181 |
</entry> |
| 182 |
<entry> |
| 183 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 184 |
+ <trans>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 !</trans> |
| 185 |
+ </entry> |
| 186 |
+ <entry> |
| 187 |
<base>POP3</base> |
| 188 |
<trans>Pop</trans> |
| 189 |
</entry> |
| 190 |
@@ -240,6 +244,10 @@ |
| 191 |
<trans>mot de passe sur le serveur</trans> |
| 192 |
</entry> |
| 193 |
<entry> |
| 194 |
+ <base>MAIL_OPTIONS</base> |
| 195 |
+ <trans>Options 'brutes' pour fetchmail</trans> |
| 196 |
+ </entry> |
| 197 |
+ <entry> |
| 198 |
<base>fetchmail</base> |
| 199 |
<trans>Récupération de mails</trans> |
| 200 |
</entry> |
| 201 |
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 |
| 202 |
--- 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 |
| 203 |
+++ 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 |
| 204 |
@@ -188,6 +188,10 @@ |
| 205 |
<trans>The user account password on the mail server</trans> |
| 206 |
</entry> |
| 207 |
<entry> |
| 208 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 209 |
+ <trans>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 !</trans> |
| 210 |
+ </entry> |
| 211 |
+ <entry> |
| 212 |
<base>POP3</base> |
| 213 |
<trans>Pop</trans> |
| 214 |
</entry> |
| 215 |
@@ -240,6 +244,10 @@ |
| 216 |
<trans>Server Mailbox Password</trans> |
| 217 |
</entry> |
| 218 |
<entry> |
| 219 |
+ <base>MAIL_OPTIONS</base> |
| 220 |
+ <trans>'Raw' options for fetchmail</trans> |
| 221 |
+ </entry> |
| 222 |
+ <entry> |
| 223 |
<base>fetchmail</base> |
| 224 |
<trans>Mail retrieval</trans> |
| 225 |
</entry> |
| 226 |
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 |
| 227 |
--- 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 |
| 228 |
+++ 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 |
| 229 |
@@ -188,6 +188,10 @@ |
| 230 |
<trans>The user account password on the mail server</trans> |
| 231 |
</entry> |
| 232 |
<entry> |
| 233 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 234 |
+ <trans>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 !</trans> |
| 235 |
+ </entry> |
| 236 |
+ <entry> |
| 237 |
<base>POP3</base> |
| 238 |
<trans>Pop</trans> |
| 239 |
</entry> |
| 240 |
@@ -240,6 +244,10 @@ |
| 241 |
<trans>Server Mailbox Password</trans> |
| 242 |
</entry> |
| 243 |
<entry> |
| 244 |
+ <base>MAIL_OPTIONS</base> |
| 245 |
+ <trans>'Raw' options for fetchmail</trans> |
| 246 |
+ </entry> |
| 247 |
+ <entry> |
| 248 |
<base>fetchmail</base> |
| 249 |
<trans>Mail retrieval</trans> |
| 250 |
</entry> |
| 251 |
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 |
| 252 |
--- 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 |
| 253 |
+++ 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 |
| 254 |
@@ -188,6 +188,10 @@ |
| 255 |
<trans>The user account password on the mail server</trans> |
| 256 |
</entry> |
| 257 |
<entry> |
| 258 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 259 |
+ <trans>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 !</trans> |
| 260 |
+ </entry> |
| 261 |
+ <entry> |
| 262 |
<base>POP3</base> |
| 263 |
<trans>Pop</trans> |
| 264 |
</entry> |
| 265 |
@@ -240,6 +244,10 @@ |
| 266 |
<trans>Server Mailbox Password</trans> |
| 267 |
</entry> |
| 268 |
<entry> |
| 269 |
+ <base>MAIL_OPTIONS</base> |
| 270 |
+ <trans>'Raw' options for fetchmail</trans> |
| 271 |
+ </entry> |
| 272 |
+ <entry> |
| 273 |
<base>fetchmail</base> |
| 274 |
<trans>Mail retrieval</trans> |
| 275 |
</entry> |
| 276 |
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 |
| 277 |
--- 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 |
| 278 |
+++ 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 |
| 279 |
@@ -188,6 +188,10 @@ |
| 280 |
<trans>La password dell'account sul server email</trans> |
| 281 |
</entry> |
| 282 |
<entry> |
| 283 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 284 |
+ <trans>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 !</trans> |
| 285 |
+ </entry> |
| 286 |
+ <entry> |
| 287 |
<base>POP3</base> |
| 288 |
<trans>Pop</trans> |
| 289 |
</entry> |
| 290 |
@@ -240,6 +244,10 @@ |
| 291 |
<trans>Password della casella sul Server</trans> |
| 292 |
</entry> |
| 293 |
<entry> |
| 294 |
+ <base>MAIL_OPTIONS</base> |
| 295 |
+ <trans>'Raw' options for fetchmail</trans> |
| 296 |
+ </entry> |
| 297 |
+ <entry> |
| 298 |
<base>fetchmail</base> |
| 299 |
<trans>Recupero Email</trans> |
| 300 |
</entry> |
| 301 |
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 |
| 302 |
--- 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 |
| 303 |
+++ 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 |
| 304 |
@@ -188,6 +188,10 @@ |
| 305 |
<trans>The user account password on the mail server</trans> |
| 306 |
</entry> |
| 307 |
<entry> |
| 308 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 309 |
+ <trans>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 !</trans> |
| 310 |
+ </entry> |
| 311 |
+ <entry> |
| 312 |
<base>POP3</base> |
| 313 |
<trans>Pop</trans> |
| 314 |
</entry> |
| 315 |
@@ -240,6 +244,10 @@ |
| 316 |
<trans>Server Mailbox Password</trans> |
| 317 |
</entry> |
| 318 |
<entry> |
| 319 |
+ <base>MAIL_OPTIONS</base> |
| 320 |
+ <trans>'Raw' options for fetchmail</trans> |
| 321 |
+ </entry> |
| 322 |
+ <entry> |
| 323 |
<base>fetchmail</base> |
| 324 |
<trans>Mail retrieval</trans> |
| 325 |
</entry> |
| 326 |
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 |
| 327 |
--- 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 |
| 328 |
+++ 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 |
| 329 |
@@ -188,6 +188,10 @@ |
| 330 |
<trans>The user account password on the mail server</trans> |
| 331 |
</entry> |
| 332 |
<entry> |
| 333 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 334 |
+ <trans>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 !</trans> |
| 335 |
+ </entry> |
| 336 |
+ <entry> |
| 337 |
<base>POP3</base> |
| 338 |
<trans>Pop</trans> |
| 339 |
</entry> |
| 340 |
@@ -240,6 +244,10 @@ |
| 341 |
<trans>Server Mailbox Password</trans> |
| 342 |
</entry> |
| 343 |
<entry> |
| 344 |
+ <base>MAIL_OPTIONS</base> |
| 345 |
+ <trans>'Raw' options for fetchmail</trans> |
| 346 |
+ </entry> |
| 347 |
+ <entry> |
| 348 |
<base>fetchmail</base> |
| 349 |
<trans>Mail retrieval</trans> |
| 350 |
</entry> |
| 351 |
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 |
| 352 |
--- 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 |
| 353 |
+++ 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 |
| 354 |
@@ -188,6 +188,10 @@ |
| 355 |
<trans>Het gebruikersaccount wachtwoord op de mail server</trans> |
| 356 |
</entry> |
| 357 |
<entry> |
| 358 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 359 |
+ <trans>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 !</trans> |
| 360 |
+ </entry> |
| 361 |
+ <entry> |
| 362 |
<base>POP3</base> |
| 363 |
<trans>Pop</trans> |
| 364 |
</entry> |
| 365 |
@@ -240,6 +244,10 @@ |
| 366 |
<trans>Server postbuswachtwoord</trans> |
| 367 |
</entry> |
| 368 |
<entry> |
| 369 |
+ <base>MAIL_OPTIONS</base> |
| 370 |
+ <trans>'Raw' options for fetchmail</trans> |
| 371 |
+ </entry> |
| 372 |
+ <entry> |
| 373 |
<base>fetchmail</base> |
| 374 |
<trans>Post ophalen</trans> |
| 375 |
</entry> |
| 376 |
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 |
| 377 |
--- 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 |
| 378 |
+++ 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 |
| 379 |
@@ -188,6 +188,10 @@ |
| 380 |
<trans>The user account password on the mail server</trans> |
| 381 |
</entry> |
| 382 |
<entry> |
| 383 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 384 |
+ <trans>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 !</trans> |
| 385 |
+ </entry> |
| 386 |
+ <entry> |
| 387 |
<base>POP3</base> |
| 388 |
<trans>Pop</trans> |
| 389 |
</entry> |
| 390 |
@@ -240,6 +244,10 @@ |
| 391 |
<trans>Server Mailbox Password</trans> |
| 392 |
</entry> |
| 393 |
<entry> |
| 394 |
+ <base>MAIL_OPTIONS</base> |
| 395 |
+ <trans>'Raw' options for fetchmail</trans> |
| 396 |
+ </entry> |
| 397 |
+ <entry> |
| 398 |
<base>fetchmail</base> |
| 399 |
<trans>Mail retrieval</trans> |
| 400 |
</entry> |
| 401 |
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 |
| 402 |
--- 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 |
| 403 |
+++ 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 |
| 404 |
@@ -188,6 +188,10 @@ |
| 405 |
<trans>A senha do usuário no servidor de e-mail</trans> |
| 406 |
</entry> |
| 407 |
<entry> |
| 408 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 409 |
+ <trans>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 !</trans> |
| 410 |
+ </entry> |
| 411 |
+ <entry> |
| 412 |
<base>POP3</base> |
| 413 |
<trans>Pop</trans> |
| 414 |
</entry> |
| 415 |
@@ -240,6 +244,10 @@ |
| 416 |
<trans>Senha da caixa postal no servidor</trans> |
| 417 |
</entry> |
| 418 |
<entry> |
| 419 |
+ <base>MAIL_OPTIONS</base> |
| 420 |
+ <trans>'Raw' options for fetchmail</trans> |
| 421 |
+ </entry> |
| 422 |
+ <entry> |
| 423 |
<base>fetchmail</base> |
| 424 |
<trans>Busca de e-mail</trans> |
| 425 |
</entry> |
| 426 |
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 |
| 427 |
--- 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 |
| 428 |
+++ 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 |
| 429 |
@@ -188,6 +188,10 @@ |
| 430 |
<trans>A senha do usuário no servidor de e-mail</trans> |
| 431 |
</entry> |
| 432 |
<entry> |
| 433 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 434 |
+ <trans>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 !</trans> |
| 435 |
+ </entry> |
| 436 |
+ <entry> |
| 437 |
<base>POP3</base> |
| 438 |
<trans>Pop</trans> |
| 439 |
</entry> |
| 440 |
@@ -240,6 +244,10 @@ |
| 441 |
<trans>Senha da caixa postal no servidor</trans> |
| 442 |
</entry> |
| 443 |
<entry> |
| 444 |
+ <base>MAIL_OPTIONS</base> |
| 445 |
+ <trans>'Raw' options for fetchmail</trans> |
| 446 |
+ </entry> |
| 447 |
+ <entry> |
| 448 |
<base>fetchmail</base> |
| 449 |
<trans>Busca de e-mail</trans> |
| 450 |
</entry> |
| 451 |
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 |
| 452 |
--- 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 |
| 453 |
+++ 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 |
| 454 |
@@ -188,6 +188,10 @@ |
| 455 |
<trans>Parola utilizatorului pe serverul de mail</trans> |
| 456 |
</entry> |
| 457 |
<entry> |
| 458 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 459 |
+ <trans>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 !</trans> |
| 460 |
+ </entry> |
| 461 |
+ <entry> |
| 462 |
<base>POP3</base> |
| 463 |
<trans>POP</trans> |
| 464 |
</entry> |
| 465 |
@@ -240,6 +244,10 @@ |
| 466 |
<trans>Parolă căsuță poștală</trans> |
| 467 |
</entry> |
| 468 |
<entry> |
| 469 |
+ <base>MAIL_OPTIONS</base> |
| 470 |
+ <trans>'Raw' options for fetchmail</trans> |
| 471 |
+ </entry> |
| 472 |
+ <entry> |
| 473 |
<base>fetchmail</base> |
| 474 |
<trans>Inport mailuri</trans> |
| 475 |
</entry> |
| 476 |
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 |
| 477 |
--- 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 |
| 478 |
+++ 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 |
| 479 |
@@ -185,7 +185,11 @@ |
| 480 |
</entry> |
| 481 |
<entry> |
| 482 |
<base>LABEL_MAIL_PASSWORD</base> |
| 483 |
- <trans>The user account password on the mail server</trans> |
| 484 |
+ <trans>The user account password on the mail server</trans> |
| 485 |
+ </entry> |
| 486 |
+ <entry> |
| 487 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 488 |
+ <trans>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 !</trans> |
| 489 |
</entry> |
| 490 |
<entry> |
| 491 |
<base>POP3</base> |
| 492 |
@@ -237,7 +241,11 @@ |
| 493 |
</entry> |
| 494 |
<entry> |
| 495 |
<base>MAIL_PASSWORD</base> |
| 496 |
- <trans>Server Mailbox Password</trans> |
| 497 |
+ <trans>Server Mailbox Password</trans> |
| 498 |
+ </entry> |
| 499 |
+ <entry> |
| 500 |
+ <base>MAIL_OPTIONS</base> |
| 501 |
+ <trans>'Raw' options for fetchmail</trans> |
| 502 |
</entry> |
| 503 |
<entry> |
| 504 |
<base>fetchmail</base> |
| 505 |
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 |
| 506 |
--- 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 |
| 507 |
+++ 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 |
| 508 |
@@ -188,6 +188,10 @@ |
| 509 |
<trans>The user account password on the mail server</trans> |
| 510 |
</entry> |
| 511 |
<entry> |
| 512 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 513 |
+ <trans>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 !</trans> |
| 514 |
+ </entry> |
| 515 |
+ <entry> |
| 516 |
<base>POP3</base> |
| 517 |
<trans>Pop</trans> |
| 518 |
</entry> |
| 519 |
@@ -240,6 +244,10 @@ |
| 520 |
<trans>Server Mailbox Password</trans> |
| 521 |
</entry> |
| 522 |
<entry> |
| 523 |
+ <base>MAIL_OPTIONS</base> |
| 524 |
+ <trans>'Raw' options for fetchmail</trans> |
| 525 |
+ </entry> |
| 526 |
+ <entry> |
| 527 |
<base>fetchmail</base> |
| 528 |
<trans>Mail retrieval</trans> |
| 529 |
</entry> |
| 530 |
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 |
| 531 |
--- 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 |
| 532 |
+++ 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 |
| 533 |
@@ -188,6 +188,10 @@ |
| 534 |
<trans>Lösenordet för kontot på mailservern</trans> |
| 535 |
</entry> |
| 536 |
<entry> |
| 537 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 538 |
+ <trans>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 !</trans> |
| 539 |
+ </entry> |
| 540 |
+ <entry> |
| 541 |
<base>POP3</base> |
| 542 |
<trans>POP</trans> |
| 543 |
</entry> |
| 544 |
@@ -240,6 +244,10 @@ |
| 545 |
<trans>Mailkontots lösenord på servern</trans> |
| 546 |
</entry> |
| 547 |
<entry> |
| 548 |
+ <base>MAIL_OPTIONS</base> |
| 549 |
+ <trans>'Raw' options for fetchmail</trans> |
| 550 |
+ </entry> |
| 551 |
+ <entry> |
| 552 |
<base>fetchmail</base> |
| 553 |
<trans>Hämtning av mail</trans> |
| 554 |
</entry> |
| 555 |
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 |
| 556 |
--- 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 |
| 557 |
+++ 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 |
| 558 |
@@ -188,6 +188,10 @@ |
| 559 |
<trans>The user account password on the mail server</trans> |
| 560 |
</entry> |
| 561 |
<entry> |
| 562 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 563 |
+ <trans>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 !</trans> |
| 564 |
+ </entry> |
| 565 |
+ <entry> |
| 566 |
<base>POP3</base> |
| 567 |
<trans>Pop</trans> |
| 568 |
</entry> |
| 569 |
@@ -240,6 +244,10 @@ |
| 570 |
<trans>Server Mailbox Password</trans> |
| 571 |
</entry> |
| 572 |
<entry> |
| 573 |
+ <base>MAIL_OPTIONS</base> |
| 574 |
+ <trans>'Raw' options for fetchmail</trans> |
| 575 |
+ </entry> |
| 576 |
+ <entry> |
| 577 |
<base>fetchmail</base> |
| 578 |
<trans>Mail retrieval</trans> |
| 579 |
</entry> |
| 580 |
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 |
| 581 |
--- 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 |
| 582 |
+++ 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 |
| 583 |
@@ -188,6 +188,10 @@ |
| 584 |
<trans>The user account password on the mail server</trans> |
| 585 |
</entry> |
| 586 |
<entry> |
| 587 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 588 |
+ <trans>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 !</trans> |
| 589 |
+ </entry> |
| 590 |
+ <entry> |
| 591 |
<base>POP3</base> |
| 592 |
<trans>Pop</trans> |
| 593 |
</entry> |
| 594 |
@@ -240,6 +244,10 @@ |
| 595 |
<trans>Server Mailbox Password</trans> |
| 596 |
</entry> |
| 597 |
<entry> |
| 598 |
+ <base>MAIL_OPTIONS</base> |
| 599 |
+ <trans>'Raw' options for fetchmail</trans> |
| 600 |
+ </entry> |
| 601 |
+ <entry> |
| 602 |
<base>fetchmail</base> |
| 603 |
<trans>Mail retrieval</trans> |
| 604 |
</entry> |
| 605 |
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 |
| 606 |
--- 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 |
| 607 |
+++ 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 |
| 608 |
@@ -188,6 +188,10 @@ |
| 609 |
<trans>邮件服务器上的用户密码</trans> |
| 610 |
</entry> |
| 611 |
<entry> |
| 612 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 613 |
+ <trans>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 !</trans> |
| 614 |
+ </entry> |
| 615 |
+ <entry> |
| 616 |
<base>POP3</base> |
| 617 |
<trans>Pop</trans> |
| 618 |
</entry> |
| 619 |
@@ -240,6 +244,10 @@ |
| 620 |
<trans>服务器邮箱密码</trans> |
| 621 |
</entry> |
| 622 |
<entry> |
| 623 |
+ <base>MAIL_OPTIONS</base> |
| 624 |
+ <trans>'Raw' options for fetchmail</trans> |
| 625 |
+ </entry> |
| 626 |
+ <entry> |
| 627 |
<base>fetchmail</base> |
| 628 |
<trans>邮件检索</trans> |
| 629 |
</entry> |
| 630 |
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 |
| 631 |
--- 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 |
| 632 |
+++ 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 |
| 633 |
@@ -188,6 +188,10 @@ |
| 634 |
<trans>郵件伺服器上的使用者密碼</trans> |
| 635 |
</entry> |
| 636 |
<entry> |
| 637 |
+ <base>LABEL_MAIL_OPTIONS</base> |
| 638 |
+ <trans>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 !</trans> |
| 639 |
+ </entry> |
| 640 |
+ <entry> |
| 641 |
<base>POP3</base> |
| 642 |
<trans>Pop</trans> |
| 643 |
</entry> |
| 644 |
@@ -240,6 +244,10 @@ |
| 645 |
<trans>伺服器郵箱密碼</trans> |
| 646 |
</entry> |
| 647 |
<entry> |
| 648 |
+ <base>MAIL_OPTIONS</base> |
| 649 |
+ <trans>'Raw' options for fetchmail</trans> |
| 650 |
+ </entry> |
| 651 |
+ <entry> |
| 652 |
<base>fetchmail</base> |
| 653 |
<trans>郵件檢索</trans> |
| 654 |
</entry> |
| 655 |
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 |
| 656 |
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/templates/etc/fetchmail/90fetchmail 2012-06-03 22:27:57.000000000 +0200 |
| 657 |
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/templates/etc/fetchmail/90fetchmail 2014-03-10 21:56:28.000000000 +0100 |
| 658 |
@@ -293,12 +293,18 @@ |
| 659 |
|
| 660 |
foreach my $FetchMailAcount ( @FetchMailAccounts ) { |
| 661 |
$FetchN++ ; |
| 662 |
- my ( $mserv, $mtype, $mname, $mpass ) = split FS, $FetchMailAcount ; |
| 663 |
+ my ( $mserv, $mtype, $mname, $mpass, $moptions ) = split FS, $FetchMailAcount ; |
| 664 |
if(not defined $mserv ) { $mserv='';} |
| 665 |
if(not defined $mname ) { $mname='';} |
| 666 |
if(not defined $mpass ) { $mpass='';} |
| 667 |
if(not defined $mtype ) { $mtype='';} |
| 668 |
+ if(not defined $moptions ) { $moptions='';} |
| 669 |
|
| 670 |
+ # we need to convert the name, the password and the options from HEX to text |
| 671 |
+ $mname = pack( "H*", $mname ); |
| 672 |
+ $mpass = pack( "H*", $mpass ); |
| 673 |
+ $moptions = pack( "H*", $moptions ); |
| 674 |
+ |
| 675 |
if ($mserv ne '') { |
| 676 |
my $ServOpt = ' and options uidl no dns'; |
| 677 |
|
| 678 |
@@ -322,10 +325,6 @@ |
| 679 |
$staticvalue .= "set postmaster \"postmaster\@$dom\"\n" ; |
| 680 |
$staticvalue .= "set bouncemail\nset no softbounce\nset properties \"\"\n" ; |
| 681 |
|
| 682 |
- # we need to convert the name and the password from HEX to text |
| 683 |
- $mname = pack( "H*", $mname ) ; |
| 684 |
- $mpass = pack( "H*", $mpass ) ; |
| 685 |
- |
| 686 |
# special case : the \ must be changed to \x5c ! |
| 687 |
$mname =~ s/[\\]/\\x5c/g ; |
| 688 |
$mpass =~ s/[\\]/\\x5c/g ; |
| 689 |
|
| 690 |
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 |
| 691 |
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/web/functions/fetchmail 2012-06-03 22:27:57.000000000 +0200 |
| 692 |
+++ smeserver-fetchmail-1.4.3/root/etc/e-smith/web/functions/fetchmail 2014-03-10 22:08:31.000000000 +0100 |
| 693 |
@@ -141,10 +141,18 @@ |
| 694 |
validation="validate_account_data(Password)"> |
| 695 |
<label>LABEL_MAIL_PASSWORD</label> |
| 696 |
</field> |
| 697 |
+ <field |
| 698 |
+ id="mail-options" |
| 699 |
+ type="text" |
| 700 |
+ size="100" |
| 701 |
+ value="display_account('Options')"> |
| 702 |
+ <label>LABEL_MAIL_OPTIONS</label> |
| 703 |
+ </field> |
| 704 |
<field type="literal" id="ValidAccount" value="show_button_validate()"> |
| 705 |
<label>BLANK</label> |
| 706 |
</field> |
| 707 |
|
| 708 |
+ |
| 709 |
<subroutine src="show_accounts()" /> |
| 710 |
|
| 711 |
</page> |
| 712 |
diff -rud smeserver-fetchmail-1.4.update/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/fetchmail.pm smeserver-fetchmail-1.4.3/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/fetchmail.pm |
| 713 |
--- smeserver-fetchmail-1.4.update/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/fetchmail.pm 2012-06-03 22:27:57.000000000 +0200 |
| 714 |
+++ smeserver-fetchmail-1.4.3/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/fetchmail.pm 2014-03-09 21:19:11.000000000 +0100 |
| 715 |
@@ -419,6 +419,7 @@ |
| 716 |
esmith::cgi::genSmallCell($q, $self->localise('MAIL_TYPE'), "header",), |
| 717 |
esmith::cgi::genSmallCell($q, $self->localise('MAIL_ACCOUNT'), "header",), |
| 718 |
esmith::cgi::genSmallCell($q, $self->localise('MAIL_PASSWORD'), "header",), |
| 719 |
+ esmith::cgi::genSmallCell($q, $self->localise('MAIL_OPTIONS'), "header",), |
| 720 |
esmith::cgi::genSmallCell($q, $self->localise('ACTION'), "header", 2), "\n", |
| 721 |
); |
| 722 |
my @MailDatas = split ( RS, $DataHide ) ; |
| 723 |
@@ -434,6 +435,7 @@ |
| 724 |
esmith::cgi::genSmallCell($q, $Rec[1]), |
| 725 |
esmith::cgi::genSmallCell($q, CGI::escapeHTML( pack( "H*", $Rec[2] ))), |
| 726 |
esmith::cgi::genSmallCell($q, CGI::escapeHTML( pack( "H*", $Rec[3] ))), |
| 727 |
+ esmith::cgi::genSmallCell($q, CGI::escapeHTML( pack( "H*", $Rec[4] )) || ''), |
| 728 |
esmith::cgi::genSmallCell($q, $nlink1), |
| 729 |
esmith::cgi::genSmallCell($q, $nlink2), |
| 730 |
"\n", |
| 731 |
@@ -497,16 +499,19 @@ |
| 732 |
my $Flag = 1 ; |
| 733 |
my $q = $self->{cgi} ; |
| 734 |
my $user = $q->param('user') ; |
| 735 |
- my $server = '' ; my $type = 'IMAP' ; my $account = '' ; my $password = '' ; |
| 736 |
+ my $server = '' ; my $type = 'IMAP' ; my $account = '' ; my $password = '' ; my $options = ''; |
| 737 |
$server = $q->param('mail-server') if ( defined $q->param('mail-server') ) ; |
| 738 |
$type = $q->param('mail-type') if ( defined $q->param('mail-type') ) ; |
| 739 |
$account = $q->param('mail-account') if ( defined $q->param('mail-account') ) ; |
| 740 |
$password = $q->param('mail-password') if ( defined $q->param('mail-password') ) ; |
| 741 |
+ $options = $q->param('mail-options') if ( defined $q->param('mail-options') ) ; |
| 742 |
$self->debug_msg("\$server = $server."); |
| 743 |
+ $self->debug_msg("\$type = $type."); |
| 744 |
$self->debug_msg("\$account = $account."); |
| 745 |
$self->debug_msg("\$password = $password."); |
| 746 |
- # if the three fields are blank, it's OK |
| 747 |
- if ( ( $server . $account . $password ) ne '' ) { |
| 748 |
+ $self->debug_msg("\$options = $options."); |
| 749 |
+ # if the four fields are blank, it's OK |
| 750 |
+ if ( ( $server . $account . $password . $options ) ne '' ) { |
| 751 |
if ( $Tst eq 'Server' ) { |
| 752 |
$self->debug_msg("'Server' test begins."); |
| 753 |
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]))" ; |
| 754 |
@@ -540,6 +545,7 @@ |
| 755 |
return $self->localise('ERR_FIELD_EMPTY'); |
| 756 |
} |
| 757 |
} |
| 758 |
+ # the $options field is completely free, so no tests here :-) |
| 759 |
$self->debug_msg("After 3 tests, \$Flag = $Flag."); |
| 760 |
} |
| 761 |
$self->debug_msg("validate_account_data ends."); |
| 762 |
@@ -682,6 +688,7 @@ |
| 763 |
return $Rec[1] if ( $Field eq 'Type' ) ; |
| 764 |
return CGI::escapeHTML(pack("H*", $Rec[2] || '' )) if ( $Field eq 'Account' ) ; |
| 765 |
return CGI::escapeHTML(pack("H*", $Rec[3] || '' )) if ( $Field eq 'Password' ) ; |
| 766 |
+ return CGI::escapeHTML(pack("H*", $Rec[4] || '' )) if ( $Field eq 'Options' ) ; |
| 767 |
|
| 768 |
$self->debug_msg("'display_account' ends.") ; |
| 769 |
} |
| 770 |
@@ -963,15 +970,19 @@ |
| 771 |
my $type = $q->param('mail-type') || 'POP3' ; |
| 772 |
my $account = $q->param('mail-account') || '' ; |
| 773 |
my $password = $q->param('mail-password') || '' ; |
| 774 |
+ my $options = $q->param('mail-options') || '' ; |
| 775 |
# it's better to store account and password in |
| 776 |
# hex form (to avoid clash with some special characters) |
| 777 |
$account = unpack( "H*", CGI::unescapeHTML( $account ) ) ; |
| 778 |
$password = unpack( "H*", CGI::unescapeHTML( $password ) ) ; |
| 779 |
+ # Finally, it's also better to store fetchmail options in hex (PS 2014-03-09) |
| 780 |
+ $options = unpack( "H*", CGI::unescapeHTML( $options ) ) ; |
| 781 |
# We need to clean-up the destination cases |
| 782 |
- $q->delete('mail-server') ; |
| 783 |
- $q->delete('mail-type') ; |
| 784 |
- $q->delete('mail-account') ; |
| 785 |
- $q->delete('mail-password') ; |
| 786 |
+ $q->delete('mail-server'); |
| 787 |
+ $q->delete('mail-type'); |
| 788 |
+ $q->delete('mail-account'); |
| 789 |
+ $q->delete('mail-password'); |
| 790 |
+ $q->delete('mail-options'); |
| 791 |
|
| 792 |
$self->debug_msg("\$user = $user."); |
| 793 |
$self->debug_msg("\$name = $name."); |
| 794 |
@@ -979,6 +990,7 @@ |
| 795 |
$self->debug_msg("\$type = $type."); |
| 796 |
$self->debug_msg("\$account = $account."); |
| 797 |
$self->debug_msg("\$password = $password."); |
| 798 |
+ $self->debug_msg("\$options = $options."); |
| 799 |
|
| 800 |
my @accounts ; |
| 801 |
my $DataHide = $rec->prop('DataHide') || '' ; |
| 802 |
@@ -996,10 +1008,10 @@ |
| 803 |
delete $accountsort{ $AccountMod } if ( $server ne '' ) ; |
| 804 |
$rec->delete_prop('AccountMod') ; |
| 805 |
} |
| 806 |
- # if $server is not empty, we need to store the 4 values in DataHide |
| 807 |
+ # if $server is not empty, we need to store the 5 values in DataHide |
| 808 |
# FormMagik has already checked if the data seems valids. |
| 809 |
if ( $server ne '' ) { |
| 810 |
- my $data = join( FS, $server, $type, $account, $password ) ; |
| 811 |
+ my $data = join( FS, $server, $type, $account, $password, $options ) ; |
| 812 |
$accountsort{ $data } = $data ; |
| 813 |
} |
| 814 |
# Special case : We already check if a 'REMOVE' button was depressed |
| 815 |
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 |
| 816 |
--- smeserver-fetchmail-1.4.update/root/etc/e-smith/templates/etc/fetchmail/90fetchmail 2016-03-22 05:19:21.382000000 -0400 |
| 817 |
+++ smeserver-fetchmail-1.4.update/root/etc/e-smith/templates/etc/fetchmail/90fetchmail 2016-03-22 05:27:58.942000000 -0400 |
| 818 |
@@ -315,8 +315,7 @@ |
| 819 |
# FetchMails service configuration |
| 820 |
$ServOpt = ' timeout ' . ( $FM->prop('timeout') || 60 ) . $ServOpt; |
| 821 |
|
| 822 |
- my $ssl = ''; |
| 823 |
- if ( $mtype =~ s/^S// ) { $ssl = 'options ssl' } |
| 824 |
+ if ( $mtype =~ s/^S// ) { $moptions = "ssl $moptions" } |
| 825 |
|
| 826 |
#We retrieve the $qmail{MaxMessageSize} to fix |
| 827 |
#the max limit where emails won't be downloaded |
| 828 |
--- smeserver-fetchmail-1.6/root/etc/e-smith/templates/etc/fetchmail/90fetchmail.pre 2017-05-26 14:54:01.237000000 -0400 |
| 829 |
+++ smeserver-fetchmail-1.6/root/etc/e-smith/templates/etc/fetchmail/90fetchmail 2017-05-26 14:54:49.086000000 -0400 |
| 830 |
@@ -343,9 +343,12 @@ |
| 831 |
$OUT .= "#\n"; |
| 832 |
$OUT .= "# Mail N$FetchN Account for : $comment\n"; |
| 833 |
$OUT .= $staticvalue; |
| 834 |
- $OUT .= "poll $mserv with proto $mtype$ServOpt\n" ; |
| 835 |
- $OUT .= " user '$mname' $DestSMTPServer with password '" ; |
| 836 |
- $OUT .= "$mpass' is $name here $keep $ssl\n" ; |
| 837 |
+ $OUT .= "poll $mserv with proto $mtype$ServOpt\n"; |
| 838 |
+ $OUT .= " user '$mname' $DestSMTPServer with password '"; |
| 839 |
+ $OUT .= "$mpass' is $name here $keep\n"; |
| 840 |
+ if ( $moptions ne '' ) { |
| 841 |
+ $OUT .= " options $moptions\n"; |
| 842 |
+ } |
| 843 |
$OUT .= " smtphost 127.0.0.200/$tcpport" . "\n"; |
| 844 |
$OUT .= " antispam 550\n"; |
| 845 |
$OUT .="EOF\n"; |
Parent Directory
| 
Revision Log
| 
Revision Graph
