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

2008-09-01 Sancho Lerena <slerena@artica.es> 

* pandora_logo.png: White background for IE6 users.

	* index.php: Updated version and develop bypass.

	* header.php, pandora.css: Better view in IE6.

	* estado_ultimopaquete.php: Fixes bad render for big numbers.

	* snmp_view.php: Fixes problems with IE6 render. Better view
	of custom OID (shortened and as tooltip).

	* stat_win.php: Fixed problem with slicer in IE6.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1053 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2008-09-01 08:51:04 +00:00
parent ba52bcabbb
commit 77845891e2
8 changed files with 61 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_console/ChangeLog
View File

@ -1,3 +1,18 @@
2008-09-01 Sancho Lerena <slerena@artica.es>
* pandora_logo.png: White background for IE6 users.
* index.php: Updated version and develop bypass.
* header.php, pandora.css: Better view in IE6.
* estado_ultimopaquete.php: Fixes bad render for big numbers.
* snmp_view.php: Fixes problems with IE6 render. Better view
of custom OID (shortened and as tooltip).
* stat_win.php: Fixed problem with slicer in IE6.
2008-09-01 Raul Mateos <raulofpandora@gmail.com>
* operation/snmp/smp_console/snmp_view.php: Show substring in custom value, when the mouse is

2
pandora_console/general/header.php
View File

@ -23,7 +23,7 @@ if(!isset ($_SESSION["id_usuario"])) {
echo "</div>";
return;
}
$table->width=520;
$table->width=480;
$table->border=0;
$table->cellpadding=3;
$table->size=array("30%");

BIN
pandora_console/images/pandora_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

18
pandora_console/include/styles/pandora.css
View File

