[SM-CVS] CVS: squirrelmail/config conf.pl,1.221,1.222 config_default.php,1.116,1.117

[Tomas K. <to...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31241/config

Modified Files:
	conf.pl config_default.php 
Log Message:
adding bincimap preset


Index: conf.pl
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/config/conf.pl,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -w -r1.221 -r1.222
--- conf.pl	10 Sep 2005 08:46:15 -0000	1.221
+++ conf.pl	10 Sep 2005 12:50:46 -0000	1.222
@@ -3704,6 +3704,7 @@
     $continue = 0;
     while ( $continue != 1 ) {
         print "Please select your IMAP server:\n";
+        print "    bincimap    = Binc IMAP server\n";
         print "    courier     = Courier IMAP server\n";
         print "    cyrus       = Cyrus IMAP server\n";
         print "    dovecot     = Dovecot Secure IMAP server\n";
@@ -3719,6 +3720,9 @@
         $server = <STDIN>;
         $server =~ s/[\r\n]//g;
 
+        # variable is used to display additional messages.
+        $message = "";
+
         print "\n";
         if ( $server eq "cyrus" ) {
             $imap_server_type               = "cyrus";
@@ -3837,6 +3841,24 @@
             $disp_default_folder_prefix     = "<none>";
 
             $continue = 1;
+        } elsif ( $server eq "bincimap" ) {
+            $imap_server_type               = "bincimap";
+            $default_folder_prefix          = "INBOX/";
+            $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                  = true;
+            $force_username_lowercase       = false;
+            $optional_delimiter             = "detect";
+            $disp_default_folder_prefix     = $default_folder_prefix;
+
+            # Default folder prefix depends on used depot.
+            $message = "\nIf you use IMAPdir depot, you must set default folder prefix to empty string.\n";
+
+            $continue = 1;
         } elsif ( $server eq "quit" ) {
             $continue = 1;
         } else {
@@ -3856,6 +3878,8 @@
         print "            optional_delimiter = $optional_delimiter\n";
         print "                 delete_folder = $delete_folder\n";
         print "      force_username_lowercase = $force_username_lowercase\n";
+
+        print "$message";
     }
     print "\nPress enter to continue...";
     $tmp = <STDIN>;

Index: config_default.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/config/config_default.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -w -r1.116 -r1.117
--- config_default.php	10 Sep 2005 08:46:15 -0000	1.116
+++ config_default.php	10 Sep 2005 12:50:46 -0000	1.117
@@ -192,14 +192,15 @@
  *
  * The type of IMAP server you are running.
  * Valid type are the following (case is important):
+ *   bincimap
  *   courier
  *   cyrus
+ *   dovecot
  *   exchange
- *   uw
- *   macosx
  *   hmailserver
+ *   macosx
  *   mercury32
- *   dovecot
+ *   uw
  *   other
  *
  * Please note that this changes only some of server settings.