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

fixed not encoded column-headers in csv export (were not useing the

Browse Source 
export charset, as used for data)
This commit is contained in:
Ralf Becker 2009-10-27 14:49:23 +00:00
parent 345993086a
commit d8ce440e33
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etemplate/inc/class.nextmatch_widget.inc.php
View File

@ -1011,7 +1011,7 @@ class nextmatch_widget
if (!$value['start']) // send the neccessary headers if (!$value['start']) // send the neccessary headers
{ {
// use last row for header detection, as first row(s) might be empty to skip header row(s) of template // use last row for header detection, as first row(s) might be empty to skip header row(s) of template
$fp = self::csv_open($rows[count($rows)-1],$value['csv_fields'],$app); $fp = self::csv_open($rows[count($rows)-1],$value['csv_fields'],$app,$charset_out,$charset,$separator);
} }
foreach($rows as $key => $row) foreach($rows as $key => $row)
{ {
@ -1045,9 +1045,12 @@ class nextmatch_widget
* @param array $row0 first row to guess the available fields * @param array $row0 first row to guess the available fields
* @param array $fields name=>label or name=>array('lable'=>label,'type'=>type) pairs * @param array $fields name=>label or name=>array('lable'=>label,'type'=>type) pairs
* @param string $app app-name * @param string $app app-name
* @param string $charset_out=null output charset
* @param string $charset data charset
* @param string $separator=';'
* @return FILE * @return FILE
*/ */
private static function csv_open($row0,&$fields,$app) private static function csv_open($row0,&$fields,$app,$charset_out=null,$charset=null,$separator=';')
{ {
if (!is_array($fields) || !count($fields)) if (!is_array($fields) || !count($fields))
{ {
@ -1064,7 +1067,7 @@ class nextmatch_widget
if (is_array($label)) $label = $label['label']; if (is_array($label)) $label = $label['label'];
$labels[$field] = $label ? $label : $field; $labels[$field] = $label ? $label : $field;
} }
fwrite($fp,self::csv_encode($labels,$fields,false)."\n"); fwrite($fp,self::csv_encode($labels,$fields,false,null,$charset_out,$charset,$separator)."\n");
} }
return $fp; return $fp;
} }