tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

2010-07-27 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* operation/agentes/exportdata.php: fixed the date into export, before it
	was 12 hour format, now it is 24 hour format.
	Fixes: #3033541



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3067 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2010-07-27 09:51:58 +00:00
parent 369e852be8
commit 495b91bb3c
2 changed files with 11 additions and 5 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 @@
2010-07-27 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/exportdata.php: fixed the date into export, before it
was 12 hour format, now it is 24 hour format.
Fixes: #3033541
2010-07-26 Raúl Mateos <raulofpandora@gmail.com> 2010-07-26 Raúl Mateos <raulofpandora@gmail.com>
* godmode/users/user_list.php: Added px to width to ease the change of * godmode/users/user_list.php: Added px to width to ease the change of

11
pandora_console/operation/agentes/exportdata.php
View File

@ -115,7 +115,7 @@ if (!empty ($export_btn) && !empty ($module)) {
$divider = '</td><td>'; $divider = '</td><td>';
$rowend = '</td></tr>'; $rowend = '</td></tr>';
$dataend = '</table>'; $dataend = '</table>';
break; break;
case "excel": case "excel":
//Excel is tab-delimited, needs quotes and needs Windows-style newlines //Excel is tab-delimited, needs quotes and needs Windows-style newlines
$datastart = __('Agent')."\t".__('Module')."\t".__('Data')."\t".__('Timestamp')."\r\n"; $datastart = __('Agent')."\t".__('Module')."\t".__('Data')."\t".__('Timestamp')."\r\n";
@ -124,7 +124,7 @@ if (!empty ($export_btn) && !empty ($module)) {
$rowend = '"'."\r\n"; $rowend = '"'."\r\n";
$dataend = "\r\n"; $dataend = "\r\n";
$extension = "xls"; $extension = "xls";
break; break;
case "csv": case "csv":
//Pure CSV is comma delimited //Pure CSV is comma delimited
$datastart = __('Agent').','.__('Module').','.__('Data').','.__('Timestamp')."\n"; $datastart = __('Agent').','.__('Module').','.__('Data').','.__('Timestamp')."\n";
@ -133,7 +133,7 @@ if (!empty ($export_btn) && !empty ($module)) {
$rowend = '"'."\n"; $rowend = '"'."\n";
$dataend = "\n"; $dataend = "\n";
$extension = "csv"; $extension = "csv";
break; break;
} }
// *************************************************** // ***************************************************
@ -152,6 +152,7 @@ if (!empty ($export_btn) && !empty ($module)) {
header("Content-Disposition: attachment; filename=export_".date("Ymd", $start)."_".date("Ymd", $end).".".$extension); header("Content-Disposition: attachment; filename=export_".date("Ymd", $start)."_".date("Ymd", $end).".".$extension);
header("Pragma: no-cache"); header("Pragma: no-cache");
header("Expires: 0"); header("Expires: 0");
break;
} }
// *************************************************** // ***************************************************
@ -198,7 +199,7 @@ if (!empty ($export_btn) && !empty ($module)) {
$output .= $divider; $output .= $divider;
$output .= $module['data']; $output .= $module['data'];
$output .= $divider; $output .= $divider;
$output .= date ("Y-m-d g:i:s", $module['utimestamp']); $output .= date ("Y-m-d G:i:s", $module['utimestamp']);
$output .= $rowend; $output .= $rowend;
} }
@ -222,7 +223,7 @@ if (!empty ($export_btn) && !empty ($module)) {
$output = ""; $output = "";
} // main foreach } // main foreach
echo $dataend; echo $dataend;
break; break;
case "avg": case "avg":
foreach ($module as $selected) { foreach ($module as $selected) {