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

- Escape double qoutes

Browse Source 
- Allow to pass extra select/lookup values to convert()
This commit is contained in:
Nathan Gray 2010-12-17 16:39:11 +00:00
parent 0ff32d804a
commit 806a5aec91
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
importexport/inc/class.importexport_export_csv.inc.php
View File

@ -225,13 +225,13 @@ class importexport_export_csv implements importexport_iface_export_record
* @parem fields List of field types => field names to be converted
* @param appname Current appname if you want to do custom fields too
*/
public static function convert(importexport_iface_egw_record &$record, Array $fields = array(), $appname = null) {
public static function convert(importexport_iface_egw_record &$record, Array $fields = array(), $appname = null, $selects = array()) {
if($appname) {
if(!self::$cf_parse_cache[$appname]) {
$c_fields = self::convert_parse_custom_fields($appname, $selects, $links, $methods);
self::$cf_parse_cache[$appname] = array($c_fields, $selects, $links, $methods);
}
list($c_fields, $selects, $links, $methods) = self::$cf_parse_cache[$appname];
list($c_fields, $c_selects, $links, $methods) = self::$cf_parse_cache[$appname];
// Not quite a recursive merge, since only one level
foreach($fields as $type => &$list) {
if($c_fields[$type]) {
@ -240,6 +240,7 @@ class importexport_export_csv implements importexport_iface_export_record
}
}
$fields += $c_fields;
$selects += $c_selects;
}
foreach((array)$fields['select'] as $name) {
if($record->$name != null && is_array($selects) && $selects[$name]) {
@ -335,7 +336,7 @@ class importexport_export_csv implements importexport_iface_export_record
$writeDelimiter = false;
foreach($dataArray as $dataElement) {
if($writeDelimiter) $string .= $delimiter;
$string .= $enclosure . str_replace("\r\n", "\n", $dataElement) . $enclosure;
$string .= $enclosure . str_replace(array("\r\n", '"'), array("\n",'""'), $dataElement) . $enclosure;
$writeDelimiter = true;
}
$string .= "\n";