postfixadmin-svn Mailing List for PostfixAdmin (Page 99)
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
(6) |
Sep
(16) |
Oct
(4) |
Nov
|
Dec
|
|
From: <Gin...@us...> - 2009-01-28 20:15:46
|
Revision: 555
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=555&view=rev
Author: GingerDog
Date: 2009-01-28 20:15:42 +0000 (Wed, 28 Jan 2009)
Log Message:
-----------
add amavis table structures into postfixadmins db
Modified Paths:
--------------
branches/postfixadmin-amavis/upgrade.php
Modified: branches/postfixadmin-amavis/upgrade.php
===================================================================
--- branches/postfixadmin-amavis/upgrade.php 2009-01-25 21:56:37 UTC (rev 554)
+++ branches/postfixadmin-amavis/upgrade.php 2009-01-28 20:15:42 UTC (rev 555)
@@ -1063,3 +1063,241 @@
db_query_parsed("ALTER TABLE `$table_mailbox` CHANGE `local_part` `local_part` VARCHAR( 255 ) {LATIN1} NOT NULL");
}
+function upgrade_547_mysql() {
+ // amavis tables
+ $table_awl = table_by_key('awl');
+ $table_bayes_expire = table_by_key('bayes_expire');
+ $table_bayes_global_vars = table_by_key('bayes_global_vars');
+ $table_bayes_seen = table_by_key('bayes_seen');
+ $table_bayes_token = table_by_key('bayes_token');
+ $table_bayes_vars = table_by_key('bayes_vars');
+
+ db_query_parsed("CREATE TABLE IF NOT EXISTS $table_awl (
+ `username` varchar(100) NOT NULL default '',
+ `email` varchar(200) NOT NULL default '',
+ `ip` varchar(10) NOT NULL default '',
+ `count` int(11) default '0',
+ `totscore` float default '0',
+ `lastupdate` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+ PRIMARY KEY (`username`,`email`,`ip`)
+ ) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
+
+ db_query_parsed(
+ "CREATE TABLE IF NOT EXISTS $table_bayes_expire (
+ `id` int(11) NOT NULL default '0',
+ `runtime` int(11) NOT NULL default '0',
+ KEY `bayes_expire_idx1` (`id`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=latin1;");
+
+ db_query_parsed(
+ "CREATE TABLE IF NOT EXISTS $table_bayes_global_vars (
+ `variable` varchar(30) NOT NULL default '',
+ `value` varchar(200) NOT NULL default '',
+ PRIMARY KEY (`variable`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=latin1;");
+
+ db_query_parsed(
+ "CREATE TABLE IF NOT EXISTS $table_bayes_seen (
+ `id` int(11) NOT NULL default '0',
+ `msgid` varchar(200) character set latin1 collate latin1_bin NOT NULL default '',
+ `flag` char(1) NOT NULL default '',
+ PRIMARY KEY (`id`,`msgid`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=latin1;");
+
+ db_query_parsed("
+ CREATE TABLE IF NOT EXISTS $table_bayes_token (
+ `id` int(11) NOT NULL default '0',
+ `token` char(5) NOT NULL default '',
+ `spam_count` int(11) NOT NULL default '0',
+ `ham_count` int(11) NOT NULL default '0',
+ `atime` int(11) NOT NULL default '0',
+ PRIMARY KEY (`id`,`token`),
+ KEY `bayes_token_idx1` (`token`),
+ KEY `bayes_token_idx2` (`id`,`atime`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=latin1;");
+
+ db_query_parsed("
+ CREATE TABLE IF NOT EXISTS $table_bayes_vars (
+ `id` int(11) NOT NULL auto_increment,
+ `username` varchar(200) NOT NULL default '',
+ `spam_count` int(11) NOT NULL default '0',
+ `ham_count` int(11) NOT NULL default '0',
+ `token_count` int(11) NOT NULL default '0',
+ `last_expire` int(11) NOT NULL default '0',
+ `last_atime_delta` int(11) NOT NULL default '0',
+ `last_expire_reduce` int(11) NOT NULL default '0',
+ `oldest_token_age` int(11) NOT NULL default '2147483647',
+ `newest_token_age` int(11) NOT NULL default '0',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `bayes_vars_idx1` (`username`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ");
+
+ $table_maddr = table_by_key('maddr');
+ db_query_parsed("
+ CREATE TABLE IF NOT EXISTS $table_maddr (
+ `id` int(10) unsigned NOT NULL auto_increment,
+ `email` varchar(255) NOT NULL,
+ `domain` varchar(255) NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `email` (`email`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ");
+
+ $table_mailaddr = table_by_key('mailaddr');
+
+ db_query_parsed("
+ CREATE TABLE IF NOT EXISTS $table_mailaddr (
+ `id` int(10) unsigned NOT NULL auto_increment,
+ `priority` int(11) NOT NULL default '7',
+ `email` varchar(255) NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `email` (`email`)
+ ) ENGINE=MyISAM DEFAULT CHARSET=latin1 ");
+
+ $table_msgrcpt = table_by_key('msgrcpt');
+ db_query_parsed("
+ CREATE TABLE IF NOT EXISTS $table_msgrcpt (
+ `mail_id` varchar(12) NOT NULL,
+ `rid` int(10) unsigned NOT NULL,
+ `ds` char(1) NOT NULL,
+ `rs` char(1) NOT NULL,
+ `bl` char(1) default '',
+ `wl` char(1) default '',
+ `bspam_level` float default NULL,
+ `smtp_resp` varchar(255) default '',
+ KEY `msgrcpt_idx_mail_id` (`mail_id`),
+ KEY `msgrcpt_idx_rid` (`rid`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=latin1");
+
+ $table_msgs = table_by_key('msgs');
+ db_query_parsed("CREATE TABLE IF NOT EXISTS $table_msgs (
+ `mail_id` varchar(12) NOT NULL,
+ `secret_id` varchar(12) default '',
+ `am_id` varchar(20) NOT NULL,
+ `time_num` int(10) unsigned NOT NULL,
+ `time_iso` timestamp NOT NULL default '0000-00-00 00:00:00',
+ `sid` int(10) unsigned NOT NULL,
+ `policy` varchar(255) default '',
+ `client_addr` varchar(255) default '',
+ `size` int(10) unsigned NOT NULL,
+ `content` char(1) default NULL,
+ `quar_type` char(1) default NULL,
+ `quar_loc` varchar(255) default '',
+ `dsn_sent` char(1) default NULL,
+ `spam_level` float default NULL,
+ `message_id` varchar(255) default '',
+ `from_addr` varchar(255) default '',
+ `subject` varchar(255) default '',
+ `host` varchar(255) NOT NULL,
+ PRIMARY KEY (`mail_id`),
+ KEY `msgs_idx_sid` (`sid`),
+ KEY `msgs_idx_time_iso` (`time_iso`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=latin1");
+
+
+ $table_policy = table_by_key('policy');
+ db_query_parsed("CREATE TABLE IF NOT EXISTS $table_policy (
+ `id` int(10) unsigned NOT NULL auto_increment,
+ `policy_name` varchar(32) default NULL,
+ `virus_lover` char(1) default NULL,
+ `spam_lover` char(1) default NULL,
+ `banned_files_lover` char(1) default NULL,
+ `bad_header_lover` char(1) default NULL,
+ `bypass_virus_checks` char(1) default NULL,
+ `bypass_spam_checks` char(1) default NULL,
+ `bypass_banned_checks` char(1) default NULL,
+ `bypass_header_checks` char(1) default NULL,
+ `spam_modifies_subj` char(1) default NULL,
+ `virus_quarantine_to` varchar(64) default NULL,
+ `spam_quarantine_to` varchar(64) default NULL,
+ `banned_quarantine_to` varchar(64) default NULL,
+ `bad_header_quarantine_to` varchar(64) default NULL,
+ `spam_tag_level` float default NULL,
+ `spam_tag2_level` float default NULL,
+ `spam_kill_level` float default NULL,
+ `spam_dsn_cutoff_level` float default NULL,
+ `spam_quarantine_cutoff_level` float(10,2) default NULL,
+ `addr_extension_virus` varchar(64) default NULL,
+ `addr_extension_spam` varchar(64) default NULL,
+ `addr_extension_banned` varchar(64) default NULL,
+ `addr_extension_bad_header` varchar(64) default NULL,
+ `warnvirusrecip` char(1) default NULL,
+ `warnbannedrecip` char(1) default NULL,
+ `warnbadhrecip` char(1) default NULL,
+ `newvirus_admin` varchar(64) default NULL,
+ `virus_admin` varchar(64) default NULL,
+ `banned_admin` varchar(64) default NULL,
+ `bad_header_admin` varchar(64) default NULL,
+ `spam_admin` varchar(64) default NULL,
+ `spam_subject_tag` varchar(64) default NULL,
+ `spam_subject_tag2` varchar(64) default NULL,
+ `message_size_limit` int(11) default NULL,
+ `banned_rulenames` varchar(64) default NULL,
+ PRIMARY KEY (`id`)
+ ) ENGINE=MyISAM DEFAULT CHARSET=latin1 ");
+
+ db_query_parsed("DELETE FROM $table_policy WHERE policy_name IN ('All Off', 'Normal', 'Virus Filtering Only', 'Spam Filtering Only', 'Low', 'High')");
+
+ $insert_fields = "INSERT INTO $table_policy (policy_name, virus_lover, spam_lover, banned_files_lover, bad_header_lover, bypass_virus_checks, bypass_spam_checks, bypass_banned_checks, bypass_header_checks, spam_modifies_subj, virus_quarantine_to, spam_quarantine_to, banned_quarantine_to, bad_header_quarantine_to, spam_tag_level, spam_tag2_level, spam_kill_level, spam_dsn_cutoff_level, spam_quarantine_cutoff_level, addr_extension_virus, addr_extension_spam, addr_extension_banned, addr_extension_bad_header, warnvirusrecip, warnbannedrecip, warnbadhrecip, newvirus_admin, virus_admin, banned_admin, bad_header_admin, spam_admin, spam_subject_tag, spam_subject_tag2, message_size_limit, banned_rulenames)";
+ db_query_parsed("$insert_fields VALUES ('All Off', 'Y', 'Y', 'Y', 'Y', 'N', 'N', 'N', 'N', 'N', NULL, NULL, NULL, NULL, -999, 999, 999, 999, 0.00, NULL, NULL, NULL, NULL, 'N', 'N', 'N', NULL, NULL, NULL, NULL, NULL, NULL, '[SPAM]', 0, NULL)");
+
+ db_query_parsed("$insert_fields VALUES ('Normal', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, -999, 2.5, 4.7, 10, 20.00, NULL, NULL, NULL, NULL, 'Y', 'Y', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, '[SPAM]', 0, NULL)");
+
+ db_query_parsed("$insert_fields VALUES ('Virus Filtering Only', 'N', 'Y', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'N', NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0.00, NULL, NULL, NULL, NULL, 'Y', 'N', 'N', NULL, NULL, NULL, NULL, NULL, NULL, '[SPAM]', 0, NULL)");
+
+ db_query_parsed("$insert_fields VALUES ('Spam Filtering Only', 'Y', 'N', 'Y', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', NULL, NULL, NULL, NULL, -999, 2.5, 5, 10, 20.00, NULL, NULL, NULL, NULL, 'N', 'Y', 'Y', NULL, NULL, NULL, NULL, NULL, NULL,'[SPAM]', 0, NULL)");
+
+ db_query_parsed("$insert_fields VALUES ('Low', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, -999, 4.5, 7, 10, 20.00, NULL, NULL, NULL, NULL, 'Y', 'Y', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, '[SPAM]', 0, NULL)");
+
+ db_query_parsed("$insert_fields VALUES ('High', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, -999, 2.5, 3, 10, 20.00, NULL, NULL, NULL, NULL, 'Y', 'Y', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, '[SPAM]', 0, NULL)");
+
+
+ $table_quarantine = table_by_key('quarantine');
+ db_query_parsed("CREATE TABLE IF NOT EXISTS $table_quarantine (
+ `mail_id` varchar(12) NOT NULL,
+ `chunk_ind` int(10) unsigned NOT NULL,
+ `mail_text` blob,
+ PRIMARY KEY (`mail_id`,`chunk_ind`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=latin1");
+
+ $table_sa_rules = table_by_key('sa_rules');
+ db_query_parsed("CREATE TABLE IF NOT EXISTS $table_sa_rules (
+ `rule` varchar(100) NOT NULL default '',
+ `rule_desc` varchar(200) NOT NULL default '',
+ PRIMARY KEY (`rule`)
+ ) ENGINE=MyISAM DEFAULT CHARSET=latin1");
+
+
+ $table_users = table_by_key('users');
+ db_query_parsed("CREATE TABLE IF NOT EXISTS $table_users (
+ `id` int(10) unsigned NOT NULL auto_increment,
+ `priority` int(11) NOT NULL default '7',
+ `policy_id` int(10) unsigned NOT NULL default '1',
+ `email` varchar(255) NOT NULL,
+ `fullname` varchar(255) default NULL,
+ `local` char(1) default NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `email` (`email`)
+ ) ENGINE=MyISAM DEFAULT CHARSET=latin1 ");
+
+
+ $table_wblist = table_by_key('wblist');
+ db_query_parsed("CREATE TABLE IF NOT EXISTS $table_wblist (
+ `rid` int(10) unsigned NOT NULL,
+ `sid` int(10) unsigned NOT NULL,
+ `wb` varchar(10) NOT NULL,
+ PRIMARY KEY (`rid`,`sid`)
+ ) ENGINE=MyISAM DEFAULT CHARSET=latin1");
+
+ db_query_parsed("ALTER TABLE $table_msgrcpt ADD CONSTRAINT `msgrcpt_maddr_fk1` FOREIGN KEY (`rid`) REFERENCES $table_maddr (`id`),
+ ADD CONSTRAINT `msgrcpt_msgs_fk1` FOREIGN KEY (`mail_id`) REFERENCES $table_msgs (`mail_id`) ON DELETE CASCADE");
+
+ db_query_parsed("ALTER TABLE $table_msgs ADD CONSTRAINT `msgs_ibfk_fk1` FOREIGN KEY (`sid`) REFERENCES $table_maddr (`id`)");
+
+ db_query_parsed("ALTER TABLE $table_quarantine ADD CONSTRAINT `quarantine_msgs_fk1` FOREIGN KEY (`mail_id`) REFERENCES $table_msgs (`mail_id`) ON DELETE CASCADE");
+ }
+
+
+function upgrade_547_pgsql() {
+ // amavis tables
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-01-25 22:22:24
|
Revision: 552
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=552&view=rev
Author: christian_boltz
Date: 2009-01-25 21:36:08 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
templates/list-virtual.php:
- switch to boolconf() to avoid "undefined variable" warning
Modified Paths:
--------------
trunk/templates/list-virtual.php
Modified: trunk/templates/list-virtual.php
===================================================================
--- trunk/templates/list-virtual.php 2009-01-25 21:31:40 UTC (rev 551)
+++ trunk/templates/list-virtual.php 2009-01-25 21:36:08 UTC (rev 552)
@@ -296,7 +296,7 @@
}
else
{
- if ($CONF['used_quotas'] == 'YES')
+ if (boolconf('used_quotas') == 'YES')
print divide_quota ($tMailbox[$i]['current']).'/';
print divide_quota ($tMailbox[$i]['quota']);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-01-25 22:22:15
|
Revision: 551
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=551&view=rev
Author: christian_boltz
Date: 2009-01-25 21:31:40 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
users/login.php:
- also switch to the new "login failed" message
Modified Paths:
--------------
trunk/users/login.php
Modified: trunk/users/login.php
===================================================================
--- trunk/users/login.php 2009-01-25 20:53:11 UTC (rev 550)
+++ trunk/users/login.php 2009-01-25 21:31:40 UTC (rev 551)
@@ -64,14 +64,14 @@
if ($result['rows'] != 1)
{
$error = 1;
- $tMessage = $PALANG['pLogin_password_incorrect'];
+ $tMessage = '<span class="error_msg">' . $PALANG['pLogin_failed'] . '</span>';
$tUsername = $fUsername;
}
}
else
{
$error = 1;
- $tMessage = $PALANG['pLogin_username_incorrect'];
+ $tMessage = '<span class="error_msg">' . $PALANG['pLogin_failed'] . '</span>';
}
if ($error != 1)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-01-25 22:22:10
|
Revision: 553
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=553&view=rev
Author: christian_boltz
Date: 2009-01-25 21:37:42 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
list-virtual.php
- switch to boolconf() to avoid "undefined variable" warning
Modified Paths:
--------------
trunk/list-virtual.php
Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php 2009-01-25 21:36:08 UTC (rev 552)
+++ trunk/list-virtual.php 2009-01-25 21:37:42 UTC (rev 553)
@@ -139,7 +139,7 @@
if ($CONF['vacation_control_admin'] == 'YES')
{
- if ($CONF['used_quotas'] == 'YES')
+ if (boolconf('used_quotas'))
$query = "SELECT $table_mailbox.*, $table_vacation.active AS v_active, $table_quota.current FROM $table_mailbox LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email LEFT JOIN $table_quota ON $table_mailbox.username=$table_quota.username WHERE $table_mailbox.domain='$fDomain' AND $table_quota.path='quota/storage' ORDER BY $table_mailbox.username LIMIT $page_size OFFSET $fDisplay";
else
$query = "SELECT $table_mailbox.*, $table_vacation.active AS v_active FROM $table_mailbox LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email WHERE $table_mailbox.domain='$fDomain' ORDER BY $table_mailbox.username LIMIT $page_size OFFSET $fDisplay";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-01-25 22:09:43
|
Revision: 554
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=554&view=rev
Author: christian_boltz
Date: 2009-01-25 21:56:37 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
VACATION INSTALL.TXT
- add note about using /etc/mail/postfixadmin/vacation.conf
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/INSTALL.TXT
Modified: trunk/VIRTUAL_VACATION/INSTALL.TXT
===================================================================
--- trunk/VIRTUAL_VACATION/INSTALL.TXT 2009-01-25 21:37:42 UTC (rev 553)
+++ trunk/VIRTUAL_VACATION/INSTALL.TXT 2009-01-25 21:56:37 UTC (rev 554)
@@ -49,6 +49,7 @@
#/etc/group
vacation:*:65501:
+
2. Create a directory
---------------------
Create a directory, for example /var/spool/vacation, that is accessible
@@ -68,6 +69,7 @@
-rwx------ 1 vacation vacation 3356 Dec 21 00:00 vacation.pl*
+
4. Setup the transport type
--------------------
Define the transport type in the Postfix master file:
@@ -105,12 +107,13 @@
If security is an issue for you, read ../DOCUMENTS/Security.txt
-6. Edit vacation.pl
------------------
-The perl vacation.pl script needs minor modification to know which database
-you are using, and also how to connect to the database.
+6. Configure vacation.pl
+------------------------
+The perl vacation.pl script needs to know which database you are using, and also
+how to connect to the database.
+
Namely :
Change any variables starting with '$db_' and '$db_type' to either 'mysql' or 'pgsql'.
@@ -118,6 +121,17 @@
Change the $vacation_domain variable to match what you entered in your /etc/postfix/transport
file.
+You can do this in two ways:
+
+a) edit vacation.pl directly
+
+b) create /etc/mail/postfixadmin/vacation.conf and enter your settings there
+
+ Just use perl syntax there to fill the config variables listed in vacation.pl
+ (without the "our" keyword). Example:
+ $db_username = 'mail';
+
+
What do these files do?
-----------------------
When a user enables a vacation message on their account, the alias
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-01-25 20:53:18
|
Revision: 550
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=550&view=rev
Author: christian_boltz
Date: 2009-01-25 20:53:11 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
login.php
- put '<span class="error_msg">' and '</span>' into login.php, not in *.lang
languages/*.lang:
- removed pLogin_username_incorrect and pLogin_password_incorrect texts
- added pLogin_failed to all translations (without the wrapping <span>)
- removed the <span> from pLogin_failed in en.lang and fi.lang
translation-update.sh:
- added "--remove string" option to remove texts from language files
Modified Paths:
--------------
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/language-update.sh
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/login.php
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/bg.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -23,8 +23,7 @@
$PALANG['pLogin_username'] = 'Логин (е-мейл)';
$PALANG['pLogin_password'] = 'Парола';
$PALANG['pLogin_button'] = 'Изход';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Вашият логин не е правилен. Проверете дали сте се написали правилно вашият е-мейл адрес!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Вашата парола не е правилна!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Ако сте потребител натиснете тук за логване в потребителската част.';
$PALANG['pMenu_main'] = 'Main'; # XXX
@@ -340,7 +339,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Вие вече си имате конфигриран автоматичен отговор!';
$PALANG['pUsersVacation_subject'] = 'Заглавие';
$PALANG['pUsersVacation_subject_text'] = 'Out of Office'; # XXX
-$PALANG['pUsersVacation_body'] = 'Текст';
+$PALANG['pUsersVacation_body'] = 'Текст'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Няма да бъда на разположение от <date> до <date>.
При спешност можете да се свържете с <contact person>.
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/ca.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -22,8 +22,7 @@
$PALANG['pLogin_username'] = 'Usuari (e-mail)';
$PALANG['pLogin_password'] = 'Contrasenya';
$PALANG['pLogin_button'] = 'Usuari';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">El login no és correcte. Aseguri\'s de que ha fet login amb el seu e-mail.</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">La seva contrasenya no es correcta!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Login per anar a la secció d\'usuaris.';
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Resum';
@@ -339,7 +338,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Ja disposa d\'una resposta automàtica configurada!';
$PALANG['pUsersVacation_subject'] = 'Assumpte';
$PALANG['pUsersVacation_subject_text'] = 'Fora de la feina';
-$PALANG['pUsersVacation_body'] = 'Cos';
+$PALANG['pUsersVacation_body'] = 'Cos'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Seré fora des del <date> fins al <date>.
Per assumptes urgents pot contactar amb mi a <contact person>.
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/cn.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -22,8 +22,7 @@
$PALANG['pLogin_username'] = '帐号 (邮件地址)';
$PALANG['pLogin_password'] = '密码';
$PALANG['pLogin_button'] = '登录';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">登录失败, 请确认你是使用你的邮件地址登录!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">密码错误!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = '普通用户点击这里进入用户控制面板.';
$PALANG['pMenu_main'] = 'Main'; # XXX
@@ -339,7 +338,7 @@
$PALANG['pUsersVacation_welcome_text'] = '你已经设置了自动回复!';
$PALANG['pUsersVacation_subject'] = '主题';
$PALANG['pUsersVacation_subject_text'] = '我现在无法回信';
-$PALANG['pUsersVacation_body'] = '内容';
+$PALANG['pUsersVacation_body'] = '内容'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
我在 <date> 到 <date> 这段时间内暂时无法回信.
如果你有急事请与 <contact person> 联系.
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/cs.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -27,8 +27,7 @@
$PALANG['pLogin_username'] = 'Uživatelské jméno (email)';
$PALANG['pLogin_password'] = 'Heslo';
$PALANG['pLogin_button'] = 'Přihlásit';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Nesprávné uživatelské jmeno. Přihlašujte se svojí emailovou adresou!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Nesprávné heslo!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Vstup do uživatelské sekce.';
$PALANG['pMenu_main'] = 'Hlavní';
@@ -348,7 +347,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Již máte nastavenou automatickou odpověď!';
$PALANG['pUsersVacation_subject'] = 'Předmět';
$PALANG['pUsersVacation_subject_text'] = 'Dovolená';
-$PALANG['pUsersVacation_body'] = 'Obsah';
+$PALANG['pUsersVacation_body'] = 'Obsah'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Jsem na dovolené od <datum> od <datum>.
S neodkladnými zprávami prosím kontaktujte <kontaktní osoba>.
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/da.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -24,8 +24,7 @@
$PALANG['pLogin_username'] = 'Brugernavn (email)';
$PALANG['pLogin_password'] = 'Adgangskode';
$PALANG['pLogin_button'] = 'Login';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Dit brugernavn er forkert. Kontroller at du bruger din emailadresse som brugernavn!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Din adgangskode er forkert!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Bruger: Log ind på brugersektionen her.';
$PALANG['pMenu_main'] = 'Start';
@@ -346,7 +345,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Du har allerede et autosvar indstillet!';
$PALANG['pUsersVacation_subject'] = 'Emne';
$PALANG['pUsersVacation_subject_text'] = 'Ikke tilstede';
-$PALANG['pUsersVacation_body'] = 'Meddelelse';
+$PALANG['pUsersVacation_body'] = 'Meddelelse'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Jeg er ikke tilstede i perioden <dato> til <dato>.
I nødstilfælde kan <kontaktperson> kontaktes.
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/de.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -24,8 +24,7 @@
$PALANG['pLogin_username'] = 'Login (eMail)';
$PALANG['pLogin_password'] = 'Passwort';
$PALANG['pLogin_button'] = 'Login';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Ihr Login-Name ist nicht korrekt. Bitte benutzen Sie die komplette eMail-Adresse</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Falsches Passwort!</span>';
+$PALANG['pLogin_failed'] = 'Ihre Mailadresse oder das Passwort sind nicht korrekt.';
$PALANG['pLogin_login_users'] = 'eMail-Benutzer bitte hier einloggen.';
$PALANG['pMenu_main'] = 'Startseite';
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/en.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -24,7 +24,7 @@
$PALANG['pLogin_username'] = 'Login (email)';
$PALANG['pLogin_password'] = 'Password';
$PALANG['pLogin_button'] = 'Login';
-$PALANG['pLogin_failed'] = '<span class="error_msg">Your email address or password are not correct.</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.';
$PALANG['pLogin_login_users'] = 'Users click here to login to the user section.';
$PALANG['pMenu_main'] = 'Main';
@@ -346,7 +346,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'You already have an auto response configured!';
$PALANG['pUsersVacation_subject'] = 'Subject';
$PALANG['pUsersVacation_subject_text'] = 'Out of Office';
-$PALANG['pUsersVacation_body'] = 'Body';
+$PALANG['pUsersVacation_body'] = 'Message';
$PALANG['pUsersVacation_body_text'] = <<<EOM
I will be away from <date> until <date>.
For urgent matters you can contact <contact person>.
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/es.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -22,8 +22,7 @@
$PALANG['pLogin_username'] = 'Usuario (e-mail)';
$PALANG['pLogin_password'] = 'Contraseña';
$PALANG['pLogin_button'] = 'Usuario';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">El login no es correcto. Asegurese de que ha hecho login con su e-mail.</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">¡Su contraseña no es correcta!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Login para ir a la sección de usuarios.';
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Resumen';
@@ -340,7 +339,7 @@
$PALANG['pUsersVacation_welcome_text'] = '¡Ya dispone de una respuesta automática configurada!';
$PALANG['pUsersVacation_subject'] = 'Asunto';
$PALANG['pUsersVacation_subject_text'] = 'Fuera del trabajo';
-$PALANG['pUsersVacation_body'] = 'Cuerpo';
+$PALANG['pUsersVacation_body'] = 'Cuerpo'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Estaré fuera desde <date> hasta <date>.
Para asuntos urgentes, puede contactar conmigo en <contact person>.
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/et.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -22,8 +22,7 @@
$PALANG['pLogin_username'] = 'Kasutajanimi (e-posti aadress)';
$PALANG['pLogin_password'] = 'Parool';
$PALANG['pLogin_button'] = 'Logi sisse';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Kasutajanimi pole õige. Veendu, et logid sisse korrektse e-posti aadressiga!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Parool pole õige!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Kasutaja, klõpsa siia logimaks sisse kasutaja sektsiooni.';
$PALANG['pMenu_main'] = 'Main'; # XXX
@@ -339,7 +338,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Automaatne vastus on juba seadistatud!';
$PALANG['pUsersVacation_subject'] = 'Teema';
$PALANG['pUsersVacation_subject_text'] = 'Kontorist väljas';
-$PALANG['pUsersVacation_body'] = 'Põhitekst';
+$PALANG['pUsersVacation_body'] = 'Põhitekst'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Olen kontorist eemal alates <date> kuni <date>.
Kiireloomuliste asjade korral palun kontakteeru <kontakt isik>.
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/eu.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -22,8 +22,7 @@
$PALANG['pLogin_username'] = 'Erabiltzailea (e-mail)';
$PALANG['pLogin_password'] = 'Pasahitza';
$PALANG['pLogin_button'] = 'Erabiltzailea';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Logina ez da zuzena. Ziurtatu zaitez logina zeure e-mailarekin egin duzula.</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Pasahitz okerra!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Erabiltzaileen gunera joateko logina.';
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Laburpena';
@@ -338,7 +337,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Erantzun automatiko bat konfiguratuta duzu!';
$PALANG['pUsersVacation_subject'] = 'Gaia';
$PALANG['pUsersVacation_subject_text'] = 'Lanetik kanpo';
-$PALANG['pUsersVacation_body'] = 'Gorputza';
+$PALANG['pUsersVacation_body'] = 'Gorputza'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
<date>-tik <date> arte kanpoan egongo naiz.
Larrialdiko gaientzat, hemen <contact person> kontakta dezakezu nirekin.
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/fi.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -23,7 +23,7 @@
$PALANG['pLogin_username'] = 'Tunnus';
$PALANG['pLogin_password'] = 'Salasana';
$PALANG['pLogin_button'] = 'Kirjaudu';
-$PALANG['pLogin_failed'] = '<span class="error_msg">Sähköpostiosoite tai salasana väärin!</span>';
+$PALANG['pLogin_failed'] = 'Sähköpostiosoite tai salasana väärin!';
$PALANG['pLogin_login_users'] = 'Käyttäjien kirjautuminen.';
$PALANG['pMenu_main'] = 'Etusivu';
@@ -338,7 +338,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Sinulla on jo automaattivastaus päällä!';
$PALANG['pUsersVacation_subject'] = 'Otsikko';
$PALANG['pUsersVacation_subject_text'] = 'Lomalla';
-$PALANG['pUsersVacation_body'] = 'Viesti';
+$PALANG['pUsersVacation_body'] = 'Viesti'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Olen lomalla <päiväys> <päiväys> välisen ajan.
Kiireellisissä asioissa voitte ottaa yhteyttä <sähköpostiosoite>.
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/fo.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -22,8 +22,7 @@
$PALANG['pLogin_username'] = 'Login (e-post)';
$PALANG['pLogin_password'] = 'Loyniorð';
$PALANG['pLogin_button'] = 'Logga inn';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Títt login er skeivt. Minst til at skriva fulla e-post adressu!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Títt loyniorð er skeivt!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Brúkarar kunnu logga inn her.';
$PALANG['pMenu_main'] = 'Main'; # XXX
@@ -339,7 +338,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Tú hevur longu eini frítíðarboð uppsett!';
$PALANG['pUsersVacation_subject'] = 'Evni';
$PALANG['pUsersVacation_subject_text'] = 'Out of Office';
-$PALANG['pUsersVacation_body'] = 'Boð';
+$PALANG['pUsersVacation_body'] = 'Boð'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
I will be away from <dagfesting> until <dagfesting>.
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/fr.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -24,8 +24,7 @@
$PALANG['pLogin_username'] = 'Adresse courriel';
$PALANG['pLogin_password'] = 'Mot de passe';
$PALANG['pLogin_button'] = 'Entrer';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Votre adresse courriel est invalide. Assurez-vous de saisir correctement l\'adresse courriel.</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Votre mot de passe est invalide !</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Utilisateurs, cliquez ici pour rejoindre votre section.';
$PALANG['pMenu_main'] = 'Menu principal';
@@ -341,7 +340,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Votre repondeur automatique est déjà configuré!';
$PALANG['pUsersVacation_subject'] = 'Sujet';
$PALANG['pUsersVacation_subject_text'] = 'En dehors du bureau';
-$PALANG['pUsersVacation_body'] = ''; # XXX
+$PALANG['pUsersVacation_body'] = 'Message'; # XXX
$PALANG['pUsersVacation_body_text'] = <<<EOM
Je serai absent(e) de <date> jusqu\'au <date>.
Pour toute urgence, merci de contacter <contact person>.
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/hr.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -21,8 +21,7 @@
$PALANG['pLogin_username'] = 'Korisničko ime (adresa e-pote)';
$PALANG['pLogin_password'] = 'Lozinka';
$PALANG['pLogin_button'] = 'Prijavi';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Korisnicko ime nije točno. Morate se prijaviti sa adresom vae e-pote!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Lozinka nije točna!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Korisnici kliknite ovdje za prijavu u korisničku sekciju.';
$PALANG['pMenu_main'] = 'Main'; # XXX
@@ -338,7 +337,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Obvijest o odsutnosti je već postavljena!';
$PALANG['pUsersVacation_subject'] = 'Subjekt';
$PALANG['pUsersVacation_subject_text'] = 'Odsutnost';
-$PALANG['pUsersVacation_body'] = 'Tekst';
+$PALANG['pUsersVacation_body'] = 'Tekst'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Od <datum> do <datum> sam odsutan.
Za hitne stvari molim vas da kontaktirate <kontaktna osoba>.
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/hu.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -23,8 +23,7 @@
$PALANG['pLogin_username'] = 'Bejelentkezés (email)';
$PALANG['pLogin_password'] = 'Jelszó';
$PALANG['pLogin_button'] = 'Bejelentkezés';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">A bejelentkezés érvénytelen. Biztos, hogy a saját email címeddel akarsz belépni?!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Nem jó a jelszó!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'A felhasználók kattintsanak ide a felhasználói felülethez.';
$PALANG['pMenu_main'] = 'Főmenü';
@@ -345,7 +344,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Már van be állítva automatikus válasz !';
$PALANG['pUsersVacation_subject'] = 'Tárgy';
$PALANG['pUsersVacation_subject_text'] = 'Sajnálom, de jelenleg nem vagyok email közelben!';
-$PALANG['pUsersVacation_body'] = 'Üzenet';
+$PALANG['pUsersVacation_body'] = 'Üzenet'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Üdvözlöm. Sajnálom de jelenleg nem vagyok email közelben.
Ettõl - Eddig.
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/is.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -22,8 +22,7 @@
$PALANG['pLogin_username'] = 'Auðkenni(email)';
$PALANG['pLogin_password'] = 'Lykilorð';
$PALANG['pLogin_button'] = 'Tengjast';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Auðkenni þitt er rangt, ath hvort þú hafir slegið það rangt inn og prófaðu aftur, ath notaðu fullt email til að tengjas!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Lykilorðið var rangt!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Notendur smellið hér til að opna almennt notendaviðmót.';
$PALANG['pMenu_main'] = 'Main'; # XXX
@@ -338,7 +337,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Þú hefur nú þegar skilgreint sjálfvirk skilaboð!';
$PALANG['pUsersVacation_subject'] = 'Meginmál - Subject';
$PALANG['pUsersVacation_subject_text'] = 'Er ekki við - Out of Office';
-$PALANG['pUsersVacation_body'] = 'Meginmál';
+$PALANG['pUsersVacation_body'] = 'Meginmál'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Ég er ekki við frá <date> og til <date>. I will be away from <date> until <date>.
Ef mikið liggur við, geturðu haft samaband við <contact person>. For urgent matters you can contact <contact person>.
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/it.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -23,8 +23,7 @@
$PALANG['pLogin_username'] = 'Nome utente (email)';
$PALANG['pLogin_password'] = 'Password';
$PALANG['pLogin_button'] = 'Entra';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Il tuo nome utente non è corretto. Assicurati di avere inserito il tuo indirizzo email corretto!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">La tua password non è corretta!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'GLi utenti devono cliccare qui per entrare nella propria sezione.';
$PALANG['pMenu_main'] = 'Principale';
@@ -340,7 +339,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Hai gi$agrave; un autoresponditore configurato';
$PALANG['pUsersVacation_subject'] = 'Soggetto';
$PALANG['pUsersVacation_subject_text'] = 'Assente dall\'ufficio';
-$PALANG['pUsersVacation_body'] = 'Corpo';
+$PALANG['pUsersVacation_body'] = 'Corpo'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Sarò assente dal <data> al <data>.
Per problemi urgenti potete contattare <persona da contattare>.
Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/ja.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -24,8 +24,7 @@
$PALANG['pLogin_username'] = 'ログイン (メールアドレス)';
$PALANG['pLogin_password'] = 'パスワード';
$PALANG['pLogin_button'] = 'ログイン';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">ログインが違います。正しいメールアドレスを入力してください。</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">パスワードが違います。</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = '一般ユーザのログインはここをクリックしてください。';
$PALANG['pMenu_main'] = 'メイン';
@@ -345,7 +344,7 @@
$PALANG['pUsersVacation_welcome_text'] = '既に自動応答を構成してあります。';
$PALANG['pUsersVacation_subject'] = '件名';
$PALANG['pUsersVacation_subject_text'] = '不在';
-$PALANG['pUsersVacation_body'] = '本文';
+$PALANG['pUsersVacation_body'] = '本文'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
私は <date> から <date> まで不在です。
緊急事項は <contact person> まで連絡してください。
Modified: trunk/languages/language-update.sh
===================================================================
--- trunk/languages/language-update.sh 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/language-update.sh 2009-01-25 20:53:11 UTC (rev 550)
@@ -33,7 +33,7 @@
grep -v 'No newline at end of file' "$file.diff" | while read line ; do
greptext="$(echo $line | sed 's/^[+ -]//')"
- grepresult=$(grep "'$greptext'" en.lang) || grepresult="***DEFAULT*** $line"
+ grepresult=$(grep "'$greptext'" en.lang) || grepresult="***DEFAULT - $greptext dropped from en.lang? *** $line"
grepresult2=$(grep "'$greptext'" $file) || grepresult2="$grepresult"
case "$line" in
---*)
@@ -105,6 +105,27 @@
} # end rename_string()
+function remove_string() {
+ for file in $filelist ; do
+ line="$(grep "PALANG\['$remove_string'\]" "$file")" || {
+ echo "*** $file does not contain \$PALANG['$remove_string'] ***" >&2
+ continue
+ }
+
+ # create patch
+ echo "
+--- $file.old
++++ $file
+@@ -1,1 +1,0 @@
+-$line
+ " > "$file.patch"
+
+ test $patch = 0 && cat $file.patch
+ test $patch = 1 && patch $file < $file.patch
+ done
+} # end remove_string()
+
+
function addcomment() {
for file in $filelist ; do
test "$file" = "en.lang" && { echo "*** skipping en.lang ***"; continue ; } >&2
@@ -208,6 +229,11 @@
Rename $PALANG['"'"'old_string'"'"'] to $PALANG['"'"'new_string'"'"']
+'"$0"' --remove string [--patch] [--nocleanup] [foo.lang [bar.lang [...] ] ]
+
+ Remove $PALANG['"'"'string'"'"'] from language files
+
+
'"$0"' --addcomment string comment [--patch] [--nocleanup] [foo.lang [bar.lang [...] ] ]
Add a comment to $PALANG['"'"'string'"'"']
@@ -251,6 +277,7 @@
forcepatch=0 # no forcepatch by default
nocleanup=0 # don't delete tempfiles
rename=0 # rename a string
+remove=0 # remove a string
stats=0 # create translation statistics
addcomment=0 # add translation comment
text=''
@@ -282,6 +309,11 @@
echo "$rename_new" | grep '^[a-z_-]*\.lang$' && rename_new='' # error out on *.lang - probably a filename
test -z "$rename_new" && { echo '--rename needs two parameters' >&2 ; exit 1 ; }
;;
+ --remove)
+ remove=1
+ shift ; remove_string="$1"
+ test -z "$remove-string" && { echo '--remove needs a parameter' >&2 ; exit 1 ; }
+ ;;
--addcomment)
addcomment=1
shift ; text="$1"
@@ -314,6 +346,7 @@
test "$addcomment" = 1 && { addcomment ; cleanup ; exit 0 ; }
test "$rename" = 1 && { rename_string ; cleanup ; exit 0 ; }
+test "$remove" = 1 && { remove_string ; cleanup ; exit 0 ; }
test "$forcepatch" = 1 && { forcepatch ; cleanup ; exit 0 ; }
test "$stats" = 1 && { statistics ; exit 0 ; }
Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/lt.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -21,8 +21,7 @@
$PALANG['pLogin_username'] = 'Vartotojas (el.paštas)';
$PALANG['pLogin_password'] = 'Slaptažodis';
$PALANG['pLogin_button'] = 'Prisijungti';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Prisijungti nepavyko. Vartotojo lauke įveskite srities pašto administratoriaus el.pašto adresą!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Slaptažodis neteisingas!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Pašto vartotojo nustatymai.';
$PALANG['pMenu_main'] = 'Main'; # XXX
@@ -338,7 +337,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Auto atsakiklis jau nustatytas!';
$PALANG['pUsersVacation_subject'] = 'Tema';
$PALANG['pUsersVacation_subject_text'] = 'Esu išvykęs';
-$PALANG['pUsersVacation_body'] = 'Žinutė';
+$PALANG['pUsersVacation_body'] = 'Žinutė'; # XXX text changed to 'Message'
### XXX (see below)
$PALANG['pUsersVacation_body_text'] = <<<EOM
I will be away from <date> until <date>.
Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/mk.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -22,8 +22,7 @@
$PALANG['pLogin_username'] = 'Корисничко име (email)';
$PALANG['pLogin_password'] = 'Лозинка';
$PALANG['pLogin_button'] = 'Пријава';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Погрешно корисничко име. Логирајте се со вашата e-mail адреса!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Погрешна лозинка!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Логин за обични корисници.';
$PALANG['pMenu_main'] = 'Main'; # XXX
@@ -340,7 +339,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Веќе имате конфигуриран автоматски одговор!';
$PALANG['pUsersVacation_subject'] = 'Тема';
$PALANG['pUsersVacation_subject_text'] = 'Отсутен';
-$PALANG['pUsersVacation_body'] = 'Содржина';
+$PALANG['pUsersVacation_body'] = 'Содржина'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Ќе бидам отсутен од <date> до <date>.
За итни случаи контактирајте со <contact person>.
Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/nb.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -24,8 +24,7 @@
$PALANG['pLogin_username'] = 'Brukernavn (e-postadresse)';
$PALANG['pLogin_password'] = 'Passord';
$PALANG['pLogin_button'] = 'Logg inn';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Påloggingsinformasjonen er ikke korrekt. Husk å bruke e-postadressen som brukernavn.</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Feil passord!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Vanlige brukere kan klikke her for å gå til brukerseksjonen.';
$PALANG['pMenu_main'] = 'Hoved';
@@ -340,7 +339,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Du har allerede et autosvar aktivert!';
$PALANG['pUsersVacation_subject'] = 'Emne';
$PALANG['pUsersVacation_subject_text'] = 'Fraværsmelding';
-$PALANG['pUsersVacation_body'] = 'Meldingstekst';
+$PALANG['pUsersVacation_body'] = 'Meldingstekst'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Jeg er utilgjengelig fra <date> til <date>.
Dersom det gjelder noe viktig kan du kontakte <contact person>.
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/nl.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -23,8 +23,7 @@
$PALANG['pLogin_username'] = 'Login (e-mail)';
$PALANG['pLogin_password'] = 'Wachtwoord';
$PALANG['pLogin_button'] = 'Login';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Foutieve login. U dient in te loggen met uw e-mail adres!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Foutief wachtwoord.!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Gebruikers klik hier om in te loggen.';
$PALANG['pMenu_main'] = 'Start';
Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/nn.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -22,8 +22,7 @@
$PALANG['pLogin_username'] = 'Brukernavn (e-postadressen)';
$PALANG['pLogin_password'] = 'Passord';
$PALANG['pLogin_button'] = 'Logg inn';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Ditt brukernavn er feil. Logg inn med e-postadressen din som brukernavn!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Passordet er feil!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Brukare, trykk her for å gå til bruker-seksjonen.';
$PALANG['pMenu_main'] = 'Main'; # XXX
@@ -336,7 +335,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Du har allerede autosvar!';
$PALANG['pUsersVacation_subject'] = 'Emne';
$PALANG['pUsersVacation_subject_text'] = 'Ikke tilstede';
-$PALANG['pUsersVacation_body'] = 'Melding';
+$PALANG['pUsersVacation_body'] = 'Melding'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Jeg vil være utilgjengelig fra <date> til <date>.
For viktige henvendelser kan du kontakte <contact person>.
Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/pl.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -24,8 +24,7 @@
$PALANG['pLogin_username'] = 'Login (email)';
$PALANG['pLogin_password'] = 'Hasło';
$PALANG['pLogin_button'] = 'Zaloguj';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Twój login jest niepoprawny!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Twoje hasło jest niepoprawne!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Sekcja przeznaczona dla użytkowników.';
$PALANG['pMenu_main'] = 'Strona główna';
@@ -343,7 +342,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Masz już skonfigurowaną auto odpowiedź!';
$PALANG['pUsersVacation_subject'] = 'Temat';
$PALANG['pUsersVacation_subject_text'] = 'Poza biurem';
-$PALANG['pUsersVacation_body'] = 'Tekst';
+$PALANG['pUsersVacation_body'] = 'Tekst'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Będę nieobecny od <date> do <date>.
Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/pt-br.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -24,8 +24,7 @@
$PALANG['pLogin_username'] = 'Usuário (email)';
$PALANG['pLogin_password'] = 'Senha';
$PALANG['pLogin_button'] = 'Entrar';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Usuário inválido. Certifique-se de ter digitado o email corretamente!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Senha inválida!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Usuários devem clicar aqui para acessar a seção de usuários.';
$PALANG['pMenu_main'] = 'Menu Principal';
Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/ru.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -25,8 +25,7 @@
$PALANG['pLogin_username'] = 'Имя (название ящика)';
$PALANG['pLogin_password'] = 'Пароль';
$PALANG['pLogin_button'] = 'Войти';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Неправильное имя. Проверьте, правильно ли вы ввели имя (название ящика)!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Введен неправильный пароль!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Вход для обычных пользователей.';
$PALANG['pMenu_main'] = 'Главная';
@@ -347,7 +346,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'У вас уже есть настроенный автоответчик!';
$PALANG['pUsersVacation_subject'] = 'Тема';
$PALANG['pUsersVacation_subject_text'] = 'Вне офиса';
-$PALANG['pUsersVacation_body'] = 'Текст';
+$PALANG['pUsersVacation_body'] = 'Текст'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Я буду отсутствовать с <даты> по <дату>.
По срочным вопросам вы можете обратиться к <контактному лицу>.
Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/sk.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -22,8 +22,7 @@
$PALANG['pLogin_username'] = 'Užívateľské meno (email)';
$PALANG['pLogin_password'] = 'Heslo';
$PALANG['pLogin_button'] = 'Prihlásiť';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Nesprávne; uživateľské meno. Prihlasujte se svojou emailovou adresou!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Nesprávne heslo!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Vstup do užívateľskej sekcie.';
$PALANG['pMenu_main'] = 'Main'; # XXX
@@ -339,7 +338,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Už máate nastavenú automatickú odpoveď!';
$PALANG['pUsersVacation_subject'] = 'Predmet';
$PALANG['pUsersVacation_subject_text'] = 'Dovolenka';
-$PALANG['pUsersVacation_body'] = 'Obsah';
+$PALANG['pUsersVacation_body'] = 'Obsah'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Som na dovolenke od <date> od <date>.
S neodkladnými zprávami kontaktujte <contact person>.
Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/sl.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -22,8 +22,7 @@
$PALANG['pLogin_username'] = 'Uporabniško ime (e-poštni naslov)';
$PALANG['pLogin_password'] = 'Geslo';
$PALANG['pLogin_button'] = 'Prijavi';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Uporabniško ime ni pravilno. Prijaviti se morate z vašim e-poštnim naslovom!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Geslo ni pravilno!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Uporabniki kliknite tukaj, če želite nastaviti odsotnost ali spremeniti geslo.';
$PALANG['pMenu_main'] = 'Main'; # XXX
@@ -339,7 +338,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Obvestilo o odsotnosti imate že nastavljeno!';
$PALANG['pUsersVacation_subject'] = 'Zadeva';
$PALANG['pUsersVacation_subject_text'] = 'Odsotnost';
-$PALANG['pUsersVacation_body'] = 'Besedilo';
+$PALANG['pUsersVacation_body'] = 'Besedilo'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Od <datum> do <datum> sem odsoten.
Za nujne zadeve prosim kontaktirajte <kontaktna oseba>.
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/sv.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -24,8 +24,7 @@
$PALANG['pLogin_username'] = 'Login (epost)';
$PALANG['pLogin_password'] = 'Lösenord';
$PALANG['pLogin_button'] = 'Login';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Ditt login är ej korrekt. Logga in med din epostadress!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Du angav fel lösenord!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Användare klickar här för att logga in på användardelen.';
$PALANG['pMenu_main'] = 'Huvudmeny';
@@ -341,7 +340,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Du har redan ett autosvar meddelande definierat!';
$PALANG['pUsersVacation_subject'] = 'Ärende';
$PALANG['pUsersVacation_subject_text'] = 'Out of Office';
-$PALANG['pUsersVacation_body'] = 'Text';
+$PALANG['pUsersVacation_body'] = 'Text'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Jag är borta från <datum> till <datum>.
För brådskande ärenden kan ni kontakta <kontakt person>.
Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/tr.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -22,8 +22,7 @@
$PALANG['pLogin_username'] = 'Kullanýcý adý (eposta)';
$PALANG['pLogin_password'] = 'Þifre';
$PALANG['pLogin_button'] = 'Giriþ';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Kullanýcý adnýnýz doðru deðil. E-posta adresinizi kontrol ediniz.</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Þifreniz doðru deðil!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = 'Kullanýcý iþlemlerine girmek için burayý kullanýnýz.';
$PALANG['pMenu_main'] = 'Main'; # XXX
@@ -339,7 +338,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Zaten bir otomatik cevaplamanýz bulunmakta!';
$PALANG['pUsersVacation_subject'] = 'konu';
$PALANG['pUsersVacation_subject_text'] = 'Ofis dýþýnda';
-$PALANG['pUsersVacation_body'] = 'Metin';
+$PALANG['pUsersVacation_body'] = 'Metin'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
<date> tarihinden den <date> ine burada bulunmayacaðým.
Acil durumlarda lütfen <contact person> a baþvurunuz.
Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/languages/tw.lang 2009-01-25 20:53:11 UTC (rev 550)
@@ -22,8 +22,7 @@
$PALANG['pLogin_username'] = '帳號 (郵件地址)';
$PALANG['pLogin_password'] = '密碼';
$PALANG['pLogin_button'] = '登錄';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">登錄失敗, 請確認你是使用你的郵件地址登錄!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">密碼錯誤!</span>';
+$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX
$PALANG['pLogin_login_users'] = '普通用戶點擊這裡進入用戶控制面板.';
$PALANG['pMenu_main'] = 'Main'; # XXX
@@ -339,7 +338,7 @@
$PALANG['pUsersVacation_welcome_text'] = '你已經設置了自動回復!';
$PALANG['pUsersVacation_subject'] = '主題';
$PALANG['pUsersVacation_subject_text'] = '我現在無法回信';
-$PALANG['pUsersVacation_body'] = '內容';
+$PALANG['pUsersVacation_body'] = '內容'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
我在 <date> 到 <date> 這段時間內暫時無法回信.
如果你有急事請與 <contact person> 聯繫.
Modified: trunk/login.php
===================================================================
--- trunk/login.php 2009-01-25 20:16:05 UTC (rev 549)
+++ trunk/login.php 2009-01-25 20:53:11 UTC (rev 550)
@@ -71,14 +71,14 @@
if ($result['rows'] != 1)
{
$error = 1;
- $tMessage = $PALANG['pLogin_failed'];
+ $tMessage = '<span class="error_msg">' . $PALANG['pLogin_failed'] . '</span>';
$tUsername = $fUsername;
}
}
else
{
$error = 1;
- $tMessage = $PALANG['pLogin_failed'];
+ $tMessage = '<span class="error_msg">' . $PALANG['pLogin_failed'] . '</span>';
}
if ($error != 1)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-01-25 20:16:15
|
Revision: 549
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=549&view=rev
Author: christian_boltz
Date: 2009-01-25 20:16:05 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
de.lang:
- translated several texts
Modified Paths:
--------------
trunk/languages/de.lang
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2009-01-24 21:30:51 UTC (rev 548)
+++ trunk/languages/de.lang 2009-01-25 20:16:05 UTC (rev 549)
@@ -31,7 +31,7 @@
$PALANG['pMenu_main'] = 'Startseite';
$PALANG['pMenu_overview'] = 'Überblick';
$PALANG['pMenu_create_alias'] = 'Alias hinzufügen';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['pMenu_create_alias_domain'] = 'Alias-Domain hinzufügen';
$PALANG['pMenu_create_mailbox'] = 'Mailbox hinzufügen';
$PALANG['pMenu_fetchmail'] = 'E-Mail Abruf';
$PALANG['pMenu_sendmail'] = 'Email versenden';
@@ -48,27 +48,27 @@
$PALANG['pMain_viewlog'] = 'Lassen Sie sich das Log anzeigen.';
$PALANG['pMain_logout'] = 'Ausloggen aus dem System';
-$PALANG['pOverview_disabled'] = 'Disabled';
-$PALANG['pOverview_unlimited'] = 'Unlimited';
-$PALANG['pOverview_title'] = ':: Defined Domains';
-$PALANG['pOverview_up_arrow'] = 'Go Top';
+$PALANG['pOverview_disabled'] = 'Deaktiviert';
+$PALANG['pOverview_unlimited'] = 'Unbegrenzt';
+$PALANG['pOverview_title'] = ':: Eingerichtete Domains';
+$PALANG['pOverview_up_arrow'] = 'nach oben';
$PALANG['pOverview_right_arrow'] = 'Nächste Seite';
$PALANG['pOverview_left_arrow'] = 'Vorherige Seite';
-$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
+$PALANG['pOverview_alias_domain_title'] = ':: Alias-Domains';
$PALANG['pOverview_alias_title'] = ':: Alias';
$PALANG['pOverview_mailbox_title'] = ':: Mailboxen';
$PALANG['pOverview_button'] = 'Los';
$PALANG['pOverview_welcome'] = 'Überblick über ';
-$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias-Domains';
+$PALANG['pOverview_alias_domain_target'] = '%s ist eine Alias-Domain für:';
$PALANG['pOverview_alias_alias_count'] = 'Aliase';
$PALANG['pOverview_alias_mailbox_count'] = 'Mailboxen';
$PALANG['pOverview_alias_address'] = 'Von';
$PALANG['pOverview_alias_goto'] = 'An';
$PALANG['pOverview_alias_modified'] = 'Zuletzt verändert';
-$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
+$PALANG['pOverview_alias_domain_modified'] = 'Zuletzt geändert';
$PALANG['pOverview_alias_active'] = 'Aktiv';
-$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_domain_active'] = 'Aktiv';
$PALANG['pOverview_alias_edit'] = 'Alias';
$PALANG['and_x_more'] = '[und %s weitere...]';
$PALANG['pOverview_mailbox_username'] = 'Email';
@@ -81,7 +81,7 @@
$PALANG['pOverview_get_domain'] = 'Domain';
$PALANG['pOverview_get_aliases'] = 'Aliases';
-$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
+$PALANG['pOverview_get_alias_domains'] = 'Alias-Domains';
$PALANG['pOverview_get_mailboxes'] = 'Mailboxen';
$PALANG['pOverview_get_quota'] = 'Mailbox Quota (MB)';
$PALANG['pOverview_get_modified'] = 'Zuletzt verändert';
@@ -90,20 +90,20 @@
$PALANG['pDelete_delete_success'] = '%s gelöscht.';
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Mailbox konnte nicht gelöscht werden ';
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Diese Domain gehört nicht Ihnen ';
-$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Diese Domain gehört nicht Ihnen ';
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Alias konnte nicht gelöscht werden ';
-$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
-$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
-$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
-$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
-$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
-$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
-$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
-$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
-$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
-$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
+$PALANG['pCreate_alias_domain_welcome'] = 'Adressen einer Ihrer Domains auf eine andere Domain weiterleiten.';
+$PALANG['pCreate_alias_domain_alias'] = 'Alias-Domain';
+$PALANG['pCreate_alias_domain_alias_text'] = 'Die Domain, für die Mails hereinkommen.';
+$PALANG['pCreate_alias_domain_target'] = 'Zieldomain';
+$PALANG['pCreate_alias_domain_target_text'] = 'Die Domain, an die die Mails gehen sollen.';
+$PALANG['pCreate_alias_domain_active'] = 'Aktiv';
+$PALANG['pCreate_alias_domain_button'] = 'Alias-Domain hinzufügen';
+$PALANG['pCreate_alias_domain_error1'] = 'Sie dürfen die gewählte Konfiguration nicht erstellen.';
+$PALANG['pCreate_alias_domain_error2'] = 'Die gewählte Konfiguration ist ungültig, bitte wählen Sie eine andere';
+$PALANG['pCreate_alias_domain_error3'] = 'Datenbank-Eintrag fehlgeschlagen.';
+$PALANG['pCreate_alias_domain_error4'] = 'Alle Domains sind bereits Alias-Domains.';
+$PALANG['pCreate_alias_domain_success'] = 'Die Alias-Domain wurde in der Datenbank eingetragen!';
$PALANG['pCreate_alias_welcome'] = 'Neuen Alias für Ihre Domain anlegen';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -127,7 +127,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Sie haben im "To"-Feld nichts angegeben!</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Die angegebene eMail-Adresse ist nicht korrekt: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Diese Domain gehört nicht Ihnen: ';
-$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Alias-Domain kann nicht geändert werden!</span>';
$PALANG['pEdit_alias_forward_and_store'] = 'Mail in der lokalen Mailbox ablegen.';
$PALANG['pEdit_alias_forward_only'] = 'Nur zur angegebenen Adresse weiterleiten.';
$PALANG['pEdit_alias_button'] = 'Alias ändern';
@@ -200,12 +200,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'Mailbox bearbeiten';
$PALANG['pViewlog_action_edit_mailbox_state'] = 'Mailbox Aktiv bearbeiten';
$PALANG['pViewlog_action_create_alias'] = 'Alias erstellen';
-$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
+$PALANG['pViewlog_action_create_alias_domain'] = 'Alias-Domain erstellen';
$PALANG['pViewlog_action_delete_alias'] = 'Alias löschen';
-$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
+$PALANG['pViewlog_action_delete_alias_domain'] = 'Alias-Domain löschen';
$PALANG['pViewlog_action_edit_alias'] = 'Alias bearbeiten';
$PALANG['pViewlog_action_edit_alias_state'] = 'Alias Aktiv bearbeiten';
-$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'Alias-Domain Aktiv bearbeiten';
$PALANG['pViewlog_action_edit_password'] = 'Passwort ändern';
$PALANG['pViewlog_button'] = 'Los';
@@ -283,7 +283,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Domain wurde angelegt!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Domain konnte nicht gelöscht werden!</span>';
-$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Alias-Domain konnte nicht gelöscht werden!</span>';
$PALANG['pAdminEdit_domain_welcome'] = 'Domain editieren';
$PALANG['pAdminEdit_domain_domain'] = 'Domain';
@@ -320,7 +320,7 @@
$PALANG['pAdminEdit_admin_password2'] = 'Passwort (nochmal)';
$PALANG['pAdminEdit_admin_password_text_error'] = '<span class="error_msg">Die beiden Passwörter sind nicht identisch<br />Oder leer!</span>';
$PALANG['pAdminEdit_admin_active'] = 'Aktiv';
-$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
+$PALANG['pAdminEdit_admin_super_admin'] = 'Super-Admin';
$PALANG['pAdminEdit_admin_button'] = 'Admin editieren';
$PALANG['pAdminEdit_admin_result_error'] = '<span class="error_msg">Konnte Admin nicht ändern</span>';
$PALANG['pAdminEdit_admin_result_success'] = 'Admin geändert!';
@@ -345,7 +345,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'Sie haben schon eine Automatische Antwort konfiguriert!';
$PALANG['pUsersVacation_subject'] = 'Betreff';
$PALANG['pUsersVacation_subject_text'] = 'Ich bin weg...';
-$PALANG['pUsersVacation_body'] = 'Text';
+$PALANG['pUsersVacation_body'] = 'Nachricht';
$PALANG['pUsersVacation_body_text'] = <<<EOM
Ich bin vom <date> bis <date> nicht zu Hause / im Büro.
In dringenden Fällen setzen Sie sich bitte mit <contact person> in Verbindung.
@@ -385,9 +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['pInvalidDomainRegex'] = "Ungültiger Domainname %s - Überprüfung per RegEx fehlgeschlagen";
+$PALANG['pInvalidDomainDNS'] = "Ungültige Domain %s - nicht per DNS auflösbar";
+$PALANG['pInvalidMailRegex'] = "Ungültige Mailadresse - Überprüfung per RegEx fehlgeschlagen";
$PALANG['pFetchmail_welcome'] = 'E-Mail Abruf für: ';
$PALANG['pFetchmail_new_entry'] = 'Neuer Eintrag';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2009-01-24 22:22:06
|
Revision: 548
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=548&view=rev
Author: GingerDog
Date: 2009-01-24 21:30:51 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
new branch for amavis stuff... here is wishful thinking (branch from trunk revision 547)
Revision Links:
--------------
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=547&view=rev
Added Paths:
-----------
branches/postfixadmin-amavis/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2009-01-24 15:44:44
|
Revision: 547
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=547&view=rev
Author: GingerDog
Date: 2009-01-24 15:44:41 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
quota_usage.pl: update from Jose Nilton <jni...@gm...> - add print of total domain and total mailbox
Modified Paths:
--------------
trunk/ADDITIONS/quota_usage.pl
Modified: trunk/ADDITIONS/quota_usage.pl
===================================================================
--- trunk/ADDITIONS/quota_usage.pl 2009-01-24 15:39:32 UTC (rev 546)
+++ trunk/ADDITIONS/quota_usage.pl 2009-01-24 15:44:41 UTC (rev 547)
@@ -1,16 +1,18 @@
#!/usr/bin/perl
# vim:ts=4:sw=4:et
-#
+# Virtual quota_usage 0.3
# Contributed to Postfixadmin by Jose Nilton <jni...@gm...>
#
# See also : http://www.russelldare.net/media/perl/dirsizeSource.pdf
# License: GPL v2.
# Usage:
-# perl quota_usage.pl --list or
-# perl quota_usage.pl --addmysql for add mysql database postfix
+# perl quota_usage.pl --list
+# perl quota_usage.pl --list --addmysql
+# for add mysql database postfix
#
-# Requires: perl perl-DBD-mysql perl-DBD (may be named differently depending on your platform).
+# Requirements - the following perl modules are required:
+# DBD::Pg or DBD::mysql; perl perl-DBD-mysql perl-DBD (may be named differently depending on your platform).
# and the 'du' binary in $ENV{'PATH'} (see below).
#
# You will need to modify the postfix DATABASE to add a quota_usage column.
@@ -35,61 +37,43 @@
my $db_password = '123456';
my $root_path = '/home/vmail';
# Pg or mysql
-my $db_type = 'Pg';
+my $db_type = 'mysql';
##END EDIT##
+(help()) if (!$ARGV[0]);
+
$ENV{'PATH'} = "/sbin:/bin:/usr/sbin:/usr/bin";
my($domain_dir, $full_domain_dir, $user_dir, $usage, $email, $sql, $dbh);
-GetOptions ('list' => \&list_quota_usage, 'addmysql' => \&insert_to_db);
+my $list = 0;
+my $insert_db = 0;
+my $total_mailbox = 0;
+my $total_domain = 0;
+GetOptions ('l|list' => \$list, 'i|addmysql' => \$insert_db, 'help|h|man' => \&help) or (help());
-sub list_quota_usage {
- opendir(DOMAINDIR, $root_path) or die ("Unable to access directory '$root_path' ($!)");
- foreach $domain_dir (sort readdir DOMAINDIR) {
- next if $domain_dir =~ /^\./; # skip dotted dirs
- $full_domain_dir = "$root_path/$domain_dir"; #print "$full_domain_dir\n";
+(list_quota_usage()) if ($list == 1 || $insert_db == 1 );
- opendir(USERDIR, $full_domain_dir) or die ("Unable to access directory '$full_domain_dir' ($!)");
- foreach $user_dir (sort readdir USERDIR) {
- next if $user_dir =~ /^\./; # skip dotted dirs
- $email = "$user_dir\@$domain_dir";
- my $i = `du -0 --summarize $full_domain_dir/$user_dir`;
- ($usage) = split(" ", $i);
- if ($usage < 100) {
- $usage = 0;
- } elsif ($usage < 1000) {
- $usage = 1;
- } else {
- $usage = $usage + 500;
- $usage = int $usage / 1000;
- }
+sub list_quota_usage {
+ opendir(DOMAINDIR, $root_path) or die ("Unable to access directory '$root_path' ($!)");
- list_out();
- }
+ if($insert_db == 1){
+ $dbh = DBI->connect("DBI:$db_type:database=$db_database;host=$db_host", $db_user, $db_password) or die ("cannot connect the database");
+ execSql("UPDATE mailbox set quota_usage = 0");
}
- close(DOMAINDIR);
- close(USERDIR);
-}
-
-sub insert_to_db {
- opendir(DOMAINDIR, $root_path) or die ("Unable to access directory '$root_path' ($!)");
-
- $dbh = DBI->connect("DBI:$db_type:database=$db_database;host=$db_host", $db_user, $db_password) or die ("cannot connect the database");
- execSql("UPDATE mailbox set quota_usage = 0");
-
-
foreach $domain_dir (sort readdir DOMAINDIR) {
- next if $domain_dir =~ /^\./; # skip dotted dirs
- $full_domain_dir = "$root_path/$domain_dir"; #print "$full_domain_dir\n";
+ next if $domain_dir =~ /^\./; # skip dotted dirs
+ $full_domain_dir = "$root_path/$domain_dir"; #print "$full_domain_dir\n";
+ $total_domain++;
opendir(USERDIR, $full_domain_dir) or die ("Unable to access directory '$full_domain_dir' ($!)");
foreach $user_dir (sort readdir USERDIR) {
next if $user_dir =~ /^\./; # skip dotted dirs
- $email = "$user_dir\@$domain_dir";
+ $email = "$user_dir\@$domain_dir";
+ $total_mailbox++;
my $i = `du -0 --summarize $full_domain_dir/$user_dir`;
($usage) = split(" ", $i);
@@ -102,39 +86,66 @@
$usage = $usage + 500;
$usage = int $usage / 1000;
}
+ if($insert_db == 1){execSql("UPDATE mailbox set quota_usage = $usage, quota_usage_date = CAST(NOW() AS DATE) WHERE username = '$email'");}
+ print_list() if ($list == 1);
- execSql("UPDATE mailbox set quota_usage = $usage, quota_usage_date = CAST(NOW() AS DATE) WHERE username = '$email'");
-#list_out(); #Debug
}
-
}
-
close(DOMAINDIR);
close(USERDIR);
+ (print_total()) if ($list == 1);
+
}
+
+
+
sub execSql {
my $sql = shift;
my $ex;
$ex = $dbh->do($sql) or die ("error when running $sql");
}
-sub list_out {
+
+
+sub print_total{
+ print "---------------------------------------------------------\n";
+ print "TOTAL DOMAIN\t\t\t\tTOTAL MAILBOX\n";
+ print "---------------------------------------------------------\n";
+ print "$total_domain\t\t\t\t\t\t$total_mailbox\n";
+}
+
+
+
+sub print_list {
format STDOUT_TOP =
Report of Quota Used
---------------------------
+---------------------------------------------------------
EMAIL QUOTA USED
-------------------------------------------------------------------
+---------------------------------------------------------
.
format =
-@<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<
-$email, "$usage\bMB"
+@<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<
+$email, "$usage MB"
.
write;
}
+
+
+
+
+sub help {
+ print "$0 [options...]\n";
+ print "-l|--list List quota used\n";
+ print "-i|--addmysql For insert quota used in database mysql\n";
+
+}
+
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2009-01-24 15:39:37
|
Revision: 546
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=546&view=rev
Author: GingerDog
Date: 2009-01-24 15:39:32 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
nb.lang: patch from Odd Henriksen - oddhenriksen - see https://sourceforge.net/tracker/index.php?func=detail&aid=2532202&group_id=191583&atid=937966 - thanks
Modified Paths:
--------------
trunk/languages/nb.lang
Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang 2009-01-23 23:12:50 UTC (rev 545)
+++ trunk/languages/nb.lang 2009-01-24 15:39:32 UTC (rev 546)
@@ -4,7 +4,7 @@
// Language file Norwegian (bokmål)
// by Odd Henriksen
//
-// Last updated: 2008-07-22 / Odd Henriksen
+// Last updated: 2009-01-24 / Odd Henriksen
//
$PALANG['YES'] = 'JA';
@@ -102,7 +102,7 @@
$PALANG['pCreate_alias_domain_error1'] = 'Du har ikke tillatelse til å opprette den valgte konfigurasjonen.';
$PALANG['pCreate_alias_domain_error2'] = 'Den valgte konfigurasjonen er ugyldig, vennligst endre den!';
$PALANG['pCreate_alias_domain_error3'] = 'Det mislyktes å lagre informasjonen i databasen.';
-$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX
+$PALANG['pCreate_alias_domain_error4'] = 'Det er allerede opprettet alias for alle domenene.';
$PALANG['pCreate_alias_domain_success'] = 'Domenealiaset har blitt lagt inn i tabellen over aliasdomener!';
$PALANG['pCreate_alias_welcome'] = 'Opprett et nytt alias.';
@@ -374,9 +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['pInvalidDomainRegex'] = "Ugyldig domenenavn %s, regexp-validering feilet";
+$PALANG['pInvalidDomainDNS'] = "Ugyldig domene %s, og/eller finnes ikke i DNS";
+$PALANG['pInvalidMailRegex'] = "Ugyldig e-postadresse, regexp-validering feilet";
$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!';
@@ -398,7 +398,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'Hent alt';
$PALANG['pFetchmail_field_keep'] = 'Behold';
$PALANG['pFetchmail_field_protocol'] = 'Protokoll';
-$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'Bruk SSL';
$PALANG['pFetchmail_field_extra_options'] = 'Ekstra alternativer';
$PALANG['pFetchmail_field_mda'] = 'MDA';
$PALANG['pFetchmail_field_date'] = 'Dato';
@@ -414,7 +414,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Hent både gamle og nye meldinger';
$PALANG['pFetchmail_desc_keep'] = 'Behold meldingene på den eksterne e-postserveren';
$PALANG['pFetchmail_desc_protocol'] = 'Protokoll som skal brukes';
-$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'Bruk SSL-kryptering';
$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';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-01-23 23:12:54
|
Revision: 545
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=545&view=rev
Author: christian_boltz
Date: 2009-01-23 23:12:50 +0000 (Fri, 23 Jan 2009)
Log Message:
-----------
nl.lang:
- fixed typo (reported by Michiel van Baak on ML)
Modified Paths:
--------------
trunk/languages/nl.lang
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2009-01-23 21:45:54 UTC (rev 544)
+++ trunk/languages/nl.lang 2009-01-23 23:12:50 UTC (rev 545)
@@ -340,7 +340,7 @@
$PALANG['pUsersVacation_welcome_text'] = 'U heeft uw automatisch beantwoorden ingesteld.';
$PALANG['pUsersVacation_subject'] = 'Onderwerp';
$PALANG['pUsersVacation_subject_text'] = 'Out of Office';
-$PALANG['pUsersVacation_body'] = 'Bericht';
+$PALANG['pUsersVacation_body'] = 'Bericht'; # XXX text changed to 'Message'
$PALANG['pUsersVacation_body_text'] = <<<EOM
Ik zal afwezig zijn van <date> tot <date>.
Voor belangrijke punten kunt u contact opnemen met <contact person>.
@@ -398,7 +398,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'alle berichten ophalen';
$PALANG['pFetchmail_field_keep'] = 'behouden';
$PALANG['pFetchmail_field_protocol'] = 'protocol';
-$PALANG['pFetchmail_field_usessl'] = 'SSL actieif';
+$PALANG['pFetchmail_field_usessl'] = 'SSL actief';
$PALANG['pFetchmail_field_extra_options'] = 'extra opties';
$PALANG['pFetchmail_field_mda'] = 'MD';
$PALANG['pFetchmail_field_date'] = 'datum';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2009-01-23 22:23:00
|
Revision: 543
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=543&view=rev
Author: GingerDog
Date: 2009-01-23 21:40:50 +0000 (Fri, 23 Jan 2009)
Log Message:
-----------
user contributed script - Jose Nilton <jni...@gm...>
Added Paths:
-----------
trunk/ADDITIONS/delete-mailq-by-domain.pl
Added: trunk/ADDITIONS/delete-mailq-by-domain.pl
===================================================================
--- trunk/ADDITIONS/delete-mailq-by-domain.pl (rev 0)
+++ trunk/ADDITIONS/delete-mailq-by-domain.pl 2009-01-23 21:40:50 UTC (rev 543)
@@ -0,0 +1,77 @@
+#!/usr/bin/perl
+
+
+use strict;
+use warnings;
+use Getopt::Long;
+
+
+$ENV{'PATH'} = "/sbin:/bin:/usr/sbin:/usr/bin";
+
+my ($domain);
+my $list = 0;
+
+(help()) if (!$ARGV[0]);
+GetOptions ('l' => \$list, 'd=s' => \$domain) or (help());
+
+
+(list_queue()) if ($list == 1);
+
+(delete_queue()) if ($domain);
+
+
+sub delete_queue {
+my $ids = `postqueue -p`;
+my @ids = split /\n/, $ids;
+
+for my $id (@ids) {
+ next if $id =~ /^[\s\(-]/;
+ chomp $id;
+ next unless $id;
+ $id =~ s/(.*?)\**\s.*/$1/;
+ #print "$id\n";
+ my $match = `postcat -q $id | grep '$domain'`;
+ next unless $match;
+ #print "Deleting ID: $id\n";
+ my $saida = `postsuper -d $id`;
+ print $saida;
+}
+
+}
+
+
+
+
+sub list_queue {
+my %hash_mail = ();
+my @queue = `postqueue -p`;
+my($queue,$key,$total);
+
+
+foreach $queue(@queue) {
+ chomp $queue;
+ if ( $queue =~ /^\s+.*\@(.*)/ ) {
+ $hash_mail{$1}++;
+ }
+}
+print"\nTOTAL\tTO\n";
+print"-----
+----------------------------------------------------------------\n";
+foreach $key (reverse sort { $hash_mail{$a} <=> $hash_mail{$b}} keys
+%hash_mail) {
+ $total += $hash_mail{$key};
+ print"$hash_mail{$key} - $key\n";
+}
+print"\n$total -> TOTAL QUEUE\n";
+
+}
+
+
+sub help {
+print "Usage $0 -l To list a row of E-mail
+Usage $0 -d domain.com To delete the mensgens the Domain\n";
+}
+
+
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2009-01-23 22:22:58
|
Revision: 544
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=544&view=rev
Author: GingerDog
Date: 2009-01-23 21:45:54 +0000 (Fri, 23 Jan 2009)
Log Message:
-----------
nl.lang: thanks Johan Hendriks - sylhouette - see https://sourceforge.net/tracker/?func=detail&atid=937966&aid=2530792&group_id=191583
Modified Paths:
--------------
trunk/languages/nl.lang
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2009-01-23 21:40:50 UTC (rev 543)
+++ trunk/languages/nl.lang 2009-01-23 21:45:54 UTC (rev 544)
@@ -398,7 +398,7 @@
$PALANG['pFetchmail_field_fetchall'] = 'alle berichten ophalen';
$PALANG['pFetchmail_field_keep'] = 'behouden';
$PALANG['pFetchmail_field_protocol'] = 'protocol';
-$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
+$PALANG['pFetchmail_field_usessl'] = 'SSL actieif';
$PALANG['pFetchmail_field_extra_options'] = 'extra opties';
$PALANG['pFetchmail_field_mda'] = 'MD';
$PALANG['pFetchmail_field_date'] = 'datum';
@@ -414,7 +414,7 @@
$PALANG['pFetchmail_desc_fetchall'] = 'Haal zowel oude (gelezen) als nieuwe berichten op.';
$PALANG['pFetchmail_desc_keep'] = 'Opgehaalde berichten op de server achterlaten.';
$PALANG['pFetchmail_desc_protocol'] = 'het te gebruiken protocol.';
-$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
+$PALANG['pFetchmail_desc_usessl'] = 'SSL encryptie';
$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.';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2009-01-23 22:22:34
|
Revision: 542
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=542&view=rev
Author: GingerDog
Date: 2009-01-23 21:37:02 +0000 (Fri, 23 Jan 2009)
Log Message:
-----------
do not use empty as it thinks the string 0 is empty...
Modified Paths:
--------------
trunk/create-domain.php
Modified: trunk/create-domain.php
===================================================================
--- trunk/create-domain.php 2009-01-21 13:47:04 UTC (rev 541)
+++ trunk/create-domain.php 2009-01-23 21:37:02 UTC (rev 542)
@@ -53,7 +53,7 @@
);
foreach($form_fields as $key => $default) {
- if(isset($_POST[$key]) && (!empty($_POST[$key]))) {
+ if(isset($_POST[$key]) && (strlen($_POST[$key]) > 0)) {
$$key = escape_string($_POST[$key]);
}
else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2009-01-21 13:47:08
|
Revision: 541
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=541&view=rev
Author: GingerDog
Date: 2009-01-21 13:47:04 +0000 (Wed, 21 Jan 2009)
Log Message:
-----------
FAQ.txt: updating
Modified Paths:
--------------
trunk/DOCUMENTS/FAQ.txt
Modified: trunk/DOCUMENTS/FAQ.txt
===================================================================
--- trunk/DOCUMENTS/FAQ.txt 2009-01-20 20:50:33 UTC (rev 540)
+++ trunk/DOCUMENTS/FAQ.txt 2009-01-21 13:47:04 UTC (rev 541)
@@ -26,3 +26,11 @@
wwwrun ALL = (courier) NOPASSWD: /usr/local/bin/postfixadmin-mailbox-postcreation.sh
(replace usernames and path according to your setup)
+
+4) I try and create a mailbox, but it keeps saying "Invalid email address"... ?
+
+ - Postfixadmin, by default, attempts to verify an email address is valid, partly by
+ checking that the domain exists. For most people this works as expected, but
+ if it doesn't for you, try editing $CONF['emailcheck_resolve_domain'] to 'NO' in
+ config.inc.php and try again.
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2009-01-20 20:50:35
|
Revision: 540
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=540&view=rev
Author: GingerDog
Date: 2009-01-20 20:50:33 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
debian/changelog: bump up svn number; change date etc
Modified Paths:
--------------
branches/postfixadmin-2.3beta/debian/changelog
Modified: branches/postfixadmin-2.3beta/debian/changelog
===================================================================
--- branches/postfixadmin-2.3beta/debian/changelog 2009-01-20 20:49:24 UTC (rev 539)
+++ branches/postfixadmin-2.3beta/debian/changelog 2009-01-20 20:50:33 UTC (rev 540)
@@ -1,6 +1,6 @@
postfixadmin (2.3beta) unstable; urgency=low
- * Subversion revision 527
+ * Subversion revision 539
* Fixes for MySQL upgrade issues
* Improved vacation.pl (renotification options, use SMTP headers, better
logging, optional external config file)
@@ -11,7 +11,7 @@
* Enhanced mailbox table to make it easier for people to customise where mailboxes live
* and much more
- -- David Goodwin <dav...@pa...> Sat, 17 Jan 2009 20:06:00 +0000
+ -- David Goodwin <dav...@pa...> Tue, 20 Jan 2009 20:50:00 +0000
postfixadmin (2.2.1.1) unstable; urgency=low
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2009-01-20 20:49:33
|
Revision: 539
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=539&view=rev
Author: GingerDog
Date: 2009-01-20 20:49:24 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
functions.inc.php: merge in r538 from trunk - remove dev comment
Modified Paths:
--------------
branches/postfixadmin-2.3beta/functions.inc.php
Property Changed:
----------------
branches/postfixadmin-2.3beta/functions.inc.php
Modified: branches/postfixadmin-2.3beta/functions.inc.php
===================================================================
--- branches/postfixadmin-2.3beta/functions.inc.php 2009-01-20 20:42:53 UTC (rev 538)
+++ branches/postfixadmin-2.3beta/functions.inc.php 2009-01-20 20:49:24 UTC (rev 539)
@@ -1576,7 +1576,6 @@
function db_delete ($table,$where,$delete)
{
$query = "DELETE FROM $table WHERE " . escape_string($where) . "='" . escape_string($delete) . "'";
- echo $query;
$result = db_query ($query);
if ($result['rows'] >= 1)
{
Property changes on: branches/postfixadmin-2.3beta/functions.inc.php
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/functions.inc.php:538
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2009-01-20 20:42:55
|
Revision: 538
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=538&view=rev
Author: GingerDog
Date: 2009-01-20 20:42:53 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
functions.inc.php: remove dev comment (echo of sql)
Modified Paths:
--------------
trunk/functions.inc.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2009-01-20 12:05:26 UTC (rev 537)
+++ trunk/functions.inc.php 2009-01-20 20:42:53 UTC (rev 538)
@@ -1576,7 +1576,6 @@
function db_delete ($table,$where,$delete)
{
$query = "DELETE FROM $table WHERE " . escape_string($where) . "='" . escape_string($delete) . "'";
- echo $query;
$result = db_query ($query);
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...> - 2009-01-20 13:22:35
|
Revision: 537
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=537&view=rev
Author: GingerDog
Date: 2009-01-20 12:05:26 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
bump up svn revision
Modified Paths:
--------------
trunk/debian/changelog
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-01-20 12:01:50 UTC (rev 536)
+++ trunk/debian/changelog 2009-01-20 12:05:26 UTC (rev 537)
@@ -1,6 +1,6 @@
postfixadmin (2.3beta) unstable; urgency=low
- * Subversion revision 527
+ * Subversion revision 533
* Fixes for MySQL upgrade issues
* Improved vacation.pl (renotification options, use SMTP headers, better
logging, optional external config file)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2009-01-20 13:22:30
|
Revision: 532
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=532&view=rev
Author: GingerDog
Date: 2009-01-20 11:53:54 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
vacation.pl: make it strip/discover addresses better, slightly better logging, stop it requiring a messageid
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/vacation.pl
Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================
--- trunk/VIRTUAL_VACATION/vacation.pl 2009-01-20 11:49:03 UTC (rev 531)
+++ trunk/VIRTUAL_VACATION/vacation.pl 2009-01-20 11:53:54 UTC (rev 532)
@@ -152,6 +152,7 @@
my ($from, $to, $cc, $replyto , $subject, $messageid, $lastheader, $smtp_sender, $smtp_recipient, %opts, $spam, $test_mode, $logger);
$subject='';
+$messageid='unknown';
# Setup a logger...
#
@@ -391,7 +392,7 @@
'Message' => encode_base64($body)
);
if($test_mode == 1) {
- $logger->info("** TEST MODE ** : Vacation response sent to $to from $from subject $subject - NOT sent\n");
+ $logger->info("** TEST MODE ** : Vacation response sent to $to from $from subject $subject (not) sent\n");
$logger->info(%mail);
return 0;
}
@@ -410,13 +411,28 @@
}
my @ok;
$logger = get_logger();
- for (split(/,\s*/, lc($arg))) {
- my $temp = Email::Valid->address($_);
+ my @list;
+ @list = $arg =~ m/([\w\.\-\']+\@[\w\.\-]+\w+)/g;
+ foreach(@list) {
+ #$logger->debug("Checking: $_");
+ my $temp = Email::Valid->address( -address => $_, -mxcheck => 0);
if($temp) {
push(@ok, $temp);
}
+ else {
+ $logger->debug("Email not valid : $Email::Valid::Details");
+ }
}
- my $result = join(", ", @ok);
+ # remove duplicates
+ my %seen = ();
+ my @uniq;
+ my $item;
+ foreach $item (@ok) {
+ push(@uniq, $item) unless $seen{$item}++
+ }
+
+ my $result = join(", ", @uniq);
+ #$logger->debug("Result: $result");
return $result;
}
@@ -459,6 +475,7 @@
$cc = '';
$replyto = '';
+$logger->debug("Script argument SMTP recipient is : '$smtp_recipient' and smtp_sender : '$smtp_sender'");
while (<STDIN>) {
last if (/^$/);
if (/^\s+(.*)/ and $lastheader) { $$lastheader .= " $1"; next; }
@@ -495,7 +512,7 @@
$logger->info("One of from=$from, to=$to, messageid=$messageid, smtp sender=$smtp_sender, smtp recipient=$smtp_recipient empty");
exit(0);
}
-
+$logger->debug("Email headers have to: '$to' and From: '$from'");
$to = strip_address($to);
$from = lc ($from);
$from = check_and_clean_from_address($from);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2009-01-20 13:22:23
|
Revision: 534
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=534&view=rev
Author: GingerDog
Date: 2009-01-20 11:56:15 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
going to rebase this off trunk
Removed Paths:
-------------
branches/postfixadmin-2.3beta/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2009-01-20 13:22:21
|
Revision: 531
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=531&view=rev
Author: GingerDog
Date: 2009-01-20 11:49:03 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
updating tests
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/tests/test.sh
Added Paths:
-----------
trunk/VIRTUAL_VACATION/tests/teodor-smtp-envelope-headers.txt
Added: trunk/VIRTUAL_VACATION/tests/teodor-smtp-envelope-headers.txt
===================================================================
--- trunk/VIRTUAL_VACATION/tests/teodor-smtp-envelope-headers.txt (rev 0)
+++ trunk/VIRTUAL_VACATION/tests/teodor-smtp-envelope-headers.txt 2009-01-20 11:49:03 UTC (rev 531)
@@ -0,0 +1,21 @@
+X-Original-To: da...@ex...
+Delivered-To: da...@ex...
+X-Virus-Scanned: amavisd-new at mx.ro
+From: "Teodor Iacob" <da...@ex...>
+To: <da...@ex...>
+Subject: estsgf
+Date: Mon, 19 Jan 2009 14:49:17 +0200
+X-Mailer: Microsoft Office Outlook 11
+X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.5579
+Thread-Index: Acl6NFZyC+AImZ1WQSS0cPUO/Y2FqA==
+X-BRO-MailScanner-Information: Please contact the ISP for more information
+X-BRO-MailScanner-ID: n0JCoUwB014357
+X-BRO-MailScanner: Found to be clean
+X-MailScanner-From: da...@ex...
+X-BRO-MailScanner-Watermark: 1232974231.00027@11VRmWFJ18WRflEdvrILlQ
+
+dsgsgfsgfg
+
+--
+
+Teodor Iacob
Modified: trunk/VIRTUAL_VACATION/tests/test.sh
===================================================================
--- trunk/VIRTUAL_VACATION/tests/test.sh 2009-01-18 12:05:14 UTC (rev 530)
+++ trunk/VIRTUAL_VACATION/tests/test.sh 2009-01-20 11:49:03 UTC (rev 531)
@@ -14,6 +14,7 @@
export PGDATABASE=postfix
export PGHOST=pgsqlserver
+
echo "DELETE FROM vacation WHERE email = 'da...@ex...'" | psql
# First time around, there should be no vacation record for da...@ex..., so these should all not cause mail to be sent.
@@ -21,15 +22,29 @@
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... -- david\#exa...@au...
-cat test-email.txt | perl ../vacation.pl -t yes -f da...@ex... -- david\#exa...@au...
-cat spam.txt | perl ../vacation.pl -t yes -f ma...@cc... -- david\#exa...@au...
-cat asterisk-email.txt | perl ../vacation.pl -t yes -f www...@pa... -- david\#exa...@au...
-cat facebook.txt | perl ../vacation.pl -t yes -f not...@fa... -- david\#exa...@au...
-cat mail-myself.txt | perl ../vacation.pl -t yes -f da...@ex... -- david\#exa...@au...
+#echo "On: mailing-list.txt:"
+# cat mailing-list.txt | perl ../vacation.pl -t yes -f fw-general-return-20540-david=exa...@li... -- david\#exa...@au...
+echo "On: test-email.txt:"
+cat test-email.txt | perl ../vacation.pl -t yes -f da...@ex... -- david\#exa...@au...
+echo "On: spam.txt:"
+cat spam.txt | perl ../vacation.pl -t yes -f ma...@cc... -- david\#exa...@au...
+echo "On: asterisk-email.txt:"
+cat asterisk-email.txt | perl ../vacation.pl -t yes -f www...@pa... -- david\#exa...@au...
+# do not reply to facebook
+echo "On: facebook.txt:"
+cat facebook.txt | perl ../vacation.pl -t yes -f not...@fa... -- david\#exa...@au...
+# do not send yourself a vacation notice.
+echo "On: mail-myself.txt:"
+cat mail-myself.txt | perl ../vacation.pl -t yes -f da...@ex... -- david\#exa...@au...
+# do not send yourself a vacation notice.
+echo "On: teodor-smtp-envelope-headers.txt:"
+cat teodor-smtp-envelope-headers.txt | perl ../vacation.pl -t yes -f da...@ex... -- david\#exa...@au...
+
+
echo "INSERT INTO vacation (email, subject, body, created, active, domain) VALUES ('da...@ex...', 'I am on holiday', 'Yeah, that is right', NOW(), true, 'example.org')" | psql
+
echo
echo "VACATION TURNED ON "
echo
@@ -46,4 +61,3 @@
echo " * Mailing myself - should not send vacation message"
cat mail-myself.txt | perl ../vacation.pl -t yes -f da...@ex... -- david\#exa...@au...
echo
-echo
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2009-01-20 13:22:16
|
Revision: 535
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=535&view=rev
Author: GingerDog
Date: 2009-01-20 12:00:46 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
update docs a litt;e add revision to .pl file
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/INSTALL.TXT
trunk/VIRTUAL_VACATION/vacation.pl
Property Changed:
----------------
trunk/VIRTUAL_VACATION/vacation.pl
Modified: trunk/VIRTUAL_VACATION/INSTALL.TXT
===================================================================
--- trunk/VIRTUAL_VACATION/INSTALL.TXT 2009-01-20 11:56:15 UTC (rev 534)
+++ trunk/VIRTUAL_VACATION/INSTALL.TXT 2009-01-20 12:00:46 UTC (rev 535)
@@ -101,22 +101,23 @@
-------------------
The database table should have already been created for you, by running
-the 'upgrade.php' script.
+the 'upgrade.php' script when installing Postfixadmin.
If security is an issue for you, read ../DOCUMENTS/Security.txt
-6. Edit filter.pl
+6. Edit vacation.pl
-----------------
-The perl filter.pl script needs minor modification to know which database
+The perl vacation.pl script needs minor modification to know which database
you are using, and also how to connect to the database.
Namely :
Change any variables starting with '$db_' and '$db_type' to either 'mysql' or 'pgsql'.
+Change the $vacation_domain variable to match what you entered in your /etc/postfix/transport
+file.
-
What do these files do?
-----------------------
When a user enables a vacation message on their account, the alias
Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================
--- trunk/VIRTUAL_VACATION/vacation.pl 2009-01-20 11:56:15 UTC (rev 534)
+++ trunk/VIRTUAL_VACATION/vacation.pl 2009-01-20 12:00:46 UTC (rev 535)
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
#
# Virtual Vacation 4.0
+# $Revision$
# Originally by Mischa Peters <mischa at high5 dot net>
#
# Copyright (c) 2002 - 2005 High5!
Property changes on: trunk/VIRTUAL_VACATION/vacation.pl
___________________________________________________________________
Modified: svn:keywords
- Id Rev
+ Revision
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2009-01-20 13:22:11
|
Revision: 533
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=533&view=rev
Author: GingerDog
Date: 2009-01-20 11:54:34 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
mail-myself.txt: test stuff
Added Paths:
-----------
trunk/VIRTUAL_VACATION/tests/mail-myself.txt
Added: trunk/VIRTUAL_VACATION/tests/mail-myself.txt
===================================================================
--- trunk/VIRTUAL_VACATION/tests/mail-myself.txt (rev 0)
+++ trunk/VIRTUAL_VACATION/tests/mail-myself.txt 2009-01-20 11:54:34 UTC (rev 533)
@@ -0,0 +1,43 @@
+Return-Path: <da...@ex...>
+X-Original-To: da...@ex...
+Delivered-To: da...@ex...
+Received: by mail.palepurple.co.uk (Postfix, from userid 1007)
+ id 83AE0894CF8; Tue, 5 Aug 2008 20:15:53 +0100 (BST)
+Received: from localhost (localhost [127.0.0.1])
+ by mail.palepurple.co.uk (Postfix) with ESMTP id 4A249894CF9
+ for <da...@ex...>; Tue, 5 Aug 2008 20:15:53 +0100 (BST)
+X-Virus-Scanned: by Amavis+SpamAssassin+ClamAV and more at palepurple.co.uk
+X-Spam-Score: -2.836
+X-Spam-Level:
+X-Spam-Status: No, score=-2.836 tagged_above=-99 required=5 tests=[AWL=-0.237,
+ BAYES_00=-2.599]
+Received: from mail.palepurple.co.uk ([127.0.0.50])
+ by localhost (oak.palepurple.co.uk [127.0.0.50]) (amavisd-new, port 10024)
+ with ESMTP id gHB1TKpjKIKX for <da...@ex...>;
+ Tue, 5 Aug 2008 20:15:50 +0100 (BST)
+Received: from irc.palepurple.co.uk (irc.palepurple.co.uk [89.16.169.131])
+ by mail.palepurple.co.uk (Postfix) with ESMTP id CAF82894CF8
+ for <da...@ex...>; Tue, 5 Aug 2008 20:15:50 +0100 (BST)
+Received: by irc.palepurple.co.uk (Postfix, from userid 1000)
+ 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..., fr...@ex..., ba...@ex..., ro...@ex...,
+ ro...@ex...
+Subject: test email
+Message-ID: <200...@co...>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+X-GnuPG-Key-URL: http://codepoets.co.uk/files/pubkey.txt
+X-PGP-Key: 0x117957A6
+User-Agent: Mutt/1.5.13 (2006-08-11)
+Content-Length: 136
+Lines: 7
+
+hello world; this is in plain text only.
+
+--
+David Goodwin
+
+[ http://www.codepoets.co.uk ]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2009-01-20 13:22:08
|
Revision: 536
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=536&view=rev
Author: GingerDog
Date: 2009-01-20 12:01:50 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
re-creating branch after more updates on trunk
Added Paths:
-----------
branches/postfixadmin-2.3beta/
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.
