[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] SF.net SVN: squirrelmail:[14762] trunk/squirrelmail/plugins/administrator
From:       pdontthink--- via squirrelmail-cvs <squirrelmail-cvs () lists ! sourceforge ! net>
Date:       2018-04-19 11:01:57
Message-ID: 1524135717.668583.31551 () sfp-scm-1 ! v30 ! lw ! sourceforge ! com
[Download RAW message or body]

Revision: 14762
          http://sourceforge.net/p/squirrelmail/code/14762
Author:   pdontthink
Date:     2018-04-19 11:01:57 +0000 (Thu, 19 Apr 2018)
Log Message:
-----------
TLS settings were not working

Modified Paths:
--------------
    trunk/squirrelmail/plugins/administrator/defines.php
    trunk/squirrelmail/plugins/administrator/options.php

Modified: trunk/squirrelmail/plugins/administrator/defines.php
===================================================================
--- trunk/squirrelmail/plugins/administrator/defines.php	2018-04-19 10:43:52 UTC (rev \
                14761)
+++ trunk/squirrelmail/plugins/administrator/defines.php	2018-04-19 11:01:57 UTC (rev \
14762) @@ -129,7 +129,7 @@
                                                  '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 @@
                  '$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"),

Modified: trunk/squirrelmail/plugins/administrator/options.php
===================================================================
--- trunk/squirrelmail/plugins/administrator/options.php	2018-04-19 10:43:52 UTC (rev \
                14761)
+++ trunk/squirrelmail/plugins/administrator/options.php	2018-04-19 11:01:57 UTC (rev \
14762) @@ -620,6 +620,8 @@
     Write the options to the file.
 */
 
+// Test/debug
+// $cfgfile = '/tmp/config.php';
 if ( $fp = @fopen( $cfgfile, 'w' ) ) {
     fwrite( $fp, "<?php\n".
     "/**\n".

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@lists.sourceforge.net
List info (subscribe/unsubscribe/change options): \
                https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn


[prev in list] [next in list] [prev in thread] [next in thread]