MercurialHorde patches / file revision
summary | shortlog | changelog | graph | tags | files | changeset | file | revisions | annotate | diff | raw
framework/HK-GW-Gmail.patch
author Gunnar Wrobel <p@rdus.de>
Mon Jan 19 09:00:34 2009 +0100 (19 months ago)
changeset 95 6826c89463cd
parent 49e3f6529bb581
permissions -rw-r--r--
Attempted update to Horde GIT repositories. 
     1 diff -r ef8756c3df68 config/conf.php

     2 --- a/config/conf.php	Wed Jul 16 11:15:42 2008 +0200

     3 +++ b/config/conf.php	Wed Jul 16 11:22:24 2008 +0200

     4 @@ -101,6 +101,7 @@

     5  $conf['kolab']['imap']['sieveport'] = 2000;

     6  $conf['kolab']['imap']['maildomain'] = 'example.com';

     7  $conf['kolab']['imap']['virtdomains'] = true;

     8 +$conf['kolab']['imap']['no_acl'] = true;

     9  $conf['kolab']['smtp']['server'] = 'localhost';

    10  $conf['kolab']['smtp']['port'] = 25;

    11  $conf['kolab']['misc']['multidomain'] = false;

    12 diff -r ef8756c3df68 framework/Auth/Auth/kolab.php

    13 --- a/framework/Auth/Auth/kolab.php	Wed Jul 16 11:15:42 2008 +0200

    14 +++ b/framework/Auth/Auth/kolab.php	Wed Jul 16 11:22:24 2008 +0200

    15 @@ -31,7 +31,7 @@

    16      {

    17          $params['hostspec'] = Kolab::getServer('imap');

    18          $params['port'] = $GLOBALS['conf']['kolab']['imap']['port'];

    19 -        $params['protocol'] = 'imap/notls';

    20 +        $params['protocol'] = 'imap/ssl';

    21  

    22          parent::Auth_imap($params);

    23      }

    24 diff -r ef8756c3df68 framework/Kolab_Storage/lib/Horde/Kolab/Storage/IMAP/cclient.php

    25 --- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/IMAP/cclient.php	Wed Jul 16 11:15:42 2008 +0200

    26 +++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/IMAP/cclient.php	Wed Jul 16 11:22:24 2008 +0200

    27 @@ -71,7 +71,7 @@

    28      {

    29          $options = '';

    30          if (!$tls) {

    31 -            $options = '/notls';

    32 +            $options = '/ssl';

    33          }

    34  

    35          $mbox = '{' . $this->_server . ':' . $this->_port

    36 @@ -100,6 +100,9 @@

    37       */

    38      function _connect()

    39      {

    40 +        if (!$this->_login) {

    41 +            return PEAR::raiseError(sprintf(_("Provide a login. Server: %s"), $this->_server));

    42 +        }

    43          $result = @imap_open($this->_base_mbox, $this->_login, $this->_password, OP_HALFOPEN);

    44          if (!$result) {

    45              return PEAR::raiseError(sprintf(_("IMAP error. Server: %s. Error: %s"), $this->_server, @imap_last_error()));

    46 diff -r ef8756c3df68 framework/Kolab_Storage/lib/Horde/Kolab/Storage/IMAP/pear.php

    47 --- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/IMAP/pear.php	Wed Jul 16 11:15:42 2008 +0200

    48 +++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/IMAP/pear.php	Wed Jul 16 11:22:24 2008 +0200

    49 @@ -56,7 +56,7 @@

    50              return true;

    51          }

    52  

    53 -        $this->_imap = &new Net_IMAP($this->_server, $this->_port);

    54 +        $this->_imap = &new Net_IMAP('ssl://' . $this->_server, $this->_port);

    55          $result = $this->_imap->login($login, $password, true, false);

    56          if (is_a($result, 'PEAR_Error')) {

    57              return $result;

    58 diff -r ef8756c3df68 imp/config/servers.php

    59 --- a/imp/config/servers.php	Wed Jul 16 11:15:42 2008 +0200

    60 +++ b/imp/config/servers.php	Wed Jul 16 11:22:24 2008 +0200

    61 @@ -316,7 +316,7 @@

    62          'name' => 'Kolab Cyrus IMAP Server',

    63          'server' => $server,

    64          'hordeauth' => 'full',

    65 -        'protocol' => 'imap/notls/novalidate-cert',

    66 +        'protocol' => 'imap/ssl',

    67          'port' => $GLOBALS['conf']['kolab']['imap']['port'],

    68          'maildomain' => $GLOBALS['conf']['kolab']['imap']['maildomain'],

    69          'realm' => '',
Horde patches