extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-13 00:40:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

handle failed connection on fetch messages

Browse Source
This commit is contained in:
Klaus Leithoff 2011-11-08 11:33:38 +00:00
parent 389f385701
commit af39f5a4e0
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
felamimail/inc/class.felamimail_activesync.inc.php
View File

@ -223,13 +223,21 @@ class felamimail_activesync implements activesync_plugin_write, activesync_plugi
//error_log(__METHOD__.__LINE__.' create object with ProfileID:'.array2string(self::$profileID)); //error_log(__METHOD__.__LINE__.' create object with ProfileID:'.array2string(self::$profileID));
if (!$this->mail->openConnection(self::$profileID,false)) if (!$this->mail->openConnection(self::$profileID,false))
{ {
error_log(__METHOD__.__LINE__."($account) can not open connection!".$this->mail->getErrorMessage());
throw new egw_exception_not_found(__METHOD__."($account) can not open connection!"); throw new egw_exception_not_found(__METHOD__."($account) can not open connection!");
} }
} }
else else
{ {
//error_log(__METHOD__.__LINE__." connect with profileID: ".self::$profileID); //error_log(__METHOD__.__LINE__." connect with profileID: ".self::$profileID);
if (!$this->mail->icServer->_connected) $this->mail->openConnection(self::$profileID,false); if (!$this->mail->icServer->_connected)
{
if (!$this->mail->openConnection(self::$profileID,false))
{
error_log(__METHOD__.__LINE__."($account) can not open connection!".$this->mail->getErrorMessage());
throw new egw_exception_not_found(__METHOD__."($account) can not open connection!");
}
}
} }
$this->_wasteID = $this->mail->getTrashFolder(false); $this->_wasteID = $this->mail->getTrashFolder(false);
//error_log(__METHOD__.__LINE__.' TrashFolder:'.$this->_wasteID); //error_log(__METHOD__.__LINE__.' TrashFolder:'.$this->_wasteID);
@ -1298,10 +1306,10 @@ class felamimail_activesync implements activesync_plugin_write, activesync_plugi
*/ */
public function StatMessage($folderid, $id) public function StatMessage($folderid, $id)
{ {
$messages = $this->fetchMessages($folderid, NULL, (array)$id); $messages = $this->fetchMessages($folderid, NULL, (array)$id);
$stat = array_shift($messages); $stat = array_shift($messages);
//debugLog (__METHOD__."('$folderid','$id') returning ".array2string($stat)); //debugLog (__METHOD__."('$folderid','$id') returning ".array2string($stat));
return $stat; return $stat;
} }
/** /**
@ -1362,6 +1370,8 @@ class felamimail_activesync implements activesync_plugin_write, activesync_plugi
//debugLog(__METHOD__.__LINE__); //debugLog(__METHOD__.__LINE__);
$this->_connect($this->account); $this->_connect($this->account);
$messagelist = array(); $messagelist = array();
// if not connected, any further action must fail
if (!$this->mail->icServer->_connected) return $messagelist;
if (!empty($cutoffdate)) $_filter = array('status'=>array('UNDELETED'),'type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate)); if (!empty($cutoffdate)) $_filter = array('status'=>array('UNDELETED'),'type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
$rv = $this->splitID($folderid,$account,$_folderName,$id); $rv = $this->splitID($folderid,$account,$_folderName,$id);
if ($this->debugLevel>1) debugLog (__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id)); if ($this->debugLevel>1) debugLog (__METHOD__.' for Folder:'.$_folderName.' Filter:'.array2string($_filter).' Ids:'.array2string($_id));