postfixadmin-svn Mailing List for PostfixAdmin (Page 103)
Brought to you by:
christian_boltz,
gingerdog
You can subscribe to this list here.
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(13) |
Oct
(63) |
Nov
(79) |
Dec
(34) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
(15) |
Feb
(8) |
Mar
(8) |
Apr
(44) |
May
(18) |
Jun
(20) |
Jul
(35) |
Aug
(21) |
Sep
(8) |
Oct
(9) |
Nov
(21) |
Dec
(14) |
2009 |
Jan
(53) |
Feb
(13) |
Mar
(36) |
Apr
(40) |
May
(22) |
Jun
(10) |
Jul
(18) |
Aug
(18) |
Sep
(7) |
Oct
(26) |
Nov
(32) |
Dec
(13) |
2010 |
Jan
(6) |
Feb
(7) |
Mar
(12) |
Apr
(2) |
May
(12) |
Jun
(8) |
Jul
(9) |
Aug
(12) |
Sep
(12) |
Oct
(7) |
Nov
(9) |
Dec
(42) |
2011 |
Jan
(10) |
Feb
(35) |
Mar
(43) |
Apr
(39) |
May
(8) |
Jun
(8) |
Jul
(83) |
Aug
(20) |
Sep
(20) |
Oct
(63) |
Nov
(33) |
Dec
(20) |
2012 |
Jan
(28) |
Feb
(3) |
Mar
(1) |
Apr
(37) |
May
(16) |
Jun
(7) |
Jul
(3) |
Aug
|
Sep
|
Oct
(3) |
Nov
(1) |
Dec
(4) |
2013 |
Jan
(6) |
Feb
(16) |
Mar
(9) |
Apr
(11) |
May
(9) |
Jun
(30) |
Jul
(17) |
Aug
(6) |
Sep
(2) |
Oct
(30) |
Nov
(41) |
Dec
(26) |
2014 |
Jan
(16) |
Feb
(20) |
Mar
(5) |
Apr
(4) |
May
(14) |
Jun
(4) |
Jul
(1) |
Aug
|
Sep
(8) |
Oct
(18) |
Nov
(26) |
Dec
|
2015 |
Jan
(4) |
Feb
(9) |
Mar
(12) |
Apr
(26) |
May
(3) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
(15) |
Oct
(13) |
Nov
|
Dec
(1) |
2016 |
Jan
(1) |
Feb
(5) |
Mar
(4) |
Apr
(3) |
May
(19) |
Jun
|
Jul
|
Aug
(3) |
Sep
(16) |
Oct
(4) |
Nov
(5) |
Dec
(5) |
2017 |
Jan
(1) |
Feb
(8) |
Mar
|
Apr
(7) |
May
(3) |
Jun
(16) |
Jul
(13) |
Aug
(16) |
Sep
(6) |
Oct
(4) |
Nov
(10) |
Dec
(7) |
2018 |
Jan
(16) |
Feb
(17) |
Mar
(11) |
Apr
(13) |
May
(20) |
Jun
(3) |
Jul
(10) |
Aug
|
Sep
(3) |
Oct
(1) |
Nov
(6) |
Dec
(18) |
2019 |
Jan
(18) |
Feb
(31) |
Mar
(4) |
Apr
(4) |
May
(1) |
Jun
(8) |
Jul
(7) |
Aug
(10) |
Sep
(23) |
Oct
(6) |
Nov
(3) |
Dec
(5) |
2020 |
Jan
(10) |
Feb
(18) |
Mar
(34) |
Apr
(19) |
May
(6) |
Jun
(9) |
Jul
|
Aug
(10) |
Sep
(16) |
Oct
(6) |
Nov
(3) |
Dec
(11) |
2021 |
Jan
(118) |
Feb
(22) |
Mar
(13) |
Apr
(12) |
May
(48) |
Jun
(21) |
Jul
(17) |
Aug
(12) |
Sep
(19) |
Oct
(25) |
Nov
(16) |
Dec
(7) |
2022 |
Jan
(6) |
Feb
(7) |
Mar
(14) |
Apr
(4) |
May
|
Jun
(16) |
Jul
(18) |
Aug
(5) |
Sep
(12) |
Oct
(8) |
Nov
(10) |
Dec
(13) |
2023 |
Jan
|
Feb
(3) |
Mar
(2) |
Apr
(1) |
May
(2) |
Jun
(6) |
Jul
(3) |
Aug
(3) |
Sep
(3) |
Oct
(2) |
Nov
(7) |
Dec
(13) |
2024 |
Jan
(8) |
Feb
(6) |
Mar
(5) |
Apr
(10) |
May
(8) |
Jun
(6) |
Jul
(2) |
Aug
(1) |
Sep
(2) |
Oct
(4) |
Nov
(15) |
Dec
(10) |
2025 |
Jan
(3) |
Feb
(12) |
Mar
(3) |
Apr
(7) |
May
(18) |
Jun
(10) |
Jul
(10) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <Gin...@us...> - 2008-07-29 20:33:23
|
Revision: 428 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=428&view=rev Author: GingerDog Date: 2008-07-29 20:33:30 +0000 (Tue, 29 Jul 2008) Log Message: ----------- vacation.pl: add patch from Luxten - enable re-notification after definable timeout - see : https://sourceforge.net/tracker/index.php?func=detail&aid=2031631&group_id=191583&atid=937966 Modified Paths: -------------- trunk/VIRTUAL_VACATION/vacation.pl Modified: trunk/VIRTUAL_VACATION/vacation.pl =================================================================== --- trunk/VIRTUAL_VACATION/vacation.pl 2008-07-29 19:53:08 UTC (rev 427) +++ trunk/VIRTUAL_VACATION/vacation.pl 2008-07-29 20:33:30 UTC (rev 428) @@ -40,6 +40,9 @@ # Properly handle failed queries to vacation_notification. # Fixed log reporting. # +# 2008-07-29 Patch from Luxten to add repeat notification after timeout. See: +# https://sourceforge.net/tracker/index.php?func=detail&aid=2031631&group_id=191583&atid=937966 +# # Requirements: # You need to have the DBD::Pg or DBD::mysql perl-module installed. # You need to have the Mail::Sendmail module installed. @@ -98,6 +101,10 @@ my $debugfile=''; #my $debugfile = "/var/log/vacation/vacation.debug"; +# notification interval, in seconds +# set to 0 to notify only once +my $interval = 60*60*24; + # =========== end configuration =========== use DBI; @@ -170,7 +177,32 @@ # Let's play safe and notify anyway return 0; } - return 1; + if ($interval) { + $query = qq{SELECT NOW()-notified_at FROM vacation_notification WHERE on_vacation=? AND notified=?}; + $stm = $dbh->prepare($query) or panic_prepare($query); + $stm->execute($to,$from) or panic_execute($query,"on_vacation='$to', notified='$from'"); + my @row = $stm->fetchrow_array; + my $int = $row[0]; + if ($int > $interval) { + do_debug ("[Interval elapsed, sending the message]: ", $from, $to); + $query = qq{UPDATE vacation_notification SET notified_at=NOW() WHERE on_vacation=? AND notified=?}; + $stm = $dbh->prepare($query); + if (!$stm) { + do_log('',$to,$from,'',"Could not prepare query $query"); + return 0; + } + if (!$stm->execute($to,$from)) { + $e=$dbh->errstr; + do_log('',$to,$from,'',"Unexpected error: '$e' from query '$query'"); + } + return 0; + } else { + do_debug ("[Interval not elapsed, not sending the message]: ", $from, $to); + return 1; + } + } else { + return 1; + } } return 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2008-07-29 19:52:58
|
Revision: 427 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=427&view=rev Author: GingerDog Date: 2008-07-29 19:53:08 +0000 (Tue, 29 Jul 2008) Log Message: ----------- vacation.pl: applying patch from luxten - see https://sourceforge.net/tracker/index.php?func=detail&aid=2031659&group_id=191583&atid=937966 - thanks! Modified Paths: -------------- trunk/VIRTUAL_VACATION/vacation.pl Modified: trunk/VIRTUAL_VACATION/vacation.pl =================================================================== --- trunk/VIRTUAL_VACATION/vacation.pl 2008-07-29 19:32:32 UTC (rev 426) +++ trunk/VIRTUAL_VACATION/vacation.pl 2008-07-29 19:53:08 UTC (rev 427) @@ -164,7 +164,7 @@ # Violation of a primay key constraint may happen here, and that's # fine. All other error conditions are not fine, however. - if ($e !~ /_pkey/) { + if ($e !~ /(?:_pkey|^Duplicate entry)/) { do_log('',$to,$from,'',"Unexpected error: '$e' from query '$query'"); # Let's play safe and notify anyway This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2008-07-29 19:32:22
|
Revision: 426 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=426&view=rev Author: GingerDog Date: 2008-07-29 19:32:32 +0000 (Tue, 29 Jul 2008) Log Message: ----------- functions.inc.php: reindent (as per inline vim settings) and add in flash_error calls when validating an email address (I suspect the strings need changing as per translation issues) Modified Paths: -------------- trunk/functions.inc.php Modified: trunk/functions.inc.php =================================================================== --- trunk/functions.inc.php 2008-07-28 15:18:54 UTC (rev 425) +++ trunk/functions.inc.php 2008-07-29 19:32:32 UTC (rev 426) @@ -17,7 +17,7 @@ */ if (ereg ("functions.inc.php", $_SERVER['PHP_SELF'])) -{ +{ header ("Location: login.php"); exit; } @@ -183,7 +183,7 @@ function language_selector() { global $supported_languages; # from languages/languages.php - + $current_lang = check_language(); $selector = '<select name="lang" xml:lang="en" dir="ltr">'; @@ -260,49 +260,47 @@ $ce_email = preg_replace("/#/", '@', $ce_email); } - if ( - isset($CONF['emailcheck_resolve_domain']) - && 'YES'==$CONF['emailcheck_resolve_domain'] - && 'WINDOWS'!=(strtoupper(substr(php_uname('s'), 0, 7))) - ) { + if (isset($CONF['emailcheck_resolve_domain']) && 'YES' == $CONF['emailcheck_resolve_domain'] && 'WINDOWS'!=(strtoupper(substr(php_uname('s'), 0, 7)))) + { - // Perform non-domain-part sanity checks - if (!preg_match ('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '[^@]+$/i', trim ($ce_email))) - { - return false; - } + // Perform non-domain-part sanity checks + if (!preg_match ('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '[^@]+$/i', trim ($ce_email))) + { + return false; + } - // Determine domain name - $matches=array(); - if (!preg_match('|@(.+)$|',$ce_email,$matches)) - { - return false; - } - $domain=$matches[1]; + // Determine domain name + $matches=array(); + if (!preg_match('|@(.+)$|',$ce_email,$matches)) + { + return false; + } + $domain=$matches[1]; - // Look for an AAAA, A, or MX record for the domain + // Look for an AAAA, A, or MX record for the domain - if(function_exists('checkdnsrr')) { - // AAAA (IPv6) is only available in PHP v. >= 5 - if (version_compare(phpversion(), "5.0.0", ">=")) - { - if (checkdnsrr($domain,'AAAA')) return true; - } - if (checkdnsrr($domain,'A')) return true; - if (checkdnsrr($domain,'MX')) return true; - } - # TODO: different error message for non-existing domains (instead of "email is invalid") - return false; + if(function_exists('checkdnsrr')) { + // AAAA (IPv6) is only available in PHP v. >= 5 + if (version_compare(phpversion(), "5.0.0", ">=")) + { + if (checkdnsrr($domain,'AAAA')) return true; } + if (checkdnsrr($domain,'A')) return true; + if (checkdnsrr($domain,'MX')) return true; + flash_error("Invalid domain, and/or not discoverable in DNS"); + return false; + } + else { + flash_error("emailcheck_resolve_domain is enabled, but function (checkdnsrr) missing!"); + } + } if (preg_match ('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '([-0-9A-Z]+\.)+' . '([0-9A-Z]){2,6}$/i', trim ($ce_email))) { return true; } - else - { - return false; - } + flash_error("Invalid email address, fails regexp check"); + return false; } @@ -375,9 +373,9 @@ * @return String */ function safeget ($param, $default="") { - $retval=$default; - if (isset($_GET[$param])) $retval=$_GET[$param]; - return $retval; + $retval=$default; + if (isset($_GET[$param])) $retval=$_GET[$param]; + return $retval; } /** @@ -389,9 +387,9 @@ * same as safeget, but for $_POST */ function safepost ($param, $default="") { - $retval=$default; - if (isset($_POST[$param])) $retval=$_POST[$param]; - return $retval; + $retval=$default; + if (isset($_POST[$param])) $retval=$_POST[$param]; + return $retval; } /** @@ -402,9 +400,9 @@ * @return String value from $_SERVER[$param] or $default */ function safeserver ($param, $default="") { - $retval=$default; - if (isset($_SERVER[$param])) $retval=$_SERVER[$param]; - return $retval; + $retval=$default; + if (isset($_SERVER[$param])) $retval=$_SERVER[$param]; + return $retval; } /** @@ -415,9 +413,9 @@ * @return String value from $_COOKIE[$param] or $default */ function safecookie ($param, $default="") { - $retval=$default; - if (isset($_COOKIE[$param])) $retval=$_COOKIE[$param]; - return $retval; + $retval=$default; + if (isset($_COOKIE[$param])) $retval=$_COOKIE[$param]; + return $retval; } @@ -851,7 +849,7 @@ { global $table_domain; - $result = db_query ("SELECT 1 FROM $table_domain WHERE domain='$domain'"); + $result = db_query("SELECT 1 FROM $table_domain WHERE domain='$domain'"); if ($result['rows'] != 1) { return false; @@ -1592,7 +1590,7 @@ foreach($timestamp as $key) { $values[$key] = "now()"; } - + $sql_values = "(" . implode(",",escape_string(array_keys($values))).") VALUES (".implode(",",$values).")"; $result = db_query ("INSERT INTO $table $sql_values"); @@ -2104,7 +2102,7 @@ $error = 0; $tMessage = ''; $pAdminCreate_admin_username_text = ''; - $pAdminCreate_admin_password_text = ''; + $pAdminCreate_admin_password_text = ''; if (!check_email ($fUsername)) { @@ -2117,24 +2115,24 @@ $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 (); + $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']; + $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); + $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())"); @@ -2152,24 +2150,24 @@ $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 />"; - } - } - } - } + $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 @@ -2179,7 +2177,7 @@ $error, $tMessage, $pAdminCreate_admin_username_text, - $pAdminCreate_admin_password_text + $pAdminCreate_admin_password_text ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gin...@us...> - 2008-07-28 15:18:55
|
Revision: 425 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=425&view=rev Author: gingerdog Date: 2008-07-28 15:18:54 +0000 (Mon, 28 Jul 2008) Log Message: ----------- index.php: updating Modified Paths: -------------- website/index.php Modified: website/index.php =================================================================== --- website/index.php 2008-07-28 14:07:54 UTC (rev 424) +++ website/index.php 2008-07-28 15:18:54 UTC (rev 425) @@ -29,24 +29,27 @@ <li>And presumably a compatible IMAP/POP3 server (dovecot and courier seem to be the most popular)</li> </ul> -<h3>Download - version 2.2.0</h3> +<h3>Download - version 2.2.1.1</h3> -<p>v2.2.0 was released in April 2008. It is the latest version and we'd recommend users of previous versions upgrade.</p> +<p>v2.2.1.1 was released in July 2008. It's the latest stable version and is basically all bug fixes from 'trunk' since 2.2.0 was released, without the new features (i.e. domain-domain aliasing). It is the latest version and we'd recommend users of previous versions upgrade.</p> -<p>v2.2.0 includes more language translations, support for fetchmail, a better upgrade procedure, improved vacation support, UTF8 support, broadcast message and many bug fixes.</p> +<p><small>2.2.1 was a slightly broken release, in that it displayed the wrong revision number; hence 2.2.1.1</small></p> -<p>You can download the software <a href="http://sourceforge.net/project/showfiles.php?group_id=191583&package_id=225300">here</a>, with the 2.2.0 release we also provide a .deb package (and there are <a href=""http://software.opensuse.org/search?q=postfixadmin">RPM packages elsewhere</a>) to hopefully make installation somewhat easier.</p> +<p>You can download the software <a href="http://sourceforge.net/project/showfiles.php?group_id=191583&package_id=225300">here</a>; the release contains .deb and .rpm (SuSE) packages and of course a .tar.gz.</p> - <h3>Download - Development/Subversion release</h3> -<p>Since release of v2.2.0, not much has happened (yet). If you wish to live on the edge and run from Subversion, feel free to do so. You may occassionally experience breakage, and we'd suggest you join the IRC channel before 'svn update'ing any important installations.</p> +<p>'trunk' currently contains a working domain-domain aliasing implementation, but to use it, you'll need to alter some Postfix settings first. Once this is finished, it will probably form 2.3.0, which may be released within the next month or so.</p> -<code>svn co https://postfixadmin.svn.sourceforge.net/svnroot/postfixadmin postfixadmin</code> +<p>In the near future, we plan to refactor the codebase to allow for XMLRPC/SOAP integration, allowing e.g. Squirrelmail and RoundCube to integrate with Postfixadmin without having to talk to e.g. a database. This should eventually allow PostfixAdmin to work with e.g. LDAP or a.n.other backend data store without having to change the front end code. This will almost certainly mean the minimum requirements will by PHP5 and probably a dependence on the Zend Framework.</p> +<p>If you wish to get involved, or try out 'trunk' try :</p> + +<code>svn co https://postfixadmin.svn.sourceforge.net/svnroot/postfixadmin/trunk postfixadmin</code> + <h3>Upgrading Postfixadmin</h3> -<p>The database schema between version 2.1.0 and anything later has changed in a number of ways, you should therefore run the 'upgrade.php' script which should take care of all database changes between revisions. </p> +<p>The database schema between version 2.1.0 and anything later has changed in a number of ways, you should therefore run the 'upgrade.php' script which should take care of all database changes between revisions. This should run automatically when you hit the application, unless you've deleted 'setup.php'.</p> <h3>Other Relevant links and related projects</h3> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2008-07-28 14:07:46
|
Revision: 424 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=424&view=rev Author: GingerDog Date: 2008-07-28 14:07:54 +0000 (Mon, 28 Jul 2008) Log Message: ----------- make this upgrade conditional on the row not already being there Modified Paths: -------------- trunk/upgrade.php Modified: trunk/upgrade.php =================================================================== --- trunk/upgrade.php 2008-07-28 14:05:44 UTC (rev 423) +++ trunk/upgrade.php 2008-07-28 14:07:54 UTC (rev 424) @@ -211,17 +211,6 @@ } } -function upgrade_1() { -# inserting the version number is a good start ;-) - db_insert( - 'config', - array( - 'name' => 'version', - 'value' => '1', - ) - ); - echo "upgrade_1"; -} function upgrade_1_mysql() { // CREATE MYSQL DATABASE TABLES. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2008-07-28 14:05:35
|
Revision: 423 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=423&view=rev Author: GingerDog Date: 2008-07-28 14:05:44 +0000 (Mon, 28 Jul 2008) Log Message: ----------- upgrade.php: ensure config table has an initial version entry Modified Paths: -------------- trunk/upgrade.php Modified: trunk/upgrade.php =================================================================== --- trunk/upgrade.php 2008-07-27 21:28:55 UTC (rev 422) +++ trunk/upgrade.php 2008-07-28 14:05:44 UTC (rev 423) @@ -87,6 +87,7 @@ $row = db_array($rs); $version = $row['value']; } else { + db_query_parsed("INSERT INTO config (name, value) VALUES ('version', '0')", 0, ''); $version = 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-07-27 21:28:49
|
Revision: 422 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=422&view=rev Author: christian_boltz Date: 2008-07-27 21:28:55 +0000 (Sun, 27 Jul 2008) Log Message: ----------- create-alias-domain.php: - filter available alias and target domains (and print an error message if none is available) - print success message via flash_info, not inside the form and do a redirect afterwards. We would have to update the list of domains available for aliasing otherwise. - added vim: settings templates/create-alias-domain.php: - hide form if no domains are available for aliasing - move logic of skipping non-available domains to /create-alias-domain.php - added vim: settings templates/list-virtual.php: - show "create alias domain" link (only) if it makes sence (not perfect yet, but better than before) - don't create empty <div> etc. if domain has no mailboxes - intentionally skipped most whitespace fixes (added a comment instead), they would make the patch unreadable languages/*: - additional error message for alias domains: 'All domains are already aliased.' Modified Paths: -------------- trunk/create-alias-domain.php trunk/languages/bg.lang trunk/languages/ca.lang trunk/languages/cn.lang trunk/languages/cs.lang trunk/languages/da.lang trunk/languages/de.lang trunk/languages/en.lang trunk/languages/es.lang trunk/languages/et.lang trunk/languages/eu.lang trunk/languages/fi.lang trunk/languages/fo.lang trunk/languages/fr.lang trunk/languages/hr.lang trunk/languages/hu.lang trunk/languages/is.lang trunk/languages/it.lang trunk/languages/ja.lang trunk/languages/lt.lang trunk/languages/mk.lang trunk/languages/nb.lang trunk/languages/nl.lang trunk/languages/nn.lang trunk/languages/pl.lang trunk/languages/pt-br.lang trunk/languages/ru.lang trunk/languages/sk.lang trunk/languages/sl.lang trunk/languages/sv.lang trunk/languages/tr.lang trunk/languages/tw.lang trunk/templates/create-alias-domain.php trunk/templates/list-virtual.php Modified: trunk/create-alias-domain.php =================================================================== --- trunk/create-alias-domain.php 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/create-alias-domain.php 2008-07-27 21:28:55 UTC (rev 422) @@ -58,13 +58,31 @@ } } +# filter available alias domains +$alias_domains = array(); +foreach ($list_domains as $dom) { + if (isset($list_aliases[$dom]) || in_array($dom,$list_aliases)) continue; + $alias_domains[] = $dom; +} +if (count($alias_domains) == 0) { + $error = 1; + $tMessage = $PALANG['pCreate_alias_domain_error4']; +} + +# filter available target domains +foreach ($list_domains as $dom) { + if (isset($list_aliases[$dom])) continue; + $target_domains[] = $dom; +} + + if (isset ($_REQUEST['alias_domain'])) { $fAliasDomain = escape_string ($_REQUEST['alias_domain']); $fAliasDomain = strtolower ($fAliasDomain); } if (isset ($_REQUEST['target_domain'])) { $fTargetDomain = escape_string ($_REQUEST['target_domain']); - $fTargetDomain = strtolower ($fTargetDomain); + $fTargetDomain = strtolower ($fTargetDomain); } if (isset ($_REQUEST['active'])) { $fActive = (bool)$_REQUEST['active']; @@ -103,7 +121,10 @@ else { db_log ($SESSID_USERNAME, $fAliasDomain, 'create_alias_domain', "$fAliasDomain -> $fTargetDomain"); - $tMessage = $PALANG['pCreate_alias_domain_success']; + flash_info($PALANG['pCreate_alias_domain_success']); + # we would have to update the list of domains available for aliasing. Doing a redirect is easier. + header("Location: " . $CONF['postfix_admin_url'] . "/create-alias-domain.php"); + exit; } } @@ -114,4 +135,5 @@ include ("templates/menu.php"); include ("templates/create-alias-domain.php"); include ("templates/footer.php"); +/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/languages/bg.lang =================================================================== --- trunk/languages/bg.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/bg.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -101,6 +101,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'Не ви е позволено да използвате избраната конфигурация.'; $PALANG['pCreate_alias_domain_error2'] = 'Избраната конфигурация е невалидна. Изберете друга!'; $PALANG['pCreate_alias_domain_error3'] = 'Възникна грешка при добавяне в базата.'; +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Създай нов alias за вашия домейн.'; Modified: trunk/languages/ca.lang =================================================================== --- trunk/languages/ca.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/ca.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -99,6 +99,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Crear un nou àlies pel domini.'; Modified: trunk/languages/cn.lang =================================================================== --- trunk/languages/cn.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/cn.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -100,6 +100,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = '在你的域中新建一个别名.'; Modified: trunk/languages/cs.lang =================================================================== --- trunk/languages/cs.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/cs.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -105,6 +105,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Vytvořit nové přesměrování ve Vaší doméně.'; Modified: trunk/languages/da.lang =================================================================== --- trunk/languages/da.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/da.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -103,6 +103,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Tilføj nyt alias til dit domæne.'; Modified: trunk/languages/de.lang =================================================================== --- trunk/languages/de.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/de.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -102,6 +102,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Neuen Alias für Ihre Domain anlegen'; Modified: trunk/languages/en.lang =================================================================== --- trunk/languages/en.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/en.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -104,6 +104,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; $PALANG['pCreate_alias_welcome'] = 'Create a new alias for your domain.'; Modified: trunk/languages/es.lang =================================================================== --- trunk/languages/es.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/es.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -99,6 +99,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Crear un nuevo alias para el dominio.'; Modified: trunk/languages/et.lang =================================================================== --- trunk/languages/et.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/et.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -100,6 +100,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Loo uus alias domeenis.'; Modified: trunk/languages/eu.lang =================================================================== --- trunk/languages/eu.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/eu.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -99,6 +99,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Domeinuarentzat alias berri bat sortu.'; $PALANG['pCreate_alias_address'] = 'Aliasa'; Modified: trunk/languages/fi.lang =================================================================== --- trunk/languages/fi.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/fi.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -103,6 +103,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Luo uusi alias.'; Modified: trunk/languages/fo.lang =================================================================== --- trunk/languages/fo.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/fo.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -100,6 +100,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Stovna eitt nýtt dulnevni á tínum navnaøki.'; Modified: trunk/languages/fr.lang =================================================================== --- trunk/languages/fr.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/fr.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -102,6 +102,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Créer un nouvel alias pour votre domaine.'; $PALANG['pCreate_alias_address'] = 'Alias'; Modified: trunk/languages/hr.lang =================================================================== --- trunk/languages/hr.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/hr.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -99,6 +99,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Stvori novi alias za domenu.'; Modified: trunk/languages/hu.lang =================================================================== --- trunk/languages/hu.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/hu.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -102,6 +102,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Új alias készítése az adott domainhez'; Modified: trunk/languages/is.lang =================================================================== --- trunk/languages/is.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/is.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -100,6 +100,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Útbúa nýjan alias fyrir þitt lén.'; $PALANG['pCreate_alias_address'] = 'Alias'; Modified: trunk/languages/it.lang =================================================================== --- trunk/languages/it.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/it.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -101,6 +101,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Crea un nuovo alias per il tuo dominio.'; Modified: trunk/languages/ja.lang =================================================================== --- trunk/languages/ja.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/ja.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -102,6 +102,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = '新しい転送先の作成'; Modified: trunk/languages/lt.lang =================================================================== --- trunk/languages/lt.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/lt.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -99,6 +99,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Naujas sinonimas.'; Modified: trunk/languages/mk.lang =================================================================== --- trunk/languages/mk.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/mk.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -100,6 +100,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Креирање на нов алијас за вашиот домен.'; Modified: trunk/languages/nb.lang =================================================================== --- trunk/languages/nb.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/nb.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -102,6 +102,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'Du har ikke tillatelse til å opprette den valgte konfigurasjonen.'; $PALANG['pCreate_alias_domain_error2'] = 'Den valgte konfigurasjonen er ugyldig, vennligst endre den!'; $PALANG['pCreate_alias_domain_error3'] = 'Det mislyktes å lagre informasjonen i databasen.'; +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'Domenealiaset har blitt lagt inn i tabellen over aliasdomener!'; $PALANG['pCreate_alias_welcome'] = 'Opprett et nytt alias.'; Modified: trunk/languages/nl.lang =================================================================== --- trunk/languages/nl.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/nl.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -101,6 +101,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'U heeft niet genoeg rechten om de huidige configuratie te maken.'; $PALANG['pCreate_alias_domain_error2'] = 'De huidige configuratie is ongeldig, slecteer een andere!'; $PALANG['pCreate_alias_domain_error3'] = 'Fout bij vullen database.'; +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'De domein alias is toegevoegd aan de alias domein tabel!'; $PALANG['pCreate_alias_welcome'] = 'Maak een nieuw alias aan voor uw domein.'; Modified: trunk/languages/nn.lang =================================================================== --- trunk/languages/nn.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/nn.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -100,6 +100,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Opprett et nytt alias.'; Modified: trunk/languages/pl.lang =================================================================== --- trunk/languages/pl.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/pl.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -102,6 +102,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Utwórz nowy alias dla Twojej domeny.'; Modified: trunk/languages/pt-br.lang =================================================================== --- trunk/languages/pt-br.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/pt-br.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -100,6 +100,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Criar um novo alias para este domínio'; Modified: trunk/languages/ru.lang =================================================================== --- trunk/languages/ru.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/ru.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -104,6 +104,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'Вам не разрешено создавать выбранную конфигурацию.'; $PALANG['pCreate_alias_domain_error2'] = 'Выбранная конфигурация некорректна, пожалуйста, выберите другую!'; $PALANG['pCreate_alias_domain_error3'] = 'Не удалось добавить запись в базу данных.'; +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'Домен-алиас добавлен в таблицу доменов-алиасов!'; $PALANG['pCreate_alias_welcome'] = 'Создание нового алиаса в вашем домене.'; Modified: trunk/languages/sk.lang =================================================================== --- trunk/languages/sk.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/sk.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -100,6 +100,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Vytvoriť nový alias vo vašej doméne.'; Modified: trunk/languages/sl.lang =================================================================== --- trunk/languages/sl.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/sl.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -100,6 +100,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Ustvari nov alias za določeno domeno.'; Modified: trunk/languages/sv.lang =================================================================== --- trunk/languages/sv.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/sv.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -102,6 +102,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Skapa nytt alias för din domän.'; Modified: trunk/languages/tr.lang =================================================================== --- trunk/languages/tr.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/tr.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -100,6 +100,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = 'Domaininiz için yeni bir alias yaratýn.'; Modified: trunk/languages/tw.lang =================================================================== --- trunk/languages/tw.lang 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/languages/tw.lang 2008-07-27 21:28:55 UTC (rev 422) @@ -100,6 +100,7 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX $PALANG['pCreate_alias_welcome'] = '在你的網域中新建一個別名.'; Modified: trunk/templates/create-alias-domain.php =================================================================== --- trunk/templates/create-alias-domain.php 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/templates/create-alias-domain.php 2008-07-27 21:28:55 UTC (rev 422) @@ -5,14 +5,18 @@ <tr> <td colspan="3"><h3><?php print $PALANG['pCreate_alias_domain_welcome']; ?></h3></td> </tr> + +<?php +if (count($alias_domains) > 0) { +?> + <tr> <td><?php print $PALANG['pCreate_alias_domain_alias'] . ":"; ?></td> <td> <select class="flat" name="alias_domain"> <?php - foreach ($list_domains as $dom) + foreach ($alias_domains as $dom) { - if (isset($list_aliases[$dom]) || in_array($dom,$list_aliases)) continue; print "<option value=\"$dom\"".(($fAliasDomain == $dom) ? ' selected' : '').">$dom</option>\n"; } ?> @@ -24,9 +28,8 @@ <td> <select class="flat" name="target_domain"> <?php - foreach ($list_domains as $dom) + foreach ($target_domains as $dom) { - if (isset($list_aliases[$dom])) continue; print "<option value=\"$dom\"".(($fTargetDomain == $dom) ? ' selected' : '').">$dom</option>\n"; } ?> @@ -38,12 +41,22 @@ <td><input class="flat" type="checkbox" name="active" value="1"<?php if ($fActive) { print ' checked'; } ?> /></td> <td> </td> </tr> +<?php +} +?> <tr> <td colspan="3" class="standout"><?php if ($error) { print '<span class="error_msg">'; } print $tMessage; if ($error) { print '</span>'; } ?></td> </tr> +<?php +if (count($alias_domains) > 0) { +?> <tr> <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pCreate_alias_domain_button']; ?>" /></td> </tr> +<?php +} +?> </table> </form> </div> +<?php /* vim: set ft=php expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/templates/list-virtual.php =================================================================== --- trunk/templates/list-virtual.php 2008-07-27 19:25:51 UTC (rev 421) +++ trunk/templates/list-virtual.php 2008-07-27 21:28:55 UTC (rev 422) @@ -72,7 +72,9 @@ print "</td></tr></table></div>\n"; -if (boolconf('alias_domain') && ((sizeof ($tAliasDomains) > 0) || is_array ($tTargetDomain))) +if (boolconf('alias_domain')) { +# XXX: the following block misses one intention level +if ((sizeof ($tAliasDomains) > 0) || (is_array ($tTargetDomain) )) { print "<table id=\"alias_domain_table\">\n"; print " <tr>\n"; @@ -116,8 +118,11 @@ } print "</table>\n"; +} +# XXX: the above block misses one intention level if (!is_array($tTargetDomain)) { + # TODO: don't print create link if no domains are left for aliasing print "<p><a href=\"create-alias-domain.php?target_domain=$fDomain\">" . $PALANG['pMenu_create_alias_domain'] . "</a>\n"; } } @@ -215,6 +220,7 @@ print "<p><a href=\"create-alias.php?domain=$fDomain\">" . $PALANG['pMenu_create_alias'] . "</a>\n"; } +if (sizeof ($tMailbox) > 0) { print "<div id=\"nav_bar\"><a name=\"MidArrow\"></a>\n<table width=730><colgroup span=\"1\"> <col width=\"550\"></col></colgroup> <tr><td align=left >"; if ( $limit['mbox_pgindex_count'] ) print "<b>".$PALANG['pOverview_mailbox_title']."</b>  "; ($tDisplay_back_show == 1) ? $highlight_at = $tDisplay_back / $CONF['page_size'] + 1 : $highlight_at = 0; @@ -231,22 +237,20 @@ } print "</td><td valign=middle align=right>"; -if ($tDisplay_back_show == 1) -{ - print "<a href=\"$file?domain=$fDomain&limit=$tDisplay_back#MidArrow\"><img border=\"0\" src=\"images/arrow-l.png\" title=\"" . $PALANG['pOverview_left_arrow'] . "\" alt=\"" . $PALANG['pOverview_left_arrow'] . "\" /></a>\n"; -} -if ($tDisplay_up_show == 1) -{ - print "<a href=\"$file?domain=$fDomain&limit=0#MidArrow\"><img border=\"0\" src=\"images/arrow-u.png\" title=\"" . $PALANG['pOverview_up_arrow'] . "\" alt=\"" . $PALANG['pOverview_up_arrow'] . "\" /></a>\n"; -} -if ($tDisplay_next_show == 1) -{ - print "<a href=\"$file?domain=$fDomain&limit=$tDisplay_next#MidArrow\"><img border=\"0\" src=\"images/arrow-r.png\" title=\"" . $PALANG['pOverview_right_arrow'] . "\" alt=\"" . $PALANG['pOverview_right_arrow'] . "\" /></a>\n"; -} -print "</td></tr></table></div>\n"; + if ($tDisplay_back_show == 1) + { + print "<a href=\"$file?domain=$fDomain&limit=$tDisplay_back#MidArrow\"><img border=\"0\" src=\"images/arrow-l.png\" title=\"" . $PALANG['pOverview_left_arrow'] . "\" alt=\"" . $PALANG['pOverview_left_arrow'] . "\" /></a>\n"; + } + if ($tDisplay_up_show == 1) + { + print "<a href=\"$file?domain=$fDomain&limit=0#MidArrow\"><img border=\"0\" src=\"images/arrow-u.png\" title=\"" . $PALANG['pOverview_up_arrow'] . "\" alt=\"" . $PALANG['pOverview_up_arrow'] . "\" /></a>\n"; + } + if ($tDisplay_next_show == 1) + { + print "<a href=\"$file?domain=$fDomain&limit=$tDisplay_next#MidArrow\"><img border=\"0\" src=\"images/arrow-r.png\" title=\"" . $PALANG['pOverview_right_arrow'] . "\" alt=\"" . $PALANG['pOverview_right_arrow'] . "\" /></a>\n"; + } + print "</td></tr></table></div>\n"; -if (sizeof ($tMailbox) > 0) -{ $colspan=8; if ($CONF['vacation_control_admin'] == 'YES') $colspan=$colspan+1; if ($CONF['alias_control_admin'] == 'YES') $colspan=$colspan+1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-07-27 19:25:41
|
Revision: 421 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=421&view=rev Author: christian_boltz Date: 2008-07-27 19:25:51 +0000 (Sun, 27 Jul 2008) Log Message: ----------- create-alias-domain.php: - fix syntax error Modified Paths: -------------- trunk/create-alias-domain.php Modified: trunk/create-alias-domain.php =================================================================== --- trunk/create-alias-domain.php 2008-07-27 19:24:09 UTC (rev 420) +++ trunk/create-alias-domain.php 2008-07-27 19:25:51 UTC (rev 421) @@ -33,7 +33,7 @@ authentication_require_role('admin'); -if (!boolconf['alias_domain']) { +if (!boolconf('alias_domain')) { header("Location: " . $CONF['postfix_admin_url'] . "/main.php"); exit; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-07-27 19:23:59
|
Revision: 420 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=420&view=rev Author: christian_boltz Date: 2008-07-27 19:24:09 +0000 (Sun, 27 Jul 2008) Log Message: ----------- config.inc.php - better description for $CONF['alias_domain'] Modified Paths: -------------- trunk/config.inc.php Modified: trunk/config.inc.php =================================================================== --- trunk/config.inc.php 2008-07-27 19:06:55 UTC (rev 419) +++ trunk/config.inc.php 2008-07-27 19:24:09 UTC (rev 420) @@ -197,8 +197,9 @@ // Alias Domains // Alias domains allow to "mirror" aliases and mailboxes to another domain. This makes -// configuration easier, but also requires postfix to do more database queries. -// Note: If you update from 2.2.x or earlier, you will have to update your postfix config. +// configuration easier if you need the same set of aliases on multiple domains, but +// also requires postfix to do more database queries. +// Note: If you update from 2.2.x or earlier, you will have to update your postfix configuration. // Set to 'NO' to disable alias domains. $CONF['alias_domain'] = 'YES'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-07-27 19:06:50
|
Revision: 419 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=419&view=rev Author: christian_boltz Date: 2008-07-27 19:06:55 +0000 (Sun, 27 Jul 2008) Log Message: ----------- config.inc.php + all files related to alias domains - added $CONF['alias_domain'] switch to disable alias domains (includes lots of whitespace changes in list-virtual.php) functions.php: - added some comments to boolconf() Modified Paths: -------------- trunk/config.inc.php trunk/create-alias-domain.php trunk/functions.inc.php trunk/list-virtual.php trunk/templates/list-virtual.php trunk/templates/menu.php Modified: trunk/config.inc.php =================================================================== --- trunk/config.inc.php 2008-07-27 18:48:41 UTC (rev 418) +++ trunk/config.inc.php 2008-07-27 19:06:55 UTC (rev 419) @@ -195,6 +195,13 @@ // '0' means no limits. $CONF['alias_goto_limit'] = '0'; +// Alias Domains +// Alias domains allow to "mirror" aliases and mailboxes to another domain. This makes +// configuration easier, but also requires postfix to do more database queries. +// Note: If you update from 2.2.x or earlier, you will have to update your postfix config. +// Set to 'NO' to disable alias domains. +$CONF['alias_domain'] = 'YES'; + // Backup // If you don't want backup tab set this to 'NO'; $CONF['backup'] = 'YES'; Modified: trunk/create-alias-domain.php =================================================================== --- trunk/create-alias-domain.php 2008-07-27 18:48:41 UTC (rev 418) +++ trunk/create-alias-domain.php 2008-07-27 19:06:55 UTC (rev 419) @@ -32,6 +32,12 @@ require_once('common.php'); authentication_require_role('admin'); + +if (!boolconf['alias_domain']) { + header("Location: " . $CONF['postfix_admin_url'] . "/main.php"); + exit; +} + $username = authentication_get_username(); $SESSID_USERNAME = $username; if(authentication_has_role('global-admin')) { Modified: trunk/functions.inc.php =================================================================== --- trunk/functions.inc.php 2008-07-27 18:48:41 UTC (rev 418) +++ trunk/functions.inc.php 2008-07-27 19:06:55 UTC (rev 419) @@ -2189,6 +2189,7 @@ /* Convert $CONF['whatever'] to boolean + (obviously only useful for settings that can be YES or NO) Returns: TRUE (on YES/yes) or FALSE (on NO/no/not set/unknown value) */ @@ -2196,11 +2197,12 @@ function boolconf($setting) { global $CONF; if (!isset($CONF[$setting])) { # not set + # TODO: show/log error message on unknown settings? return false; } elseif (strtoupper($CONF[$setting]) == 'YES') { # YES return true; } else { # NO, unknown value - # TODO: show error on unknown value? + # TODO: show/log error message on unknown value? return false; } } Modified: trunk/list-virtual.php =================================================================== --- trunk/list-virtual.php 2008-07-27 18:48:41 UTC (rev 418) +++ trunk/list-virtual.php 2008-07-27 19:06:55 UTC (rev 419) @@ -73,50 +73,51 @@ } -# Alias-Domains -# first try to get a list of other domains pointing -# to this currently chosen one (aka. alias domains) -$query = "SELECT $table_alias_domain.alias_domain,$table_alias_domain.target_domain,$table_alias_domain.modified,$table_alias_domain.active FROM $table_alias_domain WHERE target_domain='$fDomain' ORDER BY $table_alias_domain.alias_domain LIMIT $fDisplay, $page_size"; -if ('pgsql'==$CONF['database_type']) -{ - $query = "SELECT alias_domain,target_domain,extract(epoch from modified) as modified,active FROM $table_alias_domain WHERE target_domain='$fDomain' ORDER BY alias_domain LIMIT $page_size OFFSET $fDisplay"; -} -$result = db_query ($query); -$tAliasDomains = array(); -if ($result['rows'] > 0) -{ - while ($row = db_array ($result['result'])) +if (boolconf('alias_domain')) { + # Alias-Domains + # first try to get a list of other domains pointing + # to this currently chosen one (aka. alias domains) + $query = "SELECT $table_alias_domain.alias_domain,$table_alias_domain.target_domain,$table_alias_domain.modified,$table_alias_domain.active FROM $table_alias_domain WHERE target_domain='$fDomain' ORDER BY $table_alias_domain.alias_domain LIMIT $fDisplay, $page_size"; + if ('pgsql'==$CONF['database_type']) { - if ('pgsql'==$CONF['database_type']) + $query = "SELECT alias_domain,target_domain,extract(epoch from modified) as modified,active FROM $table_alias_domain WHERE target_domain='$fDomain' ORDER BY alias_domain LIMIT $page_size OFFSET $fDisplay"; + } + $result = db_query ($query); + $tAliasDomains = array(); + if ($result['rows'] > 0) + { + while ($row = db_array ($result['result'])) { - $row['modified']=gmstrftime('%c %Z',$row['modified']); - $row['active']=('t'==$row['active']) ? 1 : 0; + if ('pgsql'==$CONF['database_type']) + { + $row['modified']=gmstrftime('%c %Z',$row['modified']); + $row['active']=('t'==$row['active']) ? 1 : 0; + } + $tAliasDomains[] = $row; } - $tAliasDomains[] = $row; + } + # now let's see if the current domain itself is an alias for another domain + $query = "SELECT $table_alias_domain.alias_domain,$table_alias_domain.target_domain,$table_alias_domain.modified,$table_alias_domain.active FROM $table_alias_domain WHERE alias_domain='$fDomain'"; + if ('pgsql'==$CONF['database_type']) + { + $query = "SELECT alias_domain,target_domain,extract(epoch from modified) as modified,active FROM $table_alias_domain WHERE alias_domain='$fDomain'"; } -} -# now let's see if the current domain itself is an alias for another domain -$query = "SELECT $table_alias_domain.alias_domain,$table_alias_domain.target_domain,$table_alias_domain.modified,$table_alias_domain.active FROM $table_alias_domain WHERE alias_domain='$fDomain'"; -if ('pgsql'==$CONF['database_type']) -{ - $query = "SELECT alias_domain,target_domain,extract(epoch from modified) as modified,active FROM $table_alias_domain WHERE alias_domain='$fDomain'"; -} -$result = db_query ($query); -$tTargetDomain = ""; -if ($result['rows'] > 0) -{ - if($row = db_array ($result['result'])) + $result = db_query ($query); + $tTargetDomain = ""; + if ($result['rows'] > 0) { - if ('pgsql'==$CONF['database_type']) + if($row = db_array ($result['result'])) { - $row['modified']=gmstrftime('%c %Z',$row['modified']); - $row['active']=('t'==$row['active']) ? 1 : 0; + if ('pgsql'==$CONF['database_type']) + { + $row['modified']=gmstrftime('%c %Z',$row['modified']); + $row['active']=('t'==$row['active']) ? 1 : 0; + } + $tTargetDomain = $row; } - $tTargetDomain = $row; } } - $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.active FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username WHERE $table_alias.domain='$fDomain' AND $table_mailbox.maildir IS NULL ORDER BY $table_alias.address LIMIT $fDisplay, $page_size"; if ('pgsql'==$CONF['database_type']) { Modified: trunk/templates/list-virtual.php =================================================================== --- trunk/templates/list-virtual.php 2008-07-27 18:48:41 UTC (rev 418) +++ trunk/templates/list-virtual.php 2008-07-27 19:06:55 UTC (rev 419) @@ -72,7 +72,7 @@ print "</td></tr></table></div>\n"; -if ((sizeof ($tAliasDomains) > 0) || is_array ($tTargetDomain)) +if (boolconf('alias_domain') && ((sizeof ($tAliasDomains) > 0) || is_array ($tTargetDomain))) { print "<table id=\"alias_domain_table\">\n"; print " <tr>\n"; Modified: trunk/templates/menu.php =================================================================== --- trunk/templates/menu.php 2008-07-27 18:48:41 UTC (rev 418) +++ trunk/templates/menu.php 2008-07-27 19:06:55 UTC (rev 419) @@ -16,8 +16,10 @@ $url = "create-alias.php"; if (isset ($_GET['domain'])) $url .= "?domain=" . $_GET['domain']; $submenu_virtual .= _menulink($url, $PALANG['pMenu_create_alias']); -$url = "create-alias-domain.php"; if (isset ($_GET['domain'])) $url .= "?target_domain=" . $_GET['domain']; -$submenu_virtual .= _menulink($url, $PALANG['pMenu_create_alias_domain']); +if (boolconf('alias_domain')) { + $url = "create-alias-domain.php"; if (isset ($_GET['domain'])) $url .= "?target_domain=" . $_GET['domain']; + $submenu_virtual .= _menulink($url, $PALANG['pMenu_create_alias_domain']); +} $submenu_admin = _menulink("create-admin.php", $PALANG['pAdminMenu_create_admin']); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-07-27 18:48:31
|
Revision: 418 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=418&view=rev Author: christian_boltz Date: 2008-07-27 18:48:41 +0000 (Sun, 27 Jul 2008) Log Message: ----------- function.inc.php - new function boolconf() for easier handling of boolean $CONF settings Modified Paths: -------------- trunk/functions.inc.php Modified: trunk/functions.inc.php =================================================================== --- trunk/functions.inc.php 2008-07-27 17:11:37 UTC (rev 417) +++ trunk/functions.inc.php 2008-07-27 18:48:41 UTC (rev 418) @@ -2186,6 +2186,27 @@ } + +/* + Convert $CONF['whatever'] to boolean + + Returns: TRUE (on YES/yes) or FALSE (on NO/no/not set/unknown value) + */ + +function boolconf($setting) { + global $CONF; + if (!isset($CONF[$setting])) { # not set + return false; + } elseif (strtoupper($CONF[$setting]) == 'YES') { # YES + return true; + } else { # NO, unknown value + # TODO: show error on unknown value? + return false; + } +} + + + $table_admin = table_by_key ('admin'); $table_alias = table_by_key ('alias'); $table_alias_domain = table_by_key ('alias_domain'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-07-27 17:11:27
|
Revision: 417 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=417&view=rev Author: christian_boltz Date: 2008-07-27 17:11:37 +0000 (Sun, 27 Jul 2008) Log Message: ----------- nb.lang - translation update by Odd Henriksen (oddhenriksen @SF) Modified Paths: -------------- trunk/languages/nb.lang Modified: trunk/languages/nb.lang =================================================================== --- trunk/languages/nb.lang 2008-07-24 14:30:59 UTC (rev 416) +++ trunk/languages/nb.lang 2008-07-27 17:11:37 UTC (rev 417) @@ -4,6 +4,8 @@ // Language file Norwegian (bokmål) // by Odd Henriksen // +// Last updated: 2008-07-22 / Odd Henriksen +// $PALANG['YES'] = 'JA'; $PALANG['NO'] = 'NEI'; @@ -29,7 +31,7 @@ $PALANG['pMenu_main'] = 'Hoved'; $PALANG['pMenu_overview'] = 'Oversikt'; $PALANG['pMenu_create_alias'] = 'Legg til alias'; -$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX +$PALANG['pMenu_create_alias_domain'] = 'Legg til aliasdomene'; $PALANG['pMenu_create_mailbox'] = 'Legg til e-postkonto'; $PALANG['pMenu_fetchmail'] = 'Hent e-post'; $PALANG['pMenu_sendmail'] = 'Send e-post'; @@ -52,21 +54,21 @@ $PALANG['pOverview_up_arrow'] = 'Gå til toppen'; $PALANG['pOverview_right_arrow'] = 'Neste side'; $PALANG['pOverview_left_arrow'] = 'Forrige side'; -$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX +$PALANG['pOverview_alias_domain_title'] = ':: Domenealias'; $PALANG['pOverview_alias_title'] = ':: Alias'; $PALANG['pOverview_mailbox_title'] = ':: Epostkontoer'; $PALANG['pOverview_button'] = 'Vis'; $PALANG['pOverview_welcome'] = 'Oversikt for '; -$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX -$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX +$PALANG['pOverview_alias_domain_aliases'] = 'Aliasdomener'; +$PALANG['pOverview_alias_domain_target'] = '%s er et aliasdomene for:'; $PALANG['pOverview_alias_alias_count'] = 'Alias'; $PALANG['pOverview_alias_mailbox_count'] = 'Epostkontoer'; $PALANG['pOverview_alias_address'] = 'Fra'; $PALANG['pOverview_alias_goto'] = 'Til'; $PALANG['pOverview_alias_modified'] = 'Sist endret'; -$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX +$PALANG['pOverview_alias_domain_modified'] = 'Sist endret'; $PALANG['pOverview_alias_active'] = 'Aktiv'; -$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX +$PALANG['pOverview_alias_domain_active'] = 'Aktiv'; $PALANG['pOverview_alias_edit'] = 'Alias'; $PALANG['and_x_more'] = '[og %s flere...]'; $PALANG['pOverview_mailbox_username'] = 'E-post'; @@ -79,7 +81,7 @@ $PALANG['pOverview_get_domain'] = 'Domene'; $PALANG['pOverview_get_aliases'] = 'Alias'; -$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX +$PALANG['pOverview_get_alias_domains'] = 'Domenealias'; $PALANG['pOverview_get_mailboxes'] = 'Epostkontoer'; $PALANG['pOverview_get_quota'] = 'Kvote for e-postkonto (MB)'; $PALANG['pOverview_get_modified'] = 'Sist endret'; @@ -88,19 +90,19 @@ $PALANG['pDelete_delete_success'] = '%s slettet.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Kan ikke slette e-postkontoen '; $PALANG['pDelete_domain_error'] = '<span class="error_msg">Dette domenet tilhører deg ikke '; -$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX +$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Dette domenet tilhører deg ikke '; $PALANG['pDelete_alias_error'] = '<span class="error_msg">Kan ikke slette alias '; -$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX -$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX -$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX -$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX -$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX -$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX -$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX -$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX -$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX -$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX -$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX +$PALANG['pCreate_alias_domain_welcome'] = 'Videresender alt som sendes til et domene til et annet domene.'; +$PALANG['pCreate_alias_domain_alias'] = 'Aliasdomene'; +$PALANG['pCreate_alias_domain_alias_text'] = 'Domenet de innkommende e-postmeldingene er adressert til.'; +$PALANG['pCreate_alias_domain_target'] = 'Destinasjonsdomene'; +$PALANG['pCreate_alias_domain_target_text'] = 'Domenet e-postmeldingene skal videresendes til.'; +$PALANG['pCreate_alias_domain_active'] = 'Aktiv'; +$PALANG['pCreate_alias_domain_button'] = 'Legg til aliasdomene'; +$PALANG['pCreate_alias_domain_error1'] = 'Du har ikke tillatelse til å opprette den valgte konfigurasjonen.'; +$PALANG['pCreate_alias_domain_error2'] = 'Den valgte konfigurasjonen er ugyldig, vennligst endre den!'; +$PALANG['pCreate_alias_domain_error3'] = 'Det mislyktes å lagre informasjonen i databasen.'; +$PALANG['pCreate_alias_domain_success'] = 'Domenealiaset har blitt lagt inn i tabellen over aliasdomener!'; $PALANG['pCreate_alias_welcome'] = 'Opprett et nytt alias.'; $PALANG['pCreate_alias_address'] = 'Alias'; @@ -123,7 +125,7 @@ $PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Du skrev ingenting i Til-feltet</span>'; $PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">E-postadressen er ikke gyldig: '; $PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Dette domenet tilhører deg ikke: '; -$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX +$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Kan ikke endre aliasdomenet!</span>'; $PALANG['pEdit_alias_forward_and_store'] = 'Lever til den lokale e-postkontoen i tillegg.'; $PALANG['pEdit_alias_forward_only'] = 'Bare videresend til de angitte e-postadressene.'; $PALANG['pEdit_alias_button'] = 'Endre alias'; @@ -191,14 +193,14 @@ $PALANG['pViewlog_action_create_mailbox'] = 'opprett e-postkonto'; $PALANG['pViewlog_action_delete_mailbox'] = 'slett e-postkonto'; $PALANG['pViewlog_action_edit_mailbox'] = 'rediger e-postkonto'; -$PALANG['pViewlog_action_edit_mailbox_state'] = 'rediger e-postkontostatus'; +$PALANG['pViewlog_action_edit_mailbox_state'] = 'endre aktiv-status på e-postkonto'; $PALANG['pViewlog_action_create_alias'] = 'opprett alias'; -$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX +$PALANG['pViewlog_action_create_alias_domain'] = 'opprett aliasdomene'; $PALANG['pViewlog_action_delete_alias'] = 'slett alias'; -$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX +$PALANG['pViewlog_action_delete_alias_domain'] = 'slett aliasdomene'; $PALANG['pViewlog_action_edit_alias'] = 'rediger alias'; $PALANG['pViewlog_action_edit_alias_state'] = 'rediger aliasstatus'; -$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX +$PALANG['pViewlog_action_edit_alias_domain_state'] = 'endre aktiv-status på aliasdomene'; $PALANG['pViewlog_action_edit_password'] = 'endre passord'; $PALANG['pViewlog_button'] = 'Vis'; @@ -275,7 +277,7 @@ $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Kunne ikke opprette domenet!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domenet er blitt opprettet!'; $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Kunne ikke fjerne domenet!</span>'; -$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX +$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Kunne ikke fjerne domenealias!</span>'; $PALANG['pAdminEdit_domain_welcome'] = 'Endre et domene'; $PALANG['pAdminEdit_domain_domain'] = 'Domene'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-07-24 14:30:50
|
Revision: 416 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=416&view=rev Author: christian_boltz Date: 2008-07-24 14:30:59 +0000 (Thu, 24 Jul 2008) Log Message: ----------- - check for latest version BTW: Should we switch to version_compare instead of strcmp? Modified Paths: -------------- website/update-check.php Modified: website/update-check.php =================================================================== --- website/update-check.php 2008-07-23 22:44:05 UTC (rev 415) +++ website/update-check.php 2008-07-24 14:30:59 UTC (rev 416) @@ -1,7 +1,7 @@ <?php require_once('header.php'); -$latest = "2.2.0"; +$latest = "2.2.1.1"; if(!isset($_GET['version'])) { echo "Invalid usage"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-07-23 22:43:56
|
Revision: 415 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=415&view=rev Author: christian_boltz Date: 2008-07-23 22:44:05 +0000 (Wed, 23 Jul 2008) Log Message: ----------- CHANGELOG.TXT - added note about 2.2.2.1 release - added release date to all 2.2.* releases debian/changelog - backported from branches/ again - but with the changes listed at the correct version number Modified Paths: -------------- trunk/CHANGELOG.TXT trunk/debian/changelog Modified: trunk/CHANGELOG.TXT =================================================================== --- trunk/CHANGELOG.TXT 2008-07-23 11:41:45 UTC (rev 414) +++ trunk/CHANGELOG.TXT 2008-07-23 22:44:05 UTC (rev 415) @@ -16,11 +16,18 @@ - added support for domain aliases (from lenix) - updated postfix example configuration for domain aliases and to use the new mysql map format - -Version 2.2.1 --------------------- +Version 2.2.1.1 - 2008/07/23 +---------------------------- + + - fixed version number in functions.inc.php ;-) + - SVN revision 412 + + +Version 2.2.1 - 2008/07/21 +-------------------------- + - added quota parameter to mailbox_postcreation hook - new hook to update the quota after editing a mailbox ($CONF['mailbox_postedit_script']) - fixed subfolder creation order and timing @@ -32,8 +39,8 @@ - SVN revision 408 -Version 2.2.0 --------------------- +Version 2.2.0 - 2008/04/29 +-------------------------- <Far more changes than those listed here; thanks to all the community who have provided patches and time to help us get here!> Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-07-23 11:41:45 UTC (rev 414) +++ trunk/debian/changelog 2008-07-23 22:44:05 UTC (rev 415) @@ -1,3 +1,10 @@ +postfixadmin (2.2.1.1) unstable; urgency=low + + * Subversion revision 412 (from branches/postfixadmin-2.2.1) + * THIS IS EFFECTIVELY THE SAME AS 2.2.1 (which should probably be ignored) + + -- David Goodwin <dav...@pa...> Wed, 23 Jul 2008 12:37:00 +0000 + postfixadmin (2.2.1) unstable; urgency=low * Various bug fixes (MySQL charset issue(s)) @@ -2,2 +9,11 @@ * Updated translations (pl, bg, ru, nb, tw etc) + * added quota parameter to mailbox_postcreation hook + * new hook to update the quota after editing a mailbox + ($CONF['mailbox_postedit_script']) + * fixed subfolder creation order and timing + * allow smtp server to be specified in vacation.pl + * fixed MySQL charset issues + * several small bugfixes + * Norwegian (bokmal) translation added + * Updated translations (pl, bg, ru, nb, tw etc) * Subversion revision 408 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2008-07-23 11:41:37
|
Revision: 414 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=414&view=rev Author: GingerDog Date: 2008-07-23 11:41:45 +0000 (Wed, 23 Jul 2008) Log Message: ----------- yeah, clearly I should have created the branch before merging stuff into 2.2.1... Added Paths: ----------- branches/postfixadmin-2.2.1.1/ branches/postfixadmin-2.2.1.1/CHANGELOG.TXT branches/postfixadmin-2.2.1.1/create-mailbox.php branches/postfixadmin-2.2.1.1/debian/changelog branches/postfixadmin-2.2.1.1/functions.inc.php Removed Paths: ------------- branches/postfixadmin-2.2.1.1/CHANGELOG.TXT branches/postfixadmin-2.2.1.1/create-mailbox.php branches/postfixadmin-2.2.1.1/debian/changelog branches/postfixadmin-2.2.1.1/functions.inc.php Deleted: branches/postfixadmin-2.2.1.1/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.2.1/CHANGELOG.TXT 2008-07-22 23:35:20 UTC (rev 411) +++ branches/postfixadmin-2.2.1.1/CHANGELOG.TXT 2008-07-23 11:41:45 UTC (rev 414) @@ -1,292 +0,0 @@ -# -# Postfix Admin -# by Mischa Peters <mischa at high5 dot net> -# Copyright (c) 2002 - 2005 High5! -# Licensed under GPL for more info check GPL-LICENSE.TXT -# -# -Version 2.2.0 --------------------- - - <Far more changes than those listed here; thanks to all the community who have provided - patches and time to help us get here!> - - Unicode support for vacation messages - - More language translations - - Merged the two vacation scripts (PostgreSQL version won :) ) - - Added setup.php/upgrade.php scripts to handle upgrades - - See also new 'config' database table - - Added support for 'fetchmail' so mail from a remote server can be retrieved. - - Many, many bug fixes - - - Added: Feature to show status of aliases/mailboxes (GregC) - - Fixed: Many admin/*.php files merged with /*.php - - Fixed: 'alias' instead of '$table_alias' being used by some .php files (GregC) - - Fixed: Overview no longer lists alias entries for mailboxes (GregC) - - Changed: Added exit buttons to several edit options. (GregC) - - Fixed: user options are a little more idiot-proof, templates are consistent (GregC) - - Changed: Users can view and edit their vacation config (GregC) - - Added: Slovakian language posted on SourceForge by eszabo - - Changed: searches include mailbox.name matches (GregC) - - Fixed: function check_email will ignore vacation_domain if vacation==YES (GregC) - - Changed: applied patches from Christian Boltz posted at - http://www.cboltz.de/tmp/postfixadmin-3.patch, referenced at - https://sourceforge.net/tracker/index.php?func=detail&aid=1696647&group_id=191583&atid=937966 (GregC) - - Added: main.php to admin dirctory (GregC) - - Added: Item "Main" on admin menu (GregC) - - Changed: Edit-vacation now edits for admins/superadmins (GregC) - - Added: Do not store local copy when forward mail. (Mihau) [24] - - Added: Virtual Vacation for PostgreSQL. (Tarvin) - - Added: Virtual Vacation 3.2 (Thanx David) - - Added: SUBJECT tag for Virtual Vacation. - - Added: Dovecot setup document for Postfix Admin. (Thanx Massimo) - - Added: SquirrelMail plugin to change_password. - - Changed: Starting to merge /admin in root. (Mihau) - - Changed: Moved some TXT files to DOCUMENTS. - - Changed: Updated tw.lang. (Thanx Bruce) - - Fixed: Usage of mysql_real_escape_string(). (Mihau) - - Fixed: Calculating of quotas. (Mihau) - - Fixed: Password generation when creating a new account. (Mihau) - - Fixed: PostgreSQL patches. (Tarvin) - - Fixed: Adding of multiple aliases. (Mihau) - - Fixed: CSS Menu width. (Mihau) - - Fixed: Overview when upgrading from 2.0.4. (Mihau) - - Fixed: smtp_mail() to wait for response from server. - - Fixed: pacrypt() so system works properly. (Thanx Npaufler) - - Fixed: quoting an email address when sending mail in vacation.pl. (Thanx Marc) - - Fixed: vacation.pl has a clean exit when it encounters an error. (Thanx Brian) - - Fixed: descriptions for quota={-1|0} in admin section (Mihau) - - -Version 2.1.0 -- 2005/01/07 ---------------------------- - - Added: Traditional Chinese language. (Thanx Bruce) - - Added: Traditional Bulgarian language. (Thanx Plamen) - - Added: Macedonian language. (Thanx Damjan) - - Added: Estonian language. (Thanx Peeter) - - Added: Slovenian language. (Thanx Nejc) - - Added: Check for update link in footer. - - Added: Additional language strings. Check LANGUAGE.TXT - - Added: Transport support. (read postfix transport for more information) - - Added: Additional language string for transport support. - - Added: MySQL 4.1 support. - - Added: PostgreSQL support. (Big Thanx WhiteFox!) - - Added: Setup Checker script. (Thanx Fenrir) - - Added: Database prefix. (Thanx Decramy) - - Added: Template tags. (Thanx Nelson) - - Added: admin/domain/alias/mailbox in delete dialog box. - - Added: $CONF['postfix_admin_url'] variable. - - Added: $CONF['postfix_admin_path'] variable. - - Added: $CONF['vacation_domain'] variable. - - Added: $CONF['welcome_text'] variable. - - Added: $CONF['special_alias_control'] variable. (Thanx Mihau) - - Added: Virtual Vacation 3.1 (Thanx David) - - Added: ADDITIONS directory with third party scripts and plugins. - - Added: Search function for aliases and mailboxes. - - Changed: Postfix Admin has now it's own license. - - Changed: New menu and color scheme. (Thanx Nelson) - - Changed: Disable number and unlimited number for aliases/mailboxes/quota. - - Changed: Virtual Vacation to have it's own transport. (Big Thanx Npaufler!) - - Changed: Removed the welcome text for a new mailbox from the language files. - - Changed: backup.php to be a more secure. (Thanx John) - - Fixed: Cleaned up stylesheet. - - Fixed: Default quota multiplier. - - Fixed: All POST/GET strings are escaped. - - Fixed: Corrected smtp_mail() to wait for result. (Thanx Patrice) - - Fixed: Pagination with alias_control switched on. - - Fixed: Swedish language. (Thanx Bjorne) - - Fixed: Polish language. (Thanx Piotr) - - Fixed: Minor Virtual Vacation bugs. (Thanx David) - - Fixed: check_quota(). - - Fixed: Minor encode_header() issue. (Thanx Matthew) - - Fixed: edit-alias.php when running with magic_quotes_gpc = off - - -Version 2.0.5 -- 2004/08/21 ---------------------------- - - Added: Chinese language. (Thanx Matthew) - - Added: Catalan language. (Thanx Jaume) - - Added: Czech language. (Thanx Jakub) - - Added: Dynamic language detection. - - Added: Header in header.tpl to set charset header from language file. - - Added: More subroutines and alias checking for Vacation. (Thanx David) - - Added: Domain pass-through with certain pages. - - Added: Backup MX option for domain. - - Added: Log contains IP address of admin. - - Added: Pagination for alias/mailbox listing. - - Added: 2 additional language strings to support Backup MX. - - Added: Support for motd.txt (Domain Admins only). - - Added: Support for motd-admin.txt (Site Admins only). - - Added: Support for motd-users.txt (Users only). - - Added: Optional hostname for vacation. - - Added: generate_password() to generating random passwords for mailboxes. - - Changed: dk -> da, se -> sv, no-nn -> nn - - Changed: All email addresses are now converted to lowercase, strtolower(). - - Changed: Moved onMouseOver to the CSS stylesheet. - - Changed: Moved font color to the CSS styleheet. - - Changed: PHP mail() is replaced by an internal function, smtp_mail(). - - Changed: mysql_fetch_array() replaced with internal function db_array(). - - Changed: mysql_fetch_assoc() replaced with internal function db_assoc(). - - Changed: mysql_fetch_row() replaced with internal function db_row(). - - Changed: Quota multiplier is now a configuration option. - - Fixed: Login didn't check for active flag. - - Fixed: Minor html table errors. - - Fixed: Row count by using COUNT(*). - - Fixed: Locked down subdirectories. - - Fixed: Create admin properly populates the domain_admins table. - - Fixed: Cleaned up stylesheet.css. - - Fixed: Delete mailbox properly removes vacation entries. - - -Version 2.0.4 -- 2004/02/26 ----------------------------- - - Added: Euskara language. (Thanx Julen) - - Added: Hungarian language. (Thanx Christian) - - Added: Icelandic language. (Thanx Gestur) - - Added: Italian language. (Thanx Stucchi) - - Added: Norwegian - Nynorsk language. (Thanx Paul) - - Added: Polish language. (Thanx Jarek) - - Added: Portuguese - Brazil language. (Thanx Roberto) - - Added: Rusian language. (Thanx Paul) - - Added: Turkish language (Thanx Onuryalazi) - - Added: Encode a string according to RFC 1522 for use in headers if it - contains 8-bit characters. (Thanx Evgeniy) - - Added: One click active change of mailbox/domain/admin. (Thanx Marcin) - - Changed: Header in header.tpl to read charset header from language file. - - Fixed: Some form values are now parsed through htmlspecialchars(). - (Thanx Marcin) - - Fixed: admin/delete.php ignored $CONF['vacation']. - - Fixed: More minor fixes to Virtual Vacation. - - -Version 2.0.3 -- 2004/01/14 ----------------------------- - - Added: Site Admin email address. - - Added: Danish language. (Thanx Lars) - - Added: Dutch language. (Thanx Mourik) - - Added: Faroese language. (Thanx Danial) - - Added: Finnish language. (Thanx Palo) - - Added: French language. (Thanx Kuthz) - - Added: Swedish language. (Thanx Slite) - - Added: Ignoring of MAILER-DAEMON type emails for Vacation. - - Fixed: Minor issues regarding mail(). - - Fixed: Minor issues regarding crypt(). - - Fixed: Strip issue of email address for Vacation. - - -Version 2.0.2 -- 2004/01/06 ----------------------------- - - Added: German language. (Thanx Tobias) - - Added: Spanish language. (Thanx Alvaro) - - Fixed: The body was not included using sendmail.php. - - Fixed: Undefined variables. - - Fixed: Minor HTML cleanup. - - -Version 2.0.1 -- 2004/01/04 ----------------------------- - - Fixed: The language variable caused a problem on some systems. - - -Version 2.0.0 -- 2004/01/03 ----------------------------- - - Added: The ability for one domain admin to maintain multiple domains. - - Added: Domain to domain forwarding. - - Added: Mailboxes can now be activated or deactivated. - - Added: Configurable welcome message for new mailboxes. - - Added: Optional sending of welcome message. - - Added: Create alias "To" defaults to current domain. - - Added: Logging of admin / user actions. - - Added: Limit for aliases and/or mailboxes per domain. - - Added: Disable aliases and/or mailboxes per domain. - - Added: Max quota per mailbox per domain. - - Added: Multi-Language support. - - Added: Statistics overview for all domains. - - Added: User .forwarding for mailbox users. - - Added: Logo for Postfix Admin (Thanx Andrew). - - Added: Extra MySQL debugging capabilities. - - Added: Clear text password support. - - Added: PHP crypt() support. - - Changed: Separated logic and SQL from content. - - Changed: config.inc.php doesn't point to example.com anymore. - - Changed: Virtual Vacation no longer requires procmail. - - Changed: Complete re-write. - - -Version 1.5.4 -- 2003/06/16 ----------------------------- - - Added: Option for "Back to". - - Added: Option for Vacation module. - - Added: Table declaration for the use of Quota in the INSTALL.TXT. - This requires an additional local delivery agent. - Quotas are not supported by Postfix! - - Changed: The word "View" to "List". - - -Version 1.5.3 -- 2003/06/06 ----------------------------- - - Fixed: Even more minor bugs in regards to declaration of variables. - (Thanx Aquilante and Kyle_m) - - -Version 1.5.2 -- 2003/06/05 ----------------------------- - - Fixed: Minor bugs in regards to declaration of variables. - - -Version 1.5.1 -- 2003/06/04 ----------------------------- - - Added: Optional mailbox per domain directory structure. (Thanx Jim) - - Added: Option to completely control the stored aliases. (Thanx Alex) - - Changed: config.inc.php is renamed to config.inc.php.sample. (Thanx Alex) - - Fixed: $PHP_SELF in config.inc.php and my_lib.php. (Thanx Jim) - - -Version 1.5.0 -- 2003/05/28 ----------------------------- - - Added: Support for "Back to Main Site" - - Added: config.inc.php as the main configuration file. - - Added: Drop down box for domain selection when adding a new admin. - - Added: Resend of test email to newly created mailbox. - - Added: Mailbox and Aliases count for domainview. - - Added: Change description of domain without deleting the complete - domain. - - Added: Change name of mailbox user without deleting the mailbox. - - Added: Expire headers for unnecessary reloads. (Thanx Alex) - - Fixed: Code clean up. - - Fixed: Minor bugs and cosmetic fixes. - - Fixed: Modified check_string() to check numbers and returns false if not - matched. (Thanx btaber) - - Fixed: Correct session handling in login.php (Thanx Yen-Wei Liu) - - Fixed: Correct deletion of RFC822 email addresses. (Thanx Yen-Wei Liu) - - Removed: Completely removed the site_lib.php. - - Removed: my_lib.php from the admin directory. - - Removed: Symlink to index.php. - - -Version 1.4.0 -- 2003/04/07 ----------------------------- - - Added: When deleting a domain, all aliases and mailboxes for that domain - are also deleted from the database. - - Added: Add standard aliases for every domain that is created. - These aliases can point to the main "local" administrator. - The aliases are configured in the config.php in the admin directory. - - Changed: The layout of my_lib.php and site_lib.php have been changed. - - Changed: Modifying an alias is now done with TEXTAREA for more - flexibility. - - Fixed: Minor bugs and cosmetic fixes. - - -Version 1.3.8a -- 2003/03/31 ----------------------------- - - Fixed: After deletion of a domain it would not return to the correct page. - - -Version 1.3.8 -- 2003/03/25 ----------------------------- - - Added: Admin password change. No longer needed to delete and re-enter - the admin user for a specific domain. - - -Version 1.3.7 -- 2002/12/24 ----------------------------- - - Initial public release of Postfix Admin. Copied: branches/postfixadmin-2.2.1.1/CHANGELOG.TXT (from rev 412, branches/postfixadmin-2.2.1/CHANGELOG.TXT) =================================================================== --- branches/postfixadmin-2.2.1.1/CHANGELOG.TXT (rev 0) +++ branches/postfixadmin-2.2.1.1/CHANGELOG.TXT 2008-07-23 11:41:45 UTC (rev 414) @@ -0,0 +1,319 @@ +# 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 +# +# Last update: +# $Id$ + + +Only in SVN trunk +-------------------- + + - added support for domain aliases (from lenix) + - updated postfix example configuration for domain aliases and to use the new mysql map format + + +Version 2.2.1 +-------------------- + + - added quota parameter to mailbox_postcreation hook + - new hook to update the quota after editing a mailbox ($CONF['mailbox_postedit_script']) + - fixed subfolder creation order and timing + - allow smtp server to be specified in vacation.pl + - fixed MySQL charset issues + - several small bugfixes + - Norwegian (bokmal) translation added + - several translation updates + - SVN revision 408 + + +Version 2.2.0 +-------------------- + + <Far more changes than those listed here; thanks to all the community who have provided + patches and time to help us get here!> + - Unicode support for vacation messages + - More language translations + - Merged the two vacation scripts (PostgreSQL version won :) ) + - Added setup.php/upgrade.php scripts to handle upgrades + - See also new 'config' database table + - Added support for 'fetchmail' so mail from a remote server can be retrieved. + - Many, many bug fixes + + - Added: Feature to show status of aliases/mailboxes (GregC) + - Fixed: Many admin/*.php files merged with /*.php + - Fixed: 'alias' instead of '$table_alias' being used by some .php files (GregC) + - Fixed: Overview no longer lists alias entries for mailboxes (GregC) + - Changed: Added exit buttons to several edit options. (GregC) + - Fixed: user options are a little more idiot-proof, templates are consistent (GregC) + - Changed: Users can view and edit their vacation config (GregC) + - Added: Slovakian language posted on SourceForge by eszabo + - Changed: searches include mailbox.name matches (GregC) + - Fixed: function check_email will ignore vacation_domain if vacation==YES (GregC) + - Changed: applied patches from Christian Boltz posted at + http://www.cboltz.de/tmp/postfixadmin-3.patch, referenced at + https://sourceforge.net/tracker/index.php?func=detail&aid=1696647&group_id=191583&atid=937966 (GregC) + - Added: main.php to admin dirctory (GregC) + - Added: Item "Main" on admin menu (GregC) + - Changed: Edit-vacation now edits for admins/superadmins (GregC) + - Added: Do not store local copy when forward mail. (Mihau) [24] + - Added: Virtual Vacation for PostgreSQL. (Tarvin) + - Added: Virtual Vacation 3.2 (Thanx David) + - Added: SUBJECT tag for Virtual Vacation. + - Added: Dovecot setup document for Postfix Admin. (Thanx Massimo) + - Added: SquirrelMail plugin to change_password. + - Changed: Starting to merge /admin in root. (Mihau) + - Changed: Moved some TXT files to DOCUMENTS. + - Changed: Updated tw.lang. (Thanx Bruce) + - Fixed: Usage of mysql_real_escape_string(). (Mihau) + - Fixed: Calculating of quotas. (Mihau) + - Fixed: Password generation when creating a new account. (Mihau) + - Fixed: PostgreSQL patches. (Tarvin) + - Fixed: Adding of multiple aliases. (Mihau) + - Fixed: CSS Menu width. (Mihau) + - Fixed: Overview when upgrading from 2.0.4. (Mihau) + - Fixed: smtp_mail() to wait for response from server. + - Fixed: pacrypt() so system works properly. (Thanx Npaufler) + - Fixed: quoting an email address when sending mail in vacation.pl. (Thanx Marc) + - Fixed: vacation.pl has a clean exit when it encounters an error. (Thanx Brian) + - Fixed: descriptions for quota={-1|0} in admin section (Mihau) + + +Version 2.1.0 -- 2005/01/07 +--------------------------- + - Added: Traditional Chinese language. (Thanx Bruce) + - Added: Traditional Bulgarian language. (Thanx Plamen) + - Added: Macedonian language. (Thanx Damjan) + - Added: Estonian language. (Thanx Peeter) + - Added: Slovenian language. (Thanx Nejc) + - Added: Check for update link in footer. + - Added: Additional language strings. Check LANGUAGE.TXT + - Added: Transport support. (read postfix transport for more information) + - Added: Additional language string for transport support. + - Added: MySQL 4.1 support. + - Added: PostgreSQL support. (Big Thanx WhiteFox!) + - Added: Setup Checker script. (Thanx Fenrir) + - Added: Database prefix. (Thanx Decramy) + - Added: Template tags. (Thanx Nelson) + - Added: admin/domain/alias/mailbox in delete dialog box. + - Added: $CONF['postfix_admin_url'] variable. + - Added: $CONF['postfix_admin_path'] variable. + - Added: $CONF['vacation_domain'] variable. + - Added: $CONF['welcome_text'] variable. + - Added: $CONF['special_alias_control'] variable. (Thanx Mihau) + - Added: Virtual Vacation 3.1 (Thanx David) + - Added: ADDITIONS directory with third party scripts and plugins. + - Added: Search function for aliases and mailboxes. + - Changed: Postfix Admin has now it's own license. + - Changed: New menu and color scheme. (Thanx Nelson) + - Changed: Disable number and unlimited number for aliases/mailboxes/quota. + - Changed: Virtual Vacation to have it's own transport. (Big Thanx Npaufler!) + - Changed: Removed the welcome text for a new mailbox from the language files. + - Changed: backup.php to be a more secure. (Thanx John) + - Fixed: Cleaned up stylesheet. + - Fixed: Default quota multiplier. + - Fixed: All POST/GET strings are escaped. + - Fixed: Corrected smtp_mail() to wait for result. (Thanx Patrice) + - Fixed: Pagination with alias_control switched on. + - Fixed: Swedish language. (Thanx Bjorne) + - Fixed: Polish language. (Thanx Piotr) + - Fixed: Minor Virtual Vacation bugs. (Thanx David) + - Fixed: check_quota(). + - Fixed: Minor encode_header() issue. (Thanx Matthew) + - Fixed: edit-alias.php when running with magic_quotes_gpc = off + + +Version 2.0.5 -- 2004/08/21 +--------------------------- + - Added: Chinese language. (Thanx Matthew) + - Added: Catalan language. (Thanx Jaume) + - Added: Czech language. (Thanx Jakub) + - Added: Dynamic language detection. + - Added: Header in header.tpl to set charset header from language file. + - Added: More subroutines and alias checking for Vacation. (Thanx David) + - Added: Domain pass-through with certain pages. + - Added: Backup MX option for domain. + - Added: Log contains IP address of admin. + - Added: Pagination for alias/mailbox listing. + - Added: 2 additional language strings to support Backup MX. + - Added: Support for motd.txt (Domain Admins only). + - Added: Support for motd-admin.txt (Site Admins only). + - Added: Support for motd-users.txt (Users only). + - Added: Optional hostname for vacation. + - Added: generate_password() to generating random passwords for mailboxes. + - Changed: dk -> da, se -> sv, no-nn -> nn + - Changed: All email addresses are now converted to lowercase, strtolower(). + - Changed: Moved onMouseOver to the CSS stylesheet. + - Changed: Moved font color to the CSS styleheet. + - Changed: PHP mail() is replaced by an internal function, smtp_mail(). + - Changed: mysql_fetch_array() replaced with internal function db_array(). + - Changed: mysql_fetch_assoc() replaced with internal function db_assoc(). + - Changed: mysql_fetch_row() replaced with internal function db_row(). + - Changed: Quota multiplier is now a configuration option. + - Fixed: Login didn't check for active flag. + - Fixed: Minor html table errors. + - Fixed: Row count by using COUNT(*). + - Fixed: Locked down subdirectories. + - Fixed: Create admin properly populates the domain_admins table. + - Fixed: Cleaned up stylesheet.css. + - Fixed: Delete mailbox properly removes vacation entries. + + +Version 2.0.4 -- 2004/02/26 +---------------------------- + - Added: Euskara language. (Thanx Julen) + - Added: Hungarian language. (Thanx Christian) + - Added: Icelandic language. (Thanx Gestur) + - Added: Italian language. (Thanx Stucchi) + - Added: Norwegian - Nynorsk language. (Thanx Paul) + - Added: Polish language. (Thanx Jarek) + - Added: Portuguese - Brazil language. (Thanx Roberto) + - Added: Rusian language. (Thanx Paul) + - Added: Turkish language (Thanx Onuryalazi) + - Added: Encode a string according to RFC 1522 for use in headers if it + contains 8-bit characters. (Thanx Evgeniy) + - Added: One click active change of mailbox/domain/admin. (Thanx Marcin) + - Changed: Header in header.tpl to read charset header from language file. + - Fixed: Some form values are now parsed through htmlspecialchars(). + (Thanx Marcin) + - Fixed: admin/delete.php ignored $CONF['vacation']. + - Fixed: More minor fixes to Virtual Vacation. + + +Version 2.0.3 -- 2004/01/14 +---------------------------- + - Added: Site Admin email address. + - Added: Danish language. (Thanx Lars) + - Added: Dutch language. (Thanx Mourik) + - Added: Faroese language. (Thanx Danial) + - Added: Finnish language. (Thanx Palo) + - Added: French language. (Thanx Kuthz) + - Added: Swedish language. (Thanx Slite) + - Added: Ignoring of MAILER-DAEMON type emails for Vacation. + - Fixed: Minor issues regarding mail(). + - Fixed: Minor issues regarding crypt(). + - Fixed: Strip issue of email address for Vacation. + + +Version 2.0.2 -- 2004/01/06 +---------------------------- + - Added: German language. (Thanx Tobias) + - Added: Spanish language. (Thanx Alvaro) + - Fixed: The body was not included using sendmail.php. + - Fixed: Undefined variables. + - Fixed: Minor HTML cleanup. + + +Version 2.0.1 -- 2004/01/04 +---------------------------- + - Fixed: The language variable caused a problem on some systems. + + +Version 2.0.0 -- 2004/01/03 +---------------------------- + - Added: The ability for one domain admin to maintain multiple domains. + - Added: Domain to domain forwarding. + - Added: Mailboxes can now be activated or deactivated. + - Added: Configurable welcome message for new mailboxes. + - Added: Optional sending of welcome message. + - Added: Create alias "To" defaults to current domain. + - Added: Logging of admin / user actions. + - Added: Limit for aliases and/or mailboxes per domain. + - Added: Disable aliases and/or mailboxes per domain. + - Added: Max quota per mailbox per domain. + - Added: Multi-Language support. + - Added: Statistics overview for all domains. + - Added: User .forwarding for mailbox users. + - Added: Logo for Postfix Admin (Thanx Andrew). + - Added: Extra MySQL debugging capabilities. + - Added: Clear text password support. + - Added: PHP crypt() support. + - Changed: Separated logic and SQL from content. + - Changed: config.inc.php doesn't point to example.com anymore. + - Changed: Virtual Vacation no longer requires procmail. + - Changed: Complete re-write. + + +Version 1.5.4 -- 2003/06/16 +---------------------------- + - Added: Option for "Back to". + - Added: Option for Vacation module. + - Added: Table declaration for the use of Quota in the INSTALL.TXT. + This requires an additional local delivery agent. + Quotas are not supported by Postfix! + - Changed: The word "View" to "List". + + +Version 1.5.3 -- 2003/06/06 +---------------------------- + - Fixed: Even more minor bugs in regards to declaration of variables. + (Thanx Aquilante and Kyle_m) + + +Version 1.5.2 -- 2003/06/05 +---------------------------- + - Fixed: Minor bugs in regards to declaration of variables. + + +Version 1.5.1 -- 2003/06/04 +---------------------------- + - Added: Optional mailbox per domain directory structure. (Thanx Jim) + - Added: Option to completely control the stored aliases. (Thanx Alex) + - Changed: config.inc.php is renamed to config.inc.php.sample. (Thanx Alex) + - Fixed: $PHP_SELF in config.inc.php and my_lib.php. (Thanx Jim) + + +Version 1.5.0 -- 2003/05/28 +---------------------------- + - Added: Support for "Back to Main Site" + - Added: config.inc.php as the main configuration file. + - Added: Drop down box for domain selection when adding a new admin. + - Added: Resend of test email to newly created mailbox. + - Added: Mailbox and Aliases count for domainview. + - Added: Change description of domain without deleting the complete + domain. + - Added: Change name of mailbox user without deleting the mailbox. + - Added: Expire headers for unnecessary reloads. (Thanx Alex) + - Fixed: Code clean up. + - Fixed: Minor bugs and cosmetic fixes. + - Fixed: Modified check_string() to check numbers and returns false if not + matched. (Thanx btaber) + - Fixed: Correct session handling in login.php (Thanx Yen-Wei Liu) + - Fixed: Correct deletion of RFC822 email addresses. (Thanx Yen-Wei Liu) + - Removed: Completely removed the site_lib.php. + - Removed: my_lib.php from the admin directory. + - Removed: Symlink to index.php. + + +Version 1.4.0 -- 2003/04/07 +---------------------------- + - Added: When deleting a domain, all aliases and mailboxes for that domain + are also deleted from the database. + - Added: Add standard aliases for every domain that is created. + These aliases can point to the main "local" administrator. + The aliases are configured in the config.php in the admin directory. + - Changed: The layout of my_lib.php and site_lib.php have been changed. + - Changed: Modifying an alias is now done with TEXTAREA for more + flexibility. + - Fixed: Minor bugs and cosmetic fixes. + + +Version 1.3.8a -- 2003/03/31 +---------------------------- + - Fixed: After deletion of a domain it would not return to the correct page. + + +Version 1.3.8 -- 2003/03/25 +---------------------------- + - Added: Admin password change. No longer needed to delete and re-enter + the admin user for a specific domain. + + +Version 1.3.7 -- 2002/12/24 +---------------------------- + - Initial public release of Postfix Admin. Deleted: branches/postfixadmin-2.2.1.1/create-mailbox.php =================================================================== --- branches/postfixadmin-2.2.1/create-mailbox.php 2008-07-22 23:35:20 UTC (rev 411) +++ branches/postfixadmin-2.2.1.1/create-mailbox.php 2008-07-23 11:41:45 UTC (rev 414) @@ -1,340 +0,0 @@ -<?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: create-mailbox.php - * Responsible for allowing for the creation of mail boxes - * - * @version $Id$ - * @license GNU GPL v2 or later. - * - * Template Variables: - * - * tMessage - * tUsername - * tName - * tQuota - * tDomain - * - * Form POST \ GET Variables: - * - * fUsername - * fPassword - * fPassword2 - * fName - * fQuota - * fDomain - * fActive - * fMail - */ - -require_once('common.php'); - -authentication_require_role('admin'); -$SESSID_USERNAME = authentication_get_username(); -if(authentication_has_role('global-admin')) { - $list_domains = list_domains (); -} -else { - $list_domains = list_domains_for_admin($SESSID_USERNAME); -} - - -$pCreate_mailbox_password_text = $PALANG['pCreate_mailbox_password_text']; -$pCreate_mailbox_name_text = $PALANG['pCreate_mailbox_name_text']; -$pCreate_mailbox_quota_text = $PALANG['pCreate_mailbox_quota_text']; - -if ($_SERVER['REQUEST_METHOD'] == "GET") -{ - $fDomain = $list_domains[0]; - if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']); - - if(!in_array($fDomain, $list_domains)) { - die("Invalid domain name selected, or you tried to select a domain you are not an admin for"); - } - $tDomain = $fDomain; - $result = db_query ("SELECT * FROM $table_domain WHERE domain='$fDomain'"); - if ($result['rows'] == 1) - { - $row = db_array ($result['result']); - $tQuota = $row['maxquota']; - } -} - -if ($_SERVER['REQUEST_METHOD'] == "POST") -{ - - if (isset ($_POST['fUsername']) && isset ($_POST['fDomain'])) $fUsername = escape_string ($_POST['fUsername']) . "@" . escape_string ($_POST['fDomain']); - $fUsername = strtolower ($fUsername); - if (isset ($_POST['fPassword'])) $fPassword = escape_string ($_POST['fPassword']); - if (isset ($_POST['fPassword2'])) $fPassword2 = escape_string ($_POST['fPassword2']); - isset ($_POST['fName']) ? $fName = escape_string ($_POST['fName']) : $fName = ""; - if (isset ($_POST['fDomain'])) $fDomain = escape_string ($_POST['fDomain']); - isset ($_POST['fQuota']) ? $fQuota = intval($_POST['fQuota']) : $fQuota = 0; - isset ($_POST['fActive']) ? $fActive = escape_string ($_POST['fActive']) : $fActive = "1"; - if (isset ($_POST['fMail'])) $fMail = escape_string ($_POST['fMail']); - - - if ( (!check_owner ($SESSID_USERNAME, $fDomain)) && (!authentication_has_role('global-admin')) ) - { - $error = 1; - $tUsername = escape_string ($_POST['fUsername']); - $tName = $fName; - $tQuota = $fQuota; - $tDomain = $fDomain; - $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error1']; - } - - if (!check_mailbox ($fDomain)) - { - $error = 1; - $tUsername = escape_string ($_POST['fUsername']); - $tName = $fName; - $tQuota = $fQuota; - $tDomain = $fDomain; - $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error3']; - } - - if (empty ($fUsername) or !check_email ($fUsername)) - { - $error = 1; - $tUsername = escape_string ($_POST['fUsername']); - $tName = $fName; - $tQuota = $fQuota; - $tDomain = $fDomain; - $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error1']; - } - - 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; - $tUsername = escape_string ($_POST['fUsername']); - $tName = $fName; - $tQuota = $fQuota; - $tDomain = $fDomain; - $pCreate_mailbox_password_text = $PALANG['pCreate_mailbox_password_text_error']; - } - } - - if ($CONF['quota'] == "YES") - { - if (!check_quota ($fQuota, $fDomain)) - { - $error = 1; - $tUsername = escape_string ($_POST['fUsername']); - $tName = $fName; - $tQuota = $fQuota; - $tDomain = $fDomain; - $pCreate_mailbox_quota_text = $PALANG['pCreate_mailbox_quota_text_error']; - } - } - - $result = db_query ("SELECT * FROM $table_alias WHERE address='$fUsername'"); - if ($result['rows'] == 1) - { - $error = 1; - $tUsername = escape_string ($_POST['fUsername']); - $tName = $fName; - $tQuota = $fQuota; - $tDomain = $fDomain; - $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error2']; - } - - if ($error != 1) - { - $password = pacrypt ($fPassword); - - if ($CONF['domain_path'] == "YES") - { - if ($CONF['domain_in_mailbox'] == "YES") - { - $maildir = $fDomain . "/" . $fUsername . "/"; - } - else - { - $maildir = $fDomain . "/" . escape_string (strtolower($_POST['fUsername'])) . "/"; - } - } - else - { - $maildir = $fUsername . "/"; - } - - if (!empty ($fQuota)) - { - $quota = multiply_quota ($fQuota); - } - else - { - $quota = 0; - } - - if ($fActive == "on") - { - $sqlActive = db_get_boolean(True); - } - else - { - $sqlActive = db_get_boolean(False); - } - if ('pgsql'==$CONF['database_type']) - { - db_query('BEGIN'); - } - - $result = db_query ("INSERT INTO $table_alias (address,goto,domain,created,modified,active) VALUES ('$fUsername','$fUsername','$fDomain',NOW(),NOW(),'$sqlActive')"); - if ($result['rows'] != 1) - { - $tDomain = $fDomain; - $tMessage = $PALANG['pAlias_result_error'] . "<br />($fUsername -> $fUsername)</br />"; - } - -/* -# TODO: The following code segment is from admin/create-mailbox.php. To be compared/merged with the code from /create-mailbox.php. - Lines starting with /* were inserted to keep this section in commented mode. - - - if ($result['rows'] != 1) - { - $tDomain = $fDomain; - $tMessage .= $PALANG['pCreate_mailbox_result_error'] . "<br />($fUsername)<br />"; - } - else - { - - $error=TRUE; // Being pessimistic - if (mailbox_postcreation($fUsername,$fDomain,$maildir)) - { - if ('pgsql'==$CONF['database_type']) - { - $result=db_query("COMMIT"); - -/* should really not be possible: */ -/* - if (!$result) die('COMMIT-query failed.'); - } - $error=FALSE; - } else { - $tMessage .= $PALANG['pCreate_mailbox_result_error'] . "<br />($fUsername)<br />"; - if ('pgsql'==$CONF['database_type']) - { - $result=db_query("ROLLBACK"); - -/* should really not be possible: */ -/* - if (!$result) die('ROLLBACK-query failed.'); - } else { - /* - When we cannot count on transactions, we need to move forward, despite - the problems. - */ -/* - $error=FALSE; - } - } - - - if (!$error) - { - db_log ($CONF['admin_email'], $fDomain, 'create_mailbox', $fUsername); - - */ - -/* -TODO: this is the start of /create-mailbox code segment that was originally used in /create-mailbox.php instead - of the above from admin/create-mailbox.php. - To be compared / merged. - */ - - $result = db_query ("INSERT INTO $table_mailbox (username,password,name,maildir,quota,domain,created,modified,active) VALUES ('$fUsername','$password','$fName','$maildir','$quota','$fDomain',NOW(),NOW(),'$sqlActive')"); - if ($result['rows'] != 1 || !mailbox_postcreation($fUsername,$fDomain,$maildir, $quota)) - { - $tDomain = $fDomain; - $tMessage .= $PALANG['pCreate_mailbox_result_error'] . "<br />($fUsername)<br />"; - db_query('ROLLBACK'); - } - else - { - db_query('COMMIT'); - db_log ($SESSID_USERNAME, $fDomain, 'create_mailbox', "$fUsername"); -/* -TODO: this is the end of /create-mailbox.php code segment - */ - $tDomain = $fDomain; - - if ($CONF['generate_password'] == "YES") - { - $tMessage .= " / $fPassword)</br />"; - } - else - { - if ($CONF['show_password'] == "YES") - { - $tMessage .= " / $fPassword)</br />"; - } - else - { - $tMessage .= ")</br />"; - } - } - - $tQuota = $CONF['maxquota']; - - if ($fMail == "on") - { - $fTo = $fUsername; - $fFrom = $SESSID_USERNAME; - $fHeaders = "To: " . $fTo . "\n"; - $fHeaders .= "From: " . $fFrom . "\n"; - - $fHeaders .= "Subject: " . encode_header ($PALANG['pSendmail_subject_text']) . "\n"; - $fHeaders .= "MIME-Version: 1.0\n"; - $fHeaders .= "Content-Type: text/plain; charset=utf-8\n"; - $fHeaders .= "Content-Transfer-Encoding: 8bit\n"; - - $fHeaders .= $CONF['welcome_text']; - - if (!smtp_mail ($fTo, $fFrom, $fHeaders)) - { - $tMessage .= "<br />" . $PALANG['pSendmail_result_error'] . "<br />"; - } - else - { - $tMessage .= "<br />" . $PALANG['pSendmail_result_success'] . "<br />"; - } - } - - if (create_mailbox_subfolders($fUsername,$fPassword)) - { - $tMessage = $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername"; - } else { - $tMessage = $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername"; - } - - } - } -} - -include ("templates/header.php"); -include ("templates/menu.php"); -include ("templates/create-mailbox.php"); -include ("templates/footer.php"); - -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ -?> Copied: branches/postfixadmin-2.2.1.1/create-mailbox.php (from rev 412, branches/postfixadmin-2.2.1/create-mailbox.php) =================================================================== --- branches/postfixadmin-2.2.1.1/create-mailbox.php (rev 0) +++ branches/postfixadmin-2.2.1.1/create-mailbox.php 2008-07-23 11:41:45 UTC (rev 414) @@ -0,0 +1,337 @@ +<?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 + * + * File: create-mailbox.php + * Responsible for allowing for the creation of mail boxes + * + * @version $Id$ + * @license GNU GPL v2 or later. + * + * Template Variables: + * + * tMessage + * tUsername + * tName + * tQuota + * tDomain + * + * Form POST \ GET Variables: + * + * fUsername + * fPassword + * fPassword2 + * fName + * fQuota + * fDomain + * fActive + * fMail + */ + +require_once('common.php'); + +authentication_require_role('admin'); +$SESSID_USERNAME = authentication_get_username(); +if(authentication_has_role('global-admin')) { + $list_domains = list_domains (); +} +else { + $list_domains = list_domains_for_admin($SESSID_USERNAME); +} + + +$pCreate_mailbox_password_text = $PALANG['pCreate_mailbox_password_text']; +$pCreate_mailbox_name_text = $PALANG['pCreate_mailbox_name_text']; +$pCreate_mailbox_quota_text = $PALANG['pCreate_mailbox_quota_text']; + +if ($_SERVER['REQUEST_METHOD'] == "GET") +{ + $fDomain = $list_domains[0]; + if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']); + + if(!in_array($fDomain, $list_domains)) { + die("Invalid domain name selected, or you tried to select a domain you are not an admin for"); + } + $tDomain = $fDomain; + $result = db_query ("SELECT * FROM $table_domain WHERE domain='$fDomain'"); + if ($result['rows'] == 1) + { + $row = db_array ($result['result']); + $tQuota = $row['maxquota']; + } +} + +if ($_SERVER['REQUEST_METHOD'] == "POST") +{ + + if (isset ($_POST['fUsername']) && isset ($_POST['fDomain'])) $fUsername = escape_string ($_POST['fUsername']) . "@" . escape_string ($_POST['fDomain']); + $fUsername = strtolower ($fUsername); + if (isset ($_POST['fPassword'])) $fPassword = escape_string ($_POST['fPassword']); + if (isset ($_POST['fPassword2'])) $fPassword2 = escape_string ($_POST['fPassword2']); + isset ($_POST['fName']) ? $fName = escape_string ($_POST['fName']) : $fName = ""; + if (isset ($_POST['fDomain'])) $fDomain = escape_string ($_POST['fDomain']); + isset ($_POST['fQuota']) ? $fQuota = intval($_POST['fQuota']) : $fQuota = 0; + isset ($_POST['fActive']) ? $fActive = escape_string ($_POST['fActive']) : $fActive = "1"; + if (isset ($_POST['fMail'])) $fMail = escape_string ($_POST['fMail']); + + + if ( (!check_owner ($SESSID_USERNAME, $fDomain)) && (!authentication_has_role('global-admin')) ) + { + $error = 1; + $tUsername = escape_string ($_POST['fUsername']); + $tName = $fName; + $tQuota = $fQuota; + $tDomain = $fDomain; + $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error1']; + } + + if (!check_mailbox ($fDomain)) + { + $error = 1; + $tUsername = escape_string ($_POST['fUsername']); + $tName = $fName; + $tQuota = $fQuota; + $tDomain = $fDomain; + $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error3']; + } + + if (empty ($fUsername) or !check_email ($fUsername)) + { + $error = 1; + $tUsername = escape_string ($_POST['fUsername']); + $tName = $fName; + $tQuota = $fQuota; + $tDomain = $fDomain; + $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error1']; + } + + 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; + $tUsername = escape_string ($_POST['fUsername']); + $tName = $fName; + $tQuota = $fQuota; + $tDomain = $fDomain; + $pCreate_mailbox_password_text = $PALANG['pCreate_mailbox_password_text_error']; + } + } + + if ($CONF['quota'] == "YES") + { + if (!check_quota ($fQuota, $fDomain)) + { + $error = 1; + $tUsername = escape_string ($_POST['fUsername']); + $tName = $fName; + $tQuota = $fQuota; + $tDomain = $fDomain; + $pCreate_mailbox_quota_text = $PALANG['pCreate_mailbox_quota_text_error']; + } + } + + $result = db_query ("SELECT * FROM $table_alias WHERE address='$fUsername'"); + if ($result['rows'] == 1) + { + $error = 1; + $tUsername = escape_string ($_POST['fUsername']); + $tName = $fName; + $tQuota = $fQuota; + $tDomain = $fDomain; + $pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error2']; + } + + if ($error != 1) + { + $password = pacrypt ($fPassword); + + if ($CONF['domain_path'] == "YES") + { + if ($CONF['domain_in_mailbox'] == "YES") + { + $maildir = $fDomain . "/" . $fUsername . "/"; + } + else + { + $maildir = $fDomain . "/" . escape_string (strtolower($_POST['fUsername'])) . "/"; + } + } + else + { + $maildir = $fUsername . "/"; + } + + if (!empty ($fQuota)) + { + $quota = multiply_quota ($fQuota); + } + else + { + $quota = 0; + } + + if ($fActive == "on") + { + $sqlActive = db_get_boolean(True); + } + else + { + $sqlActive = db_get_boolean(False); + } + if ('pgsql'==$CONF['database_type']) + { + db_query('BEGIN'); + } + + $result = db_query ("INSERT INTO $table_alias (address,goto,domain,created,modified,active) VALUES ('$fUsername','$fUsername','$fDomain',NOW(),NOW(),'$sqlActive')"); + if ($result['rows'] != 1) + { + $tDomain = $fDomain; + $tMessage = $PALANG['pAlias_result_error'] . "<br />($fUsername -> $fUsername)</br />"; + } + +/* +# TODO: The following code segment is from admin/create-mailbox.php. To be compared/merged with the code from /create-mailbox.php. + Lines starting with /* were inserted to keep this section in commented mode. + + + if ($result['rows'] != 1) + { + $tDomain = $fDomain; + $tMessage .= $PALANG['pCreate_mailbox_result_error'] . "<br />($fUsername)<br />"; + } + else + { + + $error=TRUE; // Being pessimistic + if (mailbox_postcreation($fUsername,$fDomain,$maildir)) + { + if ('pgsql'==$CONF['database_type']) + { + $result=db_query("COMMIT"); + +/* should really not be possible: */ +/* + if (!$result) die('COMMIT-query failed.'); + } + $error=FALSE; + } else { + $tMessage .= $PALANG['pCreate_mailbox_result_error'] . "<br />($fUsername)<br />"; + if ('pgsql'==$CONF['database_type']) + { + $result=db_query("ROLLBACK"); + +/* should really not be possible: */ +/* + if (!$result) die('ROLLBACK-query failed.'); + } else { + /* + When we cannot count on transactions, we need to move forward, despite + the problems. + */ +/* + $error=FALSE; + } + } + + + if (!$error) + { + db_log ($CONF['admin_email'], $fDomain, 'create_mailbox', $fUsername); + + */ + +/* +TODO: this is the start of /create-mailbox code segment that was originally used in /create-mailbox.php instead + of the above from admin/create-mailbox.php. + To be compared / merged. + */ + + $result = db_query ("INSERT INTO $table_mailbox (username,password,name,maildir,quota,domain,created,modified,active) VALUES ('$fUsername','$password','$fName','$maildir','$quota','$fDomain',NOW(),NOW(),'$sqlActive')"); + if ($result['rows'] != 1 || !mailbox_postcreation($fUsername,$fDomain,$maildir, $quota)) + { + $tDomain = $fDomain; + $tMessage .= $PALANG['pCreate_mailbox_result_error'] . "<br />($fUsername)<br />"; + db_query('ROLLBACK'); + } + else + { + db_query('COMMIT'); + db_log ($SESSID_USERNAME, $fDomain, 'create_mailbox', "$fUsername"); +/* +TODO: this is the end of /create-mailbox.php code segment + */ + $tDomain = $fDomain; + + if ($CONF['generate_password'] == "YES") + { + $tMessage .= " / $fPassword)</br />"; + } + else + { + if ($CONF['show_password'] == "YES") + { + $tMessage .= " / $fPassword)</br />"; + } + else + { + $tMessage .= ")</br />"; + } + } + + $tQuota = $CONF['maxquota']; + + if ($fMail == "on") + { + $fTo = $fUsername; + $fFrom = $SESSID_USERNAME; + $fHeaders = "To: " . $fTo . "\n"; + $fHeaders .= "From: " . $fFrom . "\n"; + + $fHeaders .= "Subject: " . encode_header ($PALANG['pSendmail_subject_text']) . "\n"; + $fHeaders .= "MIME-Version: 1.0\n"; + $fHeaders .= "Content-Type: text/plain; charset=utf-8\n"; + $fHeaders .= "Content-Transfer-Encoding: 8bit\n"; + + $fHeaders .= $CONF['welcome_text']; + + if (!smtp_mail ($fTo, $fFrom, $fHeaders)) + { + $tMessage .= "<br />" . $PALANG['pSendmail_result_error'] . "<br />"; + } + else + { + $tMessage .= "<br />" . $PALANG['pSendmail_result_success'] . "<br />"; + } + } + + if (create_mailbox_subfolders($fUsername,$fPassword)) + { + $tMessage = $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername"; + } else { + $tMessage = $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername"; + } + + } + } +} + +include ("templates/header.php"); +include ("templates/menu.php"); +include ("templates/create-mailbox.php"); +include ("templates/footer.php"); + +/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +?> Deleted: branches/postfixadmin-2.2.1.1/debian/changelog =================================================================== --- branches/postfixadmin-2.2.1/debian/changelog 2008-07-22 23:35:20 UTC (rev 411) +++ branches/postfixadmin-2.2.1.1/debian/changelog 2008-07-23 11:41:45 UTC (rev 414) @@ -1,57 +0,0 @@ -postfixadmin (2.2.1) unstable; urgency=low - - * Various bug fixes (MySQL charset issue(s)) - * Updated translations (pl, bg, ru, nb, tw etc) - * Subversion revision 408 - - -- David Goodwin <dav...@pa...> Mon, 21 Jul 2008 22:44:00 +0000 -postfixadmin (2.2.0) unstable; urgency=low - - * 2.2.0 Released. - * Fix fetchmail script to work with PostgreSQL - * Fix fetchmail table creation in MySQL and PostgreSQL - * Documentation fixups - * Subversion revision 356 - - -- David Goodwin <dav...@pa...> Thu, 29 Apr 2008 15:47:00 +0000 - -postfixadmin (2.2.0-rc5) unstable; urgency=low - - * Fix MySQL installation issues (schema not being created!) - * Fix MySQL vacation_notification timestamp issue - * SVN revision: 340 - - -- David Goodwin <dav...@pa...> Wed, 23 Apr 2008 16:27:00 +0000 - -postfixadmin (2.2.0-1rc4) unstable; urgency=low - - * Removal of standalone database schema files (see upgrade.php) - * Various bug fixes - * Better/Move documentation on installation - * setup.php/upgrade.php works for PostgreSQL and MySQL - * MySQL Unicode problems fixed - * I think this is effectively v2.2.0 - * SVN revision: 336 - - -- David Goodwin <dav...@pa...> Sun, 20 Apr 2008 20:19:00 +0000 - -postfixadmin (2.2.0-1rc3) unstable; urgency=low - - * Various bug fixes - - -- David Goodwin <dav...@pa...> Thu, 28 Feb 2008 12:00:00 +0000 - -postfixadmin (2.2.0-1rc2) unstable; urgency=low - - * Improved CSS - * Improved upgrade procedure (should work for PGSQL) (see upgrade.php) - * Various bug fixes - - -- David Goodwin <dav...@pa...> Sat, 29 Dec 2007 21:14:00 +0000 - -postfixadmin (2.2.0-1rc1) unstable; urgency=low - - * Initial Release (via dpkg) - - -- David Goodwin <dav...@pa...> Sun, 04 Nov 2007 15:36:00 +0000 - Copied: branches/postfixadmin-2.2.1.1/debian/changelog (from rev 413, branches/postfixadmin-2.2.1/debian/changelog) =================================================================== --- branches/postfixadmin-2.2.1.1/debian/changelog (rev 0) +++ branches/postfixadmin-2.2.1.1/debian/changelog 2008-07-23 11:41:45 UTC (rev 414) @@ -0,0 +1,75 @@ +postfixadmin (2.2.1.1) unstable; urgency=low + + * Various bug fixes (MySQL charset issue(s)) + * Updated translations (pl, bg, ru, nb, tw etc) + * added quota parameter to mailbox_postcreation hook + * new hook to update the quota after editing a mailbox + ($CONF['mailbox_postedi +t_script']) + * fixed subfolder creation order and timing + * allow smtp server to be specified in vacation.pl + * fixed MySQL charset issues + * several small bugfixes + * Norwegian (bokmal) translation added + * Subversion revision 412 (from branches/postfixadmin-2.2.1) + * THIS IS EFFECTIVELY THE SAME AS 2.2.1 (which should probably be ignored) + + -- David Goodwin <dav...@pa...> Wed, 23 Jul 2008 12:37:00 +0000 + +postfixadmin (2.2.1) unstable; urgency=low + + * Various bug fixes (MySQL charset issue(s)) + * Updated translations (pl, bg, ru, nb, tw etc) + * Subversion revision 408 + + -- David Goodwin <dav...@pa...> Mon, 21 Jul 2008 22:44:00 +0000 +postfixadmin (2.2.0) unstable; urgency=low + + * 2.2.0 Released. + * Fix fetchmail script to work with PostgreSQL + * Fix fetchmail table creation in MySQL and PostgreSQL + * Documentation fixups + * Subversion revision 356 + + -- David Goodwin <dav...@pa...> Thu, 29 Apr 2008 15:47:00 +0000 + +postfixadmin (2.2.0-rc5) unstable; urgency=low + + * Fix MySQL installation issues (schema not being created!) + * Fix MySQL vacation_notification timestamp issue + * SVN revision: 340 + + -- David Goodwin <dav...@pa...> Wed, 23 Apr 2008 16:27:00 +0000 + +postfixadmin (2.2.0-1rc4) unstable; urgency=low + + * Removal of standalone database schema files (see upgrade.php) + * Various bug fixes + * Better/Move documentation on installation + * setup.php/upgrade.php works for PostgreSQL and MySQL + * MySQL Unicode problems fixed + * I think this is effectively v2.2.0 + * SVN revision: 336 + + -- David Goodwin <dav...@pa...> Sun, 20 Apr 2008 20:19:00 +0000 + +postfixadmin (2.2.0-1rc3) unstable; urgency=low + + * Various bug fixes + + -- David Goodwin <dav...@pa...> Thu, 28 Feb 2008 12:00:00 +0000 + +postfixadmin (2.2.0-1rc2) unstable; urgency=low + + * Improved CSS + * Improved upgrade procedure (should work for PGSQL) (see upgrade.php) + * Various bug fixes + + -- David Goodwin <dav...@pa...> Sat, 29 Dec 2007 21:14:00 +0000 + +postfixadmin (2.2.0-1rc1) unstable; urgency=low + + * Initial Release (via dpkg) + + -- David Goodwin <dav...@pa...> Sun, 04 Nov 2007 15:36:00 +0000 + Deleted: branches/postfixadmin-2.2.1.1/functions.inc.php =================================================================== --- branches/postfixadmin-2.2.1/functions.inc.php 2008-07-22 23:35:20 UTC (rev 411) +++ branches/postfixadmin-2.2.1.1/functions.inc.php 2008-07-23 11:41:45 UTC (rev 414) @@ -1,2157 +0,0 @@ -<?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: functions.inc.php - * Contains re-usable code. - */ - -if (ereg ("functions.inc.php", $_SERVER['PHP_SELF'])) -{ - header ("Location: login.php"); - exit; -} - -$version = '2.2.0'; - -/** - * check_session - * Action: Check if a session already exists, if not redirect to login.php - * Call: check_session () - * @return String username (e.g. fo...@ex...) - */ -function authentication_get_username() -{ - global $CONF; - if (!isset($_SESSION['sessid'])) { - header ("Location: " . $CONF['postfix_admin_url'] . "/login.php"); - exit(0); - } - $SESSID_USERNAME = $_SESSION['sessid']['username']; - return $SESSID_USERNAME; -} - -/** - * Returns the type of user - either 'user' or 'admin' - * Returns false if neither (E.g. if not logged in) - * @return String admin or user or (boolean) false. - */ -function authentication_get_usertype() { - if(isset($_SESSION['sessid'])) { - if(isset($_SESSION['sessid']['type'])) { - return $_SESSION['sessid']['type']; - } - } - return false; -} -/** - * - * Used to determine whether a user has a particular role. - * @param String role-name. (E.g. admin, global-admin or user) - * @return boolean True if they have the requested role in their session. - * Note, user < admin < global-admin - */ -function authentication_has_role($role) { - global $CONF; - if(isset($_SESSION['sessid'])) { - if(isset($_SESSION['sessid']['roles'])) { - if(in_array($role, $_SESSION['sessid']['roles'])) { - return true; - } - } - } - return false; -} - -/** - * Used to enforce that $user has a particular role when - * viewing a page. - * If they are lacking a role, redirect them to - * $CONF['postfix_admin_url']/login.php - * - * Note, user < admin < global-admin - */ -function authentication_require_role($role) { - global $CONF; - // redirect to appropriate page? - if(authentication_has_role($role)) { - return True; - } - header("Location: " . $CONF['postfix_admin_url'] . "/login.php"); - exit(0); -} -/** - * @return boolean TRUE if a admin, FALSE otherwise. - */ -function authentication_is_admin() { - return authentication_get_usertype() == 'admin'; -} - -/** - * @return boolean TRUE if a user, FALSE otherwise. - */ -function authentication_is_user() { - return authentication_get_usertype() == 'user'; -} - - -/** - * Add an error message for display on the next page that is rendered. - * @param String message to show. - * - * Stores string in session. Flushed through header template. - * @see _flash_string() - */ -function flash_error($string) { - _flash_string('error', $string); -} - -/** - * Used to display an info message on successful update. - * @param String $string - * Stores data in sessio. - * @see _flash_string() - */ -function flash_info($string) { - _flash_string('info', $string); -} -/** - * 'Private' method used for flash_info() and flash_error(). - */ -function _flash_string($type, $string) { - if(!isset($_SESSION['flash'])) { - $_SESSION['flash'] = array(); - } - if(!isset($_SESSION['flash'][$type])) { - $_SESSION['flash'][$type] = array(); - } - $_SESSION['flash'][$type][] = $string; -} - -// -// check_language -// Action: checks what language the browser uses -// Call: check_language -// Parameter: $use_post - set to 0 if $_POST should NOT be read -// -function check_language ($use_post = 1) -{ - global $CONF; - global $supported_languages; # from languages/languages.php - - $lang = $CONF['default_language']; - - if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) - { - $lang_array = preg_split ('/(\s*,\s*)/', $_SERVER['HTTP_ACCEPT_LANGUAGE']); - if (safecookie('lang')) { - array_unshift($lang_array, safecookie('lang')); # prefer language from cookie - } - if ( $use_post && safepost('lang')) { - array_unshift($lang_array, safepost('lang')); # but prefer $_POST['lang'] even more - } - - for($i = 0; $i < count($lang_array); $i++) - { - $lang_next = $lang_array[$i]; - $lang_next = strtolower(trim($lang_next)); - if(array_key_exists($lang_next, $supported_languages)) - { - $lang = $lang_next; - break; - } - } - } - return $lang; -} - -// -// language_selector -// Action: returns a language selector dropdown with the browser (or cookie) language preselected -// Call: language_selector() -// -function language_selector() -{ - global $supported_languages; # from languages/languages.php - - $current_lang = check_language(); - - $selector = '<select name="lang" xml:lang="en" dir="ltr">'; - - foreach($supported_languages as $lang => $lang_name) { - if ($lang == $current_lang) { - $selected = ' selected="selected"'; - } else { - $selected = ''; - } - $selector .= "<option value='$lang'$selected>$lang_name</option>"; - } - $selector .= "</select>"; - return $selector; -} - -// -// check_string -// Action: chec... [truncated message content] |
From: <Gin...@us...> - 2008-07-23 11:40:27
|
Revision: 413 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=413&view=rev Author: GingerDog Date: 2008-07-23 11:40:36 +0000 (Wed, 23 Jul 2008) Log Message: ----------- update version number - probably need to be 2.2.1.1 now :/ Modified Paths: -------------- branches/postfixadmin-2.2.1/debian/changelog branches/postfixadmin-2.2.1/functions.inc.php Modified: branches/postfixadmin-2.2.1/debian/changelog =================================================================== --- branches/postfixadmin-2.2.1/debian/changelog 2008-07-23 11:35:14 UTC (rev 412) +++ branches/postfixadmin-2.2.1/debian/changelog 2008-07-23 11:40:36 UTC (rev 413) @@ -1,3 +1,21 @@ +postfixadmin (2.2.1.1) unstable; urgency=low + + * Various bug fixes (MySQL charset issue(s)) + * Updated translations (pl, bg, ru, nb, tw etc) + * added quota parameter to mailbox_postcreation hook + * new hook to update the quota after editing a mailbox + ($CONF['mailbox_postedi +t_script']) + * fixed subfolder creation order and timing + * allow smtp server to be specified in vacation.pl + * fixed MySQL charset issues + * several small bugfixes + * Norwegian (bokmal) translation added + * Subversion revision 412 (from branches/postfixadmin-2.2.1) + * THIS IS EFFECTIVELY THE SAME AS 2.2.1 (which should probably be ignored) + + -- David Goodwin <dav...@pa...> Wed, 23 Jul 2008 12:37:00 +0000 + postfixadmin (2.2.1) unstable; urgency=low * Various bug fixes (MySQL charset issue(s)) Modified: branches/postfixadmin-2.2.1/functions.inc.php =================================================================== --- branches/postfixadmin-2.2.1/functions.inc.php 2008-07-23 11:35:14 UTC (rev 412) +++ branches/postfixadmin-2.2.1/functions.inc.php 2008-07-23 11:40:36 UTC (rev 413) @@ -22,7 +22,7 @@ exit; } -$version = '2.2.1'; +$version = '2.2.1.1'; /** * check_session This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2008-07-23 11:35:07
|
Revision: 412 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=412&view=rev Author: GingerDog Date: 2008-07-23 11:35:14 +0000 (Wed, 23 Jul 2008) Log Message: ----------- the missing stuff - bump up version in functions.inc.php; fix changelog.txt Modified Paths: -------------- branches/postfixadmin-2.2.1/CHANGELOG.TXT branches/postfixadmin-2.2.1/create-mailbox.php branches/postfixadmin-2.2.1/functions.inc.php Modified: branches/postfixadmin-2.2.1/CHANGELOG.TXT =================================================================== --- branches/postfixadmin-2.2.1/CHANGELOG.TXT 2008-07-22 23:35:20 UTC (rev 411) +++ branches/postfixadmin-2.2.1/CHANGELOG.TXT 2008-07-23 11:35:14 UTC (rev 412) @@ -1,10 +1,37 @@ +# 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 # -# Postfix Admin -# by Mischa Peters <mischa at high5 dot net> -# Copyright (c) 2002 - 2005 High5! -# Licensed under GPL for more info check GPL-LICENSE.TXT -# -# +# Last update: +# $Id$ + + +Only in SVN trunk +-------------------- + + - added support for domain aliases (from lenix) + - updated postfix example configuration for domain aliases and to use the new mysql map format + + +Version 2.2.1 +-------------------- + + - added quota parameter to mailbox_postcreation hook + - new hook to update the quota after editing a mailbox ($CONF['mailbox_postedit_script']) + - fixed subfolder creation order and timing + - allow smtp server to be specified in vacation.pl + - fixed MySQL charset issues + - several small bugfixes + - Norwegian (bokmal) translation added + - several translation updates + - SVN revision 408 + + Version 2.2.0 -------------------- Modified: branches/postfixadmin-2.2.1/create-mailbox.php =================================================================== --- branches/postfixadmin-2.2.1/create-mailbox.php 2008-07-22 23:35:20 UTC (rev 411) +++ branches/postfixadmin-2.2.1/create-mailbox.php 2008-07-23 11:35:14 UTC (rev 412) @@ -9,9 +9,6 @@ * 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: create-mailbox.php * Responsible for allowing for the creation of mail boxes * Modified: branches/postfixadmin-2.2.1/functions.inc.php =================================================================== --- branches/postfixadmin-2.2.1/functions.inc.php 2008-07-22 23:35:20 UTC (rev 411) +++ branches/postfixadmin-2.2.1/functions.inc.php 2008-07-23 11:35:14 UTC (rev 412) @@ -22,7 +22,7 @@ exit; } -$version = '2.2.0'; +$version = '2.2.1'; /** * check_session This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-07-22 23:35:11
|
Revision: 411 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=411&view=rev Author: christian_boltz Date: 2008-07-22 23:35:20 +0000 (Tue, 22 Jul 2008) Log Message: ----------- CHANGELOG.TXT - added changes since 2.2.0 release (2.2.1 and SVN trunk only) - updated copyright header debian/changelog - backported update from 2.2.1 branch to trunk Modified Paths: -------------- trunk/CHANGELOG.TXT trunk/debian/changelog Modified: trunk/CHANGELOG.TXT =================================================================== --- trunk/CHANGELOG.TXT 2008-07-22 21:57:51 UTC (rev 410) +++ trunk/CHANGELOG.TXT 2008-07-22 23:35:20 UTC (rev 411) @@ -1,10 +1,37 @@ +# 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 # -# Postfix Admin -# by Mischa Peters <mischa at high5 dot net> -# Copyright (c) 2002 - 2005 High5! -# Licensed under GPL for more info check GPL-LICENSE.TXT -# -# +# Last update: +# $Id$ + + +Only in SVN trunk +-------------------- + + - added support for domain aliases (from lenix) + - updated postfix example configuration for domain aliases and to use the new mysql map format + + +Version 2.2.1 +-------------------- + + - added quota parameter to mailbox_postcreation hook + - new hook to update the quota after editing a mailbox ($CONF['mailbox_postedit_script']) + - fixed subfolder creation order and timing + - allow smtp server to be specified in vacation.pl + - fixed MySQL charset issues + - several small bugfixes + - Norwegian (bokmal) translation added + - several translation updates + - SVN revision 408 + + Version 2.2.0 -------------------- Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2008-07-22 21:57:51 UTC (rev 410) +++ trunk/debian/changelog 2008-07-22 23:35:20 UTC (rev 411) @@ -1,3 +1,10 @@ +postfixadmin (2.2.1) unstable; urgency=low + + * Various bug fixes (MySQL charset issue(s)) + * Updated translations (pl, bg, ru, nb, tw etc) + * Subversion revision 408 + + -- David Goodwin <dav...@pa...> Mon, 21 Jul 2008 22:44:00 +0000 postfixadmin (2.2.0) unstable; urgency=low * 2.2.0 Released. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-07-22 21:57:42
|
Revision: 410 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=410&view=rev Author: christian_boltz Date: 2008-07-22 21:57:51 +0000 (Tue, 22 Jul 2008) Log Message: ----------- create-mailbox.php: - removed duplicate @version and @license comment Modified Paths: -------------- trunk/create-mailbox.php Modified: trunk/create-mailbox.php =================================================================== --- trunk/create-mailbox.php 2008-07-22 20:03:53 UTC (rev 409) +++ trunk/create-mailbox.php 2008-07-22 21:57:51 UTC (rev 410) @@ -9,9 +9,6 @@ * 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: create-mailbox.php * Responsible for allowing for the creation of mail boxes * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2008-07-22 20:03:44
|
Revision: 409 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=409&view=rev Author: GingerDog Date: 2008-07-22 20:03:53 +0000 (Tue, 22 Jul 2008) Log Message: ----------- debian/changelog: new release - 2.2.1 Modified Paths: -------------- branches/postfixadmin-2.2.1/debian/changelog Modified: branches/postfixadmin-2.2.1/debian/changelog =================================================================== --- branches/postfixadmin-2.2.1/debian/changelog 2008-07-21 21:43:06 UTC (rev 408) +++ branches/postfixadmin-2.2.1/debian/changelog 2008-07-22 20:03:53 UTC (rev 409) @@ -1,3 +1,10 @@ +postfixadmin (2.2.1) unstable; urgency=low + + * Various bug fixes (MySQL charset issue(s)) + * Updated translations (pl, bg, ru, nb, tw etc) + * Subversion revision 408 + + -- David Goodwin <dav...@pa...> Mon, 21 Jul 2008 22:44:00 +0000 postfixadmin (2.2.0) unstable; urgency=low * 2.2.0 Released. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2008-07-21 21:42:58
|
Revision: 408 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=408&view=rev Author: GingerDog Date: 2008-07-21 21:43:06 +0000 (Mon, 21 Jul 2008) Log Message: ----------- svn merge -r401:407 ../../trunk; skipped stuff for list-virtual.php which involved the alias domains stuff Modified Paths: -------------- branches/postfixadmin-2.2.1/backup.php branches/postfixadmin-2.2.1/config.inc.php branches/postfixadmin-2.2.1/functions.inc.php branches/postfixadmin-2.2.1/languages/bg.lang branches/postfixadmin-2.2.1/languages/pl.lang Modified: branches/postfixadmin-2.2.1/backup.php =================================================================== --- branches/postfixadmin-2.2.1/backup.php 2008-07-18 23:21:59 UTC (rev 407) +++ branches/postfixadmin-2.2.1/backup.php 2008-07-21 21:43:06 UTC (rev 408) @@ -88,7 +88,7 @@ for ($i = 0 ; $i < sizeof ($tables) ; ++$i) { - $result = db_query ("SHOW CREATE TABLE ".table_by_pos($i)); + $result = db_query ("SHOW CREATE TABLE " . table_by_key($tables[$i])); if ($result['rows'] > 0) { while ($row = db_array ($result['result'])) @@ -100,7 +100,7 @@ for ($i = 0 ; $i < sizeof ($tables) ; ++$i) { - $result = db_query ("SELECT * FROM ".table_by_pos($i)); + $result = db_query ("SELECT * FROM " . table_by_key($tables[$i])); if ($result['rows'] > 0) { while ($row = db_assoc ($result['result'])) @@ -118,7 +118,7 @@ } } } - header ("Content-Type: application/octet-stream"); + header ("Content-Type: text/plain"); header ("Content-Disposition: attachment; filename=\"$filename\""); header ("Content-Transfer-Encoding: binary"); header ("Content-Length: " . filesize("$backup")); Modified: branches/postfixadmin-2.2.1/config.inc.php =================================================================== --- branches/postfixadmin-2.2.1/config.inc.php 2008-07-18 23:21:59 UTC (rev 407) +++ branches/postfixadmin-2.2.1/config.inc.php 2008-07-21 21:43:06 UTC (rev 408) @@ -63,6 +63,7 @@ 'config' => 'config', 'domain' => 'domain', 'domain_admins' => 'domain_admins', + 'fetchmail' => 'fetchmail', 'log' => 'log', 'mailbox' => 'mailbox', 'vacation' => 'vacation', Modified: branches/postfixadmin-2.2.1/functions.inc.php =================================================================== --- branches/postfixadmin-2.2.1/functions.inc.php 2008-07-18 23:21:59 UTC (rev 407) +++ branches/postfixadmin-2.2.1/functions.inc.php 2008-07-21 21:43:06 UTC (rev 408) @@ -1687,24 +1687,6 @@ -// -// table_by_pos -// Action: Return table name for given position -// Call: table_by_pos (int pos) -// -function table_by_pos ($pos) -{ - global $CONF; - $x=0; - foreach($CONF['database_tables'] as $i=>$v) - { - if($pos==$x++) return table_by_key ($i); - } - return false; -} - - - /* Called after a mailbox has been created in the DBMS. Returns: boolean. Modified: branches/postfixadmin-2.2.1/languages/bg.lang =================================================================== --- branches/postfixadmin-2.2.1/languages/bg.lang 2008-07-18 23:21:59 UTC (rev 407) +++ branches/postfixadmin-2.2.1/languages/bg.lang 2008-07-21 21:43:06 UTC (rev 408) @@ -3,92 +3,93 @@ // // Language file Bulgarian // by Plamen Tonev +// udated by Georgi Naplatanov (goshoo @SF) // -$PALANG['YES'] = 'Äà'; -$PALANG['NO'] = 'Íå'; -$PALANG['edit'] = 'ðåäàêòèðàíå'; -$PALANG['del'] = 'èçòðèâàíå'; -$PALANG['exit'] = 'Exit'; # XXX -$PALANG['cancel'] = 'Cancel'; # XXX -$PALANG['save'] = 'Save'; # XXX -$PALANG['confirm'] = 'Ñèãóðíè ëè ñòå, ÷å æåëàåòå äà èçòðèåòî òîâà?\n'; -$PALANG['confirm_domain'] = 'Íàèñòèíà ëè èñêàòå äà èçòðèåòå âñè÷êè çàïèñè çà òîçè äîìåéí? Òîâà äåéñòâèå å íåîáðàòèìî!\n'; +$PALANG['YES'] = 'Да'; +$PALANG['NO'] = 'Не'; +$PALANG['edit'] = 'редактиране'; +$PALANG['del'] = 'изтриване'; +$PALANG['exit'] = 'Изход'; +$PALANG['cancel'] = 'Отказ'; +$PALANG['save'] = 'Запази'; +$PALANG['confirm'] = 'Сигурни ли сте, че желаете да изтрието това?\n'; +$PALANG['confirm_domain'] = 'Наистина ли искате да изтриете всички записи за този домейн? Това действие е необратимо!\n'; $PALANG['check_update'] = 'Check for update'; -$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX -$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX +$PALANG['invalid_parameter'] = 'Невалиден параметър!'; # XXX +$PALANG['pFooter_logged_as'] = 'Потребител %s'; # XXX -$PALANG['pLogin_welcome'] = 'Àäìèíèñòðàòîðà ìîæå äà ñå ëîãíå îòòóê çà àäìèíèñòðèðàíå íà äîìåéí.'; -$PALANG['pLogin_username'] = 'Ëîãèí (å-ìåéë)'; -$PALANG['pLogin_password'] = 'Ïàðîëà'; -$PALANG['pLogin_button'] = 'Èçõîä'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Âàøèÿò ëîãèí íå å ïðàâèëåí. Ïðîâåðåòå äàëè ñòå ñå íàïèñàëè ïðàâèëíî âàøèÿò å-ìåéë àäðåñ!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Âàøàòà ïàðîëà íå å ïðàâèëíà!</span>'; -$PALANG['pLogin_login_users'] = 'Àêî ñòå ïîòðåáèòåë íàòèñíåòå òóê çà ëîãâàíå â ïîòðåáèòåëñêàòà ÷àñò.'; +$PALANG['pLogin_welcome'] = 'Администратора може да се логне оттук за администриране на домейн.'; +$PALANG['pLogin_username'] = 'Логин (е-мейл)'; +$PALANG['pLogin_password'] = 'Парола'; +$PALANG['pLogin_button'] = 'Изход'; +$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Вашият логин не е правилен. Проверете дали сте се написали правилно вашият е-мейл адрес!</span>'; +$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Вашата парола не е правилна!</span>'; +$PALANG['pLogin_login_users'] = 'Ако сте потребител натиснете тук за логване в потребителската част.'; $PALANG['pMenu_main'] = 'Main'; # XXX -$PALANG['pMenu_overview'] = 'Ïðåãëåä'; -$PALANG['pMenu_create_alias'] = 'Ñúçäàé íîâ Alias'; -$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX -$PALANG['pMenu_create_mailbox'] = 'Ñúçäàé íîâà ïîùåíñêà êóòèÿ'; +$PALANG['pMenu_overview'] = 'Преглед'; +$PALANG['pMenu_create_alias'] = 'Създай нов Alias'; +$PALANG['pMenu_create_alias_domain'] = 'Добави Alias Domain'; +$PALANG['pMenu_create_mailbox'] = 'Създай нова пощенска кутия'; $PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX -$PALANG['pMenu_sendmail'] = 'Èçïðàòè Email'; -$PALANG['pMenu_password'] = 'Ïàðîëà'; -$PALANG['pMenu_viewlog'] = 'Ïðåãëåä íà Log'; -$PALANG['pMenu_logout'] = 'Èçõîä'; +$PALANG['pMenu_sendmail'] = 'Изпрати Email'; +$PALANG['pMenu_password'] = 'Парола'; +$PALANG['pMenu_viewlog'] = 'Преглед на Log'; +$PALANG['pMenu_logout'] = 'Изход'; -$PALANG['pMain_welcome'] = 'Äîáðå äîøëè!'; -$PALANG['pMain_overview'] = 'Ïðåãëåä íà alias-èòå è ïîùåíñêèòå êóòèè. Îòòóê ìîæåòå äà ðåäàêòèðàòå/òðèåòå.'; -$PALANG['pMain_create_alias'] = 'Ñúçäàâàíå íà íîâ alias çà âàøèÿò äîìåéí.'; -$PALANG['pMain_create_mailbox'] = 'Ñúçäàâàíå íà íîâà ïîùåíñêà êóòèÿ çà âàøèÿ äîìåéí.'; -$PALANG['pMain_sendmail'] = 'Èçïðàòè å-ìåéë äî åäèí îò íîâîñúçäàäåíè ïîùåíñêè êóòèè.'; -$PALANG['pMain_password'] = 'Ñìÿíà íà ïàðîëàòà çà àäìèíèñòðàòîðñêèÿ àêàóíò.'; -$PALANG['pMain_viewlog'] = 'Ïðåãëåä íà log ôàéëà.'; -$PALANG['pMain_logout'] = 'Èçõîä îò ñèñòåìàòà'; +$PALANG['pMain_welcome'] = 'Добре дошли!'; +$PALANG['pMain_overview'] = 'Преглед на alias-ите и пощенските кутии. Оттук можете да редактирате/триете.'; +$PALANG['pMain_create_alias'] = 'Създаване на нов alias за вашият домейн.'; +$PALANG['pMain_create_mailbox'] = 'Създаване на нова пощенска кутия за вашия домейн.'; +$PALANG['pMain_sendmail'] = 'Изпрати е-мейл до един от новосъздадени пощенски кутии.'; +$PALANG['pMain_password'] = 'Смяна на паролата за администраторския акаунт.'; +$PALANG['pMain_viewlog'] = 'Преглед на log файла.'; +$PALANG['pMain_logout'] = 'Изход от системата'; -$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'] = 'Disabled'; # XXX +$PALANG['pOverview_unlimited'] = 'Unlimited'; # XXX +$PALANG['pOverview_title'] = ':: Defined Domains'; # XXX +$PALANG['pOverview_up_arrow'] = 'Go Top'; # XXX +$PALANG['pOverview_right_arrow'] = 'Next Page'; # XXX +$PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX -$PALANG['pOverview_alias_title'] = ':: Alias'; -$PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; -$PALANG['pOverview_button'] = 'Íàïðåä'; -$PALANG['pOverview_welcome'] = 'Ïðåãëåä íà '; +$PALANG['pOverview_alias_title'] = ':: Alias'; # XXX +$PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX +$PALANG['pOverview_button'] = 'Напред'; +$PALANG['pOverview_welcome'] = 'Преглед на '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX $PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX -$PALANG['pOverview_alias_alias_count'] = 'Alias-è'; -$PALANG['pOverview_alias_mailbox_count'] = 'Ïîùåíñêè êóòèè'; -$PALANG['pOverview_alias_address'] = 'Îò'; -$PALANG['pOverview_alias_goto'] = 'Äî'; -$PALANG['pOverview_alias_modified'] = 'Ïîñëåäíî ìîäèôèöèðàí'; -$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX -$PALANG['pOverview_alias_active'] = 'Active'; # XXX -$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX +$PALANG['pOverview_alias_alias_count'] = 'Alias-и'; +$PALANG['pOverview_alias_mailbox_count'] = 'Пощенски кутии'; +$PALANG['pOverview_alias_address'] = 'От'; +$PALANG['pOverview_alias_goto'] = 'До'; +$PALANG['pOverview_alias_modified'] = 'Последно модифициран'; +$PALANG['pOverview_alias_domain_modified'] = 'Последна промяна'; +$PALANG['pOverview_alias_active'] = 'Активен'; +$PALANG['pOverview_alias_domain_active'] = 'Активен'; $PALANG['pOverview_alias_edit'] = 'Alias'; # XXX $PALANG['and_x_more'] = '[and %s more...]'; # XXX -$PALANG['pOverview_mailbox_username'] = 'Å-ìåéë'; -$PALANG['pOverview_mailbox_name'] = 'Èìå'; -$PALANG['pOverview_mailbox_quota'] = 'Îáåì (MB)'; -$PALANG['pOverview_mailbox_modified'] = 'Ïîñëåäíî ìîäèôèöèðàí'; -$PALANG['pOverview_mailbox_active'] = 'Àêòèâåí'; +$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-è'; +$PALANG['pOverview_get_domain'] = 'Домейн'; +$PALANG['pOverview_get_aliases'] = 'Alias-и'; $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX -$PALANG['pOverview_get_mailboxes'] = 'Ïîùåíñêè êóòèè'; -$PALANG['pOverview_get_quota'] = 'Îáåì íà ïîùåíñêàòà êóòèÿ (MB)'; -$PALANG['pOverview_get_modified'] = 'Ïîñëåäíî ìîäèôèöèðàí'; +$PALANG['pOverview_get_mailboxes'] = 'Пощенски кутии'; +$PALANG['pOverview_get_quota'] = 'Обем на пощенската кутия (MB)'; +$PALANG['pOverview_get_modified'] = 'Последно модифициран'; -$PALANG['pDelete_delete_error'] = '<span class="error_msg">Íå ìîãà äà èçòðèÿ çàïèñà '; +$PALANG['pDelete_delete_error'] = '<span class="error_msg">Не мога да изтрия записа '; $PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX -$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX -$PALANG['pDelete_domain_error'] = '<span class="error_msg">Òîçè äîìåéí íå å âàø! '; -$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX +$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Не мога да изтрия пощенската кутия'; +$PALANG['pDelete_domain_error'] = '<span class="error_msg">Този домейн не е ваш! '; +$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Този домейн не е ваш '; $PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX $PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX $PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX @@ -97,98 +98,98 @@ $PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX $PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX $PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX -$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX -$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX -$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX +$PALANG['pCreate_alias_domain_error1'] = 'Не ви е позволено да използвате избраната конфигурация.'; +$PALANG['pCreate_alias_domain_error2'] = 'Избраната конфигурация е невалидна. Изберете друга!'; +$PALANG['pCreate_alias_domain_error3'] = 'Възникна грешка при добавяне в базата.'; $PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX -$PALANG['pCreate_alias_welcome'] = 'Ñúçäàé íîâ alias çà âàøèÿ äîìåéí.'; +$PALANG['pCreate_alias_welcome'] = 'Създай нов alias за вашия домейн.'; $PALANG['pCreate_alias_address'] = 'Alias'; -$PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">Òîçè ALIAS íå å âàëèäåí!</span>'; -$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>'; -$PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Íå ìîãà äà äîáàâÿ alias-à êúì òàáëèöàòà!</span>'; -$PALANG['pCreate_alias_result_success'] = 'Alias-à áåøå äîáàâåí óñïåøíî â òàáëèöàòà!'; -$PALANG['pCreate_alias_catchall_text'] = 'Çà äà ñúçäàäåòå catch-all èçïîëçâàéòå "*" çà alias.<br />Çà ïðåíàñî÷âàíå íà äîìåéí êúì äîìåéí èçïîëçâàéòå "*@domain.tld" â ïîëåòî Êúì.'; +$PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">Този ALIAS не е валиден!</span>'; +$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'] = 'Активен'; +$PALANG['pCreate_alias_button'] = 'Добави Alias'; +$PALANG['pCreate_alias_goto_text'] = 'Накъде трябва да се изпраща писмото.'; +$PALANG['pCreate_alias_goto_text_error'] = 'Накъде трябва да се изпраща писмото.<br /><span class="error_msg">Избраният адрес в полето Към не е валиден!</span>'; +$PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Не мога да добавя alias-а към таблицата!</span>'; +$PALANG['pCreate_alias_result_success'] = 'Alias-а беше добавен успешно в таблицата!'; +$PALANG['pCreate_alias_catchall_text'] = 'За да създадете catch-all използвайте "*" за alias.<br />За пренасочване на домейн към домейн използвайте "*@domain.tld" в полето Към.'; -$PALANG['pEdit_alias_welcome'] = 'Ðåäàêòèðàíå íà alias çà âàøèÿ äîìåéí.<br />Åäèí çàïèñ íà ðåä.'; +$PALANG['pEdit_alias_welcome'] = 'Редактиране на alias за вашия домейн.<br />Един запис на ред.'; $PALANG['pEdit_alias_address'] = 'Alias'; -$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Íå ìîãà äà îòêðèÿ òîçè alias!</span>'; -$PALANG['pEdit_alias_goto'] = 'Êúì'; +$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">Òîçè äîìåéí íå å âàø: '; +$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">Този домейн не е ваш: '; $PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX -$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_button'] = 'Ðåäàêòèðàé Alias'; -$PALANG['pEdit_alias_result_error'] = '<span class="error_msg">Íå ìîãà äà ìîäèôèöèðàì òîçè alias!</span>'; +$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX +$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX +$PALANG['pEdit_alias_button'] = 'Редактирай Alias'; +$PALANG['pEdit_alias_result_error'] = '<span class="error_msg">Не мога да модифицирам този alias!</span>'; -$PALANG['pCreate_mailbox_welcome'] = 'Ñúçäàâàíå íà íîâà ïîùåíñêà êóòèÿ çà âàøèÿ äîìåéí.'; -$PALANG['pCreate_mailbox_username'] = 'Ëîãèí'; -$PALANG['pCreate_mailbox_username_text_error1'] = '<br /><span class="error_msg">Å-ìåéë-à íå å âàëèäåí!</span>'; -$PALANG['pCreate_mailbox_username_text_error2'] = '<br /><span class="error_msg">Òîçè å-ìåéë àäðåñ âå÷å ñúùåñòâóâà, ìîëÿ èçáåðåòå äðóã!</span>'; -$PALANG['pCreate_mailbox_username_text_error3'] = '<br /><span class="error_msg">Âèå ñòå äîñòèãíàëè ñâîÿ ëèìèò çà ñúçäàâàíå íà ïîùåíñêè êóòèè!</span>'; -$PALANG['pCreate_mailbox_password'] = 'Ïàðîëà'; -$PALANG['pCreate_mailbox_password2'] = 'Ïàðîëà (îòíîâî)'; -$PALANG['pCreate_mailbox_password_text'] = 'Ïàðîëà çà POP3/IMAP'; -$PALANG['pCreate_mailbox_password_text_error'] = 'Ïàðîëà çà POP3/IMAP<br /><span class="error_msg">Ïàðîëèòå, êîèòî ñòå äàëè íå ñúâïàäàò!<br />Èëè ñà ïðàçíè!</span>'; -$PALANG['pCreate_mailbox_name'] = 'Èìå'; -$PALANG['pCreate_mailbox_name_text'] = 'Ïúëíî èìå'; -$PALANG['pCreate_mailbox_quota'] = 'Îáåì'; +$PALANG['pCreate_mailbox_welcome'] = 'Създаване на нова пощенска кутия за вашия домейн.'; +$PALANG['pCreate_mailbox_username'] = 'Логин'; +$PALANG['pCreate_mailbox_username_text_error1'] = '<br /><span class="error_msg">Е-мейл-а не е валиден!</span>'; +$PALANG['pCreate_mailbox_username_text_error2'] = '<br /><span class="error_msg">Този е-мейл адрес вече съществува, моля изберете друг!</span>'; +$PALANG['pCreate_mailbox_username_text_error3'] = '<br /><span class="error_msg">Вие сте достигнали своя лимит за създаване на пощенски кутии!</span>'; +$PALANG['pCreate_mailbox_password'] = 'Парола'; +$PALANG['pCreate_mailbox_password2'] = 'Парола (отново)'; +$PALANG['pCreate_mailbox_password_text'] = 'Парола за POP3/IMAP'; +$PALANG['pCreate_mailbox_password_text_error'] = 'Парола за POP3/IMAP<br /><span class="error_msg">Паролите, които сте дали не съвпадат!<br />Или са празни!</span>'; +$PALANG['pCreate_mailbox_name'] = 'Име'; +$PALANG['pCreate_mailbox_name_text'] = 'Пълно име'; +$PALANG['pCreate_mailbox_quota'] = 'Обем'; $PALANG['pCreate_mailbox_quota_text'] = 'MB'; -$PALANG['pCreate_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Îáåìà, êîéòî ñòå çàäàëè å òâúðäå ãîëÿì!</span>'; -$PALANG['pCreate_mailbox_active'] = 'Àêòèâåí'; -$PALANG['pCreate_mailbox_mail'] = 'Ñúçäàé ïîùåíñêà êóòèÿ'; -$PALANG['pCreate_mailbox_button'] = 'Äîáàâè ïîùåíñêà êóòèÿ'; -$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Íå ìîãà äà äîáàâÿ ïîùåíñêàòà êóòèÿ â òàáëèöàòà!</span>'; -$PALANG['pCreate_mailbox_result_success'] = 'Ïîùåíñêàòà êóòèÿ áå óñïåøíî ñúçäàäåíà è äîáàâåíà â òàáëèöàòà!'; +$PALANG['pCreate_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Обема, който сте задали е твърде голям!</span>'; +$PALANG['pCreate_mailbox_active'] = 'Активен'; +$PALANG['pCreate_mailbox_mail'] = 'Създай пощенска кутия'; +$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'] = 'Ëîãèí'; -$PALANG['pEdit_mailbox_username_error'] = '<span class="error_msg">Íå ìîãà äà îòêðèÿ ïîùåíñêàòà êóòèÿ!</span>'; -$PALANG['pEdit_mailbox_password'] = 'Íîâà ïàðîëà'; -$PALANG['pEdit_mailbox_password2'] = 'Íîâà ïàðîëà (îòíîâî)'; -$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">Ïàðîëèòå, êîèòî ñòå äàëè íå ñúâïàäàò!</span>'; -$PALANG['pEdit_mailbox_name'] = 'Èìå'; +$PALANG['pEdit_mailbox_welcome'] = 'Редакция на пощенска кутия за вашия домейн.'; +$PALANG['pEdit_mailbox_username'] = 'Логин'; +$PALANG['pEdit_mailbox_username_error'] = '<span class="error_msg">Не мога да открия пощенската кутия!</span>'; +$PALANG['pEdit_mailbox_password'] = 'Нова парола'; +$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'] = 'Обем'; $PALANG['pEdit_mailbox_quota_text'] = 'MB'; -$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Îáåìà, êîéòî ñòå äàëè å òâúðäå ãîëÿì!</span>'; -$PALANG['pEdit_mailbox_domain_error'] = '<span class="error_msg">Òîçè äîìåéí íå å âàø: '; -$PALANG['pEdit_mailbox_button'] = 'Ðåäàêöèÿ íà ïîùåíñêà êóòèÿ'; -$PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Íå ìîãà äà ìîäèôèöèðàì ïîùåíñêàòà êóòèÿ!</span>'; +$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Обема, който сте дали е твърде голям!</span>'; +$PALANG['pEdit_mailbox_domain_error'] = '<span class="error_msg">Този домейн не е ваш: '; +$PALANG['pEdit_mailbox_button'] = 'Редакция на пощенска кутия'; +$PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Не мога да модифицирам пощенската кутия!</span>'; -$PALANG['pPassword_welcome'] = 'Ñìÿíà íà ïàðîëà.'; -$PALANG['pPassword_admin'] = 'Ëîãèí'; -$PALANG['pPassword_admin_text_error'] = '<span class="error_msg">Ëîãèí-à, êîéòî ñòå äàëè íå ñúâïàäà ñ ïîùåíñêàòà êóòèÿ!</span>'; -$PALANG['pPassword_password_current'] = 'Íàñòîÿùà ïàðîëà'; -$PALANG['pPassword_password_current_text_error'] = '<span class="error_msg">Íå ñòå âúâåëè âàøàòà íàñòîÿùà ïàðîëà!</span>'; -$PALANG['pPassword_password'] = 'Íîâà ïàðîëà'; -$PALANG['pPassword_password2'] = 'Íîâà ïàðîëà (îòíîâî)'; -$PALANG['pPassword_password_text_error'] = '<span class="error_msg">Ïàðîëèòå, êîèòî ñòå âúâåëè íå ñúâïàäàò!<br />Èëè ñà ïðàçíè!</span>'; -$PALANG['pPassword_button'] = 'Ñìåíè ïàðîëà'; -$PALANG['pPassword_result_error'] = '<span class="error_msg">Íå ìîãà äà ñìåíÿ ïàðîëàòà!</span>'; -$PALANG['pPassword_result_success'] = 'Ïàðîëàòà âè áå ñìåíåíà óñïåøíî!'; +$PALANG['pPassword_welcome'] = 'Смяна на парола.'; +$PALANG['pPassword_admin'] = 'Логин'; +$PALANG['pPassword_admin_text_error'] = '<span class="error_msg">Логин-а, който сте дали не съвпада с пощенската кутия!</span>'; +$PALANG['pPassword_password_current'] = 'Настояща парола'; +$PALANG['pPassword_password_current_text_error'] = '<span class="error_msg">Не сте въвели вашата настояща парола!</span>'; +$PALANG['pPassword_password'] = 'Нова парола'; +$PALANG['pPassword_password2'] = 'Нова парола (отново)'; +$PALANG['pPassword_password_text_error'] = '<span class="error_msg">Паролите, които сте въвели не съвпадат!<br />Или са празни!</span>'; +$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'] = 'Äàòà'; -$PALANG['pViewlog_username'] = 'Àäìèí'; -$PALANG['pViewlog_domain'] = 'Äîìåéí'; -$PALANG['pViewlog_action'] = 'Äåéñòâèå'; -$PALANG['pViewlog_data'] = 'Äàííè'; +$PALANG['pViewlog_welcome'] = 'Разглеждане на последните 10 действия за '; +$PALANG['pViewlog_timestamp'] = 'Дата'; +$PALANG['pViewlog_username'] = 'Админ'; +$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 @@ -202,153 +203,153 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX -$PALANG['pViewlog_button'] = 'Íàïðåä'; -$PALANG['pViewlog_result_error'] = '<span class="error_msg">Íå ìîãà äà îòêðèÿ ëîãîâåòå!</span>'; +$PALANG['pViewlog_button'] = 'Напред'; +$PALANG['pViewlog_result_error'] = '<span class="error_msg">Не мога да открия логовете!</span>'; -$PALANG['pSendmail_welcome'] = 'Èçïðàùàíå íà å-ìåéë.'; -$PALANG['pSendmail_admin'] = 'Îò'; -$PALANG['pSendmail_to'] = 'Äî'; -$PALANG['pSendmail_to_text_error'] = '<span class="error_msg">Ïîëåòî Äî å ïðàçåí èëè íåâàëèäåí å-ìåéë àäðåñ!</span>'; -$PALANG['pSendmail_subject'] = 'Çàãëàâèå'; -$PALANG['pSendmail_subject_text'] = 'Äîáðå äîøëè'; -$PALANG['pSendmail_body'] = 'Òåêñò'; -$PALANG['pSendmail_button'] = 'Èçïðàòè'; -$PALANG['pSendmail_result_error'] = '<span class="error_msg">Íå ìîãà äà ñúçäàì ïîùåíñêàòà êóòèÿ!</span>'; # XXX text change - new: <span class="error_msg">Unable to send email!</span> -$PALANG['pSendmail_result_success'] = 'Ïîùåíñêàòà êóòèÿ áå ñúçäàäåí óñïåøíî!'; # XXX text change - new: Email sent! +$PALANG['pSendmail_welcome'] = 'Изпращане на е-мейл.'; +$PALANG['pSendmail_admin'] = 'От'; +$PALANG['pSendmail_to'] = 'До'; +$PALANG['pSendmail_to_text_error'] = '<span class="error_msg">Полето До е празен или невалиден е-мейл адрес!</span>'; +$PALANG['pSendmail_subject'] = 'Заглавие'; +$PALANG['pSendmail_subject_text'] = 'Добре дошли'; +$PALANG['pSendmail_body'] = 'Текст'; +$PALANG['pSendmail_button'] = 'Изпрати'; +$PALANG['pSendmail_result_error'] = '<span class="error_msg">Не мога да изпратя съобщението!</span>'; +$PALANG['pSendmail_result_success'] = 'Съобщението беше изпратено!'; -$PALANG['pAdminMenu_list_admin'] = 'Ñïèñúê ñ àäìèíèòå'; -$PALANG['pAdminMenu_list_domain'] = 'Ñïèñúê ñ äîìåéíèòå'; -$PALANG['pAdminMenu_list_virtual'] = 'Âèðòóàëåí ñïèñúê'; -$PALANG['pAdminMenu_viewlog'] = 'Ïðåãëåä íà ëîãà'; -$PALANG['pAdminMenu_backup'] = 'Ðåçåðâíî êîïèå'; -$PALANG['pAdminMenu_create_domain_admins'] = 'Àäìèíè íà äîìåéíè'; -$PALANG['pAdminMenu_create_admin'] = 'Íîâ àäìèí'; -$PALANG['pAdminMenu_create_domain'] = 'Íîâ äîìåéí'; -$PALANG['pAdminMenu_create_alias'] = 'Äîáàâè Alias'; -$PALANG['pAdminMenu_create_mailbox'] = 'Äîáàâè ïîùåíñêà êóòèÿ'; +$PALANG['pAdminMenu_list_admin'] = 'Списък с админите'; +$PALANG['pAdminMenu_list_domain'] = 'Списък с домейните'; +$PALANG['pAdminMenu_list_virtual'] = 'Виртуален списък'; +$PALANG['pAdminMenu_viewlog'] = 'Преглед на лога'; +$PALANG['pAdminMenu_backup'] = 'Резервно копие'; +$PALANG['pAdminMenu_create_domain_admins'] = 'Админи на домейни'; +$PALANG['pAdminMenu_create_admin'] = 'Нов админ'; +$PALANG['pAdminMenu_create_domain'] = 'Нов домейн'; +$PALANG['pAdminMenu_create_alias'] = 'Добави Alias'; +$PALANG['pAdminMenu_create_mailbox'] = 'Добави пощенска кутия'; -$PALANG['pAdminList_admin_domain'] = 'Äîìåéí'; -$PALANG['pAdminList_admin_username'] = 'Àäìèí'; -$PALANG['pAdminList_admin_count'] = 'Äîìåéíè'; -$PALANG['pAdminList_admin_modified'] = 'Ïîñëåäíî ìîäèôèöèðàí'; -$PALANG['pAdminList_admin_active'] = 'Àêòèâåí'; +$PALANG['pAdminList_admin_domain'] = 'Домейн'; +$PALANG['pAdminList_admin_username'] = 'Админ'; +$PALANG['pAdminList_admin_count'] = 'Домейни'; +$PALANG['pAdminList_admin_modified'] = 'Последно модифициран'; +$PALANG['pAdminList_admin_active'] = 'Активен'; -$PALANG['pAdminList_domain_domain'] = 'Äîìåéí'; -$PALANG['pAdminList_domain_description'] = 'Îïèñàíèå'; -$PALANG['pAdminList_domain_aliases'] = 'Alias-è'; -$PALANG['pAdminList_domain_mailboxes'] = 'Ïîùåíñêè êóòèè'; -$PALANG['pAdminList_domain_maxquota'] = 'Ìàêñèìàëåí îáåì (MB)'; +$PALANG['pAdminList_domain_domain'] = 'Домейн'; +$PALANG['pAdminList_domain_description'] = 'Описание'; +$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'] = 'Последно модифициран'; +$PALANG['pAdminList_domain_active'] = 'Активен'; -$PALANG['pAdminList_virtual_button'] = 'Íàïðåä'; -$PALANG['pAdminList_virtual_welcome'] = 'Ïðåãëåä íà '; -$PALANG['pAdminList_virtual_alias_alias_count'] = 'Alias-è'; -$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Ïîùåíñêè êóòèè'; -$PALANG['pAdminList_virtual_alias_address'] = 'Îò'; -$PALANG['pAdminList_virtual_alias_goto'] = 'Êúì'; -$PALANG['pAdminList_virtual_alias_modified'] = 'Ïîñëåäíî ìîäèôèöèðàí'; -$PALANG['pAdminList_virtual_mailbox_username'] = 'Å-ìåéë'; -$PALANG['pAdminList_virtual_mailbox_name'] = 'Èìå'; -$PALANG['pAdminList_virtual_mailbox_quota'] = 'Îáåì (MB)'; -$PALANG['pAdminList_virtual_mailbox_modified'] = 'Ïîñëåäíî ìîäèôèöèðàí'; -$PALANG['pAdminList_virtual_mailbox_active'] = 'Àêòèâåí'; +$PALANG['pAdminList_virtual_button'] = 'Напред'; +$PALANG['pAdminList_virtual_welcome'] = 'Преглед на '; +$PALANG['pAdminList_virtual_alias_alias_count'] = 'Alias-и'; +$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Пощенски кутии'; +$PALANG['pAdminList_virtual_alias_address'] = 'От'; +$PALANG['pAdminList_virtual_alias_goto'] = 'Към'; +$PALANG['pAdminList_virtual_alias_modified'] = 'Последно модифициран'; +$PALANG['pAdminList_virtual_mailbox_username'] = 'Е-мейл'; +$PALANG['pAdminList_virtual_mailbox_name'] = 'Име'; +$PALANG['pAdminList_virtual_mailbox_quota'] = 'Обем (MB)'; +$PALANG['pAdminList_virtual_mailbox_modified'] = 'Последно модифициран'; +$PALANG['pAdminList_virtual_mailbox_active'] = 'Активен'; -$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 = íåîãðàíè÷åíè'; -$PALANG['pAdminCreate_domain_mailboxes'] = 'Ïîùåíñêè êóòèè'; -$PALANG['pAdminCreate_domain_mailboxes_text'] = '0 = èçêëþ÷åíè | -1 = íåîãðàíè÷åíè'; -$PALANG['pAdminCreate_domain_maxquota'] = 'Ìàêñèìàëåí îáåì'; -$PALANG['pAdminCreate_domain_maxquota_text'] = 'MB<br /> 0 = èçêëþ÷åíî | -1 = íåîãðàíè÷åí'; +$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">Невалиден домайн!</span>'; +$PALANG['pAdminCreate_domain_description'] = 'Описание'; +$PALANG['pAdminCreate_domain_aliases'] = 'Alias-и'; +$PALANG['pAdminCreate_domain_aliases_text'] = '0 = изключени | -1 = неограничени'; +$PALANG['pAdminCreate_domain_mailboxes'] = 'Пощенски кутии'; +$PALANG['pAdminCreate_domain_mailboxes_text'] = '0 = изключени | -1 = неограничени'; +$PALANG['pAdminCreate_domain_maxquota'] = 'Максимален обем'; +$PALANG['pAdminCreate_domain_maxquota_text'] = 'MB<br /> 0 = изключено | -1 = неограничен'; $PALANG['pAdminCreate_domain_transport'] = 'Transport'; $PALANG['pAdminCreate_domain_transport_text'] = 'Define transport'; -$PALANG['pAdminCreate_domain_defaultaliases'] = 'Äîáàâè alias-è ïî ïîäðàçáèðàíå'; +$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['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">Грешка при изтриването на домейна!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX -$PALANG['pAdminEdit_domain_welcome'] = 'Ðåäàêòèðàíå íà äîìåéí'; -$PALANG['pAdminEdit_domain_domain'] = 'Äîìåéí'; -$PALANG['pAdminEdit_domain_description'] = 'Îïèñàíèå'; -$PALANG['pAdminEdit_domain_aliases'] = 'Alias-è'; -$PALANG['pAdminEdit_domain_aliases_text'] = '0 = èçêëþ÷åíè | -1 = íåîãðàíè÷åíè'; -$PALANG['pAdminEdit_domain_mailboxes'] = 'Ïîùåíñêè êóòèè'; -$PALANG['pAdminEdit_domain_mailboxes_text'] = '0 = èçêëþ÷åíè | -1 = íåîãðàíè÷åíè'; -$PALANG['pAdminEdit_domain_maxquota'] = 'Ìàêñèìàëåí îáåì'; -$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB<br /> 0 = èçêëþ÷åíî | -1 = íåîãðàíè÷åí'; +$PALANG['pAdminEdit_domain_welcome'] = 'Редактиране на домейн'; +$PALANG['pAdminEdit_domain_domain'] = 'Домейн'; +$PALANG['pAdminEdit_domain_description'] = 'Описание'; +$PALANG['pAdminEdit_domain_aliases'] = 'Alias-и'; +$PALANG['pAdminEdit_domain_aliases_text'] = '0 = изключени | -1 = неограничени'; +$PALANG['pAdminEdit_domain_mailboxes'] = 'Пощенски кутии'; +$PALANG['pAdminEdit_domain_mailboxes_text'] = '0 = изключени | -1 = неограничени'; +$PALANG['pAdminEdit_domain_maxquota'] = 'Максимален обем'; +$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB<br /> 0 = изключено | -1 = неограничен'; $PALANG['pAdminEdit_domain_transport'] = 'Transport'; $PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; -$PALANG['pAdminEdit_domain_backupmx'] = 'Ìåéë ñúðâúðà å ðåçåðâåí MX'; -$PALANG['pAdminEdit_domain_active'] = 'Àêòèâåí'; -$PALANG['pAdminEdit_domain_button'] = 'Ðåäàêòèðàé äîìåéí'; -$PALANG['pAdminEdit_domain_result_error'] = '<span class="error_msg">Íå ìîãà äà ìîäèôèöèðàì äîìåéíà!</span>'; +$PALANG['pAdminEdit_domain_backupmx'] = 'Мейл сървъра е резервен MX'; +$PALANG['pAdminEdit_domain_active'] = 'Активен'; +$PALANG['pAdminEdit_domain_button'] = 'Редактирай домейн'; +$PALANG['pAdminEdit_domain_result_error'] = '<span class="error_msg">Не мога да модифицирам домейна!</span>'; -$PALANG['pAdminCreate_admin_welcome'] = 'Äîáàâè íîâ àäìèí íà äîìåéíà'; -$PALANG['pAdminCreate_admin_username'] = 'Àäìèí'; -$PALANG['pAdminCreate_admin_username_text'] = 'Å-ìåéë àäðåñ'; -$PALANG['pAdminCreate_admin_username_text_error1'] = 'Å-ìåéë àäðåñ<br /><span class="error_msg">Àäìèí íå å âàëèäåí å-ìåéë àäðåñ!</span>'; -$PALANG['pAdminCreate_admin_username_text_error2'] = 'Å-ìåéë àäðåñ<br /><span class="error_msg">Àäìèí-à âå÷å ñúùåñòâóâà èëè íå å âàëèäåí</span>'; -$PALANG['pAdminCreate_admin_password'] = 'Ïàðîëà'; -$PALANG['pAdminCreate_admin_password2'] = 'Ïàðîëà (îòíîâî)'; -$PALANG['pAdminCreate_admin_password_text_error'] = '<span class="error_msg">Ïàðîëèòå, êîèòî ñòå âúâåëè íå ñúâïàäàò!<br />Èëè ñà ïðàçíè!</span>'; -$PALANG['pAdminCreate_admin_button'] = 'Äîáàâè àäìèí'; -$PALANG['pAdminCreate_admin_result_error'] = '<span class="error_msg">Íå ìîãà äà äîáàâÿ àäìèíà!</span>'; -$PALANG['pAdminCreate_admin_result_success'] = 'Àäìèíà áåøå äîáàâåí óñïåøíî!'; -$PALANG['pAdminCreate_admin_address'] = 'Äîìåéí'; +$PALANG['pAdminCreate_admin_welcome'] = 'Добави нов админ на домейна'; +$PALANG['pAdminCreate_admin_username'] = 'Админ'; +$PALANG['pAdminCreate_admin_username_text'] = 'Е-мейл адрес'; +$PALANG['pAdminCreate_admin_username_text_error1'] = 'Е-мейл адрес<br /><span class="error_msg">Админ не е валиден е-мейл адрес!</span>'; +$PALANG['pAdminCreate_admin_username_text_error2'] = 'Е-мейл адрес<br /><span class="error_msg">Админ-а вече съществува или не е валиден</span>'; +$PALANG['pAdminCreate_admin_password'] = 'Парола'; +$PALANG['pAdminCreate_admin_password2'] = 'Парола (отново)'; +$PALANG['pAdminCreate_admin_password_text_error'] = '<span class="error_msg">Паролите, които сте въвели не съвпадат!<br />Или са празни!</span>'; +$PALANG['pAdminCreate_admin_button'] = 'Добави админ'; +$PALANG['pAdminCreate_admin_result_error'] = '<span class="error_msg">Не мога да добавя админа!</span>'; +$PALANG['pAdminCreate_admin_result_success'] = 'Админа беше добавен успешно!'; +$PALANG['pAdminCreate_admin_address'] = 'Домейн'; -$PALANG['pAdminEdit_admin_welcome'] = 'Ðåäàêöèÿ íà àäìèí íà äîìåéí'; -$PALANG['pAdminEdit_admin_username'] = 'Àäìèí'; -$PALANG['pAdminEdit_admin_password'] = 'Ïàðîëà'; -$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'; # XXX -$PALANG['pAdminEdit_admin_button'] = 'Ðåäàêòèðàé Àäìèí'; -$PALANG['pAdminEdit_admin_result_error'] = '<span class="error_msg">Íå ìîãà äà ìîäèôèöèðàì àäìèíà!</span>'; -$PALANG['pAdminEdit_admin_result_success'] = 'Àäìèí-à áåøå ìîäèôèöèðàí!'; +$PALANG['pAdminEdit_admin_welcome'] = 'Редакция на админ на домейн'; +$PALANG['pAdminEdit_admin_username'] = 'Админ'; +$PALANG['pAdminEdit_admin_password'] = 'Парола'; +$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'] = 'Главен Администратор'; +$PALANG['pAdminEdit_admin_button'] = 'Редактирай Админ'; +$PALANG['pAdminEdit_admin_result_error'] = '<span class="error_msg">Не мога да модифицирам админа!</span>'; +$PALANG['pAdminEdit_admin_result_success'] = 'Админ-а беше модифициран!'; -$PALANG['pUsersLogin_welcome'] = 'Ïîòðåáèòåëñêè âõîä çà ñìÿíà íà ïàðîëà è alias-è.'; -$PALANG['pUsersLogin_username'] = 'Ëîãèí (å-ìåéë)'; -$PALANG['pUsersLogin_password'] = 'Ïàðîëà'; -$PALANG['pUsersLogin_button'] = 'Âõîä'; -$PALANG['pUsersLogin_username_incorrect'] = 'Âàøèÿò ëîãèí íå å ïðàâèëåí. Ìîëÿ ïðîâåðåòå çà êîðåêòíîñò íà âàøèÿò å-ìåéë àäðåñ!'; -$PALANG['pUsersLogin_password_incorrect'] = 'Âàøàòà ïàðîëà íå å ïðàâèëíà!'; +$PALANG['pUsersLogin_welcome'] = 'Потребителски вход за смяна на парола и alias-и.'; +$PALANG['pUsersLogin_username'] = 'Логин (е-мейл)'; +$PALANG['pUsersLogin_password'] = 'Парола'; +$PALANG['pUsersLogin_button'] = 'Вход'; +$PALANG['pUsersLogin_username_incorrect'] = 'Вашият логин не е правилен. Моля проверете за коректност на вашият е-мейл адрес!'; +$PALANG['pUsersLogin_password_incorrect'] = 'Вашата парола не е правилна!'; -$PALANG['pUsersMenu_vacation'] = 'Àâòîìàòè÷åí îòãîâîð'; -$PALANG['pUsersMenu_edit_alias'] = 'Ñìÿíà íà ïðåíàñî÷âàíåòî'; -$PALANG['pUsersMenu_password'] = 'Ñìåíè ïàðîëà'; +$PALANG['pUsersMenu_vacation'] = 'Автоматичен отговор'; +$PALANG['pUsersMenu_edit_alias'] = 'Смяна на пренасочването'; +$PALANG['pUsersMenu_password'] = 'Смени парола'; -$PALANG['pUsersMain_vacation'] = 'Íàñòðîéâàíå íà "out of office" ñúîáùåíèå èëè àâòîìàòè÷åí îòãîâîð çà âàøèÿò å-ìåéë.'; +$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'] = 'Ñìÿíà íà íàñòîÿùàòà ïàðîëà.'; +$PALANG['pUsersMain_edit_alias'] = 'Смяна на пренасочването на е-мейл.'; +$PALANG['pUsersMain_password'] = 'Смяна на настоящата парола.'; -$PALANG['pUsersVacation_welcome'] = 'Àâòîìàòè÷åí îòãîâîð.'; -$PALANG['pUsersVacation_welcome_text'] = 'Âèå âå÷å ñè èìàòå êîíôèãðèðàí àâòîìàòè÷åí îòãîâîð!'; -$PALANG['pUsersVacation_subject'] = 'Çàãëàâèå'; -$PALANG['pUsersVacation_subject_text'] = 'Out of Office'; -$PALANG['pUsersVacation_body'] = 'Òåêñò'; +$PALANG['pUsersVacation_welcome'] = 'Автоматичен отговор.'; +$PALANG['pUsersVacation_welcome_text'] = 'Вие вече си имате конфигриран автоматичен отговор!'; +$PALANG['pUsersVacation_subject'] = 'Заглавие'; +$PALANG['pUsersVacation_subject_text'] = 'Out of Office'; # XXX +$PALANG['pUsersVacation_body'] = 'Текст'; $PALANG['pUsersVacation_body_text'] = <<<EOM -Íÿìà äà áúäà íà ðàçïîëîæåíèå îò <date> äî <date>. -Ïðè ñïåøíîñò ìîæåòå äà ñå ñâúðæåòå ñ <contact person>. +Няма да бъда на разположение от <date> до <date>. +При спешност можете да се свържете с <contact person>. EOM; -$PALANG['pUsersVacation_button_away'] = 'Îòèâàì âúâ âàêàíöèÿ'; -$PALANG['pUsersVacation_button_back'] = 'Âðúùàì ñå îò âàêàíöèÿ'; -$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Íå ìîãà äà îáíîâÿ íàñòðîéêèòå çà âàøèÿò àâòîìàòè÷åí îòãîâîð!</span>'; -$PALANG['pUsersVacation_result_success'] = 'Âàøèÿò àâòîìàòè÷åí îòãîâîð áåøå ïðåìàõíàò!'; +$PALANG['pUsersVacation_button_away'] = 'Отивам във ваканция'; +$PALANG['pUsersVacation_button_back'] = 'Връщам се от ваканция'; +$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Не мога да обновя настройките за вашият автоматичен отговор!</span>'; +$PALANG['pUsersVacation_result_success'] = 'Вашият автоматичен отговор беше премахнат!'; -$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; # XXX +$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; # XXX $PALANG['pCreate_dbLog_createalias'] = 'create alias'; # XXX $PALANG['pDelete_dbLog_deletealias'] = 'delete alias'; # XXX $PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox'; # XXX @@ -360,15 +361,15 @@ $PALANG['pSearch'] = 'search'; # XXX $PALANG['pSearch_welcome'] = 'Searching for: '; # XXX $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'] = 'Broadcast message'; # XXX -$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX +$PALANG['pBroadcast_title'] = 'Съобщение до всички'; +$PALANG['pBroadcast_from'] = 'От'; +$PALANG['pBroadcast_name'] = 'Име'; +$PALANG['pBroadcast_subject'] = 'Заглавие'; +$PALANG['pBroadcast_message'] = 'Съобщение'; +$PALANG['pBroadcast_send'] = 'Изпрати'; +$PALANG['pBroadcast_success'] = 'Вашето съобщение беше изпратено.'; +$PALANG['pAdminMenu_broadcast_message'] = 'Съобщение до всички'; +$PALANG['pBroadcast_error_empty'] = 'Полетата Име, Заглавие и Съобщение са задължителни!'; $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX @@ -382,9 +383,9 @@ $PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX $PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX $PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX -$PALANG['pFetchmail_field_id'] = 'ID'; # XXX -$PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX -$PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX +$PALANG['pFetchmail_field_id'] = 'ID'; # XXX +$PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX +$PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX $PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX $PALANG['pFetchmail_field_src_user'] = 'User'; # XXX $PALANG['pFetchmail_field_src_password'] = 'Password'; # XXX Modified: branches/postfixadmin-2.2.1/languages/pl.lang =================================================================== --- branches/postfixadmin-2.2.1/languages/pl.lang 2008-07-18 23:21:59 UTC (rev 407) +++ branches/postfixadmin-2.2.1/languages/pl.lang 2008-07-21 21:43:06 UTC (rev 408) @@ -4,35 +4,36 @@ // Language file Polish // by Jarek // updated by Piotr Meyer <aniou at smutek dot pl> +// updated by Lukasz Wasikowski <lu...@wa...> // $PALANG['YES'] = 'Tak'; $PALANG['NO'] = 'Nie'; $PALANG['edit'] = 'Edytuj'; $PALANG['del'] = 'Usuń'; -$PALANG['exit'] = 'Exit'; # XXX -$PALANG['cancel'] = 'Cancel'; # XXX -$PALANG['save'] = 'Save'; # XXX -$PALANG['confirm'] = 'Jesteś przekonany, że chcesz usunąć to?\n'; +$PALANG['exit'] = 'Wyjdź'; +$PALANG['cancel'] = 'Anuluj'; +$PALANG['save'] = 'Zapisz'; +$PALANG['confirm'] = 'Jesteś przekonany, że chcesz to usunąć?\n'; $PALANG['confirm_domain'] = 'Czy rzeczywiście chcesz usunąć wszystkie wpisy dla tej domeny? To jest proces nieodwracalny!\n'; -$PALANG['check_update'] = 'Check for update'; # XXX -$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX -$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX +$PALANG['check_update'] = 'Sprawdź aktualizację'; +$PALANG['invalid_parameter'] = 'Błędny parametr!'; +$PALANG['pFooter_logged_as'] = 'Zalogowano jako %s'; $PALANG['pLogin_welcome'] = 'Sekcja przeznaczona dla administratorów domen.'; -$PALANG['pLogin_username'] = 'Login (email)'; # XXX +$PALANG['pLogin_username'] = 'Login (email)'; $PALANG['pLogin_password'] = 'Hasło'; $PALANG['pLogin_button'] = 'Zaloguj'; $PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Twój login jest niepoprawny!</span>'; $PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Twoje hasło jest niepoprawne!</span>'; $PALANG['pLogin_login_users'] = 'Sekcja przeznaczona dla użytkowników.'; -$PALANG['pMenu_main'] = 'Main'; # XXX +$PALANG['pMenu_main'] = 'Strona główna'; $PALANG['pMenu_overview'] = 'Dane zbiorcze'; -$PALANG['pMenu_create_alias'] = 'Dadaj alias'; +$PALANG['pMenu_create_alias'] = 'Dodaj alias'; $PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX $PALANG['pMenu_create_mailbox'] = 'Dodaj konto'; -$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX +$PALANG['pMenu_fetchmail'] = 'Pobierz Email'; $PALANG['pMenu_sendmail'] = 'Wyślij Email'; $PALANG['pMenu_password'] = 'Hasło'; $PALANG['pMenu_viewlog'] = 'Logi'; @@ -47,46 +48,46 @@ $PALANG['pMain_viewlog'] = 'Pokaż pliki logów.'; $PALANG['pMain_logout'] = 'Zakończ pracę z systemem'; -$PALANG['pOverview_disabled'] = 'Disabled'; # XXX -$PALANG['pOverview_unlimited'] = 'Unlimited'; # XXX -$PALANG['pOverview_title'] = ':: Defined Domains'; # XXX -$PALANG['pOverview_up_arrow'] = 'Go Top'; # XXX -$PALANG['pOverview_right_arrow'] = 'Next Page'; # XXX -$PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX +$PALANG['pOverview_disabled'] = 'Wyłączony'; +$PALANG['pOverview_unlimited'] = 'Bez limitu'; +$PALANG['pOverview_title'] = ':: Zdefiniowane domeny'; +$PALANG['pOverview_up_arrow'] = 'Do góry'; +$PALANG['pOverview_right_arrow'] = 'Następna strona'; +$PALANG['pOverview_left_arrow'] = 'Poprzednia strona'; $PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX -$PALANG['pOverview_alias_title'] = ':: Alias'; # XXX -$PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX +$PALANG['pOverview_alias_title'] = ':: Aliasy'; +$PALANG['pOverview_mailbox_title'] = ':: Konta pocztowe'; # XXX $PALANG['pOverview_button'] = 'Idź'; $PALANG['pOverview_welcome'] = 'Dane zbiorcze dla domeny '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX $PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX -$PALANG['pOverview_alias_alias_count'] = 'Aliasy'; +$PALANG['pOverview_alias_alias_count'] = 'Alias'; $PALANG['pOverview_alias_mailbox_count'] = 'Konta'; $PALANG['pOverview_alias_address'] = 'Od'; $PALANG['pOverview_alias_goto'] = 'Do'; $PALANG['pOverview_alias_modified'] = 'Ostatnio zmodyfikowany'; $PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX -$PALANG['pOverview_alias_active'] = 'Active'; # XXX +$PALANG['pOverview_alias_active'] = 'Aktywny'; $PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX -$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX -$PALANG['and_x_more'] = '[and %s more...]'; # XXX -$PALANG['pOverview_mailbox_username'] = 'Email'; # XXX -$PALANG['pOverview_mailbox_name'] = 'Name'; # XXX -$PALANG['pOverview_mailbox_quota'] = 'Quota (MB)'; # XXX +$PALANG['pOverview_alias_edit'] = 'Alias'; +$PALANG['and_x_more'] = '[i %s wiecej...]'; +$PALANG['pOverview_mailbox_username'] = 'Email'; +$PALANG['pOverview_mailbox_name'] = 'Nazwa'; +$PALANG['pOverview_mailbox_quota'] = 'Udział (MB)'; $PALANG['pOverview_mailbox_modified'] = 'Ostatnio zmodyfikowany'; $PALANG['pOverview_mailbox_active'] = 'Aktywny'; -$PALANG['pOverview_vacation_edit'] = 'Vacation'; -$PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX +$PALANG['pOverview_vacation_edit'] = 'Auto odpowiedź'; +$PALANG['pOverview_vacation_option'] = 'Ustaw auto odpowiedź'; $PALANG['pOverview_get_domain'] = 'Domena'; $PALANG['pOverview_get_aliases'] = 'Aliasy'; $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX $PALANG['pOverview_get_mailboxes'] = 'Konta'; -$PALANG['pOverview_get_quota'] = 'Mailbox Quota (MB)'; # XXX +$PALANG['pOverview_get_quota'] = 'Udział (MB)'; $PALANG['pOverview_get_modified'] = 'Ostatnio zmodyfikowany'; $PALANG['pDelete_delete_error'] = '<span class="error_msg">Nie można usunąć tego wpisu '; -$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX +$PALANG['pDelete_delete_success'] = '%s usunięty.'; $PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Nie można usunąć konta '; $PALANG['pDelete_domain_error'] = '<span class="error_msg">Ta domena nie należy do Ciebie '; $PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX @@ -105,14 +106,14 @@ $PALANG['pCreate_alias_welcome'] = 'Utwórz nowy alias dla Twojej domeny.'; $PALANG['pCreate_alias_address'] = 'Alias'; -$PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">ALIAS jest niepoprawny!</span>'; +$PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">Alias jest niepoprawny!</span>'; $PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Taki adres email juz istnieje, proszę wybrać inny!</span>'; $PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Twój limit aliasów został osiągniety!</span>'; $PALANG['pCreate_alias_goto'] = 'Do'; -$PALANG['pCreate_alias_active'] = 'Active'; # XXX +$PALANG['pCreate_alias_active'] = 'Aktywny'; $PALANG['pCreate_alias_button'] = 'Dodaj alias'; $PALANG['pCreate_alias_goto_text'] = 'Gdzie ten mail powinien być wysłany.'; -$PALANG['pCreate_alias_goto_text_error'] = 'Gdzie ten email powinien dotrzeć.<br /><span class="error_msg">The TO is not valid!</span>'; +$PALANG['pCreate_alias_goto_text_error'] = 'Gdzie ten mail powinien dotrzeć.<br /><span class="error_msg">Pole TO jest niepoprawne!</span>'; $PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Nie można dodać aliasu do tabeli aliasów!</span>'; $PALANG['pCreate_alias_result_success'] = 'Alias został dodany do tabeli aliasów!'; $PALANG['pCreate_alias_catchall_text'] = 'Aby utworzyć domyślne konto dla domeny (catch-all) podaj "*" (gwiazdkę) jako alias.<br />Jeśli chcesz przekazywać całość poczty do innej domeny, wpisz jako alias "*@domena.tld".'; @@ -120,7 +121,7 @@ $PALANG['pEdit_alias_address'] = 'Alias'; $PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Nie można zokalizować aliasu!</span>'; $PALANG['pEdit_alias_goto'] = 'Do'; -$PALANG['pEdit_alias_active'] = 'Active'; # XXX +$PALANG['pEdit_alias_active'] = 'Aktywny'; $PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Nie podałeś adresu odbiorcy (pole "To")</span>'; $PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Wpisany adres email jest niepoprawny: '; $PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Ta domena nie należy do Ciebie: '; @@ -149,7 +150,7 @@ $PALANG['pCreate_mailbox_button'] = 'Dodaj konto'; $PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Nie można dodać konta do tabeli kont!</span>'; $PALANG['pCreate_mailbox_result_success'] = 'Konto zostało dodane do tabeli kont!'; -$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['pCreate_mailbox_result_succes_nosubfolders'] = 'Konto zostało dodane do tabeli kont, ale żadne (lub tylko niektóre) z predefiniowanych folderów nie zostały utworzone'; $PALANG['pEdit_mailbox_welcome'] = 'Edytuj konto w Twojej domenie.'; $PALANG['pEdit_mailbox_username'] = 'Nazwa użytkownika'; @@ -167,7 +168,7 @@ $PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Nie można zmienić parametrów!</span>'; $PALANG['pPassword_welcome'] = 'Zmień Swoje hasło.'; -$PALANG['pPassword_admin'] = 'Login'; # XXX +$PALANG['pPassword_admin'] = 'Login'; $PALANG['pPassword_admin_text_error'] = '<span class="error_msg">Podany LOGIN nie pasuje!</span>'; $PALANG['pPassword_password_current'] = 'Aktualne hasło'; $PALANG['pPassword_password_current_text_error'] = '<span class="error_msg">Nieprawidłowe aktualne hasło!</span>'; @@ -178,11 +179,11 @@ $PALANG['pPassword_result_error'] = '<span class="error_msg">Nie można zmienić Twojego hasła!</span>'; $PALANG['pPassword_result_success'] = 'Twoje hasło zostało zmienione!'; -$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['pEdit_vacation_set'] = 'Zmień / Ustaw wiadomość auto odpowiedzi'; +$PALANG['pEdit_vacation_remove'] = 'Usuń wiadomość auto odpowiedzi'; +$PALANG['pVacation_result_error'] = '<span class="error_msg">Nie można ustawić wiadomości auto odpowiedzi!</span>'; +$PALANG['pVacation_result_removed'] = 'Auto odpowiedź została usunięta!'; +$PALANG['pVacation_result_added'] = 'Auto odpowiedź została dodana!'; $PALANG['pViewlog_welcome'] = 'Pokaż 10 ostatnich działań dla '; $PALANG['pViewlog_timestamp'] = 'Data'; @@ -190,18 +191,18 @@ $PALANG['pViewlog_domain'] = 'Domena'; $PALANG['pViewlog_action'] = 'Działanie'; $PALANG['pViewlog_data'] = 'Dane'; -$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_create_mailbox'] = 'utwórz konto'; +$PALANG['pViewlog_action_delete_mailbox'] = 'usuń konto'; +$PALANG['pViewlog_action_edit_mailbox'] = 'edytuj konto'; +$PALANG['pViewlog_action_edit_mailbox_state'] = 'edytuj aktywne konto'; +$PALANG['pViewlog_action_create_alias'] = 'utwórz alias'; $PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX -$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX +$PALANG['pViewlog_action_delete_alias'] = 'usuń alias'; $PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX -$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX -$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX +$PALANG['pViewlog_action_edit_alias'] = 'edytuj alias'; +$PALANG['pViewlog_action_edit_alias_state'] = 'edytuj aktywny alias'; $PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX -$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX +$PALANG['pViewlog_action_edit_password'] = 'zmień hasło'; $PALANG['pViewlog_button'] = 'Idź'; $PALANG['pViewlog_result_error'] = '<span class="error_msg">Nie można odszukać logów!</span>'; @@ -214,12 +215,12 @@ $PALANG['pSendmail_subject_text'] = 'Witamy'; $PALANG['pSendmail_body'] = 'Tekst'; $PALANG['pSendmail_button'] = 'Wyślij wiadomość'; -$PALANG['pSendmail_result_error'] = '<span class="error_msg">Nie można utworzyć konta!</span>'; # XXX text change - new: <span class="error_msg">Unable to send email!</span> -$PALANG['pSendmail_result_success'] = 'Konto zostało utworzone!'; # XXX text change - new: Email sent! +$PALANG['pSendmail_result_error'] = '<span class="error_msg">Nie można wysłać emaila!</span>'; +$PALANG['pSendmail_result_success'] = 'Email wysłany!'; $PALANG['pAdminMenu_list_admin'] = 'Lista administratorów'; $PALANG['pAdminMenu_list_domain'] = 'Lista domen'; -$PALANG['pAdminMenu_list_virtual'] = 'Virtual List'; # XXX +$PALANG['pAdminMenu_list_virtual'] = 'Virtual list'; # XXX $PALANG['pAdminMenu_viewlog'] = 'Logi'; $PALANG['pAdminMenu_backup'] = 'Kopia bezpieczeństwa'; $PALANG['pAdminMenu_create_domain_admins'] = 'Administratorzy domeny'; @@ -239,13 +240,13 @@ $PALANG['pAdminList_domain_aliases'] = 'Aliasy'; $PALANG['pAdminList_domain_mailboxes'] = 'Konta'; $PALANG['pAdminList_domain_maxquota'] = 'Max udział (MB)'; -$PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX -$PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX +$PALANG['pAdminList_domain_transport'] = 'Transport'; +$PALANG['pAdminList_domain_backupmx'] = 'Zapasowy MX'; $PALANG['pAdminList_domain_modified'] = 'Ostatnio zmodyfikowane'; $PALANG['pAdminList_domain_active'] = 'Aktywne'; $PALANG['pAdminList_virtual_button'] = 'Idź'; -$PALANG['pAdminList_virtual_welcome'] = 'Overview for '; +$PALANG['pAdminList_virtual_welcome'] = 'Podsumowanie dla '; $PALANG['pAdminList_virtual_alias_alias_count'] = 'Aliasy'; $PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Konta'; $PALANG['pAdminList_virtual_alias_address'] = 'Od'; @@ -268,15 +269,15 @@ $PALANG['pAdminCreate_domain_mailboxes_text'] = '-1 = wyłączone | 0 = bez limitów'; $PALANG['pAdminCreate_domain_maxquota'] = 'Max udział'; $PALANG['pAdminCreate_domain_maxquota_text'] = 'MB<br /> -1 = wyłączone | 0 = bez l... [truncated message content] |
From: <chr...@us...> - 2008-07-18 23:21:51
|
Revision: 407 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=407&view=rev Author: christian_boltz Date: 2008-07-18 23:21:59 +0000 (Fri, 18 Jul 2008) Log Message: ----------- functions.php - removed (now) unused function table_by_pos I'm quite sure we won't need it again, basically it answered questions like "what's the 3rd table in $CONF['database_tables']?" Modified Paths: -------------- trunk/functions.inc.php Modified: trunk/functions.inc.php =================================================================== --- trunk/functions.inc.php 2008-07-18 23:15:52 UTC (rev 406) +++ trunk/functions.inc.php 2008-07-18 23:21:59 UTC (rev 407) @@ -1691,24 +1691,6 @@ -// -// table_by_pos -// Action: Return table name for given position -// Call: table_by_pos (int pos) -// -function table_by_pos ($pos) -{ - global $CONF; - $x=0; - foreach($CONF['database_tables'] as $i=>$v) - { - if($pos==$x++) return table_by_key ($i); - } - return false; -} - - - /* Called after a mailbox has been created in the DBMS. Returns: boolean. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-07-18 23:15:45
|
Revision: 406 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=406&view=rev Author: christian_boltz Date: 2008-07-18 23:15:52 +0000 (Fri, 18 Jul 2008) Log Message: ----------- backup.php: - replace table_by_pos with table_by_key - script was totally broken while table_by_pos was used (only admin table backed up) - changed Content-Type: header to text/plain - file is still offered for download, but can be opened in a text editor easier Modified Paths: -------------- trunk/backup.php Modified: trunk/backup.php =================================================================== --- trunk/backup.php 2008-07-18 23:07:40 UTC (rev 405) +++ trunk/backup.php 2008-07-18 23:15:52 UTC (rev 406) @@ -88,7 +88,7 @@ for ($i = 0 ; $i < sizeof ($tables) ; ++$i) { - $result = db_query ("SHOW CREATE TABLE ".table_by_pos($i)); + $result = db_query ("SHOW CREATE TABLE " . table_by_key($tables[$i])); if ($result['rows'] > 0) { while ($row = db_array ($result['result'])) @@ -100,7 +100,7 @@ for ($i = 0 ; $i < sizeof ($tables) ; ++$i) { - $result = db_query ("SELECT * FROM ".table_by_pos($i)); + $result = db_query ("SELECT * FROM " . table_by_key($tables[$i])); if ($result['rows'] > 0) { while ($row = db_assoc ($result['result'])) @@ -118,7 +118,7 @@ } } } - header ("Content-Type: application/octet-stream"); + header ("Content-Type: text/plain"); header ("Content-Disposition: attachment; filename=\"$filename\""); header ("Content-Transfer-Encoding: binary"); header ("Content-Length: " . filesize("$backup")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-07-18 23:07:32
|
Revision: 405 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=405&view=rev Author: christian_boltz Date: 2008-07-18 23:07:40 +0000 (Fri, 18 Jul 2008) Log Message: ----------- config.inc.php - add fetchmail table to $CONF['database_tables'] Modified Paths: -------------- trunk/config.inc.php Modified: trunk/config.inc.php =================================================================== --- trunk/config.inc.php 2008-07-18 22:35:33 UTC (rev 404) +++ trunk/config.inc.php 2008-07-18 23:07:40 UTC (rev 405) @@ -63,6 +63,7 @@ 'config' => 'config', 'domain' => 'domain', 'domain_admins' => 'domain_admins', + 'fetchmail' => 'fetchmail', 'log' => 'log', 'mailbox' => 'mailbox', 'vacation' => 'vacation', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-07-18 22:35:24
|
Revision: 404 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=404&view=rev Author: christian_boltz Date: 2008-07-18 22:35:33 +0000 (Fri, 18 Jul 2008) Log Message: ----------- list-virtual.php: - always initialize $tAliasDomains and $tTargetDomain (makes sure no evil data comes in, and also fixes the PHP notice) Modified Paths: -------------- trunk/list-virtual.php Modified: trunk/list-virtual.php =================================================================== --- trunk/list-virtual.php 2008-07-17 20:58:03 UTC (rev 403) +++ trunk/list-virtual.php 2008-07-18 22:35:33 UTC (rev 404) @@ -82,6 +82,7 @@ $query = "SELECT alias_domain,target_domain,extract(epoch from modified) as modified,active FROM $table_alias_domain WHERE target_domain='$fDomain' ORDER BY alias_domain LIMIT $page_size OFFSET $fDisplay"; } $result = db_query ($query); +$tAliasDomains = array(); if ($result['rows'] > 0) { while ($row = db_array ($result['result'])) @@ -101,6 +102,7 @@ $query = "SELECT alias_domain,target_domain,extract(epoch from modified) as modified,active FROM $table_alias_domain WHERE alias_domain='$fDomain'"; } $result = db_query ($query); +$tTargetDomain = ""; if ($result['rows'] > 0) { if($row = db_array ($result['result'])) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |