Added option to disable/enable the use of priority under "General Options"

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1690 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/config/conf.pl b/config/conf.pl
index 5610f64bbeb91b34ca5719e8d40ac2d787484a03..9c3b27b17f72fdb094713e6bc5d121514961d5fc 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -248,6 +248,9 @@ if (!$use_authenticated_smtp) {
 if (!$auto_create_special) {
        $auto_create_special = "false";
 }
 if (!$auto_create_special) {
        $auto_create_special = "false";
 }

+if(!$default_use_priority) {
+        $default_use_priority = "true";
+}

 
 #####################################################################################
 if ($config_use_color == 1) {
 
 #####################################################################################
 if ($config_use_color == 1) {


@@ -340,6 +343,7 @@ while (($command ne "q") && ($command ne "Q")) {
       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 "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 "6.  Allow use of priority  : $WHT$default_use_priority$NRM\n";

       print "\n";
       print "R   Return to Main Menu\n";
    } elsif ($menu == 5) {
       print "\n";
       print "R   Return to Main Menu\n";
    } elsif ($menu == 5) {


@@ -495,6 +499,7 @@ while (($command ne "q") && ($command ne "Q")) {
          elsif ($command == 3) { $attachment_dir           = command34 (); }
          elsif ($command == 4) { $default_left_size        = command35 (); }
         elsif ($command == 5) { $force_username_lowercase = command36 (); }
          elsif ($command == 3) { $attachment_dir           = command34 (); }
          elsif ($command == 4) { $default_left_size        = command35 (); }
         elsif ($command == 5) { $force_username_lowercase = command36 (); }

+        elsif ($command == 6) { $default_use_priority     = command37 (); }

       } elsif ($menu == 5) {
          if    ($command == 1) { command41 (); }
          elsif ($command == 2) { $theme_css = command42 (); }
       } elsif ($menu == 5) {
          if    ($command == 1) { command41 (); }
          elsif ($command == 2) { $theme_css = command42 (); }


@@ -1338,6 +1343,24 @@ sub command36 {
    return "false";
 }
 
    return "false";
 }
 

+sub command37 {
+   print "";
+   print "\n";
+   
+   if ($default_use_priority eq "true") {
+      $default_value = "y";
+   } else {
+      $default_value = "n";
+   }
+   
+   print "Allow users to specify priority of outgoing mail (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";
 
 sub command41 {
    print "\nNow we will define the themes that you wish to use.  If you have added\n";


@@ -1731,11 +1754,13 @@ sub save_data {
 
    print FILE "\tglobal \$default_charset, \$data_dir, \$attachment_dir;\n";
    print FILE "\tglobal \$default_left_size, \$force_username_lowercase;\n";
 
    print FILE "\tglobal \$default_charset, \$data_dir, \$attachment_dir;\n";
    print FILE "\tglobal \$default_left_size, \$force_username_lowercase;\n";

+   print FILE "\tglobal \$default_use_priority;\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 "\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 "\t\$default_use_priority     = $default_use_priority;\n";

 
    print FILE "\n";
 
 
    print FILE "\n";