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

2006-07-13 Sancho Lerena <sancho.lerena@artica.es> 

* estado_grupo.php. Fix bug viewing groups, agent intervar was not read and 
	misused, resulting in a bad result of module down total sum.

        * Some headers changed to show the "official" GPL Header info

	* godmode/setup/setup.php: Fixed small bug showing filelist.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@134 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2006-07-14 10:08:08 +00:00
parent 05df7536d4
commit ab43a55634
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/CHANGELOG
View File

@ -1,3 +1,12 @@
2006-07-13 Sancho Lerena <sancho.lerena@artica.es>
* estado_grupo.php. Fix bug viewing groups, agent intervar was not read and
misused, resulting in a bad result of module down total sum.
* Some headers changed to show the "official" GPL Header info
* godmode/setup/setup.php: Fixed small bug showing filelist.
2006-07-12 Raul Mateos <raulofpandora@gmail.com> 2006-07-12 Raul Mateos <raulofpandora@gmail.com>
* datos_agente.php. Add new text about authors. Add a line between table and button. Add different colors between rows (cosmetic changes). Add Help. * datos_agente.php. Add new text about authors. Add a line between table and button. Add different colors between rows (cosmetic changes). Add Help.

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

@ -109,7 +109,7 @@ if (comprueba_login() == 0)
$ficheros = list_files('images/backgrounds/', "background",1, 0); $ficheros = list_files('images/backgrounds/', "background",1, 0);
$a=0; $a=0;
while ($ficheros[$a]){ while (isset($ficheros[$a])){
echo "<option>".$ficheros[$a]; echo "<option>".$ficheros[$a];
$a++; $a++;
} }

2
pandora_console/include/config.php
View File

@ -31,7 +31,7 @@ $dbpassword="pandora"; // Password
$dbhost="localhost"; // MySQL Host $dbhost="localhost"; // MySQL Host
$dbtype="mysql"; // Type of Database, now only "mysql" its supported $dbtype="mysql"; // Type of Database, now only "mysql" its supported
$attachment_store="/var/www/pandora_console"; //This is directory where placed "attachment" directory, to upload files stores. This MUST be writtable by wwwserver user, and should be in pandora root. Please append "/" to the end :-) $attachment_store="/var/www/pandora_console"; //This is directory where placed "attachment" directory, to upload files stores. This MUST be writtable by wwwserver user, and should be in pandora root. Please append "/" to the end :-)
$config_fontpath = "FreeSans.ttf"; $config_fontpath = "../reporting/FreeSans.ttf";
// Read rest of config from DB // Read rest of config from DB

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

@ -1,7 +1,7 @@
<?php <?php
// Pandora - the Free monitoring system // Pandora - the Free Distributed Monitoring System
// ==================================== // ================================================
// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com // Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com
// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es // Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es
// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com // Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com
@ -66,7 +66,8 @@ if (comprueba_login() == 0)
if ($result1=mysql_query($sql1)){ if ($result1=mysql_query($sql1)){
while ($row1 = mysql_fetch_array($result1)){ while ($row1 = mysql_fetch_array($result1)){
$existen_agentes =1; $existen_agentes =1;
$id_agente=$row1["id_agente"]; $intervalo = $row1["intervalo"];
$id_agente=$row1["id_agente"]; // Bugsolved 0607113 <slerena@gmail.com>
// Check for recent alerts // Check for recent alerts
if (check_alert_fired($id_agente) == 1){ if (check_alert_fired($id_agente) == 1){
$grupo[$array_index]["alerts"]++; $grupo[$array_index]["alerts"]++;
@ -84,10 +85,11 @@ if (comprueba_login() == 0)
$result4=mysql_query($sql4); $result4=mysql_query($sql4);
if ($row4 = mysql_fetch_array($result4)){ if ($row4 = mysql_fetch_array($result4)){
$module_interval = $row4["module_interval"]; $module_interval = $row4["module_interval"];
if ($module_interval !=0) if ($module_interval > 0)
$intervalo_comp = $module_interval; $intervalo_comp = $module_interval;
else else {
$intervalo_comp = $intervalo; $intervalo_comp = $intervalo;
}
} }
$ultimo_contacto_modulo = $row3["timestamp"]; $ultimo_contacto_modulo = $row3["timestamp"];
# Defines if module is down (interval x 2 > time last contact) # Defines if module is down (interval x 2 > time last contact)
@ -173,4 +175,4 @@ else {
audit_db($id_user,$REMOTE_ADDR, "ACL Violation","Trying to access Agent view (Grouped)"); audit_db($id_user,$REMOTE_ADDR, "ACL Violation","Trying to access Agent view (Grouped)");
require ("general/noaccess.php"); require ("general/noaccess.php");
} }
?> ?>