* Added a debug mode.

[squirrelmail.git] / config / conf.pl

diff --git a/config/conf.pl b/config/conf.pl
index b118f71e4e41512ef92a8a5a453726a950e4cddf..2cc338ccaad409e2212c658f7e1b3b0cea9e9ca3 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -3,9 +3,21 @@
 # Luke Ehresman (luke@squirrelmail.org)
 #
 # A simple configure script to configure squirrelmail
+#
+# $Id$
 ############################################################              
 $conf_pl_version = "x62";
 
+############################################################              
+# 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'})) {
+   print "Content-Type: text/html\n\n";
+   print "You must run this script from the command line.";
+   exit;
+}
+
 ############################################################              
 # First, lets read in the data already in there...
 ############################################################              
@@ -224,6 +236,12 @@ if (!$config_use_color) {
 if (!$invert_time) {
    $invert_time = "false";
 }
+if (!$force_username_lowercase) {
+       $force_username_lowercase = "false";
+}
+if (!$optional_delimiter) {
+       $optional_delimiter = "detect";
+}
 
 #####################################################################################
 if ($config_use_color == 1) {
@@ -283,6 +301,7 @@ while (($command ne "q") && ($command ne "Q")) {
       }
       print "8.  Server               : $WHT$imap_server_type$NRM\n";
       print "9.  Invert Time          : $WHT$invert_time$NRM\n";
+      print "10. Delimiter            : $WHT$optional_delimiter$NRM\n";
       print "\n";
       print "R   Return to Main Menu\n";
    } elsif ($menu == 3) {
@@ -428,15 +447,16 @@ while (($command ne "q") && ($command ne "Q")) {
          elsif ($command == 2) { $org_logo   = command2 (); }
          elsif ($command == 3) { $org_title  = command3 (); }
       } elsif ($menu == 2) {
-         if    ($command == 1) { $domain             = command11 (); }
-         elsif ($command == 2) { $imapServerAddress  = command12 (); }
-         elsif ($command == 3) { $imapPort           = command13 (); }
-         elsif ($command == 4) { $useSendmail        = command14 (); }
-         elsif ($command == 5) { $sendmail_path      = command15 (); }
-         elsif ($command == 6) { $smtpServerAddress  = command16 (); }
-         elsif ($command == 7) { $smtpPort           = command17 (); }
-         elsif ($command == 8) { $imap_server_type   = command18 (); }
-         elsif ($command == 9) { $invert_time        = command19 (); }
+         if    ($command == 1)  { $domain             = command11 (); }
+         elsif ($command == 2)  { $imapServerAddress  = command12 (); }
+         elsif ($command == 3)  { $imapPort           = command13 (); }
+         elsif ($command == 4)  { $useSendmail        = command14 (); }
+         elsif ($command == 5)  { $sendmail_path      = command15 (); }
+         elsif ($command == 6)  { $smtpServerAddress  = command16 (); }
+         elsif ($command == 7)  { $smtpPort           = command17 (); }
+         elsif ($command == 8)  { $imap_server_type   = command18 (); }
+         elsif ($command == 9)  { $invert_time        = command19 (); }
+         elsif ($command == 10) { $optional_delimiter = command110 (); }
       } elsif ($menu == 3) {
          if    ($command == 1) { $default_folder_prefix          = command21 (); }
          elsif ($command == 2) { $show_prefix_option             = command22 (); }
@@ -676,6 +696,24 @@ sub command19 {
    return $invert_time;
 }   
 
+sub command110 {
+       print "This is the delimiter that your IMAP server uses to distinguish between\n";
+       print "folders.  For example, Cyrus uses '.' as the delimiter and a complete\n";
+       print "folder would look like 'INBOX.Friends.Bob', while UW uses '/' and would\n";
+       print "look like 'INBOX/Friends/Bob'.  Normally this should be left at 'detect'\n";
+       print "but if you are sure you konw what delimiter your server uses, you can\n";
+       print "specify it here.\n";
+       print "\nTo have it autodetect the delimiter, set it to 'detect'.\n\n";
+   print "[$WHT$optional_delimiter$NRM]: $WHT";
+   $new_optional_delimiter = <STDIN>;
+   if ($new_optional_delimiter eq "\n") {
+      $new_optional_delimiter = $optional_delimiter;
+   } else {
+      $new_optional_delimiter =~ s/[\r|\n]//g;
+   }
+   return $new_optional_delimiter;
+}
+
 # MOTD
 sub command71 {
    print "\nYou can now create the welcome message that is displayed\n";
@@ -1239,19 +1277,21 @@ sub command41 {
          $cnt = 0;
          while ($cnt <= $#files) {
             $filename = "../themes/" . $files[$cnt];
-            $found = 0;
-            for ($x=0; $x <= $#theme_path; $x++) {
-               if ($theme_path[$x] eq $filename) {
-                  $found = 1;
+               if ($filename ne "../themes/index.php") {
+               $found = 0;
+               for ($x=0; $x <= $#theme_path; $x++) {
+                  if ($theme_path[$x] eq $filename) {
+                     $found = 1;
+                  }
+               }
+               if ($found != 1) {
+                  print "** Found theme: $filename\n";
+                  print "   What is its name? ";
+                  $nm = <STDIN>;
+                  $nm =~ s/[\n|\r]//g;
+                  $theme_name[$#theme_name+1] = $nm;
+                  $theme_path[$#theme_path+1] = $filename;
                }
-            }
-            if ($found != 1) {
-               print "** Found theme: $filename\n";
-               print "   What is its name? ";
-               $nm = <STDIN>;
-               $nm =~ s/[\n|\r]//g;
-               $theme_name[$#theme_name+1] = $nm;
-               $theme_path[$#theme_path+1] = $filename;
             }
             $cnt++;
          }
@@ -1505,6 +1545,7 @@ sub save_data {
    print FILE "\t\$sendmail_path        = \"$sendmail_path\";\n";
    print FILE "\t\$imap_server_type     = \"$imap_server_type\";\n";
    print FILE "\t\$invert_time          = $invert_time;\n";
+       print FILE "\t\$optional_delimiter   = \"$optional_delimiter\";\n";
    
    print FILE "\n";
 
@@ -1642,7 +1683,7 @@ sub set_defaults {
                        
          $continue = 1;
       } elsif ($server eq "exchange") {
-                       $default_folder_prefix = "INBOX/";
+                       $default_folder_prefix = "";
                        $default_sub_of_inbox = true;
                        $trash_folder = "INBOX/Deleted Items";
                        $sent_folder = "INBOX/Sent Items";
@@ -1650,7 +1691,7 @@ sub set_defaults {
                        $show_contain_subfolders_option = false;
                        $imap_server_type = "exchange";
          
-         print "          default_folder_prefix = INBOX/\n";
+         print "          default_folder_prefix = <none>\n";
          print "           default_sub_of_inbox = true\n";
          print "                   trash_folder = \"INBOX/Deleted Items\"\n";
          print "                    sent_folder = \"INBOX/Sent Items\"\n";