Fixing strings:

- Removing space before colon
- Removing trailing spaces
- Changing "said" to "wrote"

ChangeLog

@@ -195,7 +195,7 @@ Version 1.5.1 -- CVS
   - Fix undefined variables in src/webmail.php.
   - 24hr clock format should include a leading 0.
   - Removed numeric keys for plugin array in config.php.
-  - Fixed translations of "On DATE, AUTHOR said" and "AUTHOR said" replies.
+  - Fixed translations of "On DATE, AUTHOR Wrote" and "AUTHOR Wrote" replies.
   - Added sq_str_pad function for padding of multi-byte strings.
   - Added sq_strlen function for calculation of multi-byte string length.
   - Quoted "INBOX" in check for the status of INBOX in a LIST call. Fixes an

functions/imap_asearch.php

@@ -1,36 +1,36 @@
 <?php
 
 /**
-* imap_search.php
-*
-* Copyright (c) 1999-2005 The SquirrelMail Project Team
-* Licensed under the GNU GPL. For full terms see the file COPYING.
-*
-* IMAP asearch routines
-*
-* Subfolder search idea from Patch #806075 by Thomas Pohl xraven at users.sourceforge.net. Thanks Thomas!
-*
-* @version $Id$
-* @package squirrelmail
-* @subpackage imap
-* @see search.php
-* @link http://www.ietf.org/rfc/rfc3501.txt
-* @author Alex Lemaresquier - Brainstorm - alex at brainstorm.fr
-*/
+ * imap_search.php
+ *
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * IMAP asearch routines
+ *
+ * Subfolder search idea from Patch #806075 by Thomas Pohl xraven at users.sourceforge.net. Thanks Thomas!
+ *
+ * @version $Id$
+ * @package squirrelmail
+ * @subpackage imap
+ * @see search.php
+ * @link http://www.ietf.org/rfc/rfc3501.txt
+ * @author Alex Lemaresquier - Brainstorm - alex at brainstorm.fr
+ */
 
 /** This functionality requires the IMAP and date functions
-*/
+ */
 require_once(SM_PATH . 'functions/imap_general.php');
 require_once(SM_PATH . 'functions/date.php');
 
-/** Set to TRUE to dump the imap dialogue
-* @global bool $imap_asearch_debug_dump
-*/
+/** Set to TRUE to dump the IMAP dialogue
+ * @global bool $imap_asearch_debug_dump
+ */
 $imap_asearch_debug_dump = FALSE;
 
