X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=config%2Fconf.pl;h=2295f560300bf3527247d460938b83034e0907d7;hb=4dea7315db37a788bb396ce27788c394e6cba224;hp=cd4fc0a38dc50f34bc4b03b377d7a2682956e595;hpb=d47b2518bd5b1544e3b7577b59f323b29737eb12;p=squirrelmail.git

diff --git a/config/conf.pl b/config/conf.pl
index cd4fc0a3..2295f560 100755
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -3,8 +3,20 @@
 # Luke Ehresman (luke@squirrelmail.org)
 #
 # A simple configure script to configure squirrelmail
+#
+# $Id$
 ############################################################              
-$conf_pl_version = "x53";
+$conf_pl_version = "x63";
+
+############################################################              
+# 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...
@@ -41,13 +53,13 @@ if ( -e "config.php") {
       print "  but be warned that many preferences change between versions.  It is\n";
       print "  recommended that you start with a clean config.php for each upgrade that\n";
       print "  you do.  To do this, just move config/config.php out of the way.\n\n";
-      print "Continue loading with the old config.php [y/n]? ";
+      print "Continue loading with the old config.php [y/N]? ";
       $ctu = <STDIN>;
-      if (($ctu =~ /^n\n/i) || ($ctu =~ /^\n/)) {
+      if (($ctu !~ /^y\n/i) || ($ctu =~ /^\n/)) {
          exit;
       }
 
-      print "\nDo you want me to stop warning you [y/n]? ";
+      print "\nDo you want me to stop warning you [y/N]? ";
       $ctu = <STDIN>;
       if ($ctu =~ /^y\n/i) {
          $print_config_version = $conf_pl_version;
@@ -92,13 +104,13 @@ if ( -e "config.php") {
       print "  \"config_default.php\" that matches the version of SquirrelMail that you\n";
       print "  are running.  You can get this from the SquirrelMail web page by going\n";
       print "  to:  http://www.squirrelmail.org.\n\n";
-      print "Continue loading with the old config_default.php (not a good idea) [y/n]? ";
+      print "Continue loading with the old config_default.php (not a good idea) [y/N]? ";
       $ctu = <STDIN>;
-      if (($ctu =~ /^n\n/i) || ($ctu =~ /^\n/)) {
+      if (($ctu !~ /^y\n/i) || ($ctu =~ /^\n/)) {
          exit;
       }
 
-      print "\nDo you want me to stop warning you [y/n]? ";
+      print "\nDo you want me to stop warning you [y/N]? ";
       $ctu = <STDIN>;
       if ($ctu =~ /^y\n/i) {
          $print_config_version = $conf_pl_version;
@@ -131,7 +143,7 @@ while ($line = <FILE>) {
          $options[1] =~ s/[\n|\r]//g;
          $options[1] =~ s/\";\s*$//;
          $options[1] =~ s/;$//;
-         $options[1] =~ s/^"//;
+         $options[1] =~ s/^\"//;
 
          if ($options[0] =~ /^theme\[[0-9]+\]\["PATH"\]/) {
             $sub = $options[0];
@@ -161,35 +173,35 @@ while ($line = <FILE>) {
                   $continue = 1;
                }
                
-               if ($tmp =~ /^\s*"host"/i) {
-                  $tmp =~ s/^\s*"host"\s*=>\s*"//i;
-                  $tmp =~ s/",\s*$//;
-                  $tmp =~ s/"\);\s*$//;
+               if ($tmp =~ /^\s*\"host\"/i) {
+                  $tmp =~ s/^\s*\"host\"\s*=>\s*\"//i;
+                  $tmp =~ s/\",\s*$//;
+                  $tmp =~ s/\"\);\s*$//;
                   $host = $tmp;
-               } elsif ($tmp =~ /^\s*"base"/i) {
-                  $tmp =~ s/^\s*"base"\s*=>\s*"//i;
-                  $tmp =~ s/",\s*$//;
-                  $tmp =~ s/"\);\s*$//;
+               } elsif ($tmp =~ /^\s*\"base\"/i) {
+                  $tmp =~ s/^\s*\"base\"\s*=>\s*\"//i;
+                  $tmp =~ s/\",\s*$//;
+                  $tmp =~ s/\"\);\s*$//;
                   $base = $tmp;
-               } elsif ($tmp =~ /^\s*"charset"/i) {
-                  $tmp =~ s/^\s*"charset"\s*=>\s*"//i;
-                  $tmp =~ s/",\s*$//;
-                  $tmp =~ s/"\);\s*$//;
+               } elsif ($tmp =~ /^\s*\"charset\"/i) {
+                  $tmp =~ s/^\s*\"charset\"\s*=>\s*\"//i;
+                  $tmp =~ s/\",\s*$//;
+                  $tmp =~ s/\"\);\s*$//;
                   $charset = $tmp;
-               } elsif ($tmp =~ /^\s*"port"/i) {
-                  $tmp =~ s/^\s*"port"\s*=>\s*"//i;
-                  $tmp =~ s/",\s*$//;
-                  $tmp =~ s/"\);\s*$//;
+               } elsif ($tmp =~ /^\s*\"port\"/i) {
+                  $tmp =~ s/^\s*\"port\"\s*=>\s*\"//i;
+                  $tmp =~ s/\",\s*$//;
+                  $tmp =~ s/\"\);\s*$//;
                   $port = $tmp;
-               } elsif ($tmp =~ /^\s*"maxrows"/i) {
-                  $tmp =~ s/^\s*"maxrows"\s*=>\s*"//i;
-                  $tmp =~ s/",\s*$//;
-                  $tmp =~ s/"\);\s*$//;
+               } elsif ($tmp =~ /^\s*\"maxrows\"/i) {
+                  $tmp =~ s/^\s*\"maxrows\"\s*=>\s*\"//i;
+                  $tmp =~ s/\",\s*$//;
+                  $tmp =~ s/\"\);\s*$//;
                   $maxrows = $tmp;
-               } elsif ($tmp =~ /^\s*"name"/i) {
-                  $tmp =~ s/^\s*"name"\s*=>\s*"//i;
-                  $tmp =~ s/",\s*$//;
-                  $tmp =~ s/"\);\s*$//;
+               } elsif ($tmp =~ /^\s*\"name\"/i) {
+                  $tmp =~ s/^\s*\"name\"\s*=>\s*\"//i;
+                  $tmp =~ s/\",\s*$//;
+                  $tmp =~ s/\"\);\s*$//;
                   $name = $tmp;
                }
             }
@@ -221,6 +233,21 @@ if (!$default_unseen_type) {
 if (!$config_use_color) {
    $config_use_color = 1;
 }
+if (!$invert_time) {
+   $invert_time = "false";
+}
+if (!$force_username_lowercase) {
+	$force_username_lowercase = "false";
+}
+if (!$optional_delimiter) {
+	$optional_delimiter = "detect";
+}
+if (!$use_authenticated_smtp) {
+    $use_authenticated_smtp = "false";
+}
+if (!$auto_create_special) {
+	$auto_create_special = "false";
+}
 
 #####################################################################################
 if ($config_use_color == 1) {
@@ -258,6 +285,8 @@ while (($command ne "q") && ($command ne "Q")) {
       print "1.  Organization Name    : $WHT$org_name$NRM\n";
       print "2.  Organization Logo    : $WHT$org_logo$NRM\n";
       print "3.  Organization Title   : $WHT$org_title$NRM\n";
+      print "4.  Signout Page         : $WHT$signout_page$NRM\n";
+      print "5.  Default Language     : $WHT$squirrelmail_default_language$NRM\n";
       print "\n";
       print "R   Return to Main Menu\n";
    } elsif ($menu == 2) {
@@ -277,9 +306,11 @@ while (($command ne "q") && ($command ne "Q")) {
       } else {
          print "6.    SMTP Server        : $WHT$smtpServerAddress$NRM\n";
          print "7.    SMTP Port          : $WHT$smtpPort$NRM\n";
+         print "8.    Authenticated SMTP : $WHT$use_authenticated_smtp$NRM\n";
       }
-      print "8.  Server               : $WHT$imap_server_type$NRM\n";
-      print "9.  Invert Time          : $WHT$invert_time$NRM\n";
+      print "9.  Server               : $WHT$imap_server_type$NRM\n";
+      print "10. Invert Time          : $WHT$invert_time$NRM\n";
+      print "11. Delimiter            : $WHT$optional_delimiter$NRM\n";
       print "\n";
       print "R   Return to Main Menu\n";
    } elsif ($menu == 3) {
@@ -297,14 +328,16 @@ while (($command ne "q") && ($command ne "Q")) {
       print "11. Show 'Contain Sub.' Option : $WHT$show_contain_subfolders_option$NRM\n";
       print "12. Default Unseen Notify      : $WHT$default_unseen_notify$NRM\n";
       print "13. Default Unseen Type        : $WHT$default_unseen_type$NRM\n";
+	  print "14. Auto create Sent and Trash : $WHT$auto_create_special$NRM\n";
       print "\n";
       print "R   Return to Main Menu\n";
    } elsif ($menu == 4) {
       print $WHT."General Options\n".$NRM;
-      print "1.  Default Charset      : $WHT$default_charset$NRM\n";
-      print "2.  Data Directory       : $WHT$data_dir$NRM\n";
-      print "3.  Attachment Directory : $WHT$attachment_dir$NRM\n";
-      print "4.  Default Left Size    : $WHT$default_left_size$NRM\n";
+      print "1.  Default Charset        : $WHT$default_charset$NRM\n";
+      print "2.  Data Directory         : $WHT$data_dir$NRM\n";
+      print "3.  Attachment Directory   : $WHT$attachment_dir$NRM\n";
+      print "4.  Default Left Size      : $WHT$default_left_size$NRM\n";
+      print "5.  Usernames in Lowercase : $WHT$force_username_lowercase$NRM\n";
       print "\n";
       print "R   Return to Main Menu\n";
    } elsif ($menu == 5) {
@@ -345,9 +378,9 @@ while (($command ne "q") && ($command ne "Q")) {
       @files = readdir(DIR);
       $pos=0;
       @unused_plugins = ();
-      chdir ("../plugins");
       for ($i=0; $i <= $#files; $i++) {
-         if ( -d $files[$i] && $files[$i] !~ /^\./ && $files[$i] ne "CVS") {
+         if ( -d "../plugins/" . $files[$i] && 
+	     $files[$i] !~ /^\./ && $files[$i] ne "CVS") {
             $match = 0;
             for ($k=0; $k<=$#plugins; $k++) {
                if ($plugins[$k] eq $files[$i]) {
@@ -360,7 +393,6 @@ while (($command ne "q") && ($command ne "Q")) {
             }
          }
       }
-      chdir ("../config");
       
       for ($i=0; $i<=$#unused_plugins; $i++) {
          $num = $num + 1;
@@ -382,26 +414,27 @@ while (($command ne "q") && ($command ne "Q")) {
    print "\n";
    print "Command >> ".$WHT;
    $command = <STDIN>;
-   $command =~ s/[\n|\r]//g; 
+   $command =~ s/[\n|\r]//g;
+   $command =~ tr/A-Z/a-z/;
    print "$NRM\n";
 
    # Read the commands they entered.
-   if (($command eq "R") || ($command eq "r")) {
+   if ($command eq "r") {
       $menu = 0;
-   } elsif (($command eq "s") || ($command eq "S")) {
+   } elsif ($command eq "s") {
       save_data ();
       print "Data saved in config.php\n";
-      print "Press any key to continue...";
+      print "Press enter to continue...";
       $tmp = <STDIN>;
       $saved = 1;
-   } elsif ((($command eq "q") || ($command eq "Q")) && ($saved == 0)) {
+   } elsif (($command eq "q") && ($saved == 0)) {
       print "You have not saved your data.\n";
-      print "Save?  (y/n) [".$WHT."y".$NRM."]: ";
+      print "Save?  [".$WHT."Y".$NRM."/n]: ";
       $save = <STDIN>;
       if (($save =~ /^y/i) || ($save =~ /^\s*$/)) {
          save_data ();
        }
-   } elsif (($command eq "c") || ($command eq "C")) {
+   } elsif ($command eq "c") {
       if ($config_use_color == 1) {
          $config_use_color = 2;
          $WHT = "";
@@ -411,7 +444,7 @@ while (($command ne "q") && ($command ne "Q")) {
          $WHT = "\x1B[37;1m";
          $NRM = "\x1B[0m";
       }
-   } elsif ((($command eq "d") || ($command eq "D")) && $menu == 0) {
+   } elsif ($command eq "d" && $menu == 0) {
       set_defaults ();
    } else {
       $saved = 0;
@@ -423,16 +456,20 @@ while (($command ne "q") && ($command ne "Q")) {
          if    ($command == 1) { $org_name   = command1 (); }
          elsif ($command == 2) { $org_logo   = command2 (); }
          elsif ($command == 3) { $org_title  = command3 (); }
+         elsif ($command == 4) { $signout_page  = command4 (); }
+	 elsif ($command == 5) { $squirrelmail_default_language = command5(); }
       } 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)  { $use_authenticated_smtp   = command18 (); }
+         elsif ($command == 9)  { $imap_server_type   = command19 (); }
+         elsif ($command == 10) { $invert_time        = command110 (); }
+         elsif ($command == 11) { $optional_delimiter = command111 (); }
       } elsif ($menu == 3) {
          if    ($command == 1) { $default_folder_prefix          = command21 (); }
          elsif ($command == 2) { $show_prefix_option             = command22 (); }
@@ -447,11 +484,13 @@ while (($command ne "q") && ($command ne "Q")) {
          elsif ($command == 11){ $show_contain_subfolders_option = command211(); }
          elsif ($command == 12){ $default_unseen_notify          = command212(); }
          elsif ($command == 13){ $default_unseen_type            = command213(); }
+         elsif ($command == 14){ $auto_create_special            = command214(); }
       } elsif ($menu == 4) {
-         if    ($command == 1) { $default_charset    = command31 (); }
-         elsif ($command == 2) { $data_dir           = command33 (); }
-         elsif ($command == 3) { $attachment_dir     = command34 (); }
-         elsif ($command == 4) { $default_left_size  = command35 (); }
+         if    ($command == 1) { $default_charset          = command31 (); }
+         elsif ($command == 2) { $data_dir                 = command33 (); }
+         elsif ($command == 3) { $attachment_dir           = command34 (); }
+         elsif ($command == 4) { $default_left_size        = command35 (); }
+	 elsif ($command == 5) { $force_username_lowercase = command36 (); }
       } elsif ($menu == 5) {
          if    ($command == 1) { command41 (); }
          elsif ($command == 2) { $theme_css = command42 (); }
@@ -518,6 +557,41 @@ sub command3 {
    return $new_org_title;
 }
 
+# signout_page
+sub command4 {
+   print "When users click the Sign Out button they will be logged out and\n";
+   print "then sent to signout_page.  If signout_page is left empty,\n";
+   print "(hit space and then return) they will be taken, as normal,\n";
+   print "to the default and rather sparse SquirrelMail signout page.\n";
+   print "\n";
+   print "[$WHT$signout_page$NRM]: $WHT";
+   $new_signout_page = <STDIN>;
+   if ($new_signout_page eq "\n") {
+      $new_signout_page = $signout_page;
+   } else {
+      $new_signout_page =~ s/[\r|\n]//g;
+      $new_signout_page =~ s/^\s+$//g;
+   }
+   return $new_signout_page;
+}
+
+# Default language
+sub command5 {
+   print "SquirrelMail attempts to set the language in many ways.  If it\n";
+   print "can not figure it out in another way, it will default to this\n";
+   print "language.  Please use the two-letter code for the desired language.\n";
+   print "\n";
+   print "[$WHT$squirrelmail_default_language$NRM]: $WHT";
+   $new_signout_page = <STDIN>;
+   if ($new_signout_page eq "\n") {
+      $new_signout_page = $squirrelmail_default_language;
+   } else {
+      $new_signout_page =~ s/[\r|\n]//g;
+      $new_signout_page =~ s/^\s+$//g;
+   }
+   return $new_signout_page;
+}
+
 ####################################################################################
 
 # domain
@@ -626,8 +700,27 @@ sub command17 {
    }
    return $new_smtpPort;
 }
-# imap_server_type 
+
+# authenticated server 
 sub command18 {
+   print "Do you wish to use an authenticated SMTP server?  Your server must\n";
+   print "support this in order for SquirrelMail to work with it.  We implemented\n";
+   print "it according to RFC 2554.\n";
+   
+   $YesNo = 'n';
+   $YesNo = 'y' if ($use_authenticated_smtp eq "true");
+
+   print "Use authenticated SMTP server (y/n) [$WHT$YesNo$NRM]: $WHT";
+
+   $new_use_authenticated_smtp = <STDIN>;
+   $new_use_authenticated_smtp =~ tr/yn//cd;
+   return "true" if ($new_use_authenticated_smtp eq "y");
+   return "false" if ($new_use_authenticated_smtp eq "n");
+   return $use_authenticated_smtp;
+}   
+
+# 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";
    print "the same principles.  We have made some work-arounds for some of\n";
@@ -638,6 +731,7 @@ sub command18 {
    print "    uw         = University of Washington's IMAP server\n";
    print "    exchange   = Microsoft Exchange IMAP server\n";
    print "    courier    = Courier IMAP server\n";
+   print "    other      = Not one of the above servers\n";
    print "[$WHT$imap_server_type$NRM]: $WHT";
    $new_imap_server_type = <STDIN>;
    if ($new_imap_server_type eq "\n") {
@@ -649,7 +743,7 @@ sub command18 {
 }
 
 # invert_time
-sub command19 {
+sub command110 {
    print "Sometimes the date of messages sent is messed up (off by a few hours\n";
    print "on some machines).  Typically this happens if the system doesn't support\n";
    print "tm_gmtoff.  It will happen only if your time zone is \"negative\".\n";
@@ -671,6 +765,24 @@ sub command19 {
    return $invert_time;
 }   
 
+sub command111 {
+	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";
@@ -1034,6 +1146,28 @@ sub command213 {
    return $default_unseen_type;
 }
 
+# Auto create special folders
+sub command214 {
+   print "Would you like the Sent and Trash folders to be created automatically for\n";
+   print "you when a user loggs in?  If the user accidentally deletes their special\n";
+   print "folders, this option will automatically create it again for them.\n";
+   print "\n";
+   
+   if ($auto_create_special eq "true") {
+      $default_value = "y";
+   } else {
+      $default_value = "n";
+   }
+   print "Auto create special folders? (y/n) [$WHT$default_value$NRM]: $WHT";
+   $new_show = <STDIN>;
+   if (($new_show =~ /^y\n/i) || (($new_show =~ /^\n/) && ($default_value eq "y"))) {
+      $auto_create_special = "true";
+   } else {
+      $auto_create_special = "false";
+   }
+   return $auto_create_special;
+}
+
 
 ############# GENERAL OPTIONS #####################
 
@@ -1133,6 +1267,27 @@ sub command35 {
 }
 
 
+sub command36 {
+   print "Some IMAP servers only have lowercase letters in the usernames\n";
+   print "but they still allow people with uppercase to log in.  This\n";
+   print "causes a problem with the user's preference files.  This option\n";
+   print "transparently changes all usernames to lowercase.";
+   print "\n";
+   
+   if ($force_username_lowercase eq "true") {
+      $default_value = "y";
+   } else {
+      $default_value = "n";
+   }
+   print "Convert usernames to lowercase (y/n) [$WHT$default_value$NRM]: $WHT";
+   $new_show = <STDIN>;
+   if (($new_show =~ /^y\n/i) || (($new_show =~ /^\n/) && ($default_value eq "y"))) {
+      return "true";
+   }
+   return "false";
+}
+
+
 sub command41 {
    print "\nNow we will define the themes that you wish to use.  If you have added\n";
    print "a theme of your own, just follow the instructions (?) about how to add\n";
@@ -1213,19 +1368,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++;
          }
@@ -1457,31 +1614,50 @@ sub save_data {
 
    print FILE "<?php\n\t/** SquirrelMail configuration\n";
    print FILE "\t ** Created using the configure script, conf.pl\n\t **/\n\n";
+   
+   print FILE "if (defined('config_php'))\n   return;\n";
+   print FILE "define('config_php', true);\n\n";
+
+   print FILE "\tglobal \$print_config_version, \$config_version, \$config_use_color;\n";
 
    if ($print_config_version) {
       print FILE "\t\$config_version = \"$print_config_version\";\n";
    }
    print FILE "\t\$config_use_color = $config_use_color;\n"; 
    print FILE "\n";
-   
+
+   print FILE "\tglobal \$org_name, \$org_logo, \$org_title, \$signout_page;\n";
    print FILE "\t\$org_name   = \"$org_name\";\n";
    print FILE "\t\$org_logo   = \"$org_logo\";\n";
    print FILE "\t\$org_title  = \"$org_title\";\n";
+   print FILE "\t\$signout_page  = \"$signout_page\";\n";
 
    print FILE "\n";
 
-   print FILE "\t\$domain               = \"$domain\";\n";
-   print FILE "\t\$imapServerAddress    = \"$imapServerAddress\";\n";
-   print FILE "\t\$imapPort             =  $imapPort;\n";
-   print FILE "\t\$useSendmail          =  $useSendmail;\n";
-   print FILE "\t\$smtpServerAddress    = \"$smtpServerAddress\";\n";
-   print FILE "\t\$smtpPort             =  $smtpPort;\n";
-   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 "\tglobal \$domain, \$imapServerAddress, \$imapPort;\n";
+   print FILE "\tglobal \$useSendmail, \$smtpServerAddress, \$smtpPort;\n";
+   print FILE "\tglobal \$sendmail_path, \$use_authenticated_smtp, \$imap_server_type;\n";
+   print FILE "\tglobal \$invert_time, \$optional_delimiter;\n";
+   print FILE "\t\$domain                 = \"$domain\";\n";
+   print FILE "\t\$imapServerAddress      = \"$imapServerAddress\";\n";
+   print FILE "\t\$imapPort               =  $imapPort;\n";
+   print FILE "\t\$useSendmail            =  $useSendmail;\n";
+   print FILE "\t\$smtpServerAddress      = \"$smtpServerAddress\";\n";
+   print FILE "\t\$smtpPort               =  $smtpPort;\n";
+   print FILE "\t\$sendmail_path          = \"$sendmail_path\";\n";
+   print FILE "\t\$use_authenticated_smtp = $use_authenticated_smtp;\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";
 
+   print FILE "\tglobal \$default_folder_prefix, \$trash_folder, \$sent_folder;\n";
+   print FILE "\tglobal \$default_move_to_trash, \$default_move_to_sent;\n";
+   print FILE "\tglobal \$show_prefix_option, \$list_special_folders_first;\n";
+   print FILE "\tglobal \$use_special_folder_color, \$auto_expunge, \$default_sub_of_inbox;\n";
+   print FILE "\tglobal \$show_contain_subfolders_option, \$default_unseen_notify;\n";
+   print FILE "\tglobal \$default_unseen_type, \$auto_create_special;\n";
    print FILE "\t\$default_folder_prefix            = \"$default_folder_prefix\";\n";
    print FILE "\t\$trash_folder                     = \"$trash_folder\";\n";
    print FILE "\t\$sent_folder                      = \"$sent_folder\";\n";
@@ -1495,21 +1671,27 @@ sub save_data {
    print FILE "\t\$show_contain_subfolders_option   =  $show_contain_subfolders_option;\n";
    print FILE "\t\$default_unseen_notify            =  $default_unseen_notify;\n";
    print FILE "\t\$default_unseen_type              =  $default_unseen_type;\n";
+   print FILE "\t\$auto_create_special              =  $auto_create_special;\n";
    print FILE "\n";
 
-   print FILE "\t\$default_charset   = \"$default_charset\";\n";
-   print FILE "\t\$data_dir          = \"$data_dir\";\n";
-   print FILE "\t\$attachment_dir    = \"$attachment_dir\";\n";
-   print FILE "\t\$default_left_size =  $default_left_size;\n";
+   print FILE "\tglobal \$default_charset, \$data_dir, \$attachment_dir;\n";
+   print FILE "\tglobal \$default_left_size, \$force_username_lowercase;\n";
+   print FILE "\t\$default_charset          = \"$default_charset\";\n";
+   print FILE "\t\$data_dir                 = \"$data_dir\";\n";
+   print FILE "\t\$attachment_dir           = \"$attachment_dir\";\n";
+   print FILE "\t\$default_left_size        =  $default_left_size;\n";
+   print FILE "\t\$force_username_lowercase = $force_username_lowercase;\n";
 
    print FILE "\n";
 
+   print FILE "\tglobal \$plugins;\n";
    for ($ct=0; $ct <= $#plugins; $ct++) {
       print FILE "\t\$plugins[$ct] = \"$plugins[$ct]\";\n";
    }
    
    print FILE "\n";
 
+   print FILE "\tglobal \$theme_css, \$theme;\n";
    print FILE "\t\$theme_css = \"$theme_css\";\n";
    for ($count=0; $count <= $#theme_name; $count++) {
       print FILE "\t\$theme[$count][\"PATH\"] = \"$theme_path[$count]\";\n";
@@ -1521,6 +1703,7 @@ sub save_data {
    if ($default_use_javascript_addr_book ne "true") {
       $default_use_javascript_addr_book = "false";
    }   
+   print FILE "\tglobal \$default_use_javascript_addr_book, \$ldap_server;\n";
    print FILE "\t\$default_use_javascript_addr_book = $default_use_javascript_addr_book;\n";
    for ($count=0; $count <= $#ldap_host; $count++) {
       print FILE "\t\$ldap_server[$count] = Array(\n";
@@ -1541,9 +1724,12 @@ sub save_data {
       print FILE ");\n\n";
    }
 
+   print FILE "\tglobal \$motd;\n";
    print FILE "\t\$motd = \"$motd\";\n";
+   
+   print FILE "\tglobal \$squirrelmail_default_language;\n";
+   print FILE "\t\$squirrelmail_default_language = \"$squirrelmail_default_language\";\n";
 
-   print FILE "?>\n";
    close FILE;
 }
 
@@ -1615,7 +1801,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";
@@ -1623,7 +1809,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";