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

GetFolderList must always return an array to not break sync

Browse Source
This commit is contained in:
Philip Herbert 2011-03-20 18:08:44 +00:00
parent 38ef2706e3
commit ca11300994
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addressbook/inc/class.addressbook_activesync.inc.php
View File

@ -165,6 +165,7 @@ class addressbook_activesync implements activesync_plugin_write, activesync_plug
public function GetFolderList()
{
// error_log(print_r($this->addressbook->get_addressbooks(EGW_ACL_READ),true));
$folderlist = array();
foreach ($this->get_addressbooks() as $account => $label)
{
$folderlist[] = array(
@ -327,7 +328,7 @@ class addressbook_activesync implements activesync_plugin_write, activesync_plug
debugLog("airsyncbasebody!");
$message->airsyncbasebody = new SyncAirSyncBaseBody();
$message->airsyncbasenativebodytype=1;
$this->backend->note2messagenote($contact[$attr], $bodypreference, &$message->airsyncbasebody);
$this->backend->note2messagenote($contact[$attr], $bodypreference, $message->airsyncbasebody);
}
break;

3
calendar/inc/class.calendar_activesync.inc.php
View File

@ -75,6 +75,7 @@ class calendar_activesync implements activesync_plugin_write
$cals = $GLOBALS['egw_info']['user']['preferences']['activesync']['calendar-cals'];
$cals = $cals ? explode(',',$cals) : array('P'); // implicit default of 'P'
$folderlist = array();
foreach ($this->calendar->list_cals() as $label => $entry)
{
@ -625,7 +626,7 @@ class calendar_activesync implements activesync_plugin_write
debugLog("airsyncbasebody!");
$message->airsyncbasebody = new SyncAirSyncBaseBody();
$message->airsyncbasenativebodytype=1;
$this->backend->note2messagenote($event['description'], $bodypreference, &$message->airsyncbasebody);
$this->backend->note2messagenote($event['description'], $bodypreference, $message->airsyncbasebody);
}
$message->organizername = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_fullname');