@ -1,15 +1,12 @@
/*
// Pandora FMS - the Free monitoring system
// ========================================
// Copyright (c) 2004-2007 Sancho Lerena, slerena@gmail.com
// Pandora FMS - the Flexible monitoring system
// =============================================
// Copyright (c) 2004-2008 Sancho Lerena, slerena@gmail.com
// Main PHP/SQL code development and project architecture and management
// Copyright (c) 2004-2007 Raul Mateos Martin, raulofpandora@gmail.com
// Copyright (c) 2004-2008 Raul Mateos Martin, raulofpandora@gmail.com
// CSS and some PHP additions
// Copyright (c) 2006-2007 Jonathan Barajas, jonathan.barajas[AT]gmail[DOT]com
// Javascript Active Console code.
// Copyright (c) 2006 Jose Navarro <contacto@indiseg.net>
// Additions to Pandora FMS 1.2 graph code and new XML reporting template management
// Copyright (c) 2005-2007 Artica Soluciones Tecnologicas, info@artica.es
// Copyright (c) 2005-2008 Artica Soluciones Tecnologicas, info@artica.es
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@ -628,8 +625,9 @@ span.rmess, span.nrmess {
#head_m {
position: absolute;
padding-top: 6px;
padding-left: 200px;
padding-left: 12em;
}
span#logo_text1 {
font: bolder 3em Arial, Sans-serif;
letter-spacing: -2px;

6
pandora_console/index.php
View File

@ -20,13 +20,13 @@
// Silk icon set 1.3 (cc) Mark James, http://www.famfamfam.com/lab/icons/silk/
// Pandora FMS uses Pear Image::Graph code
$build_version="PC080822";
$pandora_version="v2.0Beta1";
$build_version="PC080901";
$pandora_version="v2.0Beta1 ";
global $build_version;
global $pandora_version;
// Set to 1 to do not check for installer or config file (for development!).
$develop_bypass = 1;
$develop_bypass = 0;
if ($develop_bypass != 1){
// If no config file, automatically try to install

7
pandora_console/operation/agentes/estado_ultimopaquete.php
View File

@ -157,12 +157,7 @@ if (mysql_num_rows ($result3)) {
// Kind of data
if (is_numeric($row3["datos"])) {
$mytempdata = fmod($row3["datos"], 1);
if ($mytempdata == 0)
$myvalue = intval($row3["datos"]);
else
$myvalue = $row3["datos"];
echo format_for_graph($myvalue );
echo format_for_graph($row3["datos"] );
} else
echo substr(salida_limpia($row3["datos"]),0,42);

68
pandora_console/operation/snmpconsole/snmp_view.php
View File

@ -136,7 +136,7 @@ $sql2="SELECT * FROM ttrap ORDER BY timestamp DESC";
$result2=mysql_query($sql2);
if (mysql_num_rows($result2)){
echo "<table><tr>";
echo "<table border=0 width=600><tr>";
echo "<td class='f9' style='padding-left: 30px;'>";
echo "<img src='images/pixel_green.png' width=20 height=20> - ".__('Validated event');
echo "<br>";
@ -161,30 +161,7 @@ if (mysql_num_rows($result2)){
$total_traps = count($trap_list);
pagination($total_traps, "index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view", $offset);
/*
if ($total_eventos > $config["block_size"]){
// If existes more registers tha$row["id_usuario"]n i can put in a page, calculate index markers
$index_counter = ceil($total_eventos/$config["block_size"]);
for ($i = 1; $i <= $index_counter; $i++) {
$inicio_bloque = ($i * $config["block_size"] - $config["block_size"]);
$final_bloque = $i * $config["block_size"];
if ($total_eventos < $final_bloque)
$final_bloque = $total_eventos;
echo '<a href="index.php?sec=eventos&sec2=eventos/eventos&offset='.$inicio_bloque.'">';
$inicio_bloque_fake = $inicio_bloque + 1;
if ($inicio_bloque == $offset)
echo '<b>[ '.$inicio_bloque_fake.' - '.$final_bloque.' ]</b>';
else
echo '[ '.$inicio_bloque_fake.' - '.$final_bloque.' ]';
echo '</a> ';
}
echo "<br><br>";
// if exists more registers than i can put in a page (defined by $config["block_size"] config parameter)
// get offset for index calculation
}
echo "</div>";
*/
if (isset($_GET["offset"])){
$offset=entrada_limpia($_GET["offset"]);
@ -192,7 +169,7 @@ if (isset($_GET["offset"])){
$offset=0;
}
echo "<br>";
echo "<table cellpadding='4' cellspacing='4' width='750' class='databox'>";
echo "<table cellpadding='4' cellspacing='4' width='735' class='databox'>";
echo "<tr>";
echo "<th>".__('Status')."</th>";
echo "<th>".__('OID')."</th>";
@ -207,7 +184,9 @@ echo "<label for='checkbox' class='p21'>".__('All')." </label>";
echo '<input type="checkbox" class="chk" name="allbox" onclick="CheckAll();">
</th>';
echo "<form name='eventtable' method='POST' action='index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&refr=60&offset=".$offset."'>";
$id_trap = 0;
$color = 0;
if ($offset !=0)
$offset_limit = $offset +1;
else
@ -219,45 +198,62 @@ for ($a=$offset_limit;$a < ($config["block_size"] + $offset + 1);$a++){
$sql="SELECT * FROM ttrap WHERE id_trap = $id_trap";
if ($result=mysql_query($sql)){
$row=mysql_fetch_array($result);
if ($color == 1){
$tdcolor = "datos";
$color = 0;
}
else {
$tdcolor = "datos2";
$color = 1;
}
$offset_counter++;
echo "<tr>";
echo "<td class='datos' align='center'>";
echo "<td class='$tdcolor' align='center'>";
if ($row["status"] == 0){
echo "<img src='images/pixel_red.png' width=20 height=20>";
}
else {
echo "<img src='images/pixel_green.png' width=20 height=20>";
}
echo "<td class='datos'>".$row["oid"];
echo "</td>";
echo "<td class='$tdcolor'>".$row["oid"];
$sql="SELECT * FROM tagente WHERE direccion = '".$row["source"]."'";
$result2=mysql_query($sql); // If there's any agent with this IP we show name and link to agent
if ($row2=mysql_fetch_array($result2)){
echo "<td class='datos'>
echo "<td class='$tdcolor'>
<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$row2["id_agente"]."'>
<b>".dame_nombre_agente($row2["id_agente"])."</b></a></td>";
}
else {
echo "<td class='datos'>".$row["source"]."</td>";
echo "<td class='$tdcolor'>".$row["source"]."</td>";
}
echo "<td class='datos' title='".$row["value_custom"]."''>".substr($row["value_custom"],0,20)."</td>";
echo "<td class='datos'>";
$custom = substr($row["value_custom"],0,15);
if (strlen ($row["value_custom"]) > 15)
$custom .= "...";
echo "<td title='".$row["value_custom"]."' class='$tdcolor'>".$custom."</td>";
echo "<td class='$tdcolor'>";
if ($row["status"] <> 0)
echo "<a href='index.php?sec=usuario&sec2=operation/users/user_edit&ver=".$row["id_usuario"]."'><a href='#' class='tip'>&nbsp;<span>".dame_nombre_real($row["id_usuario"])."</span></a>".substr($row["id_usuario"],0,8)."</a>";
echo "</td>";
echo "<td class='datos'>".$row["timestamp"]."</td>";
echo "<td class='datos' align='center'>";
echo "<td class='$tdcolor'>".$row["timestamp"]."</td>";
echo "<td class='$tdcolor' align='center'>";
if ($row["alerted"] != 0 )
echo "<img src='images/dot_yellow.png' border=0>";
echo "</td>";
echo "<td class='datos' align='center'>";
echo "<td class='$tdcolor' align='center'>";
if ($row["status"] == 0 && give_acl ($config['id_user'],"0","IW"))
echo "<a href='index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&check=".$row["id_trap"]."'><img src='images/ok.png' border='0'></a>";
if (give_acl ($config['id_user'], "0", "IM"))
echo "<a href='index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&delete=".$row["id_trap"]."&refr=60&offset=".$offset."'><img src='images/cross.png' border=0></a>";
echo "</td>";
echo "<td class='datos' align='center'>";
echo "<td class='$tdcolor' align='center'>";
echo "<input type='checkbox' class='chk' name='snmptrapid".$offset_counter."' value='".$row["id_trap"]."'>";
echo "</td></tr>";
}

2
pandora_console/reporting/stat_win.php
View File

@ -128,7 +128,7 @@ if ($start_date != $current){
var defOffset = 2;
var defSlideTime = 220;
var tnActive = 0;
var visibleMargin = 5;
var visibleMargin = 15;
var menuW = 325;
var menuH = 310;
window.onload = function() {