extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

1) fixed missing charset conversation on import

Browse Source 
2) phpgw --> egw
This commit is contained in:
Ralf Becker 2005-07-27 16:11:01 +00:00
parent 2c58feb1e0
commit 2bc834b576
1 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
addressbook/inc/class.vcaladdressbook.inc.php
View File

@ -11,8 +11,8 @@
/* $Id$ */
require_once PHPGW_SERVER_ROOT.'/addressbook/inc/class.boaddressbook.inc.php';
require_once PHPGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/iCalendar.php';
require_once EGW_SERVER_ROOT.'/addressbook/inc/class.boaddressbook.inc.php';
require_once EGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/iCalendar.php';
class vcaladdressbook extends boaddressbook
{
@ -51,12 +51,10 @@
'URL;WORK' => array('url'),
);
require_once(PHPGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/iCalendar.php');
require_once(EGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/iCalendar.php');
$vCard = Horde_iCalendar::newComponent('vcard', $container);
$botranslation = CreateObject('phpgwapi.translation');
if (!$vCard->parsevCalendar($_vcard,'VCARD'))
{
return False;
@ -146,7 +144,6 @@
#return true;
/* _debug_array($contact);exit; */
$contact['fn'] = trim($contact['n_given'].' '.$contact['n_family']);
if(!$contact['tel_work']) $contact['tel_work'] = '';
@ -160,6 +157,8 @@
if(!$contact['tel_isdn']) $contact['tel_isdn'] = '';
if(!$contact['tel_video']) $contact['tel_video'] = '';
$GLOBALS['egw']->translation->convert($contact,'utf-8');
if($_abID > 0)
{
// update entry
@ -174,18 +173,17 @@
}
/**
* @return string containing the vcard
* return a vcard
*
* @param int $_id the id of the contact
* @param int $_vcardProfile profile id for mapping from vcard values to egw addressbook
* @desc return a vcard
* @return string containing the vcard
*/
function getVCard($_id, $_vcardProfile)
{
require_once(PHPGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/iCalendar/vcard.php');
require_once(EGW_SERVER_ROOT.'/phpgwapi/inc/horde/Horde/iCalendar/vcard.php');
$vCard = new Horde_iCalendar_vcard;
$botranslation = CreateObject('phpgwapi.translation');
$vCard =& new Horde_iCalendar_vcard;
#if ($this->xmlrpc && !isset($data['fields']))
#{
@ -266,7 +264,7 @@
#_debug_array($fields);
if($this->check_perms($_id,PHPGW_ACL_READ))
if($this->check_perms($_id,EGW_ACL_READ))
{
//$data = array('id' => $_id, 'fields' => $fields);
$entry = $this->so->read_entry($_id,$fields);
@ -276,8 +274,7 @@
$entry = $this->data2xmlrpc($entry);
}
#_debug_array($entry);
$sysCharSet = $GLOBALS['phpgw']->translation->charset();
$sysCharSet = $GLOBALS['egw']->translation->charset();
foreach($vcardFields[$_vcardProfile] as $vcardField => $databaseFields)
{
@ -310,7 +307,7 @@
break;
}
$value = $botranslation->convert($value,$sysCharSet,'utf-8');
$value = $GLOBALS['egw']->translation->convert($value,$sysCharSet,'utf-8');
// don't add the entry if it contains only ';'
if(strlen(str_replace(';','',$value)) != 0)