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

diff --git a/config/conf.pl b/config/conf.pl
index 10c673c3..da4637a1 100755
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -4,16 +4,110 @@
 #
 # 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 {
@@ -43,6 +137,9 @@ while ($line = <FILE>) {
             $sub = $options[0];
             $sub =~ s/\]\["PATH"\]//;
             $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];
@@ -108,6 +205,7 @@ while ($line = <FILE>) {
       }   
    }
 }
+close FILE;
 if ($useSendmail ne "true") {
    $useSendmail = "false";
 }
@@ -120,17 +218,29 @@ if (!$default_unseen_notify) {
 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";
@@ -155,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 {
@@ -216,13 +332,48 @@ while (($command ne "q") && ($command ne "Q")) {
       print "R   Return to Main Menu\n";
    } elsif ($menu == 8) {
       print $WHT."Plugins\n".$NRM;
-      print "1   Change Plugins\n";
+      print "  Installed Plugins\n";
+      $num = 0;
       for ($count = 0; $count <= $#plugins; $count++) {
-         print "    >  $plugins[$count]\n";
+         $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";
 
@@ -248,7 +399,17 @@ 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;
@@ -296,9 +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(); }
+         if    ($command == 1) { $motd             = command71(); }
       } elsif ($menu == 8) {
-         if    ($command == 1) { $motd = command81(); }
+         if    ($command =~ /^[0-9]+/) { @plugins = command81(); }
       }
    }   
 }
@@ -405,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";
@@ -487,7 +650,7 @@ 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 {
@@ -509,72 +672,33 @@ sub command71 {
 ################# PLUGINS ###################
 
 sub command81 {
-   print "\nThis is where you can define plugins.  The plugin must already exist in the\n";
-   print "plugins/ directory in order to add them here.  A plugin name is the name of the\n";
-   print "directory that it resides in.  For example, if you have a plugin in the directory\n";
-   print "plugins/myplug, the name is \"myplug\".\n\n";
-   print "[plugins] command (?=help) > ";
-   $input = <STDIN>;
-   $input =~ s/[\r|\n]//g;
-   while ($input ne "d") {
-      if ($input =~ /^\s*l\s*/i) {
-         $count = 0;
-         while ($count <= $#plugins) {
-            print " $count.  $plugins[$count]\n";
-            $count++;
-         }
-         print "\n";
-      } elsif ($input =~ /^\s*\+/) {
-         print "What is the name of this plugin: ";
-         $name = <STDIN>;
-         $name =~ s/[\r|\n]//g;
-
-         if (-e "../plugins/$name") {
-            $exists = 0;
-            for ($m=0; $m <= $#plugins; $m++) {
-               if ($plugins[$m] eq $name) {
-                  $exists = 1;
-               }
+   $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]);
             }
-            if ($exists == 1) {
-               print "\nThat plugin already exists in the list!\n";
-            } else {
-               $plugins[$#plugins+1] = $name;
-            }   
-            print "\n";
-         } else {
-            print "\nThat plugin does not exist in the plugins/ directory!\n\n";
+            $ct++;
          }
-      } elsif ($input =~ /^\s*-\s*[0-9]?/) {
-         if ($input =~ /[0-9]+\s*$/) {
-            $rem_num = $input;
-            $rem_num =~ s/^\s*-\s*//g;
-            $rem_num =~ s/\s*$//;
-         } else {
-            $rem_num = $#plugins;
-         }
-            
-         $count = 0;
-         @new_plugins = ();
-         while ($count <= $#plugins) {
-            if ($count != $rem_num) {
-               @new_plugins = (@new_plugins, $plugins[$count]);
+         @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]);
             }
-            $count++;
+            $ct++;
          }
-         @plugins = @new_plugins;
-      } elsif ($input =~ /^\s*\?\s*/) {
-         print ".-------------------------.\n";
-         print "| +          (add plugin) |\n";
-         print "| - N     (remove plugin) |\n";
-         print "| l        (list plugins) |\n";
-         print "| d                (done) |\n";
-         print "`-------------------------'\n";
+         @plugins = @newplugins;
       }
-      print "[plugins] command (?=help) > ";
-      $input = <STDIN>;
-      $input =~ s/[\r|\n]//g;
-   }
+   }   
+   return @plugins;
 }   
 
 ################# FOLDERS ###################
@@ -1024,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;
@@ -1056,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";
@@ -1236,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";
@@ -1248,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";
@@ -1275,8 +1457,8 @@ sub save_data {
 
    print FILE "\n";
 
-   for ($count=0; $count <= $#plugins; $count++) {
-      print FILE "\t\$plugins[$count] = \"$plugins[$count]\";\n";
+   for ($ct=0; $ct <= $#plugins; $ct++) {
+      print FILE "\t\$plugins[$ct] = \"$plugins[$ct]\";\n";
    }
    
    print FILE "\n";
@@ -1311,7 +1493,6 @@ sub save_data {
       print FILE ");\n\n";
    }
 
-   print FILE "\n";
    print FILE "\t\$motd = \"$motd\";\n";
 
    print FILE "?>\n";
@@ -1320,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";
@@ -1386,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") {