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

Fix Domain Issue (Bug #2367) for SyncML

Browse Source
This commit is contained in:
Jörg Lehrke 2009-11-18 18:57:00 +00:00
parent 73e2f3721e
commit d1b10adf4a
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,11 @@ class EGW_SyncML_State extends Horde_SyncML_State
*/ */
var $uidMappings = array(); var $uidMappings = array();
/*
* the domain of the current user
*/
var $_account_domain = 'default';
/** /**
* get the local content id from a syncid * get the local content id from a syncid
* *
@ -294,21 +299,22 @@ class EGW_SyncML_State extends Horde_SyncML_State
return FALSE; return FALSE;
} }
if(!isset($this->_password)) { if (!isset($this->_password)) {
Horde::logMessage('SyncML: Authentication not yet possible currently. Password not available' , __FILE__, __LINE__, PEAR_LOG_DEBUG); Horde::logMessage('SyncML: Authentication not yet possible currently. Password not available' , __FILE__, __LINE__, PEAR_LOG_DEBUG);
return FALSE; return FALSE;
} }
if(strpos($this->_locName,'@') === False) { if (strpos($this->_locName,'@') === False) {
$this->_locName .= '@'.$GLOBALS['egw_info']['server']['default_domain']; $this->_account_domain = $GLOBALS['egw_info']['server']['default_domain'];
$this->_locName .= '@'. $this->_account_domain;
} else { } else {
$parts = explode('@',$this->_locName); $parts = explode('@',$this->_locName);
$GLOBALS['egw_info']['user']['domain'] = array_pop($parts); $this->_account_domain = array_pop($parts);
} }
$GLOBALS['egw_info']['user']['domain'] = $this->_account_domain;
#Horde::logMessage('SyncML: authenticate with username: ' . $this->_locName . ' and password: ' . $this->_password, __FILE__, __LINE__, PEAR_LOG_DEBUG); #Horde::logMessage('SyncML: authenticate with username: ' . $this->_locName . ' and password: ' . $this->_password, __FILE__, __LINE__, PEAR_LOG_DEBUG);
if($GLOBALS['sessionid'] = $GLOBALS['egw']->session->create($this->_locName,$this->_password,'text')) { if ($GLOBALS['sessionid'] = $GLOBALS['egw']->session->create($this->_locName,$this->_password,'text')) {
if ($GLOBALS['egw_info']['user']['apps']['syncml']) { if ($GLOBALS['egw_info']['user']['apps']['syncml']) {
$this->_isAuthorized = true; $this->_isAuthorized = true;
@ -324,7 +330,8 @@ class EGW_SyncML_State extends Horde_SyncML_State
} else { } else {
// store sessionID in a variable, because ->verify maybe resets that value // store sessionID in a variable, because ->verify maybe resets that value
$sessionID = session_id(); $sessionID = session_id();
if(!$GLOBALS['egw']->session->verify($sessionID, 'staticsyncmlkp3')) { $GLOBALS['egw_info']['user']['domain'] = $this->_account_domain;
if (!$GLOBALS['egw']->session->verify($sessionID, 'staticsyncmlkp3')) {
Horde::logMessage('SyncML_EGW: egw session(' .$sessionID. ') not verified ' , __FILE__, __LINE__, PEAR_LOG_DEBUG); Horde::logMessage('SyncML_EGW: egw session(' .$sessionID. ') not verified ' , __FILE__, __LINE__, PEAR_LOG_DEBUG);
} }
} }