extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

make sure subject is UTF8 (complies with json_encode); handle unfolding of the emailadmin profile correctly

Browse Source
This commit is contained in:
Klaus Leithoff 2013-05-23 08:16:25 +00:00
parent d9b9743b81
commit 894f92b4c3
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/inc/class.mail_bo.inc.php
View File

@ -1560,6 +1560,12 @@ class mail_bo
return 'No Subject';
}
if ($decode) $_string = self::decode_header($_string);
// make sure its utf-8
$test = @json_encode($_string);
if (($test=="null" || $test === false || is_null($test)) && strlen($_string)>0)
{
$_string = utf8_encode($_string);
}
return $_string;
}

11
mail/inc/class.mail_ui.inc.php
View File

@ -411,7 +411,7 @@ class mail_ui
*/
function getFolderTree($_fetchCounters=false, $_nodeID=null)
{
if ($_nodeID)
if (!is_null($_nodeID) && $_nodeID !=0)
{
list($_profileID,$_folderName) = explode(self::$delimiter,$_nodeID,2);
if (is_numeric($_profileID))
@ -465,8 +465,7 @@ class mail_ui
//$endtime = microtime(true) - $starttime;
//error_log(__METHOD__.__LINE__.' Fetching identities Took:'.$endtime);
//_debug_array($folderObjects);
//error_log(__METHOD__.__LINE__.array2string($folderObjects));
$c = 0;
foreach($folderObjects as $key => $obj)
{
@ -525,7 +524,7 @@ class mail_ui
$this->setOutStructure($oA,$out,$obj->delimiter);
$c++;
}
if ($_nodeID)
if (!is_null($_nodeID) && $_nodeID !=0)
{
$node = self::findNode($out,$_nodeID);
//error_log(__METHOD__.__LINE__.':'.$_nodeID.'->'.array2string($node));
@ -546,9 +545,9 @@ class mail_ui
{
foreach($_out['item'] as $node)
{
//error_log(__METHOD__.__LINE__.':'.$_nodeID.'->'.$node['id']);
if ($node['id']===$_nodeID)
if ($node['id']==$_nodeID)
{
//error_log(__METHOD__.__LINE__.':'.$_nodeID.'->'.$node['id']);
return ($childElements?$node['item']:$node);
}
elseif (is_array($node['item']) && strncmp($node['id'],$_nodeID,strlen($node['id']))===0 && strlen($_nodeID)>strlen($node['id']))