Changeset c55337c in github

Timestamp:

Nov 30, 2009 7:06:12 AM (4 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

e2927b0

Parents:

6c95809d

Message:

• write error to log if connection to managesieve server cannot be established

File:

• plugins/managesieve/managesieve.php (modified) (3 diffs)

plugins/managesieve/managesieve.php

@@ -62 +62 @@
     require_once($this->home . '/lib/rcube_sieve.php');
 
+    $host = str_replace('%h', $_SESSION['imap_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']), 
-        str_replace('%h', $_SESSION['imap_host'], $this->rc->config->get('managesieve_host', 'localhost')),
-        $this->rc->config->get('managesieve_port', 2000),
+        $host, $port,
         $this->rc->config->get('managesieve_usetls', false),
         $this->rc->config->get('managesieve_disabled_extensions'),
@@ -121 +123 @@
         break;
       }
+
+      raise_error(array('code' => 403, 'type' => 'php', 'message' => "Unable to connect to managesieve on $host:$port"), true, false);
+
       // to disable 'Add filter' button set env variable
       $this->rc->output->set_env('filterconnerror', true);
@@ -548 +553 @@
     $select = new html_select(array('name' => '_set', 'id' => $attrib['id'], 'onchange' => 'rcmail.managesieve_set()'));
 
-    asort($list, SORT_LOCALE_STRING);
-
-    foreach($list as $set)
-      $select->add($set . ($set == $active ? ' ('.$this->gettext('active').')' : ''), $set);
+    if ($list) {
+      asort($list, SORT_LOCALE_STRING);
+
+      foreach($list as $set)
+        $select->add($set . ($set == $active ? ' ('.$this->gettext('active').')' : ''), $set);
+    }
     
     $out = $select->show($this->sieve->current);