diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-08-14 18:55:38 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-08-14 18:55:38 +0200 |
| commit | 519e380f637cbc8d2b5c3d7a0d34508ac17d57d8 (patch) | |
| tree | 0faa5eead671c4e47139e165dba82b27d762fae2 /plugins | |
| parent | 413df054ad3235c59c24e897b616c569adc4f67b (diff) | |
| parent | 56689b31ae3746600b12a9c5c9ec1438e704a6e7 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/managesieve/Changelog | 2 | ||||
| -rw-r--r-- | plugins/managesieve/lib/Net/Sieve.php | 4 | ||||
| -rw-r--r-- | plugins/new_user_identity/new_user_identity.php | 14 | ||||
| -rw-r--r-- | plugins/new_user_identity/package.xml | 4 |
4 files changed, 16 insertions, 8 deletions
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog index c015ee403..482cff0ca 100644 --- a/plugins/managesieve/Changelog +++ b/plugins/managesieve/Changelog @@ -1,3 +1,5 @@ +- Fixed issue with DBMail bug [http://pear.php.net/bugs/bug.php?id=19077] (#1488594) + * version 5.2 [2012-07-24] ----------------------------------------------------------- - Added GUI for variables setting - RFC5229 (patch from Paweł Słowik) diff --git a/plugins/managesieve/lib/Net/Sieve.php b/plugins/managesieve/lib/Net/Sieve.php index a8e36d8d7..8a0a9b0e1 100644 --- a/plugins/managesieve/lib/Net/Sieve.php +++ b/plugins/managesieve/lib/Net/Sieve.php @@ -1098,7 +1098,9 @@ class Net_Sieve return PEAR::raiseError(trim($response . $line), 6); } - if (preg_match('/^{([0-9]+)}/i', $line, $matches)) { + // "\+?" is added in the regexp to workaround DBMail bug + // http://dbmail.org/mantis/view.php?id=963 + if (preg_match('/^{([0-9]+)\+?}/i', $line, $matches)) { // Matches literal string responses. $line = $this->_recvBytes($matches[1] + 2); diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php index f3dae20a3..200d9accd 100644 --- a/plugins/new_user_identity/new_user_identity.php +++ b/plugins/new_user_identity/new_user_identity.php @@ -36,11 +36,14 @@ class new_user_identity extends rcube_plugin $rcmail = rcmail::get_instance(); if ($this->init_ldap($args['host'])) { - $results = $this->ldap->search('*', $args['user'], TRUE); + $results = $this->ldap->search('*', $args['user'], true); if (count($results->records) == 1) { - $args['user_name'] = $results->records[0]['name']; - if (!$args['user_email'] && strpos($results->records[0]['email'], '@')) { - $args['user_email'] = rcube_idn_to_ascii($results->records[0]['email']); + $user_name = is_array($results->records[0]['name']) ? $results->records[0]['name'][0] : $results->records[0]['name']; + $user_email = is_array($results->records[0]['email']) ? $results->records[0]['email'][0] : $results->records[0]['email']; + + $args['user_name'] = $user_name; + if (!$args['user_email'] && strpos($user_email, '@')) { + $args['user_email'] = rcube_idn_to_ascii($user_email); } } } @@ -49,8 +52,9 @@ class new_user_identity extends rcube_plugin private function init_ldap($host) { - if ($this->ldap) + if ($this->ldap) { return $this->ldap->ready; + } $rcmail = rcmail::get_instance(); diff --git a/plugins/new_user_identity/package.xml b/plugins/new_user_identity/package.xml index 7d9d20d39..e50cd9255 100644 --- a/plugins/new_user_identity/package.xml +++ b/plugins/new_user_identity/package.xml @@ -15,9 +15,9 @@ <email>alec@alec.pl</email> <active>yes</active> </lead> - <date>2012-08-07</date> + <date>2012-08-13</date> <version> - <release>1.0.6</release> + <release>1.0.7</release> <api>1.1</api> </version> <stability> |