Browse Source

Correct vendor string for GMail is 'gimap'

pull/6883/head
Aleksander Machniak 6 years ago
parent
commit
9b88e9e5c2
  1. 2
      config/defaults.inc.php
  2. 2
      program/lib/Roundcube/rcube_imap.php

2
config/defaults.inc.php

@ -181,7 +181,7 @@ $config['imap_delimiter'] = null;
// If you know your imap's folder vendor, you can specify it here.
// Otherwise it will be determined automatically. Use lower-case
// identifiers, e.g. 'dovecot', 'cyrus', 'gmail', 'hmail', 'uw-imap'.
// identifiers, e.g. 'dovecot', 'cyrus', 'gimap', 'hmail', 'uw-imap'.
$config['imap_vendor'] = null;
// If IMAP server doesn't support NAMESPACE extension, but you're

2
program/lib/Roundcube/rcube_imap.php

@ -644,7 +644,7 @@ class rcube_imap extends rcube_storage
$vendor = (string) (!empty($ident) ? $ident['name'] : '');
$ident = strtolower($vendor . ' ' . $this->conn->data['GREETING']);
$vendors = array('cyrus', 'dovecot', 'uw-imap', 'gmail', 'hmail');
$vendors = array('cyrus', 'dovecot', 'uw-imap', 'gimap', 'hmail');
foreach ($vendors as $v) {
if (strpos($ident, $v) !== false) {

Loading…
Cancel
Save