diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index a76422f839..1469bfacf2 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2007-03-02 Sancho Lerena + + * Massive commit. Updated almost every file for agent + visualization, module visualizacion, added many icons, and altered + so many files. + 2007-02-27 Sancho Lerena * include/styles/god.css: Moved style block. diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index eadb0a3817..b894f2406a 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -1,13 +1,15 @@ -Pandora \ No newline at end of file +echo ""; +echo ""; +if (isset ($_SESSION["id_usuario"])){ + echo "
"; + $id_usuario = entrada_limpia ($_SESSION["id_usuario"]); + if (dame_admin($id_usuario)==1) + echo " "; + else + echo " "; + echo $lang_label["has_connected"]. ' + ['. $id_usuario. ']'; + echo ""; + echo " ". $lang_label["information"].""; + echo ""; + echo " ". $lang_label["help"].""; + echo ""; + echo " ". $lang_label["logout"].""; +} +echo "
"; +?> \ No newline at end of file diff --git a/pandora_console/general/links_menu.php b/pandora_console/general/links_menu.php index ef98ddb125..c96d75c439 100644 --- a/pandora_console/general/links_menu.php +++ b/pandora_console/general/links_menu.php @@ -1,9 +1,22 @@ , 2003-2006 -// Raul Mateos , 2004-2006 +// Pandora FMS - the Free monitoring system +// ======================================== +// Copyright (c) 2004-2007 Sancho Lerena, slerena@openideas.info +// Copyright (c) 2005-2007 Artica Soluciones Tecnologicas +// Copyright (c) 2004-2007 Raul Mateos Martin, raulofpandora@gmail.com +// Copyright (c) 2006-2007 Jose Navarro jose@jnavarro.net +// Copyright (c) 2006-2007 Jonathan Barajas, jonathan.barajas[AT]gmail[DOT]com + +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation version 2 +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// 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. $sql1='SELECT * FROM tlink ORDER BY name'; $result=mysql_query($sql1); diff --git a/pandora_console/general/logoff.php b/pandora_console/general/logoff.php index 10714506bb..a3eecba7d0 100644 --- a/pandora_console/general/logoff.php +++ b/pandora_console/general/logoff.php @@ -17,6 +17,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ?> - -

-
\ No newline at end of file +
+

+
+
+ +
+
+ logo
+ +
+
'.$REMOTE_ADDR.''; ?>
+
+ +
diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php index fa12d4789e..89f668ea17 100644 --- a/pandora_console/general/logon_ok.php +++ b/pandora_console/general/logon_ok.php @@ -17,32 +17,26 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -echo "
"; -$nick = $_SESSION['id_usuario']; -echo "

" . $lang_label["welcome_title"] . "

"; -echo $lang_label["main_text"]; -echo "

"; -echo $lang_label["has_connected"] . " " . $nick . " - "; + echo "
"; + $nick = $_SESSION['id_usuario']; + echo "

" . $lang_label["welcome_title"] . "

"; + echo "

"; + echo $lang_label["main_text"]; + echo "

"; -if (dame_admin ($nick) == 1) { - echo $lang_label["administrator"] . '. '; -} else { - echo $lang_label["normal_user"] . '. '; -} + echo "
"; + // Show last activity from this user + echo "

" . $lang_label["user_last_activity"] . "

"; + // Show table header + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; -echo "
"; -// Show last activity from this user -echo "

" . $lang_label["user_last_activity"] . "

"; -// Show table header -echo '
' . $lang_label["user"] . '' . $lang_label["action"] . '' . $lang_label["date"] . '' . $lang_label["src_address"] . '' . $lang_label["comments"] . '
'; -echo ''; -echo ''; -echo ''; -echo ''; -echo ''; - -// Skip offset records -$query1="SELECT * FROM tsesion WHERE (TO_DAYS(fecha) > TO_DAYS(NOW()) - 7) AND ID_usuario = '" . $nick . "' ORDER BY fecha DESC limit 15"; + // Skip offset records + $query1="SELECT * FROM tsesion WHERE (TO_DAYS(fecha) > TO_DAYS(NOW()) - 7) AND ID_usuario = '" . $nick . "' ORDER BY fecha DESC limit 15"; $result = mysql_query ($query1); $contador = 5; // Max items @@ -73,7 +67,9 @@ $query1="SELECT * FROM tsesion WHERE (TO_DAYS(fecha) > TO_DAYS(NOW()) - 7) AND I $contador--; } - echo "
' . $lang_label["user"] . '' . $lang_label["action"] . '' . $lang_label["date"] . '' . $lang_label["src_address"] . '' . $lang_label["comments"] . '
"; + echo "
"; + echo ""; + echo "
"; // activity $sql='SELECT COUNT(*) FROM tmensajes WHERE id_usuario_destino="' . $nick . '" AND estado="FALSE";'; $resultado = mysql_query ($sql); @@ -88,43 +84,43 @@ $query1="SELECT * FROM tsesion WHERE (TO_DAYS(fecha) > TO_DAYS(NOW()) - 7) AND I echo '

' . $lang_label["stat_title"] . '

'; - $query1 = "SELECT COUNT(*) FROM tusuario"; + $query1 = "SELECT COUNT(id_usuario) FROM tusuario"; $result = mysql_query ($query1); $row = mysql_fetch_array ($result); echo ''; - echo $lang_label["there_are"] . $row[0] . ' ' . $lang_label["user_defined"]; + echo $lang_label["there_are"] ."". $row[0] . ' ' . $lang_label["user_defined"]; echo ''; - $query1 = "SELECT COUNT(*) FROM tagente"; + $query1 = "SELECT COUNT(id_agente) FROM tagente"; $result = mysql_query ($query1); $row = mysql_fetch_array ($result); echo ''; - echo $lang_label["there_are"] . $row[0] .' ' . $lang_label["agent_defined"]; + echo $lang_label["there_are"] . "".$row[0]." ". $lang_label["agent_defined"]; echo ''; $query1 = "SELECT COUNT(id_agente_datos) FROM tagente_datos"; $result = mysql_query ($query1); $row = mysql_fetch_array ($result); echo ''; - echo $lang_label["there_are"] . $row[0] . ' ' . $lang_label["data_harvested"]; + echo $lang_label["there_are"] . "".$row[0] . ' ' . $lang_label["data_harvested"]; echo ''; $query1 = "SELECT COUNT(*) FROM talerta_agente_modulo"; $result = mysql_query ($query1); $row = mysql_fetch_array ($result); echo ""; - echo $lang_label["there_are"] . $row[0] .' ' . $lang_label["alert_defined"]; + echo $lang_label["there_are"] . "".$row[0] .' ' . $lang_label["alert_defined"]; echo ""; echo ''; - $query1 = "SELECT timestamp FROM tagente_estado ORDER BY timestamp DESC"; + $query1 = "SELECT timestamp FROM tagente_estado ORDER BY timestamp DESC LIMIT 1"; $result = mysql_query($query1); - if($row = mysql_fetch_array($result)!='') { // Take the first element only - echo $lang_label["data_timestamp"] . $row["timestamp"]; + if ($row = mysql_fetch_array($result)) { // Take the first element only + echo $lang_label["data_timestamp"] . "".$row["timestamp"].""; } else { echo 'No data received yet!'; } echo ''; - echo '
'; + echo ''; // class "jus" ?> \ No newline at end of file diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php index 33c606268a..6aeacc2b84 100644 --- a/pandora_console/general/main_menu.php +++ b/pandora_console/general/main_menu.php @@ -1,9 +1,22 @@ , 2003-2006 -// Raul Mateos , 2004-2006 +// Pandora FMS - the Free monitoring system +// ======================================== +// Copyright (c) 2004-2007 Sancho Lerena, slerena@openideas.info +// Copyright (c) 2005-2007 Artica Soluciones Tecnologicas +// Copyright (c) 2004-2007 Raul Mateos Martin, raulofpandora@gmail.com +// Copyright (c) 2006-2007 Jose Navarro jose@jnavarro.net +// Copyright (c) 2006-2007 Jonathan Barajas, jonathan.barajas[AT]gmail[DOT]com + +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation version 2 +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// 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. ?>
logo @@ -21,15 +34,8 @@ if (! isset ($_SESSION["id_usuario"])) { echo '
IP: ' . $REMOTE_ADDR . '
'; } else { - $iduser = $_SESSION['id_usuario']; require ("godmode/menu.php"); - echo '
'; - echo ''; - echo ''; - echo '
' . $lang_label["has_connected"] . '
'; - echo '[' . $iduser . ']
'; - echo "
IP: " . $REMOTE_ADDR . "
 
"; require ("links_menu.php"); } ?> diff --git a/pandora_console/godmode/admin_access_logs.php b/pandora_console/godmode/admin_access_logs.php index 793569c863..b04eaece47 100644 --- a/pandora_console/godmode/admin_access_logs.php +++ b/pandora_console/godmode/admin_access_logs.php @@ -17,22 +17,21 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// Load global vars -require("include/config.php"); + // Load global vars + require("include/config.php"); -if (comprueba_login() != 0) { - audit_db("Noauth",$REMOTE_ADDR, "No authenticated acces","Trying to access event viewer"); - require ("general/noaccess.php"); - exit; -} - -$id_usuario =$_SESSION["id_usuario"]; -if (give_acl($id_usuario, 0, "PM")!=1) { - audit_db($id_usuario,$REMOTE_ADDR, "ACL Violation","Trying to access event viewer"); - require ("general/noaccess.php"); - exit; -} + if (comprueba_login() != 0) { + audit_db("Noauth",$REMOTE_ADDR, "No authenticated acces","Trying to access event viewer"); + require ("general/noaccess.php"); + exit; + } + $id_usuario =$_SESSION["id_usuario"]; + if (give_acl($id_usuario, 0, "PM")!=1) { + audit_db($id_usuario,$REMOTE_ADDR, "ACL Violation","Trying to access event viewer"); + require ("general/noaccess.php"); + exit; + } echo "

".$lang_label["audit_title"]."

"; if (isset($_GET["offset"])) @@ -44,7 +43,7 @@ if (give_acl($id_usuario, 0, "PM")!=1) { if (isset($_GET["tipo_log"])){ $tipo_log = $_GET["tipo_log"]; $tipo_log_select = " WHERE accion='".$tipo_log."' "; - } elseif (isset($_POST["tipo_log"])){ + } elseif (isset($_POST["tipo_log"])) { $tipo_log = $_POST["tipo_log"]; if ($tipo_log == "-1"){ $tipo_log_select = ""; @@ -52,57 +51,58 @@ if (give_acl($id_usuario, 0, "PM")!=1) { } else $tipo_log_select = " WHERE accion='".$tipo_log."' "; } - else $tipo_log_select= ""; + else + $tipo_log_select= ""; -// generate select + // generate select -echo "

".$lang_label["filter"]; -echo " - ".$lang_label["help"]."

"; -echo "
"; -echo "
"; -echo ""; -echo ""; -echo "
"; + echo "

".$lang_label["filter"]; + echo " +  ".$lang_label["help"]."

"; + echo "
"; + echo "
"; + echo ""; + echo ""; + echo "
"; -$sql2="SELECT COUNT(*) FROM tsesion ".$tipo_log_select." ORDER BY fecha DESC"; -$result2=mysql_query($sql2); -$row2=mysql_fetch_array($result2); -$counter = $row2[0]; -if (isset ($tipo_log)) - $url = "index.php?sec=godmode&sec2=godmode/admin_access_logs&tipo_log=".$tipo_log; -else - $url = "index.php?sec=godmode&sec2=godmode/admin_access_logs"; + $sql2="SELECT COUNT(*) FROM tsesion ".$tipo_log_select." ORDER BY fecha DESC"; + $result2=mysql_query($sql2); + $row2=mysql_fetch_array($result2); + $counter = $row2[0]; + if (isset ($tipo_log)) + $url = "index.php?sec=godmode&sec2=godmode/admin_access_logs&tipo_log=".$tipo_log; + else + $url = "index.php?sec=godmode&sec2=godmode/admin_access_logs"; -//echo "URLTipolog $tipo_log"; + //echo "URLTipolog $tipo_log"; pagination ($counter, $url, $offset); echo '
'; -// table header - echo ''; + // table header + echo '
'; echo ''; - echo ''; + echo ''; echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; -// Skip offset records - $query1="SELECT * FROM tsesion ".$tipo_log_select." ORDER BY fecha DESC"; - $result=mysql_query($query1); + // Skip offset records + $query1="SELECT * FROM tsesion ".$tipo_log_select." ORDER BY fecha DESC"; + $result=mysql_query($query1); $offset_counter = 0; while ($offset_counter < $offset){ if ($row=mysql_fetch_array($result)) @@ -110,10 +110,10 @@ else else $offset_counter = $offset; //exit condition } - - $offset_counter = 0; + + $offset_counter = 0; $color=1; -// Get data + // Get data while ($row=mysql_fetch_array($result) and ($offset_counter < $block_size) ){ if ($color == 1){ $tdcolor = "datos"; @@ -131,9 +131,9 @@ else echo ''; $offset_counter++; - } + } -// end table + // end table echo "
'.$lang_label["user"].''.$lang_label["user"].''.$lang_label["action"].''.$lang_label["date"].''.$lang_label["src_address"].''.$lang_label["comments"].''.$lang_label["date"].''.$lang_label["src_address"].''.$lang_label["comments"].''.$row["descripcion"]; echo '
"; ?> \ No newline at end of file diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index 6b0965f2e8..6cbc12cd16 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -3,6 +3,14 @@ // ======================== // AGENT GENERAL DATA FORM // ======================== +// Load global vars +require("include/config.php"); + +if (give_acl($id_user, 0, "AW")!=1) { + audit_db($id_usuario,$REMOTE_ADDR, "ACL Violation","Trying to access agent manager"); + require ("general/noaccess.php"); + exit; +}; echo "

".$lang_label["agent_conf"]; if (isset($_GET["creacion"])){ @@ -15,6 +23,7 @@ echo " > ".$lang_label["create_agent"]."  ".$lang_label["help"].""; } echo "

"; +echo "
"; echo '
'; @@ -25,7 +34,7 @@ if ($creacion_agente == 1) { echo ""; } echo ''; -echo " - "; + +
"; +echo "
"; echo ''.$lang_label["agent_name"].' '; @@ -33,9 +42,6 @@ if (isset($_GET["creacion"])){ echo " "; } else { echo " - "; diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index bfa4b7598f..2f7799b1f8 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -1,21 +1,22 @@ +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.?> +"; +echo ""; +// Make some space between tabs and title +echo "
"; +// Unset variable to allow operations to work +$id_agente = ""; + // Delete Alert // ============= if (isset($_GET["delete_alert"])){ // if modified some parameter @@ -513,28 +546,13 @@ if (isset($_GET["delete_module"])){ // DELETE agent module ! } +// Load page depending on tab selected +// ----------------------------------- if (isset($_GET["tab"])) $tab = $_GET["tab"]; else $tab = "main"; -echo ""; - switch ($tab) { case "main": require "agent_manager.php"; break; @@ -545,5 +563,4 @@ case "alert": require "alert_manager.php"; } -echo "FUCKIN SHIT"; ?> \ No newline at end of file diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index e094511218..593410db93 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -17,12 +17,24 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// Load global vars -require("include/config.php"); + // Load global vars + require("include/config.php"); -if (give_acl($id_user, 0, "AW")==1) { + if (give_acl($id_user, 0, "AW") != 1) { + audit_db($id_user,$REMOTE_ADDR, "ACL Violation", + "Trying to access Agent Management"); + require ("general/noaccess.php"); + exit; + } + + if (isset($_GET["offset"])) + $offset = entrada_limpia($_GET["offset"]); + else + $offset = 0; + if (isset($_GET["borrar_agente"])){ // if delete agent $id_agente = entrada_limpia($_GET["borrar_agente"]); + $agent_name = dame_nombre_agente($id_agente); $id_grupo = dame_id_grupo($id_agente); if (give_acl($id_user, $id_grupo, "AW")==1){ // Firts delete from agents table @@ -56,80 +68,98 @@ if (give_acl($id_user, 0, "AW")==1) { $result=mysql_query($sql_delete4); } $sql_delete2 ="DELETE FROM tagente_modulo - WHERE id_agente = ".$id_agente; // delete from tagente_modulo + WHERE id_agente = ".$id_agente; $sql_delete3 ="DELETE FROM tagente_estado - WHERE id_agente = ".$id_agente; // delete from tagente_estado + WHERE id_agente = ".$id_agente; $result=mysql_query($sql_delete2); $result=mysql_query($sql_delete3); - } else { - audit_db($id_user,$REMOTE_ADDR, "ACL Violation", - "Trying to delete an Agent"); - require ("general/noaccess.php"); + audit_db($id_user,$REMOTE_ADDR, "Agent '$agent_name' deleted", + "Agent Management"); + } else { // NO permissions. + audit_db($id_user,$REMOTE_ADDR, "ACL Violation", + "Trying to delete agent '$agent_name'"); + require ("general/noaccess.php"); + exit; } } - echo "

".$lang_label["agent_conf"]."

"; - echo "

".$lang_label["agent_defined2"]." + echo "

".$lang_label["agent_conf"]." > ".$lang_label["agent_defined2"]." - ".$lang_label["help"]."

"; + ".$lang_label["help"].""; - $sql1='SELECT id_agente, nombre, id_grupo, comentarios - FROM tagente ORDER BY nombre'; + $sql1="SELECT id_agente, nombre, id_grupo, comentarios, id_os + FROM tagente ORDER BY nombre LIMIT $offset, $block_size"; $result=mysql_query($sql1); + + $sql2="SELECT COUNT(id_agente) FROM tagente"; + $result2=mysql_query($sql2); + $row2=mysql_fetch_array($result2); + $total_events = $row2[0]; + + // Prepare pagination + echo "
"; + pagination ($total_events, "index.php?sec=gagente&sec2=godmode/agentes/modificar_agente", $offset); + echo "
"; + if (mysql_num_rows($result)){ - echo ""; - echo " +
".$lang_label["agent_name"]; - echo "".$lang_label["group"]; - echo "".$lang_label["description"]; - echo "".$lang_label["delete"]; - $color=1; - while ($row=mysql_fetch_array($result)){ - $id_grupo = $row["id_grupo"]; - if ($color == 1){ - $tdcolor = "datos"; - $color = 0; + echo ""; + echo ""; + // Operating System icon + echo ""; + // Group icon and name + echo ""; + // Description + echo ""; + // Action + echo ""; } - else { - $tdcolor = "datos2"; - $color = 1; } - if (give_acl($id_user, $id_grupo, "AW")==1){ - echo ""; - echo ""; - echo ""; - echo ""; - } - } - echo ""; + echo ""; echo ""; echo "
".$lang_label["agent_name"]; + echo "".$lang_label["os"]; + echo "".$lang_label["group"]; + echo "".$lang_label["description"]; + echo "".$lang_label["delete"]; + $color=1; + while ($row=mysql_fetch_array($result)){ + $id_grupo = $row["id_grupo"]; + if ($color == 1){ + $tdcolor = "datos"; + $color = 0; + } + else { + $tdcolor = "datos2"; + $color = 1; + } + if (give_acl($id_user, $id_grupo, "AW")==1){ + // Agent name + echo "
+ ".$row["nombre"]." + + +   ".dame_grupo($id_grupo)."".$row["comentarios"]." + +
- ".$row["nombre"]." - - ( ".dame_grupo($id_grupo)." )".$row["comentarios"]." - -
"; echo ""; - echo ""; echo "
"; - } else { + } else { + // If no data... let's show a beautiful button to create agent + // This is a piece of crap because we're duplicanting code above + // of this, don't do again, Raul, please. echo "
".$lang_label["no_agent_def"]."
"; echo "
"; - echo ""; echo "
"; - } -} // Fin pagina -else { - audit_db($id_user,$REMOTE_ADDR, "ACL Violation", - "Trying to access Agent Management"); - require ("general/noaccess.php"); } ?> diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index d7077d8a2e..db5ceda261 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -125,29 +125,35 @@ function type_change() ".$lang_label["agent_conf"]." > ".$lang_label["assigned_modules"]." + + ".$lang_label["help"].""; if ($row=mysql_num_rows($result)){ - ?> -

- -

- - - '; + echo ""; echo ""; @@ -188,6 +193,7 @@ if ( $creacion_agente != 1) { echo ""; + echo "
- - - - - - - '; + echo '
".$lang_label["module_name"]; + echo "".$lang_label["type"]; + echo "".$lang_label["interval"]; + echo "".$lang_label["description"]; + echo "".$lang_label["module_group"]; + echo "".$lang_label["max_min"]; + echo "".$lang_label["action"]; $color=1; while ($row=mysql_fetch_array($result)){ if ($color == 1){ @@ -175,7 +181,6 @@ if ( $creacion_agente != 1) { } else { echo " N/A"; } - echo "".substr($descripcion,0,30)."". substr(dame_nombre_grupomodulo($module_group2),0,15).""; if ($id_tipo != -1) echo " @@ -196,19 +202,22 @@ if ( $creacion_agente != 1) { echo " ".$lang_label["update"].""; } echo "
"; } else echo "
No modules
"; + } // ==================================================================================== // Module Creation / Update form // ==================================================================================== else { - echo '
'; + echo ''; if ($update_module == "1"){ echo ''; echo ''; @@ -223,18 +232,17 @@ else { } } } -?> -

- - 

- - - - - + + -
- - - -".$lang_label["agent_conf"]." > ".$lang_label["module_asociation_form"]." + ".$lang_label["help"].""; + +echo ' '; +echo ''; +echo " -
"; + +//-- Module type combobox +echo "".$lang_label["module_type"]; +echo ""; if ($update_module == "1") { echo ""; echo "".$lang_label["no_change_field"].""; @@ -321,15 +329,17 @@ if (isset($_POST["oid"])){
- +"; if ($update_module == "1"){ echo ''; } else { echo ''; } echo ""; - echo "
"; + + ?>
diff --git a/pandora_console/godmode/grupos/configurar_grupo.php b/pandora_console/godmode/grupos/configurar_grupo.php index f0391eee8e..622b062ffa 100644 --- a/pandora_console/godmode/grupos/configurar_grupo.php +++ b/pandora_console/godmode/grupos/configurar_grupo.php @@ -1,14 +1,15 @@
- -
+'; + + echo ''; +?> + + +
".$lang_label["create_group_no"].""; @@ -90,7 +91,7 @@ if (comprueba_login() == 0) echo "
- diff --git a/pandora_console/godmode/usuarios/lista_usuarios.php b/pandora_console/godmode/usuarios/lista_usuarios.php index cae6cf2672..60be05b25c 100644 --- a/pandora_console/godmode/usuarios/lista_usuarios.php +++ b/pandora_console/godmode/usuarios/lista_usuarios.php @@ -65,9 +65,9 @@ while ($rowdup=mysql_fetch_array($resq1)){ echo "".$fecha_registro; echo ""; if ($nivel == 1) - echo ""; + echo ""; else - echo ""; + echo ""; $sql1='SELECT * FROM tusuario_perfil WHERE id_usuario = "'.$nombre.'"'; $result=mysql_query($sql1); diff --git a/pandora_console/images/accept.png b/pandora_console/images/accept.png new file mode 100644 index 0000000000..89c8129a49 Binary files /dev/null and b/pandora_console/images/accept.png differ diff --git a/pandora_console/images/add.png b/pandora_console/images/add.png new file mode 100644 index 0000000000..6332fefea4 Binary files /dev/null and b/pandora_console/images/add.png differ diff --git a/pandora_console/images/anchor.png b/pandora_console/images/anchor.png new file mode 100644 index 0000000000..9b3422c61e Binary files /dev/null and b/pandora_console/images/anchor.png differ diff --git a/pandora_console/images/application_double.png b/pandora_console/images/application_double.png new file mode 100644 index 0000000000..647592f2e9 Binary files /dev/null and b/pandora_console/images/application_double.png differ diff --git a/pandora_console/images/application_edit.png b/pandora_console/images/application_edit.png new file mode 100644 index 0000000000..fb2efb8775 Binary files /dev/null and b/pandora_console/images/application_edit.png differ diff --git a/pandora_console/images/application_osx_terminal.png b/pandora_console/images/application_osx_terminal.png new file mode 100644 index 0000000000..b3d8ce01e2 Binary files /dev/null and b/pandora_console/images/application_osx_terminal.png differ diff --git a/pandora_console/images/arrow_refresh.png b/pandora_console/images/arrow_refresh.png new file mode 100644 index 0000000000..0de26566d4 Binary files /dev/null and b/pandora_console/images/arrow_refresh.png differ diff --git a/pandora_console/images/asterisk_yellow.png b/pandora_console/images/asterisk_yellow.png new file mode 100644 index 0000000000..bab7cc9bcc Binary files /dev/null and b/pandora_console/images/asterisk_yellow.png differ diff --git a/pandora_console/images/attach.png b/pandora_console/images/attach.png new file mode 100644 index 0000000000..ea897cc9f1 Binary files /dev/null and b/pandora_console/images/attach.png differ diff --git a/pandora_console/images/award_star_bronze_1.png b/pandora_console/images/award_star_bronze_1.png new file mode 100644 index 0000000000..658c7117bb Binary files /dev/null and b/pandora_console/images/award_star_bronze_1.png differ diff --git a/pandora_console/images/award_star_bronze_2.png b/pandora_console/images/award_star_bronze_2.png new file mode 100644 index 0000000000..e47babd7ba Binary files /dev/null and b/pandora_console/images/award_star_bronze_2.png differ diff --git a/pandora_console/images/award_star_bronze_3.png b/pandora_console/images/award_star_bronze_3.png new file mode 100644 index 0000000000..396e4b3a25 Binary files /dev/null and b/pandora_console/images/award_star_bronze_3.png differ diff --git a/pandora_console/images/award_star_gold_2.png b/pandora_console/images/award_star_gold_2.png new file mode 100644 index 0000000000..0eaa571757 Binary files /dev/null and b/pandora_console/images/award_star_gold_2.png differ diff --git a/pandora_console/images/award_star_silver_1.png b/pandora_console/images/award_star_silver_1.png new file mode 100644 index 0000000000..028a54626a Binary files /dev/null and b/pandora_console/images/award_star_silver_1.png differ diff --git a/pandora_console/images/backgrounds/background4.jpg b/pandora_console/images/backgrounds/background4.jpg new file mode 100644 index 0000000000..1f891d0826 Binary files /dev/null and b/pandora_console/images/backgrounds/background4.jpg differ diff --git a/pandora_console/images/bell.png b/pandora_console/images/bell.png new file mode 100644 index 0000000000..6e0015df4f Binary files /dev/null and b/pandora_console/images/bell.png differ diff --git a/pandora_console/images/book_edit.png b/pandora_console/images/book_edit.png new file mode 100644 index 0000000000..6e756cc85a Binary files /dev/null and b/pandora_console/images/book_edit.png differ diff --git a/pandora_console/images/brick.png b/pandora_console/images/brick.png new file mode 100644 index 0000000000..7851cf34c9 Binary files /dev/null and b/pandora_console/images/brick.png differ diff --git a/pandora_console/images/bricks.png b/pandora_console/images/bricks.png new file mode 100644 index 0000000000..0905f933b8 Binary files /dev/null and b/pandora_console/images/bricks.png differ diff --git a/pandora_console/images/bug.png b/pandora_console/images/bug.png new file mode 100644 index 0000000000..2d5fb90ec6 Binary files /dev/null and b/pandora_console/images/bug.png differ diff --git a/pandora_console/images/bullet_add.png b/pandora_console/images/bullet_add.png new file mode 100644 index 0000000000..41ff8335b0 Binary files /dev/null and b/pandora_console/images/bullet_add.png differ diff --git a/pandora_console/images/bullet_black.png b/pandora_console/images/bullet_black.png new file mode 100644 index 0000000000..57619706d1 Binary files /dev/null and b/pandora_console/images/bullet_black.png differ diff --git a/pandora_console/images/bullet_blue.png b/pandora_console/images/bullet_blue.png new file mode 100644 index 0000000000..a7651ec8a0 Binary files /dev/null and b/pandora_console/images/bullet_blue.png differ diff --git a/pandora_console/images/bullet_delete.png b/pandora_console/images/bullet_delete.png new file mode 100644 index 0000000000..bd6271b246 Binary files /dev/null and b/pandora_console/images/bullet_delete.png differ diff --git a/pandora_console/images/bullet_disk.png b/pandora_console/images/bullet_disk.png new file mode 100644 index 0000000000..209c6a7862 Binary files /dev/null and b/pandora_console/images/bullet_disk.png differ diff --git a/pandora_console/images/bullet_error.png b/pandora_console/images/bullet_error.png new file mode 100644 index 0000000000..bca2b491fd Binary files /dev/null and b/pandora_console/images/bullet_error.png differ diff --git a/pandora_console/images/bullet_go.png b/pandora_console/images/bullet_go.png new file mode 100644 index 0000000000..bc4faa709e Binary files /dev/null and b/pandora_console/images/bullet_go.png differ diff --git a/pandora_console/images/bullet_green.png b/pandora_console/images/bullet_green.png new file mode 100644 index 0000000000..058ad261f5 Binary files /dev/null and b/pandora_console/images/bullet_green.png differ diff --git a/pandora_console/images/bullet_key.png b/pandora_console/images/bullet_key.png new file mode 100644 index 0000000000..3d37f2ea49 Binary files /dev/null and b/pandora_console/images/bullet_key.png differ diff --git a/pandora_console/images/bullet_white.png b/pandora_console/images/bullet_white.png new file mode 100644 index 0000000000..a9af8d44bf Binary files /dev/null and b/pandora_console/images/bullet_white.png differ diff --git a/pandora_console/images/bullet_wrench.png b/pandora_console/images/bullet_wrench.png new file mode 100644 index 0000000000..67817e6e5a Binary files /dev/null and b/pandora_console/images/bullet_wrench.png differ diff --git a/pandora_console/images/bullet_yellow.png b/pandora_console/images/bullet_yellow.png new file mode 100644 index 0000000000..6469cea7e9 Binary files /dev/null and b/pandora_console/images/bullet_yellow.png differ diff --git a/pandora_console/images/calendar_view_day.png b/pandora_console/images/calendar_view_day.png new file mode 100644 index 0000000000..9740f76ee6 Binary files /dev/null and b/pandora_console/images/calendar_view_day.png differ diff --git a/pandora_console/images/camera.png b/pandora_console/images/camera.png new file mode 100644 index 0000000000..8536d1a795 Binary files /dev/null and b/pandora_console/images/camera.png differ diff --git a/pandora_console/images/chart_bar.png b/pandora_console/images/chart_bar.png new file mode 100644 index 0000000000..9051fbc609 Binary files /dev/null and b/pandora_console/images/chart_bar.png differ diff --git a/pandora_console/images/chart_curve.png b/pandora_console/images/chart_curve.png new file mode 100644 index 0000000000..01e933a619 Binary files /dev/null and b/pandora_console/images/chart_curve.png differ diff --git a/pandora_console/images/chart_organisation.png b/pandora_console/images/chart_organisation.png new file mode 100644 index 0000000000..c32d25c16f Binary files /dev/null and b/pandora_console/images/chart_organisation.png differ diff --git a/pandora_console/images/chart_pie.png b/pandora_console/images/chart_pie.png new file mode 100644 index 0000000000..fe00fa050a Binary files /dev/null and b/pandora_console/images/chart_pie.png differ diff --git a/pandora_console/images/clock.png b/pandora_console/images/clock.png new file mode 100644 index 0000000000..e2672c2067 Binary files /dev/null and b/pandora_console/images/clock.png differ diff --git a/pandora_console/images/cog.png b/pandora_console/images/cog.png new file mode 100644 index 0000000000..67de2c6ccb Binary files /dev/null and b/pandora_console/images/cog.png differ diff --git a/pandora_console/images/comments.png b/pandora_console/images/comments.png new file mode 100644 index 0000000000..39433cf78a Binary files /dev/null and b/pandora_console/images/comments.png differ diff --git a/pandora_console/images/computer.png b/pandora_console/images/computer.png new file mode 100644 index 0000000000..9bc37dce36 Binary files /dev/null and b/pandora_console/images/computer.png differ diff --git a/pandora_console/images/computer_error.png b/pandora_console/images/computer_error.png new file mode 100644 index 0000000000..b2c3ed5780 Binary files /dev/null and b/pandora_console/images/computer_error.png differ diff --git a/pandora_console/images/database.png b/pandora_console/images/database.png new file mode 100644 index 0000000000..3d09261a26 Binary files /dev/null and b/pandora_console/images/database.png differ diff --git a/pandora_console/images/database_gear.png b/pandora_console/images/database_gear.png new file mode 100644 index 0000000000..7c0ab2b4c6 Binary files /dev/null and b/pandora_console/images/database_gear.png differ diff --git a/pandora_console/images/database_lightning.png b/pandora_console/images/database_lightning.png new file mode 100644 index 0000000000..d9eefc2251 Binary files /dev/null and b/pandora_console/images/database_lightning.png differ diff --git a/pandora_console/images/database_refresh.png b/pandora_console/images/database_refresh.png new file mode 100644 index 0000000000..ff803be124 Binary files /dev/null and b/pandora_console/images/database_refresh.png differ diff --git a/pandora_console/images/delete.gif b/pandora_console/images/delete.gif deleted file mode 100644 index acf716a7d2..0000000000 Binary files a/pandora_console/images/delete.gif and /dev/null differ diff --git a/pandora_console/images/delete.png b/pandora_console/images/delete.png new file mode 100644 index 0000000000..08f249365a Binary files /dev/null and b/pandora_console/images/delete.png differ diff --git a/pandora_console/images/disk.png b/pandora_console/images/disk.png new file mode 100644 index 0000000000..99d532e8b1 Binary files /dev/null and b/pandora_console/images/disk.png differ diff --git a/pandora_console/images/drive_network.png b/pandora_console/images/drive_network.png new file mode 100644 index 0000000000..63d2d5d5b1 Binary files /dev/null and b/pandora_console/images/drive_network.png differ diff --git a/pandora_console/images/drive_user.png b/pandora_console/images/drive_user.png new file mode 100644 index 0000000000..0b4751ce42 Binary files /dev/null and b/pandora_console/images/drive_user.png differ diff --git a/pandora_console/images/email.png b/pandora_console/images/email.png new file mode 100644 index 0000000000..7348aed77f Binary files /dev/null and b/pandora_console/images/email.png differ diff --git a/pandora_console/images/email_error.png b/pandora_console/images/email_error.png new file mode 100644 index 0000000000..8bdd3304de Binary files /dev/null and b/pandora_console/images/email_error.png differ diff --git a/pandora_console/images/email_go.png b/pandora_console/images/email_go.png new file mode 100644 index 0000000000..4a6c5d396a Binary files /dev/null and b/pandora_console/images/email_go.png differ diff --git a/pandora_console/images/email_open.png b/pandora_console/images/email_open.png new file mode 100644 index 0000000000..7b6f9813d4 Binary files /dev/null and b/pandora_console/images/email_open.png differ diff --git a/pandora_console/images/error.png b/pandora_console/images/error.png new file mode 100644 index 0000000000..628cf2dae3 Binary files /dev/null and b/pandora_console/images/error.png differ diff --git a/pandora_console/images/exclamation.png b/pandora_console/images/exclamation.png new file mode 100644 index 0000000000..c37bd062e6 Binary files /dev/null and b/pandora_console/images/exclamation.png differ diff --git a/pandora_console/images/eye.png b/pandora_console/images/eye.png new file mode 100644 index 0000000000..564a1a9714 Binary files /dev/null and b/pandora_console/images/eye.png differ diff --git a/pandora_console/images/flag_blue.png b/pandora_console/images/flag_blue.png new file mode 100644 index 0000000000..003924f5ea Binary files /dev/null and b/pandora_console/images/flag_blue.png differ diff --git a/pandora_console/images/flag_green.png b/pandora_console/images/flag_green.png new file mode 100644 index 0000000000..e4bc611f87 Binary files /dev/null and b/pandora_console/images/flag_green.png differ diff --git a/pandora_console/images/flag_red.png b/pandora_console/images/flag_red.png new file mode 100644 index 0000000000..e8a602da7b Binary files /dev/null and b/pandora_console/images/flag_red.png differ diff --git a/pandora_console/images/flag_yellow.png b/pandora_console/images/flag_yellow.png new file mode 100644 index 0000000000..14c89a5430 Binary files /dev/null and b/pandora_console/images/flag_yellow.png differ diff --git a/pandora_console/images/group.png b/pandora_console/images/group.png new file mode 100644 index 0000000000..7fb4e1f1e1 Binary files /dev/null and b/pandora_console/images/group.png differ diff --git a/pandora_console/images/groups/apps_1.gif b/pandora_console/images/groups/apps_1.gif deleted file mode 100644 index 165d8a38e4..0000000000 Binary files a/pandora_console/images/groups/apps_1.gif and /dev/null differ diff --git a/pandora_console/images/groups/comms_1.gif b/pandora_console/images/groups/comms_1.gif deleted file mode 100644 index edf8d984f3..0000000000 Binary files a/pandora_console/images/groups/comms_1.gif and /dev/null differ diff --git a/pandora_console/images/groups/db_1.gif b/pandora_console/images/groups/db_1.gif deleted file mode 100644 index f220111684..0000000000 Binary files a/pandora_console/images/groups/db_1.gif and /dev/null differ diff --git a/pandora_console/images/groups/firewall_1.gif b/pandora_console/images/groups/firewall_1.gif deleted file mode 100644 index 85b0811f00..0000000000 Binary files a/pandora_console/images/groups/firewall_1.gif and /dev/null differ diff --git a/pandora_console/images/groups/ids_1.gif b/pandora_console/images/groups/ids_1.gif deleted file mode 100644 index dba2d7e44e..0000000000 Binary files a/pandora_console/images/groups/ids_1.gif and /dev/null differ diff --git a/pandora_console/images/groups/others_1.gif b/pandora_console/images/groups/others_1.gif deleted file mode 100644 index a4b40ca86e..0000000000 Binary files a/pandora_console/images/groups/others_1.gif and /dev/null differ diff --git a/pandora_console/images/groups/servers_1.gif b/pandora_console/images/groups/servers_1.gif deleted file mode 100644 index ae544aab68..0000000000 Binary files a/pandora_console/images/groups/servers_1.gif and /dev/null differ diff --git a/pandora_console/images/groups/workstation_1.gif b/pandora_console/images/groups/workstation_1.gif deleted file mode 100644 index 4745bc69ec..0000000000 Binary files a/pandora_console/images/groups/workstation_1.gif and /dev/null differ diff --git a/pandora_console/images/groups_small/application_osx_terminal.png b/pandora_console/images/groups_small/application_osx_terminal.png new file mode 100644 index 0000000000..b3d8ce01e2 Binary files /dev/null and b/pandora_console/images/groups_small/application_osx_terminal.png differ diff --git a/pandora_console/images/groups_small/binary.gif b/pandora_console/images/groups_small/binary.gif new file mode 100644 index 0000000000..52b4eafa49 Binary files /dev/null and b/pandora_console/images/groups_small/binary.gif differ diff --git a/pandora_console/images/groups_small/bricks.png b/pandora_console/images/groups_small/bricks.png new file mode 100644 index 0000000000..0905f933b8 Binary files /dev/null and b/pandora_console/images/groups_small/bricks.png differ diff --git a/pandora_console/images/groups_small/chart_organisation.png b/pandora_console/images/groups_small/chart_organisation.png new file mode 100644 index 0000000000..c32d25c16f Binary files /dev/null and b/pandora_console/images/groups_small/chart_organisation.png differ diff --git a/pandora_console/images/groups_small/clock.png b/pandora_console/images/groups_small/clock.png new file mode 100644 index 0000000000..e2672c2067 Binary files /dev/null and b/pandora_console/images/groups_small/clock.png differ diff --git a/pandora_console/images/groups_small/computer.png b/pandora_console/images/groups_small/computer.png new file mode 100644 index 0000000000..9bc37dce36 Binary files /dev/null and b/pandora_console/images/groups_small/computer.png differ diff --git a/pandora_console/images/groups_small/database_gear.png b/pandora_console/images/groups_small/database_gear.png new file mode 100644 index 0000000000..7c0ab2b4c6 Binary files /dev/null and b/pandora_console/images/groups_small/database_gear.png differ diff --git a/pandora_console/images/groups_small/drive_network.png b/pandora_console/images/groups_small/drive_network.png new file mode 100644 index 0000000000..63d2d5d5b1 Binary files /dev/null and b/pandora_console/images/groups_small/drive_network.png differ diff --git a/pandora_console/images/groups_small/email.png b/pandora_console/images/groups_small/email.png new file mode 100644 index 0000000000..7348aed77f Binary files /dev/null and b/pandora_console/images/groups_small/email.png differ diff --git a/pandora_console/images/groups_small/eye.png b/pandora_console/images/groups_small/eye.png new file mode 100644 index 0000000000..564a1a9714 Binary files /dev/null and b/pandora_console/images/groups_small/eye.png differ diff --git a/pandora_console/images/groups_small/firewall.png b/pandora_console/images/groups_small/firewall.png new file mode 100644 index 0000000000..d42f3a8451 Binary files /dev/null and b/pandora_console/images/groups_small/firewall.png differ diff --git a/pandora_console/images/groups_small/heart.png b/pandora_console/images/groups_small/heart.png new file mode 100644 index 0000000000..d9ee53e590 Binary files /dev/null and b/pandora_console/images/groups_small/heart.png differ diff --git a/pandora_console/images/groups_small/house.png b/pandora_console/images/groups_small/house.png new file mode 100644 index 0000000000..fed62219f5 Binary files /dev/null and b/pandora_console/images/groups_small/house.png differ diff --git a/pandora_console/images/groups_small/images.png b/pandora_console/images/groups_small/images.png new file mode 100644 index 0000000000..184860d1e0 Binary files /dev/null and b/pandora_console/images/groups_small/images.png differ diff --git a/pandora_console/images/groups_small/lightning.png b/pandora_console/images/groups_small/lightning.png new file mode 100644 index 0000000000..9680afd12f Binary files /dev/null and b/pandora_console/images/groups_small/lightning.png differ diff --git a/pandora_console/images/groups_small/lock.png b/pandora_console/images/groups_small/lock.png new file mode 100644 index 0000000000..2ebc4f6f96 Binary files /dev/null and b/pandora_console/images/groups_small/lock.png differ diff --git a/pandora_console/images/groups_small/network.png b/pandora_console/images/groups_small/network.png new file mode 100644 index 0000000000..7d10489f1b Binary files /dev/null and b/pandora_console/images/groups_small/network.png differ diff --git a/pandora_console/images/groups_small/plugin.png b/pandora_console/images/groups_small/plugin.png new file mode 100644 index 0000000000..6187b15aec Binary files /dev/null and b/pandora_console/images/groups_small/plugin.png differ diff --git a/pandora_console/images/groups_small/server_database.png b/pandora_console/images/groups_small/server_database.png new file mode 100644 index 0000000000..b24e826c70 Binary files /dev/null and b/pandora_console/images/groups_small/server_database.png differ diff --git a/pandora_console/images/groups_small/star.png b/pandora_console/images/groups_small/star.png new file mode 100644 index 0000000000..b88c857895 Binary files /dev/null and b/pandora_console/images/groups_small/star.png differ diff --git a/pandora_console/images/groups_small/transmit.png b/pandora_console/images/groups_small/transmit.png new file mode 100644 index 0000000000..f54bf736cd Binary files /dev/null and b/pandora_console/images/groups_small/transmit.png differ diff --git a/pandora_console/images/groups_small/world.png b/pandora_console/images/groups_small/world.png new file mode 100644 index 0000000000..68f21d3011 Binary files /dev/null and b/pandora_console/images/groups_small/world.png differ diff --git a/pandora_console/images/heart.png b/pandora_console/images/heart.png new file mode 100644 index 0000000000..d9ee53e590 Binary files /dev/null and b/pandora_console/images/heart.png differ diff --git a/pandora_console/images/help.png b/pandora_console/images/help.png new file mode 100644 index 0000000000..5c870176d4 Binary files /dev/null and b/pandora_console/images/help.png differ diff --git a/pandora_console/images/hourglass.png b/pandora_console/images/hourglass.png new file mode 100644 index 0000000000..57b03ce7a6 Binary files /dev/null and b/pandora_console/images/hourglass.png differ diff --git a/pandora_console/images/house.png b/pandora_console/images/house.png new file mode 100644 index 0000000000..fed62219f5 Binary files /dev/null and b/pandora_console/images/house.png differ diff --git a/pandora_console/images/images.png b/pandora_console/images/images.png new file mode 100644 index 0000000000..184860d1e0 Binary files /dev/null and b/pandora_console/images/images.png differ diff --git a/pandora_console/images/information.png b/pandora_console/images/information.png new file mode 100644 index 0000000000..12cd1aef90 Binary files /dev/null and b/pandora_console/images/information.png differ diff --git a/pandora_console/images/lightbulb.png b/pandora_console/images/lightbulb.png new file mode 100644 index 0000000000..d22fde8ba4 Binary files /dev/null and b/pandora_console/images/lightbulb.png differ diff --git a/pandora_console/images/lightbulb_off.png b/pandora_console/images/lightbulb_off.png new file mode 100644 index 0000000000..e95b8c5b12 Binary files /dev/null and b/pandora_console/images/lightbulb_off.png differ diff --git a/pandora_console/images/lightning.png b/pandora_console/images/lightning.png new file mode 100644 index 0000000000..9680afd12f Binary files /dev/null and b/pandora_console/images/lightning.png differ diff --git a/pandora_console/images/lightning_go.png b/pandora_console/images/lightning_go.png new file mode 100644 index 0000000000..29039e6a8b Binary files /dev/null and b/pandora_console/images/lightning_go.png differ diff --git a/pandora_console/images/lock.png b/pandora_console/images/lock.png new file mode 100644 index 0000000000..2ebc4f6f96 Binary files /dev/null and b/pandora_console/images/lock.png differ diff --git a/pandora_console/images/lock_open.png b/pandora_console/images/lock_open.png new file mode 100644 index 0000000000..a471765ff1 Binary files /dev/null and b/pandora_console/images/lock_open.png differ diff --git a/pandora_console/images/monitor.png b/pandora_console/images/monitor.png new file mode 100644 index 0000000000..d040bd0223 Binary files /dev/null and b/pandora_console/images/monitor.png differ diff --git a/pandora_console/images/mouse.png b/pandora_console/images/mouse.png new file mode 100644 index 0000000000..63a92fa91c Binary files /dev/null and b/pandora_console/images/mouse.png differ diff --git a/pandora_console/images/newspaper.png b/pandora_console/images/newspaper.png new file mode 100644 index 0000000000..6a2ecce1b8 Binary files /dev/null and b/pandora_console/images/newspaper.png differ diff --git a/pandora_console/images/note.png b/pandora_console/images/note.png new file mode 100644 index 0000000000..244e6ca045 Binary files /dev/null and b/pandora_console/images/note.png differ diff --git a/pandora_console/images/page_white.png b/pandora_console/images/page_white.png new file mode 100644 index 0000000000..8b8b1ca000 Binary files /dev/null and b/pandora_console/images/page_white.png differ diff --git a/pandora_console/images/page_white_acrobat.png b/pandora_console/images/page_white_acrobat.png new file mode 100644 index 0000000000..8f8095e46f Binary files /dev/null and b/pandora_console/images/page_white_acrobat.png differ diff --git a/pandora_console/images/page_white_magnify.png b/pandora_console/images/page_white_magnify.png new file mode 100644 index 0000000000..f6b74cc40f Binary files /dev/null and b/pandora_console/images/page_white_magnify.png differ diff --git a/pandora_console/images/page_white_text.png b/pandora_console/images/page_white_text.png new file mode 100644 index 0000000000..813f712f72 Binary files /dev/null and b/pandora_console/images/page_white_text.png differ diff --git a/pandora_console/images/pandora.png b/pandora_console/images/pandora.png new file mode 100644 index 0000000000..5188ee0e6f Binary files /dev/null and b/pandora_console/images/pandora.png differ diff --git a/pandora_console/images/paste_plain.png b/pandora_console/images/paste_plain.png new file mode 100644 index 0000000000..c0490eb797 Binary files /dev/null and b/pandora_console/images/paste_plain.png differ diff --git a/pandora_console/images/phone_sound.png b/pandora_console/images/phone_sound.png new file mode 100644 index 0000000000..7fdf1c58c0 Binary files /dev/null and b/pandora_console/images/phone_sound.png differ diff --git a/pandora_console/images/pill.png b/pandora_console/images/pill.png new file mode 100644 index 0000000000..f2bdef6be8 Binary files /dev/null and b/pandora_console/images/pill.png differ diff --git a/pandora_console/images/plugin_disabled.png b/pandora_console/images/plugin_disabled.png new file mode 100644 index 0000000000..f4f6be59cb Binary files /dev/null and b/pandora_console/images/plugin_disabled.png differ diff --git a/pandora_console/images/plugin_enabled.png b/pandora_console/images/plugin_enabled.png new file mode 100644 index 0000000000..6187b15aec Binary files /dev/null and b/pandora_console/images/plugin_enabled.png differ diff --git a/pandora_console/images/printer.png b/pandora_console/images/printer.png new file mode 100644 index 0000000000..a350d18715 Binary files /dev/null and b/pandora_console/images/printer.png differ diff --git a/pandora_console/images/rainbow.png b/pandora_console/images/rainbow.png new file mode 100644 index 0000000000..5ede989a4b Binary files /dev/null and b/pandora_console/images/rainbow.png differ diff --git a/pandora_console/images/rosette.png b/pandora_console/images/rosette.png new file mode 100644 index 0000000000..f233bc7705 Binary files /dev/null and b/pandora_console/images/rosette.png differ diff --git a/pandora_console/images/server_database.png b/pandora_console/images/server_database.png new file mode 100644 index 0000000000..b24e826c70 Binary files /dev/null and b/pandora_console/images/server_database.png differ diff --git a/pandora_console/images/so_linux.gif b/pandora_console/images/so_linux.gif index c53038e206..1edb15bc61 100644 Binary files a/pandora_console/images/so_linux.gif and b/pandora_console/images/so_linux.gif differ diff --git a/pandora_console/images/star.png b/pandora_console/images/star.png new file mode 100644 index 0000000000..b88c857895 Binary files /dev/null and b/pandora_console/images/star.png differ diff --git a/pandora_console/images/status_away.png b/pandora_console/images/status_away.png new file mode 100644 index 0000000000..70bcbccaae Binary files /dev/null and b/pandora_console/images/status_away.png differ diff --git a/pandora_console/images/status_busy.png b/pandora_console/images/status_busy.png new file mode 100644 index 0000000000..987c806fff Binary files /dev/null and b/pandora_console/images/status_busy.png differ diff --git a/pandora_console/images/status_online.png b/pandora_console/images/status_online.png new file mode 100644 index 0000000000..947bd4b62c Binary files /dev/null and b/pandora_console/images/status_online.png differ diff --git a/pandora_console/images/telephone.png b/pandora_console/images/telephone.png new file mode 100644 index 0000000000..cecc436fbd Binary files /dev/null and b/pandora_console/images/telephone.png differ diff --git a/pandora_console/images/transmit.png b/pandora_console/images/transmit.png new file mode 100644 index 0000000000..f54bf736cd Binary files /dev/null and b/pandora_console/images/transmit.png differ diff --git a/pandora_console/images/user.png b/pandora_console/images/user.png new file mode 100644 index 0000000000..79f35ccbda Binary files /dev/null and b/pandora_console/images/user.png differ diff --git a/pandora_console/images/user_comment.png b/pandora_console/images/user_comment.png new file mode 100644 index 0000000000..e54ebebafb Binary files /dev/null and b/pandora_console/images/user_comment.png differ diff --git a/pandora_console/images/user_female.png b/pandora_console/images/user_female.png new file mode 100644 index 0000000000..7c71de03b2 Binary files /dev/null and b/pandora_console/images/user_female.png differ diff --git a/pandora_console/images/user_gray.png b/pandora_console/images/user_gray.png new file mode 100644 index 0000000000..8fd539e9cb Binary files /dev/null and b/pandora_console/images/user_gray.png differ diff --git a/pandora_console/images/user_green.png b/pandora_console/images/user_green.png new file mode 100644 index 0000000000..30383c2de5 Binary files /dev/null and b/pandora_console/images/user_green.png differ diff --git a/pandora_console/images/user_orange.png b/pandora_console/images/user_orange.png new file mode 100644 index 0000000000..b818127df6 Binary files /dev/null and b/pandora_console/images/user_orange.png differ diff --git a/pandora_console/images/user_red.png b/pandora_console/images/user_red.png new file mode 100644 index 0000000000..c6f66e8b30 Binary files /dev/null and b/pandora_console/images/user_red.png differ diff --git a/pandora_console/images/user_suit.png b/pandora_console/images/user_suit.png new file mode 100644 index 0000000000..b3454e15fb Binary files /dev/null and b/pandora_console/images/user_suit.png differ diff --git a/pandora_console/images/wand.png b/pandora_console/images/wand.png new file mode 100644 index 0000000000..44ccbf8128 Binary files /dev/null and b/pandora_console/images/wand.png differ diff --git a/pandora_console/images/world.png b/pandora_console/images/world.png new file mode 100644 index 0000000000..68f21d3011 Binary files /dev/null and b/pandora_console/images/world.png differ diff --git a/pandora_console/images/wrench.png b/pandora_console/images/wrench.png new file mode 100644 index 0000000000..5c8213fef5 Binary files /dev/null and b/pandora_console/images/wrench.png differ diff --git a/pandora_console/images/wrench_orange.png b/pandora_console/images/wrench_orange.png new file mode 100644 index 0000000000..565a9330e0 Binary files /dev/null and b/pandora_console/images/wrench_orange.png differ diff --git a/pandora_console/images/zoom.png b/pandora_console/images/zoom.png new file mode 100644 index 0000000000..908612e394 Binary files /dev/null and b/pandora_console/images/zoom.png differ diff --git a/pandora_console/include/config.php b/pandora_console/include/config.php index ec611fd507..4bf8dc3380 100644 --- a/pandora_console/include/config.php +++ b/pandora_console/include/config.php @@ -1,13 +1,15 @@ "; // Show GOTO FIRST button echo ''; - echo ""; + echo ""; echo ""; echo " "; // Show PREVIOUS button @@ -438,9 +426,9 @@ function pagination ($count, $url, $offset ) { $index_page_prev= ($index_page-(floor($block_limit/2)))*$block_size; if ($index_page_prev < 0) $index_page_prev = 0; - echo ' '; + echo ''; } - + echo " ";echo " "; // Draw blocks markers // $i stores number of page for ($i = $inicio_pag; $i < $index_limit; $i++) { @@ -462,6 +450,7 @@ function pagination ($count, $url, $offset ) { echo ' '; echo ""; } + echo " ";echo " "; // Show NEXT PAGE (fast forward) // Index_counter stores max of blocks if (($paginacion_maxima == 1) AND (($index_counter - $i) > 0)) { @@ -469,7 +458,7 @@ function pagination ($count, $url, $offset ) { if ($prox_bloque > $count) $prox_bloque = ($count -1) - $block_size; echo ''; - echo " "; + echo " "; $i = $index_counter; } // if exists more registers than i can put in a page (defined by $block_size config parameter) @@ -478,8 +467,8 @@ function pagination ($count, $url, $offset ) { // as painted in last block (last integer block). if (($count - $block_size) > 0){ $myoffset = floor(($count-1)/ $block_size)* $block_size; - echo ' '; - echo ""; + echo ''; + echo ""; echo ""; } // End div and layout diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index d36c9dea01..cd00ddba1a 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -214,7 +214,7 @@ function dame_module_id($nombre){ // Returns agent name when given its ID // --------------------------------------------------------------- -function dame_nombre_agente($id){ +function dame_nombre_agente ($id){ require("config.php"); $query1="SELECT * FROM tagente WHERE id_agente = ".$id; $resq1=mysql_query($query1); @@ -527,6 +527,20 @@ function dame_so_icon($id){ return $pro; } +// --------------------------------------------------------------- +// Returns Admin value (0 no admin, 1 admin) +// --------------------------------------------------------------- + +function dame_admin($id){ + require("config.php"); + $query1="SELECT * FROM tusuario WHERE id_usuario ='".$id."'"; + $rowdup=mysql_query($query1); + $rowdup2=mysql_fetch_array($rowdup); + $admin=$rowdup2["nivel"]; + return $admin; +} + + // --------------------------------------------------------------- // event_insert - Insert event in eventable, using Id_grupo, Id_agente and Evento // --------------------------------------------------------------- diff --git a/pandora_console/include/languages/language_en.php b/pandora_console/include/languages/language_en.php index 1e89c273eb..284ac41c95 100644 --- a/pandora_console/include/languages/language_en.php +++ b/pandora_console/include/languages/language_en.php @@ -1,13 +1,15 @@
"; -$lang_label["user_last_activity"]="This is your last activity in Pandora"; +$lang_label["user_last_activity"]="This is your last activity in Pandora FMS console"; $lang_label["err_auth"]="Authentication Error"; $lang_label["err_auth_msg"]="Either, your password or your login are incorrect. Please check your CAPS LOCK key, username and password are case SeNSiTiVe.

All actions, included failed login attempts are logged in Pandora System logs, and these can be reviewed by each user, please report to admin any incident or malfunction."; $lang_label["find_crit"]="Please select a search criterion"; @@ -664,6 +666,7 @@ $lang_label["validate_event_failed"]="Event validation failed"; // 21 feb 2007 $lang_label["load"]="Load"; +$lang_label["information"]="General information"; global $lang_label; global $help_label; diff --git a/pandora_console/include/styles/link.css b/pandora_console/include/styles/link.css index 8f975d8fcc..e538031abc 100644 --- a/pandora_console/include/styles/link.css +++ b/pandora_console/include/styles/link.css @@ -1,3 +1,24 @@ +/* +// Pandora FMS - the Free monitoring system +// ======================================== +// Copyright (c) 2004-2007 Sancho Lerena, slerena@openideas.info +// Copyright (c) 2005-2007 Artica Soluciones Tecnologicas +// Copyright (c) 2004-2007 Raul Mateos Martin, raulofpandora@gmail.com +// Copyright (c) 2006-2007 Jose Navarro jose@jnavarro.net +// Copyright (c) 2006-2007 Jonathan Barajas, jonathan.barajas[AT]gmail[DOT]com + +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation version 2 +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// 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. +*/ + #link a { display: block; color: #000; diff --git a/pandora_console/include/styles/op.css b/pandora_console/include/styles/op.css index 1de51cc7e5..43afef831d 100644 --- a/pandora_console/include/styles/op.css +++ b/pandora_console/include/styles/op.css @@ -26,28 +26,30 @@ div#op7s>ul, div#op8s>ul, div#op9s>ul { width: 126px; } #op1 li , #op1 li:hover, #op1s li { - background: url(../../images/op1.gif) no-repeat 4px 3px; + background: url(../../images/bricks.png) no-repeat 4px 3px; } #op2 li, #op2 li:hover, #op2s li { - background: url(../../images/op2.gif) no-repeat 3px 3px; + background: url(../../images/server_database.png) no-repeat 4px 3px; } #op3 li, #op3 li:hover, #op3s li { - background: url(../../images/op3.gif) no-repeat 5px 3px; + background: url(../../images/book_edit.png) no-repeat 4px 3px; } #op4 li, #op4 li:hover, #op4s li { - background: url(../../images/op4.gif) no-repeat 5px 3px; + background: url(../../images/lightning_go.png) no-repeat 4px 3px; } +/* users */ #op5 li, #op5 li:hover, #op5s li { - background: url(../../images/op5.gif) no-repeat 7px 3px; + background: url(../../images/group.png) no-repeat 4px 3px; } #op6 li, #op6 li:hover, #op6s li { - background: url(../../images/op6.gif) no-repeat 4px 5px; + background: url(../../images/computer_error.png) no-repeat 4px 5px; } +/* trap console */ #op7 li, #op7 li:hover, #op7s li { - background: url(../../images/op7.gif) no-repeat 1px 0px; + background: url(../../images/email.png) no-repeat 4px 3px; } #op8 li, #op8 li:hover, #op8s li { - background: url(../../images/op8.gif) no-repeat 4px 3px; + background: url(../../images/chart_pie.png) no-repeat 4px 3px; } #op9 li, #op9 li:hover, #op9s li { background: url(../../images/op9.gif) no-repeat 4px 3px; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 999e88cda3..1364ed0ff8 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -1,23 +1,21 @@ /* -// Pandora - the Free monitoring system -// ==================================== -// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com -// Copyright (c) 2005-2006 Artica Soluciones Tecnológicas S.L, info@artica.es -// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com -// This program is free software; - you can redistribute it and/or +// Pandora FMS - the Free monitoring system +// ======================================== +// Copyright (c) 2004-2007 Sancho Lerena, slerena@openideas.info +// Copyright (c) 2005-2007 Artica Soluciones Tecnologicas +// Copyright (c) 2004-2007 Raul Mateos Martin, raulofpandora@gmail.com +// Copyright (c) 2006-2007 Jose Navarro jose@jnavarro.net +// Copyright (c) 2006-2007 Jonathan Barajas, jonathan.barajas[AT]gmail[DOT]com + +// This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; - either version 2 -// of the License, or (at your option) any later version. +// as published by the Free Software Foundation version 2 // This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; - without even the implied warranty of +// but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with this program; - if not, write to the Free Software +// along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @@ -35,12 +33,10 @@ select, textarea, input { } textarea { border: 1px solid #c0c0c0; - -moz-border-radius: 3%; padding: 5px; } input { border: 1px solid #c0c0c0; - -moz-border-radius: 1%; padding: 2px 3px 4px 3px; height: 23px; } @@ -49,6 +45,8 @@ option { } h1, h2 { color: #103a3a; + padding-bottom: 15px; + padding-top: 10px; } h3 { color: #3c566d; @@ -194,11 +192,18 @@ input.sub { table, img { border: 0px; } + th, td.lb { color: #ffffff; background-color: #778866; } -td.lb { + +td.lb_view { + color: #ffffff; + background-color: #7BA04A; +} + +td.lb, td.lb_view { height: 16px; padding-left: 3px; font-weight: bold; @@ -206,7 +211,7 @@ td.lb { td.datos, td.datost, td.datosb, td.datos_id, td.datosf9, td.datosf9i, td.datos_jus, td.w90datos, td.w135datos { /* background-color: #f5f5f5; */ - background-color: #F9F9F9; + background-color: #F9F9F9; } td.datos2, td.datos2t, td.datos2b, td.datos2_id, td.datos2f9, @@ -234,7 +239,7 @@ td.datos_jus, td.datos2_jus { background-color: #D84437; } .bg4 { /* links */ - background-color: #D8C4C4; + background-color: #5385BF; } .bg, .bg2, .bg3, .bg4 { @@ -265,6 +270,7 @@ td.datosf9i, td.datos2f9i { } .jus { text-align: justify; + width: 700px; } .tit { padding-top: 3px; @@ -446,7 +452,9 @@ div.title_line { div.data_box { border-top: 5px solid #4E682C; - padding-left: 10px; + border-right: 1px solid #4E682C; + border-bottom: 1px solid #4E682C; + padding-left: 20px; padding-top: 0px; padding-bottom: 20px; margin-bottom: 25px; @@ -455,8 +463,9 @@ div.data_box { width: 800px; float: left; margin-top: 0px; - margin-left: -5px; + margin-left: 0px; margin-right: 0px; + min-height: 470px; } #menu_tab .mn, #menu_tab ul, #menu_tab .mn ul @@ -472,12 +481,12 @@ div.data_box { } #menu_tab li a, #menu_tab li.nomn a { - background: #db6351; - padding: 1px 9px 1px 9px; + background: #0FB800; + padding: 2px 10px 2px 10px; color: #fff; - border: 1px solid #E01A1E; + border: 1px solid #0F5800; font-weight: bold; - line-height: 17px; + line-height: 18px; } #menu_tab .mn li a @@ -489,7 +498,7 @@ div.data_box { #menu_tab li.nomn:hover a, #menu_tab li:hover ul a:hover { - background: #b2b08a; + background: #25DB00; } #menu_tab li:hover a { @@ -502,19 +511,19 @@ div.data_box { } span.users { - background: url(../../images/usuarios.gif) no-repeat; + background: url(../../images/group.png) no-repeat; } span.agents { - background: url(../../images/agentes.gif) no-repeat; + background: url(../../images/bricks.png) no-repeat; } span.data { - background: url(../../images/datos.gif) no-repeat; + background: url(../../images/data.gif) no-repeat; } span.alerts { - background: url(../../images/alertas.gif) no-repeat; + background: url(../../images/bell.png) no-repeat; } span.time { - background: url(../../images/time.gif) no-repeat; + background: url(../../images/hourglass.png) no-repeat; } span.users, span.agents, span.data, span.alerts, span.time { margin-left: 4px; @@ -524,4 +533,18 @@ span.users, span.agents, span.data, span.alerts, span.time { } .mgb25 { margin-bottom: 25px; +} + +#head { + border-bottom: 1px solid #708090; + padding-bottom: 12px; + font-size: 10px; + width: 800px; + margin-bottom: 27px; + margin-left: 5px; +} +#foot { + padding-top: 25px; + text-align: center; + clear: both; } \ No newline at end of file diff --git a/pandora_console/index.php b/pandora_console/index.php index 7abb9ce4d8..f5073bcf78 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -95,7 +95,6 @@ if (isset ($_GET["refr"])){ // Login process if ( (! isset ($_SESSION['id_usuario'])) AND (isset ($_GET["login"]))) { - $nick = entrada_limpia ($_POST["nick"]); $pass = entrada_limpia ($_POST["pass"]); @@ -154,48 +153,34 @@ if (isset ($_GET["refr"])){ include "general/login_page.php"; exit; } - - if (isset ($_GET["logoff"])) { - // Log off - unset ($_GET["sec2"]); - $_GET["sec"] = "general/logoff"; + + // Log off + if (isset ($_GET["bye"])) { + include "general/logoff.php"; $iduser = $_SESSION["id_usuario"]; logoff_db ($iduser, $REMOTE_ADDR); session_unregister ("id_usuario"); + exit; } $pagina = ""; + if (isset ($_GET["sec2"])){ + $sec2 = parametro_limpio ($_GET["sec2"]); + $pagina = $sec2; + } else + $sec2 = ""; + if (isset ($_GET["sec"])){ $sec = parametro_limpio ($_GET["sec"]); $pagina = $sec2; } else $sec = ""; - - if (isset ($_GET["sec2"])){ - $sec2 = parametro_limpio ($_GET["sec2"]); - $pagina = $sec2; - } else - $sec2 = ""; - - ?>
-
- - -
- -
- Pandora FMS Header -
-

- -

-
- - - +
+ +
- -
-
+ diff --git a/pandora_console/install.php b/pandora_console/install.php index f2654bd583..d1946361a7 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -335,18 +335,16 @@ function install_step4() { $cfgout = fopen ($pandora_config,"w"); $config_contents = fread ($cfgin, filesize("include/config.inc.php")); - $config_new = ' - - - - '; + $config_new = ''; $step7 = fputs ($cfgout, $config_new); $step7 = $step7 + fputs ($cfgout, $config_contents); if ($step7 > 0) diff --git a/pandora_console/operation/agentes/bulbs.php b/pandora_console/operation/agentes/bulbs.php index c82067b262..f58d83e092 100644 --- a/pandora_console/operation/agentes/bulbs.php +++ b/pandora_console/operation/agentes/bulbs.php @@ -1,14 +1,16 @@ - ".$lang_label["red_light"]."
 - ".$lang_label["yellow_light"]." + - ".$lang_label["fired"]."
- ".$lang_label["no_light"]." - ".$lang_label["blue_light"]." - ".$lang_label["broken_light"]."
+
+ - ".$lang_label["not_fired"]."
"; ?> \ No newline at end of file diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index 1bab642b22..2d7b3cbfee 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_agente.php @@ -1,14 +1,15 @@ ".$lang_label["ag_title"].""; - echo "

".$lang_label["summary"]." - -  ".$lang_label["help"]."

"; + + echo "

".$lang_label["ag_title"]." > ".$lang_label["summary"]." +  ".$lang_label["help"]."

"; // Show group selector - if (isset($_POST["ag_group"])){ $ag_group = $_POST["ag_group"]; echo "
"; + // Show only selected groups + if ($ag_group > 1){ + $sql="SELECT * FROM tagente WHERE id_grupo=$ag_group + AND disabled = 0 ORDER BY nombre LIMIT $offset, $block_size "; + $sql2="SELECT COUNT(id_agente) FROM tagente WHERE id_grupo=$ag_group + AND disabled = 0 ORDER BY nombre"; + } + else { + $sql="SELECT * FROM tagente WHERE disabled = 0 + ORDER BY nombre, id_grupo LIMIT $offset, $block_size"; + $sql2="SELECT COUNT(id_agente) FROM tagente WHERE disabled = 0 + ORDER BY nombre, id_grupo"; + } - if ($ag_group > 1) - $sql='SELECT * FROM tagente WHERE id_grupo='.$ag_group.' - AND disabled = 0 ORDER BY nombre'; - else - $sql='SELECT * FROM tagente WHERE disabled = 0 - ORDER BY id_grupo, nombre'; - + $result2=mysql_query($sql2); + $row2=mysql_fetch_array($result2); + $total_events = $row2[0]; + echo "
"; + // Prepare pagination + + pagination ($total_events, "index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=$group_id&refr=60", $offset); + // Show data. + echo "
"; $result=mysql_query($sql); if (mysql_num_rows($result)){ - echo ""; - echo " - ".$lang_label["fired"]; - echo "  "; - echo ""; - echo " - ".$lang_label["not_fired"]; - echo ""; - echo "
"; echo ""; echo ""; echo ""; @@ -112,7 +133,7 @@ if (comprueba_login() == 0) { $agent_type = $row["agent_type"]; $ultimo_contacto = $row["ultimo_contacto"]; $biginterval=$intervalo; - foreach ($mis_grupos as $migrupo){ //Verifiy if the group this agent begins is one of the user groups + foreach ($mis_grupos as $migrupo){ //Verifiy if the group this agent begins is one of the user groups if (($migrupo ==1) || ($id_grupo==$migrupo)){ $pertenece = 1; break; @@ -125,6 +146,7 @@ if (comprueba_login() == 0) { $sql_t="SELECT * FROM tagente_estado, tagente_modulo WHERE tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.id_agente=".$id_agente; + // $sql_t="SELECT * FROM tagente_estado WHERE id_agente=".$id_agente; $result_t=mysql_query($sql_t); $estado_general = 0; $numero_modulos = 0; @@ -182,7 +204,6 @@ if (comprueba_login() == 0) { } echo ""; echo ""; } - echo ''; + echo ''; echo ""; echo "
".$lang_label["agent"]."".$lang_label["os"]."
"; - $id_grupo=dame_id_grupo($id_agente); if (give_acl($id_user, $id_grupo, "AW")==1){ echo "".$intervalo." - - ( '.dame_grupo($id_grupo).' ) + ". $numero_modulos." / ".$numero_monitor; if ($monitor_bad <> 0) { @@ -239,16 +259,16 @@ if (comprueba_login() == 0) { elseif ($monitor_down > 0) { echo ""; } - } else { + } else echo ""; - } - // checks if an alert was fired recently + + // checks if an alert was fired recently echo ""; - if (check_alert_fired($id_agente) == 1) { + if (check_alert_fired($id_agente) == 1) echo ""; - } else { + else echo ""; - } + echo ""; if ( $ultimo_contacto == "0000-00-00 00:00:00"){ @@ -282,5 +302,5 @@ if (comprueba_login() == 0) { audit_db($id_user,$REMOTE_ADDR, "ACL Violation","Trying to access Agent view"); require ("general/noaccess.php"); } -} + ?> diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index 43faec7936..dfcc7ca7bc 100644 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -1,14 +1,15 @@ ".$lang_label["ag_title"]." > ".$lang_label["view_agent_general_data"]." ".$lang_label["help"].""; - echo ''; + + // Blank space below title + echo "
"; + + echo '
'; + echo ""; echo '
"; + echo ''; + echo " - '; - echo " - "; + echo ''; echo ' - - - - + '; echo ''; echo ' - '; + '; echo ''; echo ' - '; + '; - echo ""; echo ''; echo ' - '; + '; if ($agent_type == 0) { echo ''; - } + '; + } else { + echo ''; + } // Total packets echo ' - '; // Last contact @@ -128,7 +126,7 @@ if (comprueba_login() == 0) { - - '; + echo "
"; echo '
'.$lang_label["agent_name"].''.salida_limpia($nombre_agente); + '.strtoupper(salida_limpia($nombre_agente)); - echo "  - "; - if (dame_admin($_SESSION['id_usuario'])==1 ) - echo " - "; + echo " +   "; // Data base access graph echo ' - ".$lang_label["agent_access_rate"]."

- -
'.$lang_label["ip_address"].''.salida_limpia($direccion_agente); + '.salida_limpia($direccion_agente); if ($agent_type == 0) { echo '
'.$lang_label["os"].' + - '.dame_so_name($id_os); + if ($os_version != "") + echo ' '.salida_limpia($os_version); } elseif ($agent_type == 1) { echo '
'.$lang_label["agent_type"].''; + '.$lang_label["agent_type"].''; } - if ($os_version != "") echo ' '.salida_limpia($os_version); echo '
'.$lang_label["interval"].''.$intervalo.''.$intervalo.'
'.salida_limpia($lang_label["description"]).''.$comentarios.''.$comentarios.'".$lang_label["agent_module_shareout"]."

- -
'.salida_limpia($lang_label["group"]).' - - ( '.dame_grupo($id_grupo).' )
+    '.dame_grupo($id_grupo).'
'.$lang_label["agentversion"].' - '.salida_limpia($agent_version).''.salida_limpia($agent_version).'
'.$lang_label["agentversion"].' + N/A
'.$lang_label["total_packets"].''; + '; $total_paketes= 0; - $id_agente = dame_agente_id($nombre_agente); - $sql_2='SELECT id_agente_modulo FROM tagente_modulo WHERE id_agente = '.$id_agente; - $result_t=mysql_query($sql_2); - while ($row=mysql_fetch_array($result_t)){ - $sql_3='SELECT COUNT(*) FROM tagente_datos WHERE id_agente_modulo = '.$row["id_agente_modulo"]; - $result_3=mysql_query($sql_3); - $row3=mysql_fetch_array($result_3); - $total_paketes = $total_paketes + $row3['0']; - } + + $sql_3='SELECT COUNT(*) FROM tagente_datos WHERE id_agente = '.$id_agente; + $result_3=mysql_query($sql_3); + $row3=mysql_fetch_array($result_3); + $total_paketes = $row3[0]; + echo $total_paketes; echo '
'.$lang_label["last_contact"]." / ".$lang_label["remote"].' '; + '; if ($ultima_act == "0000-00-00 00:00:00"){ echo $lang_label["never"]; } else { @@ -143,7 +141,7 @@ if (comprueba_login() == 0) { // Asigned/active server echo '
'.$lang_label["server_asigned"].''; + '; if ($server == ""){ echo "N/A"; } else { @@ -170,12 +168,29 @@ if (comprueba_login() == 0) { } echo '
'.$lang_label["next_contact"].' - +
"; + + echo "		"; + echo ""; + echo ""; + echo ""; + echo " + "; + echo "
+ ".$lang_label["agent_access_rate"]."

+ +
+ ".$lang_label["agent_module_shareout"]."

+ +
'; + + echo "
"; } diff --git a/pandora_console/operation/agentes/estado_grupo.php b/pandora_console/operation/agentes/estado_grupo.php index 601b55f088..2d863a2c17 100644 --- a/pandora_console/operation/agentes/estado_grupo.php +++ b/pandora_console/operation/agentes/estado_grupo.php @@ -1,14 +1,16 @@ ".$lang_label["ag_title"].""; - echo "

".$lang_label["group_view"]." - - ".$lang_label["help"]." -

"; - - $mis_grupos=list_group2 ($id_user); - - // Update network modules for this group - // Check for Network FLAG change request - if (isset ($_GET["update_netgroup"])) { - if (give_acl ($id_user, $_GET["update_netgroup"], "AW") == 1) { - $sql = "SELECT * FROM tagente WHERE id_grupo = ". - $_GET["update_netgroup"]; - $result = mysql_query ($sql); - while ($row = mysql_fetch_array ($result)) { - $id_agente = $row["id_agente"]; - $query2 ="UPDATE tagente_modulo SET flag=1 - WHERE id_agente = ".$id_agente; - $res = mysql_query ($query2); - } - } - } - - $contador_grupo = 0; - $contador_agente = 0; - $array_index = 0; - - // Recorro cada grupo para ver el estado de todos los modulos - foreach ($mis_grupos as $migrupo) { - if ($migrupo != "") { - $grupo[$array_index]["agent"] = 0; - $grupo[$array_index]["ok"] = 0; - $grupo[$array_index]["down"] = 0; - $grupo[$array_index]["bad"] = 0; - $grupo[$array_index]["alerts"] = 0; - $grupo[$array_index]["data"] = 0; - $grupo[$array_index]["icon"] = dame_grupo_icono ($migrupo); - $grupo[$array_index]["id_grupo"] = $migrupo; - $existen_agentes =0; - - $sql1 = "SELECT intervalo, id_agente - FROM tagente WHERE disabled=0 - AND id_grupo =".$migrupo; - if ($result1 = mysql_query ($sql1)) { - while ($row1 = mysql_fetch_array ($result1)) { - $existen_agentes = 1; - $intervalo = $row1["intervalo"]; - $id_agente = $row1["id_agente"]; - - // Check for recent alerts - if (check_alert_fired($id_agente) == 1) { - $grupo[$array_index]["alerts"]++; - } - - $grupo[$array_index]["agent"]++; - $grupo[$array_index]["group"] = dame_nombre_grupo ($migrupo); - // Estado grupo, agent - $contador_agente++; - $sql3 = "SELECT estado, timestamp, id_agente_modulo, - datos FROM tagente_estado - WHERE id_agente = ".$row1["id_agente"]; - $result3 = mysql_query ($sql3); - while ($row3 = mysql_fetch_array ($result3)) { - $estado = $row3["estado"]; - // Get module interval - $ahora = date ("Y/m/d H:i:s"); - $sql4 = "SELECT module_interval - FROM tagente_modulo - WHERE id_agente_modulo = ".$row3["id_agente_modulo"]; - $result4 = mysql_query ($sql4); - if ($row4 = mysql_fetch_array ($result4)) { - $module_interval = $row4["module_interval"]; - if ($module_interval > 0) { - $intervalo_comp = $module_interval; - } else { - $intervalo_comp = $intervalo; - } - } - - $ultimo_contacto_modulo = $row3["timestamp"]; - - // Defines if module is down (interval x 2 > time last contact) - if ($ultimo_contacto_modulo != "0000-00-00 00:00:00") { - $seconds = strtotime ($ahora) - - strtotime ($ultimo_contacto_modulo); - if ($seconds >= ($intervalo_comp * 2)) { - $grupo[$array_index]["down"]++; - } elseif ($estado != 100) { - if ($row3["datos"] != 0) { - $grupo[$array_index]["ok"]++; - } else { - $grupo[$array_index]["bad"]++; - } - } elseif ($estado == 100) // For data module, not monitors - $grupo[$array_index]["data"]++; // Data module - } - } - } - } - - if ($existen_agentes == 1){ - $array_index++; - } - } - } - - if ($contador_agente != 0) { - $ancho = ceil(sqrt($array_index+1)); - $real_count =0; - echo ""; - for ($table=0; $table < $ancho; $table++) { - echo ""; - for ($table_row=0; $table_row < $ancho; $table_row++) { - if ($real_count < $array_index) { - - $group_name = $grupo[$real_count]["group"]; - $icono_grupo = $grupo[$real_count]["icon"]; - $icono_type = ""; - - if ($grupo[$real_count]["down"] > 0) { - $icono_type = " - "; - } - if ($grupo[$real_count]["bad"] > 0) { - $icono_type = $icono_type." - "; - } - if ($grupo[$real_count]["ok"] > 0) { - $icono_type = $icono_type." - "; - } - if ($grupo[$real_count]["data"] > 0) { - $icono_type = $icono_type." - "; - } - // Show yellow light if there are recent alerts fired for this group - if ($grupo[$real_count]["alerts"] > 0 ){ - $icono_type=$icono_type." - "; - } - - // TOOLTIP. - $celda = ""; - } - - echo "
- - - - - - -
". - $lang_label["agents"].":
". - $grupo[$real_count]["agent"]."
- - - - - - - - - - - - - - - - - - - - -
". - ucfirst($lang_label["monitors"]).":
- - ".$lang_label["ok"].": - ".$grupo[$real_count]["ok"]." -
- - ".$lang_label["down"].": ". - $grupo[$real_count]["down"]."
- - ".$lang_label["fail"].": ". - $grupo[$real_count]["bad"]."
- - ".$lang_label["alerts"].": ". - $grupo[$real_count]["alerts"]."
- "; - // Render network exec module button, only when this group is writtable by user - if (give_acl ($id_user, $grupo[$real_count]["id_grupo"], "AW") == 1) { - $celda .= "  - "; - } - $celda .= "

". - $icono_type."

- ".$group_name.""; - echo $celda; - } - $real_count++; - } - echo "
"; - } else { - echo "
".$lang_label["no_agent_def"]."
"; - } - } else { - echo "
".$lang_label["no_agent"]."
"; + if (give_acl ($id_user, 0, "AR") != 1) { + audit_db ($id_user, $REMOTE_ADDR, "ACL Violation", + "Trying to access Agent view (Grouped)"); + require ("general/noaccess.php"); + exit; } -} else { - audit_db ($id_user, $REMOTE_ADDR, "ACL Violation", - "Trying to access Agent view (Grouped)"); - require ("general/noaccess.php"); -} + echo "

".$lang_label["ag_title"]." > ".$lang_label["group_view"]." + + ".$lang_label["help"]." +

"; + + $mis_grupos = list_group2 ($id_user); + + // Update network modules for this group + // Check for Network FLAG change request + if (isset ($_GET["update_netgroup"])) { + if (give_acl ($id_user, $_GET["update_netgroup"], "AW") == 1) { + $sql = "SELECT * FROM tagente WHERE id_grupo = ". + $_GET["update_netgroup"]; + $result = mysql_query ($sql); + while ($row = mysql_fetch_array ($result)) { + $id_agente = $row["id_agente"]; + $query2 ="UPDATE tagente_modulo SET flag=1 + WHERE id_agente = ".$id_agente; + $res = mysql_query ($query2); + } + } + } + + $contador_grupo = 0; + $contador_agente = 0; + $array_index = 0; + + // For each valid group for this user, take data from agent and modules + foreach ($mis_grupos as $migrupo) { + if ($migrupo != "") { + $grupo[$array_index]["agent"] = 0; + $grupo[$array_index]["ok"] = 0; + $grupo[$array_index]["down"] = 0; + $grupo[$array_index]["bad"] = 0; + $grupo[$array_index]["alerts"] = 0; + $grupo[$array_index]["data"] = 0; + $grupo[$array_index]["icon"] = dame_grupo_icono ($migrupo); + $grupo[$array_index]["id_grupo"] = $migrupo; + $existen_agentes =0; + + $sql1 = "SELECT intervalo, id_agente + FROM tagente WHERE disabled=0 + AND id_grupo = ".$migrupo; + if ($result1 = mysql_query ($sql1)) { + while ($row1 = mysql_fetch_array ($result1)) { + $existen_agentes = 1; + $intervalo = $row1["intervalo"]; + $id_agente = $row1["id_agente"]; + + // Check for recent alerts + if (check_alert_fired($id_agente) == 1) { + $grupo[$array_index]["alerts"]++; + } + + $grupo[$array_index]["agent"]++; + $grupo[$array_index]["group"] = dame_nombre_grupo ($migrupo); + // Estado grupo, agent + $contador_agente++; + $sql3 = "SELECT estado, timestamp, id_agente_modulo, + datos FROM tagente_estado + WHERE id_agente = ".$row1["id_agente"]; + $result3 = mysql_query ($sql3); + while ($row3 = mysql_fetch_array ($result3)) { + $estado = $row3["estado"]; + // Get module interval + $ahora = date ("Y/m/d H:i:s"); + $sql4 = "SELECT module_interval + FROM tagente_modulo + WHERE id_agente_modulo = ".$row3["id_agente_modulo"]; + $result4 = mysql_query ($sql4); + if ($row4 = mysql_fetch_array ($result4)) { + $module_interval = $row4["module_interval"]; + if ($module_interval > 0) { + $intervalo_comp = $module_interval; + } else { + $intervalo_comp = $intervalo; + } + } + + $ultimo_contacto_modulo = $row3["timestamp"]; + + // Defines if module is down (interval x 2 > time last contact) + if ($ultimo_contacto_modulo != "0000-00-00 00:00:00") { + $seconds = strtotime ($ahora) - + strtotime ($ultimo_contacto_modulo); + if ($seconds >= ($intervalo_comp * 2)) { + $grupo[$array_index]["down"]++; + } elseif ($estado != 100) { + if ($row3["datos"] != 0) { + $grupo[$array_index]["ok"]++; + } else { + $grupo[$array_index]["bad"]++; + } + } elseif ($estado == 100) // For data module, not monitors + $grupo[$array_index]["data"]++; // Data module + } + } + } + } + if ($existen_agentes == 1){ + $array_index++; + } + } + } + + // Draw data + + if ($contador_agente != 0) { + $ancho = ceil(sqrt($array_index+1)); + $real_count =0; + echo ""; + for ($table=0; $table < $ancho; $table++) { + echo ""; + for ($table_row=0; $table_row < $ancho; $table_row++) { + if ($real_count < $array_index) { + + $group_name = $grupo[$real_count]["group"]; + $icono_grupo = $grupo[$real_count]["icon"]; + $icono_type = ""; + + if ($grupo[$real_count]["down"] > 0) { + $icono_type = " + "; + } + if ($grupo[$real_count]["bad"] > 0) { + $icono_type = $icono_type." + "; + } + if ($grupo[$real_count]["ok"] > 0) { + $icono_type = $icono_type." + "; + } + if ($grupo[$real_count]["data"] > 0) { + $icono_type = $icono_type." + "; + } + // Show yellow light if there are recent alerts fired for this group + if ($grupo[$real_count]["alerts"] > 0 ){ + $icono_type=$icono_type." + "; + } + + // TOOLTIP. + $celda = ""; + } + + echo "
+ + + + + + +
". + $lang_label["agents"].":
". + $grupo[$real_count]["agent"]."
+ + + + + + + + + + + + + + + + + + + + +
". + ucfirst($lang_label["monitors"]).":
+ + ".$lang_label["ok"].": + ".$grupo[$real_count]["ok"]." +
+ + ".$lang_label["down"].": ". + $grupo[$real_count]["down"]."
+ + ".$lang_label["fail"].": ". + $grupo[$real_count]["bad"]."
+ + ".$lang_label["alerts"].": ". + $grupo[$real_count]["alerts"]."
+ "; + // Render network exec module button, only when this group is writtable by user + if (give_acl ($id_user, $grupo[$real_count]["id_grupo"], "AW") == 1) { + $celda .= "  + "; + } + $celda .= "

". + $icono_type."

+ ".$group_name.""; + echo $celda; + } + $real_count++; + } + echo "
"; + } else { + echo "
".$lang_label["no_agent_def"]."
"; + } + + ?> diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index f16ee25c4c..6ec6f6915b 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -1,14 +1,15 @@ -
    -
  • "; - - echo "Main"; - echo "
    • "; +
      "; + if (give_acl($id_usuario,$id_grupo, "AW") == 1){ + // Manage agent + echo "
    • Manage"; + echo "
      • "; + } + // Main view echo "
    • "; - echo "Data"; + echo " Main"; echo "
      • "; + + // Data echo "
    • "; - echo "Alerts"; + echo " Data"; echo "
      • "; + + // Alerts + echo "
    • "; + echo " Alerts"; + echo "
      • "; + + // Go to group view + echo "
    • "; + echo " Group view"; + echo "
      • "; + echo "
    "; echo ""; - + echo "
    "; switch ($tab) { + /* http://pandora.localhost/index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=600 */ + case "manage": require "estado_generalagente.php"; + echo "
    "; + case "main": require "estado_generalagente.php"; echo "
    "; //require "estado_monitores.php"; diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index c1f2dd5d86..0d33a3363c 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -1,14 +1,15 @@