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

Add new contacts to selected addressbook. Fix SIF category delimiter

Browse Source
This commit is contained in:
Jörg Lehrke 2009-11-19 20:52:44 +00:00
parent b685a21fd1
commit d9adef103b
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addressbook/inc/class.addressbook_sif.inc.php
View File

@ -121,6 +121,8 @@ class addressbook_sif extends addressbook_bo
#fwrite($handle, $sifData); #fwrite($handle, $sifData);
#fclose($handle); #fclose($handle);
Horde::logMessage("SyncML siftoegw:\n$sifData", __FILE__, __LINE__, PEAR_LOG_DEBUG);
$this->xml_parser = xml_parser_create('UTF-8'); $this->xml_parser = xml_parser_create('UTF-8');
xml_set_object($this->xml_parser, $this); xml_set_object($this->xml_parser, $this);
xml_parser_set_option($this->xml_parser, XML_OPTION_CASE_FOLDING, false); xml_parser_set_option($this->xml_parser, XML_OPTION_CASE_FOLDING, false);
@ -141,7 +143,10 @@ class addressbook_sif extends addressbook_bo
case 'cat_id': case 'cat_id':
if(!empty($value)) if(!empty($value))
{ {
$finalContact[$key] = implode(",", $this->find_or_add_categories(explode(';', $value), $_abID)); $categories1 = explode(',', $value);
$categories2 = explode(';', $value);
$categories = count($categories1) > count($categories2) ? $categories1 : $categories2;
$finalContact[$key] = implode(",", $this->find_or_add_categories($categories, $_abID));
} }
else else
{ {
@ -160,6 +165,7 @@ class addressbook_sif extends addressbook_bo
} }
$this->fixup_contact($finalContact); $this->fixup_contact($finalContact);
Horde::logMessage("SyncML siftoegw: " . print_r($finalContact, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
return $finalContact; return $finalContact;
} }
@ -203,6 +209,11 @@ class addressbook_sif extends addressbook_bo
// update entry // update entry
$contact['id'] = $_abID; $contact['id'] = $_abID;
} }
elseif (array_key_exists('filter_addressbook', $GLOBALS['egw_info']['user']['preferences']['syncml']))
{
$contact['owner'] = (int) $GLOBALS['egw_info']['user']['preferences']['syncml']['filter_addressbook'];
}
return $this->save($contact); return $this->save($contact);
} }
@ -253,7 +264,7 @@ class addressbook_sif extends addressbook_bo
case 'Categories': case 'Categories':
if(!empty($value)) { if(!empty($value)) {
$value = implode("; ", $this->get_categories($value)); $value = implode(", ", $this->get_categories($value));
$value = $GLOBALS['egw']->translation->convert($value, $sysCharSet, 'utf-8'); $value = $GLOBALS['egw']->translation->convert($value, $sysCharSet, 'utf-8');
} else { } else {
break; break;

4
addressbook/inc/class.addressbook_vcal.inc.php
View File

@ -143,6 +143,10 @@ class addressbook_vcal extends addressbook_bo
// update entry // update entry
$contact['id'] = $_abID; $contact['id'] = $_abID;
} }
elseif (array_key_exists('filter_addressbook', $GLOBALS['egw_info']['user']['preferences']['syncml']))
{
$contact['owner'] = (int) $GLOBALS['egw_info']['user']['preferences']['syncml']['filter_addressbook'];
}
return $this->save($contact); return $this->save($contact);
} }