summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-05-04 18:35:28 +0000
committeralecpl <alec@alec.pl>2011-05-04 18:35:28 +0000
commit4a7ed027e4d9b605060cecc9bd97bc3dd2c1889b (patch)
tree530ae0a41bde5d1cf6a2aa5e55c4d3d454c6154e /program/include
parenta9251be2f09fb5f18a85d201c67668c70980efe3 (diff)
- Fix PHP warning on mistaken in_array() usage (#1487901)
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_imap_generic.php21
1 files changed, 7 insertions, 14 deletions
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