extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-27 08:19:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

- fixed single quotes in view

Browse Source 
- fixed setting of no cat (after there've been one) in edit
This commit is contained in:
Ralf Becker 2004-03-07 12:27:07 +00:00
parent 49d9007518
commit 3abbf2fb67
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
addressbook/inc/class.uiaddressbook.inc.php
View File

@ -1098,32 +1098,21 @@
$fields['cat_id'] = is_array($this->cat_id) ? implode(',',$this->cat_id) : $this->cat_id; $fields['cat_id'] = is_array($this->cat_id) ? implode(',',$this->cat_id) : $this->cat_id;
$cats = explode(',',$fields[0]['cat_id']); $cats = explode(',',$fields[0]['cat_id']);
if($cats[1]) $catnames = array();
foreach($cats as $cat)
{ {
// while(list($key,$contactscat) = each($cats)) if ($cat)
foreach($cats as $key => $contactscat)
{ {
if($contactscat) $cat = $this->cat->return_single((int)$cat);
{ $catnames[] = stripslashes($cat[0]['name']);
$catinfo = $this->cat->return_single((int)$contactscat);
$catname .= $catinfo[0]['name'] . '; ';
}
}
if(!$this->cat_id)
{
$this->cat_id = $cats[0];
} }
} }
else $catname = implode('; ',$catnames);
if (!$this->cat_id)
{ {
$fields[0]['cat_id'] = str_replace(',','',$fields[0]['cat_id']); $this->cat_id = count($cats) > 1 ? $cats[1] : $cats[0];
$catinfo = $this->cat->return_single((int)$fields[0]['cat_id']);
$catname = $catinfo[0]['name'];
if(!$this->cat_id)
{
$this->cat_id = $fields[0]['cat_id'];
}
} }
$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color); $tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
$GLOBALS['phpgw']->template->set_var(array( $GLOBALS['phpgw']->template->set_var(array(
'ref_data' => $GLOBALS['phpgw']->common->grab_owner_name($record_owner), 'ref_data' => $GLOBALS['phpgw']->common->grab_owner_name($record_owner),
@ -1489,11 +1478,11 @@
if(is_array($fcat_id)) if(is_array($fcat_id))
{ {
$fields['cat_id'] = count($fcat_id) > 1 ? ','.implode(',',$fcat_id).',' : $fcat_id[0]; $fields['cat_id'] = count($fcat_id) > 1 ? ','.implode(',',$fcat_id).',' : (int)$fcat_id[0];
} }
else else
{ {
$fields['cat_id'] = $fcat_id; $fields['cat_id'] = (int)$fcat_id;
} }
$fields['ab_id'] = $entry['ab_id']; $fields['ab_id'] = $entry['ab_id'];