diff options
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | program/include/rcube_imap_generic.php | 21 |
2 files changed, 11 insertions, 14 deletions
@@ -1,6 +1,10 @@ CHANGELOG Roundcube Webmail =========================== +- Fix PHP warning on mistaken in_array() usage (#1487901) + +RELEASE 0.5.2 +------------- - TinyMCE 3.4.2 now compatible with IE9 - PEAR::Net_SMTP 1.5.2, fixed timeout issue (#1487843) - Fix bug where template name without plugin prefix was used in render_page hook diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php index 43194c4fd..36638d25d 100644 --- a/program/include/rcube_imap_generic.php +++ b/program/include/rcube_imap_generic.php @@ -777,13 +777,6 @@ class rcube_imap_generic // Now we're secure, capabilities need to be reread $this->clearCapability(); } - - // Use best (for security) supported authentication method - foreach (array('DIGEST-MD5', 'CRAM-MD5', 'CRAM_MD5', 'PLAIN', 'LOGIN') as $auth_method) { - if (in_array($auth_method, $auth_methods)) { - break; - } - } } // Send ID info @@ -809,13 +802,13 @@ class rcube_imap_generic else if (!$login_disabled) { $auth_methods[] = 'LOGIN'; } -
- // Use best (for security) supported authentication method
- foreach (array('DIGEST-MD5', 'CRAM-MD5', 'CRAM_MD5', 'PLAIN', 'LOGIN') as $auth_method) {
- if (in_array($auth_method, $auth_methods)) {
- break;
- }
- }
+ + // Use best (for security) supported authentication method + foreach (array('DIGEST-MD5', 'CRAM-MD5', 'CRAM_MD5', 'PLAIN', 'LOGIN') as $auth_method) { + if (in_array($auth_method, $auth_methods)) { + break; + } + } } else { // Prevent from sending credentials in plain text when connection is not secure |