Hello community, here is the log from the commit of package postfixadmin for openSUSE:12.1:Update:Test checked in at 2012-01-27 10:36:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/postfixadmin (Old) and /work/SRC/openSUSE:12.1:Update:Test/.postfixadmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postfixadmin", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/postfixadmin/postfixadmin.changes 2012-01-27 10:36:29.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.postfixadmin.new/postfixadmin.changes 2012-01-27 10:36:30.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 26 22:10:20 UTC 2012 - opensuse@cboltz.de + +- update to PostfixAdmin 2.3.5 (security release) + - fixes some SQL injections (CVE-2012-0811) + - fixes some XSS vulnerabilities (CVE-2012-0812) + - see CHANGELOG.TXT or bnc#741455 for details + +------------------------------------------------------------------- Old: ---- postfixadmin-2.3.4.tar.gz postfixadmin-changes-since-2.3.4.diff New: ---- postfixadmin-2.3.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfixadmin.spec ++++++ --- /var/tmp/diff_new_pack.YsJKSU/_old 2012-01-27 10:36:30.000000000 +0100 +++ /var/tmp/diff_new_pack.YsJKSU/_new 2012-01-27 10:36:30.000000000 +0100 @@ -1,15 +1,29 @@ # +# spec file for package postfixadmin +# +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: postfixadmin -Version: 2.3.4 +Version: 2.3.5 Release: 1 License: GPL v2+ Url: http://postfixadmin.sourceforge.net/ Group: Productivity/Networking/Web/Frontends Source0: %{name}-%{version}.tar.gz -Patch: postfixadmin-changes-since-2.3.4.diff BuildArch: noarch # Web interface @@ -78,7 +92,6 @@ %prep %setup -q -%patch -p0 %build echo "*** serverroot: %{serverroot} ***" @@ -116,7 +129,6 @@ #install -m 644 $RPM_SOURCE_DIR/%{name}.conf \ # %{buildroot}%{_sysconfdir}/apache2/conf.d/ - %pre getent group vacation >/dev/null || groupadd vacation || : getent passwd vacation >/dev/null || useradd -c "Virtual Vacation" -d %{_localstatedir}/spool/vacation -s /sbin/nologin -M -r vacation || : @@ -146,3 +158,4 @@ %attr(1770,root,vacation) %dir %{_localstatedir}/spool/vacation %{_localstatedir}/spool/vacation/vacation.pl +%changelog ++++++ postfixadmin-2.3.4.tar.gz -> postfixadmin-2.3.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/CHANGELOG.TXT new/postfixadmin-2.3.5/CHANGELOG.TXT --- old/postfixadmin-2.3.4/CHANGELOG.TXT 2011-09-16 20:41:00.000000000 +0200 +++ new/postfixadmin-2.3.5/CHANGELOG.TXT 2012-01-15 13:10:59.000000000 +0100 @@ -8,7 +8,26 @@ # http://www.postfixadmin.com or http://postfixadmin.sf.net # # Last update: -# $Id: CHANGELOG.TXT 1180 2011-09-16 18:41:00Z christian_boltz $ +# $Id: CHANGELOG.TXT 1335 2012-01-15 12:10:59Z christian_boltz $ + +Version 2.3.5 - 2012/01/16 - SVN r1335 (postfixadmin-2.3 branch) +---------------------------------------------------------------- + + - fix SQL injection in pacrypt() (if $CONF[encrypt] == 'mysql_encrypt') + - fix SQL injection in backup.php - the dump was not mysql_escape()d, + therefore users could inject SQL (for example in the vacation message) + which will be executed when restoring the database dump. + WARNING: database dumps created with backup.php from 2.3.4 or older might + contain malicious SQL. Double-check before using them! + - fix XSS with $_GET[domain] in templates/menu.php and edit-vacation + - fix XSS in some create-domain input fields + - fix XSS in create-alias and edit-alias error message + - fix XSS (by values stored in the database) in fetchmail list view, + list-domain and list-virtual + - create-domain: fix SQL injection (only exploitable by superadmins) + - add missing $LANG['pAdminDelete_admin_error'] + - don't mark mailbox targets with recipient delimiter as "forward only" + - wrap hex2bin with function_exists() - PHP 5.3.8 has it as native function Version 2.3.4 - 2011/09/16 - SVN r1180 (postfixadmin-2.3 branch) ---------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/backup.php new/postfixadmin-2.3.5/backup.php --- old/postfixadmin-2.3.4/backup.php 2009-10-24 02:11:09.000000000 +0200 +++ new/postfixadmin-2.3.5/backup.php 2012-01-10 16:46:25.000000000 +0100 @@ -9,7 +9,7 @@ * Further details on the project are available at : * http://www.postfixadmin.com or http://postfixadmin.sf.net * - * @version $Id: backup.php 736 2009-10-24 00:11:09Z christian_boltz $ + * @version $Id: backup.php 1320 2012-01-10 15:46:25Z GingerDog $ * @license GNU GPL v2 or later. * * File: backup.php @@ -33,101 +33,98 @@ print '<p>Sorry: Backup is currently not supported for your DBMS.</p>'; } /* - SELECT attnum,attname,typname,atttypmod-4,attnotnull,atthasdef,adsrc - AS def FROM pg_attribute,pg_class,pg_type,pg_attrdef - WHERE pg_class.oid=attrelid AND pg_type.oid=atttypid - AND attnum>0 AND pg_class.oid=adrelid AND adnum=attnum AND atthasdef='t' AND lower(relname)='admin' - UNION SELECT attnum,attname,typname,atttypmod-4,attnotnull,atthasdef,'' - AS def FROM pg_attribute,pg_class,pg_type - WHERE pg_class.oid=attrelid - AND pg_type.oid=atttypid - AND attnum>0 - AND atthasdef='f' - AND lower(relname)='admin' + SELECT attnum,attname,typname,atttypmod-4,attnotnull,atthasdef,adsrc + AS def FROM pg_attribute,pg_class,pg_type,pg_attrdef + WHERE pg_class.oid=attrelid AND pg_type.oid=atttypid + AND attnum>0 AND pg_class.oid=adrelid AND adnum=attnum AND atthasdef='t' AND lower(relname)='admin' + UNION SELECT attnum,attname,typname,atttypmod-4,attnotnull,atthasdef,'' + AS def FROM pg_attribute,pg_class,pg_type + WHERE pg_class.oid=attrelid + AND pg_type.oid=atttypid + AND attnum>0 + AND atthasdef='f' + AND lower(relname)='admin' $db = $_GET['db']; $cmd = "pg_dump -c -D -f /tix/miner/miner.sql -F p -N -U postgres $db"; $res = `$cmd`; // Alternate: $res = shell_exec($cmd); echo $res; -*/ + */ if ($_SERVER['REQUEST_METHOD'] == "GET") { - umask (077); - $path = (ini_get('upload_tmp_dir') != '') ? ini_get('upload_tmp_dir') : '/tmp'; - $filename = "postfixadmin-" . date ("Ymd") . "-" . getmypid() . ".sql"; - $backup = $path . DIRECTORY_SEPARATOR . $filename; - - $header = "#\n# Postfix Admin $version\n# Date: " . date ("D M j G:i:s T Y") . "\n#\n"; - - if (!$fh = fopen ($backup, 'w')) - { - $tMessage = "<div class="error_msg">Cannot open file ($backup)</div>"; - include ("templates/header.php"); - include ("templates/menu.php"); - include ("templates/message.php"); - include ("templates/footer.php"); - } - else - { - fwrite ($fh, $header); - - $tables = array( - 'admin', - 'alias', - 'alias_domain', - 'config', - 'domain', - 'domain_admins', - 'fetchmail', - 'log', - 'mailbox', - 'quota', - 'quota2', - 'vacation', - 'vacation_notification' - ); - - for ($i = 0 ; $i < sizeof ($tables) ; ++$i) - { - $result = db_query ("SHOW CREATE TABLE " . table_by_key($tables[$i])); - if ($result['rows'] > 0) - { - while ($row = db_array ($result['result'])) + umask (077); + $path = (ini_get('upload_tmp_dir') != '') ? ini_get('upload_tmp_dir') : '/tmp'; + $filename = "postfixadmin-" . date ("Ymd") . "-" . getmypid() . ".sql"; + $backup = $path . DIRECTORY_SEPARATOR . $filename; + + $header = "#\n# Postfix Admin $version\n# Date: " . date ("D M j G:i:s T Y") . "\n#\n"; + + if (!$fh = fopen ($backup, 'w')) + { + $tMessage = "<div class="error_msg">Cannot open file ($backup)</div>"; + include ("templates/header.php"); + include ("templates/menu.php"); + include ("templates/message.php"); + include ("templates/footer.php"); + } + else + { + fwrite ($fh, $header); + + $tables = array( + 'admin', + 'alias', + 'alias_domain', + 'config', + 'domain', + 'domain_admins', + 'fetchmail', + 'log', + 'mailbox', + 'quota', + 'quota2', + 'vacation', + 'vacation_notification' + ); + + for ($i = 0 ; $i < sizeof ($tables) ; ++$i) + { + $result = db_query ("SHOW CREATE TABLE " . table_by_key($tables[$i])); + if ($result['rows'] > 0) { - fwrite ($fh, "$row[1];\n\n"); + while ($row = db_array ($result['result'])) + { + fwrite ($fh, "$row[1];\n\n"); + } } - } - } + } - for ($i = 0 ; $i < sizeof ($tables) ; ++$i) - { - $result = db_query ("SELECT * FROM " . table_by_key($tables[$i])); - if ($result['rows'] > 0) - { - while ($row = db_assoc ($result['result'])) + for ($i = 0 ; $i < sizeof ($tables) ; ++$i) + { + $result = db_query ("SELECT * FROM " . table_by_key($tables[$i])); + if ($result['rows'] > 0) { - foreach ($row as $key=>$val) - { - $fields[] = $key; - $values[] = $val; - } - - fwrite ($fh, "INSERT INTO ". $tables[$i] . " (". implode (',',$fields) . ") VALUES ('" . implode ('','',$values) . "');\n"); - $fields = ""; - $values = ""; + while ($row = db_assoc ($result['result'])) + { + $fields = array_keys($row); + $values = array_values($row); + $values = array_map('escape_string', $values); + fwrite ($fh, "INSERT INTO ". $tables[$i] . " (". implode (',',$fields) . ") VALUES ('" . implode ('','',$values) . "');\n"); + $fields = ""; + $values = ""; + } } - } - } - } - header ("Content-Type: text/plain"); - header ("Content-Disposition: attachment; filename="$filename""); - header ("Content-Transfer-Encoding: binary"); - header ("Content-Length: " . filesize("$backup")); - header ("Content-Description: Postfix Admin"); - $download_backup = fopen ("$backup", "r"); - unlink ("$backup"); - fpassthru ($download_backup); + } + } + header ("Content-Type: text/plain"); + header ("Content-Disposition: attachment; filename="$filename""); + header ("Content-Transfer-Encoding: binary"); + header ("Content-Length: " . filesize("$backup")); + header ("Content-Description: Postfix Admin"); + $download_backup = fopen ("$backup", "r"); + unlink ("$backup"); + fpassthru ($download_backup); } /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/create-alias.php new/postfixadmin-2.3.5/create-alias.php --- old/postfixadmin-2.3.4/create-alias.php 2010-12-25 15:11:16.000000000 +0100 +++ new/postfixadmin-2.3.5/create-alias.php 2012-01-11 22:42:19.000000000 +0100 @@ -14,7 +14,7 @@ * Template File: create-alias.php * Responsible for allowing for the creation of mail aliases. * - * @version $Id: create-alias.php 898 2010-12-25 14:11:16Z christian_boltz $ + * @version $Id: create-alias.php 1330 2012-01-11 21:42:19Z christian_boltz $ * @license GNU GPL v2 or later. * * Template Variables: @@ -133,7 +133,7 @@ $error = 1; $tGoto = $goto; if (!empty($tMessage)) $tMessage .= "<br />"; - $tMessage .= $PALANG['pEdit_alias_goto_text_error2'] . "$address</span>"; + $tMessage .= $PALANG['pEdit_alias_goto_text_error2'] . htmlentities($address) . "</span>"; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/debian/changelog new/postfixadmin-2.3.5/debian/changelog --- old/postfixadmin-2.3.4/debian/changelog 2011-09-16 20:35:00.000000000 +0200 +++ new/postfixadmin-2.3.5/debian/changelog 2012-01-25 23:26:28.000000000 +0100 @@ -1,31 +1,7 @@ -postfixadmin (2.3.4) unstable; urgency=low +postfixadmin (2.3.5-1) unstable; urgency=low - * New upstream release (2.3.4) + * Initial Debian release (Closes: #247225) + * Changed email address from normes to myself for signing purposes. - -- David Goodwin <david.goodwin@palepurple.co.uk> Fri, 16 Sep 2011 19:33:00 +0100 - -postfixadmin (2.3.3) unstable; urgency=low - - * New upstream release (2.3.3) - - -- David Goodwin <david.goodwin@palepurple.co.uk> Mon, 14 Mar 2011 22:20:00 +0100 - -postfixadmin (2.3.2) unstable; urgency=low - - * New upstream release - - -- David Goodwin <david.goodwin@palepurple.co.uk> Mon, 23 Aug 2010 11:24:00 +0100 - -postfixadmin (2.3.1) unstable; urgency=low - - * New upstream release - * Updated .deb standards (thanks normes) - - -- David Goodwin <david.goodwin@palepurple.co.uk> Thu, 08 Jul 2010 22:20:14 +0100 - -postfixadmin (2.3) unstable; urgency=low - - * Initial release (Closes: #247225) - - -- Norman Messtorff <normes@normes.org> Sun, 21 Feb 2010 22:36:26 +0200 + -- David Goodwin (PalePurple) <david@palepurple.co.uk> Wed, 25 Jan 2012 12:27:28 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/debian/control new/postfixadmin-2.3.5/debian/control --- old/postfixadmin-2.3.4/debian/control 2010-08-02 21:39:49.000000000 +0200 +++ new/postfixadmin-2.3.5/debian/control 2012-01-15 12:52:31.000000000 +0100 @@ -3,14 +3,13 @@ Priority: optional Maintainer: Norman Messtorff <normes@normes.org> Build-Depends: debhelper (>= 7), po-debconf, quilt (>= 0.46) -Standards-Version: 3.8.4 +Standards-Version: 3.9.2 Homepage: http://postfixadmin.sourceforge.net -XS-Vcs-Svn: https://postfixadmin.svn.sourceforge.net/svnroot/postfixadmin/trunk Package: postfixadmin Architecture: all Depends: debconf (>= 0.5), dbconfig-common, wwwconfig-common, apache2 | lighttpd | httpd, libapache2-mod-php5 | php5-cgi | php5, php5-imap, php5-mysql | php5-pgsql, mysql-client | postgresql-client, ${misc:Depends} -Recommends: postfix-mysql | postfix-pgsql, mysql-server | postgresql-server +Recommends: postfix-mysql | postfix-pgsql, mysql-server | postgresql-server | postgresql Suggests: squirrelmail-postfixadmin, dovecot-common | courier-authlib-mysql | courier-authlib-postgresql Description: Virtual mail hosting interface for Postfix Postfixadmin is a web interface to managing virtual users and domains diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/debian/patches/20110414_db-credentials new/postfixadmin-2.3.5/debian/patches/20110414_db-credentials --- old/postfixadmin-2.3.4/debian/patches/20110414_db-credentials 2011-03-14 23:52:49.000000000 +0100 +++ new/postfixadmin-2.3.5/debian/patches/20110414_db-credentials 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -Index: postfixadmin-trunk/config.inc.php -=================================================================== ---- postfixadmin-trunk.orig/config.inc.php 2010-02-21 19:04:32.000000000 +0100 -+++ postfixadmin-trunk/config.inc.php 2010-02-21 19:05:26.000000000 +0100 -@@ -23,7 +23,7 @@ - * Doing this implies you have changed this file as required. - * i.e. configuring database etc; specifying setup.php password etc. - */ --$CONF['configured'] = false; -+$CONF['configured'] = true; - - // In order to setup Postfixadmin, you MUST specify a hashed password here. - // To create the hash, visit setup.php in a browser and type a password into the field, -@@ -46,11 +46,11 @@ - // mysql = MySQL 3.23 and 4.0, 4.1 or 5 - // mysqli = MySQL 4.1+ - // pgsql = PostgreSQL --$CONF['database_type'] = 'mysql'; --$CONF['database_host'] = 'localhost'; --$CONF['database_user'] = 'postfix'; --$CONF['database_password'] = 'postfixadmin'; --$CONF['database_name'] = 'postfix'; -+$CONF['database_type'] = '_DBC_DBTYPE_'; -+$CONF['database_host'] = '_DBC_DBSERVER_'; -+$CONF['database_user'] = '_DBC_DBUSER_'; -+$CONF['database_password'] = '_DBC_DBPASS_'; -+$CONF['database_name'] = '_DBC_DBNAME_'; - // If you need to specify a different port for a MYSQL database connection, use e.g. - // $CONF['database_host'] = '172.30.33.66:3308'; - // If you need to specify a different port for POSTGRESQL database connection - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/debian/patches/db_credentials new/postfixadmin-2.3.5/debian/patches/db_credentials --- old/postfixadmin-2.3.4/debian/patches/db_credentials 1970-01-01 01:00:00.000000000 +0100 +++ new/postfixadmin-2.3.5/debian/patches/db_credentials 2012-01-15 12:52:31.000000000 +0100 @@ -0,0 +1,56 @@ +Description: This patch sets the dbconfig placeholders in config.inc.php. +Forwarded: not-needed +Author: Norman Messtorff <normes@normes.org> +Last-Update: 2011-12-18 + +Index: postfixadmin-2.3/config.inc.php +=================================================================== +--- postfixadmin-2.3.orig/config.inc.php 2012-01-14 12:42:16.000000000 +0100 ++++ postfixadmin-2.3/config.inc.php 2012-01-14 12:56:28.000000000 +0100 +@@ -16,6 +16,11 @@ + * Contains configuration options. + */ + ++// This loads the automatic generated DB credentials from /etc/postfixadmin/dbconfig.inc.php ++require_once('dbconfig.inc.php'); ++if (!isset($dbserver) || empty($dbserver)) ++ $dbserver='localhost'; ++ + /***************************************************************** + * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + * You have to set $CONF['configured'] = true; before the +@@ -23,7 +28,7 @@ + * Doing this implies you have changed this file as required. + * i.e. configuring database etc; specifying setup.php password etc. + */ +-$CONF['configured'] = false; ++$CONF['configured'] = true; + + // In order to setup Postfixadmin, you MUST specify a hashed password here. + // To create the hash, visit setup.php in a browser and type a password into the field, +@@ -33,7 +38,7 @@ + // Postfix Admin Path + // Set the location of your Postfix Admin installation here. + // YOU MUST ENTER THE COMPLETE URL e.g. http://domain.tld/postfixadmin +-$CONF['postfix_admin_url'] = ''; ++$CONF['postfix_admin_url'] = '/postfixadmin'; + + // shouldn't need changing. + $CONF['postfix_admin_path'] = dirname(__FILE__); +@@ -46,11 +51,11 @@ + // mysql = MySQL 3.23 and 4.0, 4.1 or 5 + // mysqli = MySQL 4.1+ + // pgsql = PostgreSQL +-$CONF['database_type'] = 'mysql'; +-$CONF['database_host'] = 'localhost'; +-$CONF['database_user'] = 'postfix'; +-$CONF['database_password'] = 'postfixadmin'; +-$CONF['database_name'] = 'postfix'; ++$CONF['database_type'] = $dbtype; ++$CONF['database_host'] = $dbserver; ++$CONF['database_user'] = $dbuser; ++$CONF['database_password'] = $dbpass; ++$CONF['database_name'] = $dbname; + // If you need to specify a different port for a MYSQL database connection, use e.g. + // $CONF['database_host'] = '172.30.33.66:3308'; + // If you need to specify a different port for POSTGRESQL database connection diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/debian/patches/series new/postfixadmin-2.3.5/debian/patches/series --- old/postfixadmin-2.3.4/debian/patches/series 2011-03-14 23:52:49.000000000 +0100 +++ new/postfixadmin-2.3.5/debian/patches/series 2012-01-15 12:52:31.000000000 +0100 @@ -1 +1 @@ -20110414_db-credentials +db_credentials diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/debian/postfixadmin.docs new/postfixadmin-2.3.5/debian/postfixadmin.docs --- old/postfixadmin-2.3.4/debian/postfixadmin.docs 2010-07-08 23:31:07.000000000 +0200 +++ new/postfixadmin-2.3.5/debian/postfixadmin.docs 2012-01-15 12:52:31.000000000 +0100 @@ -1,2 +1 @@ DOCUMENTS -CHANGELOG.TXT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/debian/postfixadmin.postinst new/postfixadmin-2.3.5/debian/postfixadmin.postinst --- old/postfixadmin-2.3.4/debian/postfixadmin.postinst 2009-06-04 23:24:26.000000000 +0200 +++ new/postfixadmin-2.3.5/debian/postfixadmin.postinst 2012-01-15 12:52:31.000000000 +0100 @@ -2,14 +2,14 @@ set -e if [ "$1" = "configure" ]; then + # configure DB stuff via dbconfig-common + dbc_generate_include=php:/etc/postfixadmin/dbconfig.inc.php + dbc_generate_include_args="-O root:www-data -m 640 -U" . /usr/share/debconf/confmodule - db_version 2.0 - dbc_generate_include='template:/etc/postfixadmin/config.inc.php' - dbc_generate_include_owner='root:www-data' - dbc_generate_include_perms='640' - dbc_generate_include_args="-U -o template_infile=/usr/share/postfixadmin/config.inc.php" . /usr/share/dbconfig-common/dpkg/postinst dbc_go postfixadmin $@ + + # configure webserver stuff db_get postfixadmin/reconfigure-webserver servers="$RET" restart="$servers" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/debian/postfixadmin.postrm new/postfixadmin-2.3.5/debian/postfixadmin.postrm --- old/postfixadmin-2.3.4/debian/postfixadmin.postrm 2009-05-10 00:11:32.000000000 +0200 +++ new/postfixadmin-2.3.5/debian/postfixadmin.postrm 2012-01-15 12:52:31.000000000 +0100 @@ -11,7 +11,9 @@ servers="$RET" restart=$servers linkname="postfixadmin" - . /usr/share/wwwconfig-common/restart.sh + if [ -e /usr/share/wwwconfig-common/restart.sh ]; then + . /usr/share/wwwconfig-common/restart.sh + fi fi if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then @@ -19,6 +21,16 @@ dbc_go postfixadmin $@ fi fi + + if [ "$1" = "purge" ]; then + rm -f /etc/postfixadmin/dbconfig.inc.php + if which ucf >/dev/null 2>&1; then + ucf --purge /etc/postfixadmin/dbconfig.inc.php + fi + + db_purge || true + + fi fi #DEBHELPER# diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/debian/rules new/postfixadmin-2.3.5/debian/rules --- old/postfixadmin-2.3.4/debian/rules 2009-07-27 22:58:00.000000000 +0200 +++ new/postfixadmin-2.3.5/debian/rules 2012-01-25 23:21:12.000000000 +0100 @@ -4,19 +4,33 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/quilt/quilt.make +export PFADIR = $(shell pwd) +export VERSION = $(shell grep -E "version = '.*';" functions.inc.php |sed -e "s/.version = '//" |sed -e "s/';.*//" |sed -e "s/ /-/g") +export DEBVERSION = $(shell grep -E "postfixadmin .([0-9]+|.)+" debian/changelog |head -1 |sed -e "s/postfixadmin .//" |sed -e "s/-.*//") -build: build-stamp +include /usr/share/quilt/quilt.make +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp build-stamp: $(QUILT_STAMPFN) dh_testdir #dh_testroot touch build-stamp +# Create a needed tar.gz file to build a non-nativ .dpkg +prep: + rm -f ../postfixadmin_*orig.tar.gz + cd ..; tar --exclude-vcs --exclude=*.svn* --exclude=postfixadmin/debian --exclude=postfixadmin/.pc -czf postfixadmin_${DEBVERSION}.orig.tar.gz postfixadmin-${DEBVERSION} + +# Call this target to build a shiny new .dpkg file. +build-package: + dh_testdir + cd ${PFADIR}; dpkg-buildpackage -rfakeroot clean: unpatch dh_testdir - dh_testroot + #dh_testroot dh_clean debconf-updatepo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/debian/source/format new/postfixadmin-2.3.5/debian/source/format --- old/postfixadmin-2.3.4/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ new/postfixadmin-2.3.5/debian/source/format 2012-01-15 12:52:31.000000000 +0100 @@ -0,0 +1 @@ +3.0 (quilt) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/debian/watch new/postfixadmin-2.3.5/debian/watch --- old/postfixadmin-2.3.4/debian/watch 1970-01-01 01:00:00.000000000 +0100 +++ new/postfixadmin-2.3.5/debian/watch 2012-01-15 12:52:31.000000000 +0100 @@ -0,0 +1,2 @@ +version=3 +http://sf.net/postfixadmin/postfixadmin_(.+)\.tar\.gz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/edit-alias.php new/postfixadmin-2.3.5/edit-alias.php --- old/postfixadmin-2.3.4/edit-alias.php 2010-12-25 15:16:11.000000000 +0100 +++ new/postfixadmin-2.3.5/edit-alias.php 2012-01-11 22:42:19.000000000 +0100 @@ -9,7 +9,7 @@ * Further details on the project are available at : * http://www.postfixadmin.com or http://postfixadmin.sf.net * - * @version $Id: edit-alias.php 899 2010-12-25 14:16:11Z christian_boltz $ + * @version $Id: edit-alias.php 1330 2012-01-11 21:42:19Z christian_boltz $ * @license GNU GPL v2 or later. * * File: edit-alias.php @@ -129,7 +129,7 @@ $error = 1; $tGoto = $goto; if (!empty($tMessage)) $tMessage .= "<br />"; - $tMessage .= $PALANG['pEdit_alias_goto_text_error2'] . "$address</span>"; + $tMessage .= $PALANG['pEdit_alias_goto_text_error2'] . htmlentities($address) . "</span>"; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/edit-vacation.php new/postfixadmin-2.3.5/edit-vacation.php --- old/postfixadmin-2.3.4/edit-vacation.php 2011-03-06 22:30:55.000000000 +0100 +++ new/postfixadmin-2.3.5/edit-vacation.php 2012-01-10 21:01:23.000000000 +0100 @@ -9,7 +9,7 @@ * Further details on the project are available at : * http://www.postfixadmin.com or http://postfixadmin.sf.net * - * @version $Id: edit-vacation.php 987 2011-03-06 21:30:55Z christian_boltz $ + * @version $Id: edit-vacation.php 1324 2012-01-10 20:01:23Z christian_boltz $ * @license GNU GPL v2 or later. * * File: edit-vacation.php @@ -61,7 +61,7 @@ $vacation_goto = preg_replace('/@/', '#', $fUsername); $vacation_goto = $vacation_goto . '@' . $vacation_domain; -$fCanceltarget = $CONF['postfix_admin_url'] . "/list-virtual.php?domain=$fDomain"; +$fCanceltarget = $CONF['postfix_admin_url'] . "/list-virtual.php?domain=" . urlencode($fDomain); if ($_SERVER['REQUEST_METHOD'] == "GET") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/functions.inc.php new/postfixadmin-2.3.5/functions.inc.php --- old/postfixadmin-2.3.4/functions.inc.php 2011-09-16 20:41:00.000000000 +0200 +++ new/postfixadmin-2.3.5/functions.inc.php 2012-01-15 13:10:59.000000000 +0100 @@ -9,14 +9,14 @@ * Further details on the project are available at : * http://www.postfixadmin.com or http://postfixadmin.sf.net * - * @version $Id: functions.inc.php 1180 2011-09-16 18:41:00Z christian_boltz $ + * @version $Id: functions.inc.php 1335 2012-01-15 12:10:59Z christian_boltz $ * @license GNU GPL v2 or later. * * File: functions.inc.php * Contains re-usable code. */ -$version = '2.3.4'; +$version = '2.3.5'; /** * check_session @@ -1189,8 +1189,9 @@ // this is apparently useful for pam_mysql etc. elseif ($CONF['encrypt'] == 'mysql_encrypt') { + $pw = escape_string($pw); if ($pw_db!="") { - $salt=substr($pw_db,0,2); + $salt=escape_string(substr($pw_db,0,2)); $res=db_query("SELECT ENCRYPT('".$pw."','".$salt."');"); } else { $res=db_query("SELECT ENCRYPT('".$pw."');"); @@ -1355,6 +1356,7 @@ return $salt; } +/**/ if (!function_exists('hex2bin')) { # PHP around 5.3.8 includes hex2bin as native function - http://php.net/hex2bin function hex2bin ($str) { $len = strlen ($str); @@ -1366,6 +1368,7 @@ } return $nstr; } +/**/ } function to64 ($v, $n) { @@ -2349,7 +2352,7 @@ { for ($i = 0; $i < sizeof ($fDomains); $i++) { - $domain = $fDomains[$i]; + $domain = escape_string($fDomains[$i]); $result = db_query ("INSERT INTO " . table_by_key ('domain_admins') . " (username,domain,created) VALUES ('$fUsername','$domain',NOW())"); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/bg.lang new/postfixadmin-2.3.5/languages/bg.lang --- old/postfixadmin-2.3.4/languages/bg.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/bg.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: bg.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: bg.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Bulgarian // by Plamen Tonev @@ -276,6 +276,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Добави домейн'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Не мога да добавя домейна!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Домейна бе добавен успешно!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Грешка при изтриването на домейна!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/ca.lang new/postfixadmin-2.3.5/languages/ca.lang --- old/postfixadmin-2.3.4/languages/ca.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/ca.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: ca.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: ca.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Catalan // by Jaume @@ -274,6 +274,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Afegir domini'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Imposible afegir el domini!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'El domini ha estat afegit!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/cn.lang new/postfixadmin-2.3.5/languages/cn.lang --- old/postfixadmin-2.3.4/languages/cn.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/cn.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: cn.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: cn.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Simplified Chinese // by Matthew <matthew at cnfug dot org> @@ -275,6 +275,7 @@ $PALANG['pAdminCreate_domain_button'] = '新增'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">新增域失败!</span>'; $PALANG['pAdminCreate_domain_result_success'] = '新增域成功!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/cs.lang new/postfixadmin-2.3.5/languages/cs.lang --- old/postfixadmin-2.3.4/languages/cs.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/cs.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: cs.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: cs.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Czech Language Translation of PostfixAdmin // by Jakub @@ -283,6 +283,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Přidat doménu'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Nepodařilo se přidat doménu!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Doména byla přidána!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Nepodařilo se odstranit doménu!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/da.lang new/postfixadmin-2.3.5/languages/da.lang --- old/postfixadmin-2.3.4/languages/da.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/da.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: da.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: da.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Danish // by Lars @@ -281,6 +281,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Tilføj domæne'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Kan ikke tilføje domæne!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domænet er tilføjet!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Domænet kunne ikke slettes!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/de.lang new/postfixadmin-2.3.5/languages/de.lang --- old/postfixadmin-2.3.4/languages/de.lang 2011-03-17 00:05:13.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/de.lang 2011-09-23 18:08:32.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: de.lang 1014 2011-03-16 23:05:13Z christian_boltz $ +# $Id: de.lang 1187 2011-09-23 16:08:32Z christian_boltz $ // // Language file German // by Tobias @@ -281,6 +281,7 @@ $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Konnte Domain nicht anlegen!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domain wurde angelegt!'; +$PALANG['pAdminDelete_admin_error'] = 'Admin kann nicht gelöscht werden!'; $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Domain konnte nicht gelöscht werden!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Alias-Domain konnte nicht gelöscht werden!</span>'; @@ -358,7 +359,7 @@ $PALANG['pUsersVacation_activeuntil'] = 'Aktiv bis zum'; $PALANG['pCreate_dbLog_createmailbox'] = 'Mailbox hinzufügen'; -$PALANG['pCreate_dbLog_createalias'] = 'Alias hinzuügen'; +$PALANG['pCreate_dbLog_createalias'] = 'Alias hinzufügen'; $PALANG['pDelete_dbLog_deletealias'] = 'Alias lüschen'; $PALANG['pDelete_dbLog_deletemailbox'] = 'Mailbox löschen'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/en.lang new/postfixadmin-2.3.5/languages/en.lang --- old/postfixadmin-2.3.4/languages/en.lang 2011-05-26 00:07:40.000000000 +0200 +++ new/postfixadmin-2.3.5/languages/en.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: en.lang 1063 2011-05-25 22:07:40Z christian_boltz $ +# $Id: en.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file English // by Mischa <mischa at high5 dot net> @@ -283,6 +283,7 @@ $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Unable to add domain!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domain has been added!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/es.lang new/postfixadmin-2.3.5/languages/es.lang --- old/postfixadmin-2.3.4/languages/es.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/es.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: es.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: es.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Spanish // by Alvaro @@ -276,6 +276,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Añadir dominio'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">¡Imposible añadir el dominio!</span>'; $PALANG['pAdminCreate_domain_result_success'] = '¡El dominio ha sido añadido!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">¡No se pudo eliminar el dominio!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">¡No se pudo eliminar el alias de dominio!</span>'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/et.lang new/postfixadmin-2.3.5/languages/et.lang --- old/postfixadmin-2.3.4/languages/et.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/et.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: et.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: et.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Estonian // by Peeter Partel <peeter at sigma dot ee> @@ -275,6 +275,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Lisa domeen'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Domeeni lisamine ebaõnnestus!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domeen on lisatud!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/eu.lang new/postfixadmin-2.3.5/languages/eu.lang --- old/postfixadmin-2.3.4/languages/eu.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/eu.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: eu.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: eu.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Euskara // by Julen @@ -273,6 +273,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Domeinua gehitu'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Ezinezkoa domeinua gehitzea!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domeinua gehituta!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/fi.lang new/postfixadmin-2.3.5/languages/fi.lang --- old/postfixadmin-2.3.4/languages/fi.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/fi.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: fi.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: fi.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Finnish // by Palo @@ -275,6 +275,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Lisää domain'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Domainin lisäys ei onnistunut!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domain on lisätty!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Domainin voitu poistaa!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Domainin aliasta ei voitu poistaa!</span>'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/fo.lang new/postfixadmin-2.3.5/languages/fo.lang --- old/postfixadmin-2.3.4/languages/fo.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/fo.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: fo.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: fo.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Faroese // by Danial @@ -275,6 +275,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Stovna navnaøki'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Fái ikki stovnað navnaøki!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Navnaøki er stovnað!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/fr.lang new/postfixadmin-2.3.5/languages/fr.lang --- old/postfixadmin-2.3.4/languages/fr.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/fr.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: fr.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: fr.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file French // by Kuthz @@ -276,6 +276,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Ajouter un domaine'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Impossible d\'ajouter le domaine!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Le domaine a été ajouté!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Impossible de supprimer le domain!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Impossible de supprimé cet alias de domaine!</span>'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/hr.lang new/postfixadmin-2.3.5/languages/hr.lang --- old/postfixadmin-2.3.4/languages/hr.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/hr.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: hr.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: hr.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Croatian // by Daniel Radetic <drade at boobah dot info> @@ -274,6 +274,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Dodaj domenu'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Domenu nije bilo moguče dodati!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domena je bila uspjeno dodana!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/hu.lang new/postfixadmin-2.3.5/languages/hu.lang --- old/postfixadmin-2.3.4/languages/hu.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/hu.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: hu.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: hu.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Hungarian // by Christian Hamar <krics at linuxforum dot hu> and Levente Farkas <lfarkas at lfarkas dot org> @@ -280,6 +280,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Domain felvétele'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">A domain felvétele sikertelen!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'A domain-t felvettük az adatbázisba!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">A domain törlése nem sikerült!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/is.lang new/postfixadmin-2.3.5/languages/is.lang --- old/postfixadmin-2.3.4/languages/is.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/is.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: is.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: is.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Icelandic // by Gestur @@ -274,6 +274,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Bæta við léni'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Get ekki bætt við léni!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Lén hefur verið bætt inn!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/it.lang new/postfixadmin-2.3.5/languages/it.lang --- old/postfixadmin-2.3.4/languages/it.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/it.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: it.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: it.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Italian // by Massimiliano Stucchi <max at gufi dot org> @@ -276,6 +276,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Aggiungi dominio'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Impossibile aggiungere il dominio!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Il dominio è stato aggiunto!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Impossibile cancellare il dominio!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/ja.lang new/postfixadmin-2.3.5/languages/ja.lang --- old/postfixadmin-2.3.4/languages/ja.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/ja.lang 2011-09-23 00:01:52.000000000 +0200 @@ -280,6 +280,7 @@ $PALANG['pAdminCreate_domain_button'] = 'ドメイン追加'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">ドメインを追加できません!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'ドメインを追加しました。'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">ドメインが削除できません!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/lt.lang new/postfixadmin-2.3.5/languages/lt.lang --- old/postfixadmin-2.3.4/languages/lt.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/lt.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: lt.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: lt.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Lithuanian // by Giedrius <giedrius_balbieris at metalot dot com> @@ -274,6 +274,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Registruoti sritį'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Srities užregistruoti nepavyko!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Sritis užregistruota!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/mk.lang new/postfixadmin-2.3.5/languages/mk.lang --- old/postfixadmin-2.3.4/languages/mk.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/mk.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: mk.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: mk.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Macedonian // by Damjan Georgiev <dame at mol dot com dot mk> @@ -276,6 +276,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Додади домен'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Не можам да го додадам доменот!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Доменот е додаден!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/nb.lang new/postfixadmin-2.3.5/languages/nb.lang --- old/postfixadmin-2.3.4/languages/nb.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/nb.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: nb.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: nb.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Norwegian (bokmål) // by Odd Henriksen @@ -276,6 +276,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Legg til domene'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Kunne ikke opprette domenet!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domenet er blitt opprettet!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Kunne ikke fjerne domenet!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Kunne ikke fjerne domenealias!</span>'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/nl.lang new/postfixadmin-2.3.5/languages/nl.lang --- old/postfixadmin-2.3.4/languages/nl.lang 2010-05-17 00:55:19.000000000 +0200 +++ new/postfixadmin-2.3.5/languages/nl.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: nl.lang 824 2010-05-16 22:55:19Z christian_boltz $ +# $Id: nl.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Dutch // by Mourik @@ -276,6 +276,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Voeg Domein toe'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Mislukt om het domein toe te voegen.</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domein is toegevoegd!'; +$PALANG['pAdminDelete_admin_error'] = 'Niet in staat beheerder te verwijderen!'; $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Niet in staat domein te verwijderen!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Niet in staat domein alias te verwijderen!</span>'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/nn.lang new/postfixadmin-2.3.5/languages/nn.lang --- old/postfixadmin-2.3.4/languages/nn.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/nn.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: nn.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: nn.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Norwegian - Bokmål // by Jon Arve Wålberg @@ -273,6 +273,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Legg til domene'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Klarte ikke å legge til domenet!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domenet er lagt til!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/pl.lang new/postfixadmin-2.3.5/languages/pl.lang --- old/postfixadmin-2.3.4/languages/pl.lang 2010-06-23 00:14:03.000000000 +0200 +++ new/postfixadmin-2.3.5/languages/pl.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: pl.lang 837 2010-06-22 22:14:03Z christian_boltz $ +# $Id: pl.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Polish // by Jarek @@ -278,6 +278,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Dodaj domenę'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Nie można dodać domeny!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domena została dodana!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Nie można usunąć domeny!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Nie można usunąć aliasu domeny!</span>'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/pt-br.lang new/postfixadmin-2.3.5/languages/pt-br.lang --- old/postfixadmin-2.3.4/languages/pt-br.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/pt-br.lang 2011-09-23 00:01:52.000000000 +0200 @@ -282,6 +282,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Criar Domínio'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Não foi possível criar o domínio!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domínio criado!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Não foi possível remover o domínio!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Não foi possível remover o alias de domínio!</span>'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/ru.lang new/postfixadmin-2.3.5/languages/ru.lang --- old/postfixadmin-2.3.4/languages/ru.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/ru.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: ru.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: ru.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Russian // by Paul @@ -282,6 +282,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Добавить домен'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Невозможно добавить домен!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Домен был добавлен!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Невозможно удалить домен!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Невозможно удалить домен-алиас!</span>'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/sk.lang new/postfixadmin-2.3.5/languages/sk.lang --- old/postfixadmin-2.3.4/languages/sk.lang 2011-02-01 23:50:50.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/sk.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: sk.lang 943 2011-02-01 22:50:50Z christian_boltz $ +# $Id: sk.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Slovak // by bajk (eszabo @sf) @@ -276,6 +276,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Vytvoriť doménu'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Nepodarilo sa pridať doménu!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Doména bola pridaná!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Nepodarilo sa odstrániť doménu!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Nepodario sa odstrániť alias domény!</span>'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/sl.lang new/postfixadmin-2.3.5/languages/sl.lang --- old/postfixadmin-2.3.4/languages/sl.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/sl.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: sl.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: sl.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Slovenian // by Nejc Skoberne <nejc at skoberne dot net> @@ -275,6 +275,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Dodaj domeno'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Domene ni bilo mogoče dodati!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domena je bila uspešno dodana!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/sv.lang new/postfixadmin-2.3.5/languages/sv.lang --- old/postfixadmin-2.3.4/languages/sv.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/sv.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: sv.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: sv.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Swedish // by Stefan Jakobsson <stefan at katrinet dot se> @@ -277,6 +277,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Lägg till domän'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Kan inte skapa domänen!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domänen har skapats!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Kunde inte tabort domän!</span>'; $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/tr.lang new/postfixadmin-2.3.5/languages/tr.lang --- old/postfixadmin-2.3.4/languages/tr.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/tr.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: tr.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: tr.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Türkçe // by Onuryalazi @@ -275,6 +275,7 @@ $PALANG['pAdminCreate_domain_button'] = 'Domain ekle'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Domain eklenemedi!</span>'; $PALANG['pAdminCreate_domain_result_success'] = 'Domain eklendi!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/languages/tw.lang new/postfixadmin-2.3.5/languages/tw.lang --- old/postfixadmin-2.3.4/languages/tw.lang 2009-12-28 22:24:38.000000000 +0100 +++ new/postfixadmin-2.3.5/languages/tw.lang 2011-09-23 00:01:52.000000000 +0200 @@ -1,5 +1,5 @@ <?php -# $Id: tw.lang 792 2009-12-28 21:24:38Z christian_boltz $ +# $Id: tw.lang 1184 2011-09-22 22:01:52Z christian_boltz $ // // Language file Traditional Chinese // by John Chen (johnpupu @SF) @@ -275,6 +275,7 @@ $PALANG['pAdminCreate_domain_button'] = '新增'; $PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">新增網域失敗!</span>'; $PALANG['pAdminCreate_domain_result_success'] = '新增網域成功!'; +$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX $PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/list-virtual.php new/postfixadmin-2.3.5/list-virtual.php --- old/postfixadmin-2.3.4/list-virtual.php 2010-12-16 00:41:40.000000000 +0100 +++ new/postfixadmin-2.3.5/list-virtual.php 2011-10-08 00:58:38.000000000 +0200 @@ -9,7 +9,7 @@ * Further details on the project are available at : * http://www.postfixadmin.com or http://postfixadmin.sf.net * - * @version $Id: list-virtual.php 893 2010-12-15 23:41:40Z christian_boltz $ + * @version $Id: list-virtual.php 1199 2011-10-07 22:58:38Z christian_boltz $ * @license GNU GPL v2 or later. * * File: list-virtual.php @@ -243,6 +243,9 @@ if ($result['rows'] > 0) { + $delimiter = preg_quote($CONF['recipient_delimiter'], "/"); + $goto_single_rec_del = ""; + while ($row = db_array ($result['result'])) { if ($display_mailbox_aliases) { @@ -251,7 +254,11 @@ $row['goto_other'] = array(); foreach ($goto_split as $goto_single) { - if ($goto_single == $row['username']) { # delivers to mailbox + if (!empty($CONF['recipient_delimiter'])) { + $goto_single_rec_del = preg_replace('/' .$delimiter. '[^' .$delimiter. '@]*@/', "@", $goto_single); + } + + if ($goto_single == $row['username'] || $goto_single_rec_del == $row['username']) { # delivers to mailbox $row['goto_mailbox'] = 1; } elseif (boolconf('vacation') && strstr($goto_single, '@' . $CONF['vacation_domain']) ) { # vacation alias - TODO: check for full vacation alias # skip the vacation alias, vacation status is detected otherwise diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/templates/admin_create-domain.php new/postfixadmin-2.3.5/templates/admin_create-domain.php --- old/postfixadmin-2.3.4/templates/admin_create-domain.php 2010-12-16 00:41:40.000000000 +0100 +++ new/postfixadmin-2.3.5/templates/admin_create-domain.php 2012-01-10 20:39:29.000000000 +0100 @@ -7,12 +7,12 @@ </tr> <tr> <td><?php print $PALANG['pAdminCreate_domain_domain'] . ":"; ?></td> - <td><input class="flat" type="text" name="fDomain" value="<?php print $tDomain; ?>" /></td> + <td><input class="flat" type="text" name="fDomain" value="<?php print htmlentities($tDomain); ?>" /></td> <td><?php print $pAdminCreate_domain_domain_text; ?></td> </tr> <tr> <td><?php print $PALANG['pAdminCreate_domain_description'] . ":"; ?></td> - <td><input class="flat" type="text" name="fDescription" value="<?php print $tDescription; ?>" /></td> + <td><input class="flat" type="text" name="fDescription" value="<?php print htmlentities($tDescription); ?>" /></td> <td> </td> </tr> <tr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/templates/admin_list-domain.php new/postfixadmin-2.3.5/templates/admin_list-domain.php --- old/postfixadmin-2.3.4/templates/admin_list-domain.php 2009-08-04 22:45:21.000000000 +0200 +++ new/postfixadmin-2.3.5/templates/admin_list-domain.php 2012-01-11 22:42:19.000000000 +0100 @@ -50,7 +50,7 @@ { print " <tr class="hilightoff" onMouseOver="className='hilighton';" onMouseOut="className='hilightoff';">\n"; print "<td><a href="list-virtual.php?domain=" . $domain_properties[$i]['domain'] . "">" . $domain_properties[$i]['domain'] . "</a></td>"; - print "<td>" . $domain_properties[$i]['description'] . "</td>"; + print "<td>" . htmlentities($domain_properties[$i]['description']) . "</td>"; print "<td>" . $domain_properties[$i]['alias_count'] . " / " . $domain_properties[$i]['aliases'] . "</td>"; print "<td>" . $domain_properties[$i]['mailbox_count'] . " / " . $domain_properties[$i]['mailboxes'] . "</td>"; if ($CONF['quota'] == 'YES') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/templates/edit-vacation.php new/postfixadmin-2.3.5/templates/edit-vacation.php --- old/postfixadmin-2.3.4/templates/edit-vacation.php 2008-06-17 23:25:09.000000000 +0200 +++ new/postfixadmin-2.3.5/templates/edit-vacation.php 2012-01-10 21:01:23.000000000 +0100 @@ -2,8 +2,7 @@ <script type="text/javascript"> function newLocation() { -window.location="<?php print $fCanceltarget; ?>" - + window.location= "<?php echo $fCanceltarget; ?>" } </script> <div id="edit_form"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/templates/fetchmail.php new/postfixadmin-2.3.5/templates/fetchmail.php --- old/postfixadmin-2.3.4/templates/fetchmail.php 2007-12-02 20:23:08.000000000 +0100 +++ new/postfixadmin-2.3.5/templates/fetchmail.php 2012-01-11 22:42:19.000000000 +0100 @@ -41,7 +41,7 @@ list($editible,$view,$type)=$fm_struct[$key]; if ($view){ $func="_listview_".$type; - print " <td nowrap>" . (function_exists($func)?$func($val):$val) . "</td>\n"; + print " <td nowrap>" . htmlentities(function_exists($func)?$func($val):$val) . "</td>\n"; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/templates/list-virtual.php new/postfixadmin-2.3.5/templates/list-virtual.php --- old/postfixadmin-2.3.4/templates/list-virtual.php 2010-05-18 00:56:23.000000000 +0200 +++ new/postfixadmin-2.3.5/templates/list-virtual.php 2012-01-11 22:42:19.000000000 +0100 @@ -314,7 +314,7 @@ } - print " <td>" . $tMailbox[$i]['name'] . "</td>\n"; + print " <td>" . htmlentities($tMailbox[$i]['name']) . "</td>\n"; if ($CONF['quota'] == 'YES') { print " <td>"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfixadmin-2.3.4/templates/menu.php new/postfixadmin-2.3.5/templates/menu.php --- old/postfixadmin-2.3.4/templates/menu.php 2009-07-19 14:25:47.000000000 +0200 +++ new/postfixadmin-2.3.5/templates/menu.php 2012-01-10 17:08:48.000000000 +0100 @@ -1,8 +1,8 @@ <?php if( !defined('POSTFIXADMIN') ) die( "This file cannot be used standalone." ); ?> <?php function _menulink ($href, $title, $submenu = "") { - if ($submenu != "") $submenu = "<ul><li><a target='_top' href='$href'>$title</a>$submenu</li></ul>"; - return "<li><a target='_top' href='$href'>$title</a>$submenu</li>"; + if ($submenu != "") $submenu = "<ul><li><a target='_top' href='$href'>$title</a>$submenu</li></ul>"; + return "<li><a target='_top' href='$href'>$title</a>$submenu</li>"; } authentication_has_role('global-admin'); @@ -10,15 +10,15 @@ echo "<div id='menu'>\n"; echo "<ul>\n"; -$url = "create-mailbox.php"; if (isset ($_GET['domain'])) $url .= "?domain=" . $_GET['domain']; +$url = "create-mailbox.php"; if (isset ($_GET['domain'])) $url .= "?domain=" . urlencode($_GET['domain']); $submenu_virtual = _menulink($url, $PALANG['pMenu_create_mailbox']); -$url = "create-alias.php"; if (isset ($_GET['domain'])) $url .= "?domain=" . $_GET['domain']; +$url = "create-alias.php"; if (isset ($_GET['domain'])) $url .= "?domain=" . urlencode($_GET['domain']); $submenu_virtual .= _menulink($url, $PALANG['pMenu_create_alias']); 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']); + $url = "create-alias-domain.php"; if (isset ($_GET['domain'])) $url .= "?target_domain=" . urlencode($_GET['domain']); + $submenu_virtual .= _menulink($url, $PALANG['pMenu_create_alias_domain']); } $submenu_admin = _menulink("create-admin.php", $PALANG['pAdminMenu_create_admin']); @@ -27,17 +27,17 @@ if (authentication_has_role('global-admin')) { - $submenu_domain = _menulink("create-domain.php", $PALANG['pAdminMenu_create_domain']); - $submenu_sendmail = _menulink("broadcast-message.php", $PALANG['pAdminMenu_broadcast_message']); + $submenu_domain = _menulink("create-domain.php", $PALANG['pAdminMenu_create_domain']); + $submenu_sendmail = _menulink("broadcast-message.php", $PALANG['pAdminMenu_broadcast_message']); } else { - $submenu_domain = ""; - $submenu_sendmail = ""; + $submenu_domain = ""; + $submenu_sendmail = ""; } if (authentication_has_role('global-admin')) { - print _menulink("list-admin.php", $PALANG['pAdminMenu_list_admin'], $submenu_admin); + print _menulink("list-admin.php", $PALANG['pAdminMenu_list_admin'], $submenu_admin); } else { - print _menulink("main.php", $PALANG['pMenu_main']); + print _menulink("main.php", $PALANG['pMenu_main']); } print _menulink("list-domain.php", $PALANG['pAdminMenu_list_domain'], $submenu_domain); @@ -49,11 +49,11 @@ print _menulink($link, $PALANG['pAdminMenu_list_virtual'], $submenu_virtual); if ($CONF['fetchmail'] == 'YES') { - print _menulink("fetchmail.php", $PALANG['pMenu_fetchmail'], $submenu_fetchmail); + print _menulink("fetchmail.php", $PALANG['pMenu_fetchmail'], $submenu_fetchmail); } if ($CONF['sendmail'] == 'YES') { - print _menulink("sendmail.php", $PALANG['pMenu_sendmail'], $submenu_sendmail); + print _menulink("sendmail.php", $PALANG['pMenu_sendmail'], $submenu_sendmail); } # not really useful in the admin menu @@ -64,7 +64,7 @@ print _menulink("password.php", $PALANG['pMenu_password']); if (authentication_has_role('global-admin') && 'pgsql'!=$CONF['database_type'] && $CONF['backup'] == 'YES') { - print _menulink("backup.php", $PALANG['pAdminMenu_backup']); + print _menulink("backup.php", $PALANG['pAdminMenu_backup']); } print _menulink("viewlog.php", $PALANG['pMenu_viewlog']); @@ -77,16 +77,16 @@ print "<br clear='all' /><br>"; # TODO if (authentication_has_role('global-admin')) { - $motd_file = "motd-admin.txt"; + $motd_file = "motd-admin.txt"; } else { - $motd_file = "motd.txt"; + $motd_file = "motd.txt"; } if (file_exists (realpath ($motd_file))) { - print "<div id=\"motd\">\n"; - include ($motd_file); - print "</div>"; + print "<div id=\"motd\">\n"; + include ($motd_file); + print "</div>"; } @@ -95,15 +95,15 @@ ?> <script type='text/javascript'> sfHover = function() { - var sfEls = document.getElementById("menu").getElementsByTagName("LI"); - for (var i=0; i<sfEls.length; i++) { - sfEls[i].onmouseover=function() { + var sfEls = document.getElementById("menu").getElementsByTagName("LI"); + for (var i=0; i<sfEls.length; i++) { + sfEls[i].onmouseover=function() { this.className+=" sfhover"; - } - sfEls[i].onmouseout=function() { + } + sfEls[i].onmouseout=function() { this.className=this.className.replace(new RegExp(" sfhover\b"), ""); - } - } + } + } } if (window.attachEvent) window.attachEvent("onload", sfHover); </script> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org