postfixadmin-svn Mailing List for PostfixAdmin (Page 115)
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
(6) |
Nov
(1) |
Dec
|
|
From: <chr...@us...> - 2007-10-16 21:43:58
|
Revision: 157
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=157&view=rev
Author: christian_boltz
Date: 2007-10-16 14:43:57 -0700 (Tue, 16 Oct 2007)
Log Message:
-----------
- fix a MySQL vs. PgSQL problem (True vs. 1) in vacation.pl
https://sourceforge.net/forum/forum.php?thread_id=1845361&forum_id=676076
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/vacation.pl
Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================
--- trunk/VIRTUAL_VACATION/vacation.pl 2007-10-13 19:39:48 UTC (rev 156)
+++ trunk/VIRTUAL_VACATION/vacation.pl 2007-10-16 21:43:57 UTC (rev 157)
@@ -115,9 +115,13 @@
exit(0);
}
-# mysql only, needs FIX for ALL databases
+my $db_true; # MySQL and PgSQL use different values for TRUE
if ($db_type eq "mysql") {
$dbh->do("SET CHARACTER SET utf8;");
+ $db_true = '1';
+} else { # Pg
+ # TODO: SET CHARACTER SET is mysql only, needs FIX for ALL databases
+ $db_true = 'True';
}
# used to detect infinite address lookup loops
@@ -233,7 +237,7 @@
panic("possible infinite loop in find_real_address for <$email>. Check for alias loop\n");
}
my $realemail;
- my $query = qq{SELECT email FROM vacation WHERE email=? and active=true};
+ my $query = qq{SELECT email FROM vacation WHERE email=? and active=$db_true};
my $stm = $dbh->prepare($query) or panic_prepare($query);
$stm->execute($email) or panic_execute($query,"email='$email'");
my $rv = $stm->rows;
@@ -251,7 +255,7 @@
if ($rv == 1) {
my @row = $stm->fetchrow_array;
my $alias = $row[0];
- $query = qq{SELECT email FROM vacation WHERE email=? and active=true};
+ $query = qq{SELECT email FROM vacation WHERE email=? and active=$db_true};
$stm = $dbh->prepare($query) or panic_prepare($query);
$stm->execute($alias) or panic_prepare($query,"email='$alias'");
$rv = $stm->rows;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-13 19:39:46
|
Revision: 156
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=156&view=rev
Author: christian_boltz
Date: 2007-10-13 12:39:48 -0700 (Sat, 13 Oct 2007)
Log Message:
-----------
- language-check.sh: add check for duplicated strings
- remove duplicated strings in bg.lang
Modified Paths:
--------------
trunk/languages/bg.lang
trunk/languages/language-update.sh
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2007-10-13 19:19:47 UTC (rev 155)
+++ trunk/languages/bg.lang 2007-10-13 19:39:48 UTC (rev 156)
@@ -213,8 +213,6 @@
$PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
$PALANG['pAdminList_domain_modified'] = 'Ïîñëåäíî ìîäèôèöèðàí';
$PALANG['pAdminList_domain_active'] = 'Àêòèâåí';
-$PALANG['pAdminList_domain_modified'] = 'Last Modified';
-$PALANG['pAdminList_domain_active'] = 'Active';
$PALANG['pAdminList_virtual_button'] = 'Íàïðåä';
$PALANG['pAdminList_virtual_welcome'] = 'Ïðåãëåä íà ';
Modified: trunk/languages/language-update.sh
===================================================================
--- trunk/languages/language-update.sh 2007-10-13 19:19:47 UTC (rev 155)
+++ trunk/languages/language-update.sh 2007-10-13 19:39:48 UTC (rev 156)
@@ -122,6 +122,12 @@
done
###############################################################################
+# check for duplicated strings
+for file in $filelist ; do
+ sed -n "/PALANG/ s/[ ]*\$PALANG\['// ; s/'.*//p" $file |sort |uniq -c |grep -v " *1 " >&2 && \
+ echo "*** duplicated string in $file, see above for details ***" >&2
+done
+
test $nocleanup = 0 && for file in $filelist ; do
rm -f $file.patch $file.strings $file.diff
done
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-13 19:19:44
|
Revision: 155
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=155&view=rev
Author: christian_boltz
Date: 2007-10-13 12:19:47 -0700 (Sat, 13 Oct 2007)
Log Message:
-----------
- added language-update.sh
Script to update the language files, with lots of tricky bash code ;-)
MUST be run everytime you add a string to en.lang.
./language-update.sh --patch
should do the job, unless something goes wrong.
./language-update.sh --help
prints all available options.
Added Paths:
-----------
trunk/languages/language-update.sh
Added: trunk/languages/language-update.sh
===================================================================
--- trunk/languages/language-update.sh (rev 0)
+++ trunk/languages/language-update.sh 2007-10-13 19:19:47 UTC (rev 155)
@@ -0,0 +1,127 @@
+#!/bin/bash
+
+ # Postfix Admin
+ #
+ # LICENSE
+ # This source file is subject to the GPL license that is bundled with
+ # this package in the file LICENSE.TXT.
+ #
+ # Further details on the project are available at :
+ # http://www.postfixadmin.com or http://postfixadmin.sf.net
+ #
+ # @version $Id$
+ # @license GNU GPL v2 or later.
+ #
+ # File: language-update.sh
+ # Lists missing translations in language files and optionally patches the
+ # english texts into the language file
+ #
+ # written by Christian Boltz
+
+
+notext=0 # output full lines by default
+patch=0 # do not patch by default
+nocleanup=0 # don't delete tempfiles
+filelist="en.lang" # always needed for comparison
+
+while [ -n "$1" ] ; do
+ case "$1" in
+ --help)
+ echo '
+Lists missing translations in language files and optionally patches the
+english texts into the language file
+
+ Usage:
+
+ '"$0"' [--notext | --patch] [--nocleanup] [foo.lang [bar.lang [...] ] ]
+
+ --notext will only list the translation keys (useful for a quick overview)
+ --patch will patch the language file directly
+ --nocleanup will keep all temp files (for debugging only)
+
+ You can give any number of langugage files as parameter.
+ If no files are given, all *.lang files will be used.
+
+ Note for translators: untranslated entries have a comment
+ # XXX
+ attached.
+'
+ exit 0;
+ ;;
+ --notext)
+ notext=1
+ ;;
+ --patch)
+ patch=1
+ ;;
+ --nocleanup)
+ nocleanup=1
+ ;;
+ -*)
+ echo 'unknown option. Try --help ;-)' >&2
+ exit 1
+ ;;
+ *)
+ filelist="$filelist $1"
+ ;;
+ esac
+ shift
+done
+
+test $notext = 1 && test $patch = 1 && echo "ERROR: You can't use --notext AND --patch at the same time." >&2 && exit 2
+
+test "$filelist" = "en.lang" && filelist="`ls -1 *.lang`"
+
+for file in $filelist ; do
+ echo "<?php include('$file'); print join(\"\\n\", array_keys(\$PALANG)) . \"\\n\"; ?>" | php > $file.strings
+done
+
+
+for file in $filelist ; do
+ test "$file" = "en.lang" && continue
+ LANG=C diff -U1 $file.strings en.lang.strings > $file.diff && echo "*** $file: no difference ***"
+
+ test $notext = 1 && cat $file.diff && continue
+
+ 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"
+ grepresult2=$(grep "'$greptext'" $file) || grepresult2="$grepresult"
+ case "$line" in
+ ---*)
+ echo "$line"
+ ;;
+ +++*)
+ echo "$line"
+ ;;
+ @*)
+ echo "$line"
+ ;;
+ -*)
+ echo "-$grepresult"
+ ;;
+ +*)
+ # needs translation
+ # already added as comment?
+ test "$grepresult" = "$grepresult2" && {
+ echo "+$grepresult # XXX" # english
+ } || {
+ echo " $grepresult2" # translated
+ echo "keeping line $grepresult2" >&2
+ echo "This will result in a malformed patch." >&2
+ }
+ ;;
+ *)
+ echo " $grepresult2"
+ ;;
+ esac
+ done > $file.patch
+
+ test $patch = 0 && cat $file.patch
+ test $patch = 1 && patch $file < $file.patch
+done
+###############################################################################
+
+test $nocleanup = 0 && for file in $filelist ; do
+ rm -f $file.patch $file.strings $file.diff
+done
Property changes on: trunk/languages/language-update.sh
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-13 19:10:40
|
Revision: 154
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=154&view=rev
Author: christian_boltz
Date: 2007-10-13 12:10:41 -0700 (Sat, 13 Oct 2007)
Log Message:
-----------
- included missing strings into every language file (in english, with
a '# XXX' comment for translators). This makes translation easier.
- added vim: comment to all language files
- this obsoletes default.lang - removed
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/lt.lang
trunk/languages/mk.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
Removed Paths:
-------------
trunk/languages/default.lang
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2007-10-12 23:16:25 UTC (rev 153)
+++ trunk/languages/bg.lang 2007-10-13 19:10:41 UTC (rev 154)
@@ -4,15 +4,15 @@
// by Plamen Tonev
//
-require ('default.lang');
-
$PALANG['YES'] = 'Äà';
$PALANG['NO'] = 'Íå';
$PALANG['edit'] = 'ðåäàêòèðàíå';
$PALANG['del'] = 'èçòðèâàíå';
+$PALANG['exit'] = 'Exit'; # XXX
$PALANG['confirm'] = 'Ñèãóðíè ëè ñòå, ÷å æåëàåòå äà èçòðèåòî òîâà?\n';
$PALANG['confirm_domain'] = 'Íàèñòèíà ëè èñêàòå äà èçòðèåòå âñè÷êè çàïèñè çà òîçè äîìåéí? Òîâà äåéñòâèå å íåîáðàòèìî!\n';
$PALANG['check_update'] = 'Check for update';
+$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Àäìèíèñòðàòîðà ìîæå äà ñå ëîãíå îòòóê çà àäìèíèñòðèðàíå íà äîìåéí.';
$PALANG['pLogin_username'] = 'Ëîãèí (å-ìåéë)';
@@ -22,9 +22,11 @@
$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Âàøàòà ïàðîëà íå å ïðàâèëíà!</span>';
$PALANG['pLogin_login_users'] = 'Àêî ñòå ïîòðåáèòåë íàòèñíåòå òóê çà ëîãâàíå â ïîòðåáèòåëñêàòà ÷àñò.';
+$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Ïðåãëåä';
$PALANG['pMenu_create_alias'] = 'Ñúçäàé íîâ Alias';
$PALANG['pMenu_create_mailbox'] = 'Ñúçäàé íîâà ïîùåíñêà êóòèÿ';
+$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'Èçïðàòè Email';
$PALANG['pMenu_password'] = 'Ïàðîëà';
$PALANG['pMenu_viewlog'] = 'Ïðåãëåä íà Log';
@@ -54,11 +56,15 @@
$PALANG['pOverview_alias_address'] = 'Îò';
$PALANG['pOverview_alias_goto'] = 'Äî';
$PALANG['pOverview_alias_modified'] = 'Ïîñëåäíî ìîäèôèöèðàí';
+$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Å-ìåéë';
$PALANG['pOverview_mailbox_name'] = 'Èìå';
$PALANG['pOverview_mailbox_quota'] = 'Îáåì (MB)';
$PALANG['pOverview_mailbox_modified'] = 'Ïîñëåäíî ìîäèôèöèðàí';
$PALANG['pOverview_mailbox_active'] = 'Àêòèâåí';
+$PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
+$PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
$PALANG['pOverview_get_domain'] = 'Äîìåéí';
$PALANG['pOverview_get_aliases'] = 'Alias-è';
@@ -67,7 +73,9 @@
$PALANG['pOverview_get_modified'] = 'Ïîñëåäíî ìîäèôèöèðàí';
$PALANG['pDelete_delete_error'] = '<span class="error_msg">Íå ìîãà äà èçòðèÿ çàïèñà ';
+$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Òîçè äîìåéí íå å âàø! ';
+$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
$PALANG['pCreate_alias_welcome'] = 'Ñúçäàé íîâ alias çà âàøèÿ äîìåéí.';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -75,6 +83,7 @@
$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Òîçè å-ìåéë àäðåñ âå÷å ñúùåñòâóâà, ìîëÿ èçáåðåòå ðàçëè÷åí!</span>';
$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Äîñòèãíàëè ñòå ëèìèòà ñè çà ñúçäàâàíå íà alias-è!</span>';
$PALANG['pCreate_alias_goto'] = 'Êúì';
+$PALANG['pCreate_alias_active'] = 'Active'; # XXX
$PALANG['pCreate_alias_button'] = 'Äîáàâè Alias';
$PALANG['pCreate_alias_goto_text'] = 'Íàêúäå òðÿáâà äà ñå èçïðàùà ïèñìîòî.';
$PALANG['pCreate_alias_goto_text_error'] = 'Íàêúäå òðÿáâà äà ñå èçïðàùà ïèñìîòî.<br /><span class="error_msg">Èçáðàíèÿò àäðåñ â ïîëåòî Êúì íå å âàëèäåí!</span>';
@@ -86,6 +95,7 @@
$PALANG['pEdit_alias_address'] = 'Alias';
$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Íå ìîãà äà îòêðèÿ òîçè alias!</span>';
$PALANG['pEdit_alias_goto'] = 'Êúì';
+$PALANG['pEdit_alias_active'] = 'Active'; # XXX
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Íå ñòå âúâåëè íèùî â ïîëåòî Êúì</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Å-ìåéë àäðåñà, êîéòî ñòå âúâåëè íå å âàëèäåí: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Òîçè äîìåéí íå å âàø: ';
@@ -113,6 +123,7 @@
$PALANG['pCreate_mailbox_button'] = 'Äîáàâè ïîùåíñêà êóòèÿ';
$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Íå ìîãà äà äîáàâÿ ïîùåíñêàòà êóòèÿ â òàáëèöàòà!</span>';
$PALANG['pCreate_mailbox_result_success'] = 'Ïîùåíñêàòà êóòèÿ áå óñïåøíî ñúçäàäåíà è äîáàâåíà â òàáëèöàòà!';
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
$PALANG['pEdit_mailbox_welcome'] = 'Ðåäàêöèÿ íà ïîùåíñêà êóòèÿ çà âàøèÿ äîìåéí.';
$PALANG['pEdit_mailbox_username'] = 'Ëîãèí';
@@ -121,6 +132,7 @@
$PALANG['pEdit_mailbox_password2'] = 'Íîâà ïàðîëà (îòíîâî)';
$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">Ïàðîëèòå, êîèòî ñòå äàëè íå ñúâïàäàò!</span>';
$PALANG['pEdit_mailbox_name'] = 'Èìå';
+$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX
$PALANG['pEdit_mailbox_quota'] = 'Îáåì';
$PALANG['pEdit_mailbox_quota_text'] = 'MB';
$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Îáåìà, êîéòî ñòå äàëè å òâúðäå ãîëÿì!</span>';
@@ -139,6 +151,11 @@
$PALANG['pPassword_button'] = 'Ñìåíè ïàðîëà';
$PALANG['pPassword_result_error'] = '<span class="error_msg">Íå ìîãà äà ñìåíÿ ïàðîëàòà!</span>';
$PALANG['pPassword_result_success'] = 'Ïàðîëàòà âè áå ñìåíåíà óñïåøíî!';
+$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
+$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX
+$PALANG['pVacation_result_error'] = '<span class="error_msg">Unable to update auto response settings!</span>'; # XXX
+$PALANG['pVacation_result_removed'] = 'Auto response has been removed!'; # XXX
+$PALANG['pVacation_result_added'] = 'Auto response has been enabled!'; # XXX
$PALANG['pViewlog_welcome'] = 'Ðàçãëåæäàíå íà ïîñëåäíèòå 10 äåéñòâèÿ çà ';
$PALANG['pViewlog_timestamp'] = 'Äàòà';
@@ -146,6 +163,15 @@
$PALANG['pViewlog_domain'] = 'Äîìåéí';
$PALANG['pViewlog_action'] = 'Äåéñòâèå';
$PALANG['pViewlog_data'] = 'Äàííè';
+$PALANG['pViewlog_action_create_mailbox'] = 'create mailbox'; # XXX
+$PALANG['pViewlog_action_delete_mailbox'] = 'delete mailbox'; # XXX
+$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
+$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
+$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Íàïðåä';
$PALANG['pViewlog_result_error'] = '<span class="error_msg">Íå ìîãà äà îòêðèÿ ëîãîâåòå!</span>';
@@ -183,6 +209,8 @@
$PALANG['pAdminList_domain_aliases'] = 'Alias-è';
$PALANG['pAdminList_domain_mailboxes'] = 'Ïîùåíñêè êóòèè';
$PALANG['pAdminList_domain_maxquota'] = 'Ìàêñèìàëåí îáåì (MB)';
+$PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX
+$PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
$PALANG['pAdminList_domain_modified'] = 'Ïîñëåäíî ìîäèôèöèðàí';
$PALANG['pAdminList_domain_active'] = 'Àêòèâåí';
$PALANG['pAdminList_domain_modified'] = 'Last Modified';
@@ -204,6 +232,7 @@
$PALANG['pAdminCreate_domain_welcome'] = 'Äîáàâÿíå íà íîâ äîìåéí';
$PALANG['pAdminCreate_domain_domain'] = 'äîìåéí';
$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">Òîçè äîìåéí âå÷å ñúùåñòâóâà!</span>';
+$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">The domain is invalid!</span>'; # XXX
$PALANG['pAdminCreate_domain_description'] = 'Îïèñàíèå';
$PALANG['pAdminCreate_domain_aliases'] = 'Alias-è';
$PALANG['pAdminCreate_domain_aliases_text'] = '0 = èçêëþ÷åíè | -1 = íåîãðàíè÷åíè';
@@ -214,10 +243,12 @@
$PALANG['pAdminCreate_domain_transport'] = 'Transport';
$PALANG['pAdminCreate_domain_transport_text'] = 'Define transport';
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Äîáàâè alias-è ïî ïîäðàçáèðàíå';
+$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
$PALANG['pAdminCreate_domain_backupmx'] = 'Ìåéë ñúðâúðà å ðåçåðâåí MX';
$PALANG['pAdminCreate_domain_button'] = 'Äîáàâè äîìåéí';
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Íå ìîãà äà äîáàâÿ äîìåéíà!</span>';
$PALANG['pAdminCreate_domain_result_success'] = 'Äîìåéíà áå äîáàâåí óñïåøíî!';
+$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Ðåäàêòèðàíå íà äîìåéí';
$PALANG['pAdminEdit_domain_domain'] = 'Äîìåéí';
@@ -271,6 +302,7 @@
$PALANG['pUsersMenu_password'] = 'Ñìåíè ïàðîëà';
$PALANG['pUsersMain_vacation'] = 'Íàñòðîéâàíå íà "out of office" ñúîáùåíèå èëè àâòîìàòè÷åí îòãîâîð çà âàøèÿò å-ìåéë.';
+$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
$PALANG['pUsersMain_edit_alias'] = 'Ñìÿíà íà ïðåíàñî÷âàíåòî íà å-ìåéë.';
$PALANG['pUsersMain_password'] = 'Ñìÿíà íà íàñòîÿùàòà ïàðîëà.';
@@ -297,5 +329,24 @@
$PALANG['pEdit_dbLog_editalias'] = 'edit alias';
$PALANG['pEdit_dbLog_editmailbox'] = 'edit mailbox';
+$PALANG['pSearch'] = 'search'; # XXX
$PALANG['pSearch_welcome'] = 'Searching for: ';
+$PALANG['pReturn_to'] = 'Return to'; # XXX
+$PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
+$PALANG['pBroadcast_from'] = 'From'; # XXX
+$PALANG['pBroadcast_name'] = 'Your name'; # XXX
+$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
+$PALANG['pBroadcast_message'] = 'Message'; # XXX
+$PALANG['pBroadcast_send'] = 'Send message'; # XXX
+$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
+$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
+$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
+$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
+$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
+$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+
+/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2007-10-12 23:16:25 UTC (rev 153)
+++ trunk/languages/ca.lang 2007-10-13 19:10:41 UTC (rev 154)
@@ -4,15 +4,15 @@
// by Jaume
//
-require ('default.lang');
-
$PALANG['YES'] = 'SI';
$PALANG['NO'] = 'NO';
$PALANG['edit'] = 'editar';
$PALANG['del'] = 'esborrar';
+$PALANG['exit'] = 'Exit'; # XXX
$PALANG['confirm'] = '¿Segur que vols esborrar-lo?\n';
$PALANG['confirm_domain'] = 'Estas segur que vols borrar tots els registres d\'aquest domini? Això no podrà ser desfet!\n';
$PALANG['check_update'] = 'Check for update';
+$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Login d\'administrador per l\'administració de dominis.';
$PALANG['pLogin_username'] = 'Usuari (e-mail)';
@@ -21,9 +21,11 @@
$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_login_users'] = 'Login per anar a la secció d\'usuaris.';
+$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Resum';
$PALANG['pMenu_create_alias'] = 'Afegir àlies';
$PALANG['pMenu_create_mailbox'] = 'Afegir bústia';
+$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'Enviar e-mail';
$PALANG['pMenu_password'] = 'Contrasenya';
$PALANG['pMenu_viewlog'] = 'Veure Logs';
@@ -53,11 +55,15 @@
$PALANG['pOverview_alias_address'] = 'De';
$PALANG['pOverview_alias_goto'] = 'Destí';
$PALANG['pOverview_alias_modified'] = 'Última modificació';
+$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-mail';
$PALANG['pOverview_mailbox_name'] = 'Nom';
$PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
$PALANG['pOverview_mailbox_modified'] = 'Última modificació';
$PALANG['pOverview_mailbox_active'] = 'Actiu';
+$PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
+$PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
$PALANG['pOverview_get_domain'] = 'Domini';
$PALANG['pOverview_get_aliases'] = 'Àlies';
@@ -66,7 +72,9 @@
$PALANG['pOverview_get_modified'] = 'Última Modificació';
$PALANG['pDelete_delete_error'] = '<span class="error_msg">Imposible borrar el registre ';
+$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Aquest domini no et pertany ';
+$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
$PALANG['pCreate_alias_welcome'] = 'Crear un nou àlies pel domini.';
$PALANG['pCreate_alias_address'] = 'Àlies';
@@ -74,6 +82,7 @@
$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Aquesta adreça ja existeix, escull una altra de diferent, si us plau!</span>';
$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Has arribat al límit de creació d\'àlies!</span>';
$PALANG['pCreate_alias_goto'] = 'Destí';
+$PALANG['pCreate_alias_active'] = 'Active'; # XXX
$PALANG['pCreate_alias_button'] = 'Afegir àlies';
$PALANG['pCreate_alias_goto_text'] = 'A on ha de ser enviat l\'e-mail.';
$PALANG['pCreate_alias_goto_text_error'] = 'A on ha de ser enviat l\'e-mail.<br /><span class="error_msg">El destí no és vàlid!</span>';
@@ -85,6 +94,7 @@
$PALANG['pEdit_alias_address'] = 'Àlies';
$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Imposible de localizar l\'àlies!</span>';
$PALANG['pEdit_alias_goto'] = 'Destí';
+$PALANG['pEdit_alias_active'] = 'Active'; # XXX
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">No has introduït res al destí</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">L\'adreça d\'e-mail introduida no és vàlida: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Aquest domini no et pertany: ';
@@ -112,6 +122,7 @@
$PALANG['pCreate_mailbox_button'] = 'Afegir bústia';
$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Imposible afegir una bústia a la taula de bústies!</span>';
$PALANG['pCreate_mailbox_result_success'] = 'La bústia ha estat afegida a la taula de bústies!';
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
$PALANG['pEdit_mailbox_welcome'] = 'Editar una bústia pel seu domini.';
$PALANG['pEdit_mailbox_username'] = 'Usuari';
@@ -120,6 +131,7 @@
$PALANG['pEdit_mailbox_password2'] = 'Nova contrasenya (repetiu)';
$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">Les contrasenyes introduides no coincideixen!</span>';
$PALANG['pEdit_mailbox_name'] = 'Nom';
+$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX
$PALANG['pEdit_mailbox_quota'] = 'Quota';
$PALANG['pEdit_mailbox_quota_text'] = 'MB';
$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">La quota especificada és massa alta!</span>';
@@ -138,6 +150,11 @@
$PALANG['pPassword_button'] = 'Canviar la contrasenya';
$PALANG['pPassword_result_error'] = '<span class="error_msg">Imposible canviar la contrasenya!</span>';
$PALANG['pPassword_result_success'] = 'La seva contrasenya ha estat canviada!';
+$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
+$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX
+$PALANG['pVacation_result_error'] = '<span class="error_msg">Unable to update auto response settings!</span>'; # XXX
+$PALANG['pVacation_result_removed'] = 'Auto response has been removed!'; # XXX
+$PALANG['pVacation_result_added'] = 'Auto response has been enabled!'; # XXX
$PALANG['pViewlog_welcome'] = 'Veure les últimes 10 accions per ';
$PALANG['pViewlog_timestamp'] = 'Data/Hora';
@@ -145,6 +162,15 @@
$PALANG['pViewlog_domain'] = 'Domini';
$PALANG['pViewlog_action'] = 'Acció';
$PALANG['pViewlog_data'] = 'Dades';
+$PALANG['pViewlog_action_create_mailbox'] = 'create mailbox'; # XXX
+$PALANG['pViewlog_action_delete_mailbox'] = 'delete mailbox'; # XXX
+$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
+$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
+$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Ves';
$PALANG['pViewlog_result_error'] = '<span class="error_msg">Imposible trobar els logs!</span>';
@@ -203,6 +229,7 @@
$PALANG['pAdminCreate_domain_welcome'] = 'Afegir nou domini';
$PALANG['pAdminCreate_domain_domain'] = 'Domini';
$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">El domini ja existeix!</span>';
+$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">The domain is invalid!</span>'; # XXX
$PALANG['pAdminCreate_domain_description'] = 'Descripció';
$PALANG['pAdminCreate_domain_aliases'] = 'Àlies';
$PALANG['pAdminCreate_domain_aliases_text'] = '-1 = ilimitat | 0 = deshabilitar';
@@ -213,10 +240,12 @@
$PALANG['pAdminCreate_domain_transport'] = 'Transport';
$PALANG['pAdminCreate_domain_transport_text'] = 'Define transport';
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Afegir àlies per defecte';
+$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
$PALANG['pAdminCreate_domain_backupmx'] = 'Mail server is backup MX';
$PALANG['pAdminCreate_domain_button'] = 'Afegir domini';
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Imposible afegir el domini!</span>';
$PALANG['pAdminCreate_domain_result_success'] = 'El domini ha estat afegit!';
+$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Editar un domini';
$PALANG['pAdminEdit_domain_domain'] = 'Domini';
@@ -271,6 +300,7 @@
$PALANG['pUsersMenu_password'] = 'Canviar la contrasenya';
$PALANG['pUsersMain_vacation'] = 'Configuri un missatge de "Fora de la feina" o una resposta automàtica pel seu correu.';
+$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
$PALANG['pUsersMain_edit_alias'] = 'Canvïi la seva redirecció de correu.';
$PALANG['pUsersMain_password'] = 'Canvïi la seva contrasenya.';
@@ -297,5 +327,24 @@
$PALANG['pEdit_dbLog_editalias'] = 'edit alias';
$PALANG['pEdit_dbLog_editmailbox'] = 'edit mailbox';
+$PALANG['pSearch'] = 'search'; # XXX
$PALANG['pSearch_welcome'] = 'Searching for: ';
+$PALANG['pReturn_to'] = 'Return to'; # XXX
+$PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
+$PALANG['pBroadcast_from'] = 'From'; # XXX
+$PALANG['pBroadcast_name'] = 'Your name'; # XXX
+$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
+$PALANG['pBroadcast_message'] = 'Message'; # XXX
+$PALANG['pBroadcast_send'] = 'Send message'; # XXX
+$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
+$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
+$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
+$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
+$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
+$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+
+/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2007-10-12 23:16:25 UTC (rev 153)
+++ trunk/languages/cn.lang 2007-10-13 19:10:41 UTC (rev 154)
@@ -4,15 +4,15 @@
// by Matthew <matthew at cnfug dot org>
//
-require ('default.lang');
-
$PALANG['YES'] = '是';
$PALANG['NO'] = '否';
$PALANG['edit'] = '编辑';
$PALANG['del'] = '删除';
+$PALANG['exit'] = 'Exit'; # XXX
$PALANG['confirm'] = '是否确定删除?\n';
$PALANG['confirm_domain'] = '你是否确定要删除该域中的所有记录? 删除后不可恢复!\n';
$PALANG['check_update'] = '检查新版本';
+$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = '邮件管理员请从这里登录以管理你的域名.';
$PALANG['pLogin_username'] = '帐号 (邮件地址)';
@@ -22,9 +22,11 @@
$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">密码错误!</span>';
$PALANG['pLogin_login_users'] = '普通用户点击这里进入用户控制面板.';
+$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = '概览';
$PALANG['pMenu_create_alias'] = '新建别名';
$PALANG['pMenu_create_mailbox'] = '新建邮箱';
+$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = '发送邮件';
$PALANG['pMenu_password'] = '修改密码';
$PALANG['pMenu_viewlog'] = '查看日志';
@@ -39,8 +41,8 @@
$PALANG['pMain_viewlog'] = '查看日志文件.';
$PALANG['pMain_logout'] = '退出系统';
-$PALANG['pOverview_disabled'] = 'Disabled';
-$PALANG['pOverview_unlimited'] = 'Unlimited';
+$PALANG['pOverview_disabled'] = 'Disabled'; # XXX
+$PALANG['pOverview_unlimited'] = 'Unlimited'; # XXX
$PALANG['pOverview_title'] = ':: 域';
$PALANG['pOverview_up_arrow'] = '返回顶端';
$PALANG['pOverview_right_arrow'] = '下一页';
@@ -54,11 +56,15 @@
$PALANG['pOverview_alias_address'] = '前往';
$PALANG['pOverview_alias_goto'] = '转到';
$PALANG['pOverview_alias_modified'] = '最后修改日期';
+$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['pOverview_mailbox_username'] = '邮件地址';
$PALANG['pOverview_mailbox_name'] = '姓名';
$PALANG['pOverview_mailbox_quota'] = '限制 (MB)';
$PALANG['pOverview_mailbox_modified'] = '最后修改日期';
$PALANG['pOverview_mailbox_active'] = '活动';
+$PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
+$PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
$PALANG['pOverview_get_domain'] = '域';
$PALANG['pOverview_get_aliases'] = '别名';
@@ -67,7 +73,9 @@
$PALANG['pOverview_get_modified'] = '最后修改日期';
$PALANG['pDelete_delete_error'] = '<span class="error_msg">不能删除本记录';
+$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">你没有该域的管理权限';
+$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
$PALANG['pCreate_alias_welcome'] = '在你的域中新建一个别名.';
$PALANG['pCreate_alias_address'] = '别名';
@@ -75,6 +83,7 @@
$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">邮件地址已经存在, 请重新选择!</span>';
$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">你的别名已经达到上限!</span>';
$PALANG['pCreate_alias_goto'] = '转到';
+$PALANG['pCreate_alias_active'] = 'Active'; # XXX
$PALANG['pCreate_alias_button'] = '新建别名';
$PALANG['pCreate_alias_goto_text'] = '邮件接收地址.';
$PALANG['pCreate_alias_goto_text_error'] = '邮件接收地址.<br /><span class="error_msg">接收地址不正确!</span>';
@@ -86,6 +95,7 @@
$PALANG['pEdit_alias_address'] = '别名';
$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">不能定位别名!</span>';
$PALANG['pEdit_alias_goto'] = '转到';
+$PALANG['pEdit_alias_active'] = 'Active'; # XXX
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">你没有填写收信人</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">邮件地址非法: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">你没有该域的管理权限: ';
@@ -113,6 +123,7 @@
$PALANG['pCreate_mailbox_button'] = '增加邮箱';
$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">不能将邮箱增加到邮箱表中!</span>';
$PALANG['pCreate_mailbox_result_success'] = '增加邮箱成功!';
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
$PALANG['pEdit_mailbox_welcome'] = '编辑你域中的邮箱.';
$PALANG['pEdit_mailbox_username'] = '用户名';
@@ -121,6 +132,7 @@
$PALANG['pEdit_mailbox_password2'] = '新密码 (验证)';
$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">你输入的两个新密码不相同!</span>';
$PALANG['pEdit_mailbox_name'] = '姓名';
+$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX
$PALANG['pEdit_mailbox_quota'] = '限制';
$PALANG['pEdit_mailbox_quota_text'] = 'MB';
$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">你输入的容量限制超出范围!</span>';
@@ -139,6 +151,11 @@
$PALANG['pPassword_button'] = '更改密码';
$PALANG['pPassword_result_error'] = '<span class="error_msg">更改密码失败!</span>';
$PALANG['pPassword_result_success'] = '更改密码成功!';
+$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
+$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX
+$PALANG['pVacation_result_error'] = '<span class="error_msg">Unable to update auto response settings!</span>'; # XXX
+$PALANG['pVacation_result_removed'] = 'Auto response has been removed!'; # XXX
+$PALANG['pVacation_result_added'] = 'Auto response has been enabled!'; # XXX
$PALANG['pViewlog_welcome'] = '查看最新的10项操作日志 域名: ';
$PALANG['pViewlog_timestamp'] = '时间';
@@ -146,6 +163,15 @@
$PALANG['pViewlog_domain'] = '域';
$PALANG['pViewlog_action'] = '操作';
$PALANG['pViewlog_data'] = '内容';
+$PALANG['pViewlog_action_create_mailbox'] = 'create mailbox'; # XXX
+$PALANG['pViewlog_action_delete_mailbox'] = 'delete mailbox'; # XXX
+$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
+$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
+$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = '执行';
$PALANG['pViewlog_result_error'] = '<span class="error_msg">未找到相关的日志!</span>';
@@ -204,6 +230,7 @@
$PALANG['pAdminCreate_domain_welcome'] = '新建域';
$PALANG['pAdminCreate_domain_domain'] = '域名';
$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">该域已经存在!</span>';
+$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">The domain is invalid!</span>'; # XXX
$PALANG['pAdminCreate_domain_description'] = '描述';
$PALANG['pAdminCreate_domain_aliases'] = '别名数';
$PALANG['pAdminCreate_domain_aliases_text'] = '-1 = 禁用 | 0 = 无限制';
@@ -214,10 +241,12 @@
$PALANG['pAdminCreate_domain_transport'] = 'Transport';
$PALANG['pAdminCreate_domain_transport_text'] = 'Define transport';
$PALANG['pAdminCreate_domain_defaultaliases'] = '增加默认别名';
+$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
$PALANG['pAdminCreate_domain_backupmx'] = '备份邮件服务器';
$PALANG['pAdminCreate_domain_button'] = '新增';
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">新增域失败!</span>';
$PALANG['pAdminCreate_domain_result_success'] = '新增域成功!';
+$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = '修改域';
$PALANG['pAdminEdit_domain_domain'] = '域名';
@@ -228,8 +257,8 @@
$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = 禁止 | 0 = 无限制';
$PALANG['pAdminEdit_domain_maxquota'] = '最大容量限制';
$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB<br /> -1 = 禁止 | 0 = 无限制';
-$PALANG['pAdminEdit_domain_transport'] = 'Transport';
-$PALANG['pAdminEdit_domain_transport_text'] = 'Define transport';
+$PALANG['pAdminEdit_domain_transport'] = 'Transport'; # XXX
+$PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX
$PALANG['pAdminEdit_domain_backupmx'] = '备份邮件服务器';
$PALANG['pAdminEdit_domain_active'] = '活动';
$PALANG['pAdminEdit_domain_button'] = '修改';
@@ -254,7 +283,7 @@
$PALANG['pAdminEdit_admin_password2'] = '密码 (验证)';
$PALANG['pAdminEdit_admin_password_text_error'] = '<span class="error_msg">你两次输入的新密码不相同!<br />或者为空!</span>';
$PALANG['pAdminEdit_admin_active'] = '活动';
-$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin';
+$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
$PALANG['pAdminEdit_admin_button'] = '修改';
$PALANG['pAdminEdit_admin_result_error'] = '<span class="error_msg">编辑域管理员失败!</span>';
$PALANG['pAdminEdit_admin_result_success'] = '编辑域管理员成功!';
@@ -271,6 +300,7 @@
$PALANG['pUsersMenu_password'] = '修改密码';
$PALANG['pUsersMain_vacation'] = '设置外出信息或自动回复.';
+$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
$PALANG['pUsersMain_edit_alias'] = '修改邮箱转发.';
$PALANG['pUsersMain_password'] = '修改当前密码.';
@@ -297,5 +327,24 @@
$PALANG['pEdit_dbLog_editalias'] = '编辑别名';
$PALANG['pEdit_dbLog_editmailbox'] = '编辑邮箱';
+$PALANG['pSearch'] = 'search'; # XXX
$PALANG['pSearch_welcome'] = '搜索: ';
+$PALANG['pReturn_to'] = 'Return to'; # XXX
+$PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
+$PALANG['pBroadcast_from'] = 'From'; # XXX
+$PALANG['pBroadcast_name'] = 'Your name'; # XXX
+$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
+$PALANG['pBroadcast_message'] = 'Message'; # XXX
+$PALANG['pBroadcast_send'] = 'Send message'; # XXX
+$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
+$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
+$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
+$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
+$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
+$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+
+/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2007-10-12 23:16:25 UTC (rev 153)
+++ trunk/languages/cs.lang 2007-10-13 19:10:41 UTC (rev 154)
@@ -5,9 +5,7 @@
// updated by Martin Ambroz (am...@tr...)
//
-require ('default.lang');
-
$PALANG['YES'] = 'ANO';
$PALANG['NO'] = 'NE';
$PALANG['edit'] = 'upravit';
@@ -31,6 +29,7 @@
$PALANG['pMenu_overview'] = 'Přehled';
$PALANG['pMenu_create_alias'] = 'Přidat přesměrování';
$PALANG['pMenu_create_mailbox'] = 'Přidat schránku';
+$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'Poslat email';
$PALANG['pMenu_password'] = 'Změnit heslo';
$PALANG['pMenu_viewlog'] = 'Prohlížet záznam';
@@ -160,6 +159,8 @@
$PALANG['pEdit_vacation_remove'] = 'Ostranit zprávu o nepřítomnosti';
$PALANG['pVacation_result_error'] = '<span class="error_msg">Nebylo možné aktualizovat nastavení automatické odpověďi!</span>';
+$PALANG['pVacation_result_removed'] = 'Auto response has been removed!'; # XXX
+$PALANG['pVacation_result_added'] = 'Auto response has been enabled!'; # XXX
$PALANG['pViewlog_welcome'] = 'Prohlížet 10 posledních akcí pro ';
$PALANG['pViewlog_timestamp'] = 'Časová značka';
@@ -168,13 +169,14 @@
$PALANG['pViewlog_action'] = 'Akce';
$PALANG['pViewlog_data'] = 'Poznámka';
+$PALANG['pViewlog_action_create_mailbox'] = 'create mailbox'; # XXX
+$PALANG['pViewlog_action_delete_mailbox'] = 'smazána schránka';
+$PALANG['pViewlog_action_edit_mailbox'] = 'úprava schránky';
+$PALANG['pViewlog_action_edit_mailbox_state'] = 'změna stavu schránky';
$PALANG['pViewlog_action_create_alias'] = 'vytvořeno přesměrování';
$PALANG['pViewlog_action_delete_alias'] = 'smazáno přesměrování';
-$PALANG['pViewlog_action_delete_mailbox'] = 'smazána schránka';
$PALANG['pViewlog_action_edit_alias'] = 'úprava přesměrování';
$PALANG['pViewlog_action_edit_alias_state'] = 'změna stavu přesměrování';
-$PALANG['pViewlog_action_edit_mailbox'] = 'úprava schránky';
-$PALANG['pViewlog_action_edit_mailbox_state'] = 'změna stavu schránky';
$PALANG['pViewlog_action_edit_password'] = 'změna hesla';
$PALANG['pViewlog_button'] = 'Jít';
@@ -245,6 +247,7 @@
$PALANG['pAdminCreate_domain_transport'] = 'Transport';
$PALANG['pAdminCreate_domain_transport_text'] = 'Nastavit transport';
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Přidat implicitní přesměrování';
+$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
$PALANG['pAdminCreate_domain_backupmx'] = 'Tento server je záložní MX domény';
$PALANG['pAdminCreate_domain_button'] = 'Přidat doménu';
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Nepodařilo se přidat doménu!</span>';
@@ -349,4 +352,9 @@
$PALANG['pStatus_undeliverable'] = 'možná NEDORUČITELNÉ ';
$PALANG['pStatus_custom'] = 'Doručeno do ';
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
+$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
+$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+
+/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2007-10-12 23:16:25 UTC (rev 153)
+++ trunk/languages/da.lang 2007-10-13 19:10:41 UTC (rev 154)
@@ -4,15 +4,15 @@
// by Lars
//
-require ('default.lang');
-
$PALANG['YES'] = 'JA';
$PALANG['NO'] = 'NEJ';
$PALANG['edit'] = 'rediger';
$PALANG['del'] = 'slet';
+$PALANG['exit'] = 'Exit'; # XXX
$PALANG['confirm'] = 'Er du sikker på du vil slette dette?\n';
$PALANG['confirm_domain'] = 'Vil du virkelig slette alle poster for dette domæne? Dette kan ikke fortrydes!\n';
$PALANG['check_update'] = 'Check for update';
+$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Postadministrator: Log ind her for at administrere dine domæner.';
$PALANG['pLogin_username'] = 'Brugernavn (email)';
@@ -22,9 +22,11 @@
$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Dit kodeord er forkert!</span>';
$PALANG['pLogin_login_users'] = 'Bruger: Log ind på brugersektionen her.';
+$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Oversigt';
$PALANG['pMenu_create_alias'] = 'Tilføj alias';
$PALANG['pMenu_create_mailbox'] = 'Tilføj postboks';
+$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'Send Email';
$PALANG['pMenu_password'] = 'Kodeord';
$PALANG['pMenu_viewlog'] = 'Vis Log';
@@ -54,11 +56,15 @@
$PALANG['pOverview_alias_address'] = 'Fra';
$PALANG['pOverview_alias_goto'] = 'Til';
$PALANG['pOverview_alias_modified'] = 'Senest rettet';
+$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Email';
$PALANG['pOverview_mailbox_name'] = 'Navn';
$PALANG['pOverview_mailbox_quota'] = 'Kvota (MB)';
$PALANG['pOverview_mailbox_modified'] = 'Senest rettet';
$PALANG['pOverview_mailbox_active'] = 'Aktiv';
+$PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
+$PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
$PALANG['pOverview_get_domain'] = 'Domæne';
$PALANG['pOverview_get_aliases'] = 'Aliaser';
@@ -69,6 +75,7 @@
$PALANG['pDelete_delete_error'] = '<span class="error_msg">Kan ikke slette denne post ';
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Kunne ikke fjerne postkassen ';
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Dette domæne er ikke dit ';
+$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
$PALANG['pCreate_alias_welcome'] = 'Opret nyt alias til dit domæne.';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -76,6 +83,7 @@
$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Email adressen eksisterer allerede. Vælg venligst en anden!</span>';
$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Du har nået grænsen for antallet af aliaser til dit domæne!</span>';
$PALANG['pCreate_alias_goto'] = 'Modtager';
+$PALANG['pCreate_alias_active'] = 'Active'; # XXX
$PALANG['pCreate_alias_button'] = 'Tilføj Alias';
$PALANG['pCreate_alias_goto_text'] = 'Hvor emailen skal videresendes til.';
$PALANG['pCreate_alias_goto_text_error'] = 'Hvor emailen skal videresendes til.<br /><span class="error_msg">Modtageradressen er ikke gyldig!</span>';
@@ -87,6 +95,7 @@
$PALANG['pEdit_alias_address'] = 'Alias';
$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Kan ikke finde aliaset!</span>';
$PALANG['pEdit_alias_goto'] = 'Modtager(e)';
+$PALANG['pEdit_alias_active'] = 'Active'; # XXX
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Du udfyldte ikke noget i Modtager(e)</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Den tilføjede emailadresse er ikke gyldig: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Dette domæne tilhører ikke dig: ';
@@ -123,6 +132,7 @@
$PALANG['pEdit_mailbox_password2'] = 'Nyt kodeord (igen)';
$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">Kodeordene er ikke ens!</span>';
$PALANG['pEdit_mailbox_name'] = 'Navn';
+$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX
$PALANG['pEdit_mailbox_quota'] = 'Kvota';
$PALANG['pEdit_mailbox_quota_text'] = 'MB';
$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Den ønskede kvota er for høj!</span>';
@@ -141,6 +151,11 @@
$PALANG['pPassword_button'] = 'Skift kodeord';
$PALANG['pPassword_result_error'] = '<span class="error_msg">Kan ikke skifte kodeord!</span>';
$PALANG['pPassword_result_success'] = 'Dit kodeord er skiftet!';
+$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
+$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX
+$PALANG['pVacation_result_error'] = '<span class="error_msg">Unable to update auto response settings!</span>'; # XXX
+$PALANG['pVacation_result_removed'] = 'Auto response has been removed!'; # XXX
+$PALANG['pVacation_result_added'] = 'Auto response has been enabled!'; # XXX
$PALANG['pViewlog_welcome'] = 'Vis de sidste 10 poster for ';
$PALANG['pViewlog_timestamp'] = 'Tidsstempel';
@@ -148,6 +163,15 @@
$PALANG['pViewlog_domain'] = 'Domæne';
$PALANG['pViewlog_action'] = 'Handling';
$PALANG['pViewlog_data'] = 'Data';
+$PALANG['pViewlog_action_create_mailbox'] = 'create mailbox'; # XXX
+$PALANG['pViewlog_action_delete_mailbox'] = 'delete mailbox'; # XXX
+$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
+$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
+$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Vis';
$PALANG['pViewlog_result_error'] = '<span class="error_msg">Kan ikke finde loggen!</span>';
@@ -206,6 +230,7 @@
$PALANG['pAdminCreate_domain_welcome'] = 'Tilføj et nyt domæne';
$PALANG['pAdminCreate_domain_domain'] = 'Domæne';
$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">Domænet eksisterer allerede!</span>';
+$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">The domain is invalid!</span>'; # XXX
$PALANG['pAdminCreate_domain_description'] = 'Beskrivelse';
$PALANG['pAdminCreate_domain_aliases'] = 'Aliaser';
$PALANG['pAdminCreate_domain_aliases_text'] = '-1 = annuller | 0 = uendeligt';
@@ -216,10 +241,12 @@
$PALANG['pAdminCreate_domain_transport'] = 'Transport';
$PALANG['pAdminCreate_domain_transport_text'] = 'Define transport';
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Tilføj standard aliaser';
+$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
$PALANG['pAdminCreate_domain_backupmx'] = 'Mail server is backup MX';
$PALANG['pAdminCreate_domain_button'] = 'Tilføj domæne';
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Kan ikke tilføje domæne!</span>';
$PALANG['pAdminCreate_domain_result_success'] = 'Domænet er tilføjet!';
+$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Kunne ikke fjerne domænet!</span>';
$PALANG['pAdminEdit_domain_welcome'] = 'Rediger et domæne';
$PALANG['pAdminEdit_domain_domain'] = 'Domæne';
@@ -250,7 +277,6 @@
$PALANG['pAdminCreate_admin_result_success'] = 'Administrator er tilføjet!';
$PALANG['pAdminCreate_admin_address'] = 'Domæne';
-$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Kunne ikke fjerne domænet!</span>';
$PALANG['pAdminEdit_admin_welcome'] = 'Rediger en domæneadministrator';
$PALANG['pAdminEdit_admin_username'] = 'Administrator';
@@ -275,6 +301,7 @@
$PALANG['pUsersMenu_password'] = 'Skift kodeord';
$PALANG['pUsersMain_vacation'] = 'Tilføj en "ikke tilstede" besked eller et autosvar til din email adresse.';
+$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
$PALANG['pUsersMain_edit_alias'] = 'Skift dine viderestillinger for email.';
$PALANG['pUsersMain_password'] = 'Skift dit nuværende kodeord.';
@@ -301,5 +328,24 @@
$PALANG['pEdit_dbLog_editalias'] = 'edit alias';
$PALANG['pEdit_dbLog_editmailbox'] = 'edit mailbox';
+$PALANG['pSearch'] = 'search'; # XXX
$PALANG['pSearch_welcome'] = 'Searching for: ';
+$PALANG['pReturn_to'] = 'Return to'; # XXX
+$PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
+$PALANG['pBroadcast_from'] = 'From'; # XXX
+$PALANG['pBroadcast_name'] = 'Your name'; # XXX
+$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
+$PALANG['pBroadcast_message'] = 'Message'; # XXX
+$PALANG['pBroadcast_send'] = 'Send message'; # XXX
+$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
+$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
+$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
+$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
+$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
+$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+
+/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2007-10-12 23:16:25 UTC (rev 153)
+++ trunk/languages/de.lang 2007-10-13 19:10:41 UTC (rev 154)
@@ -4,8 +4,6 @@
// by Tobias
//
-require ('default.lang');
-
$PALANG['YES'] = 'JA';
$PALANG['NO'] = 'NEIN';
$PALANG['edit'] = 'editieren';
@@ -247,6 +245,7 @@
$PALANG['pAdminCreate_domain_transport'] = 'Transport';
$PALANG['pAdminCreate_domain_transport_text'] = 'Define transport';
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Standard-Aliase hinzufügen';
+$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
$PALANG['pAdminCreate_domain_backupmx'] = 'Mail server is backup MX';
$PALANG['pAdminCreate_domain_button'] = 'Domain hinzufügen';
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Konnte Domain nicht anlegen!</span>';
@@ -356,6 +355,8 @@
$PALANG['pPasswordTooShort'] = "Das Passwort ist zu kurz - mindestens %s Zeichen benötigt";
$PALANG['pFetchmail_welcome'] = 'E-Mail Abruf für: ';
+
$PALANG['pFetchmail_new_entry'] = 'Neuer Eintrag';
+/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Deleted: trunk/languages/default.lang
===================================================================
--- trunk/languages/default.lang 2007-10-12 23:16:25 UTC (rev 153)
+++ trunk/languages/default.lang 2007-10-13 19:10:41 UTC (rev 154)
@@ -1,12 +0,0 @@
-<?php
-//
-// Language file English
-// by Mischa <mischa at high5 dot net>
-//
-// This is in the fact en.lang.
-// Contains complete set of variables/sentences used in PostfixAdmin.
-// Every language file should require it at the beginning.
-//
-
-require_once(dirname(__FILE__) . '/en.lang');
-
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2007-10-12 23:16:25 UTC (rev 153)
+++ trunk/languages/en.lang 2007-10-13 19:10:41 UTC (rev 154)
@@ -307,7 +307,7 @@
$PALANG['pUsersMenu_password'] = 'Change Password';
$PALANG['pUsersMain_vacation'] = 'Set an "out of office" message or auto responder for your mail.';
-$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove';
+$PALANG['pUsersMain_vacationSet'] = 'Auto Response is ON, click \'Auto Response\' to edit/remove';
$PALANG['pUsersMain_edit_alias'] = 'Change your email forwarding.';
$PALANG['pUsersMain_password'] = 'Change your current password.';
@@ -358,4 +358,6 @@
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:';
$PALANG['pFetchmail_new_entry'] = 'New entry';
+
+/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2007-10-12 23:16:25 UTC (rev 153)
+++ trunk/languages/es.lang 2007-10-13 19:10:41 UTC (rev 154)
@@ -4,15 +4,15 @@
// by Alvaro
//
-require ('default.lang');
-
$PALANG['YES'] = 'SI';
$PALANG['NO'] = 'NO';
$PALANG['edit'] = 'editar';
$PALANG['del'] = 'borrar';
+$PALANG['exit'] = 'Exit'; # XXX
$PALANG['confirm'] = '¿Está seguro de que desea borrarlo?\n';
$PALANG['confirm_domain'] = '¿Está seguro de que desea borrar todos los registros de este dominio? ¡Esto no puede ser deshecho!\n';
$PALANG['check_update'] = 'Check for update';
+$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Login de administrador para administración de dominios.';
$PALANG['pLogin_username'] = 'Usuario (e-mail)';
@@ -21,9 +21,11 @@
$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_login_users'] = 'Login para ir a la sección de usuarios.';
+$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Resumen';
$PALANG['pMenu_create_alias'] = 'Añadir alias';
$PALANG['pMenu_create_mailbox'] = 'Añadir buzón';
+$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'Enviar e-mail';
$PALANG['pMenu_password'] = 'Contraseña';
$PALANG['pMenu_viewlog'] = 'Ver Logs';
@@ -53,11 +55,15 @@
$PALANG['pOverview_alias_address'] = 'De';
$PALANG['pOverview_alias_goto'] = 'Destino';
$PALANG['pOverview_alias_modified'] = 'Última modificación';
+$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-mail';
$PALANG['pOverview_mailbox_name'] = 'Nombre';
$PALANG['pOverview_mailbox_quota'] = 'Cuota (MB)';
$PALANG['pOverview_mailbox_modified'] = 'Última modificación';
$PALANG['pOverview_mailbox_active'] = 'Activo';
+$PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
+$PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
$PALANG['pOverview_get_domain'] = 'Dominio';
$PALANG['pOverview_get_aliases'] = 'Alias';
@@ -66,7 +72,9 @@
$PALANG['pOverview_get_modified'] = 'Última Modificación';
$PALANG['pDelete_delete_error'] = '<span class="error_msg">Imposible borrar el registro ';
+$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Este dominio no le pertenece ';
+$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
$PALANG['pCreate_alias_welcome'] = 'Crear un nuevo alias para el dominio.';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -74,6 +82,7 @@
$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">¡Esta dirección ya existe, elija otra diferente por favor!</span>';
$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">¡Ha llegado a su límite de creación de alias!</span>';
$PALANG['pCreate_alias_goto'] = 'Destino';
+$PALANG['pCreate_alias_active'] = 'Active'; # XXX
$PALANG['pCreate_alias_button'] = 'Añadir alias';
$PALANG['pCreate_alias_goto_text'] = 'A donde debe de ser enviado el e-mail.';
$PALANG['pCreate_alias_goto_text_error'] = 'A donde debe de ser enviado el e-mail.<br /><span class="error_msg">¡El PARA no es válido!</span>';
@@ -85,6 +94,7 @@
$PALANG['pEdit_alias_address'] = 'Alias';
$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">¡Imposible de localizar el alias!</span>';
$PALANG['pEdit_alias_goto'] = 'Destino';
+$PALANG['pEdit_alias_active'] = 'Active'; # XXX
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">No ha introducido nada en el destino</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">La dirección de e-mail introducida no es válida: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Este dominio no le pertenece: ';
@@ -112,6 +122,7 @@
$PALANG['pCreate_mailbox_button'] = 'Añadir buzón';
$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">¡Imposible añadir un buzón a la tabla de buzones!</span>';
$PALANG['pCreate_mailbox_result_success'] = '¡El buzón ha sido añadido a la tabla de buzones!';
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
$PALANG['pEdit_mailbox_welcome'] = 'Editar un buzón para su dominio.';
$PALANG['pEdit_mailbox_username'] = 'Usuario';
@@ -120,6 +131,7 @@
$PALANG['pEdit_mailbox_password2'] = 'Nueva contraseña (repetir)';
$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">¡Las contraseñas introducidas no coinciden!</span>';
$PALANG['pEdit_mailbox_name'] = 'Nombre';
+$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX
$PALANG['pEdit_mailbox_quota'] = 'Cuota';
$PALANG['pEdit_mailbox_quota_text'] = 'MB';
$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">¡La cuota especificada es demasiado alta!</span>';
@@ -139,18 +151,31 @@
$PALANG['pPassword_result_error'] = '<span class="error_msg">¡Imposible cambiar la contraseña!</span>';
$PALANG['pPassword_result_success'] = '¡Su contraseña ha sido cambiada!';
+$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
+$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX
+$PALANG['pVacation_result_error'] = '<span class="error_msg">¡Imposible actualizar la configuracióne la respuesta automática!</span>';
+$PALANG['pVacation_result_removed'] = 'Auto response has been removed!'; # XXX
+$PALANG['pVacation_result_added'] = 'Auto response has been enabled!'; # XXX
+
$PALANG['pViewlog_welcome'] = 'Ver las últimas 10 acciones para ';
$PALANG['pViewlog_timestamp'] = 'Fecha/Hora';
$PALANG['pViewlog_username'] = 'Administrador';
$PALANG['pViewlog_domain'] = 'Dominio';
$PALANG['pViewlog_action'] = 'Acción';
$PALANG['pViewlog_data'] = 'Datos';
+$PALANG['pViewlog_action_create_mailbox'] = 'create mailbox'; # XXX
+$PALANG['pViewlog_action_delete_mailbox'] = 'delete mailbox'; # XXX
+$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
+$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
+$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
+$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Ir';
$PALANG['pViewlog_result_error'] = '<span class="error_msg">¡Imposible encontrar los logs!</span>';
-$PALANG['pVacation_result_error'] = '<span class="error_msg">¡Imposible actualizar la configuracióne la respuesta automática!</span>';
-
$PALANG['pSendmail_welcome'] = 'Enviar un e-mail.';
$PALANG['pSendmail_admin'] = 'De';
$PALANG['pSendmail_to'] = 'Destino';
@@ -205,6 +230,7 @@
$PALANG['pAdminCreate_domain_welcome'] = 'Añadir nuevo dominio';
$PALANG['pAdminCreate_domain_domain'] = 'Dominio';
$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">¡El dominio ya existe!</span>';
+$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">The domain is invalid!</span>'; # XXX
$PALANG['pAdminCreate_domain_description'] = 'Descripción';
$PALANG['pAdminCreate_domain_aliases'] = 'Alias';
$PALANG['pAdminCreate_domain_aliases_text'] = '-1 = deshabilitar | 0 = ilimitado';
@@ -215,10 +241,12 @@
$PALANG['pAdminCreate_domain_transport'] = 'Transport';
$PALANG['pAdminCreate_domain_transport_text'] = 'Define transport';
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Añadir alias por defecto';
+$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
$PALANG['pAdminCreate_domain_backupmx'] = 'Mail server is backup MX';
$PALANG['pAdminCreate_domain_button'] = 'Añadir dominio';
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">¡Imposible añadir el dominio!</span>';
$PALANG['pAdminCreate_domain_result_success'] = '¡El dominio ha sido añadido!';
+$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Editar un dominio';
$PALANG['pAdminEdit_domain_domain'] = 'Dominio';
@@ -273,6 +301,7 @@
$PALANG['pUsersMenu_password'] = 'Cambiar la contraseña';
$PALANG['pUsersMain_vacation'] = 'Configure un mensaje de "fuera del trabajo" o una respuesta automática para su correo.';
+$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
$PALANG['pUsersMain_edit_alias'] = 'Cambie su redirección de correo.';
$PALANG['pUsersMain_password'] = 'Cambie su contraseña.';
@@ -299,5 +328,24 @@
$PALANG['pEdit_dbLog_editalias'] = 'edit alias';
$PALANG['pEdit_dbLog_editmailbox'] = 'edit mailbox';
+$PALANG['pSearch'] = 'search'; # XXX
$PALANG['pSearch_welcome'] = 'Searching for: ';
+$PALANG['pReturn_to'] = 'Return to'; # XXX
+$PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
+$PALANG['pBroadcast_from'] = 'From'; # XXX
+$PALANG['pBroadcast_name'] = 'Your name'; # XXX
+$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
+$PALANG['pBroadcast_message'] = 'Message'; # XXX
+$PALANG['pBroadcast_send'] = 'Send message'; # XXX
+$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
+$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
+$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
+$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
+$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
+$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
+$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
+$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
+$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+
+/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2007-10-12 23:16:25 UTC (rev 153)
+++ trunk/languages/et.lang 2007-10-13 19:10:41 UTC (rev 154)
@@ -4,15 +4,15 @@
// by Peeter Partel <peeter at sigma dot ee>
//
-require ('default.lang');
-
$PALANG['YES'] = 'JAH';
$PALANG['NO'] = 'EI';
$PALANG['edit'] = 'Redigeeri';
$PALANG['del'] = 'Kustuta';
+$PALANG['exit'] = 'Exit'; # XXX
$PALANG['confirm'] = 'Oled kindel, et soovid seda kustutada?\n';
$PALANG['confirm_domain'] = 'Oled tõesti kindel, et tahad kustutada kõik kirjed sellele domeenile? Seda tegevust ei saa tagasi võtta!\n';
$PALANG['check_update'] = 'Check for update';
+$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'E-posti haldaja, logi siit domeeni administreerimiseks sisse.';
$PALANG['pLogin_username'] = 'Kasutajanimi (e-posti aadress)';
@@ -22,9 +22,11 @@
$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Parool pole õige!</span>';
$PALANG['pLogin_login_users'] = 'Kasutaja, klõpsa siia logimaks sisse kasutaja sektsiooni.';
+$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Ülevaade';
$PALANG['pMenu_create_alias'] = 'Lisa alias';
$PALANG['pMenu_create_mailbox'] = 'Lisa postkast';
+$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'Saada kiri';
$PALANG['pMenu_password'] = 'Parool';
$PALANG['pMenu_viewlog'] = 'Vaata logi';
@@ -54,11 +56,15 @@
$PALANG['pOverview_alias_address'] = 'Kellelt';
$PALANG['pOverview_alias_goto'] = 'Kellele';
$PALANG['pOverview_alias_modified'] = 'Viimati muudetud';
+$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-posti aadress';
$PALANG['pOverview_mailbox_name'] = 'Nimi';
$PALANG['pOverview_mailbox_quota'] = 'Kettaruumi piirang (MB)';
$PALANG['pOverview_mailbox_modified'] = 'Viimati muudetud';
$PALANG['pOverview_mailbox_active'] = 'Aktiivne';
+$PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
+$PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
$PALANG['pOverview_get_domain'] = 'Domeen';
$PALANG['pOverview_get_aliases'] = 'Aliased';
@@ -67,7 +73,9 @@
$PALANG['pOverview_get_modified'] = 'Viimati muudetud';
$PALANG['pDelete_delete_error'] = '<span class="error_msg">Kustutamine ebaõnne...
[truncated message content] |
|
From: <chr...@us...> - 2007-10-12 23:16:25
|
Revision: 153
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=153&view=rev
Author: christian_boltz
Date: 2007-10-12 16:16:25 -0700 (Fri, 12 Oct 2007)
Log Message:
-----------
- fr.lang translation update by Francois Grange - thanks!
https://sourceforge.net/tracker/?func=detail&atid=937964&aid=1811005&group_id=191583
Modified Paths:
--------------
trunk/languages/fr.lang
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2007-10-12 19:35:53 UTC (rev 152)
+++ trunk/languages/fr.lang 2007-10-12 23:16:25 UTC (rev 153)
@@ -3,17 +3,18 @@
// Language file French
// by Kuthz
// updated by Olivier ETIENNE
+// updated by Francois Grange
//
-require ('default.lang');
-
$PALANG['YES'] = 'Oui';
$PALANG['NO'] = 'Non';
$PALANG['edit'] = 'Modifier';
$PALANG['del'] = 'Effacer';
+$PALANG['exit'] = 'Quitter';
$PALANG['confirm'] = 'Etes vous sur de vouloir supprimer cet enregistrement\n';
$PALANG['confirm_domain'] = 'Etes-vous sur de vouloir effacer tous les enregistrements dans ce domaine ? Cette opération ne pourra pas être annulée.\n';
$PALANG['check_update'] = 'Vérifiez les mises à jour';
+$PALANG['pFooter_logged_as'] = 'Bonjour %s';
$PALANG['pLogin_welcome'] = 'Entrez votre adresse courriel pour administrer votre domaine.';
$PALANG['pLogin_username'] = 'Adresse courriel';
@@ -22,10 +23,12 @@
$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_login_users'] = 'Utilisateurs, cliquez ici pour rejoindre votre section.';
+$PALANG['pMenu_main'] = 'Menu principal';
$PALANG['pMenu_overview'] = 'Vue d\'ensemble';
$PALANG['pMenu_create_alias'] = 'Ajouter un alias';
$PALANG['pMenu_create_mailbox'] = 'Ajouter un compte courriel';
+$PALANG['pMenu_fetchmail'] = 'Récupérer le courrier';
$PALANG['pMenu_sendmail'] = 'Envoyer un courriel';
$PALANG['pMenu_password'] = 'Mot de passe';
$PALANG['pMenu_viewlog'] = 'Consulter le journal des événements';
@@ -55,11 +58,15 @@
$PALANG['pOverview_alias_address'] = 'De';
$PALANG['pOverview_alias_goto'] = 'A';
$PALANG['pOverview_alias_modified'] = 'Dernière Modification';
+$PALANG['pOverview_alias_active'] = 'Activé';
+$PALANG['pOverview_alias_edit'] = 'Alias';
$PALANG['pOverview_mailbox_username'] = 'courriel';
$PALANG['pOverview_mailbox_name'] = 'Nom';
$PALANG['pOverview_mailbox_quota'] = 'Limite (MB)';
$PALANG['pOverview_mailbox_modified'] = 'Dernière Modification';
$PALANG['pOverview_mailbox_active'] = 'Actif';
+$PALANG['pOverview_vacation_edit'] = 'REPONDEUR ACTIVE';
+$PALANG['pOverview_vacation_option'] = 'Configurer le répondeur';
$PALANG['pOverview_get_domain'] = 'Domaine';
$PALANG['pOverview_get_aliases'] = 'Alias';
@@ -70,13 +77,14 @@
$PALANG['pDelete_delete_error'] = '<span class="error_msg">Impossible d\'effacer cette entrée ';
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Impossible d\'effacer ce compte courriel';
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Ce domaine n\'est pas le votre ';
-
+$PALANG['pDelete_alias_error'] = '<span class="error_msg">Impossible d\'effacer cet alias ';
$PALANG['pCreate_alias_welcome'] = 'Créer un nouvel alias pour votre domaine.';
$PALANG['pCreate_alias_address'] = 'Alias';
$PALANG['pCreate_alias_address_text_error1'] = '<br><span class="error_msg">Cet ALIAS n\'est pas valide!</span>';
$PALANG['pCreate_alias_address_text_error2'] = '<br><span class="error_msg">Ce compte courriel existe déjà, choisissez un autre libellé !</span>';
$PALANG['pCreate_alias_address_text_error3'] = '<br><span class="error_msg">Vous avez atteint votre limite d\'alias créés !</span>';
$PALANG['pCreate_alias_goto'] = 'À';
+$PALANG['pCreate_alias_active'] = 'Activé';
$PALANG['pCreate_alias_button'] = 'Ajouter un alias';
$PALANG['pCreate_alias_goto_text'] = 'Destinataires des courriels.';
$PALANG['pCreate_alias_goto_text_error'] = 'Destinataires des courriels.<br /><span class="error_msg">le champ À contient des erreurs!</span>';
@@ -88,6 +96,7 @@
$PALANG['pEdit_alias_address'] = 'Alias';
$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Impossible de localiser l\'alias!</span>';
$PALANG['pEdit_alias_goto'] = 'À';
+$PALANG['pEdit_alias_active'] = 'Activé';
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Vous devez entrer quelques choses dans le champ À</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">L\'adresse courriel que vous avez entré est invalide: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Ce domaine n\'est pas le votre: ';
@@ -124,6 +133,7 @@
$PALANG['pEdit_mailbox_password2'] = 'Nouveau mot de passe (confirmation)';
$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">Le mot de passe entré ne correspond pas!</span>';
$PALANG['pEdit_mailbox_name'] = 'Nom';
+$PALANG['pEdit_mailbox_name_text'] = 'Nom complet';
$PALANG['pEdit_mailbox_quota'] = 'Limite';
$PALANG['pEdit_mailbox_quota_text'] = 'MB';
$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">La limite fournit est trop haute!</span>';
@@ -142,6 +152,11 @@
$PALANG['pPassword_button'] = 'Changer le mot de passe';
$PALANG['pPassword_result_error'] = '<span class="error_msg">Impossible de changer votre mot de passe!</span>';
$PALANG['pPassword_result_success'] = 'Votre mot de passe a été change!';
+$PALANG['pEdit_vacation_set'] = 'Modifier le message';
+$PALANG['pEdit_vacation_remove'] = 'Effacer le message';
+$PALANG['pVacation_result_error'] = '<span class="error_msg">Impossible de mettre à jour les réglages du répondeur!</span>';
+$PALANG['pVacation_result_removed'] = 'Le répondeur a été désactivé!';
+$PALANG['pVacation_result_added'] = 'Le répondeur a été activé!';
$PALANG['pViewlog_welcome'] = 'Visualiser les 10 dernières action pour ';
$PALANG['pViewlog_timestamp'] = 'Date/Heure';
@@ -149,6 +164,15 @@
$PALANG['pViewlog_domain'] = 'Domaine';
$PALANG['pViewlog_action'] = 'Action';
$PALANG['pViewlog_data'] = 'Information';
+$PALANG['pViewlog_action_create_mailbox'] = 'créer un compte courriel';
+$PALANG['pViewlog_action_delete_mailbox'] = 'supprimer un compte courriel';
+$PALANG['pViewlog_action_edit_mailbox'] = 'éditer un compte courriel';
+$PALANG['pViewlog_action_edit_mailbox_state'] = 'activer un compte courriel';
+$PALANG['pViewlog_action_create_alias'] = 'créer un alias';
+$PALANG['pViewlog_action_delete_alias'] = 'supprimer un alias';
+$PALANG['pViewlog_action_edit_alias'] = 'éditer un alias';
+$PALANG['pViewlog_action_edit_alias_state'] = 'activer un alias';
+$PALANG['pViewlog_action_edit_password'] = 'changer le mot de passe';
$PALANG['pViewlog_button'] = 'Aller';
$PALANG['pViewlog_result_error'] = '<span class="error_msg">Impossible de trouver le journal des événements!</span>';
@@ -218,6 +242,7 @@
$PALANG['pAdminCreate_domain_transport'] = 'Transport';
$PALANG['pAdminCreate_domain_transport_text'] = 'Definir le transport';
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Ajouter les alias par défaut';
+$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
$PALANG['pAdminCreate_domain_backupmx'] = 'Le serveur est un "backup MX"';
$PALANG['pAdminCreate_domain_button'] = 'Ajouter un domaine';
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Impossible d\'ajouter le domaine!</span>';
@@ -277,6 +302,7 @@
$PALANG['pUsersMenu_password'] = 'Modifier votre mot de passe';
$PALANG['pUsersMain_vacation'] = 'Configurer votre répondeur automatique.';
+$PALANG['pUsersMain_vacationSet'] = 'La ' . $PALANG['pUsersMenu_vacation'] . ' est activée, cliquer \'' . $PALANG['pUsersMenu_vacation'] . '\' pour ' . $PALANG['edit'] . '/effacer';
$PALANG['pUsersMain_edit_alias'] = 'Modifier vos transferts de courriel.';
$PALANG['pUsersMain_password'] = 'Changer votre mot de passe.';
@@ -291,8 +317,8 @@
EOM;
$PALANG['pUsersVacation_button_away'] = 'Absence';
$PALANG['pUsersVacation_button_back'] = 'De retour';
-$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Impossible de mettre à jour vos paramètres de reponse automatique!</span>';
-$PALANG['pUsersVacation_result_success'] = 'Votre reponse automatique a été enlevée!';
+$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Impossible de mettre à jour vos paramètres de réponse automatique!</span>';
+$PALANG['pUsersVacation_result_success'] = 'Votre réponse automatique a été enlevée!';
$PALANG['pCreate_dbLog_createmailbox'] = 'Création de compte';
$PALANG['pCreate_dbLog_createalias'] = 'Création d\'alias';
@@ -303,5 +329,22 @@
$PALANG['pEdit_dbLog_editalias'] = 'Modificaton d\'alias';
$PALANG['pEdit_dbLog_editmailbox'] = 'Modification de compte';
+$PALANG['pSearch'] = 'Rechercher';
$PALANG['pSearch_welcome'] = 'Recherche : ';
+$PALANG['pReturn_to'] = 'Réponse à';
+$PALANG['pBroadcast_title'] = 'Envoyer un message général';
+$PALANG['pBroadcast_from'] = 'De';
+$PALANG['pBroadcast_name'] = 'Votre nom';
+$PALANG['pBroadcast_subject'] = 'Sujet';
+$PALANG['pBroadcast_message'] = 'Message';
+$PALANG['pBroadcast_send'] = 'Envoyer le message';
+$PALANG['pBroadcast_success'] = 'Votre message général a été envoyé.';
+$PALANG['pAdminMenu_broadcast_message'] = 'message général';
+$PALANG['pBroadcast_error_empty'] = 'Les champs Nom, Sujet et Message ne peuvent pas être vides!';
+$PALANG['pStatus_undeliverable'] = 'Non délivrable ';
+$PALANG['pStatus_custom'] = 'Délivré à ';
+$PALANG['pStatus_popimap'] = 'POP/IMAP ';
+$PALANG['pPasswordTooShort'] = "Mot de passe trop court. - %s caractères minimum";
+$PALANG['pFetchmail_welcome'] = 'Récupérer le courrier pour :';
+$PALANG['pFetchmail_new_entry'] = 'Nouvelle entrée';
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-12 19:35:51
|
Revision: 152
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=152&view=rev
Author: christian_boltz
Date: 2007-10-12 12:35:53 -0700 (Fri, 12 Oct 2007)
Log Message:
-----------
- fix: remove spurious comma from goto when removing vacation alias
reported by inle in https://sourceforge.net/forum/message.php?msg_id=4564628
Modified Paths:
--------------
trunk/users/vacation.php
Modified: trunk/users/vacation.php
===================================================================
--- trunk/users/vacation.php 2007-10-11 22:27:25 UTC (rev 151)
+++ trunk/users/vacation.php 2007-10-12 19:35:53 UTC (rev 152)
@@ -113,8 +113,8 @@
//only one of these will do something, first handles address at beginning and middle, second at end, third if it's the only alias record.
$goto= preg_replace ( "/$vacation_goto,/", '', $tGoto);
- $goto= preg_replace ( "/,$vacation_goto/", '', $tGoto);
- $goto= preg_replace ( "/$vacation_goto/", '', $tGoto);
+ $goto= preg_replace ( "/,$vacation_goto/", '', $goto);
+ $goto= preg_replace ( "/$vacation_goto/", '', $goto);
$query = "UPDATE $table_alias SET goto='$goto',modified=NOW() WHERE address='$USERID_USERNAME'";
if($goto == '') {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-11 22:27:23
|
Revision: 151
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=151&view=rev
Author: christian_boltz
Date: 2007-10-11 15:27:25 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
- added fetchmail.php to menu.tpl (only displayed if $CONF['fetchmail'] == 'YES')
- shortened german menu text for fetchmail
- config.inc.php:
- added $CONF['fetchmail'] and $CONF['fetchmail_extra_options'], including
a big warning for the latter one.
- include config.inc.php at the end if it exists. This can make future
updates easier because you don't have to edit config.inc.php itsself.
It should also make development easier because you don't need to undo
local changes before commiting config.inc.php
- fetchmail.tpl:
- new array display_fields, contains the list of fields to display in the
table. This also solves most "undefined index" warnings.
Note: editing fetchmail does not honor $CONF['fetchmail_extra_options'] = 'NO' yet.
Modified Paths:
--------------
trunk/config.inc.php
trunk/languages/de.lang
trunk/templates/fetchmail.tpl
trunk/templates/menu.tpl
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2007-10-11 18:58:24 UTC (rev 150)
+++ trunk/config.inc.php 2007-10-11 22:27:25 UTC (rev 151)
@@ -197,6 +197,15 @@
// If you don't want logging set this to 'NO';
$CONF['logging'] = 'YES';
+// Fetchmail
+// If you don't want fetchmail tab set this to 'NO';
+$CONF['fetchmail'] = 'YES';
+
+// fetchmail_extra_options allows users to specify any fetchmail options and any MDA
+// (it will even accept 'rm -rf /' as MDA!)
+// This should be set to NO, except if you *really* trust *all* your users.
+$CONF['fetchmail_extra_options'] = 'NO';
+
// Header
$CONF['show_header_text'] = 'NO';
$CONF['header_text'] = ':: Postfix Admin ::';
@@ -299,6 +308,15 @@
// See also the "Optional flags for names" table at
// http://www.php.net/manual/en/function.imap-open.php
+
+// If you want to keep most settings at default values and/or want to ensure
+// that future updates work without problems, you can use a separate config
+// file (config.local.php) instead of editing this file and override some
+// settings there.
+if (file_exists (realpath ("./config.local.php"))) {
+ include('config.local.php');
+};
+
//
// END OF CONFIG FILE
//
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2007-10-11 18:58:24 UTC (rev 150)
+++ trunk/languages/de.lang 2007-10-11 22:27:25 UTC (rev 151)
@@ -29,7 +29,7 @@
$PALANG['pMenu_overview'] = 'Überblick';
$PALANG['pMenu_create_alias'] = 'Alias hinzufügen';
$PALANG['pMenu_create_mailbox'] = 'Mailbox hinzufügen';
-$PALANG['pMenu_fetchmail'] = 'E-Mail Abruf bearbeiten';
+$PALANG['pMenu_fetchmail'] = 'E-Mail Abruf';
$PALANG['pMenu_sendmail'] = 'Email versenden';
$PALANG['pMenu_password'] = 'Passwort ändern';
$PALANG['pMenu_viewlog'] = 'Log ansehen';
Modified: trunk/templates/fetchmail.tpl
===================================================================
--- trunk/templates/fetchmail.tpl 2007-10-11 18:58:24 UTC (rev 150)
+++ trunk/templates/fetchmail.tpl 2007-10-11 22:27:25 UTC (rev 151)
@@ -2,12 +2,41 @@
<form name="overview" method="post">
<?php
-
+
+# fields to display in table view
+$display_fields=array(
+ "id",
+ "mailbox",
+ "src_server",
+ "src_auth",
+ "src_user",
+# "src_password",
+ "src_folder",
+ "pool_time",
+ "fetchall",
+ "keep",
+ "protocol",
+);
+
+if ($CONF['fetchmail_extra_options'] == 'YES') {
+ array_push(
+ $display_fields,
+ "extra_options",
+ "mda"
+ );
+}
+
+array_push(
+ $display_fields,
+ "date",
+ "returned_text"
+);
+
$headers=array();
- foreach($fm_struct as $row){
- list($editible,$view,$type,$title,$comment)=$row;
+ foreach($display_fields as $row){
+ list($editible,$view,$type,$title,$comment)=$fm_struct[$row];
if ($view){
- $headers[]=$row;
+ $headers[]=$fm_struct[$row];
}
}
@@ -30,17 +59,19 @@
}
else{
print " <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
- foreach($row as $key=>$val){
+ foreach($display_fields as $key){
+
list($editible,$view,$type,$title,$comment)=$fm_struct[$key];
+ $val = $row[$key];
if ($view){
$func="_listview_".$type;
print " <td nowrap>" . (function_exists($func)?$func($val):$val) . "</td>\n";
}
+
}
print " </tr>\n";
}
}
-
}
function fetchmail_edit_row($data=array()){
@@ -153,3 +184,4 @@
<p />
</form>
</div>
+<?php /* vim: set ft=php expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ ?>
Modified: trunk/templates/menu.tpl
===================================================================
--- trunk/templates/menu.tpl 2007-10-11 18:58:24 UTC (rev 150)
+++ trunk/templates/menu.tpl 2007-10-11 22:27:25 UTC (rev 151)
@@ -6,6 +6,9 @@
<li><a target="_top" href="<?php print $url; ?>"><?php print $PALANG['pMenu_create_alias']; ?></a></li>
<?php $url = "create-mailbox.php"; if (isset ($_GET['domain'])) $url .= "?domain=" . $_GET['domain']; ?>
<li><a target="_top" href="<?php print $url; ?>"><?php print $PALANG['pMenu_create_mailbox']; ?></a></li>
+ <?php if ($CONF['fetchmail'] == "YES") { ?>
+ <li><a target="_top" href="fetchmail.php"><?php print $PALANG['pMenu_fetchmail']; ?></a></li>
+ <?php } ?>
<?php if ($CONF['sendmail'] == 'YES') { ?><li><a target="_top" href="sendmail.php"><?php print $PALANG['pMenu_sendmail']; ?></a></li><?php } ?>
<?php if ($CONF['vacation'] == "YES") { ?>
<li><a target="_top" href="edit-vacation.php"><?php print $PALANG['pUsersMenu_vacation']; ?></a></li>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-11 18:58:25
|
Revision: 150
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=150&view=rev
Author: christian_boltz
Date: 2007-10-11 11:58:24 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
- vacation.pl: replace DBD::MySQL with DBD::mysql in a comment.
Reported in the forum by jlbrown1:
https://sourceforge.net/forum/message.php?msg_id=4563099
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/vacation.pl
Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================
--- trunk/VIRTUAL_VACATION/vacation.pl 2007-10-10 10:32:45 UTC (rev 149)
+++ trunk/VIRTUAL_VACATION/vacation.pl 2007-10-11 18:58:24 UTC (rev 150)
@@ -38,7 +38,7 @@
#
#
# Requirements:
-# You need to have the DBD::Pg or DBD::MySQL perl-module installed.
+# You need to have the DBD::Pg or DBD::mysql perl-module installed.
# You need to have the Mail::Sendmail module installed.
# You need to have the Email::Valid module installed.
# You need to have the MIME::Charset module installed.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-10 10:32:42
|
Revision: 149
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=149&view=rev
Author: christian_boltz
Date: 2007-10-10 03:32:45 -0700 (Wed, 10 Oct 2007)
Log Message:
-----------
- another hu.lang translation by Levente Farkas - thanks again!
Modified Paths:
--------------
trunk/languages/hu.lang
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2007-10-10 10:13:24 UTC (rev 148)
+++ trunk/languages/hu.lang 2007-10-10 10:32:45 UTC (rev 149)
@@ -136,6 +136,7 @@
$PALANG['pEdit_mailbox_password2'] = 'Új jelszó (mégegyszer)';
$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">A beírt jelszavak nem egyeznek!</span>';
$PALANG['pEdit_mailbox_name'] = 'Név';
+$PALANG['pEdit_mailbox_name_text'] = 'Teljes név';
$PALANG['pEdit_mailbox_quota'] = 'Quota';
$PALANG['pEdit_mailbox_quota_text'] = 'MB';
$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">A megadott quota érték túl magas!</span>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-10 10:13:21
|
Revision: 148
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=148&view=rev
Author: christian_boltz
Date: 2007-10-10 03:13:24 -0700 (Wed, 10 Oct 2007)
Log Message:
-----------
- updated hu.lang. Thanks to Levente Farkas <lfarkas at lfarkas dot org>
https://sourceforge.net/tracker/?func=detail&atid=937964&aid=1810646&group_id=191583
Modified Paths:
--------------
trunk/languages/hu.lang
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2007-10-09 23:48:48 UTC (rev 147)
+++ trunk/languages/hu.lang 2007-10-10 10:13:24 UTC (rev 148)
@@ -1,7 +1,7 @@
<?php
//
// Language file Hungarian
-// by Christian Hamar <krics at linuxforum dot hu>
+// by Christian Hamar <krics at linuxforum dot hu> and Levente Farkas <lfarkas at lfarkas dot org>
//
require ('default.lang');
@@ -10,21 +10,26 @@
$PALANG['NO'] = 'NEM';
$PALANG['edit'] = 'szerkeszt';
$PALANG['del'] = 'töröl';
+$PALANG['exit'] = 'Kilép';
$PALANG['confirm'] = 'Biztos vagy benne hogy törlöd ezt?\n';
$PALANG['confirm_domain'] = 'Biztos hogy törölni akarod az összes bejegyzést ez alól a domain alól? Nem lehet visszahozni késõbb!\n';
$PALANG['check_update'] = 'Check for update';
-$PALANG['pLogin_welcome'] = 'Mail admins login here to administrate your domain.';
-$PALANG['pLogin_username'] = 'Login (email)';
+$PALANG['pFooter_logged_as'] = '%s-ként bejelentkezve';
+
+$PALANG['pLogin_welcome'] = 'Mail adminisztrátorok itt jelentkezzenek be, hogy adminisztrálják a domainjüket.';
+$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_login_users'] = 'A felhasználók kattintsanak ide a felhasználói felülethez.';
+$PALANG['pMenu_main'] = 'Főmenü';
$PALANG['pMenu_overview'] = 'Áttekintés';
$PALANG['pMenu_create_alias'] = 'Alias felvétele';
$PALANG['pMenu_create_mailbox'] = 'Felhasználó felvétele';
+$PALANG['pMenu_fetchmail'] = 'Email lehozása';
$PALANG['pMenu_sendmail'] = 'Email küldése';
$PALANG['pMenu_password'] = 'Jelszó';
$PALANG['pMenu_viewlog'] = 'Napló megtekintése';
@@ -39,14 +44,14 @@
$PALANG['pMain_viewlog'] = 'Naplófájlok megtekintése.';
$PALANG['pMain_logout'] = 'Kijelentkezés a rendszerbõl';
-$PALANG['pOverview_disabled'] = 'Disabled';
-$PALANG['pOverview_unlimited'] = 'Unlimited';
-$PALANG['pOverview_title'] = ':: Defined Domains';
-$PALANG['pOverview_up_arrow'] = 'Go Top';
-$PALANG['pOverview_right_arrow'] = 'Next Page';
-$PALANG['pOverview_left_arrow'] = 'Previous Page';
+$PALANG['pOverview_disabled'] = 'Letiltva';
+$PALANG['pOverview_unlimited'] = 'Korlátlan';
+$PALANG['pOverview_title'] = ':: Definiált Domain-ok';
+$PALANG['pOverview_up_arrow'] = 'Vissza a tetejére';
+$PALANG['pOverview_right_arrow'] = 'Következő oldal';
+$PALANG['pOverview_left_arrow'] = 'Előző oldal';
$PALANG['pOverview_alias_title'] = ':: Alias';
-$PALANG['pOverview_mailbox_title'] = ':: Mailboxes';
+$PALANG['pOverview_mailbox_title'] = ':: Mailbox-ok';
$PALANG['pOverview_button'] = 'Gyerünk';
$PALANG['pOverview_welcome'] = 'Áttekintés: ';
$PALANG['pOverview_alias_alias_count'] = 'Alias-ok';
@@ -54,12 +59,17 @@
$PALANG['pOverview_alias_address'] = 'Honnan';
$PALANG['pOverview_alias_goto'] = 'Hova';
$PALANG['pOverview_alias_modified'] = 'Utolsó módosítás';
+$PALANG['pOverview_alias_active'] = 'Aktív';
+$PALANG['pOverview_alias_edit'] = 'Alias';
$PALANG['pOverview_mailbox_username'] = 'Email';
$PALANG['pOverview_mailbox_name'] = 'Név';
$PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
$PALANG['pOverview_mailbox_modified'] = 'Utolsó módosítás';
$PALANG['pOverview_mailbox_active'] = 'Aktív';
+$PALANG['pOverview_vacation_edit'] = 'SZABADSÁG EKKOR';
+$PALANG['pOverview_vacation_option'] = 'Szabadság beállítása';
+
$PALANG['pOverview_get_domain'] = 'Domain';
$PALANG['pOverview_get_aliases'] = 'Alias-ok';
$PALANG['pOverview_get_mailboxes'] = 'Postafiókok';
@@ -67,7 +77,9 @@
$PALANG['pOverview_get_modified'] = 'Utolsó módosítás';
$PALANG['pDelete_delete_error'] = '<span class="error_msg">Nem sikerült törölni a bejegyzést ';
+$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Nem sikerült törölni a mailbox-ot ';
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Ehhez a domainhez nincs jogosultságod ';
+$PALANG['pDelete_alias_error'] = '<span class="error_msg">Nem sikerült törölni az alias-t ';
$PALANG['pCreate_alias_welcome'] = 'Új alias készítése az adott domainhez';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -75,6 +87,7 @@
$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Ez az email cím már létezik, kérlek válassz másikat!</span>';
$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Elérted a maximális alias limitet!</span>';
$PALANG['pCreate_alias_goto'] = 'Hova';
+$PALANG['pCreate_alias_active'] = 'Aktív';
$PALANG['pCreate_alias_button'] = 'Alias felvétele';
$PALANG['pCreate_alias_goto_text'] = 'Ahova a levélnek mennie kell.';
$PALANG['pCreate_alias_goto_text_error'] = 'Ahova a levélnek mennie kell.<br /><span class="error_msg">Érvénytelen a HOVA mezõ!</span>';
@@ -86,11 +99,12 @@
$PALANG['pEdit_alias_address'] = 'Alias';
$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Nemsikerült megtalálni az aliast!</span>';
$PALANG['pEdit_alias_goto'] = 'Hova';
+$PALANG['pEdit_alias_active'] = 'Aktív';
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Nem írtál semmit a \'Hova\' mezõbe</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Az email cím amit beírtál érvénytelen: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Ehhez a domainhez nincs jogosultságod: ';
-$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.';
-$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.';
+$PALANG['pEdit_alias_forward_and_store'] = 'Kézbesítés helyi mailbox-ba.';
+$PALANG['pEdit_alias_forward_only'] = 'Továbbítás csak az adott email címre.';
$PALANG['pEdit_alias_button'] = 'Alias szerkesztése';
$PALANG['pEdit_alias_result_error'] = '<span class="error_msg">Nemsikerült módosítani az Aliast!</span>';
@@ -113,6 +127,7 @@
$PALANG['pCreate_mailbox_button'] = 'Postafiók létrehozása';
$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Nemsikerült a postafiókot felvenni a mailbox adatbázis táblába!</span>';
$PALANG['pCreate_mailbox_result_success'] = 'A postafiókot sikeresen felvettük a mailbox adatbázis táblába!';
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'A postafiókot hozzáadtuk a postafiók táblához, de egyik előre definiált alkönyvtárat sem tudtuk létrehozni (vagy csak néhányat)';
$PALANG['pEdit_mailbox_welcome'] = 'Postafiók szerkesztése az adott domainhez.';
$PALANG['pEdit_mailbox_username'] = 'Felhasználónév';
@@ -129,8 +144,8 @@
$PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Nemsikerült megváltoztatni a jelszót!</span>';
$PALANG['pPassword_welcome'] = 'Bejelentkezési jelszó megváltoztatása';
-$PALANG['pPassword_admin'] = 'Login';
-$PALANG['pPassword_admin_text_error'] = '<span class="error_msg">A LOGIN amit megadtál egyetlen postafiókkal sem egyezik!</span>';
+$PALANG['pPassword_admin'] = 'Bejelentkezés';
+$PALANG['pPassword_admin_text_error'] = '<span class="error_msg">A felhasználónév amit megadtál egyetlen postafiókkal sem egyezik!</span>';
$PALANG['pPassword_password_current'] = 'Régi jelszó';
$PALANG['pPassword_password_current_text_error'] = '<span class="error_msg">Nem adtad meg a régi jelszavadat!</span>';
$PALANG['pPassword_password'] = 'Új jelszó';
@@ -140,6 +155,13 @@
$PALANG['pPassword_result_error'] = '<span class="error_msg">Nemsikerült megváltoztatni a jelszavad!</span>';
$PALANG['pPassword_result_success'] = 'A jelszavad megváltozott!';
+$PALANG['pEdit_vacation_set'] = 'Nem vagyok elérhatő üzenet módosítás / beállítás';
+$PALANG['pEdit_vacation_remove'] = 'Nem vagyok elérhatő üzenet törlése';
+
+$PALANG['pVacation_result_error'] = '<span class="error_msg">Nem sikerült frissíteni az automatikus válasz beállításait!</span>';
+$PALANG['pVacation_result_removed'] = 'Az automatikus válasz törölve!';
+$PALANG['pVacation_result_added'] = 'Az automatikus válasz engedélyezve!';
+
$PALANG['pViewlog_welcome'] = 'Az utolsó 10 esemény megtekintése: ';
$PALANG['pViewlog_timestamp'] = 'Idõbélyeg';
$PALANG['pViewlog_username'] = 'Admin';
@@ -147,6 +169,16 @@
$PALANG['pViewlog_action'] = 'Akció';
$PALANG['pViewlog_data'] = 'Adat';
+$PALANG['pViewlog_action_create_mailbox'] = 'postafiók létrehozása';
+$PALANG['pViewlog_action_delete_mailbox'] = 'postafiók törlése';
+$PALANG['pViewlog_action_edit_mailbox'] = 'postafiók módosítása';
+$PALANG['pViewlog_action_edit_mailbox_state'] = 'postafiók aktivitás módosítása';
+$PALANG['pViewlog_action_create_alias'] = 'alias létrehozása';
+$PALANG['pViewlog_action_delete_alias'] = 'alias törlése';
+$PALANG['pViewlog_action_edit_alias'] = 'alias módosítása';
+$PALANG['pViewlog_action_edit_alias_state'] = 'alias aktivitás módosítása';
+$PALANG['pViewlog_action_edit_password'] = 'jelszó módosítása';
+
$PALANG['pViewlog_button'] = 'Gyerünk';
$PALANG['pViewlog_result_error'] = '<span class="error_msg">Nemsikerült megtalálni a napló fájlokat!</span>';
@@ -204,6 +236,7 @@
$PALANG['pAdminCreate_domain_welcome'] = 'Új domain felvétele';
$PALANG['pAdminCreate_domain_domain'] = 'Domain';
$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">A domain már létezik!</span>';
+$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">A domain érvénytelen!</span>';
$PALANG['pAdminCreate_domain_description'] = 'Leírás';
$PALANG['pAdminCreate_domain_aliases'] = 'Alias-ok';
$PALANG['pAdminCreate_domain_aliases_text'] = '-1 = kikapcsol | 0 = végtelen';
@@ -212,13 +245,16 @@
$PALANG['pAdminCreate_domain_maxquota'] = 'Max Quota';
$PALANG['pAdminCreate_domain_maxquota_text'] = 'MB<br /> -1 = kikapcsol | 0 = végtelen';
$PALANG['pAdminCreate_domain_transport'] = 'Transport';
-$PALANG['pAdminCreate_domain_transport_text'] = 'Define transport';
+$PALANG['pAdminCreate_domain_transport_text'] = 'Transport definiálása';
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Alapértelmezett alias-ok hozzáadása';
-$PALANG['pAdminCreate_domain_backupmx'] = 'Mail server is backup MX';
+$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
+$PALANG['pAdminCreate_domain_backupmx'] = 'A mail szerver egy backup MX';
$PALANG['pAdminCreate_domain_button'] = 'Domain felvétele';
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">A domain felvétele sikertelen!</span>';
$PALANG['pAdminCreate_domain_result_success'] = 'A domain-t felvettük az adatbázisba!';
+$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">A domain törlése nem sikerült!</span>';
+
$PALANG['pAdminEdit_domain_welcome'] = 'Domain szerkesztése';
$PALANG['pAdminEdit_domain_domain'] = 'Domain';
$PALANG['pAdminEdit_domain_description'] = 'Leírás';
@@ -229,8 +265,8 @@
$PALANG['pAdminEdit_domain_maxquota'] = 'Max Quota';
$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB<br /> -1 = kikapcsol | 0 = végtelen';
$PALANG['pAdminEdit_domain_transport'] = 'Transport';
-$PALANG['pAdminEdit_domain_transport_text'] = 'Define transport';
-$PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX';
+$PALANG['pAdminEdit_domain_transport_text'] = 'Transport definiálása';
+$PALANG['pAdminEdit_domain_backupmx'] = 'A mail szerver egy backup MX';
$PALANG['pAdminEdit_domain_active'] = 'Aktív';
$PALANG['pAdminEdit_domain_button'] = 'Domain szerkesztése';
$PALANG['pAdminEdit_domain_result_error'] = '<span class="error_msg">A domain módosítása sikertelen!</span>';
@@ -271,6 +307,7 @@
$PALANG['pUsersMenu_password'] = 'Jelszó megváltoztatása';
$PALANG['pUsersMain_vacation'] = 'Itt lehet beállítani az automatikus válasz levél szövegét, ha az ember távol van.';
+$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' bekapcsolva, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove';
$PALANG['pUsersMain_edit_alias'] = 'Email átirányítás beállítása.';
$PALANG['pUsersMain_password'] = 'Jelenlegi jelszó megváltoztatása.';
@@ -299,5 +336,28 @@
$PALANG['pEdit_dbLog_editalias'] = 'alias szerkesztése';
$PALANG['pEdit_dbLog_editmailbox'] = 'postafiók szerkesztése';
+$PALANG['pSearch'] = 'search';
$PALANG['pSearch_welcome'] = 'Keresendõ kulcsszó: ';
+
+$PALANG['pReturn_to'] = 'Válasz ide';
+
+$PALANG['pBroadcast_title'] = 'Broadcast üzenet küldése';
+$PALANG['pBroadcast_from'] = 'Feladó';
+$PALANG['pBroadcast_name'] = 'Neved';
+$PALANG['pBroadcast_subject'] = 'Téma';
+$PALANG['pBroadcast_message'] = 'Üzenet';
+$PALANG['pBroadcast_send'] = 'Üzenet küldése';
+$PALANG['pBroadcast_success'] = 'Broadcast üzeneted elküldve.';
+$PALANG['pAdminMenu_broadcast_message'] = 'BC üzenet';
+$PALANG['pBroadcast_error_empty'] = 'A név, téma és üzenet mezők nem lehetnek üresek !';
+
+$PALANG['pStatus_undeliverable'] = 'lehet hogy nem kézbesíthető ';
+$PALANG['pStatus_custom'] = 'Ide kézbesítődik ';
+$PALANG['pStatus_popimap'] = 'POP/IMAP ';
+
+$PALANG['pPasswordTooShort'] = "A Jelszó túl rövid - legalább %s karakter szükséges";
+
+$PALANG['pFetchmail_welcome'] = 'Mail lehozása:';
+$PALANG['pFetchmail_new_entry'] = 'Új bejegyzés';
+
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-09 23:48:45
|
Revision: 147
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=147&view=rev
Author: christian_boltz
Date: 2007-10-09 16:48:48 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
- initial version of fetchmail support (by Viktor Gotwig,info AT symateam.de)
(see postfixadmin-devel mailinglist for detailed description and known
problems, subject "fetchmail support").
This commit adds fetchmail.pl which was missing in r140
Added Paths:
-----------
trunk/ADDITIONS/fetchmail.pl
Added: trunk/ADDITIONS/fetchmail.pl
===================================================================
--- trunk/ADDITIONS/fetchmail.pl (rev 0)
+++ trunk/ADDITIONS/fetchmail.pl 2007-10-09 23:48:48 UTC (rev 147)
@@ -0,0 +1,63 @@
+#!/usr/bin/perl
+
+use DBI;
+use MIME::Base64;
+use Data::Dumper;
+
+# the home dir of vmail user:
+$vmail_dir="/home/maildirs";
+
+# mysql settings
+$database="mailadmin";
+$hostname="127.0.0.1";
+$user="mail";
+$password="*****";
+$dsn = "DBI:mysql:database=$database;host=$hostname";
+
+#mysql connect
+$dbh = DBI->connect($dsn, $user, $password) || die "cannot connect the database";
+
+$sql=<<SQL;
+SELECT id,mailbox,src_server,src_auth,src_user,src_password,src_folder,fetchall,keep,protocol,mda,extra_options
+FROM fetchmail
+WHERE unix_timestamp(now())-unix_timestamp(date) > pool_time*60
+SQL
+
+my (%config);
+map{
+ my ($id,$mailbox,$src_server,$src_auth,$src_user,$src_password,$src_folder,$fetchall,$keep,$protocol,$mda,$extra_options)=@$_;
+
+ $cmd="user '${src_user}' there with password '".decode_base64($src_password)."'";
+ $cmd.=" folder '${src_folder}'" if ($src_folder);
+ $cmd.=" mda ".$mda if ($mda);
+
+# $cmd.=" mda \"/usr/local/libexec/dovecot/deliver -m ${mailbox}\"";
+ $cmd.=" is '${mailbox}' here";
+
+ $cmd.=" keep" if ($keep);
+ $cmd.=" fetchall" if ($fetchall);
+ $cmd.=" ".$extra_options if ($extra_options);
+
+ $text=<<TXT;
+set postmaster "postmaster"
+set nobouncemail
+set no spambounce
+set properties ""
+
+poll ${src_server} with proto ${protocol}
+ $cmd
+
+TXT
+
+ open X,"> ${vmail_dir}/.fetchmailrc" || die "cannot open/create ${vmail_dir}/.fetchmailrc";
+ print X $text;
+ close X;
+ chmod 0600,"${vmail_dir}/.fetchmailrc";
+ $ret=`/usr/bin/fetchmail`;
+ $sql="UPDATE fetchmail SET returned_text=".$dbh->quote($ret).", date=now() WHERE id=".$id;
+ $dbh->do($sql);
+
+}@{$dbh->selectall_arrayref($sql)};
+
+unlink "${vmail_dir}/.fetchmailrc";
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-09 23:46:55
|
Revision: 146
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=146&view=rev
Author: christian_boltz
Date: 2007-10-09 16:46:52 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
- replaced admin creation code with a call to create_admin(),
see commit message of r135 for details
Modified Paths:
--------------
trunk/admin/create-admin.php
Modified: trunk/admin/create-admin.php
===================================================================
--- trunk/admin/create-admin.php 2007-10-09 22:36:13 UTC (rev 145)
+++ trunk/admin/create-admin.php 2007-10-09 23:46:52 UTC (rev 146)
@@ -57,78 +57,13 @@
$fDomains = array();
if (!empty ($_POST['fDomains'])) $fDomains = $_POST['fDomains'];
- if (!check_email ($fUsername))
- {
- $error = 1;
+ list ($error, $tMessage, $pAdminCreate_admin_username_text, $pAdminCreate_admin_password_text) = create_admin($fUsername, $fPassword, $fPassword2, $fDomains);
+
+ if ($error != 0) {
if (isset ($_POST['fUsername'])) $tUsername = escape_string ($_POST['fUsername']);
if (isset ($_POST['fDomains'])) $tDomains = $_POST['fDomains'];
- $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text_error1'];
}
- if (empty ($fUsername) or admin_exist ($fUsername))
- {
- $error = 1;
- $tUsername = escape_string ($_POST['fUsername']);
- if (isset ($_POST['fDomains'])) $tDomains = $_POST['fDomains'];
- $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text_error2'];
- }
-
- if (empty ($fPassword) or empty ($fPassword2) or ($fPassword != $fPassword2))
- {
- if (empty ($fPassword) and empty ($fPassword2) and $CONF['generate_password'] == "YES")
- {
- $fPassword = generate_password ();
- }
- else
- {
- $error = 1;
- if (isset ($_POST['fUsername'])) $tUsername = escape_string ($_POST['fUsername']);
- if (isset ($_POST['fDomains'])) $tDomains = $_POST['fDomains'];
- $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text'];
- $pAdminCreate_admin_password_text = $PALANG['pAdminCreate_admin_password_text_error'];
- }
- }
-
- if ($error != 1)
- {
- $password = pacrypt($fPassword);
- $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text'];
-
-
- $result = db_query ("INSERT INTO $table_admin (username,password,created,modified) VALUES ('$fUsername','$password',NOW(),NOW())");
- if ($result['rows'] != 1)
- {
- $tMessage = $PALANG['pAdminCreate_admin_result_error'] . "<br />($fUsername)<br />";
- }
- else
- {
- if (!empty ($fDomains[0]))
- {
- for ($i = 0; $i < sizeof ($fDomains); $i++)
- {
- $domain = $fDomains[$i];
- $result = db_query ("INSERT INTO $table_domain_admins (username,domain,created) VALUES ('$fUsername','$domain',NOW())");
- }
- }
- $tMessage = $PALANG['pAdminCreate_admin_result_success'] . "<br />($fUsername";
- if ($CONF['generate_password'] == "YES")
- {
- $tMessage .= " / $fPassword)</br />";
- }
- else
- {
- if ($CONF['show_password'] == "YES")
- {
- $tMessage .= " / $fPassword)</br />";
- }
- else
- {
- $tMessage .= ")</br />";
- }
- }
- }
- }
-
include ("../templates/header.tpl");
include ("../templates/admin_menu.tpl");
include ("../templates/admin_create-admin.tpl");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-09 22:36:11
|
Revision: 145
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=145&view=rev
Author: christian_boltz
Date: 2007-10-09 15:36:13 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
- added several german translations
- fixed a typo in fr.lang
- removed some no longer used translations from en.lang, cs.lang and es.lang
Modified Paths:
--------------
trunk/languages/cs.lang
trunk/languages/de.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/fr.lang
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2007-10-09 16:53:09 UTC (rev 144)
+++ trunk/languages/cs.lang 2007-10-09 22:36:13 UTC (rev 145)
@@ -160,7 +160,6 @@
$PALANG['pEdit_vacation_remove'] = 'Ostranit zprávu o nepřítomnosti';
$PALANG['pVacation_result_error'] = '<span class="error_msg">Nebylo možné aktualizovat nastavení automatické odpověďi!</span>';
-$PALANG['pVacation_result_success'] = 'Automatická odpověď byla odstraněna!';
$PALANG['pViewlog_welcome'] = 'Prohlížet 10 posledních akcí pro ';
$PALANG['pViewlog_timestamp'] = 'Časová značka';
@@ -226,7 +225,6 @@
$PALANG['pAdminList_virtual_alias_address'] = 'Od';
$PALANG['pAdminList_virtual_alias_goto'] = 'Cíl';
$PALANG['pAdminList_virtual_alias_modified'] = 'Naposledy Změněno';
-$PALANG['pAdminList_virtual_alias_active'] = 'Aktivní';
$PALANG['pAdminList_virtual_mailbox_username'] = 'Název';
$PALANG['pAdminList_virtual_mailbox_name'] = 'Celé Jméno';
$PALANG['pAdminList_virtual_mailbox_quota'] = 'Místo (MB)';
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2007-10-09 16:53:09 UTC (rev 144)
+++ trunk/languages/de.lang 2007-10-09 22:36:13 UTC (rev 145)
@@ -10,10 +10,13 @@
$PALANG['NO'] = 'NEIN';
$PALANG['edit'] = 'editieren';
$PALANG['del'] = 'löschen';
+$PALANG['exit'] = 'Verlassen';
$PALANG['confirm'] = 'Sind Sie sicher dass Sie das löschen wollen?\n';
$PALANG['confirm_domain'] = 'Wollen Sie wirklich alle Einträge dieser Domain löschen? Dies kann NICHT rückgängig gemacht werden!\n';
$PALANG['check_update'] = 'Auf Updates überprüfen';
+$PALANG['pFooter_logged_as'] = 'Angemeldet als %s';
+
$PALANG['pLogin_welcome'] = 'Mail-Administratoren loggen sich bitte hier ein.';
$PALANG['pLogin_username'] = 'Login (eMail)';
$PALANG['pLogin_password'] = 'Passwort';
@@ -22,6 +25,7 @@
$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Falsches Passwort!</span>';
$PALANG['pLogin_login_users'] = 'eMail-Benutzer bitte hier einloggen.';
+$PALANG['pMenu_main'] = 'Startseite';
$PALANG['pMenu_overview'] = 'Überblick';
$PALANG['pMenu_create_alias'] = 'Alias hinzufügen';
$PALANG['pMenu_create_mailbox'] = 'Mailbox hinzufügen';
@@ -55,11 +59,15 @@
$PALANG['pOverview_alias_address'] = 'Von';
$PALANG['pOverview_alias_goto'] = 'An';
$PALANG['pOverview_alias_modified'] = 'Zuletzt verändert';
+$PALANG['pOverview_alias_active'] = 'Aktiv';
+$PALANG['pOverview_alias_edit'] = 'Alias';
$PALANG['pOverview_mailbox_username'] = 'Email';
$PALANG['pOverview_mailbox_name'] = 'Name';
$PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
$PALANG['pOverview_mailbox_modified'] = 'Zuletzt verändert';
$PALANG['pOverview_mailbox_active'] = 'Aktiv';
+$PALANG['pOverview_vacation_edit'] = 'AUTOMATISCHE ANTWORT IST AKTIV';
+$PALANG['pOverview_vacation_option'] = 'Automatische Antwort einrichten';
$PALANG['pOverview_get_domain'] = 'Domain';
$PALANG['pOverview_get_aliases'] = 'Aliases';
@@ -68,7 +76,9 @@
$PALANG['pOverview_get_modified'] = 'Zuletzt verändert';
$PALANG['pDelete_delete_error'] = '<span class="error_msg">Eintrag konnte nicht gelöscht werden ';
+$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_alias_error'] = '<span class="error_msg">Alias konnte nicht gelöscht werden ';
$PALANG['pCreate_alias_welcome'] = 'Neuen Alias für Ihre Domain anlegen';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -76,6 +86,7 @@
$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Diese eMail-Adresse existiert bereits. Bitte wählen Sie eine andere!</span>';
$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Sie haben Ihr Limit für Aliase auf dieser Domain erreicht!</span>';
$PALANG['pCreate_alias_goto'] = 'An';
+$PALANG['pCreate_alias_active'] = 'Aktiv';
$PALANG['pCreate_alias_button'] = 'Alias hinzufügen';
$PALANG['pCreate_alias_goto_text'] = 'Wohin soll die eMail weitergeleitet werden?';
$PALANG['pCreate_alias_goto_text_error'] = 'Wohin die eMail weitergeleitet werden soll<br /><span class="error_msg">Das An-Feld ist falsch!</span>';
@@ -87,6 +98,7 @@
$PALANG['pEdit_alias_address'] = 'Alias';
$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Auffinden des Alias schlug fehl!</span>';
$PALANG['pEdit_alias_goto'] = 'An';
+$PALANG['pEdit_alias_active'] = 'Aktiv';
$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: ';
@@ -114,6 +126,7 @@
$PALANG['pCreate_mailbox_button'] = 'Mailbox hinzufügen';
$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Unmöglich die Mailbox in die Mailbox-Tabelle einzutragen!</span>';
$PALANG['pCreate_mailbox_result_success'] = 'Die Mailbox wurde in die Mailbox-Tabelle eingetragen!';
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Die Mailbox wurde in der Mailbox-Tabelle eingetragen, aber keine (oder nur einige) der vorkonfigurierten Unterordner konnte erstellt werden';
$PALANG['pEdit_mailbox_welcome'] = 'Ändern Sie ihre Mailbox hier.';
$PALANG['pEdit_mailbox_username'] = 'Benutzername';
@@ -122,6 +135,7 @@
$PALANG['pEdit_mailbox_password2'] = 'Neues Passwort (nochmal)';
$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">Die beiden Passwörter sind nicht identisch!</span>';
$PALANG['pEdit_mailbox_name'] = 'Name';
+$PALANG['pEdit_mailbox_name_text'] = 'Vollständiger Name';
$PALANG['pEdit_mailbox_quota'] = 'Quota';
$PALANG['pEdit_mailbox_quota_text'] = 'MB';
$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Das angegebene Quota ist zu hoch!</span>';
@@ -141,6 +155,13 @@
$PALANG['pPassword_result_error'] = '<span class="error_msg">Unmöglich das Passwort zu ändern!</span>';
$PALANG['pPassword_result_success'] = 'Ihr Passwort wurde geändert!';
+$PALANG['pEdit_vacation_set'] = 'Automatische Antwort ändern / einrichten';
+$PALANG['pEdit_vacation_remove'] = 'Automatische Antwort abschalten';
+
+$PALANG['pVacation_result_error'] = '<span class="error_msg">Änderungen der automatischen Antwort konnten nicht gespeichert werden!</span>';
+$PALANG['pVacation_result_removed'] = 'Automatische Antwort wurde abgeschaltet!';
+$PALANG['pVacation_result_added'] = 'Automatische Antwort wurde aktiviert!';
+
$PALANG['pViewlog_welcome'] = 'Zeigt die letzten 10 Aktionen für ';
$PALANG['pViewlog_timestamp'] = 'Zeitpunkt';
$PALANG['pViewlog_username'] = 'Admin';
@@ -148,6 +169,16 @@
$PALANG['pViewlog_action'] = 'Aktion';
$PALANG['pViewlog_data'] = 'Daten';
+$PALANG['pViewlog_action_create_mailbox'] = 'Mailbox erstellen';
+$PALANG['pViewlog_action_delete_mailbox'] = 'Mailbox löschen';
+$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_delete_alias'] = 'Alias löschen';
+$PALANG['pViewlog_action_edit_alias'] = 'Alias bearbeiten';
+$PALANG['pViewlog_action_edit_alias_state'] = 'Alias Aktiv bearbeiten';
+$PALANG['pViewlog_action_edit_password'] = 'Passwort ändern';
+
$PALANG['pViewlog_button'] = 'Los';
$PALANG['pViewlog_result_error'] = '<span class="error_msg">Kann keine Einträge finden!</span>';
@@ -205,6 +236,7 @@
$PALANG['pAdminCreate_domain_welcome'] = 'Domain hinzufügen';
$PALANG['pAdminCreate_domain_domain'] = 'Domain';
$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">Diese Domain existiert bereits!</span>';
+$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">Diese Domain ist ungültig!</span>';
$PALANG['pAdminCreate_domain_description'] = 'Beschreibung';
$PALANG['pAdminCreate_domain_aliases'] = 'Aliase';
$PALANG['pAdminCreate_domain_aliases_text'] = '-1 = ausschalten | 0 = kein Limit';
@@ -220,6 +252,8 @@
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Konnte Domain nicht anlegen!</span>';
$PALANG['pAdminCreate_domain_result_success'] = 'Domain wurde angelegt!';
+$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Domain konnte nicht gelöscht werden!</span>';
+
$PALANG['pAdminEdit_domain_welcome'] = 'Domain editieren';
$PALANG['pAdminEdit_domain_domain'] = 'Domain';
$PALANG['pAdminEdit_domain_description'] = 'Beschreibung';
@@ -272,6 +306,7 @@
$PALANG['pUsersMenu_password'] = 'Passwort ändern';
$PALANG['pUsersMain_vacation'] = 'Geben Sie eine "Automatische Antwort" ein. Sinnvoll z.B. während Sie im Urlaub sind';
+$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' ist aktiv, \'' . $PALANG['pUsersMenu_vacation'] . '\' anklicken zum Bearbeiten oder Abschalten';
$PALANG['pUsersMain_edit_alias'] = 'Ändern Sie Ihre Weiterleitung.';
$PALANG['pUsersMain_password'] = 'Ändern Sie Ihr Passwort.';
@@ -302,6 +337,24 @@
$PALANG['pSearch'] = 'suche';
$PALANG['pSearch_welcome'] = 'Suche nach: ';
+$PALANG['pReturn_to'] = 'Zurück zu';
+
+$PALANG['pBroadcast_title'] = 'Rundmail senden';
+$PALANG['pBroadcast_from'] = 'Von';
+$PALANG['pBroadcast_name'] = 'Ihr Name';
+$PALANG['pBroadcast_subject'] = 'Betreff';
+$PALANG['pBroadcast_message'] = 'Nachricht';
+$PALANG['pBroadcast_send'] = 'Nachricht senden';
+$PALANG['pBroadcast_success'] = 'Ihre Rundmail wurde gesendet.';
+$PALANG['pAdminMenu_broadcast_message'] = 'Rundmail';
+$PALANG['pBroadcast_error_empty'] = 'Die Felder Name, Betreff und Nachricht d\xFCrfen nicht leer sein!';
+
+$PALANG['pStatus_undeliverable'] = 'möglicherweise UNZUSTELLBAR ';
+$PALANG['pStatus_custom'] = 'Zustellung an ';
+$PALANG['pStatus_popimap'] = 'POP/IMAP ';
+
+$PALANG['pPasswordTooShort'] = "Das Passwort ist zu kurz - mindestens %s Zeichen benötigt";
+
$PALANG['pFetchmail_welcome'] = 'E-Mail Abruf für: ';
$PALANG['pFetchmail_new_entry'] = 'Neuer Eintrag';
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2007-10-09 16:53:09 UTC (rev 144)
+++ trunk/languages/en.lang 2007-10-09 22:36:13 UTC (rev 145)
@@ -227,7 +227,6 @@
$PALANG['pAdminList_virtual_alias_address'] = 'From';
$PALANG['pAdminList_virtual_alias_goto'] = 'To';
$PALANG['pAdminList_virtual_alias_modified'] = 'Last Modified';
-$PALANG['pAdminList_virtual_alias_active'] = 'Active';
$PALANG['pAdminList_virtual_mailbox_username'] = 'Email';
$PALANG['pAdminList_virtual_mailbox_name'] = 'Name';
$PALANG['pAdminList_virtual_mailbox_quota'] = 'Quota (MB)';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2007-10-09 16:53:09 UTC (rev 144)
+++ trunk/languages/es.lang 2007-10-09 22:36:13 UTC (rev 145)
@@ -150,7 +150,6 @@
$PALANG['pViewlog_result_error'] = '<span class="error_msg">¡Imposible encontrar los logs!</span>';
$PALANG['pVacation_result_error'] = '<span class="error_msg">¡Imposible actualizar la configuracióne la respuesta automática!</span>';
-$PALANG['pVacation_result_success'] = 'La respuesta automática ha sido borrada!';
$PALANG['pSendmail_welcome'] = 'Enviar un e-mail.';
$PALANG['pSendmail_admin'] = 'De';
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2007-10-09 16:53:09 UTC (rev 144)
+++ trunk/languages/fr.lang 2007-10-09 22:36:13 UTC (rev 145)
@@ -229,7 +229,7 @@
$PALANG['pAdminEdit_domain_domain'] = 'Domaine';
$PALANG['pAdminEdit_domain_description'] = 'Description';
$PALANG['pAdminEdit_domain_aliases'] = 'Alias';
-$PALANG['pAdminCEdit_domain_aliases_text'] = '-1 = désactivé | 0 = illimité';
+$PALANG['pAdminEdit_domain_aliases_text'] = '-1 = désactivé | 0 = illimité';
$PALANG['pAdminEdit_domain_mailboxes'] = 'Comptes courriels';
$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = désactivé | 0 = illimité';
$PALANG['pAdminEdit_domain_maxquota'] = 'Limite maximum';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-10-09 16:53:10
|
Revision: 144
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=144&view=rev
Author: GingerDog
Date: 2007-10-09 09:53:09 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
create-domain.php: fix bug reported by ricflomag - see http://sourceforge.net/tracker/index.php?func=detail&aid=1752057&group_id=191583&atid=937964
Modified Paths:
--------------
trunk/admin/create-domain.php
Modified: trunk/admin/create-domain.php
===================================================================
--- trunk/admin/create-domain.php 2007-10-09 16:23:09 UTC (rev 143)
+++ trunk/admin/create-domain.php 2007-10-09 16:53:09 UTC (rev 144)
@@ -57,13 +57,14 @@
if ($_SERVER['REQUEST_METHOD'] == "POST")
{
if (isset ($_POST['fDomain'])) $fDomain = escape_string ($_POST['fDomain']);
- !empty ($_POST['fDescription']) ? $fDescription = escape_string ($_POST['fDescription']) : $fDescription = "";
- if (isset ($_POST['fAliases'])) $fAliases = escape_string ($_POST['fAliases']);
- if (isset ($_POST['fMailboxes'])) $fMailboxes = escape_string ($_POST['fMailboxes']);
- !empty ($_POST['fMaxquota']) ? $fMaxquota = escape_string ($_POST['fMaxquota']) : $fMaxquota = "0";
- !empty ($_POST['fTransport']) ? $fTransport = escape_string ($_POST['fTransport']) : $fTransport = "virtual";
- if (isset ($_POST['fDefaultaliases'])) $fDefaultaliases = escape_string ($_POST['fDefaultaliases']);
- isset ($_POST['fBackupmx']) ? $fBackupmx = escape_string ($_POST['fBackupmx']) : $fBackupmx = "0";
+ foreach(array('fDescription' => '', 'fAliases' => '0', 'fMailboxes' => '0',
+ 'fMaxquota' => '0', 'fTransport' => 'virtual',
+ 'fDefaultaliases' => '0', 'fBackupmx' => '0') as $key => $default) {
+ if(isset($_POST[$key]) && !empty($POST[$key])) {
+ $$key = escape_string($_POST[$key]);
+ }
+ $$key = $default;
+ }
if (empty ($fDomain) or domain_exist ($fDomain) or !check_domain ($fDomain))
{
@@ -99,8 +100,8 @@
$fBackupmx = 0;
$sqlBackupmx = ('pgsql'==$CONF['database_type']) ? 'false' : 0;
}
-
- $result = db_query ("INSERT INTO $table_domain (domain,description,aliases,mailboxes,maxquota,transport,backupmx,created,modified) VALUES ('$fDomain','$fDescription',$fAliases,$fMailboxes,$fMaxquota,'$fTransport',$sqlBackupmx,NOW(),NOW())");
+ $sql_query = "INSERT INTO $table_domain (domain,description,aliases,mailboxes,maxquota,transport,backupmx,created,modified) VALUES ('$fDomain','$fDescription',$fAliases,$fMailboxes,$fMaxquota,'$fTransport',$sqlBackupmx,NOW(),NOW())";
+ $result = db_query($sql_query);
if ($result['rows'] != 1)
{
$tMessage = $PALANG['pAdminCreate_domain_result_error'] . "<br />($fDomain)<br />";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-10-09 16:23:07
|
Revision: 143
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=143&view=rev
Author: GingerDog
Date: 2007-10-09 09:23:09 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
fix edit-admin to not use the db password to pre-populate the field - as per emails with Christian Boltz
Modified Paths:
--------------
trunk/admin/edit-admin.php
trunk/templates/admin_edit-admin.tpl
Modified: trunk/admin/edit-admin.php
===================================================================
--- trunk/admin/edit-admin.php 2007-10-09 16:19:41 UTC (rev 142)
+++ trunk/admin/edit-admin.php 2007-10-09 16:23:09 UTC (rev 143)
@@ -71,24 +71,25 @@
// has the password changed?
$originalPassword = $admin_details['password'];
- if($fPassword != $originalPassword) {
- // if it has, ensure both fields are the same...
- if ($fPassword == $fPassword2)
- {
- if(strlen($fPassword) >= $CONF['min_password_length']) {
- $fPassword = pacrypt($fPassword);
+ if($fPassword != '') {
+ if($fPassword != $originalPassword) {
+ // if it has, ensure both fields are the same...
+ if ($fPassword == $fPassword2)
+ {
+ if(strlen($fPassword) >= $CONF['min_password_length']) {
+ $fPassword = pacrypt($fPassword);
+ }
+ else {
+ $error = 1;
+ flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']));
+ }
}
else {
$error = 1;
- flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']));
+ $pAdminEdit_admin_password_text = $PALANG['pAdminEdit_admin_password_text_error'];
}
}
- else {
- $error = 1;
- $pAdminEdit_admin_password_text = $PALANG['pAdminEdit_admin_password_text_error'];
- }
}
-
$fDomains = array();
if (array_key_exists('fDomains', $_POST)) $fDomains = escape_string ($_POST['fDomains']);
if ($error != 1)
Modified: trunk/templates/admin_edit-admin.tpl
===================================================================
--- trunk/templates/admin_edit-admin.tpl 2007-10-09 16:19:41 UTC (rev 142)
+++ trunk/templates/admin_edit-admin.tpl 2007-10-09 16:23:09 UTC (rev 143)
@@ -4,27 +4,27 @@
<tr>
<td colspan="3"><h3><?php print $PALANG['pAdminEdit_admin_welcome']; ?></h3></td></tr>
<tr>
- <td><?php print $PALANG['pAdminEdit_admin_username'] . ":"; ?></td>
+ <td><?php print $PALANG['pAdminEdit_admin_username']; ?>:</td>
<td><?php print $username; ?></td>
<td> </td>
</tr>
<tr>
- <td><?php print $PALANG['pAdminEdit_admin_password'] . ":"; ?></td>
- <td><input class="flat" type="password" autocomplete="off" name="fPassword" value="<?php echo $tPassword; ?>"/></td>
+ <td><?php print $PALANG['pAdminEdit_admin_password']; ?>:</td>
+ <td><input class="flat" type="password" autocomplete="off" name="fPassword" value=""/></td>
<td><?php print $pAdminEdit_admin_password_text; ?></td>
</tr>
<tr>
- <td><?php print $PALANG['pAdminEdit_admin_password2'] . ":"; ?></td>
- <td><input class="flat" type="password" name="fPassword2" /></td>
+ <td><?php print $PALANG['pAdminEdit_admin_password2']; ?>:</td>
+ <td><input class="flat" type="password" name="fPassword2" value="" /></td>
<td> </td>
</tr>
<tr>
- <td><?php print $PALANG['pAdminEdit_admin_active'] . ":"; ?></td>
+ <td><?php print $PALANG['pAdminEdit_admin_active']; ?>:</td>
<td><input class="flat" type="checkbox" name="fActive" <?php print (!empty ($tActive)) ? 'checked' : ''; ?> /></td>
<td> </td>
</tr>
<tr>
- <td><?php print $PALANG['pAdminEdit_admin_super_admin'] . ":"; ?></td>
+ <td><?php print $PALANG['pAdminEdit_admin_super_admin']; ?>:</td>
<td><input class="flat" type="checkbox" name="fSadmin" <?php print (!empty ($tSadmin)) ? 'checked' : ''; ?> /></td>
<td> </td>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-10-09 16:19:40
|
Revision: 142
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=142&view=rev
Author: GingerDog
Date: 2007-10-09 09:19:41 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
common.php: caps change in headeR
Modified Paths:
--------------
trunk/common.php
Modified: trunk/common.php
===================================================================
--- trunk/common.php 2007-10-07 23:24:14 UTC (rev 141)
+++ trunk/common.php 2007-10-09 16:19:41 UTC (rev 142)
@@ -29,7 +29,7 @@
require_once("$incpath/config.inc.php");
if(isset($CONF['configured'])) {
if($CONF['configured'] == FALSE) {
- headeR("Location: setup.php");
+ header("Location: setup.php");
exit(0);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-07 23:24:12
|
Revision: 141
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=141&view=rev
Author: christian_boltz
Date: 2007-10-07 16:24:14 -0700 (Sun, 07 Oct 2007)
Log Message:
-----------
- DATABASE_*.TXT: Do no longer create default superadmin ad...@do...,
this is now done via setup.php
Modified Paths:
--------------
trunk/DATABASE_MYSQL.TXT
trunk/DATABASE_PGSQL.TXT
Modified: trunk/DATABASE_MYSQL.TXT
===================================================================
--- trunk/DATABASE_MYSQL.TXT 2007-10-07 23:12:07 UTC (rev 140)
+++ trunk/DATABASE_MYSQL.TXT 2007-10-07 23:24:14 UTC (rev 141)
@@ -150,8 +150,3 @@
FOREIGN KEY (on_vacation) REFERENCES vacation(email) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci TYPE=InnoDB COMMENT='Postfix Admin - Virtual Vacation Notifications';
-#
-#
-# superadmin user & password (login: ad...@do..., password: admin)
-INSERT INTO domain_admins (username, domain, active) VALUES ('ad...@do...','ALL','1');
-INSERT INTO admin (username, password, active) VALUES ('ad...@do...','$1$0fec9189$bgI6ncWrldPOsXnkUBIjl1','1');
Modified: trunk/DATABASE_PGSQL.TXT
===================================================================
--- trunk/DATABASE_PGSQL.TXT 2007-10-07 23:12:07 UTC (rev 140)
+++ trunk/DATABASE_PGSQL.TXT 2007-10-07 23:24:14 UTC (rev 141)
@@ -167,9 +167,3 @@
GRANT SELECT ON vacation TO vacation;
GRANT SELECT,INSERT,DELETE ON vacation_notification TO vacation;
---
---
--- superadmin user & password (login: ad...@do..., password: admin)
-INSERT INTO domain (domain) VALUES ('ALL');
-INSERT INTO domain_admins (username, domain, active) VALUES ('ad...@do...','ALL','1');
-INSERT INTO admin (username, password, active) VALUES ('ad...@do...','$1$0fec9189$bgI6ncWrldPOsXnkUBIjl1','1');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-07 23:12:05
|
Revision: 140
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=140&view=rev
Author: christian_boltz
Date: 2007-10-07 16:12:07 -0700 (Sun, 07 Oct 2007)
Log Message:
-----------
- initial version of fetchmail support (by Viktor Gotwig,info AT symateam.de)
(see postfixadmin-devel mailinglist for detailed description and known
problems, subject "fetchmail support")
- encoded some german umlauts as htmlentities
Modified Paths:
--------------
trunk/languages/de.lang
trunk/languages/en.lang
Added Paths:
-----------
trunk/fetchmail.php
trunk/templates/fetchmail.tpl
Added: trunk/fetchmail.php
===================================================================
--- trunk/fetchmail.php (rev 0)
+++ trunk/fetchmail.php 2007-10-07 23:12:07 UTC (rev 140)
@@ -0,0 +1,174 @@
+<?php
+/**
+ * Postfix Admin
+ *
+ * LICENSE
+ * This source file is subject to the GPL license that is bundled with
+ * this package in the file LICENSE.TXT.
+ *
+ * Further details on the project are available at :
+ * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: fetchmail.php
+ * Responsible for setting up fetchmail
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * Template Variables:
+ *
+ * TODO
+ *
+ * Form POST \ GET Variables:
+ *
+ * TODO
+ */
+
+/* new sql table: fetchmail
+
+create table fetchmail(
+ id int(11) unsigned not null auto_increment,
+ mailbox varchar(255) not null default '',
+ src_server varchar(255) not null default '',
+ src_auth enum('password','kerberos_v5','kerberos','kerberos_v4','gssapi','cram-md5','otp','ntlm','msn','ssh','any'),
+ src_user varchar(255) not null default '',
+ src_password varchar(255) not null default '',
+ src_folder varchar(255) not null default '',
+ pool_time int(11) unsigned not null default 10,
+ fetchall tinyint(1) unsigned not null default 0,
+ keep tinyint(1) unsigned not null default 0,
+ protocol enum('POP3','IMAP','POP2','ETRN','AUTO'),
+ extra_options text,
+ returned_text text,
+ mda varchar(255) not null default '',
+ date timestamp(14),
+ primary key(id)
+);
+
+*/
+
+require_once('common.php');
+
+authentication_require_role('admin');
+
+$fm_struct=array( // list($editible,$view,$type,$title,$comment)
+ "id" =>array(0,1,'id', 'ID','Record ID'),
+ "mailbox" =>array(1,1,'enum', 'Mailbox','Local mailbox'),
+ "src_server" =>array(1,1,'text', 'Server','Remote Server'),
+ "src_auth" =>array(1,1,'enum', 'Auth Type','Mostly password'),
+ "src_user" =>array(1,1,'text', 'User','Remote User'),
+ "src_password" =>array(1,1,'password', 'Password','Remote Password'),
+ "src_folder" =>array(1,1,'text', 'Folder','Remote Folder'),
+ "pool_time" =>array(1,1,'num', 'Poll','Poll Time (min)'),
+ "fetchall" =>array(1,1,'bool', 'Fetch All','Retrieve both old (seen) and new messages'),
+ "keep" =>array(1,1,'bool', 'Keep','Keep retrieved messages on the remote mailserver'),
+ "protocol" =>array(1,1,'enum', 'Protocol','Protocol to use'),
+ "extra_options" =>array(1,1,'longtext', 'Extra Options','Extra fetchmail Options'),
+ "mda" =>array(1,1,'longtext', 'MDA','Mail Delivery Agent'),
+ "date" =>array(0,1,'text', 'Date','Date of last pooling/configuration change'),
+ "returned_text" =>array(0,1,'longtext', 'Returned Text','Text message from last pooling'),
+);
+
+$SESSID_USERNAME = authentication_get_username();
+if (!$SESSID_USERNAME )
+ exit;
+
+$fm_defaults=array(
+ "id" =>0,
+ "mailbox" => array($SESSID_USERNAME),
+ "pool_time" =>10,
+ "src_auth" =>
+ array('password','kerberos_v5','kerberos','kerberos_v4','gssapi','cram-md5','otp','ntlm','msn','ssh','any'),
+ "protocol" =>
+ array('POP3','IMAP','POP2','ETRN','AUTO'),
+);
+
+
+$list_domains = list_domains_for_admin ($SESSID_USERNAME);
+$user_domains=implode("','",array_values($list_domains));
+$sql="SELECT username FROM mailbox WHERE domain in ('".$user_domains."')";
+
+$res = db_query ($sql);
+if ($res['rows'] > 0){
+ $fm_defaults["mailbox"]=array();
+ while ($name = db_array ($res['result'])){
+ $fm_defaults["mailbox"][] = $name["username"];
+ }
+}
+else{
+ $fm_defaults["mailbox"]=array();
+ $fm_defaults["mailbox"][]=$SESSID_USERNAME;
+}
+
+$new=$_REQUEST["new"];
+$edit=(int)$_REQUEST["edit"];
+$delete=$_REQUEST["delete"];
+$save=$_REQUEST["save"];
+$cancel=$_REQUEST["cancel"];
+
+if ($cancel){
+ $edit=0;
+}
+elseif($edit && $save){
+ $_vals=array();
+ foreach($fm_struct as $key=>$row){
+ list($editible,$view,$type,$title,$comment)=$row;
+ if ($editible){
+ $func="_inp_".$type;
+ $val=$_REQUEST[$key];
+ if ($type!="password" || substr($val,0,1)!="*"){
+ $_vals[]=$key."='".mysql_escape_string(
+ function_exists($func)
+ ?$func($val)
+ :$val)."'";
+ }
+ }
+ }
+ $sql="UPDATE fetchmail SET ".implode(",",$_vals).",returned_text='' WHERE id=".$edit;
+ $res= db_query ($sql);
+}
+elseif($delete){
+ db_query ("delete from fetchmail WHERE id=".$edit);
+}
+elseif ($new){
+ $_keys=array();
+ $_vals=array();
+ foreach($fm_defaults as $key=>$val){
+ $_keys[]=$key;
+ $_vals[]="'".(is_array($val)?$val[0]:mysql_escape_string($val))."'";
+ }
+ $sql="INSERT fetchmail (".implode(",",$_keys).") VALUES (".implode(",",$_vals).")";
+ $res= db_query ($sql);
+ $sql="SELECT id FROM fetchmail order by id desc limit 1";
+ $res= db_query ($sql);
+ list($edit)=mysql_fetch_row($res['result']);
+}
+
+$res = db_query ("SELECT ".implode(",",array_keys($fm_struct))." FROM fetchmail order by id desc");
+if ($res['rows'] > 0){
+ while ($row = db_array ($res['result'])){
+ $tFmail[] = $row;
+ }
+}
+
+function _inp_num($val){
+ return (int)($val);
+}
+
+function _inp_bool($val){
+ return $val?1:0;
+}
+
+function _inp_password($val){
+ return base64_encode($val);
+}
+
+ include ("./templates/header.tpl");
+ include ("./templates/menu.tpl");
+ include ("./templates/fetchmail.tpl");
+ include ("./templates/footer.tpl");
+
+?>
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2007-10-07 19:52:40 UTC (rev 139)
+++ trunk/languages/de.lang 2007-10-07 23:12:07 UTC (rev 140)
@@ -25,6 +25,7 @@
$PALANG['pMenu_overview'] = 'Überblick';
$PALANG['pMenu_create_alias'] = 'Alias hinzufügen';
$PALANG['pMenu_create_mailbox'] = 'Mailbox hinzufügen';
+$PALANG['pMenu_fetchmail'] = 'E-Mail Abruf bearbeiten';
$PALANG['pMenu_sendmail'] = 'Email versenden';
$PALANG['pMenu_password'] = 'Passwort ändern';
$PALANG['pMenu_viewlog'] = 'Log ansehen';
@@ -32,7 +33,7 @@
$PALANG['pMain_welcome'] = 'Willkommen zu Postfix Admin!';
$PALANG['pMain_overview'] = 'Listet Ihre Aliase und Mailboxen auf. Sie können sie hier editieren und löschen.';
-$PALANG['pMain_create_alias'] = 'Fügt einen neuen Alias für Ihre Domain hinzu.';
+$PALANG['pMain_create_alias'] = 'Fügt einen neuen Alias für Ihre Domain hinzu.';
$PALANG['pMain_create_mailbox'] = 'Legt eine neue Mailbox für Ihre Domain an.';
$PALANG['pMain_sendmail'] = 'Versenden Sie eine Email.';
$PALANG['pMain_password'] = 'Ändern Sie Ihr Admin-Passwort.';
@@ -280,24 +281,28 @@
$PALANG['pUsersVacation_subject_text'] = 'Ich bin weg...';
$PALANG['pUsersVacation_body'] = 'Text';
$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.
-Vielen Dank für Ihr Verständniss.
+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.
+Vielen Dank für Ihr Verständnis.
EOM;
$PALANG['pUsersVacation_button_away'] = 'Ich gehe weg';
$PALANG['pUsersVacation_button_back'] = 'Ich bin zurück';
$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Konnte Ihre Automatische Antwort nicht einstellen!</span>';
$PALANG['pUsersVacation_result_success'] = 'Ihre Automatische Antwort wurde gelöscht!';
-$PALANG['pCreate_dbLog_createmailbox'] = 'Mailbox hinzufügen';
-$PALANG['pCreate_dbLog_createalias'] = 'Alias hinzufügen';
-$PALANG['pDelete_dbLog_deletealias'] = 'Alias löschen';
-$PALANG['pDelete_dbLog_deletemailbox'] = 'Mailbox löschen';
+$PALANG['pCreate_dbLog_createmailbox'] = 'Mailbox hinzufügen';
+$PALANG['pCreate_dbLog_createalias'] = 'Alias hinzuü\xBCgen';
+$PALANG['pDelete_dbLog_deletealias'] = 'Alias lüschen';
+$PALANG['pDelete_dbLog_deletemailbox'] = 'Mailbox löschen';
-$PALANG['pEdit_dbLog_editactive'] = 'Aktiv-Status ändern';
+$PALANG['pEdit_dbLog_editactive'] = 'Aktiv-Status ändern';
$PALANG['pEdit_dbLog_editalias'] = 'Alias bearbeiten';
$PALANG['pEdit_dbLog_editmailbox'] = 'Mailbox bearbeiten';
$PALANG['pSearch'] = 'suche';
$PALANG['pSearch_welcome'] = 'Suche nach: ';
+
+$PALANG['pFetchmail_welcome'] = 'E-Mail Abruf für: ';
+$PALANG['pFetchmail_new_entry'] = 'Neuer Eintrag';
+
?>
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2007-10-07 19:52:40 UTC (rev 139)
+++ trunk/languages/en.lang 2007-10-07 23:12:07 UTC (rev 140)
@@ -28,6 +28,7 @@
$PALANG['pMenu_overview'] = 'Overview';
$PALANG['pMenu_create_alias'] = 'Add Alias';
$PALANG['pMenu_create_mailbox'] = 'Add Mailbox';
+$PALANG['pMenu_fetchmail'] = 'Fetch Email';
$PALANG['pMenu_sendmail'] = 'Send Email';
$PALANG['pMenu_password'] = 'Password';
$PALANG['pMenu_viewlog'] = 'View Log';
@@ -354,4 +355,8 @@
$PALANG['pStatus_popimap'] = 'POP/IMAP ';
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters";
+
+$PALANG['pFetchmail_welcome'] = 'Fetch mail for:';
+$PALANG['pFetchmail_new_entry'] = 'New entry';
+
?>
Added: trunk/templates/fetchmail.tpl
===================================================================
--- trunk/templates/fetchmail.tpl (rev 0)
+++ trunk/templates/fetchmail.tpl 2007-10-07 23:12:07 UTC (rev 140)
@@ -0,0 +1,155 @@
+<div id="overview">
+<form name="overview" method="post">
+
+<?php
+
+ $headers=array();
+ foreach($fm_struct as $row){
+ list($editible,$view,$type,$title,$comment)=$row;
+ if ($view){
+ $headers[]=$row;
+ }
+ }
+
+ print "<table id=\"log_table\" border=0>\n";
+ print " <tr>\n";
+ print " <td colspan=\"".(sizeof($headers)-1)."\"><h3>".$PALANG['pFetchmail_welcome'].$user_domains."</h3></td>\n";
+ print " <td align=right><a href='?new=1'>>> ".$PALANG['pFetchmail_new_entry']."</a></td>\n";
+ print " </tr>\n";
+ print " <tr class=\"header\">\n";
+ foreach($headers as $row){
+ list($editible,$view,$type,$title,$comment)=$row;
+ print " <td>" . $title . "</td>\n";
+ }
+ print " </tr>\n";
+
+ if (sizeof ($tFmail) > 0){
+ foreach($tFmail as $row){
+ if ($edit && $edit==$row["id"]){
+ print "<tr><td colspan=".sizeof($headers).">".fetchmail_edit_row($row)."</td></tr>\n";
+ }
+ else{
+ print " <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
+ foreach($row as $key=>$val){
+ list($editible,$view,$type,$title,$comment)=$fm_struct[$key];
+ if ($view){
+ $func="_listview_".$type;
+ print " <td nowrap>" . (function_exists($func)?$func($val):$val) . "</td>\n";
+ }
+ }
+ print " </tr>\n";
+ }
+ }
+
+ }
+
+function fetchmail_edit_row($data=array()){
+ global $fm_struct,$fm_defaults;
+ $id=$data["id"];
+ $_id=$data["id"]*100+1;
+ $ret="<table cellspacing=1 cellpadding=0 border=0 width=100%>";
+ foreach($fm_struct as $key=>$struct){
+ list($editible,$view,$type,$title,$comment)=$struct;
+ if ($editible){
+ $ret.="<tr><td align=left valign=top><label for=${_id} style='width:20em;'>${title}: </label></td>";
+ $ret.="<td align=left style='padding-left:.25em;padding-right:.25em;background-color:white;'>";
+ $func="_edit_".$type;
+ if (! function_exists($func))
+ $func="_edit_text";
+ $val=isset($data[$key])
+ ?$data[$key]
+ :(! is_array($fm_defaults[$key])
+ ?$fm_defaults[$key]
+ :''
+ );
+ $ret.=$func($_id++,$key,$fm_defaults[$key],$val);
+ $ret.="</td><td align=left valign=top><i> ${comment}</i></td></tr>\n";
+ }
+ elseif($view){
+ $func="_view_".$type;
+ $val=isset($data[$key])
+ ?(function_exists($func)
+ ?$func($data[$key])
+ :nl2br($data[$key])
+ )
+ :"--x--";
+ $ret.="<tr><td align=left valign=top>${title}: </label></td>";
+ $ret.="<td align=left valign=top style='padding-left:.25em;padding-right:.25em;background-color:white;'>".$val;
+ $ret.="</td><td align=left valign=top><i> ${comment}</i></td></tr>\n";
+ }
+ }
+ $ret.="<tr><td align=left><input type=submit name=cancel value='Abbrechen'></td><td align=right><input type=submit name=save value='Save'></td><td align=right><input type=submit name=delete value='Delete'>";
+ if ($id){
+ $ret.="<input type=hidden name=edit value='${id}'>";
+ }
+ $ret.="</td></tr>\n";
+ $ret.="</table>\n";
+ return $ret;
+}
+
+function _edit_text($id,$key,$def_vals,$val=""){
+ $val=htmlspecialchars($val);
+ return "<input type=text name=${key} id=${id} value='${val}'>";
+}
+
+function _edit_password($id,$key,$def_vals,$val=""){
+ $val=preg_replace("{.}","*",$val);
+ return "<input type=password name=${key} id=${id} value='${val}'>";
+}
+
+function _edit_num($id,$key,$def_vals,$val=""){
+ $val=(int)($val);
+ return "<input type=text name=${key} id=${id} value='${val}'>";
+}
+
+function _edit_bool($id,$key,$def_vals,$val=""){
+ $ret="<input type=checkbox name=${key} id=${id}";
+ if ($val)
+ $ret.=" checked";
+ $ret.=">";
+ return $ret;
+}
+
+function _edit_longtext($id,$key,$def_vals,$val=""){
+ $val=htmlspecialchars($val);
+ return "<textarea name=${key} id=${id} rows=2 style='width:20em;'>${val}</textarea>";
+}
+
+function _edit_enum($id,$key,$def_vals,$val=""){
+ $ret="<select name=${key} id=${id}>";
+ foreach($def_vals as $opt_val){
+ $ret.="<option";
+ if ($opt_val==$val)
+ $ret.=" selected";
+ $ret.=">${opt_val}</option>\n";
+ }
+ $ret.="</select>\n";
+ return $ret;
+}
+
+function _listview_id($val){
+ return "<a href='?edit=${val}'> ${val} </a>";
+}
+
+function _listview_bool($val){
+ return $val?"+":"";
+}
+
+function _listview_longtext($val){
+ return strlen($val)?"Text - ".strlen($val)." chars":"--x--";
+}
+
+function _listview_text($val){
+ return sizeof($val)?$val:"--x--";
+}
+
+function _listview_password($val){
+ return preg_replace("{.}","*",$val);
+}
+
+
+?>
+</table>
+<p />
+</form>
+</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-07 19:52:36
|
Revision: 139
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=139&view=rev
Author: christian_boltz
Date: 2007-10-07 12:52:40 -0700 (Sun, 07 Oct 2007)
Log Message:
-----------
- always convert maildir name to lovercase - fixes
https://sourceforge.net/tracker/index.php?func=detail&aid=1783149&group_id=191583&atid=937964
Modified Paths:
--------------
trunk/create-mailbox.php
Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php 2007-10-07 19:16:48 UTC (rev 138)
+++ trunk/create-mailbox.php 2007-10-07 19:52:40 UTC (rev 139)
@@ -168,7 +168,7 @@
}
else
{
- $maildir = $fDomain . "/" . escape_string ($_POST['fUsername']) . "/";
+ $maildir = $fDomain . "/" . escape_string (strtolower($_POST['fUsername'])) . "/";
}
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-07 19:16:44
|
Revision: 138
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=138&view=rev
Author: christian_boltz
Date: 2007-10-07 12:16:48 -0700 (Sun, 07 Oct 2007)
Log Message:
-----------
- escape_string(): preserve array keys when escaping arrays
Modified Paths:
--------------
trunk/functions.inc.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2007-10-07 17:49:50 UTC (rev 137)
+++ trunk/functions.inc.php 2007-10-07 19:16:48 UTC (rev 138)
@@ -287,8 +287,8 @@
// Note, the array keys are not cleaned.
if(is_array($string)) {
$clean = array();
- foreach($string as $row) {
- $clean[] = escape_string($row);
+ foreach(array_keys($string) as $row) {
+ $clean[$row] = escape_string($string[$row]);
}
return $clean;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-07 17:49:46
|
Revision: 137
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=137&view=rev
Author: christian_boltz
Date: 2007-10-07 10:49:50 -0700 (Sun, 07 Oct 2007)
Log Message:
-----------
- force user to delete setup.php (which allows creation of superadmins now!)
Note: Developers can use
$CONF['configured'] == 'I_know_the_risk_of_not_deleting_setup.php'
to avoid deletion of setup.php after every "svn up".
WARNING:
THIS ALLOWS NON-AUTHENTIFICATED USERS TO CREATE SUPERADMIN ACCOUNTS!
Use this setting only on development systems, where the database is not
used by postfix.
Modified Paths:
--------------
trunk/index.php
trunk/login.php
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2007-10-07 17:41:29 UTC (rev 136)
+++ trunk/index.php 2007-10-07 17:49:50 UTC (rev 137)
@@ -21,7 +21,9 @@
* Form POST \ GET Variables: -none-
*/
-if (!file_exists (realpath ("./setup.php")))
+$CONF['configured'] = FALSE;
+@include_once('config.inc.php'); # hide error message because only $CONF['configured'] is checked here
+if (!file_exists (realpath ("./setup.php")) || $CONF['configured'] == 'I_know_the_risk_of_not_deleting_setup.php')
{
header ("Location: login.php");
exit;
Modified: trunk/login.php
===================================================================
--- trunk/login.php 2007-10-07 17:41:29 UTC (rev 136)
+++ trunk/login.php 2007-10-07 17:49:50 UTC (rev 137)
@@ -28,6 +28,19 @@
*/
require_once('common.php');
+
+# force user to delete setup.php (allows creation of superadmins!)
+if (file_exists (realpath ("./setup.php"))) {
+ if (is_string($CONF['configured']) && $CONF['configured'] == 'I_know_the_risk_of_not_deleting_setup.php')
+ {
+ }
+ else
+ {
+ print "Please delete setup.php before using Postfix Admin!";
+ exit;
+ }
+}
+
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
include ("./templates/header.tpl");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-07 17:41:28
|
Revision: 136
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=136&view=rev
Author: christian_boltz
Date: 2007-10-07 10:41:29 -0700 (Sun, 07 Oct 2007)
Log Message:
-----------
- read config.inc.php earlier to make the check for
$CONF['configured'] == FALSE work
Modified Paths:
--------------
trunk/common.php
Modified: trunk/common.php
===================================================================
--- trunk/common.php 2007-10-07 17:23:29 UTC (rev 135)
+++ trunk/common.php 2007-10-07 17:41:29 UTC (rev 136)
@@ -26,13 +26,13 @@
header("Location: setup.php");
exit(0);
}
+require_once("$incpath/config.inc.php");
if(isset($CONF['configured'])) {
if($CONF['configured'] == FALSE) {
headeR("Location: setup.php");
exit(0);
}
}
-require_once("$incpath/config.inc.php");
require_once("$incpath/functions.inc.php");
require_once("$incpath/languages/" . check_language () . ".lang");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-07 17:23:32
|
Revision: 135
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=135&view=rev
Author: christian_boltz
Date: 2007-10-07 10:23:29 -0700 (Sun, 07 Oct 2007)
Log Message:
-----------
- setup.php now has a "create superadmin" form
- completely reworked HTML code in setup.php
- moved admin creation code from create_admin.php to functions.php,
function create_admin
- several related changes in functions.inc.php:
- use table_by_key() directly instead of the cached variables (which
are empty if config.inc.php was not read before functions.php)
- add an additional (optional) parameter $setup to db_connect, changed
many die(msg) calls to $error_message .= msg.
If $setup is given, the return value is array($link, $error_text)
instead of $link
- db_connect now checks for invalid $CONF['database_type']
Modified Paths:
--------------
trunk/functions.inc.php
trunk/setup.php
trunk/stylesheet.css
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2007-10-05 08:58:36 UTC (rev 134)
+++ trunk/functions.inc.php 2007-10-07 17:23:29 UTC (rev 135)
@@ -737,9 +737,7 @@
//
function admin_exist ($username)
{
- global $table_admin;
-
- $result = db_query ("SELECT 1 FROM $table_admin WHERE username='$username'");
+ $result = db_query ("SELECT 1 FROM " . table_by_key ('admin') . " WHERE username='$username'");
if ($result['rows'] != 1)
{
return false;
@@ -1236,66 +1234,88 @@
";
-
-//
-// db_connect
-// Action: Makes a connection to the database if it doesn't exist
-// Call: db_connect ()
-//
-function db_connect ()
+/**
+ * db_connect
+ * Action: Makes a connection to the database if it doesn't exist
+ * Call: db_connect ()
+ * Optional parameter: $setup = TRUE, used by setup.php
+ *
+ * Return value:
+ * a) without $setup or $setup == 0
+ * - $link - the database connection -OR-
+ * - call die() in case of connection problems
+ * b) with $setup == TRUE
+ * array($link, $error_text);
+ */
+function db_connect ($setup = 0)
{
global $CONF;
global $DEBUG_TEXT;
+ if ($setup != 0) $DEBUG_TEXT = '';
+ $error_text = '';
+ $link = 0;
if ($CONF['database_type'] == "mysql")
{
if (function_exists ("mysql_connect"))
{
- $link = @mysql_connect ($CONF['database_host'], $CONF['database_user'], $CONF['database_password']) or die ("<p />DEBUG INFORMATION:<br />Connect: " . mysql_error () . "$DEBUG_TEXT");
- @mysql_query("SET CHARACTER SET utf8",$link);
- @mysql_query("SET COLLATION_CONNECTION='utf8_general_ci'",$link);
- $succes = @mysql_select_db ($CONF['database_name'], $link) or die ("<p />DEBUG INFORMATION:<br />MySQL Select Database: " . mysql_error () . "$DEBUG_TEXT");
+ $link = @mysql_connect ($CONF['database_host'], $CONF['database_user'], $CONF['database_password']) or $error_text .= ("<p />DEBUG INFORMATION:<br />Connect: " . mysql_error () . "$DEBUG_TEXT");
+ if ($link) {
+ @mysql_query("SET CHARACTER SET utf8",$link);
+ @mysql_query("SET COLLATION_CONNECTION='utf8_general_ci'",$link);
+ $succes = @mysql_select_db ($CONF['database_name'], $link) or $error_text .= ("<p />DEBUG INFORMATION:<br />MySQL Select Database: " . mysql_error () . "$DEBUG_TEXT");
+ }
}
else
{
- print "<p />DEBUG INFORMATION:<br />MySQL 3.x / 4.0 functions not available!<br />database_type = 'mysql' in config.inc.php, are you using a different database? $DEBUG_TEXT";
- die();
+ $error_text .= "<p />DEBUG INFORMATION:<br />MySQL 3.x / 4.0 functions not available!<br />database_type = 'mysql' in config.inc.php, are you using a different database? $DEBUG_TEXT";
}
}
-
- if ($CONF['database_type'] == "mysqli")
+ elseif ($CONF['database_type'] == "mysqli")
{
if (function_exists ("mysqli_connect"))
{
- $link = @mysqli_connect ($CONF['database_host'], $CONF['database_user'], $CONF['database_password']) or die ("<p />DEBUG INFORMATION:<br />Connect: " . mysqli_connect_error () . "$DEBUG_TEXT");
- @mysqli_query($link,"SET CHARACTER SET utf8");
- @mysqli_query($link,"SET COLLATION_CONNECTION='utf8_general_ci'");
- $success = @mysqli_select_db ($link, $CONF['database_name']) or die ("<p />DEBUG INFORMATION:<br />MySQLi Select Database: " . mysqli_error ($link) . "$DEBUG_TEXT");
+ $link = @mysqli_connect ($CONF['database_host'], $CONF['database_user'], $CONF['database_password']) or $error_text .= ("<p />DEBUG INFORMATION:<br />Connect: " . mysqli_connect_error () . "$DEBUG_TEXT");
+ if ($link) {
+ @mysqli_query($link,"SET CHARACTER SET utf8");
+ @mysqli_query($link,"SET COLLATION_CONNECTION='utf8_general_ci'");
+ $success = @mysqli_select_db ($link, $CONF['database_name']) or $error_text .= ("<p />DEBUG INFORMATION:<br />MySQLi Select Database: " . mysqli_error ($link) . "$DEBUG_TEXT");
+ }
}
else
{
- print "<p />DEBUG INFORMATION:<br />MySQL 4.1 functions not available!<br />database_type = 'mysqli' in config.inc.php, are you using a different database? $DEBUG_TEXT";
- die();
+ $error_text .= "<p />DEBUG INFORMATION:<br />MySQL 4.1 functions not available!<br />database_type = 'mysqli' in config.inc.php, are you using a different database? $DEBUG_TEXT";
}
}
-
- if ($CONF['database_type'] == "pgsql")
+ elseif ($CONF['database_type'] == "pgsql")
{
if (function_exists ("pg_pconnect"))
{
$connect_string = "host=" . $CONF['database_host'] . " dbname=" . $CONF['database_name'] . " user=" . $CONF['database_user'] . " password=" . $CONF['database_password'];
- $link = @pg_pconnect ($connect_string) or die ("<p />DEBUG INFORMATION:<br />Connect: failed to connect to database. $DEBUG_TEXT");
- pg_set_client_encoding($link, 'UNICODE');
+ $link = @pg_pconnect ($connect_string) or $error_text .= ("<p />DEBUG INFORMATION:<br />Connect: failed to connect to database. $DEBUG_TEXT");
+ if ($link) pg_set_client_encoding($link, 'UNICODE');
}
else
{
- print "<p />DEBUG INFORMATION:<br />PostgreSQL functions not available!<br />database_type = 'pgsql' in config.inc.php, are you using a different database? $DEBUG_TEXT";
- die();
+ $error_text .= "<p />DEBUG INFORMATION:<br />PostgreSQL functions not available!<br />database_type = 'pgsql' in config.inc.php, are you using a different database? $DEBUG_TEXT";
}
}
+ else
+ {
+ $error_text = "<p />DEBUG INFORMATION:<br />Invalid \$CONF['database_type']! Please fix your config.inc.php! $DEBUG_TEXT";
+ }
- if ($link)
+ if ($setup)
{
+ return array($link, $error_text);
+ }
+ elseif ($error_text != "")
+ {
+ print $error_text;
+ die();
+ }
+ elseif ($link)
+ {
return $link;
}
else
@@ -1846,7 +1866,107 @@
return $stat_string;
}
+/*
+ Called by create-admin.php and setup.php
+ Returns:
+ array(
+ 'error' => 0, # 0 on success, otherwise > 0
+ 'tMessage' => '', # success / failure message
+ 'pAdminCreate_admin_username_text' => '', # help text / error message for username
+ 'pAdminCreate_admin_password_text' => '' # error message for username
+ )
+ */
+
+function create_admin($fUsername, $fPassword, $fPassword2, $fDomains, $no_generate_password=0)
+{
+ global $PALANG;
+ global $CONF;
+ $error = 0;
+ $tMessage = '';
+ $pAdminCreate_admin_username_text = '';
+ $pAdminCreate_admin_password_text = '';
+
+ if (!check_email ($fUsername))
+ {
+ $error = 1;
+ $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text_error1'];
+ }
+
+ if (empty ($fUsername) or admin_exist ($fUsername))
+ {
+ $error = 1;
+ $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text_error2'];
+ }
+
+ if (empty ($fPassword) or empty ($fPassword2) or ($fPassword != $fPassword2))
+ {
+ if (empty ($fPassword) and empty ($fPassword2) and $CONF['generate_password'] == "YES" && $no_generate_password == 0)
+ {
+ $fPassword = generate_password ();
+ }
+ else
+ {
+ $error = 1;
+ $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text'];
+ $pAdminCreate_admin_password_text = $PALANG['pAdminCreate_admin_password_text_error'];
+ }
+ }
+
+ if ($error != 1)
+ {
+ $password = pacrypt($fPassword);
+ $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text'];
+
+ $result = db_query ("INSERT INTO " . table_by_key('admin') . " (username,password,created,modified) VALUES ('$fUsername','$password',NOW(),NOW())");
+ if ($result['rows'] != 1)
+ {
+ $tMessage = $PALANG['pAdminCreate_admin_result_error'] . "<br />($fUsername)<br />";
+ }
+ else
+ {
+ if (!empty ($fDomains[0]))
+ {
+ for ($i = 0; $i < sizeof ($fDomains); $i++)
+ {
+ $domain = $fDomains[$i];
+ $result = db_query ("INSERT INTO " . table_by_key ('domain_admins') . " (username,domain,created) VALUES ('$fUsername','$domain',NOW())");
+ }
+ }
+ $tMessage = $PALANG['pAdminCreate_admin_result_success'] . "<br />($fUsername";
+ if ($CONF['generate_password'] == "YES" && $no_generate_password == 0)
+ {
+ $tMessage .= " / $fPassword)</br />";
+ }
+ else
+ {
+ if ($CONF['show_password'] == "YES" && $no_generate_password == 0)
+ {
+ $tMessage .= " / $fPassword)</br />";
+ }
+ else
+ {
+ $tMessage .= ")</br />";
+ }
+ }
+ }
+ }
+
+ # TODO: should we log creation, editing and deletion of admins?
+ # Note: needs special handling in viewlog, because domain is empty
+ # db_log ($SESSID_USERNAME, '', 'create_admin', "$fUsername");
+
+ return array(
+ $error,
+ $tMessage,
+ $pAdminCreate_admin_username_text,
+ $pAdminCreate_admin_password_text
+ );
+
+
+}
+
+
$table_admin = table_by_key ('admin');
$table_alias = table_by_key ('alias');
$table_domain = table_by_key ('domain');
Modified: trunk/setup.php
===================================================================
--- trunk/setup.php 2007-10-05 08:58:36 UTC (rev 134)
+++ trunk/setup.php 2007-10-07 17:23:29 UTC (rev 135)
@@ -22,17 +22,19 @@
*
* Form POST \ GET Variables: -none-
*/
+
+require_once("languages/en.lang");
+require_once("functions.inc.php");
+
+$CONF['show_header_text'] = 'NO';
+require('templates/header.tpl');
?>
-<html>
-<head>
-<title>Postfix Admin Setup Checker</title>
-</head>
-<body>
-<img id="login_header_logo" src="images/postbox.png" />
-<img id="login_header_logo" src="images/postfixadmin2.png" />
-<h2>Postfix Admin Setup Checker 1.0.0</h2>
-Running software:<br />
-<p />
+
+<div class='setup'>
+<h2>Postfix Admin Setup Checker</h2>
+
+<p>Running software:
+<ul>
<?php
//
// Check for availablilty functions
@@ -57,29 +59,28 @@
{
if (phpversion() < 5) $phpversion = 4;
if (phpversion() >= 5) $phpversion = 5;
- print "- PHP version " . phpversion () . "<br />\n";
+ print "<li>PHP version " . phpversion () . "\n";
}
else
{
- print "<li><b>Unable to check for PHP version. (missing function: phpversion())</b><br />\n";
+ print "<li><b>Unable to check for PHP version. (missing function: phpversion())</b>\n";
}
-print "<p />\n";
//
// Check for Apache version
//
if ($f_apache_get_version == 1)
{
- print "- " . apache_get_version() . "<br /><p />\n";
+ print "<li>" . apache_get_version() . "\n";
}
else
{
- print "<li><b>Unable to check for Apache version. (missing function: apache_get_version())</b><br />\n";
+ print "<li><b>Unable to check for Apache version. (missing function: apache_get_version())</b>\n";
}
-print "<p />\n";
-print "Checking for dependencies:<br />\n";
-print "<p />\n";
+print "</ul>";
+print "<p>Checking for dependencies:\n";
+print "<ul>\n";
//
// Check for Magic Quotes
@@ -88,26 +89,27 @@
{
if (get_magic_quotes_gpc () == 0)
{
- print "- Magic Quotes: Disabled - OK<br /><p />\n";
+ print "<li>Magic Quotes: Disabled - OK\n";
}
else
{
- print "<li><b>Warning: Magic Quotes: ON (internal workaround used)</b><br /><p />\n";
+ print "<li><b>Warning: Magic Quotes: ON (internal workaround used)</b>\n";
}
}
else
{
- print "<li><b>Unable to check for Magic Quotes. (missing function: get_magic_quotes_gpc())</b><br />\n";
+ print "<li><b>Unable to check for Magic Quotes. (missing function: get_magic_quotes_gpc())</b>\n";
}
-print "<p />\n";
-
//
// Check for config.inc.php
//
+$config_loaded = 0;
if ($file_config == 1)
{
- print "- Depends on: presence config.inc.php - OK<br />\n";
+ print "<li>Depends on: presence config.inc.php - OK\n";
+ require_once('config.inc.php');
+ $config_loaded = 1;
}
else
{
@@ -117,7 +119,6 @@
print "<pre>% cp config.inc.php.sample config.inc.php</pre>\n";
$error =+ 1;
}
-print "<p />\n";
//
// Check if there is support for at least 1 database
@@ -150,9 +151,8 @@
//
if ($f_mysql_connect == 1)
{
- print "- Depends on: MySQL 3.23, 4.0 - OK<br />\n";
+ print "<li>Depends on: MySQL 3.23, 4.0 - OK\n";
}
-print "<p />\n";
//
// MySQL 4.1 functions
@@ -161,26 +161,45 @@
{
if ($f_mysqli_connect == 1)
{
- print "- Depends on: MySQL 4.1 - OK (change the database_type in config.inc.php!!)<br />\n";
+ print "<li>Depends on: MySQL 4.1 - OK\n";
+ if ( !($config_loaded && $CONF['database_type'] == 'mysqli') ) {
+ print "(change the database_type to 'mysqli' in config.inc.php!!)\n";
+ }
}
}
-print "<p />\n";
//
// PostgreSQL functions
//
if ($f_pg_connect == 1)
{
- print "- Depends on: PostgreSQL - OK (change the database_type in config.inc.php!!)<br />\n";
+ print "<li>Depends on: PostgreSQL - OK \n";
+ if ( !($config_loaded && $CONF['database_type'] == 'pgsql') ) {
+ print "(change the database_type to 'pgsql' in config.inc.php!!)\n";
+ }
}
-print "<p />\n";
//
+// Database connection
+//
+if ($config_loaded) {
+ list ($link, $error_text) = db_connect(TRUE);
+ if ($error_text == "") {
+ print "<li>Testing database connection - OK";
+ } else {
+ print "<li><b>Error: Can't connect to database</b><br />\n";
+ print "Please edit the \$CONF['database_*'] parameters in config.inc.php.\n";
+ print "$error_text\n";
+ $error ++;
+ }
+}
+
+//
// Session functions
//
if ($f_session_start == 1)
{
- print "- Depends on: session - OK<br />\n";
+ print "<li>Depends on: session - OK\n";
}
else
{
@@ -192,14 +211,13 @@
print "% portinstall php$phpversion-session</pre>\n";
$error =+ 1;
}
-print "<p />\n";
//
// PCRE functions
//
if ($f_preg_match == 1)
{
- print "- Depends on: pcre - OK<br />\n";
+ print "<li>Depends on: pcre - OK\n";
}
else
{
@@ -211,15 +229,81 @@
print "% portinstall php$phpversion-pcre</pre>\n";
$error =+ 1;
}
-print "<p />\n";
-if ($error == 0)
+print "</ul>";
+
+if ($error != 0)
{
- print "Everything seems fine... you are ready to rock & roll!</br>\n";
+ print "<p><b>Please fix the errors listed above.</b></p>";
+}
+else
+{
+ print "<p>Everything seems fine... you are ready to rock & roll!</p>\n";
+
+ $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text'];
+ $pAdminCreate_admin_password_text = "";
+ $tUsername = '';
+ $tMessage = '';
+
+
+ if ($_SERVER['REQUEST_METHOD'] == "POST")
+ {
+ if (isset ($_POST['fUsername'])) $fUsername = escape_string ($_POST['fUsername']);
+ if (isset ($_POST['fPassword'])) $fPassword = escape_string ($_POST['fPassword']);
+ if (isset ($_POST['fPassword2'])) $fPassword2 = escape_string ($_POST['fPassword2']);
+
+ list ($error, $tMessage, $pAdminCreate_admin_username_text, $pAdminCreate_admin_password_text) = create_admin($fUsername, $fPassword, $fPassword2, array('ALL'), TRUE);
+ if ($error != 0) {
+ if (isset ($_POST['fUsername'])) $tUsername = escape_string ($_POST['fUsername']);
+ } else {
+ print "<p><b>$tMessage</b></p>";
+ echo "<p><b>You can now log in to Postfix Admin.</b></p>";
+ }
+ }
+
+ if ($_SERVER['REQUEST_METHOD'] == "GET" || $error != 0)
+ {
+ ?>
+
+<div id="edit_form">
+<form name="create_admin" method="post">
+<table>
+ <tr>
+ <td colspan="3"><h3>Create superadmin account</h3></td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminCreate_admin_username'] . ":"; ?></td>
+ <td><input class="flat" type="text" name="fUsername" value="<?php print $tUsername; ?>" /></td>
+ <td><?php print $pAdminCreate_admin_username_text; ?></td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminCreate_admin_password'] . ":"; ?></td>
+ <td><input class="flat" type="password" name="fPassword" /></td>
+ <td><?php print $pAdminCreate_admin_password_text; ?></td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pAdminCreate_admin_password2'] . ":"; ?></td>
+ <td><input class="flat" type="password" name="fPassword2" /></td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pAdminCreate_admin_button']; ?>" /></td>
+ </tr>
+ <tr>
+ <td colspan="3" class="standout"><?php print $tMessage; ?></td>
+ </tr>
+</table>
+</form>
+</div>
+
+ <?php
+ }
+
print "<b>Make sure you delete this setup.php file!</b><br />\n";
print "Also check the config.inc.php file for any settings that you might need to change!<br />\n";
print "Click here to go to the <a href=\"admin\">admin section</a> (make sure that your .htaccess is setup properly)\n";
}
?>
+</div>
</body>
</html>
Modified: trunk/stylesheet.css
===================================================================
--- trunk/stylesheet.css 2007-10-05 08:58:36 UTC (rev 134)
+++ trunk/stylesheet.css 2007-10-07 17:23:29 UTC (rev 135)
@@ -21,10 +21,6 @@
color: #888888;
}
-ul {
- padding-left: 0px;
-}
-
table {
// border-spacing: 0;
// padding: 0;
@@ -250,4 +246,13 @@
color: #777777;
}
+div.setup {
+ width:700px;
+ margin-left:auto;
+ margin-right:auto;
+ text-align: left;
+}
+div.setup li {
+ padding-bottom:1em;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-10-05 08:58:36
|
Revision: 134
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=134&view=rev
Author: GingerDog
Date: 2007-10-05 01:58:36 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
convert-passwd-to-postfixadmin.pl: initial attempt; wrote due to request by plip0 on irc
Added Paths:
-----------
trunk/ADDITIONS/convert-passwd-to-postfixadmin.pl
Added: trunk/ADDITIONS/convert-passwd-to-postfixadmin.pl
===================================================================
--- trunk/ADDITIONS/convert-passwd-to-postfixadmin.pl (rev 0)
+++ trunk/ADDITIONS/convert-passwd-to-postfixadmin.pl 2007-10-05 08:58:36 UTC (rev 134)
@@ -0,0 +1,41 @@
+#!/usr/bin/perl -w
+#
+# Postfix Admin
+#
+# LICENSE
+# This source file is subject to the GPL license that is bundled with
+# this package in the file LICENSE.TXT.
+#
+# Further details on the project are available at :
+# http://www.postfixadmin.com or http://postfixadmin.sf.net
+#
+# @version $Id$
+# @license GNU GPL v2 or later.
+#
+#
+# Really crude attempt at taking all users from a local
+# passwd file (/etc/shadow) and creating postfixadmin mailboxes for them.
+#
+# The script outputs some SQL, which you need to then insert into your database
+# as appropriate.
+#
+# Notes:
+# 1) Change $mydomain and $true as required.
+# 2) Ideally it should parse /etc/passwd, or call the getpw()? function and
+# populate someone's name if known.
+# 3) There's plenty of room for improvement.
+#
+# Original author: David Goodwin <david at palepurple-co-uk> - 2007/10/05.
+#
+use strict;
+
+open(FH, '</etc/shadow') or die ('Cannot open shadow file; you need to be root - ' . $!);
+my $mydomain = "test.com";
+my $true = "t"; # t for pgsql; 1 for mysql
+foreach(<FH>) {
+ my ($username, $password) = split(':', $_);
+ next if $password eq '!';
+ next if $password eq '*';
+ my $maildir = "$username\@$mydomain/";
+ print "insert into mailbox (username, password, domain, active, maildir) values ('$username', '$password', '$mydomain', $true, '$maildir');\n";
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-10-05 00:05:33
|
Revision: 133
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=133&view=rev
Author: christian_boltz
Date: 2007-10-04 17:05:31 -0700 (Thu, 04 Oct 2007)
Log Message:
-----------
- fix: do not remove . and .. (thanks rschetterer!)
- added support for domain subdir style layouts and lots of error checks (thanks abatie!)
- added exit status check after archiving mailbox before calling rmtree
- references:
- https://sourceforge.net/tracker/index.php?func=detail&aid=1750088&group_id=191583&atid=937964
- http://www.rdrop.com/files/mailbox_remover.pl
Modified Paths:
--------------
trunk/ADDITIONS/mailbox_remover.pl
Modified: trunk/ADDITIONS/mailbox_remover.pl
===================================================================
--- trunk/ADDITIONS/mailbox_remover.pl 2007-10-04 14:58:38 UTC (rev 132)
+++ trunk/ADDITIONS/mailbox_remover.pl 2007-10-05 00:05:31 UTC (rev 133)
@@ -3,64 +3,122 @@
# by Petr Znojemsky (c) 2004
# Mailbox remover 0.1a 23/10/2004 - the very first version for MySQL
# removes maildirs from disk when they are not found in a database
-# Run program and read the $logfile before uncommenting the "rmtree" line!
+#
+# Added subdir support and pause --- Alan Batie 2007
+# Lists directories to be deleted then pauses for 5 seconds for chance to abort
+# $Id: mbox_remover,v 1.4 2007/07/12 22:11:09 alan Exp alan $
+#
# All your maildirs or other directories could be accidentally removed.
# Use it at own risk. No warranties!
+use strict;
use DBI;
use File::Path;
##########
# Set these variables according to your configuration
-$maildir_path="/var/mail/virtual/";
-$logfile="/var/log/mail/removed_maildirs";
+# when mailboxes are removed, save their tarballs here
+my $archdir="/var/archive/mailboxes";
+
+# expected to support z option, tweak invocation if you want different
+my $archcmd="/usr/bin/tar";
+
+# trailing slash not needed
+my $maildir_path="/var/mail";
+# find out if we need to check subdirs for mailboxes or just maildir_path
+# $CONF['domain_path'] = 'YES';
+my $pfadmin_config="/usr/local/www/postfixadmin/config.inc.php";
+
# database information
-$host="localhost";
-$port="3306";
-$userid="postfix";
-$passwd="postfix";
-$db="postfix";
+my $host="localhost";
+my $port="3306";
+my $userid="dbuser";
+my $passwd="dbpw";
+my $db="dbname";
############
-$connectionInfo="DBI:mysql:database=$db;$host:$port";
+my $connectionInfo="DBI:mysql:database=$db;$host:$port";
# make connection to database
-$dbh = DBI->connect($connectionInfo,$userid,$passwd);
+my $dbh = DBI->connect($connectionInfo,$userid,$passwd);
# prepare and execute query
-$query = "SELECT username FROM mailbox";
-$sth = $dbh->prepare($query);
+my $query = "SELECT maildir FROM mailbox";
+my $sth = $dbh->prepare($query);
$sth->execute();
+
# assign fields to variables
-$sth->bind_columns(\$username);
-# output computer list to the browser
+my ($db_maildir, %db_maildirs);
+$sth->bind_columns(\$db_maildir);
+
+# load up directory list
while($sth->fetch()) {
-push(@usernames, $username);
+ $db_maildirs{$db_maildir} = 1;
}
+
$sth->finish();
# disconnect from database
$dbh->disconnect;
-# store maildir list to @directories
-opendir(DIRHANDLE, $maildir_path) || die "Cannot open dir $maildir_path: $!";
-foreach $name (sort readdir(DIRHANDLE))
-{
- push (@directories, $name);
+#
+# find out if we need to check subdirs for mailboxes or just maildir_path
+# $CONF['domain_path'] = 'YES';
+#
+my $use_subdirs = 0;
+open(CONFIG, "<$pfadmin_config") || die "Can't open '$pfadmin_config': $!\n";
+while(<CONFIG>) {
+ if (/\$CONF\['domain_path'\] *= *'([^']*)'/) {
+ $use_subdirs = ($1 =~ /yes/i);
+ }
}
-closedir(DIRHANDLE);
-# eliminate "." and ".." from the maildir list
-($dot, $doubledot, @directories) = @directories;
+close(CONFIG);
+# store maildir list to %directories
+# key is path, value is username to use in archive file
+my %directories;
+opendir(DIR, $maildir_path) || die "Cannot open dir $maildir_path: $!\n";
+foreach my $name (readdir(DIR)) {
+ next if ($name eq '.' || $name eq '..' || ! -d "$maildir_path/$name");
+ if ($use_subdirs) {
+ opendir(SUBDIR, "$maildir_path/$name") || die "Cannot open dir $maildir_path/$name: $!\n";
+ foreach my $subname (readdir(SUBDIR)) {
+ next if ($subname eq '.' || $subname eq '..' || ! -d "$maildir_path/$name/$subname");
+ # db entry has trailing slash...
+ if (!defined($db_maildirs{"$name/$subname/"})) {
+ print "marking $maildir_path/$name/$subname for deletion.\n";
+ $directories{"$name/$subname"} = "$name-$subname";
+ }
+ }
+ closedir(SUBDIR);
+ } else {
+ # db entry has trailing slash...
+ if (!defined($db_maildirs{"$name/"})) {
+ print "marking $maildir_path/$name for deletion.\n";
+ $directories{"$name"} = $name;
+ }
+ }
+}
+closedir(DIR);
+
+print "Ctrl-C in 5 seconds to abort before removal starts...\n";
+sleep 5;
+
+my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+# yyyymmddhhmm
+my $tstamp = sprintf("%04d%02d%02d%02d%02d", $year+1900, $mon+1, $mday, $hour, $min);
+
# compare two arrays and erase maildirs not found in database
-foreach $maildir (@directories)
-{
- if ((grep { $_ eq $maildir} @usernames)==0)
- {
- # username not found, delete maildir.
- # Please read $logfile before uncommenting following line!
- # rmtree($maildir_path.$maildir);
- open(INFO, ">>$logfile") || die "Cannot write to the logfile: $logfile.";
- print INFO localtime()." Maildir ".$maildir_path.$maildir." has been deleted.\n";
- close(INFO);
- }
+chdir $maildir_path || die "Can't change to maildir '$maildir_path': $!\n";;
+my @args;
+foreach my $maildir (keys(%directories)) {
+ my $archive = "$archdir/$directories{$maildir}-$tstamp.tgz";
+ # quick permissions check
+ open(TOUCH, ">$archive") || die "Can't create archive file $archive: $!\n";
+ close(TOUCH);
+ print "Archiving $maildir\n";
+ @args = ($archcmd, "cvzf", $archive, $maildir);
+ system(@args) == 0 or die "Creating archive for $maildir failed: $?"
+
+ rmtree($maildir);
+ print localtime() . " $maildir has been deleted.\n";
}
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.
