X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=config%2Fconf.pl;h=8f75be145bb66c517d745a82a3337f3c4b1028e6;hp=d928d0a314334ed675e2c089a06441037433bb86;hb=f94f306d2612ca37a97a3e6d3bae3e13e964eba4;hpb=ca885a4ff4cc1175af8db97bab02f7aa74ced73a diff --git a/config/conf.pl b/config/conf.pl index d928d0a3..8f75be14 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 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/\]//; @@ -286,6 +327,11 @@ while ( $line = ) { $tmp =~ s/[\'\"]?,?\s*$//; $tmp =~ s/[\'\"]?\);\s*$//; $listing = $tmp; + } elsif ( $tmp =~ /^\s*[\'\"]writeable[\'\"]/i ) { + $tmp =~ s/^\s*[\'\"]writeable[\'\"]\s*=>\s*[\'\"]?//i; + $tmp =~ s/[\'\"]?,?\s*$//; + $tmp =~ s/[\'\"]?\);\s*$//; + $writeable = $tmp; } elsif ( $tmp =~ /^\s*[\'\"]search_tree[\'\"]/i ) { $tmp =~ s/^\s*[\'\"]search_tree[\'\"]\s*=>\s*[\'\"]?//i; $tmp =~ s/[\'\"]?,?\s*$//; @@ -310,9 +356,10 @@ while ( $line = ) { $ldap_protocol[$sub] = $protocol; $ldap_limit_scope[$sub] = $limit_scope; $ldap_listing[$sub] = $listing; + $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]; @@ -339,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) ; @@ -353,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); @@ -415,6 +463,13 @@ $use_smtp_tls = 1 if ( $use_smtp_tls eq 'true'); $disable_thread_sort = 'false' if ( !$disable_thread_sort ); $disable_server_sort = 'false' if ( !$disable_server_sort ); +# since 1.5.2 +$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"; push @plugins, $ARGV[1]; @@ -456,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"; @@ -499,7 +554,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { print "4. IMAP Server : $WHT$imapServerAddress$NRM\n"; print "5. IMAP Port : $WHT$imapPort$NRM\n"; print "6. Authentication type : $WHT$imap_auth_mech$NRM\n"; - print "7. Secure IMAP (TLS) : $WHT$use_imap_tls$NRM\n"; + print "7. Secure IMAP (TLS) : $WHT" . display_use_tls($use_imap_tls) . "$NRM\n"; print "8. Server software : $WHT$imap_server_type$NRM\n"; print "9. Delimiter : $WHT$optional_delimiter$NRM\n"; print "\n"; @@ -515,8 +570,8 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { print "4. SMTP Server : $WHT$smtpServerAddress$NRM\n"; print "5. SMTP Port : $WHT$smtpPort$NRM\n"; print "6. POP before SMTP : $WHT$pop_before_smtp$NRM\n"; - print "7. SMTP Authentication : $WHT$smtp_auth_mech$NRM\n"; - print "8. Secure SMTP (TLS) : $WHT$use_smtp_tls$NRM\n"; + print "7. SMTP Authentication : $WHT$smtp_auth_mech" . display_smtp_sitewide_userpass() ."$NRM\n"; + print "8. Secure SMTP (TLS) : $WHT" . display_use_tls($use_smtp_tls) . "$NRM\n"; print "9. Header encryption key : $WHT$encode_header_key$NRM\n"; print "\n"; } @@ -587,21 +642,18 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { 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 "\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"; @@ -615,6 +667,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { print "3. Global address book file : $WHT$abook_global_file$NRM\n"; print "4. Allow writing into global file address book : $WHT$abook_global_file_writeable$NRM\n"; print "5. Allow listing of global file address book : $WHT$abook_global_file_listing$NRM\n"; + print "6. Allowed address book line length : $WHT$abook_file_line_length$NRM\n"; print "\n"; print "R Return to Main Menu\n"; } elsif ( $menu == 7 ) { @@ -689,14 +742,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"; } @@ -821,18 +873,22 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { elsif ( $command == 13 ) { $allow_advanced_search = command316(); } elsif ( $command == 14 ) { $session_name = command317(); } 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(); } elsif ( $command == 3 ) { $abook_global_file=command63(); } elsif ( $command == 4 ) { command64(); } elsif ( $command == 5 ) { command65(); } + elsif ( $command == 6 ) { command_abook_file_line_length(); } } elsif ( $menu == 7 ) { if ( $command == 1 ) { $motd = command71(); } } elsif ( $menu == 8 ) { @@ -857,10 +913,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(); } } } } @@ -951,8 +1006,6 @@ sub command3 { print "If your Organization Title includes a '\$', please precede it with a \\. \n"; print "Other '\$' will be considered the beginning of a variable that\n"; print "must be defined before the \$org_title is printed.\n"; - print "\$version, for example can be used, and will print the\n"; - print "string representing the current SquirrelMail version.\n"; print "\n"; print "[$WHT$org_title$NRM]: $WHT"; $new_org_title = ; @@ -1018,7 +1071,7 @@ 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 "The default is 'SquirrelMail'\n"; print "\n"; print "[$WHT$provider_name$NRM]: $WHT"; $new_provider_name = ; @@ -1027,6 +1080,7 @@ sub command8 { } else { $new_provider_name =~ s/[\r\n]//g; $new_provider_name =~ s/^\s+$//g; + $new_provider_name =~ s/\'/\\'/g; } return $new_provider_name; } @@ -1159,26 +1213,6 @@ sub command17 { return $new_smtpPort; } -# authenticated server -sub command18 { - return; - # This sub disabled by tassium - it has been replaced with smtp_auth_mech - print "Do you wish to use an authenticated SMTP server? Your server must\n"; - print "support this in order for SquirrelMail to work with it. We implemented\n"; - print "it according to RFC 2554.\n"; - - $YesNo = 'n'; - $YesNo = 'y' if ( lc($use_authenticated_smtp) eq 'true' ); - - print "Use authenticated SMTP server (y/n) [$WHT$YesNo$NRM]: $WHT"; - - $new_use_authenticated_smtp = ; - $new_use_authenticated_smtp =~ tr/yn//cd; - return 'true' if ( $new_use_authenticated_smtp eq "y" ); - return 'false' if ( $new_use_authenticated_smtp eq "n" ); - return $use_authenticated_smtp; -} - # pop before SMTP sub command18a { print "Do you wish to use POP3 before SMTP? Your server must\n"; @@ -1272,8 +1306,11 @@ sub command111 { # Now offers to detect supported mechs, assuming server & port are set correctly sub command112a { - if ($use_imap_tls =~ /^true\b/i) { - print "Auto-detection of login methods is unavailable when using TLS.\n"; + if ($use_imap_tls ne "0") { + # 1. Script does not handle TLS. + # 2. Server does not have to declare all supported authentication mechs when + # STARTTLS is used. Supported mechs are declared only after STARTTLS. + print "Auto-detection of login methods is unavailable when using TLS or STARTTLS.\n"; } else { print "If you have already set the hostname and port number, I can try to\n"; print "detect the mechanisms your IMAP server supports.\n"; @@ -1335,9 +1372,10 @@ sub command112a { # SMTP authentication type # Possible choices: none, plain, cram-md5, digest-md5 sub command112b { - if ($use_smtp_tls =~ /^true\b/i) { - print "Auto-detection of login methods is unavailable when using TLS.\n"; - } else { + if ($use_smtp_tls ne "0") { + print "Auto-detection of login methods is unavailable when using TLS or STARTTLS.\n"; + } elsif (eval ("use IO::Socket; 1")) { + # try loading IO::Socket module print "If you have already set the hostname and port number, I can try to\n"; print "automatically detect some of the mechanisms your SMTP server supports.\n"; print "Auto-detection is *optional* - you can safely say \"n\" here.\n"; @@ -1351,7 +1389,6 @@ sub command112b { # Special case! # Check none by trying to relay to junk@microsoft.com $host = $smtpServerAddress . ':' . $smtpPort; - use IO::Socket; my $sock = IO::Socket::INET->new($host); print "Testing none:\t\t$WHT"; if (!defined($sock)) { @@ -1425,16 +1462,94 @@ sub command112b { $inval=; chomp($inval); if ($inval =~ /^none\b/i) { - # SMTP doesn't necessarily require logins - return "none"; + # remove sitewide smtp authentication information + $smtp_sitewide_user = ''; + $smtp_sitewide_pass = ''; + # SMTP doesn't necessarily require logins + return "none"; + } elsif ( ($inval =~ /^cram-md5\b/i) || ($inval =~ /^digest-md5\b/i) || + ($inval =~ /^login\b/i) || ($inval =~/^plain\b/i)) { + command_smtp_sitewide_userpass($inval); + return lc($inval); + } elsif (trim($inval) eq '') { + # user selected default value + command_smtp_sitewide_userpass($smtp_auth_mech); + return $smtp_auth_mech; + } else { + # user entered garbage + return $smtp_auth_mech; } - if ( ($inval =~ /^cram-md5\b/i) || ($inval =~ /^digest-md5\b/i) || - ($inval =~ /^login\b/i) || ($inval =~/^plain\b/i)) { - return lc($inval); +} + +sub command_smtp_sitewide_userpass($) { + # get first function argument + my $auth_mech = shift(@_); + my $default, $tmp; + $auth_mech = lc(trim($auth_mech)); + if ($auth_mech eq 'none') { + return; + } + print "SMTP authentication uses IMAP username and password by default.\n"; + print "\n"; + print "Would you like to use other login and password for all SquirrelMail \n"; + print "SMTP connections?"; + if ($smtp_sitewide_user ne '') { + $default = 'y'; + print " [Yn]:"; + } else { + $default = 'n'; + print " [yN]:"; + } + $tmp=; + $tmp = trim($tmp); + + if ($tmp eq '') { + $tmp = $default; } else { - # user entered garbage, or default value so nothing needs to be set - return $smtp_auth_mech; + $tmp = lc($tmp); + } + + if ($tmp eq 'n') { + $smtp_sitewide_user = ''; + $smtp_sitewide_pass = ''; + } elsif ($tmp eq 'y') { + print "Enter username [$smtp_sitewide_user]:"; + my $new_user = ; + $new_user = trim($new_user); + if ($new_user ne '') { + $smtp_sitewide_user = $new_user; + } + if ($smtp_sitewide_user ne '') { + print "If you don't enter any password, current sitewide password will be used.\n"; + print "If you enter space, password will be set to empty string.\n"; + print "Enter password:"; + my $new_pass = ; + if ($new_pass ne "\n") { + $smtp_sitewide_pass = trim($new_pass); + } + } else { + print "Invalid input. You must set username used for SMTP authentication.\n"; + print "Click enter to continue\n"; + $tmp = ; + } + } else { + print "Invalid input\n"; + print "Click enter to continue\n"; + $tmp = ; + } +} + +# Sub adds information about SMTP authentication type to menu +sub display_smtp_sitewide_userpass() { + my $ret = ''; + if ($smtp_auth_mech ne 'none') { + if ($smtp_sitewide_user ne '') { + $ret = ' (with custom username and password)'; + } else { + $ret = ' (with IMAP username and password)'; + } } + return $ret; } # TLS @@ -1468,6 +1583,19 @@ sub command_use_tls { return $default_val; } +# This sub is used to display human readable text for +# $use_imap_tls and $use_smtp_tls values in conf.pl menu +sub display_use_tls($) { + my $val = shift(@_); + my $ret = 'disabled'; + if ($val eq '2') { + $ret = 'STARTTLS'; + } elsif ($val eq '1') { + $ret = 'TLS'; + } + return $ret; +} + # $encode_header_key sub command114{ print "Encryption key allows to hide SquirrelMail Received: headers\n"; @@ -1632,7 +1760,11 @@ sub command23a { if ( $new_trash_folder eq "\n" ) { $new_trash_folder = $trash_folder; } else { - $new_trash_folder =~ s/[\r\n]//g; + if (check_imap_folder($new_trash_folder)) { + $new_trash_folder =~ s/[\r\n]//g; + } else { + $new_trash_folder = $trash_folder; + } } return $new_trash_folder; } @@ -1653,7 +1785,11 @@ sub command23b { if ( $new_sent_folder eq "\n" ) { $new_sent_folder = $sent_folder; } else { - $new_sent_folder =~ s/[\r\n]//g; + if (check_imap_folder($new_sent_folder)) { + $new_sent_folder =~ s/[\r\n]//g; + } else { + $new_sent_folder = $sent_folder; + } } return $new_sent_folder; } @@ -1675,7 +1811,11 @@ sub command23c { if ( $new_draft_folder eq "\n" ) { $new_draft_folder = $draft_folder; } else { - $new_draft_folder =~ s/[\r\n]//g; + if (check_imap_folder($new_draft_folder)) { + $new_draft_folder =~ s/[\r\n]//g; + } else { + $new_draft_folder = $draft_folder; + } } return $new_draft_folder; } @@ -1941,7 +2081,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 { @@ -2404,19 +2544,71 @@ sub command318 { return $time_zone_type; } +# set the location base for redirects (since 1.5.2) +sub command_config_location_base { + print "Here you can set the base part of the SquirrelMail URL.\n"; + print "It is normally autodetected but if that fails, use this\n"; + print "option to override.\n"; + print "It should contain only the protocol and hostname/port parts\n"; + print "of the URL; the full path will be appended automatically.\n\n"; + print "Examples:\nhttp://webmail.example.org\nhttp://webmail.example.com:8080\nhttps://webmail.example.com:6691\n\n"; + print "Do not add any path elements.\n"; + + print "URL base? [" .$WHT."autodetect$NRM]: $WHT"; + $new_config_location_base = ; + chomp($new_config_location_base); + $config_location_base = $new_config_location_base; + + return $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 " "; @@ -2424,142 +2616,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 " "; } @@ -2573,67 +2976,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 " "; } @@ -2647,91 +3027,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; @@ -2739,35 +3142,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; @@ -2776,34 +3180,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"; @@ -2889,6 +3265,8 @@ sub command_fontsets { sub command61 { print "You can now define different LDAP servers.\n"; + print "Please ensure proper permissions for config.php when including\n"; + print "sensitive passwords.\n\n"; print "[ldap] command (?=help) > "; $input = ; $input =~ s/[\r\n]//g; @@ -2928,6 +3306,9 @@ sub command61 { if ( $ldap_listing[$count] ) { print " listing: $ldap_listing[$count]\n"; } + if ( $ldap_writeable[$count] ) { + print " writeable: $ldap_writeable[$count]\n"; + } if ( $ldap_search_tree[$count] ) { print " search_tree: $ldap_search_tree[$count]\n"; } @@ -2942,7 +3323,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; @@ -3047,7 +3432,6 @@ sub command61 { print "Number of displayed entries is limited by maxrows setting.\n"; print "\n"; print "Don't enable this option for public LDAP directories.\n"; - print "This feature is experimental.\n"; print "\n"; print "Allow listing of LDAP directory? (y/N):"; $name = ; @@ -3060,6 +3444,23 @@ sub command61 { print "\n"; + print "You can control write access to LDAP address book here. This option can\n"; + print "be useful if you run small LDAP server and want to provide writable\n"; + print "shared address book stored in LDAP to users of webmail interface.\n"; + print "\n"; + print "Don't enable this option for public LDAP directories.\n"; + print "\n"; + print "Allow writing to LDAP directory? (y/N):"; + $name = ; + if ( $name =~ /^y\n/i ) { + $name = 'true'; + } else { + $name = 'false'; + } + $ldap_writeable[$sub] = $name; + + print "\n"; + print "You can specify an additional search filter.\n"; print "This could be something like \"(objectclass=posixAccount)\".\n"; print "No filtering is performed by default. Press ENTER for default.\n"; @@ -3136,6 +3537,7 @@ sub command61 { @new_ldap_protocol = (); @new_ldap_limit_scope = (); @new_ldap_listing = (); + @new_ldap_writeable = (); @new_ldap_search_tree = (); @new_ldap_starttls = (); @@ -3153,6 +3555,7 @@ sub command61 { @new_ldap_protocol = ( @new_ldap_protocol, $ldap_protocol[$count] ); @new_ldap_limit_scope = ( @new_ldap_limit_scope, $ldap_limit_scope[$count] ); @new_ldap_listing = ( @new_ldap_listing, $ldap_listing[$count] ); + @new_ldap_writeable = ( @new_ldap_writeable, $ldap_writeable[$count] ); @new_ldap_search_tree = ( @new_ldap_search_tree, $ldap_search_tree[$count] ); @new_ldap_starttls = ( @new_ldap_starttls, $ldap_starttls[$count] ); } @@ -3170,6 +3573,7 @@ sub command61 { @ldap_protocol = @new_ldap_protocol; @ldap_limit_scope = @new_ldap_limit_scope; @ldap_listing = @new_ldap_listing; + @ldap_writeable = @new_ldap_writeable; @ldap_search_tree = @new_ldap_search_tree; @ldap_starttls = @new_ldap_starttls; @@ -3279,14 +3683,47 @@ sub command65 { return $abook_global_file_listing; } +# controls $abook_file_line_length setting +sub command_abook_file_line_length { + print "This setting controls space allocated to file based address book records.\n"; + print "End users will be unable to save address book entry, if total entry size \n"; + print "(quoted address book fields + 4 delimiters + linefeed) exceeds allowed \n"; + print "address book length size.\n"; + print "\n"; + print "Same setting is applied to personal and global file based address books.\n"; + print "\n"; + print "It is strongly recommended to keep default setting value. Change it only\n"; + print "if you really want to store address book entries that are bigger than two\n"; + print "kilobytes (2048).\n"; + print "\n"; + + print "Enter allowed address book line length [$abook_file_line_length]: "; + my $tmp = ; + $tmp = trim($tmp); + # value is not modified, if user hits Enter or enters space + if ($tmp ne '') { + # make sure that input is numeric + if ($tmp =~ /^\d+$/) { + $abook_file_line_length = $tmp; + } else { + print "If you want to change this setting, you must enter number.\n"; + print "If you want to keep original setting - enter space.\n\n"; + print "Press Enter to continue..."; + $tmp = ; + } + } +} + sub command91 { print "If you want to store your users address book details in a database then\n"; print "you need to set this DSN to a valid value. The format for this is:\n"; print "mysql://user:pass\@hostname/dbname\n"; print "Where mysql can be one of the databases PHP supports, the most common\n"; - print "of these are mysql, msql and pgsql\n"; + print "of these are mysql, msql and pgsql.\n"; + print "Please ensure proper permissions for config.php when including\n"; + print "sensitive passwords.\n\n"; print "If the DSN is left empty (hit space and then return) the database\n"; - print "related code for address books will not be used\n"; + print "related code for address books will not be used.\n"; print "\n"; if ( $addrbook_dsn eq "" ) { @@ -3324,9 +3761,11 @@ sub command93 { print "you need to set this DSN to a valid value. The format for this is:\n"; print "mysql://user:pass\@hostname/dbname\n"; print "Where mysql can be one of the databases PHP supports, the most common\n"; - print "of these are mysql, msql and pgsql\n"; + print "of these are mysql, msql and pgsql.\n"; + print "Please ensure proper permissions for config.php when including\n"; + print "sensitive passwords.\n\n"; print "If the DSN is left empty (hit space and then return) the database\n"; - print "related code for address books will not be used\n"; + print "related code for address books will not be used.\n"; print "\n"; if ( $prefs_dsn eq "" ) { @@ -3427,9 +3866,11 @@ sub command98 { print "you need to set this DSN to a valid value. The format for this is:\n"; print "mysql://user:pass\@hostname/dbname\n"; print "Where mysql can be one of the databases PHP supports, the most common\n"; - print "of these are mysql, msql and pgsql\n"; + print "of these are mysql, msql and pgsql.\n"; + print "Please ensure proper permissions for config.php when including\n"; + print "sensitive passwords.\n\n"; print "If the DSN is left empty (hit space and then return) the database\n"; - print "related code for global SQL address book will not be used\n"; + print "related code for global SQL address book will not be used.\n"; print "\n"; if ( $addrbook_global_dsn eq "" ) { @@ -3523,7 +3964,7 @@ sub commandA2 { print "This option controls what character set is used when sending\n"; print "mail and when sending HTML to the browser. Option works only\n"; print "with US English (en_US) translation. Other translations use\n"; - print "charsets that are set in functions/i18n.php.\n"; + print "charsets that are set in translation settings.\n"; print "\n"; print "[$WHT$default_charset$NRM]: $WHT"; @@ -3719,7 +4160,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 = " "; @@ -3873,9 +4339,9 @@ sub save_data { # boolean print CF "\$hide_auth_header = $hide_auth_header;\n"; # boolean - print CF "\$disable_thread_sort = $disable_thread_sort;\n"; + print CF "\$disable_thread_sort = $disable_thread_sort;\n"; # boolean - print CF "\$disable_server_sort = $disable_server_sort;\n"; + print CF "\$disable_server_sort = $disable_server_sort;\n"; # boolean print CF "\$allow_charset_search = $allow_charset_search;\n"; # integer @@ -3884,6 +4350,9 @@ sub save_data { # integer print CF "\$time_zone_type = $time_zone_type;\n"; print CF "\n"; + # string + print CF "\$config_location_base = '$config_location_base';\n"; + print CF "\n"; # all plugins are strings for ( $ct = 0 ; $ct <= $#plugins ; $ct++ ) { @@ -3892,25 +4361,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; @@ -3991,6 +4488,11 @@ sub save_data { # boolean print CF " 'listing' => $ldap_listing[$count]"; } + if ( $ldap_writeable[$count] ) { + print CF ",\n"; + # boolean + print CF " 'writeable' => $ldap_writeable[$count]"; + } if ( $ldap_search_tree[$count] ) { print CF ",\n"; # integer @@ -4040,11 +4542,15 @@ sub save_data { print CF "\$abook_global_file_writeable = $abook_global_file_writeable;\n\n"; # boolean print CF "\$abook_global_file_listing = $abook_global_file_listing;\n\n"; + # integer + print CF "\$abook_file_line_length = $abook_file_line_length;\n\n"; # boolean 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"; # string print CF "\$imap_auth_mech = '$imap_auth_mech';\n"; # boolean @@ -4072,20 +4578,12 @@ sub save_data { print CF "\$allow_remote_configtest = $allow_remote_configtest;\n"; print CF "\n"; - print CF "\@include SM_PATH . 'config/config_local.php';\n"; - - print CF "\n/**\n"; - print CF " * Make sure there are no characters after the PHP closing\n"; - print CF " * tag below (including newline characters and whitespace).\n"; - print CF " * Otherwise, that character will cause the headers to be\n"; - print CF " * sent and regular output to begin, which will majorly screw\n"; - print CF " * things up when we try to send more headers later.\n"; - print CF " */\n"; - print CF "?>"; - close CF; print "Data saved in config.php\n"; + + build_plugin_hook_array(); + } else { print "Error saving config.php: $!\n"; } @@ -4373,6 +4871,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\///; } @@ -4380,13 +4879,16 @@ sub change_to_rel_path() { return $new_path; } -sub detect_auth_support { # Attempts to auto-detect if a specific auth mechanism is supported. # Called by 'command112a' and 'command112b' # ARGS: service-name (IMAP or SMTP), host:port, mech-name (ie. CRAM-MD5) - +sub detect_auth_support { + # Try loading IO::Socket + unless (eval("use IO::Socket; 1")) { + print "Perl IO::Socket module is not available."; + return undef; + } # Misc setup - use IO::Socket; my $service = shift; my $host = shift; my $mech = shift; @@ -4478,3 +4980,234 @@ sub clear_screen() { system "clear"; } } + +# checks IMAP mailbox name. Refuses to accept 8bit folders +# returns 0 (folder name is not correct) or 1 (folder name is correct) +sub check_imap_folder($) { + my $folder_name = shift(@_); + + if ($folder_name =~ /[\x80-\xFFFF]/) { + print "Folder name contains 8bit characters. Configuration utility requires\n"; + print "UTF7-IMAP encoded folder names.\n"; + print "Press enter to continue..."; + my $tmp = ; + return 0; + } elsif ($folder_name =~ /[&\*\%]/) { + # check for ampersand and list-wildcards + print "Folder name contains special UTF7-IMAP characters.\n"; + print "Are you sure that folder name is correct? (yN): "; + my $tmp = ; + $tmp = lc(trim($tmp)); + if ($tmp =~ /^y$/) { + return 1; + } else { + return 0; + } + } else { + return 1; + } +} + +# quotes string written in single quotes +sub quote_single($) { + my $string = shift(@_); + $string =~ s/\'/\\'/g; + return $string; +} + +# 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; + + + # throw away lines that are not exactly one "brace set" deep + # + if ($brace_count > 1) { + next; + } + + + # 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; + } + + } + + + # 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"; + + } + +} +