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 "9. POP Before SMTP : $WHT$pop_before_smtp$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 "10. Server : $WHT$imap_server_type$NRM\n";
+ print "11. Invert Time : $WHT$invert_time$NRM\n";
+ print "12. Delimiter : $WHT$optional_delimiter$NRM\n";
print "\n";
print "R Return to Main Menu\n";
} elsif ( $menu == 3 ) {
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 ( $command == 9 ) { $pop_before_smtp = command18a(); }
+ elsif ( $command == 10 ) { $imap_server_type = command19(); }
+ elsif ( $command == 11 ) { $invert_time = command110(); }
+ elsif ( $command == 12 ) { $optional_delimiter = command111(); }
} elsif ( $menu == 3 ) {
if ( $command == 1 ) { $default_folder_prefix = command21(); }
elsif ( $command == 2 ) { $show_prefix_option = command22(); }
return $use_authenticated_smtp;
}
+# pop before SMTP
+sub command18a {
+ print "Do you wish to use POP3 before SMTP? Your server must\n";
+ print "support this in order for SquirrelMail to work with it.\n";
+
+ $YesNo = 'n';
+ $YesNo = 'y' if ( lc($pop_before_smtp) eq "true" );
+
+ print "Use pop before SMTP (y/n) [$WHT$YesNo$NRM]: $WHT";
+
+ $new_pop_before_smtp = <STDIN>;
+ $new_pop_before_smtp =~ tr/yn//cd;
+ return "true" if ( $new_pop_before_smtp eq "y" );
+ return "false" if ( $new_pop_before_smtp eq "n" );
+ return $pop_before_smtp;
+}
+
# imap_server_type
sub command19 {
print "Each IMAP server has its own quirks. As much as we tried to stick\n";
if ($print_config_version) {
print CF "\$config_version = '$print_config_version';\n";
}
- print CF "\$config_use_color = $config_use_color;\n";
+ print CF "\$config_use_color = '$config_use_color';\n";
print CF "\n";
- print CF "\$org_name = \"$org_name\";\n";
+ print CF "\$org_name = '$org_name';\n";
print CF "\$org_logo = '$org_logo';\n";
$org_logo_width |= 0;
$org_logo_height |= 0;
- print CF "\$org_logo_width = $org_logo_width;\n";
- print CF "\$org_logo_height = $org_logo_height;\n";
+ print CF "\$org_logo_width = '$org_logo_width';\n";
+ print CF "\$org_logo_height = '$org_logo_height';\n";
print CF "\$org_title = \"$org_title\";\n";
print CF "\$signout_page = '$signout_page';\n";
print CF "\$frame_top = '$frame_top';\n";
print CF "\$domain = '$domain';\n";
print CF "\$imapServerAddress = '$imapServerAddress';\n";
- print CF "\$imapPort = $imapPort;\n";
- print CF "\$useSendmail = $useSendmail;\n";
+ print CF "\$imapPort = '$imapPort';\n";
+ print CF "\$useSendmail = '$useSendmail';\n";
print CF "\$smtpServerAddress = '$smtpServerAddress';\n";
- print CF "\$smtpPort = $smtpPort;\n";
+ print CF "\$smtpPort = '$smtpPort';\n";
print CF "\$sendmail_path = '$sendmail_path';\n";
- print CF "\$use_authenticated_smtp = $use_authenticated_smtp;\n";
+ print CF "\$use_authenticated_smtp = '$use_authenticated_smtp';\n";
+ print CF "\$pop_before_smtp = '$pop_before_smtp';\n";
print CF "\$imap_server_type = '$imap_server_type';\n";
print CF "\$invert_time = $invert_time;\n";
print CF "\$optional_delimiter = '$optional_delimiter';\n";
print CF "\$trash_folder = '$trash_folder';\n";
print CF "\$sent_folder = '$sent_folder';\n";
print CF "\$draft_folder = '$draft_folder';\n";
- print CF "\$default_move_to_trash = $default_move_to_trash;\n";
- print CF "\$default_move_to_sent = $default_move_to_sent;\n";
- print CF "\$default_save_as_draft = $default_save_as_draft;\n";
- print CF "\$show_prefix_option = $show_prefix_option;\n";
- print CF "\$list_special_folders_first = $list_special_folders_first;\n";
- print CF "\$use_special_folder_color = $use_special_folder_color;\n";
- print CF "\$auto_expunge = $auto_expunge;\n";
- print CF "\$default_sub_of_inbox = $default_sub_of_inbox;\n";
- print CF "\$show_contain_subfolders_option = $show_contain_subfolders_option;\n";
- print CF "\$default_unseen_notify = $default_unseen_notify;\n";
- print CF "\$default_unseen_type = $default_unseen_type;\n";
- print CF "\$auto_create_special = $auto_create_special;\n";
- print CF "\$delete_folder = $delete_folder;\n";
+ print CF "\$default_move_to_trash = '$default_move_to_trash';\n";
+ print CF "\$default_move_to_sent = '$default_move_to_sent';\n";
+ print CF "\$default_save_as_draft = '$default_save_as_draft';\n";
+ print CF "\$show_prefix_option = '$show_prefix_option';\n";
+ print CF "\$list_special_folders_first = '$list_special_folders_first';\n";
+ print CF "\$use_special_folder_color = '$use_special_folder_color';\n";
+ print CF "\$auto_expunge = '$auto_expunge';\n";
+ print CF "\$default_sub_of_inbox = '$default_sub_of_inbox';\n";
+ print CF "\$show_contain_subfolders_option = '$show_contain_subfolders_option';\n";
+ print CF "\$default_unseen_notify = '$default_unseen_notify';\n";
+ print CF "\$default_unseen_type = '$default_unseen_type';\n";
+ print CF "\$auto_create_special = '$auto_create_special';\n";
+ print CF "\$delete_folder = '$delete_folder';\n";
print CF "\n";
print CF "\$default_charset = '$default_charset';\n";
print CF "\$data_dir = '$data_dir';\n";
print CF "\$attachment_dir = \"$attachment_dir\";\n";
- print CF "\$dir_hash_level = $dir_hash_level;\n";
- print CF "\$default_left_size = $default_left_size;\n";
- print CF "\$force_username_lowercase = $force_username_lowercase;\n";
- print CF "\$default_use_priority = $default_use_priority;\n";
- print CF "\$hide_sm_attributions = $hide_sm_attributions;\n";
- print CF "\$default_use_mdn = $default_use_mdn;\n";
- print CF "\$edit_identity = $edit_identity;\n";
- print CF "\$edit_name = $edit_name;\n";
- print CF "\$allow_thread_sort = $allow_thread_sort;\n";
- print CF "\$allow_server_sort = $allow_server_sort;\n";
+ print CF "\$dir_hash_level = '$dir_hash_level';\n";
+ print CF "\$default_left_size = '$default_left_size';\n";
+ print CF "\$force_username_lowercase = '$force_username_lowercase';\n";
+ print CF "\$default_use_priority = '$default_use_priority';\n";
+ print CF "\$hide_sm_attributions = '$hide_sm_attributions';\n";
+ print CF "\$default_use_mdn = '$default_use_mdn';\n";
+ print CF "\$edit_identity = '$edit_identity';\n";
+ print CF "\$edit_name = '$edit_name';\n";
+ print CF "\$allow_thread_sort = '$allow_thread_sort';\n";
+ print CF "\$allow_server_sort = '$allow_server_sort';\n";
print CF "\n";
for ( $ct = 0 ; $ct <= $#plugins ; $ct++ ) {
projects / squirrelmail.git / blobdiff