From: jervfors Date: Wed, 29 Dec 2004 15:06:20 +0000 (+0000) Subject: Changing squirrelmail/Squirrelmail to SquirrelMail in some strings as well as other... X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=598294a727a2789b7c562ee7083da703c8bb0628;p=squirrelmail.git Changing squirrelmail/Squirrelmail to SquirrelMail in some strings as well as other minor documentation fixes git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@8522 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/ChangeLog b/ChangeLog index 200fc852..4f115f45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,7 +76,7 @@ Version 1.5.1 -- CVS - Current hook name is now globally available when running a hook ($currentHookName) - Fix bug when Saving to Draft folder that contains special characters. - Added size limit to signatures saved in file backend. Created error_option_save - function, that allows sending error message to options page. Thanks to Martynas + function, that allows sending error message to options page. Thanks to Martynas Bieliauskas for spotting big signature "option". - Make SquirrelSpell work with safe_mode enabled, if using PHP >=4.3.0. Patch by Ray Ferguson. @@ -93,13 +93,13 @@ Version 1.5.1 -- CVS - $agresive_decoding configuration option changed to $aggressive_decoding. Fixed spelling. - Added $lossy_encoding option (provides fix for #806698) - - Reenabled use of $default_charset option. Option works only with en_US + - Reenabled use of $default_charset option. Option works only with en_US translation in order to prevent language/charset misconfiguration. - Fixes for nonpopulation of folder lists and errors when emptying the trash (provides fixes for #1019185 and #1017941) - Fixed $custom_css loading in squirrelspell plugin. - - Turkish translation uses C character case conversion rules. Fixes php and - squirrelmail functions are assume English conversion rules. + - Turkish translation uses C character case conversion rules. Fixes PHP and + SquirrelMail functions are assume English conversion rules. - Fixed problem that caused an error when deleting all messages on the last page of a paginated view (provides fix for #1014612) - Added MySQL password/UNIX crypt support to mysql backend in the @@ -121,19 +121,19 @@ Version 1.5.1 -- CVS - Removed japanese_xtra function used by older XTRA_CODE calls. Plugins should use separate xtra_code functions. Older function does not provide information about supported options. - - Added php-gettext classes (see class/l10n/*.php) and ngettext support + - Added php-gettext classes (see class/l10n/*.php) and ngettext support functions (provides fix for #1019007). - LC_NUMERIC locale is set to C. (workaround for #1027130). Some plugins might use decimal delimiters incorrectly. - Added sq_is8bit function that can be used to detect 8bit strings. - Added sq_mb_list_encodings function that provides list of encodings supported - by php mbstring module. + by PHP mbstring module. - Added Content-Transfer-Encoding: 8bit header for read receipts that contain 8bit symbols. (provides fix for #934033). - Fixed decoding function problems when mbstring.func_override has MB_OVERLOAD_REGEX enabled. - Security: Fixed XSS exploit in decodeHeader function. [CAN-2004-1036] - - Added site configuration and custom translation engine support to translate + - Added site configuration and custom translation engine support to translate plugin. - Fixed SquirrelSpell error output. Patch courtesy David Boone. - Fixed bug in IMAP read routines that treated "0" as false instead of @@ -142,18 +142,18 @@ Version 1.5.1 -- CVS - Added compact paginator option. Patch by Felix Egli. - Fixed reply/forward form in order to avoid warnings in SSL enabled sites. Patch by Felix Egli. - - Removed command line option unsupported by qmail-inject in + - Removed command line option unsupported by qmail-inject in class/deliver/Deliver_SendMail.class.php. Thanks to Ken Brush. - Global file based address book is controled in configuration. Removed global_file address book backend (use 'local_file' instead). - Added Net-Style theme by Gabriele Maidecchi. Closes patch #1041323. - - Fix: Messages shown with bad times in message list due to misinterpreted + - Fix: Messages shown with bad times in message list due to misinterpreted UW IMAP internal date. - Fixed path used by random theme. - - Utf7-imap encoding/decoding functions will check, if required charset is + - Utf7-imap encoding/decoding functions will check, if required charset is supported by mbstring and use it. Fixes bug #1005353. - - LDAP backend will use internal squirrelmail charset conversion functions - instead of php xml extension. Fixes bug #655137. + - LDAP backend will use internal SquirrelMail charset conversion functions + instead of PHP XML extension. Fixes bug #655137. - Added Wood theme and Silver Steel theme by Pavel Spatny and Simple Green theme - Fix two time zone calculation bugs, thanks to David White. Fixes #1063879. - 'Priority' and 'Importance' headers are now also recognised, next to the @@ -167,7 +167,7 @@ Version 1.5.1 -- CVS - Removed extra ; in SquirrelMail added Received header per RFC 822. Fixes #1088548. - Add IMAP server type "hmailserver" to make search work with hMailServer. Fixes #1085377. - - Reuploaded newmail plugin sounds. Fixes files uploaded to cvs without binary + - Reuploaded newmail plugin sounds. Fixes files uploaded to cvs without binary option. - Changing your JavaScript preference required a re-login to work. Fixes #983614. @@ -360,7 +360,7 @@ Version 1.4.0 RC 2a - Fix IMAP error when returning to message from viewing image attachment. - Do more trimming to indented subjects in threadview so they don't wrap. - Trash folder now displays purge link in all cases. (Closes #655943) - - Fix typo in delete_move_next plugin which caused php file-handle errors. + - Fix typo in delete_move_next plugin which caused PHP file-handle errors. - Make vCard more liberal in what it accepts (thanks Kurt Pires). - Fix problem with subject encoding when using Japanse. - Move login_form hook to be actually in the login form. @@ -388,7 +388,7 @@ Version 1.4.0 RC 1 - Added CRAM-MD5 and DIGEST-MD5 authentication support for IMAP and SMTP - Experimental TLS support for IMAP and SMTP (requires PHP 4.3.x) - Override settings with config_local.php - - Compose form no longer shows attachment options if php file_uploads + - Compose form no longer shows attachment options if PHP file_uploads disabled - Improved bodystructure parsing. - Support for windows-1257 charset. @@ -674,17 +674,17 @@ Version 1.2.0 -- 25 December 2001 *************************************************************** -*** Squirrelmail Development Series 1.1 and 1.1 Pre-Releases *** +*** SquirrelMail Development Series 1.1 and 1.1 Pre-Releases *** **************************************************************** Version 1.2.0-rc3 -- 2 December 2001 ------------------------------------ - Speed improvements and optimizations on much of the code - Comments added, formatting cleaned up for much of the code - - Several plugins integrated into the Squirrelmail core + - Several plugins integrated into the SquirrelMail core (focus change, attachment common, printer friendly, etc) - Several plugins added as "Official Plugins" to the main - Squirrelmail distribution + SquirrelMail distribution - First half of a rewrite of the option pages code - The Paginator!!! - Other stuff that I don't recall (developers, please fill this in!) @@ -737,7 +737,7 @@ Version 1.1.0 -- April 21, 2000 ************************************** -*** Squirrelmail Stable Series 1.0 *** +*** SquirrelMail Stable Series 1.0 *** ************************************** Version 1.0.6 -- April 19, 2001 @@ -819,7 +819,7 @@ Version 1.0 -- January 30, 2001 ******************************************************** -*** Squirrelmail Development Series 1.0 Pre-Releases *** +*** SquirrelMail Development Series 1.0 Pre-Releases *** ******************************************************** Version 1.0pre3 -- January 22, 2001 @@ -887,7 +887,7 @@ Version 1.0pre1 -- December 14, 2000 ***************************************** -*** Squirrelmail 0.5 and Pre-Releases *** +*** SquirrelMail 0.5 and Pre-Releases *** ***************************************** Version 0.5 -- September 25, 2000 @@ -942,7 +942,7 @@ Version 0.5pre1 -- August 9, 2000 ***************************************** -*** Squirrelmail 0.4 and Pre-Releases *** +*** SquirrelMail 0.4 and Pre-Releases *** ***************************************** Version 0.4 -- May 15, 2000 @@ -992,7 +992,7 @@ Version 0.4pre1 -- April 29, 2000 ***************************************** -*** Squirrelmail 0.3 and Pre-Releases *** +*** SquirrelMail 0.3 and Pre-Releases *** ***************************************** Version 0.3.1 -- March 13, 2000 @@ -1040,7 +1040,7 @@ Version 0.3pre1 -- February 17, 2000 ***************************************** -*** Squirrelmail 0.2 and Pre-Releases *** +*** SquirrelMail 0.2 and Pre-Releases *** ***************************************** Version 0.2.1 -- January 05, 2000 @@ -1059,7 +1059,7 @@ Version 0.2 -- January 02, 2000 ***************************************** -*** Squirrelmail 0.1 and Pre-Releases *** +*** SquirrelMail 0.1 and Pre-Releases *** ***************************************** Version 0.1.2 -- December 20, 1999 diff --git a/INSTALL b/INSTALL index 4938d692..84d3a794 100644 --- a/INSTALL +++ b/INSTALL @@ -38,7 +38,7 @@ Each of these steps is covered in detail below. If your webserver does not already have PHP you must configure it to work with PHP. You need at least PHP v4.1.0. SquirrelMail uses the standard suffix .php for all PHP4 files. - + You can find PHP at http://www.php.net. See the documentation that comes with PHP for instructions how to set it up. @@ -49,7 +49,7 @@ Each of these steps is covered in detail below. --with-mhash Will improve charset decoding if present --with-mysql For MySQL storage of preferences or addressbooks --with-openssl When you want to use encrypted IMAP connections (TLS) - + If you're going to use LDAP in the addressbook, you must compile PHP with the LDAP extension. Include the MHASH extension to improve performance in character set decoding. @@ -63,7 +63,7 @@ Each of these steps is covered in detail below. This depends a lot on the server your choose. See the documentation that comes with your server. - + If you're concerned about people accessing it directly, you can limit access to only the IP of the webserver. @@ -100,8 +100,8 @@ b. Setting up directories $ chgrp -R nobody data Keep in mind that with different installations, the web server could - typically run as userid/groupid of nobody/nobody, nobody/nogroup, - apache/apache or www-data/www-data. The best way to find out is to read + typically run as userid/groupid of nobody/nobody, nobody/nogroup, + apache/apache or www-data/www-data. The best way to find out is to read the web server's configuration file. There also needs to be a directory where attachments are stored @@ -120,30 +120,30 @@ b. Setting up directories If you trust all the users on you system not to read mail they are not supposed to read change the last line to chmod 777 SomeDirectory - or simply use /tmp as you attachments directory. - - If a user is aborting a mail but has uploaded some attachments to it - the files will be lying around in this directory forever if you do not + or simply use /tmp as you attachments directory. + + If a user is aborting a mail but has uploaded some attachments to it + the files will be lying around in this directory forever if you do not remove them. To fix this, it is recommended to create a cron job that deletes everything in the attachment directory. Something similar to the following will be good enough: $ cd /var/attach/directory $ rm -f * - + However, this will delete attachments that are currently in use by people sending email when the cron job runs. You can either (1) make sure that the cron job runs at an obscure hour and hope that nobody gets upset, or (2) you can run a modified version of the commands above. Check out the man pages for other commands such as 'find' or 'tmpreaper'. - + One sample script you could set up that would erase all attachments, but wouldn't erase preferences, address books, or the like (just in case your - attachment directory is the same as your data directory) might look like + attachment directory is the same as your data directory) might look like this: - + $ rm `find /var/attach/directory -atime +2 | grep -v "\." | grep -v _` - + Remember to be careful with whatever method you do use, and to test out the command before it potentially wipes out everyone's preferences. @@ -167,9 +167,9 @@ c. Setting up SquirrelMail ----------------------- Point your browser at the URL at which SquirrelMail is installed. A - possible example of this is: + possible example of this is: http://www.yourdomain.com/squirrelmail - + It should be pretty straight forward to use. Some more documentation might show up one day or another. @@ -184,22 +184,22 @@ c. Setting up SquirrelMail 6. TRANSLATIONS --------------- - In order to use translated versions of SquirrelMail, you need + In order to use translated versions of SquirrelMail, you need to download and install locale packages that contain translations - that you want to use with squirrelmail. - + that you want to use with SquirrelMail. + Locale packages can be downloaded from SquirrelMail SourceForge project page. - + http://sourceforge.net/project/showfiles.php?group_id=311&package_id=110388 - + Each translation contains install script that copies required files into appropriate locations. If you can't run that script, you can extract - contents of translation packages into your squirrelmail directory. - + contents of translation packages into your SquirrelMail directory. + NOTE No.1: *-src.tar.gz, *-src.tar.bz2 and *-src.zip archives does not contain compiled translation files. You will need to run compilelocales script in order to get all gettext binary translations. - + NOTE No.2: You might need to restart your webserver before using translations. If you can't do that, install your translations _before_ you use SquirrelMail. diff --git a/class/l10n.class.php b/class/l10n.class.php index 9b78f917..38639991 100644 --- a/class/l10n.class.php +++ b/class/l10n.class.php @@ -5,7 +5,7 @@ * Copyright (c) 2003-2005 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * - * This contains internal squirrelmail functions needed to handle + * This contains internal SquirrelMail functions needed to handle * translations when php gettext extension is missing or some functions * are not available. * diff --git a/config/conf.pl b/config/conf.pl index 817644c7..e2cfc618 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -1,13 +1,13 @@ #!/usr/bin/env perl # conf.pl # -# Copyright (c) 1999-2003 The SquirrelMail Project Team +# Copyright (c) 1999-2003 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"; ############################################################ @@ -22,9 +22,9 @@ if ( eval q{require "File/Basename.pm"} ) { chdir($dir); } -############################################################ +############################################################ # Some people try to run this as a CGI. That's wrong! -############################################################ +############################################################ if ( defined( $ENV{'PATH_INFO'} ) || defined( $ENV{'QUERY_STRING'} ) || defined( $ENV{'REQUEST_METHOD'} ) ) { @@ -36,15 +36,15 @@ if ( defined( $ENV{'PATH_INFO'} ) ############################################################ # If we got here, use Cwd to get the full directory path # (the Basename stuff above will sometimes return '.' as -# the base directory, which is not helpful here). +# the base directory, which is not helpful here). ############################################################ use Cwd; $dir = cwd(); - -############################################################ + +############################################################ # First, lets read in the data already in there... -############################################################ +############################################################ if ( -e "config.php" ) { open( FILE, "config.php" ); while ( $line = ) { @@ -160,7 +160,7 @@ if ( -e "config.php" ) { # Read and parse the current configuration file # (either config.php or config_default.php). while ( $line = ) { - $line =~ s/^\s+//; + $line =~ s/^\s+//; $line =~ s/^\$//; $var = $line; @@ -315,7 +315,7 @@ $oldway = 'false' if ( !$oldway ); $use_icons = 'false' if ( !$use_icons ); $use_php_recode = 'false' if ( !$use_php_recode ); $use_php_iconv = 'false' if ( !$use_php_iconv ); -$skip_SM_header = 'false' if ( !$skip_SM_header ); +$skip_SM_header = 'false' if ( !$skip_SM_header ); $default_use_javascript_addr_book = 'false' if (! $default_use_javascript_addr_book); if ( $ARGV[0] eq '--install-plugin' ) { @@ -364,8 +364,8 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "7. Message of the Day (MOTD)\n"; print "8. Plugins\n"; print "9. Database\n"; - print "10. Language settings\n"; - print "11. Tweaks\n"; + print "10. Language settings\n"; + print "11. Tweaks\n"; print "\n"; print "D. Set pre-defined settings for specific IMAP servers\n"; print "\n"; @@ -396,7 +396,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { } print "$NRM\n"; print "\n"; - + if ( $show_imap_settings ) { print $WHT . "IMAP Settings". $NRM . "\n--------------\n"; print "4. IMAP Server : $WHT$imapServerAddress$NRM\n"; @@ -429,7 +429,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "$WHT$imapServerAddress$NRM:"; print "$WHT$imapPort$NRM "; print "($WHT$imap_server_type$NRM)\n"; - } + } if ($show_smtp_settings == 0) { if ( lc($useSendmail) eq 'true' ) { print "B. Change Sendmail Config : $WHT$sendmail_path$NRM\n"; @@ -441,11 +441,11 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { } if ( $show_smtp_settings || $show_imap_settings ) { - print "H. Hide " . - ($show_imap_settings ? "IMAP Server" : + print "H. Hide " . + ($show_imap_settings ? "IMAP Server" : (lc($useSendmail) eq 'true') ? "Sendmail" : "SMTP") . " Settings\n"; } - + print "\n"; print "R Return to Main Menu\n"; } elsif ( $menu == 3 ) { @@ -493,7 +493,7 @@ while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { print "1. Change Themes\n"; for ( $count = 0 ; $count <= $#theme_name/2 ; $count++ ) { $temp_name = $theme_name[$count*2]; - printf " %s%*s %s\n", $temp_name, + printf " %s%*s %s\n", $temp_name, 40 - length($temp_name), " ", $theme_name[($count*2)+1]; } @@ -1030,7 +1030,7 @@ sub command17 { return $new_smtpPort; } -# authenticated server +# authenticated server sub command18 { return; # This sub disabled by tassium - it has been replaced with smtp_auth_mech @@ -1067,7 +1067,7 @@ sub command18a { return $pop_before_smtp; } -# imap_server_type +# imap_server_type sub command19 { print "Each IMAP server has its own quirks. As much as we tried to stick\n"; print "to standards, it doesn't help much if the IMAP server doesn't follow\n"; @@ -1177,9 +1177,9 @@ sub command112a { } else { print $WHT . " ERROR DETECTING$NRM\n"; } - + } - } + } print "\nWhat authentication mechanism do you want to use for IMAP connections?\n\n"; print $WHT . "login" . $NRM . " - Plaintext. If you can do better, you probably should.\n"; print $WHT . "plain" . $NRM . " - SASL PLAIN. If you need this, you already know it.\n"; @@ -1198,7 +1198,7 @@ sub command112a { } } - + # SMTP authentication type # Possible choices: none, plain, cram-md5, digest-md5 sub command112b { @@ -1214,7 +1214,7 @@ sub command112b { if ($inval =~ /^y\b/i) { # Yes, let's try to detect. print "Trying to detect supported methods (SMTP)...\n"; - + # Special case! # Check none by trying to relay to junk@microsoft.com $host = $smtpServerAddress . ':' . $smtpPort; @@ -1252,7 +1252,7 @@ sub command112b { } else { print $WHT . "ERROR DETECTING$NRM\n"; } - + # Try CRAM-MD5 print "Testing CRAM-MD5:\t"; $tmp=detect_auth_support('SMTP',$host,'CRAM-MD5'); @@ -1265,7 +1265,7 @@ sub command112b { } else { print $WHT . "ERROR DETECTING$NRM\n"; } - + print "Testing DIGEST-MD5:\t"; $tmp=detect_auth_support('SMTP',$host,'DIGEST-MD5'); @@ -1278,7 +1278,7 @@ sub command112b { } else { print $WHT . "ERROR DETECTING$NRM\n"; } - } + } } print "\nWhat authentication mechanism do you want to use for SMTP connections?\n"; print $WHT . "none" . $NRM . " - Your SMTP server does not require authorization.\n"; @@ -1295,7 +1295,7 @@ sub command112b { # SMTP doesn't necessarily require logins return "none"; } - if ( ($inval =~ /^cram-md5\b/i) || ($inval =~ /^digest-md5\b/i) || + if ( ($inval =~ /^cram-md5\b/i) || ($inval =~ /^digest-md5\b/i) || ($inval =~ /^login\b/i) || ($inval =~/^plain\b/i)) { return lc($inval); } else { @@ -1323,7 +1323,7 @@ sub command113 { } else { print "n"; } - print "$NRM]: $WHT"; + print "$NRM]: $WHT"; $inval=; $inval =~ tr/yn//cd; return 'true' if ( $inval eq "y" ); @@ -1344,7 +1344,7 @@ sub command114{ return 'true' if ( lc($new_skip_SM_header) eq 'y' ); return 'false' if ( lc($new_skip_SM_header) eq 'n' ); - return $skip_SM_header; + return $skip_SM_header; } # MOTD @@ -1470,7 +1470,7 @@ sub command22 { return $show_prefix_option; } -# Trash Folder +# Trash Folder sub command23a { print "You can now specify where the default trash folder is located.\n"; print "On servers where you do not want this, you can set it to anything\n"; @@ -1492,7 +1492,7 @@ sub command23a { return $new_trash_folder; } -# Sent Folder +# Sent Folder sub command23b { print "This is where messages that are sent will be stored. SquirrelMail\n"; print "by default puts a copy of all outgoing messages in this folder.\n"; @@ -1513,7 +1513,7 @@ sub command23b { return $new_sent_folder; } -# Draft Folder +# Draft Folder sub command23c { print "You can now specify where the default draft folder is located.\n"; print "On servers where you do not want this, you can set it to anything\n"; @@ -1535,7 +1535,7 @@ sub command23c { return $new_draft_folder; } -# default move to trash +# default move to trash sub command24a { print "By default, should messages get moved to the trash folder? You\n"; print "can specify the default trash folder in option 3. If this is set\n"; @@ -1560,7 +1560,7 @@ sub command24a { return $default_move_to_trash; } -# default move to sent +# default move to sent sub command24b { print "By default, should messages get moved to the sent folder? You\n"; print "can specify the default sent folder in option 4. If this is set\n"; @@ -1608,7 +1608,7 @@ sub command24c { return $default_save_as_draft; } -# List special folders first +# List special folders first sub command27 { print "SquirrelMail has what we call 'special folders' that are not\n"; print "manipulated and viewed like normal folders. Some examples of\n"; @@ -1633,7 +1633,7 @@ sub command27 { return $list_special_folders_first; } -# Show special folders color +# Show special folders color sub command28 { print "SquirrelMail has what we call 'special folders' that are not\n"; print "manipulated and viewed like normal folders. Some examples of\n"; @@ -1658,7 +1658,7 @@ sub command28 { return $use_special_folder_color; } -# Auto expunge +# Auto expunge sub command29 { print "The way that IMAP handles deleting messages is as follows. You\n"; print "mark the message as deleted, and then to 'really' delete it, you\n"; @@ -1682,7 +1682,7 @@ sub command29 { return $auto_expunge; } -# Default sub of inbox +# Default sub of inbox sub command210 { print "Some IMAP servers (Cyrus) have all folders as subfolders of INBOX.\n"; print "This can cause some confusion in folder creation for users when\n"; @@ -1706,7 +1706,7 @@ sub command210 { return $default_sub_of_inbox; } -# Show contain subfolder option +# Show contain subfolder option sub command211 { print "Some IMAP servers (UW) make it so that there are two types of\n"; print "folders. Those that contain messages, and those that contain\n"; @@ -1730,7 +1730,7 @@ sub command211 { return $show_contain_subfolders_option; } -# Default Unseen Notify +# Default Unseen Notify sub command212 { print "This option specifies where the users will receive notification\n"; print "about unseen messages by default. This is of course an option that\n"; @@ -1749,7 +1749,7 @@ sub command212 { return $default_unseen_notify; } -# Default Unseen Type +# Default Unseen Type sub command213 { print "Here you can define the default way that unseen messages will be displayed\n"; print "to the user in the folder listing on the left side.\n"; @@ -1789,7 +1789,7 @@ sub command214 { return $auto_create_special; } -# Automatically delete folders +# Automatically delete folders sub command215 { if ( $imap_server_type eq "uw" ) { print "UW IMAP servers will not allow folders containing mail to also contain folders.\n"; @@ -1799,7 +1799,7 @@ sub command215 { print "Press any key to continue...\n"; $new_delete = ; $delete_folder = 'true'; - } else { + } else { if ( $imap_server_type eq "courier" ) { print "Courier (or Courier-IMAP) IMAP servers may not support "; print "subfolders of Trash. \n"; @@ -1807,7 +1807,7 @@ sub command215 { print "Trash will be treated by Courier as a special folder that does not \n"; print "allow subfolders. \n\n"; print "Please verify your Courier configuration, and test folder deletion \n"; - print "when changing this setting.\n\n"; + print "when changing this setting.\n\n"; } print "Are subfolders of the Trash supported by your IMAP server?\n"; @@ -1815,8 +1815,8 @@ sub command215 { print "If not, say no (deleted folders should not be sent to Trash)\n\n"; # reversal of logic. # question was: Should folders be automatically deleted instead of sent to trash.. - # we've changed the question to make it more clear, - # and are here handling that to avoid changing the answers.. + # we've changed the question to make it more clear, + # and are here handling that to avoid changing the answers.. if ( lc($delete_folder) eq 'true' ) { $default_value = "n"; } else { @@ -1862,7 +1862,7 @@ sub command33a { print "The path name can be absolute or relative (to the config directory).\n"; print "It doesn't matter. Here are two examples:\n"; print " Absolute: /var/spool/data/\n"; - print " Relative: ../data/\n"; + print " Relative: ../data/\n"; print "Relative paths to directories outside of the SquirrelMail distribution\n"; print "will be converted to their absolute path equivalents in config.php.\n\n"; print "Note: There are potential security risks with having a writeable directory\n"; @@ -1929,9 +1929,9 @@ sub command33b { sub command33c { print "The directory hash level setting allows you to configure the level\n"; - print "of hashing that Squirremail employs in your data and attachment\n"; + print "of hashing that SquirrelMail employs in your data and attachment\n"; print "directories. This value must be an integer ranging from 0 to 4.\n"; - print "When this value is set to 0, Squirrelmail will simply store all\n"; + print "When this value is set to 0, SquirrelMail will simply store all\n"; print "files as normal in the data and attachment directories. However,\n"; print "when set to a value from 1 to 4, a simple hashing scheme will be\n"; print "used to organize the files in this directory. In short, the crc32\n"; @@ -2578,7 +2578,7 @@ sub command63 { print "must set this option to a valid value. If option does\n"; print "not have path elements, system assumes that file is\n"; print "stored in data directory. If relative path is set, it is\n"; - print "relative to main squirrelmail directory. If value is empty,\n"; + print "relative to main SquirrelMail directory. If value is empty,\n"; print "address book is not enabled.\n"; print "\n"; @@ -3070,14 +3070,14 @@ sub save_data { print CF " */\n"; print CF "\n"; print CF "global \$version;\n"; - + if ($print_config_version) { print CF "\$config_version = '$print_config_version';\n"; } # integer print CF "\$config_use_color = $config_use_color;\n"; print CF "\n"; - + # string print CF "\$org_name = \"$org_name\";\n"; # string @@ -3105,7 +3105,7 @@ sub save_data { # string that can contain variables print CF "\$motd = \"$motd\";\n"; print CF "\n"; - + # string print CF "\$squirrelmail_default_language = '$squirrelmail_default_language';\n"; # string @@ -3216,7 +3216,7 @@ sub save_data { # integer print CF "\$allow_advanced_search = $allow_advanced_search;\n"; print CF "\n"; - + # all plugins are strings for ( $ct = 0 ; $ct <= $#plugins ; $ct++ ) { print CF "\$plugins[$ct] = '$plugins[$ct]';\n"; @@ -3346,7 +3346,7 @@ sub save_data { 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"; @@ -3355,7 +3355,7 @@ sub save_data { 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"; @@ -3425,7 +3425,7 @@ sub set_defaults { $disp_default_folder_prefix = $default_folder_prefix; $delete_folder = true; $force_username_lowercase = true; - + $continue = 1; } elsif ( $server eq "exchange" ) { $imap_server_type = "exchange"; @@ -3454,7 +3454,7 @@ sub set_defaults { $disp_default_folder_prefix = $default_folder_prefix; $delete_folder = true; $force_username_lowercase = false; - + $continue = 1; } elsif ( $server eq "macosx" ) { $imap_server_type = "macosx"; @@ -3526,7 +3526,7 @@ sub set_defaults { # This subroutine corrects relative paths to ensure they # will work within the SM space. If the path falls within -# the SM directory tree, the SM_PATH variable will be +# the SM directory tree, the SM_PATH variable will be # prepended to the path, if not, then the path will be # converted to an absolute path, e.g. # '../images/logo.gif' --> SM_PATH . 'images/logo.gif' @@ -3549,7 +3549,7 @@ sub change_to_SM_path() { return $old_path if ( $old_path =~ /^\'(\/|http)/ ); return $old_path if ( $old_path =~ /^\'\w:\// ); return $old_path if ( $old_path =~ /^SM_PATH/); - + if ( $old_path =~ /^\$/ ) { # check if it's a single var, or a $var/path combination # if it's $var/path, enclose in "" @@ -3558,17 +3558,17 @@ sub change_to_SM_path() { } return $old_path; } - + # Remove remaining ' $old_path =~ s/\'//g; - + # For relative paths, split on '../' @rel_path = split(/\.\.\//, $old_path); if ( $#rel_path > 1 ) { # more than two levels away. Make it absolute. @abs_path = split(/\//, $dir); - + # Lop off the relative pieces of the absolute path.. for ( $i = 0; $i <= $#rel_path; $i++ ) { pop @abs_path; @@ -3583,7 +3583,7 @@ sub change_to_SM_path() { $new_path .= "\'"; } else { # Last, it's a relative path without any leading '.' - # Prepend SM_PATH and config, since the paths are + # Prepend SM_PATH and config, since the paths are # relative to the config directory $new_path = "SM_PATH . \'config/" . $old_path . "\'"; } @@ -3624,7 +3624,7 @@ sub detect_auth_support { print "BAD ARGS!\n"; return undef; } - + if ($service eq 'SMTP') { $cmd = "AUTH $mech\r\n"; $logout = "QUIT\r\n"; diff --git a/config/config_default.php b/config/config_default.php index 3109247b..e883a04c 100644 --- a/config/config_default.php +++ b/config/config_default.php @@ -145,7 +145,7 @@ $smtpPort = 25; /** * SquirrelMail header control * - * Option can be used to disable Received: headers added by squirrelmail. + * Option can be used to disable Received: headers added by SquirrelMail. * This can increase user's privacy and solve problems with spam filters * that increase spam marks for dynamic dialup addresses. * @@ -199,7 +199,7 @@ $imapPort = 143; * Please note that this changes only some of server settings. * * In order to set everything correctly, you need to adjust several - * squirrelmail options. These options are listed in doc/presets.txt + * SquirrelMail options. These options are listed in doc/presets.txt * @global string $imap_server_type */ $imap_server_type = 'other'; @@ -456,7 +456,7 @@ $attachment_dir = $data_dir; /** * Hash level used for data directory. * - * This option allows spliting file based squirrelmail user + * This option allows spliting file based SquirrelMail user * data storage directory into several subfolders. Number from * 0 to 4 allows allows having up to four subfolder levels. * @@ -497,7 +497,7 @@ $default_use_priority = true; /** * SquirrelMail Attributions Control * - * This option disables display of "created by squirrelmail developers" + * This option disables display of "created by SquirrelMail developers" * strings and provider link * @global bool $hide_sm_attributions */ @@ -969,4 +969,4 @@ $config_use_color = 2; * sent and regular output to begin, which will majorly screw * things up when we try to send more headers later. */ -?> +?> \ No newline at end of file diff --git a/contrib/RPM/squirrelmail.cron b/contrib/RPM/squirrelmail.cron index 21c10645..fb36bffe 100644 --- a/contrib/RPM/squirrelmail.cron +++ b/contrib/RPM/squirrelmail.cron @@ -1,5 +1,5 @@ #!/bin/sh -# This goes through the squirrelmail attachment spool directory and +# This goes through the SquirrelMail attachment spool directory and # removes any abandoned temporary files that are more than 10 days old. # $Id$ # diff --git a/contrib/makedoc.sh b/contrib/makedoc.sh index e768ae0b..5c665ff7 100755 --- a/contrib/makedoc.sh +++ b/contrib/makedoc.sh @@ -1,18 +1,18 @@ #!/bin/bash -# $Id$ +# $Id$ -# WARNING. In order to use it with squirrelmail, you should -# modify phpDocumentor.ini and add .mod extension +# WARNING. In order to use it with SquirrelMail, you should +# modify phpDocumentor.ini and add .mod extension # to [_phpDocumentor_phpfile_exts] settings. #/** # * makedoc - PHPDocumentor script to save your settings -# * +# * # * Put this file inside your PHP project homedir, edit its variables and run whenever you wants to # * re/make your project documentation. -# * +# * # * The version of this file is the version of PHPDocumentor it is compatible. -# * +# * # * It simples run phpdoc with the parameters you set in this file. # * NOTE: Do not add spaces after bash variables. # * @@ -28,21 +28,21 @@ #/** # * title of generated documentation, default is 'Generated Documentation' -# * +# * # * @var string TITLE # */ -TITLE="Squirrelmail Devel CVS Documentation" +TITLE="SquirrelMail Devel CVS Documentation" -#/** +#/** # * name to use for the default package. If not specified, uses 'default' # * # * @var string PACKAGES # */ PACKAGES="squirrelmail" -#/** +#/** # * name of a directory(s) to parse directory1,directory2 -# * $PWD is the directory where makedoc.sh +# * $PWD is the directory where makedoc.sh # * # * @var string PATH_PROJECT # */ @@ -69,7 +69,7 @@ PATH_DOCS=/var/www/smdocs # */ OUTPUTFORMAT=HTML -#/** +#/** # * converter to be used # * # * @var string CONVERTER diff --git a/doc/compose.txt b/doc/compose.txt index 7abdea47..4ac8fb2a 100644 --- a/doc/compose.txt +++ b/doc/compose.txt @@ -14,7 +14,7 @@ easily, taking into account the user's settings, "Compose in new window" and 3) Print it: echo makeComposeLink($comp_uri, $disp); -makeComposeLink() has been available since Squirrelmail 1.4.2. +makeComposeLink() has been available since SquirrelMail 1.4.2. @@ -27,8 +27,8 @@ the function needs one argument: 1) url with arguments to the compose window. example 1: - + example 2: - + diff --git a/doc/db-backend.txt b/doc/db-backend.txt index ed53bc4a..33155437 100644 --- a/doc/db-backend.txt +++ b/doc/db-backend.txt @@ -39,7 +39,7 @@ For MySQL you would normally do something like: # mysqladmin create squirrelmail (from the mysql client) - mysql> GRANT select,insert,update,delete ON squirrelmail.* + mysql> GRANT select,insert,update,delete ON squirrelmail.* TO squirreluser@localhost IDENTIFIED BY 'sqpassword'; The table structure should be similar to this (for MySQL): diff --git a/doc/ie_ssl.txt b/doc/ie_ssl.txt index 45331f6f..1a774b64 100644 --- a/doc/ie_ssl.txt +++ b/doc/ie_ssl.txt @@ -10,7 +10,7 @@ things, one being the key to decypher the password. Once we had figured out that it was sessions in PHP that was causing the problem, we tried turning the session management off in the download script -in Squirrelmail. This introduced another problem for us because we NEEDED +in SquirrelMail. This introduced another problem for us because we NEEDED sessions to decypher the key so we could log into the IMAP server and download the attachment. @@ -25,8 +25,8 @@ session had been started, and lo and behold, it worked! Below is the code that made this work: session_start() - header("Pragma: "); - header("Cache-Control: cache"); + header("Pragma: "); + header("Cache-Control: cache"); With all the testing I have done, this works, and works very well for all browsers. @@ -43,7 +43,7 @@ This was submitted by Marcin Jessa gets fixed). The problem has to do with downloading attachments. Apparently, MSIE forgets how MIME works, when it uses HTTP/1.1. For the Apache server, insert the following directive in httpd.conf: - + BrowserMatch "MSIE" nokeepalive downgrade-1.0 force-response-1.0 Recent versions of Apache already have a similar directive for a diff --git a/doc/plugin.txt b/doc/plugin.txt index bb143818..8f61a0b5 100644 --- a/doc/plugin.txt +++ b/doc/plugin.txt @@ -188,7 +188,7 @@ version is not listed, files are included from v.1.3.2.): 9.2. $prefs_backend (from 1.4.3rc1 and 1.5.0) functions/db_prefs.php functions/file_prefs.php - 9.2.1. functions/display_messages.php + 9.2.1. functions/display_messages.php (loaded only by file_prefs.php) Hook Types: Parameters and Return Values @@ -1138,7 +1138,7 @@ files. You should change the header to look something more like: - # Copyright (c) 1999-2003 The Squirrelmail Development Team + # Copyright (c) 1999-2003 The SquirrelMail Development Team # Roland Bauerschmidt , 1999. # $Id$ msgid "" @@ -1147,7 +1147,7 @@ files. "POT-Creation-Date: 2003-01-21 19:21+0100\n" "PO-Revision-Date: 2003-01-21 21:01+0100\n" "Last-Translator: Juergen Edner \n" - "Language-Team: German \n" + "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" @@ -1182,9 +1182,9 @@ Documenting the Code (Optional) If you wish, you can use phpdoc (Javadoc-style) comments, when documenting your code. -If you follow the standards that are followed between Squirrelmail core & +If you follow the standards that are followed between SquirrelMail core & plugin developers, the resulted documentation can be included with the rest of -the Squirrelmail code & API documentation. Specifically, in the page-level +the SquirrelMail code & API documentation. Specifically, in the page-level docblock, declare the package to be 'plugins', and the subpackage to be the name of your plugin. For instance: @@ -1201,7 +1201,7 @@ name of your plugin. For instance: The rest is up to you. Try to follow some common sense and document what is really needed. Documenting the code properly can be a big help not only to yourself, but to those who will take a look at your code, fix the bugs and even -improve it, in the true open-source spirit that Squirrelmail was built upon. +improve it, in the true open-source spirit that SquirrelMail was built upon. For more information about phpdocumentor and how to write proper-tagged comments, you are directed at: diff --git a/doc/presets.txt b/doc/presets.txt index bd8351a7..6b534324 100644 --- a/doc/presets.txt +++ b/doc/presets.txt @@ -1,6 +1,6 @@ $Date$ -This file lists squirrelmail options set by D option in conf.pl +This file lists SquirrelMail options set by D option in conf.pl It can be used if user can't run conf.pl and changes options manually. Settings can be different if IMAP server uses shared folders. diff --git a/functions/abook_ldap_server.php b/functions/abook_ldap_server.php index eacedc68..bd6a5bbe 100644 --- a/functions/abook_ldap_server.php +++ b/functions/abook_ldap_server.php @@ -218,7 +218,7 @@ class abook_ldap_server extends addressbook_backend { /** * Decode from charset used by this LDAP server to charset used by translation * - * Uses squirrelmail charset_decode functions + * Uses SquirrelMail charset_decode functions * @param string string that has to be decoded * @return string decoded string */ diff --git a/functions/auth.php b/functions/auth.php index adfa3622..ba6ce8eb 100644 --- a/functions/auth.php +++ b/functions/auth.php @@ -31,7 +31,7 @@ if (! isset($use_smtp_tls)) { } /** - * Check if user has previously logged in to the Squirrelmail session. If user + * Check if user has previously logged in to the SquirrelMail session. If user * has not logged in, execution will stop inside this function. * * @return int A positive value is returned if user has previously logged in diff --git a/functions/constants.php b/functions/constants.php index a6600714..a5d1c257 100644 --- a/functions/constants.php +++ b/functions/constants.php @@ -6,7 +6,7 @@ * Copyright (c) 1999-2005 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * - * Loads constants used by the rest of the Squirrelmail source. + * Loads constants used by the rest of the SquirrelMail source. * This file is include by src/login.php, src/redirect.php and * src/load_prefs.php. * @@ -18,7 +18,7 @@ require_once(SM_PATH . 'functions/plugin.php'); /* Required for the hook */ /**************************************************************/ -/* Set values for constants used by Squirrelmail preferences. */ +/* Set values for constants used by SquirrelMail preferences. */ /**************************************************************/ /* Define basic, general purpose preference constants. */ diff --git a/functions/date.php b/functions/date.php index 8e86e10d..a2a88566 100644 --- a/functions/date.php +++ b/functions/date.php @@ -446,7 +446,7 @@ function getTimeStamp($dateParts) { } /* I use this function for profiling. Should never be called in - actual versions of squirrelmail released to public. */ + actual versions of SquirrelMail released to public. */ /* function getmicrotime() { $mtime = microtime(); @@ -455,4 +455,4 @@ function getTimeStamp($dateParts) { return ($mtime); } */ -?> +?> \ No newline at end of file diff --git a/functions/display_messages.php b/functions/display_messages.php index fd0aa027..32c4858f 100644 --- a/functions/display_messages.php +++ b/functions/display_messages.php @@ -19,12 +19,12 @@ require_once(SM_PATH . 'functions/plugin.php'); /** - * Find out where squirrelmail lives and try to be smart about it. - * The only problem would be when squirrelmail lives in directories + * Find out where SquirrelMail lives and try to be smart about it. + * The only problem would be when SquirrelMail lives in directories * called "src", "functions", or "plugins", but people who do that need * to be beaten with a steel pipe anyway. * - * @return string the base uri of squirrelmail installation. + * @return string the base uri of SquirrelMail installation. */ function sqm_baseuri(){ global $base_uri, $PHP_SELF; diff --git a/functions/encode/cp1251.php b/functions/encode/cp1251.php index a77023ab..5f155373 100644 --- a/functions/encode/cp1251.php +++ b/functions/encode/cp1251.php @@ -30,7 +30,7 @@ function charset_encode_cp1251 ($string) { * Return cp1251 symbol when unicode character number is provided * * This function is used internally by charset_encode_cp1251 - * function. It might be unavailable to other squirrelmail functions. + * function. It might be unavailable to other SquirrelMail functions. * Don't use it or make sure, that functions/encode/cp1251.php is * included. * diff --git a/functions/encode/cp1255.php b/functions/encode/cp1255.php index 31378c4e..2e191396 100644 --- a/functions/encode/cp1255.php +++ b/functions/encode/cp1255.php @@ -30,7 +30,7 @@ function charset_encode_cp1255 ($string) { * Return cp1255 symbol when unicode character number is provided * * This function is used internally by charset_encode_cp1255 - * function. It might be unavailable to other squirrelmail functions. + * function. It might be unavailable to other SquirrelMail functions. * Don't use it or make sure, that functions/encode/cp1255.php is * included. * diff --git a/functions/encode/cp1256.php b/functions/encode/cp1256.php index 9ccb9965..3c36580a 100644 --- a/functions/encode/cp1256.php +++ b/functions/encode/cp1256.php @@ -30,7 +30,7 @@ function charset_encode_cp1256 ($string) { * Return cp1256 symbol when unicode character number is provided * * This function is used internally by charset_encode_cp1256 - * function. It might be unavailable to other squirrelmail functions. + * function. It might be unavailable to other SquirrelMail functions. * Don't use it or make sure, that functions/encode/cp1256.php is * included. * diff --git a/functions/encode/iso_8859_1.php b/functions/encode/iso_8859_1.php index b65ff5ac..58f3eb61 100644 --- a/functions/encode/iso_8859_1.php +++ b/functions/encode/iso_8859_1.php @@ -30,7 +30,7 @@ function charset_encode_iso_8859_1 ($string) { * Return iso-8859-1 symbol when unicode character number is provided * * This function is used internally by charset_encode_iso_8859_1 - * function. It might be unavailable to other squirrelmail functions. + * function. It might be unavailable to other SquirrelMail functions. * Don't use it or make sure, that functions/encode/iso_8859_1.php is * included. * diff --git a/functions/encode/iso_8859_15.php b/functions/encode/iso_8859_15.php index a9edd40b..19b5d54f 100644 --- a/functions/encode/iso_8859_15.php +++ b/functions/encode/iso_8859_15.php @@ -30,7 +30,7 @@ function charset_encode_iso_8859_15 ($string) { * Return iso-8859-15 symbol when unicode character number is provided * * This function is used internally by charset_encode_iso_8859_15 - * function. It might be unavailable to other squirrelmail functions. + * function. It might be unavailable to other SquirrelMail functions. * Don't use it or make sure, that functions/encode/iso_8859_15.php is * included. * diff --git a/functions/encode/iso_8859_2.php b/functions/encode/iso_8859_2.php index 3fc3f21b..2a2cf526 100644 --- a/functions/encode/iso_8859_2.php +++ b/functions/encode/iso_8859_2.php @@ -30,7 +30,7 @@ function charset_encode_iso_8859_2 ($string) { * Return iso-8859-2 symbol when unicode character number is provided * * This function is used internally by charset_encode_iso_8859_2 - * function. It might be unavailable to other squirrelmail functions. + * function. It might be unavailable to other SquirrelMail functions. * Don't use it or make sure, that functions/encode/iso_8859_2.php is * included. * diff --git a/functions/encode/iso_8859_7.php b/functions/encode/iso_8859_7.php index 45ab0d19..a0e6b716 100644 --- a/functions/encode/iso_8859_7.php +++ b/functions/encode/iso_8859_7.php @@ -30,7 +30,7 @@ function charset_encode_iso_8859_7 ($string) { * Return iso-8859-7 symbol when unicode character number is provided * * This function is used internally by charset_encode_iso_8859_7 - * function. It might be unavailable to other squirrelmail functions. + * function. It might be unavailable to other SquirrelMail functions. * Don't use it or make sure, that functions/encode/iso_8859_7.php is * included. * diff --git a/functions/encode/iso_8859_9.php b/functions/encode/iso_8859_9.php index d8e55969..09883658 100644 --- a/functions/encode/iso_8859_9.php +++ b/functions/encode/iso_8859_9.php @@ -30,7 +30,7 @@ function charset_encode_iso_8859_9 ($string) { * Return iso-8859-9 symbol when unicode character number is provided * * This function is used internally by charset_encode_iso_8859_9 - * function. It might be unavailable to other squirrelmail functions. + * function. It might be unavailable to other SquirrelMail functions. * Don't use it or make sure, that functions/encode/iso_8859_9.php is * included. * diff --git a/functions/encode/koi8_r.php b/functions/encode/koi8_r.php index 8aea0d8d..df4ee66f 100644 --- a/functions/encode/koi8_r.php +++ b/functions/encode/koi8_r.php @@ -30,7 +30,7 @@ function charset_encode_koi8_r ($string) { * Return koi8-r symbol when unicode character number is provided * * This function is used internally by charset_encode_koi8_r - * function. It might be unavailable to other squirrelmail functions. + * function. It might be unavailable to other SquirrelMail functions. * Don't use it or make sure, that functions/encode/koi8_r.php is * included. * diff --git a/functions/encode/koi8_u.php b/functions/encode/koi8_u.php index e23e217f..e0082da9 100644 --- a/functions/encode/koi8_u.php +++ b/functions/encode/koi8_u.php @@ -30,7 +30,7 @@ function charset_encode_koi8_u ($string) { * Return koi8-u symbol when unicode character number is provided * * This function is used internally by charset_encode_koi8_u - * function. It might be unavailable to other squirrelmail functions. + * function. It might be unavailable to other SquirrelMail functions. * Don't use it or make sure, that functions/encode/koi8_u.php is * included. * diff --git a/functions/encode/tis_620.php b/functions/encode/tis_620.php index 368141e7..789e266d 100644 --- a/functions/encode/tis_620.php +++ b/functions/encode/tis_620.php @@ -30,7 +30,7 @@ function charset_encode_tis_620 ($string) { * Return tis-620 symbol when unicode character number is provided * * This function is used internally by charset_encode_tis_620 - * function. It might be unavailable to other squirrelmail functions. + * function. It might be unavailable to other SquirrelMail functions. * Don't use it or make sure, that functions/encode/tis_620.php is * included. * diff --git a/functions/encode/us_ascii.php b/functions/encode/us_ascii.php index e3a25ee5..5f43ccf9 100644 --- a/functions/encode/us_ascii.php +++ b/functions/encode/us_ascii.php @@ -30,7 +30,7 @@ function charset_encode_us_ascii ($string) { * Return us-ascii symbol when unicode character number is provided * * This function is used internally by charset_encode_us_ascii - * function. It might be unavailable to other squirrelmail functions. + * function. It might be unavailable to other SquirrelMail functions. * Don't use it or make sure, that functions/encode/us_ascii.php is * included. * diff --git a/functions/encode/utf_8.php b/functions/encode/utf_8.php index 9f6ff000..f5c7e9a9 100644 --- a/functions/encode/utf_8.php +++ b/functions/encode/utf_8.php @@ -34,7 +34,7 @@ function charset_encode_utf_8 ($string) { * Return utf8 symbol when unicode character number is provided * * This function is used internally by charset_encode_utf_8 - * function. It might be unavailable to other squirrelmail functions. + * function. It might be unavailable to other SquirrelMail functions. * Don't use it or make sure, that functions/encode/utf_8.php is * included. * diff --git a/functions/i18n.php b/functions/i18n.php index 96934747..676f2720 100644 --- a/functions/i18n.php +++ b/functions/i18n.php @@ -66,8 +66,8 @@ function sq_textdomain($domain) { * php gettext extension works only when locale is set. This wrapper * function allows to use more than one locale name. * - * @param int $category locale category name. Use php named constants - * (LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, LC_TIME) + * @param int $category locale category name. Use php named constants + * (LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, LC_TIME) * @param mixed $locale option contains array with possible locales or string with one locale * @return string name of set locale or false, if all locales fail. * @since 1.5.1 @@ -320,9 +320,9 @@ function set_up_language($sm_language, $do_search = false, $default = false) { if (function_exists('bind_textdomain_codeset')) { // Japanese translation uses different internal charset if ($sm_notAlias == 'ja_JP') { - bind_textdomain_codeset ("squirrelmail", 'EUC-JP'); + bind_textdomain_codeset ('squirrelmail', 'EUC-JP'); } else { - bind_textdomain_codeset ("squirrelmail", $languages[$sm_notAlias]['CHARSET'] ); + bind_textdomain_codeset ('squirrelmail', $languages[$sm_notAlias]['CHARSET'] ); } } diff --git a/functions/imap_messages.php b/functions/imap_messages.php index c17f1082..cb2cf325 100755 --- a/functions/imap_messages.php +++ b/functions/imap_messages.php @@ -242,7 +242,7 @@ function get_squirrel_sort($imap_stream, $sSortField, $reverse = false, $aUid = case 'RFC822.SIZE': if(!$walk) { // redefine $sSortField to maintain the same namespace between - // server-side sorting and squirrelmail sorting + // server-side sorting and SquirrelMail sorting $sSortField = 'SIZE'; } foreach ($msgs as $item) { @@ -972,4 +972,4 @@ function sqimap_get_small_header($imap_stream, $id, $sent) { return $res[0]; } -?> +?> \ No newline at end of file diff --git a/functions/mime.php b/functions/mime.php index ab9935f2..a2ff7c18 100644 --- a/functions/mime.php +++ b/functions/mime.php @@ -1490,7 +1490,7 @@ function sq_fixatts($tagname, /** * This function edits the style definition to make them friendly and - * usable in squirrelmail. + * usable in SquirrelMail. * * @param $message the message object * @param $id the message id @@ -2074,4 +2074,4 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX') { } // end fn SendDownloadHeaders -?> +?> \ No newline at end of file diff --git a/functions/options.php b/functions/options.php index 443d4c74..421fe557 100644 --- a/functions/options.php +++ b/functions/options.php @@ -44,7 +44,7 @@ define('SMOPT_SAVE_DEFAULT', 'save_option'); define('SMOPT_SAVE_NOOP', 'save_option_noop'); /** - * SquirrelOption: An option for Squirrelmail. + * SquirrelOption: An option for SquirrelMail. * * @package squirrelmail * @subpackage prefs @@ -68,7 +68,7 @@ class SquirrelOption { */ var $type; /** - * Indicates if a link should be shown to refresh part + * Indicates if a link should be shown to refresh part * or all of the window * * See SMOPT_REFRESH_* defines @@ -83,9 +83,9 @@ class SquirrelOption { */ var $size; /** - * Text that follows a text input or + * Text that follows a text input or * select list input on the preferences page - * + * * useful for indicating units, meanings of special values, etc. * @var string */ @@ -103,7 +103,7 @@ class SquirrelOption { */ var $script; /** - * script (usually Javascript) that will be placed after (outside of) + * script (usually Javascript) that will be placed after (outside of) * the INPUT tag * @var string */ @@ -127,7 +127,7 @@ class SquirrelOption { */ var $new_value; /** - * associative array, where each key is an actual input value + * associative array, where each key is an actual input value * and the corresponding value is what is displayed to the user * for that list item in the drop-down list * @var array @@ -135,9 +135,9 @@ class SquirrelOption { var $possible_values; /** * disables html sanitizing. - * - * WARNING - don't use it, if user input is possible in option - * or use own sanitizing functions. Currently works only with + * + * WARNING - don't use it, if user input is possible in option + * or use own sanitizing functions. Currently works only with * SMOPT_TYPE_STRLIST. * @var bool */ @@ -232,7 +232,7 @@ class SquirrelOption { /** * Set the script for this option. - * @param string $script + * @param string $script */ function setScript($script) { $this->script = $script; @@ -258,7 +258,7 @@ class SquirrelOption { * Creates fields on option pages according to option type * * Function that calls other createWidget* functions. - * @return string html formated option field + * @return string html formated option field */ function createHTMLWidget() { global $color; diff --git a/functions/prefs.php b/functions/prefs.php index b70f0ae1..92f6f43d 100644 --- a/functions/prefs.php +++ b/functions/prefs.php @@ -41,7 +41,7 @@ if (isset($prefs_backend) && file_exists(SM_PATH . $prefs_backend)) { * hashed location of that datafile. * * @param string username the username of the current user - * @param string dir the squirrelmail datadir + * @param string dir the SquirrelMail datadir * @param string datafile the name of the file to open * @param bool hash_seach default true * @return string the hashed location of datafile @@ -91,7 +91,7 @@ function getHashedFile($username, $dir, $datafile, $hash_search = true) { * dir for that username. * * @param string username the username of the current user - * @param string dir the squirrelmail datadir + * @param string dir the SquirrelMail datadir * @param string hash_dirs default '' * @return the path to the hash dir for username */ diff --git a/functions/strings.php b/functions/strings.php index 4d4635f3..b9b357f8 100644 --- a/functions/strings.php +++ b/functions/strings.php @@ -7,7 +7,7 @@ * Licensed under the GNU GPL. For full terms see the file COPYING. * * This code provides various string manipulation functions that are - * used by the rest of the Squirrelmail code. + * used by the rest of the SquirrelMail code. * * @version $Id$ * @package squirrelmail diff --git a/functions/tree.php b/functions/tree.php index 13b97eee..784328a3 100644 --- a/functions/tree.php +++ b/functions/tree.php @@ -7,7 +7,7 @@ * Licensed under the GNU GPL. For full terms see the file COPYING. * * This code provides various string manipulation functions that are - * used by the rest of the Squirrelmail code. + * used by the rest of the SquirrelMail code. * * @version $Id$ * @package squirrelmail diff --git a/functions/url_parser.php b/functions/url_parser.php index 2bce6976..c9dbcc53 100644 --- a/functions/url_parser.php +++ b/functions/url_parser.php @@ -7,7 +7,7 @@ * Licensed under the GNU GPL. For full terms see the file COPYING. * * This code provides various string manipulation functions that are - * used by the rest of the Squirrelmail code. + * used by the rest of the SquirrelMail code. * * @version $Id$ * @package squirrelmail diff --git a/plugins/bug_report/bug_report.php b/plugins/bug_report/bug_report.php index 539e5d30..eef6e674 100644 --- a/plugins/bug_report/bug_report.php +++ b/plugins/bug_report/bug_report.php @@ -11,7 +11,7 @@ * Copyright (c) 1999-2005 The SquirrelMail development team * Licensed under the GNU GPL. For full terms see the file COPYING. * - * This is a standard Squirrelmail-1.2 API for plugins. + * This is a standard SquirrelMail 1.2 API for plugins. * * @version $Id$ * @package plugins diff --git a/plugins/bug_report/setup.php b/plugins/bug_report/setup.php index 18be67b6..3e782d48 100644 --- a/plugins/bug_report/setup.php +++ b/plugins/bug_report/setup.php @@ -6,7 +6,7 @@ * Copyright (c) 1999-2005 The SquirrelMail development team * Licensed under the GNU GPL. For full terms see the file COPYING. * - * This is a standard Squirrelmail-1.2 API for plugins. + * This is a standard SquirrelMail 1.2 API for plugins. * * @version $Id$ * @package plugins diff --git a/plugins/bug_report/show_system_specs.php b/plugins/bug_report/show_system_specs.php index 1367d1a1..020dd518 100644 --- a/plugins/bug_report/show_system_specs.php +++ b/plugins/bug_report/show_system_specs.php @@ -6,7 +6,7 @@ * Copyright (c) 1999-2005 The SquirrelMail development team * Licensed under the GNU GPL. For full terms see the file COPYING. * - * This is a standard Squirrelmail-1.2 API for plugins. + * This is a standard SquirrelMail 1.2 API for plugins. * * @version $Id$ * @package plugins @@ -19,12 +19,10 @@ define('SM_PATH','../../'); include_once(SM_PATH . 'include/validate.php'); - ?> 
-
 
  *
- * init plugin into squirrelmail
+ * Init plugin into SquirrelMail
  *
  * $Id$
  * @package plugins
diff --git a/plugins/filters/bulkquery/README b/plugins/filters/bulkquery/README
index 2805a3b1..b20e4aea 100644
--- a/plugins/filters/bulkquery/README
+++ b/plugins/filters/bulkquery/README
@@ -1,4 +1,3 @@
-
 bulkquery - A program by Brent Bice - 02/2002
 
    Bulkquery is a multi-threaded program that makes a large number of
@@ -6,12 +5,12 @@ DNS queries as fast as possible. It's tailored for making DNS queries for
 specific IP addresses against specific DNS based RBLs.
 
    "Why bother?"
-I've been asked this several times. While running squirrelmail on a server
+I've been asked this several times. While running SquirrelMail on a server
 with very little bandwidth and very high latency (a dial-up account - snicker)
 I noticed that while my filters plugin was making gethostbyname() function
 calls, my dial-up line was mostly idle. This was, apparently, because all
 the DNS function calls were being made in series. Once a DNS query had been
-sent, no others were sent until a response had been received or until a 
+sent, no others were sent until a response had been received or until a
 certain timeout period had occurred.  And some of the RBLs were quite a
 bit faster than the others.  This seemed pretty inefficient. "Why not make
 more DNS queries while waiting for the replies," I thought.
diff --git a/plugins/info/README b/plugins/info/README
index 812d0bfa..dd3aeedb 100644
--- a/plugins/info/README
+++ b/plugins/info/README
@@ -1,7 +1,7 @@
-README for the info plugin for Squirrelmail
+README for the info plugin for SquirrelMail
 
   This plugin is designed to aid a system admin
-or Squirrelmail developer troubleshoot IMAP commands
+or SquirrelMail developer troubleshoot IMAP commands
 and responses.
 
 IMPORTANT NOTE:
@@ -13,7 +13,7 @@ IMPORTANT NOTE:
 * FOR TESTING, TROUBLESHOOTING AND DEVELOPMENT.     *
 *****************************************************
 
-You have been warned :) 
+You have been warned :)
 
 Ok, now to the good stuff. Enable this plugin as you would any other.
 Its called 'info'. You will then have an "IMAP server information"  section
