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

Update SyncML user preferences immediately

Browse Source
This commit is contained in:
Jörg Lehrke 2010-02-07 20:28:15 +00:00
parent 0197125d42
commit df51d3a409
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,8 +152,18 @@ class EGW_SyncML_State extends Horde_SyncML_State
function getClientDeviceInfo() { function getClientDeviceInfo() {
#Horde::logMessage("SyncML: getClientDeviceInfo " . $this->_locName #Horde::logMessage("SyncML: getClientDeviceInfo " . $this->_locName
# . ", " . $this->_sourceURI, __FILE__, __LINE__, PEAR_LOG_DEBUG); # . ", " . $this->_sourceURI, __FILE__, __LINE__, PEAR_LOG_DEBUG);
$syncml_prefs = $GLOBALS['egw_info']['user']['preferences']['syncml'];
$deviceMaxEntries = 'maxEntries-' . $this->_sourceURI;
$deviceUIDExtension = 'uidExtension-' . $this->_sourceURI;
$deviceNonBlockingAllday = 'nonBlockingAllday-' . $this->_sourceURI;
$deviceTimezone = 'tzid-' . $this->_sourceURI;
if (isset($this->_clientDeviceInfo) if (isset($this->_clientDeviceInfo)
&& is_array($this->_clientDeviceInfo)) { && is_array($this->_clientDeviceInfo)) {
// update user preferences
$this->_clientDeviceInfo['maxEntries'] = $syncml_prefs[$deviceMaxEntries];
$this->_clientDeviceInfo['uidExtension'] = $syncml_prefs[$deviceUIDExtension];
$this->_clientDeviceInfo['nonBlockingAllday'] = $syncml_prefs[$deviceNonBlockingAllday];
$this->_clientDeviceInfo['tzid'] = $syncml_prefs[$deviceTimezone];
// use cached information // use cached information
return $this->_clientDeviceInfo; return $this->_clientDeviceInfo;
} }
@ -187,11 +197,6 @@ class EGW_SyncML_State extends Horde_SyncML_State
if (($row = $GLOBALS['egw']->db->select('egw_syncmldevinfo', if (($row = $GLOBALS['egw']->db->select('egw_syncmldevinfo',
$cols, $where, __LINE__, __FILE__, false, '', 'syncml')->fetch())) { $cols, $where, __LINE__, __FILE__, false, '', 'syncml')->fetch())) {
$deviceMaxEntries = 'maxEntries-' . $this->_sourceURI;
$deviceUIDExtension = 'uidExtension-' . $this->_sourceURI;
$deviceNonBlockingAllday = 'nonBlockingAllday-' . $this->_sourceURI;
$deviceTimezone = 'tzid-' . $this->_sourceURI;
$syncml_prefs = $GLOBALS['egw_info']['user']['preferences']['syncml'];
$this->_clientDeviceInfo = array ( $this->_clientDeviceInfo = array (
'DTDVersion' => $row['dev_dtdversion'], 'DTDVersion' => $row['dev_dtdversion'],
'supportNumberOfChanges' => $row['dev_numberofchanges'], 'supportNumberOfChanges' => $row['dev_numberofchanges'],