2007-05-20 Sancho Lerena <slerena@artica.es>

* pandoradb_data.sql: Uptated network component data.

        * include/styles/pandora.css: Few updates for style.

        * include/functions_db.php: Added functions for visual console
        features.

        * include/languages/language_en.php: New strings.

        * include/javascript: Moved all javascript files here.

        * include/javascript/x_slide.js, include/javascript/x_event.js:
          Copied from branch / console from Azabel.

        * include/javascript/wz_jsgraphics.js: New functions to draw
        lines.

        * pandoradb.sql: Created new tlayout and tlayout_data tables.

        * index.php: Small changes. Added support to refresh any page via
        POST.

        * operation/visual_console: Added Visual Console feature.

        * operation/agentes/estado_alertas.php: Updated styles and fixes
        damm bug when no alert available.

        * operation/agentes/status_monitor.php: Updated styles.

        * operation/agentes/estado_generalagente.php: Update styles.

        * operation/agentes/estado_agente.php: Updated style.

        * operation/servers/view_server.php: Updated style.

        * operation/reporting/graph_builder.php: Fixed some minor
        bugs. Needs to fix more bugs :(

        * operation/menu.php: Updated menu. Visual Console has dynamic items!.

        * images/pandora_logo_head.png: New header logo !

        * images/pandora_logo.png: New Pandora FMS 1.3 logo ! :-))

        * images/console/background: More samples added.

        * images/console/icons: Icons to be used in visual console.

        * reporting/fgraph.php: New feature added to simple graph to show
        only average values.

        * reporting/stat_win.php: Added support to avg_only and show avg,
        max and min values from each graph. Zoom factor is more usable
        now.

        * general/logoff.php: New style.

        * general/footer.php: Fixed style.

        * general/logon_failed.php: Fixed style.

        * general/login_page.php: New style.

        * general/header.php: Fixed style.

        * godmode/agentes/configurar_agente.php: Fixed styles.

        * godmode/agentes/agent_manager.php: Fixed styles.

	* operation/active_console: Removed from trunk: not ready to be used.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@459 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,12 +1,85 @@
+2007-05-20  Sancho Lerena  <slerena@artica.es>
+
+	* pandoradb_data.sql: Uptated network component data.
+	
+	* include/styles/pandora.css: Few updates for style.
+	
+	* include/functions_db.php: Added functions for visual console
+	features.
+
+	* include/languages/language_en.php: New strings.
+	
+	* include/javascript: Moved all javascript files here.
+	
+	* include/javascript/x_slide.js, include/javascript/x_event.js:
+	  Copied from branch / console from Azabel.
+
+	* include/javascript/wz_jsgraphics.js: New functions to draw
+	lines.
+	
+	* pandoradb.sql: Created new tlayout and tlayout_data tables.
+
+	* index.php: Small changes. Added support to refresh any page via
+	POST.
+	
+	* operation/visual_console: Added Visual Console feature.
+	
+	* operation/agentes/estado_alertas.php: Updated styles and fixes
+	damm bug when no alert available.
+	
+	* operation/agentes/status_monitor.php: Updated styles.
+	
+	* operation/agentes/estado_generalagente.php: Update styles.
+	
+	* operation/agentes/estado_agente.php: Updated style.
+		
+	* operation/servers/view_server.php: Updated style.
+	
+	* operation/reporting/graph_builder.php: Fixed some minor
+	bugs. Needs to fix more bugs :(
+	
+	* operation/menu.php: Updated menu. Visual Console has dynamic items!.
+	
+	* images/pandora_logo_head.png: New header logo !
+	
+	* images/pandora_logo.png: New Pandora FMS 1.3 logo ! :-))
+
+	* images/console/background: More samples added.
+	
+	* images/console/icons: Icons to be used in visual console.
+	
+	* reporting/fgraph.php: New feature added to simple graph to show
+	only average values.
+	
+	* reporting/stat_win.php: Added support to avg_only and show avg,
+	max and min values from each graph. Zoom factor is more usable
+	now.
+	
+	* general/logoff.php: New style.
+	
+	* general/footer.php: Fixed style.
+	
+	* general/logon_failed.php: Fixed style.
+	
+	* general/login_page.php: New style.
+	
+	* general/header.php: Fixed style.
+	
+	* godmode/agentes/configurar_agente.php: Fixed styles.
+	
+	* godmode/agentes/agent_manager.php: Fixed styles.
+
+
 2007-05-18  Sancho Lerena  <slerena@gmail.com>
 
 	* include/styles/pandora.css : Some style changes.
 