@@ -27,11 +27,11 @@ performing these commands on the account you are logged into, so
 any command that changes the contents of  your mailbox will ..er..
 change the contents of your mailbox :)
 
-Changes and custom commands are maintained as long as you are on 
-the IMAP server options page (even after submitting tests). 
+Changes and custom commands are maintained as long as you are on
+the IMAP server options page (even after submitting tests).
 Once you leave this page and return then the commmands are reset
-to the defaults. You can manually reset the commands using the 
-'default' button, or clear the contents of all the commands with 
+to the defaults. You can manually reset the commands using the
+'default' button, or clear the contents of all the commands with
 the 'clear' button.
 
 Questions, problems, comments welcome at
diff --git a/plugins/mail_fetch/README b/plugins/mail_fetch/README
index e4f6be94..9f11a56c 100644
--- a/plugins/mail_fetch/README
+++ b/plugins/mail_fetch/README
@@ -7,13 +7,13 @@ Features
 
 * Copies messages from remote server
 * Saves server, alias, username, and password in prefs file...
-* Remembers where to resume downloading messages if 
+* Remembers where to resume downloading messages if
   your pop server supports UIDL.
 * Optionally deletes mail from the remote server.
 * Allow an infinite amount of remote servers
 * Optional to not save password - prompt on check
 * Save messages into a local IMAP folder instead of INBOX
