extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-05 21:49:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

various small bugfixes

Browse Source
This commit is contained in:
Lars Kneschke 2006-04-07 08:11:17 +00:00
parent 8941ccbc23
commit ea7b5a8afa
8 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpgwapi/inc/horde/Horde/SyncML.php
View File

@ -157,7 +157,7 @@ class Horde_SyncML_SyncMLHdr extends Horde_SyncML_ContentHandler {
// has been authorized. Make sure we have a valid session id. // has been authorized. Make sure we have a valid session id.
if(!empty($_GET['syncml_sessionid'])) { if(!empty($_GET['syncml_sessionid'])) {
session_id($_GET['syncml_sessionid']); session_id($_GET['syncml_sessionid']);
Horde::logMessage('SyncML['. session_id() .']: reusing existing session', __FILE__, __LINE__, PEAR_LOG_INFO); Horde::logMessage('SyncML['. session_id() .']: reusing existing session', __FILE__, __LINE__, PEAR_LOG_DEBUG);
} else { } else {
#session_id('syncml' . preg_replace('/[^a-zA-Z0-9]/', '', $sourceURI . $sessionID)); #session_id('syncml' . preg_replace('/[^a-zA-Z0-9]/', '', $sourceURI . $sessionID));
session_id('syncml-' . md5(uniqid(rand(), true))); session_id('syncml-' . md5(uniqid(rand(), true)));
@ -527,7 +527,6 @@ class Horde_SyncML_SyncMLBody extends Horde_SyncML_ContentHandler {
// we do still have some data to send OR // we do still have some data to send OR
// we should reply to the Sync command // we should reply to the Sync command
if($state->getSyncStatus() >= CLIENT_SYNC_ACKNOWLEDGED && $state->getSyncStatus() < SERVER_SYNC_FINNISHED) { if($state->getSyncStatus() >= CLIENT_SYNC_ACKNOWLEDGED && $state->getSyncStatus() < SERVER_SYNC_FINNISHED) {
Horde::logMessage('SyncML sending syncdata to client '. CLIENT_SYNC_ACKNOWLEDGED .'/'. SERVER_SYNC_FINNISHED .'/'. $state->getSyncStatus(), __FILE__, __LINE__, PEAR_LOG_INFO);
$sync = &new Horde_SyncML_Command_Sync(); $sync = &new Horde_SyncML_Command_Sync();
$this->_currentCmdID = $sync->syncToClient($this->_currentCmdID, $this->_output); $this->_currentCmdID = $sync->syncToClient($this->_currentCmdID, $this->_output);
} }

1
phpgwapi/inc/horde/Horde/SyncML/Command/Sync.php
View File

@ -51,7 +51,6 @@ class Horde_SyncML_Command_Sync extends Horde_Syncml_Command {
$currentCmdID = $status->output($currentCmdID, $output); $currentCmdID = $status->output($currentCmdID, $output);
if($sync = $state->getSync($this->_targetURI)) { if($sync = $state->getSync($this->_targetURI)) {
Horde::logMessage('SyncML: starting from client for $this->_targetURI = ' . $this->_targetURI, __FILE__, __LINE__, PEAR_LOG_DEBUG);
$currentCmdID = $sync->startSync($currentCmdID, $output); $currentCmdID = $sync->startSync($currentCmdID, $output);
foreach ($this->_syncElements as $element) { foreach ($this->_syncElements as $element) {

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

@ -630,16 +630,20 @@ class Horde_SyncML_State {
*/ */
function getPreferedContentType($type) function getPreferedContentType($type)
{ {
# if ($type == 'contacts') {
# return 'text/x-vcard';
# } elseif ($type == 'notes') {
# return 'text/x-vnote';
# } elseif ($type == 'tasks') {
# return 'text/x-vcalendar';
# } elseif ($type == 'calendar') {
# return 'text/x-vcalendar';
# }
switch($type) { switch($type) {
case 'contacts': case 'contacts':
return 'text/x-vcard'; return 'text/x-vcard';
break; break;
case 'sifcalendar':
case './sifcalendar':
return 'text/x-s4j-sife';
break;
case 'sifcontacts': case 'sifcontacts':
case './sifcontacts': case './sifcontacts':
return 'text/x-s4j-sifc'; return 'text/x-s4j-sifc';

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

@ -203,34 +203,41 @@ class EGW_SyncML_State extends Horde_SyncML_State
if(!isset($this->_locName) && !isset($this->_password)) if(!isset($this->_locName) && !isset($this->_password))
{ {
Horde::logMessage('SyncML: Authentication not possible currently. No username and password available' , __FILE__, __LINE__, PEAR_LOG_DEBUG); Horde::logMessage('SyncML: Authentication not yet possible currently. Username and password not available' , __FILE__, __LINE__, PEAR_LOG_DEBUG);
return FALSE;
}
if(!isset($this->_password))
{
Horde::logMessage('SyncML: Authentication not yet possible currently. Password not available' , __FILE__, __LINE__, PEAR_LOG_DEBUG);
return FALSE; return FALSE;
} }
if(strstr($this->_locName,'@') === False) 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); #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','u')) if($GLOBALS['sessionid'] = $GLOBALS['egw']->session->create($this->_locName,$this->_password,'text','u'))
{ {
$this->_isAuthorized = true; $this->_isAuthorized = true;
#Horde::logMessage('SyncML_EGW: Authentication of ' . $this->_locName . '/' . $GLOBALS['sessionid'] . ' succeded' , __FILE__, __LINE__, PEAR_LOG_DEBUG); Horde::logMessage('SyncML_EGW: Authentication of ' . $this->_locName . '/' . $GLOBALS['sessionid'] . ' succeded' , __FILE__, __LINE__, PEAR_LOG_DEBUG);
} }
else else
{ {
$this->_isAuthorized = false; $this->_isAuthorized = false;
Horde::logMessage('SyncML: Authentication of ' . $this->_locName . ' failed' , __FILE__, __LINE__, PEAR_LOG_DEBUG); Horde::logMessage('SyncML: Authentication of ' . $this->_locName . ' failed' , __FILE__, __LINE__, PEAR_LOG_INFO);
} }
} }
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')) 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);
}
} }
return $this->_isAuthorized; return $this->_isAuthorized;

5
phpgwapi/inc/horde/Horde/SyncML/Sync/SlowSync.php
View File

@ -99,7 +99,7 @@ class Horde_SyncML_Sync_SlowSync extends Horde_SyncML_Sync_TwoWaySync {
* from the server database by using Horde API (Registry) calls. * from the server database by using Horde API (Registry) calls.
*/ */
function runSyncCommand(&$command) { function runSyncCommand(&$command) {
Horde::logMessage('SyncML: content type is ' . $command->getContentType() .' moreData '. $command->_moreData, __FILE__, __LINE__, PEAR_LOG_DEBUG); #Horde::logMessage('SyncML: content type is ' . $command->getContentType() .' moreData '. $command->_moreData, __FILE__, __LINE__, PEAR_LOG_DEBUG);
global $registry; global $registry;
$history = $GLOBALS['egw']->contenthistory; $history = $GLOBALS['egw']->contenthistory;
@ -153,7 +153,6 @@ class Horde_SyncML_Sync_SlowSync extends Horde_SyncML_Sync_TwoWaySync {
$hordeType = str_replace('./','',$hordeType); $hordeType = str_replace('./','',$hordeType);
$syncElementItems = $command->getSyncElementItems(); $syncElementItems = $command->getSyncElementItems();
Horde::logMessage('SyncML: found '. count($syncElementItems) .' items to import', __FILE__, __LINE__, PEAR_LOG_DEBUG);
foreach($syncElementItems as $syncItem) { foreach($syncElementItems as $syncItem) {
if(!$contentType = $syncItem->getContentType()) { if(!$contentType = $syncItem->getContentType()) {
@ -179,10 +178,8 @@ class Horde_SyncML_Sync_SlowSync extends Horde_SyncML_Sync_TwoWaySync {
# } # }
# } elseif (is_a($command, 'Horde_SyncML_Command_Sync_Replace')) { # } elseif (is_a($command, 'Horde_SyncML_Command_Sync_Replace')) {
#$guid = $state->getGlobalUID($type, $syncItem->getLocURI()); #$guid = $state->getGlobalUID($type, $syncItem->getLocURI());
Horde::logMessage('SyncML: start search for '. $syncItem->getContent() .' ('. $contentType .')' , __FILE__, __LINE__, PEAR_LOG_DEBUG);
$guid = $registry->call($hordeType . '/search', $guid = $registry->call($hordeType . '/search',
array($state->convertClient2Server($syncItem->getContent(), $contentType), $contentType)); array($state->convertClient2Server($syncItem->getContent(), $contentType), $contentType));
Horde::logMessage('SyncML: found guid: '. ($guid ? $guid : 'not found') , __FILE__, __LINE__, PEAR_LOG_DEBUG);
$ok = false; $ok = false;
if ($guid) { if ($guid) {
#Horde::logMessage('SyncML: locuri'. $syncItem->getLocURI() . ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_ERR); #Horde::logMessage('SyncML: locuri'. $syncItem->getLocURI() . ' guid ' . $guid , __FILE__, __LINE__, PEAR_LOG_ERR);

8
phpgwapi/inc/horde/XML/WBXML/Decoder.php
View File

@ -94,7 +94,10 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
*/ */
function getByte($input) function getByte($input)
{ {
return ord($input{$this->_strpos++}); $value = $input{$this->_strpos++};
$value = ord($value);
return $value;
} }
/** /**
@ -131,7 +134,6 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
function decode($wbxml) function decode($wbxml)
{ {
$this->_error = false; // reset state $this->_error = false; // reset state
$this->_strpos = 0; $this->_strpos = 0;
if (empty($this->_ch)) { if (empty($this->_ch)) {
@ -149,7 +151,6 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
// Containing the value zero (0) // Containing the value zero (0)
// The actual DPI is determined after the String Table is read. // The actual DPI is determined after the String Table is read.
$dpiStruct = $this->getDocumentPublicIdentifier($wbxml); $dpiStruct = $this->getDocumentPublicIdentifier($wbxml);
// Get Charset from 5.6 // Get Charset from 5.6
// charset = mb_u_int32 // charset = mb_u_int32
$this->_charset = $this->getCharset($wbxml); $this->_charset = $this->getCharset($wbxml);
@ -366,6 +367,7 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
$size = XML_WBXML::MBUInt32ToInt($input, $this->_strpos); $size = XML_WBXML::MBUInt32ToInt($input, $this->_strpos);
// print "opaque of size $size\n"; // @todo remove debug // print "opaque of size $size\n"; // @todo remove debug
$b = substr($input, $this->_strpos, $size); $b = substr($input, $this->_strpos, $size);
#$b = mb_substr($input, $this->_strpos, $size, 'ISO-8859-1');
$this->_strpos += $size; $this->_strpos += $size;
// opaque data inside a <data> element may or may not be // opaque data inside a <data> element may or may not be

2
phpgwapi/inc/horde/config/conf.php
View File

@ -18,7 +18,7 @@ $conf['auth']['checkip'] = true;
$conf['auth']['params']['username'] = 'Administrator'; $conf['auth']['params']['username'] = 'Administrator';
$conf['auth']['params']['requestuser'] = false; $conf['auth']['params']['requestuser'] = false;
$conf['auth']['driver'] = 'auto'; $conf['auth']['driver'] = 'auto';
$conf['log']['priority'] = PEAR_LOG_DEBUG; $conf['log']['priority'] = PEAR_LOG_INFO;
$conf['log']['ident'] = 'EGWSYNC'; $conf['log']['ident'] = 'EGWSYNC';
$conf['log']['params'] = array(); $conf['log']['params'] = array();
$conf['log']['name'] = '/tmp/egroupware_syncml.log'; $conf['log']['name'] = '/tmp/egroupware_syncml.log';

10
phpgwapi/inc/horde/config/registry.php
View File

@ -111,16 +111,6 @@ $this->applications['egwcalendarsync'] = array(
'menu_parent' => 'organizing' 'menu_parent' => 'organizing'
); );
$this->applications['egwsifcalendarsync'] = array(
'fileroot' => EGW_SERVER_ROOT.'/syncml/sifcalendar',
'webroot' => $this->applications['horde']['webroot'] . '/mnemo',
'icon' => $this->applications['horde']['webroot'] . '/mnemo/graphics/mnemo.gif',
'name' => _("Calendar"),
'status' => 'active',
'provides' => 'sifcalendar',
'menu_parent' => 'organizing'
);
$this->applications['egwtaskssync'] = array( $this->applications['egwtaskssync'] = array(
'fileroot' => EGW_SERVER_ROOT.'/syncml/tasks', 'fileroot' => EGW_SERVER_ROOT.'/syncml/tasks',
'webroot' => $this->applications['horde']['webroot'] . '/mnemo', 'webroot' => $this->applications['horde']['webroot'] . '/mnemo',