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

Revert "Fixed an SQL error when serving the agent status tooltip" 

This reverts commit 96389ee94e.
This commit is contained in:
Alejandro Gallardo Escobar 2015-03-18 12:26:12 +01:00
parent 96389ee94e
commit d8a2976926
1 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pandora_console/operation/agentes/stat_win.php
View File

@ -27,7 +27,6 @@ require_once ($config['homedir'] . '/include/functions_db.php');
require_once ($config['homedir'] . '/include/functions_reporting.php'); require_once ($config['homedir'] . '/include/functions_reporting.php');
require_once ($config['homedir'] . '/include/functions_graph.php'); require_once ($config['homedir'] . '/include/functions_graph.php');
require_once ($config['homedir'] . '/include/functions_modules.php'); require_once ($config['homedir'] . '/include/functions_modules.php');
require_once ($config['homedir'] . '/include/functions_agents.php');
// Hash login process // Hash login process
if (! isset ($config['id_user']) && get_parameter("loginhash", 0)) { if (! isset ($config['id_user']) && get_parameter("loginhash", 0)) {
@ -48,21 +47,6 @@ if (! isset ($config['id_user']) && get_parameter("loginhash", 0)) {
check_login (); check_login ();
$server_id = (int) get_parameter("server");
if (!empty($server_id) && defined('METACONSOLE')) {
$server = metaconsole_get_connection_by_id($server_id);
if (metaconsole_connect($server) !== NOERR) {
echo "<html>";
echo "<body>";
ui_print_error_message(__('There was a problem connecting with the node'));
echo "</body>";
echo "</html>";
exit;
}
}
$user_language = get_user_language ($config['id_user']); $user_language = get_user_language ($config['id_user']);
if (file_exists ('../../include/languages/'.$user_language.'.mo')) { if (file_exists ('../../include/languages/'.$user_language.'.mo')) {
$l10n = new gettext_reader (new CachedFileReader ('../../include/languages/'.$user_language.'.mo')); $l10n = new gettext_reader (new CachedFileReader ('../../include/languages/'.$user_language.'.mo'));
@ -117,36 +101,22 @@ $label = base64_decode(get_parameter('label', ''));
<?php <?php
// Get input parameters // Get input parameters
$label = get_parameter ("label","");
// Module id if (!isset($_GET["period"]) OR (!isset($_GET["id"]))) {
$id = (int) get_parameter ("id", 0); ui_print_error_message(
// Agent id __('There was a problem locating the source of the graph'));
$agent_id = (int) modules_get_agentmodule_agent($id);
if (empty($id) || empty($agent_id)) {
ui_print_error_message(__('There was a problem locating the source of the graph'));
exit;
}
// ACL
$permission = false;
$agent_group = (int) agents_get_agent_group($agent_id);
if (!empty($agent_group) && check_acl($config['id_user'], $agent_group, "RR")) {
$permission = true;
}
if (!$permission) {
require ($config['homedir'] . "/general/noaccess.php");
exit; exit;
} }
$period = get_parameter ( "period", SECONDS_1HOUR);
$draw_alerts = get_parameter("draw_alerts", 0); $draw_alerts = get_parameter("draw_alerts", 0);
$avg_only = get_parameter ("avg_only", 0); $avg_only = get_parameter ("avg_only", 0);
$show_other = (bool)get_parameter('show_other', false); $show_other = (bool)get_parameter('show_other', false);
if ($show_other) { if ($show_other) {
$avg_only = 0; $avg_only = 0;
} }
$period = get_parameter ("period", SECONDS_1DAY); $period = get_parameter ("period", 86400);
$id = get_parameter ("id", 0);
$width = get_parameter ("width", 555); $width = get_parameter ("width", 555);
$height = get_parameter ("height", 245); $height = get_parameter ("height", 245);
$label = get_parameter ("label", ""); $label = get_parameter ("label", "");