Merge remote-tracking branch 'svnexport/master'

ADDITIONS/squirrelmail-plugin/INSTALL

@@ -12,6 +12,7 @@ Requirements:
 	wget https://packages.zendframework.com/releases/ZendFramework-1.12.3/ZendFramework-1.12.3-minimal.tar.gz 
 	tar -zxf ZendFramework-1.12.3-minimal.tar.gz
 	mv ZendFramework-1.12.3-minimal/library/Zend .    )
+   NOTE: This plugin is _not compatible_ with Zend Framework version 2.x.
 
 Installation :
 ==============

CHANGELOG.TXT

@@ -15,13 +15,15 @@ SVN changes since 3.0 beta1 (2.91)
 - AliasHandler: don't clean goto field when making alias inactive (bug#316)
 - list-virtual: display quota even if $CONF[used_quotas] == NO (bug#307)
 - vacation.pl: fix postgresql queries in vacation.pl (bug#315)
-- fix query in AliasHandler getList which caused an empty list on some 
-  systems (bug#313)
+- fix query in AliasHandler getList() which caused an empty list and breaks
+  deletion of aliases in MariaDB (bug#313, bug#325)
 - fetchmail.pl: fix ssl extra options (cert check, cert path, fingerprint)
 - fix logging (run setup.php to fix old log entries) (bug#317)
 - fetchmail.php: change error_reporting() to exclude E_NOTICE (bug#322)
-- fr.lang translation update (patch#123)
-- $CONF[default_aliases] can now use the new domain as alias target (patch#124) 
+- translation updates: fr (patch#123), nl (patch#122)
+- $CONF[default_aliases] can now use the new domain as alias target (patch#124)
+- check that vacation start/end date are not in the past (patch#122) 
+- update vacation INSTALL.TXT with more secure locations
 
 Version 3.0 beta1 (2.91) - 2014/05/06 - SVN r1670
 -------------------------------------------------

INSTALL.TXT

@@ -159,7 +159,9 @@ See ADDITIONS/squirrelmail-plugin
 See xmlrpc.php - only a subset of Postfixadmin's functionality is currently exposed.
 See config.inc.php - see xmlrpc_enabled key (defaults to off).
 
-You'll need to install a copy of the Zend Framework within Postfixadmin (see header within xmlrpc.php)
+You'll need to install a copy of the Zend Framework (version 1.12.x) within Postfixadmin
+or your PHP include_path (see header within xmlrpc.php).
+NOTE: The XMLRPC interface is _not compatible_ with Zend Framework version 2.x.
 You'll need to enable the xmlrpc link (see config.inc.php)
 
 8. More information

model/AliasHandler.php

@@ -39,7 +39,8 @@ class AliasHandler extends PFAHandler {
                 /*options*/ '',
                 /*not_in_db*/ 0,
                 /*dont_write_to_db*/ 1,
-                /*select*/ 'coalesce(__is_mailbox,0) as is_mailbox',
+                /*select*/ 'coalesce(__is_mailbox,0) as is_mailbox, __mailbox_username', 
+                           # __mailbox_username is unused, but needed as workaround for a MariaDB bug
                 /*extrafrom*/ 'LEFT JOIN ( ' .
                     ' SELECT 1 as __is_mailbox, username as __mailbox_username ' .
                     ' FROM ' . table_by_key('mailbox') .