holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix SyncML device info handling

Browse Source
This commit is contained in:
Jörg Lehrke 2010-11-21 18:19:16 +00:00
parent dd4c8f4ff4
commit d66c2c2f73
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) function setClientDeviceInfo($clientDeviceInfo)
{ {
$this->_clientDeviceInfo = $clientDeviceInfo; $this->_clientDeviceInfo = $clientDeviceInfo;
$this->_clientDeviceInfo['persistent'] = false; unset($this->_clientDeviceInfo['persistent']);
} }
function setDeletedItems($_type, $_deletedItems) 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], 'tzid' => $syncml_prefs[$deviceTimezone],
'charset' => $syncml_prefs[$deviceCharSet], 'charset' => $syncml_prefs[$deviceCharSet],
'devId' => $deviceID, 'devId' => $deviceID,
'persistent' => true, 'persistent' => $deviceID,
'dataStore' => unserialize($row['dev_datastore']), 'dataStore' => unserialize($row['dev_datastore']),
); );
return $this->_clientDeviceInfo; return $this->_clientDeviceInfo;
@ -635,7 +635,7 @@ class EGW_SyncML_State extends Horde_SyncML_State
return false; return false;
} }
if (empty($this->_clientDeviceInfo['persistent'])) { if (!isset($this->_clientDeviceInfo['persistent'])) {
// the device information was updated // the device information was updated
if(!isset($this->size_dev_hwversion)) { 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'); $deviceID = $GLOBALS['egw']->db->get_last_insert_id('egw_syncmldevinfo', 'dev_id');
} }
$this->_clientDeviceInfo['persistent'] = true; $this->_clientDeviceInfo['persistent'] = $deviceID;
} }
$data = $where = array ( $data = $where = array (
@ -694,7 +694,7 @@ class EGW_SyncML_State extends Horde_SyncML_State
$GLOBALS['egw']->db->delete('egw_syncmldeviceowner', $where, $GLOBALS['egw']->db->delete('egw_syncmldeviceowner', $where,
__LINE__, __FILE__, 'syncml'); __LINE__, __FILE__, 'syncml');
$data['owner_devid'] = $deviceID; $data['owner_devid'] = $this->_clientDeviceInfo['persistent'];
$GLOBALS['egw']->db->insert('egw_syncmldeviceowner', $data, $where, $GLOBALS['egw']->db->insert('egw_syncmldeviceowner', $data, $where,
__LINE__, __FILE__, 'syncml'); __LINE__, __FILE__, 'syncml');