Use additional starttls return info from autoconfig library

horde · May 21, 2014 · 753b899 · 753b899
1 parent 670f2dc
commit 753b899
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 24 deletions.
diff --git a/imp/js/remoteprefs.js b/imp/js/remoteprefs.js
@@ -28,7 +28,7 @@ var ImpRemotePrefs = {
             $('remote_server').setValue(r.mconfig.host);
             $('remote_user').setValue(r.mconfig.username);
             $('remote_port').setValue(r.mconfig.port);
-            $('remote_secure_autoconfig').setValue(~~(!!r.mconfig.tls));
+            $('remote_secure_autoconfig').setValue(r.mconfig.tls);
 
             if ($F('remote_label').blank()) {
                 $('remote_label').setValue(r.mconfig.label);

diff --git a/imp/lib/Prefs/Special/Remote.php b/imp/lib/Prefs/Special/Remote.php
@@ -89,38 +89,46 @@ public function update(Horde_Core_Prefs_Ui $ui)
                     $ob->type = $ob::POP3;
                 }
 
-                if ($ui->vars->remote_secure_autoconfig) {
-                    $ob->secure = 'ssl';
+                if (isset($ui->vars->remote_secure_autoconfig)) {
+                    switch ($ui->vars->remote_secure_autoconfig) {
+                    case 'starttls':
+                        $ob->secure = 'tls';
+                        break;
+
+                    case 'tls':
+                        $ob->secure = 'ssl';
+                        break;
+
+                    default:
+                        $ob->secure = true;
+                        break;
+                    }
                 } else {
                     switch ($ui->vars->remote_secure) {
                     case 'auto':
                         $ob->secure = true;
                         break;
 
                     case 'yes':
-                        if (isset($ui->vars->remote_secure_autoconfig)) {
-                            $ob->secure = 'tls';
-                        } else {
-                            switch ($ob->type) {
-                            case $ob::IMAP:
-                                $tmp = new Horde_Mail_Autoconfig_Server_Imap();
-                                break;
-
-                            case $ob::POP3:
-                                $tmp = new Horde_Mail_Autoconfig_Server_Pop3();
-                                break;
-                            }
-
-                            $tmp->host = $ob->hostspec;
-                            $tmp->port = $ob->port;
-                            $tmp->tls = true;
-
-                            $ob->secure = $tmp->valid()
-                                ? 'ssl'
-                                : 'tls';
+                        switch ($ob->type) {
+                        case $ob::IMAP:
+                            $tmp = new Horde_Mail_Autoconfig_Server_Imap();
+                            break;
+
+                        case $ob::POP3:
+                            $tmp = new Horde_Mail_Autoconfig_Server_Pop3();
+                            break;
                         }
-                        break;
+
+                        $tmp->host = $ob->hostspec;
+                        $tmp->port = $ob->port;
+                        $tmp->tls = true;
+
+                        $ob->secure = $tmp->valid()
+                            ? 'ssl'
+                            : 'tls';
                     }
+                    break;
                 }
 
                 $remote[strval($ob)] = $ob;