-* Check mail during login (Needs SM 1.1.3 or older). 
+* Check mail during login (Needs SM 1.1.3 or older).
 * Check mail during folder refreshes.
 * Allows gettext translations.
 
@@ -31,7 +31,7 @@ Configuration
 Under the options you can add, delete or modify server list where
 fetching mail.  For each server you can set also username and password;
 if you leave password blank, the password whore required when you fetch
-mail.  Make sure "Leave Mail On Server" is checked if you do not want 
+mail.  Make sure "Leave Mail On Server" is checked if you do not want
 Mail_Fetch to delete it from the remote server.  Once configured,
 click 'Fetch' in the SquirrelMail menu to get your mail; you can fetch
 mail from all server instead or from only one by selecting the options
@@ -43,11 +43,11 @@ entered in order for this to work.
 
 In order to secure a little bit the system, pop3 passwords can be encrypted.
 The encryption key may be defined in to places. The first, and more secure,
-is in the httpd configuration as an enviromental variable called MF_TIT 
-only accesible from the squirrelmail directory.
- 
-the way you can do this from apache is adding the following directives to 
-httpd.conf (supposing that squirrelmail is located at /usr/local) or an
+is in the httpd configuration as an enviromental variable called MF_TIT
+only accesible from the SquirrelMail directory.
+
+the way you can do this from apache is adding the following directives to
+httpd.conf (supposing that SquirrelMail is located at /usr/local) or an
 included configuration file:
 
 
@@ -55,7 +55,7 @@ included configuration file:
 
 
 Of course, you should replace the text inside double quotes with the key
-you want to (some kind of secret text). A please remember that the file 
+you want to (some kind of secret text). A please remember that the file
 where you decided to place this must be root only readable.
 
 The second way is to edit functions.php and look for:
@@ -79,7 +79,7 @@ Future Work
 ===========
 
 * Add IMAP server stealing
- 
+
 * Limit number of pop accounts
 
 
@@ -109,7 +109,7 @@ Old version (0.3) has been updated from Tyler's original version 0.1 by
 
 Translations
 ============
-Translation is made in the same manner than Squirrelmail's core does.
+Translation is made in the same manner as SquirrelMail's core.
 You need to take .po file, fill the template, store it
 in the appropriate locale folder under the plugin and compile the po
 file. Better than this fill the po file and send it back to the author.
@@ -138,9 +138,9 @@ and then add it again.
 ChangeLog
 =========
 
-1.3.1 
+1.3.1
 
-Bugfix 
+Bugfix
 ------
 1 Delete mail server routine update record not as expected.
 The logic is still correct to completed the wanted action, but the order
@@ -154,7 +154,7 @@ Added features
 fetching mail from server is stopped in the middle.
 2. POP3 connection will be re-established for non-persistent server failure.
 
