TLS settings were not working

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@14762 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php
index 62322a2356500986997c60f7a40504bb01c01036..e1437d87a61b70c64c2c28c7cadfc4aa05f1d4fc 100644 (file)
--- a/plugins/administrator/defines.php
+++ b/plugins/administrator/defines.php
@@ -129,7 +129,7 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                  'size' => 10,
                                                  'default' => 'detect' ),
                  '$use_imap_tls' => array( 'name' => _("IMAP Connection Security"),
-                                           'type' => SMOPT_TYPE_STRLIST,
+                                           'type' => SMOPT_TYPE_NUMLIST,
                                            'posvals' => array( 0 => _("Plain text connection"),
                                                                1 => _("Secure IMAP (TLS) connection"),
                                                                2 => _("IMAP STARTTLS connection")),
@@ -156,10 +156,10 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                  '$smtpPort' => array( 'name' => _("SMTP Server Port"),
                                        'type' => SMOPT_TYPE_INTEGER ),
                  '$use_smtp_tls' => array( 'name' => _("SMTP Connection Security"),
-                                           'type' => SMOPT_TYPE_STRLIST,
+                                           'type' => SMOPT_TYPE_NUMLIST,
                                            'posvals' => array( 0 => _("Plain text connection"),
-                                                               1 => _("Secure IMAP (TLS) connection"),
-                                                               2 => _("IMAP STARTTLS connection")),
+                                                               1 => _("Secure SMTP (TLS) connection"),
+                                                               2 => _("SMTP STARTTLS connection")),
                                            'comment' => _("Requires higher PHP version and special functions. See SquirrelMail documentation."),
                                            'default' => 0 ),
                  '$smtp_auth_mech' => array( 'name' => _("SMTP Authentication Type"),

diff --git a/plugins/administrator/options.php b/plugins/administrator/options.php
index 170e1f6a634b68afc8e8f6364cc9a7e17edf5700..1bfaf784cd37a826269827e8a53324e2f433a73a 100644 (file)
--- a/plugins/administrator/options.php
+++ b/plugins/administrator/options.php
@@ -620,6 +620,8 @@ echo '<tr bgcolor="'.$color[5].'"><th colspan="2"><input value="'.
     Write the options to the file.
 */
 
+// Test/debug
+// $cfgfile = '/tmp/config.php';
 if ( $fp = @fopen( $cfgfile, 'w' ) ) {
     fwrite( $fp, "<?php\n".
     "/**\n".