X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=config%2Fconf.pl;h=4360f04703ef784ac4544b515ba2e1c8e6f31001;hb=0fe622fddabb599b799d8fa7d65d8f423e11a3bd;hp=b454fb44059b98e1d399abc6fdeb6974a69d0bcc;hpb=40ba4d36052da54f044e9b966ef7c60d16c21215;p=squirrelmail.git diff --git a/config/conf.pl b/config/conf.pl index b454fb44..4360f047 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -3,8 +3,10 @@ # Luke Ehresman (luke@squirrelmail.org) # # A simple configure script to configure squirrelmail +# +# $Id$ ############################################################ -$conf_pl_version = "x62"; +$conf_pl_version = "x63"; ############################################################ # Some people try to run this as a CGI. That's wrong! @@ -240,6 +242,12 @@ if (!$force_username_lowercase) { 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) { @@ -277,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) { @@ -296,27 +306,31 @@ 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 "10. Delimiter : $WHT$optional_delimiter$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) { print $WHT."Folder Defaults\n".$NRM; - print "1. Default Folder Prefix : $WHT$default_folder_prefix$NRM\n"; - print "2. Show Folder Prefix Option : $WHT$show_prefix_option$NRM\n"; - print "3. Trash Folder : $WHT$trash_folder$NRM\n"; - print "4. Sent Folder : $WHT$sent_folder$NRM\n"; - print "5. By default, move to trash : $WHT$default_move_to_trash$NRM\n"; - print "6. By default, move to sent : $WHT$default_move_to_sent$NRM\n"; - print "7. List Special Folders First : $WHT$list_special_folders_first$NRM\n"; - print "8. Show Special Folders Color : $WHT$use_special_folder_color$NRM\n"; - 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 "1. Default Folder Prefix : $WHT$default_folder_prefix$NRM\n"; + print "2. Show Folder Prefix Option : $WHT$show_prefix_option$NRM\n"; + print "3. Trash Folder : $WHT$trash_folder$NRM\n"; + print "4. Sent Folder : $WHT$sent_folder$NRM\n"; + print "5. Drafts Folder : $WHT$draft_folder$NRM\n"; + print "6. By default, move to trash : $WHT$default_move_to_trash$NRM\n"; + print "7. By default, move to sent : $WHT$default_move_to_sent$NRM\n"; + print "8. By default, save as draft : $WHT$default_save_as_draft$NRM\n"; + print "9. List Special Folders First : $WHT$list_special_folders_first$NRM\n"; + print "10. Show Special Folders Color : $WHT$use_special_folder_color$NRM\n"; + print "11. Auto Expunge : $WHT$auto_expunge$NRM\n"; + print "12. Default Sub. of INBOX : $WHT$default_sub_of_inbox$NRM\n"; + print "13. Show 'Contain Sub.' Option : $WHT$show_contain_subfolders_option$NRM\n"; + print "14. Default Unseen Notify : $WHT$default_unseen_notify$NRM\n"; + print "15. Default Unseen Type : $WHT$default_unseen_type$NRM\n"; + print "16. Auto Create Special Folders : $WHT$auto_create_special$NRM\n"; print "\n"; print "R Return to Main Menu\n"; } elsif ($menu == 4) { @@ -444,31 +458,37 @@ 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 (); } - elsif ($command == 10) { $optional_delimiter = command110 (); } + 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 (); } - elsif ($command == 3) { $trash_folder = command23 (); } - elsif ($command == 4) { $sent_folder = command24 (); } - elsif ($command == 5) { $default_move_to_trash = command25 (); } - elsif ($command == 6) { $default_move_to_sent = command26 (); } - elsif ($command == 7) { $list_special_folders_first = command27 (); } - elsif ($command == 8) { $use_special_folder_color = command28 (); } - 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(); } + if ($command == 1) { $default_folder_prefix = command21 (); } + elsif ($command == 2) { $show_prefix_option = command22 (); } + elsif ($command == 3) { $trash_folder = command23a (); } + elsif ($command == 4) { $sent_folder = command23b (); } + elsif ($command == 5) { $draft_folder = command23c (); } + elsif ($command == 6) { $default_move_to_trash = command24a (); } + elsif ($command == 7) { $default_move_to_sent = command24b (); } + elsif ($command == 8) { $default_save_as_draft = command24c (); } + elsif ($command == 9) { $list_special_folders_first = command27 (); } + elsif ($command == 10) { $use_special_folder_color = command28 (); } + elsif ($command == 11) { $auto_expunge = command29 (); } + elsif ($command == 12) { $default_sub_of_inbox = command210(); } + elsif ($command == 13) { $show_contain_subfolders_option = command211(); } + elsif ($command == 14) { $default_unseen_notify = command212(); } + elsif ($command == 15) { $default_unseen_type = command213(); } + elsif ($command == 16) { $auto_create_special = command214(); } } elsif ($menu == 4) { if ($command == 1) { $default_charset = command31 (); } elsif ($command == 2) { $data_dir = command33 (); } @@ -541,6 +561,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 = ; + 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 = ; + 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 @@ -649,8 +704,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 = ; + $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"; @@ -661,6 +735,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 = ; if ($new_imap_server_type eq "\n") { @@ -672,7 +747,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"; @@ -694,7 +769,7 @@ sub command19 { return $invert_time; } -sub command110 { +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"; @@ -826,7 +901,7 @@ sub command22 { } # Trash Folder -sub command23 { +sub command23a { print "You can now specify where the default trash folder is located.\n"; print "On servers where you do not want this, you can set it to anything\n"; print "and set option 7 to false.\n"; @@ -848,7 +923,7 @@ sub command23 { } # Sent Folder -sub command24 { +sub command23b { print "This is where messages that are sent will be stored. SquirrelMail\n"; print "by default puts a copy of all outgoing messages in this folder.\n"; print "\n"; @@ -868,8 +943,30 @@ sub command24 { return $new_sent_folder; } +# Draft Folder +sub command23c { + print "You can now specify where the default draft folder is located.\n"; + print "On servers where you do not want this, you can set it to anything\n"; + print "and set option 9 to false.\n"; + print "\n"; + print "This is relative to where the rest of your email is kept. You do\n"; + print "not need to worry about their mail directory. If this folder\n"; + print "would be ~/mail/drafts on the filesystem, you only need to specify\n"; + print "that this is 'drafts', and be sure to put 'mail/' in option 1.\n"; + print "\n"; + + print "[$WHT$draft_folder$NRM]: $WHT"; + $new_draft_folder = ; + if ($new_draft_folder eq "\n") { + $new_draft_folder = $draft_folder; + } else { + $new_draft_folder =~ s/[\r|\n]//g; + } + return $new_draft_folder; +} + # default move to trash -sub command25 { +sub command24a { print "By default, should messages get moved to the trash folder? You\n"; print "can specify the default trash folder in option 3. If this is set\n"; print "to false, messages will get deleted immediately without moving\n"; @@ -894,7 +991,7 @@ sub command25 { } # default move to sent -sub command26 { +sub command24b { 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 sent an no copy will be made.\n"; @@ -917,6 +1014,30 @@ sub command26 { return $default_move_to_sent; } +# default save as draft +sub command24c { + print "By default, should the save to draft option be shown? You can\n"; + print "specify the default drafts folder in option 5. If this is set\n"; + print "to false, users will not be shown the save to draft option.\n"; + print "\n"; + print "Drafts folder is currently: $draft_folder\n"; + print "\n"; + + if ($default_move_to_draft eq "true") { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "By default, save as draft (y/n) [$WHT$default_value$NRM]: $WHT"; + $new_show = ; + if (($new_show =~ /^y\n/i) || (($new_show =~ /^\n/) && ($default_value eq "y"))) { + $default_save_as_draft = "true"; + } else { + $default_save_as_draft = "false"; + } + return $default_save_as_draft; +} + # List special folders first sub command27 { print "SquirrelMail has what we call 'special folders' that are not\n"; @@ -1075,6 +1196,29 @@ sub command213 { return $default_unseen_type; } +# Auto create special folders +sub command214 { + print "Would you like the Sent, Trash, and Drafts folders to be created\n"; + print "automatically print for you when a user logs in? If the user\n"; + print "accidentally deletes their special folders, this option will\n"; + print "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 = ; + 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 ##################### @@ -1521,37 +1665,59 @@ sub save_data { print FILE "\n"; close FILE; } @@ -1645,17 +1820,19 @@ sub set_defaults { print "\n"; if ($server eq "cyrus") { - $default_folder_prefix = "INBOX"; + $default_folder_prefix = ""; $trash_folder = "INBOX.Trash"; $sent_folder = "INBOX.Sent"; + $draft_folder = "INBOX.Drafts"; $show_prefix_option = false; $default_sub_of_inbox = true; $show_contain_subfolders_option = false; $imap_server_type = "cyrus"; - print " default_folder_prefix = INBOX\n"; + print " default_folder_prefix = none\n"; print " trash_folder = INBOX.Trash\n"; print " sent_folder = INBOX.Sent\n"; + print " draft_folder = INBOX.Drafts\n"; print " show_prefix_option = false\n"; print " default_sub_of_inbox = true\n"; print "show_contain_subfolders_option = false\n"; @@ -1666,6 +1843,7 @@ sub set_defaults { $default_folder_prefix = "mail/"; $trash_folder = "Trash"; $sent_folder = "Sent"; + $draft_folder = "Drafts"; $show_prefix_option = true; $default_sub_of_inbox = false; $show_contain_subfolders_option = true; @@ -1674,6 +1852,7 @@ sub set_defaults { print " default_folder_prefix = mail/\n"; print " trash_folder = Trash\n"; print " sent_folder = Sent\n"; + print " draft_folder = Drafts\n"; print " show_prefix_option = true\n"; print " default_sub_of_inbox = false\n"; print "show_contain_subfolders_option = true\n"; @@ -1681,18 +1860,20 @@ 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"; + $drafts_folder = "INBOX/Drafts"; $show_prefix_option = false; $show_contain_subfolders_option = false; $imap_server_type = "exchange"; - print " default_folder_prefix = INBOX/\n"; + print " default_folder_prefix = \n"; print " default_sub_of_inbox = true\n"; print " trash_folder = \"INBOX/Deleted Items\"\n"; print " sent_folder = \"INBOX/Sent Items\"\n"; + print " draft_folder = \"INBOX/Drafts\"\n"; print " show_prefix_option = false\n"; print " show_contain_subfolders_option = false\n"; print " imap_server_type = exchange\n";