X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=config%2Fconf.pl;h=2f93f3fe5836885d6c3b89e159498364859e416a;hb=9061389cab27ff4e1af6509b7f4031aabed334e8;hp=e65755c3220717858a605696c0c1ae774192ab8b;hpb=51abca0770f8974f73763b8a250516722ef368a2;p=squirrelmail.git diff --git a/config/conf.pl b/config/conf.pl index e65755c3..2f93f3fe 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -8,7 +8,7 @@ # # $Id$ ############################################################ -$conf_pl_version = "1.4.0"; +$conf_pl_version = "1.5.0"; ############################################################ # Check what directory we're supposed to be running in, and @@ -46,6 +46,17 @@ $dir = cwd(); # First, lets read in the data already in there... ############################################################ if ( -e "config.php" ) { + # Make sure that file is readable + if (! -r "config.php") { + clear_screen(); + print "WARNING:\n"; + print "The file \"config/config.php\" was found, but you don't\n"; + print "have rights to read it.\n"; + print "\n"; + print "Press any key to continue"; + $ctu = ; + exit; + } open( FILE, "config.php" ); while ( $line = ) { $line =~ s/^\s+//; @@ -70,7 +81,7 @@ if ( -e "config.php" ) { if ( $config_version ne $conf_pl_version ) { clear_screen(); - print $WHT. "WARNING:\n" . $NRM; + print "WARNING:\n"; 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"; print " read the defaults from this file but be warned that many\n"; @@ -123,7 +134,7 @@ if ( -e "config.php" ) { if ( $config_version ne $conf_pl_version ) { clear_screen(); - print $WHT. "WARNING:\n" . $NRM; + print "WARNING:\n"; print " You are trying to use a 'config_default.php' from an older\n"; print " version of SquirrelMail. This is HIGHLY unrecommended. You\n"; print " should get the 'config_default.php' that matches the version\n"; @@ -175,27 +186,52 @@ while ( $line = ) { $options[1] =~ s/\\'/'/g; $options[1] =~ s/\\\\/\\/g; - if ( $options[0] =~ /^theme\[[0-9]+\]\[['"]PATH['"]\]/ ) { + if ( $options[0] =~ /^user_themes\[[0-9]+\]\[['"]PATH['"]\]/ ) { $sub = $options[0]; $sub =~ s/\]\[['"]PATH['"]\]//; $sub =~ s/.*\[//; - if ( -e "../themes" ) { - $options[1] =~ s/^\.\.\/config/\.\.\/themes/; + if ( -e "../css/" ) { + $options[1] =~ s/^\.\.\/config/\.\.\/css/; } - $theme_path[$sub] = &change_to_rel_path($options[1]); - } elsif ( $options[0] =~ /^theme\[[0-9]+\]\[['"]NAME['"]\]/ ) { + $user_theme_path[$sub] = &change_to_rel_path($options[1]); + } elsif ( $options[0] =~ /^user_themes\[[0-9]+\]\[['"]NAME['"]\]/ ) { $sub = $options[0]; $sub =~ s/\]\[['"]NAME['"]\]//; $sub =~ s/.*\[//; - $theme_name[$sub] = $options[1]; - } elsif ( $options[0] =~ /^aTemplateSet\[[0-9]+\]\[['"]PATH['"]\]/ ) { + $user_theme_name[$sub] = $options[1]; + } elsif ( $options[0] =~ /^icon_themes\[[0-9]+\]\[['"]PATH['"]\]/ ) { $sub = $options[0]; $sub =~ s/\]\[['"]PATH['"]\]//; $sub =~ s/.*\[//; + if ( -e "../images/" ) { + $options[1] =~ s/^\.\.\/config/\.\.\/images/; + } + $icon_theme_path[$sub] = &change_to_rel_path($options[1]); + } elsif ( $options[0] =~ /^icon_themes\[[0-9]+\]\[['"]NAME['"]\]/ ) { + $sub = $options[0]; + $sub =~ s/\]\[['"]NAME['"]\]//; + $sub =~ s/.*\[//; + $icon_theme_name[$sub] = $options[1]; + } elsif ( $options[0] =~ /^aTemplateSet\[[0-9]+\]\[['"]ID['"]\]/ ) { + $sub = $options[0]; + $sub =~ s/\]\[['"]ID['"]\]//; + $sub =~ s/.*\[//; if ( -e "../templates" ) { $options[1] =~ s/^\.\.\/config/\.\.\/templates/; } - $templateset_path[$sub] = &change_to_rel_path($options[1]); + $templateset_id[$sub] = $options[1]; +##### FIXME: This section BELOW here so old prefs files don't blow up when running conf.pl +##### Remove after a month or two +} elsif ( $options[0] =~ /^aTemplateSet\[[0-9]+\]\[['"]PATH['"]\]/ ) { + $sub = $options[0]; + $sub =~ s/\]\[['"]PATH['"]\]//; + $sub =~ s/.*\[//; + if ( -e "../templates" ) { + $options[1] =~ s/^\.\.\/config/\.\.\/templates/; + } + $templateset_id[$sub] = $options[1]; +##### FIXME: This section ABOVE here so old prefs files don't blow up when running conf.pl +##### Remove after a month or two } elsif ( $options[0] =~ /^aTemplateSet\[[0-9]+\]\[['"]NAME['"]\]/ ) { $sub = $options[0]; $sub =~ s/\]\[['"]NAME['"]\]//; @@ -216,6 +252,11 @@ while ( $line = ) { $sub =~ s/\'\]//; $sub =~ s/^fontsets\[\'//; $fontsets{$sub} = $options[1]; + } elsif ( $options[0] =~ /^theme\[[0-9]+\]\[['"]PATH|NAME['"]\]/ ) { + ## + ## $color themes are no longer supported. Please leave this + ## so conf.pl doesn't barf if it encounters a $theme. + ## } elsif ( $options[0] =~ /^ldap_server\[[0-9]+\]/ ) { $sub = $options[0]; $sub =~ s/\]//; @@ -318,7 +359,7 @@ while ( $line = ) { $ldap_writeable[$sub] = $writeable; $ldap_search_tree[$sub] = $search_tree; $ldap_starttls[$sub] = $starttls; - } elsif ( $options[0] =~ /^(data_dir|attachment_dir|theme_css|org_logo|signout_page|icon_theme_def)$/ ) { + } elsif ( $options[0] =~ /^(data_dir|attachment_dir|org_logo|signout_page|icon_theme_def)$/ ) { ${ $options[0] } = &change_to_rel_path($options[1]); } else { ${ $options[0] } = $options[1]; @@ -345,8 +386,6 @@ $noselect_fix_enable = 'false' if ( !$noselect_fix_enable ); $frame_top = "_top" if ( !$frame_top ); $provider_uri = '' if ( !$provider_uri ); $provider_name = '' if ( !$provider_name ); -$edit_identity = 'true' if ( !$edit_identity ); -$edit_name = 'true' if ( !$edit_name ); $no_list_for_subscribe = 'false' if ( !$no_list_for_subscribe ); $allow_charset_search = 'true' if ( !$allow_charset_search ); $allow_advanced_search = 0 if ( !$allow_advanced_search) ; @@ -359,6 +398,9 @@ $default_use_javascript_addr_book = 'false' if (! $default_use_javascript_addr_b # since 1.2.0 $hide_sm_attributions = 'false' if ( !$hide_sm_attributions ); +# since 1.2.5 +$edit_identity = 'true' if ( !$edit_identity ); +$edit_name = 'true' if ( !$edit_name ); # since 1.4.0 $use_smtp_tls= 'false' if ( !$use_smtp_tls); @@ -395,9 +437,6 @@ $prefs_user_size = 128 if ( !$prefs_user_size ); $prefs_key_size = 64 if ( !$prefs_key_size ); $prefs_val_size = 65536 if ( !$prefs_val_size ); -# since 1.5.2 -$icon_theme_def = '' if ( !$icon_theme_def ); - # add qmail-inject test here for backwards compatibility if ( !$sendmail_args && $sendmail_path =~ /qmail-inject/ ) { $sendmail_args = ''; @@ -429,6 +468,7 @@ $abook_file_line_length = 2048 if ( !$abook_file_line_length ); $config_location_base = '' if ( !$config_location_base ); $smtp_sitewide_user = '' if ( !$smtp_sitewide_user ); $smtp_sitewide_pass = '' if ( !$smtp_sitewide_pass ); +$icon_theme_def = '' if ( !$icon_theme_def ); if ( $ARGV[0] eq '--install-plugin' ) { print "Activating plugin " . $ARGV[1] . "\n"; @@ -471,7 +511,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { print "2. Server Settings\n"; print "3. Folder Defaults\n"; print "4. General Options\n"; - print "5. Templates\n"; + print "5. User Interface\n"; print "6. Address Books\n"; print "7. Message of the Day (MOTD)\n"; print "8. Plugins\n"; @@ -606,18 +646,14 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { print "\n"; print "R Return to Main Menu\n"; } elsif ( $menu == 5 ) { - print $WHT. "Themes\n" . $NRM; - print "1. Change Template set\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 "3. Default font size: $WHT$default_fontsize$NRM\n"; - print "4. Change available font sets\n"; - print "5. Change Themes\n"; + print $WHT. "User Interface\n" . $NRM; + print "1. Use Icons? : $WHT$use_icons$NRM\n"; +# print "3. Default Icon Set : $WHT$icon_theme_def$NRM\n"; + print "2. Default font size : $WHT$default_fontsize$NRM\n"; + print "3. Manage template sets\n"; + print "4. Manage user themes\n"; + print "5. Manage font sets\n"; + print "6. Manage icon themes\n"; print "\n"; print "R Return to Main Menu\n"; @@ -706,8 +742,6 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { } elsif ( $menu == 11 ) { print $WHT. "Interface tweaks\n" . $NRM; print "1. Display html mails in iframe : $WHT$use_iframe$NRM\n"; - print "2. Use Icons : $WHT$use_icons$NRM\n"; - print "3. Default Icon Set : $WHT$icon_theme_def$NRM\n"; print "\n"; print $WHT. "PHP tweaks\n" . $NRM; print "4. Use php recode functions : $WHT$use_php_recode$NRM\n"; @@ -841,11 +875,13 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { elsif ( $command == 15 ) { $time_zone_type = command318(); } elsif ( $command == 16 ) { $config_location_base = command_config_location_base(); } } elsif ( $menu == 5 ) { - if ( $command == 1 ) { $templateset_default = command_templates(); } - elsif ( $command == 2 ) { $theme_css = command42(); } - elsif ( $command == 3 ) { $default_fontsize = command_default_fontsize(); } - elsif ( $command == 4 ) { command_fontsets(); } - elsif ( $command == 5 ) { command41(); } + if ( $command == 1 ) { $use_icons = commandB3(); } +# elsif ( $command == 3 ) { $icon_theme_def = commandB7(); } + elsif ( $command == 2 ) { $default_fontsize = command_default_fontsize(); } + elsif ( $command == 3 ) { $templateset_default = command_templates(); } + elsif ( $command == 4 ) { command_userThemes(); } + elsif ( $command == 5 ) { command_fontsets(); } + elsif ( $command == 6 ) { command_iconSets(); } } elsif ( $menu == 6 ) { if ( $command == 1 ) { command61(); } elsif ( $command == 2 ) { command62(); } @@ -877,8 +913,6 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { elsif ( $command == 5 ) { $lossy_encoding = commandA5(); } } elsif ( $menu == 11 ) { if ( $command == 1 ) { $use_iframe = commandB2(); } - elsif ( $command == 2 ) { $use_icons = commandB3(); } - elsif ( $command == 3 ) { $icon_theme_def = commandB7(); } elsif ( $command == 4 ) { $use_php_recode = commandB4(); } elsif ( $command == 5 ) { $use_php_iconv = commandB5(); } elsif ( $command == 6 ) { $allow_remote_configtest = commandB6(); } @@ -2529,19 +2563,52 @@ sub command_config_location_base { } +sub command_userThemes { + print "\nDefine the user themes that you wish to use. If you have added\n"; + print "a theme of your own, just follow the instructions (?) about\n"; + print "how to add them. You can also change the default theme.\n\n"; + + print "Available user themes:\n"; + $count = 0; + while ( $count <= $#user_theme_name ) { + if ( $count == $user_theme_default ) { + print " *"; + } else { + print " "; + } + if ( $count < 10 ) { + print " "; + } + $name = $user_theme_name[$count]; + $num_spaces = 35 - length($name); + for ( $i = 0 ; $i < $num_spaces ; $i++ ) { + $name = $name . " "; + } + + print " $count. $name"; + print "($user_theme_path[$count])\n"; -sub command41 { - 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) > "; + $count++; + } + + print "\n"; + print ".------------------------------------.\n"; + print "| t (detect user themes) |\n"; + print "| + (add user theme) |\n"; + print "| - N (remove user theme) |\n"; + print "| m N (mark default user theme) |\n"; + print "| l (list user themes) |\n"; + print "| d (done) |\n"; + print "`------------------------------------'\n"; + + print "\n[user_themes] command (?=help) > "; $input = ; $input =~ s/[\r\n]//g; while ( $input ne "d" ) { if ( $input =~ /^\s*l\s*/i ) { $count = 0; - while ( $count <= $#theme_name ) { - if ( $count == $theme_default ) { + while ( $count <= $#user_theme_name ) { + if ( $count == $user_theme_default ) { print " *"; } else { print " "; @@ -2549,135 +2616,314 @@ sub command41 { if ( $count < 10 ) { print " "; } - $name = $theme_name[$count]; + $name = $user_theme_name[$count]; $num_spaces = 35 - length($name); for ( $i = 0 ; $i < $num_spaces ; $i++ ) { $name = $name . " "; } print " $count. $name"; - print "($theme_path[$count])\n"; + print "($user_theme_path[$count])\n"; $count++; } } elsif ( $input =~ /^\s*m\s*[0-9]+/i ) { - $old_def = $theme_default; - $theme_default = $input; - $theme_default =~ s/^\s*m\s*//; - if ( ( $theme_default > $#theme_name ) || ( $theme_default < 0 ) ) { - print "Cannot set default theme to $theme_default. That theme does not exist.\n"; - $theme_default = $old_def; + $old_def = $user_theme_default; + $user_theme_default = $input; + $user_theme_default =~ s/^\s*m\s*//; + if ( ( $user_theme_default > $#user_theme_name ) || ( $user_theme_default < 0 ) ) { + print "Cannot set default theme to $user_theme_default. That theme does not exist.\n"; + $user_theme_default = $old_def; } } elsif ( $input =~ /^\s*\+/ ) { - print "What is the name of this theme: "; + print "What is the name of this theme? "; $name = ; $name =~ s/[\r\n]//g; - $theme_name[ $#theme_name + 1 ] = $name; - print "Be sure to put ../themes/ before the filename.\n"; - print "What file is this stored in (ex: ../themes/default_theme.php): "; + $user_theme_name[ $#user_theme_name + 1 ] = $name; + print "Be sure to put ../css/ before the filename.\n"; + print "What file is this stored in (ex: ../css/my_theme/): "; $name = ; $name =~ s/[\r\n]//g; - $theme_path[ $#theme_path + 1 ] = $name; + $user_theme_path[ $#user_theme_path + 1 ] = $name; } elsif ( $input =~ /^\s*-\s*[0-9]?/ ) { if ( $input =~ /[0-9]+\s*$/ ) { $rem_num = $input; $rem_num =~ s/^\s*-\s*//g; $rem_num =~ s/\s*$//; } else { - $rem_num = $#theme_name; + $rem_num = $#user_theme_name; } - if ( $rem_num == $theme_default ) { + if ( $rem_num == $user_theme_default ) { print "You cannot remove the default theme!\n"; } else { $count = 0; @new_theme_name = (); @new_theme_path = (); - while ( $count <= $#theme_name ) { + while ( $count <= $#user_theme_name ) { if ( $count != $rem_num ) { - @new_theme_name = ( @new_theme_name, $theme_name[$count] ); - @new_theme_path = ( @new_theme_path, $theme_path[$count] ); + @new_theme_name = ( @new_theme_name, $user_theme_name[$count] ); + @new_theme_path = ( @new_theme_path, $user_theme_path[$count] ); } $count++; } - @theme_name = @new_theme_name; - @theme_path = @new_theme_path; - if ( $theme_default > $rem_num ) { - $theme_default--; + @user_theme_name = @new_theme_name; + @user_theme_path = @new_theme_path; + if ( $user_theme_default > $rem_num ) { + $user_theme_default--; } } } elsif ( $input =~ /^\s*t\s*/i ) { print "\nStarting detection...\n\n"; - opendir( DIR, "../themes" ); - @files = grep { /\.php$/i } readdir(DIR); + opendir( DIR, "../css" ); + @files = readdir(DIR); $cnt = 0; while ( $cnt <= $#files ) { - $filename = "../themes/" . $files[$cnt]; - if ( $filename ne "../themes/index.php" ) { + $filename = "../css/" . $files[$cnt] .'/'; + if ( $filename ne "../css/rtl.css" && -e $filename . "default.css" ) { $found = 0; - for ( $x = 0 ; $x <= $#theme_path ; $x++ ) { - if ( $theme_path[$x] eq $filename ) { + for ( $x = 0 ; $x <= $#user_theme_path ; $x++ ) { + if ( $user_theme_path[$x] eq $filename ) { $found = 1; } } if ( $found != 1 ) { - print "** Found theme: $filename\n"; + print "** Found user theme: $filename\n"; print " What is its name? "; $nm = ; $nm =~ s/[\n\r]//g; - $theme_name[ $#theme_name + 1 ] = $nm; - $theme_path[ $#theme_path + 1 ] = $filename; + $user_theme_name[ $#user_theme_name + 1 ] = $nm; + $user_theme_path[ $#user_theme_path + 1 ] = $filename; } } $cnt++; } print "\n"; - for ( $cnt = 0 ; $cnt <= $#theme_path ; $cnt++ ) { - $filename = $theme_path[$cnt]; - if ( !( -e $filename ) ) { + for ( $cnt = 0 ; $cnt <= $#user_theme_path ; $cnt++ ) { + $filename = $user_theme_path[$cnt]; + if ( $filename != 'none' && !( -e $filename ."/default.css" ) ) { print " Removing $filename (file not found)\n"; $offset = 0; - @new_theme_name = (); - @new_theme_path = (); - for ( $x = 0 ; $x < $#theme_path ; $x++ ) { - if ( $theme_path[$x] eq $filename ) { + @new_user_theme_name = (); + @new_user_theme_path = (); + for ( $x = 0 ; $x < $#user_theme_path ; $x++ ) { + if ( $user_theme_path[$x] eq $filename ) { $offset = 1; } if ( $offset == 1 ) { - $new_theme_name[$x] = $theme_name[ $x + 1 ]; - $new_theme_path[$x] = $theme_path[ $x + 1 ]; + $new_user_theme_name[$x] = $user_theme_name[ $x + 1 ]; + $new_user_theme_path[$x] = $user_theme_path[ $x + 1 ]; } else { - $new_theme_name[$x] = $theme_name[$x]; - $new_theme_path[$x] = $theme_path[$x]; + $new_user_theme_name[$x] = $user_theme_name[$x]; + $new_user_theme_path[$x] = $user_theme_path[$x]; } } - @theme_name = @new_theme_name; - @theme_path = @new_theme_path; + @user_theme_name = @new_user_theme_name; + @user_theme_path = @new_user_theme_path; } } print "\nDetection complete!\n\n"; closedir DIR; } elsif ( $input =~ /^\s*\?\s*/ ) { - print ".-------------------------.\n"; - print "| t (detect themes) |\n"; - print "| + (add theme) |\n"; - print "| - N (remove theme) |\n"; - print "| m N (mark default) |\n"; - print "| l (list themes) |\n"; - print "| d (done) |\n"; - print "`-------------------------'\n"; + print ".------------------------------------.\n"; + print "| t (detect user themes) |\n"; + print "| + (add user theme) |\n"; + print "| - N (remove user theme) |\n"; + print "| m N (mark default user theme) |\n"; + print "| l (list user themes) |\n"; + print "| d (done) |\n"; + print "`------------------------------------'\n"; + } + print "[user_themes] command (?=help) > "; + $input = ; + $input =~ s/[\r\n]//g; + } +} + +sub command_iconSets { + print "\nDefine the icon themes that you wish to use. If you have added\n"; + print "a theme of your own, just follow the instructions (?) about\n"; + print "how to add them. You can also change the default theme.\n\n"; + + print "Available icon themes:\n\n"; + + $count = 0; + while ( $count <= $#icon_theme_name ) { + if ( $count == $icon_theme_def ) { + print " *"; + } else { + print " "; + } + if ( $count < 10 ) { + print " "; + } + $name = $icon_theme_name[$count]; + $num_spaces = 35 - length($name); + for ( $i = 0 ; $i < $num_spaces ; $i++ ) { + $name = $name . " "; + } + + print " $count. $name"; + print "($icon_theme_path[$count])\n"; + + $count++; + } + + print "\n"; + print ".------------------------------------.\n"; + print "| t (detect icon themes) |\n"; + print "| + (add icon theme) |\n"; + print "| - N (remove icon theme) |\n"; + print "| m N (mark default icon theme) |\n"; + print "| l (list icon themes) |\n"; + print "| d (done) |\n"; + print "`------------------------------------'\n"; + + print "\n[icon_themes] command (?=help) > "; + $input = ; + $input =~ s/[\r\n]//g; + while ( $input ne "d" ) { + if ( $input =~ /^\s*l\s*/i ) { + $count = 0; + while ( $count <= $#icon_theme_name ) { + if ( $count == $icon_theme_def ) { + print " *"; + } else { + print " "; + } + if ( $count < 10 ) { + print " "; + } + $name = $icon_theme_name[$count]; + $num_spaces = 35 - length($name); + for ( $i = 0 ; $i < $num_spaces ; $i++ ) { + $name = $name . " "; + } + + print " $count. $name"; + print "($icon_theme_path[$count])\n"; + + $count++; + } + } elsif ( $input =~ /^\s*m\s*[0-9]+/i ) { + $old_def = $icon_theme_def; + $icon_theme_def = $input; + $icon_theme_def =~ s/^\s*m\s*//; + if ( ( $icon_theme_default > $#icon_theme_name ) || ( $icon_theme_default < 0 ) ) { + print "Cannot set default icon theme to $icon_theme_default. That theme does not exist.\n"; + $icon_theme_def = $old_def; + } + } elsif ( $input =~ /^\s*\+/ ) { + print "What is the name of this icon theme? "; + $name = ; + $name =~ s/[\r\n]//g; + $icon_theme_name[ $#icon_theme_name + 1 ] = $name; + print "Be sure to put ../images/themes/ before the filename.\n"; + print "What directory is this icon theme stored in (ex: ../images/themes/my_theme/)? "; + $name = ; + $name =~ s/[\r\n]//g; + $icon_theme_path[ $#icon_theme_path + 1 ] = $name; + } elsif ( $input =~ /^\s*-\s*[0-9]?/ ) { + if ( $input =~ /[0-9]+\s*$/ ) { + $rem_num = $input; + $rem_num =~ s/^\s*-\s*//g; + $rem_num =~ s/\s*$//; + } else { + $rem_num = $#icon_theme_name; + } + if ( $rem_num == $icon_theme_def ) { + print "You cannot remove the default icon theme!\n"; + } else { + $count = 0; + @new_theme_name = (); + @new_theme_path = (); + while ( $count <= $#icon_theme_name ) { + if ( $count != $rem_num ) { + @new_theme_name = ( @new_theme_name, $icon_theme_name[$count] ); + @new_theme_path = ( @new_theme_path, $icon_theme_path[$count] ); + } + $count++; + } + @icon_theme_name = @new_theme_name; + @icon_theme_path = @new_theme_path; + if ( $icon_theme_def > $rem_num ) { + $icon_theme_def--; + } + } + } elsif ( $input =~ /^\s*t\s*/i ) { + print "\nStarting detection...\n\n"; + + opendir( DIR, "../images/themes/" ); + @files = readdir(DIR); + $cnt = 0; + while ( $cnt <= $#files ) { + $filename = "../images/themes/" . $files[$cnt] .'/'; + if ( -d "../images/themes/" . $files[$cnt] && $files[$cnt] !~ /^\./ && $files[$cnt] ne "CVS" ) { + $found = 0; + for ( $x = 0 ; $x <= $#icon_theme_path ; $x++ ) { + if ( $icon_theme_path[$x] eq $filename ) { + $found = 1; + } + } + if ( $found != 1 ) { + print "** Found icon theme: $filename\n"; + print " What is its name? "; + $nm = ; + $nm =~ s/[\n\r]//g; + $icon_theme_name[ $#icon_theme_name + 1 ] = $nm; + $icon_theme_path[ $#icon_theme_path + 1 ] = $filename; + } + } + $cnt++; + } + print "\n"; + for ( $cnt = 0 ; $cnt <= $#icon_theme_path ; $cnt++ ) { + $filename = $icon_theme_path[$cnt]; + if ( $filename ne "none" && $filename ne "template" && ! -d $filename ) { + print " Removing $filename (file not found)\n"; + $offset = 0; + @new_icon_theme_name = (); + @new_icon_theme_path = (); + for ( $x = 0 ; $x < $#icon_theme_path ; $x++ ) { + if ( $icon_theme_path[$x] eq $filename ) { + $offset = 1; + } + if ( $offset == 1 ) { + $new_icon_theme_name[$x] = $icon_theme_name[ $x + 1 ]; + $new_icon_theme_path[$x] = $icon_theme_path[ $x + 1 ]; + } else { + $new_icon_theme_name[$x] = $icon_theme_name[$x]; + $new_icon_theme_path[$x] = $icon_theme_path[$x]; + } + } + @icon_theme_name = @new_icon_theme_name; + @icon_theme_path = @new_icon_theme_path; + } + } + print "\nDetection complete!\n\n"; + + closedir DIR; + } elsif ( $input =~ /^\s*\?\s*/ ) { + print ".------------------------------------.\n"; + print "| t (detect icon themes) |\n"; + print "| + (add icon theme) |\n"; + print "| - N (remove icon theme) |\n"; + print "| m N (mark default icon theme) |\n"; + print "| l (list icon themes) |\n"; + print "| d (done) |\n"; + print "`------------------------------------'\n"; } - print "[theme] command (?=help) > "; + print "[icon_themes] command (?=help) > "; $input = ; $input =~ s/[\r\n]//g; } } sub command_templates { - print "\nDefine the template sets that you wish to use. If you have added "; - print "a template set of your own, just follow the instructions (?) about how to add "; - print "them. You can also change the default template.\n"; + print "\nDefine the template sets that you wish to use. If you have added\n"; + print "a template set of your own, just follow the instructions (?) about\n"; + print "how to add them. You can also change the default template.\n"; print "\n Available Templates:\n"; @@ -2698,11 +2944,12 @@ sub command_templates { } print " $count. $name"; - print "($templateset_path[$count])\n"; + print "($templateset_id[$count])\n"; $count++; } +# FIXME: what is this stuff? it is commented out, can we just blast it? # opendir( DIR, "../templates" ); # @files = readdir(DIR); # $pos = 0; @@ -2711,7 +2958,7 @@ sub command_templates { # if ( -d "../templates/" . $files[$i] && $files[$i] !~ /^\./ && $files[$i] ne "CVS" ) { # $filename = "../templates/" . $files[$cnt]; # $found = 0; -# for ( $x = 0 ; $x <= $#templateset_path ; $x++ ) { +# for ( $x = 0 ; $x <= $#templateset_id ; $x++ ) { # if ( $theme_path[$x] eq $filename ) { # $found = 1; # } @@ -2740,20 +2987,26 @@ sub command_templates { # } # closedir DIR; + $menu_text = ".-------------------------------------.\n" + . "| t (detect template set) |\n" + . "| + (add template set) |\n" + . "| - N (remove template set) |\n" + . "| m N (mark default template set) |\n" + . "| l (list template sets) |\n" + . "| d (done) |\n" + . "|-------------------------------------|\n" + . "| where N is a template set number |\n" + . "`-------------------------------------'\n"; print "\n"; - print ".--------------------------------.\n"; - print "| t (detect templates set) |\n"; - print "| + (add template set) |\n"; - print "| - N (remove template set) |\n"; - print "| m N (mark template set) |\n"; - print "| l (list template set) |\n"; - print "| d (done) |\n"; - print "`--------------------------------'\n"; + print $menu_text; print "\n[template set] command (?=help) > "; $input = ; $input =~ s/[\r\n]//g; while ( $input ne "d" ) { + + # list template sets + # if ( $input =~ /^\s*l\s*/i ) { $count = 0; while ( $count <= $#templateset_name ) { @@ -2772,10 +3025,13 @@ sub command_templates { } print " $count. $name"; - print "($templateset_path[$count])\n"; + print "($templateset_id[$count])\n"; $count++; } + + # mark default template set + # } elsif ( $input =~ /^\s*m\s*[0-9]+/i ) { $old_def = $templateset_default; $templateset_default = $input; @@ -2784,79 +3040,89 @@ sub command_templates { print "Cannot set default template set to $templateset_default. That template set does not exist.\n"; $templateset_default = $old_def; } + + # add template set + # } elsif ( $input =~ /^\s*\+/ ) { - print "What is the name of this template: "; + print "\nWhat is the name of this template (as shown to your users): "; $name = ; $name =~ s/[\r\n]//g; $templateset_name[ $#templateset_name + 1 ] = $name; - print "Be sure to put ../templates/ before the dirname.\n"; - print "What file is this stored in (ex: ../templates/default/): "; + print "\n\nThe directory name should not contain any path information\n" + . "or slashes, and should be the name of the directory that the\n" + . "template set is found in within the SquirrelMail templates\n" + . "directory.\n\n"; + print "What directory is this stored in (ex: default_advanced): "; $name = ; $name =~ s/[\r\n]//g; - $templateset_path[ $#templateset_path + 1 ] = $name; + $templateset_id[ $#templateset_id + 1 ] = $name; + + # detect template sets + # } elsif ( $input =~ /^\s*t\s*/i ) { print "\nStarting detection...\n\n"; opendir( DIR, "../templates" ); @files = readdir(DIR); $cnt = 0; - $detected = 0; while ( $cnt <= $#files ) { if ( -d "../templates/" . $files[$cnt] && $files[$cnt] !~ /^\./ && $files[$cnt] ne "CVS" ) { - $filename = "../templates/" . $files[$cnt]. "/"; + $filename = $files[$cnt]; $found = 0; - for ( $x = 0 ; $x <= $#templateset_path ; $x++ ) { - if ( $templateset_path[$x] eq $filename ) { + for ( $x = 0 ; $x <= $#templateset_id ; $x++ ) { + if ( $templateset_id[$x] eq $filename ) { $found = 1; + last; } } - if ( $found != 1 && $detected == 0) { - $templateset_path[ $#templateset_path + 1 ] = $filename; - $templateset_name[ $#templateset_name + 1 ] = "Default template"; - $aTemplateSet[ $#templateset_name + 1 ] = "Default template"; - $aTemplateSet[ $#templateset_path + 1 ] = $filename; - } elsif ( $found != 1) { + if ( $found != 1) { print "** Found template set: $filename\n"; - print " What is it's name? "; + print " What is it's name (as shown to your users)? "; $nm = ; $nm =~ s/[\n\r]//g; - $templateset_path[ $#templateset_path + 1 ] = $filename; + $templateset_id[ $#templateset_id + 1 ] = $filename; $templateset_name[ $#templateset_name + 1 ] = $nm; - - $aTemplateSet[ $#templateset_name + 1 ] = $nm; - $aTemplateSet[ $#templateset_path + 1 ] = $filename; +# FIXME: why are these two lines here? +# $aTemplateSet[ $#templateset_name + 1 ] = $nm; +# $aTemplateSet[ $#templateset_id + 1 ] = $filename; } - $detected++; } $cnt++; } print "\n"; - for ( $cnt = 0 ; $cnt <= $#templateset_path ; $cnt++ ) { - $filename = $templateset_path[$cnt]; - if ( !(-d $filename) ) { - print " Removing $filename (file not found)\n"; + for ( $cnt= 0 ; $cnt <= $#templateset_id ; ) { + $filename = $templateset_id[$cnt]; + if ( !(-d change_to_rel_path('SM_PATH . \'templates/' . $filename)) ) { + print " Removing \"$filename\" (template set directory not found)\n"; + if ( $templateset_default gt $cnt ) { $templateset_default--; } + elsif ( $templateset_default eq $cnt ) { $templateset_default = 0; } $offset = 0; @new_templateset_name = (); - @new_templateset_path = (); - for ( $x = 0 ; $x < $#templateset_path ; $x++ ) { - if ( $templateset_path[$x] eq $filename ) { + @new_templateset_id = (); + for ( $x = 0 ; $x < $#templateset_id ; $x++ ) { + if ( $templateset_id[$x] eq $filename ) { $offset = 1; } if ( $offset == 1 ) { $new_templateset_name[$x] = $templateset_name[ $x + 1 ]; - $new_theme_path[$x] = $templateset_path[ $x + 1 ]; + $new_templateset_id[$x] = $templateset_id[ $x + 1 ]; } else { $new_templateset_name[$x] = $templateset_name[$x]; - $new_templateset_path[$x] = $templateset_path[$x]; + $new_templateset_id[$x] = $templateset_id[$x]; } } @templateset_name = @new_templateset_name; - @templateset_path = @new_templateset_path; - } + @templateset_id = @new_templateset_id; + } else { $cnt++; } } print "\nDetection complete!\n\n"; closedir DIR; - } elsif ( $input =~ /^\s*-\s*[0-9]?/ ) { + + # remove template set + # + # undocumented functionality of removing last template set isn't that great + #} elsif ( $input =~ /^\s*-\s*[0-9]?/ ) { + } elsif ( $input =~ /^\s*-\s*[0-9]+/ ) { if ( $input =~ /[0-9]+\s*$/ ) { $rem_num = $input; $rem_num =~ s/^\s*-\s*//g; @@ -2869,29 +3135,25 @@ sub command_templates { } else { $count = 0; @new_templateset_name = (); - @new_templateset_path = (); + @new_templateset_id = (); while ( $count <= $#templateset_name ) { if ( $count != $rem_num ) { @new_templateset_name = ( @new_templateset_name, $templateset_name[$count] ); - @new_templateset_path = ( @new_templateset_path, $templateset_path[$count] ); + @new_templateset_id = ( @new_templateset_id, $templateset_id[$count] ); } $count++; } @templateset_name = @new_templateset_name; - @templateset_path = @new_templateset_path; + @templateset_id = @new_templateset_id; if ( $templateset_default > $rem_num ) { $templateset_default--; } } + + # help + # } elsif ( $input =~ /^\s*\?\s*/ ) { - print ".--------------------------------.\n"; - print "| t (detect templates set) |\n"; - print "| + (add template set) |\n"; - print "| - N (remove template set) |\n"; - print "| m N (mark template set) |\n"; - print "| l (list template set) |\n"; - print "| d (done) |\n"; - print "`--------------------------------'\n"; + print $menu_text; } print "[template set] command (?=help) > "; $input = ; @@ -2901,34 +3163,6 @@ sub command_templates { } -# Theme - CSS file -sub command42 { - print "You may specify a cascading style-sheet (CSS) file to be included\n"; - print "on each html page generated by SquirrelMail. The CSS file is useful\n"; - print "for specifying a site-wide font. If you're not familiar with CSS\n"; - print "files, leave this blank.\n"; - print "\n"; - print "To clear out an existing value, just type a space for the input.\n"; - print "\n"; - print "Please be aware of the following: \n"; - print " - Relative URLs are relative to the config dir\n"; - print " to use the themes directory, use ../themes/css/newdefault.css\n"; - print " - To specify a css file defined outside the SquirrelMail source tree\n"; - print " use the absolute URL the webserver would use to include the file\n"; - print " e.g. http://some.host.com/css/mystyle.css or /css/mystyle.css\n"; - print "\n"; - print "[$WHT$theme_css$NRM]: $WHT"; - $new_theme_css = ; - - if ( $new_theme_css eq "\n" ) { - $new_theme_css = $theme_css; - } else { - $new_theme_css =~ s/[\r\n]//g; - } - $new_theme_css =~ s/^\s*//; - return $new_theme_css; -} - # sets default font size option sub command_default_fontsize { print "Enter default font size [$WHT$$default_fontsize$NRM]: $WHT"; @@ -3073,10 +3307,10 @@ sub command61 { print "First, we need to have the hostname or the IP address where\n"; print "this LDAP server resides. Example: ldap.bigfoot.com\n"; - print "\n"; - print "You can use any URI compatible with your LDAP library. Please\n"; + print "\n"; + print "You can use any URI compatible with your LDAP library. Please\n"; print "note that StartTLS option is not compatible with ldaps and\n"; - print "ldapi URIs.\n"; + print "ldapi URIs.\n"; print "hostname: "; $name = ; $name =~ s/[\r\n]//g; @@ -3911,11 +4145,11 @@ sub commandB6 { # Default Icon theme sub commandB7 { - print "You may change the path to the default icon theme to be used, if icons\n"; - print "have been enabled. This theme will be used when an icon cannot be\n"; - print "found in the current theme, or when no icon theme is specified. If\n"; - print "left blank, and icons are enabled, the default theme will be used\n"; - print "from images/themes/default/.\n"; + print "You may change the path to the default icon theme to be used, if icons\n"; + print "have been enabled. This theme will be used when an icon cannot be\n"; + print "found in the current theme, or when no icon theme is specified. If\n"; + print "left blank, and icons are enabled, the default theme will be used\n"; + print "from images/themes/default/.\n"; print "\n"; print "To clear out an existing value, just type a space for the input.\n"; print "\n"; @@ -4110,25 +4344,55 @@ sub save_data { print CF "\n"; # strings - print CF "\$theme_css = " . &change_to_SM_path($theme_css) . ";\n"; - if ( $theme_default eq '' ) { $theme_default = '0'; } - print CF "\$theme_default = $theme_default;\n"; + if ( $user_theme_default eq '' ) { $user_theme_default = '0'; } + print CF "\$user_theme_default = $user_theme_default;\n"; + + for ( $count = 0 ; $count <= $#user_theme_name ; $count++ ) { + if ($user_theme_path[$count] eq 'none') { + $path = '\'none\''; + } else { + $path = &change_to_SM_path($user_theme_path[$count]); + } + print CF "\$user_themes[$count]['PATH'] = " . $path . ";\n"; + # escape theme name so it can contain single quotes. + $esc_name = $user_theme_name[$count]; + $esc_name =~ s/\\/\\\\/g; + $esc_name =~ s/'/\\'/g; + print CF "\$user_themes[$count]['NAME'] = '$esc_name';\n"; + } + print CF "\n"; + + if ( $icon_theme_def eq '' ) { $icon_theme_def = '0'; } + print CF "\$icon_theme_def = $icon_theme_def;\n"; - for ( $count = 0 ; $count <= $#theme_name ; $count++ ) { - print CF "\$theme[$count]['PATH'] = " . &change_to_SM_path($theme_path[$count]) . ";\n"; + for ( $count = 0 ; $count <= $#icon_theme_name ; $count++ ) { + $path = $icon_theme_path[$count]; + if ($path eq 'none' || $path eq 'template') { + $path = "'".$path."'"; + } else { + $path = &change_to_SM_path($icon_theme_path[$count]); + } + print CF "\$icon_themes[$count]['PATH'] = " . $path . ";\n"; # escape theme name so it can contain single quotes. - $esc_name = $theme_name[$count]; + $esc_name = $icon_theme_name[$count]; $esc_name =~ s/\\/\\\\/g; $esc_name =~ s/'/\\'/g; - print CF "\$theme[$count]['NAME'] = '$esc_name';\n"; + print CF "\$icon_themes[$count]['NAME'] = '$esc_name';\n"; } print CF "\n"; if ( $templateset_default eq '' ) { $templateset_default = '0'; } print CF "\$templateset_default = $templateset_default;\n"; +# FIXME: need to make this a setting the user can change herein +# This REALLY needs to be done, since the index of the "default" +# set cannot always be predicted! +# Heck, why are default and fallback indexes? If we make them +# into the ID strings, then it would not cause such issues +$templateset_fallback = 0; + print CF "\$templateset_fallback = $templateset_fallback;\n"; for ( $count = 0 ; $count <= $#templateset_name ; $count++ ) { - print CF "\$aTemplateSet[$count]['PATH'] = " . &change_to_SM_path($templateset_path[$count]) . ";\n"; + print CF "\$aTemplateSet[$count]['ID'] = '" . $templateset_id[$count] . "';\n"; # escape theme name so it can contain single quotes. $esc_name = $templateset_name[$count]; $esc_name =~ s/\\/\\\\/g; @@ -4289,8 +4553,6 @@ sub save_data { # boolean print CF "\$use_icons = $use_icons;\n"; print CF "\n"; - # string - print CF "\$icon_theme_def = " . &change_to_SM_path($icon_theme_def) . ";\n"; # boolean print CF "\$use_php_recode = $use_php_recode;\n"; print CF "\n"; @@ -4591,6 +4853,7 @@ sub change_to_rel_path() { my $new_path = $old_path; if ( $old_path =~ /^SM_PATH/ ) { + # FIXME: the following replacement loses the opening quote mark! $new_path =~ s/^SM_PATH . \'/\.\.\//; $new_path =~ s/\.\.\/config\///; }