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

2012-06-13 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* operation/agentes/estado_agente.php: Improved user feedback when
	user delete an agent in this view.
	* operation/agentes/tactical.php: Removed empty links in tactical 
	view.
	
	Merged from branches.
	
	* godmode/setup/performance.php: Added enterprise_include_once to
	avoid a PHP error.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6526 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-06-13 09:56:20 +00:00
parent d59580c30a
commit 4a8e9bbbda
4 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/ChangeLog
View File

@ -1,3 +1,15 @@
2012-06-13 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/agentes/estado_agente.php: Improved user feedback when
user delete an agent in this view.
* operation/agentes/tactical.php: Removed empty links in tactical
view.
Merged from branches.
* godmode/setup/performance.php: Added enterprise_include_once to
avoid a PHP error.
2012-06-13 Hirofumi Kosaka <kosaka@rworks.jp>
* operation/agentes/estado_ultimopaquete.php: Merged from 4.0.x:

2
pandora_console/godmode/setup/performance.php
View File

@ -24,7 +24,7 @@ if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_us
return;
}
// Load enterprise extensions
enterprise_include ('godmode/setup/setup.php');
enterprise_include_once ('godmode/setup/setup.php');
/*
NOTICE FOR DEVELOPERS:

8
pandora_console/operation/agentes/estado_agente.php
View File

@ -162,6 +162,14 @@ if (check_acl ($config['id_user'], 0, "AW")) {
ui_print_page_header ( __("Agent detail"), "images/bricks.png", false, "agent_status", false, $onheader);
// User is deleting agent
if (isset($result_delete)) {
if ($result_delete)
ui_print_success_message(__("Sucessfully deleted agent"));
else
ui_print_error_message(__("There was an error message deleting the agent"));
}
echo '<form method="post" action="?sec=estado&sec2=operation/agentes/estado_agente&group_id=' . $group_id . '">';
echo '<table cellpadding="4" cellspacing="4" class="databox" width="98%">';

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

@ -54,7 +54,7 @@ function print_cells_temp ($cells) {
if (isset($row["color"]))
$color = 'style="color: ' . $row["color"] . ';"';
if (isset($row["href"]))
if (isset($row["href"]) and !empty($row["href"]))
echo '<td class="'.$class.'" style="text-align:right;"><a class="big_data" href="'.io_safe_input ($row["href"]).'" ' . $color . '>'.$row[1].'</a></td></tr>';
else
echo '<td class="'.$class.'" style="text-align:right;"><a class="big_data" ' . $color . '>'.$row[1].'</a></td></tr>';
@ -175,27 +175,27 @@ if($is_admin) {
$cells[0][0] = __('Local modules rate');
$cells[0][1] = format_numeric($server_performance ["local_modules_rate"]);
$cells[0]["color"] = "#729fcf";
$cells[0]["href"] = "javascript:";
$cells[0]["href"] = "";
$cells[1][0] = __('Remote modules rate');
$cells[1][1] = format_numeric($server_performance ["remote_modules_rate"]);
$cells[1]["color"] = "#729fcf";
$cells[1]["href"] = "javascript:";
$cells[1]["href"] = "";
$cells[2][0] = __('Local modules');
$cells[2][1] = format_numeric($server_performance ["total_local_modules"]);
$cells[2]["color"] = "#3465a4";
$cells[2]["href"] = "javascript:";
$cells[2]["href"] = "";
$cells[3][0] = __('Remote modules');
$cells[3][1] = format_numeric($server_performance ["total_remote_modules"]);
$cells[3]["color"] = "#3465a4";
$cells[3]["href"] = "javascript:";
$cells[3]["href"] = "";
$cells[4][0] = __('Total running modules');
$cells[4][1] = format_numeric($server_performance ["total_modules"]);
$cells[4]["color"] = "#000";
$cells[4]["href"] = "javascript:";
$cells[4]["href"] = "";
print_cells_temp ($cells);
}
@ -216,7 +216,7 @@ $cells[1]["href"] = "index.php?sec=estado&sec2=operation/agentes/status_monitor&
$cells[2][0] = __('Agents unknown');
$cells[2][1] = $data["agents_unknown"];
$cells[2]["color"] = "#aaa";
$cells[2]["href"] = "javascript:";
$cells[2]["href"] = "index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&status=3";
print_cells_temp ($cells);