SF.net SVN: postfixadmin:[1877] trunk

[<chr...@us...>]

Revision: 1877
          http://sourceforge.net/p/postfixadmin/code/1877
Author:   christian_boltz
Date:     2016-10-31 20:15:31 +0000 (Mon, 31 Oct 2016)
Log Message:
-----------
AliasHandler: restrict __is_mailbox subquery to allowed domains

This improves performance on setups with lots of mailboxes.
Well, except for superadmins because restricting to "all domains"
doesn't really help ;-)

Thanks to gygy for reporting this on IRC, and for testing the patch.

Modified Paths:
--------------
    trunk/CHANGELOG.TXT
    trunk/model/AliasHandler.php

Modified: trunk/CHANGELOG.TXT
===================================================================
--- trunk/CHANGELOG.TXT	2016-10-20 21:26:13 UTC (rev 1876)
+++ trunk/CHANGELOG.TXT	2016-10-31 20:15:31 UTC (rev 1877)
@@ -12,6 +12,8 @@
 Changes since the 3.0.1 release
 -------------------------------------------------
 
+  - AliasHandler: restrict mailbox subquery to allowed domains to improve
+    performance (except for superadmins ;-) on setups with lots of mailboxes
   - allow switching between dovecot:* password schemes while still accepting
     passwords hashed using the previous dovecot:* scheme
   - FetchmailHandler: use a valid date as default for 'date'

Modified: trunk/model/AliasHandler.php
===================================================================
--- trunk/model/AliasHandler.php	2016-10-20 21:26:13 UTC (rev 1876)
+++ trunk/model/AliasHandler.php	2016-10-31 20:15:31 UTC (rev 1877)
@@ -48,6 +48,7 @@
                     ' SELECT 1 as __is_mailbox, username as __mailbox_username ' .
                     ' FROM ' . table_by_key('mailbox') .
                     ' WHERE username IS NOT NULL ' .
+                    ' AND ' . db_in_clause($this->domain_field, $this->allowed_domains) .
                     ' ) AS __mailbox ON __mailbox_username = address' ),
             'goto_mailbox'  => pacol(   $mbgoto,    $mbgoto,$mbgoto,'bool', 'pEdit_alias_forward_and_store' , ''                                , 0,
                 /*options*/ '',

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.