-	* include/functions.php: Changed format_numeric and format_for_graph to show a 
-	better number formatting.
+	* include/functions.php: Changed format_numeric and
+	format_for_graph to show a better number formatting.
 
-	* index.php: Some minor changes in layout and bgcolor (not used style because 
-	some pages that don't have the same color uses main style, f.e: stat_win for graphs).
+	* index.php: Some minor changes in layout and bgcolor (not used
+	style because some pages that don't have the same color uses main
+	style, f.e: stat_win for graphs).
 
 	* godmode/agentes/module_manager.php
 	* operation/agentes/estado_ultimopaquete.php
@@ -15,8 +88,8 @@
 	* operation/agentes/datos_agente.php, estado_ul: Updated output render and fixes 
 	some tables, added databox style, removed line.
 
-	* operation/menu.php: Removed active console. This don't go with 1.3 version 
-	finally due many unfixed bugs.
+	* operation/menu.php: Removed active console. This don't go with
+	1.3 version finally due many unfixed bugs.
 
 	* reporting/stat_win.php: White background fixed.
 

pandora_console/general/footer.php

@@ -15,9 +15,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-echo "</center>";
+echo "<center>";
 echo '<a class="white_bold" target="_new" href="general/license/pandora_info_'.$language_code.'.html">
-Pandora FMS '.$pandora_version.' Build '.$build_version.' '.
+Pandora FMS '.$pandora_version.' Build '.$build_version.'<br>'.
 $lang_label["gpl_notice"].'</a><br>';
 	if (isset($_SERVER['REQUEST_TIME'])) {
 		$time = $_SERVER['REQUEST_TIME'];

pandora_console/general/header.php

@@ -23,7 +23,7 @@ echo '
 	<span id="logo_text1">Pandora</span> <span id="logo_text2">FMS</span>
 </div>
 <div id="head_l">
-	<a href="index.php"><img src="images/logo_menu.gif" border="0" alt="logo"></a>
+	<a href="index.php"><img src="images/pandora_logo_head.png" border="0" alt="logo"></a>
 </div>
 
 ';

pandora_console/general/login_page.php

@@ -18,25 +18,29 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 ?>
-
-<div align='center'>
-	<h1 id="log"><?php echo $lang_label['welcome_title']; ?></h1>
-	<div id='login'>
-		<div id="login_box">
-			<form method="post" action="index.php?login=1">
-				<div class="f9b">Login</div>
-				<input class="login" type="text" name="nick" value="">
-				<div class="f9b">Password</div>
-				<input class="login" type="password" name="pass" value="">
-				<div><input type="submit" class="sub next" value="Login"></div>
-			</form>
-		</div>
-		<div id="logo_box">
+<center>
+<div align='center' class='databox' style='margin-top:200px; width: 460px; border-left: solid 1px #000;border-top: solid 1px #000; border-bottom: solid 2px #000; border-right: solid 2px #000;'>
+	<h1 style='font-size: 18px; color: #000; margin-bottom: 0px;'><?php echo $lang_label['welcome_title']; ?></h1>
+	<div  class='databox' style='width: 400px;'>
+		<form method="post" action="index.php?login=1">
+		<table cellpadding=4 cellspacing=1 width=400>
+		<tr><td rowspan=5 align='left'>
 			<a href="index.php">
-			<img src="images/logo_login.gif" border="0" alt="logo"></a><br>
+			<img src="images/pandora_logo.png" border="0" alt="logo"></a><br>
 			<?php echo $pandora_version; ?>
-		</div>
-		<div id="ip"><?php echo 'IP: <b class="f10">'.$REMOTE_ADDR.'</b>'; ?></div>
+		<td class='f9b'>
+				Login <br>
+		
+				<input class="login" type="text" name="nick" value="">
+		<tr><td class='f9b'>
+				Password <br>
+				<input class="login" type="password" name="pass" value="">
+		<tr><td align='center'>
+				<input type="submit" class="sub next" value="Login">	
+		</table>
+		</form>
 	</div>
-	<div id="foot"><?php require("general/footer.php") ?></div>
-</div>
+	<div id="ip"><?php echo 'IP: <b class="f10">'.$REMOTE_ADDR.'</b>'; ?></div>
+
+</div>
+</center>

pandora_console/general/logoff.php

@@ -17,17 +17,27 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ?>
-<div align='center'>
-	<h1 id="log"><?php echo $lang_label["logged_out"] ; ?></h1>
-	<div id='login'>	
-		<div id="login_box">
-			<?PHP echo $lang_label["logout_msg"]; ?>
-		</div>
-		<div id="logo_box">
-			<a href="index.php"><img src="images/logo_menu.gif" border="0" alt="logo"></a><br>
+
+<center>
+<div align='center' class='databox' style='margin-top:200px; width: 460px; border-left: solid 1px #000;border-top: solid 1px #000; border-bottom: solid 2px #000; border-right: solid 2px #000;'>
+	<h1 style='font-size: 18px; color: #000; margin-bottom: 0px;'>
+	<?php echo $lang_label["logged_out"]; ?></h1>
+	<div  class='databox' style='width: 400px;'>
+		<form method="post" action="index.php?login=1">
+		<table cellpadding=4 cellspacing=1 width=400>
+		<tr><td align='left'>
+			<a href="index.php">
+			<img src="images/pandora_logo.png" border="0" alt="logo"></a><br>
 			<?php echo $pandora_version; ?>
-		</div>
-		<div id="ip"><?php echo 'IP: <b class="f10">'.$REMOTE_ADDR.'</b>'; ?></div>
+		<td valign='bottom'>
+			<?PHP echo $lang_label["logout_msg"]; ?>
+		</table>
+		</form>
 	</div>
-	<div id="foot"><?php require("general/footer.php") ?></div>
+	<div id="ip"><?php echo 'IP: <b class="f10">'.$REMOTE_ADDR.'</b>'; ?></div>
 </div>
+</center>
+
+
+
+

pandora_console/general/logon_failed.php

@@ -18,14 +18,22 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ?>
 
-<div align='center'>
-<div id='login_f'>
-	<h1 id="log_f" class="error"><?php echo $lang_label['err_auth']; ?></h1>
-	<div id='noa'><img src='images/noaccess.gif'></div>
-	<div>
-		<a href="index.php"><img src="images/logo_login.gif" border="0"></a><br>
+<center>
+<div align='center' class='databox' style='margin-top:200px; width: 460px; border-left: solid 1px #000;border-top: solid 1px #000; border-bottom: solid 2px #000; border-right: solid 2px #000;'>
+<div id='login_f' class='databox' style='width:400px; margin-top: 10px;'>
+	<h1 id="log_f" style='margin-top: 0px;' class="error"><?php echo $lang_label['err_auth']; ?></h1>
+	<div id='noa' style='width:50px' >
+		<img src='images/noaccess.gif'>
+	</div>
+
+	<div style='width: 350px'>
+		<a href="index.php"><img src="images/pandora_logo.png" border="0"></a><br>
 		<?php echo $pandora_version; ?>
 	</div>
+
 	<div class="msg"><?php echo $lang_label["err_auth_msg"]; ?></div>
 </div>
-</div>
+<br>
+</div>
+</center>
+

pandora_console/godmode/agentes/agent_manager.php

@@ -58,8 +58,8 @@ if ($create_agent == 1) {
 	echo "<input type='hidden' name='update_agent' value='1'>";
 	echo "<input type='hidden' name='id_agente' value='".$id_agente."'>";
 }
-echo '<table width="650" cellpadding="3" cellspacing="3" class="fon">';
-echo "<tr><td class='lb' rowspan='9' width='1'>";
+echo '<table width="650" cellpadding="4" cellspacing="4" class="databox_color">';
+echo "<tr>";
 echo '<td class="datos"><b>'.$lang_label["agent_name"].'</b></td>
 <td class="datos">
 <input type="text" name="agente" size=30 value="'.$nombre_agente.'">';
@@ -170,10 +170,8 @@ while ($row=mysql_fetch_array($result)){
 		echo $lang_label["active"].'
 		<input type="radio" name="disabled" class="chk" value="0" checked>';
 	}
-?>
-<tr><td colspan='3'><div class='raya'></div></td></tr>
-<tr><td colspan="3" align="right">
-<?php 
+
+echo '</table><table width="650"><tr><td  align="right">';
 if ($create_agent == 1){
 	echo "
 	<input name='crtbutton' type='submit' class='sub wand' value='".
@@ -183,7 +181,6 @@ if ($create_agent == 1){
 	<input name='uptbutton' type='submit' class='sub upd' value='".
 	$lang_label["update"]."'>";
 }
+echo "</td></form></table>";
+
 ?>
-</td>
-</form>
-</table>

pandora_console/godmode/agentes/configurar_agente.php

@@ -617,10 +617,21 @@ if (((!isset($_POST["nc"]) OR ($_POST["nc"]==-1)) ) 	&&
 		echo "<h3 class='suc'>".$lang_label["add_module_ok"]."</h3>";
 	}
 	// Init vars to null to avoid trash in forms 
-	$id_tipo_modulo = "";$nombre =  "";$descripcion = "";$modulo_max = "";
-	$modulo_min = "";// Pandora 1.2 new module data:
-	$tcp_send = "";$tcp_rcv = "";$tcp_port = "";$ip_target = "";
-	$snmp_oid = "";$snmp_community = "";$id_module_group = "";
+	$id_tipo_modulo = "";
+	$nombre =  "";
+	$modulo_nombre = "";
+	$descripcion = ""; 
+	$modulo_descripcion= ""; 
+	$modulo_max = "";
+	$modulo_min = "";
+	// Pandora 1.2 new module data:
+	$tcp_send = "";
+	$tcp_rcv = "";
+	$tcp_port = "";
+	$ip_target = "";
+	$snmp_oid = "";
+	$snmp_community = "";
+	$id_module_group = "";
 	$module_interval = "";
 }
 

pandora_console/include/functions_db.php

@@ -1083,4 +1083,112 @@ function give_db_value ($field, $table, $field_search, $condition_value){
 	return $pro;
 }
 
+
+// ---------------------------------------------------------------
+// Return current status from a given agent module (1 alive, 0 down)
+// ---------------------------------------------------------------
+
+function return_status_agent_module ($id_agentmodule = 0){
+	require("config.php");
+	$query1="SELECT estado FROM tagente_estado WHERE id_agente_modulo = ".$id_agentmodule; 
+	$resq1=mysql_query($query1);
+	if ($resq1 != 0) {
+		$rowdup=mysql_fetch_array($resq1);
+		if ($rowdup[0] == 0)
+			return 1;
+		else 
+			return 0;
+		
+	} else 
+		return 0; 
+}
+
+// ---------------------------------------------------------------
+// Return current value from a given agent module 
+// ---------------------------------------------------------------
+
+function return_value_agent_module ($id_agentmodule = 0){
+	require("config.php");
+	$query1="SELECT datos FROM tagente_estado WHERE id_agente_modulo = ".$id_agentmodule; 
+	$resq1=mysql_query($query1);
+	if ($resq1 != 0) {
+		$rowdup=mysql_fetch_array($resq1);
+			return format_numeric($rowdup[0]);
+		
+	} else 
+		return 0; 
+}
+
+// ---------------------------------------------------------------
+// Return coordinate X from a layout item
+// ---------------------------------------------------------------
+
+function return_coordinate_X_layoutdata ($id_layoutdata){
+	require("config.php");
+	$query1="SELECT pos_x FROM tlayout_data WHERE id = ".$id_layoutdata; 
+	$resq1=mysql_query($query1);
+	if ($resq1 != 0) {
+		$rowdup=mysql_fetch_array($resq1);
+			return ($rowdup[0]);
+	} else 
+		return (0);
+}
+
+// ---------------------------------------------------------------
+// Return coordinate X from a layout item
+// ---------------------------------------------------------------
+
+function return_coordinate_y_layoutdata ($id_layoutdata){
+	require("config.php");
+	$query1="SELECT pos_y FROM tlayout_data WHERE id = ".$id_layoutdata; 
+	$resq1=mysql_query($query1);
+	if ($resq1 != 0) {
+		$rowdup=mysql_fetch_array($resq1);
+			return ($rowdup[0]);
+	} else 
+		return (0);
+}
+
+function return_moduledata_avg_value ($id_agent_module, $period){
+	require("config.php");
+	$datelimit = time() - $period; // limit date
+	$id_agent = give_db_value ("id_agente", "tagente_modulo", "id_agente_modulo", $id_agent_module);
+	$query1="SELECT AVG(datos) FROM tagente_datos WHERE id_agente = $id_agent AND id_agente_modulo = $id_agent_module AND utimestamp > $datelimit";
+	$resq1=mysql_query($query1);
+	if ($resq1 != 0) {
+		$rowdup=mysql_fetch_array($resq1);
+			return ($rowdup[0]);
+	} else 
+		return (0);
+}
+
+
+function return_moduledata_max_value ($id_agent_module, $period){
+	require("config.php");
+	$datelimit = time() - $period; // limit date
+	$id_agent = give_db_value ("id_agente", "tagente_modulo", "id_agente_modulo", $id_agent_module);
+	$query1="SELECT MAX(datos) FROM tagente_datos WHERE id_agente = $id_agent AND id_agente_modulo = $id_agent_module AND utimestamp > $datelimit";
+	$resq1=mysql_query($query1);
+	if ($resq1 != 0) {
+		$rowdup=mysql_fetch_array($resq1);
+			return ($rowdup[0]);
+	} else 
+		return (0);
+}
+
+
+function return_moduledata_min_value ($id_agent_module, $period){
+	require("config.php");
+	$datelimit = time() - $period; // limit date
+	$id_agent = give_db_value ("id_agente", "tagente_modulo", "id_agente_modulo", $id_agent_module);
+	$query1="SELECT MIN(datos) FROM tagente_datos WHERE id_agente = $id_agent AND id_agente_modulo = $id_agent_module AND utimestamp > $datelimit";
+	$resq1=mysql_query($query1);
+	if ($resq1 != 0) {
+		$rowdup=mysql_fetch_array($resq1);
+			return ($rowdup[0]);
+	} else 
+		return (0);
+}
+
+
 ?>

pandora_console/include/javascript/x_event.js

@@ -0,0 +1,2 @@
+/* x_event.js compiled from X 4.0 with XC 0.27b. Distributed by GNU LGPL. For copyrights, license, documentation and more visit Cross-Browser.com */
+function xAddEventListener(e,eT,eL,cap){if(!(e=xGetElementById(e))) return;eT=eT.toLowerCase();if((!xIE4Up && !xOp7Up) && e==window) {if(eT=='resize') { window.xPCW=xClientWidth(); window.xPCH=xClientHeight(); window.xREL=eL; xResizeEvent(); return; }if(eT=='scroll') { window.xPSL=xScrollLeft(); window.xPST=xScrollTop(); window.xSEL=eL; xScrollEvent(); return; }}var eh='e.on'+eT+'=eL';if(e.addEventListener) e.addEventListener(eT,eL,cap);else if(e.attachEvent) e.attachEvent('on'+eT,eL);else eval(eh);}function xResizeEvent(){if (window.xREL) setTimeout('xResizeEvent()', 250);var cw = xClientWidth(), ch = xClientHeight();if (window.xPCW != cw || window.xPCH != ch) { window.xPCW = cw; window.xPCH = ch; if (window.xREL) window.xREL(); }}function xScrollEvent(){if (window.xSEL) setTimeout('xScrollEvent()', 250);var sl = xScrollLeft(), st = xScrollTop();if (window.xPSL != sl || window.xPST != st) { window.xPSL = sl; window.xPST = st; if (window.xSEL) window.xSEL(); }}function xEvent(evt) {var e = evt || window.event;if(!e) return;if(e.type) this.type = e.type;if(e.target) this.target = e.target;else if(e.srcElement) this.target = e.srcElement;if (e.relatedTarget) this.relatedTarget = e.relatedTarget;else if (e.type == 'mouseover' && e.fromElement) this.relatedTarget = e.fromElement;else if (e.type == 'mouseout') this.relatedTarget = e.toElement;if(xOp6Dn) { this.pageX = e.clientX; this.pageY = e.clientY; }else if(xDef(e.pageX,e.pageY)) { this.pageX = e.pageX; this.pageY = e.pageY; }else if(xDef(e.clientX,e.clientY)) { this.pageX = e.clientX + xScrollLeft(); this.pageY = e.clientY + xScrollTop(); }if (xDef(e.offsetX,e.offsetY)) {this.offsetX = e.offsetX;this.offsetY = e.offsetY;}else if (xDef(e.layerX,e.layerY)) {this.offsetX = e.layerX;this.offsetY = e.layerY;}else {this.offsetX = this.pageX - xPageX(this.target);this.offsetY = this.pageY - xPageY(this.target);}if (e.keyCode) { this.keyCode = e.keyCode; } else if (xDef(e.which) && e.type.indexOf('key')!=-1) { this.keyCode = e.which; }this.shiftKey = e.shiftKey;this.ctrlKey = e.ctrlKey;this.altKey = e.altKey;}function xPreventDefault(e){if (e && e.preventDefault) e.preventDefault();else if (window.event) window.event.returnValue = false;}function xRemoveEventListener(e,eT,eL,cap){if(!(e=xGetElementById(e))) return;eT=eT.toLowerCase();if((!xIE4Up && !xOp7Up) && e==window) {if(eT=='resize') { window.xREL=null; return; }if(eT=='scroll') { window.xSEL=null; return; }}var eh='e.on'+eT+'=null';if(e.removeEventListener) e.removeEventListener(eT,eL,cap);else if(e.detachEvent) e.detachEvent('on'+eT,eL);else eval(eh);}function xStopPropagation(evt){if (evt && evt.stopPropagation) evt.stopPropagation();else if (window.event) window.event.cancelBubble = true;}

pandora_console/include/javascript/x_slide.js

@@ -0,0 +1,2 @@
+/* x_slide.js compiled from X 4.0 with XC 0.27b. Distributed by GNU LGPL. For copyrights, license, documentation and more visit Cross-Browser.com */
+function xSlideTo(e, x, y, uTime){if (!(e=xGetElementById(e))) return;if (!e.timeout) e.timeout = 25;e.xTarget = x; e.yTarget = y; e.slideTime = uTime; e.stop = false;e.yA = e.yTarget - xTop(e); e.xA = e.xTarget - xLeft(e); if (e.slideLinear) e.B = 1/e.slideTime;else e.B = Math.PI / (2 * e.slideTime); e.yD = xTop(e); e.xD = xLeft(e); var d = new Date(); e.C = d.getTime();if (!e.moving) _xSlideTo(e);}function _xSlideTo(e){if (!(e=xGetElementById(e))) return;var now, s, t, newY, newX;now = new Date();t = now.getTime() - e.C;if (e.stop) { e.moving = false; }else if (t < e.slideTime) {setTimeout("_xSlideTo('"+e.id+"')", e.timeout);if (e.slideLinear) s = e.B * t;else s = Math.sin(e.B * t);newX = Math.round(e.xA * s + e.xD);newY = Math.round(e.yA * s + e.yD);xMoveTo(e, newX, newY);e.moving = true;}  else {xMoveTo(e, e.xTarget, e.yTarget);e.moving = false;}  }

pandora_console/include/languages/language_en.php

@@ -5,10 +5,8 @@
 // Main PHP/SQL code development and project architecture and management
 // Copyright (c) 2004-2007 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
+// Additions to Pandora FMS 1.2 graph code
 // Copyright (c) 2005-2007 Artica Soluciones Tecnologicas, info@artica.es
 //
 // This program is free software; you can redistribute it and/or
@@ -21,6 +19,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 $lang_label["view_agents"]="View Agents";
 $lang_label["manage_incidents"]="Manage Incidents";
 $lang_label["view_users"]= "View Users";
@@ -660,7 +659,6 @@ $lang_label["no_monitors_g"]="This group doesn't have any monitor";
 
 $lang_label["reporting"]="Reporting";
 $lang_label["agent_general_reporting"]="Agent overview";
-$lang_label["active_console"]="Active console";
 $lang_label["validate_event_failed"]="Event validation failed";
 $lang_label["load"]="Load";
 $lang_label["information"]="General information";
@@ -783,6 +781,16 @@ $lang_label["friday"]="Friday";
 $lang_label["saturday"]="Saturday";
 $lang_label["hr"]="Hr";
 $lang_label["get_file"]="Download file";
+
+// 19 May
+$lang_label["visual_console"]="Visual console";
+$lang_label["elements"]="Elements";
+$lang_label["minutes"]="minutes";
+
+$lang_label["avg_only"]="Avg.Only";
+$lang_label["avg_value"]="Avg. Value";
+$lang_label["auto_refresh_time"]="Autorefresh time";
+$lang_label["refresh"]="Refresh";
 global $lang_label; 
 global $help_label;
 ?>

pandora_console/include/styles/pandora.css

@@ -313,7 +313,7 @@ td.datos_jus, td.datos2_jus {
 	text-align: center;
 }
 .f9, .f9i, .f9b, td.f9, td.f9i, td.datosf9, td.datos2f9 {
-	font-size: 9px;
+	font-size: 8px;
 }
 .f9i, .redi {
 	font-style: italic;
@@ -548,6 +548,7 @@ span.master, span.snmp, span.binary, span.recon {
 }
 .databox_color {
 	border-left: 4px solid #778855;
+
 }
 #head_l {
 	float: left;

pandora_console/index.php

@@ -70,15 +70,20 @@ require "include/functions_db.php";
 <head>
 <?php
 // Refresh page
-if (isset ($_GET["refr"])){
-	$intervalo = entrada_limpia ($_GET["refr"]);
-	// Agent selection filters and refresh
- 	if (isset ($_POST["ag_group"])) {
-		$ag_group = $_POST["ag_group"];
-		$query = 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'] . '&ag_group_refresh=' . $ag_group;
-		echo '<meta http-equiv="refresh" content="' . $intervalo . '; URL=' . $query . '">';
-	} else 
-		echo '<meta http-equiv="refresh" content="' . $intervalo . '">';	
+if ( (isset ($_GET["refr"])) || (isset($_POST["refr"])) ){
+	if (isset ($_GET["refr"]))
+		$intervalo = entrada_limpia ($_GET["refr"]);
+	if (isset ($_POST["refr"]))
+		$intervalo = entrada_limpia ($_POST["refr"]);
+	if ($intervalo > 0){
+		// Agent selection filters and refresh
+		$query = 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'] . '&refr=' . $intervalo;
+		if (isset ($_POST["ag_group"])) {
+			$ag_group = $_POST["ag_group"];
+			$query = 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'] . '&ag_group_refresh=' . $ag_group;
+		} else 
+			echo '<meta http-equiv="refresh" content="' . $intervalo . '; URL=' . $query . '">';
+	}
 }
 ?>
 <title>Pandora FMS - <?php echo $lang_label["header_title"]; ?></title>
@@ -92,7 +97,8 @@ if (isset ($_GET["refr"])){
 <meta name="robots" content="index, follow">
 <link rel="icon" href="images/pandora.ico" type="image/ico">
 <link rel="stylesheet" href="include/styles/pandora.css" type="text/css">
-<script type='text/JavaScript' src='include/calendar.js'></script>
+<script type='text/JavaScript' src='include/javascript/calendar.js'></script>
+<script type="text/javascript" src="include/javascript/wz_jsgraphics.js"></script>
 </head>
 
 <?php
@@ -136,9 +142,6 @@ if (isset ($_GET["refr"])){
 				$pass = $primera . "****" . $ultima;
 				audit_db ($nick, $REMOTE_ADDR, "Logon Failed",
 					  "Incorrect password: " . $nick . " / " . $pass);
-				echo '<div id="foot">';
-				include "general/footer.php";
-				echo '</div>';
 				exit;
 			}
 		}
@@ -151,9 +154,6 @@ if (isset ($_GET["refr"])){
 			$pass = $primera . "****" . $ultima;
 			audit_db ($nick, $REMOTE_ADDR, "Logon Failed",
 				  "Invalid username: " . $nick . " / " . $pass);
-			echo '<div id="foot">';
-			include "general/footer.php";
-			echo '</div>';
 			exit;
 		}
 	} elseif (! isset ($_SESSION['id_usuario'])) {