A default server setting should always set all options, even if they are

the defaults, to permit switching between different servers. Thanks Tomas
for noting this.

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

diff --git a/config/conf.pl b/config/conf.pl
index 6c8fdfb4fae837d57e2557394759a3cd97872508..817644c72e38057f4149258519b8813a78da1216 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -3472,6 +3472,18 @@ sub set_defaults {
             $continue = 1;
         } elsif ( $server eq "hmailserver" ) {
             $imap_server_type               = "hmailserver";
             $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" ) {
 
            $continue = 1;
         } elsif ( $server eq "mercury32" ) {

diff --git a/doc/presets.txt b/doc/presets.txt
index 730bb631aba54aa2424e409a9d42a91227fdfba5..bd8351a7d6bf0ece46a80c6058e953e003c2e066 100644 (file)
--- a/doc/presets.txt
+++ b/doc/presets.txt
@@ -105,10 +105,20 @@ show_contain_subfolders_option = false
                  delete_folder = true
       force_username_lowercase = false
 
                  delete_folder = true
       force_username_lowercase = false
 

-------------------
+-----------------------

 'hmailserver' settings:
 'hmailserver' settings:

-------------------
+-----------------------

               imap_server_type = hmailserver   (used in imap_search.php)
               imap_server_type = hmailserver   (used in imap_search.php)

+         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
+                 delete_folder = false
+      force_username_lowercase = false

 
 -------------------
 'mercury' settings:
 
 -------------------
 'mercury' settings: