postfixadmin-svn Mailing List for PostfixAdmin (Page 102)
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: <Gin...@us...> - 2008-09-01 19:01:14
|
Revision: 454
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=454&view=rev
Author: GingerDog
Date: 2008-09-01 19:01:24 +0000 (Mon, 01 Sep 2008)
Log Message:
-----------
INSTALL.TXT: minor updates
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/INSTALL.TXT
Modified: trunk/VIRTUAL_VACATION/INSTALL.TXT
===================================================================
--- trunk/VIRTUAL_VACATION/INSTALL.TXT 2008-08-31 20:17:23 UTC (rev 453)
+++ trunk/VIRTUAL_VACATION/INSTALL.TXT 2008-09-01 19:01:24 UTC (rev 454)
@@ -12,15 +12,15 @@
REQUIRED!
---------
-You need to have the following installed to be able to use Virtual Vacation.
+There are a bunch of Perl modules which need installing, depending on your
+distribution these may be available through your package management tool, or
+will need installing through CPAN.
-- Perl5
-- Perl DBI
-- Either Perl DBD::mysql OR Perl DBD::pgsql - depending on DB backend.
-- Email::Valid
-- Mail::Sendmail
+A full list of required modules can be found in the source of vacation.pl.
+It obviously relies on Perl
+
About Virtual Vacation
----------------------
Virtual Vacation is today done with a local shell account that can receive
@@ -129,7 +129,7 @@
vacation.pl then checks the database to see wether a user is on holiday and
what message to send back. Make sure that vacation.pl is able to communicate
-to your databse. In the first couple of lines you have to specify the
+to your database. In the first couple of lines you have to specify the
database, username and password for it.
NOTE: Make sure that the path to perl is correct.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-08-31 20:17:18
|
Revision: 453
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=453&view=rev
Author: GingerDog
Date: 2008-08-31 20:17:23 +0000 (Sun, 31 Aug 2008)
Log Message:
-----------
vacation.pl: plenty of refactoring; I think this addresses all hte points at https://sourceforge.net/forum/message.php?msg_id=5205584
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/tests/asterisk-email.txt
trunk/VIRTUAL_VACATION/tests/test-email.txt
trunk/VIRTUAL_VACATION/tests/test.sh
trunk/VIRTUAL_VACATION/vacation.pl
Modified: trunk/VIRTUAL_VACATION/tests/asterisk-email.txt
===================================================================
--- trunk/VIRTUAL_VACATION/tests/asterisk-email.txt 2008-08-31 14:15:48 UTC (rev 452)
+++ trunk/VIRTUAL_VACATION/tests/asterisk-email.txt 2008-08-31 20:17:23 UTC (rev 453)
@@ -3,7 +3,7 @@
Delivered-To: da...@ex...
Received: by mail.palepurple.co.uk (Postfix, from userid 33)
id 1942F894CF9; Fri, 1 Aug 2008 11:23:45 +0100 (BST)
-To: <da...@ex...>
+To: "" <da...@ex...>
Subject: New Phone call - annotate it!
X-PHP-Script: admin.palepurple.co.uk/contacts/dispatch.php for 78.105.97.55
From: "ast...@ex..." <ast...@ex...>
Modified: trunk/VIRTUAL_VACATION/tests/test-email.txt
===================================================================
--- trunk/VIRTUAL_VACATION/tests/test-email.txt 2008-08-31 14:15:48 UTC (rev 452)
+++ trunk/VIRTUAL_VACATION/tests/test-email.txt 2008-08-31 20:17:23 UTC (rev 453)
@@ -22,7 +22,8 @@
id 8869450146; Tue, 5 Aug 2008 20:15:50 +0100 (BST)
Date: Tue, 5 Aug 2008 20:15:50 +0100
From: David Goodwin <da...@ex...>
-To: da...@ex...
+To: "DG" <da...@ex...>, "Fred@Work" <fr...@ex...>, "Barney Rubble"
+ <ba...@ex...>, "Rover Dog" <ro...@ex...>, ro...@ex...
Subject: test email
Message-ID: <200...@co...>
MIME-Version: 1.0
Modified: trunk/VIRTUAL_VACATION/tests/test.sh
===================================================================
--- trunk/VIRTUAL_VACATION/tests/test.sh 2008-08-31 14:15:48 UTC (rev 452)
+++ trunk/VIRTUAL_VACATION/tests/test.sh 2008-08-31 20:17:23 UTC (rev 453)
@@ -18,25 +18,32 @@
# First time around, there should be no vacation record for da...@ex..., so these should all not cause mail to be sent.
# some will trip up spam/mailing list protection etc though
-
+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...
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
-
+echo
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...
-echo "* Should send vacation message for this"
+echo " * Should send vacation message for this *"
cat test-email.txt | perl ../vacation.pl -t yes -f da...@ex... -- da...@ex...
-echo "* Spam - no vacation message for this"
+echo " * Spam - no vacation message for this"
cat spam.txt | perl ../vacation.pl -t yes -f ma...@xx... -- da...@ex...
-echo "* OK - should send vacation message for this"
+echo " * OK - should send vacation message for this"
cat asterisk-email.txt | perl ../vacation.pl -t yes -f www...@pa... -- da...@ex...
-echo "* Facebook - should not send vacation message for"
+echo " * Facebook - should not send vacation message for"
cat facebook.txt | perl ../vacation.pl -t yes -f not...@fa... -- da...@ex...
+echo " * Mailing myself - should not send vacation message"
+cat mail-myself.txt | perl ../vacation.pl -t yes -f da...@ex... -- da...@ex...
+echo
+echo
Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================
--- trunk/VIRTUAL_VACATION/vacation.pl 2008-08-31 14:15:48 UTC (rev 452)
+++ trunk/VIRTUAL_VACATION/vacation.pl 2008-08-31 20:17:23 UTC (rev 453)
@@ -99,8 +99,8 @@
my $db_host = '';
# connection details
-my $db_username = 'your_username';
-my $db_password = 'your_password';
+my $db_username = 'dg';
+my $db_password = 'gingerdog';
my $db_name = 'postfix';
# smtp server used to send vacation e-mails
@@ -139,17 +139,19 @@
use Getopt::Std;
use Log::Log4perl qw(get_logger :levels);
-my ($from, $to, $cc, ,$bcc , $subject, $messageid, $lastheader, $smtp_sender, $smtp_recipient, %opts, $sndrhdr, $spam, $test_mode, $logger);
+my ($from, $to, $cc, $replyto , $subject, $messageid, $lastheader, $smtp_sender, $smtp_recipient, %opts, $spam, $test_mode, $logger);
$subject='';
# Setup a logger...
#
-getopts('f:t:', \%opts) or die "Usage: $0 [-t yes] [-f sender] [-- [recipient]]\n -t for testing only\n";
+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};
$test_mode = 0;
$opts{t} and $test_mode = 1;
+$smtp_recipient = shift || $smtp_recipient || $ENV{"USER"} || "";
+
my $log_layout = Log::Log4perl::Layout::PatternLayout->new("%d %p> %F:%L %M - %m%n");
if($test_mode == 1) {
@@ -388,15 +390,24 @@
}
}
+# Remove textual stuff from a (list of) email address(es)
+# e.g. convert: "aardvark" <a@b.com>, "Danger Mouse" <c@d.com>, e@f.com to
+# a@b.com, c@d.com, e@f.com
sub strip_address {
my ($arg) = @_;
if(!$arg) {
return '';
}
- if($arg =~ /([\w\-.%]+\@[\w.-]+)/) {
- return lc($1);
+ my @ok;
+ $logger = get_logger();
+ for (split(/,\s*/, lc($arg))) {
+ my $temp = Email::Valid->address($_);
+ if($temp) {
+ push(@ok, $temp);
+ }
}
- return '';
+ my $result = join(", ", @ok);
+ return $result;
}
sub panic_prepare {
@@ -412,34 +423,52 @@
$logger->error("Could not execute sql statement - '$arg' with parameters '$param'");
exit(0);
}
+
+# Make sure the email wasn't sent by someone who could be a mailing list etc; if it was,
+# then we abort after appropriate logging.
+sub check_and_clean_from_address {
+ my ($address) = @_;
+ my $logger = get_logger();
+
+ if($address =~ /^(noreply|postmaster|mailer-daemon|listserv|majordomo|owner-|request-|bounces-)/i ||
+ $address =~ /-(owner|request|bounces)\@/i ) {
+ $logger->debug("sender $address contains $1 - will not send vacation message");
+ exit(0);
+ }
+ $address = strip_address($address);
+ if($address eq "") {
+ $logger->error("Address $address is not valid; exiting");
+ exit(0);
+ }
+ #$logger->debug("Address cleaned up to $address");
+ return $address;
+}
########################### main #################################
# Take headers apart
-#
+$cc = '';
+$replyto = '';
+
while (<STDIN>) {
last if (/^$/);
- if (/^\s+(.*)/ and $lastheader) { $$lastheader .= " $1"; }
- elsif (/^Return-Path:\s+(.*)\n$/i) { $smtp_sender = $1; $lastheader = \$smtp_sender; }
- elsif (/^Delivered-To:\s+(.*)\n$/i) { $smtp_recipient = $1; $lastheader = \$smtp_recipient; }
- 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 (/^bcc:\s+(.*)\n$/i) { $bcc = $1; $lastheader = \$bcc; }
- elsif (/^subject:\s+(.*)\n$/i) { $subject = $1; $lastheader = \$subject; }
- elsif (/^message-id:\s+(.*)\n$/i) { $messageid = $1; $lastheader = \$messageid; }
+ if (/^\s+(.*)/ and $lastheader) { $$lastheader .= " $1"; next; }
+ elsif (/^from:\s*(.*)\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; }
+ elsif (/^subject:\s*(.*)\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/i) { next; }
+ elsif (/^Auto-Submitted:\s*no\s*/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); }
- elsif (/^Sender:\s+(.*)/i) { $sndrhdr = $1; $lastheader = \$sndrhdr; }
else {$lastheader = "" ; }
}
-$smtp_recipient = shift || $smtp_recipient || $ENV{"USER"} || "";
# If either From: or To: are not set, exit
if(!$from || !$to || !$messageid || !$smtp_sender || !$smtp_recipient) {
@@ -447,15 +476,16 @@
exit(0);
}
-if($smtp_sender =~ /^(mailer-daemon|listserv|majordomo|owner-|request-|bounces-)/i ||
- $smtp_sender =~ /-(owner|request|bounces)\@/i ) {
- $logger->debug("sender $smtp_sender contains $1 - will not send vacation message");
- exit(0);
+$to = strip_address($to);
+$from = lc ($from);
+$from = check_and_clean_from_address($from);
+if($replyto ne "") {
+ # if reply-to is invalid, or looks like a mailing list, then we probably don't want to send a reply.
+ $replyto = check_and_clean_from_address($replyto);
}
+$smtp_sender = check_and_clean_from_address($smtp_sender);
+$smtp_recipient = check_and_clean_from_address($smtp_recipient);
-$smtp_sender = strip_address($smtp_sender);
-$smtp_recipient = strip_address($smtp_recipient);
-$sndrhdr = strip_address($sndrhdr);
if ($smtp_sender eq $smtp_recipient) {
$logger->debug("smtp sender $smtp_sender and recipient $smtp_recipient are the same; aborting");
@@ -463,39 +493,28 @@
}
my $recipfound = 0;
-for (split(/,\s*/, lc($to)), split(/,\s*/, lc($cc)), split(/,\s*/, lc($bcc))) {
+for (split(/,\s*/, lc($to)), split(/,\s*/, lc($cc))) {
my $destinatario = strip_address($_);
- if ($sndrhdr eq $destinatario) {
- $logger->debug("sender header $sndrhdr contains recipient $destinatario (mailing myself?)");
+ if ($smtp_sender eq $destinatario) {
+ $logger->debug("sender header $smtp_sender contains recipient $destinatario (mailing myself?)");
exit(0);
}
if ($smtp_recipient eq $destinatario) { $recipfound++; }
}
if (!$recipfound) {
- $logger->debug("smtp envelope recipient $smtp_recipient not found in the header recipients (therefore they were bcc'ed, so won't send vacation message)");
+ $logger->debug("smtp envelope recipient $smtp_recipient not found in the header recipients ($to & $cc) (therefore they were bcc'ed, so won't send vacation message)");
exit (0);
}
-$from = lc ($from);
-if (!Email::Valid->address($from,-mxcheck => 1)) { $logger->debug("Invalid from email address: $from; exiting."); exit(0); }
-if (!Email::Valid->address($smtp_sender,-mxcheck => 1)) { $logger->debug("Invalid sender email address: $smtp_sender; exiting."); exit(0); }
-if ($from =~ /([\w\-.%]+\@[\w.-]+)/) { $from = $1; }
-# Does the $from address look like a mailing list etc?
-if ($from eq "" ||
- $from =~ /^(owner-|-(?:request|owner)\@|^(?:mailer-daemon|postmaster)\@)/i) {
- $logger->debug("from $from contains $1"); exit (0);
-}
-
my ($rv, $email) = find_real_address($smtp_recipient);
-$logger->debug("find_email_address gave: rv:$rv, email:$email");
if ($rv == 1) {
$logger->debug("Attempting to send vacation response for: $messageid to: $smtp_sender, $smtp_recipient, $email (test_mode = $test_mode)");
send_vacation_email($email, $smtp_sender, $smtp_recipient, $messageid, $test_mode);
}
else {
- $logger->debug("SMTP recipient $smtp_recipient which resolves to $email does not have an active vacation");
+ $logger->debug("SMTP recipient $smtp_recipient which resolves to $email does not have an active vacation (rv: $rv, email: $email)");
}
0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-08-31 14:15:39
|
Revision: 452
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=452&view=rev
Author: GingerDog
Date: 2008-08-31 14:15:48 +0000 (Sun, 31 Aug 2008)
Log Message:
-----------
upgrade.php: ensure we cope with config table with a prefix; thanks to AldoReset (IRC); see also https://sourceforge.net/tracker/index.php?func=detail&aid=2084937&group_id=191583&atid=937964
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-08-31 14:03:11 UTC (rev 451)
+++ trunk/upgrade.php 2008-08-31 14:15:48 UTC (rev 452)
@@ -51,12 +51,13 @@
}
+$table = table_by_key('config');
if($CONF['database_type'] == 'pgsql') {
// check if table already exists, if so, don't recreate it
- $r = db_query("SELECT relname FROM pg_class WHERE relname = 'config'");
+ $r = db_query("SELECT relname FROM pg_class WHERE relname = '$table'");
if($r['rows'] == 0) {
$pgsql = "
- CREATE TABLE " . table_by_key ('config') . " (
+ CREATE TABLE $table (
id SERIAL,
name VARCHAR(20) NOT NULL UNIQUE,
value VARCHAR(20) NOT NULL,
@@ -67,7 +68,7 @@
}
else {
$mysql = "
- CREATE TABLE {IF_NOT_EXISTS} " . table_by_key ('config') . "(
+ CREATE TABLE {IF_NOT_EXISTS} $table (
`id` {AUTOINCREMENT} {PRIMARY},
`name` VARCHAR(20) {LATIN1} NOT NULL DEFAULT '',
`value` VARCHAR(20) {LATIN1} NOT NULL DEFAULT '',
@@ -77,7 +78,7 @@
db_query_parsed($mysql, 0, " ENGINE = MYISAM COMMENT = 'PostfixAdmin settings'");
}
-$sql = "SELECT * FROM " . table_by_key ('config') . " WHERE name = 'version'";
+$sql = "SELECT * FROM $table WHERE name = 'version'";
// insert into config('version', '01');
@@ -88,7 +89,7 @@
$row = db_array($rs);
$version = $row['value'];
} else {
- db_query_parsed("INSERT INTO " . table_by_key ('config') . " (name, value) VALUES ('version', '0')", 0, '');
+ db_query_parsed("INSERT INTO $table (name, value) VALUES ('version', '0')", 0, '');
$version = 0;
}
@@ -105,7 +106,7 @@
return true;
}
- echo "<p>Updating database:<p>old version: $current_version; target version: $target_version";
+ echo "<p>Updating database:</p><p>- old version: $current_version; target version: $target_version</p>";
for ($i = $current_version +1; $i <= $target_version; $i++) {
$function = "upgrade_$i";
@@ -131,7 +132,8 @@
}
// Update config table so we don't run the same query twice in the future.
$i = (int) $i;
- $sql = "UPDATE config SET value = $i WHERE name = 'version'";
+ $table = table_by_key('config');
+ $sql = "UPDATE $table SET value = $i WHERE name = 'version'";
db_query($sql);
};
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-08-31 14:03:04
|
Revision: 451
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=451&view=rev
Author: GingerDog
Date: 2008-08-31 14:03:11 +0000 (Sun, 31 Aug 2008)
Log Message:
-----------
INSTALL.TXT: typo fixing, see https://sourceforge.net/tracker/?func=detail&atid=937964&aid=2084940&group_id=191583 ; thanks to AldoReset on irc
Modified Paths:
--------------
trunk/INSTALL.TXT
Modified: trunk/INSTALL.TXT
===================================================================
--- trunk/INSTALL.TXT 2008-08-23 16:08:18 UTC (rev 450)
+++ trunk/INSTALL.TXT 2008-08-31 14:03:11 UTC (rev 451)
@@ -86,8 +86,8 @@
Apache configuration file (which can be set to be visible only by root) using
something like the following in your VirtualHost definition :
- SetVar DB_USER "postfix"
- SetVar DB_PASS "opensesame"
+ SetEnv DB_USER "postfix"
+ SetEnv DB_PASS "opensesame"
config.inc.php would then be able to access these through :
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-08-23 16:08:09
|
Revision: 450
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=450&view=rev
Author: christian_boltz
Date: 2008-08-23 16:08:18 +0000 (Sat, 23 Aug 2008)
Log Message:
-----------
ru.lang:
- translation update by Pavel Usischev - pusischev
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=2064862&group_id=191583
Modified Paths:
--------------
trunk/languages/ru.lang
Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang 2008-08-19 20:00:50 UTC (rev 449)
+++ trunk/languages/ru.lang 2008-08-23 16:08:18 UTC (rev 450)
@@ -104,7 +104,7 @@
$PALANG['pCreate_alias_domain_error1'] = 'Вам не разрешено создавать выбранную конфигурацию.';
$PALANG['pCreate_alias_domain_error2'] = 'Выбранная конфигурация некорректна, пожалуйста, выберите другую!';
$PALANG['pCreate_alias_domain_error3'] = 'Не удалось добавить запись в базу данных.';
-$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
+$PALANG['pCreate_alias_domain_error4'] = 'Все домены уже задействованы в доменах-алиасах.';
$PALANG['pCreate_alias_domain_success'] = 'Домен-алиас добавлен в таблицу доменов-алиасов!';
$PALANG['pCreate_alias_welcome'] = 'Создание нового алиаса в вашем домене.';
@@ -386,9 +386,9 @@
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Пароль слишком короткий - требуется %s символов";
-$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
-$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Некорректное имя домена %s, не соответствует регулярному выражению";
+$PALANG['pInvalidDomainDNS'] = "Некорректный домен %s, и/или не обнаруживается в DNS";
+$PALANG['pInvalidMailRegex'] = "Некорректный адрес e-mail, не соответствует регулярному выражению";
$PALANG['pFetchmail_welcome'] = 'Собирать почту для:';
$PALANG['pFetchmail_new_entry'] = 'Новая запись';
@@ -410,7 +410,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Скачивать все';
$PALANG['pFetchmail_field_keep'] = 'Не удалять';
$PALANG['pFetchmail_field_protocol'] = 'Протокол';
-$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_ssl'] = 'Включить 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 encryption'; # XXX
+$PALANG['pFetchmail_desc_ssl'] = 'Шифрование SSL';
$PALANG['pFetchmail_desc_extra_options'] = 'Дополнительные параметры fetchmail';
$PALANG['pFetchmail_desc_mda'] = 'Агент доставки почты (Mail Delivery Agent)';
$PALANG['pFetchmail_desc_date'] = 'Дата последнего опроса/изменения конфигурации';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-08-19 20:00:40
|
Revision: 449
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=449&view=rev
Author: GingerDog
Date: 2008-08-19 20:00:50 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
patch from https://sourceforge.net/tracker/index.php?func=detail&aid=2059427&group_id=191583&atid=937964 ; thanks
Modified Paths:
--------------
trunk/functions.inc.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2008-08-16 17:56:28 UTC (rev 448)
+++ trunk/functions.inc.php 2008-08-19 20:00:50 UTC (rev 449)
@@ -609,11 +609,11 @@
$limit = get_domain_properties ($domain);
if ($limit['aliases'] == 0)
{
- return true;
+ return false;
}
if ($limit['aliases'] < 0)
{
- return false;
+ return true;
}
if ($limit['alias_count'] >= $limit['aliases'])
{
@@ -637,11 +637,11 @@
$limit = get_domain_properties ($domain);
if ($limit['mailboxes'] == 0)
{
- return true;
+ return false;
}
if ($limit['mailboxes'] < 0)
{
- return false;
+ return true;
}
if ($limit['mailbox_count'] >= $limit['mailboxes'])
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-08-16 17:56:18
|
Revision: 448
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=448&view=rev
Author: GingerDog
Date: 2008-08-16 17:56:28 +0000 (Sat, 16 Aug 2008)
Log Message:
-----------
upgrade.php: fix from zl2tod (via IRC)
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-08-16 12:05:44 UTC (rev 447)
+++ trunk/upgrade.php 2008-08-16 17:56:28 UTC (rev 448)
@@ -929,7 +929,6 @@
");
}
function upgrade_439_pgsql() {
- db_query_parsed("
- ALTER TABLE $table_fetchmail ADD COLUMN ssl BOOLEAN NOT NULL DEFAULT false;
- ");
+ $table_fetchmail = table_by_key('fetchmail');
+ db_query_parsed("ALTER TABLE $table_fetchmail ADD COLUMN ssl BOOLEAN NOT NULL DEFAULT false");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-08-16 12:05:34
|
Revision: 447
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=447&view=rev
Author: christian_boltz
Date: 2008-08-16 12:05:44 +0000 (Sat, 16 Aug 2008)
Log Message:
-----------
list-virtual.php:
- show links to create mailboxes or alias even on disabled domains
https://sourceforge.net/tracker/?func=detail&atid=937967&aid=2054502&group_id=191583
(Only the first two lines and the last } (both removed) are real changes,
everything else is a whitespace fix)
Modified Paths:
--------------
trunk/list-virtual.php
Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php 2008-08-14 22:08:38 UTC (rev 446)
+++ trunk/list-virtual.php 2008-08-16 12:05:44 UTC (rev 447)
@@ -190,23 +190,20 @@
$tDisplay_next = $fDisplay + $page_size;
}
- $active = $limit['active'];
- if($active == 't' || $active == 1) {
- $backup_mx = $limit['backupmx'];
- if($backup_mx == 'f' || $backup_mx == 0) {
- if($limit['aliases'] == 0) {
- $tCanAddAlias = true;
- }
- elseif($limit['alias_count'] < $limit['aliases']) {
- $tCanAddAlias = true;
- }
- if($limit['mailboxes'] == 0) {
- $tCanAddMailbox = true;
- }
- elseif($limit['mailbox_count'] < $limit['mailboxes']) {
- $tCanAddMailbox = true;
- }
+ $backup_mx = $limit['backupmx'];
+ if($backup_mx == 'f' || $backup_mx == 0) {
+ if($limit['aliases'] == 0) {
+ $tCanAddAlias = true;
}
+ elseif($limit['alias_count'] < $limit['aliases']) {
+ $tCanAddAlias = true;
+ }
+ if($limit['mailboxes'] == 0) {
+ $tCanAddMailbox = true;
+ }
+ elseif($limit['mailbox_count'] < $limit['mailboxes']) {
+ $tCanAddMailbox = true;
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-08-14 22:08:28
|
Revision: 446
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=446&view=rev
Author: christian_boltz
Date: 2008-08-14 22:08:38 +0000 (Thu, 14 Aug 2008)
Log Message:
-----------
config.inc.php:
- set default for $CONF['create_mailbox_subdirs_prefix'] to 'INBOX.'
to be backward-compatible with the previously hardcoded value
Modified Paths:
--------------
trunk/config.inc.php
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2008-08-14 19:03:41 UTC (rev 445)
+++ trunk/config.inc.php 2008-08-14 22:08:38 UTC (rev 446)
@@ -323,7 +323,7 @@
// $CONF['create_mailbox_subdirs_host']='localhost';
//
// Specify '' for Dovecot and 'INBOX.' for Courier.
-$CONF['create_mailbox_subdirs_prefix']='';
+$CONF['create_mailbox_subdirs_prefix']='INBOX.';
//
// Normally, the TCP port number does not have to be specified.
// $CONF['create_mailbox_subdirs_hostport']=143;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-08-14 19:03:32
|
Revision: 445
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=445&view=rev
Author: GingerDog
Date: 2008-08-14 19:03:41 +0000 (Thu, 14 Aug 2008)
Log Message:
-----------
patch from https://sourceforge.net/tracker/index.php?func=detail&aid=2049843&group_id=191583&atid=937964 ; thanks
Modified Paths:
--------------
trunk/templates/list-virtual.php
Modified: trunk/templates/list-virtual.php
===================================================================
--- trunk/templates/list-virtual.php 2008-08-14 18:58:13 UTC (rev 444)
+++ trunk/templates/list-virtual.php 2008-08-14 19:03:41 UTC (rev 445)
@@ -323,8 +323,8 @@
}
$edit_aliases=0;
- if ( authentication_has_role('global-admin') && $CONF['alias_control_admin'] == 'YES') $edit_aliases = 1;
- if ( (! authentication_has_role('global-admin')) && $CONF['alias_control'] == 'YES') $edit_aliases = 1;
+ if ( (! authentication_has_role('global-admin')) && $CONF['alias_control_admin'] == 'YES') $edit_aliases = 1;
+ if ( authentication_has_role('global-admin') && $CONF['alias_control'] == 'YES') $edit_aliases = 1;
if ($edit_aliases == 1)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-08-14 18:58:03
|
Revision: 444
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=444&view=rev
Author: GingerDog
Date: 2008-08-14 18:58:13 +0000 (Thu, 14 Aug 2008)
Log Message:
-----------
imap-prefix patch - see https://sourceforge.net/tracker/index.php?func=detail&aid=2049852&group_id=191583&atid=937964 , apparently useful for courier
Modified Paths:
--------------
trunk/config.inc.php
trunk/functions.inc.php
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2008-08-14 18:50:33 UTC (rev 443)
+++ trunk/config.inc.php 2008-08-14 18:58:13 UTC (rev 444)
@@ -322,6 +322,9 @@
// $CONF['create_mailbox_subdirs']=array('Spam');
// $CONF['create_mailbox_subdirs_host']='localhost';
//
+// Specify '' for Dovecot and 'INBOX.' for Courier.
+$CONF['create_mailbox_subdirs_prefix']='';
+//
// Normally, the TCP port number does not have to be specified.
// $CONF['create_mailbox_subdirs_hostport']=143;
//
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2008-08-14 18:50:33 UTC (rev 443)
+++ trunk/functions.inc.php 2008-08-14 18:58:13 UTC (rev 444)
@@ -1915,6 +1915,7 @@
}
$s_host=$CONF['create_mailbox_subdirs_host'];
+ $s_prefix=$CONF['create_mailbox_subdirs_prefix'];
$s_options='';
$s_port='';
@@ -1957,7 +1958,7 @@
foreach($CONF['create_mailbox_subdirs'] as $f)
{
- $f='{'.$s_host.'}INBOX.'.$f;
+ $f='{'.$s_host.'}'.$s_prefix.$f;
$res=imap_createmailbox($i,$f);
if (!$res) {
@imap_close($i);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-08-14 18:50:24
|
Revision: 443
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=443&view=rev
Author: GingerDog
Date: 2008-08-14 18:50:33 +0000 (Thu, 14 Aug 2008)
Log Message:
-----------
list-virtual.php: fix from https://sourceforge.net/tracker/index.php?func=detail&aid=2050952&group_id=191583&atid=937964
Modified Paths:
--------------
trunk/templates/list-virtual.php
Modified: trunk/templates/list-virtual.php
===================================================================
--- trunk/templates/list-virtual.php 2008-08-06 14:45:17 UTC (rev 442)
+++ trunk/templates/list-virtual.php 2008-08-14 18:50:33 UTC (rev 443)
@@ -6,13 +6,14 @@
$file = 'list-virtual.php';
-if ($limit['aliases'] == 0) $limit['aliases'] = $PALANG['pOverview_unlimited'];
-if ($limit['mailboxes'] == 0) $limit['mailboxes'] = $PALANG['pOverview_unlimited'];
-if ($limit['maxquota'] == 0) $limit['maxquota'] = $PALANG['pOverview_unlimited'];
-if ($limit['aliases'] < 0) $limit['aliases'] = $PALANG['pOverview_disabled'];
-if ($limit['mailboxes'] < 0) $limit['mailboxes'] = $PALANG['pOverview_disabled'];
-if ($limit['maxquota'] < 0) $limit['maxquota'] = $PALANG['pOverview_disabled'];
+if ($limit['aliases'] == 0) $limit['aliases'] = $PALANG['pOverview_disabled'];
+if ($limit['mailboxes'] == 0) $limit['mailboxes'] = $PALANG['pOverview_disabled'];
+if ($limit['maxquota'] == 0) $limit['maxquota'] = $PALANG['pOverview_disabled'];
+if ($limit['aliases'] < 0) $limit['aliases'] = $PALANG['pOverview_unlimited'];
+if ($limit['mailboxes'] < 0) $limit['mailboxes'] = $PALANG['pOverview_unlimited'];
+if ($limit['maxquota'] < 0) $limit['maxquota'] = $PALANG['pOverview_unlimited'];
+
for ($i = 0; $i < sizeof ($list_domains); $i++)
{
if ($fDomain == $list_domains[$i])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-08-06 14:45:07
|
Revision: 442
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=442&view=rev
Author: GingerDog
Date: 2008-08-06 14:45:17 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
vacation.pl: fix for https://sourceforge.net/tracker/?func=detail&atid=937964&aid=2040288&group_id=191583
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/vacation.pl
Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================
--- trunk/VIRTUAL_VACATION/vacation.pl 2008-08-05 20:57:45 UTC (rev 441)
+++ trunk/VIRTUAL_VACATION/vacation.pl 2008-08-06 14:45:17 UTC (rev 442)
@@ -167,7 +167,7 @@
filename => $logfile,
mode => 'append');
- my $logger = get_logger();
+ $logger = get_logger();
$appender->layout($log_layout);
$logger->add_appender($appender);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-08-05 20:57:37
|
Revision: 441
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=441&view=rev
Author: GingerDog
Date: 2008-08-05 20:57:45 +0000 (Tue, 05 Aug 2008)
Log Message:
-----------
vacation.pl: remove my super secret connection details
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/vacation.pl
Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================
--- trunk/VIRTUAL_VACATION/vacation.pl 2008-08-05 20:54:47 UTC (rev 440)
+++ trunk/VIRTUAL_VACATION/vacation.pl 2008-08-05 20:57:45 UTC (rev 441)
@@ -99,13 +99,14 @@
my $db_host = '';
# connection details
-my $db_username = 'dg';
-my $db_password = 'gingerdog';
+my $db_username = 'your_username';
+my $db_password = 'your_password';
my $db_name = 'postfix';
# smtp server used to send vacation e-mails
-my $smtp_server = '192.168.1.4';
+my $smtp_server = 'localhost';
+# Set to 1 to enable logging to syslog.
my $syslog = 0;
# path to logfile, when empty logging is supressed
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-08-05 20:51:24
|
Revision: 439
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=439&view=rev
Author: christian_boltz
Date: 2008-08-05 20:51:23 +0000 (Tue, 05 Aug 2008)
Log Message:
-----------
Applying the patch from Stefan Breitegger (tuxstef @SF), see
https://sourceforge.net/tracker/index.php?func=detail&aid=1995478&group_id=191583&atid=937966
+ some small changes
fetchmail.php
- add checkbox to allow setting the fetchmail "ssl" option
fetchmail.pl:
- honor ssl option if set
upgrade.php:
- add ssl column to fetchmail table
*.lang:
- added field name and description for fetchmail ssl option
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-08-05 20:26:30 UTC (rev 438)
+++ trunk/ADDITIONS/fetchmail.pl 2008-08-05 20:51:23 UTC (rev 439)
@@ -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
+SELECT id,mailbox,src_server,src_auth,src_user,src_password,src_folder,fetchall,keep,protocol,mda,extra_options,ssl
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)=@$_;
+ my ($id,$mailbox,$src_server,$src_auth,$src_user,$src_password,$src_folder,$fetchall,$keep,$protocol,$mda,$extra_options,$ssl)=@$_;
$cmd="user '${src_user}' there with password '".decode_base64($src_password)."'";
$cmd.=" folder '${src_folder}'" if ($src_folder);
@@ -36,6 +36,7 @@
$cmd.=" keep" if ($keep);
$cmd.=" fetchall" if ($fetchall);
+ $cmd.=" ssl" if ($ssl);
$cmd.=" ".$extra_options if ($extra_options);
$text=<<TXT;
Modified: trunk/fetchmail.php
===================================================================
--- trunk/fetchmail.php 2008-08-05 20:26:30 UTC (rev 438)
+++ trunk/fetchmail.php 2008-08-05 20:51:23 UTC (rev 439)
@@ -63,6 +63,7 @@
"fetchall" => array(1, 1, 'bool' ),
"keep" => array(1, 1, 'bool' ),
"protocol" => array(1, 1, 'enum' ),
+ "ssl" => 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' ),
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2008-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/bg.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -398,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -413,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/ca.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -397,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -412,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/cn.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -397,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -412,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/cs.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -409,6 +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_extra_options'] = 'Extra Parametry';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Datum';
@@ -424,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/da.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -409,6 +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_extra_options'] = 'Ekstra tilvalg';
$PALANG['pFetchmail_field_mda'] = 'MDA (Mail Delivery Agent)';
$PALANG['pFetchmail_field_date'] = 'Dato';
@@ -424,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/de.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -409,6 +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_extra_options'] = 'Zusätzliche Optionen';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Datum';
@@ -424,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/en.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -410,6 +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_extra_options'] = 'Extra Options';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Date';
@@ -425,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/es.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -398,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -413,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/et.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -401,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -416,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/eu.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -396,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -411,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/fi.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -399,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -414,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/fo.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -402,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -417,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/fr.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -399,6 +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_extra_options'] = 'Options supplémentaires';
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -414,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/hr.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -396,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -411,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/hu.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -410,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -425,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/is.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -396,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -411,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/it.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -398,6 +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_extra_options'] = 'Extra';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Data';
@@ -413,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/ja.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -408,6 +408,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'すべて取得';
$PALANG['pFetchmail_field_keep'] = '残す';
$PALANG['pFetchmail_field_protocol'] = 'プロトコル';
+$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = '追加オプション';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = '日付';
@@ -423,6 +424,7 @@
$PALANG['pFetchmail_desc_fetchall'] = '既読と新着メッセージを取得するか';
$PALANG['pFetchmail_desc_keep'] = 'リモートサーバに取得済メッセージを残すか';
$PALANG['pFetchmail_desc_protocol'] = '利用するプロトコル';
+$PALANG['pFetchmail_desc_ssl'] = '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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/lt.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -397,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -412,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/mk.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -398,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -413,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/nb.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -398,6 +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_extra_options'] = 'Ekstra alternativer';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Dato';
@@ -413,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/nl.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -398,6 +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_extra_options'] = 'extra opties';
$PALANG['pFetchmail_field_mda'] = 'MD';
$PALANG['pFetchmail_field_date'] = 'datum';
@@ -413,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/nn.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -394,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -409,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/pl.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -402,6 +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_extra_options'] = 'Dodatkowe opcje';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Data';
@@ -417,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/pt-br.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -397,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -412,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/ru.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -410,6 +410,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Скачивать все';
$PALANG['pFetchmail_field_keep'] = 'Не удалять';
$PALANG['pFetchmail_field_protocol'] = 'Протокол';
+$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX
$PALANG['pFetchmail_field_extra_options'] = 'Дополнительные параметры';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Дата';
@@ -425,6 +426,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Скачивать и старые (виденные), и новые сообщения';
$PALANG['pFetchmail_desc_keep'] = 'Не удалять скачанные сообщения с удаленного сервера';
$PALANG['pFetchmail_desc_protocol'] = 'Какой протокол использовать';
+$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX
$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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/sk.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -397,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -412,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/sl.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -397,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -412,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/sv.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -399,6 +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_extra_options'] = 'Extra inställningsmöjligheter';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Datum';
@@ -414,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/tr.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -397,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -412,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/languages/tw.lang 2008-08-05 20:51:23 UTC (rev 439)
@@ -397,6 +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_extra_options'] = 'Extra Options'; # XXX
$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
@@ -412,6 +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_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-08-05 20:26:30 UTC (rev 438)
+++ trunk/upgrade.php 2008-08-05 20:51:23 UTC (rev 439)
@@ -919,3 +919,17 @@
}
+/**
+ * add ssl option for fetchmail
+ */
+function upgrade_439_mysql() {
+ $table_fetchmail = table_by_key('fetchmail');
+ db_query_parsed("
+ ALTER TABLE `$table_fetchmail` ADD `ssl` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0' AFTER `protocol` ;
+ ");
+}
+function upgrade_439_pgsql() {
+ db_query_parsed("
+ ALTER TABLE $table_fetchmail ADD COLUMN ssl BOOLEAN NOT NULL DEFAULT false;
+ ");
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-08-05 20:26:22
|
Revision: 438
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=438&view=rev
Author: christian_boltz
Date: 2008-08-05 20:26:30 +0000 (Tue, 05 Aug 2008)
Log Message:
-----------
upgrade.php:
- upgrade_362_*() renamed to upgrade_438_* to make sure it runs after an
upgrade from 2.2.x
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-08-05 18:10:19 UTC (rev 437)
+++ trunk/upgrade.php 2008-08-05 20:26:30 UTC (rev 438)
@@ -859,7 +859,8 @@
/**
* Create alias_domain table - MySQL
*/
-function upgrade_362_mysql() {
+# function upgrade_362_mysql() { # renamed to _438 to make sure it runs after an upgrade from 2.2.x
+function upgrade_438_mysql() {
# Table structure for table alias_domain
#
$table_alias_domain = table_by_key('alias_domain');
@@ -880,7 +881,8 @@
/**
* Create alias_domain table - PgSQL
*/
-function upgrade_362_pgsql() {
+# function upgrade_362_pgsql() { # renamed to _438 to make sure it runs after an upgrade from 2.2.x
+function upgrade_438_pgsql() {
# Table structure for table alias_domain
$table_alias_domain = table_by_key('alias_domain');
$table_domain = table_by_key('domain');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-08-05 18:10:12
|
Revision: 437
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=437&view=rev
Author: christian_boltz
Date: 2008-08-05 18:10:19 +0000 (Tue, 05 Aug 2008)
Log Message:
-----------
nl.lang:
- language update by Johan Hendriks (sylhouette @SF)
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=2038725&group_id=191583
Modified Paths:
--------------
trunk/languages/nl.lang
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2008-08-04 00:02:00 UTC (rev 436)
+++ trunk/languages/nl.lang 2008-08-05 18:10:19 UTC (rev 437)
@@ -101,7 +101,7 @@
$PALANG['pCreate_alias_domain_error1'] = 'U heeft niet genoeg rechten om de huidige configuratie te maken.';
$PALANG['pCreate_alias_domain_error2'] = 'De huidige configuratie is ongeldig, slecteer een andere!';
$PALANG['pCreate_alias_domain_error3'] = 'Fout bij vullen database.';
-$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
+$PALANG['pCreate_alias_domain_error4'] = 'Alle domeinen hebben al een alias!';
$PALANG['pCreate_alias_domain_success'] = 'De domein alias is toegevoegd aan de alias domein tabel!';
$PALANG['pCreate_alias_welcome'] = 'Maak een nieuw alias aan voor uw domein.';
@@ -375,9 +375,9 @@
$PALANG['pStatus_custom'] = 'Bezorgen op ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Wachtwoord is te kort - moet minimaal %s karakters bevatten";
-$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
-$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Ongeldig domein naam %s";
+$PALANG['pInvalidDomainDNS'] = "Ongeldig domein %s";
+$PALANG['pInvalidMailRegex'] = "Ongeldig email adres";
$PALANG['pFetchmail_welcome'] = 'Haal mail op voor:';
$PALANG['pFetchmail_new_entry'] = 'Nieuw item';
$PALANG['pFetchmail_database_save_error'] = 'Niet in staat dit item toe te voegen aan database!';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-08-04 00:01:51
|
Revision: 436
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=436&view=rev
Author: GingerDog
Date: 2008-08-04 00:02:00 +0000 (Mon, 04 Aug 2008)
Log Message:
-----------
remove comment as per cboltz's request etc
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-08-03 22:28:47 UTC (rev 435)
+++ trunk/upgrade.php 2008-08-04 00:02:00 UTC (rev 436)
@@ -895,7 +895,6 @@
modified timestamp with time zone default now(),
active boolean NOT NULL default true,
PRIMARY KEY(alias_domain))");
-# Constraint \"alias_domain_pkey\" Primary Key (\"alias_domain\")
db_query_parsed("CREATE INDEX alias_domain_active ON $table_alias_domain(alias_domain,active)");
db_query_parsed("COMMENT ON TABLE $table_alias_domain IS 'Postfix Admin - Domain Aliases'");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-08-03 22:28:37
|
Revision: 435
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=435&view=rev
Author: christian_boltz
Date: 2008-08-03 22:28:47 +0000 (Sun, 03 Aug 2008)
Log Message:
-----------
upgrade.php
- removed upgrade_300_mysql() which contained duplicated code (see
upgrade_362_*) and was placed in the middle of another upgrade function
@GingerDog: Do we need the 'Constraint "alias_domain_pkey"'? (see comment)
- replace hardcoded 'config' table name with table_by_key('config')
- several whitespace fixes
- use common vim: line
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-08-03 10:12:35 UTC (rev 434)
+++ trunk/upgrade.php 2008-08-03 22:28:47 UTC (rev 435)
@@ -1,9 +1,10 @@
<?php
if(!defined('POSTFIXADMIN')) {
- require_once('common.php');
+ require_once('common.php');
}
-// vim ts=4:sw=4:et
+/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
+
# Note: run with upgrade.php?debug=1 to see all SQL error messages
@@ -76,7 +77,7 @@
db_query_parsed($mysql, 0, " ENGINE = MYISAM COMMENT = 'PostfixAdmin settings'");
}
-$sql = "SELECT * FROM config WHERE name = 'version'";
+$sql = "SELECT * FROM " . table_by_key ('config') . " WHERE name = 'version'";
// insert into config('version', '01');
@@ -87,7 +88,7 @@
$row = db_array($rs);
$version = $row['value'];
} else {
- db_query_parsed("INSERT INTO config (name, value) VALUES ('version', '0')", 0, '');
+ db_query_parsed("INSERT INTO " . table_by_key ('config') . " (name, value) VALUES ('version', '0')", 0, '');
$version = 0;
}
@@ -189,7 +190,7 @@
$query = trim(str_replace(array_keys($replace), $replace, $sql));
if (safeget('debug') != "") {
print "<p style='color:#999'>$query";
- }
+ }
$result = db_query($query, $ignore_errors);
if (safeget('debug') != "") {
print "<div style='color:#f00'>" . $result['error'] . "</div>";
@@ -526,53 +527,6 @@
$result = db_query_parsed("CREATE INDEX alias_address_active ON alias(address,active)");
}
-/**
- * MySQL only alias_domain table
- */
-function upgrade_300_mysql() {
- $table_alias_domain = table_by_key('alias_domain');
- // i just duplicate stuff from DATABASE_*.TXT over here?
- if( $CONF['database_type'] == 'pgsql' ) {
- // check if table already exists, if so, don't recreate it
- $sql_table_exists =
- "SELECT relname ".
- " FROM pg_class ".
- " WHERE relname = '$table_alias_domain'";
- $res = db_query( $sql_table_exists );
- if( $res['rows'] == 0 ) {
- $sql_table_create =
- "CREATE TABLE $table_alias_domain ( ".
- " alias_domain character varying(255) NOT NULL REFERENCES domain(domain) ON DELETE CASCADE, ".
- " target_domain character varying(255) NOT NULL REFERENCES domain(domain) ON DELETE CASCADE, ".
- " created timestamp with time zone default now(), ".
- " modified timestamp with time zone default now(), ".
- " active boolean NOT NULL default true, ".
- " Constraint \"alias_domain_pkey\" Primary Key (\"alias_domain\") ".
- ")";
- db_query( $sql_table_create );
- $sql_table_index =
- "CREATE INDEX alias_domain_active ON $table_alias_domain(alias_domain,active)";
- db_query( $sql_table_index );
- $sql_table_comment =
- "COMMENT ON TABLE $table_alias_domain IS 'Postfix Admin - Domain Aliases'";
- db_query( $sql_table_comment );
- }
- } else { // database-type mysql assumed
- $sql_table_create =
- "CREATE TABLE IF NOT EXISTS `$table_alias_domain` ( ".
- " `alias_domain` varchar(255) NOT NULL default '', ".
- " `target_domain` varchar(255) NOT NULL default '', ".
- " `created` datetime NOT NULL default '0000-00-00 00:00:00', ".
- " `modified` datetime NOT NULL default '0000-00-00 00:00:00', ".
- " `active` tinyint(1) NOT NULL default '1', ".
- " PRIMARY KEY (`alias_domain`), ".
- " KEY `active` (`active`), ".
- " KEY `target_domain` (`target_domain`) ".
- ") TYPE=MyISAM COMMENT='Postfix Admin - Domain Aliases'";
- db_query( $sql_table_create );
- }
-}
-
$result = db_query_parsed("ALTER TABLE $table_domain_admins ALTER COLUMN username DROP DEFAULT");
$result = db_query_parsed("ALTER TABLE $table_domain_admins ALTER COLUMN domain DROP DEFAULT");
@@ -903,7 +857,7 @@
}
/**
- * Support alias_domain table
+ * Create alias_domain table - MySQL
*/
function upgrade_362_mysql() {
# Table structure for table alias_domain
@@ -917,15 +871,14 @@
`modified` datetime NOT NULL default '0000-00-00 00:00:00',
`active` tinyint(1) NOT NULL default '1',
PRIMARY KEY (`alias_domain`),
- KEY `active` (`active`),
- KEY `target_domain` (`target_domain`)
-) TYPE=MyISAM COMMENT='Postfix Admin - Domain Aliases'");
-
-
+ KEY `active` (`active`),
+ KEY `target_domain` (`target_domain`)
+ ) TYPE=MyISAM COMMENT='Postfix Admin - Domain Aliases'
+ ");
}
/**
- * Support alias_domain table
+ * Create alias_domain table - PgSQL
*/
function upgrade_362_pgsql() {
# Table structure for table alias_domain
@@ -934,14 +887,15 @@
if(_pgsql_object_exists($table_alias_domain)) {
return;
}
- db_query_parsed(
- "CREATE TABLE $table_alias_domain (
+ db_query_parsed("
+ CREATE TABLE $table_alias_domain (
alias_domain character varying(255) NOT NULL REFERENCES $table_domain(domain) ON DELETE CASCADE,
target_domain character varying(255) NOT NULL REFERENCES $table_domain(domain) ON DELETE CASCADE,
created timestamp with time zone default now(),
- modified timestamp with time zone default now(),
- active boolean NOT NULL default true,
- PRIMARY KEY(alias_domain))");
+ modified timestamp with time zone default now(),
+ active boolean NOT NULL default true,
+ PRIMARY KEY(alias_domain))");
+# Constraint \"alias_domain_pkey\" Primary Key (\"alias_domain\")
db_query_parsed("CREATE INDEX alias_domain_active ON $table_alias_domain(alias_domain,active)");
db_query_parsed("COMMENT ON TABLE $table_alias_domain IS 'Postfix Admin - Domain Aliases'");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-08-03 10:12:27
|
Revision: 434
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=434&view=rev
Author: GingerDog
Date: 2008-08-03 10:12:35 +0000 (Sun, 03 Aug 2008)
Log Message:
-----------
fix compile error
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/vacation.pl
Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================
--- trunk/VIRTUAL_VACATION/vacation.pl 2008-08-03 10:09:29 UTC (rev 433)
+++ trunk/VIRTUAL_VACATION/vacation.pl 2008-08-03 10:12:35 UTC (rev 434)
@@ -372,10 +372,9 @@
########################### main #################################
-my ($from, $to, $cc, ,$bcc , $subject, $messageid, $lastheader, $sender, $recipient, %opts, $sndrhdr);
+my ($from, $to, $cc, ,$bcc , $subject, $messageid, $lastheader, $sender, $recipient, %opts, $sndrhdr, $spam);
$subject='';
-$spam = 0;
# Take headers apart
while (<STDIN>) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-08-03 10:09:20
|
Revision: 433
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=433&view=rev
Author: GingerDog
Date: 2008-08-03 10:09:29 +0000 (Sun, 03 Aug 2008)
Log Message:
-----------
vacation.pl: initial merge of smtp rcpt/to checking stuff as per https://sourceforge.net/forum/forum.php?thread_id=2099851&forum_id=676076 ; Thank you!
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/vacation.pl
Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================
--- trunk/VIRTUAL_VACATION/vacation.pl 2008-08-01 20:47:07 UTC (rev 432)
+++ trunk/VIRTUAL_VACATION/vacation.pl 2008-08-03 10:09:29 UTC (rev 433)
@@ -43,12 +43,20 @@
# 2008-07-29 Patch from Luxten to add repeat notification after timeout. See:
# https://sourceforge.net/tracker/index.php?func=detail&aid=2031631&group_id=191583&atid=937966
#
+# 2008-08-01 Luigi Iotti <luigi at iotti dot biz>
+# Use envelope sender/recipient instead of using
+# From: and To: header fields;
+# Support to good vacation behavior as in
+# http://www.irbs.net/internet/postfix/0707/0954.html
+# (needs to be tested);
+#
# Requirements:
# You need to have the DBD::Pg or DBD::mysql perl-module installed.
# You need to have the Mail::Sendmail module installed.
# You need to have the Email::Valid module installed.
# You need to have the MIME::Charset module installed.
# You need to have the MIME::EncWords module installed.
+# You need to have the GetOpt::Std module installed.
#
# On Debian based systems :
# libmail-sendmail-perl
@@ -116,6 +124,7 @@
use Email::Valid;
use strict;
use Mail::Sendmail;
+use Getopt::Std;
binmode (STDIN,':utf8');
@@ -131,12 +140,12 @@
exit(0);
}
-my $db_true; # MySQL and PgSQL use different values for TRUE
+my $db_true; # MySQL and PgSQL use different values for TRUE, and unicode support...
if ($db_type eq "mysql") {
$dbh->do("SET CHARACTER SET utf8;");
$db_true = '1';
} else { # Pg
- # TODO: SET CHARACTER SET is mysql only, needs FIX for ALL databases
+ $dbh->do("SET CLIENT ENCODING 'UTF8'");
$db_true = 'True';
}
@@ -355,9 +364,15 @@
}
+sub strip_address {
+ my $arg = shift;
+ $arg =~ /([\w\-.%]+\@[\w.-]+)/;
+ return lc($1);
+}
+
########################### main #################################
-my ($from, $to, $cc, $subject, $messageid, $lastheader);
+my ($from, $to, $cc, ,$bcc , $subject, $messageid, $lastheader, $sender, $recipient, %opts, $sndrhdr);
$subject='';
$spam = 0;
@@ -366,55 +381,59 @@
while (<STDIN>) {
last if (/^$/);
if (/^\s+(.*)/ and $lastheader) { $$lastheader .= " $1"; }
+ elsif (/^Return-Path:\s+(.*)\n$/i) { $sender = $1; $lastheader = \$sender; }
+ elsif (/^Delivered-To:\s+(.*)\n$/i) { $recipient = $1; $lastheader = \$recipient; }
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 (/^bcc:\s+(.*)\n$/i) { $bcc = $1; $lastheader = \$bcc; }
elsif (/^subject:\s+(.*)\n$/i) { $subject = $1; $lastheader = \$subject; }
elsif (/^message-id:\s+(.*)\n$/i) { $messageid = $1; $lastheader = \$messageid; }
- elsif (/^x-spam-(flag|status):\s+yes/i) { exit (0); }
- elsif (/^precedence:\s+(bulk|list|junk)/i) { exit (0); }
- elsif (/^x-loop:\s+postfix\ admin\ virtual\ vacation/i) { exit (0); }
+ elsif (/^x-spam-(flag|status):\s+yes/i) { do_debug("x-spam-$1: yes found"); exit (0); }
+ elsif (/^precedence:\s+(bulk|list|junk)/i) { do_debug("precedence: $1 found"); exit (0); }
+ elsif (/^x-loop:\s+postfix\ admin\ virtual\ vacation/i) { do_debug("x-loop: postfix admin virtual vacation found"); exit (0); }
+ elsif (/^Auto-Submitted:\s+no/i) { next; }
+ elsif (/^Auto-Submitted:/i) { do_debug("Auto-Submitted: something found"); exit (0); }
+ elsif (/^List-(Id|Post):/i) { do_debug("List-$1: found"); exit (0); }
+ elsif (/^Sender:\s+(.*)/i) { $sndrhdr = $1; $lastheader = \$sndrhdr; }
else {$lastheader = "" ; }
}
+getopts('f:', \%opts) or die "Usage: $0 [-f sender] [-- [recipient]]";
+$opts{f} and $sender = $opts{f};
+$recipient = shift || $recipient || $ENV{"USER"} || "";
+
# If either From: or To: are not set, exit
-if (!$from || !$to || !$messageid) { exit (0); }
+if (!$from || !$to || !$messageid || !$sender || !$recipient) { do_debug("One of from=$from, to=$to, $messageid=$messageid, sender=$sender, recipient=$recipient is empty"); exit (0); }
+if ( $sender =~ /^(mailer-daemon|listserv|majordomo|owner-|request-|bounces-)/i) { do_debug("sender $sender contains $1"); exit (0); }
+if ( $sender =~ /-(owner|request|bounces)\@/i) { do_debug("sender $sender contains $1"); exit (0); }
+my $ss = strip_address($sender);
+my $sr = strip_address($recipient);
+my $ssh = strip_address($sndrhdr);
+if ($ss eq $sr) { do_debug("sender $ss and recipient $sr are the same"); exit(0); }
+my $recipfound = 0;
+for (split(/,\s*/, lc($to)), split(/,\s*/, lc($cc)), split(/,\s*/, lc($bcc))) {
+ my $destinatario = strip_address($_);
+ if ($ssh eq $destinatario) { do_debug("sender header $sender contains recipient $destinatario"); exit(0); }
+ if ($sr eq $destinatario) { $recipfound++; }
+}
+if (!$recipfound) { do_debug("envelope recipient $sr not found in the header recipients"); exit (0); }
$from = lc ($from);
if (!Email::Valid->address($from,-mxcheck => 1)) { do_debug("Invalid from email address: $from; exiting."); exit(0); }
+if (!Email::Valid->address($ss,-mxcheck => 1)) { do_debug("Invalid sender email address: $ss; exiting."); exit(0); }
# Check if it's an obvious sender, exit
if ($from =~ /([\w\-.%]+\@[\w.-]+)/) { $from = $1; }
-if ($from eq "" || $from =~ /^owner-|-(request|owner)\@|^(mailer-daemon|postmaster)\@/i) { exit (0); }
+if ($from eq "" || $from =~ /^(owner-|-(?:request|owner)\@|^(?:mailer-daemon|postmaster)\@)/i) { do_debug("from $from contains $1"); exit (0); }
-# Strip To: and Cc: and push them in array
-my @strip_cc_array;
-my @strip_to_array = split(/, */, lc ($to) );
-if (defined $cc) { @strip_cc_array = split(/, */, lc ($cc) ); }
-push (@strip_to_array, @strip_cc_array);
-
-my @search_array;
-
-# Strip email address from headers
-for (@strip_to_array) {
- if ($_ =~ /([\w\-.%]+\@[\w.-]+)/) {
- push (@search_array, $1);
- do_debug ("[STRIP RECIPIENTS]: ", $messageid, $1);
- }
+my ($rv, $email) = find_real_address ($sr);
+if ($rv == 1) {
+ do_debug ("[FOUND VACATION]: ", $messageid, $sender, $recipient, $email);
+ send_vacation_email( $email, $sender, $recipient, $messageid);
}
-# Search for email address which has vacation
-for (@search_array) {
- /([\w\-.%]+\@[\w.-]+)/ or next;
- my $addr = $1;
- my ($rv, $email) = find_real_address ($addr);
- if ($rv == 1) {
- do_debug ("[FOUND VACATION]: ", $messageid, $from, $to, $email);
- send_vacation_email( $email, $from, $to, $messageid);
- }
-}
-
0;
#/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-08-01 20:46:58
|
Revision: 432
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=432&view=rev
Author: christian_boltz
Date: 2008-08-01 20:47:07 +0000 (Fri, 01 Aug 2008)
Log Message:
-----------
edit-vacation.php:
- cleanup vacation_notification table when disabling vacation
https://sourceforge.net/forum/message.php?msg_id=5131390
Modified Paths:
--------------
trunk/edit-vacation.php
Modified: trunk/edit-vacation.php
===================================================================
--- trunk/edit-vacation.php 2008-07-30 06:48:37 UTC (rev 431)
+++ trunk/edit-vacation.php 2008-08-01 20:47:07 UTC (rev 432)
@@ -118,6 +118,7 @@
$db_false = db_get_boolean(false);
// retain vacation message if possible - i.e disable vacation away-ness.
$result = db_query ("UPDATE $table_vacation SET active = $db_false WHERE email='$fUsername'");
+ $result = db_query("DELETE FROM $table_vacation_notification WHERE on_vacation='$fUsername'");
$result = db_query ("SELECT * FROM $table_alias WHERE address='$fUsername'");
if ($result['rows'] == 1)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-07-30 06:48:27
|
Revision: 431
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=431&view=rev
Author: GingerDog
Date: 2008-07-30 06:48:37 +0000 (Wed, 30 Jul 2008)
Log Message:
-----------
vacation.pl: disable automaticnotification stuff
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/vacation.pl
Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================
--- trunk/VIRTUAL_VACATION/vacation.pl 2008-07-29 23:32:23 UTC (rev 430)
+++ trunk/VIRTUAL_VACATION/vacation.pl 2008-07-30 06:48:37 UTC (rev 431)
@@ -103,7 +103,10 @@
# notification interval, in seconds
# set to 0 to notify only once
-my $interval = 60*60*24;
+# e.g. 1 day ...
+#my $interval = 60*60*24;
+# disabled by default
+my $interval = 0;
# =========== end configuration ===========
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-07-29 23:32:13
|
Revision: 430
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=430&view=rev
Author: christian_boltz
Date: 2008-07-29 23:32:23 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
CHANGELOG.TXT
- updated with the latest changes (r415-r429)
Modified Paths:
--------------
trunk/CHANGELOG.TXT
Modified: trunk/CHANGELOG.TXT
===================================================================
--- trunk/CHANGELOG.TXT 2008-07-29 23:18:40 UTC (rev 429)
+++ trunk/CHANGELOG.TXT 2008-07-29 23:32:23 UTC (rev 430)
@@ -14,8 +14,14 @@
Only in SVN trunk
--------------------
- - added support for domain aliases (from lenix)
+ - 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
+ - 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
+ - translation updates
+ - several small bugfixes
+ - SVN revision *******************************
Version 2.2.1.1 - 2008/07/23
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-07-29 23:18:35
|
Revision: 429
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=429&view=rev
Author: christian_boltz
Date: 2008-07-29 23:18:40 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
functions.inc.php:
- move DNS checks from check_email() to check_domain()
- add clear error message on non-resolvable domains (using flash_error() -
this is probably not the best solution, but better than nothing)
- made error messages translatable
create-domain.php:
- avoid duplicated call to check_domain (to avoid duplicated error message)
- domains are now DNS-checked on creation - see the changes in check_domain()
in functions.inc.php
languages/*:
- added error messages for the above changes
Modified Paths:
--------------
trunk/create-domain.php
trunk/functions.inc.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
Modified: trunk/create-domain.php
===================================================================
--- trunk/create-domain.php 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/create-domain.php 2008-07-29 23:18:40 UTC (rev 429)
@@ -76,8 +76,8 @@
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 (empty ($fDomain) or !check_domain ($fDomain)) $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error2'];
}
if ($error != 1)
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/functions.inc.php 2008-07-29 23:18:40 UTC (rev 429)
@@ -227,14 +227,37 @@
// TODO: make check_domain able to handle as example .local domains
function check_domain ($domain)
{
- if (preg_match ('/([-0-9A-Z]+\.)+' . '([0-9A-Z]){2,6}$/i', trim ($domain)))
+ global $CONF;
+ global $PALANG;
+
+ if (!preg_match ('/([-0-9A-Z]+\.)+' . '([0-9A-Z]){2,6}$/i', trim ($domain)))
{
- return true;
+ flash_error(sprintf($PALANG['pInvalidDomainRegex'], htmlentities($domain)));
+ return false;
}
- else
+
+ if (isset($CONF['emailcheck_resolve_domain']) && 'YES' == $CONF['emailcheck_resolve_domain'] && 'WINDOWS'!=(strtoupper(substr(php_uname('s'), 0, 7))))
{
- return false;
+
+ // Look for an AAAA, A, or MX record for the domain
+
+ if(function_exists('checkdnsrr')) {
+ // AAAA (IPv6) is only available in PHP v. >= 5
+ if (version_compare(phpversion(), "5.0.0", ">="))
+ {
+ if (checkdnsrr($domain,'AAAA')) return true;
+ }
+ if (checkdnsrr($domain,'A')) return true;
+ if (checkdnsrr($domain,'MX')) return true;
+ flash_error(sprintf($PALANG['pInvalidDomainDNS'], htmlentities($domain)));
+ return false;
+ }
+ else {
+ flash_error("emailcheck_resolve_domain is enabled, but function (checkdnsrr) missing!");
+ }
}
+
+ return true;
}
@@ -260,47 +283,24 @@
$ce_email = preg_replace("/#/", '@', $ce_email);
}
- if (isset($CONF['emailcheck_resolve_domain']) && 'YES' == $CONF['emailcheck_resolve_domain'] && 'WINDOWS'!=(strtoupper(substr(php_uname('s'), 0, 7))))
+ // Perform non-domain-part sanity checks
+ if (!preg_match ('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '[^@]+$/i', trim ($ce_email)))
{
-
- // Perform non-domain-part sanity checks
- if (!preg_match ('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '[^@]+$/i', trim ($ce_email)))
- {
- return false;
- }
-
- // Determine domain name
- $matches=array();
- if (!preg_match('|@(.+)$|',$ce_email,$matches))
- {
- return false;
- }
- $domain=$matches[1];
-
- // Look for an AAAA, A, or MX record for the domain
-
- if(function_exists('checkdnsrr')) {
- // AAAA (IPv6) is only available in PHP v. >= 5
- if (version_compare(phpversion(), "5.0.0", ">="))
- {
- if (checkdnsrr($domain,'AAAA')) return true;
- }
- if (checkdnsrr($domain,'A')) return true;
- if (checkdnsrr($domain,'MX')) return true;
- flash_error("Invalid domain, and/or not discoverable in DNS");
- return false;
- }
- else {
- flash_error("emailcheck_resolve_domain is enabled, but function (checkdnsrr) missing!");
- }
+ flash_error($PALANG['pInvalidMailRegex']);
+ return false;
}
- if (preg_match ('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '([-0-9A-Z]+\.)+' . '([0-9A-Z]){2,6}$/i', trim ($ce_email)))
+ // Determine domain name
+ $matches=array();
+ if (!preg_match('|@(.+)$|',$ce_email,$matches))
{
- return true;
+ flash_error($PALANG['pInvalidMailRegex']);
+ return false;
}
- flash_error("Invalid email address, fails regexp check");
- return false;
+ $domain=$matches[1];
+
+ # check domain name
+ return check_domain($domain);
}
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/bg.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -375,6 +375,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/ca.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -374,6 +374,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/cn.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -374,6 +374,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/cs.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -386,6 +386,9 @@
$PALANG['pStatus_custom'] = 'Doručeno do ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Heslo je příliš krátké - je vyžadováno minimálně %s znaků";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Stahovat poštu pro:';
$PALANG['pFetchmail_new_entry'] = 'Nová položka';
$PALANG['pFetchmail_database_save_error'] = 'Tuto položku není možné uložit do databáze!';
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/da.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -385,6 +385,9 @@
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Adgangskoden er for kort - mindst %s tegn kræves";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Hent post for:';
$PALANG['pFetchmail_new_entry'] = 'Ny regel';
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/de.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -385,6 +385,9 @@
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Das Passwort ist zu kurz - mindestens %s Zeichen benötigt";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'E-Mail Abruf für: ';
$PALANG['pFetchmail_new_entry'] = 'Neuer Eintrag';
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/en.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -386,6 +386,9 @@
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # usage: flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']));
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check";
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS";
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check";
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:';
$PALANG['pFetchmail_new_entry'] = 'New entry';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/es.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -375,6 +375,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/et.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -378,6 +378,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/eu.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -373,6 +373,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/fi.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -376,6 +376,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/fo.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -379,6 +379,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/fr.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -376,6 +376,9 @@
$PALANG['pStatus_custom'] = 'Délivré à ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Mot de passe trop court. - %s caractères minimum";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Récupérer le courrier pour :';
$PALANG['pFetchmail_new_entry'] = 'Nouvelle entrée';
$PALANG['pFetchmail_database_save_error'] = 'Impossible d\'enregistrer cette entrée dans la base!';
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/hr.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -372,6 +372,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/hu.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -386,6 +386,9 @@
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "A Jelszó túl rövid - legalább %s karakter szükséges";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Mail lehozása:';
$PALANG['pFetchmail_new_entry'] = 'Új bejegyzés';
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/is.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -373,6 +373,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/it.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -375,6 +375,9 @@
$PALANG['pStatus_custom'] = 'In consegna a ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Password troppo breve - minimo %s caratteri";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Ricevi posta per:';
$PALANG['pFetchmail_new_entry'] = 'Nuova voce';
$PALANG['pFetchmail_database_save_error'] = 'Impossibile registrare nel database!';
Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/ja.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -384,6 +384,9 @@
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "パスワードが短すぎます。最低 %s 文字必要です。"; # usage: flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']));
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'メール取得:';
$PALANG['pFetchmail_new_entry'] = '新しいエントリ';
Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/lt.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -374,6 +374,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/mk.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -375,6 +375,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/nb.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -374,6 +374,9 @@
$PALANG['pStatus_custom'] = 'Leverer til ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Passordet er for kort - det må inneholde minst %s tegn";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Hent e-post for:';
$PALANG['pFetchmail_new_entry'] = 'Ny oppføring';
$PALANG['pFetchmail_database_save_error'] = 'Kunne ikke lagre denne oppføringen i databasen!';
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/nl.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -375,6 +375,9 @@
$PALANG['pStatus_custom'] = 'Bezorgen op ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Wachtwoord is te kort - moet minimaal %s karakters bevatten";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Haal mail op voor:';
$PALANG['pFetchmail_new_entry'] = 'Nieuw item';
$PALANG['pFetchmail_database_save_error'] = 'Niet in staat dit item toe te voegen aan database!';
Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/nn.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -370,6 +370,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/pl.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -379,6 +379,9 @@
$PALANG['pStatus_custom'] = 'Dostarczyć do ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Hasło jest za krótkie - musi mieć minimum %s znaków";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Pobierz pocztę dla:';
$PALANG['pFetchmail_new_entry'] = 'Nowy wpis';
$PALANG['pFetchmail_database_save_error'] = 'Wpis nie może być zapisany w bazie danych!';
Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/pt-br.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -374,6 +374,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/ru.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -386,6 +386,9 @@
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Пароль слишком короткий - требуется %s символов";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Собирать почту для:';
$PALANG['pFetchmail_new_entry'] = 'Новая запись';
Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/sk.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -374,6 +374,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/sl.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -374,6 +374,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/sv.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -376,6 +376,9 @@
$PALANG['pStatus_custom'] = 'Levereras till ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "För kort lösenord - ett lösenord på %s tecken krävs";
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Hämta mail för:';
$PALANG['pFetchmail_new_entry'] = 'Ny anteckning';
$PALANG['pFetchmail_database_save_error'] = 'Misslyckades med att spara anteckningen i databasen!';
Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/tr.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -374,6 +374,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang 2008-07-29 20:33:30 UTC (rev 428)
+++ trunk/languages/tw.lang 2008-07-29 23:18:40 UTC (rev 429)
@@ -374,6 +374,9 @@
$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
+$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
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.
