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

- Small Changes in some text (Pandora Server) 

- Small bug solved in the highlight of one option in Operation Menu (Pandora Console)

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@33 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2006-05-29 15:00:39 +00:00
parent 73f5dfe5e6
commit 524a01ccea
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/operation/menu.php
View File

@ -36,7 +36,7 @@ if (isset($_SESSION["id_usuario"])) {
echo "<div id='arrows'><ul class='mn'><li><a href='index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;refr=60' class='mn'>".$lang_label["detailed_monitoragent_state"]."</a></li></ul></div>";
}
else echo "<div id='arrow'><ul class='mn'><li><a href='index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;refr=60' class='mn'>".$lang_label["detailed_monitoragent_state"]."</a></li></ul></div>";
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/exportada") {
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/exportdata") {
echo "<div id='arrows'><ul class='mn'><li><a href='index.php?sec=estado&amp;sec2=operation/agentes/exportdata' class='mn'>".$lang_label["export_data"]."</a></li></ul></div>";
}
else echo "<div id='arrow'><ul class='mn'><li><a href='index.php?sec=estado&amp;sec2=operation/agentes/exportdata' class='mn'>".$lang_label["export_data"]."</a></li></ul></div>";

2
pandora_server/bin/pandora_config.pm
View File

@ -211,7 +211,7 @@ sub pandora_loadconfig {
print " [*] MD5 Security enabled.\n";
}
if ($pa_config->{"pandora_master"} == 1) {
print " [*] This server is in MASTER mode.\n";
print " [*] This server is running in MASTER mode.\n";
}
if ($pa_config->{"daemon"} == 1) {
print " [*] This server is running in DAEMON mode.\n";

38
pandora_server/bin/pandora_db.pm
View File

@ -3,7 +3,7 @@ package pandora_db;
use warnings;
use Time::Local;
use DBI;
use Date::Manip; # Needed to manipulate DateTime formats of input, output and compare
use Date::Manip; # Needed to manipulate DateTime formats of input, output and compare
use XML::Simple;
use POSIX qw(strtod);
@ -58,30 +58,30 @@ our @EXPORT = qw( crea_agente_modulo
sub pandora_calcula_alerta (%$$$$$$) {
my $pa_config = $_[0];
my $timestamp = $_[1];
my $nombre_agente = $_[2];
my $tipo_modulo = $_[3];
my $nombre_modulo = $_[4];
my $datos = $_[5];
my $dbh = $_[6];
my $timestamp = $_[1];
my $nombre_agente = $_[2];
my $tipo_modulo = $_[3];
my $nombre_modulo = $_[4];
my $datos = $_[5];
my $dbh = $_[6];
my $id_modulo;
my $id_modulo;
my $id_agente;
my $id_agente_modulo;
my $id_agente_modulo;
my $max;
my $min; # for calculate max & min to generate ALERTS
# Obtemos los ID's a traves del paquete de datos
$id_agente = dame_agente_id($pa_config, $nombre_agente, $dbh);
$id_modulo = dame_modulo_id($pa_config, $tipo_modulo,$dbh);
$id_agente_modulo = dame_agente_modulo_id($pa_config, $id_agente,$id_modulo,$nombre_modulo,$dbh);
logger($pa_config, "DEBUG: calcula_alerta() Calculado id_agente_modulo a $id_agente_modulo",3);
# Obtemos los ID's a traves del paquete de datos
$id_agente = dame_agente_id($pa_config, $nombre_agente, $dbh);
$id_modulo = dame_modulo_id($pa_config, $tipo_modulo,$dbh);
$id_agente_modulo = dame_agente_modulo_id($pa_config, $id_agente,$id_modulo,$nombre_modulo,$dbh);
logger($pa_config, "DEBUG: calcula_alerta() Calculado id_agente_modulo a $id_agente_modulo",3);
# Buscamos si existe una alerta definida para esta combinacion agente/modulo
my $query_idag = "select * from talerta_agente_modulo where id_agente_modulo = '$id_agente_modulo'";
my $s_idag = $dbh->prepare($query_idag);
$s_idag ->execute;
my @data;
# Buscamos si existe una alerta definida para esta combinacion agente/modulo
my $query_idag = "select * from talerta_agente_modulo where id_agente_modulo = '$id_agente_modulo'";
my $s_idag = $dbh->prepare($query_idag);
$s_idag ->execute;
my @data;
# If exists a defined alert for this module then continue
if ($s_idag->rows != 0) {
while (@data = $s_idag->fetchrow_array()) {