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

Change from Ralf Becker <RalfBecker@outdoor-training.de> for vcard import and mult. cats

Browse Source
This commit is contained in:
Miles Lott 2001-05-23 20:18:57 +00:00
parent fafc7d39c9
commit 7aa962674b
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/edit.php
View File

@ -204,7 +204,7 @@
$fields['access'] = 'public'; $fields['access'] = 'public';
} }
$fields['cat_id'] = $cat_id; $fields['cat_id'] = is_array($cat_id) ? implode(',',$cat_id) : $cat_id;
if (($this->grants[$check[0]['owner']] & PHPGW_ACL_EDIT) && $check[0]['owner'] != $phpgw_info['user']['account_id']) if (($this->grants[$check[0]['owner']] & PHPGW_ACL_EDIT) && $check[0]['owner'] != $phpgw_info['user']['account_id'])
{ {

14
addressbook/import.php
View File

@ -157,15 +157,19 @@
{ {
while ($data = fgets($fp,8000)) while ($data = fgets($fp,8000))
{ {
list($name,$value,$extra) = split(':', $data); $data = trim($data); // RB 2001/05/07 added for Lotus Organizer
while (substr($data,-1) == '=') { // '=' at end-of-line --> line to be continued with next line
$data = substr($data,0,-1) . trim(fgets($fp,8000));
}
if (strstr($data,';ENCODING=QUOTED-PRINTABLE')) { // RB 2001/05/07 added for Lotus Organizer
$data = quoted_printable_decode(str_replace(';ENCODING=QUOTED-PRINTABLE','',$data));
}
list($name,$value) = explode(':', $data,2); // RB 2001/05/09 to allow ':' in Values (not only in URL's)
if (strtolower(substr($name,0,5)) == 'begin') if (strtolower(substr($name,0,5)) == 'begin')
{ {
$buffer = $this->import_start_record($buffer); $buffer = $this->import_start_record($buffer);
} }
if (substr($value,0,5) == "http")
{
$value = $value . ":".$extra;
}
if ($name && $value) if ($name && $value)
{ {
reset($this->import); reset($this->import);