Thread: SF.net SVN: postfixadmin:[411] trunk
Brought to you by:
christian_boltz,
gingerdog
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-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: <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 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-29 23:18:35
|
Revision: 429 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=429&view=rev Author: christian_boltz Date: 2008-07-29 23:18:40 +0000 (Tue, 29 Jul 2008) Log Message: ----------- functions.inc.php: - move DNS checks from check_email() to check_domain() - add clear error message on non-resolvable domains (using flash_error() - this is probably not the best solution, but better than nothing) - made error messages translatable create-domain.php: - avoid duplicated call to check_domain (to avoid duplicated error message) - domains are now DNS-checked on creation - see the changes in check_domain() in functions.inc.php languages/*: - added error messages for the above changes Modified Paths: -------------- trunk/create-domain.php trunk/functions.inc.php trunk/languages/bg.lang trunk/languages/ca.lang trunk/languages/cn.lang trunk/languages/cs.lang trunk/languages/da.lang trunk/languages/de.lang trunk/languages/en.lang trunk/languages/es.lang trunk/languages/et.lang trunk/languages/eu.lang trunk/languages/fi.lang trunk/languages/fo.lang trunk/languages/fr.lang trunk/languages/hr.lang trunk/languages/hu.lang trunk/languages/is.lang trunk/languages/it.lang trunk/languages/ja.lang trunk/languages/lt.lang trunk/languages/mk.lang trunk/languages/nb.lang trunk/languages/nl.lang trunk/languages/nn.lang trunk/languages/pl.lang trunk/languages/pt-br.lang trunk/languages/ru.lang trunk/languages/sk.lang trunk/languages/sl.lang trunk/languages/sv.lang trunk/languages/tr.lang trunk/languages/tw.lang Modified: trunk/create-domain.php =================================================================== --- trunk/create-domain.php 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/create-domain.php 2008-07-29 23:18:40 UTC (rev 429) @@ -76,8 +76,8 @@ if (isset ($_POST['fTransport'])) $tTransport = escape_string ($_POST['fTransport']); if (isset ($_POST['fDefaultaliases'])) $tDefaultaliases = escape_string ($_POST['fDefaultaliases']); if (isset ($_POST['fBackupmx'])) $tBackupmx = escape_string ($_POST['fBackupmx']); + /* if (empty ($fDomain) or !check_domain ($fDomain)) */ $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error2']; if (domain_exist ($fDomain)) $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error']; - if (empty ($fDomain) or !check_domain ($fDomain)) $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error2']; } if ($error != 1) Modified: trunk/functions.inc.php =================================================================== --- trunk/functions.inc.php 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/functions.inc.php 2008-07-29 23:18:40 UTC (rev 429) @@ -227,14 +227,37 @@ // TODO: make check_domain able to handle as example .local domains function check_domain ($domain) { - if (preg_match ('/([-0-9A-Z]+\.)+' . '([0-9A-Z]){2,6}$/i', trim ($domain))) + global $CONF; + global $PALANG; + + if (!preg_match ('/([-0-9A-Z]+\.)+' . '([0-9A-Z]){2,6}$/i', trim ($domain))) { - return true; + flash_error(sprintf($PALANG['pInvalidDomainRegex'], htmlentities($domain))); + return false; } - else + + if (isset($CONF['emailcheck_resolve_domain']) && 'YES' == $CONF['emailcheck_resolve_domain'] && 'WINDOWS'!=(strtoupper(substr(php_uname('s'), 0, 7)))) { - return false; + + // Look for an AAAA, A, or MX record for the domain + + if(function_exists('checkdnsrr')) { + // AAAA (IPv6) is only available in PHP v. >= 5 + if (version_compare(phpversion(), "5.0.0", ">=")) + { + if (checkdnsrr($domain,'AAAA')) return true; + } + if (checkdnsrr($domain,'A')) return true; + if (checkdnsrr($domain,'MX')) return true; + flash_error(sprintf($PALANG['pInvalidDomainDNS'], htmlentities($domain))); + return false; + } + else { + flash_error("emailcheck_resolve_domain is enabled, but function (checkdnsrr) missing!"); + } } + + return true; } @@ -260,47 +283,24 @@ $ce_email = preg_replace("/#/", '@', $ce_email); } - if (isset($CONF['emailcheck_resolve_domain']) && 'YES' == $CONF['emailcheck_resolve_domain'] && 'WINDOWS'!=(strtoupper(substr(php_uname('s'), 0, 7)))) + // Perform non-domain-part sanity checks + if (!preg_match ('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '[^@]+$/i', trim ($ce_email))) { - - // Perform non-domain-part sanity checks - if (!preg_match ('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '[^@]+$/i', trim ($ce_email))) - { - return false; - } - - // Determine domain name - $matches=array(); - if (!preg_match('|@(.+)$|',$ce_email,$matches)) - { - return false; - } - $domain=$matches[1]; - - // Look for an AAAA, A, or MX record for the domain - - if(function_exists('checkdnsrr')) { - // AAAA (IPv6) is only available in PHP v. >= 5 - if (version_compare(phpversion(), "5.0.0", ">=")) - { - if (checkdnsrr($domain,'AAAA')) return true; - } - if (checkdnsrr($domain,'A')) return true; - if (checkdnsrr($domain,'MX')) return true; - flash_error("Invalid domain, and/or not discoverable in DNS"); - return false; - } - else { - flash_error("emailcheck_resolve_domain is enabled, but function (checkdnsrr) missing!"); - } + flash_error($PALANG['pInvalidMailRegex']); + return false; } - if (preg_match ('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_{|}~]+' . '@' . '([-0-9A-Z]+\.)+' . '([0-9A-Z]){2,6}$/i', trim ($ce_email))) + // Determine domain name + $matches=array(); + if (!preg_match('|@(.+)$|',$ce_email,$matches)) { - return true; + flash_error($PALANG['pInvalidMailRegex']); + return false; } - flash_error("Invalid email address, fails regexp check"); - return false; + $domain=$matches[1]; + + # check domain name + return check_domain($domain); } Modified: trunk/languages/bg.lang =================================================================== --- trunk/languages/bg.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/bg.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -375,6 +375,9 @@ $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX Modified: trunk/languages/ca.lang =================================================================== --- trunk/languages/ca.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/ca.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -374,6 +374,9 @@ $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX Modified: trunk/languages/cn.lang =================================================================== --- trunk/languages/cn.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/cn.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -374,6 +374,9 @@ $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX Modified: trunk/languages/cs.lang =================================================================== --- trunk/languages/cs.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/cs.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -386,6 +386,9 @@ $PALANG['pStatus_custom'] = 'Doručeno do '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; $PALANG['pPasswordTooShort'] = "Heslo je příliš krátké - je vyžadováno minimálně %s znaků"; +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Stahovat poštu pro:'; $PALANG['pFetchmail_new_entry'] = 'Nová položka'; $PALANG['pFetchmail_database_save_error'] = 'Tuto položku není možné uložit do databáze!'; Modified: trunk/languages/da.lang =================================================================== --- trunk/languages/da.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/da.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -385,6 +385,9 @@ $PALANG['pStatus_popimap'] = 'POP/IMAP '; $PALANG['pPasswordTooShort'] = "Adgangskoden er for kort - mindst %s tegn kræves"; +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Hent post for:'; $PALANG['pFetchmail_new_entry'] = 'Ny regel'; Modified: trunk/languages/de.lang =================================================================== --- trunk/languages/de.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/de.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -385,6 +385,9 @@ $PALANG['pStatus_popimap'] = 'POP/IMAP '; $PALANG['pPasswordTooShort'] = "Das Passwort ist zu kurz - mindestens %s Zeichen benötigt"; +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'E-Mail Abruf für: '; $PALANG['pFetchmail_new_entry'] = 'Neuer Eintrag'; Modified: trunk/languages/en.lang =================================================================== --- trunk/languages/en.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/en.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -386,6 +386,9 @@ $PALANG['pStatus_popimap'] = 'POP/IMAP '; $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # usage: flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length'])); +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; $PALANG['pFetchmail_new_entry'] = 'New entry'; Modified: trunk/languages/es.lang =================================================================== --- trunk/languages/es.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/es.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -375,6 +375,9 @@ $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX Modified: trunk/languages/et.lang =================================================================== --- trunk/languages/et.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/et.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -378,6 +378,9 @@ $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX Modified: trunk/languages/eu.lang =================================================================== --- trunk/languages/eu.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/eu.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -373,6 +373,9 @@ $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX Modified: trunk/languages/fi.lang =================================================================== --- trunk/languages/fi.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/fi.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -376,6 +376,9 @@ $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX Modified: trunk/languages/fo.lang =================================================================== --- trunk/languages/fo.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/fo.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -379,6 +379,9 @@ $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX Modified: trunk/languages/fr.lang =================================================================== --- trunk/languages/fr.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/fr.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -376,6 +376,9 @@ $PALANG['pStatus_custom'] = 'Délivré à '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; $PALANG['pPasswordTooShort'] = "Mot de passe trop court. - %s caractères minimum"; +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Récupérer le courrier pour :'; $PALANG['pFetchmail_new_entry'] = 'Nouvelle entrée'; $PALANG['pFetchmail_database_save_error'] = 'Impossible d\'enregistrer cette entrée dans la base!'; Modified: trunk/languages/hr.lang =================================================================== --- trunk/languages/hr.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/hr.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -372,6 +372,9 @@ $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX Modified: trunk/languages/hu.lang =================================================================== --- trunk/languages/hu.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/hu.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -386,6 +386,9 @@ $PALANG['pStatus_popimap'] = 'POP/IMAP '; $PALANG['pPasswordTooShort'] = "A Jelszó túl rövid - legalább %s karakter szükséges"; +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Mail lehozása:'; $PALANG['pFetchmail_new_entry'] = 'Új bejegyzés'; Modified: trunk/languages/is.lang =================================================================== --- trunk/languages/is.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/is.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -373,6 +373,9 @@ $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX Modified: trunk/languages/it.lang =================================================================== --- trunk/languages/it.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/it.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -375,6 +375,9 @@ $PALANG['pStatus_custom'] = 'In consegna a '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; $PALANG['pPasswordTooShort'] = "Password troppo breve - minimo %s caratteri"; +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Ricevi posta per:'; $PALANG['pFetchmail_new_entry'] = 'Nuova voce'; $PALANG['pFetchmail_database_save_error'] = 'Impossibile registrare nel database!'; Modified: trunk/languages/ja.lang =================================================================== --- trunk/languages/ja.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/ja.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -384,6 +384,9 @@ $PALANG['pStatus_popimap'] = 'POP/IMAP '; $PALANG['pPasswordTooShort'] = "パスワードが短すぎます。最低 %s 文字必要です。"; # usage: flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length'])); +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'メール取得:'; $PALANG['pFetchmail_new_entry'] = '新しいエントリ'; Modified: trunk/languages/lt.lang =================================================================== --- trunk/languages/lt.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/lt.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -374,6 +374,9 @@ $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX Modified: trunk/languages/mk.lang =================================================================== --- trunk/languages/mk.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/mk.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -375,6 +375,9 @@ $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX Modified: trunk/languages/nb.lang =================================================================== --- trunk/languages/nb.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/nb.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -374,6 +374,9 @@ $PALANG['pStatus_custom'] = 'Leverer til '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; $PALANG['pPasswordTooShort'] = "Passordet er for kort - det må inneholde minst %s tegn"; +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Hent e-post for:'; $PALANG['pFetchmail_new_entry'] = 'Ny oppføring'; $PALANG['pFetchmail_database_save_error'] = 'Kunne ikke lagre denne oppføringen i databasen!'; Modified: trunk/languages/nl.lang =================================================================== --- trunk/languages/nl.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/nl.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -375,6 +375,9 @@ $PALANG['pStatus_custom'] = 'Bezorgen op '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; $PALANG['pPasswordTooShort'] = "Wachtwoord is te kort - moet minimaal %s karakters bevatten"; +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Haal mail op voor:'; $PALANG['pFetchmail_new_entry'] = 'Nieuw item'; $PALANG['pFetchmail_database_save_error'] = 'Niet in staat dit item toe te voegen aan database!'; Modified: trunk/languages/nn.lang =================================================================== --- trunk/languages/nn.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/nn.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -370,6 +370,9 @@ $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX Modified: trunk/languages/pl.lang =================================================================== --- trunk/languages/pl.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/pl.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -379,6 +379,9 @@ $PALANG['pStatus_custom'] = 'Dostarczyć do '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; $PALANG['pPasswordTooShort'] = "Hasło jest za krótkie - musi mieć minimum %s znaków"; +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Pobierz pocztę dla:'; $PALANG['pFetchmail_new_entry'] = 'Nowy wpis'; $PALANG['pFetchmail_database_save_error'] = 'Wpis nie może być zapisany w bazie danych!'; Modified: trunk/languages/pt-br.lang =================================================================== --- trunk/languages/pt-br.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/pt-br.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -374,6 +374,9 @@ $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX Modified: trunk/languages/ru.lang =================================================================== --- trunk/languages/ru.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/ru.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -386,6 +386,9 @@ $PALANG['pStatus_popimap'] = 'POP/IMAP '; $PALANG['pPasswordTooShort'] = "Пароль слишком короткий - требуется %s символов"; +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Собирать почту для:'; $PALANG['pFetchmail_new_entry'] = 'Новая запись'; Modified: trunk/languages/sk.lang =================================================================== --- trunk/languages/sk.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/sk.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -374,6 +374,9 @@ $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX Modified: trunk/languages/sl.lang =================================================================== --- trunk/languages/sl.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/sl.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -374,6 +374,9 @@ $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX Modified: trunk/languages/sv.lang =================================================================== --- trunk/languages/sv.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/sv.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -376,6 +376,9 @@ $PALANG['pStatus_custom'] = 'Levereras till '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; $PALANG['pPasswordTooShort'] = "För kort lösenord - ett lösenord på %s tecken krävs"; +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Hämta mail för:'; $PALANG['pFetchmail_new_entry'] = 'Ny anteckning'; $PALANG['pFetchmail_database_save_error'] = 'Misslyckades med att spara anteckningen i databasen!'; Modified: trunk/languages/tr.lang =================================================================== --- trunk/languages/tr.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/tr.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -374,6 +374,9 @@ $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX Modified: trunk/languages/tw.lang =================================================================== --- trunk/languages/tw.lang 2008-07-29 20:33:30 UTC (rev 428) +++ trunk/languages/tw.lang 2008-07-29 23:18:40 UTC (rev 429) @@ -374,6 +374,9 @@ $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX $PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX +$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX +$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-08-05 20:51:24
|
Revision: 439 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=439&view=rev Author: christian_boltz Date: 2008-08-05 20:51:23 +0000 (Tue, 05 Aug 2008) Log Message: ----------- Applying the patch from Stefan Breitegger (tuxstef @SF), see https://sourceforge.net/tracker/index.php?func=detail&aid=1995478&group_id=191583&atid=937966 + some small changes fetchmail.php - add checkbox to allow setting the fetchmail "ssl" option fetchmail.pl: - honor ssl option if set upgrade.php: - add ssl column to fetchmail table *.lang: - added field name and description for fetchmail ssl option Modified Paths: -------------- trunk/ADDITIONS/fetchmail.pl trunk/fetchmail.php trunk/languages/bg.lang trunk/languages/ca.lang trunk/languages/cn.lang trunk/languages/cs.lang trunk/languages/da.lang trunk/languages/de.lang trunk/languages/en.lang trunk/languages/es.lang trunk/languages/et.lang trunk/languages/eu.lang trunk/languages/fi.lang trunk/languages/fo.lang trunk/languages/fr.lang trunk/languages/hr.lang trunk/languages/hu.lang trunk/languages/is.lang trunk/languages/it.lang trunk/languages/ja.lang trunk/languages/lt.lang trunk/languages/mk.lang trunk/languages/nb.lang trunk/languages/nl.lang trunk/languages/nn.lang trunk/languages/pl.lang trunk/languages/pt-br.lang trunk/languages/ru.lang trunk/languages/sk.lang trunk/languages/sl.lang trunk/languages/sv.lang trunk/languages/tr.lang trunk/languages/tw.lang trunk/upgrade.php Modified: trunk/ADDITIONS/fetchmail.pl =================================================================== --- trunk/ADDITIONS/fetchmail.pl 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/ADDITIONS/fetchmail.pl 2008-08-05 20:51:23 UTC (rev 439) @@ -18,14 +18,14 @@ $dbh = DBI->connect($dsn, $user, $password) || die "cannot connect the database"; $sql=<<SQL; -SELECT id,mailbox,src_server,src_auth,src_user,src_password,src_folder,fetchall,keep,protocol,mda,extra_options +SELECT id,mailbox,src_server,src_auth,src_user,src_password,src_folder,fetchall,keep,protocol,mda,extra_options,ssl FROM fetchmail WHERE unix_timestamp(now())-unix_timestamp(date) > poll_time*60 SQL my (%config); map{ - my ($id,$mailbox,$src_server,$src_auth,$src_user,$src_password,$src_folder,$fetchall,$keep,$protocol,$mda,$extra_options)=@$_; + my ($id,$mailbox,$src_server,$src_auth,$src_user,$src_password,$src_folder,$fetchall,$keep,$protocol,$mda,$extra_options,$ssl)=@$_; $cmd="user '${src_user}' there with password '".decode_base64($src_password)."'"; $cmd.=" folder '${src_folder}'" if ($src_folder); @@ -36,6 +36,7 @@ $cmd.=" keep" if ($keep); $cmd.=" fetchall" if ($fetchall); + $cmd.=" ssl" if ($ssl); $cmd.=" ".$extra_options if ($extra_options); $text=<<TXT; Modified: trunk/fetchmail.php =================================================================== --- trunk/fetchmail.php 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/fetchmail.php 2008-08-05 20:51:23 UTC (rev 439) @@ -63,6 +63,7 @@ "fetchall" => array(1, 1, 'bool' ), "keep" => array(1, 1, 'bool' ), "protocol" => array(1, 1, 'enum' ), + "ssl" => array(1, 1, 'bool' ), "extra_options" => array($extra_options, $extra_options, 'longtext' ), "mda" => array($extra_options, $extra_options, 'longtext' ), "date" => array(0, $display_status, 'text' ), Modified: trunk/languages/bg.lang =================================================================== --- trunk/languages/bg.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/bg.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -398,6 +398,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,6 +414,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/ca.lang =================================================================== --- trunk/languages/ca.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/ca.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -397,6 +397,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -412,6 +413,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/cn.lang =================================================================== --- trunk/languages/cn.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/cn.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -397,6 +397,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -412,6 +413,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/cs.lang =================================================================== --- trunk/languages/cs.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/cs.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -409,6 +409,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Stahovat vše'; $PALANG['pFetchmail_field_keep'] = 'Nemazat'; $PALANG['pFetchmail_field_protocol'] = 'Protokol'; +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Parametry'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Datum'; @@ -424,6 +425,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Získávat všechny staré (přečtené) i nové zprávy'; $PALANG['pFetchmail_desc_keep'] = 'Ponechávat stažené zprávy na vzdáleném mailserveru'; $PALANG['pFetchmail_desc_protocol'] = 'Použitý protokol'; +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra parametry pro fetchmail'; $PALANG['pFetchmail_desc_mda'] = 'Program pro doručení pošty do schránky (MDA)'; $PALANG['pFetchmail_desc_date'] = 'Datum posledního stažení pošty/změny konfigurace'; Modified: trunk/languages/da.lang =================================================================== --- trunk/languages/da.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/da.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -409,6 +409,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Hent alle'; $PALANG['pFetchmail_field_keep'] = 'Behold'; $PALANG['pFetchmail_field_protocol'] = 'Protokol'; +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Ekstra tilvalg'; $PALANG['pFetchmail_field_mda'] = 'MDA (Mail Delivery Agent)'; $PALANG['pFetchmail_field_date'] = 'Dato'; @@ -424,6 +425,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Hent både gamle (sete) og nye beskeder'; $PALANG['pFetchmail_desc_keep'] = 'Gem hentede beskeder på den eksterne postserver'; $PALANG['pFetchmail_desc_protocol'] = 'Brug protokol'; +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Ekstra fetchmail flag'; $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; $PALANG['pFetchmail_desc_date'] = 'Dato for seneste prøve/konfigurationsændring'; Modified: trunk/languages/de.lang =================================================================== --- trunk/languages/de.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/de.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -409,6 +409,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Alle abholen'; $PALANG['pFetchmail_field_keep'] = 'Behalten'; $PALANG['pFetchmail_field_protocol'] = 'Protokoll'; +$PALANG['pFetchmail_field_ssl'] = 'SSL aktiv'; $PALANG['pFetchmail_field_extra_options'] = 'Zusätzliche Optionen'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Datum'; @@ -424,6 +425,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Sowohl alte (gelesene) als auch neue Nachrichten abholen'; $PALANG['pFetchmail_desc_keep'] = 'Abgeholte Nachrichten auf dem entfernten Server lassen'; $PALANG['pFetchmail_desc_protocol'] = 'Zu verwendendes Protokoll'; +$PALANG['pFetchmail_desc_ssl'] = 'Verschlüsselung mit SSL'; $PALANG['pFetchmail_desc_extra_options'] = 'Zusätzliche fetchmail-Optionen'; $PALANG['pFetchmail_desc_mda'] = 'Programm zur Mailauslieferung'; $PALANG['pFetchmail_desc_date'] = 'Datum des letzten Mailabrufs/Konfigurationsänderung'; Modified: trunk/languages/en.lang =================================================================== --- trunk/languages/en.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/en.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -410,6 +410,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; $PALANG['pFetchmail_field_keep'] = 'Keep'; $PALANG['pFetchmail_field_protocol'] = 'Protocol'; +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Date'; @@ -425,6 +426,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; Modified: trunk/languages/es.lang =================================================================== --- trunk/languages/es.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/es.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -398,6 +398,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,6 +414,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/et.lang =================================================================== --- trunk/languages/et.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/et.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -401,6 +401,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -416,6 +417,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/eu.lang =================================================================== --- trunk/languages/eu.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/eu.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -396,6 +396,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -411,6 +412,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/fi.lang =================================================================== --- trunk/languages/fi.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/fi.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -399,6 +399,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -414,6 +415,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/fo.lang =================================================================== --- trunk/languages/fo.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/fo.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -402,6 +402,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -417,6 +418,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/fr.lang =================================================================== --- trunk/languages/fr.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/fr.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -399,6 +399,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Tout récupérer'; $PALANG['pFetchmail_field_keep'] = 'Conserver'; $PALANG['pFetchmail_field_protocol'] = 'Protocole'; +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Options supplémentaires'; $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -414,6 +415,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Récupérer tous les messages, nouveaux et déjà lus'; $PALANG['pFetchmail_desc_keep'] = 'Conserver une copie des messages sur le serveur'; $PALANG['pFetchmail_desc_protocol'] = 'Protocole à utiliser'; +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Options supplémentaires de Fetchmail'; $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date dernière vérification/changement configuration'; Modified: trunk/languages/hr.lang =================================================================== --- trunk/languages/hr.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/hr.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -396,6 +396,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -411,6 +412,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/hu.lang =================================================================== --- trunk/languages/hu.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/hu.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -410,6 +410,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -425,6 +426,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/is.lang =================================================================== --- trunk/languages/is.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/is.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -396,6 +396,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -411,6 +412,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/it.lang =================================================================== --- trunk/languages/it.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/it.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -398,6 +398,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Ricevi tutto'; $PALANG['pFetchmail_field_keep'] = 'Conserva'; $PALANG['pFetchmail_field_protocol'] = 'Protocollo'; +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Data'; @@ -413,6 +414,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Recupera anche i messaggi già letti'; $PALANG['pFetchmail_desc_keep'] = 'Conserva una copia del messaggi sul server remoto'; $PALANG['pFetchmail_desc_protocol'] = 'Protocollo da usare'; +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Opzioni extra'; $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; $PALANG['pFetchmail_desc_date'] = 'Data dell\'ultima modifica o attività'; Modified: trunk/languages/ja.lang =================================================================== --- trunk/languages/ja.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/ja.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -408,6 +408,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'すべて取得'; $PALANG['pFetchmail_field_keep'] = '残す'; $PALANG['pFetchmail_field_protocol'] = 'プロトコル'; +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = '追加オプション'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = '日付'; @@ -423,6 +424,7 @@ $PALANG['pFetchmail_desc_fetchall'] = '既読と新着メッセージを取得するか'; $PALANG['pFetchmail_desc_keep'] = 'リモートサーバに取得済メッセージを残すか'; $PALANG['pFetchmail_desc_protocol'] = '利用するプロトコル'; +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = '追加の fetchmail オプション'; $PALANG['pFetchmail_desc_mda'] = 'メール配送エージェント (Mail Delivery Agent)'; $PALANG['pFetchmail_desc_date'] = '最終取得確認/設定変更日時'; Modified: trunk/languages/lt.lang =================================================================== --- trunk/languages/lt.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/lt.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -397,6 +397,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -412,6 +413,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/mk.lang =================================================================== --- trunk/languages/mk.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/mk.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -398,6 +398,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,6 +414,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/nb.lang =================================================================== --- trunk/languages/nb.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/nb.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -398,6 +398,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Hent alt'; $PALANG['pFetchmail_field_keep'] = 'Behold'; $PALANG['pFetchmail_field_protocol'] = 'Protokoll'; +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Ekstra alternativer'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Dato'; @@ -413,6 +414,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Hent både gamle og nye meldinger'; $PALANG['pFetchmail_desc_keep'] = 'Behold meldingene på den eksterne e-postserveren'; $PALANG['pFetchmail_desc_protocol'] = 'Protokoll som skal brukes'; +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Ekstra fetchmail-alternativer'; $PALANG['pFetchmail_desc_mda'] = 'E-postleveringsagent (Mail Delivery Agent)'; $PALANG['pFetchmail_desc_date'] = 'Dato for siste spørring/konfigurasjonsendring'; Modified: trunk/languages/nl.lang =================================================================== --- trunk/languages/nl.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/nl.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -398,6 +398,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'alle berichten ophalen'; $PALANG['pFetchmail_field_keep'] = 'behouden'; $PALANG['pFetchmail_field_protocol'] = 'protocol'; +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'extra opties'; $PALANG['pFetchmail_field_mda'] = 'MD'; $PALANG['pFetchmail_field_date'] = 'datum'; @@ -413,6 +414,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Haal zowel oude (gelezen) als nieuwe berichten op.'; $PALANG['pFetchmail_desc_keep'] = 'Opgehaalde berichten op de server achterlaten.'; $PALANG['pFetchmail_desc_protocol'] = 'het te gebruiken protocol.'; +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'extra opties voor fetchmail.'; $PALANG['pFetchmail_desc_mda'] = 'mail delivery agent.'; $PALANG['pFetchmail_desc_date'] = 'datum van de laatste berichtencontrole/configuratie verandering.'; Modified: trunk/languages/nn.lang =================================================================== --- trunk/languages/nn.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/nn.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -394,6 +394,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -409,6 +410,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/pl.lang =================================================================== --- trunk/languages/pl.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/pl.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -402,6 +402,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Pobierz wszystkie'; $PALANG['pFetchmail_field_keep'] = 'Pozostaw'; $PALANG['pFetchmail_field_protocol'] = 'Protokół'; +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Dodatkowe opcje'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Data'; @@ -417,6 +418,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Pobierz zarówno stare (przeczytane) jak i nowe wiadomości'; $PALANG['pFetchmail_desc_keep'] = 'Pozostaw wiadomości na serwerze'; $PALANG['pFetchmail_desc_protocol'] = 'Protokół'; +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Dodatkowe opcje dla fetchmail'; $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; $PALANG['pFetchmail_desc_date'] = 'Data ostatniego sprawdzenia/zmiany konfiguracji'; Modified: trunk/languages/pt-br.lang =================================================================== --- trunk/languages/pt-br.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/pt-br.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -397,6 +397,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -412,6 +413,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/ru.lang =================================================================== --- trunk/languages/ru.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/ru.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -410,6 +410,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Скачивать все'; $PALANG['pFetchmail_field_keep'] = 'Не удалять'; $PALANG['pFetchmail_field_protocol'] = 'Протокол'; +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Дополнительные параметры'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Дата'; @@ -425,6 +426,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Скачивать и старые (виденные), и новые сообщения'; $PALANG['pFetchmail_desc_keep'] = 'Не удалять скачанные сообщения с удаленного сервера'; $PALANG['pFetchmail_desc_protocol'] = 'Какой протокол использовать'; +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Дополнительные параметры fetchmail'; $PALANG['pFetchmail_desc_mda'] = 'Агент доставки почты (Mail Delivery Agent)'; $PALANG['pFetchmail_desc_date'] = 'Дата последнего опроса/изменения конфигурации'; Modified: trunk/languages/sk.lang =================================================================== --- trunk/languages/sk.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/sk.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -397,6 +397,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -412,6 +413,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/sl.lang =================================================================== --- trunk/languages/sl.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/sl.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -397,6 +397,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -412,6 +413,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/sv.lang =================================================================== --- trunk/languages/sv.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/sv.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -399,6 +399,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Hämta samtliga'; $PALANG['pFetchmail_field_keep'] = 'Behåll'; $PALANG['pFetchmail_field_protocol'] = 'Protokoll'; +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra inställningsmöjligheter'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Datum'; @@ -414,6 +415,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Hämta både gamla lästa (visade) brev och nya'; $PALANG['pFetchmail_desc_keep'] = 'Behåll hämtade brev på mailservern'; $PALANG['pFetchmail_desc_protocol'] = 'Använd följande protokoll'; +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail inställningar'; $PALANG['pFetchmail_desc_mda'] = 'Mailserveragent (MDA)'; $PALANG['pFetchmail_desc_date'] = 'Datum för senaste kontroll/konfigurationsändring'; Modified: trunk/languages/tr.lang =================================================================== --- trunk/languages/tr.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/tr.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -397,6 +397,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -412,6 +413,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/tw.lang =================================================================== --- trunk/languages/tw.lang 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/languages/tw.lang 2008-08-05 20:51:23 UTC (rev 439) @@ -397,6 +397,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX +$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -412,6 +413,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX +$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/upgrade.php =================================================================== --- trunk/upgrade.php 2008-08-05 20:26:30 UTC (rev 438) +++ trunk/upgrade.php 2008-08-05 20:51:23 UTC (rev 439) @@ -919,3 +919,17 @@ } +/** + * add ssl option for fetchmail + */ +function upgrade_439_mysql() { + $table_fetchmail = table_by_key('fetchmail'); + db_query_parsed(" + ALTER TABLE `$table_fetchmail` ADD `ssl` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0' AFTER `protocol` ; + "); +} +function upgrade_439_pgsql() { + db_query_parsed(" + ALTER TABLE $table_fetchmail ADD COLUMN ssl BOOLEAN NOT NULL DEFAULT false; + "); +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2008-08-14 18:58:03
|
Revision: 444 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=444&view=rev Author: GingerDog Date: 2008-08-14 18:58:13 +0000 (Thu, 14 Aug 2008) Log Message: ----------- imap-prefix patch - see https://sourceforge.net/tracker/index.php?func=detail&aid=2049852&group_id=191583&atid=937964 , apparently useful for courier Modified Paths: -------------- trunk/config.inc.php trunk/functions.inc.php Modified: trunk/config.inc.php =================================================================== --- trunk/config.inc.php 2008-08-14 18:50:33 UTC (rev 443) +++ trunk/config.inc.php 2008-08-14 18:58:13 UTC (rev 444) @@ -322,6 +322,9 @@ // $CONF['create_mailbox_subdirs']=array('Spam'); // $CONF['create_mailbox_subdirs_host']='localhost'; // +// Specify '' for Dovecot and 'INBOX.' for Courier. +$CONF['create_mailbox_subdirs_prefix']=''; +// // Normally, the TCP port number does not have to be specified. // $CONF['create_mailbox_subdirs_hostport']=143; // Modified: trunk/functions.inc.php =================================================================== --- trunk/functions.inc.php 2008-08-14 18:50:33 UTC (rev 443) +++ trunk/functions.inc.php 2008-08-14 18:58:13 UTC (rev 444) @@ -1915,6 +1915,7 @@ } $s_host=$CONF['create_mailbox_subdirs_host']; + $s_prefix=$CONF['create_mailbox_subdirs_prefix']; $s_options=''; $s_port=''; @@ -1957,7 +1958,7 @@ foreach($CONF['create_mailbox_subdirs'] as $f) { - $f='{'.$s_host.'}INBOX.'.$f; + $f='{'.$s_host.'}'.$s_prefix.$f; $res=imap_createmailbox($i,$f); if (!$res) { @imap_close($i); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-11-01 20:15:52
|
Revision: 471 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=471&view=rev Author: christian_boltz Date: 2008-11-01 20:15:46 +0000 (Sat, 01 Nov 2008) Log Message: ----------- config.inc.php, functions.inc.php, templates/list-virtual.php: - dropped $CONF['show_custom_count'], it can easily be calculated with count($CONF['show_custom_domains']). This fixes part (6) of https://sourceforge.net/tracker2/?func=detail&aid=1951926&group_id=191583&atid=937967 config.inc.php: - added some comments explaining $CONF['show_undeliverable_exceptions'] and $CONF['show_custom_domains'] Modified Paths: -------------- trunk/config.inc.php trunk/functions.inc.php trunk/templates/list-virtual.php Modified: trunk/config.inc.php =================================================================== --- trunk/config.inc.php 2008-10-31 13:37:49 UTC (rev 470) +++ trunk/config.inc.php 2008-11-01 20:15:46 UTC (rev 471) @@ -274,11 +274,13 @@ // elsewhere, you will probably want to disable this. $CONF['show_undeliverable']='NO'; $CONF['show_undeliverable_color']='tomato'; +// mails to these domains will never be flagged as undeliverable $CONF['show_undeliverable_exceptions']=array("unixmail.domain.ext","exchangeserver.domain.ext","gmail.com"); $CONF['show_popimap']='NO'; $CONF['show_popimap_color']='darkgrey'; -// set 'show_custom_count' to 0 to disable custom indicators -$CONF['show_custom_count']=2; +// you can assign special colors to some domains. To do this, +// - add the domain to show_custom_domains +// - add the corresponding color to show_custom_colors $CONF['show_custom_domains']=array("subdomain.domain.ext","domain2.ext"); $CONF['show_custom_colors']=array("lightgreen","lightblue"); Modified: trunk/functions.inc.php =================================================================== --- trunk/functions.inc.php 2008-10-31 13:37:49 UTC (rev 470) +++ trunk/functions.inc.php 2008-11-01 20:15:46 UTC (rev 471) @@ -2061,7 +2061,7 @@ } // CUSTOM DESTINATION CHECK - if ( $CONF['show_custom_count'] > 0 ) + if ( count($CONF['show_custom_domains']) > 0 ) { for ($i = 0; $i < sizeof ($CONF['show_custom_domains']); $i++) { Modified: trunk/templates/list-virtual.php =================================================================== --- trunk/templates/list-virtual.php 2008-10-31 13:37:49 UTC (rev 470) +++ trunk/templates/list-virtual.php 2008-11-01 20:15:46 UTC (rev 471) @@ -370,7 +370,7 @@ print " <span style='background-color:" . $CONF['show_popimap_color'] . "'>" . $CONF['show_status_text'] . "</span>=" . $PALANG['pStatus_popimap'] . "\n"; } - if ( $CONF['show_custom_count'] > 0 ) + if ( count($CONF['show_custom_domains']) > 0 ) { for ($i = 0; $i < sizeof ($CONF['show_custom_domains']); $i++) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-11-12 21:48:36
|
Revision: 479 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=479&view=rev Author: christian_boltz Date: 2008-11-12 21:48:31 +0000 (Wed, 12 Nov 2008) Log Message: ----------- fetchmail.php: - allow superadmin to create fetchmail entry for any mailbox, not only for himself https://sourceforge.net/tracker/index.php?func=detail&aid=2147740&group_id=191583&atid=937964 upgrade.php, fetchmail.php, fetchmail.pl: - rename fetchmail ssl field to usessl - "ssl" is a reserved word in MySQL and therefore causes various problems (we would need to quote the field name everywhere) https://sourceforge.net/tracker/index.php?func=detail&aid=2265333&group_id=191583&atid=937964 languages/*.lang: - renamed strings for fetchmail (use)ssl field Modified Paths: -------------- trunk/ADDITIONS/fetchmail.pl trunk/fetchmail.php trunk/languages/bg.lang trunk/languages/ca.lang trunk/languages/cn.lang trunk/languages/cs.lang trunk/languages/da.lang trunk/languages/de.lang trunk/languages/en.lang trunk/languages/es.lang trunk/languages/et.lang trunk/languages/eu.lang trunk/languages/fi.lang trunk/languages/fo.lang trunk/languages/fr.lang trunk/languages/hr.lang trunk/languages/hu.lang trunk/languages/is.lang trunk/languages/it.lang trunk/languages/ja.lang trunk/languages/lt.lang trunk/languages/mk.lang trunk/languages/nb.lang trunk/languages/nl.lang trunk/languages/nn.lang trunk/languages/pl.lang trunk/languages/pt-br.lang trunk/languages/ru.lang trunk/languages/sk.lang trunk/languages/sl.lang trunk/languages/sv.lang trunk/languages/tr.lang trunk/languages/tw.lang trunk/upgrade.php Modified: trunk/ADDITIONS/fetchmail.pl =================================================================== --- trunk/ADDITIONS/fetchmail.pl 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/ADDITIONS/fetchmail.pl 2008-11-12 21:48:31 UTC (rev 479) @@ -18,14 +18,14 @@ $dbh = DBI->connect($dsn, $user, $password) || die "cannot connect the database"; $sql=<<SQL; -SELECT id,mailbox,src_server,src_auth,src_user,src_password,src_folder,fetchall,keep,protocol,mda,extra_options,ssl +SELECT id,mailbox,src_server,src_auth,src_user,src_password,src_folder,fetchall,keep,protocol,mda,extra_options,usessl FROM fetchmail WHERE unix_timestamp(now())-unix_timestamp(date) > poll_time*60 SQL my (%config); map{ - my ($id,$mailbox,$src_server,$src_auth,$src_user,$src_password,$src_folder,$fetchall,$keep,$protocol,$mda,$extra_options,$ssl)=@$_; + my ($id,$mailbox,$src_server,$src_auth,$src_user,$src_password,$src_folder,$fetchall,$keep,$protocol,$mda,$extra_options,$usessl)=@$_; $cmd="user '${src_user}' there with password '".decode_base64($src_password)."'"; $cmd.=" folder '${src_folder}'" if ($src_folder); @@ -36,7 +36,7 @@ $cmd.=" keep" if ($keep); $cmd.=" fetchall" if ($fetchall); - $cmd.=" ssl" if ($ssl); + $cmd.=" ssl" if ($usessl); $cmd.=" ".$extra_options if ($extra_options); $text=<<TXT; Modified: trunk/fetchmail.php =================================================================== --- trunk/fetchmail.php 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/fetchmail.php 2008-11-12 21:48:31 UTC (rev 479) @@ -63,7 +63,7 @@ "fetchall" => array(1, 1, 'bool' ), "keep" => array(1, 1, 'bool' ), "protocol" => array(1, 1, 'enum' ), - "ssl" => array(1, 1, 'bool' ), + "usessl" => array(1, 1, 'bool' ), "extra_options" => array($extra_options, $extra_options, 'longtext' ), "mda" => array($extra_options, $extra_options, 'longtext' ), "date" => array(0, $display_status, 'text' ), @@ -92,7 +92,12 @@ $table_fetchmail = table_by_key('fetchmail'); $table_mailbox = table_by_key('mailbox'); -$list_domains = list_domains_for_admin ($SESSID_USERNAME); +if (authentication_has_role('global-admin')) { + $list_domains = list_domains (); +} else { + $list_domains = list_domains_for_admin(authentication_get_username()); +} + $user_domains=implode(", ",array_values($list_domains)); # for displaying $user_domains_sql=implode("','",escape_string(array_values($list_domains))); # for SQL $sql="SELECT username FROM $table_mailbox WHERE domain in ('".$user_domains_sql."')"; # TODO: replace with domain selection dropdown Modified: trunk/languages/bg.lang =================================================================== --- trunk/languages/bg.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/bg.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -398,7 +398,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -414,7 +414,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/ca.lang =================================================================== --- trunk/languages/ca.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/ca.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -397,7 +397,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,7 +413,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/cn.lang =================================================================== --- trunk/languages/cn.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/cn.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -397,7 +397,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,7 +413,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/cs.lang =================================================================== --- trunk/languages/cs.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/cs.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -409,7 +409,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Stahovat vše'; $PALANG['pFetchmail_field_keep'] = 'Nemazat'; $PALANG['pFetchmail_field_protocol'] = 'Protokol'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Parametry'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Datum'; @@ -425,7 +425,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Získávat všechny staré (přečtené) i nové zprávy'; $PALANG['pFetchmail_desc_keep'] = 'Ponechávat stažené zprávy na vzdáleném mailserveru'; $PALANG['pFetchmail_desc_protocol'] = 'Použitý protokol'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra parametry pro fetchmail'; $PALANG['pFetchmail_desc_mda'] = 'Program pro doručení pošty do schránky (MDA)'; $PALANG['pFetchmail_desc_date'] = 'Datum posledního stažení pošty/změny konfigurace'; Modified: trunk/languages/da.lang =================================================================== --- trunk/languages/da.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/da.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -409,7 +409,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Hent alle'; $PALANG['pFetchmail_field_keep'] = 'Behold'; $PALANG['pFetchmail_field_protocol'] = 'Protokol'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Ekstra tilvalg'; $PALANG['pFetchmail_field_mda'] = 'MDA (Mail Delivery Agent)'; $PALANG['pFetchmail_field_date'] = 'Dato'; @@ -425,7 +425,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Hent både gamle (sete) og nye beskeder'; $PALANG['pFetchmail_desc_keep'] = 'Gem hentede beskeder på den eksterne postserver'; $PALANG['pFetchmail_desc_protocol'] = 'Brug protokol'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Ekstra fetchmail flag'; $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; $PALANG['pFetchmail_desc_date'] = 'Dato for seneste prøve/konfigurationsændring'; Modified: trunk/languages/de.lang =================================================================== --- trunk/languages/de.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/de.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -409,7 +409,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Alle abholen'; $PALANG['pFetchmail_field_keep'] = 'Behalten'; $PALANG['pFetchmail_field_protocol'] = 'Protokoll'; -$PALANG['pFetchmail_field_ssl'] = 'SSL aktiv'; +$PALANG['pFetchmail_field_usessl'] = 'SSL aktiv'; $PALANG['pFetchmail_field_extra_options'] = 'Zusätzliche Optionen'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Datum'; @@ -425,7 +425,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Sowohl alte (gelesene) als auch neue Nachrichten abholen'; $PALANG['pFetchmail_desc_keep'] = 'Abgeholte Nachrichten auf dem entfernten Server lassen'; $PALANG['pFetchmail_desc_protocol'] = 'Zu verwendendes Protokoll'; -$PALANG['pFetchmail_desc_ssl'] = 'Verschlüsselung mit SSL'; +$PALANG['pFetchmail_desc_usessl'] = 'Verschlüsselung mit SSL'; $PALANG['pFetchmail_desc_extra_options'] = 'Zusätzliche fetchmail-Optionen'; $PALANG['pFetchmail_desc_mda'] = 'Programm zur Mailauslieferung'; $PALANG['pFetchmail_desc_date'] = 'Datum des letzten Mailabrufs/Konfigurationsänderung'; Modified: trunk/languages/en.lang =================================================================== --- trunk/languages/en.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/en.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -410,7 +410,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; $PALANG['pFetchmail_field_keep'] = 'Keep'; $PALANG['pFetchmail_field_protocol'] = 'Protocol'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Date'; @@ -426,7 +426,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; Modified: trunk/languages/es.lang =================================================================== --- trunk/languages/es.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/es.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -398,7 +398,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -414,7 +414,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/et.lang =================================================================== --- trunk/languages/et.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/et.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -401,7 +401,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -417,7 +417,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/eu.lang =================================================================== --- trunk/languages/eu.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/eu.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -396,7 +396,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -412,7 +412,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/fi.lang =================================================================== --- trunk/languages/fi.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/fi.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -399,7 +399,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -415,7 +415,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/fo.lang =================================================================== --- trunk/languages/fo.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/fo.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -402,7 +402,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -418,7 +418,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/fr.lang =================================================================== --- trunk/languages/fr.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/fr.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -399,7 +399,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Tout récupérer'; $PALANG['pFetchmail_field_keep'] = 'Conserver'; $PALANG['pFetchmail_field_protocol'] = 'Protocole'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Options supplémentaires'; $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -415,7 +415,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Récupérer tous les messages, nouveaux et déjà lus'; $PALANG['pFetchmail_desc_keep'] = 'Conserver une copie des messages sur le serveur'; $PALANG['pFetchmail_desc_protocol'] = 'Protocole à utiliser'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Options supplémentaires de Fetchmail'; $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date dernière vérification/changement configuration'; Modified: trunk/languages/hr.lang =================================================================== --- trunk/languages/hr.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/hr.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -396,7 +396,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -412,7 +412,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/hu.lang =================================================================== --- trunk/languages/hu.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/hu.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -410,7 +410,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -426,7 +426,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/is.lang =================================================================== --- trunk/languages/is.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/is.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -396,7 +396,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -412,7 +412,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/it.lang =================================================================== --- trunk/languages/it.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/it.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -398,7 +398,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Ricevi tutto'; $PALANG['pFetchmail_field_keep'] = 'Conserva'; $PALANG['pFetchmail_field_protocol'] = 'Protocollo'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Data'; @@ -414,7 +414,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Recupera anche i messaggi già letti'; $PALANG['pFetchmail_desc_keep'] = 'Conserva una copia del messaggi sul server remoto'; $PALANG['pFetchmail_desc_protocol'] = 'Protocollo da usare'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Opzioni extra'; $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; $PALANG['pFetchmail_desc_date'] = 'Data dell\'ultima modifica o attività'; Modified: trunk/languages/ja.lang =================================================================== --- trunk/languages/ja.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/ja.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -408,7 +408,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'すべて取得'; $PALANG['pFetchmail_field_keep'] = '残す'; $PALANG['pFetchmail_field_protocol'] = 'プロトコル'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = '追加オプション'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = '日付'; @@ -424,7 +424,7 @@ $PALANG['pFetchmail_desc_fetchall'] = '既読と新着メッセージを取得するか'; $PALANG['pFetchmail_desc_keep'] = 'リモートサーバに取得済メッセージを残すか'; $PALANG['pFetchmail_desc_protocol'] = '利用するプロトコル'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = '追加の fetchmail オプション'; $PALANG['pFetchmail_desc_mda'] = 'メール配送エージェント (Mail Delivery Agent)'; $PALANG['pFetchmail_desc_date'] = '最終取得確認/設定変更日時'; Modified: trunk/languages/lt.lang =================================================================== --- trunk/languages/lt.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/lt.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -397,7 +397,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,7 +413,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/mk.lang =================================================================== --- trunk/languages/mk.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/mk.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -398,7 +398,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -414,7 +414,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/nb.lang =================================================================== --- trunk/languages/nb.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/nb.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -398,7 +398,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Hent alt'; $PALANG['pFetchmail_field_keep'] = 'Behold'; $PALANG['pFetchmail_field_protocol'] = 'Protokoll'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Ekstra alternativer'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Dato'; @@ -414,7 +414,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Hent både gamle og nye meldinger'; $PALANG['pFetchmail_desc_keep'] = 'Behold meldingene på den eksterne e-postserveren'; $PALANG['pFetchmail_desc_protocol'] = 'Protokoll som skal brukes'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Ekstra fetchmail-alternativer'; $PALANG['pFetchmail_desc_mda'] = 'E-postleveringsagent (Mail Delivery Agent)'; $PALANG['pFetchmail_desc_date'] = 'Dato for siste spørring/konfigurasjonsendring'; Modified: trunk/languages/nl.lang =================================================================== --- trunk/languages/nl.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/nl.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -398,7 +398,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'alle berichten ophalen'; $PALANG['pFetchmail_field_keep'] = 'behouden'; $PALANG['pFetchmail_field_protocol'] = 'protocol'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'extra opties'; $PALANG['pFetchmail_field_mda'] = 'MD'; $PALANG['pFetchmail_field_date'] = 'datum'; @@ -414,7 +414,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Haal zowel oude (gelezen) als nieuwe berichten op.'; $PALANG['pFetchmail_desc_keep'] = 'Opgehaalde berichten op de server achterlaten.'; $PALANG['pFetchmail_desc_protocol'] = 'het te gebruiken protocol.'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'extra opties voor fetchmail.'; $PALANG['pFetchmail_desc_mda'] = 'mail delivery agent.'; $PALANG['pFetchmail_desc_date'] = 'datum van de laatste berichtencontrole/configuratie verandering.'; Modified: trunk/languages/nn.lang =================================================================== --- trunk/languages/nn.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/nn.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -394,7 +394,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -410,7 +410,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/pl.lang =================================================================== --- trunk/languages/pl.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/pl.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -402,7 +402,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Pobierz wszystkie'; $PALANG['pFetchmail_field_keep'] = 'Pozostaw'; $PALANG['pFetchmail_field_protocol'] = 'Protokół'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Dodatkowe opcje'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Data'; @@ -418,7 +418,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Pobierz zarówno stare (przeczytane) jak i nowe wiadomości'; $PALANG['pFetchmail_desc_keep'] = 'Pozostaw wiadomości na serwerze'; $PALANG['pFetchmail_desc_protocol'] = 'Protokół'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Dodatkowe opcje dla fetchmail'; $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; $PALANG['pFetchmail_desc_date'] = 'Data ostatniego sprawdzenia/zmiany konfiguracji'; Modified: trunk/languages/pt-br.lang =================================================================== --- trunk/languages/pt-br.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/pt-br.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -397,7 +397,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,7 +413,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/ru.lang =================================================================== --- trunk/languages/ru.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/ru.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -410,7 +410,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Скачивать все'; $PALANG['pFetchmail_field_keep'] = 'Не удалять'; $PALANG['pFetchmail_field_protocol'] = 'Протокол'; -$PALANG['pFetchmail_field_ssl'] = 'Включить SSL'; +$PALANG['pFetchmail_field_usessl'] = 'Включить SSL'; $PALANG['pFetchmail_field_extra_options'] = 'Дополнительные параметры'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Дата'; @@ -426,7 +426,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Скачивать и старые (виденные), и новые сообщения'; $PALANG['pFetchmail_desc_keep'] = 'Не удалять скачанные сообщения с удаленного сервера'; $PALANG['pFetchmail_desc_protocol'] = 'Какой протокол использовать'; -$PALANG['pFetchmail_desc_ssl'] = 'Шифрование SSL'; +$PALANG['pFetchmail_desc_usessl'] = 'Шифрование SSL'; $PALANG['pFetchmail_desc_extra_options'] = 'Дополнительные параметры fetchmail'; $PALANG['pFetchmail_desc_mda'] = 'Агент доставки почты (Mail Delivery Agent)'; $PALANG['pFetchmail_desc_date'] = 'Дата последнего опроса/изменения конфигурации'; Modified: trunk/languages/sk.lang =================================================================== --- trunk/languages/sk.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/sk.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -397,7 +397,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,7 +413,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/sl.lang =================================================================== --- trunk/languages/sl.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/sl.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -397,7 +397,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,7 +413,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/sv.lang =================================================================== --- trunk/languages/sv.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/sv.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -399,7 +399,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Hämta samtliga'; $PALANG['pFetchmail_field_keep'] = 'Behåll'; $PALANG['pFetchmail_field_protocol'] = 'Protokoll'; -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra inställningsmöjligheter'; $PALANG['pFetchmail_field_mda'] = 'MDA'; $PALANG['pFetchmail_field_date'] = 'Datum'; @@ -415,7 +415,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Hämta både gamla lästa (visade) brev och nya'; $PALANG['pFetchmail_desc_keep'] = 'Behåll hämtade brev på mailservern'; $PALANG['pFetchmail_desc_protocol'] = 'Använd följande protokoll'; -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail inställningar'; $PALANG['pFetchmail_desc_mda'] = 'Mailserveragent (MDA)'; $PALANG['pFetchmail_desc_date'] = 'Datum för senaste kontroll/konfigurationsändring'; Modified: trunk/languages/tr.lang =================================================================== --- trunk/languages/tr.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/tr.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -397,7 +397,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,7 +413,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/languages/tw.lang =================================================================== --- trunk/languages/tw.lang 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/languages/tw.lang 2008-11-12 21:48:31 UTC (rev 479) @@ -397,7 +397,7 @@ $PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX $PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX $PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX -$PALANG['pFetchmail_field_ssl'] = 'SSL active'; # XXX +$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX $PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX $PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX $PALANG['pFetchmail_field_date'] = 'Date'; # XXX @@ -413,7 +413,7 @@ $PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX $PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX $PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX -$PALANG['pFetchmail_desc_ssl'] = 'SSL encryption'; # XXX +$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX $PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX $PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX $PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX Modified: trunk/upgrade.php =================================================================== --- trunk/upgrade.php 2008-11-12 20:32:45 UTC (rev 478) +++ trunk/upgrade.php 2008-11-12 21:48:31 UTC (rev 479) @@ -990,4 +990,13 @@ } } +function upgrade_479_mysql () { + # ssl is a reserved word in MySQL and causes several problems. Renaming the field... + $table_fmail = table_by_key('fetchmail'); + db_query_parsed("ALTER TABLE `$table_fmail` CHANGE `ssl` `usessl` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0'"); +} +function upgrade_479_pgsql () { + $table_fmail = table_by_key('fetchmail'); + db_query_parsed("alter table $table_fmail rename column ssl to usessl"); +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2008-11-13 11:56:56
|
Revision: 482 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=482&view=rev Author: GingerDog Date: 2008-11-13 11:56:52 +0000 (Thu, 13 Nov 2008) Log Message: ----------- patch from int on irc - if $CONF[show_passwords] then do so Modified Paths: -------------- trunk/edit-mailbox.php trunk/templates/edit-mailbox.php Modified: trunk/edit-mailbox.php =================================================================== --- trunk/edit-mailbox.php 2008-11-12 22:57:30 UTC (rev 481) +++ trunk/edit-mailbox.php 2008-11-13 11:56:52 UTC (rev 482) @@ -20,6 +20,7 @@ * * tMessage * tName + * tPassword * tQuota * * Form POST \ GET Variables: @@ -75,7 +76,11 @@ if ('pgsql'==$CONF['database_type']) { $tActive = ('t'==$user_details['active']) ? 1 : 0; } - + $tPassword = ''; + if ($CONF['show_password'] == "YES") + { + $tPassword = $user_details['password']; + } $result = db_query ("SELECT * FROM $table_domain WHERE domain='$fDomain'"); if ($result['rows'] == 1) { Modified: trunk/templates/edit-mailbox.php =================================================================== --- trunk/templates/edit-mailbox.php 2008-11-12 22:57:30 UTC (rev 481) +++ trunk/templates/edit-mailbox.php 2008-11-13 11:56:52 UTC (rev 482) @@ -12,7 +12,7 @@ </tr> <tr> <td><?php print $PALANG['pEdit_mailbox_password'] . ":"; ?></td> - <td><input class="flat" type="password" name="fPassword" /></td> + <td><input class="flat" type="password" name="fPassword" value="<?php print htmlspecialchars ($tPassword,ENT_QUOTES); ?>"/></td> <td><?php print $pEdit_mailbox_password_text; ?></td> </tr> <tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-11-23 12:18:24
|
Revision: 485 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=485&view=rev Author: christian_boltz Date: 2008-11-23 12:18:20 +0000 (Sun, 23 Nov 2008) Log Message: ----------- edit-mailbox.php, templates/edit-mailbox.php: - revert r482 (show password when editing mailboxes) because it does more harm than good (see mailinglist for details). Also opened a feature request to bring this back in a way that works for everybody: https://sourceforge.net/tracker/index.php?func=detail&aid=2332595&group_id=191583&atid=937967 Modified Paths: -------------- trunk/edit-mailbox.php trunk/templates/edit-mailbox.php Modified: trunk/edit-mailbox.php =================================================================== --- trunk/edit-mailbox.php 2008-11-22 10:23:36 UTC (rev 484) +++ trunk/edit-mailbox.php 2008-11-23 12:18:20 UTC (rev 485) @@ -20,7 +20,6 @@ * * tMessage * tName - * tPassword * tQuota * * Form POST \ GET Variables: @@ -76,11 +75,7 @@ if ('pgsql'==$CONF['database_type']) { $tActive = ('t'==$user_details['active']) ? 1 : 0; } - $tPassword = ''; - if ($CONF['show_password'] == "YES") - { - $tPassword = $user_details['password']; - } + $result = db_query ("SELECT * FROM $table_domain WHERE domain='$fDomain'"); if ($result['rows'] == 1) { Modified: trunk/templates/edit-mailbox.php =================================================================== --- trunk/templates/edit-mailbox.php 2008-11-22 10:23:36 UTC (rev 484) +++ trunk/templates/edit-mailbox.php 2008-11-23 12:18:20 UTC (rev 485) @@ -12,7 +12,7 @@ </tr> <tr> <td><?php print $PALANG['pEdit_mailbox_password'] . ":"; ?></td> - <td><input class="flat" type="password" name="fPassword" value="<?php print htmlspecialchars ($tPassword,ENT_QUOTES); ?>"/></td> + <td><input class="flat" type="password" name="fPassword" /></td> <td><?php print $pEdit_mailbox_password_text; ?></td> </tr> <tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2008-12-15 21:28:45
|
Revision: 502 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=502&view=rev Author: GingerDog Date: 2008-12-15 21:28:41 +0000 (Mon, 15 Dec 2008) Log Message: ----------- create-domain.php: try and remove code duplication, expand use of $form_fields (defaults etc); only allow valid transport values through Modified Paths: -------------- trunk/create-domain.php trunk/templates/admin_create-domain.php Modified: trunk/create-domain.php =================================================================== --- trunk/create-domain.php 2008-12-15 21:27:31 UTC (rev 501) +++ trunk/create-domain.php 2008-12-15 21:28:41 UTC (rev 502) @@ -41,50 +41,61 @@ authentication_require_role('global-admin'); +$form_fields = array( + 'fDomain' => array('type' => 'str', 'default' => null), + 'fDescription' => array('type' => 'str', 'default' =>''), + 'fAliases' => array('type' => 'int', 'default' => $CONF['aliases']), + 'fMailboxes' => array('type' => 'int', 'default' => $CONF['mailboxes']), + 'fMaxquota' => array('type' => 'int', 'default' => $CONF['maxquota']), + 'fTransport' => array('type' => 'str', 'default' => $CONF['transport_default'], 'options' => $CONF['transport_options']), + 'fDefaultaliases' => array('type' => 'str', 'default' => 'off', 'options' => array('on', 'off')), + 'fBackupmx' => array('type' => 'str', 'default' => 'off', 'options' => array('on', 'off')) +); + +foreach($form_fields as $key => $default) { + if(isset($_POST[$key]) && (!empty($_POST[$key]))) { + $$key = escape_string($_POST[$key]); + } + else { + $$key = $default['default']; + } + if($default['type'] == 'int') { + $$key = intval($$key); + } + if($default['type'] == 'str') { + $$key = strip_tags($$key); /* should we even bother? */ + } + if(isset($default['options'])) { + if(!in_array($$key, $default['options'])) { + die("Invalid parameter given for $key"); + } + } +} if ($_SERVER['REQUEST_METHOD'] == "GET") { - $tAliases = $CONF['aliases']; - $tMailboxes = $CONF['mailboxes']; - $tMaxquota = $CONF['maxquota']; - $tTransport = $CONF['transport_default']; + /* default values as set above */ + $tTransport = $fTransport; + $tAliases = $fAliases; + $tMaxquota = $fMaxquota; + $tMailboxes = $fMailboxes; + $tDefaultAliases = $fDefaultaliases; + $tBackupmx = $fBackupmx; } if ($_SERVER['REQUEST_METHOD'] == "POST") { - if (isset($_POST['fDomain'])) { - $fDomain = escape_string($_POST['fDomain']); - } - $form_fields = array( - 'fDescription' => '', - 'fAliases' => '0', - 'fMailboxes' => '0', - 'fMaxquota' => '0', - 'fTransport' => $CONF['transport_default'], - 'fDefaultaliases' => '0', - 'fBackupmx' => '0' ); - - foreach($form_fields as $key => $default) { - if(isset($_POST[$key]) && (!empty($_POST[$key]))) { - $$key = escape_string($_POST[$key]); - } - else { - $$key = $default; - } - } - - - if (empty($fDomain) or domain_exist($fDomain) or !check_domain($fDomain)) + if ($fDomain == null or domain_exist($fDomain) or !check_domain($fDomain)) { $error = 1; - $tDomain = escape_string ($_POST['fDomain']); - $tDescription = escape_string ($_POST['fDescription']); - $tAliases = escape_string ($_POST['fAliases']); - $tMailboxes = escape_string ($_POST['fMailboxes']); - if (isset ($_POST['fMaxquota'])) $tMaxquota = escape_string ($_POST['fMaxquota']); - if (isset ($_POST['fTransport'])) $tTransport = escape_string ($_POST['fTransport']); - if (isset ($_POST['fDefaultaliases'])) $tDefaultaliases = escape_string ($_POST['fDefaultaliases']); - if (isset ($_POST['fBackupmx'])) $tBackupmx = escape_string ($_POST['fBackupmx']); - /* if (empty ($fDomain) or !check_domain ($fDomain)) */ $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error2']; + $tDomain = $fDomain; + $tDescription = $fDescription; + $tAliases = $fAliases; + $tMailboxes = $fMailboxes; + if (isset ($_POST['fMaxquota'])) $tMaxquota = $fMaxquota; + if (isset ($_POST['fTransport'])) $tTransport = $fTransport; + if (isset ($_POST['fDefaultaliases'])) $tDefaultaliases = $fDefaultaliases; + if (isset ($_POST['fBackupmx'])) $tBackupmx = $fBackupmx; + $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error2']; if (domain_exist ($fDomain)) $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error']; } Modified: trunk/templates/admin_create-domain.php =================================================================== --- trunk/templates/admin_create-domain.php 2008-12-15 21:27:31 UTC (rev 501) +++ trunk/templates/admin_create-domain.php 2008-12-15 21:28:41 UTC (rev 502) @@ -55,15 +55,15 @@ <?php } ?> <tr> <td><?php print $PALANG['pAdminCreate_domain_defaultaliases'] . ":"; ?></td> - <td><?php $checked = (!empty ($tDefaultaliases)) ? 'checked' : ''; ?> - <input class="flat" type="checkbox" name="fDefaultaliases" <?php print $checked; ?> /> + <td><?php $checked = ($tDefaultaliases == 'on') ? 'checked=checked' : ''; ?> + <input class="flat" type="checkbox" value='on' name="fDefaultaliases" <?php print $checked; ?> /> </td> <td><?php print $PALANG['pAdminCreate_domain_defaultaliases_text']; ?></td> </tr> <tr> <td><?php print $PALANG['pAdminCreate_domain_backupmx'] . ":"; ?></td> - <td><?php $checked = (!empty ($tBackupmx)) ? 'checked' : ''; ?> - <input class="flat" type="checkbox" name="fBackupmx" <?php print $checked; ?> /> + <td><?php $checked = ($tBackupmx == 'on') ? 'checked' : ''; ?> + <input class="flat" type="checkbox" value='on' name="fBackupmx" <?php print $checked; ?> /> </td> <td> </td> </tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2009-01-14 16:04:00
|
Revision: 515 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=515&view=rev Author: GingerDog Date: 2009-01-14 16:03:50 +0000 (Wed, 14 Jan 2009) Log Message: ----------- en.lang: see ticket 2359801 - make login messages more generic Modified Paths: -------------- trunk/languages/en.lang trunk/login.php Modified: trunk/languages/en.lang =================================================================== --- trunk/languages/en.lang 2009-01-14 13:13:25 UTC (rev 514) +++ trunk/languages/en.lang 2009-01-14 16:03:50 UTC (rev 515) @@ -24,8 +24,7 @@ $PALANG['pLogin_username'] = 'Login (email)'; $PALANG['pLogin_password'] = 'Password'; $PALANG['pLogin_button'] = 'Login'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Your login is not correct. Make sure that you login with your email address!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Your password is not correct!</span>'; +$PALANG['pLogin_failed'] = '<span class="error_msg">Your email address or password are not correct.</span>'; $PALANG['pLogin_login_users'] = 'Users click here to login to the user section.'; $PALANG['pMenu_main'] = 'Main'; Modified: trunk/login.php =================================================================== --- trunk/login.php 2009-01-14 13:13:25 UTC (rev 514) +++ trunk/login.php 2009-01-14 16:03:50 UTC (rev 515) @@ -71,14 +71,14 @@ if ($result['rows'] != 1) { $error = 1; - $tMessage = $PALANG['pLogin_password_incorrect']; + $tMessage = $PALANG['pLogin_failed']; $tUsername = $fUsername; } } else { $error = 1; - $tMessage = $PALANG['pLogin_username_incorrect']; + $tMessage = $PALANG['pLogin_failed']; } if ($error != 1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2009-01-15 11:19:57
|
Revision: 516 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=516&view=rev Author: GingerDog Date: 2009-01-15 11:19:51 +0000 (Thu, 15 Jan 2009) Log Message: ----------- add patch for domain postcreation script; see https://sourceforge.net/tracker/index.php?func=detail&aid=2508593&group_id=191583&atid=937966 Modified Paths: -------------- trunk/config.inc.php trunk/create-domain.php trunk/functions.inc.php Modified: trunk/config.inc.php =================================================================== --- trunk/config.inc.php 2009-01-14 16:03:50 UTC (rev 515) +++ trunk/config.inc.php 2009-01-15 11:19:51 UTC (rev 516) @@ -307,6 +307,13 @@ // $CONF['mailbox_postdeletion_script']='sudo -u courier /usr/local/bin/postfixadmin-mailbox-postdeletion.sh'; // Optional: +// Script to run after creation of domains. +// Note that this may fail if PHP is run in "safe mode", or if +// operating system features (such as SELinux) or limitations +// prevent the web-server from executing external scripts. +$CONF['domain_postcreation_script']='sudo -u courier /usr/local/bin/postfixadmin-domain-postcreation.sh'; + +// Optional: // Script to run after deletion of domains. // Note that this may fail if PHP is run in "safe mode", or if // operating system features (such as SELinux) or limitations Modified: trunk/create-domain.php =================================================================== --- trunk/create-domain.php 2009-01-14 16:03:50 UTC (rev 515) +++ trunk/create-domain.php 2009-01-15 11:19:51 UTC (rev 516) @@ -136,6 +136,10 @@ } $tMessage = $PALANG['pAdminCreate_domain_result_success'] . "<br />($fDomain)</br />"; } + if (!domain_postcreation($fDomain)) + { + $tMessage = $PALANG['pAdminCreate_domain_error']; + } } } Modified: trunk/functions.inc.php =================================================================== --- trunk/functions.inc.php 2009-01-14 16:03:50 UTC (rev 515) +++ trunk/functions.inc.php 2009-01-15 11:19:51 UTC (rev 516) @@ -1805,6 +1805,42 @@ } /* + Called after a domain has been added in the DBMS. + Returns: boolean. + */ +function domain_postcreation($domain) +{ + global $CONF; + $confpar='domain_postcreation_script'; + + if (!isset($CONF[$confpar]) || empty($CONF[$confpar])) + { + return true; + } + + if (empty($domain)) + { + print '<p>Warning: empty domain parameter.</p>'; + return false; + } + + $cmdarg1=escapeshellarg($domain); + $command=$CONF[$confpar]." $cmdarg1"; + $retval=0; + $output=array(); + $firstline=''; + $firstline=exec($command,$output,$retval); + if (0!=$retval) + { + error_log("Running $command yielded return value=$retval, first line of output=$firstline"); + print '<p>WARNING: Problems running domain postcreation script!</p>'; + return FALSE; + } + + return TRUE; +} + +/* Called after a domain has been deleted in the DBMS. Returns: boolean. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2009-01-15 12:53:56
|
Revision: 518 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=518&view=rev Author: GingerDog Date: 2009-01-15 11:38:11 +0000 (Thu, 15 Jan 2009) Log Message: ----------- merge patch for dovecot quota viewing - see https://sourceforge.net/tracker/index.php?func=detail&aid=2060309&group_id=191583&atid=937966 - thank you shario; sorry it took so long to merge! Modified Paths: -------------- trunk/DOCUMENTS/DOVECOT.txt trunk/DOCUMENTS/POSTFIX_CONF.txt trunk/config.inc.php trunk/functions.inc.php trunk/list-virtual.php trunk/templates/list-virtual.php Modified: trunk/DOCUMENTS/DOVECOT.txt =================================================================== --- trunk/DOCUMENTS/DOVECOT.txt 2009-01-15 11:25:54 UTC (rev 517) +++ trunk/DOCUMENTS/DOVECOT.txt 2009-01-15 11:38:11 UTC (rev 518) @@ -1,41 +1,50 @@ # # Dovecot configuration for Postfix Admin -# Written by: Massimo <AndyCapp> Danieli +# Originally written by: Massimo <AndyCapp> Danieli +# Revised by: Sampsa Hario <shario> for Dovecot v1.0 # -1. Dovecot setup ------------------ +More complete Dovecot documentation: -dovecot.conf relevant part for postfixadmin setup +http://wiki.dovecot.org/Quota +http://wiki.dovecot.org/Quota/Dict +http://www.opensourcehowto.org/how-to/mysql/mysql-users-postfixadmin-postfix-dovecot--squirrelmail-with-userprefs-stored-in-mysql.html + +Here are the relevant parts of Dovecot v1.0.x configuration for Postfixadmin setup. Please refer to Dovecot documentation for complete information. -default_mail_env = maildir:/usr/local/virtual/%u/ +The setup gets userdb and passdb info from MySQL as well as quotas, and +uses dict backend to store used quotas as key=value pairs so that they can +be viewed real-time in Postfixadmin. -# auth_userdb specifies maildir location and user/group ID to use -auth_userdb = mysql /etc/dovecot/dovecot-mysql.conf +1. Dovecot setup +----------------- -# auth_passdb specifies user passwords -auth_passdb = mysql /etc/dovecot/dovecot-mysql.conf +default_mail_env = maildir:/usr/local/virtual/%u/ +auth default { + userdb sql { + # Path for SQL configuration file, see doc/dovecot-sql-example.conf + args = /etc/dovecot-mysql.conf + } + passdb sql { + # Path for SQL configuration file, see doc/dovecot-sql-example.conf + args = /etc/dovecot-mysql.conf + } +} + # Valid UID range for users, defaults to 500 and above. -first_valid_uid = 1001 # Change this to your postifx UID +first_valid_uid = 1001 # Change this to your postfix UID 2. Dovecot mysql setup ---------------------- -Below you'll find the relevant part of dovecot-mysql.conf file regarding our setup -Things you may need to change are db_password, uid and gid +Below you'll find the relevant part of dovecot-mysql.conf file regarding our +setup. Things you may need to change are db_password, uid and gid: -db_host = localhost -db_port = 3306 -# Default sock for Debian sarge -db_unix_socket = /var/run/mysqld/mysqld.sock -db = postfix -db_user = postfix -db_passwd = postfix -db_client_flags = 0 +connect = host=localhost dbname=postfix user=postfix password=postfix # Default password scheme. # depends on your $CONF['encrypt'] setting: @@ -44,12 +53,80 @@ # cleartext -> PLAIN default_pass_scheme = MD5-CRYPT -# Query to retrieve password. +# Query to retrieve password. user can be used to retrieve username in other +# formats also. -password_query = SELECT password FROM mailbox WHERE username = '%u' +password_query = SELECT username AS user,password FROM mailbox WHERE username = '%u' AND active='1' # Query to retrieve user information. -user_query = SELECT maildir, 1001 AS uid, 1001 AS gid FROM mailbox WHERE username = '%u' +user_query = SELECT maildir, 1001 AS uid, 1001 AS gid FROM mailbox WHERE username = '%u' AND active='1' -NB The GID and UID are for postfix user and group ID, NOT MySQL user and group ID. +NB! The GID and UID are for postfix user and group ID, NOT MySQL user and group ID. + + +3. Dovecot v1.0 quota support (optional) +---------------------------------------- + +Please note that you need to use Dovecot's own local delivery agent to +enforce and update quotas. Then you can view real-time used quotas in +Postfixadmin. + +Add to dovecot.conf: + +## IMAP quota +protocol imap { + quota = dict:storage=200000 proxy::quota +} + +## POP quota +protocol pop3 { + mail_plugins = quota +} + +## Local Delivery Agent +protocol lda { + mail_plugins = quota +} + +## Dictionary DB proxy +dict { + quota = mysql:/etc/dovecot-dict-quota.conf +} + +## Default quota values +plugin { +quota = dict:storage=200000 proxy::quota +} + + +Change dovecot-mysql.conf to return quota values: + +user_query = SELECT maildir, 1001 AS uid, 1001 AS gid, CONCAT('dict:storage=',floor(quota/1000),' proxy::quota') as quota FROM mailbox WHERE username = '%u' + + +Create file dovecot-dict-quota.conf: + +driver = mysql +connect = host=localhost dbname=postfix user=postfix password=postfix +default_pass_scheme = MD5-CRYPT +table = quota +select_field = current +where_field = path +username_field = username + + +Create database in Mysql: + +create table quota ( + username varchar(255) not null, + path varchar(100) not null, + current integer, + primary key (username, path) +); + + +Enable quota support in Postfixadmin config.inc.php: + +$CONF['used_quotas'] = 'YES'; +$CONF['quota'] = 'YES'; Modified: trunk/DOCUMENTS/POSTFIX_CONF.txt =================================================================== --- trunk/DOCUMENTS/POSTFIX_CONF.txt 2009-01-15 11:25:54 UTC (rev 517) +++ trunk/DOCUMENTS/POSTFIX_CONF.txt 2009-01-15 11:38:11 UTC (rev 518) @@ -18,6 +18,15 @@ proxy:mysql:/etc/postfix/sql/mysql_virtual_mailbox_maps.cf, proxy:mysql:/etc/postfix/sql/mysql_virtual_alias_domain_mailbox_maps.cf +# Additional for quota support +virtual_create_maildirsize = yes +virtual_mailbox_extended = yes +virtual_mailbox_limit_maps = mysql:/etc/postfix/mysql_virtual_mailbox_limit_maps.cf +virtual_mailbox_limit_override = yes +virtual_maildir_limit_message = Sorry, the user's maildir has overdrawn his +diskspace quota, please try again later. +virtual_overquota_bounce = yes + Where you chose to store the .cf files doesn't really matter, but they will have database passwords stored in plain text so they should be readable only by user postfix, or in a directory only accessible to user postfix. @@ -84,6 +93,15 @@ dbname = postfix query = SELECT CONCAT(domain,'/',maildir) FROM mailbox,alias_domain WHERE alias_domain.alias_domain = '%d' and mailbox.username = CONCAT('%u', '@', alias_domain.target_domain) AND mailbox.active = 1 +# For quota support + +mysql-virtual-mailbox-limit-maps.cf: +user = postfix +password = password +hosts = localhost +dbname = postfix +query = SELECT quota FROM mailbox WHERE username='%s' AND active = '1' + ------------------------- More information - HowTo docs that use PostfixAdmin Modified: trunk/config.inc.php =================================================================== --- trunk/config.inc.php 2009-01-15 11:25:54 UTC (rev 517) +++ trunk/config.inc.php 2009-01-15 11:38:11 UTC (rev 518) @@ -68,6 +68,7 @@ 'mailbox' => 'mailbox', 'vacation' => 'vacation', 'vacation_notification' => 'vacation_notification', + 'quota' => 'quota', ); // Site Admin @@ -333,7 +334,16 @@ // // Specify '' for Dovecot and 'INBOX.' for Courier. $CONF['create_mailbox_subdirs_prefix']='INBOX.'; + +// Optional: +// Show used quotas from Dovecot dictionary backend in virtual +// mailbox listing. +// See: DOCUMENTATION/DOVECOT.txt +// http://wiki.dovecot.org/Quota/Dict // +// $CONF['used_quotas'] = 'YES'; + +// // Normally, the TCP port number does not have to be specified. // $CONF['create_mailbox_subdirs_hostport']=143; // Modified: trunk/functions.inc.php =================================================================== --- trunk/functions.inc.php 2009-01-15 11:25:54 UTC (rev 517) +++ trunk/functions.inc.php 2009-01-15 11:38:11 UTC (rev 518) @@ -714,7 +714,7 @@ { global $CONF; if ($quota == -1) return $quota; - $value = $quota / $CONF['quota_multiplier']; + $value = round($quota / $CONF['quota_multiplier'],2); return $value; } @@ -2257,4 +2257,5 @@ $table_mailbox = table_by_key ('mailbox'); $table_vacation = table_by_key ('vacation'); $table_vacation_notification = table_by_key('vacation_notification'); +$table_quota = table_by_key ('quota'); /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ Modified: trunk/list-virtual.php =================================================================== --- trunk/list-virtual.php 2009-01-15 11:25:54 UTC (rev 517) +++ trunk/list-virtual.php 2009-01-15 11:38:11 UTC (rev 518) @@ -139,7 +139,10 @@ if ($CONF['vacation_control_admin'] == 'YES') { - $query = "SELECT $table_mailbox.*, $table_vacation.active AS v_active FROM $table_mailbox LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email WHERE $table_mailbox.domain='$fDomain' ORDER BY $table_mailbox.username LIMIT $page_size OFFSET $fDisplay"; + if ($CONF['used_quotas'] == 'YES') + $query = "SELECT $table_mailbox.*, $table_vacation.active AS v_active, $table_quota.current FROM $table_mailbox LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email LEFT JOIN $table_quota ON $table_mailbox.username=$table_quota.username WHERE $table_mailbox.domain='$fDomain' AND $table_quota.path='quota/storage' ORDER BY $table_mailbox.username LIMIT $page_size OFFSET $fDisplay"; + else + $query = "SELECT $table_mailbox.*, $table_vacation.active AS v_active FROM $table_mailbox LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email WHERE $table_mailbox.domain='$fDomain' ORDER BY $table_mailbox.username LIMIT $page_size OFFSET $fDisplay"; } else { Modified: trunk/templates/list-virtual.php =================================================================== --- trunk/templates/list-virtual.php 2009-01-15 11:25:54 UTC (rev 517) +++ trunk/templates/list-virtual.php 2009-01-15 11:38:11 UTC (rev 518) @@ -296,6 +296,8 @@ } else { + if ($CONF['used_quotas'] == 'YES') + print divide_quota ($tMailbox[$i]['current']).'/'; print divide_quota ($tMailbox[$i]['quota']); } print "</td>\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2009-01-15 13:22:35
|
Revision: 524 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=524&view=rev Author: GingerDog Date: 2009-01-15 12:27:55 +0000 (Thu, 15 Jan 2009) Log Message: ----------- functions.inc.php / CHANGELOG.txt - bump version numbers etc Modified Paths: -------------- trunk/CHANGELOG.TXT trunk/functions.inc.php Modified: trunk/CHANGELOG.TXT =================================================================== --- trunk/CHANGELOG.TXT 2009-01-15 12:25:41 UTC (rev 523) +++ trunk/CHANGELOG.TXT 2009-01-15 12:27:55 UTC (rev 524) @@ -14,7 +14,7 @@ Only in SVN trunk -------------------- -Version 2.3 Beta - 2009/01/15 - SVN r518 +Version 2.3 Beta - 2009/01/15 - SVN r523 ----------------------------------------- - added support for domain aliases (from lenix) (can be disabled with $CONF['alias_domain']) Modified: trunk/functions.inc.php =================================================================== --- trunk/functions.inc.php 2009-01-15 12:25:41 UTC (rev 523) +++ trunk/functions.inc.php 2009-01-15 12:27:55 UTC (rev 524) @@ -22,7 +22,7 @@ exit; } -$version = '2.2.0'; +$version = '2.3 beta'; /** * check_session This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2009-01-15 14:32:48
|
Revision: 525 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=525&view=rev Author: GingerDog Date: 2009-01-15 14:32:43 +0000 (Thu, 15 Jan 2009) Log Message: ----------- config.inc.php, functions.inc.php - add support for mysql_encrypt method for password encrpytion - useful for pam integration, apparently - see https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1793352&group_id=191583 Modified Paths: -------------- trunk/config.inc.php trunk/functions.inc.php Modified: trunk/config.inc.php =================================================================== --- trunk/config.inc.php 2009-01-15 12:27:55 UTC (rev 524) +++ trunk/config.inc.php 2009-01-15 14:32:43 UTC (rev 525) @@ -88,6 +88,7 @@ // md5 = md5 sum of the password // system = whatever you have set as your PHP system default // cleartext = clear text passwords (ouch!) +// mysql_encrypt = useful for PAM integration $CONF['encrypt'] = 'md5crypt'; // Minimum length required for passwords. Postfixadmin will not Modified: trunk/functions.inc.php =================================================================== --- trunk/functions.inc.php 2009-01-15 12:27:55 UTC (rev 524) +++ trunk/functions.inc.php 2009-01-15 14:32:43 UTC (rev 525) @@ -1146,6 +1146,20 @@ if ($CONF['encrypt'] == 'cleartext') { $password = $pw; } + + // See https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1793352&group_id=191583 + // this is apparently useful for pam_mysql etc. + if ($CONF['encrypt'] == 'mysql_encrypt') + { + if ($pw_db!="") { + $salt=substr($pw_db,0,2); + $res=db_query("SELECT ENCRYPT('".$pw."','".$salt."');"); + } else { + $res=db_query("SELECT ENCRYPT('".$pw."');"); + } + $l = db_row($res["result"]); + $password = $l[0]; + } $password = escape_string ($password); return $password; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2009-01-17 20:09:54
|
Revision: 527 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=527&view=rev Author: GingerDog Date: 2009-01-17 20:09:43 +0000 (Sat, 17 Jan 2009) Log Message: ----------- update in preparation for beta release Modified Paths: -------------- trunk/CHANGELOG.TXT trunk/debian/changelog Modified: trunk/CHANGELOG.TXT =================================================================== --- trunk/CHANGELOG.TXT 2009-01-16 18:17:18 UTC (rev 526) +++ trunk/CHANGELOG.TXT 2009-01-17 20:09:43 UTC (rev 527) @@ -14,7 +14,7 @@ Only in SVN trunk -------------------- -Version 2.3 Beta - 2009/01/15 - SVN r523 +Version 2.3 Beta - 2009/01/15 - SVN r527 ----------------------------------------- - added support for domain aliases (from lenix) (can be disabled with $CONF['alias_domain']) Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2009-01-16 18:17:18 UTC (rev 526) +++ trunk/debian/changelog 2009-01-17 20:09:43 UTC (rev 527) @@ -1,3 +1,18 @@ +postfixadmin (2.3beta) unstable; urgency=low + + * Subversion revision 527 + * Fixes for MySQL upgrade issues + * Improved vacation.pl (renotification options, use SMTP headers, better + logging, optional external config file) + * Improved fetchmail.pl + * Domain aliases - new implementation should reduce backscatter etc. + * translation updates + * Added domain-postcreation script support + * Enhanced mailbox table to make it easier for people to customise where mailboxes live + * and much more + + -- David Goodwin <dav...@pa...> Sat, 17 Jan 2009 20:06:00 +0000 + postfixadmin (2.2.1.1) unstable; urgency=low * Subversion revision 412 (from branches/postfixadmin-2.2.1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2009-01-25 20:53:18
|
Revision: 550 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=550&view=rev Author: christian_boltz Date: 2009-01-25 20:53:11 +0000 (Sun, 25 Jan 2009) Log Message: ----------- login.php - put '<span class="error_msg">' and '</span>' into login.php, not in *.lang languages/*.lang: - removed pLogin_username_incorrect and pLogin_password_incorrect texts - added pLogin_failed to all translations (without the wrapping <span>) - removed the <span> from pLogin_failed in en.lang and fi.lang translation-update.sh: - added "--remove string" option to remove texts from language files Modified Paths: -------------- trunk/languages/bg.lang trunk/languages/ca.lang trunk/languages/cn.lang trunk/languages/cs.lang trunk/languages/da.lang trunk/languages/de.lang trunk/languages/en.lang trunk/languages/es.lang trunk/languages/et.lang trunk/languages/eu.lang trunk/languages/fi.lang trunk/languages/fo.lang trunk/languages/fr.lang trunk/languages/hr.lang trunk/languages/hu.lang trunk/languages/is.lang trunk/languages/it.lang trunk/languages/ja.lang trunk/languages/language-update.sh trunk/languages/lt.lang trunk/languages/mk.lang trunk/languages/nb.lang trunk/languages/nl.lang trunk/languages/nn.lang trunk/languages/pl.lang trunk/languages/pt-br.lang trunk/languages/ru.lang trunk/languages/sk.lang trunk/languages/sl.lang trunk/languages/sv.lang trunk/languages/tr.lang trunk/languages/tw.lang trunk/login.php Modified: trunk/languages/bg.lang =================================================================== --- trunk/languages/bg.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/bg.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -23,8 +23,7 @@ $PALANG['pLogin_username'] = 'Логин (е-мейл)'; $PALANG['pLogin_password'] = 'Парола'; $PALANG['pLogin_button'] = 'Изход'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Вашият логин не е правилен. Проверете дали сте се написали правилно вашият е-мейл адрес!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Вашата парола не е правилна!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Ако сте потребител натиснете тук за логване в потребителската част.'; $PALANG['pMenu_main'] = 'Main'; # XXX @@ -340,7 +339,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Вие вече си имате конфигриран автоматичен отговор!'; $PALANG['pUsersVacation_subject'] = 'Заглавие'; $PALANG['pUsersVacation_subject_text'] = 'Out of Office'; # XXX -$PALANG['pUsersVacation_body'] = 'Текст'; +$PALANG['pUsersVacation_body'] = 'Текст'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Няма да бъда на разположение от <date> до <date>. При спешност можете да се свържете с <contact person>. Modified: trunk/languages/ca.lang =================================================================== --- trunk/languages/ca.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/ca.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -22,8 +22,7 @@ $PALANG['pLogin_username'] = 'Usuari (e-mail)'; $PALANG['pLogin_password'] = 'Contrasenya'; $PALANG['pLogin_button'] = 'Usuari'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">El login no és correcte. Aseguri\'s de que ha fet login amb el seu e-mail.</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">La seva contrasenya no es correcta!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Login per anar a la secció d\'usuaris.'; $PALANG['pMenu_main'] = 'Main'; # XXX $PALANG['pMenu_overview'] = 'Resum'; @@ -339,7 +338,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Ja disposa d\'una resposta automàtica configurada!'; $PALANG['pUsersVacation_subject'] = 'Assumpte'; $PALANG['pUsersVacation_subject_text'] = 'Fora de la feina'; -$PALANG['pUsersVacation_body'] = 'Cos'; +$PALANG['pUsersVacation_body'] = 'Cos'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Seré fora des del <date> fins al <date>. Per assumptes urgents pot contactar amb mi a <contact person>. Modified: trunk/languages/cn.lang =================================================================== --- trunk/languages/cn.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/cn.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -22,8 +22,7 @@ $PALANG['pLogin_username'] = '帐号 (邮件地址)'; $PALANG['pLogin_password'] = '密码'; $PALANG['pLogin_button'] = '登录'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">登录失败, 请确认你是使用你的邮件地址登录!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">密码错误!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = '普通用户点击这里进入用户控制面板.'; $PALANG['pMenu_main'] = 'Main'; # XXX @@ -339,7 +338,7 @@ $PALANG['pUsersVacation_welcome_text'] = '你已经设置了自动回复!'; $PALANG['pUsersVacation_subject'] = '主题'; $PALANG['pUsersVacation_subject_text'] = '我现在无法回信'; -$PALANG['pUsersVacation_body'] = '内容'; +$PALANG['pUsersVacation_body'] = '内容'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM 我在 <date> 到 <date> 这段时间内暂时无法回信. 如果你有急事请与 <contact person> 联系. Modified: trunk/languages/cs.lang =================================================================== --- trunk/languages/cs.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/cs.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -27,8 +27,7 @@ $PALANG['pLogin_username'] = 'Uživatelské jméno (email)'; $PALANG['pLogin_password'] = 'Heslo'; $PALANG['pLogin_button'] = 'Přihlásit'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Nesprávné uživatelské jmeno. Přihlašujte se svojí emailovou adresou!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Nesprávné heslo!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Vstup do uživatelské sekce.'; $PALANG['pMenu_main'] = 'Hlavní'; @@ -348,7 +347,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Již máte nastavenou automatickou odpověď!'; $PALANG['pUsersVacation_subject'] = 'Předmět'; $PALANG['pUsersVacation_subject_text'] = 'Dovolená'; -$PALANG['pUsersVacation_body'] = 'Obsah'; +$PALANG['pUsersVacation_body'] = 'Obsah'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Jsem na dovolené od <datum> od <datum>. S neodkladnými zprávami prosím kontaktujte <kontaktní osoba>. Modified: trunk/languages/da.lang =================================================================== --- trunk/languages/da.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/da.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -24,8 +24,7 @@ $PALANG['pLogin_username'] = 'Brugernavn (email)'; $PALANG['pLogin_password'] = 'Adgangskode'; $PALANG['pLogin_button'] = 'Login'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Dit brugernavn er forkert. Kontroller at du bruger din emailadresse som brugernavn!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Din adgangskode er forkert!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Bruger: Log ind på brugersektionen her.'; $PALANG['pMenu_main'] = 'Start'; @@ -346,7 +345,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Du har allerede et autosvar indstillet!'; $PALANG['pUsersVacation_subject'] = 'Emne'; $PALANG['pUsersVacation_subject_text'] = 'Ikke tilstede'; -$PALANG['pUsersVacation_body'] = 'Meddelelse'; +$PALANG['pUsersVacation_body'] = 'Meddelelse'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Jeg er ikke tilstede i perioden <dato> til <dato>. I nødstilfælde kan <kontaktperson> kontaktes. Modified: trunk/languages/de.lang =================================================================== --- trunk/languages/de.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/de.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -24,8 +24,7 @@ $PALANG['pLogin_username'] = 'Login (eMail)'; $PALANG['pLogin_password'] = 'Passwort'; $PALANG['pLogin_button'] = 'Login'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Ihr Login-Name ist nicht korrekt. Bitte benutzen Sie die komplette eMail-Adresse</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Falsches Passwort!</span>'; +$PALANG['pLogin_failed'] = 'Ihre Mailadresse oder das Passwort sind nicht korrekt.'; $PALANG['pLogin_login_users'] = 'eMail-Benutzer bitte hier einloggen.'; $PALANG['pMenu_main'] = 'Startseite'; Modified: trunk/languages/en.lang =================================================================== --- trunk/languages/en.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/en.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -24,7 +24,7 @@ $PALANG['pLogin_username'] = 'Login (email)'; $PALANG['pLogin_password'] = 'Password'; $PALANG['pLogin_button'] = 'Login'; -$PALANG['pLogin_failed'] = '<span class="error_msg">Your email address or password are not correct.</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; $PALANG['pLogin_login_users'] = 'Users click here to login to the user section.'; $PALANG['pMenu_main'] = 'Main'; @@ -346,7 +346,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'You already have an auto response configured!'; $PALANG['pUsersVacation_subject'] = 'Subject'; $PALANG['pUsersVacation_subject_text'] = 'Out of Office'; -$PALANG['pUsersVacation_body'] = 'Body'; +$PALANG['pUsersVacation_body'] = 'Message'; $PALANG['pUsersVacation_body_text'] = <<<EOM I will be away from <date> until <date>. For urgent matters you can contact <contact person>. Modified: trunk/languages/es.lang =================================================================== --- trunk/languages/es.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/es.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -22,8 +22,7 @@ $PALANG['pLogin_username'] = 'Usuario (e-mail)'; $PALANG['pLogin_password'] = 'Contraseña'; $PALANG['pLogin_button'] = 'Usuario'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">El login no es correcto. Asegurese de que ha hecho login con su e-mail.</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">¡Su contraseña no es correcta!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Login para ir a la sección de usuarios.'; $PALANG['pMenu_main'] = 'Main'; # XXX $PALANG['pMenu_overview'] = 'Resumen'; @@ -340,7 +339,7 @@ $PALANG['pUsersVacation_welcome_text'] = '¡Ya dispone de una respuesta automática configurada!'; $PALANG['pUsersVacation_subject'] = 'Asunto'; $PALANG['pUsersVacation_subject_text'] = 'Fuera del trabajo'; -$PALANG['pUsersVacation_body'] = 'Cuerpo'; +$PALANG['pUsersVacation_body'] = 'Cuerpo'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Estaré fuera desde <date> hasta <date>. Para asuntos urgentes, puede contactar conmigo en <contact person>. Modified: trunk/languages/et.lang =================================================================== --- trunk/languages/et.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/et.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -22,8 +22,7 @@ $PALANG['pLogin_username'] = 'Kasutajanimi (e-posti aadress)'; $PALANG['pLogin_password'] = 'Parool'; $PALANG['pLogin_button'] = 'Logi sisse'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Kasutajanimi pole õige. Veendu, et logid sisse korrektse e-posti aadressiga!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Parool pole õige!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Kasutaja, klõpsa siia logimaks sisse kasutaja sektsiooni.'; $PALANG['pMenu_main'] = 'Main'; # XXX @@ -339,7 +338,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Automaatne vastus on juba seadistatud!'; $PALANG['pUsersVacation_subject'] = 'Teema'; $PALANG['pUsersVacation_subject_text'] = 'Kontorist väljas'; -$PALANG['pUsersVacation_body'] = 'Põhitekst'; +$PALANG['pUsersVacation_body'] = 'Põhitekst'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Olen kontorist eemal alates <date> kuni <date>. Kiireloomuliste asjade korral palun kontakteeru <kontakt isik>. Modified: trunk/languages/eu.lang =================================================================== --- trunk/languages/eu.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/eu.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -22,8 +22,7 @@ $PALANG['pLogin_username'] = 'Erabiltzailea (e-mail)'; $PALANG['pLogin_password'] = 'Pasahitza'; $PALANG['pLogin_button'] = 'Erabiltzailea'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Logina ez da zuzena. Ziurtatu zaitez logina zeure e-mailarekin egin duzula.</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Pasahitz okerra!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Erabiltzaileen gunera joateko logina.'; $PALANG['pMenu_main'] = 'Main'; # XXX $PALANG['pMenu_overview'] = 'Laburpena'; @@ -338,7 +337,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Erantzun automatiko bat konfiguratuta duzu!'; $PALANG['pUsersVacation_subject'] = 'Gaia'; $PALANG['pUsersVacation_subject_text'] = 'Lanetik kanpo'; -$PALANG['pUsersVacation_body'] = 'Gorputza'; +$PALANG['pUsersVacation_body'] = 'Gorputza'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM <date>-tik <date> arte kanpoan egongo naiz. Larrialdiko gaientzat, hemen <contact person> kontakta dezakezu nirekin. Modified: trunk/languages/fi.lang =================================================================== --- trunk/languages/fi.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/fi.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -23,7 +23,7 @@ $PALANG['pLogin_username'] = 'Tunnus'; $PALANG['pLogin_password'] = 'Salasana'; $PALANG['pLogin_button'] = 'Kirjaudu'; -$PALANG['pLogin_failed'] = '<span class="error_msg">Sähköpostiosoite tai salasana väärin!</span>'; +$PALANG['pLogin_failed'] = 'Sähköpostiosoite tai salasana väärin!'; $PALANG['pLogin_login_users'] = 'Käyttäjien kirjautuminen.'; $PALANG['pMenu_main'] = 'Etusivu'; @@ -338,7 +338,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Sinulla on jo automaattivastaus päällä!'; $PALANG['pUsersVacation_subject'] = 'Otsikko'; $PALANG['pUsersVacation_subject_text'] = 'Lomalla'; -$PALANG['pUsersVacation_body'] = 'Viesti'; +$PALANG['pUsersVacation_body'] = 'Viesti'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Olen lomalla <päiväys> <päiväys> välisen ajan. Kiireellisissä asioissa voitte ottaa yhteyttä <sähköpostiosoite>. Modified: trunk/languages/fo.lang =================================================================== --- trunk/languages/fo.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/fo.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -22,8 +22,7 @@ $PALANG['pLogin_username'] = 'Login (e-post)'; $PALANG['pLogin_password'] = 'Loyniorð'; $PALANG['pLogin_button'] = 'Logga inn'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Títt login er skeivt. Minst til at skriva fulla e-post adressu!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Títt loyniorð er skeivt!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Brúkarar kunnu logga inn her.'; $PALANG['pMenu_main'] = 'Main'; # XXX @@ -339,7 +338,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Tú hevur longu eini frítíðarboð uppsett!'; $PALANG['pUsersVacation_subject'] = 'Evni'; $PALANG['pUsersVacation_subject_text'] = 'Out of Office'; -$PALANG['pUsersVacation_body'] = 'Boð'; +$PALANG['pUsersVacation_body'] = 'Boð'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM I will be away from <dagfesting> until <dagfesting>. Modified: trunk/languages/fr.lang =================================================================== --- trunk/languages/fr.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/fr.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -24,8 +24,7 @@ $PALANG['pLogin_username'] = 'Adresse courriel'; $PALANG['pLogin_password'] = 'Mot de passe'; $PALANG['pLogin_button'] = 'Entrer'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Votre adresse courriel est invalide. Assurez-vous de saisir correctement l\'adresse courriel.</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Votre mot de passe est invalide !</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Utilisateurs, cliquez ici pour rejoindre votre section.'; $PALANG['pMenu_main'] = 'Menu principal'; @@ -341,7 +340,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Votre repondeur automatique est déjà configuré!'; $PALANG['pUsersVacation_subject'] = 'Sujet'; $PALANG['pUsersVacation_subject_text'] = 'En dehors du bureau'; -$PALANG['pUsersVacation_body'] = ''; # XXX +$PALANG['pUsersVacation_body'] = 'Message'; # XXX $PALANG['pUsersVacation_body_text'] = <<<EOM Je serai absent(e) de <date> jusqu\'au <date>. Pour toute urgence, merci de contacter <contact person>. Modified: trunk/languages/hr.lang =================================================================== --- trunk/languages/hr.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/hr.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -21,8 +21,7 @@ $PALANG['pLogin_username'] = 'Korisničko ime (adresa e-pote)'; $PALANG['pLogin_password'] = 'Lozinka'; $PALANG['pLogin_button'] = 'Prijavi'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Korisnicko ime nije točno. Morate se prijaviti sa adresom vae e-pote!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Lozinka nije točna!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Korisnici kliknite ovdje za prijavu u korisničku sekciju.'; $PALANG['pMenu_main'] = 'Main'; # XXX @@ -338,7 +337,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Obvijest o odsutnosti je već postavljena!'; $PALANG['pUsersVacation_subject'] = 'Subjekt'; $PALANG['pUsersVacation_subject_text'] = 'Odsutnost'; -$PALANG['pUsersVacation_body'] = 'Tekst'; +$PALANG['pUsersVacation_body'] = 'Tekst'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Od <datum> do <datum> sam odsutan. Za hitne stvari molim vas da kontaktirate <kontaktna osoba>. Modified: trunk/languages/hu.lang =================================================================== --- trunk/languages/hu.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/hu.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -23,8 +23,7 @@ $PALANG['pLogin_username'] = 'Bejelentkezés (email)'; $PALANG['pLogin_password'] = 'Jelszó'; $PALANG['pLogin_button'] = 'Bejelentkezés'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">A bejelentkezés érvénytelen. Biztos, hogy a saját email címeddel akarsz belépni?!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Nem jó a jelszó!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'A felhasználók kattintsanak ide a felhasználói felülethez.'; $PALANG['pMenu_main'] = 'Főmenü'; @@ -345,7 +344,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Már van be állítva automatikus válasz !'; $PALANG['pUsersVacation_subject'] = 'Tárgy'; $PALANG['pUsersVacation_subject_text'] = 'Sajnálom, de jelenleg nem vagyok email közelben!'; -$PALANG['pUsersVacation_body'] = 'Üzenet'; +$PALANG['pUsersVacation_body'] = 'Üzenet'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Üdvözlöm. Sajnálom de jelenleg nem vagyok email közelben. Ettõl - Eddig. Modified: trunk/languages/is.lang =================================================================== --- trunk/languages/is.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/is.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -22,8 +22,7 @@ $PALANG['pLogin_username'] = 'Auðkenni(email)'; $PALANG['pLogin_password'] = 'Lykilorð'; $PALANG['pLogin_button'] = 'Tengjast'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Auðkenni þitt er rangt, ath hvort þú hafir slegið það rangt inn og prófaðu aftur, ath notaðu fullt email til að tengjas!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Lykilorðið var rangt!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Notendur smellið hér til að opna almennt notendaviðmót.'; $PALANG['pMenu_main'] = 'Main'; # XXX @@ -338,7 +337,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Þú hefur nú þegar skilgreint sjálfvirk skilaboð!'; $PALANG['pUsersVacation_subject'] = 'Meginmál - Subject'; $PALANG['pUsersVacation_subject_text'] = 'Er ekki við - Out of Office'; -$PALANG['pUsersVacation_body'] = 'Meginmál'; +$PALANG['pUsersVacation_body'] = 'Meginmál'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Ég er ekki við frá <date> og til <date>. I will be away from <date> until <date>. Ef mikið liggur við, geturðu haft samaband við <contact person>. For urgent matters you can contact <contact person>. Modified: trunk/languages/it.lang =================================================================== --- trunk/languages/it.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/it.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -23,8 +23,7 @@ $PALANG['pLogin_username'] = 'Nome utente (email)'; $PALANG['pLogin_password'] = 'Password'; $PALANG['pLogin_button'] = 'Entra'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Il tuo nome utente non è corretto. Assicurati di avere inserito il tuo indirizzo email corretto!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">La tua password non è corretta!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'GLi utenti devono cliccare qui per entrare nella propria sezione.'; $PALANG['pMenu_main'] = 'Principale'; @@ -340,7 +339,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Hai gi$agrave; un autoresponditore configurato'; $PALANG['pUsersVacation_subject'] = 'Soggetto'; $PALANG['pUsersVacation_subject_text'] = 'Assente dall\'ufficio'; -$PALANG['pUsersVacation_body'] = 'Corpo'; +$PALANG['pUsersVacation_body'] = 'Corpo'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Sarò assente dal <data> al <data>. Per problemi urgenti potete contattare <persona da contattare>. Modified: trunk/languages/ja.lang =================================================================== --- trunk/languages/ja.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/ja.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -24,8 +24,7 @@ $PALANG['pLogin_username'] = 'ログイン (メールアドレス)'; $PALANG['pLogin_password'] = 'パスワード'; $PALANG['pLogin_button'] = 'ログイン'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">ログインが違います。正しいメールアドレスを入力してください。</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">パスワードが違います。</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = '一般ユーザのログインはここをクリックしてください。'; $PALANG['pMenu_main'] = 'メイン'; @@ -345,7 +344,7 @@ $PALANG['pUsersVacation_welcome_text'] = '既に自動応答を構成してあります。'; $PALANG['pUsersVacation_subject'] = '件名'; $PALANG['pUsersVacation_subject_text'] = '不在'; -$PALANG['pUsersVacation_body'] = '本文'; +$PALANG['pUsersVacation_body'] = '本文'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM 私は <date> から <date> まで不在です。 緊急事項は <contact person> まで連絡してください。 Modified: trunk/languages/language-update.sh =================================================================== --- trunk/languages/language-update.sh 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/language-update.sh 2009-01-25 20:53:11 UTC (rev 550) @@ -33,7 +33,7 @@ grep -v 'No newline at end of file' "$file.diff" | while read line ; do greptext="$(echo $line | sed 's/^[+ -]//')" - grepresult=$(grep "'$greptext'" en.lang) || grepresult="***DEFAULT*** $line" + grepresult=$(grep "'$greptext'" en.lang) || grepresult="***DEFAULT - $greptext dropped from en.lang? *** $line" grepresult2=$(grep "'$greptext'" $file) || grepresult2="$grepresult" case "$line" in ---*) @@ -105,6 +105,27 @@ } # end rename_string() +function remove_string() { + for file in $filelist ; do + line="$(grep "PALANG\['$remove_string'\]" "$file")" || { + echo "*** $file does not contain \$PALANG['$remove_string'] ***" >&2 + continue + } + + # create patch + echo " +--- $file.old ++++ $file +@@ -1,1 +1,0 @@ +-$line + " > "$file.patch" + + test $patch = 0 && cat $file.patch + test $patch = 1 && patch $file < $file.patch + done +} # end remove_string() + + function addcomment() { for file in $filelist ; do test "$file" = "en.lang" && { echo "*** skipping en.lang ***"; continue ; } >&2 @@ -208,6 +229,11 @@ Rename $PALANG['"'"'old_string'"'"'] to $PALANG['"'"'new_string'"'"'] +'"$0"' --remove string [--patch] [--nocleanup] [foo.lang [bar.lang [...] ] ] + + Remove $PALANG['"'"'string'"'"'] from language files + + '"$0"' --addcomment string comment [--patch] [--nocleanup] [foo.lang [bar.lang [...] ] ] Add a comment to $PALANG['"'"'string'"'"'] @@ -251,6 +277,7 @@ forcepatch=0 # no forcepatch by default nocleanup=0 # don't delete tempfiles rename=0 # rename a string +remove=0 # remove a string stats=0 # create translation statistics addcomment=0 # add translation comment text='' @@ -282,6 +309,11 @@ echo "$rename_new" | grep '^[a-z_-]*\.lang$' && rename_new='' # error out on *.lang - probably a filename test -z "$rename_new" && { echo '--rename needs two parameters' >&2 ; exit 1 ; } ;; + --remove) + remove=1 + shift ; remove_string="$1" + test -z "$remove-string" && { echo '--remove needs a parameter' >&2 ; exit 1 ; } + ;; --addcomment) addcomment=1 shift ; text="$1" @@ -314,6 +346,7 @@ test "$addcomment" = 1 && { addcomment ; cleanup ; exit 0 ; } test "$rename" = 1 && { rename_string ; cleanup ; exit 0 ; } +test "$remove" = 1 && { remove_string ; cleanup ; exit 0 ; } test "$forcepatch" = 1 && { forcepatch ; cleanup ; exit 0 ; } test "$stats" = 1 && { statistics ; exit 0 ; } Modified: trunk/languages/lt.lang =================================================================== --- trunk/languages/lt.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/lt.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -21,8 +21,7 @@ $PALANG['pLogin_username'] = 'Vartotojas (el.paštas)'; $PALANG['pLogin_password'] = 'Slaptažodis'; $PALANG['pLogin_button'] = 'Prisijungti'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Prisijungti nepavyko. Vartotojo lauke įveskite srities pašto administratoriaus el.pašto adresą!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Slaptažodis neteisingas!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Pašto vartotojo nustatymai.'; $PALANG['pMenu_main'] = 'Main'; # XXX @@ -338,7 +337,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Auto atsakiklis jau nustatytas!'; $PALANG['pUsersVacation_subject'] = 'Tema'; $PALANG['pUsersVacation_subject_text'] = 'Esu išvykęs'; -$PALANG['pUsersVacation_body'] = 'Žinutė'; +$PALANG['pUsersVacation_body'] = 'Žinutė'; # XXX text changed to 'Message' ### XXX (see below) $PALANG['pUsersVacation_body_text'] = <<<EOM I will be away from <date> until <date>. Modified: trunk/languages/mk.lang =================================================================== --- trunk/languages/mk.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/mk.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -22,8 +22,7 @@ $PALANG['pLogin_username'] = 'Корисничко име (email)'; $PALANG['pLogin_password'] = 'Лозинка'; $PALANG['pLogin_button'] = 'Пријава'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Погрешно корисничко име. Логирајте се со вашата e-mail адреса!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Погрешна лозинка!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Логин за обични корисници.'; $PALANG['pMenu_main'] = 'Main'; # XXX @@ -340,7 +339,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Веќе имате конфигуриран автоматски одговор!'; $PALANG['pUsersVacation_subject'] = 'Тема'; $PALANG['pUsersVacation_subject_text'] = 'Отсутен'; -$PALANG['pUsersVacation_body'] = 'Содржина'; +$PALANG['pUsersVacation_body'] = 'Содржина'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Ќе бидам отсутен од <date> до <date>. За итни случаи контактирајте со <contact person>. Modified: trunk/languages/nb.lang =================================================================== --- trunk/languages/nb.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/nb.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -24,8 +24,7 @@ $PALANG['pLogin_username'] = 'Brukernavn (e-postadresse)'; $PALANG['pLogin_password'] = 'Passord'; $PALANG['pLogin_button'] = 'Logg inn'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Påloggingsinformasjonen er ikke korrekt. Husk å bruke e-postadressen som brukernavn.</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Feil passord!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Vanlige brukere kan klikke her for å gå til brukerseksjonen.'; $PALANG['pMenu_main'] = 'Hoved'; @@ -340,7 +339,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Du har allerede et autosvar aktivert!'; $PALANG['pUsersVacation_subject'] = 'Emne'; $PALANG['pUsersVacation_subject_text'] = 'Fraværsmelding'; -$PALANG['pUsersVacation_body'] = 'Meldingstekst'; +$PALANG['pUsersVacation_body'] = 'Meldingstekst'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Jeg er utilgjengelig fra <date> til <date>. Dersom det gjelder noe viktig kan du kontakte <contact person>. Modified: trunk/languages/nl.lang =================================================================== --- trunk/languages/nl.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/nl.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -23,8 +23,7 @@ $PALANG['pLogin_username'] = 'Login (e-mail)'; $PALANG['pLogin_password'] = 'Wachtwoord'; $PALANG['pLogin_button'] = 'Login'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Foutieve login. U dient in te loggen met uw e-mail adres!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Foutief wachtwoord.!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Gebruikers klik hier om in te loggen.'; $PALANG['pMenu_main'] = 'Start'; Modified: trunk/languages/nn.lang =================================================================== --- trunk/languages/nn.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/nn.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -22,8 +22,7 @@ $PALANG['pLogin_username'] = 'Brukernavn (e-postadressen)'; $PALANG['pLogin_password'] = 'Passord'; $PALANG['pLogin_button'] = 'Logg inn'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Ditt brukernavn er feil. Logg inn med e-postadressen din som brukernavn!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Passordet er feil!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Brukare, trykk her for å gå til bruker-seksjonen.'; $PALANG['pMenu_main'] = 'Main'; # XXX @@ -336,7 +335,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Du har allerede autosvar!'; $PALANG['pUsersVacation_subject'] = 'Emne'; $PALANG['pUsersVacation_subject_text'] = 'Ikke tilstede'; -$PALANG['pUsersVacation_body'] = 'Melding'; +$PALANG['pUsersVacation_body'] = 'Melding'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Jeg vil være utilgjengelig fra <date> til <date>. For viktige henvendelser kan du kontakte <contact person>. Modified: trunk/languages/pl.lang =================================================================== --- trunk/languages/pl.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/pl.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -24,8 +24,7 @@ $PALANG['pLogin_username'] = 'Login (email)'; $PALANG['pLogin_password'] = 'Hasło'; $PALANG['pLogin_button'] = 'Zaloguj'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Twój login jest niepoprawny!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Twoje hasło jest niepoprawne!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Sekcja przeznaczona dla użytkowników.'; $PALANG['pMenu_main'] = 'Strona główna'; @@ -343,7 +342,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Masz już skonfigurowaną auto odpowiedź!'; $PALANG['pUsersVacation_subject'] = 'Temat'; $PALANG['pUsersVacation_subject_text'] = 'Poza biurem'; -$PALANG['pUsersVacation_body'] = 'Tekst'; +$PALANG['pUsersVacation_body'] = 'Tekst'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Będę nieobecny od <date> do <date>. Modified: trunk/languages/pt-br.lang =================================================================== --- trunk/languages/pt-br.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/pt-br.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -24,8 +24,7 @@ $PALANG['pLogin_username'] = 'Usuário (email)'; $PALANG['pLogin_password'] = 'Senha'; $PALANG['pLogin_button'] = 'Entrar'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Usuário inválido. Certifique-se de ter digitado o email corretamente!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Senha inválida!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Usuários devem clicar aqui para acessar a seção de usuários.'; $PALANG['pMenu_main'] = 'Menu Principal'; Modified: trunk/languages/ru.lang =================================================================== --- trunk/languages/ru.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/ru.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -25,8 +25,7 @@ $PALANG['pLogin_username'] = 'Имя (название ящика)'; $PALANG['pLogin_password'] = 'Пароль'; $PALANG['pLogin_button'] = 'Войти'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Неправильное имя. Проверьте, правильно ли вы ввели имя (название ящика)!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Введен неправильный пароль!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Вход для обычных пользователей.'; $PALANG['pMenu_main'] = 'Главная'; @@ -347,7 +346,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'У вас уже есть настроенный автоответчик!'; $PALANG['pUsersVacation_subject'] = 'Тема'; $PALANG['pUsersVacation_subject_text'] = 'Вне офиса'; -$PALANG['pUsersVacation_body'] = 'Текст'; +$PALANG['pUsersVacation_body'] = 'Текст'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Я буду отсутствовать с <даты> по <дату>. По срочным вопросам вы можете обратиться к <контактному лицу>. Modified: trunk/languages/sk.lang =================================================================== --- trunk/languages/sk.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/sk.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -22,8 +22,7 @@ $PALANG['pLogin_username'] = 'Užívateľské meno (email)'; $PALANG['pLogin_password'] = 'Heslo'; $PALANG['pLogin_button'] = 'Prihlásiť'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Nesprávne; uživateľské meno. Prihlasujte se svojou emailovou adresou!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Nesprávne heslo!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Vstup do užívateľskej sekcie.'; $PALANG['pMenu_main'] = 'Main'; # XXX @@ -339,7 +338,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Už máate nastavenú automatickú odpoveď!'; $PALANG['pUsersVacation_subject'] = 'Predmet'; $PALANG['pUsersVacation_subject_text'] = 'Dovolenka'; -$PALANG['pUsersVacation_body'] = 'Obsah'; +$PALANG['pUsersVacation_body'] = 'Obsah'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Som na dovolenke od <date> od <date>. S neodkladnými zprávami kontaktujte <contact person>. Modified: trunk/languages/sl.lang =================================================================== --- trunk/languages/sl.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/sl.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -22,8 +22,7 @@ $PALANG['pLogin_username'] = 'Uporabniško ime (e-poštni naslov)'; $PALANG['pLogin_password'] = 'Geslo'; $PALANG['pLogin_button'] = 'Prijavi'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Uporabniško ime ni pravilno. Prijaviti se morate z vašim e-poštnim naslovom!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Geslo ni pravilno!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Uporabniki kliknite tukaj, če želite nastaviti odsotnost ali spremeniti geslo.'; $PALANG['pMenu_main'] = 'Main'; # XXX @@ -339,7 +338,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Obvestilo o odsotnosti imate že nastavljeno!'; $PALANG['pUsersVacation_subject'] = 'Zadeva'; $PALANG['pUsersVacation_subject_text'] = 'Odsotnost'; -$PALANG['pUsersVacation_body'] = 'Besedilo'; +$PALANG['pUsersVacation_body'] = 'Besedilo'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Od <datum> do <datum> sem odsoten. Za nujne zadeve prosim kontaktirajte <kontaktna oseba>. Modified: trunk/languages/sv.lang =================================================================== --- trunk/languages/sv.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/sv.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -24,8 +24,7 @@ $PALANG['pLogin_username'] = 'Login (epost)'; $PALANG['pLogin_password'] = 'Lösenord'; $PALANG['pLogin_button'] = 'Login'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Ditt login är ej korrekt. Logga in med din epostadress!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Du angav fel lösenord!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Användare klickar här för att logga in på användardelen.'; $PALANG['pMenu_main'] = 'Huvudmeny'; @@ -341,7 +340,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Du har redan ett autosvar meddelande definierat!'; $PALANG['pUsersVacation_subject'] = 'Ärende'; $PALANG['pUsersVacation_subject_text'] = 'Out of Office'; -$PALANG['pUsersVacation_body'] = 'Text'; +$PALANG['pUsersVacation_body'] = 'Text'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM Jag är borta från <datum> till <datum>. För brådskande ärenden kan ni kontakta <kontakt person>. Modified: trunk/languages/tr.lang =================================================================== --- trunk/languages/tr.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/tr.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -22,8 +22,7 @@ $PALANG['pLogin_username'] = 'Kullanýcý adý (eposta)'; $PALANG['pLogin_password'] = 'Þifre'; $PALANG['pLogin_button'] = 'Giriþ'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Kullanýcý adnýnýz doðru deðil. E-posta adresinizi kontrol ediniz.</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Þifreniz doðru deðil!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = 'Kullanýcý iþlemlerine girmek için burayý kullanýnýz.'; $PALANG['pMenu_main'] = 'Main'; # XXX @@ -339,7 +338,7 @@ $PALANG['pUsersVacation_welcome_text'] = 'Zaten bir otomatik cevaplamanýz bulunmakta!'; $PALANG['pUsersVacation_subject'] = 'konu'; $PALANG['pUsersVacation_subject_text'] = 'Ofis dýþýnda'; -$PALANG['pUsersVacation_body'] = 'Metin'; +$PALANG['pUsersVacation_body'] = 'Metin'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM <date> tarihinden den <date> ine burada bulunmayacaðým. Acil durumlarda lütfen <contact person> a baþvurunuz. Modified: trunk/languages/tw.lang =================================================================== --- trunk/languages/tw.lang 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/languages/tw.lang 2009-01-25 20:53:11 UTC (rev 550) @@ -22,8 +22,7 @@ $PALANG['pLogin_username'] = '帳號 (郵件地址)'; $PALANG['pLogin_password'] = '密碼'; $PALANG['pLogin_button'] = '登錄'; -$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">登錄失敗, 請確認你是使用你的郵件地址登錄!</span>'; -$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">密碼錯誤!</span>'; +$PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX $PALANG['pLogin_login_users'] = '普通用戶點擊這裡進入用戶控制面板.'; $PALANG['pMenu_main'] = 'Main'; # XXX @@ -339,7 +338,7 @@ $PALANG['pUsersVacation_welcome_text'] = '你已經設置了自動回復!'; $PALANG['pUsersVacation_subject'] = '主題'; $PALANG['pUsersVacation_subject_text'] = '我現在無法回信'; -$PALANG['pUsersVacation_body'] = '內容'; +$PALANG['pUsersVacation_body'] = '內容'; # XXX text changed to 'Message' $PALANG['pUsersVacation_body_text'] = <<<EOM 我在 <date> 到 <date> 這段時間內暫時無法回信. 如果你有急事請與 <contact person> 聯繫. Modified: trunk/login.php =================================================================== --- trunk/login.php 2009-01-25 20:16:05 UTC (rev 549) +++ trunk/login.php 2009-01-25 20:53:11 UTC (rev 550) @@ -71,14 +71,14 @@ if ($result['rows'] != 1) { $error = 1; - $tMessage = $PALANG['pLogin_failed']; + $tMessage = '<span class="error_msg">' . $PALANG['pLogin_failed'] . '</span>'; $tUsername = $fUsername; } } else { $error = 1; - $tMessage = $PALANG['pLogin_failed']; + $tMessage = '<span class="error_msg">' . $PALANG['pLogin_failed'] . '</span>'; } if ($error != 1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <roe...@us...> - 2009-02-03 17:50:21
|
Revision: 560 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=560&view=rev Author: roehrijn Date: 2009-02-03 17:50:13 +0000 (Tue, 03 Feb 2009) Log Message: ----------- config.inc.php: - Added configuration for courier authlib authentication flavors function.inc.php: - changed pa_crypt to make it handle courier authlib authentication flavors Modified Paths: -------------- trunk/config.inc.php trunk/functions.inc.php Modified: trunk/config.inc.php =================================================================== --- trunk/config.inc.php 2009-02-02 22:14:23 UTC (rev 559) +++ trunk/config.inc.php 2009-02-03 17:50:13 UTC (rev 560) @@ -89,8 +89,15 @@ // system = whatever you have set as your PHP system default // cleartext = clear text passwords (ouch!) // mysql_encrypt = useful for PAM integration +// authlib = support for courier-authlib style passwords $CONF['encrypt'] = 'md5crypt'; +// In what flavor should courier-authlib style passwords be enrypted? +// md5 = {md5} + base64 encoded md5 hash +// md5raw = {md5raw} + plain encoded md5 hash +// crypt = {crypt} + Standard UNIX DES-enrypted with 2-character salt +$CONF['authlib_default_flavor'] = 'md5raw'; + // Minimum length required for passwords. Postfixadmin will not // allow users to set passwords which are shorter than this value. $CONF['min_password_length'] = 5; Modified: trunk/functions.inc.php =================================================================== --- trunk/functions.inc.php 2009-02-02 22:14:23 UTC (rev 559) +++ trunk/functions.inc.php 2009-02-03 17:50:13 UTC (rev 560) @@ -256,7 +256,7 @@ flash_error("emailcheck_resolve_domain is enabled, but function (checkdnsrr) missing!"); } } - + return true; } @@ -1160,6 +1160,27 @@ $l = db_row($res["result"]); $password = $l[0]; } + + if ($CONF['encrypt'] == 'authlib') { + $flavor = $CONF['authlib_default_flavor']; + $salt = ' '; + if(ereg('^{.*}', $pw_db)) { + // we have a flavor in the db -> use it instead of default flavor + $result = split('{|}', $pw_db, 3); + $flavor = $result[1]; + $salt = substr($result[2], 0, 2); + } + + if(stripos($flavor, 'md5raw') === 0) { + $password = '{' . $flavor . '}' . md5($pw); + } else if(stripos($flavor, 'md5') === 0) { + $password = '{' . $flavor . '}' . base64_encode(md5($pw, TRUE)); + } else if(stripos($flavor, 'crypt') === 0) { + $password = '{' . $flavor . '}' . crypt($pw, $salt); + } + } + + $password = escape_string ($password); return $password; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2009-02-03 21:02:10
|
Revision: 561 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=561&view=rev Author: christian_boltz Date: 2009-02-03 21:02:04 +0000 (Tue, 03 Feb 2009) Log Message: ----------- CHANGELOG.TXT: - updated with latest changes functions.inc.php - whitespace fixes Modified Paths: -------------- trunk/CHANGELOG.TXT trunk/functions.inc.php Modified: trunk/CHANGELOG.TXT =================================================================== --- trunk/CHANGELOG.TXT 2009-02-03 17:50:13 UTC (rev 560) +++ trunk/CHANGELOG.TXT 2009-02-03 21:02:04 UTC (rev 561) @@ -15,13 +15,14 @@ ----------------- -Version 2.3 - 2009/01/30 - SVN r557 +Version 2.3 - 2009/02/03 - SVN r561 ----------------------------------- - vacation.pl: make it strip/discover addresses better, slightly better logging, stop it requiring a messageid - added ADDITIONS/delete-mailq-by-domain.pl (by Jose Nilton) - added ADDITIONS/quota_usage.pl (by Jose Nilton) - produces report of quota usage - - some small bugfixes + - added support for courier authlib authentication flavors ($CONF['authlib_default_flavor']) + - some small bugfixes and language updates Version 2.3 Beta - 2009/01/15 - SVN r527 Modified: trunk/functions.inc.php =================================================================== --- trunk/functions.inc.php 2009-02-03 17:50:13 UTC (rev 560) +++ trunk/functions.inc.php 2009-02-03 21:02:04 UTC (rev 561) @@ -256,7 +256,7 @@ flash_error("emailcheck_resolve_domain is enabled, but function (checkdnsrr) missing!"); } } - + return true; } @@ -1162,23 +1162,23 @@ } if ($CONF['encrypt'] == 'authlib') { - $flavor = $CONF['authlib_default_flavor']; - $salt = ' '; - if(ereg('^{.*}', $pw_db)) { - // we have a flavor in the db -> use it instead of default flavor - $result = split('{|}', $pw_db, 3); - $flavor = $result[1]; - $salt = substr($result[2], 0, 2); - } - - if(stripos($flavor, 'md5raw') === 0) { - $password = '{' . $flavor . '}' . md5($pw); - } else if(stripos($flavor, 'md5') === 0) { - $password = '{' . $flavor . '}' . base64_encode(md5($pw, TRUE)); - } else if(stripos($flavor, 'crypt') === 0) { - $password = '{' . $flavor . '}' . crypt($pw, $salt); - } - } + $flavor = $CONF['authlib_default_flavor']; + $salt = ' '; + if(ereg('^{.*}', $pw_db)) { + // we have a flavor in the db -> use it instead of default flavor + $result = split('{|}', $pw_db, 3); + $flavor = $result[1]; + $salt = substr($result[2], 0, 2); + } + + if(stripos($flavor, 'md5raw') === 0) { + $password = '{' . $flavor . '}' . md5($pw); + } else if(stripos($flavor, 'md5') === 0) { + $password = '{' . $flavor . '}' . base64_encode(md5($pw, TRUE)); + } else if(stripos($flavor, 'crypt') === 0) { + $password = '{' . $flavor . '}' . crypt($pw, $salt); + } + } $password = escape_string ($password); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2009-02-15 15:02:30
|
Revision: 566 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=566&view=rev Author: christian_boltz Date: 2009-02-15 15:02:26 +0000 (Sun, 15 Feb 2009) Log Message: ----------- - added/fixed vim: lines to nearly all *.php files (exception: templates/*) (ts=3 or ts=4 depending on the file content) - several whitespace fixes - (no code changes) Modified Paths: -------------- trunk/create-alias.php trunk/delete.php trunk/edit-admin.php trunk/edit-alias.php trunk/edit-domain.php trunk/index.php trunk/list-admin.php trunk/login.php trunk/logout.php trunk/main.php trunk/password.php trunk/search.php trunk/setup.php trunk/templates/header.php trunk/users/edit-alias.php trunk/users/index.php trunk/users/logout.php trunk/users/main.php trunk/users/password.php trunk/variables.inc.php Modified: trunk/create-alias.php =================================================================== --- trunk/create-alias.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/create-alias.php 2009-02-15 15:02:26 UTC (rev 566) @@ -41,7 +41,7 @@ $list_domains = list_domains (); } else { - $list_domains = list_domains_for_admin ($username); + $list_domains = list_domains_for_admin ($username); } $pCreate_alias_goto_text = $PALANG['pCreate_alias_goto_text']; @@ -57,7 +57,7 @@ { if (isset ($_POST['fAddress']) && isset ($_POST['fDomain'])) { $fAddress = escape_string($_POST['fAddress']) . "@" . escape_string ($_POST['fDomain']); - $fAddress = strtolower ($fAddress); + $fAddress = strtolower ($fAddress); } if (isset ($_POST['fGoto'])) { @@ -156,4 +156,5 @@ include ("templates/menu.php"); include ("templates/create-alias.php"); include ("templates/footer.php"); +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ ?> Modified: trunk/delete.php =================================================================== --- trunk/delete.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/delete.php 2009-02-15 15:02:26 UTC (rev 566) @@ -171,5 +171,5 @@ include ("templates/message.php"); include ("templates/footer.php"); -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ ?> Modified: trunk/edit-admin.php =================================================================== --- trunk/edit-admin.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/edit-admin.php 2009-02-15 15:02:26 UTC (rev 566) @@ -101,11 +101,11 @@ $sqlActive = db_get_boolean(False); } - $password_query = ''; - if ($fPassword != '') { # do not change password to empty one - $password_query = ", password='$fPassword'"; - } - $result = db_query ("UPDATE $table_admin SET modified=NOW(),active='$sqlActive' $password_query WHERE username='$username'"); + $password_query = ''; + if ($fPassword != '') { # do not change password to empty one + $password_query = ", password='$fPassword'"; + } + $result = db_query ("UPDATE $table_admin SET modified=NOW(),active='$sqlActive' $password_query WHERE username='$username'"); if ($fSadmin == "on") $fSadmin = 'ALL'; @@ -155,5 +155,5 @@ include ("templates/admin_edit-admin.php"); include ("templates/footer.php"); -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ ?> Modified: trunk/edit-alias.php =================================================================== --- trunk/edit-alias.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/edit-alias.php 2009-02-15 15:02:26 UTC (rev 566) @@ -99,15 +99,15 @@ $array = array(); } - for ($i = 0; $i < sizeof ($array); $i++) { - if (in_array ("$array[$i]", $CONF['default_aliases'])) continue; - if (empty ($array[$i])) continue; # TODO: should never happen - remove after 2.2 release - if (!check_email ($array[$i])) - { - $error = 1; - $tGoto = $goto; - $tMessage = $PALANG['pEdit_alias_goto_text_error2'] . "$array[$i]</span>"; - } + for ($i = 0; $i < sizeof ($array); $i++) { + if (in_array ("$array[$i]", $CONF['default_aliases'])) continue; + if (empty ($array[$i])) continue; # TODO: should never happen - remove after 2.2 release + if (!check_email ($array[$i])) + { + $error = 1; + $tGoto = $goto; + $tMessage = $PALANG['pEdit_alias_goto_text_error2'] . "$array[$i]</span>"; + } } if ($error != 1) Modified: trunk/edit-domain.php =================================================================== --- trunk/edit-domain.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/edit-domain.php 2009-02-15 15:02:26 UTC (rev 566) @@ -121,5 +121,5 @@ include ("templates/admin_edit-domain.php"); include ("templates/footer.php"); -/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ ?> Modified: trunk/index.php =================================================================== --- trunk/index.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/index.php 2009-02-15 15:02:26 UTC (rev 566) @@ -85,3 +85,6 @@ </p> </body> </html> +<?php +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ +?> Modified: trunk/list-admin.php =================================================================== --- trunk/list-admin.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/list-admin.php 2009-02-15 15:02:26 UTC (rev 566) @@ -27,9 +27,9 @@ $list_admins = list_admins(); if ((is_array ($list_admins) and sizeof ($list_admins) > 0)) { - for ($i = 0; $i < sizeof ($list_admins); $i++) { - $admin_properties[$i] = get_admin_properties ($list_admins[$i]); - } + for ($i = 0; $i < sizeof ($list_admins); $i++) { + $admin_properties[$i] = get_admin_properties ($list_admins[$i]); + } } include ("templates/header.php"); @@ -37,4 +37,5 @@ include ("templates/admin_list-admin.php"); include ("templates/footer.php"); +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ ?> Modified: trunk/login.php =================================================================== --- trunk/login.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/login.php 2009-02-15 15:02:26 UTC (rev 566) @@ -32,14 +32,14 @@ # force user to delete setup.php (allows creation of superadmins!) if (file_exists (realpath ("./setup.php"))) { - if (is_string($CONF['configured']) && $CONF['configured'] == 'I_know_the_risk_of_not_deleting_setup.php') - { - } - else - { + if (is_string($CONF['configured']) && $CONF['configured'] == 'I_know_the_risk_of_not_deleting_setup.php') + { + } + else + { print "Please delete setup.php before using Postfix Admin!"; exit; - } + } } if ($_SERVER['REQUEST_METHOD'] == "GET") @@ -55,12 +55,12 @@ $fPassword = ''; if (isset ($_POST['fUsername'])) $fUsername = escape_string ($_POST['fUsername']); if (isset ($_POST['fPassword'])) $fPassword = escape_string ($_POST['fPassword']); - $lang = safepost('lang'); + $lang = safepost('lang'); - if ( $lang != check_language(0) ) { # only set cookie if language selection was changed - setcookie('lang', $lang, time() + 60*60*24*30); # language cookie, lifetime 30 days - # (language preference cookie is processed even if username and/or password are invalid) - } + if ( $lang != check_language(0) ) { # only set cookie if language selection was changed + setcookie('lang', $lang, time() + 60*60*24*30); # language cookie, lifetime 30 days + # (language preference cookie is processed even if username and/or password are invalid) + } $result = db_query ("SELECT password FROM $table_admin WHERE username='$fUsername' AND active='1'"); if ($result['rows'] == 1) @@ -105,4 +105,6 @@ include ("./templates/login.php"); include ("./templates/footer.php"); } + +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ ?> Modified: trunk/logout.php =================================================================== --- trunk/logout.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/logout.php 2009-02-15 15:02:26 UTC (rev 566) @@ -28,4 +28,6 @@ header ("Location: login.php"); exit; + +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ ?> Modified: trunk/main.php =================================================================== --- trunk/main.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/main.php 2009-02-15 15:02:26 UTC (rev 566) @@ -31,4 +31,6 @@ include ("./templates/menu.php"); include ("./templates/main.php"); include ("./templates/footer.php"); + +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ ?> Modified: trunk/password.php =================================================================== --- trunk/password.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/password.php 2009-02-15 15:02:26 UTC (rev 566) @@ -93,4 +93,6 @@ include ("./templates/password.php"); include ("./templates/footer.php"); } + +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ ?> Modified: trunk/search.php =================================================================== --- trunk/search.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/search.php 2009-02-15 15:02:26 UTC (rev 566) @@ -90,7 +90,7 @@ { $row['modified']=gmstrftime('%c %Z',$row['modified']); $row['active']=('t'==$row['active']) ? 1 : 0; - } + } $tAlias[] = $row; } } @@ -129,5 +129,5 @@ include ("templates/search.php"); include ("templates/footer.php"); -// vim:ts=4:sw=4:et +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ ?> Modified: trunk/setup.php =================================================================== --- trunk/setup.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/setup.php 2009-02-15 15:02:26 UTC (rev 566) @@ -209,8 +209,8 @@ } else { print "<li><b>Error: Can't connect to database</b><br />\n"; print "Please edit the \$CONF['database_*'] parameters in config.inc.php.\n"; - print "$error_text</li>\n"; - $error ++; + print "$error_text</li>\n"; + $error ++; } } @@ -369,3 +369,6 @@ </div> </body> </html> +<?php +/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ +?> Modified: trunk/templates/header.php =================================================================== --- trunk/templates/header.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/templates/header.php 2009-02-15 15:02:26 UTC (rev 566) @@ -14,9 +14,9 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <?php if (file_exists (realpath ("../".$CONF['theme_css']))) { - print "<link rel=\"stylesheet\" type=\"text/css\" href=\"../".htmlentities($CONF['theme_css'])."\" />\n"; + print "<link rel=\"stylesheet\" type=\"text/css\" href=\"../".htmlentities($CONF['theme_css'])."\" />\n"; } else { - print "<link rel=\"stylesheet\" type=\"text/css\" href=\"".htmlentities($CONF['theme_css'])."\" />\n"; + print "<link rel=\"stylesheet\" type=\"text/css\" href=\"".htmlentities($CONF['theme_css'])."\" />\n"; } ?> <title>Postfix Admin - <?php print $_SERVER['HTTP_HOST']; ?></title> @@ -26,14 +26,14 @@ <?php if (file_exists (realpath ("../".$CONF['theme_logo']))) { - print "<img id=\"login_header_logo\" src=\"../".htmlentities($CONF['theme_logo'])."\" />\n"; + print "<img id=\"login_header_logo\" src=\"../".htmlentities($CONF['theme_logo'])."\" />\n"; } else { - print "<img id=\"login_header_logo\" src=\"".htmlentities($CONF['theme_logo'])."\" />\n"; + print "<img id=\"login_header_logo\" src=\"".htmlentities($CONF['theme_logo'])."\" />\n"; } if (($CONF['show_header_text'] == "YES") and ($CONF['header_text'])) { - print "<h2>" . $CONF['header_text'] . "</h2>\n"; + print "<h2>" . $CONF['header_text'] . "</h2>\n"; } ?> </div> @@ -57,3 +57,6 @@ /* nuke it from orbit. It's the only way to be sure. */ $_SESSION['flash'] = array(); } + +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ +?> Modified: trunk/users/edit-alias.php =================================================================== --- trunk/users/edit-alias.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/users/edit-alias.php 2009-02-15 15:02:26 UTC (rev 566) @@ -135,4 +135,6 @@ include ("../templates/users_edit-alias.php"); include ("../templates/footer.php"); } + +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ ?> Modified: trunk/users/index.php =================================================================== --- trunk/users/index.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/users/index.php 2009-02-15 15:02:26 UTC (rev 566) @@ -26,4 +26,6 @@ */ header ("Location: login.php"); exit; + +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ ?> Modified: trunk/users/logout.php =================================================================== --- trunk/users/logout.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/users/logout.php 2009-02-15 15:02:26 UTC (rev 566) @@ -29,4 +29,6 @@ header ("Location: login.php"); exit; + +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ ?> Modified: trunk/users/main.php =================================================================== --- trunk/users/main.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/users/main.php 2009-02-15 15:02:26 UTC (rev 566) @@ -54,4 +54,6 @@ include ("../templates/users_main.php"); include ("../templates/footer.php"); } + +/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/users/password.php =================================================================== --- trunk/users/password.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/users/password.php 2009-02-15 15:02:26 UTC (rev 566) @@ -32,7 +32,7 @@ authentication_require_role('user'); $USERID_USERNAME = authentication_get_username(); -$tmp = preg_split ('/@/', $USERID_USERNAME); +$tmp = preg_split ('/@/', $USERID_USERNAME); $USERID_DOMAIN = $tmp[1]; if ($_SERVER['REQUEST_METHOD'] == "POST") @@ -58,7 +58,7 @@ $row = db_array ($result['result']); $checked_password = pacrypt($fPassword_current, $row['password']); - $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$username' AND password='$checked_password'"); + $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$username' AND password='$checked_password'"); if ($result['rows'] != 1) { $error = 1; Modified: trunk/variables.inc.php =================================================================== --- trunk/variables.inc.php 2009-02-11 20:02:15 UTC (rev 565) +++ trunk/variables.inc.php 2009-02-15 15:02:26 UTC (rev 566) @@ -19,8 +19,8 @@ */ if (ereg ("variables.inc.php", $_SERVER['PHP_SELF'])) { - header ("Location: login.php"); - exit; + header ("Location: login.php"); + exit; } $error = ""; @@ -99,4 +99,6 @@ $pPassword_admin_text = " "; $pPassword_password_current_text = " "; $pPassword_password_text = " "; + +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2009-02-26 22:57:19
|
Revision: 571 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=571&view=rev Author: christian_boltz Date: 2009-02-26 22:57:11 +0000 (Thu, 26 Feb 2009) Log Message: ----------- list-virtual.php - do not hide "add alias" / "add mailbox" links if domain is a backup MX (includes some whitespace changes, the "real" change removes 3 lines of code checking for the backupmx setting) edit-domain.php - do not reset aliases, mailboxes and maxquota to disabled for backup MX domains These changes should fix https://sourceforge.net/forum/forum.php?thread_id=2897067&forum_id=676076 Modified Paths: -------------- trunk/edit-domain.php trunk/list-virtual.php Modified: trunk/edit-domain.php =================================================================== --- trunk/edit-domain.php 2009-02-26 22:35:50 UTC (rev 570) +++ trunk/edit-domain.php 2009-02-26 22:57:11 UTC (rev 571) @@ -80,9 +80,6 @@ if ($fBackupmx == "on") { - $fAliases = -1; - $fMailboxes = -1; - $fMaxquota = -1; $fBackupmx = 1; $sqlBackupmx = db_get_boolean(True); } Modified: trunk/list-virtual.php =================================================================== --- trunk/list-virtual.php 2009-02-26 22:35:50 UTC (rev 570) +++ trunk/list-virtual.php 2009-02-26 22:57:11 UTC (rev 571) @@ -193,21 +193,18 @@ $tDisplay_next = $fDisplay + $page_size; } - $backup_mx = $limit['backupmx']; - if($backup_mx == 'f' || $backup_mx == 0) { - if($limit['aliases'] == 0) { - $tCanAddAlias = true; - } - elseif($limit['alias_count'] < $limit['aliases']) { - $tCanAddAlias = true; - } - if($limit['mailboxes'] == 0) { - $tCanAddMailbox = true; - } - elseif($limit['mailbox_count'] < $limit['mailboxes']) { - $tCanAddMailbox = true; - } + if($limit['aliases'] == 0) { + $tCanAddAlias = true; } + elseif($limit['alias_count'] < $limit['aliases']) { + $tCanAddAlias = true; + } + if($limit['mailboxes'] == 0) { + $tCanAddMailbox = true; + } + elseif($limit['mailbox_count'] < $limit['mailboxes']) { + $tCanAddMailbox = true; + } } // this is why we need a proper template layer. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2009-03-08 21:16:44
|
Revision: 572 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=572&view=rev Author: GingerDog Date: 2009-03-08 21:16:41 +0000 (Sun, 08 Mar 2009) Log Message: ----------- see https://sourceforge.net/tracker/index.php?func=detail&aid=2567466&group_id=191583&atid=937966 - allow adding of an alias even if a mailbox already exists (e.g. allowing you to do keep+forward) Modified Paths: -------------- trunk/create-alias.php trunk/delete.php trunk/edit-alias.php trunk/functions.inc.php trunk/list-virtual.php Modified: trunk/create-alias.php =================================================================== --- trunk/create-alias.php 2009-02-26 22:57:11 UTC (rev 571) +++ trunk/create-alias.php 2009-03-08 21:16:41 UTC (rev 572) @@ -117,13 +117,15 @@ $fAddress = "@" . escape_string ($_POST['fDomain']); } + $append_alias = false; + $result = db_query ("SELECT * FROM $table_alias WHERE address='$fAddress'"); - if ($result['rows'] == 1) { - $error = 1; + if ($result['rows'] == 1) + { + $append_alias = true; $tAddress = escape_string ($_POST['fAddress']); $tGoto = $fGoto; $tDomain = $fDomain; - $pCreate_alias_address_text = $PALANG['pCreate_alias_address_text_error2']; } if ($fActive == "on") { @@ -133,13 +135,29 @@ $sqlActive = db_get_boolean(False); } - if ($error != 1) { + $success = false; + /* Alias (or mailbox) already present, let's add the destination to that row */ + if ($append_alias) { if (preg_match('/^\*@(.*)$/', $fGoto, $match)) { $fGoto = "@" . $match[1]; } + $array = db_array ($result['result']); + + $values ['goto'] = $array['goto'] . ',' . $fGoto; + $result = db_update ($table_alias, "address = '$fAddress'", $values, array ('modified')); + $success = ($result == 1); + + } elseif ($error != 1) { + if (preg_match('/^\*@(.*)$/', $fGoto, $match)) { + $fGoto = "@" . $match[1]; + } + $result = db_query ("INSERT INTO $table_alias (address,goto,domain,created,modified,active) VALUES ('$fAddress','$fGoto','$fDomain',NOW(),NOW(),'$sqlActive')"); - if ($result['rows'] != 1) { + $success = ($result['rows'] == 1); + } + + if (! $success) { $tDomain = $fDomain; $tMessage = $PALANG['pCreate_alias_result_error'] . "<br />($fAddress -> $fGoto)<br />\n"; } @@ -149,7 +167,6 @@ $tDomain = $fDomain; $tMessage = $PALANG['pCreate_alias_result_success'] . "<br />($fAddress -> $fGoto)<br />\n"; } - } } include ("templates/header.php"); Modified: trunk/delete.php =================================================================== --- trunk/delete.php 2009-02-26 22:57:11 UTC (rev 571) +++ trunk/delete.php 2009-03-08 21:16:41 UTC (rev 572) @@ -43,6 +43,57 @@ $error=0; +/** + * delete_alias + * Action: Delete an alias + * @param String $alias- alias to delete. + * @param String $domain - domain of the alias + * @param boolean $force_delete - deletes the alias from the table if true, + * checks if the alias is real and act accordlying if false. + * Default is false. + * @return String username (e.g. fo...@ex...) + */ +function delete_alias ($alias, $domain, $force_delete = false) +{ + global $table_alias, $table_mailbox; + $real_alias = true; + + if (! $force_delete) + { + $result = db_query ("SELECT 1 FROM $table_mailbox + WHERE username='$alias' AND domain='$domain'"); + if ($result['rows'] != 0) + { + /* If the alias is a real mailbox as well, remove all its real aliases and keep + * only the address */ + $real_alias = false; + } + } + + if ($force_delete or $real_alias) + { + $result = db_query ("DELETE FROM $table_alias WHERE address='$alias' AND domain='$domain'"); + } + else + { + $result = db_query ("UPDATE $table_alias SET goto='$alias',modified=NOW() + WHERE address='$alias' AND domain='$domain'"); + } + + if ($result['rows'] != 1) + { + $tMessage = $PALANG['pDelete_delete_error'] . "<b>$alias</b> (alias)!</span>"; + + return false; + } + else + { + db_log ($SESSID_USERNAME, $fDomain, 'delete_alias', $fDelete); + } + + return true; +} + if ($fTable == "admin") { authentication_require_role('global-admin'); @@ -98,7 +149,7 @@ } } # ($fTable == "alias_domain") -elseif ($fTable == "alias" or $fTable == "mailbox") +elseif ($fTable == "mailbox") { if (!check_owner ($SESSID_USERNAME, $fDomain)) @@ -114,52 +165,61 @@ else { if ($CONF['database_type'] == "pgsql") db_query('BEGIN'); - /* there may be no aliases to delete */ - $result = db_query("SELECT * FROM $table_alias WHERE address = '$fDelete' AND domain = '$fDomain'"); - if($result['rows'] == 1) { - $result = db_query ("DELETE FROM $table_alias WHERE address='$fDelete' AND domain='$fDomain'"); - db_log ($SESSID_USERNAME, $fDomain, 'delete_alias', $fDelete); - } - /* is there a mailbox? if do delete it from orbit; it's the only way to be sure */ - $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$fDelete' AND domain='$fDomain'"); - if ($result['rows'] == 1) + $error = delete_alias ($fDelete, $fDomain, $force_delete = true) ? 0 : 1; + if (! $error) { - $result = db_query ("DELETE FROM $table_mailbox WHERE username='$fDelete' AND domain='$fDomain'"); - $postdel_res=mailbox_postdeletion($fDelete,$fDomain); - if ($result['rows'] != 1 || !$postdel_res) + /* is there a mailbox? if do delete it from orbit; it's the only way to be sure */ + $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$fDelete' AND domain='$fDomain'"); + if ($result['rows'] == 1) { - $error = 1; - $tMessage = $PALANG['pDelete_delete_error'] . "<b>$fDelete</b> ("; - if ($result['rows']!=1) + $result = db_query ("DELETE FROM $table_mailbox WHERE username='$fDelete' AND domain='$fDomain'"); + $postdel_res=mailbox_postdeletion($fDelete,$fDomain); + if ($result['rows'] != 1 || !$postdel_res) { - $tMessage.='mailbox'; - if (!$postdel_res) $tMessage.=', '; + $error = 1; + $tMessage = $PALANG['pDelete_delete_error'] . "<b>$fDelete</b> ("; + if ($result['rows']!=1) + { + $tMessage.='mailbox'; + if (!$postdel_res) $tMessage.=', '; + } + if (!$postdel_res) + { + $tMessage.='post-deletion'; + } + $tMessage.=')</span>'; } - if (!$postdel_res) - { - $tMessage.='post-deletion'; - } - $tMessage.=')</span>'; } + $result = db_query("SELECT * FROM $table_vacation WHERE email = '$fDelete' AND domain = '$fDomain'"); + if($result['rows'] == 1) { + db_query ("DELETE FROM $table_vacation WHERE email='$fDelete' AND domain='$fDomain'"); + db_query ("DELETE FROM $table_vacation_notification WHERE on_vacation ='$fDelete' "); /* should be caught by cascade, if PgSQL */ + } } - $result = db_query("SELECT * FROM $table_vacation WHERE email = '$fDelete' AND domain = '$fDomain'"); - if($result['rows'] == 1) { - db_query ("DELETE FROM $table_vacation WHERE email='$fDelete' AND domain='$fDomain'"); - db_query ("DELETE FROM $table_vacation_notification WHERE on_vacation ='$fDelete' "); /* should be caught by cascade, if PgSQL */ + + if ($error != 1) + { + if ($CONF['database_type'] == "pgsql") db_query('COMMIT'); + header ("Location: list-virtual.php?domain=$fDomain"); + exit; + } else { + $tMessage = $PALANG['pDelete_delete_error'] . "<b>$fDelete</b> (physical mail)!</span>"; + if ($CONF['database_type'] == "pgsql") db_query('ROLLBACK'); } - } + } # ($fTable == "mailbox") +} +elseif ($fTable == "alias") { + $error = delete_alias ($fDelete, $fDomain) ? 0 : 1; if ($error != 1) { - if ($CONF['database_type'] == "pgsql") db_query('COMMIT'); header ("Location: list-virtual.php?domain=$fDomain"); exit; } else { - $tMessage .= $PALANG['pDelete_delete_error'] . "<b>$fDelete</b> (physical mail)!</span>"; - if ($CONF['database_type'] == "pgsql") db_query('ROLLBACK'); + $tMessage = $PALANG['pDelete_delete_error'] . "<b>$fDelete</b> (alias)!</span>"; } -} +} else { flash_error($PALANG['invalid_parameter']); Modified: trunk/edit-alias.php =================================================================== --- trunk/edit-alias.php 2009-02-26 22:57:11 UTC (rev 571) +++ trunk/edit-alias.php 2009-03-08 21:16:41 UTC (rev 572) @@ -46,6 +46,13 @@ { $row = db_array ($result['result']); $tGoto = $row['goto']; + + /* Has a mailbox as well? Remove the address from $tGoto in order to edit just the real aliases */ + $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$fAddress' AND domain='$fDomain'"); + if ($result['rows'] == 1) + { + $tGoto = preg_replace ('/\s*,*\s*' . $fAddress . '\s*,*\s*/', '', $tGoto); + } } } else @@ -110,6 +117,13 @@ } } + $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$fAddress' AND domain='$fDomain'"); + /* The alias has a real mailbox as well, prepend $goto with it */ + if ($result['rows'] == 1) + { + $goto = "$fAddress,$goto"; + } + if ($error != 1) { $result = db_query ("UPDATE $table_alias SET goto='$goto',modified=NOW() WHERE address='$fAddress' AND domain='$fDomain'"); Modified: trunk/functions.inc.php =================================================================== --- trunk/functions.inc.php 2009-02-26 22:57:11 UTC (rev 571) +++ trunk/functions.inc.php 2009-03-08 21:16:41 UTC (rev 572) @@ -431,18 +431,25 @@ global $table_alias, $table_mailbox, $table_domain; $list = array (); - $result = db_query ("SELECT COUNT(*) FROM $table_alias WHERE domain='$domain'"); - $row = db_row ($result['result']); - $list['alias_count'] = $row[0]; + $result = db_query ("SELECT COUNT(*) FROM $table_alias + LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username + WHERE ($table_alias.domain='$domain' AND $table_mailbox.maildir IS NULL) + OR + ($table_alias.domain='$domain' + AND $table_alias.goto LIKE '%,%' + AND $table_mailbox.maildir IS NOT NULL)"); + $row = db_row ($result['result']); + $list['alias_count'] = $row[0]; + $result = db_query ("SELECT COUNT(*) FROM $table_mailbox WHERE domain='$domain'"); $row = db_row ($result['result']); $list['mailbox_count'] = $row[0]; - $result = db_query ("SELECT SUM(quota) FROM $table_mailbox WHERE domain='$domain'"); - $row = db_row ($result['result']); - $list['quota_sum'] = $row[0]; - $list['alias_count'] = $list['alias_count'] - $list['mailbox_count']; + $result = db_query ("SELECT SUM(quota) FROM $table_mailbox WHERE domain='$domain'"); + $row = db_row ($result['result']); + $list['quota_sum'] = $row[0]; + $list['alias_count'] = $list['alias_count']; $list['alias_pgindex']=array (); $list['mbox_pgindex']=array (); @@ -455,24 +462,40 @@ $idxlabel=""; $list['alias_pgindex_count'] = 0; - if ( $list['alias_count'] > $page_size ) - { - while ( $current < $list['alias_count'] ) - { - $limitSql=('pgsql'==$CONF['database_type']) ? "1 OFFSET $current" : "$current, 1"; - $query = "SELECT $table_alias.address FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username WHERE $table_alias.domain='$domain' AND $table_mailbox.maildir IS NULL ORDER BY $table_alias.address LIMIT $limitSql"; - $result = db_query ("$query"); - $row = db_array ($result['result']); - $tmpstr = $row['address']; - //get first 2 chars - $idxlabel = $tmpstr[0] . $tmpstr[1] . "-"; - ($current + $page_size - 1 <= $list['alias_count']) ? $current = $current + $page_size - 1 : $current = $list['alias_count'] - 1; - $limitSql=('pgsql'==$CONF['database_type']) ? "1 OFFSET $current" : "$current, 1"; - $query = "SELECT $table_alias.address FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username WHERE $table_alias.domain='$domain' AND $table_mailbox.maildir IS NULL ORDER BY $table_alias.address LIMIT $limitSql"; - $result = db_query ("$query"); - $row = db_array ($result['result']); - $tmpstr = $row['address']; - $idxlabel = $idxlabel . $tmpstr[0] . $tmpstr[1]; + if ( $list['alias_count'] > $page_size ) + { + while ( $current < $list['alias_count'] ) + { + $limitSql=('pgsql'==$CONF['database_type']) ? "1 OFFSET $current" : "$current, 1"; + $query = "SELECT $table_alias.address + FROM $table_alias + LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username + WHERE ($table_alias.domain='$domain' AND $table_mailbox.maildir IS NULL) + OR + ($table_alias.domain='$domain' + AND $table_alias.goto LIKE '%,%' + AND $table_mailbox.maildir IS NOT NULL) + ORDER BY $table_alias.address LIMIT $limitSql"; + $result = db_query ("$query"); + $row = db_array ($result['result']); + $tmpstr = $row['address']; + //get first 2 chars + $idxlabel = $tmpstr[0] . $tmpstr[1] . "-"; + ($current + $page_size - 1 <= $list['alias_count']) ? $current = $current + $page_size - 1 : $current = $list['alias_count'] - 1; + $limitSql=('pgsql'==$CONF['database_type']) ? "1 OFFSET $current" : "$current, 1"; + $query = "SELECT $table_alias.address + FROM $table_alias + LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username + WHERE ($table_alias.domain='$domain' AND $table_mailbox.maildir IS NULL) + OR + ($table_alias.domain='$domain' + AND $table_alias.goto LIKE '%,%' + AND $table_mailbox.maildir IS NOT NULL) + ORDER BY $table_alias.address LIMIT $limitSql"; + $result = db_query ("$query"); + $row = db_array ($result['result']); + $tmpstr = $row['address']; + $idxlabel = $idxlabel . $tmpstr[0] . $tmpstr[1]; $current = $current + 1; @@ -1103,11 +1126,16 @@ -// -// pacrypt -// Action: Encrypts password based on config settings -// Call: pacrypt (string cleartextpassword) -// +/** + * Encrypt a password, using the apparopriate hashing mechanism as defined in + * config.inc.php ($CONF['encrypt']). + * When wanting to compare one pw to another, it's necessary to provide the salt used - hence + * the second parameter ($pw_db), which is the existing hash from the DB. + * + * @param string $pw + * @param string $encrypted password + * @return string encrypted password. + */ function pacrypt ($pw, $pw_db="") { global $CONF; Modified: trunk/list-virtual.php =================================================================== --- trunk/list-virtual.php 2009-02-26 22:57:11 UTC (rev 571) +++ trunk/list-virtual.php 2009-03-08 21:16:41 UTC (rev 572) @@ -72,7 +72,6 @@ exit(0); } - if (boolconf('alias_domain')) { # Alias-Domains # first try to get a list of other domains pointing @@ -118,10 +117,29 @@ } } -$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"; +$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) + OR + ($table_alias.domain='$fDomain' + AND $table_alias.goto LIKE '%,%' + AND $table_mailbox.maildir IS NOT NULL) + ORDER BY $table_alias.address LIMIT $fDisplay, $page_size"; + if ('pgsql'==$CONF['database_type']) { - $query = "SELECT address,goto,extract(epoch from modified) as modified,active FROM $table_alias WHERE domain='$fDomain' AND NOT EXISTS(SELECT 1 FROM $table_mailbox WHERE username=$table_alias.address) ORDER BY address LIMIT $page_size OFFSET $fDisplay"; + $query = "SELECT address, + goto, + modified, + active + FROM $table_alias WHERE domain='$fDomain' + AND NOT EXISTS(SELECT 1 FROM $table_mailbox + WHERE username=$table_alias.address + AND $table_alias.goto NOT LIKE '%,%') + ORDER BY address LIMIT $page_size OFFSET $fDisplay"; } $result = db_query ($query); if ($result['rows'] > 0) @@ -133,6 +151,13 @@ $row['modified']=gmstrftime('%c %Z',$row['modified']); $row['active']=('t'==$row['active']) ? 1 : 0; } + + /* Has a real mailbox as well? Remove the address from $row['goto'] in order to edit just the real aliases */ + if (strstr ($row['goto'], ',') != FALSE) + { + $row['goto'] = preg_replace ('/\s*,*\s*' . $row['address'] . '\s*,*\s*/', '', $row['goto']); + } + $tAlias[] = $row; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2009-03-13 20:50:00
|
Revision: 575 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=575&view=rev Author: GingerDog Date: 2009-03-13 20:48:24 +0000 (Fri, 13 Mar 2009) Log Message: ----------- refactoring of users (most app logic is now in /model) Modified Paths: -------------- trunk/users/edit-alias.php trunk/users/login.php trunk/users/main.php trunk/users/password.php trunk/users/vacation.php Added Paths: ----------- trunk/model/ trunk/model/AliasHandler.php trunk/model/UserHandler.php trunk/model/VacationHandler.php Added: trunk/model/AliasHandler.php =================================================================== --- trunk/model/AliasHandler.php (rev 0) +++ trunk/model/AliasHandler.php 2009-03-13 20:48:24 UTC (rev 575) @@ -0,0 +1,185 @@ +<?php + +/** + * Handlers User level alias actions - e.g. add alias, get aliases, update etc. + */ +class AliasHandler { + + private $username = null; + + public function __construct($username) { + $this->username = $username; + + } + /** + * @return list of email addresses the user's mail is forwarded to. + * (may be an empty list, especially if $CONF['alias_control'] is turned off... + * @param boolean - by default we don't return special addresses (e.g. vacation and mailbox alias); pass in true here if you wish to. + */ + public function get($all=false) { + $username = escape_string($this->username); + $table_alias = table_by_key('alias'); + + $sql = "SELECT * FROM $table_alias WHERE address='$username'"; + $result = db_query($sql); + if ($result['rows'] == 1) + { + $row = db_array ($result['result']); + // At the moment Postfixadmin stores aliases in it's database in a comma seperated list; this may change one day. + $list = explode(',', $row['goto']); + if($all) { + return $list; + } + + $new_list = array(); + /* if !$all, remove vacation & mailbox aliases */ + foreach($list as $address) { + if($address != '' ) { + if($this->is_vacation_address($address) || $this->is_mailbox_alias($address)) { + } + else { + $new_list[] = $address; + } + } + } + $list = $new_list; + return $list; + } + return array(); + } + + /** + * @param string $address + * @param string $username + * @return boolean true if the username is an alias for the mailbox AND we have alias_control turned off. + */ + public function is_mailbox_alias($address) { + global $CONF; + $username = $this->username; + if($address == $username) { + return true; + } + return false; + } + + /** + * @param string $address + * @return boolean true if the address contains the vacation domain + */ + public function is_vacation_address($address) { + global $CONF; + if($CONF['vacation'] == 'YES') { + if(stripos($address, '@' . $CONF['vacation_domain'])) { + return true; + } + } + return false; + } + /** + * @return boolean true on success + * @param string $username + * @param array $addresses - list of aliases to set for the user. + * @param string flags - forward_and_store or remote_only or '' + * @param boolean $vacation_persist - set to false to stop the vacation address persisting across updates + * Set the user's aliases to those provided. If $addresses ends up being empty the alias record is removed. + */ + public function update($addresses, $flags = '', $vacation_persist=true) { + // find out if the user is on vacation or not; if they are, + // then the vacation alias needs adding to the db (as we strip it out in the get method) + // likewise with the alias_control address. + + $valid_flags = array('', 'forward_and_store', 'remote_only'); + if(!in_array($flags, $valid_flags)) { + die("Invalid flag passed into update()... : $flag - valid options are :" . implode(',', $valid_flags)); + } + $addresses = array_unique($addresses); + + $original = $this->get(true); + + foreach($original as $address) { + if($vacation_persist) { + if($this->is_vacation_address($address)) { + $addresses[] = $address; + } + } + if($flags != 'remote_only') { + if($this->is_mailbox_alias($address)) { + $addresses[] = $address; + } + } + } + $addresses = array_unique($addresses); + + $new_list = array(); + if($flags == 'remote_only') { + foreach($addresses as $address) { + // strip out our username... if it's in the list given. + if($address != $this->username) { + $new_list[] = $address; + } + } + $addresses = $new_list; + } + + if($flags == 'forward_and_store') { + if(!in_array($this->username, $addresses)) { + $addresses[] = $this->username; + } + } + $new_list = array(); + foreach($addresses as $address) { + if($address != '') { + $new_list[] = $address; + } + } + $addresses = array_unique($new_list); + $username = escape_string($this->username); + $goto = escape_string(implode(',', $addresses)); + $table_alias = table_by_key('alias'); + if(sizeof($addresses) == 0) { + $sql = "DELETE FROM $table_alias WHERE address = '$username'"; + } + if($this->hasAliasRecord() == false) { + $true = db_get_boolean(True); + $tmp = preg_split('/@/', $username); + $domain = $tmp[1]; + $sql = "INSERT INTO $table_alias (address, goto, domain, created, modified, active) VALUES ('$username', '$goto', '$domain', NOW(), NOW(), $true)"; + } + else { + $sql = "UPDATE $table_alias SET goto = '$goto', modified = NOW() WHERE address = '$username'"; + } + $result = db_query($sql); + if($result['rows'] != 1) { + return false; + } + db_log($username, $domain, 'edit_alias', "$username -> $goto"); + return true; + } + + /** + * Determine whether a local delivery address is present. This is + * stores as an alias with the same name as the mailbox name (username) + * @return boolean true if local delivery is enabled + */ + public function hasStoreAndForward() { + $aliases = $this->get(true); + if(in_array($this->username, $aliases)) { + return true; + } + return false; + } + + /** + * @return boolean true if the user has an alias record (i.e row in alias table); else false. + */ + public function hasAliasRecord() { + $username = escape_string($this->username); + $table_alias = table_by_key('alias'); + $sql = "SELECT * FROM $table_alias WHERE address = '$username'"; + $result = db_query($sql); + if($result['rows'] == 1) { + return true; + } + return false; + } +} Added: trunk/model/UserHandler.php =================================================================== --- trunk/model/UserHandler.php (rev 0) +++ trunk/model/UserHandler.php 2009-03-13 20:48:24 UTC (rev 575) @@ -0,0 +1,65 @@ +<?php + +/** + * Simple class to represent a user. + */ +class UserHandler { + + /** + * @return boolean true on success; false on failure + * @param string $username + * @param string $old_password + * @param string $new_passwords + * + * All passwords need to be plain text; they'll be hashed appropriately + * as per the configuration in config.inc.php + */ + public function change_pass($username, $old_password, $new_password) { + global $config; + if(!UserHandler::login($username, $old_password)) { + return false; + } + + $tmp = preg_split ('/@/', $username); + $USERID_DOMAIN = $tmp[1]; + + $username = escape_string($username); + $table_mailbox = table_by_key('mailbox'); + + $active = db_get_boolean(True); + $result = db_query("SELECT * FROM $table_mailbox WHERE username='$username' AND active=$active"); + $new_db_password = escape_string(pacrypt($new_password)); + + $result = db_query ("UPDATE $table_mailbox SET password='$new_db_password',modified=NOW() WHERE username='$username'"); + + db_log ($username, $USERID_DOMAIN, 'edit_password', "$USERID_USERNAME"); + return true; + } + + /** + * Attempt to log a user in. + * @param string $username + * @param string $password + * @return boolean true on successful login (i.e. password matches etc) + */ + public static function login($username, $password) { + global $config; + $username = escape_string($username); + + $table_mailbox = table_by_key('mailbox'); + $active = db_get_boolean(True); + $query = "SELECT password FROM $table_mailbox WHERE username='$username' AND active=$active"; + + $result = db_query ($query); + if ($result['rows'] == 1) + { + $row = db_array ($result['result']); + $password = pacrypt ($password, $row['password']); + + if($row['password'] == $password) { + return true; + } + } + return false; + } +} Added: trunk/model/VacationHandler.php =================================================================== --- trunk/model/VacationHandler.php (rev 0) +++ trunk/model/VacationHandler.php 2009-03-13 20:48:24 UTC (rev 575) @@ -0,0 +1,126 @@ +<?php + +class VacationHandler { + protected $username = null; + function __construct($username) { + $this->username = $username; + } + + /** + * Removes the autoreply alias etc for this user; namely, if they're away we remove their vacation alias and + * set the vacation table record to false. + * @return boolean true on success. + */ + function remove() { + $ah = new AliasHandler($this->username); + $aliases = $ah->get(true); // fetch all. + $new_aliases = array(); + $table_vacation = table_by_key('vacation'); + $table_vacation_notification = table_by_key('vacation_notification'); + + /* go through the user's aliases and remove any that look like a vacation address */ + foreach($aliases as $alias) { + if(!$ah->is_vacation_address($alias)) { + $new_aliases[] = $alias; + } + } + $ah->update($new_aliases, '', false); + + // tidy up vacation table. + $active = db_get_boolean(False); + $username = escape_string($this->username); + $result = db_query("UPDATE $table_vacation SET active = $active WHERE email='$username'"); + $result = db_query("DELETE FROM $table_vacation_notification WHERE on_vacation='$username'"); + /* crap error handling; oh for exceptions... */ + return true; + } + + /** + * @return boolean true indicates this server supports vacation messages, and users are able to change their own. + * @global array $CONF + */ + function vacation_supported() { + global $CONF; + return $CONF['vacation'] == 'YES' && $CONF['vacation_control'] == 'YES'; + } + + /** + * @return boolean true if on vacation, otherwise false + * Why do we bother storing true/false in the vacation table if the alias dictates it anyway? + */ + function check_vacation() { + $ah = new AliasHandler($this->username); + $aliases = $ah->get(true); // fetch all. + foreach($aliases as $alias) { + if($ah->is_vacation_address($alias)) { + return true; + } + } + return false; + } + + /** + * Retrieve information on someone who is on vacation + * @return mixed stored information on vacation - array(subject - string, message - string, active - boolean) or false if they've never been on vacation. + */ + function get_details() { + $table_vacation = table_by_key('vacation'); + $username = escape_string($this->username); + + $sql = "SELECT * FROM $table_vacation WHERE email = '$username'"; + $result = db_query($sql); + if($result['rows'] == 1) { + $row = db_array($result['result']); + $boolean = ($row['active'] == db_get_boolean(true)); + return array( 'subject' => $row['subject'], + 'body' => $row['body'], + 'active' => $boolean ); + } + return false; + } + /** + * @param string $username + * @param string $subject + * @param string $body + */ + function set_away($subject, $body) { + $this->remove(); // clean out any notifications that might already have been sent. + // is there an entry in the vacaton table for the user, or do we need to insert? + $table_vacation = table_by_key('vacation'); + $username = escape_string($this->username); + $body = escape_string($body); + $subject = escape_string($subject); + + $result = db_query("SELECT * FROM $table_vacation WHERE email = '$username'"); + // check if the user has a vacation entry already, if so just update it + if($result['rows'] == 1) { + $active = db_get_boolean(True); + $result = db_query("UPDATE $table_vacation SET active = $active, body = '$body', subject = '$subject', created = NOW() WHERE email = '$username'"); + } + else { + $tmp = preg_split ('/@/', $username); + $domain = escape_string($tmp[1]); + $result = db_query ("INSERT INTO $table_vacation (email,subject,body,domain,created,active) VALUES ('$username','$subject','$body','$domain',NOW(),$Active)"); + } + + $ah = new AliasHandler($this->username); + $aliases = $ah->get(true); + $vacation_address = $this->getVacationAlias(); + $aliases[] = $vacation_address; + return $ah->update($aliases, '', false); + } + + /** + * Returns the vacation alias for this user. + * i.e. if this user's username was ro...@ex..., and the autoreply domain was set to + * autoreply.fish.net in config.inc.php we'd return roger#exa...@au... + * @return string an email alias. + */ + public function getVacationAlias() { + global $CONF; + $vacation_domain = $CONF['vacation_domain']; + $vacation_goto = preg_replace('/@/', '#', $this->username); + $vacation_goto = "{$vacation_goto}@{$vacation_domain}"; + return $vacation_goto; + } +} Modified: trunk/users/edit-alias.php =================================================================== --- trunk/users/edit-alias.php 2009-03-12 09:11:22 UTC (rev 574) +++ trunk/users/edit-alias.php 2009-03-13 20:48:24 UTC (rev 575) @@ -20,12 +20,12 @@ * Template Variables: * * tMessage - * tGoto + * tGotoArray + * tStoreAndForward * * Form POST \ GET Variables: * * fAddress - * fDomain * fGoto */ @@ -40,20 +40,14 @@ $vacation_domain = $CONF['vacation_domain']; $vacation_goto = preg_replace('/@/', '#', $USERID_USERNAME) . '@' . $vacation_domain; +$ah = new AliasHandler($USERID_USERNAME); + if ($_SERVER['REQUEST_METHOD'] == "GET") { $vacation_domain = $CONF['vacation_domain']; - $result = db_query ("SELECT * FROM $table_alias WHERE address='$USERID_USERNAME'"); - if ($result['rows'] == 1) - { - $row = db_array ($result['result']); - $tGoto = $row['goto']; - } - else - { - $tMessage = $PALANG['pEdit_alias_address_error']; - } + $tGotoArray = $ah->get(); + $tStoreAndForward = $ah->hasStoreAndForward(); include ("../templates/header.php"); include ("../templates/users_menu.php"); @@ -71,63 +65,42 @@ $pEdit_alias_goto = $PALANG['pEdit_alias_goto']; - if (isset ($_POST['fVacation'])) $fVacation = $_POST['fVacation']; - if (isset ($_POST['fGoto'])) $fGoto = escape_string (trim($_POST['fGoto'])); - if (isset ($_POST['fForward_and_store'])) $fForward_and_store = escape_string ($_POST['fForward_and_store']); - + if (isset($_POST['fVacation'])) $fVacation = $_POST['fVacation']; + if (isset($_POST['fGoto'])) $fGoto = escape_string (trim($_POST['fGoto'])); + if (isset($_POST['fForward_and_store'])) $fForward_and_store = escape_string ($_POST['fForward_and_store']); $goto = strtolower ($fGoto); $goto = preg_replace ('/\\\r\\\n/', ',', $goto); $goto = preg_replace ('/\r\n/', ',', $goto); $goto = preg_replace ('/[\s]+/i', '', $goto); $goto = preg_replace ('/\,*$/', '', $goto); - ( $fForward_and_store == "YES" ) ? $goto = $USERID_USERNAME . "," . $goto : ''; + $goto = explode(",",$goto); + $goto = array_merge(array_unique($goto)); - $goto = implode(",",$goto); - $array = preg_split ('/,/', $goto); - - for ($i = 0; $i < sizeof ($array); $i++) { - if (in_array ("$array[$i]", $CONF['default_aliases'])) continue; - if (empty ($array[$i]) && $fForward_and_store == "NO") - { - $error = 1; - $tGoto = $goto; - $tMessage = $PALANG['pEdit_alias_goto_text_error1']; + $good_goto = array(); + foreach($goto as $address) { + if(!check_email($address)) { + $error += 1; + $tMessage = $PALANG['pEdit_alias_goto_text_error1'] . "$address</font>"; } - if (empty ($array[$i])) continue; - if (!check_email ($array[$i])) - { - $error = 1; - $tGoto = $goto; - $tMessage = $PALANG['pEdit_alias_goto_text_error2'] . "$array[$i]</font>"; + else { + $good_goto[] = $address; } } + $goto = $good_goto; - if ($error != 1) - { - if (empty ($goto)) - { - $goto = $USERID_USERNAME; + if ($error == 0) { + $flags = 'remote_only'; + if($fForward_and_store == "YES" ) { + $flags = 'forward_and_store'; } - - if ($fVacation == "YES") - { - $goto .= "," . $vacation_goto; - } - - $result = db_query ("UPDATE $table_alias SET goto='$goto',modified=NOW() WHERE address='$USERID_USERNAME'"); - if ($result['rows'] != 1) - { - $tMessage = $PALANG['pEdit_alias_result_error']; - } - else - { - db_log ($USERID_USERNAME, $USERID_DOMAIN, 'edit_alias', "$USERID_USERNAME -> $goto"); - + $updated = $ah->update($goto, $flags); + if($updated) { header ("Location: main.php"); exit; } + $tMessage = $PALANG['pEdit_alias_result_error']; } include ("../templates/header.php"); Modified: trunk/users/login.php =================================================================== --- trunk/users/login.php 2009-03-12 09:11:22 UTC (rev 574) +++ trunk/users/login.php 2009-03-13 20:48:24 UTC (rev 575) @@ -40,8 +40,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { - $fUsername = escape_string ($_POST['fUsername']); - $fPassword = escape_string ($_POST['fPassword']); + $lang = safepost('lang'); if ( $lang != check_language(0) ) { # only set cookie if language selection was changed @@ -49,33 +48,10 @@ # (language preference cookie is processed even if username and/or password are invalid) } - $active = db_get_boolean(True); - $query = "SELECT password FROM $table_mailbox WHERE username='$fUsername' AND active=$active"; + $fUsername = escape_string ($_POST['fUsername']); + $fPassword = escape_string ($_POST['fPassword']); - $result = db_query ($query); - if ($result['rows'] == 1) - { - $row = db_array ($result['result']); - $password = pacrypt ($fPassword, $row['password']); - - $query = "SELECT * FROM $table_mailbox WHERE username='$fUsername' AND password='$password' AND active=$active"; - - $result = db_query ($query); - if ($result['rows'] != 1) - { - $error = 1; - $tMessage = '<span class="error_msg">' . $PALANG['pLogin_failed'] . '</span>'; - $tUsername = $fUsername; - } - } - else - { - $error = 1; - $tMessage = '<span class="error_msg">' . $PALANG['pLogin_failed'] . '</span>'; - } - - if ($error != 1) - { + if(UserHandler::login($_POST['fUsername'], $_POST['fPassword'])) { session_regenerate_id(); $_SESSION['sessid'] = array(); $_SESSION['sessid']['roles'] = array(); @@ -84,6 +60,11 @@ header("Location: main.php"); exit; } + else { + $error = 1; + $tMessage = '<span class="error_msg">' . $PALANG['pLogin_failed'] . '</span>'; + $tUsername = $fUsername; + } include ("../templates/header.php"); include ("../templates/users_login.php"); Modified: trunk/users/main.php =================================================================== --- trunk/users/main.php 2009-03-12 09:11:22 UTC (rev 574) +++ trunk/users/main.php 2009-03-13 20:48:24 UTC (rev 575) @@ -27,11 +27,8 @@ authentication_require_role('user'); $USERID_USERNAME = authentication_get_username(); -$db_active = db_get_boolean(True); -$result = db_query("SELECT * FROM $table_vacation WHERE email='$USERID_USERNAME' AND active='$db_active'"); -if ($result['rows'] == 1) -{ - $row = db_array($result['result']); +$vh = new VacationHandler($USERID_USERNAME); +if($vh->check_vacation()) { $tummVacationtext = $PALANG['pUsersMain_vacationSet']; } else @@ -39,21 +36,10 @@ $tummVacationtext = $PALANG['pUsersMain_vacation']; } -if ($_SERVER["REQUEST_METHOD"] == "GET") -{ - include ("../templates/header.php"); - include ("../templates/users_menu.php"); - include ("../templates/users_main.php"); - include ("../templates/footer.php"); -} +include ("../templates/header.php"); +include ("../templates/users_menu.php"); +include ("../templates/users_main.php"); +include ("../templates/footer.php"); -if ($_SERVER["REQUEST_METHOD"] == "POST") -{ - include ("../templates/header.php"); - include ("../templates/users_menu.php"); - include ("../templates/users_main.php"); - include ("../templates/footer.php"); -} - /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ ?> Modified: trunk/users/password.php =================================================================== --- trunk/users/password.php 2009-03-12 09:11:22 UTC (rev 574) +++ trunk/users/password.php 2009-03-13 20:48:24 UTC (rev 575) @@ -32,9 +32,6 @@ authentication_require_role('user'); $USERID_USERNAME = authentication_get_username(); -$tmp = preg_split ('/@/', $USERID_USERNAME); -$USERID_DOMAIN = $tmp[1]; - if ($_SERVER['REQUEST_METHOD'] == "POST") { if(isset($_POST['fCancel'])) { @@ -52,25 +49,11 @@ } $username = $USERID_USERNAME; - $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$username'"); - if ($result['rows'] == 1) - { - $row = db_array ($result['result']); - $checked_password = pacrypt($fPassword_current, $row['password']); - - $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$username' AND password='$checked_password'"); - if ($result['rows'] != 1) - { - $error = 1; - $pPassword_password_current_text = $PALANG['pPassword_password_current_text_error']; - } + $uh = new UserHandler(); + if(!$uh->login($username, $fPassword_current)) { + $error += 1; + $pPassword_password_current_text = $PALANG['pPassword_password_current_text_error']; } - else - { - $error = 1; - $pPassword_email_text = $PALANG['pPassword_email_text_error']; - } - if (empty ($fPassword) or ($fPassword != $fPassword2)) { $error = 1; @@ -79,12 +62,8 @@ if ($error != 1) { - $password = pacrypt ($fPassword); - $result = db_query ("UPDATE $table_mailbox SET password='$password',modified=NOW() WHERE username='$username'"); - if ($result['rows'] == 1) - { + if($uh->change_pass($username, $fPassword_current, $fPassword)) { flash_info($PALANG['pPassword_result_success']); - db_log ($USERID_USERNAME, $USERID_DOMAIN, 'edit_password', "$USERID_USERNAME"); header("Location: main.php"); exit(0); } Modified: trunk/users/vacation.php =================================================================== --- trunk/users/vacation.php 2009-03-12 09:11:22 UTC (rev 574) +++ trunk/users/vacation.php 2009-03-13 20:48:24 UTC (rev 575) @@ -42,19 +42,20 @@ exit(0); } -$tmp = preg_split ('/@/', $USERID_USERNAME); -$USERID_DOMAIN = $tmp[1]; +$vh = new VacationHandler(authentication_get_username()); if ($_SERVER['REQUEST_METHOD'] == "GET") { - $result = db_query("SELECT * FROM $table_vacation WHERE email='$USERID_USERNAME'"); - if ($result['rows'] == 1) - { - $row = db_array($result['result']); - if ($row['active'] == db_get_boolean(True)) $tMessage = $PALANG['pUsersVacation_welcome_text']; - $tSubject = $row['subject']; - $tBody = $row['body']; + $tSubject = ''; + $tBody = ''; + + if($vh->get_details()) { + $tSubject = $details['subject']; + $tBody = $details['body']; } + if($vh->check_vacation()) { + $tMessage = $PALANG['pUsersVacation_welcome_text']; + } if ($tSubject == '') { $tSubject = html_entity_decode($PALANG['pUsersVacation_subject_text'], ENT_QUOTES, 'UTF-8'); } if ($tBody == '') { $tBody = html_entity_decode($PALANG['pUsersVacation_body_text'], ENT_QUOTES, 'UTF-8'); } @@ -67,11 +68,6 @@ exit(0); } - // We store goto addresses in the form of roger#exa...@au... - $vacation_domain = $CONF['vacation_domain']; - $vacation_goto = preg_replace('/@/', '#', $USERID_USERNAME); - $vacation_goto = "{$vacation_goto}@{$vacation_domain}"; - if (isset ($_POST['fSubject'])) $fSubject = escape_string ($_POST['fSubject']); if (isset ($_POST['fBody'])) $fBody = escape_string ($_POST['fBody']); if (isset ($_POST['fAway'])) $fAway = escape_string ($_POST['fAway']); @@ -82,104 +78,25 @@ if ($tBody == '') { $tBody = html_entity_decode($PALANG['pUsersVacation_body_text'], ENT_QUOTES, 'UTF-8'); } // if they've set themselves away OR back, delete any record of vacation emails. - if (!empty ($fBack) || !empty ($fAway)) - { - $notActive = db_get_boolean(False); - // this isn't very good, as $result['rows'] would be 0 if the user had not used vacation stuff before. - $result = db_query("UPDATE $table_vacation SET active = $notActive WHERE email='$USERID_USERNAME'"); - $result = db_query("DELETE FROM $table_vacation_notification WHERE on_vacation='$USERID_USERNAME'"); - $tMessage = $PALANG['pUsersVacation_result_error']; - // We need to see whether there is already an alias record for the user, or not. - // If not, we create one, else update the existing one. - $result = db_query ("SELECT * FROM $table_alias WHERE address='$USERID_USERNAME'"); - if ($result['rows'] == 1) - { - $row = db_array ($result['result']); - $tGoto = $row['goto']; - - //only one of these will do something, first handles address at beginning and middle, second at end, third if it's the only alias record. - $goto= preg_replace ( "/$vacation_goto,/", '', $tGoto); - $goto= preg_replace ( "/,$vacation_goto/", '', $goto); - $goto= preg_replace ( "/$vacation_goto/", '', $goto); - $query = "UPDATE $table_alias SET goto='$goto',modified=NOW() WHERE address='$USERID_USERNAME'"; - - if($goto == '') { - // if there are no other goto records left, remove the alias record for this user. - $query = "DELETE FROM $table_alias WHERE address = '$USERID_USERNAME'"; - } - $result = db_query($query); - } - else { - $goto = $vacation_goto; - $boolean = db_get_boolean(True); - - $result = db_query("INSERT into $table_alias (address, goto, domain, created, active) - VALUES ('$USERID_USERNAME', '', '$USERID_DOMAIN', NOW(), $boolean)"); - } - if ($result['rows'] != 1) - { - $error = 1; - $tMessage = $PALANG['pUsersVacation_result_error']; - } - else - { - $tMessage = $PALANG['pUsersVacation_result_success']; - } - - } - // the user is going away - set the goto alias and vacation table as necessary. if (!empty ($fAway)) { - // Can we ever have no alias records for a user? - $result = db_query ("SELECT * FROM $table_alias WHERE address='$USERID_USERNAME'"); - if ($result['rows'] == 1) - { - $row = db_array ($result['result']); - $tGoto = $row['goto']; - } - $Active = db_get_boolean(True); - $result = db_query("SELECT * FROM $table_vacation WHERE email = '$USERID_USERNAME'"); - if($result['rows'] == 1) { - $result = db_query("UPDATE $table_vacation SET active = $Active, body = '$fBody', subject = '$fSubject', created = NOW() WHERE email = '$USERID_USERNAME'"); - } - else { - $result = db_query ("INSERT INTO $table_vacation (email,subject,body,domain,created,active) VALUES ('$USERID_USERNAME','$fSubject','$fBody','$USERID_DOMAIN',NOW(),$Active)"); - } - - if ($result['rows'] != 1) - { + if(!$vh->set_away($fSubject, $fBody)) { $error = 1; $tMessage = $PALANG['pUsersVacation_result_error']; } - // add the goto record back in... - $comma = ''; - if(strlen($tGoto) > 1) { - $comma = ','; - } - $goto = $tGoto . $comma . $vacation_goto; - - $result = db_query ("UPDATE $table_alias SET goto='$goto',modified=NOW() WHERE address='$USERID_USERNAME'"); - if ($result['rows'] != 1) - { - $error = 1; - $tMessage = $PALANG['pUsersVacation_result_error']; - } - else - { - flash_info($PALANG['pVacation_result_added']); - header ("Location: main.php"); - exit; - } + flash_info($PALANG['pVacation_result_added']); + header ("Location: main.php"); + exit; } if (!empty ($fBack)) { - if ($tMessage == '' || $tMessage = $PALANG['pUsersVacation_result_success']) { - flash_info($PALANG['pVacation_result_removed']); - header ("Location: main.php"); - exit; - } + $vh->remove(); + $tMessage = $PALANG['pUsersVacation_result_success']; + flash_info($tMessage); + header ("Location: main.php"); + exit; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |