[pkg-horde] [SCM] Debian Horde Packages repository: ingo1 package branch, upstream+patches, updated. 51dd464c158f47c3639c7070bd7cbe6d21389dfe

[Gregory Colpart]

The following commit has been merged in the upstream+patches branch:
commit 51dd464c158f47c3639c7070bd7cbe6d21389dfe
Merge: bb97f68f69bc3660ea9630f41fb71dc7b7a60b9e 83df58bbd071b97150ba9176f7f09ae5b918e2d3
Author: Gregory Colpart <reg at foulademer.gcolpart.com>
Date:   Mon Nov 2 00:47:02 2009 +0100

    Merge branch 'upstream' into upstream+patches

diff --combined config/backends.php.dist
index 7224afb,9a168cb..2b33170
--- a/config/backends.php.dist
+++ b/config/backends.php.dist
@@@ -1,6 -1,6 +1,6 @@@
  <?php
  /**
-  * $Horde: ingo/config/backends.php.dist,v 1.20.8.11 2008/05/02 03:54:53 chuck Exp $
+  * $Horde: ingo/config/backends.php.dist,v 1.20.8.12 2008/12/15 02:33:07 chuck Exp $
   *
   * Ingo works purely on a preferred mechanism for server selection. There are
   * a number of properties that you can set for each backend:
@@@ -71,11 -71,12 +71,12 @@@ $backends['maildrop'] = array
          // owner's home directory.
          // You can use the following variables:
          //   %u = name of the filters' owner
+         //   %d = domain name of the filters' owner
          //   %U = the 'username' from above
          // Example:
-         //   '/data/maildrop/filters/%u'
+         //   '/data/maildrop/filters/%d/%u'
          //   This would be translated into:
-         //   '/data/maildrop/filters/<filter_owners_username>/.mailfilter'
+         //   '/data/maildrop/filters/<filter_owners_domainname>/<filter_owners_username>/.mailfilter'
          // 'vfs_path' => '/path/to/maildrop',
  
          // VFS: FTP example
@@@ -299,9 -300,6 +300,9 @@@ $backends['ldapsieve'] = array
  
  /* Kolab Example (using Sieve) */
  if ($GLOBALS['conf']['kolab']['enabled']) {
 +    // When using Kolab, other backends are removed
 +    $backends = Array();
 +    
      require_once 'Horde/Kolab.php';
  
      if (!is_callable('Kolab', 'getServer')) {

-- 
Debian Horde Packages repository: ingo1 package