extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 17:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix SIFE issues

Browse Source
This commit is contained in:
Jörg Lehrke 2009-11-22 17:48:51 +00:00
parent 71ef04effc
commit ed5799b519
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
calendar/inc/class.calendar_sif.inc.php
View File

@ -164,7 +164,10 @@ class calendar_sif extends calendar_boupdate
case 'category':
if (!empty($value))
{
$finalEvent[$key] = implode(',',$this->find_or_add_categories(explode(';', $value), $_calID));
$categories1 = explode(',', $value);
$categories2 = explode(';', $value);
$categories = count($categories1) > count($categories2) ? $categories1 : $categories2;
$finalEvent[$key] = implode(',', $this->find_or_add_categories($categories, $_calID));
}
break;
@ -266,22 +269,17 @@ class calendar_sif extends calendar_boupdate
}
/**
* @return int contact id
* @param string $_vcard the vcard
* @param int $_abID the internal addressbook id
* @return int event id
* @param string $_sifdata the SIFE data
* @param int $_calID=-1 the internal addressbook id
* @param boolean $merge=false merge data with existing entry
* @desc import a vard into addressbook
* @desc import a SIFE into the calendar
*/
function addSIF($_sifdata, $_calID, $merge=false)
function addSIF($_sifdata, $_calID=-1, $merge=false)
{
$state = &$_SESSION['SyncML.state'];
$deviceInfo = $state->getClientDeviceInfo();
$calID = false;
#error_log('ABID: '.$_abID);
#error_log(base64_decode($_sifdata));
if (!$event = $this->siftoegw($_sifdata, $_calID))
{
return false;
@ -334,7 +332,7 @@ class calendar_sif extends calendar_boupdate
* return a sife
*
* @param int $_id the id of the event
* @return string containing the vcard
* @return string containing the SIFE
*/
function getSIF($_id)
{
@ -560,7 +558,7 @@ class calendar_sif extends calendar_boupdate
case 'Categories':
if (!empty($value))
{
$value = implode('; ', $this->get_categories(explode(',',$value)));
$value = implode(', ', $this->get_categories($value));
$value = $GLOBALS['egw']->translation->convert($value, $sysCharSet, 'utf-8');
}
else