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

2012-12-09 Sancho Lerena <slerena@artica.es> 

* pandoradb.sql: Replaced ^---.. comments with "-- -.." to avoid problems
	with MySQL 5.0.x
	
	* include/config_process.php: Fixed some problems with default timezone, because
	config function was called before timezone was setup.
	
	* include/styles/pandora.css: Added new style for netflow report render (HTML).
	
	* include/functions_netflow.php: Replaced some code for use new CSS styles.
	


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7243 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2012-12-10 00:05:09 +00:00
parent 0adbeddb32
commit 0ddabe12c4
4 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,5 +1,15 @@
2012-12-09 Sancho Lerena <slerena@artica.es>
* pandoradb.sql: Replaced ^---.. comments with "-- -.." to avoid problems
with MySQL 5.0.x
* include/config_process.php: Fixed some problems with default timezone, because
config function was called before timezone was setup.
* include/styles/pandora.css: Added new style for netflow report render (HTML).
* include/functions_netflow.php: Replaced some code for use new CSS styles.
Ported new feature (Command Snapshot) from 4.0.3 code.
* include/javascript/pandora.js: Added new javascript function

7
pandora_console/include/config_process.php
View File

@ -104,12 +104,19 @@ if (! defined ('ENTERPRISE_DIR'))
require_once ($ownDir. 'functions_config.php');
// We need a timezone BEFORE calling config_process_config.
// If not we will get ugly warnings. Set Europe/Madrid by default
// Later will be replaced by the good one.
date_default_timezone_set("Europe/Madrid");
config_process_config();
// Set a the system timezone default
if ((!isset($config["timezone"])) OR ($config["timezone"] == "")){
$config["timezone"] = "Europe/Berlin";
}
date_default_timezone_set($config["timezone"]);
require_once ($ownDir . 'streams.php');

10
pandora_console/include/functions_netflow.php
View File

@ -275,14 +275,14 @@ function netflow_data_table ($data, $start_date, $end_date, $aggregate, $unit) {
}
$values = array();
$table->size = array ('50%');
$table->class = 'databox';
$table->size = array ('60%');
$table->class = 'databox_grid';
$table->cellspacing = 0;
$table->data = array();
$table->head = array();
$table->head[0] = '<b>'.__('Timestamp').'</b>';
$table->style[0] = 'border: 1px solid black;padding: 4px';
$table->style[0] = 'padding: 4px';
$j = 0;
$source_index = array ();
@ -290,7 +290,7 @@ function netflow_data_table ($data, $start_date, $end_date, $aggregate, $unit) {
if (isset ($data['sources'])) {
foreach ($data['sources'] as $source => $null) {
$table->style[$j+1] = 'border: 1px solid black;padding: 4px';
$table->style[$j+1] = 'padding: 4px';
$table->align[$j+1] = "right";
$table->head[$j+1] = $source;
$source_index[$j] = $source;
@ -298,7 +298,7 @@ function netflow_data_table ($data, $start_date, $end_date, $aggregate, $unit) {
$j++;
}
} else {
$table->style[1] = 'border: 1px solid black;padding: 4px';
$table->style[1] = 'padding: 4px;';
}
// No aggregates

19
pandora_console/include/styles/pandora.css
View File

@ -890,11 +890,28 @@ span.rmess, span.nrmess {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
}
.databox {
background-color: #f4f5f4;
}
/* For use in Netflow */
table.databox_grid {
margin: 25px;
}
table.databox_grid th {
font-size: 12px;
}
table.databox_grid td {
padding: 6px;
margin: 4px;
border-bottom: 1px solid #acacac;
border-right: 1px solid #acacac;
}
table.alternate tr:nth-child(odd) td{
background-color: #e4e5e4;
}