tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-10-30 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_api.php: fixed the output of data as csv when
	the data have a return carriges.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8981 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-10-30 15:00:46 +00:00
parent c170bd356c
commit 0d95b97b09
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2013-10-30 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed the output of data as csv when
the data have a return carriges.
2013-10-22 Hirofumi Kosaka <kosaka@rworks.jp> 2013-10-22 Hirofumi Kosaka <kosaka@rworks.jp>
* include/help/en/help_alert_config.php, * include/help/en/help_alert_config.php,

12
pandora_console/include/functions_api.php
View File

@ -123,7 +123,7 @@ function returnData($returnType, $data, $separator = ';') {
foreach($data['data'] as $dataContent) { foreach($data['data'] as $dataContent) {
foreach($data['list_index'] as $index) { foreach($data['list_index'] as $index) {
if (array_key_exists($index, $dataContent)) if (array_key_exists($index, $dataContent))
echo $dataContent[$index]; echo str_replace("\n", " ", $dataContent[$index]);
if (end($data['list_index']) == $index) if (end($data['list_index']) == $index)
echo "\n"; echo "\n";
else else
@ -135,7 +135,11 @@ function returnData($returnType, $data, $separator = ';') {
if (!empty($data['data'])) { if (!empty($data['data'])) {
foreach($data['data'] as $dataContent) { foreach($data['data'] as $dataContent) {
$clean = array_map("array_apply_io_safe_output", $dataContent); $clean = array_map("array_apply_io_safe_output", $dataContent);
echo implode($separator, $clean) . "\n"; $row = implode($separator, $clean);
$row = str_replace("\r", "\n", $row);
$row = str_replace("\n", " ", $row);
echo $row . "\n";
} }
} }
} }
@ -5406,7 +5410,7 @@ function get_events_with_user($trash1, $trash2, $other, $returnType, $user_in_db
$sql_post .= " AND id_grupo != 0"; $sql_post .= " AND id_grupo != 0";
} }
switch($status) { switch ($status) {
case 0: case 0:
case 1: case 1:
case 2: case 2:
@ -5619,8 +5623,10 @@ function get_events_with_user($trash1, $trash2, $other, $returnType, $user_in_db
$data['data'] = $result; $data['data'] = $result;
returnData($returnType, $data, $separator); returnData($returnType, $data, $separator);
if (empty($result)) if (empty($result))
return false; return false;
return true; return true;
} }