diff options
author | alecpl <alec@alec.pl> | 2009-05-20 09:03:14 +0000 |
---|---|---|
committer | alecpl <alec@alec.pl> | 2009-05-20 09:03:14 +0000 |
commit | 2de7d74c2bba02568581ea2f819b3d3eda52c6e5 (patch) | |
tree | 7ceefc38883c04fb0f7cb5906d2690f69b08a6ec | |
parent | dbe44cd105d936fb82159eb1a8447db074ff5428 (diff) |
- remove not used icl_commons.inc file
-rw-r--r-- | program/lib/icl_commons.inc | 81 | ||||
-rw-r--r-- | program/lib/imap.inc | 4 |
2 files changed, 0 insertions, 85 deletions
diff --git a/program/lib/icl_commons.inc b/program/lib/icl_commons.inc deleted file mode 100644 index 87eed629f..000000000 --- a/program/lib/icl_commons.inc +++ /dev/null @@ -1,81 +0,0 @@ -<?php -function mod_b64_decode($data){ - return base64_decode(str_replace(",","/",$data)); -} - -function mod_b64_encode($data){ - return str_replace("/",",",str_replace("=","",base64_encode($data))); -} - - -function utf8_to_html($str){ - $len = strlen($str); - $out = ""; - for($i=0;$i<$len;$i+=2){ - $val = ord($str[$i]); - $next_val = ord($str[$i+1]); - if ($val<255){ - $out.="&#".($val*256+$next_val).";"; - }else{ - $out.=$str[$i].$str[$i+1]; - } - } - return $out; -} - -function iil_utf7_decode($str, $raw=false){ - if (strpos($str, '&')===false) return $str; - - $len = strlen($str); - $in_b64 = false; - $b64_data = ""; - $out = ""; - for ($i=0;$i<$len;$i++){ - $char = $str[$i]; - if ($char=='&') $in_b64 = true; - else if ($in_b64 && $char=='-'){ - $in_b64 = false; - if ($b64_data=="") $out.="&"; - else{ - $dec=mod_b64_decode($b64_data); - $out.=($raw?$dec:utf8_to_html($dec)); - $b64_data = ""; - } - }else if ($in_b64) $b64_data.=$char; - else $out.=$char; - } - return $out; -} - -function iil_utf7_encode($str){ - if (!preg_match('/[\200-\237\241-\377]/', $str)) - return $str; - - $len = strlen($str); - - for ($i=0;$i<$len;$i++){ - $val = ord($str[$i]); - if ($val>=224 && $val<=239){ - $unicode = ($val-224) * 4096 + (ord($str[$i+1])-128) * 64 + (ord($str[$i+2])-128); - $i+=2; - $utf_code.=chr((int)($unicode/256)).chr($unicode%256); - }else if ($val>=192 && $val<=223){ - $unicode = ($val-192) * 64 + (ord($str[$i+1])-128); - $i++; - $utf_code.=chr((int)($unicode/256)).chr($unicode%256); - }else{ - if ($utf_code){ - $out.='&'.mod_b64_encode($utf_code).'-'; - $utf_code=""; - } - if ($str[$i]=="-") $out.="&"; - $out.=$str[$i]; - } - } - if ($utf_code) - $out.='&'.mod_b64_encode($utf_code).'-'; - return $out; -} - - -?>
\ No newline at end of file diff --git a/program/lib/imap.inc b/program/lib/imap.inc index 1502064a8..66394dde8 100644 --- a/program/lib/imap.inc +++ b/program/lib/imap.inc @@ -92,9 +92,6 @@ * @todo Replace echo-debugging (make it adhere to config setting and log) */ -// changed path to work within roundcube webmail -include_once 'lib/icl_commons.inc'; - if (!isset($IMAP_USE_HEADER_DATE) || !$IMAP_USE_HEADER_DATE) { $IMAP_USE_INTERNAL_DATE = true; @@ -2211,7 +2208,6 @@ function iil_C_ListSubscribed(&$conn, $ref, $mailbox) { $a = iil_ExplodeQuotedString(' ', $line); // last string is folder name - //$folder = UTF7DecodeString(str_replace('"', '', $a[count($a)-1])); $folder = trim($a[count($a)-1], '"'); if ((!in_array($folder, $folders)) && (empty($ignore) |