X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=config%2Fconf.pl;h=148b6615f6eb1c5ccbaa90fe59044f10709c7cb6;hp=0d116118e71950d0f3de3dc5a48e4530b1a88c01;hb=5810acfad0da5329c455285d6c70f49efc34871d;hpb=029d1fc26037b2b0c3744452ca26970c136d7009 diff --git a/config/conf.pl b/config/conf.pl index 0d116118..148b6615 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -1,14 +1,14 @@ #!/usr/bin/env perl # conf.pl # -# Copyright (c) 1999-2006 The SquirrelMail Project Team +# Copyright (c) 1999-2007 The SquirrelMail Project Team # Licensed under the GNU GPL. For full terms see COPYING. # # A simple configure script to configure SquirrelMail # # $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 enter 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)$/ ) { + } 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]; @@ -344,9 +385,7 @@ $delete_folder = 'false' if ( !$delete_folder ); $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 ); +$provider_name = '' if ( !$provider_name || $provider_name eq 'SquirrelMail'); $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); @@ -426,6 +468,10 @@ $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 ); +$disable_plugins = 'false' if ( !$disable_plugins ); +$disable_plugins_user = '' if ( !$disable_plugins_user ); +$only_secure_cookies = 'true' if ( !$only_secure_cookies ); if ( $ARGV[0] eq '--install-plugin' ) { print "Activating plugin " . $ARGV[1] . "\n"; @@ -442,8 +488,38 @@ if ( $ARGV[0] eq '--install-plugin' ) { @plugins = @newplugins; save_data(); exit(0); +} elsif ( $ARGV[0] eq '--update-plugins' or $ARGV[0] eq '-u') { + build_plugin_hook_array(); + exit(0); +} elsif ( $ARGV[0] eq '--help' or $ARGV[0] eq '-h') { + print "SquirrelMail Configuration Script\n"; + print "Usage:\n"; + print " * No arguments: initiates the configuration dialog\n"; + print " * --install-plugin : activates the specified plugin\n"; + print " * --remove-plugin : deactivates the specified plugin\n"; + print " * --update-plugins , -u : rebuilds plugin_hooks.php according\n"; + print " to plugins activated in config.php\n"; + print " * --help , -h : Displays this help\n"; + print "\n"; + exit(0); } + + +#################################################################################### + +# used in multiple places, define once +$list_supported_imap_servers = + " bincimap = Binc IMAP server\n" . + " courier = Courier IMAP server\n" . + " cyrus = Cyrus IMAP server\n" . + " dovecot = Dovecot Secure IMAP server\n" . + " exchange = Microsoft Exchange IMAP server\n" . + " hmailserver = hMailServer\n" . + " macosx = Mac OS X Mailserver\n" . + " mercury32 = Mercury/32\n" . + " uw = University of Washington's IMAP server\n"; + ##################################################################################### if ( $config_use_color == 1 ) { $WHT = "\x1B[37;1m"; @@ -468,7 +544,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"; @@ -487,7 +563,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { print "5. Signout Page : $WHT$signout_page$NRM\n"; print "6. Top Frame : $WHT$frame_top$NRM\n"; print "7. Provider link : $WHT$provider_uri$NRM\n"; - print "8. Provider name : $WHT$provider_name$NRM\n"; + print "8. Provider link text : $WHT$provider_name$NRM\n"; print "\n"; print "R Return to Main Menu\n"; @@ -582,39 +658,36 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { print "R Return to Main Menu\n"; } elsif ( $menu == 4 ) { print $WHT. "General Options\n" . $NRM; - print "1. Data Directory : $WHT$data_dir$NRM\n"; - print "2. Attachment Directory : $WHT$attachment_dir$NRM\n"; - print "3. Directory Hash Level : $WHT$dir_hash_level$NRM\n"; - print "4. Default Left Size : $WHT$default_left_size$NRM\n"; - print "5. Usernames in Lowercase : $WHT$force_username_lowercase$NRM\n"; - print "6. Allow use of priority : $WHT$default_use_priority$NRM\n"; - print "7. Hide SM attributions : $WHT$hide_sm_attributions$NRM\n"; - print "8. Allow use of receipts : $WHT$default_use_mdn$NRM\n"; - print "9. Allow editing of identity : $WHT$edit_identity$NRM\n"; - print " Allow editing of name : $WHT$edit_name$NRM\n"; - print " Remove username from header : $WHT$hide_auth_header$NRM\n"; - print "10. Disable server thread sort : $WHT$disable_thread_sort$NRM\n"; - print "11. Disable server-side sorting : $WHT$disable_server_sort$NRM\n"; - print "12. Allow server charset search : $WHT$allow_charset_search$NRM\n"; - print "13. Allow advanced search : $WHT$allow_advanced_search$NRM\n"; - print "14. PHP session name : $WHT$session_name$NRM\n"; - print "15. Time zone configuration : $WHT$time_zone_type$NRM\n"; - print "16. Location base : $WHT$config_location_base$NRM\n"; + print "1. Data Directory : $WHT$data_dir$NRM\n"; + print "2. Attachment Directory : $WHT$attachment_dir$NRM\n"; + print "3. Directory Hash Level : $WHT$dir_hash_level$NRM\n"; + print "4. Default Left Size : $WHT$default_left_size$NRM\n"; + print "5. Usernames in Lowercase : $WHT$force_username_lowercase$NRM\n"; + print "6. Allow use of priority : $WHT$default_use_priority$NRM\n"; + print "7. Hide SM attributions : $WHT$hide_sm_attributions$NRM\n"; + print "8. Allow use of receipts : $WHT$default_use_mdn$NRM\n"; + print "9. Allow editing of identity : $WHT$edit_identity$NRM\n"; + print " Allow editing of name : $WHT$edit_name$NRM\n"; + print " Remove username from header : $WHT$hide_auth_header$NRM\n"; + print "10. Disable server thread sort : $WHT$disable_thread_sort$NRM\n"; + print "11. Disable server-side sorting : $WHT$disable_server_sort$NRM\n"; + print "12. Allow server charset search : $WHT$allow_charset_search$NRM\n"; + print "13. Allow advanced search : $WHT$allow_advanced_search$NRM\n"; + print "14. PHP session name : $WHT$session_name$NRM\n"; + print "15. Time zone configuration : $WHT$time_zone_type$NRM\n"; + print "16. Location base : $WHT$config_location_base$NRM\n"; + print "17. Only secure cookies if poss. : $WHT$only_secure_cookies$NRM\n"; 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"; @@ -639,12 +712,18 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { print "\n"; print "R Return to Main Menu\n"; } elsif ( $menu == 8 ) { - print $WHT. "Plugins\n" . $NRM; + if (lc($disable_plugins) eq 'true' && $disable_plugins_user ne '') { + print $WHT. "Plugins (WARNING: All plugins are currently disabled\n for the user \"$disable_plugins_user\"!)\n" . $NRM; + } elsif (lc($disable_plugins) eq 'true') { + print $WHT. "Plugins (WARNING: All plugins are currently disabled!)\n" . $NRM; + } else { + print $WHT. "Plugins\n" . $NRM; + } print " Installed Plugins\n"; $num = 0; for ( $count = 0 ; $count <= $#plugins ; $count++ ) { $num = $count + 1; - print " $num. $plugins[$count]\n"; + print " $num. $plugins[$count]" . get_plugin_version($plugins[$count]) . "\n"; } print "\n Available Plugins:\n"; opendir( DIR, "../plugins" ); @@ -668,11 +747,19 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { for ( $i = 0 ; $i <= $#unused_plugins ; $i++ ) { $num = $num + 1; - print " $num. $unused_plugins[$i]\n"; + print " $num. $unused_plugins[$i]" . get_plugin_version($unused_plugins[$i]) . "\n"; } closedir DIR; print "\n"; + if (lc($disable_plugins) eq 'true' && $disable_plugins_user ne '') { + print "E Enable active plugins (all plugins currently\n disabled for the user \"$disable_plugins_user\")\n"; + } elsif (lc($disable_plugins) eq 'true') { + print "E Enable active plugins (all plugins currently\n disabled)\n"; + } else { + print "D Disable all plugins\n"; + } + print "U Set the user for whom plugins can be disabled\n"; print "R Return to Main Menu\n"; } elsif ( $menu == 9 ) { print $WHT. "Database\n" . $NRM; @@ -703,14 +790,13 @@ 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 "\n"; print $WHT. "PHP tweaks\n" . $NRM; - print "3. Use php recode functions : $WHT$use_php_recode$NRM\n"; - print "4. Use php iconv functions : $WHT$use_php_iconv$NRM\n"; + print "4. Use php recode functions : $WHT$use_php_recode$NRM\n"; + print "5. Use php iconv functions : $WHT$use_php_iconv$NRM\n"; print "\n"; print $WHT. "Configuration tweaks\n" . $NRM; - print "5. Allow remote configtest : $WHT$allow_remote_configtest$NRM\n"; + print "6. Allow remote configtest : $WHT$allow_remote_configtest$NRM\n"; print "\n"; print "R Return to Main Menu\n"; } @@ -836,12 +922,15 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { elsif ( $command == 14 ) { $session_name = command317(); } elsif ( $command == 15 ) { $time_zone_type = command318(); } elsif ( $command == 16 ) { $config_location_base = command_config_location_base(); } + elsif ( $command == 17 ) { $only_secure_cookies = command319(); } } 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(); } @@ -852,7 +941,10 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { } elsif ( $menu == 7 ) { if ( $command == 1 ) { $motd = command71(); } } elsif ( $menu == 8 ) { - if ( $command =~ /^[0-9]+/ ) { @plugins = command81(); } + if ( $command =~ /^[0-9]+/ ) { @plugins = command81(); } + elsif ( $command eq "u" ) { $disable_plugins_user = command82(); } + elsif ( $command eq "d" ) { $disable_plugins = 'true'; } + elsif ( $command eq "e" ) { $disable_plugins = 'false'; } } elsif ( $menu == 9 ) { if ( $command == 1 ) { $addrbook_dsn = command91(); } elsif ( $command == 2 ) { $addrbook_table = command92(); } @@ -873,10 +965,9 @@ 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 ) { $use_php_recode = commandB4(); } - elsif ( $command == 4 ) { $use_php_iconv = commandB5(); } - elsif ( $command == 5 ) { $allow_remote_configtest = commandB6(); } + elsif ( $command == 4 ) { $use_php_recode = commandB4(); } + elsif ( $command == 5 ) { $use_php_iconv = commandB5(); } + elsif ( $command == 6 ) { $allow_remote_configtest = commandB6(); } } } } @@ -1016,8 +1107,8 @@ sub command6 { # Default link to provider sub command7 { - print "Here you can set the link on the right of the page.\n"; - print "If empty, it will link to the SquirrelMail About page.\n"; + print "Here you can set the link on the top-right of the message list.\n"; + print "If empty, it will not be displayed.\n"; print "\n"; print "[$WHT$provider_uri$NRM]: $WHT"; $new_provider_uri = ; @@ -1031,13 +1122,13 @@ sub command7 { } sub command8 { - print "Here you can set the name of the link on the right of the page.\n"; - print "The default is 'SquirrelMail'\n"; + print "Here you can set the name of the link on the top-right of the message list.\n"; + print "The default is empty (do not display anything).'\n"; print "\n"; print "[$WHT$provider_name$NRM]: $WHT"; $new_provider_name = ; if ( $new_provider_name eq "\n" ) { - $new_provider_name = 'SquirrelMail'; + $new_provider_name = ''; } else { $new_provider_name =~ s/[\r\n]//g; $new_provider_name =~ s/^\s+$//g; @@ -1059,7 +1150,7 @@ sub command11 { if ( $new_domain eq "\n" ) { $new_domain = $domain; } else { - $new_domain =~ s/[\r\n]//g; + $new_domain =~ s/\s//g; } return $new_domain; } @@ -1199,14 +1290,7 @@ sub command19 { print "these servers. If you would like to use them, please select your\n"; print "IMAP server. If you do not wish to use these work-arounds, you can\n"; print "set this to \"other\", and none will be used.\n"; - print " courier = Courier IMAP server\n"; - print " cyrus = Cyrus IMAP server\n"; - print " dovecot = Dovecot Secure IMAP server\n"; - print " exchange = Microsoft Exchange IMAP server\n"; - print " hmailserver = hMailServer\n"; - print " macosx = Mac OS X Mailserver\n"; - print " mercury32 = Mercury Mail Transport System\n"; - print " uw = University of Washington's IMAP server\n"; + print $list_supported_imap_servers; print "\n"; print " other = Not one of the above servers\n"; print "\n"; @@ -1447,10 +1531,7 @@ sub command_smtp_sitewide_userpass($) { my $auth_mech = shift(@_); my $default, $tmp; $auth_mech = lc(trim($auth_mech)); - if ($auth_mech ne 'cram-md5' && - $auth_mech ne 'digest-md5' && - $auth_mech ne 'login' && - $auth_mech ne 'plain') { + if ($auth_mech eq 'none') { return; } print "SMTP authentication uses IMAP username and password by default.\n"; @@ -1493,12 +1574,12 @@ sub command_smtp_sitewide_userpass($) { } } else { print "Invalid input. You must set username used for SMTP authentication.\n"; - print "Click any key to continue\n"; + print "Click enter to continue\n"; $tmp = ; } } else { print "Invalid input\n"; - print "Click any key to continue\n"; + print "Click enter to continue\n"; $tmp = ; } } @@ -1640,6 +1721,25 @@ sub command81 { return @plugins; } +# disable_plugins_user +sub command82 { + print "When all active plugins are disabled, they can be disabled only\n"; + print "for the one user named here. If left blank, plugins will be\n"; + print "disabled for ALL users. This setting has no effect if plugins\n"; + print "are not disabled.\n"; + print "\n"; + print "This must be the exact IMAP login name for the desired user.\n"; + print "\n"; + print "[$WHT$disable_plugins_user$NRM]: $WHT"; + $new_disable_plugins_user = ; + if ( $new_disable_plugins_user eq "\n" ) { + $new_disable_plugins_user = $disable_plugins_user; + } else { + $new_disable_plugins_user =~ s/[\r\n]//g; + } + return $new_disable_plugins_user; +} + ################# FOLDERS ################### # default_folder_prefix @@ -2045,7 +2145,7 @@ sub command215 { print "Deleting folders will bypass the trash folder and 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"; + print "Press enter to continue...\n"; $new_delete = ; $delete_folder = 'true'; } else { @@ -2526,20 +2626,79 @@ sub command_config_location_base { return $config_location_base; } +# only_secure_cookies (since 1.5.2) +sub command319 { + print "This option allows you to specify that if a user session is initiated\n"; + print "under a secure (HTTPS, SSL-encrypted) connection, the cookies given to\n"; + print "the browser will ONLY be transmitted via a secure connection henceforth.\n\n"; + print "Generally this is a Good Thing, and should NOT be disabled. However,\n"; + print "if you intend to use the Secure Login or Show SSL Link plugins to\n"; + print "encrypt the user login, but not the rest of the SquirrelMail session,\n"; + print "this can be turned off. Think twice before doing so.\n"; + print "\n"; + if ( lc($only_secure_cookies) eq 'true' ) { + $default_value = "y"; + } else { + $default_value = "n"; + } + print "Transmit cookies only on secure connection when available? (y/n) [$WHT$default_value$NRM]: $WHT"; + $only_secure_cookies = ; + if ( ( $only_secure_cookies =~ /^y\n/i ) || ( ( $only_secure_cookies =~ /^\n/ ) && ( $default_value eq "y" ) ) ) { + $only_secure_cookies = 'true'; + } else { + $only_secure_cookies = 'false'; + } + return $only_secure_cookies; +} -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) > "; + +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"; + + $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 " "; @@ -2547,142 +2706,353 @@ 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 "[theme] command (?=help) > "; + 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 and fallback\n"; + print "themes. The default theme will be used when no icon theme is\n"; + print "set by the user. The fallback theme will be used if an icon\n"; + print "cannot be found in the currently selected icon theme.\n\n"; + + print "Available icon themes:\n\n"; + + $count = 0; + while ( $count <= $#icon_theme_name ) { + if ( $count == $icon_theme_def ) { + print " d"; + } else { + print " "; + } + if ( $count eq $icon_theme_fallback ) { + print "f "; + } 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 d = Default icon theme\n"; + print " f = Fallback icon theme\n"; + 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 "| f N (set fallback icon set) |\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; + print "\n"; + while ( $count <= $#icon_theme_name ) { + if ( $count == $icon_theme_def ) { + print " d"; + } else { + print " "; + } + if ( $count eq $icon_theme_fallback ) { + print "f "; + } else { + 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 d = Default icon theme\n"; + print " f = Fallback icon theme\n\n"; + } 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*f\s*[0-9]+/i ) { + $old_fb = $icon_theme_fallback; + $icon_theme_fallback = $input; + $icon_theme_fallback =~ s/^\s*f\s*//; + if ( ( $icon_theme_fallback > $#icon_theme_name ) || ( $icon_theme_fallback < 0 ) ) { + print "Cannot set fallback icon theme to $icon_theme_fallback. That theme does not exist.\n"; + $icon_theme_fallback = $old_fb; + } + } 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"; + } elsif ( $rem_num == $icon_theme_fallback ) { + print "You cannot remove the fallback 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 "| f N (set fallback icon set) |\n"; + print "| l (list icon themes) |\n"; + print "| d (done) |\n"; + print "`------------------------------------'\n"; + } + 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"; $count = 0; while ( $count <= $#templateset_name ) { - if ( $count == $templateset_default ) { - print " *"; + if ( $templateset_id[$count] eq $templateset_default ) { + print " d"; + } else { + print " "; + } + if ( $templateset_id[$count] eq $templateset_fallback ) { + print "f "; } else { print " "; } @@ -2696,67 +3066,44 @@ sub command_templates { } print " $count. $name"; - print "($templateset_path[$count])\n"; + print "($templateset_id[$count])\n"; $count++; } - -# opendir( DIR, "../templates" ); -# @files = readdir(DIR); -# $pos = 0; -# -# while ( $cnt <= $#files ) { -# if ( -d "../templates/" . $files[$i] && $files[$i] !~ /^\./ && $files[$i] ne "CVS" ) { -# $filename = "../templates/" . $files[$cnt]; -# $found = 0; -# for ( $x = 0 ; $x <= $#templateset_path ; $x++ ) { -# if ( $theme_path[$x] eq $filename ) { -# $found = 1; -# } -# } -# } -# $cnt++; -# } -# for ( $i = 0 ; $i <= $#files ; $i++ ) { -# if ( -d "../templates/" . $files[$i] && $files[$i] !~ /^\./ && $files[$i] ne "CVS" ) { -# $match = 0; -# for ( $k = 0 ; $k <= $#aTemplateSets ; $k++ ) { -# if ( $aTemplateSets[$chosen] eq $files[$i] ) { -# $match = 1; -# } -# } -# if ( $match == 0 ) { -# $unused_plugins[$pos] = $files[$i]; -# $pos++; -# } -# } -# } -# -# for ( $i = 0 ; $i <= $#unused_plugins ; $i++ ) { -# $num = $num + 1; -# print " $num. $unused_plugins[$i]\n"; -# } -# closedir DIR; - + print "\n d = default template set\n" + . " f = fallback template set\n\n"; + + $menu_text = ".-------------------------------------.\n" + . "| t (detect template set) |\n" + . "| + (add template set) |\n" + . "| - N (remove template set) |\n" + . "| m N (mark default template set) |\n" + . "| f N (set fallback 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 ) { - if ( $count == $templateset_default ) { - print " *"; + if ( $templateset_id[$count] eq $templateset_default ) { + print " d"; + } else { + print " "; + } + if ( $templateset_id[$count] eq $templateset_fallback ) { + print "f "; } else { print " "; } @@ -2770,91 +3117,114 @@ sub command_templates { } print " $count. $name"; - print "($templateset_path[$count])\n"; + print "($templateset_id[$count])\n"; $count++; } + print "\n d = default template set\n" + . " f = fallback template set\n\n"; + + # mark default template set + # } elsif ( $input =~ /^\s*m\s*[0-9]+/i ) { $old_def = $templateset_default; - $templateset_default = $input; - $templateset_default =~ s/^\s*m\s*//; - if ( ( $templateset_default > $#templateset_name ) || ( $templateset_default < 0 ) ) { - print "Cannot set default template set to $templateset_default. That template set does not exist.\n"; + $input =~ s/^\s*m\s*//; + $templateset_default = $templateset_id[$input]; + if ( $templateset_default =~ /^\s*$/ ) { + print "Cannot set default template set to $input. That template set does not exist.\n"; $templateset_default = $old_def; } + + # set fallback template set + # + } elsif ( $input =~ /^\s*f\s*[0-9]+/i ) { + $old_def = $templateset_fallback; + $input =~ s/^\s*f\s*//; + $templateset_fallback = $templateset_id[$input]; + if ( $templateset_fallback =~ /^\s*$/ ) { + print "Cannot set fallback template set to $input. That template set does not exist.\n"; + $templateset_fallback = $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; } - $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 eq $filename ) { $templateset_default = 'default'; } + if ( $templateset_fallback eq $filename ) { $templateset_fallback = 'default'; } $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; @@ -2862,35 +3232,36 @@ sub command_templates { } else { $rem_num = $#templateset_name; } - if ( $rem_num == $templateset_default ) { + if ( $templateset_id[$rem_num] eq $templateset_default ) { print "You cannot remove the default template set!\n"; + } elsif ( $templateset_id[$rem_num] eq $templateset_fallback ) { + print "You cannot remove the fallback template set!\n"; } 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; - if ( $templateset_default > $rem_num ) { - $templateset_default--; - } + @templateset_id = @new_templateset_id; } + + # 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; + + # command not understood + # + } else { + print "Command not understood\n"; } + print "[template set] command (?=help) > "; $input = ; $input =~ s/[\r\n]//g; @@ -2899,34 +3270,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"; @@ -3070,7 +3413,11 @@ sub command61 { $sub = $#ldap_host + 1; 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 "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 "note that StartTLS option is not compatible with ldaps and\n"; + print "ldapi URIs.\n"; print "hostname: "; $name = ; $name =~ s/[\r\n]//g; @@ -3903,7 +4250,32 @@ sub commandB6 { return $allow_remote_configtest; } +# 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 "\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 icon themes directory, use ../images/themes/newtheme/\n"; + print " - The icon theme may be outside the SquirrelMail directory, but\n"; + print " it must be web accessible.\n"; + print "[$WHT$icon_theme_def$NRM]: $WHT"; + $new_icon_theme_def = ; + if ( $new_icon_theme_def eq "\n" ) { + $new_icon_theme_def = $icon_theme_def; + } else { + $new_icon_theme_def =~ s/[\r\n]//g; + } + $new_icon_theme_def =~ s/^\s*//; + return $new_icon_theme_def; +} sub save_data { $tab = " "; @@ -4071,6 +4443,11 @@ sub save_data { # string print CF "\$config_location_base = '$config_location_base';\n"; print CF "\n"; + # boolean + print CF "\$disable_plugins = $disable_plugins;\n"; + # string + print CF "\$disable_plugins_user = '$disable_plugins_user';\n"; + print CF "\n"; # all plugins are strings for ( $ct = 0 ; $ct <= $#plugins ; $ct++ ) { @@ -4079,25 +4456,53 @@ 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 <= $#theme_name ; $count++ ) { - print CF "\$theme[$count]['PATH'] = " . &change_to_SM_path($theme_path[$count]) . ";\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 = $theme_name[$count]; + $esc_name = $user_theme_name[$count]; $esc_name =~ s/\\/\\\\/g; $esc_name =~ s/'/\\'/g; - print CF "\$theme[$count]['NAME'] = '$esc_name';\n"; + print CF "\$user_themes[$count]['NAME'] = '$esc_name';\n"; } print CF "\n"; - if ( $templateset_default eq '' ) { $templateset_default = '0'; } - print CF "\$templateset_default = $templateset_default;\n"; + if ( $icon_theme_def eq '' ) { $icon_theme_def = '0'; } + print CF "\$icon_theme_def = $icon_theme_def;\n"; + if ( $icon_theme_fallback eq '' ) { $icon_theme_fallback = '0'; } + print CF "\$icon_theme_fallback = $icon_theme_fallback;\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 = $icon_theme_name[$count]; + $esc_name =~ s/\\/\\\\/g; + $esc_name =~ s/'/\\'/g; + print CF "\$icon_themes[$count]['NAME'] = '$esc_name';\n"; + } + print CF "\n"; + + if ( $templateset_default eq '' ) { $templateset_default = 'default'; } + print CF "\$templateset_default = '$templateset_default';\n"; + + if ( $templateset_fallback eq '' ) { $templateset_fallback = 'default'; } + 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; @@ -4238,17 +4643,19 @@ sub save_data { print CF "\$no_list_for_subscribe = $no_list_for_subscribe;\n"; # string - print CF "\$smtp_auth_mech = '$smtp_auth_mech';\n"; - print CF "\$smtp_sitewide_user = '". quote_single($smtp_sitewide_user) ."';\n"; - print CF "\$smtp_sitewide_pass = '". quote_single($smtp_sitewide_pass) ."';\n"; + print CF "\$smtp_auth_mech = '$smtp_auth_mech';\n"; + print CF "\$smtp_sitewide_user = '". quote_single($smtp_sitewide_user) ."';\n"; + print CF "\$smtp_sitewide_pass = '". quote_single($smtp_sitewide_pass) ."';\n"; # string - print CF "\$imap_auth_mech = '$imap_auth_mech';\n"; + print CF "\$imap_auth_mech = '$imap_auth_mech';\n"; # boolean - print CF "\$use_imap_tls = $use_imap_tls;\n"; + print CF "\$use_imap_tls = $use_imap_tls;\n"; # boolean - print CF "\$use_smtp_tls = $use_smtp_tls;\n"; + print CF "\$use_smtp_tls = $use_smtp_tls;\n"; # string - print CF "\$session_name = '$session_name';\n"; + print CF "\$session_name = '$session_name';\n"; + # boolean + print CF "\$only_secure_cookies = $only_secure_cookies;\n"; print CF "\n"; @@ -4271,6 +4678,9 @@ sub save_data { close CF; print "Data saved in config.php\n"; + + build_plugin_hook_array(); + } else { print "Error saving config.php: $!\n"; } @@ -4297,15 +4707,7 @@ sub set_defaults { $continue = 0; while ( $continue != 1 ) { print "Please select your IMAP server:\n"; - print " bincimap = Binc IMAP server\n"; - print " courier = Courier IMAP server\n"; - print " cyrus = Cyrus IMAP server\n"; - print " dovecot = Dovecot Secure IMAP server\n"; - print " exchange = Microsoft Exchange IMAP server\n"; - print " hmailserver = hMailServer\n"; - print " macosx = Mac OS X Mailserver\n"; - print " mercury32 = Mercury/32\n"; - print " uw = University of Washington's IMAP server\n"; + print $list_supported_imap_servers; print "\n"; print " quit = Do not change anything\n"; print "\n"; @@ -4558,6 +4960,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\///; } @@ -4675,7 +5078,7 @@ sub check_imap_folder($) { if ($folder_name =~ /[\x80-\xFFFF]/) { print "Folder name contains 8bit characters. Configuration utility requires\n"; print "UTF7-IMAP encoded folder names.\n"; - print "Press any key to continue..."; + print "Press enter to continue..."; my $tmp = ; return 0; } elsif ($folder_name =~ /[&\*\%]/) { @@ -4700,3 +5103,262 @@ sub quote_single($) { $string =~ s/\'/\\'/g; return $string; } + +# determine a plugin's version number +# +# parses the setup.php file, looking for the +# version string in the _info() or the +# _version functions. +# +sub get_plugin_version() { + + my $plugin_name = shift(@_); + + $setup_file = '../plugins/' . $plugin_name . '/setup.php'; + if ( -e "$setup_file" ) { + # Make sure that file is readable + if (! -r "$setup_file") { + print "\n"; + print "WARNING:\n"; + print "The file \"$setup_file\" was found, but you don't\n"; + print "have rights to read it. The plugin \""; + print $plugin_name . "\" may not work correctly until you fix this.\n"; + print "\nPress enter to continue"; + $ctu = ; + print "\n"; + next; + } + + $version = ' '; +# FIXME: grep the file instead of reading it into memory? + $whole_file = ''; + open( FILE, "$setup_file" ); + while ( $line = ) { + $whole_file .= $line; + } + close(FILE); + + # ideally, there is a version in the _info function... + # + if ($whole_file =~ /('version'\s*=>\s*['"](.*?)['"])/) { + $version .= $2; + + # this assumes there is only one function that returns + # a static string in the setup file + # + } elsif ($whole_file =~ /(return\s*['"](.*?)['"])/) { + $version .= $2; + } + + return $version; + + } else { + print "\n"; + print "WARNING:\n"; + print "The file \"$setup_file\" was not found.\n"; + print "The plugin \"" . $plugin_name; + print "\" may not work correctly until you fix this.\n"; + print "\nPress enter to continue"; + $ctu = ; + print "\n"; + next; + } + +} + +# parses the setup.php files for all activated plugins and +# builds static plugin hooks array so we don't have to load +# ALL plugins are runtime and build the hook array on every +# page request +# +# hook array is saved in config/plugin_hooks.php +# +# Note the $verbose variable at the top of this routine +# can be set to zero to quiet it down. +# +# NOTE/FIXME: we aren't necessarily interested in writing +# a full-blown PHP parsing engine, so plenty +# of assumptions are included herein about the +# coding of the plugin setup files, and things +# like commented out curly braces or other +# such oddities can break this in a bad way. +# +sub build_plugin_hook_array() { + + $verbose = 1; + + if ($verbose) { + print "\n\n"; + } + + if ( open( HOOKFILE, ">plugin_hooks.php" ) ) { + print HOOKFILE "; + print "\n"; + next; + } + open( FILE, "$setup_file" ); + $inside_init_fxn = 0; + $brace_count = 0; + while ( $line = ) { + + # throw away lines until we get to target function + # + if (!$inside_init_fxn + && $line !~ /^\s*function\s*squirrelmail_plugin_init_/i) { + next; + } + $inside_init_fxn = 1; + + + # count open braces + # + if ($line =~ /{/) { + $brace_count++; + } + + + # count close braces + # + if ($line =~ /}/) { + $brace_count--; + + # leaving _init() function... + if ($brace_count == 0) { + close(FILE); + next PLUGIN; + } + + } + + + # throw away lines that are not exactly one "brace set" deep + # + if ($brace_count > 1) { + next; + } + + + # also not interested in lines that are not + # hook registration points + # + if ($line !~ /^\s*\$squirrelmail_plugin_hooks/i) { + next; + } + + + # if $line does not have an ending semicolon, + # we need to recursively read in subsequent + # lines until we find one + while ( $line !~ /;\s*$/ ) { + $line =~ s/[\n\r]\s*$//; + $line .= ; + } + + + $line =~ s/^\s+//; + $line =~ s/^\$//; + $var = $line; + + $var =~ s/=/EQUALS/; + if ( $var =~ /^([a-z])/i ) { + @options = split ( /\s*EQUALS\s*/, $var ); + $options[1] =~ s/[\n\r]//g; + $options[1] =~ s/[\'\"];\s*$//; + $options[1] =~ s/;$//; + $options[1] =~ s/^[\'\"]//; + # de-escape escaped strings + $options[1] =~ s/\\'/'/g; + $options[1] =~ s/\\\\/\\/g; + + if ( $options[0] =~ /^squirrelmail_plugin_hooks\s*\[\s*['"]([a-z0-9 \/._*-]+)['"]\s*\]\s*\[\s*['"]([0-9a-z._-]+)['"]\s*\]/i ) { + $hook_name = $1; + $hooked_plugin_name = $2; + # Note: if we wanted to stop plugins from registering + # a *different* plugin on a hook, we could catch + # it here, however this has actually proven to be + # a useful *feature* + #if ($hooked_plugin_name ne $plugins[$ct]) { + # print "...plugin is tring to hook in under different name...\n"; + #} + +#FIXME: do we want to count the number of hook registrations for each plugin and warn if a plugin doesn't have any? + # hook registration has been found! + if ($verbose) { + if ($hooked_plugin_name ne $plugins[$ct]) { + print " registering on hook \"" . $hook_name . "\" (as \"$hooked_plugin_name\" plugin)\n"; + } else { + print " registering on hook \"" . $hook_name . "\"\n"; + } + } + $line =~ s/ {2,}/ /g; + $line =~ s/=/\n =/; + print HOOKFILE "\$$line"; + + } + + } + + } + close(FILE); + + } else { + print "\n"; + print "WARNING:\n"; + print "The file \"$setup_file\" was not found.\n"; + print "The plugin \"" . $plugins[$ct]; + print "\" will not be activated until you fix this.\n"; + print "\nPress enter to continue"; + $ctu = ; + print "\n"; + next; + } + + } + + print HOOKFILE "\n\n"; + close(HOOKFILE); +# if ($verbose) { + print "\nDone activating plugins; registration data saved in plugin_hooks.php\n\n"; +# } + + } else { + + print "\n"; + print "WARNING:\n"; + print "The file \"plugin_hooks.php\" was not able to be written to.\n"; + print "No plugins will be activated until you fix this.\n"; + print "\nPress enter to continue"; + $ctu = ; + print "\n"; + + } + +} +