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

fixed not working address import from FMail under ldap

Browse Source
This commit is contained in:
Ralf Becker 2006-08-24 16:06:45 +00:00
parent c2a7644b5e
commit 47d18e092a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addressbook/inc/class.socontacts.inc.php
View File

@ -792,13 +792,15 @@ error_log("socontacts::search(".print_r($criteria,true).",'$only_keys','$order_b
/** /**
* gets all contact fields from database * gets all contact fields from database
*
* @return array of (internal) field-names
*/ */
function get_contact_columns() function get_contact_columns()
{ {
$fields = $this->somain->db_data_cols; $fields = $this->get_fields('all');
foreach ((array)$this->customfields as $cfield => $coptions) foreach ((array)$this->customfields as $cfield => $coptions)
{ {
$fields['#'.$cfield] = '#'.$cfield; $fields[] = '#'.$cfield;
} }
return $fields; return $fields;
} }

2
addressbook/inc/class.uicontacts.inc.php
View File

@ -885,7 +885,7 @@ class uicontacts extends bocontacts
} }
$new_type = array_keys($this->content_types); $new_type = array_keys($this->content_types);
$content['tid'] = $_GET['typeid'] ? $_GET['typeid'] : $new_type[0]; $content['tid'] = $_GET['typeid'] ? $_GET['typeid'] : $new_type[0];
foreach($this->get_contact_columns() as $field => $data) foreach($this->get_contact_columns() as $field)
{ {
if ($_GET['presets'][$field]) $content[$field] = $_GET['presets'][$field]; if ($_GET['presets'][$field]) $content[$field] = $_GET['presets'][$field];
} }