-/** Imap SEARCH keys
-* @global array $imap_asearch_opcodes
-*/
+/** IMAP SEARCH keys
+ * @global array $imap_asearch_opcodes
+ */
 global $imap_asearch_opcodes;
 $imap_asearch_opcodes = array(
 /* <sequence-set> => 'asequence', */    // Special handling, @see sqimap_asearch_build_criteria()
@@ -71,9 +71,9 @@ $imap_asearch_opcodes = array(
     'UNSEEN' => ''
 );
 
-/** Imap SEARCH month names encoding
-* @global array $imap_asearch_months
-*/
+/** IMAP SEARCH month names encoding
+ * @global array $imap_asearch_months
+ */
 $imap_asearch_months = array(
     '01' => 'jan',
     '02' => 'feb',
@@ -90,37 +90,38 @@ $imap_asearch_months = array(
 );
 
 /**
-* Function to display an error related to an IMAP-query.
-* We need to do our own error management since we may receive NO responses on purpose (even BAD with SORT or THREAD)
-* so we call sqimap_error_box() if the function exists (sm >= 1.5) or use our own embedded code
-* @global array imap_error_titles
-* @param string $response the imap server response code
-* @param string $query the failed query
-* @param string $message an optional error message
-* @param string $link an optional link to try again
-*/
+ * Function to display an error related to an IMAP query.
+ * We need to do our own error management since we may receive NO responses on purpose (even BAD with SORT or THREAD)
+ * so we call sqimap_error_box() if the function exists (sm >= 1.5) or use our own embedded code
+ * @global array imap_error_titles
+ * @param string $response the imap server response code
+ * @param string $query the failed query
+ * @param string $message an optional error message
+ * @param string $link an optional link to try again
+ */
 //@global array color sm colors array
 function sqimap_asearch_error_box($response, $query, $message, $link = '')
 {
     global $color;
-    // Error message titles according to imap server returned code
+    // Error message titles according to IMAP server returned code
     $imap_error_titles = array(
         'OK' => '',
-        'NO' => _("ERROR : Could not complete request."),
-        'BAD' => _("ERROR : Bad or malformed request."),
-        'BYE' => _("ERROR : Imap server closed the connection."),
-        '' => _("ERROR : Connection dropped by imap-server.")
+        'NO' => _("ERROR: Could not complete request."),
+        'BAD' => _("ERROR: Bad or malformed request."),
+        'BYE' => _("ERROR: IMAP server closed the connection."),
+        '' => _("ERROR: Connection dropped by IMAP server.")
     );
 
 
     if (!array_key_exists($response, $imap_error_titles))
-        $title = _("ERROR : Unknown imap response.");
+        $title = _("ERROR: Unknown IMAP response.");
     else
         $title = $imap_error_titles[$response];
     if ($link == '')
-        $message_title = _("Reason Given: ");
+        $message_title = _("Reason Given:");
     else
-        $message_title = _("Possible reason : ");
+        $message_title = _("Possible reason:");
+    $message_title .= ' ';
     if (function_exists('sqimap_error_box'))
         sqimap_error_box($title, $query, $message_title, $message, $link);
     else {    //Straight copy of 1.5 imap_general.php:sqimap_error_box(). Can be removed at a later time
@@ -141,11 +142,11 @@ function sqimap_asearch_error_box($response, $query, $message, $link = '')
 }
 
 /**
-* This is a convenient way to avoid spreading if (isset(... all over the code
-* @param mixed $var any variable (reference)
-* @param mixed $def default value to return if unset (default is zls (''), pass 0 or array() when appropriate)
-* @return mixed $def if $var is unset, otherwise $var
-*/
+ * This is a convenient way to avoid spreading if (isset(... all over the code
+ * @param mixed $var any variable (reference)
+ * @param mixed $def default value to return if unset (default is zls (''), pass 0 or array() when appropriate)
+ * @return mixed $def if $var is unset, otherwise $var
+ */
 function asearch_nz(&$var, $def = '')
 {
     if (isset($var))
@@ -154,11 +155,11 @@ function asearch_nz(&$var, $def = '')
 }
 
 /**
-* This should give the same results as PHP 4 >= 4.3.0's html_entity_decode(),
-* except it doesn't handle hex constructs
-* @param string $string string to unhtmlentity()
-* @return string decoded string
-*/
+ * This should give the same results as PHP 4 >= 4.3.0's html_entity_decode(),
+ * except it doesn't handle hex constructs
+ * @param string $string string to unhtmlentity()
+ * @return string decoded string
+ */
 function asearch_unhtmlentities($string) {
     $trans_tbl = array_flip(get_html_translation_table(HTML_ENTITIES));
     for ($i=127; $i<255; $i++)    /* Add &#<dec>; entities */
@@ -167,15 +168,15 @@ function asearch_unhtmlentities($string) {
 /* I think the one above is quicker, though it should be benchmarked
     $string = strtr($string, array_flip(get_html_translation_table(HTML_ENTITIES)));
     return preg_replace("/&#([0-9]+);/E", "chr('\\1')", $string);
-*/
+ */
 }
 
 /**
-* Provide an easy way to dump the imap dialogue if $imap_asearch_debug_dump is TRUE
-* @global bool imap_asearch_debug_dump
-* @param string $var_name
-* @param string $var_var
-*/
+ * Provide an easy way to dump the IMAP dialogue if $imap_asearch_debug_dump is TRUE
+ * @global bool imap_asearch_debug_dump
+ * @param string $var_name
+ * @param string $var_var
+ */
 function s_debug_dump($var_name, $var_var)
 {
     global $imap_asearch_debug_dump;
@@ -192,16 +193,16 @@ function s_debug_dump($var_name, $var_var)
 }
 
 /** Encode a string to quoted or literal as defined in rfc 3501
-*
-* -  4.3 String:
-*        A quoted string is a sequence of zero or more 7-bit characters,
-*         excluding CR and LF, with double quote (<">) characters at each end.
-* -  9. Formal Syntax:
-*        quoted-specials = DQUOTE / "\"
-* @param string $what string to encode
-* @param string $charset search charset used
-* @return string encoded string
-*/
+ *
+ * -  4.3 String:
+ *        A quoted string is a sequence of zero or more 7-bit characters,
+ *         excluding CR and LF, with double quote (<">) characters at each end.
+ * -  9. Formal Syntax:
+ *        quoted-specials = DQUOTE / "\"
+ * @param string $what string to encode
+ * @param string $charset search charset used
+ * @return string encoded string
+ */
 function sqimap_asearch_encode_string($what, $charset)
 {
     if (strtoupper($charset) == 'ISO-2022-JP')    // This should be now handled in imap_utf7_local?
@@ -212,16 +213,16 @@ function sqimap_asearch_encode_string($what, $charset)
 }
 
 /**
-* Parses a user date string into an rfc 3501 date string
-* Handles space, slash, backslash, dot and comma as separators (and dash of course ;=)
-* @global array imap_asearch_months
-* @param string user date
-* @return array a preg_match-style array:
-*  - [0] = fully formatted rfc 3501 date string (<day number>-<US month TLA>-<4 digit year>)
-*  - [1] = day
-*  - [2] = month
-*  - [3] = year
-*/
+ * Parses a user date string into an rfc 3501 date string
+ * Handles space, slash, backslash, dot and comma as separators (and dash of course ;=)
+ * @global array imap_asearch_months
+ * @param string user date
+ * @return array a preg_match-style array:
+ *  - [0] = fully formatted rfc 3501 date string (<day number>-<US month TLA>-<4 digit year>)
+ *  - [1] = day
+ *  - [2] = month
+ *  - [3] = year
+ */
 function sqimap_asearch_parse_date($what)
 {
     global $imap_asearch_months;
@@ -253,13 +254,13 @@ function sqimap_asearch_parse_date($what)
 }
 
 /**
-* Build one criteria sequence
-* @global array imap_asearch_opcodes
-* @param string $opcode search opcode
-* @param string $what opcode argument
-* @param string $charset search charset
-* @return string one full criteria sequence
-*/
+ * Build one criteria sequence
+ * @global array imap_asearch_opcodes
+ * @param string $opcode search opcode
+ * @param string $what opcode argument
+ * @param string $charset search charset
+ * @return string one full criteria sequence
+ */
 function sqimap_asearch_build_criteria($opcode, $what, $charset)
 {
     global $imap_asearch_opcodes;
@@ -314,11 +315,11 @@ function sqimap_asearch_build_criteria($opcode, $what, $charset)
 }
 
 /**
-* Another way to do array_values(array_unique(array_merge($to, $from)));
-* @param array $to to array (reference)
-* @param array $from from array
-* @return array uniquely merged array
-*/
+ * Another way to do array_values(array_unique(array_merge($to, $from)));
+ * @param array $to to array (reference)
+ * @param array $from from array
+ * @return array uniquely merged array
+ */
 function sqimap_array_merge_unique(&$to, $from)
 {
     if (empty($to))
@@ -332,14 +333,14 @@ function sqimap_array_merge_unique(&$to, $from)
 }
 
 /**
-* Run the imap SEARCH command as defined in rfc 3501
-* @link http://www.ietf.org/rfc/rfc3501.txt
-* @param resource $imapConnection the current imap stream
-* @param string $search_string the full search expression eg "ALL RECENT"
-* @param string $search_charset charset to use or zls ('')
-* @return array an IDs or UIDs array of matching messages or an empty array
-* @since 1.5.0
-*/
+ * Run the IMAP SEARCH command as defined in rfc 3501
+ * @link http://www.ietf.org/rfc/rfc3501.txt
+ * @param resource $imapConnection the current imap stream
+ * @param string $search_string the full search expression eg "ALL RECENT"
+ * @param string $search_charset charset to use or zls ('')
+ * @return array an IDs or UIDs array of matching messages or an empty array
+ * @since 1.5.0
+ */
 function sqimap_run_search($imapConnection, $search_string, $search_charset)
 {
     //For some reason, this seems to happen and forbids searching servers not allowing OPTIONAL [CHARSET]
@@ -375,11 +376,11 @@ function sqimap_run_search($imapConnection, $search_string, $search_charset)
 }
 
 /**
-* @global bool allow_charset_search user setting
-* @global array languages sm languages array
-* @global string squirrelmail_language user language setting
-* @return string the user defined charset if $allow_charset_search is TRUE else zls ('')
-*/
+ * @global bool allow_charset_search user setting
+ * @global array languages sm languages array
+ * @global string squirrelmail_language user language setting
+ * @return string the user defined charset if $allow_charset_search is TRUE else zls ('')
+ */
 function sqimap_asearch_get_charset()
 {
     global $allow_charset_search, $languages, $squirrelmail_language;
@@ -390,16 +391,16 @@ function sqimap_asearch_get_charset()
 }
 
 /**
-* Convert sm internal sort to imap sort taking care of:
-* - user defined date sorting (ARRIVAL vs DATE)
-* - if the searched mailbox is the sent folder then TO is being used instead of FROM
-* - reverse order by using REVERSE
-* @param string $mailbox mailbox name to sort
-* @param integer $sort_by sm sort criteria index
-* @global bool internal_date_sort sort by arrival date instead of message date
-* @global string sent_folder sent folder name
-* @return string imap sort criteria
-*/
+ * Convert SquirrelMail internal sort to IMAP sort taking care of:
+ * - user defined date sorting (ARRIVAL vs DATE)
+ * - if the searched mailbox is the sent folder then TO is being used instead of FROM
+ * - reverse order by using REVERSE
+ * @param string $mailbox mailbox name to sort
+ * @param integer $sort_by sm sort criteria index
+ * @global bool internal_date_sort sort by arrival date instead of message date
+ * @global string sent_folder sent folder name
+ * @return string imap sort criteria
+ */
 function sqimap_asearch_get_sort_criteria($mailbox, $sort_by)
 {
     global $internal_date_sort, $sent_folder;
@@ -415,10 +416,10 @@ function sqimap_asearch_get_sort_criteria($mailbox, $sort_by)
 }
 
 /**
-* @param string $cur_mailbox unformatted mailbox name
-* @param array $boxes_unformatted selectable mailbox unformatted names array (reference)
-* @return array sub mailboxes unformatted names
-*/
+ * @param string $cur_mailbox unformatted mailbox name
+ * @param array $boxes_unformatted selectable mailbox unformatted names array (reference)
+ * @return array sub mailboxes unformatted names
+ */
 function sqimap_asearch_get_sub_mailboxes($cur_mailbox, &$mboxes_array)
 {
     $sub_mboxes_array = array();
@@ -431,18 +432,18 @@ function sqimap_asearch_get_sub_mailboxes($cur_mailbox, &$mboxes_array)
 }
 
 /**
-* Create the search query strings for all given criteria and merge results for every mailbox
-* @param resource $imapConnection
-* @param array $mailbox_array (reference)
-* @param array $biop_array (reference)
-* @param array $unop_array (reference)
-* @param array $where_array (reference)
-* @param array $what_array (reference)
-* @param array $exclude_array (reference)
-* @param array $sub_array (reference)
-* @param array $mboxes_array selectable unformatted mailboxes names (reference)
-* @return array array(mailbox => array(UIDs))
-*/
+ * Create the search query strings for all given criteria and merge results for every mailbox
+ * @param resource $imapConnection
+ * @param array $mailbox_array (reference)
+ * @param array $biop_array (reference)
+ * @param array $unop_array (reference)
+ * @param array $where_array (reference)
+ * @param array $what_array (reference)
+ * @param array $exclude_array (reference)
+ * @param array $sub_array (reference)
+ * @param array $mboxes_array selectable unformatted mailboxes names (reference)
+ * @return array array(mailbox => array(UIDs))
+ */
 function sqimap_asearch($imapConnection, &$mailbox_array, &$biop_array, &$unop_array, &$where_array, &$what_array, &$exclude_array, &$sub_array, &$mboxes_array)
 {
 

functions/imap_general.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 implements all functions that do general imap functions.
+ * This implements all functions that do general IMAP functions.
  *
  * @version $Id$
  * @package squirrelmail
@@ -21,7 +21,7 @@ require_once(SM_PATH . 'functions/auth.php');
 /**
  * Generates a new session ID by incrementing the last one used;
  * this ensures that each command has a unique ID.
- * @param bool $unique_id (since 1.3.0) controls use of unique 
+ * @param bool $unique_id (since 1.3.0) controls use of unique
  *  identifiers/message sequence numbers in IMAP commands. See IMAP
  *  rfc 'UID command' chapter.
  * @return string IMAP session id of the form 'A000'.
@@ -46,7 +46,7 @@ function sqimap_session_id($unique_id = FALSE) {
  * @param array $response
  * @param array $message
  * @param boolean $unique_id (since 1.3.0) see sqimap_session_id().
- * @return mixed returns false on imap error. displays error message 
+ * @return mixed returns false on imap error. displays error message
  *  if imap stream is not available.
  * @since 1.2.3
  */
@@ -66,7 +66,7 @@ function sqimap_run_command_list ($imap_stream, $query, $handle_errors, &$respon
         set_up_language($squirrelmail_language);
         require_once(SM_PATH . 'functions/display_messages.php');
         $string = "<b><font color=\"$color[2]\">\n" .
-                _("ERROR : No available imapstream.") .
+                _("ERROR: No available IMAP stream.") .
                 "</b></font>\n";
         error_box($string,$color);
         return false;
@@ -83,7 +83,7 @@ function sqimap_run_command_list ($imap_stream, $query, $handle_errors, &$respon
  * @param boolean $filter (since 1.4.1 and 1.5.0) see sqimap_fread()
  * @param mixed $outputstream (since 1.4.1 and 1.5.0) see sqimap_fread()
  * @param boolean $no_return (since 1.4.1 and 1.5.0) see sqimap_fread()
- * @return mixed returns false on imap error. displays error message 
+ * @return mixed returns false on imap error. displays error message
  *  if imap stream is not available.
  * @since 1.2.3
  */
@@ -98,7 +98,7 @@ function sqimap_run_command ($imap_stream, $query, $handle_errors, &$response,
 
         $read = sqimap_read_data ($imap_stream, $tag, $handle_errors, $response,
                                   $message, $query,$filter,$outputstream,$no_return);
-        if (empty($read)) {    //Imap server dropped its connection
+        if (empty($read)) {    //IMAP server dropped its connection
             $response = '';
             $message = '';
             return false;
@@ -117,7 +117,7 @@ function sqimap_run_command ($imap_stream, $query, $handle_errors, &$response,
         set_up_language($squirrelmail_language);
         require_once(SM_PATH . 'functions/display_messages.php');
         $string = "<b><font color=\"$color[2]\">\n" .
-                _("ERROR : No available imapstream.") .
+                _("ERROR: No available IMAP stream.") .
                 "</b></font>\n";
         error_box($string,$color);
         return false;
@@ -157,9 +157,9 @@ function sqimap_run_pipelined_command ($imap_stream, $aQueryList, $handle_errors
     $aResponse = false;
 
     /*
-       Do not fire all calls at once to the imap-server but split the calls up
+       Do not fire all calls at once to the IMAP server but split the calls up
        in portions of $iChunkSize. If we do not do that I think we misbehave as
-       IMAP client or should handle BYE calls if the IMAP-server drops the
+       IMAP client or should handle BYE calls if the IMAP server drops the
        connection because the number of queries is to large. This isn't tested
        but a wild guess how it could work in the field.
 
@@ -215,7 +215,7 @@ function sqimap_run_pipelined_command ($imap_stream, $aQueryList, $handle_errors
 }
 
 /**
- * Custom fgets function: gets a line from the IMAP-server,
+ * Custom fgets function: gets a line from the IMAP server,
  * no matter how big it may be.
  * @param stream $imap_stream the stream to read from
  * @return string a line
@@ -246,7 +246,7 @@ function sqimap_fgets($imap_stream) {
  * @param integer $iSize
  * @param boolean $filter
  * @param mixed $outputstream stream or 'php://stdout' string
- * @param boolean $no_return controls data returned by function 
+ * @param boolean $no_return controls data returned by function
  * @return string
  * @since 1.4.1
  */
@@ -321,7 +321,7 @@ function sqimap_read_data_list($imap_stream, $tag, $handle_errors,
     set_up_language($squirrelmail_language);
     require_once(SM_PATH . 'functions/display_messages.php');
     $string = "<b><font color=\"$color[2]\">\n" .
-        _("ERROR : Bad function call.") .
+        _("ERROR: Bad function call.") .
         "</b><br />\n" .
         _("Reason:") . ' '.
           'There is a plugin installed which make use of the  <br />' .
@@ -336,7 +336,7 @@ function sqimap_read_data_list($imap_stream, $tag, $handle_errors,
 }
 
 /**
- * Function to display an error related to an IMAP-query.
+ * Function to display an error related to an IMAP query.
  * @param string title the caption of the error box
  * @param string query the query that went wrong
  * @param string message_title optional message title
@@ -549,12 +549,12 @@ function sqimap_retrieve_imap_response($imap_stream, $tag, $handle_errors,
             if (!$handle_errors) {
                 $query = '';
             }
-            sqimap_error_box(_("ERROR : Imap server closed the connection."), $query, _("Server responded:"),$sResponse);
+            sqimap_error_box(_("ERROR: IMAP server closed the connection."), $query, _("Server responded:"),$sResponse);
             echo '</body></html>';
             exit;
         } else if ($handle_errors) {
             unset($data);
-            sqimap_error_box(_("ERROR : Connection dropped by imap-server."), $query);
+            sqimap_error_box(_("ERROR: Connection dropped by IMAP server."), $query);
             exit;
         }
     }
@@ -578,21 +578,21 @@ function sqimap_retrieve_imap_response($imap_stream, $tag, $handle_errors,
     case 'NO':
         /* ignore this error from M$ exchange, it is not fatal (aka bug) */
         if (strstr($message[$tag], 'command resulted in') === false) {
-            sqimap_error_box(_("ERROR : Could not complete request."), $query, _("Reason Given: "), $message[$tag]);
+            sqimap_error_box(_("ERROR: Could not complete request."), $query, _("Reason Given:") . ' ', $message[$tag]);
             echo '</body></html>';
             exit;
         }
         break;
     case 'BAD':
-        sqimap_error_box(_("ERROR : Bad or malformed request."), $query, _("Server responded: "), $message[$tag]);
+        sqimap_error_box(_("ERROR: Bad or malformed request."), $query, _("Server responded:") . ' ', $message[$tag]);
         echo '</body></html>';
         exit;
     case 'BYE':
-        sqimap_error_box(_("ERROR : Imap server closed the connection."), $query, _("Server responded: "), $message[$tag]);
+        sqimap_error_box(_("ERROR: IMAP server closed the connection."), $query, _("Server responded:") . ' ', $message[$tag]);
         echo '</body></html>';
         exit;
     default:
-        sqimap_error_box(_("ERROR : Unknown imap response."), $query, _("Server responded: "), $message[$tag]);
+        sqimap_error_box(_("ERROR: Unknown IMAP response."), $query, _("Server responded:") . ' ', $message[$tag]);
        /* the error is displayed but because we don't know the reponse we
           return the result anyway */
        return $aResponse;
@@ -664,8 +664,8 @@ function sqimap_create_stream($server,$port,$tls=false) {
 }
 
 /**
- * Logs the user into the imap server.  If $hide is set, no error messages
- * will be displayed.  This function returns the imap connection handle.
+ * Logs the user into the IMAP server.  If $hide is set, no error messages
+ * will be displayed.  This function returns the IMAP connection handle.
  * @param string $username user name
  * @param string $password encrypted password
  * @param string $imap_server_address address of imap server
@@ -823,19 +823,19 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $
 
     /* Special error case:
      * Login referrals. The server returns:
-	 * ? OK [REFERRAL <imap url>]
-	 * Check RFC 2221 for details. Since we do not support login referrals yet
-	 * we log the user out.
-	 */
+     * ? OK [REFERRAL <imap url>]
+     * Check RFC 2221 for details. Since we do not support login referrals yet
+     * we log the user out.
+     */
     if ( stristr($message, 'REFERRAL imap') === TRUE ) {
-        sqimap_logout($imap_stream);   
+        sqimap_logout($imap_stream);
         set_up_language($squirrelmail_language, true);
         include_once(SM_PATH . 'functions/display_messages.php' );
         sqsession_destroy();
         logout_error( _("Your mailbox is not located at this server. Try a different server or consult your system administrator") );
         exit;
     }
-    
+
     return $imap_stream;
 }
 
@@ -857,7 +857,7 @@ function sqimap_logout ($imap_stream) {
  * else returns array of all capabilities.
  * @param stream $imap_stream
  * @param string $capability (optional since 1.3.0)
- * @return mixed (string if $capability is set and found, 
+ * @return mixed (string if $capability is set and found,
  *  false, if $capability is set and not found,
  *  array if $capability not set)
  */
@@ -996,7 +996,7 @@ function parseAddress($address, $max=0) {
  * OBSOLETE FUNCTION should be removed after mailbox_display,
  * printMessage function is adapted
  *
- * callback function used for formating of addresses array in 
+ * callback function used for formating of addresses array in
  * parseAddress() function
  * @param array $aAddr
  * @param integer $k array key
@@ -1029,7 +1029,7 @@ function sqimap_unseen_messages ($imap_stream, $mailbox) {
 /**
  * Returns the status items of a mailbox.
  * Default it returns MESSAGES,UNSEEN and RECENT
- * Supported status items are MESSAGES, UNSEEN, RECENT (since 1.4.0), 
+ * Supported status items are MESSAGES, UNSEEN, RECENT (since 1.4.0),
  * UIDNEXT (since 1.5.1) and UIDVALIDITY (since 1.5.1)
  * @param stream $imap_stream imap stream
  * @param string $mailbox mail folder
@@ -1095,14 +1095,14 @@ function sqimap_append_done ($imap_stream, $folder='') {
 }
 
 /**
- * Displays error messages, if there are errors in responses to 
+ * Displays error messages, if there are errors in responses to
  * commands issues by sqimap_append() and sqimap_append_done() functions.
  * @param string $response
  * @param string $folder
  * @since 1.5.1
  */
 function sqimap_append_checkresponse($response, $folder) {
-    
+
     if (preg_match("/(.*)(BAD|NO)(.*)$/", $response, $regs)) {
         global $squirrelmail_language, $color;
         set_up_language($squirrelmail_language);
@@ -1111,12 +1111,12 @@ function sqimap_append_checkresponse($response, $folder) {
         $reason = $regs[3];
         if ($regs[2] == 'NO') {
            $string = "<b><font color=\"$color[2]\">\n" .
-                  _("ERROR : Could not append message to") ." $folder." .
+                  _("ERROR: Could not append message to") ." $folder." .
                   "</b><br />\n" .
-                  _("Server responded: ") .
+                  _("Server responded:") . ' ' .
                   $reason . "<br />\n";
            if (preg_match("/(.*)(quota)(.*)$/i", $reason, $regs)) {
-              $string .= _("Solution: ") .
+              $string .= _("Solution:") . ' ' .
             _("Remove unneccessary messages from your folder and start with your Trash folder.")
               ."<br />\n";
            }
@@ -1124,9 +1124,9 @@ function sqimap_append_checkresponse($response, $folder) {
            error_box($string,$color);
         } else {
            $string = "<b><font color=\"$color[2]\">\n" .
-                  _("ERROR : Bad or malformed request.") .
+                  _("ERROR: Bad or malformed request.") .
                   "</b><br />\n" .
-                  _("Server responded: ") .
+                  _("Server responded:") . ' ' .
                   $reason . "</font><br />\n";
            error_box($string,$color);
            exit;
@@ -1135,7 +1135,7 @@ function sqimap_append_checkresponse($response, $folder) {
 }
 
 /**
- * Allows mapping of imap server address with custom function
+ * Allows mapping of IMAP server address with custom function
  * see map_yp_alias()
  * @param string $imap_server imap server address or mapping
  * @param string $username
@@ -1151,11 +1151,11 @@ function sqimap_get_user_server ($imap_server, $username) {
 }
 
 /**
- * This is an example that gets imapservers from yellowpages (NIS).
+ * This is an example that gets IMAP servers from yellowpages (NIS).
  * you can simple put map:map_yp_alias in your $imap_server_address
  * in config.php use your own function instead map_yp_alias to map your
- * LDAP whatever way to find the users imapserver.
- * 
+ * LDAP whatever way to find the users IMAP server.
+ *
  * Requires access to external ypmatch program
  * FIXME: it can be implemented in php yp extension or pecl (since php 5.1.0)
  * @param string $username

help/en_US/options.hlp

@@ -58,8 +58,8 @@
       <ul>
       <li><b>No Citation</b><br />
       Prepends no citation line whatsoever.<br /><br />
-      <li><b>Author Said</b><br />
-      This produces the line: <tt>John Doe Said:</tt> where John Doe will be replaced
+      <li><b>Author Wrote</b><br />
+      This produces the line: <tt>John Doe Wrote:</tt> where John Doe will be replaced
       by whoever the message you're replying to was from.<br /><br />
       <li><b>Quote Who XML</b><br />
       This produces the line: <tt>&lt;quote who="John Doe"&gt;</tt>.<br /><br />

include/options/folder.php

@@ -229,9 +229,9 @@ function load_optpage_data_folder() {
         'caption' => _("Selection List Style"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'posvals' => array( 0 => _("Long: ") . '"' . _("Folder") . $delim . _("Subfolder") . '"',
-                            1 => _("Indented: ") .  '"    ' . _("Subfolder") . '"',
-                            2 => _("Delimited: ") . '". ' . _("Subfolder") . '"'),
+        'posvals' => array( 0 => _("Long:") . ' "' . _("Folder") . $delim . _("Subfolder") . '"',
+                            1 => _("Indented:") . ' "    ' . _("Subfolder") . '"',
+                            2 => _("Delimited:") . ' ". ' . _("Subfolder") . '"'),
         'htmlencoded' => true
     );
 
@@ -290,4 +290,4 @@ function save_option_draft_folder($option) {
     save_option($option);
 }
 
-?>
+?>

include/options/personal.php

@@ -172,8 +172,8 @@ function load_optpage_data_personal() {
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
         'posvals' => array(SMPREF_NONE    => _("No Citation"),
-                           'author_said'  => _("AUTHOR Said"),
-                           'date_time_author' => _("On DATE, AUTHOR Said"),
+                           'author_said'  => _("AUTHOR Wrote"),
+                           'date_time_author' => _("On DATE, AUTHOR Wrote"),
                            'quote_who'    => _("Quote Who XML"),
                            'user-defined' => _("User-Defined"))
     );

src/compose.php

@@ -194,7 +194,7 @@ function getReplyCitation($orig_from, $orig_date) {
         /**
          * To translators: %s is for author's name
          */
-        $full_reply_citation = sprintf(_("%s said:"),$orig_from);
+        $full_reply_citation = sprintf(_("%s wrote:"),$orig_from);
         break;
     case 'quote_who':
         // FIXME: do we have to translate xml formating?
@@ -208,11 +208,11 @@ function getReplyCitation($orig_from, $orig_date) {
          *  first %s is for date string, second %s is for author's name. Date uses
          *  formating from "D, F j, Y g:i a" and "D, F j, Y H:i" translations.
          * Example string:
-         *  "On Sat, December 24, 2004 23:59, Santa said:"
+         *  "On Sat, December 24, 2004 23:59, Santa wrote:"
          * If you have to put author's name in front of date string, check comments about
          * argument swapping at http://www.php.net/sprintf
          */
-        $full_reply_citation = sprintf(_("On %s, %s said:"), getLongDateString($orig_date), $orig_from);
+        $full_reply_citation = sprintf(_("On %s, %s wrote:"), getLongDateString($orig_date), $orig_from);
         break;
     case 'user-defined':
         $start = $reply_citation_start .
@@ -1576,7 +1576,7 @@ function deliverMessage($composeMessage, $draft=false) {
     }
     if (!$succes) {
         $msg  = $deliver->dlv_msg . '<br />' .
-            _("Server replied: ") . $deliver->dlv_ret_nr . ' '.
+            _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .
             $deliver->dlv_server_msg;
         plain_error_message($msg, $color);
     } else {

src/read_body.php

@@ -264,7 +264,7 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
     }
     if (!$success) {
         $msg  = $deliver->dlv_msg . '<br />' .
-                _("Server replied: ") . $deliver->dlv_ret_nr . ' '.
+                _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .
                 $deliver->dlv_server_msg;
         require_once(SM_PATH . 'functions/display_messages.php');
         plain_error_message($msg, $color);