X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=config%2Fconf.pl;h=90e9b0e2869595d52addc4affe798e5640386da2;hp=bc811a3f51b47fa70ceada116a6f27081be5c863;hb=4da27e4fe5b4d123738277b4f4dc058f7de8a16a;hpb=f923b93d9dfa36c30ee37e77b6117940ef2c5977 diff --git a/config/conf.pl b/config/conf.pl index bc811a3f..90e9b0e2 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -6,7 +6,7 @@ # # $Id$ ############################################################ -$conf_pl_version = "x62"; +$conf_pl_version = "x63"; ############################################################ # Some people try to run this as a CGI. That's wrong! @@ -245,6 +245,9 @@ if (!$optional_delimiter) { if (!$use_authenticated_smtp) { $use_authenticated_smtp = "false"; } +if (!$auto_create_special) { + $auto_create_special = "false"; +} ##################################################################################### if ($config_use_color == 1) { @@ -283,6 +286,7 @@ while (($command ne "q") && ($command ne "Q")) { 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) { @@ -324,6 +328,7 @@ while (($command ne "q") && ($command ne "Q")) { 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 "14. Auto create Sent and Trash : $WHT$auto_create_special$NRM\n"; print "\n"; print "R Return to Main Menu\n"; } elsif ($menu == 4) { @@ -452,6 +457,7 @@ while (($command ne "q") && ($command ne "Q")) { 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 (); } @@ -478,6 +484,7 @@ while (($command ne "q") && ($command ne "Q")) { elsif ($command == 11){ $show_contain_subfolders_option = command211(); } elsif ($command == 12){ $default_unseen_notify = command212(); } elsif ($command == 13){ $default_unseen_type = command213(); } + elsif ($command == 14){ $auto_create_special = command214(); } } elsif ($menu == 4) { if ($command == 1) { $default_charset = command31 (); } elsif ($command == 2) { $data_dir = command33 (); } @@ -568,6 +575,23 @@ sub command4 { 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 @@ -707,6 +731,7 @@ sub command19 { 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") { @@ -1121,6 +1146,28 @@ sub command213 { return $default_unseen_type; } +# Auto create special folders +sub command214 { + print "Would you like the Sent and Trash folders to be created automatically for\n"; + print "you when a user loggs in? If the user accidentally deletes their special\n"; + print "folders, this option will 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 ##################### @@ -1579,7 +1626,7 @@ sub save_data { print FILE "\t\$config_use_color = $config_use_color;\n"; print FILE "\n"; - print FILE "\tglobal \$org_name, \$org_logo, \$org_title;\n"; + print FILE "\tglobal \$org_name, \$org_logo, \$org_title, \$signout_page;\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"; @@ -1610,7 +1657,7 @@ sub save_data { print FILE "\tglobal \$show_prefix_option, \$list_special_folders_first;\n"; print FILE "\tglobal \$use_special_folder_color, \$auto_expunge, \$default_sub_of_inbox;\n"; print FILE "\tglobal \$show_contain_subfolders_option, \$default_unseen_notify;\n"; - print FILE "\tglobal \$default_unseen_type;\n"; + print FILE "\tglobal \$default_unseen_type, \$auto_create_special;\n"; print FILE "\t\$default_folder_prefix = \"$default_folder_prefix\";\n"; print FILE "\t\$trash_folder = \"$trash_folder\";\n"; print FILE "\t\$sent_folder = \"$sent_folder\";\n"; @@ -1624,6 +1671,7 @@ sub save_data { 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 "\t\$auto_create_special = $auto_create_special;\n"; print FILE "\n"; print FILE "\tglobal \$default_charset, \$data_dir, \$attachment_dir;\n"; @@ -1679,7 +1727,6 @@ sub save_data { print FILE "\tglobal \$motd;\n"; print FILE "\t\$motd = \"$motd\";\n"; - print FILE "?>\n"; close FILE; }