postfixadmin-svn Mailing List for PostfixAdmin (Page 101)
Brought to you by:
christian_boltz,
gingerdog
Menu
▾
▴
postfixadmin-svn — Postfix Admin SVN commit messages - READ ONLY!
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(13) |
Oct
(63) |
Nov
(79) |
Dec
(34) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(15) |
Feb
(8) |
Mar
(8) |
Apr
(44) |
May
(18) |
Jun
(20) |
Jul
(35) |
Aug
(21) |
Sep
(8) |
Oct
(9) |
Nov
(21) |
Dec
(14) |
| 2009 |
Jan
(53) |
Feb
(13) |
Mar
(36) |
Apr
(40) |
May
(22) |
Jun
(10) |
Jul
(18) |
Aug
(18) |
Sep
(7) |
Oct
(26) |
Nov
(32) |
Dec
(13) |
| 2010 |
Jan
(6) |
Feb
(7) |
Mar
(12) |
Apr
(2) |
May
(12) |
Jun
(8) |
Jul
(9) |
Aug
(12) |
Sep
(12) |
Oct
(7) |
Nov
(9) |
Dec
(42) |
| 2011 |
Jan
(10) |
Feb
(35) |
Mar
(43) |
Apr
(39) |
May
(8) |
Jun
(8) |
Jul
(83) |
Aug
(20) |
Sep
(20) |
Oct
(63) |
Nov
(33) |
Dec
(20) |
| 2012 |
Jan
(28) |
Feb
(3) |
Mar
(1) |
Apr
(37) |
May
(16) |
Jun
(7) |
Jul
(3) |
Aug
|
Sep
|
Oct
(3) |
Nov
(1) |
Dec
(4) |
| 2013 |
Jan
(6) |
Feb
(16) |
Mar
(9) |
Apr
(11) |
May
(9) |
Jun
(30) |
Jul
(17) |
Aug
(6) |
Sep
(2) |
Oct
(30) |
Nov
(41) |
Dec
(26) |
| 2014 |
Jan
(16) |
Feb
(20) |
Mar
(5) |
Apr
(4) |
May
(14) |
Jun
(4) |
Jul
(1) |
Aug
|
Sep
(8) |
Oct
(18) |
Nov
(26) |
Dec
|
| 2015 |
Jan
(4) |
Feb
(9) |
Mar
(12) |
Apr
(26) |
May
(3) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
(15) |
Oct
(13) |
Nov
|
Dec
(1) |
| 2016 |
Jan
(1) |
Feb
(5) |
Mar
(4) |
Apr
(3) |
May
(19) |
Jun
|
Jul
|
Aug
(3) |
Sep
(16) |
Oct
(4) |
Nov
(5) |
Dec
(5) |
| 2017 |
Jan
(1) |
Feb
(8) |
Mar
|
Apr
(7) |
May
(3) |
Jun
(16) |
Jul
(13) |
Aug
(16) |
Sep
(6) |
Oct
(4) |
Nov
(10) |
Dec
(7) |
| 2018 |
Jan
(16) |
Feb
(17) |
Mar
(11) |
Apr
(13) |
May
(20) |
Jun
(3) |
Jul
(10) |
Aug
|
Sep
(3) |
Oct
(1) |
Nov
(6) |
Dec
(18) |
| 2019 |
Jan
(18) |
Feb
(31) |
Mar
(4) |
Apr
(4) |
May
(1) |
Jun
(8) |
Jul
(7) |
Aug
(10) |
Sep
(23) |
Oct
(6) |
Nov
(3) |
Dec
(5) |
| 2020 |
Jan
(10) |
Feb
(18) |
Mar
(34) |
Apr
(19) |
May
(6) |
Jun
(9) |
Jul
|
Aug
(10) |
Sep
(16) |
Oct
(6) |
Nov
(3) |
Dec
(11) |
| 2021 |
Jan
(118) |
Feb
(22) |
Mar
(13) |
Apr
(12) |
May
(48) |
Jun
(21) |
Jul
(17) |
Aug
(12) |
Sep
(19) |
Oct
(25) |
Nov
(16) |
Dec
(7) |
| 2022 |
Jan
(6) |
Feb
(7) |
Mar
(14) |
Apr
(4) |
May
|
Jun
(16) |
Jul
(18) |
Aug
(5) |
Sep
(12) |
Oct
(8) |
Nov
(10) |
Dec
(13) |
| 2023 |
Jan
|
Feb
(3) |
Mar
(2) |
Apr
(1) |
May
(2) |
Jun
(6) |
Jul
(3) |
Aug
(3) |
Sep
(3) |
Oct
(2) |
Nov
(7) |
Dec
(13) |
| 2024 |
Jan
(8) |
Feb
(6) |
Mar
(5) |
Apr
(10) |
May
(8) |
Jun
(6) |
Jul
(2) |
Aug
(1) |
Sep
(2) |
Oct
(4) |
Nov
(15) |
Dec
(10) |
| 2025 |
Jan
(3) |
Feb
(12) |
Mar
(3) |
Apr
(7) |
May
(18) |
Jun
(10) |
Jul
(10) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <chr...@us...> - 2008-11-12 21:48:36
|
Revision: 479
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=479&view=rev
Author: christian_boltz
Date: 2008-11-12 21:48:31 +0000 (Wed, 12 Nov 2008)
Log Message:
-----------
fetchmail.php:
- allow superadmin to create fetchmail entry for any mailbox, not only for himself
https://sourceforge.net/tracker/index.php?func=detail&aid=2147740&group_id=191583&atid=937964
upgrade.php, fetchmail.php, fetchmail.pl:
- rename fetchmail ssl field to usessl - "ssl" is a reserved word in MySQL and
therefore causes various problems (we would need to quote the field name
everywhere)
https://sourceforge.net/tracker/index.php?func=detail&aid=2265333&group_id=191583&atid=937964
languages/*.lang:
- renamed strings for fetchmail (use)ssl field
Modified Paths:
--------------
trunk/ADDITIONS/fetchmail.pl
trunk/fetchmail.php
trunk/languages/bg.lang
trunk/languages/ca.lang
trunk/languages/cn.lang
trunk/languages/cs.lang
trunk/languages/da.lang
trunk/languages/de.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/et.lang
trunk/languages/eu.lang
trunk/languages/fi.lang
trunk/languages/fo.lang
trunk/languages/fr.lang
trunk/languages/hr.lang
trunk/languages/hu.lang
trunk/languages/is.lang
trunk/languages/it.lang
trunk/languages/ja.lang
trunk/languages/lt.lang
trunk/languages/mk.lang
trunk/languages/nb.lang
trunk/languages/nl.lang
trunk/languages/nn.lang
trunk/languages/pl.lang
trunk/languages/pt-br.lang
trunk/languages/ru.lang
trunk/languages/sk.lang
trunk/languages/sl.lang
trunk/languages/sv.lang
trunk/languages/tr.lang
trunk/languages/tw.lang
trunk/upgrade.php
Modified: trunk/ADDITIONS/fetchmail.pl
===================================================================
--- trunk/ADDITIONS/fetchmail.pl 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/ADDITIONS/fetchmail.pl 2008-11-12 21:48:31 UTC (rev 479)
@@ -18,14 +18,14 @@
$dbh = DBI->connect($dsn, $user, $password) || die "cannot connect the database";
$sql=<<SQL;
-SELECT id,mailbox,src_server,src_auth,src_user,src_password,src_folder,fetchall,keep,protocol,mda,extra_options,ssl
+SELECT id,mailbox,src_server,src_auth,src_user,src_password,src_folder,fetchall,keep,protocol,mda,extra_options,usessl
FROM fetchmail
WHERE unix_timestamp(now())-unix_timestamp(date) > poll_time*60
SQL
my (%config);
map{
- my ($id,$mailbox,$src_server,$src_auth,$src_user,$src_password,$src_folder,$fetchall,$keep,$protocol,$mda,$extra_options,$ssl)=@$_;
+ my ($id,$mailbox,$src_server,$src_auth,$src_user,$src_password,$src_folder,$fetchall,$keep,$protocol,$mda,$extra_options,$usessl)=@$_;
$cmd="user '${src_user}' there with password '".decode_base64($src_password)."'";
$cmd.=" folder '${src_folder}'" if ($src_folder);
@@ -36,7 +36,7 @@
$cmd.=" keep" if ($keep);
$cmd.=" fetchall" if ($fetchall);
- $cmd.=" ssl" if ($ssl);
+ $cmd.=" ssl" if ($usessl);
$cmd.=" ".$extra_options if ($extra_options);
$text=<<TXT;
Modified: trunk/fetchmail.php
===================================================================
--- trunk/fetchmail.php 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/fetchmail.php 2008-11-12 21:48:31 UTC (rev 479)
@@ -63,7 +63,7 @@
"fetchall" => array(1, 1, 'bool' ),
"keep" => array(1, 1, 'bool' ),
"protocol" => array(1, 1, 'enum' ),
- "ssl" => array(1, 1, 'bool' ),
+ "usessl" => array(1, 1, 'bool' ),
"extra_options" => array($extra_options, $extra_options, 'longtext' ),
"mda" => array($extra_options, $extra_options, 'longtext' ),
"date" => array(0, $display_status, 'text' ),
@@ -92,7 +92,12 @@
$table_fetchmail = table_by_key('fetchmail');
$table_mailbox = table_by_key('mailbox');
-$list_domains = list_domains_for_admin ($SESSID_USERNAME);
+if (authentication_has_role('global-admin')) {
+ $list_domains = list_domains ();
+} else {
+ $list_domains = list_domains_for_admin(authentication_get_username());
+}
+
$user_domains=implode(", ",array_values($list_domains)); # for displaying
$user_domains_sql=implode("','",escape_string(array_values($list_domains))); # for SQL
$sql="SELECT username FROM $table_mailbox WHERE domain in ('".$user_domains_sql."')"; # TODO: replace with domain selection dropdown
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/bg.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -398,7 +398,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -414,7 +414,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/ca.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -397,7 +397,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -413,7 +413,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/cn.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -397,7 +397,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -413,7 +413,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/cs.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -409,7 +409,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Stahovat vše';
$PALANG['pFetchmail_field_keep'] = 'Nemazat';
$PALANG['pFetchmail_field_protocol'] = 'Protokol';
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Parametry';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Datum';
@@ -425,7 +425,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Získávat všechny staré (přečtené) i nové zprávy';
$PALANG['pFetchmail_desc_keep'] = 'Ponechávat stažené zprávy na vzdáleném mailserveru';
$PALANG['pFetchmail_desc_protocol'] = 'Použitý protokol';
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra parametry pro fetchmail';
$PALANG['pFetchmail_desc_mda'] = 'Program pro doručení pošty do schránky (MDA)';
$PALANG['pFetchmail_desc_date'] = 'Datum posledního stažení pošty/změny konfigurace';
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/da.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -409,7 +409,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Hent alle';
$PALANG['pFetchmail_field_keep'] = 'Behold';
$PALANG['pFetchmail_field_protocol'] = 'Protokol';
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Ekstra tilvalg';
$PALANG['pFetchmail_field_mda'] = 'MDA (Mail Delivery Agent)';
$PALANG['pFetchmail_field_date'] = 'Dato';
@@ -425,7 +425,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Hent både gamle (sete) og nye beskeder';
$PALANG['pFetchmail_desc_keep'] = 'Gem hentede beskeder på den eksterne postserver';
$PALANG['pFetchmail_desc_protocol'] = 'Brug protokol';
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Ekstra fetchmail flag';
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent';
$PALANG['pFetchmail_desc_date'] = 'Dato for seneste prøve/konfigurationsændring';
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/de.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -409,7 +409,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Alle abholen';
$PALANG['pFetchmail_field_keep'] = 'Behalten';
$PALANG['pFetchmail_field_protocol'] = 'Protokoll';
-$PALANG['pFetchmail_field_ssl'] = 'SSL aktiv';
+$PALANG['pFetchmail_field_usessl'] = 'SSL aktiv';
$PALANG['pFetchmail_field_extra_options'] = 'Zusätzliche Optionen';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Datum';
@@ -425,7 +425,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Sowohl alte (gelesene) als auch neue Nachrichten abholen';
$PALANG['pFetchmail_desc_keep'] = 'Abgeholte Nachrichten auf dem entfernten Server lassen';
$PALANG['pFetchmail_desc_protocol'] = 'Zu verwendendes Protokoll';
-$PALANG['pFetchmail_desc_ssl'] = 'Verschlüsselung mit SSL';
+$PALANG['pFetchmail_desc_usessl'] = 'Verschlüsselung mit SSL';
$PALANG['pFetchmail_desc_extra_options'] = 'Zusätzliche fetchmail-Optionen';
$PALANG['pFetchmail_desc_mda'] = 'Programm zur Mailauslieferung';
$PALANG['pFetchmail_desc_date'] = 'Datum des letzten Mailabrufs/Konfigurationsänderung';
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/en.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -410,7 +410,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All';
$PALANG['pFetchmail_field_keep'] = 'Keep';
$PALANG['pFetchmail_field_protocol'] = 'Protocol';
-$PALANG['pFetchmail_field_ssl'] = 'SSL active';
+$PALANG['pFetchmail_field_usessl'] = 'SSL active';
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Date';
@@ -426,7 +426,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages';
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver';
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use';
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption';
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption';
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options';
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent';
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/es.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -398,7 +398,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -414,7 +414,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/et.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -401,7 +401,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -417,7 +417,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/eu.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -396,7 +396,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -412,7 +412,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/fi.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -399,7 +399,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -415,7 +415,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/fo.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -402,7 +402,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -418,7 +418,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/fr.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -399,7 +399,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Tout récupérer';
$PALANG['pFetchmail_field_keep'] = 'Conserver';
$PALANG['pFetchmail_field_protocol'] = 'Protocole';
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Options supplémentaires';
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -415,7 +415,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Récupérer tous les messages, nouveaux et déjà lus';
$PALANG['pFetchmail_desc_keep'] = 'Conserver une copie des messages sur le serveur';
$PALANG['pFetchmail_desc_protocol'] = 'Protocole à utiliser';
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Options supplémentaires de Fetchmail';
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date dernière vérification/changement configuration';
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/hr.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -396,7 +396,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -412,7 +412,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/hu.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -410,7 +410,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -426,7 +426,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/is.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -396,7 +396,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -412,7 +412,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/it.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -398,7 +398,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Ricevi tutto';
$PALANG['pFetchmail_field_keep'] = 'Conserva';
$PALANG['pFetchmail_field_protocol'] = 'Protocollo';
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Data';
@@ -414,7 +414,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Recupera anche i messaggi già letti';
$PALANG['pFetchmail_desc_keep'] = 'Conserva una copia del messaggi sul server remoto';
$PALANG['pFetchmail_desc_protocol'] = 'Protocollo da usare';
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Opzioni extra';
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent';
$PALANG['pFetchmail_desc_date'] = 'Data dell\'ultima modifica o attività';
Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/ja.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -408,7 +408,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'すべて取得';
$PALANG['pFetchmail_field_keep'] = '残す';
$PALANG['pFetchmail_field_protocol'] = 'プロトコル';
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = '追加オプション';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = '日付';
@@ -424,7 +424,7 @@
$PALANG['pFetchmail_desc_fetchall'] = '既読と新着メッセージを取得するか';
$PALANG['pFetchmail_desc_keep'] = 'リモートサーバに取得済メッセージを残すか';
$PALANG['pFetchmail_desc_protocol'] = '利用するプロトコル';
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = '追加の fetchmail オプション';
$PALANG['pFetchmail_desc_mda'] = 'メール配送エージェント (Mail Delivery Agent)';
$PALANG['pFetchmail_desc_date'] = '最終取得確認／設定変更日時';
Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/lt.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -397,7 +397,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -413,7 +413,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/mk.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -398,7 +398,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -414,7 +414,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/nb.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -398,7 +398,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Hent alt';
$PALANG['pFetchmail_field_keep'] = 'Behold';
$PALANG['pFetchmail_field_protocol'] = 'Protokoll';
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Ekstra alternativer';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Dato';
@@ -414,7 +414,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Hent både gamle og nye meldinger';
$PALANG['pFetchmail_desc_keep'] = 'Behold meldingene på den eksterne e-postserveren';
$PALANG['pFetchmail_desc_protocol'] = 'Protokoll som skal brukes';
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Ekstra fetchmail-alternativer';
$PALANG['pFetchmail_desc_mda'] = 'E-postleveringsagent (Mail Delivery Agent)';
$PALANG['pFetchmail_desc_date'] = 'Dato for siste spørring/konfigurasjonsendring';
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/nl.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -398,7 +398,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'alle berichten ophalen';
$PALANG['pFetchmail_field_keep'] = 'behouden';
$PALANG['pFetchmail_field_protocol'] = 'protocol';
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'extra opties';
$PALANG['pFetchmail_field_mda'] = 'MD';
$PALANG['pFetchmail_field_date'] = 'datum';
@@ -414,7 +414,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Haal zowel oude (gelezen) als nieuwe berichten op.';
$PALANG['pFetchmail_desc_keep'] = 'Opgehaalde berichten op de server achterlaten.';
$PALANG['pFetchmail_desc_protocol'] = 'het te gebruiken protocol.';
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'extra opties voor fetchmail.';
$PALANG['pFetchmail_desc_mda'] = 'mail delivery agent.';
$PALANG['pFetchmail_desc_date'] = 'datum van de laatste berichtencontrole/configuratie verandering.';
Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/nn.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -394,7 +394,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -410,7 +410,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/pl.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -402,7 +402,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Pobierz wszystkie';
$PALANG['pFetchmail_field_keep'] = 'Pozostaw';
$PALANG['pFetchmail_field_protocol'] = 'Protokół';
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Dodatkowe opcje';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Data';
@@ -418,7 +418,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Pobierz zarówno stare (przeczytane) jak i nowe wiadomości';
$PALANG['pFetchmail_desc_keep'] = 'Pozostaw wiadomości na serwerze';
$PALANG['pFetchmail_desc_protocol'] = 'Protokół';
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Dodatkowe opcje dla fetchmail';
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent';
$PALANG['pFetchmail_desc_date'] = 'Data ostatniego sprawdzenia/zmiany konfiguracji';
Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/pt-br.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -397,7 +397,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -413,7 +413,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/ru.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -410,7 +410,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Скачивать все';
$PALANG['pFetchmail_field_keep'] = 'Не удалять';
$PALANG['pFetchmail_field_protocol'] = 'Протокол';
-$PALANG['pFetchmail_field_ssl'] = 'Включить SSL';
+$PALANG['pFetchmail_field_usessl'] = 'Включить SSL';
$PALANG['pFetchmail_field_extra_options'] = 'Дополнительные параметры';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Дата';
@@ -426,7 +426,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Скачивать и старые (виденные), и новые сообщения';
$PALANG['pFetchmail_desc_keep'] = 'Не удалять скачанные сообщения с удаленного сервера';
$PALANG['pFetchmail_desc_protocol'] = 'Какой протокол использовать';
-$PALANG['pFetchmail_desc_ssl'] = 'Шифрование SSL';
+$PALANG['pFetchmail_desc_usessl'] = 'Шифрование SSL';
$PALANG['pFetchmail_desc_extra_options'] = 'Дополнительные параметры fetchmail';
$PALANG['pFetchmail_desc_mda'] = 'Агент доставки почты (Mail Delivery Agent)';
$PALANG['pFetchmail_desc_date'] = 'Дата последнего опроса/изменения конфигурации';
Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/sk.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -397,7 +397,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -413,7 +413,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/sl.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -397,7 +397,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -413,7 +413,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/sv.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -399,7 +399,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Hämta samtliga';
$PALANG['pFetchmail_field_keep'] = 'Behåll';
$PALANG['pFetchmail_field_protocol'] = 'Protokoll';
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra inställningsmöjligheter';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Datum';
@@ -415,7 +415,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Hämta både gamla lästa (visade) brev och nya';
$PALANG['pFetchmail_desc_keep'] = 'Behåll hämtade brev på mailservern';
$PALANG['pFetchmail_desc_protocol'] = 'Använd följande protokoll';
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail inställningar';
$PALANG['pFetchmail_desc_mda'] = 'Mailserveragent (MDA)';
$PALANG['pFetchmail_desc_date'] = 'Datum för senaste kontroll/konfigurationsändring';
Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/tr.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -397,7 +397,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -413,7 +413,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/languages/tw.lang 2008-11-12 21:48:31 UTC (rev 479)
@@ -397,7 +397,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -413,7 +413,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-11-12 20:32:45 UTC (rev 478)
+++ trunk/upgrade.php 2008-11-12 21:48:31 UTC (rev 479)
@@ -990,4 +990,13 @@
}
}
+function upgrade_479_mysql () {
+ # ssl is a reserved word in MySQL and causes several problems. Renaming the field...
+ $table_fmail = table_by_key('fetchmail');
+ db_query_parsed("ALTER TABLE `$table_fmail` CHANGE `ssl` `usessl` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0'");
+}
+function upgrade_479_pgsql () {
+ $table_fmail = table_by_key('fetchmail');
+ db_query_parsed("alter table $table_fmail rename column ssl to usessl");
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-12 20:32:48
|
Revision: 478
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=478&view=rev
Author: christian_boltz
Date: 2008-11-12 20:32:45 +0000 (Wed, 12 Nov 2008)
Log Message:
-----------
create-mailbox.php
- added two ) in success messages
Modified Paths:
--------------
trunk/create-mailbox.php
Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php 2008-11-12 20:15:04 UTC (rev 477)
+++ trunk/create-mailbox.php 2008-11-12 20:32:45 UTC (rev 478)
@@ -322,9 +322,9 @@
if (create_mailbox_subfolders($fUsername,$fPassword))
{
- $tMessage = $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername";
+ $tMessage = $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername)";
} else {
- $tMessage = $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername";
+ $tMessage = $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername)";
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-12 20:15:06
|
Revision: 477
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=477&view=rev
Author: christian_boltz
Date: 2008-11-12 20:15:04 +0000 (Wed, 12 Nov 2008)
Log Message:
-----------
upgrade.php
- fix MySQL syntax error in upgrade_473_mysql (pointed out by int on IRC)
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-11-11 23:00:09 UTC (rev 476)
+++ trunk/upgrade.php 2008-11-12 20:15:04 UTC (rev 477)
@@ -951,7 +951,7 @@
ALTER TABLE `$table_admin` CHANGE `password` `password` VARCHAR( 255 ) {LATIN1} NOT NULL
ALTER TABLE `$table_admin` DEFAULT {LATIN1}
ALTER TABLE `$table_alias` CHANGE `address` `address` VARCHAR( 255 ) {LATIN1} NOT NULL
- ALTER TABLE `$table_alias` CHANGE `goto` `goto` TEXT ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_alias` CHANGE `goto` `goto` TEXT {LATIN1} NOT NULL
ALTER TABLE `$table_alias` CHANGE `domain` `domain` VARCHAR( 255 ) {LATIN1} NOT NULL
ALTER TABLE `$table_alias` DEFAULT {LATIN1}
ALTER TABLE `$table_al_dom` CHANGE `alias_domain` `alias_domain` VARCHAR( 255 ) {LATIN1} NOT NULL
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-11 23:00:16
|
Revision: 476
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=476&view=rev
Author: christian_boltz
Date: 2008-11-11 23:00:09 +0000 (Tue, 11 Nov 2008)
Log Message:
-----------
css/default.css
- style info and error messages with a green (ul.flash-info) and red (ul.flash-error) border
Modified Paths:
--------------
trunk/css/default.css
Modified: trunk/css/default.css
===================================================================
--- trunk/css/default.css 2008-11-11 22:11:52 UTC (rev 475)
+++ trunk/css/default.css 2008-11-11 23:00:09 UTC (rev 476)
@@ -44,6 +44,24 @@
border: 1px solid #888888;
}
+ul.flash-info {
+ border:2px solid #AFE1A6; /* medium green */
+ padding:1em;
+ max-width:730px;
+ margin-left:auto;
+ margin-right:auto;
+ list-style:none;
+}
+
+ul.flash-error {
+ border:2px solid #FF6347; /* tomato */
+ padding:1em;
+ max-width:730px;
+ margin-left:auto;
+ margin-right:auto;
+ list-style:none;
+}
+
.error_msg {
color: #d01313;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-11 22:11:56
|
Revision: 475
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=475&view=rev
Author: christian_boltz
Date: 2008-11-11 22:11:52 +0000 (Tue, 11 Nov 2008)
Log Message:
-----------
functions.inc.php:
- check_email requires global $PALANG
Modified Paths:
--------------
trunk/functions.inc.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2008-11-11 20:48:42 UTC (rev 474)
+++ trunk/functions.inc.php 2008-11-11 22:11:52 UTC (rev 475)
@@ -271,6 +271,7 @@
function check_email ($email)
{
global $CONF;
+ global $PALANG;
$ce_email=$email;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-11 20:48:46
|
Revision: 474
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=474&view=rev
Author: christian_boltz
Date: 2008-11-11 20:48:42 +0000 (Tue, 11 Nov 2008)
Log Message:
-----------
CHANGELOG.TXT
- doing the paperwork: updated changelog with all commits up to svn r473
(aka "current trunk" - this commit will become r474)
Modified Paths:
--------------
trunk/CHANGELOG.TXT
Modified: trunk/CHANGELOG.TXT
===================================================================
--- trunk/CHANGELOG.TXT 2008-11-06 22:08:35 UTC (rev 473)
+++ trunk/CHANGELOG.TXT 2008-11-11 20:48:42 UTC (rev 474)
@@ -15,10 +15,33 @@
--------------------
- added support for domain aliases (from lenix) (can be disabled with $CONF['alias_domain'])
- - add clear error message for non-resolvable domains when creating mailboxes or aliases
+ Important: If you update from a previous version, you'll have to adapt your postfix
+ configuration (see DOCUMENTS/POSTFIX_CONF.txt) - or just disable alias domain support,
+ your postfix configuration will continue to work
+ - updated postfix example configuration for domain aliases and to use the new mysql map format
+ - vacation.pl:
+ - add option for re-notification after definable timeout (patch from Luxten)
+ (default stays on "notify once")
+ - force usage of envelope from/to, better checks for mailinglists, spam etc.
+ If in doubt, do not send a vacation reply (patch from Lutxen)
+ - added a small test suite
+ - use Log4Perl
+ - allow to enter the configuration in /etc/mail/postfixadmin/vacation.conf
+ instead of editing vacation.pl directly
+ - bump version number of vacation.pl
+ - added clear error message for non-resolvable domains when creating mailboxes or aliases
- check for non-resolvable domains on domain creation
- - enable re-notification after definable timeout in vacation (patch from Luxten)
- - updated postfix example configuration for domain aliases and to use the new mysql map format
+ - new option $CONF['create_mailbox_subdirs_prefix'] for compatibility with more IMAP servers
+ - fix "illegal mix of collations" problem in MySQL by explicitely setting the charset everywhere
+ - fix: cleanup vacation_notification table when disabling vacation
+ - fix: config and fetchmail tables now honor $CONF['database_tables']
+ - fix: "unlimited" and "disabled" for quota and limits were crossed at several places
+ - fix: honor $CONF['default_transport'] even if $CONF['transport'] = "no" (patch by fabiobon)
+ - show links to create mailboxes or alias even on disabled domains
+ - added support for fetchmail's "ssl" option
+ - force username to be lowercase - this helps some IMAP clients apprently
+ - dropped $CONF['show_custom_count']. PHP can count ;-)
+ - dropped obsolete VIRTUAL_VACATION/mail-filter script
- translation updates
- several small bugfixes
- SVN revision *******************************
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-06 22:08:46
|
Revision: 473
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=473&view=rev
Author: christian_boltz
Date: 2008-11-06 22:08:35 +0000 (Thu, 06 Nov 2008)
Log Message:
-----------
upgrade.php:
- alias.goto was accidently changed to varchar(255) in upgrade_469_mysql.
Make it a text field again.
https://sourceforge.net/tracker/?func=detail&atid=937964&aid=2221002&group_id=191583
- renamed upgrade_469_mysql to upgrade_473_mysql to ensure the above
change is done
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-11-05 21:04:29 UTC (rev 472)
+++ trunk/upgrade.php 2008-11-06 22:08:35 UTC (rev 473)
@@ -935,7 +935,7 @@
db_query_parsed("ALTER TABLE $table_fetchmail ADD COLUMN ssl BOOLEAN NOT NULL DEFAULT false");
}
-function upgrade_469_mysql() {
+function upgrade_473_mysql() {
$table_admin = table_by_key('admin');
$table_alias = table_by_key('alias');
$table_al_dom = table_by_key('alias_domain');
@@ -951,7 +951,7 @@
ALTER TABLE `$table_admin` CHANGE `password` `password` VARCHAR( 255 ) {LATIN1} NOT NULL
ALTER TABLE `$table_admin` DEFAULT {LATIN1}
ALTER TABLE `$table_alias` CHANGE `address` `address` VARCHAR( 255 ) {LATIN1} NOT NULL
- ALTER TABLE `$table_alias` CHANGE `goto` `goto` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_alias` CHANGE `goto` `goto` TEXT ) {LATIN1} NOT NULL
ALTER TABLE `$table_alias` CHANGE `domain` `domain` VARCHAR( 255 ) {LATIN1} NOT NULL
ALTER TABLE `$table_alias` DEFAULT {LATIN1}
ALTER TABLE `$table_al_dom` CHANGE `alias_domain` `alias_domain` VARCHAR( 255 ) {LATIN1} NOT NULL
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-11-05 21:04:37
|
Revision: 472
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=472&view=rev
Author: GingerDog
Date: 2008-11-05 21:04:29 +0000 (Wed, 05 Nov 2008)
Log Message:
-----------
mail-filter: obsolete
Removed Paths:
-------------
trunk/VIRTUAL_VACATION/mail-filter
Deleted: trunk/VIRTUAL_VACATION/mail-filter
===================================================================
--- trunk/VIRTUAL_VACATION/mail-filter 2008-11-01 20:15:46 UTC (rev 471)
+++ trunk/VIRTUAL_VACATION/mail-filter 2008-11-05 21:04:29 UTC (rev 472)
@@ -1,17 +0,0 @@
-#!/bin/sh
-FILTER_DIR=/home/vacation
-SENDMAIL="/usr/sbin/sendmail -i"
-EX_TEMPFAIL=75
-EX_UNAVAILABLE=69
-
-trap "rm -f in.$$" 0 1 2 3 15
-
-cd $FILTER_DIR || { echo $FILTER_DIR does not exist; exit $EX_TEMPFAIL; }
-
-cat > in.$$ || { echo Cannot save mail to file; exit $EX_TEMPFAIL; }
-
-/home/vacation/vacation.pl < in.$$ || { echo Message content rejected; exit $EX_UNAVAILABLE; }
-
-$SENDMAIL "$@" < in.$$
-
-exit $?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-01 20:15:52
|
Revision: 471
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=471&view=rev
Author: christian_boltz
Date: 2008-11-01 20:15:46 +0000 (Sat, 01 Nov 2008)
Log Message:
-----------
config.inc.php, functions.inc.php, templates/list-virtual.php:
- dropped $CONF['show_custom_count'], it can easily be calculated with
count($CONF['show_custom_domains']). This fixes part (6) of
https://sourceforge.net/tracker2/?func=detail&aid=1951926&group_id=191583&atid=937967
config.inc.php:
- added some comments explaining $CONF['show_undeliverable_exceptions']
and $CONF['show_custom_domains']
Modified Paths:
--------------
trunk/config.inc.php
trunk/functions.inc.php
trunk/templates/list-virtual.php
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2008-10-31 13:37:49 UTC (rev 470)
+++ trunk/config.inc.php 2008-11-01 20:15:46 UTC (rev 471)
@@ -274,11 +274,13 @@
// elsewhere, you will probably want to disable this.
$CONF['show_undeliverable']='NO';
$CONF['show_undeliverable_color']='tomato';
+// mails to these domains will never be flagged as undeliverable
$CONF['show_undeliverable_exceptions']=array("unixmail.domain.ext","exchangeserver.domain.ext","gmail.com");
$CONF['show_popimap']='NO';
$CONF['show_popimap_color']='darkgrey';
-// set 'show_custom_count' to 0 to disable custom indicators
-$CONF['show_custom_count']=2;
+// you can assign special colors to some domains. To do this,
+// - add the domain to show_custom_domains
+// - add the corresponding color to show_custom_colors
$CONF['show_custom_domains']=array("subdomain.domain.ext","domain2.ext");
$CONF['show_custom_colors']=array("lightgreen","lightblue");
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2008-10-31 13:37:49 UTC (rev 470)
+++ trunk/functions.inc.php 2008-11-01 20:15:46 UTC (rev 471)
@@ -2061,7 +2061,7 @@
}
// CUSTOM DESTINATION CHECK
- if ( $CONF['show_custom_count'] > 0 )
+ if ( count($CONF['show_custom_domains']) > 0 )
{
for ($i = 0; $i < sizeof ($CONF['show_custom_domains']); $i++)
{
Modified: trunk/templates/list-virtual.php
===================================================================
--- trunk/templates/list-virtual.php 2008-10-31 13:37:49 UTC (rev 470)
+++ trunk/templates/list-virtual.php 2008-11-01 20:15:46 UTC (rev 471)
@@ -370,7 +370,7 @@
print " <span style='background-color:" . $CONF['show_popimap_color'] .
"'>" . $CONF['show_status_text'] . "</span>=" . $PALANG['pStatus_popimap'] . "\n";
}
- if ( $CONF['show_custom_count'] > 0 )
+ if ( count($CONF['show_custom_domains']) > 0 )
{
for ($i = 0; $i < sizeof ($CONF['show_custom_domains']); $i++)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-10-31 13:37:57
|
Revision: 470
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=470&view=rev
Author: christian_boltz
Date: 2008-10-31 13:37:49 +0000 (Fri, 31 Oct 2008)
Log Message:
-----------
vacation.pl:
- allow to enter the configuration in /etc/mail/postfixadmin/vacation.conf
instead of editing vacation.pl directly
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/vacation.pl
Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================
--- trunk/VIRTUAL_VACATION/vacation.pl 2008-10-31 10:24:23 UTC (rev 469)
+++ trunk/VIRTUAL_VACATION/vacation.pl 2008-10-31 13:37:49 UTC (rev 470)
@@ -93,31 +93,31 @@
# can read it.
# db_type - uncomment one of these
-my $db_type = 'Pg';
+our $db_type = 'Pg';
#my $db_type = 'mysql';
# leave empty for connection via UNIX socket
-my $db_host = '';
+our $db_host = '';
# connection details
-my $db_username = 'dg';
-my $db_password = 'gingerdog';
-my $db_name = 'postfix';
+our $db_username = 'dg';
+our $db_password = 'gingerdog';
+our $db_name = 'postfix';
-my $vacation_domain = 'autoreply.example.org';
+our $vacation_domain = 'autoreply.example.org';
# smtp server used to send vacation e-mails
-my $smtp_server = 'localhost';
+our $smtp_server = 'localhost';
# Set to 1 to enable logging to syslog.
-my $syslog = 0;
+our $syslog = 0;
# path to logfile, when empty logging is supressed
# change to e.g. /dev/null if you want nothing logged.
# if we can't write to this, we try /tmp/vacation.log instead
-my $logfile='/var/spool/vacation/vacation.log';
+our $logfile='/var/spool/vacation/vacation.log';
# 2 = debug + info, 1 = info only, 0 = error only
-my $log_level = 2;
+our $log_level = 2;
# notification interval, in seconds
@@ -125,8 +125,15 @@
# e.g. 1 day ...
#my $interval = 60*60*24;
# disabled by default
-my $interval = 0;
+our $interval = 0;
+# instead of changing this script, you can put your settings to /etc/mail/postfixadmin/vacation.conf
+# just use perl syntax there to fill the variables listed above (without the "our" keyword). Example:
+# $db_username = 'mail';
+if (-f "/etc/mail/postfixadmin/vacation.conf") {
+ require "/etc/mail/postfixadmin/vacation.conf";
+}
+
# =========== end configuration ===========
if ( ! -w $logfile ) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-10-31 10:24:34
|
Revision: 469
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=469&view=rev
Author: christian_boltz
Date: 2008-10-31 10:24:23 +0000 (Fri, 31 Oct 2008)
Log Message:
-----------
upgrade.php:
- upgrade_469_mysql: fix "illegal mix of collations" by explicitely setting
the charset for all VARCHAR and TEXT fields.
http://sourceforge.net/tracker2/?func=detail&aid=1990191&group_id=191583&atid=937964
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-10-21 11:08:19 UTC (rev 468)
+++ trunk/upgrade.php 2008-10-31 10:24:23 UTC (rev 469)
@@ -934,3 +934,60 @@
$table_fetchmail = table_by_key('fetchmail');
db_query_parsed("ALTER TABLE $table_fetchmail ADD COLUMN ssl BOOLEAN NOT NULL DEFAULT false");
}
+
+function upgrade_469_mysql() {
+ $table_admin = table_by_key('admin');
+ $table_alias = table_by_key('alias');
+ $table_al_dom = table_by_key('alias_domain');
+ $table_domain = table_by_key('domain');
+ $table_dom_adm = table_by_key('domain_admins');
+ $table_fmail = table_by_key('fetchmail');
+ $table_mailbox = table_by_key('mailbox');
+ $table_log = table_by_key('log');
+
+ # tables were created without explicit charset before :-(
+ $all_sql = split("\n", trim("
+ ALTER TABLE `$table_admin` CHANGE `username` `username` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_admin` CHANGE `password` `password` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_admin` DEFAULT {LATIN1}
+ ALTER TABLE `$table_alias` CHANGE `address` `address` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_alias` CHANGE `goto` `goto` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_alias` CHANGE `domain` `domain` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_alias` DEFAULT {LATIN1}
+ ALTER TABLE `$table_al_dom` CHANGE `alias_domain` `alias_domain` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_al_dom` CHANGE `target_domain` `target_domain` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_al_dom` DEFAULT {LATIN1}
+ ALTER TABLE `$table_domain` CHANGE `domain` `domain` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_domain` CHANGE `transport` `transport` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_domain` DEFAULT {LATIN1}
+ ALTER TABLE `$table_dom_adm` CHANGE `username` `username` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_dom_adm` CHANGE `domain` `domain` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_dom_adm` DEFAULT {LATIN1}
+ ALTER TABLE `$table_log` CHANGE `username` `username` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_log` CHANGE `domain` `domain` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_log` CHANGE `action` `action` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_log` CHANGE `data` `data` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_log` DEFAULT {LATIN1}
+ ALTER TABLE `$table_mailbox` CHANGE `username` `username` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_mailbox` CHANGE `password` `password` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_mailbox` CHANGE `maildir` `maildir` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_mailbox` CHANGE `domain` `domain` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_mailbox` DEFAULT {LATIN1}
+ ALTER TABLE `$table_fmail` CHANGE `mailbox` `mailbox` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_fmail` CHANGE `src_server` `src_server` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_fmail` CHANGE `src_user` `src_user` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_fmail` CHANGE `src_password` `src_password` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_fmail` CHANGE `src_folder` `src_folder` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_fmail` CHANGE `mda` `mda` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_fmail` CHANGE `mailbox` `mailbox` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_fmail` CHANGE `extra_options` `extra_options` TEXT {LATIN1} NULL DEFAULT NULL
+ ALTER TABLE `$table_fmail` CHANGE `returned_text` `returned_text` TEXT {LATIN1} NULL DEFAULT NULL
+ ALTER TABLE `$table_fmail` DEFAULT {LATIN1}
+ "));
+
+ foreach ($all_sql as $sql) {
+ $result = db_query_parsed($sql);
+ }
+}
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-10-21 11:08:32
|
Revision: 468
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=468&view=rev
Author: GingerDog
Date: 2008-10-21 11:08:19 +0000 (Tue, 21 Oct 2008)
Log Message:
-----------
vacation.pl: bump version number as it has not changed in years
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/vacation.pl
Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================
--- trunk/VIRTUAL_VACATION/vacation.pl 2008-10-19 18:27:14 UTC (rev 467)
+++ trunk/VIRTUAL_VACATION/vacation.pl 2008-10-21 11:08:19 UTC (rev 468)
@@ -1,7 +1,8 @@
#!/usr/bin/perl -w
#
-# Virtual Vacation 3.1
-# by Mischa Peters <mischa at high5 dot net>
+# Virtual Vacation 4.0
+# Originally by Mischa Peters <mischa at high5 dot net>
+#
# Copyright (c) 2002 - 2005 High5!
# Licensed under GPL for more info check GPL-LICENSE.TXT
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-10-19 18:27:24
|
Revision: 467
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=467&view=rev
Author: GingerDog
Date: 2008-10-19 18:27:14 +0000 (Sun, 19 Oct 2008)
Log Message:
-----------
error handling fixes - see also http://sourceforge.net/forum/forum.php?thread_id=2349320&forum_id=676076
Modified Paths:
--------------
trunk/ADDITIONS/postfixadmin-mailbox-postcreation.sh
Modified: trunk/ADDITIONS/postfixadmin-mailbox-postcreation.sh
===================================================================
--- trunk/ADDITIONS/postfixadmin-mailbox-postcreation.sh 2008-10-16 11:31:25 UTC (rev 466)
+++ trunk/ADDITIONS/postfixadmin-mailbox-postcreation.sh 2008-10-19 18:27:14 UTC (rev 467)
@@ -23,12 +23,12 @@
basedir=/var/spool/maildirs
if [ ! -e "$basedir" ]; then
- echo "basedir '$basedir' does not exist; bailing out."
+ echo "$0: basedir '$basedir' does not exist; bailing out."
exit 1
fi
if [ `echo $3 | fgrep '..'` ]; then
- echo "An argument contained a double-dot sequence; bailing out."
+ echo "$0: An argument contained a double-dot sequence; bailing out."
exit 1
fi
@@ -36,27 +36,25 @@
parent=`dirname "$maildir"`
if [ ! -d "$parent" ]; then
if [ -e "$parent" ]; then
- echo "Strainge - directory '$parent' exists, but is not a directory."
- echo "Bailing out."
+ echo "$0: strange - directory '$parent' exists, but is not a directory; bailing out."
exit 1
else
mkdir -p "${parent}"
if [ $? -ne 0 ]; then
- echo "mkdir -p '$parent' returned non-zero; bailing out."
+ echo "$0: mkdir -p '$parent' returned non-zero; bailing out."
exit 1
fi
fi
fi
if [ -e "$maildir" ]; then
- echo "Directory '$maildir' already exists! Bailing out"
+ echo "$0: Directory '$maildir' already exists! bailing out"
exit 1
fi
maildirmake "$maildir"
if [ ! -d "$maildir" ]; then
- echo "maildirmake didn't produce a directory"
- echo "Bailing out."
+ echo "$0: maildirmake didn't produce a directory; bailing out."
exit 1
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-10-16 11:33:10
|
Revision: 466
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=466&view=rev
Author: GingerDog
Date: 2008-10-16 11:31:25 +0000 (Thu, 16 Oct 2008)
Log Message:
-----------
delete.php: make it more robust, and do not overwrite error message from earlier with one from later
Modified Paths:
--------------
trunk/delete.php
Modified: trunk/delete.php
===================================================================
--- trunk/delete.php 2008-10-11 19:58:34 UTC (rev 465)
+++ trunk/delete.php 2008-10-16 11:31:25 UTC (rev 466)
@@ -49,7 +49,7 @@
$fWhere = 'username';
$result_admin = db_delete ($table_admin,$fWhere,$fDelete);
$result_domain_admins = db_delete ($table_domain_admins,$fWhere,$fDelete);
-
+
if (!($result_admin == 1) and ($result_domain_admins >= 0))
{
$error = 1;
@@ -70,8 +70,6 @@
$result_alias = db_delete ($table_alias,$fWhere,$fDelete);
$result_mailbox = db_delete ($table_mailbox,$fWhere,$fDelete);
$result_log = db_delete ($table_log,$fWhere,$fDelete);
- $result_alias_domain = db_delete ($table_alias_domain,'alias_domain',$fDelete);
- $result_target_domain = db_delete ($table_alias_domain,'target_domain',$fDelete);
if ($CONF['vacation'] == "YES")
{
$result_vacation = db_delete ($table_vacation,$fWhere,$fDelete);
@@ -90,28 +88,6 @@
}
} # ($fTable == "domain")
-elseif ($fTable == "alias_domain")
-{
- if (!check_owner ($SESSID_USERNAME, $fDelete))
- {
- $error = 1;
- $tMessage = $PALANG['pDelete_domain_alias_error'] . "<b>$fDelete</b>!</span>";
- }
-
- $result = db_delete ($table_alias_domain,'alias_domain',$fDelete);
- if (!$result || !alias_domain_postdeletion($fDelete))
- {
- $error = 1;
- $tMessage = $PALANG['pAdminDelete_alias_domain_error'];
- }
- else
- {
- db_log ($SESSID_USERNAME, $fDelete, 'delete_alias_domain', $fDelete);
- $url = "list-virtual.php?domain=" . urlencode($_REQUEST['domain']);
- header ("Location: $url");
- }
-} # ($fTable == "alias_domain")
-
elseif ($fTable == "alias" or $fTable == "mailbox")
{
@@ -128,46 +104,40 @@
else
{
if ($CONF['database_type'] == "pgsql") db_query('BEGIN');
- $result = db_query ("DELETE FROM $table_alias WHERE address='$fDelete' AND domain='$fDomain'");
- if ($result['rows'] != 1)
- {
- $error = 1;
- $tMessage = $PALANG['pDelete_delete_error'] . "<b>$fDelete</b> (alias)!</span>";
- }
- else
- {
+ /* there may be no aliases to delete */
+ $result = db_query("SELECT * FROM $table_alias WHERE address = '$fDelete' AND domain = '$fDomain'");
+ if($result['rows'] == 1) {
+ $result = db_query ("DELETE FROM $table_alias WHERE address='$fDelete' AND domain='$fDomain'");
db_log ($SESSID_USERNAME, $fDomain, 'delete_alias', $fDelete);
}
- if (!$error)
+ /* is there a mailbox? if do delete it from orbit; it's the only way to be sure */
+ $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$fDelete' AND domain='$fDomain'");
+ if ($result['rows'] == 1)
{
- $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$fDelete' AND domain='$fDomain'");
- if ($result['rows'] == 1)
+ $result = db_query ("DELETE FROM $table_mailbox WHERE username='$fDelete' AND domain='$fDomain'");
+ $postdel_res=mailbox_postdeletion($fDelete,$fDomain);
+ if ($result['rows'] != 1 || !$postdel_res)
{
- $result = db_query ("DELETE FROM $table_mailbox WHERE username='$fDelete' AND domain='$fDomain'");
- $postdel_res=mailbox_postdeletion($fDelete,$fDomain);
- if ($result['rows'] != 1 || !$postdel_res)
+ $error = 1;
+ $tMessage = $PALANG['pDelete_delete_error'] . "<b>$fDelete</b> (";
+ if ($result['rows']!=1)
{
- $error = 1;
- $tMessage = $PALANG['pDelete_delete_error'] . "<b>$fDelete</b> (";
- if ($result['rows']!=1)
- {
- $tMessage.='mailbox';
- if (!$postdel_res) $tMessage.=', ';
- }
- if (!$postdel_res)
- {
- $tMessage.='post-deletion';
- }
- $tMessage.=')</span>';
+ $tMessage.='mailbox';
+ if (!$postdel_res) $tMessage.=', ';
}
- else
+ if (!$postdel_res)
{
- db_query ("DELETE FROM $table_vacation WHERE email='$fDelete' AND domain='$fDomain'");
- db_log ($SESSID_USERNAME, $fDomain, 'delete_mailbox', $fDelete);
+ $tMessage.='post-deletion';
}
+ $tMessage.=')</span>';
}
}
+ $result = db_query("SELECT * FROM $table_vacation WHERE email = '$fDelete' AND domain = '$fDomain'");
+ if($result['rows'] == 1) {
+ db_query ("DELETE FROM $table_vacation WHERE email='$fDelete' AND domain='$fDomain'");
+ db_query ("DELETE FROM $table_vacation_notification WHERE on_vacation ='$fDelete' "); /* should be caught by cascade, if PgSQL */
+ }
}
if ($error != 1)
@@ -176,14 +146,13 @@
header ("Location: list-virtual.php?domain=$fDomain");
exit;
} else {
- $tMessage = $PALANG['pDelete_delete_error'] . "<b>$fDelete</b> (physical mail)!</span>";
+ $tMessage .= $PALANG['pDelete_delete_error'] . "<b>$fDelete</b> (physical mail)!</span>";
if ($CONF['database_type'] == "pgsql") db_query('ROLLBACK');
}
-} # ($fTable == "alias" or $fTable == "mailbox")
+}
else
{
- # unknown $fTable value
flash_error($PALANG['invalid_parameter']);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-10-11 19:58:39
|
Revision: 465
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=465&view=rev
Author: GingerDog
Date: 2008-10-11 19:58:34 +0000 (Sat, 11 Oct 2008)
Log Message:
-----------
create-mailbox.php: force username to be lowercase - this helps some IMAP clients apprently
Modified Paths:
--------------
trunk/create-mailbox.php
Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php 2008-10-11 07:43:11 UTC (rev 464)
+++ trunk/create-mailbox.php 2008-10-11 19:58:34 UTC (rev 465)
@@ -259,6 +259,9 @@
To be compared / merged.
*/
+ // apparently uppercase usernames really confuse some IMAP clients.
+ $fUsername = strtolower($fUsername);
+
$result = db_query ("INSERT INTO $table_mailbox (username,password,name,maildir,quota,domain,created,modified,active) VALUES ('$fUsername','$password','$fName','$maildir','$quota','$fDomain',NOW(),NOW(),'$sqlActive')");
if ($result['rows'] != 1 || !mailbox_postcreation($fUsername,$fDomain,$maildir, $quota))
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-10-11 07:43:22
|
Revision: 464
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=464&view=rev
Author: GingerDog
Date: 2008-10-11 07:43:11 +0000 (Sat, 11 Oct 2008)
Log Message:
-----------
make it more obvious what the db possibilities are
Modified Paths:
--------------
trunk/config.inc.php
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2008-10-03 08:27:22 UTC (rev 463)
+++ trunk/config.inc.php 2008-10-11 07:43:11 UTC (rev 464)
@@ -44,8 +44,8 @@
$CONF['default_language'] = 'en';
// Database Config
-// mysql = MySQL 3.23 and 4.0
-// mysqli = MySQL 4.1
+// mysql = MySQL 3.23 and 4.0, 4.1 or 5
+// mysqli = MySQL 4.1+
// pgsql = PostgreSQL
$CONF['database_type'] = 'mysql';
$CONF['database_host'] = 'localhost';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-10-03 08:27:25
|
Revision: 463
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=463&view=rev
Author: GingerDog
Date: 2008-10-03 08:27:22 +0000 (Fri, 03 Oct 2008)
Log Message:
-----------
create-domain.php: reindent; applied patch from http://sourceforge.net/tracker/?func=detail&atid=937964&aid=2143861&group_id=191583 - thanks fabiobon - this enables the $CONF[transport] parameter again
Modified Paths:
--------------
trunk/create-domain.php
Modified: trunk/create-domain.php
===================================================================
--- trunk/create-domain.php 2008-10-01 20:41:56 UTC (rev 462)
+++ trunk/create-domain.php 2008-10-03 08:27:22 UTC (rev 463)
@@ -43,81 +43,89 @@
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
- $tAliases = $CONF['aliases'];
- $tMailboxes = $CONF['mailboxes'];
- $tMaxquota = $CONF['maxquota'];
- $tTransport = $CONF['transport_default'];
+ $tAliases = $CONF['aliases'];
+ $tMailboxes = $CONF['mailboxes'];
+ $tMaxquota = $CONF['maxquota'];
+ $tTransport = $CONF['transport_default'];
}
if ($_SERVER['REQUEST_METHOD'] == "POST")
{
- if (isset ($_POST['fDomain'])) $fDomain = escape_string ($_POST['fDomain']);
- $form_fields = array('fDescription' => '', 'fAliases' => '0', 'fMailboxes' => '0',
- 'fMaxquota' => '0', 'fTransport' => 'virtual', 'fDefaultaliases' => '0',
- 'fBackupmx' => '0');
- foreach($form_fields as $key => $default) {
- if(isset($_POST[$key]) && (!empty($_POST[$key]))) {
- $$key = escape_string($_POST[$key]);
- }
- else {
- $$key = $default;
- }
- }
+ if (isset($_POST['fDomain'])) {
+ $fDomain = escape_string($_POST['fDomain']);
+ }
+ $form_fields = array(
+ 'fDescription' => '',
+ 'fAliases' => '0',
+ 'fMailboxes' => '0',
+ 'fMaxquota' => '0',
+ 'fTransport' => $CONF['transport_default'],
+ 'fDefaultaliases' => '0',
+ 'fBackupmx' => '0' );
+ foreach($form_fields as $key => $default) {
+ if(isset($_POST[$key]) && (!empty($_POST[$key]))) {
+ $$key = escape_string($_POST[$key]);
+ }
+ else {
+ $$key = $default;
+ }
+ }
- if (empty ($fDomain) or domain_exist ($fDomain) or !check_domain ($fDomain))
- {
- $error = 1;
- $tDomain = escape_string ($_POST['fDomain']);
- $tDescription = escape_string ($_POST['fDescription']);
- $tAliases = escape_string ($_POST['fAliases']);
- $tMailboxes = escape_string ($_POST['fMailboxes']);
- if (isset ($_POST['fMaxquota'])) $tMaxquota = escape_string ($_POST['fMaxquota']);
- if (isset ($_POST['fTransport'])) $tTransport = escape_string ($_POST['fTransport']);
- if (isset ($_POST['fDefaultaliases'])) $tDefaultaliases = escape_string ($_POST['fDefaultaliases']);
- if (isset ($_POST['fBackupmx'])) $tBackupmx = escape_string ($_POST['fBackupmx']);
+
+ if (empty($fDomain) or domain_exist($fDomain) or !check_domain($fDomain))
+ {
+ $error = 1;
+ $tDomain = escape_string ($_POST['fDomain']);
+ $tDescription = escape_string ($_POST['fDescription']);
+ $tAliases = escape_string ($_POST['fAliases']);
+ $tMailboxes = escape_string ($_POST['fMailboxes']);
+ if (isset ($_POST['fMaxquota'])) $tMaxquota = escape_string ($_POST['fMaxquota']);
+ if (isset ($_POST['fTransport'])) $tTransport = escape_string ($_POST['fTransport']);
+ if (isset ($_POST['fDefaultaliases'])) $tDefaultaliases = escape_string ($_POST['fDefaultaliases']);
+ if (isset ($_POST['fBackupmx'])) $tBackupmx = escape_string ($_POST['fBackupmx']);
/* if (empty ($fDomain) or !check_domain ($fDomain)) */ $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error2'];
- if (domain_exist ($fDomain)) $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error'];
- }
+ if (domain_exist ($fDomain)) $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error'];
+ }
- if ($error != 1)
- {
- $tAliases = $CONF['aliases'];
- $tMailboxes = $CONF['mailboxes'];
- $tMaxquota = $CONF['maxquota'];
+ if ($error != 1)
+ {
+ $tAliases = $CONF['aliases'];
+ $tMailboxes = $CONF['mailboxes'];
+ $tMaxquota = $CONF['maxquota'];
- if ($fBackupmx == "on")
- {
- $fAliases = -1;
- $fMailboxes = -1;
- $fMaxquota = -1;
- $fBackupmx = 1;
- $sqlBackupmx = db_get_boolean(true);
- }
- else
- {
- $fBackupmx = 0;
- $sqlBackupmx = db_get_boolean(false);
- }
- $sql_query = "INSERT INTO $table_domain (domain,description,aliases,mailboxes,maxquota,transport,backupmx,created,modified) VALUES ('$fDomain','$fDescription',$fAliases,$fMailboxes,$fMaxquota,'$fTransport',$sqlBackupmx,NOW(),NOW())";
- $result = db_query($sql_query);
- if ($result['rows'] != 1)
- {
- $tMessage = $PALANG['pAdminCreate_domain_result_error'] . "<br />($fDomain)<br />";
- }
- else
- {
- if ($fDefaultaliases == "on")
- {
- foreach ($CONF['default_aliases'] as $address=>$goto)
+ if ($fBackupmx == "on")
+ {
+ $fAliases = -1;
+ $fMailboxes = -1;
+ $fMaxquota = -1;
+ $fBackupmx = 1;
+ $sqlBackupmx = db_get_boolean(true);
+ }
+ else
+ {
+ $fBackupmx = 0;
+ $sqlBackupmx = db_get_boolean(false);
+ }
+ $sql_query = "INSERT INTO $table_domain (domain,description,aliases,mailboxes,maxquota,transport,backupmx,created,modified) VALUES ('$fDomain','$fDescription',$fAliases,$fMailboxes,$fMaxquota,'$fTransport',$sqlBackupmx,NOW(),NOW())";
+ $result = db_query($sql_query);
+ if ($result['rows'] != 1)
+ {
+ $tMessage = $PALANG['pAdminCreate_domain_result_error'] . "<br />($fDomain)<br />";
+ }
+ else
+ {
+ if ($fDefaultaliases == "on")
{
- $address = $address . "@" . $fDomain;
- $result = db_query ("INSERT INTO $table_alias (address,goto,domain,created,modified) VALUES ('$address','$goto','$fDomain',NOW(),NOW())");
+ foreach ($CONF['default_aliases'] as $address=>$goto)
+ {
+ $address = $address . "@" . $fDomain;
+ $result = db_query ("INSERT INTO $table_alias (address,goto,domain,created,modified) VALUES ('$address','$goto','$fDomain',NOW(),NOW())");
+ }
}
- }
- $tMessage = $PALANG['pAdminCreate_domain_result_success'] . "<br />($fDomain)</br />";
- }
- }
+ $tMessage = $PALANG['pAdminCreate_domain_result_success'] . "<br />($fDomain)</br />";
+ }
+ }
}
include ("templates/header.php");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-10-01 20:42:07
|
Revision: 462
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=462&view=rev
Author: christian_boltz
Date: 2008-10-01 20:41:56 +0000 (Wed, 01 Oct 2008)
Log Message:
-----------
FAQ.txt:
- added note about sudo configuration
Modified Paths:
--------------
trunk/DOCUMENTS/FAQ.txt
Modified: trunk/DOCUMENTS/FAQ.txt
===================================================================
--- trunk/DOCUMENTS/FAQ.txt 2008-09-06 20:32:17 UTC (rev 461)
+++ trunk/DOCUMENTS/FAQ.txt 2008-10-01 20:41:56 UTC (rev 462)
@@ -17,3 +17,12 @@
(e.g. rm -Rf /var/spool/mail/vmail/som...@ex...)
or install the postfixadmin-mailbox-postdeletion.sh script (See ADDITIONS/)
and modify config.inc.php appropriately.
+
+
+3) How do I have to setup sudo to run the $CONF['*_script'] scripts?
+
+ - run visudo to edit the sudo configuration file
+ - add a line like this for every script you want to run:
+ wwwrun ALL = (courier) NOPASSWD: /usr/local/bin/postfixadmin-mailbox-postcreation.sh
+ (replace usernames and path according to your setup)
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-09-06 20:32:06
|
Revision: 461
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=461&view=rev
Author: GingerDog
Date: 2008-09-06 20:32:17 +0000 (Sat, 06 Sep 2008)
Log Message:
-----------
fetchmail.php: clearly two sets of eyes are better than one; thanks niki
Modified Paths:
--------------
trunk/fetchmail.php
Modified: trunk/fetchmail.php
===================================================================
--- trunk/fetchmail.php 2008-09-06 19:27:45 UTC (rev 460)
+++ trunk/fetchmail.php 2008-09-06 20:32:17 UTC (rev 461)
@@ -89,11 +89,13 @@
array('POP3','IMAP','POP2','ETRN','AUTO'),
);
+$table_fetchmail = table_by_key('fetchmail');
+$table_mailbox = table_by_key('mailbox');
$list_domains = list_domains_for_admin ($SESSID_USERNAME);
$user_domains=implode(", ",array_values($list_domains)); # for displaying
$user_domains_sql=implode("','",escape_string(array_values($list_domains))); # for SQL
-$sql="SELECT username FROM mailbox WHERE domain in ('".$user_domains_sql."')"; # TODO: replace with domain selection dropdown
+$sql="SELECT username FROM $table_mailbox WHERE domain in ('".$user_domains_sql."')"; # TODO: replace with domain selection dropdown
$res = db_query ($sql);
if ($res['rows'] > 0){
@@ -114,7 +116,6 @@
$row_id = $edit;
}
-$table_fetchmail = table_by_key('fetchmail');
if ($row_id) {
$result = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM $table_fetchmail WHERE id=" . $row_id);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-09-06 19:27:37
|
Revision: 460
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=460&view=rev
Author: GingerDog
Date: 2008-09-06 19:27:45 +0000 (Sat, 06 Sep 2008)
Log Message:
-----------
fetchmail.php: use table prefix etc; as reported by niki on irc
Modified Paths:
--------------
trunk/fetchmail.php
Modified: trunk/fetchmail.php
===================================================================
--- trunk/fetchmail.php 2008-09-04 12:47:02 UTC (rev 459)
+++ trunk/fetchmail.php 2008-09-06 19:27:45 UTC (rev 460)
@@ -114,8 +114,10 @@
$row_id = $edit;
}
+$table_fetchmail = table_by_key('fetchmail');
+
if ($row_id) {
- $result = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM fetchmail WHERE id=" . $row_id);
+ $result = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM $table_fetchmail WHERE id=" . $row_id);
if ($result['rows'] > 0) {
$edit_row = db_array ($result['result']);
$account = $edit_row['src_user'] . " @ " . $edit_row['src_server'];
@@ -133,7 +135,7 @@
$edit=0;
$new=0;
} elseif ($delete) { # delete an entry
- $result = db_query ("delete from fetchmail WHERE id=".$delete);
+ $result = db_query ("delete from $table_fetchmail WHERE id=".$delete);
if ($result['rows'] != 1)
{
flash_error($PALANG['pDelete_delete_error']) . '</span>';
@@ -179,12 +181,12 @@
if ($save) {
if ($new) {
- $sql="INSERT INTO fetchmail (".implode(",",escape_string(array_keys($formvars))).") VALUES ('".implode("','",escape_string($formvars))."')";
+ $sql="INSERT INTO $table_fetchmail (".implode(",",escape_string(array_keys($formvars))).") VALUES ('".implode("','",escape_string($formvars))."')";
} else { # $edit
foreach(array_keys($formvars) as $key) {
$formvars[$key] = escape_string($key) . "='" . escape_string($formvars[$key]) . "'";
}
- $sql="UPDATE fetchmail SET ".implode(",",$formvars).",returned_text='', date=NOW() WHERE id=".$edit;
+ $sql="UPDATE $table_fetchmail SET ".implode(",",$formvars).",returned_text='', date=NOW() WHERE id=".$edit;
}
$result = db_query ($sql);
if ($result['rows'] != 1)
@@ -213,7 +215,7 @@
$tFmail = array();
if ($edit + $new == 0) { # display list
- $res = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM fetchmail order by id desc");
+ $res = db_query ("SELECT ".implode(",",escape_string(array_keys($fm_struct)))." FROM $table_fetchmail order by id desc");
if ($res['rows'] > 0) {
while ($row = db_array ($res['result'])) {
$tFmail[] = $row;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-09-04 12:46:52
|
Revision: 459
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=459&view=rev
Author: GingerDog
Date: 2008-09-04 12:47:02 +0000 (Thu, 04 Sep 2008)
Log Message:
-----------
functions.inc.php: fix alias creation - 0 & -1 confusion again
Modified Paths:
--------------
trunk/functions.inc.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2008-09-03 08:45:34 UTC (rev 458)
+++ trunk/functions.inc.php 2008-09-04 12:47:02 UTC (rev 459)
@@ -609,11 +609,12 @@
$limit = get_domain_properties ($domain);
if ($limit['aliases'] == 0)
{
- return false;
+ # 0 = unlimited, -1 = disabled
+ return true;
}
if ($limit['aliases'] < 0)
{
- return true;
+ return false;
}
if ($limit['alias_count'] >= $limit['aliases'])
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-09-03 09:18:56
|
Revision: 456
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=456&view=rev
Author: GingerDog
Date: 2008-09-03 08:32:25 +0000 (Wed, 03 Sep 2008)
Log Message:
-----------
force requirement for command line parameters to script; regexp changes - thanks Luxten (https://sourceforge.net/forum/forum.php?thread_id=2099851&forum_id=676076)
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/vacation.pl
Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================
--- trunk/VIRTUAL_VACATION/vacation.pl 2008-09-01 19:20:23 UTC (rev 455)
+++ trunk/VIRTUAL_VACATION/vacation.pl 2008-09-03 08:32:25 UTC (rev 456)
@@ -146,10 +146,10 @@
# Setup a logger...
#
getopts('f:t:', \%opts) or die "Usage: $0 [-t yes] -f sender -- recipient\n -t for testing only\n";
-$opts{f} and $smtp_sender = $opts{f};
+$opts{f} and $smtp_sender = $opts{f} or die "-f sender not present on command line";
$test_mode = 0;
$opts{t} and $test_mode = 1;
-$smtp_recipient = shift || $smtp_recipient || $ENV{"USER"} || "";
+$smtp_recipient = shift or die "recipient not given on command line";
my $log_layout = Log::Log4perl::Layout::PatternLayout->new("%d %p> %F:%L %M - %m%n");
@@ -452,7 +452,7 @@
while (<STDIN>) {
last if (/^$/);
if (/^\s+(.*)/ and $lastheader) { $$lastheader .= " $1"; next; }
- elsif (/^from:\s*(.*)\s*\n$/i) { $from = $1; $lastheader = \$from; }
+ elsif (/^from:\s*(.*)\b\s*\n$/i) { $from = $1; $lastheader = \$from; }
elsif (/^to:\s*(.*)\s*\n$/i) { $to = $1; $lastheader = \$to; }
elsif (/^cc:\s*(.*)\s*\n$/i) { $cc = $1; $lastheader = \$cc; }
elsif (/^Reply-to:\s*(.*)\s*\n$/i) { $replyto = $1; $lastheader = \$replyto; }
@@ -462,7 +462,7 @@
elsif (/^x-facebook-notify:/i) { $logger->debug('Mail from facebook, ignoring'); exit(0); }
elsif (/^precedence:\s+(bulk|list|junk)/i) { $logger->debug("precedence: $1 found; exiting"); exit (0); }
elsif (/^x-loop:\s+postfix\ admin\ virtual\ vacation/i) { $logger->debug("x-loop: postfix admin virtual vacation found; exiting"); exit (0); }
- elsif (/^Auto-Submitted:\s*no\s*/i) { next; }
+ elsif (/^Auto-Submitted:\s*no\b*/i) { next; }
elsif (/^Auto-Submitted:/i) { $logger->debug("Auto-Submitted: something found; exiting"); exit (0); }
elsif (/^List-(Id|Post):/i) { $logger->debug("List-$1: found; exiting"); exit (0); }
else {$lastheader = "" ; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-09-03 08:45:27
|
Revision: 458
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=458&view=rev
Author: GingerDog
Date: 2008-09-03 08:45:34 +0000 (Wed, 03 Sep 2008)
Log Message:
-----------
test.sh: update to reflect that the parameters passed into the script are actually of the a#b...@au...d and not a@b
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/tests/test.sh
Modified: trunk/VIRTUAL_VACATION/tests/test.sh
===================================================================
--- trunk/VIRTUAL_VACATION/tests/test.sh 2008-09-03 08:44:36 UTC (rev 457)
+++ trunk/VIRTUAL_VACATION/tests/test.sh 2008-09-03 08:45:34 UTC (rev 458)
@@ -21,12 +21,12 @@
echo
echo "NONE OF THESE SHOULD RESULT IN MAIL BEING SENT"
echo
-cat mailing-list.txt | perl ../vacation.pl -t yes -f fw-general-return-20540-david=exa...@li... -- da...@ex...
-cat test-email.txt | perl ../vacation.pl -t yes -f da...@ex... -- da...@ex...
-cat spam.txt | perl ../vacation.pl -t yes -f ma...@cc... -- da...@ex...
-cat asterisk-email.txt | perl ../vacation.pl -t yes -f www...@pa... -- da...@ex...
-cat facebook.txt | perl ../vacation.pl -t yes -f not...@fa... -- da...@ex...
-cat mail-myself.txt | perl ../vacation.pl -t yes -f da...@ex... -- da...@ex...
+cat mailing-list.txt | perl ../vacation.pl -t yes -f fw-general-return-20540-david=exa...@li... -- david\#exa...@au...
+cat test-email.txt | perl ../vacation.pl -t yes -f da...@ex... -- david\#exa...@au...
+cat spam.txt | perl ../vacation.pl -t yes -f ma...@cc... -- david\#exa...@au...
+cat asterisk-email.txt | perl ../vacation.pl -t yes -f www...@pa... -- david\#exa...@au...
+cat facebook.txt | perl ../vacation.pl -t yes -f not...@fa... -- david\#exa...@au...
+cat mail-myself.txt | perl ../vacation.pl -t yes -f da...@ex... -- david\#exa...@au...
echo "INSERT INTO vacation (email, subject, body, created, active, domain) VALUES ('da...@ex...', 'I am on holiday', 'Yeah, that is right', NOW(), true, 'example.org')" | psql
@@ -34,16 +34,16 @@
echo "VACATION TURNED ON "
echo
echo "Still ignore mailing list"
-cat mailing-list.txt | perl ../vacation.pl -t yes -f fw-general-return-20540-david=exa...@li... -- da...@ex...
+cat mailing-list.txt | perl ../vacation.pl -t yes -f fw-general-return-20540-david=exa...@li... -- david\#exa...@au...
echo " * Should send vacation message for this *"
-cat test-email.txt | perl ../vacation.pl -t yes -f da...@ex... -- da...@ex...
+cat test-email.txt | perl ../vacation.pl -t yes -f da...@ex... -- david\#exa...@au...
echo " * Spam - no vacation message for this"
-cat spam.txt | perl ../vacation.pl -t yes -f ma...@xx... -- da...@ex...
+cat spam.txt | perl ../vacation.pl -t yes -f ma...@xx... -- david\#exa...@au...
echo " * OK - should send vacation message for this"
-cat asterisk-email.txt | perl ../vacation.pl -t yes -f www...@pa... -- da...@ex...
+cat asterisk-email.txt | perl ../vacation.pl -t yes -f www...@pa... -- david\#exa...@au...
echo " * Facebook - should not send vacation message for"
-cat facebook.txt | perl ../vacation.pl -t yes -f not...@fa... -- da...@ex...
+cat facebook.txt | perl ../vacation.pl -t yes -f not...@fa... -- david\#exa...@au...
echo " * Mailing myself - should not send vacation message"
-cat mail-myself.txt | perl ../vacation.pl -t yes -f da...@ex... -- da...@ex...
+cat mail-myself.txt | perl ../vacation.pl -t yes -f da...@ex... -- david\#exa...@au...
echo
echo
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-09-03 08:44:31
|
Revision: 457
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=457&view=rev
Author: GingerDog
Date: 2008-09-03 08:44:36 +0000 (Wed, 03 Sep 2008)
Log Message:
-----------
1- fix smtp_recipient (i.e un-vacationise-it), 2- remove the needless \s* stuff - these will get removed by the strip_address() routine anyway
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/vacation.pl
Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================
--- trunk/VIRTUAL_VACATION/vacation.pl 2008-09-03 08:32:25 UTC (rev 456)
+++ trunk/VIRTUAL_VACATION/vacation.pl 2008-09-03 08:44:36 UTC (rev 457)
@@ -103,6 +103,8 @@
my $db_password = 'gingerdog';
my $db_name = 'postfix';
+my $vacation_domain = 'autoreply.example.org';
+
# smtp server used to send vacation e-mails
my $smtp_server = 'localhost';
@@ -452,24 +454,34 @@
while (<STDIN>) {
last if (/^$/);
if (/^\s+(.*)/ and $lastheader) { $$lastheader .= " $1"; next; }
- elsif (/^from:\s*(.*)\b\s*\n$/i) { $from = $1; $lastheader = \$from; }
- elsif (/^to:\s*(.*)\s*\n$/i) { $to = $1; $lastheader = \$to; }
- elsif (/^cc:\s*(.*)\s*\n$/i) { $cc = $1; $lastheader = \$cc; }
+ elsif (/^from:\s*(.*)\n$/i) { $from = $1; $lastheader = \$from; }
+ elsif (/^to:\s*(.*)\n$/i) { $to = $1; $lastheader = \$to; }
+ elsif (/^cc:\s*(.*)\n$/i) { $cc = $1; $lastheader = \$cc; }
elsif (/^Reply-to:\s*(.*)\s*\n$/i) { $replyto = $1; $lastheader = \$replyto; }
- elsif (/^subject:\s*(.*)\s*\n$/i) { $subject = $1; $lastheader = \$subject; }
+ elsif (/^subject:\s*(.*)\n$/i) { $subject = $1; $lastheader = \$subject; }
elsif (/^message-id:\s*(.*)\s*\n$/i) { $messageid = $1; $lastheader = \$messageid; }
elsif (/^x-spam-(flag|status):\s+yes/i) { $logger->debug("x-spam-$1: yes found; exiting"); exit (0); }
elsif (/^x-facebook-notify:/i) { $logger->debug('Mail from facebook, ignoring'); exit(0); }
elsif (/^precedence:\s+(bulk|list|junk)/i) { $logger->debug("precedence: $1 found; exiting"); exit (0); }
elsif (/^x-loop:\s+postfix\ admin\ virtual\ vacation/i) { $logger->debug("x-loop: postfix admin virtual vacation found; exiting"); exit (0); }
- elsif (/^Auto-Submitted:\s*no\b*/i) { next; }
+ elsif (/^Auto-Submitted:\s*no/i) { next; }
elsif (/^Auto-Submitted:/i) { $logger->debug("Auto-Submitted: something found; exiting"); exit (0); }
elsif (/^List-(Id|Post):/i) { $logger->debug("List-$1: found; exiting"); exit (0); }
else {$lastheader = "" ; }
}
+if($smtp_recipient =~ /\@$vacation_domain/) {
+ # the regexp used here could probably be improved somewhat, for now hope that people won't use # as a valid mailbox character.
+ my $tmp = $smtp_recipient;
+ $tmp =~ s/\@$vacation_domain//;
+ $tmp =~ s/#/\@/;
+ $logger->debug("Converted autoreply mailbox back to normal style - from $smtp_recipient to $tmp");
+ $smtp_recipient = $tmp;
+ undef $tmp;
+}
+
# If either From: or To: are not set, exit
if(!$from || !$to || !$messageid || !$smtp_sender || !$smtp_recipient) {
$logger->info("One of from=$from, to=$to, messageid=$messageid, smtp sender=$smtp_sender, smtp recipient=$smtp_recipient empty");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-09-01 19:20:14
|
Revision: 455
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=455&view=rev
Author: GingerDog
Date: 2008-09-01 19:20:23 +0000 (Mon, 01 Sep 2008)
Log Message:
-----------
functions.inc.php: Fix mailbox check_mailbox() routine - if the domain has 0 for mailbox count it should allow unlimited mailboxes (not disable - which is -1)
Modified Paths:
--------------
trunk/functions.inc.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2008-09-01 19:01:24 UTC (rev 454)
+++ trunk/functions.inc.php 2008-09-01 19:20:23 UTC (rev 455)
@@ -635,13 +635,14 @@
function check_mailbox ($domain)
{
$limit = get_domain_properties ($domain);
+ /* -1 = disable, 0 = unlimited */
if ($limit['mailboxes'] == 0)
{
- return false;
+ return true;
}
if ($limit['mailboxes'] < 0)
{
- return true;
+ return false;
}
if ($limit['mailbox_count'] >= $limit['mailboxes'])
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
8 messages has been excluded from this view by a project administrator.