-"Chiu Wai Pun"  
+"Chiu Wai Pun" 
 
 ---------------------------------------------------------------------------
                    Philippe Mingo 
@@ -175,7 +175,7 @@ fetching mail from server is stopped in the middle.
 0.9   Added an alias for each server. Changed default encryption key, please
       reenter passwords if you're not using environment system.
 0.8   Better encryption security through env variables.
-0.7   Added password encryption and strings internationalization. 
+0.7   Added password encryption and strings internationalization.
 ----------------------------------------------------------------------------
 0.6   Bugfix for folder list and typo
       set_time_limit of 20 seconds per message (to avoid timeout errors)
@@ -193,7 +193,7 @@ fetching mail from server is stopped in the middle.
 0.3   Converted fetch routine to use the POP3 object from thewebmasters.net
       Added Leave Mail on Server option
       Now only downloads new messages if the pop server supports UIDL.
-----------------------------------------------------------------------------      
+----------------------------------------------------------------------------
 0.2   Now saves account information
 0.1   Initial release by Tyler Akins
 ----------------------------------------------------------------------------
diff --git a/plugins/sent_subfolders/setup.php b/plugins/sent_subfolders/setup.php
index b835136d..68fe91cd 100644
--- a/plugins/sent_subfolders/setup.php
+++ b/plugins/sent_subfolders/setup.php
@@ -6,7 +6,7 @@
  * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
