Changeset 3703 in subversion

Timestamp:

Jun 3, 2010 4:11:42 AM (3 years ago)

Author:

alec

Message:

• Support %n and %d variables in managesieve_host option

Location:

trunk/plugins/managesieve

Files:

• Changelog (modified) (1 diff)
• config.inc.php.dist (modified) (1 diff)
• managesieve.php (modified) (2 diffs)

trunk/plugins/managesieve/Changelog

@@ +1 @@
+* version 2.6 [2010-06-03]
+-----------------------------------------------------------
+- Support %n and %d variables in managesieve_host option
+
 * version 2.5 [2010-05-04]
 -----------------------------------------------------------

trunk/plugins/managesieve/config.inc.php.dist

@@ -5 +5 @@
 
 // managesieve server address, default is localhost.
-// Use %h variable as replacement for user's IMAP hostname
+// Replacement variables supported in host name:
+// %h - user's IMAP hostname
+// %n - http hostname ($_SERVER['SERVER_NAME'])
+// %d - domain (http hostname without the first part)
+// For example %n = mail.domain.tld, %d = domain.tld
 $rcmail_config['managesieve_host'] = 'localhost';
 

trunk/plugins/managesieve/managesieve.php

@@ -8 +8 @@
  * with server using managesieve protocol. Adds Filters tab in Settings.
  *
- * @version 2.5
+ * @version 2.6
  * @author Aleksander 'A.L.E.C' Machniak <alec@alec.pl>
  *
@@ -63 +63 @@
         require_once($this->home . '/lib/rcube_sieve.php');
 
-        $host = str_replace('%h', $_SESSION['imap_host'], $this->rc->config->get('managesieve_host', 'localhost'));
+        $host = rcube_parse_host($this->rc->config->get('managesieve_host', 'localhost'));
         $port = $this->rc->config->get('managesieve_port', 2000);
 
         // try to connect to managesieve server and to fetch the script
         $this->sieve = new rcube_sieve($_SESSION['username'],
-        $this->rc->decrypt($_SESSION['password']), $host, $port,
+            $this->rc->decrypt($_SESSION['password']), $host, $port,
             $this->rc->config->get('managesieve_usetls', false),
             $this->rc->config->get('managesieve_disabled_extensions'),