Added support for IMAP & SMTP use of TLS and fancy auth mechanisms to administrator...

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

diff --git a/plugins/administrator/defines.php b/plugins/administrator/defines.php
index d6d4b79b61426630aa7804ab852e42faba15c37d..9c961c7f80e107372a8a916510ea7260b593697a 100644 (file)
--- a/plugins/administrator/defines.php
+++ b/plugins/administrator/defines.php
@@ -110,6 +110,15 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                  'comment' => _("Use \"detect\" to auto-detect."),
                                                  'size' => 10,
                                                  'default' => 'detect' ),
+                                '$use_imap_tls' => array( 'name' => "Use TLS for IMAP connections",
+                                                                                  'type' => SMOPT_TYPE_BOOLEAN,
+                                                                                  'comment' => "Requires PHP 4.3.x! Experimental.",
+                                                                                  'default' => false ),
+                                '$imap_auth_mech' => array( 'name' => "IMAP Authentication Mech",
+                                                                                        'type' => SMOPT_TYPE_STRLIST,
+                                                                                        'posvals' => array('plain' => 'Plaintext',
+                                                                                                                           'cram-md5' => 'CRAM-MD5',
+                                                                                                                               'digest-md5' => 'DIGEST-MD5') ),
                  '$useSendmail' => array( 'name' => _("Use Sendmail"),
                                           'type' => SMOPT_TYPE_BOOLEAN ),
                  '$sendmail_path' => array( 'name' => _("Sendmail Path"),
@@ -120,8 +129,17 @@ $defcfg = array( '$config_version' => array( 'name' => _("Config File Version"),
                                                 'size' => 40 ),
                  '$smtpPort' => array( 'name' => _("SMTP Server Port"),
                                        'type' => SMOPT_TYPE_INTEGER ),
-                 '$use_authenticated_smtp' => array( 'name' => _("Authenticated SMTP"),
-                                                     'type' => SMOPT_TYPE_BOOLEAN ),
+                                '$use_smtp_tls' => array( 'name' => "Use TLS for SMTP connections",
+                                                                                  'type' => SMOPT_TYPE_BOOLEAN,
+                                                                                  'comment' => "Requires PHP 4.3.x! Experimental.",
+                                                                                  'default' => false ),
+                                '$smtp_auth_mech' => array( 'name' => "SMTP Authentication Mech",
+                                                                                        'type' => SMOPT_TYPE_STRLIST,
+                                                                                        'posvals' => array('none' => 'No SMTP auth',
+                                                                                                           'plain' => 'Plaintext',
+                                                                                                                               'cram-md5' => 'CRAM-MD5',
+                                                                                                                               'digest-md5' => 'DIGEST-MD5'),
+                                                                                        'default' => 'none'),
                  '$invert_time' => array( 'name' => _("Invert Time"),
                                           'type' => SMOPT_TYPE_BOOLEAN ),
                  '$default_use_mdn' => array( 'name' => _("Use Confirmation Flags"),