diff --git a/reference/imap/functions/imap-utf7-decode.xml b/reference/imap/functions/imap-utf7-decode.xml index 113dc649bf..02697531c5 100644 --- a/reference/imap/functions/imap-utf7-decode.xml +++ b/reference/imap/functions/imap-utf7-decode.xml @@ -1,5 +1,5 @@ - + @@ -15,14 +15,18 @@ stringtext - Decodes modified UTF-7 text into 8bit data. + Decodes modified UTF-7 text into ISO-8859-1 string. - Returns the decoded 8bit data, or &false; if the input string was - not valid modified UTF-7. This function is needed to decode - mailbox names that contain international characters outside of - the printable ASCII range. The modified UTF-7 encoding is defined - in RFC 2060, section + Returns a string that is encoded in ISO-8859-1 and consists of the same + sequence of characters in text, or &false; + if text contains invalid modified UTF-7 sequence + or text contains a character that is not part of + ISO-8859-1 character set. + This function is needed to decode mailbox names that contain certain + characters which are not in range of printable ASCII characters. + The modified UTF-7 encoding is defined in + RFC 2060, section 5.1.3 (original UTF-7 was defned in RFC1642). diff --git a/reference/imap/functions/imap-utf7-encode.xml b/reference/imap/functions/imap-utf7-encode.xml index 830b3ecc81..4fa4d33c5a 100644 --- a/reference/imap/functions/imap-utf7-encode.xml +++ b/reference/imap/functions/imap-utf7-encode.xml @@ -1,11 +1,11 @@ - + imap_utf7_encode - Converts 8bit data to modified UTF-7 text. + Converts ISO-8859-1 string to modified UTF-7 text. @@ -15,10 +15,11 @@ stringdata - Converts 8bit data to modified UTF-7 - text. This is needed to encode mailbox names that contain - international characters outside of the printable ASCII - range. The modified UTF-7 encoding is defined in data to modified UTF-7 + text. This is needed to encode mailbox names that contain certain + characters which are not in range of printable ASCII characters. + Note that data is expected to be + encoded in ISO-8859-1. The modified UTF-7 encoding is defined in RFC 2060, section 5.1.3 (original UTF-7 was defned in RFC1642). diff --git a/reference/imap/functions/imap-utf8.xml b/reference/imap/functions/imap-utf8.xml index 0c941a8064..a3c33ebae8 100644 --- a/reference/imap/functions/imap-utf8.xml +++ b/reference/imap/functions/imap-utf8.xml @@ -1,23 +1,26 @@ - + imap_utf8 - Converts text to UTF8 + Converts MIME-encoded text to UTF-8 Description stringimap_utf8 - stringtext + + stringmime_encoded_text + - Converts the given text to - UTF8 (as defined in - RFC2044). + Converts the given mime_encoded_text to + UTF-8. MIME encoding method and the UTF-8 specification are described in + RFC2047 and + RFC2044 respectively.