extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 20:49:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix one problem regarding failed xml-response

Browse Source
This commit is contained in:
Klaus Leithoff 2013-11-19 13:31:58 +00:00
parent 762f0f5c8a
commit 730eb55387
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -363,7 +363,7 @@ class mail_bo
*/ */
function saveSessionData() function saveSessionData()
{ {
error_log(__METHOD__.__LINE__.array2string(array_keys($this->sessionData))); //error_log(__METHOD__.__LINE__.array2string(array_keys($this->sessionData)));
if (!empty($this->sessionData['mailbox'])) self::$activeFolderCache[$this->profileID]=$this->sessionData['mailbox']; if (!empty($this->sessionData['mailbox'])) self::$activeFolderCache[$this->profileID]=$this->sessionData['mailbox'];
if (isset(self::$activeFolderCache) && is_array(self::$activeFolderCache)) if (isset(self::$activeFolderCache) && is_array(self::$activeFolderCache))
{ {
@ -1809,14 +1809,14 @@ class mail_bo
if ($foldersNameSpace[$type]['prefix'] == $folderName || $foldersNameSpace[$type]['prefix'] == $folderName.$foldersNameSpace[$type]['delimiter']) continue; if ($foldersNameSpace[$type]['prefix'] == $folderName || $foldersNameSpace[$type]['prefix'] == $folderName.$foldersNameSpace[$type]['delimiter']) continue;
//echo __METHOD__."Checking $folderName for existence<br>"; //echo __METHOD__."Checking $folderName for existence<br>";
if (!self::folderExists($folderName,true)) { if (!self::folderExists($folderName,true)) {
echo("eMail Folder $folderName failed to exist; should be unsubscribed; Trying ..."); //echo("eMail Folder $folderName failed to exist; should be unsubscribed; Trying ...");
error_log(__METHOD__."-> $folderName failed to be here; should be unsubscribed");
if (self::subscribe($folderName, false)) if (self::subscribe($folderName, false))
{ {
echo " success."."<br>" ; $r = " success.";
} else { } else {
echo " failed."."<br>"; $r = " failed.";
} }
error_log(__METHOD__."-> $folderName failed to be here; should be unsubscribed....".$r);
} }
} }
} }

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

@ -1087,7 +1087,7 @@ class mail_ui
unset($query['actions']); unset($query['actions']);
//_debug_array($query); //_debug_array($query);
//error_log(__METHOD__.__LINE__.array2string($query['order']).'->'.array2string($query['sort'])); //error_log(__METHOD__.__LINE__.array2string($query['order']).'->'.array2string($query['sort']));
//error_log(__METHOD__.__LINE__.' SelectedFolder:'.$query['selectedFolder'].' Start:'.$query['start'].' NumRows:'.$query['num_rows']); error_log(__METHOD__.__LINE__.' SelectedFolder:'.$query['selectedFolder'].' Start:'.$query['start'].' NumRows:'.$query['num_rows']);
$starttime = microtime(true); $starttime = microtime(true);
//error_log(__METHOD__.__LINE__.array2string($query['search'])); //error_log(__METHOD__.__LINE__.array2string($query['search']));
//$query['search'] is the phrase in the searchbox //$query['search'] is the phrase in the searchbox
@ -1208,8 +1208,8 @@ unset($query['actions']);
if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode']=='EGW_SELECTMODE_TOGGLE') unset($cols[0]); if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode']=='EGW_SELECTMODE_TOGGLE') unset($cols[0]);
$rows = $this->header2gridelements($sortResult['header'],$cols, $_folderName, $folderType,$previewMessage); $rows = $this->header2gridelements($sortResult['header'],$cols, $_folderName, $folderType,$previewMessage);
//error_log(__METHOD__.__LINE__.array2string($rows)); //error_log(__METHOD__.__LINE__.array2string($rows));
//$endtime = microtime(true) - $starttime; $endtime = microtime(true) - $starttime;
//error_log(__METHOD__.__LINE__. " time used: ".$endtime.' for Folder:'.$_folderName); error_log(__METHOD__.__LINE__. " time used: ".$endtime.' for Folder:'.$_folderName);
return $rowsFetched['messages']; return $rowsFetched['messages'];
} }