steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/framework/Net_IMAP IMAPProtocol.php, 1.1, 1.2
cvs at intevation.de
cvs at intevation.de
Thu Feb 10 23:15:24 CET 2005
Author: steffen
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/framework/Net_IMAP
In directory doto:/tmp/cvs-serv22304/kolab-resource-handlers/fbview/fbview/framework/Net_IMAP
Modified Files:
IMAPProtocol.php
Log Message:
Issue640 (encoding of foldernames in urls -- php code now requires mbstring to function properly but will work with ascii foldernames just fine even without)
Index: IMAPProtocol.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/framework/Net_IMAP/IMAPProtocol.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- IMAPProtocol.php 21 Sep 2004 14:33:23 -0000 1.1
+++ IMAPProtocol.php 10 Feb 2005 22:15:22 -0000 1.2
@@ -2942,6 +2942,10 @@
if($this->_useUTF_7 == false ){
return $str;
}
+ if( function_exists('mb_convert_encoding') ) {
+ // We have mb* functions, assume input is UTF-8 and convert
+ return mb_convert_encoding( $str, 'UTF7-IMAP', 'UTF8');
+ }
//return imap_utf7_encode($str);
$encoded_utf7 = '';
@@ -2987,6 +2991,10 @@
if($this->_useUTF_7 == false ){
return $str;
}
+ if( function_exists('mb_convert_encoding') ) {
+ // We have mb* functions, assume output should be UTF-8 and convert
+ return mb_convert_encoding( $str, 'UTF8', 'UTF7-IMAP' );
+ }
//return imap_utf7_decode($str);
More information about the commits
mailing list