Add ability to control the display of the "Check Spelling" button. Allows administrat...

[squirrelmail.git] / config / conf.pl

diff --git a/config/conf.pl b/config/conf.pl
index 315c6f418fff94c1f832a486e7ea99c4a5e4a10c..2de4eefb819b676cf3920bfbc627397b49abad12 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 # conf.pl
 #
-# Copyright (c) 1999-2015 The SquirrelMail Project Team
+# Copyright (c) 1999-2017 The SquirrelMail Project Team
 # Licensed under the GNU GPL. For full terms see COPYING.
 #
 # A simple configure script to configure SquirrelMail
@@ -435,6 +435,12 @@ $smtp_auth_mech = 'none'                if ( !$smtp_auth_mech );
 $use_imap_tls = 'false'                 if ( !$use_imap_tls );
 $imap_auth_mech = 'login'               if ( !$imap_auth_mech );
 
+# $use_imap_tls and $use_smtp_tls are switched to integer since 1.5.1
+$use_imap_tls = 0                      if ( $use_imap_tls eq 'false');
+$use_imap_tls = 1                      if ( $use_imap_tls eq 'true');
+$use_smtp_tls = 0                      if ( $use_smtp_tls eq 'false');
+$use_smtp_tls = 1                      if ( $use_smtp_tls eq 'true');
+
 # since 1.5.0
 $show_alternative_names = 'false'       if ( !$show_alternative_names );
 # $available_languages option available only in 1.5.0. removed due to $languages
@@ -491,11 +497,6 @@ if ( !%fontsets) {
                  'verasans',  'bitstream vera sans,verdana,sans-serif');
 }
 
-# $use_imap_tls and $use_smtp_tls are switched to integer since 1.5.1
-$use_imap_tls = 0                      if ( $use_imap_tls eq 'false');
-$use_imap_tls = 1                      if ( $use_imap_tls eq 'true');
-$use_smtp_tls = 0                      if ( $use_smtp_tls eq 'false');
-$use_smtp_tls = 1                      if ( $use_smtp_tls eq 'true');
 # sorting options changed names and reversed values in 1.5.1
 $disable_thread_sort = 'false'         if ( !$disable_thread_sort );
 $disable_server_sort = 'false'         if ( !$disable_server_sort );
@@ -5267,9 +5268,9 @@ sub save_data {
         print CF "\$smtp_sitewide_pass    = '". quote_single($smtp_sitewide_pass) ."';\n";
         # string
         print CF "\$imap_auth_mech        = '$imap_auth_mech';\n";
-        # boolean
+        # integer
         print CF "\$use_imap_tls          = $use_imap_tls;\n";
-        # boolean
+        # integer
         print CF "\$use_smtp_tls          = $use_smtp_tls;\n";
         # boolean
         print CF "\$display_imap_login_error = $display_imap_login_error;\n";
@@ -5515,13 +5516,13 @@ sub set_defaults {
             $domain                         = "gmail.com";
             $imapServerAddress              = "imap.gmail.com";
             $imapPort                       = 993;
-            $use_imap_tls                   = true;
+            $use_imap_tls                   = 1;
             $imap_auth_mech                 = "login";
             $smtpServerAddress              = "smtp.gmail.com";
             $smtpPort                       = 465;
             $pop_before_smtp                = false;
             $useSendmail                    = false;
-            $use_smtp_tls                   = true;
+            $use_smtp_tls                   = 1;
             $smtp_auth_mech                 = "login";
             $continue = 1;