- * This is a standard Squirrelmail-1.2 API for plugins.
+ * This is a standard SquirrelMail 1.2 API for plugins.
  *
  * $Id$
  * @package plugins
@@ -23,7 +23,7 @@ define('SMPREF_SENT_SUBFOLDERS_MONTHLY',   3);
 define('SMOPT_GRP_SENT_SUBFOLDERS','SENT_SUBFOLDERS');
 
 /**
- * Adds plugin to squirrelmail hooks
+ * Adds plugin to SquirrelMail's hooks
  */
 function squirrelmail_plugin_init_sent_subfolders() {
     /* Standard initialization API. */
diff --git a/plugins/squirrelspell/INSTALL b/plugins/squirrelspell/INSTALL
index 478380b0..406d43c5 100644
--- a/plugins/squirrelspell/INSTALL
+++ b/plugins/squirrelspell/INSTALL
@@ -1,7 +1,7 @@
 SquirrelSpell plugin
 --------------------
 
-Untar SquirrelSpell into your squirrelmail/plugins directory. Modify the 
+Untar SquirrelSpell into your squirrelmail/plugins directory. Modify the
 sqspell_config.php file making sure you have ispell or aspell
 available on your system and located in PHP's path. The squirrelspell
 doesn't check for that and if it is not available, you're just going to
@@ -11,14 +11,14 @@ very useful.
 Read files in "doc" directory -- they explain some features.
 
 Enable the plugin either by hand or by running the configure script from
-your squirrelmail install directory.
+your SquirrelMail install directory.
 
 NOTE: If you are using php >= 4.3.0 squirrelspell should work in safe mode.
 Otherwise, you may have to disable safe mode for the squirrelspell directory.
    APACHE CONF EXAMPLE:
-	
-		php_admin_value safe_mode 0
-	
+        
+                php_admin_value safe_mode 0
+        
 
 
 Enjoy and report bugs. ;)
