class.emailadmin_imapbase.inc.php

leithoff 2016-03-17 11:00:43 UTC #1

Author: leithoff
New Revision: 55410

URL: http://svn.stylite.de/viewvc/egroupware?rev=55410&view=rev
Log:
adapt translation function calls to new api location

Modified:
trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php

Modified: trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php?rev=55410&r1=55409&r2=55410&view=diff

— trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php (original)
+++ trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php Thu Mar 17 12:00:43 2016
@@ -2234,7 +2234,7 @@
*/
function encodeFolderName($_folderName)
{

  return translation::convert($_folderName, 'UTF7-IMAP', self::$displayCharset);

```
  return Api\Translation::convert($_folderName, 'UTF7-IMAP', self::$displayCharset);
```
}

/**
@@ -2244,8 +2244,8 @@
- @return ISO-8859-1 / UTF7-IMAP encoded string
  */
  function _encodeFolderName($_folderName) {

  return translation::convert($_folderName, self::$displayCharset, 'ISO-8859-1');

  #return translation::convert($_folderName, self::$displayCharset, 'UTF7-IMAP');

  return Api\Translation::convert($_folderName, self::$displayCharset, 'ISO-8859-1');

```
  #return Api\Translation::convert($_folderName, self::$displayCharset, 'UTF7-IMAP');
```
}

/**
@@ -4067,7 +4067,7 @@
//setting the charset (if not given)
if ($_charset===false) $_charset = self::$displayCharset;
$string = @htmlentities($_string, ENT_QUOTES, $_charset, false);

  if (empty($string) && !empty($_string)) $string = @htmlentities(translation::convert($_string,Api\Translation::detect_encoding($_string),$_charset),ENT_QUOTES | ENT_IGNORE,$_charset, false);

  if (empty($string) && !empty($_string)) $string = @htmlentities(Api\Translation::convert($_string,Api\Translation::detect_encoding($_string),$_charset),ENT_QUOTES | ENT_IGNORE,$_charset, false);
  return $string;

}

@@ -5166,7 +5166,7 @@
}

		if ($singleBodyPart['charSet']===false) $singleBodyPart['charSet'] = Api\Translation::detect_encoding($singleBodyPart['body']);

  	$singleBodyPart['body'] = translation::convert(

  	$singleBodyPart['body'] = Api\Translation::convert(
  		$singleBodyPart['body'],
  		strtolower($singleBodyPart['charSet'])
  	);

@@ -5958,7 +5958,7 @@
if (isset($attachments[$num][‘charset’])&&!empty($attachments[$num][‘charset’])) {
// we do not try guessing the charset, if it is not set
//if ($attachments[$num][‘charset’]===false) $attachments[$num][‘charset’] = Api\Translation::detect_encoding($attachments[$num][‘attachment’]);

  					translation::convert($attachments[$num]['attachment'],$attachments[$num]['charset']);

  					Api\Translation::convert($attachments[$num]['attachment'],$attachments[$num]['charset']);
  				}
  				if(in_array($attachments[$num]['name'], $file_list))
  				{

Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs