extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 17:42:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Respect convert to human friendly fields option

Browse Source
This commit is contained in:
Nathan Gray 2010-11-22 23:32:27 +00:00
parent 98df477a23
commit 12fddd6660
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addressbook/inc/class.addressbook_export_contacts_csv.inc.php
View File

@ -179,7 +179,9 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi
}
// Some conversion
$this->convert($contact, $options);
importexport_export_csv::convert($contact, self::$types, 'addressbook');
if($options['convert']) {
importexport_export_csv::convert($contact, self::$types, 'addressbook');
}
$export_object->export_record($contact);
unset($contact);
}
@ -252,8 +254,8 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi
$record->$field_name = array();
if(is_array($record->$field) && in_array($value, $record->$field) || $record->$field == $value) {
if($explode_settings['explode'] != self::MAIN_CATS) {
$record->$field_name = lang('Yes');
} else {
$record->$field_name = $options['convert'] ? lang('Yes') : true;
} elseif($options['convert']) {
// 3 part assign due to magic get method
$record_value = $record->$field_name;
$record_value[] = $settings['label'];
@ -264,7 +266,7 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi
// 3 part assign due to magic get method
$record_value = $record->$field_name;
foreach(array_intersect($record->$field, array_keys($settings['subs'])) as $sub_id) {
$record_value[] = $settings['subs'][$sub_id];
$record_value[] = $options['convert'] ? $settings['subs'][$sub_id] : $sub_id;
}
$record->$field_name = $record_value;
}