############################################################
use Cwd;
$dir = cwd();
-if ( $dir =~ /:/ ) {
- $dir = substr($dir, index($dir, ':') + 1);
-}
############################################################
close(FILE);
if ( $config_version ne $conf_pl_version ) {
- system "clear";
+ clear_screen();
print $WHT. "WARNING:\n" . $NRM;
print " The file \"config/config.php\" was found, but it is for\n";
print " an older version of SquirrelMail. It is possible to still\n";
close(FILE);
if ( $config_version ne $conf_pl_version ) {
- system "clear";
+ clear_screen();
print $WHT. "WARNING:\n" . $NRM;
print " You are trying to use a 'config_default.php' from an older\n";
print " version of SquirrelMail. This is HIGHLY unrecommended. You\n";
}
while ( ( $command ne "q" ) && ( $command ne "Q" ) ) {
- system "clear";
+ clear_screen();
print $WHT. "SquirrelMail Configuration : " . $NRM;
if ( $config == 1 ) { print "Read: config.php"; }
elsif ( $config == 2 ) { print "Read: config_default.php"; }
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 "17. Don't move folders into Trash : $WHT$delete_folder$NRM\n";
+ print "17. Folder Delete Bypasses Trash : $WHT$delete_folder$NRM\n";
print "18. Enable /NoSelect folder fix : $WHT$noselect_fix_enable$NRM\n";
print "\n";
print "R Return to Main Menu\n";
print "7. Allow use of priority : $WHT$default_use_priority$NRM\n";
print "8. Hide SM attributions : $WHT$hide_sm_attributions$NRM\n";
print "9. Allow use of receipts : $WHT$default_use_mdn$NRM\n";
- print "10. Allow editing of identity : $WHT$edit_identity$NRM\n";
+ print "10. Allow editing of identity : $WHT$edit_identity$NRM/$WHT$edit_name$NRM\n";
print "11. Allow server thread sort : $WHT$allow_thread_sort$NRM\n";
print "12. Allow server-side sorting : $WHT$allow_server_sort$NRM\n";
- if ( lc($edit_identity) eq "false" ) {
- print "13. Allow editing of name : $WHT$edit_name$NRM\n";
- }
- print "14. Allow server charset search : $WHT$allow_charset_search$NRM\n";
- print "15. Enable UID support : $WHT$uid_support$NRM\n";
- print "16. PHP session name : $WHT$session_name$NRM\n";
+ print "13. Allow server charset search : $WHT$allow_charset_search$NRM\n";
+ print "14. Enable UID support : $WHT$uid_support$NRM\n";
+ print "15. PHP session name : $WHT$session_name$NRM\n";
print "\n";
print "R Return to Main Menu\n";
} elsif ( $menu == 5 ) {
print $WHT. "Themes\n" . $NRM;
print "1. Change Themes\n";
- for ( $count = 0 ; $count <= $#theme_name ; $count++ ) {
- print " > $theme_name[$count]\n";
+ for ( $count = 0 ; $count <= $#theme_name/2 ; $count++ ) {
+ $temp_name = $theme_name[$count*2];
+ printf " %s%*s %s\n", $temp_name,
+ 40 - length($temp_name), " ",
+ $theme_name[($count*2)+1];
}
print "2. CSS File : $WHT$theme_css$NRM\n";
print "\n";
elsif ( $command == 10 ) { $edit_identity = command310(); }
elsif ( $command == 11 ) { $allow_thread_sort = command312(); }
elsif ( $command == 12 ) { $allow_server_sort = command313(); }
- elsif ( $command == 13 ) { $edit_name = command311(); }
- elsif ( $command == 14 ) { $allow_charset_search = command314(); }
- elsif ( $command == 15 ) { $uid_support = command315(); }
- elsif ( $command == 16 ) { $session_name = command316(); }
+ elsif ( $command == 13 ) { $allow_charset_search = command314(); }
+ elsif ( $command == 14 ) { $uid_support = command315(); }
+ elsif ( $command == 15 ) { $session_name = command316(); }
} elsif ( $menu == 5 ) {
if ( $command == 1 ) { command41(); }
elsif ( $command == 2 ) { $theme_css = command42(); }
return $auto_create_special;
}
-# Auto create special folders
+# Automatically delete folders
sub command215 {
- print "Would you like to automatically completely delete any deleted\n";
- print "folders? If not then they will be moved to the Trash folder\n";
- print "and can be deleted from there\n";
- print "\n";
-
- if ( lc($delete_folder) eq "true" ) {
- $default_value = "y";
- } else {
- $default_value = "n";
- }
- print "Auto delete folders? (y/n) [$WHT$default_value$NRM]: $WHT";
- $new_delete = <STDIN>;
- if ( ( $new_delete =~ /^y\n/i ) || ( ( $new_delete =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
+ if ( $imap_server_type == "courier" ) {
+ print "Courier(or Courier-IMAP) IMAP servers do not support ";
+ print "subfolders of Trash. \n";
+ print "Deleting folders will bypass the trash folder and ";
+ print "be immediately deleted.\n\n";
+ print "If this is not the correct value for your server,\n";
+ print "please use option D on the Main Menu to configure your server correctly.\n\n";
+ print "Press any key to continue...\n";
+ $new_delete = <STDIN>;
$delete_folder = "true";
- } else {
- $delete_folder = "false";
+ } elsif ( $imap_server_type == "uw" ) {
+ print "UW IMAP servers will not allow folders containing";
+ print "mail to also contain folders.\n";
+ print "Deleting folders will bypass the trash folder and";
+ print "be immediately deleted\n\n";
+ print "If this is not the correct value for your server,\n";
+ print "please use option D on the Main Menu to configure your server correctly.\n\n";
+ print "Press any key to continue...\n";
+ $new_delete = <STDIN>;
+ $delete_folder = "true";
+ } else {
+ print "Should folders selected for deletion bypass the Trash folder?\n\n";
+ if ( lc($delete_folder) eq "true" ) {
+ $default_value = "y";
+ } else {
+ $default_value = "n";
+ }
+ print "Auto delete folders? (y/n) [$WHT$default_value$NRM]: $WHT";
+ $new_delete = <STDIN>;
+ if ( ( $new_delete =~ /^y\n/i ) || ( ( $new_delete =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
+ $delete_folder = "true";
+ } else {
+ $delete_folder = "false";
+ }
}
return $delete_folder;
}
}
sub command310 {
- print "This allows you to prevent the editing of the users name and";
- print "email address. This is mainly useful when used with the";
+ print "This allows you to prevent the editing of the user's name and ";
+ print "email address. This is mainly useful when used with the ";
print "retrieveuserdata plugin\n";
print "\n";
} else {
$default_value = "n";
}
- print "Allow editing? (y/n) [$WHT$default_value$NRM]: $WHT";
+ print "Allow editing of user's identity? (y/n) [$WHT$default_value$NRM]: $WHT";
$new_edit = <STDIN>;
if ( ( $new_edit =~ /^y\n/i ) || ( ( $new_edit =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
$edit_identity = "true";
+ $edit_name = "true";
} else {
$edit_identity = "false";
+ $edit_name = command311();
}
return $edit_identity;
}
sub command311 {
- print "This option allows you to choose if the user can edit their full name";
- print "even when you don't want them to change their username\n";
+ print "As a follow-up, this option allows you to choose if the user ";
+ print "can edit their full name even when you don't want them to ";
+ print "change their username\n";
print "\n";
if ( lc($edit_name) eq "true" ) {
sub command41 {
- print "\nNow we will define the themes that you wish to use. If you have added\n";
- print "a theme of your own, just follow the instructions (?) about how to add\n";
+ print "\nDefine the themes that you wish to use. If you have added ";
+ print "a theme of your own, just follow the instructions (?) about how to add ";
print "them. You can also change the default theme.\n";
print "[theme] command (?=help) > ";
$input = <STDIN>;
} else {
print " ";
}
+ if ( $count < 10 ) {
+ print " ";
+ }
$name = $theme_name[$count];
- $num_spaces = 25 - length($name);
+ $num_spaces = 35 - length($name);
for ( $i = 0 ; $i < $num_spaces ; $i++ ) {
$name = $name . " ";
}
}
sub set_defaults {
- system "clear";
+ clear_screen();
print $WHT. "SquirrelMail Configuration : " . $NRM;
if ( $config == 1 ) { print "Read: config.php"; }
elsif ( $config == 2 ) { print "Read: config_default.php"; }
$show_contain_subfolders_option = true;
$optional_delimiter = "/";
$disp_default_folder_prefix = $default_folder_prefix;
-
+ $delete_folder = true;
+
$continue = 1;
} elsif ( $server eq "exchange" ) {
$imap_server_type = "exchange";
$show_contain_subfolders_option = false;
$optional_delimiter = ".";
$disp_default_folder_prefix = $default_folder_prefix;
-
+ $delete_folder = true;
+
$continue = 1;
} elsif ( $server eq "macosx" ) {
$imap_server_type = "macosx";
print " default_sub_of_inbox = $default_sub_of_inbox\n";
print "show_contain_subfolders_option = $show_contain_subfolders_option\n";
print " optional_delimiter = $optional_delimiter\n";
+ print " delete_folder = $delete_folder\n";
}
print "\nPress any key to continue...";
$tmp = <STDIN>;
# prepended to the path, if not, then the path will be
# converted to an absolute path, e.g.
# '../images/logo.gif' --> SM_PATH . 'images/logo.gif'
+# '../../someplace/data' --> '/absolute/path/someplace/data'
# 'images/logo.gif' --> SM_PATH . 'config/images/logo.gif'
# '/absolute/path/logo.gif' --> '/absolute/path/logo.gif'
# 'http://whatever/' --> 'http://whatever'
+# $some_var/path --> "$some_var/path"
sub change_to_SM_path() {
my ($old_path) = @_;
my $new_path = '';
# If the path is absolute, don't bother.
return "\'" . $old_path . "\'" if ( $old_path eq '');
return "\'" . $old_path . "\'" if ( $old_path =~ /^(\/|http)/ );
+ return "\'" . $old_path . "\'" if ( $old_path =~ /^\w:\// );
return $old_path if ( $old_path =~ /^\'(\/|http)/ );
- return $old_path if ( $old_path =~ /^(\$|SM_PATH)/);
+ return $old_path if ( $old_path =~ /^\'\w:\// );
+ return $old_path if ( $old_path =~ /^SM_PATH/);
+
+ if ( $old_path =~ /^\$/ ) {
+ # check if it's a single var, or a $var/path combination
+ # if it's $var/path, enclose in ""
+ if ( $old_path =~ /\// ) {
+ return '"'.$old_path.'"';
+ }
+ return $old_path;
+ }
# Remove remaining '
$old_path =~ s/\'//g;
if ( $#rel_path > 1 ) {
# more than two levels away. Make it absolute.
@abs_path = split(/\//, $dir);
-
- # account for leading slash
- shift @abs_path;
-
- foreach $subdir (@rel_path) {
- if ($subdir eq '') {
- pop @abs_path;
- } else {
- push @abs_path, $subdir;
- }
- }
- $new_path = "\'";
- foreach $subdir (@abs_path) {
- $new_path .= '/' . $subdir;
+
+ # Lop off the relative pieces of the absolute path..
+ for ( $i = 0; $i <= $#rel_path; $i++ ) {
+ pop @abs_path;
+ shift @rel_path;
}
- $new_path .= "\'";
+ push @abs_path, @rel_path;
+ $new_path = "\'" . join('/', @abs_path) . "\'";
} elsif ( $#rel_path > 0 ) {
# it's within the SM tree, prepend SM_PATH
$new_path = $old_path;
if ( $old_path =~ /^SM_PATH/ ) {
$new_path =~ s/^SM_PATH . \'/\.\.\//;
- $new_path =~ s/\.\.\/config\///;
+ $new_path =~ s/\.\.\/config\///;
}
return $new_path;
close $sock;
return 'YES';
}
+
+sub clear_screen() {
+ if ( $^O =~ /^mswin/i) {
+ system "cls";
+ } else {
+ system "clear";
+ }
+}
projects / squirrelmail.git / blobdiff