@@ -62,11 +62,11 @@ This is an options commented sqspell_config.php
        configure the array to look something like this:
 
        $SQSPELL_APP = array(
-    			"English" => "aspell -a",
+                            "English" => "aspell -a",
                             "Russian" => "ispell -d russian -a",
-    			...
-    			"Swahili" => "ispell -d swahili -a"
-    		       );
+                            ...
+                            "Swahili" => "ispell -d swahili -a"
+                           );
 
        Watch the commas, making sure there isn't one after your last
        dictionary declaration. Also, make sure all these dictionaries
@@ -121,4 +121,4 @@ This is an options commented sqspell_config.php
                     Adding until resolved.
     **/
     $SQSPELL_SOUP_NAZI = 'Mozilla/3, Mozilla/2, Opera 4, Opera/4, Macintosh';
-?>    
+?>
diff --git a/plugins/squirrelspell/doc/PRIVACY b/plugins/squirrelspell/doc/PRIVACY
index a88e1929..c108cc0e 100644
--- a/plugins/squirrelspell/doc/PRIVACY
+++ b/plugins/squirrelspell/doc/PRIVACY
@@ -5,7 +5,7 @@ Beginning with version v0.2 SquirrelSpell saves personal dictionary on the
 server. This has a potential of a serious privacy issue, therefore you
 should configure your system to disallow web access to the directory where
 your user dictionaries are stored. By default they are stored in your
