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

2012-09-27 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_ui.php, operation/agentes/tactical.php: cleaned
	source code style.
	
	* include/functions_reporting.php: fixed the ACL into the function
	"reporting_get_group_stats".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7006 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-09-27 15:17:50 +00:00
parent 5d4df358e6
commit f701cdc957
4 changed files with 197 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2012-09-27 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_ui.php, operation/agentes/tactical.php: cleaned
source code style.
* include/functions_reporting.php: fixed the ACL into the function
"reporting_get_group_stats".
2012-09-27 Sergio Martin <sergio.martin@artica.es>
* include/functions_menu.php

345
pandora_console/include/functions_reporting.php
View File

File diff suppressed because it is too large Load Diff

2
pandora_console/include/functions_ui.php
View File

@ -1914,7 +1914,7 @@ function ui_get_full_url ($url = '', $no_proxy = false, $add_name_php_file = fal
else {
//Only add the home url
$url = $config['homeurl'] . '/';
}
}
}
elseif (!strstr($url, ".php")) {
if ($proxy) {

22
pandora_console/operation/agentes/tactical.php
View File

@ -34,7 +34,7 @@ if (! check_acl ($config['id_user'], 0, "AR")) {
$is_admin = check_acl ($config['id_user'], 0, "PM");
$force_refresh = get_parameter ("force_refresh", "");
if ($force_refresh == 1){
if ($force_refresh == 1) {
db_process_sql ("UPDATE tgroup_stat SET utimestamp = 0");
}
@ -75,8 +75,9 @@ ui_print_page_header (__("Tactical view"), "images/bricks.png", false, "", false
$data = reporting_get_group_stats();
echo '<div style="width:20%; float:left; padding-right: 5%;" id="leftcolumn">';
// Monitor checks
// ---------------------------------------------------------------------
// The status horizontal bars (Global health, Monitor sanity...
// ---------------------------------------------------------------------
$table->width = "100%";
$table->class = "databox";
$table->cellpadding = 0;
@ -117,6 +118,9 @@ $table->data[7][0] =
html_print_table ($table);
unset ($table);
// ---------------------------------------------------------------------
// Monitor checks
// ---------------------------------------------------------------------
echo '<table class="databox" cellpadding="4" cellspacing="4" width="100%">';
echo '<tr><th colspan="2">'.__('Monitor checks').'</th></tr>';
@ -163,9 +167,9 @@ $cells[7]["color"] = "#ff8800";
print_cells_temp ($cells);
// --------------------------------------------------------------------------
// ---------------------------------------------------------------------
// Server performance
// --------------------------------------------------------------------------
// ---------------------------------------------------------------------
if ($is_admin) {
$server_performance = servers_get_performance();
@ -227,16 +231,16 @@ echo '</div>'; //Left column
echo '<div style="width: 70%; float:left;" id="rightcolumn">';
// --------------------------------------------------------------------------
// ---------------------------------------------------------------------
// Last events information
// --------------------------------------------------------------------------
// ---------------------------------------------------------------------
events_print_event_table ("WHERE estado<>1 ", 10, "100%");
// --------------------------------------------------------------------------
// ---------------------------------------------------------------------
// Server information
// --------------------------------------------------------------------------
// ---------------------------------------------------------------------
if ($is_admin) {
$serverinfo = servers_get_info ();
$cells = array ();