X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=config%2Fconf.pl;h=da4637a1014ae0e7c67e0d768879dd6d2e440a32;hb=412d852b9811eec55cf8e21c3785e1451c9ab7d8;hp=f9dce285837fed2f0c2112bef4e00d69cd9b4dc4;hpb=349ca9f7359a2d69a9a99e295cce00e8476e016f;p=squirrelmail.git

diff --git a/config/conf.pl b/config/conf.pl
index f9dce285..da4637a1 100755
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -1,20 +1,113 @@
 #!/usr/bin/perl
 # conf.pl
-# Written March 26, 2000
-# Luke Ehresman (lehresma@css.tayloru.edu)
+# Luke Ehresman (luke@squirrelmail.org)
 #
 # A simple configure script to configure squirrelmail
 ############################################################              
-$WHT = "\x1B[37;1m";
-$NRM = "\x1B[0m";
+$conf_pl_version = "x52";
 
 ############################################################              
 # First, lets read in the data already in there...
 ############################################################              
 if ( -e "config.php") {
+   open (FILE, "config.php");
+   while ($line = <FILE>) {
+      if ($line =~ /^\s+\$/) {
+         $line =~ s/^\s+\$//;
+         $var = $line;
+      
+         $var =~ s/=/EQUALS/;
+         if ($var =~ /^([a-z]|[A-Z])/) {
+            @o = split(/\s*EQUALS\s*/, $var);
+            if ($o[0] eq "config_version") {
+               $o[1] =~ s/[\n|\r]//g;
+               $o[1] =~ s/\";\s*$//;
+               $o[1] =~ s/;$//;
+               $o[1] =~ s/^"//;
+
+               $config_version = $o[1];
+               close (FILE);
+            }
+         }
+      }   
+   }
+   close (FILE);
+
+   if ($config_version ne $conf_pl_version) {
+      system "clear";
+      print $WHT."WARNING:\n".$NRM;
+      print "  The file \"config/config.php\" was found, but it is for an older version of\n";
+      print "  SquirrelMail.  It is possible to still read the defaults from this file\n";
+      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]? ";
+      $ctu = <STDIN>;
+      if (($ctu =~ /^n\n/i) || ($ctu =~ /^\n/)) {
+         exit;
+      }
+
+      print "\nDo you want me to stop warning you [y/n]? ";
+      $ctu = <STDIN>;
+      if ($ctu =~ /^y\n/i) {
+         $print_config_version = $conf_pl_version;
+      } else {
+         $print_config_version = $config_version;
+      }
+   } else {
+      $print_config_version = $config_version;
+   } 
+
    $config = 1;
    open (FILE, "config.php");
 } elsif (-e "config_default.php") {
+   open (FILE, "config_default.php");
+   while ($line = <FILE>) {
+      if ($line =~ /^\s+\$/) {
+         $line =~ s/^\s+\$//;
+         $var = $line;
+      
+         $var =~ s/=/EQUALS/;
+         if ($var =~ /^([a-z]|[A-Z])/) {
+            @o = split(/\s*EQUALS\s*/, $var);
+            if ($o[0] eq "config_version") {
+               $o[1] =~ s/[\n|\r]//g;
+               $o[1] =~ s/\";\s*$//;
+               $o[1] =~ s/;$//;
+               $o[1] =~ s/^"//;
+
+               $config_version = $o[1];
+               close (FILE);
+            }
+         }
+      }   
+   }
+   close (FILE);
+
+   if ($config_version ne $conf_pl_version) {
+      system "clear";
+      print $WHT."WARNING:\n".$NRM;
+      print "  You are trying to use a \"config_default.php\" from an older version of\n";
+      print "  SquirrelMail.  This is HIGHLY unrecommended.  You should get the\n";
+      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]? ";
+      $ctu = <STDIN>;
+      if (($ctu =~ /^n\n/i) || ($ctu =~ /^\n/)) {
+         exit;
+      }
+
+      print "\nDo you want me to stop warning you [y/n]? ";
+      $ctu = <STDIN>;
+      if ($ctu =~ /^y\n/i) {
+         $print_config_version = $conf_pl_version;
+      } else {
+         $print_config_version = $config_version;
+      }
+   } else {
+      $print_config_version = $config_version;
+   }
    $config = 2;
    open (FILE, "config_default.php");
 } else {
@@ -32,26 +125,36 @@ while ($line = <FILE>) {
       $line =~ s/^\s+\$//;
       $var = $line;
       
+      $var =~ s/=/EQUALS/;
       if ($var =~ /^([a-z]|[A-Z])/) {
-         @options = split(/\s*=\s*/, $var);
+         @options = split(/\s*EQUALS\s*/, $var);
          $options[1] =~ s/[\n|\r]//g;
-         $options[1] =~ s/^"//g;
-         $options[1] =~ s/;.*$//g;
-         $options[1] =~ s/"$//g;
+         $options[1] =~ s/\";\s*$//;
+         $options[1] =~ s/;$//;
+         $options[1] =~ s/^"//;
 
          if ($options[0] =~ /^theme\[[0-9]+\]\["PATH"\]/) {
             $sub = $options[0];
             $sub =~ s/\]\["PATH"\]//;
-            $sub = substr ($sub, @sub-1, 1);
+            $sub =~ s/.*\[//; 
+            if (-e "../themes") {
+               $options[1] =~ s/^\.\.\/config/\.\.\/themes/;
+            }   
             $theme_path[$sub] = $options[1];
          } elsif ($options[0] =~ /^theme\[[0-9]+\]\["NAME"\]/) {
             $sub = $options[0];
             $sub =~ s/\]\["NAME"\]//;
-            $sub = substr ($sub, @sub-1, 1);
+            $sub =~ s/.*\[//; 
             $theme_name[$sub] = $options[1];
+         } elsif ($options[0] =~ /^plugins\[[0-9]+\]/) {
+            $sub = $options[0];
+            $sub =~ s/\]//; 
+            $sub =~ s/^plugins\[//;
+            $plugins[$sub] = $options[1];
          } elsif ($options[0] =~ /^ldap_server\[[0-9]+\]/) {
             $sub = $options[0];
-            $sub = substr ($sub, length($sub)-2, 1);
+            $sub =~ s/\]//; 
+            $sub =~ s/^ldap_server\[//;
             $continue = 0;
             while (($tmp = <FILE>) && ($continue != 1)) {
                if ($tmp =~ /\);\s*$/) {
@@ -102,23 +205,42 @@ while ($line = <FILE>) {
       }   
    }
 }
+close FILE;
 if ($useSendmail ne "true") {
    $useSendmail = "false";
 }
 if (!$sendmail_path) {
    $sendmail_path = "/usr/sbin/sendmail";
 }
+if (!$default_unseen_notify) {
+   $default_unseen_notify = 2;
+}
+if (!$default_unseen_type) {
+   $default_unseen_type = 1;
+}
+if (!$config_use_color) {
+   $config_use_color = 1;
+}
 
 #####################################################################################
+if ($config_use_color == 1) {
+   $WHT = "\x1B[37;1m";
+   $NRM = "\x1B[0m";
+} else {
+   $WHT = "";
+   $NRM = "";
+   $config_use_color = 2;
+}
 
 while (($command ne "q") && ($command ne "Q")) {
    system "clear";
-   if ($menu == 0) {
-      print $WHT."SquirrelMail Configuration : ".$NRM;
-      if ($config == 1) { print "Read: config.php"; }
-      elsif ($config == 2) { print "Read: config_default.php"; }
-      print "\n";
+   print $WHT."SquirrelMail Configuration : ".$NRM;
+   if ($config == 1) { print "Read: config.php"; }
+   elsif ($config == 2) { print "Read: config_default.php"; }
+   print "\n";
+   print "---------------------------------------------------------\n";
 
+   if ($menu == 0) {
       print $WHT."Main Menu --\n".$NRM;
       print "1.  Organization Preferences\n";
       print "2.  Server Settings\n";
@@ -127,6 +249,7 @@ while (($command ne "q") && ($command ne "Q")) {
       print "5.  Themes\n";
       print "6.  Address Books (LDAP)\n";
       print "7.  Message of the Day (MOTD)\n";
+      print "8.  Plugins\n";
       print "\n";
       print "D.  Set pre-defined settings for specific IMAP servers\n";
       print "\n";
@@ -142,7 +265,13 @@ while (($command ne "q") && ($command ne "Q")) {
       print "1.  Domain               : $WHT$domain$NRM\n";
       print "2.  IMAP Server          : $WHT$imapServerAddress$NRM\n";
       print "3.  IMAP Port            : $WHT$imapPort$NRM\n";
-      print "4.  Use Sendmail         : $WHT$useSendmail$NRM\n";
+      print "4.  Use Sendmail/SMTP    : $WHT";
+      if ($useSendmail eq "true") {
+         print "Sendmail";
+      } else {
+         print "SMTP";
+      }
+      print "$NRM\n";
       if ($useSendmail eq "true") {
          print "5.    Sendmail Path      : $WHT$sendmail_path$NRM\n";
       } else {
@@ -165,15 +294,16 @@ while (($command ne "q") && ($command ne "Q")) {
       print "9.  Auto Expunge               : $WHT$auto_expunge$NRM\n";
       print "10. Default Sub. of INBOX      : $WHT$default_sub_of_inbox$NRM\n";
       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 "\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.  Auto Forward         : $WHT$auto_forward$NRM\n";
-      print "3.  Data Directory       : $WHT$data_dir$NRM\n";
-      print "4.  Attachment Directory : $WHT$attachment_dir$NRM\n";
-      print "5.  Default Left Size    : $WHT$default_left_size$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 "\n";
       print "R   Return to Main Menu\n";
    } elsif ($menu == 5) {
@@ -198,9 +328,52 @@ while (($command ne "q") && ($command ne "Q")) {
       print "\n$motd\n";
       print "\n";
       print "1   Edit the MOTD\n";
+      print "\n";
+      print "R   Return to Main Menu\n";
+   } elsif ($menu == 8) {
+      print $WHT."Plugins\n".$NRM;
+      print "  Installed Plugins\n";
+      $num = 0;
+      for ($count = 0; $count <= $#plugins; $count++) {
+         $num = $count + 1;
+         print "    $num. $plugins[$count]\n";
+      }
+      print "\n  Available Plugins:\n";
+      opendir(DIR, "../plugins");
+      @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") {
+            $match = 0;
+            for ($k=0; $k<=$#plugins; $k++) {
+               if ($plugins[$k] eq $files[$i]) {
+                  $match = 1;
+               }
+            }
+            if ($match == 0) {
+               $unused_plugins[$pos] = $files[$i];
+               $pos++;
+            }
+         }
+      }
+      chdir ("../config");
+      
+      for ($i=0; $i<=$#unused_plugins; $i++) {
+         $num = $num + 1;
+         print "    $num. $unused_plugins[$i]\n"; 
+      }
+      closedir DIR;
+      
       print "\n";
       print "R   Return to Main Menu\n";
    }
+   if ($config_use_color == 1) {
+      print "C.  Turn color off\n";
+   } else {
+      print "C.  Turn color on\n";
+   }
    print "S   Save data\n";
    print "Q   Quit\n";
 
@@ -226,12 +399,22 @@ while (($command ne "q") && ($command ne "Q")) {
       if (($save =~ /^y/i) || ($save =~ /^\s*$/)) {
          save_data ();
        }
-   } elsif (($command eq "d") || ($command eq "D")) {
+   } elsif (($command eq "c") || ($command eq "C")) {
+      if ($config_use_color == 1) {
+         $config_use_color = 2;
+         $WHT = "";
+         $NRM = "";
+      } else {
+         $config_use_color = 1;
+         $WHT = "\x1B[37;1m";
+         $NRM = "\x1B[0m";
+      }
+   } elsif ((($command eq "d") || ($command eq "D")) && $menu == 0) {
       set_defaults ();
    } else {
       $saved = 0;
       if ($menu == 0) {
-         if (($command > 0) && ($command < 8)) {
+         if (($command > 0) && ($command < 9)) {
             $menu = $command;
          }
       } elsif ($menu == 1) {
@@ -259,12 +442,13 @@ while (($command ne "q") && ($command ne "Q")) {
          elsif ($command == 9) { $auto_expunge                   = command29 (); }
          elsif ($command == 10){ $default_sub_of_inbox           = command210(); }
          elsif ($command == 11){ $show_contain_subfolders_option = command211(); }
+         elsif ($command == 12){ $default_unseen_notify          = command212(); }
+         elsif ($command == 13){ $default_unseen_type            = command213(); }
       } elsif ($menu == 4) {
          if    ($command == 1) { $default_charset    = command31 (); }
-         elsif ($command == 2) { $auto_forward       = command32 (); }
-         elsif ($command == 3) { $data_dir           = command33 (); }
-         elsif ($command == 4) { $attachment_dir     = command34 (); }
-         elsif ($command == 5) { $default_left_size  = command35 (); }
+         elsif ($command == 2) { $data_dir           = command33 (); }
+         elsif ($command == 3) { $attachment_dir     = command34 (); }
+         elsif ($command == 4) { $default_left_size  = command35 (); }
       } elsif ($menu == 5) {
          if ($command == 1) { 
             command41 (); 
@@ -273,7 +457,9 @@ while (($command ne "q") && ($command ne "Q")) {
          if    ($command == 1) { command61(); }
          elsif ($command == 2) { command62(); }
       } elsif ($menu == 7) {
-         if    ($command == 1) { $motd = command71 (); $motd =~ s/"/\\"/g;}
+         if    ($command == 1) { $motd             = command71(); }
+      } elsif ($menu == 8) {
+         if    ($command =~ /^[0-9]+/) { @plugins = command81(); }
       }
    }   
 }
@@ -380,14 +566,16 @@ sub command14 {
    print "messages in SquirrelMail.  You can either connect to an SMTP server\n";
    print "or use sendmail directly.\n";
    if ($useSendmail eq "true") {
-      $default_value = "y";
+      $default_value = "1";
    } else {
-      $default_value = "n";
+      $default_value = "2";
    }
    print "\n";
-   print "Use Sendmail (y/n) [$WHT$default_value$NRM]: $WHT";
+   print "  1.  Sendmail\n";
+   print "  2.  SMTP\n";
+   print "Your choice [1/2] [$WHT$default_value$NRM]: $WHT";
    $use_sendmail = <STDIN>;
-   if (($use_sendmail =~ /^y\n/i) || (($use_sendmail =~ /^\n/) && ($default_value eq "y"))) {
+   if (($use_sendmail =~ /^1\n/i) || (($use_sendmail =~ /^\n/) && ($default_value eq "1"))) {
       $useSendmail = "true";
    } else {
       $useSendmail = "false";
@@ -462,19 +650,57 @@ sub command18 {
 sub command71 {
    print "\nYou can now create the welcome message that is displayed\n";
    print "every time a user logs on.  You can use HTML or just plain\n";
-   print "text.\n\n(Type @ on a blank line to exit)\n";
+   print "text.  If you do not wish to have one, just make it blank.\n\n(Type @ on a blank line to exit)\n";
+   
+   $new_motd = "";
    do {
       print "] ";
       $line = <STDIN>;
       $line =~ s/[\r|\n]//g;
-      $line =~ s/  /\&nbsp;\&nbsp;/g;
       if ($line ne "@") {
+         $line =~ s/  /\&nbsp;\&nbsp;/g;
+         $line =~ s/\t/\&nbsp;\&nbsp;\&nbsp;\&nbsp;/g;
+         $line =~ s/$/ /;
+         $line =~ s/\"/\\\"/g;
+
          $new_motd = $new_motd . $line;
       }
    } while ($line ne "@");
    return $new_motd;
 }
 
+################# PLUGINS ###################
+
+sub command81 {
+   $command =~ s/[\s|\n|\r]*//g;
+   if ($command > 0) {  
+      $command = $command - 1;
+      if ($command <= $#plugins) {
+         @newplugins = ();
+         $ct=0;
+         while ($ct <= $#plugins) {
+            if ($ct != $command) {
+               @newplugins = (@newplugins, $plugins[$ct]);
+            }
+            $ct++;
+         }
+         @plugins = @newplugins;
+      } elsif ($command <= $#plugins + $#unused_plugins + 1) {
+         $num = $command - $#plugins - 1;
+         @newplugins = @plugins;
+         $ct=0;
+         while ($ct <= $#unused_plugins) {
+            if ($ct == $num) {
+               @newplugins = (@newplugins, $unused_plugins[$ct]);
+            }
+            $ct++;
+         }
+         @plugins = @newplugins;
+      }
+   }   
+   return @plugins;
+}   
+
 ################# FOLDERS ###################
 
 # default_folder_prefix
@@ -605,8 +831,7 @@ sub command25 {
 sub command26 {
    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";
-   print "to false, messages will get deleted immediately without moving\n";
-   print "to the sent folder.\n";
+   print "to false, messages will get sent an no copy will be made.\n";
    print "\n";
    print "Trash folder is currently: $sent_folder\n";
    print "\n";
@@ -748,6 +973,43 @@ sub command211 {
    return $show_contain_subfolders_option;
 }
 
+# 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";
+   print "can be changed on a user level.\n";
+   print "  1 = No notification\n";
+   print "  2 = Only on the INBOX\n";
+   print "  3 = On all folders\n";
+   print "\n";
+   
+   print "Which one should be default (1,2,3)? [$WHT$default_unseen_notify$NRM]: $WHT";
+   $new_show = <STDIN>;
+   if ($new_show =~ /^[1|2|3]\n/i) {
+      $default_unseen_notify = $new_show;
+   }
+   $default_unseen_notify =~ s/[\r|\n]//g;
+   return $default_unseen_notify;
+}
+
+# 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";
+   print "  1 = Only unseen messages   (4)\n";
+   print "  2 = Unseen and Total messages  (4/27)\n";
+   print "\n";
+   
+   print "Which one should be default (1,2)? [$WHT$default_unseen_type$NRM]: $WHT";
+   $new_show = <STDIN>;
+   if ($new_show =~ /^[1|2]\n/i) {
+      $default_unseen_type = $new_show;
+   }
+   $default_unseen_type =~ s/[\r|\n]//g;
+   return $default_unseen_type;
+}
+
+
 ############# GENERAL OPTIONS #####################
 
 # Default Charset
@@ -769,32 +1031,6 @@ sub command31 {
    return $new_default_charset;
 }
 
-# Auto Forward
-sub command32 {
-   print "There are some places that we will automatically forward the user\n";
-   print "rather than display pointless messages like 'Message sent!' or\n";
-   print "stuff like that.  Use this or not?\n";
-   print "\n";
-   print "NOTE:  This is not working currently as we are trying to find a\n";
-   print "       better way to handle this.  This option really doesn't do\n";
-   print "       much.\n";
-   print "\n";
-   
-   if ($auto_forward eq "true") {
-      $default_value = "y";
-   } else {
-      $default_value = "n";
-   }
-   print "Auto forward (y/n) [$WHT$default_value$NRM]: $WHT";
-   $new_show = <STDIN>;
-   if (($new_show =~ /^y\n/i) || (($new_show =~ /^\n/) && ($default_value eq "y"))) {
-      $auto_forward = "true";
-   } else {
-      $auto_forward = "false";
-   }
-   return $auto_forward;
-}
-
 # Data directory
 sub command33 {
    print "It is a possible security hole to have a writable directory\n";
@@ -912,8 +1148,8 @@ sub command41 {
          $name = <STDIN>;
          $name =~ s/[\r|\n]//g;
          $theme_name[$#theme_name+1] = $name;
-         print "Be sure to put ../config/ before the filename.\n";
-         print "What file is this stored in (ex: ../config/default_theme.php): ";
+         print "Be sure to put ../themes/ before the filename.\n";
+         print "What file is this stored in (ex: ../themes/default_theme.php): ";
          $name = <STDIN>;
          $name =~ s/[\r|\n]//g;
          $theme_path[$#theme_path+1] = $name;
@@ -944,8 +1180,60 @@ sub command41 {
                $theme_default--;
             }   
          }
+      } elsif ($input =~ /^\s*t\s*/i) {
+         print "\nStarting detection...\n\n";
+         
+         opendir(DIR, "../themes");
+         @files = grep { /\.php$/i } readdir(DIR);
+         $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 ($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++;
+         }
+         print "\n";
+         for ($cnt=0; $cnt <= $#theme_path; $cnt++) {
+            $filename = $theme_path[$cnt];
+            if (! (-e $filename)) {
+               print "  Removing $filename (file not found)\n";
+               $offset = 0;
+               @new_theme_name = ();
+               @new_theme_path = ();
+               for ($x=0; $x < $#theme_path; $x++) {
+                  if ($theme_path[$x] eq $filename) {
+                     $offset = 1;
+                  }
+                  if ($offset == 1) {
+                     $new_theme_name[$x] = $theme_name[$x+1];
+                     $new_theme_path[$x] = $theme_path[$x+1];
+                  } else {
+                     $new_theme_name[$x] = $theme_name[$x];
+                     $new_theme_path[$x] = $theme_path[$x];
+                  }
+               }
+               @theme_name = @new_theme_name;
+               @theme_path = @new_theme_path;
+            }
+         }
+         print "\nDetection complete!\n\n";
+         
+         closedir DIR;  
       } elsif ($input =~ /^\s*\?\s*/) {
          print ".-------------------------.\n";
+         print "| t       (detect themes) |\n";
          print "| +           (add theme) |\n";
          print "| - N      (remove theme) |\n";
          print "| m N      (mark default) |\n";
@@ -1107,7 +1395,7 @@ sub command62 {
       $default_use_javascript_addr_book = "false";
       $default_value = "n";
    }
-   print "Use javascript version (y/n) [$WHT$default_value$NRM]: $WHT";
+   print "Use javascript version by default (y/n) [$WHT$default_value$NRM]: $WHT";
    $new_show = <STDIN>;
    if (($new_show =~ /^y\n/i) || (($new_show =~ /^\n/) && ($default_value eq "y"))) {
       $default_use_javascript_addr_book = "true";
@@ -1124,6 +1412,12 @@ 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";
 
+   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 "\t\$org_name   = \"$org_name\";\n";
    print FILE "\t\$org_logo   = \"$org_logo\";\n";
    print FILE "\t\$org_title  = \"$org_title\";\n";
@@ -1136,7 +1430,7 @@ sub save_data {
    print FILE "\t\$useSendmail          =  $useSendmail;\n";
    print FILE "\t\$smtpServerAddress    = \"$smtpServerAddress\";\n";
    print FILE "\t\$smtpPort             =  $smtpPort;\n";
-   print FILE "\t\$sendmailPath         = \"$sendmail_path\";\n";
+   print FILE "\t\$sendmail_path         = \"$sendmail_path\";\n";
    print FILE "\t\$imap_server_type     = \"$imap_server_type\";\n";
    
    print FILE "\n";
@@ -1152,16 +1446,23 @@ sub save_data {
    print FILE "\t\$auto_expunge                     =  $auto_expunge;\n";
    print FILE "\t\$default_sub_of_inbox             =  $default_sub_of_inbox;\n";
    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 "\n";
 
    print FILE "\t\$default_charset   = \"$default_charset\";\n";
-   print FILE "\t\$auto_forward      =  $auto_forward;\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 "\n";
 
+   for ($ct=0; $ct <= $#plugins; $ct++) {
+      print FILE "\t\$plugins[$ct] = \"$plugins[$ct]\";\n";
+   }
+   
+   print FILE "\n";
+
    for ($count=0; $count <= $#theme_name; $count++) {
       print FILE "\t\$theme[$count][\"PATH\"] = \"$theme_path[$count]\";\n";
       print FILE "\t\$theme[$count][\"NAME\"] = \"$theme_name[$count]\";\n";
@@ -1192,7 +1493,6 @@ sub save_data {
       print FILE ");\n\n";
    }
 
-   print FILE "\n";
    print FILE "\t\$motd = \"$motd\";\n";
 
    print FILE "?>\n";
@@ -1201,6 +1501,12 @@ sub save_data {
 
 sub set_defaults {
    system "clear";
+   print $WHT."SquirrelMail Configuration : ".$NRM;
+   if ($config == 1) { print "Read: config.php"; }
+   elsif ($config == 2) { print "Read: config_default.php"; }
+   print "\n";
+   print "---------------------------------------------------------\n";
+
    print "While we have been building SquirrelMail, we have discovered some\n";
    print "preferences that work better with some servers that don't work so\n";
    print "well with others.  If you select your IMAP server, this option will\n";
@@ -1208,7 +1514,7 @@ sub set_defaults {
    print "\n";
    print "Please note that you will still need to go through and make sure\n";
    print "everything is correct.  This does not change everything.  There are\n";
-   print "only a few settings that thils will change.\n";
+   print "only a few settings that this will change.\n";
    print "\n";
 
    $continue = 0;
@@ -1223,8 +1529,9 @@ sub set_defaults {
       $server = <STDIN>;
       $server =~ s/[\r|\n]//g;
 
-      if      ($server eq "cyrus") { 
-			$default_folder_prefix = "";
+      print "\n";
+      if ($server eq "cyrus") { 
+			$default_folder_prefix = "INBOX";
 			$trash_folder = "INBOX.Trash";
 			$sent_folder = "INBOX.Sent";
 			$show_prefix_option = false;
@@ -1232,6 +1539,14 @@ sub set_defaults {
 			$show_contain_subfolders_option = false;
 			$imap_server_type = "cyrus";
 
+         print "         default_folder_prefix = INBOX\n";
+         print "                  trash_folder = INBOX.Trash\n";
+         print "                   sent_folder = INBOX.Sent\n";
+         print "            show_prefix_option = false\n";
+         print "          default_sub_of_inbox = true\n";
+         print "show_contain_subfolders_option = false\n";
+         print "              imap_server_type = cyrus\n";
+
          $continue = 1;
       } elsif ($server eq "uw") {
 			$default_folder_prefix = "mail/";
@@ -1241,6 +1556,14 @@ sub set_defaults {
 			$default_sub_of_inbox = false;
 			$show_contain_subfolders_option = true;
 			$imap_server_type = "uw";
+
+         print "         default_folder_prefix = mail/\n";
+         print "                  trash_folder = Trash\n";
+         print "                   sent_folder = Sent\n";
+         print "            show_prefix_option = true\n";
+         print "          default_sub_of_inbox = false\n";
+         print "show_contain_subfolders_option = true\n";
+         print "              imap_server_type = uw\n";
 			
          $continue = 1;
       } elsif ($server eq "exchange") {
@@ -1250,12 +1573,21 @@ sub set_defaults {
 			$sent_folder = "INBOX/Sent Items";
 			$show_prefix_option = false;
 			$show_contain_subfolders_option = false;
-			
 			$imap_server_type = "exchange";
          
+         print "          default_folder_prefix = INBOX/\n";
+         print "           default_sub_of_inbox = true\n";
+         print "                   trash_folder = \"INBOX/Deleted Items\"\n";
+         print "                    sent_folder = \"INBOX/Sent Items\"\n";
+         print "             show_prefix_option = false\n";
+         print " show_contain_subfolders_option = false\n";
+         print "               imap_server_type = exchange\n";
+         
 			$continue = 1;
       } elsif ($server eq "courier") {
 			$imap_server_type = "courier";
+
+         print "   imap_server_type = courier\n";
 			
          $continue = 1;
 		} elsif ($server eq "quit") {
@@ -1265,4 +1597,6 @@ sub set_defaults {
 			print "\n";
       }
    }   
+   print "\nPress any key to continue...";
+   $tmp = <STDIN>;
 }