phpgw --> egw

This commit is contained in:
Ralf Becker 2008-10-08 18:40:01 +00:00
parent 94da0682cd
commit 2349c28fa8
3 changed files with 91 additions and 91 deletions

View File

@ -430,12 +430,12 @@ class Horde_SyncML_State {
if(strstr($this->_locName,'@') === False)
{
$this->_locName .= '@'.$GLOBALS['phpgw_info']['server']['default_domain'];
$this->_locName .= '@'.$GLOBALS['egw_info']['server']['default_domain'];
}
#Horde::logMessage('SyncML: Authenticate ' . $this->_locName . ' - ' . $this->_password, __FILE__, __LINE__, PEAR_LOG_DEBUG);
if($GLOBALS['sessionid'] = $GLOBALS['phpgw']->session->create($this->_locName,$this->_password,'text','u'))
if($GLOBALS['sessionid'] = $GLOBALS['egw']->session->create($this->_locName,$this->_password,'text','u'))
{
$this->_isAuthorized = true;
#Horde::logMessage('SyncML_EGW: Authentication of ' . $this->_locName . '/' . $GLOBALS['sessionid'] . ' succeded' , __FILE__, __LINE__, PEAR_LOG_DEBUG);
@ -450,7 +450,7 @@ class Horde_SyncML_State {
{
// store sessionID in a variable, because ->verify maybe resets that value
$sessionID = session_id();
if(!$GLOBALS['phpgw']->session->verify($sessionID, 'staticsyncmlkp3'))
if(!$GLOBALS['egw']->session->verify($sessionID, 'staticsyncmlkp3'))
Horde::logMessage('SyncML_EGW: egw session('.$sessionID. ') not verified ' , __FILE__, __LINE__, PEAR_LOG_DEBUG);
}

View File

@ -20,7 +20,7 @@ class EGW_SyncML_State extends Horde_SyncML_State
{
$mapID = $this->_locName . $this->_sourceURI . $type;
$db = clone($GLOBALS['phpgw']->db);
$db = clone($GLOBALS['egw']->db);
$cols = array('map_timestamp');

View File

@ -45,7 +45,7 @@ class Horde_SyncML_Sync_TwoWaySync extends Horde_SyncML_Sync {
// array of Items which got modified, but got never send to the client before
$missedAdds = array();
$history = $GLOBALS['phpgw']->contenthistory;
$history = $GLOBALS['egw']->contenthistory;
$state = &$_SESSION['SyncML.state'];
$counter = 0;