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

Fix SyncML device info handling

Browse Source
This commit is contained in:
Jörg Lehrke 2010-11-21 18:17:36 +00:00
parent 594efde2f9
commit a419a61117
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/inc/horde/Horde/SyncML/State.php
View File

@ -458,7 +458,7 @@ class Horde_SyncML_State {
function setClientDeviceInfo($clientDeviceInfo)
{
$this->_clientDeviceInfo = $clientDeviceInfo;
$this->_clientDeviceInfo['persistent'] = false;
unset($this->_clientDeviceInfo['persistent']);
}
function setDeletedItems($_type, $_deletedItems)

8
phpgwapi/inc/horde/Horde/SyncML/State_egw.php
View File

@ -238,7 +238,7 @@ class EGW_SyncML_State extends Horde_SyncML_State
'tzid' => $syncml_prefs[$deviceTimezone],
'charset' => $syncml_prefs[$deviceCharSet],
'devId' => $deviceID,
'persistent' => true,
'persistent' => $deviceID,
'dataStore' => unserialize($row['dev_datastore']),
);
return $this->_clientDeviceInfo;
@ -635,7 +635,7 @@ class EGW_SyncML_State extends Horde_SyncML_State
return false;
}
if (empty($this->_clientDeviceInfo['persistent'])) {
if (!isset($this->_clientDeviceInfo['persistent'])) {
// the device information was updated
if(!isset($this->size_dev_hwversion)) {
@ -683,7 +683,7 @@ class EGW_SyncML_State extends Horde_SyncML_State
$deviceID = $GLOBALS['egw']->db->get_last_insert_id('egw_syncmldevinfo', 'dev_id');
}
$this->_clientDeviceInfo['persistent'] = true;
$this->_clientDeviceInfo['persistent'] = $deviceID;
}
$data = $where = array (
@ -694,7 +694,7 @@ class EGW_SyncML_State extends Horde_SyncML_State
$GLOBALS['egw']->db->delete('egw_syncmldeviceowner', $where,
__LINE__, __FILE__, 'syncml');
$data['owner_devid'] = $deviceID;
$data['owner_devid'] = $this->_clientDeviceInfo['persistent'];
$GLOBALS['egw']->db->insert('egw_syncmldeviceowner', $data, $where,
__LINE__, __FILE__, 'syncml');