X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=config%2Fconf.pl;h=fb53a0e2b836b75083248794512b16775f6da9a6;hb=432db2fc4af6edc726e9a52f023cd3bd1d664667;hp=acba9314ece754ff2cf906a97772130b3be4741b;hpb=6e00b12723cb5a90cdc074860d61b56b0b01884a;p=squirrelmail.git

diff --git a/config/conf.pl b/config/conf.pl
index acba9314..fb53a0e2 100755
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -1,13 +1,13 @@
 #!/usr/bin/env perl
 # conf.pl
 #
-# Copyright (c) 1999-2003 The SquirrelMail Project Team 
+# Copyright (c) 1999-2005 The SquirrelMail Project Team
 # Licensed under the GNU GPL. For full terms see COPYING.
 #
 # A simple configure script to configure SquirrelMail
 #
 # $Id$
-############################################################              
+############################################################
 $conf_pl_version = "1.4.0";
 
 ############################################################
@@ -22,9 +22,9 @@ if ( eval q{require "File/Basename.pm"} ) {
     chdir($dir);
 }
 
-############################################################              
+############################################################
 # Some people try to run this as a CGI. That's wrong!
-############################################################              
+############################################################
 if ( defined( $ENV{'PATH_INFO'} )
     || defined( $ENV{'QUERY_STRING'} )
     || defined( $ENV{'REQUEST_METHOD'} ) ) {
@@ -36,15 +36,15 @@ if ( defined( $ENV{'PATH_INFO'} )
 ############################################################
 # If we got here, use Cwd to get the full directory path
 # (the Basename stuff above will sometimes return '.' as
-# the base directory, which is not helpful here). 
+# the base directory, which is not helpful here).
 ############################################################
 use Cwd;
 $dir = cwd();
-  
 
-############################################################              
+
+############################################################
 # First, lets read in the data already in there...
-############################################################              
+############################################################
 if ( -e "config.php" ) {
     open( FILE, "config.php" );
     while ( $line = <FILE> ) {
@@ -160,7 +160,7 @@ if ( -e "config.php" ) {
 # Read and parse the current configuration file
 # (either config.php or config_default.php).
 while ( $line = <FILE> ) {
-    $line =~ s/^\s+//; 
+    $line =~ s/^\s+//;
     $line =~ s/^\$//;
     $var = $line;
 
@@ -188,11 +188,15 @@ while ( $line = <FILE> ) {
             $sub =~ s/\]\[['"]NAME['"]\]//;
             $sub =~ s/.*\[//;
             $theme_name[$sub] = $options[1];
-        } elsif ( $options[0] =~ /^plugins\[[0-9]+\]/ ) {
+        } elsif ( $options[0] =~ /^plugins\[[0-9]*\]/ ) {
             $sub = $options[0];
             $sub =~ s/\]//;
             $sub =~ s/^plugins\[//;
-            $plugins[$sub] = $options[1];
+            if ($sub eq '') {
+               push @plugins, $options[1];
+            } else {
+               $plugins[$sub] = $options[1];
+            }
         } elsif ( $options[0] =~ /^ldap_server\[[0-9]+\]/ ) {
             $sub = $options[0];
             $sub =~ s/\]//;
@@ -228,6 +232,11 @@ while ( $line = <FILE> ) {
                     $tmp =~ s/[\'\"]?,?\s*$//;
                     $tmp =~ s/[\'\"]?\);\s*$//;
                     $maxrows = $tmp;
+                } elsif ( $tmp =~ /^\s*[\'\"]filter[\'\"]/i ) {
+                    $tmp =~ s/^\s*[\'\"]filter[\'\"]\s*=>\s*[\'\"]?//i;
+                    $tmp =~ s/[\'\"]?,?\s*$//;
+                    $tmp =~ s/[\'\"]?\);\s*$//;
+                    $filter = $tmp;
                 } elsif ( $tmp =~ /^\s*[\'\"]name[\'\"]/i ) {
                     $tmp =~ s/^\s*[\'\"]name[\'\"]\s*=>\s*[\'\"]//i;
                     $tmp =~ s/[\'\"],?\s*$//;
@@ -248,6 +257,11 @@ while ( $line = <FILE> ) {
                     $tmp =~ s/[\'\"]?,?\s*$//;
                     $tmp =~ s/[\'\"]?\);\s*$//;
                     $protocol = $tmp;
+                } elsif ( $tmp =~ /^\s*[\'\"]limit_scope[\'\"]/i ) {
+                    $tmp =~ s/^\s*[\'\"]limit_scope[\'\"]\s*=>\s*[\'\"]?//i;
+                    $tmp =~ s/[\'\"]?,?\s*$//;
+                    $tmp =~ s/[\'\"]?\);\s*$//;
+                    $limit_scope = $tmp;
                 }
             }
             $ldap_host[$sub]    = $host;
@@ -255,10 +269,12 @@ while ( $line = <FILE> ) {
             $ldap_name[$sub]    = $name;
             $ldap_port[$sub]    = $port;
             $ldap_maxrows[$sub] = $maxrows;
+            $ldap_filter[$sub]  = $filter;
             $ldap_charset[$sub] = $charset;
             $ldap_binddn[$sub]  = $binddn;
             $ldap_bindpw[$sub]  = $bindpw;
             $ldap_protocol[$sub] = $protocol;
+            $ldap_limit_scope[$sub] = $limit_scope;
         } elsif ( $options[0] =~ /^(data_dir|attachment_dir|theme_css|org_logo|signout_page)$/ ) {
             ${ $options[0] } = &change_to_rel_path($options[1]);
         } else {
@@ -296,27 +312,33 @@ $allow_advanced_search = 0              if ( !$allow_advanced_search) ;
 $prefs_user_field = 'user'              if ( !$prefs_user_field );
 $prefs_key_field = 'prefkey'            if ( !$prefs_key_field );
 $prefs_val_field = 'prefval'            if ( !$prefs_val_field );
-$addrbook_global_table = 'global_abook' if ( !$addrbook_global_table );
-$addrbook_global_writeable = 'false'    if ( !$addrbook_global_writeable );
-$addrbook_global_listing = 'false'      if ( !$addrbook_global_listing );
-$abook_global_file = ''                 if ( !$abook_global_file);
-$abook_global_file_writeable = 'false'  if ( !$abook_global_file_writeable);
 $use_smtp_tls= 'false'                  if ( !$use_smtp_tls);
 $smtp_auth_mech = 'none'                if ( !$smtp_auth_mech );
 $use_imap_tls = 'false'                 if ( !$use_imap_tls );
 $imap_auth_mech = 'login'               if ( !$imap_auth_mech );
 $session_name = 'SQMSESSID'             if ( !$session_name );
+$skip_SM_header = 'false'               if ( !$skip_SM_header );
+$default_use_javascript_addr_book = 'false' if (! $default_use_javascript_addr_book);
+# since 1.5.0
 $show_alternative_names = 'false'       if ( !$show_alternative_names );
 $available_languages = 'all'            if ( !$available_languages );
 $aggressive_decoding = 'false'          if ( !$aggressive_decoding );
-$lossy_encoding = 'false'               if ( !$lossy_encoding );
 $advanced_tree = 'false'                if ( !$advanced_tree );
-$oldway = 'false'                       if ( !$oldway );
-$use_icons = 'false'                    if ( !$use_icons );
 $use_php_recode = 'false'               if ( !$use_php_recode );
 $use_php_iconv = 'false'                if ( !$use_php_iconv );
-$skip_SM_header = 'false'               if ( !$skip_SM_header ); 
-$default_use_javascript_addr_book = 'false' if (! $default_use_javascript_addr_book);
+# since 1.5.1
+$use_icons = 'false'                    if ( !$use_icons );
+$use_iframe = 'false'                   if ( !$use_iframe );
+$lossy_encoding = 'false'               if ( !$lossy_encoding );
+$allow_remote_configtest = 'false'      if ( !$allow_remote_configtest );
+$addrbook_global_table = 'global_abook' if ( !$addrbook_global_table );
+$addrbook_global_writeable = 'false'    if ( !$addrbook_global_writeable );
+$addrbook_global_listing = 'false'      if ( !$addrbook_global_listing );
+$abook_global_file = ''                 if ( !$abook_global_file);
+$abook_global_file_writeable = 'false'  if ( !$abook_global_file_writeable);
+$abook_global_file_listing = 'true'     if ( !$abook_global_file_listing );
+$encode_header_key = ''                 if ( !$encode_header_key );
+$hide_auth_header = 'false'             if ( !$hide_auth_header );
 
 if ( $ARGV[0] eq '--install-plugin' ) {
     print "Activating plugin " . $ARGV[1] . "\n";
@@ -345,7 +367,7 @@ if ( $config_use_color == 1 ) {
     $config_use_color = 2;
 }
 
-while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
+while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) {
     clear_screen();
     print $WHT. "SquirrelMail Configuration : " . $NRM;
     if    ( $config == 1 ) { print "Read: config.php"; }
@@ -364,8 +386,8 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
         print "7.  Message of the Day (MOTD)\n";
         print "8.  Plugins\n";
         print "9.  Database\n";
-        print "10. Language settings\n"; 
-        print "11. Tweaks\n"; 
+        print "10. Language settings\n";
+        print "11. Tweaks\n";
         print "\n";
         print "D.  Set pre-defined settings for specific IMAP servers\n";
         print "\n";
@@ -396,7 +418,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
         }
         print "$NRM\n";
         print "\n";
-        
+
         if ( $show_imap_settings ) {
           print $WHT . "IMAP Settings". $NRM . "\n--------------\n";
           print "4.  IMAP Server            : $WHT$imapServerAddress$NRM\n";
@@ -410,7 +432,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
           if ( lc($useSendmail) eq 'true' ) {
             print $WHT . "Sendmail" . $NRM . "\n--------\n";
             print "4.   Sendmail Path         : $WHT$sendmail_path$NRM\n";
-            print "5.   Suppress SM header    : $WHT$skip_SM_header$NRM\n";
+            print "5.   Header encryption key : $WHT$encode_header_key$NRM\n";
             print "\n";
           } else {
             print $WHT . "SMTP Settings" . $NRM . "\n-------------\n";
@@ -419,7 +441,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
             print "6.   POP before SMTP       : $WHT$pop_before_smtp$NRM\n";
             print "7.   SMTP Authentication   : $WHT$smtp_auth_mech$NRM\n";
             print "8.   Secure SMTP (TLS)     : $WHT$use_smtp_tls$NRM\n";
-            print "9.   Suppress SM header    : $WHT$skip_SM_header$NRM\n";
+            print "9.   Header encryption key : $WHT$encode_header_key$NRM\n";
             print "\n";
           }
         }
@@ -429,7 +451,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
           print "$WHT$imapServerAddress$NRM:";
           print "$WHT$imapPort$NRM ";
           print "($WHT$imap_server_type$NRM)\n";
-        } 
+        }
         if ($show_smtp_settings == 0) {
           if ( lc($useSendmail) eq 'true' ) {
             print "B.  Change Sendmail Config : $WHT$sendmail_path$NRM\n";
@@ -441,11 +463,11 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
         }
         if ( $show_smtp_settings || $show_imap_settings )
         {
-          print "H.  Hide " . 
-                ($show_imap_settings ? "IMAP Server" : 
+          print "H.  Hide " .
+                ($show_imap_settings ? "IMAP Server" :
                   (lc($useSendmail) eq 'true') ? "Sendmail" : "SMTP") . " Settings\n";
         }
-        
+
         print "\n";
         print "R   Return to Main Menu\n";
     } elsif ( $menu == 3 ) {
@@ -480,7 +502,9 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
         print "6.  Allow use of priority       : $WHT$default_use_priority$NRM\n";
         print "7.  Hide SM attributions        : $WHT$hide_sm_attributions$NRM\n";
         print "8.  Allow use of receipts       : $WHT$default_use_mdn$NRM\n";
-        print "9.  Allow editing of identity   : $WHT$edit_identity$NRM/$WHT$edit_name$NRM\n";
+        print "9.  Allow editing of identity   : $WHT$edit_identity$NRM\n";
+        print "    Allow editing of name       : $WHT$edit_name$NRM\n";
+        print "    Remove username from header : $WHT$hide_auth_header$NRM\n";
         print "10. Allow server thread sort    : $WHT$allow_thread_sort$NRM\n";
         print "11. Allow server-side sorting   : $WHT$allow_server_sort$NRM\n";
         print "12. Allow server charset search : $WHT$allow_charset_search$NRM\n";
@@ -493,7 +517,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
         print "1.  Change Themes\n";
         for ( $count = 0 ; $count <= $#theme_name/2 ; $count++ ) {
             $temp_name = $theme_name[$count*2];
-            printf "     %s%*s    %s\n", $temp_name, 
+            printf "     %s%*s    %s\n", $temp_name,
                    40 - length($temp_name), " ",
                    $theme_name[($count*2)+1];
         }
@@ -506,9 +530,10 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
         for ( $count = 0 ; $count <= $#ldap_host ; $count++ ) {
             print "    >  $ldap_host[$count]\n";
         }
-        print "2.  Use Javascript address book search  : $WHT$default_use_javascript_addr_book$NRM\n";
-        print "3.  Use global file address book        : $WHT$abook_global_file$NRM\n";
+        print "2.  Use Javascript address book search          : $WHT$default_use_javascript_addr_book$NRM\n";
+        print "3.  Use global file address book                : $WHT$abook_global_file$NRM\n";
         print "4.  Allow writing into global file address book : $WHT$abook_global_file_writeable$NRM\n";
+        print "5.  Allow listing of global file address book   : $WHT$abook_global_file_listing$NRM\n";
         print "\n";
         print "R   Return to Main Menu\n";
     } elsif ( $menu == 7 ) {
@@ -583,13 +608,16 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
         print "R   Return to Main Menu\n";
     } elsif ( $menu == 11 ) {
     print $WHT. "Interface tweaks\n" . $NRM;
-    print "1.  Advanced tree            : $WHT$advanced_tree$NRM\n";
-    print "2.  Oldway                   : $WHT$oldway$NRM\n";
-    print "3.  Use Icons                : $WHT$use_icons$NRM\n";
+    print "1.  Advanced tree                : $WHT$advanced_tree$NRM\n";
+    print "2.  Display html mails in iframe : $WHT$use_iframe$NRM\n";
+    print "3.  Use Icons                    : $WHT$use_icons$NRM\n";
     print "\n";
     print $WHT. "PHP tweaks\n" . $NRM;
-    print "4.  Use php recode functions : $WHT$use_php_recode$NRM\n";
-    print "5.  Use php iconv functions  : $WHT$use_php_iconv$NRM\n";
+    print "4.  Use php recode functions     : $WHT$use_php_recode$NRM\n";
+    print "5.  Use php iconv functions      : $WHT$use_php_iconv$NRM\n";
+    print "\n";
+    print $WHT. "Configuration tweaks\n" . $NRM;
+    print "6.  Allow remote configtest     : $WHT$allow_remote_configtest$NRM\n";
     print "\n";
         print "R   Return to Main Menu\n";
     }
@@ -668,14 +696,15 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
               elsif ( $command == 8 )  { $imap_server_type       = command19(); }
               elsif ( $command == 9 )  { $optional_delimiter     = command111(); }
             } elsif ( $show_smtp_settings && lc($useSendmail) eq 'true' ) {
-              if ( $command == 4 )  { $sendmail_path          = command15(); }
+              if    ( $command == 4 )  { $sendmail_path          = command15(); }
+              elsif ( $command == 5 )  { $encode_header_key      = command114(); }
             } elsif ( $show_smtp_settings ) {
               if    ( $command == 4 )  { $smtpServerAddress      = command16(); }
               elsif ( $command == 5 )  { $smtpPort               = command17(); }
               elsif ( $command == 6 )  { $pop_before_smtp        = command18a(); }
               elsif ( $command == 7 )  { $smtp_auth_mech    = command112b(); }
               elsif ( $command == 8 )  { $use_smtp_tls      = command113("SMTP",$use_smtp_tls); }
-              elsif ( $command == 9 )  { $skip_SM_header    = command114(); }
+              elsif ( $command == 9 )  { $encode_header_key      = command114(); }
             }
         } elsif ( $menu == 3 ) {
             if    ( $command == 1 )  { $default_folder_prefix          = command21(); }
@@ -719,6 +748,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
             elsif ( $command == 2 ) { command62(); }
             elsif ( $command == 3 ) { $abook_global_file=command63(); }
             elsif ( $command == 4 ) { command64(); }
+            elsif ( $command == 5 ) { command65(); }
         } elsif ( $menu == 7 ) {
             if ( $command == 1 ) { $motd = command71(); }
         } elsif ( $menu == 8 ) {
@@ -744,10 +774,11 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
             elsif ( $command == 6 ) { $lossy_encoding         = commandA6(); }
         } elsif ( $menu == 11 ) {
             if    ( $command == 1 ) { $advanced_tree  = commandB1(); }
-            elsif ( $command == 2 ) { $oldway            = commandB2(); }
+            if    ( $command == 2 ) { $use_iframe     = commandB2(); }
             elsif ( $command == 3 ) { $use_icons      = commandB3(); }
             elsif ( $command == 4 ) { $use_php_recode = commandB4(); }
             elsif ( $command == 5 ) { $use_php_iconv  = commandB5(); }
+            elsif ( $command == 6 ) { $allow_remote_configtest = commandB6(); }
         }
     }
 }
@@ -770,8 +801,6 @@ sub command1 {
     print "If your Organization Name includes a '\$', please precede it with a \\. \n";
     print "Other '\$' will be considered the beginning of a variable that\n";
     print "must be defined before the \$org_name is printed.\n";
-    print "\$version, for example, is included by default, and will print the\n";
-    print "string representing the current SquirrelMail version.\n";
     print "\n";
     print "[$WHT$org_name$NRM]: $WHT";
     $new_org_name = <STDIN>;
@@ -840,7 +869,7 @@ sub command3 {
     print "If your Organization Title includes a '\$', please precede it with a \\. \n";
     print "Other '\$' will be considered the beginning of a variable that\n";
     print "must be defined before the \$org_title is printed.\n";
-    print "\$version, for example, is included by default, and will print the\n";
+    print "\$version, for example can be used, and will print the\n";
     print "string representing the current SquirrelMail version.\n";
     print "\n";
     print "[$WHT$org_title$NRM]: $WHT";
@@ -892,12 +921,12 @@ sub command6 {
 # Default link to provider
 sub command7 {
     print "Here you can set the link on the right of the page.\n";
-    print "The default is 'http://www.squirrelmail.org/'\n";
+    print "If empty, it will link to the SquirrelMail About page.\n";
     print "\n";
     print "[$WHT$provider_uri$NRM]: $WHT";
     $new_provider_uri = <STDIN>;
     if ( $new_provider_uri eq "\n" ) {
-        $new_provider_uri = 'http://www.squirrelmail.org/';
+        $new_provider_uri = '';
     } else {
         $new_provider_uri =~ s/[\r\n]//g;
         $new_provider_uri =~ s/^\s+$//g;
@@ -1030,7 +1059,7 @@ sub command17 {
     return $new_smtpPort;
 }
 
-# authenticated server 
+# authenticated server
 sub command18 {
     return;
     # This sub disabled by tassium - it has been replaced with smtp_auth_mech
@@ -1067,7 +1096,7 @@ sub command18a {
     return $pop_before_smtp;
 }
 
-# imap_server_type 
+# imap_server_type
 sub command19 {
     print "Each IMAP server has its own quirks.  As much as we tried to stick\n";
     print "to standards, it doesn't help much if the IMAP server doesn't follow\n";
@@ -1075,12 +1104,16 @@ sub command19 {
     print "these servers.  If you would like to use them, please select your\n";
     print "IMAP server.  If you do not wish to use these work-arounds, you can\n";
     print "set this to \"other\", and none will be used.\n";
-    print "    cyrus      = Cyrus IMAP server\n";
-    print "    uw         = University of Washington's IMAP server\n";
-    print "    exchange   = Microsoft Exchange IMAP server\n";
-    print "    courier    = Courier IMAP server\n";
-    print "    macosx     = Mac OS X Mailserver\n";
-    print "    other      = Not one of the above servers\n";
+    print "    courier     = Courier IMAP server\n";
+    print "    cyrus       = Cyrus IMAP server\n";
+    print "    dovecot     = Dovecot Secure IMAP server\n";
+    print "    exchange    = Microsoft Exchange IMAP server\n";
+    print "    hmailserver = hMailServer\n";
+    print "    macosx      = Mac OS X Mailserver\n";
+    print "    uw          = University of Washington's IMAP server\n";
+    print "\n";
+    print "    other       = Not one of the above servers\n";
+    print "\n";
     print "[$WHT$imap_server_type$NRM]: $WHT";
     $new_imap_server_type = <STDIN>;
 
@@ -1176,9 +1209,9 @@ sub command112a {
           } else {
             print $WHT . " ERROR DETECTING$NRM\n";
           }
-          
+
         }
-    } 
+    }
       print "\nWhat authentication mechanism do you want to use for IMAP connections?\n\n";
       print $WHT . "login" . $NRM . " - Plaintext. If you can do better, you probably should.\n";
       print $WHT . "plain" . $NRM . " - SASL PLAIN. If you need this, you already know it.\n";
@@ -1197,7 +1230,7 @@ sub command112a {
       }
 }
 
-    
+
 # SMTP authentication type
 # Possible choices: none, plain, cram-md5, digest-md5
 sub command112b {
@@ -1213,7 +1246,7 @@ sub command112b {
         if ($inval =~ /^y\b/i) {
             # Yes, let's try to detect.
             print "Trying to detect supported methods (SMTP)...\n";
-        
+
             # Special case!
             # Check none by trying to relay to junk@microsoft.com
             $host = $smtpServerAddress . ':' . $smtpPort;
@@ -1251,7 +1284,7 @@ sub command112b {
               } else {
                   print $WHT . "ERROR DETECTING$NRM\n";
               }
-    
+
             # Try CRAM-MD5
             print "Testing CRAM-MD5:\t";
             $tmp=detect_auth_support('SMTP',$host,'CRAM-MD5');
@@ -1264,7 +1297,7 @@ sub command112b {
               } else {
                   print $WHT . "ERROR DETECTING$NRM\n";
             }
-    
+
 
             print "Testing DIGEST-MD5:\t";
             $tmp=detect_auth_support('SMTP',$host,'DIGEST-MD5');
@@ -1277,7 +1310,7 @@ sub command112b {
               } else {
                   print $WHT . "ERROR DETECTING$NRM\n";
             }
-        } 
+        }
     }
     print "\nWhat authentication mechanism do you want to use for SMTP connections?\n";
     print $WHT . "none" . $NRM . " - Your SMTP server does not require authorization.\n";
@@ -1294,7 +1327,7 @@ sub command112b {
       # SMTP doesn't necessarily require logins
       return "none";
     }
-    if ( ($inval =~ /^cram-md5\b/i) || ($inval =~ /^digest-md5\b/i) || 
+    if ( ($inval =~ /^cram-md5\b/i) || ($inval =~ /^digest-md5\b/i) ||
     ($inval =~ /^login\b/i) || ($inval =~/^plain\b/i)) {
       return lc($inval);
     } else {
@@ -1322,7 +1355,7 @@ sub command113 {
     } else {
       print "n";
     }
-    print "$NRM]: $WHT"; 
+    print "$NRM]: $WHT";
     $inval=<STDIN>;
     $inval =~ tr/yn//cd;
     return 'true'  if ( $inval eq "y" );
@@ -1330,20 +1363,28 @@ sub command113 {
     return $default_val;
 }
 
+# $encode_header_key
 sub command114{
-    print "\nUse this to suppress insertion of SquirrelMail Received: headers\n";
-    print "in outbound messages.\n\n";
-
-    $YesNo = 'n';
-    $YesNo = 'y' if ( lc($skip_SM_header) eq 'true' );
-
-    print "Suppress SM header (y/n) [$WHT$YesNo$NRM]: $WHT";
-    $new_skip_SM_header = <STDIN>;
-    chomp($new_skip_SM_header);
-
-    return 'true'  if ( lc($new_skip_SM_header) eq 'y' );
-    return 'false'  if ( lc($new_skip_SM_header) eq 'n' );
-    return $skip_SM_header;    
+    print "Encryption key allows to hide SquirrelMail Received: headers\n";
+    print "in outbound messages. Interface uses encryption key to encode\n";
+    print "username, remote address and proxied address, then stores encoded\n";
+    print "information in X-Squirrel-* headers.\n";
+    print "\n";
+    print "Warning: used encryption function is not bulletproof. When used\n";
+    print "with static encryption keys, it provides only minimal security\n";
+    print "measures and information can be decoded quickly.\n";
+    print "\n";
+    print "Encoded information can be decoded with decrypt_headers.php script\n";
+    print "from SquirrelMail contrib/ directory.\n";
+    print "\n";
+    print "Enter encryption key: ";
+    $new_encode_header_key = <STDIN>;
+    if ( $new_encode_header_key eq "\n" ) {
+        $new_encode_header_key = $encode_header_key;
+    } else {
+        $new_encode_header_key =~ s/[\r\n]//g;
+    }
+    return $new_encode_header_key;
 }
 
 # MOTD
@@ -1469,7 +1510,7 @@ sub command22 {
     return $show_prefix_option;
 }
 
-# Trash Folder 
+# Trash Folder
 sub command23a {
     print "You can now specify where the default trash folder is located.\n";
     print "On servers where you do not want this, you can set it to anything\n";
@@ -1491,7 +1532,7 @@ sub command23a {
     return $new_trash_folder;
 }
 
-# Sent Folder 
+# Sent Folder
 sub command23b {
     print "This is where messages that are sent will be stored.  SquirrelMail\n";
     print "by default puts a copy of all outgoing messages in this folder.\n";
@@ -1512,7 +1553,7 @@ sub command23b {
     return $new_sent_folder;
 }
 
-# Draft Folder 
+# Draft Folder
 sub command23c {
     print "You can now specify where the default draft folder is located.\n";
     print "On servers where you do not want this, you can set it to anything\n";
@@ -1534,7 +1575,7 @@ sub command23c {
     return $new_draft_folder;
 }
 
-# default move to trash 
+# default move to trash
 sub command24a {
     print "By default, should messages get moved to the trash folder?  You\n";
     print "can specify the default trash folder in option 3.  If this is set\n";
@@ -1559,7 +1600,7 @@ sub command24a {
     return $default_move_to_trash;
 }
 
-# default move to sent 
+# default move to sent
 sub command24b {
     print "By default, should messages get moved to the sent folder?  You\n";
     print "can specify the default sent folder in option 4.  If this is set\n";
@@ -1607,7 +1648,7 @@ sub command24c {
     return $default_save_as_draft;
 }
 
-# List special folders first 
+# List special folders first
 sub command27 {
     print "SquirrelMail has what we call 'special folders' that are not\n";
     print "manipulated and viewed like normal folders.  Some examples of\n";
@@ -1632,7 +1673,7 @@ sub command27 {
     return $list_special_folders_first;
 }
 
-# Show special folders color 
+# Show special folders color
 sub command28 {
     print "SquirrelMail has what we call 'special folders' that are not\n";
     print "manipulated and viewed like normal folders.  Some examples of\n";
@@ -1657,7 +1698,7 @@ sub command28 {
     return $use_special_folder_color;
 }
 
-# Auto expunge 
+# Auto expunge
 sub command29 {
     print "The way that IMAP handles deleting messages is as follows.  You\n";
     print "mark the message as deleted, and then to 'really' delete it, you\n";
@@ -1681,7 +1722,7 @@ sub command29 {
     return $auto_expunge;
 }
 
-# Default sub of inbox 
+# Default sub of inbox
 sub command210 {
     print "Some IMAP servers (Cyrus) have all folders as subfolders of INBOX.\n";
     print "This can cause some confusion in folder creation for users when\n";
@@ -1705,7 +1746,7 @@ sub command210 {
     return $default_sub_of_inbox;
 }
 
-# Show contain subfolder option 
+# Show contain subfolder option
 sub command211 {
     print "Some IMAP servers (UW) make it so that there are two types of\n";
     print "folders.  Those that contain messages, and those that contain\n";
@@ -1729,7 +1770,7 @@ sub command211 {
     return $show_contain_subfolders_option;
 }
 
-# Default Unseen Notify 
+# Default Unseen Notify
 sub command212 {
     print "This option specifies where the users will receive notification\n";
     print "about unseen messages by default.  This is of course an option that\n";
@@ -1748,7 +1789,7 @@ sub command212 {
     return $default_unseen_notify;
 }
 
-# Default Unseen Type 
+# Default Unseen Type
 sub command213 {
     print "Here you can define the default way that unseen messages will be displayed\n";
     print "to the user in the folder listing on the left side.\n";
@@ -1788,7 +1829,7 @@ sub command214 {
     return $auto_create_special;
 }
 
-# Automatically delete folders 
+# Automatically delete folders
 sub command215 {
     if ( $imap_server_type eq "uw" ) {
         print "UW IMAP servers will not allow folders containing mail to also contain folders.\n";
@@ -1798,7 +1839,7 @@ sub command215 {
         print "Press any key to continue...\n";
         $new_delete = <STDIN>;
         $delete_folder = 'true';
-    } else { 
+    } else {
         if ( $imap_server_type eq "courier" ) {
             print "Courier (or Courier-IMAP) IMAP servers may not support ";
             print "subfolders of Trash. \n";
@@ -1806,7 +1847,7 @@ sub command215 {
             print "Trash will be treated by Courier as a special folder that does not \n";
             print "allow subfolders. \n\n";
             print "Please verify your Courier configuration, and test folder deletion \n";
-            print "when changing this setting.\n\n";                                                             
+            print "when changing this setting.\n\n";
         }
 
         print "Are subfolders of the Trash supported by your IMAP server?\n";
@@ -1814,8 +1855,8 @@ sub command215 {
         print "If not, say no (deleted folders should not be sent to Trash)\n\n";
         # reversal of logic.
         # question was: Should folders be automatically deleted instead of sent to trash..
-        # we've changed the question to make it more clear, 
-        # and are here handling that to avoid changing the answers.. 
+        # we've changed the question to make it more clear,
+        # and are here handling that to avoid changing the answers..
         if ( lc($delete_folder) eq 'true' ) {
             $default_value = "n";
         } else {
@@ -1861,7 +1902,7 @@ sub command33a {
     print "The path name can be absolute or relative (to the config directory).\n";
     print "It doesn't matter.  Here are two examples:\n";
     print "  Absolute:    /var/spool/data/\n";
-    print "  Relative:    ../data/\n";     
+    print "  Relative:    ../data/\n";
     print "Relative paths to directories outside of the SquirrelMail distribution\n";
     print "will be converted to their absolute path equivalents in config.php.\n\n";
     print "Note: There are potential security risks with having a writeable directory\n";
@@ -1928,9 +1969,9 @@ sub command33b {
 
 sub command33c {
     print "The directory hash level setting allows you to configure the level\n";
-    print "of hashing that Squirremail employs in your data and attachment\n";
+    print "of hashing that SquirrelMail employs in your data and attachment\n";
     print "directories. This value must be an integer ranging from 0 to 4.\n";
-    print "When this value is set to 0, Squirrelmail will simply store all\n";
+    print "When this value is set to 0, SquirrelMail will simply store all\n";
     print "files as normal in the data and attachment directories. However,\n";
     print "when set to a value from 1 to 4, a simple hashing scheme will be\n";
     print "used to organize the files in this directory. In short, the crc32\n";
@@ -2051,6 +2092,7 @@ sub command39 {
     return 'false';
 }
 
+
 sub command310 {
     print "This allows you to prevent the editing of the user's name and ";
     print "email address. This is mainly useful when used with the ";
@@ -2067,9 +2109,11 @@ sub command310 {
     if ( ( $new_edit =~ /^y\n/i ) || ( ( $new_edit =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
         $edit_identity = 'true';
         $edit_name = 'true';
+        $hide_auth_header = 'false';
     } else {
         $edit_identity = 'false';
         $edit_name = command311();
+        $hide_auth_header = command311b();
     }
     return $edit_identity;
 }
@@ -2095,6 +2139,32 @@ sub command311 {
     return $edit_name;
 }
 
+sub command311b {
+    print "SquirrelMail adds username information to every sent email.";
+    print "It is done in order to prevent possible sender forging when ";
+    print "end users are allowed to change their email and name ";
+    print "information.\n";
+    print "\n";
+    print "You can disable this header, if you think that it violates ";
+    print "user's privacy or security. Please note, that setting will ";
+    print "work only when users are not allowed to change their identity.\n";
+    print "\n";
+
+    if ( lc($hide_auth_header) eq "true" ) {
+        $default_value = "y";
+    } else {
+        $default_value = "n";
+    }
+    print "Remove username from email headers? (y/n) [$WHT$default_value$NRM]: $WHT";
+    $new_header = <STDIN>;
+    if ( ( $new_header =~ /^y\n/i ) || ( ( $new_header =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
+        $hide_auth_header = "true";
+    } else {
+        $hide_auth_header = "false";
+    }
+    return $edit_name;
+}
+
 sub command312 {
     print "This option allows you to choose if users can use thread sorting\n";
     print "Your IMAP server must support the THREAD command for this to work\n";
@@ -2386,15 +2456,21 @@ sub command61 {
                 if ( $ldap_maxrows[$count] ) {
                     print "     maxrows: $ldap_maxrows[$count]\n";
                 }
+                if ( $ldap_filter[$count] ) {
+                    print "      filter: $ldap_filter[$count]\n";
+                }
                 if ( $ldap_binddn[$count] ) {
                     print "      binddn: $ldap_binddn[$count]\n";
                     if ( $ldap_bindpw[$count] ) {
                         print "      bindpw: $ldap_bindpw[$count]\n";
                     }
                 }
-        if ( $ldap_protocol[$count] ) {
+                if ( $ldap_protocol[$count] ) {
                     print "    protocol: $ldap_protocol[$count]\n";
                 }
+                if ( $ldap_limit_scope[$count] ) {
+                    print " limit_scope: $ldap_limit_scope[$count]\n";
+                }
 
                 print "\n";
                 $count++;
@@ -2457,6 +2533,16 @@ sub command61 {
 
             print "\n";
 
+            print "You can specify an additional search filter.\n";
+            print "This could be something like \"(objectclass=posixAccount)\".\n";
+            print "Default is no extra filter.  Press ENTER for default.\n";
+            print "filter: ";
+            $name = <STDIN>;
+            $name =~ s/[\r|\n]//g;
+            $ldap_filter[$sub] = $name;
+
+            print "\n";
+
             print "If your LDAP server does not like anonymous logins, you can specify bind DN.\n";
             print "Default is none, anonymous bind.  Press ENTER for default.\n";
             print "binddn: ";
@@ -2477,9 +2563,9 @@ sub command61 {
                 print "\n";
             }
 
-        print "You can specify bind protocol version here.\n";
+            print "You can specify bind protocol version here.\n";
             print "Default protocol version depends on your php ldap settings.\n";
-        print "Press ENTER for default.\n";
+            print "Press ENTER for default.\n";
             print "protocol: ";
             $name = <STDIN>;
             $name =~ s/[\r\n]//g;
@@ -2487,6 +2573,22 @@ sub command61 {
 
             print "\n";
 
+            print "You can control search scope here.\n";
+            print "This option is specific to Microsoft ADS implementation.\n";
+            print "It requires use of v3 or newer LDAP protocol.\n";
+            print "Don't enable it, if you use other LDAP server.\n";
+            print "\n";
+            print "Limit ldap scope? (y/N):";
+            $name = <STDIN>;
+            if ( $name =~ /^y\n/i ) {
+                $name = 'true';
+            } else {
+                $name = 'false';
+            }
+            $ldap_limit_scope[$sub] = $name;
+
+            print "\n";
+
         } elsif ( $input =~ /^\s*-\s*[0-9]?/ ) {
             if ( $input =~ /[0-9]+\s*$/ ) {
                 $rem_num = $input;
@@ -2502,9 +2604,11 @@ sub command61 {
             @new_ldap_name    = ();
             @new_ldap_charset = ();
             @new_ldap_maxrows = ();
+            @new_ldap_filter  = ();
             @new_ldap_bindpw  = ();
             @new_ldap_binddn  = ();
             @new_ldap_protocol = ();
+            @new_ldap_limit_scope = ();
 
             while ( $count <= $#ldap_host ) {
                 if ( $count != $rem_num ) {
@@ -2514,9 +2618,11 @@ sub command61 {
                     @new_ldap_name    = ( @new_ldap_name,    $ldap_name[$count] );
                     @new_ldap_charset = ( @new_ldap_charset, $ldap_charset[$count] );
                     @new_ldap_maxrows = ( @new_ldap_maxrows, $ldap_maxrows[$count] );
+                    @new_ldap_filter  = ( @new_ldap_filter,  $ldap_filter[$count] );
                     @new_ldap_binddn  = ( @new_ldap_binddn,  $ldap_binddn[$count] );
                     @new_ldap_bindpw  = ( @new_ldap_bindpw,  $ldap_bindpw[$count] );
                     @new_ldap_protocol  = ( @new_ldap_protocol,  $ldap_protocol[$count] );
+                    @new_ldap_limit_scope = ( @new_ldap_limit_scope,  $ldap_limit_scope[$count] );
                 }
                 $count++;
             }
@@ -2526,9 +2632,11 @@ sub command61 {
             @ldap_name    = @new_ldap_name;
             @ldap_charset = @new_ldap_charset;
             @ldap_maxrows = @new_ldap_maxrows;
+            @ldap_filter  = @new_ldap_filter;
             @ldap_binddn  = @new_ldap_binddn;
             @ldap_bindpw  = @new_ldap_bindpw;
             @ldap_protocol = @new_ldap_protocol;
+            @ldap_limit_scope = @new_ldap_limit_scope;
 
         } elsif ( $input =~ /^\s*\?\s*/ ) {
             print ".-------------------------.\n";
@@ -2577,7 +2685,7 @@ sub command63 {
     print "must set this option to a valid value. If option does\n";
     print "not have path elements, system assumes that file is\n";
     print "stored in data directory. If relative path is set, it is\n";
-    print "relative to main squirrelmail directory. If value is empty,\n";
+    print "relative to main SquirrelMail directory. If value is empty,\n";
     print "address book is not enabled.\n";
     print "\n";
 
@@ -2614,6 +2722,28 @@ sub command64 {
     return $abook_global_file_writeable;
 }
 
+# listing of global filebased abook control
+sub command65 {
+    print "This setting controls listing of global file address\n";
+    print "book in addresses page.\n";
+    print "\n";
+
+    if ( lc($abook_global_file_listing) eq 'true' ) {
+        $default_value = "y";
+    } else {
+        $abook_global_file_listing = 'false';
+        $default_value               = "n";
+    }
+    print "Allow listing of global file address book (y/n) [$WHT$default_value$NRM]: $WHT";
+    $new_show = <STDIN>;
+    if ( ( $new_show =~ /^y\n/i ) || ( ( $new_show =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
+        $abook_global_file_listing = 'true';
+    } else {
+        $abook_global_file_listing = 'false';
+    }
+    return $abook_global_file_listing;
+}
+
 sub command91 {
     print "If you want to store your users address book details in a database then\n";
     print "you need to set this DSN to a valid value. The format for this is:\n";
@@ -2963,25 +3093,27 @@ sub commandB1 {
     }
     return $advanced_tree;
 }
-# Oldway
+# display html emails in iframe
 sub commandB2 {
-    print "Setting \$oldway to false causes left_main.php to use the new\n";
-    print "experimental way of getting the mailbox-tree.\n";
+    print "This option can enable html email rendering inside iframe.\n";
+    print "Inline frames are used in order to provide sandbox environment";
+    print "for html code included in html formated emails.";
+    print "Option is experimental and might have glitches in some parts of code.";
     print "\n";
 
-    if ( lc($oldway) eq 'true' ) {
+    if ( lc($use_iframe) eq 'true' ) {
         $default_value = "y";
     } else {
         $default_value = "n";
     }
-    print "Use old way of folder list display? (y/n) [$WHT$default_value$NRM]: $WHT";
-    $oldway = <STDIN>;
-    if ( ( $oldway =~ /^y\n/i ) || ( ( $oldway =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
-        $oldway = 'true';
+    print "Display html emails in iframe? (y/n) [$WHT$default_value$NRM]: $WHT";
+    $use_iframe = <STDIN>;
+    if ( ( $use_iframe =~ /^y\n/i ) || ( ( $use_iframe =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
+        $use_iframe = 'true';
     } else {
-        $oldway = 'false';
+        $use_iframe = 'false';
     }
-    return $oldway;
+    return $use_iframe;
 }
 # use icons
 sub commandB3 {
@@ -3056,6 +3188,28 @@ sub commandB5 {
     return $use_php_iconv;
 }
 
+# configtest block
+sub commandB6 {
+    print "Enable this option if you want to check SquirrelMail configuration\n";
+    print "remotely with configtest.php script.\n";
+    print "\n";
+
+    if ( lc($allow_remote_configtest) eq 'true' ) {
+        $default_value = "y";
+    } else {
+        $default_value = "n";
+    }
+    print "Allow remote configuration tests? (y/n) [$WHT$default_value$NRM]: $WHT";
+    $allow_remote_configtest = <STDIN>;
+    if ( ( $allow_remote_configtest =~ /^y\n/i ) || ( ( $allow_remote_configtest =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
+        $allow_remote_configtest = 'true';
+    } else {
+        $allow_remote_configtest = 'false';
+    }
+    return $allow_remote_configtest;
+}
+
+
 
 sub save_data {
     $tab = "    ";
@@ -3069,14 +3223,14 @@ sub save_data {
         print CF " */\n";
         print CF "\n";
         print CF "global \$version;\n";
-    
+
         if ($print_config_version) {
             print CF "\$config_version = '$print_config_version';\n";
         }
         # integer
         print CF "\$config_use_color = $config_use_color;\n";
         print CF "\n";
-    
+
         # string
         print CF "\$org_name      = \"$org_name\";\n";
         # string
@@ -3104,7 +3258,7 @@ sub save_data {
         # string that can contain variables
         print CF "\$motd = \"$motd\";\n";
         print CF "\n";
-    
+
         # string
         print CF "\$squirrelmail_default_language = '$squirrelmail_default_language';\n";
         # string
@@ -3143,8 +3297,8 @@ sub save_data {
         print CF "\$invert_time            = $invert_time;\n";
         # string
         print CF "\$optional_delimiter     = '$optional_delimiter';\n";
-        #boolean
-        print CF "\$skip_SM_header         = $skip_SM_header;\n";
+        # string
+        print CF "\$encode_header_key      = '$encode_header_key';\n";
         print CF "\n";
 
     # string
@@ -3206,6 +3360,8 @@ sub save_data {
         print CF "\$edit_identity            = $edit_identity;\n";
     # boolean
         print CF "\$edit_name                = $edit_name;\n";
+    # boolean
+        print CF "\$hide_auth_header         = $hide_auth_header;\n";
     # boolean
         print CF "\$allow_thread_sort        = $allow_thread_sort;\n";
     # boolean
@@ -3215,10 +3371,10 @@ sub save_data {
     # integer
         print CF "\$allow_advanced_search    = $allow_advanced_search;\n";
         print CF "\n";
-    
+
     # all plugins are strings
         for ( $ct = 0 ; $ct <= $#plugins ; $ct++ ) {
-            print CF "\$plugins[$ct] = '$plugins[$ct]';\n";
+            print CF "\$plugins[] = '$plugins[$ct]';\n";
         }
         print CF "\n";
 
@@ -3266,6 +3422,11 @@ sub save_data {
         # integer
                 print CF "    'maxrows' => $ldap_maxrows[$count]";
             }
+            # string
+            if ( $ldap_filter[$count] ) {
+                print CF ",\n";
+                print CF "    'filter' => '$ldap_filter[$count]'";
+            }
             if ( $ldap_binddn[$count] ) {
                 print CF ",\n";
                 # string
@@ -3281,6 +3442,11 @@ sub save_data {
         # integer
                 print CF "    'protocol' => $ldap_protocol[$count]";
             }
+            if ( $ldap_limit_scope[$count] ) {
+                print CF ",\n";
+                # boolean
+                print CF "    'limit_scope' => $ldap_limit_scope[$count]";
+            }
             print CF "\n";
             print CF ");\n";
             print CF "\n";
@@ -3312,6 +3478,8 @@ sub save_data {
         print CF "\$abook_global_file = '$abook_global_file';\n";
     # boolean
         print CF "\$abook_global_file_writeable = $abook_global_file_writeable;\n\n";
+    # boolean
+        print CF "\$abook_global_file_listing = $abook_global_file_listing;\n\n";
     # boolean
         print CF "\$no_list_for_subscribe = $no_list_for_subscribe;\n";
 
@@ -3332,7 +3500,7 @@ sub save_data {
     print CF "\$advanced_tree = $advanced_tree;\n";
     print CF "\n";
     # boolean
-    print CF "\$oldway = $oldway;\n";
+    print CF "\$use_iframe = $use_iframe;\n";
     print CF "\n";
     # boolean
     print CF "\$use_icons = $use_icons;\n";
@@ -3342,10 +3510,13 @@ sub save_data {
     print CF "\n";
     # boolean
     print CF "\$use_php_iconv = $use_php_iconv;\n";
+    print CF "\n";
+    # boolean
+    print CF "\$allow_remote_configtest = $allow_remote_configtest;\n";
     print CF "\n";
 
         print CF "\@include SM_PATH . 'config/config_local.php';\n";
-    
+
         print CF "\n/**\n";
         print CF " * Make sure there are no characters after the PHP closing\n";
         print CF " * tag below (including newline characters and whitespace).\n";
@@ -3354,7 +3525,7 @@ sub save_data {
         print CF " * things up when we try to send more headers later.\n";
         print CF " */\n";
         print CF "?>";
-        
+
         close CF;
 
         print "Data saved in config.php\n";
@@ -3384,13 +3555,17 @@ sub set_defaults {
     $continue = 0;
     while ( $continue != 1 ) {
         print "Please select your IMAP server:\n";
-        print "    cyrus      = Cyrus IMAP server\n";
-        print "    uw         = University of Washington's IMAP server\n";
-        print "    exchange   = Microsoft Exchange IMAP server\n";
-        print "    courier    = Courier IMAP server\n";
-        print "    macosx     = Mac OS X Mailserver\n";
-        print "    mercury32  = Mercury/32\n";
-        print "    quit       = Do not change anything\n";
+        print "    courier     = Courier IMAP server\n";
+        print "    cyrus       = Cyrus IMAP server\n";
+        print "    dovecot     = Dovecot Secure IMAP server\n";
+        print "    exchange    = Microsoft Exchange IMAP server\n";
+        print "    hmailserver = hMailServer\n";
+        print "    macosx      = Mac OS X Mailserver\n";
+        print "    mercury32   = Mercury/32\n";
+        print "    uw          = University of Washington's IMAP server\n";
+        print "\n";
+        print "    quit        = Do not change anything\n";
+        print "\n";
         print "Command >> ";
         $server = <STDIN>;
         $server =~ s/[\r\n]//g;
@@ -3423,7 +3598,7 @@ sub set_defaults {
             $disp_default_folder_prefix     = $default_folder_prefix;
             $delete_folder                  = true;
             $force_username_lowercase       = true;
-            
+
             $continue = 1;
         } elsif ( $server eq "exchange" ) {
             $imap_server_type               = "exchange";
@@ -3452,7 +3627,7 @@ sub set_defaults {
             $disp_default_folder_prefix     = $default_folder_prefix;
             $delete_folder                  = true;
             $force_username_lowercase       = false;
-            
+
             $continue = 1;
         } elsif ( $server eq "macosx" ) {
             $imap_server_type               = "macosx";
@@ -3467,6 +3642,22 @@ sub set_defaults {
             $allow_charset_search           = false;
             $disp_default_folder_prefix     = $default_folder_prefix;
 
+            $continue = 1;
+        } elsif ( $server eq "hmailserver" ) {
+            $imap_server_type               = "hmailserver";
+            $default_folder_prefix          = "";
+            $trash_folder                   = "INBOX.Trash";
+            $sent_folder                    = "INBOX.Sent";
+            $draft_folder                   = "INBOX.Drafts";
+            $show_prefix_option             = false;
+            $default_sub_of_inbox           = true;
+            $show_contain_subfolders_option = false;
+            $optional_delimiter             = "detect";
+            $allow_charset_search           = false;
+            $disp_default_folder_prefix     = $default_folder_prefix;
+            $delete_folder                  = false;
+            $force_username_lowercase       = false;
+
             $continue = 1;
         } elsif ( $server eq "mercury32" ) {
             $imap_server_type               = "mercury32";
@@ -3481,6 +3672,21 @@ sub set_defaults {
             $delete_folder                  = true;
             $force_username_lowercase       = true;
 
+            $continue = 1;
+        } elsif ( $server eq "dovecot" ) {
+            $imap_server_type               = "dovecot";
+            $default_folder_prefix          = "";
+            $trash_folder                   = "Trash";
+            $sent_folder                    = "Sent";
+            $draft_folder                   = "Drafts";
+            $show_prefix_option             = false;
+            $default_sub_of_inbox           = false;
+            $show_contain_subfolders_option = false;
+            $delete_folder                  = false;
+            $force_username_lowercase       = true;
+            $optional_delimiter             = "detect";
+            $disp_default_folder_prefix     = "<none>";
+
             $continue = 1;
         } elsif ( $server eq "quit" ) {
             $continue = 1;
@@ -3508,7 +3714,7 @@ sub set_defaults {
 
 # This subroutine corrects relative paths to ensure they
 # will work within the SM space. If the path falls within
-# the SM directory tree, the SM_PATH variable will be 
+# the SM directory tree, the SM_PATH variable will be
 # prepended to the path, if not, then the path will be
 # converted to an absolute path, e.g.
 #   '../images/logo.gif'      --> SM_PATH . 'images/logo.gif'
@@ -3531,7 +3737,7 @@ sub change_to_SM_path() {
     return $old_path                if ( $old_path =~ /^\'(\/|http)/ );
     return $old_path                if ( $old_path =~ /^\'\w:\// );
     return $old_path                if ( $old_path =~ /^SM_PATH/);
-   
+
     if ( $old_path =~ /^\$/ ) {
         # check if it's a single var, or a $var/path combination
         # if it's $var/path, enclose in ""
@@ -3540,17 +3746,17 @@ sub change_to_SM_path() {
         }
         return $old_path;
     }
-    
+
     # Remove remaining '
     $old_path =~ s/\'//g;
-    
+
     # For relative paths, split on '../'
     @rel_path = split(/\.\.\//, $old_path);
 
     if ( $#rel_path > 1 ) {
         # more than two levels away. Make it absolute.
         @abs_path = split(/\//, $dir);
-        
+
         # Lop off the relative pieces of the absolute path..
         for ( $i = 0; $i <= $#rel_path; $i++ ) {
             pop @abs_path;
@@ -3565,7 +3771,7 @@ sub change_to_SM_path() {
         $new_path .= "\'";
     } else {
         # Last, it's a relative path without any leading '.'
-    # Prepend SM_PATH and config, since the paths are 
+    # Prepend SM_PATH and config, since the paths are
     # relative to the config directory
         $new_path = "SM_PATH . \'config/" . $old_path . "\'";
     }
@@ -3606,7 +3812,7 @@ sub detect_auth_support {
       print "BAD ARGS!\n";
       return undef;
     }
-    
+
     if ($service eq 'SMTP') {
         $cmd = "AUTH $mech\r\n";
         $logout = "QUIT\r\n";