Fixes for POP3 and TLS (new option)

diff --git a/auth/pop3/config.html b/auth/pop3/config.html
index bb97d8775392f9dbaa67505727faec2e66cf2ee6..1f5acfa623c7f5292f4051527cf4d01f36b9ad5f 100644 (file)
--- a/auth/pop3/config.html
+++ b/auth/pop3/config.html
@@ -3,7 +3,7 @@
         $config->auth_pop3host = "127.0.0.1";
     }
     if (!isset($config->auth_pop3type)) {
-        $config->auth_pop3type = "pop3";
+        $config->auth_pop3type = "pop3notls";
     }
     if (!isset($config->auth_pop3port)) {
         $config->auth_pop3port = "110";
@@ -23,7 +23,7 @@
 <TR VALIGN=TOP BGCOLOR="<?php echo $THEME->cellheading2 ?>">
        <TD ALIGN=RIGHT><P>auth_pop3type:</TD>
        <TD>
-    <?php  $pop3types = array("pop3","pop3cert");
+    <?php  $pop3types = array("pop3","pop3cert", "pop3notls");
        foreach($pop3types as $pop3type) {
            $pop3options[$pop3type] = $pop3type;
        }

diff --git a/auth/pop3/lib.php b/auth/pop3/lib.php
index 64cc3c424bd5354b401721d6da91de8d04c1b34c..5602f0065edc89254a4a4594ce573484b1d0f6f2 100644 (file)
--- a/auth/pop3/lib.php
+++ b/auth/pop3/lib.php
@@ -9,6 +9,9 @@ function auth_user_login ($username, $password) {
 
     switch ($CFG->auth_pop3type) {
         case "pop3":
+            $host = "{".$CFG->auth_pop3host.":$CFG->auth_pop3port/pop3}INBOX";
+        break;
+        case "pop3notls":
             $host = "{".$CFG->auth_pop3host.":$CFG->auth_pop3port/pop3/notls}INBOX";
         break;
         case "pop3cert":