diff --git a/api/src/Mail/Imap.php b/api/src/Mail/Imap.php index ce91a289fc..341dd7e5bb 100644 --- a/api/src/Mail/Imap.php +++ b/api/src/Mail/Imap.php @@ -65,7 +65,7 @@ class Imap extends Horde_Imap_Client_Socket implements Imap\PushIface * @var array */ static public $default_params = array( - //'debug' => '/tmp/imap.log', // uncomment to log communitcation with IMAP server + //'debug' => '/tmp/imap.log', // uncomment to log communication with IMAP server //'debug_literal' => true, // uncomment to log mail contents returned by IMAP server 'cache' => true, // default caching via Cache / Api\Cache ); @@ -1562,4 +1562,4 @@ class Imap extends Horde_Imap_Client_Socket implements Imap\PushIface in_array($this->acc_imap_host.':'.$this->acc_imap_port, self::$hosts_with_push)); } } -Imap::init_static(); +Imap::init_static(); \ No newline at end of file diff --git a/api/src/Mail/Imap/Cyrus.php b/api/src/Mail/Imap/Cyrus.php index 28b615b4cd..ea1b059f89 100644 --- a/api/src/Mail/Imap/Cyrus.php +++ b/api/src/Mail/Imap/Cyrus.php @@ -61,7 +61,7 @@ class Cyrus extends Mail\Imap */ function deleteAccount($_hookValues) { - // some precausion to really delete just _one_ account + // some precaution to really delete just _one_ account if (strpos($_hookValues['account_lid'],'%') !== false || strpos($_hookValues['account_lid'],'*') !== false) { @@ -230,4 +230,4 @@ class Cyrus extends Mail\Imap } return parent::__call($name, $params); } -} +} \ No newline at end of file diff --git a/api/src/Mail/Imap/Dovecot.php b/api/src/Mail/Imap/Dovecot.php index 6eabe2aa04..c76e392742 100644 --- a/api/src/Mail/Imap/Dovecot.php +++ b/api/src/Mail/Imap/Dovecot.php @@ -73,7 +73,7 @@ class Dovecot extends Mail\Imap $this->params['acc_imap_admin_username'] = substr($this->acc_imap_admin_username, $pos+1); } $this->params['acc_imap_admin_username'] = (is_string($_username) ? $_username : $this->acc_imap_username). - '*'.$this->acc_imap_admin_username; + '*'.$this->params['acc_imap_admin_username']; parent::adminConnection($_username); } @@ -282,4 +282,4 @@ class Dovecot extends Mail\Imap return true; } -} +} \ No newline at end of file diff --git a/api/src/Mail/Smtp/Sql.php b/api/src/Mail/Smtp/Sql.php index 7e20377cf7..99c55d5b27 100644 --- a/api/src/Mail/Smtp/Sql.php +++ b/api/src/Mail/Smtp/Sql.php @@ -404,4 +404,4 @@ class Sql extends Mail\Smtp return true; } -} +} \ No newline at end of file