Removed quick check to see if users have cookies enabled. Violates the

[squirrelmail.git] / config / conf.pl

diff --git a/config/conf.pl b/config/conf.pl
index ee11dffe2c7fcf2921fb7c38331f7660e7aee132..da4637a1014ae0e7c67e0d768879dd6d2e440a32 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -252,11 +252,6 @@ while (($command ne "q") && ($command ne "Q")) {
       print "8.  Plugins\n";
       print "\n";
       print "D.  Set pre-defined settings for specific IMAP servers\n";
-      if ($config_use_color == 1) {
-         print "C.  Turn color off\n";
-      } else {
-         print "C.  Turn color on\n";
-      }
       print "\n";
    } elsif ($menu == 1) {
       print $WHT."Organization Preferences\n".$NRM;
@@ -374,6 +369,11 @@ while (($command ne "q") && ($command ne "Q")) {
       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";
 
@@ -409,7 +409,7 @@ while (($command ne "q") && ($command ne "Q")) {
          $WHT = "\x1B[37;1m";
          $NRM = "\x1B[0m";
       }
-   } elsif (($command eq "d") || ($command eq "D")) {
+   } elsif ((($command eq "d") || ($command eq "D")) && $menu == 0) {
       set_defaults ();
    } else {
       $saved = 0;
@@ -1430,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";