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

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



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