-$data_dir which you provided in your Squirrelmail config. This is the best
+$data_dir which you provided in your SquirrelMail config. This is the best
 option, but you should read the SquirrelMail FAQ's and Readme's on how to
 secure that directory.
 
diff --git a/plugins/squirrelspell/setup.php b/plugins/squirrelspell/setup.php
index 8ff0d971..13e75748 100644
--- a/plugins/squirrelspell/setup.php
+++ b/plugins/squirrelspell/setup.php
@@ -16,7 +16,7 @@
  */
 
 /**
- * Standard squirrelmail plugin initialization API.
+ * Standard SquirrelMail plugin initialization API.
  *
  * @return void
  */
diff --git a/plugins/squirrelspell/sqspell_interface.php b/plugins/squirrelspell/sqspell_interface.php
index 662f51b2..af629789 100644
--- a/plugins/squirrelspell/sqspell_interface.php
+++ b/plugins/squirrelspell/sqspell_interface.php
@@ -28,7 +28,7 @@ $SQSPELL_DIR='plugins/squirrelspell/';
 $SQSPELL_CRYPTO=FALSE;
 
 /**
- * Load the stuff needed from squirrelmail
+ * Load the stuff needed from SquirrelMail
  * @ignore
  */
 define('SM_PATH','../../');
diff --git a/plugins/squirrelspell/sqspell_options.php b/plugins/squirrelspell/sqspell_options.php
index e6ca44b6..12b9c1b5 100644
--- a/plugins/squirrelspell/sqspell_options.php
+++ b/plugins/squirrelspell/sqspell_options.php
@@ -23,7 +23,7 @@ $SQSPELL_DIR='plugins/squirrelspell/';
 $SQSPELL_CRYPTO=FALSE;
 
 /**
- * Load some necessary stuff from squirrelmail.
+ * Load some necessary stuff from SquirrelMail.
  * @ignore
  */
 define('SM_PATH','../../');
diff --git a/plugins/translate/README b/plugins/translate/README
index 1b4a97d7..d43ef707 100644
--- a/plugins/translate/README
+++ b/plugins/translate/README
@@ -53,12 +53,12 @@ Installation
 As with other plugins, just uncompress the archive in the plugins
 directory, go back to the main directory, run configure and add the plugin.
 
-Questions/comments/flames/etc can be sent to the Squirrelmail Plugins list
+Questions/comments/flames/etc can be sent to the SquirrelMail Plugins list
 
 
 Changes
 =======
-  * Plugin included into squirrelmail distribution
+  * Plugin included into SquirrelMail distribution
   * Added site configuration options
 
 1.3 -> 1.4
@@ -67,10 +67,10 @@ Changes
 
 1.2 -> 1.3
   * Stupid bugfix.  :-)
-  
+
 1.1 -> 1.2
   * HTML changed to look better
-  
+
 1.0 -> 1.1
   * Added more servers
   * Added better language handling
diff --git a/src/download.php b/src/download.php
index 0cf53880..de1c449c 100644
--- a/src/download.php
+++ b/src/download.php
@@ -143,7 +143,7 @@ if (strlen($filename) < 1) {
  *    most likely display the attachment inline inside the browser.
  *      And finally, the third one will be used by default.  If it
  *    is displayable (text or html), it will load them up in a text
- *    viewer (built in to squirrelmail).  Otherwise, it sets the
+ *    viewer (built in to SquirrelMail).  Otherwise, it sets the
  *    content-type as application/octet-stream
  */
 if (isset($absolute_dl) && $absolute_dl) {