From ea1a814c4093993290c18c825fa737d78c2147c0 Mon Sep 17 00:00:00 2001 From: raulmateos Date: Mon, 2 Apr 2007 17:17:27 +0000 Subject: [PATCH] 2007-04-02 Raul Mateos * images/ok.gif: Deleted * images/cross.png, go.png, ok.png, upd.png: Added new images * include/styles/pandora.css, tip.css, op.css: Updated. Deleted some old styles, not all. * include/languages/language_en.php, language_es_es.php: Added text for no recon task. * godmode/*.php, operation/*.php, help/*.php: Changed some icons, updated several buttons with new icons. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@410 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 15 +++++ .../godmode/agentes/alert_manager.php | 2 +- .../godmode/agentes/modificar_agente.php | 8 +-- .../godmode/agentes/module_manager.php | 2 +- .../godmode/alertas/modificar_alerta.php | 21 +++---- .../godmode/grupos/lista_grupos.php | 4 +- .../godmode/modules/manage_nc_groups.php | 2 +- .../modules/manage_network_components.php | 2 +- .../modules/manage_network_templates.php | 2 +- .../modules/manage_network_templates_form.php | 2 +- .../godmode/modules/module_list.php | 2 +- .../godmode/perfiles/lista_perfiles.php | 52 +++++++++--------- .../godmode/servers/manage_recontask.php | 37 +++++++------ .../godmode/servers/modificar_server.php | 2 +- pandora_console/godmode/setup/links.php | 12 ++-- pandora_console/godmode/setup/setup.php | 4 +- .../godmode/usuarios/configurar_usuarios.php | 2 +- .../godmode/usuarios/lista_usuarios.php | 17 +++--- pandora_console/help/en/chap2.php | 4 +- pandora_console/help/en/chap3.php | 6 +- pandora_console/help/en/chap5.php | 4 +- pandora_console/help/en/chap7.php | 2 +- pandora_console/help/es/chap2.php | 4 +- pandora_console/help/es/chap3.php | 6 +- pandora_console/help/es/chap5.php | 4 +- pandora_console/help/es/chap7.php | 2 +- pandora_console/images/cross.png | Bin 0 -> 655 bytes pandora_console/images/go.png | Bin 0 -> 410 bytes pandora_console/images/ok.gif | Bin 795 -> 0 bytes pandora_console/images/ok.png | Bin 0 -> 781 bytes pandora_console/images/upd.png | Bin 0 -> 600 bytes pandora_console/images/zoom.png | Bin 692 -> 556 bytes .../include/languages/language_en.php | 3 + .../include/languages/language_es_es.php | 3 + pandora_console/include/styles/op.css | 8 +-- pandora_console/include/styles/pandora.css | 16 +++--- pandora_console/include/styles/tip.css | 20 ++++--- .../operation/active_console/index.php | 2 +- pandora_console/operation/events/events.php | 8 +-- .../operation/incidents/incident.php | 6 +- .../operation/messages/message.php | 6 +- .../operation/snmpconsole/snmp_alert.php | 8 +-- .../operation/snmpconsole/snmp_view.php | 8 +-- pandora_console/operation/users/user.php | 46 ++++++++-------- 44 files changed, 192 insertions(+), 162 deletions(-) create mode 100644 pandora_console/images/cross.png create mode 100644 pandora_console/images/go.png delete mode 100644 pandora_console/images/ok.gif create mode 100644 pandora_console/images/ok.png create mode 100644 pandora_console/images/upd.png diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index fb2c102f09..2b37d4f9e8 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,18 @@ +2007-04-02 Raul Mateos + + * images/ok.gif: Deleted + + * images/cross.png, go.png, ok.png, upd.png: Added new images + + * include/styles/pandora.css, tip.css, op.css: Updated. Deleted some + old styles, not all. + + * include/languages/language_en.php, language_es_es.php: Added text + for no recon task. + + * godmode/*.php, operation/*.php, help/*.php: Changed some icons, + updated several buttons with new icons. + 2007-04-01 Raul Mateos * pandoradb.sql, pandoradb_data.sql: Removed comments that diff --git a/pandora_console/godmode/agentes/alert_manager.php b/pandora_console/godmode/agentes/alert_manager.php index 856057794f..293ed27543 100644 --- a/pandora_console/godmode/agentes/alert_manager.php +++ b/pandora_console/godmode/agentes/alert_manager.php @@ -73,7 +73,7 @@ $result=mysql_query($sql1); $string = $string." - ".$lang_label["delete"]."   "; + ".$lang_label["delete"]."   "; $string = $string." diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index ea73f389fe..2955f987a8 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -189,25 +189,25 @@ if (mysql_num_rows($result)){ borrar_agente=".$row["id_agente"]."' onClick='if (!confirm(\' ".$lang_label["are_you_sure"]."\')) return false;'> - "; + "; } } echo "
"; echo ""; echo "
"; - echo ""; echo "
"; echo ""; } 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. + // of this, don't do again. echo "
".$lang_label["no_agent_def"]."
"; echo "
"; - echo ""; echo "
"; } diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index d69cd1469e..d883bfae59 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -229,7 +229,7 @@ if ($row=mysql_num_rows($result)){ sec2=godmode/agentes/configurar_agente& id_agente=".$id_agente."& delete_module=".$row["id_agente_modulo"]."'> - ".$lang_label["delete"]." + ".$lang_label["delete"]."   "; echo "".$lang_label["update_alert_ok"].""; } - if (isset($_POST["crear_alerta"])){ // se ha modificado algun parametro de agente - // $id_alerta = entrada_limpia($_POST["id_alerta"]); + if (isset($_POST["crear_alerta"])){ // if create alert $nombre = entrada_limpia($_POST["nombre"]); $comando = entrada_limpia($_POST["comando"]); $descripcion= entrada_limpia($_POST["descripcion"]); @@ -36,9 +34,8 @@ if ( (give_acl($id_user, 0, "LM")==1)){ echo "

".$lang_label["create_alert_ok"]."

"; } - if (isset($_GET["borrar_alerta"])){ // se ha modificado algun parametro + if (isset($_GET["borrar_alerta"])){ // if delete alert $id_alerta = entrada_limpia($_GET["borrar_alerta"]); - // Primero borramos de la tabla de tagente_modulo $sql_delete= "DELETE FROM talerta WHERE id_alerta = ".$id_alerta; $result=mysql_query($sql_delete); if (! $result) @@ -70,17 +67,17 @@ if ( (give_acl($id_user, 0, "LM")==1)){ } echo "".$row["nombre"].""; echo "".$row["descripcion"]; - echo ""; + echo ""; } echo "
"; echo ""; echo "
"; - echo ""; + echo ""; echo "
"; echo ""; -} // Fin pagina +} // End page else { audit_db($id_user,$REMOTE_ADDR, "ACL Violation","Trying to access Alert Management"); require ("general/noaccess.php"); diff --git a/pandora_console/godmode/grupos/lista_grupos.php b/pandora_console/godmode/grupos/lista_grupos.php index 4bf3113506..b1834ba7aa 100644 --- a/pandora_console/godmode/grupos/lista_grupos.php +++ b/pandora_console/godmode/grupos/lista_grupos.php @@ -113,7 +113,7 @@ if (comprueba_login() == 0) borrar_grupo=".$row["id_grupo"]."' onClick='if (!confirm(\' ".$lang_label["are_you_sure"]."\')) return false;'> - + "; } @@ -122,7 +122,7 @@ if (comprueba_login() == 0) echo ""; echo "
"; - echo ""; + echo ""; echo "
"; } // Fin pagina diff --git a/pandora_console/godmode/modules/manage_nc_groups.php b/pandora_console/godmode/modules/manage_nc_groups.php index 3bfaad5f92..81f591ec96 100644 --- a/pandora_console/godmode/modules/manage_nc_groups.php +++ b/pandora_console/godmode/modules/manage_nc_groups.php @@ -105,7 +105,7 @@ while ($row=mysql_fetch_array($result)){ - + "; diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php index 6cca29a10e..c5b3fcd56a 100644 --- a/pandora_console/godmode/modules/manage_network_components.php +++ b/pandora_console/godmode/modules/manage_network_components.php @@ -240,7 +240,7 @@ if ( $row = mysql_num_rows ($result)){ echo $module_max." / ".$module_min; echo ""; echo ""; - echo "".$lang_label["delete"].""; + echo "".$lang_label["delete"].""; } echo "
"; echo ""; diff --git a/pandora_console/godmode/modules/manage_network_templates.php b/pandora_console/godmode/modules/manage_network_templates.php index 508da6e4b9..dfb511cf23 100644 --- a/pandora_console/godmode/modules/manage_network_templates.php +++ b/pandora_console/godmode/modules/manage_network_templates.php @@ -71,7 +71,7 @@ while ($row=mysql_fetch_array($result)){ - + "; diff --git a/pandora_console/godmode/modules/manage_network_templates_form.php b/pandora_console/godmode/modules/manage_network_templates_form.php index 436e841d3b..b078f9991d 100644 --- a/pandora_console/godmode/modules/manage_network_templates_form.php +++ b/pandora_console/godmode/modules/manage_network_templates_form.php @@ -161,7 +161,7 @@ if ($id_np != -1){ } echo "".substr($descripcion,0,30).""; echo "".give_network_component_group_name($id_group).""; - echo ""; + echo ""; } } echo ""; diff --git a/pandora_console/godmode/modules/module_list.php b/pandora_console/godmode/modules/module_list.php index add2359cef..5d6090844b 100644 --- a/pandora_console/godmode/modules/module_list.php +++ b/pandora_console/godmode/modules/module_list.php @@ -101,7 +101,7 @@ if (give_acl($id_user, 0, "PM")==1) { echo ""; echo "
"; - echo ""; + echo ""; echo "
"; } // Fin pagina diff --git a/pandora_console/godmode/perfiles/lista_perfiles.php b/pandora_console/godmode/perfiles/lista_perfiles.php index 410a577d2d..01e9754c2c 100644 --- a/pandora_console/godmode/perfiles/lista_perfiles.php +++ b/pandora_console/godmode/perfiles/lista_perfiles.php @@ -2,8 +2,8 @@ // Pandora - The Free Monitoring System // This code is protected by GPL license. // Este codigo esta protegido por la licencia GPL. -// Sancho Lerena , 2003-2006 -// Raul Mateos , 2005-2006 +// Sancho Lerena , 2003-2007 +// Raul Mateos , 2005-2007 // Global variables require("include/config.php"); @@ -183,18 +183,18 @@ echo ""; - echo "".$lang_label["profiles"]; - echo "IR ".$help_label["IR"].""; - echo "IW ".$help_label["IW"].""; - echo "IM ".$help_label["IM"].""; - echo "AR ".$help_label["AR"].""; - echo "AW ".$help_label["AW"].""; - echo "LW ".$help_label["LW"].""; - echo "UM ".$help_label["UM"].""; - echo "DM ".$help_label["DM"].""; - echo "LM ".$help_label["LM"].""; - echo "PM ".$help_label["PM"].""; - echo "".$lang_label["delete"].""; + echo "".$lang_label["profiles"]; + echo "IR ".$help_label["IR"].""; + echo "IW ".$help_label["IW"].""; + echo "IM ".$help_label["IM"].""; + echo "AR ".$help_label["AR"].""; + echo "AW ".$help_label["AW"].""; + echo "LW ".$help_label["LW"].""; + echo "UM ".$help_label["UM"].""; + echo "DM ".$help_label["DM"].""; + echo "LM ".$help_label["LM"].""; + echo "PM ".$help_label["PM"].""; + echo "".$lang_label["delete"].""; while ($rowdup=mysql_fetch_array($resq1)){ $id_perfil = $rowdup["id_perfil"]; $nombre=$rowdup["name"]; @@ -219,42 +219,42 @@ echo "".$nombre.""; echo ""; - if ($incident_view == 1) echo ""; + if ($incident_view == 1) echo ""; echo ""; - if ($incident_edit == 1) echo ""; + if ($incident_edit == 1) echo ""; echo ""; - if ($incident_management == 1) echo ""; + if ($incident_management == 1) echo ""; echo ""; - if ($agent_view == 1) echo ""; + if ($agent_view == 1) echo ""; echo ""; - if ($agent_edit == 1) echo ""; + if ($agent_edit == 1) echo ""; echo ""; - if ($alert_edit == 1) echo ""; + if ($alert_edit == 1) echo ""; echo ""; - if ($user_management == 1) echo ""; + if ($user_management == 1) echo ""; echo ""; - if ($db_management == 1) echo ""; + if ($db_management == 1) echo ""; echo ""; - if ($alert_management == 1) echo ""; + if ($alert_management == 1) echo ""; echo ""; - if ($pandora_management == 1) echo ""; - echo ""; + if ($pandora_management == 1) echo ""; + echo ""; } echo ""; echo "
"; echo ""; echo "
"; - echo ""; + echo ""; echo "
"; } } diff --git a/pandora_console/godmode/servers/manage_recontask.php b/pandora_console/godmode/servers/manage_recontask.php index 436840660e..ce1e5142e2 100644 --- a/pandora_console/godmode/servers/manage_recontask.php +++ b/pandora_console/godmode/servers/manage_recontask.php @@ -91,18 +91,19 @@ echo "

".$lang_label["manage_recontask"]."

"; $query="SELECT * FROM trecon_task"; $result=mysql_query($query); $color=1; - -echo ""; -echo "
".$lang_label["name"]; -echo "".$lang_label['type']; -echo "".$lang_label['network']; -echo "".$lang_label['network_profile']; -echo "".$lang_label['group']; -echo "".$lang_label['incident']; -echo "".$lang_label['interval']; -echo "".$lang_label['recon_server']; -echo "".$lang_label['network_server']; -echo "X"; +if (mysql_num_rows($result)){ + echo ""; + echo "'; +if (mysql_num_rows($result)){ + echo ''; +} else { + echo "
".$lang_label["no_rtask"]."
"; + echo "
".$lang_label["name"]; + echo "".$lang_label['type']; + echo "".$lang_label['network']; + echo "".$lang_label['network_profile']; + echo "".$lang_label['group']; + echo "".$lang_label['incident']; + echo "".$lang_label['interval']; + echo "".$lang_label['recon_server']; + echo "".$lang_label['network_server']; + echo "X"; +} while ($row=mysql_fetch_array($result)){ $id_rt = $row["id_rt"]; $name = $row["name"]; @@ -160,14 +161,18 @@ while ($row=mysql_fetch_array($result)){ echo "".give_server_name($id_network_server_assigned)."";; // ACTION - echo ""; + echo ""; } - -echo '
"; +} echo "
"; echo "
"; -echo ""; echo "
"; diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php index 1bf206839a..8b21ccee9a 100644 --- a/pandora_console/godmode/servers/modificar_server.php +++ b/pandora_console/godmode/servers/modificar_server.php @@ -159,7 +159,7 @@ if (comprueba_login() == 0) { } echo "		".substr($keepalive,0,25); echo "".substr($laststart,0,25); - echo ""; + echo ""; } echo '
'; } diff --git a/pandora_console/godmode/setup/links.php b/pandora_console/godmode/setup/links.php index 8b43770e8f..3f998bc627 100644 --- a/pandora_console/godmode/setup/links.php +++ b/pandora_console/godmode/setup/links.php @@ -2,8 +2,8 @@ // Pandora - The Free Monitoring System // This code is protected by GPL license. // Este codigo esta protegido por la licencia GPL. -// Sancho Lerena , 2003-2006 -// Raul Mateos , 2005-2006 +// Sancho Lerena , 2003-2007 +// Raul Mateos , 2005-2007 // Load global vars if (comprueba_login() == 0) @@ -23,7 +23,7 @@ if (comprueba_login() == 0) } } - if (isset($_POST["update"])){ // se ha modificado algun parameter + if (isset($_POST["update"])){ // if update $id_link = entrada_limpia($_POST["id_link"]); $name = entrada_limpia($_POST["name"]); $link = entrada_limpia($_POST["link"]); @@ -35,7 +35,7 @@ if (comprueba_login() == 0) echo "

".$lang_label["modify_link_ok"]."

"; } - if (isset($_GET["borrar"])){ // se ha modificado algun parametro + if (isset($_GET["borrar"])){ // if delete $id_link = entrada_limpia($_GET["borrar"]); $sql_delete= "DELETE FROM tlink WHERE id_link = ".$id_link; $result=mysql_query($sql_delete); @@ -103,12 +103,12 @@ if (comprueba_login() == 0) $color = 1; } echo "".$row["name"].""; - echo ''; + echo ''; } echo "
"; echo ""; echo "
"; - echo ""; + echo ""; echo "
"; } // Fin bloque else } else { diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php index c5321640b9..f2c7c68302 100644 --- a/pandora_console/godmode/setup/setup.php +++ b/pandora_console/godmode/setup/setup.php @@ -54,7 +54,7 @@ if (comprueba_login() == 0) echo "
"; echo ''; echo '"; echo "
'.$lang_label["language_code"]; - echo '
"; - echo ''; + echo ''; echo "
"; } else { diff --git a/pandora_console/godmode/usuarios/configurar_usuarios.php b/pandora_console/godmode/usuarios/configurar_usuarios.php index 6fc9cd68e3..ac91310757 100644 --- a/pandora_console/godmode/usuarios/configurar_usuarios.php +++ b/pandora_console/godmode/usuarios/configurar_usuarios.php @@ -236,7 +236,7 @@ if (comprueba_login() == 0) echo ''; echo "".dame_perfil($row["id_perfil"])." / "; echo "".dame_grupo($row["id_grupo"]).""; - echo ''; + echo ''; } echo "
"; } diff --git a/pandora_console/godmode/usuarios/lista_usuarios.php b/pandora_console/godmode/usuarios/lista_usuarios.php index 60be05b25c..276ba01bc8 100644 --- a/pandora_console/godmode/usuarios/lista_usuarios.php +++ b/pandora_console/godmode/usuarios/lista_usuarios.php @@ -2,16 +2,15 @@ // Pandora - The Free Monitoring System // This code is protected by GPL license. // Este codigo esta protegido por la licencia GPL. -// Sancho Lerena , 2003-2006 -// Raul Mateos , 2005-2006 +// Sancho Lerena , 2003-2007 +// Raul Mateos , 2005-2007 // Load globar vars require("include/config.php"); -//require("include/functions.php"); -//require("include/functions_db.php"); + if (comprueba_login() == 0) if (give_acl($id_user, 0, "UM")==1) { - if (isset($_GET["borrar_usuario"])){ // se ha modificado algun parametro de agente + if (isset($_GET["borrar_usuario"])){ // if delete user $nombre= entrada_limpia($_GET["borrar_usuario"]); // Delete user // Delete cols from table tgrupo_usuario @@ -40,7 +39,7 @@ if (comprueba_login() == 0) "; echo "".$comentarios; - echo ""; + echo ""; } echo "
"; echo ""; echo ""; - echo ""; - echo ""; + echo ""; + echo ""; echo ""; diff --git a/pandora_console/help/en/chap2.php b/pandora_console/help/en/chap2.php index a98d80c988..90f6690d70 100644 --- a/pandora_console/help/en/chap2.php +++ b/pandora_console/help/en/chap2.php @@ -111,11 +111,11 @@ least, fill in the user ID, the password (twice) and Pandora's global profile.

-

A user profile is deleted by clicking on the delete icon  on the right hand side of the profile.

+

A user profile is deleted by clicking on the delete icon  on the right hand side of the profile.

2.3. Deleting a user

-

A user is deleted by clicking on the delete icon  on the right hand side of the user. The list of users is accessed through the "Manage Users" option in the Administration menu.

+

A user is deleted by clicking on the delete icon  on the right hand side of the user. The list of users is accessed through the "Manage Users" option in the Administration menu.

diff --git a/pandora_console/help/en/chap3.php b/pandora_console/help/en/chap3.php index afd9f9528a..1113902f58 100644 --- a/pandora_console/help/en/chap3.php +++ b/pandora_console/help/en/chap3.php @@ -90,7 +90,7 @@ and can be accessed.

A group is added by clicking "Create group" and assigning a name to it.

-A group is deleted by clicking the delete icon in the right hand side of each group.

+A group is deleted by clicking the delete icon in the right hand side of each group.

3.2. Adding an agent

@@ -155,7 +155,7 @@ user views.

In this screen the modules can be:

    -
  • Deleted by clicking
    • +
  • Deleted by clicking
  • Edited by clicking
@@ -185,7 +185,7 @@ Operating System.

-

An Alert is deleted by clicking on the delete icon placed on the right hand side of the Alert. A new customised Alert can be created clicking in "Create Alert".

+

An Alert is deleted by clicking on the delete icon placed on the right hand side of the Alert. A new customised Alert can be created clicking in "Create Alert".

The values "_field1_", "_field2_" and "_field3_" in the customised Alerts are used to build the command line that the machine where Pandora resides will execute – if there were several servers, the one in Master mode.

diff --git a/pandora_console/help/en/chap5.php b/pandora_console/help/en/chap5.php index bc8afa1c7b..70ee060368 100644 --- a/pandora_console/help/en/chap5.php +++ b/pandora_console/help/en/chap5.php @@ -68,8 +68,8 @@ if the problem can be ignored or it's been already solved.

User ID: User that validated the event.

Timestamp: Date and time when the event was raised or validated- if it has been validated.

Action: Action that can be executed over the event.

-

This icon will validate the event, disappearing the icon

-

This icon will delete the event

+

This icon will validate the event, disappearing the icon

+

This icon will delete the event

The events can be also validated or deleted in groups by selecting the tick boxes on the last column of the event, and pressing "Validate" or "Delete" at the diff --git a/pandora_console/help/en/chap7.php b/pandora_console/help/en/chap7.php index 677a597afd..965724feb0 100644 --- a/pandora_console/help/en/chap7.php +++ b/pandora_console/help/en/chap7.php @@ -95,7 +95,7 @@ in the Operation menu.

servers.

It is possible delete a server using the icon - +

It is possible to change the server properties using the icon diff --git a/pandora_console/help/es/chap2.php b/pandora_console/help/es/chap2.php index 77106853ff..00b0b08f2a 100644 --- a/pandora_console/help/es/chap2.php +++ b/pandora_console/help/es/chap2.php @@ -104,12 +104,12 @@ grupos a los que tiene acceso una vez se ha creado el usuario, y actualizar su c

-

Para borrar un perfil de un usuario bastará con pulsar en el icono +

Para borrar un perfil de un usuario bastará con pulsar en el icono correspondiente que hay a la derecha de cada perfil.

2.3. Borrar un usuario

-

Para borrar un usuario bastará en pulsar en el icono +

Para borrar un usuario bastará en pulsar en el icono correspondiente que hay a la derecha del usuario en la lista de usuarios accesible desde «Gestión de usuarios», en el menú de administración.

diff --git a/pandora_console/help/es/chap3.php b/pandora_console/help/es/chap3.php index b612f792ab..09f9f27f99 100644 --- a/pandora_console/help/es/chap3.php +++ b/pandora_console/help/es/chap3.php @@ -87,7 +87,7 @@ de administración.

Se pueden crear todos los grupos que se necesiten pulsando en «Crear grupo» y asignándole un nombre.

Para borrar un grupo se pulsa en -el icono que cada grupo tienen a su derecha.

+el icono que cada grupo tienen a su derecha.

3.2. Añadir un agente

@@ -171,7 +171,7 @@ Cualquier valor por debajo del mínimo definido se interpretará com

Desde aquí se puede:

    -
  • borrar un módulo pinchando en el icono
    • +
  • borrar un módulo pinchando en el icono
  • o editarlo, pinchando en el icono
@@ -203,7 +203,7 @@ Operativo de Pandora.

-

Para borrar una alerta pulsamos en que se encuentra a la derecha de la alerta que se quiere borrar.

+

Para borrar una alerta pulsamos en que se encuentra a la derecha de la alerta que se quiere borrar.

Para crear una alerta personalizada se accede a «Gestión de alertas» > «Crear alertas», en el menú de administración

diff --git a/pandora_console/help/es/chap5.php b/pandora_console/help/es/chap5.php index 9065d292aa..2ffb2cec80 100644 --- a/pandora_console/help/es/chap5.php +++ b/pandora_console/help/es/chap5.php @@ -64,8 +64,8 @@ solucionado.

ID de usuario: Usuario que ha validado el evento.

Fecha y hora: Fecha y hora de aparición del evento o de validación en caso de estar validado.

Acción: Acción que se puede ejecutar sobre el evento:

-

Pinchando en este icono se validará el evento y desaparecerá el icono

-

Pinchando en este icono se borrará (y desaparecerá) el evento

+

Pinchando en este icono se validará el evento y desaparecerá el icono

+

Pinchando en este icono se borrará (y desaparecerá) el evento

Los eventos también se pueden validar y eliminar, marcándolos en la columna de la derecha y pinchando en «Validar» o «Borrar».

diff --git a/pandora_console/help/es/chap7.php b/pandora_console/help/es/chap7.php index 9c8822f8de..8fa279eebd 100644 --- a/pandora_console/help/es/chap7.php +++ b/pandora_console/help/es/chap7.php @@ -92,7 +92,7 @@ acceder a la lista de los Servidores Pandora.

Desde «Gestión» en el menú de administración se puede acceder a la lista de los Servidores Pandora que están configurados y administrarlos.

Para borrar un servidor utilizamos el icono - +

Para modificar un servidor utilizamos el icono diff --git a/pandora_console/images/cross.png b/pandora_console/images/cross.png new file mode 100644 index 0000000000000000000000000000000000000000..1514d51a3cf1b67e1c5b9ada36f1fd474e2d214a GIT binary patch literal 655 zcmV;A0&x9_P)uEoyT++I zn$b9r%cFfhHe2K68PkBu*@^<$y+7xQ$wJ~;c5aBx$R=xq*41Wo zhwQus_VOgm0hughj}MhOvs#{>Vg09Y8WxjWUJY5YW zJ?&8eG!59Cz=|E%Ns@013KLWOLV)CObIIj_5{>{#k%TEAMs_GbdDV`x-iYsGH z#=Z{USAQA>NY(}X7=3{K8#ZD2*!*kie8d0ob9Fh%G9Y=r;n&8^QUAkdX#Dq|D$hyKfc&Ml|8p0c z|4m?!%b@Oan%jHPb>P21W3>NYd-<1_&1WU%JGUHShzcVz!>-In&hVRPdDrmgA!XB=w& zAG5&bziK_hADjk6&({3E^3;U?OHcIvUwEwR|Gc9eKtr;M1&07*qoM6N<$ Ef*qF6bpQYW literal 0 HcmV?d00001 diff --git a/pandora_console/images/ok.gif b/pandora_console/images/ok.gif deleted file mode 100644 index 818dea923b2b75b21565a4b3baf6a894da2d01e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 795 zcmV+$1LXXPP)LlS^onXB38?@6QEeG-)n` zWaf{O3~d%syp|e-HL0HpYzByR4Og zP|vrD7!a93IA^RKy14C5`q_Q;>;-$T_w7eQ#}7(`s_1X>xM`0FlK}T5EhJ^9e58{H9n5dlLJnhZg|- zKd$c#jUI_N^hRE7TE%GL8b&Ne1P@R^rK%v_vWZ*S1cT#4IfR~xgW0!=k8&w!CHeD zgAzfBV|&MkyzRfwft4SVeKf^}*WRHVvU>qg3d86t)r|zj3|1^#{cRlR{s<)=J34o= zF}ejShKs*_OYq<>4K*!D$we1zEQKNB98QF#6-$Y?ZlbQbo=@I9LgS)ltQgLuj`3?@ zf+bZ;P&m+kyWjy}2xjLBL>IU7Wd0$iQlC@Qk7-=gj5y)UPe-}^dlCgi>X%WN&7*|i z=?}C!KbpQmq^6xJf%{K#oJbtzmp^XtRq_~<_fsfQc%o>p>)_JFWpJEd0E8tsIF?K0 zCbHLAAAOfi)v-D~9gu{?|XK zUArvK^usBF2U9o^{KiiFy5-zR|G?MZT`GE2YER~PF#H?mYxiav zYMQ}8p*X|$$;*u2PUn@U4rNXRFGl$vE&tSyVcjka11@x}SWrsM0O!yQWxfplyG$>m ZzW}fWdP)4-QibtN)VXQDpczE`xXAkUjh%RI>;okxb7K@0kpyQ1k_Y(|Oe7$m(^ zNYX>mI||sUbmn+c3<&FnE=4u#()KBS^SH8e)Qs5i!#lY=$-1gbH6VluzU=m=EP78&5vQ z-?+fFP-G2l&l_QzYealK$;1Rl?FkzXR&Jv@fBPNjCr#AYRyJ7UJQ0v#?)7Ott=>3`#-pV!7>9}>Q1jL)H6h&gkP@3nI=+F3nA~M>u#(n* z8T!#8oEw&-mED4!h4s!N@Jo3S7N&Q6%6l3}nlcd~X@>;uelvPsSkXIgg~e+^T1zSf z3SNj(5%jK~i8@b;C(!|aRMd~*jR)1TJ;TYVk<&_*NfowAm` zmannW2zP`*(gqvG$JJ$!L+O@>G&*X3p^@C#U2%4Hv1 zd~~cyL;#S|N_?o5v+t?}7{ee*kd}nj8jCB7D6PKFl0%6tPkAhJA*mIQFl&z$gB9nM m;`H62`?t6C3;zNO|A`+Upb%bsl+VKe0000VHqt_AUI?gEKejkU?n?aB|Kv# zJY*+8Ybru*EJSZFMsPPxb2d$PI#GK&QhY{Sg;{QtXM3J#D`M%ln zz}ob|+Vs8K`o7!x!rSz}-1@`Z^u*ls#ohJB-Sx=b^T*!x$lmqI-t)-c^~vA$%HZ|O z;r7ho_RZn-%zxte&f@mX;`z|x_0Z$?(&YEi<@eL&_tWP1*5~)u=lIv>_u1(9+UfY+ z>iOR5`QGgM-|YF}?fK&E`Qq;R&bEq&Ag0004WQchCDUq!?oj7~j@EB_hBlI96W; zDqtEH;p^@0>=UE}6);Tn^>TBvw~my93g{+yx;WZcnTN|j1+=1k?X4}$>^&r*0-6TV z?iMEYA?iFZYgD!U!a`lu_yw6@B8svyQWD%k(xO}_?&TFz7G_2f;Sv%TU_lXK72;z= g^(6;0I~S(c0Wb;{jJdZHkpKVy07*qoM6N<$f<-SeBLDyZ delta 679 zcmV;Y0$Ba51hfT^8Gi-<001BJ|6u?C00d`2O+f$vugEtAis=9V02y>eSaefwW^{L9 za%BKPWN%_+AW3auXJt}lVPtu6$z?nM00KryL_t(I%Z<`YNYp_b!13?Qsx6j^OTI%r z*aHorLv7M#b?#7>5Q!TYDMXj*5JIOS!b=CcBte75%Q#n24H!V{TY(LLAE*NAHZ}C#wnj%B zw5OFIkRhkkAW#kDC3j9Wm0YXRaXlyyp>#mVfYG)eC;@abDb=T-BCAY4LI(Z@GOTr2 zV_A{pRwSmz+8Be>CjAw(=gnbVWAeguvZa93JmL(EDu1Eo(g5SBQRl=l-~;e|MF}Zr z9+;9@8JDf6r_zCh>adQIg@NWaU<~*KM1fdxJRTc5JylY@&F}Zjp5gQRPp_%)Xi6$-t}66-66s{|f*No(qNZN(+0+cJ0I=`T6NRU*Ap7c}uEdT>!wt zw!LAsq diff --git a/pandora_console/include/styles/op.css b/pandora_console/include/styles/op.css index 1e9e1f94e3..eb4b83f112 100644 --- a/pandora_console/include/styles/op.css +++ b/pandora_console/include/styles/op.css @@ -39,17 +39,17 @@ div#op7s>ul, div#op8s>ul, div#op9s>ul { } /* users */ #op5 li, #op5 li:hover, #op5s li { - background: url(../../images/group.png) no-repeat 4px 3px; + background: url(../../images/group.png) no-repeat 4px 4px; } #op6 li, #op6 li:hover, #op6s li { - background: url(../../images/computer_error.png) no-repeat 4px 5px; + background: url(../../images/computer_error.png) no-repeat 4px 4px; } /* trap console */ #op7 li, #op7 li:hover, #op7s li { - background: url(../../images/email.png) no-repeat 4px 3px; + background: url(../../images/email.png) no-repeat 4px 4px; } #op8 li, #op8 li:hover, #op8s li { - background: url(../../images/chart_pie.png) no-repeat 4px 3px; + background: url(../../images/chart_pie.png) no-repeat 4px 4px; } #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 991dc7b224..85bc7a9b26 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -193,6 +193,14 @@ input.sub { -moz-border-radius: 5%; font-size: 11px; } +input.next { + padding-right: 15px; + background: #e5e5e5 url(../../images/go.png) no-repeat right 2px; +} +input.upd { + padding-right: 15px; + background: #e5e5e5 url(../../images/upd.png) no-repeat right 2px; +} table, img { border: 0px; } @@ -215,7 +223,7 @@ td.lb, td.lb_view { 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, @@ -332,9 +340,6 @@ td.datosf9i, td.datos2f9i { .w30 { width: 30px; } -.w40 { - width: 40px; -} .w45 { width: 45px; } @@ -374,9 +379,6 @@ td.datosf9i, td.datos2f9i { .bot, .titb, td.datosb { vertical-align: bottom; } -.w180 { - width: 180px; -} .w200 { width: 200px; } diff --git a/pandora_console/include/styles/tip.css b/pandora_console/include/styles/tip.css index fcf599a31c..35e98ea426 100644 --- a/pandora_console/include/styles/tip.css +++ b/pandora_console/include/styles/tip.css @@ -1,11 +1,11 @@ -a.tip, a.tip2 { +a.tip, a.tip2, a.tipp { cursor: help; background: url(../../images/tip.gif) no-repeat; } -a.tip { +a.tip , a.tip2 { padding: 5px 2px 5px 12px; } -a.tip2 { +a.tipp { padding: 2px 2px 2px 12px; } a.help { @@ -20,26 +20,30 @@ a.info { a.info2 { padding: 2px 0px 0px 0px; } -a.tip, a.tip2, a.help , a.info, a.info2 { +a.tip, a.tip2, a.tipp, a.help , a.info, a.info2 { position: relative; text-decoration: none; } a.tip:hover { text-decoration: none; - background-color: #f5f5f5; + background-color: #f9f9f9; } a.tip2:hover { + text-decoration: none; + background-color: #e6e9cd; +} +a.tipp:hover { text-decoration: none; background-color: #778866; } a.info:hover, a.info2:hover, a.help:hover { text-decoration: none; } -a.tip span, a.tip2 span, a.info span, a.info2 span, a.help span { +a.tip span, a.tip2 span, a.tipp span, a.info span, a.info2 span, a.help span { display: none; } -a.tip:hover span, a.tip2:hover span, a.info:hover span, a.info2:hover span, -a.help:hover span { +a.tip:hover span, a.tip2:hover span,a.tipp:hover span, a.info:hover span, +a.info2:hover span, a.help:hover span { display: block; text-decoration: none; position: absolute; diff --git a/pandora_console/operation/active_console/index.php b/pandora_console/operation/active_console/index.php index f869983147..45df2e3188 100644 --- a/pandora_console/operation/active_console/index.php +++ b/pandora_console/operation/active_console/index.php @@ -1277,7 +1277,7 @@ while ($vista=mysql_fetch_array($vistas)){ - + diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index 562f86cf4d..ba90098265 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -178,9 +178,9 @@ echo "
"; echo " - ".$lang_label["not_validated_event"]; echo ""; echo ""; -echo " - ".$lang_label["validate_event"]; +echo " - ".$lang_label["validate_event"]; echo "
"; -echo " - ".$lang_label["delete_event"]; +echo " - ".$lang_label["delete_event"]; echo ""; echo "".$lang_label["events"].""; echo "

"; @@ -297,9 +297,9 @@ if ($total_events > 0){ echo ""; if (($row2["estado"] == 0) and (give_acl($id_user,$id_group,"IW") ==1)) - echo " "; + echo " "; if (give_acl($id_user,$id_group,"IM") ==1) - echo " "; + echo " "; if (give_acl($id_user,$id_group,"IW") == 1) echo ""; diff --git a/pandora_console/operation/incidents/incident.php b/pandora_console/operation/incidents/incident.php index f28aeb8fe8..61bc0f199b 100644 --- a/pandora_console/operation/incidents/incident.php +++ b/pandora_console/operation/incidents/incident.php @@ -110,7 +110,7 @@ if ((isset($_GET["action"])) AND ($_GET["action"]=="insert")){ audit_db($usuario,$REMOTE_ADDR,"Incident created","User ".$id_usuario." created incident #".$id_inc); } } else { - audit_db($id_usuario,$REMOTE_ADDR,"ACL Forbidden","User ".$_SESSION["id_usuario"]." try to create incident"); + audit_db($id_usuario,$REMOTE_ADDR,"ACL Forbidden","User ".$_SESSION["id_usuario"]." try to create incident"); no_permission(); } } @@ -430,7 +430,7 @@ if ($row2_count[0] <= 0 ) { if ((give_acl($id_usuario, $id_group, "IM") ==1) OR ($_SESSION["id_usuario"] == $id_author_inc) ){ // Only incident owners or incident manager // from this group can delete incidents - echo ""; + echo ""; } } } @@ -440,7 +440,7 @@ if ($row2_count[0] <= 0 ) { if (give_acl($_SESSION["id_usuario"], 0, "IW")==1) { echo ""; echo ""; - echo "
"; + echo ""; } echo ""; diff --git a/pandora_console/operation/messages/message.php b/pandora_console/operation/messages/message.php index cc5320b192..3b52e35e53 100644 --- a/pandora_console/operation/messages/message.php +++ b/pandora_console/operation/messages/message.php @@ -105,7 +105,7 @@ if (isset($_GET["nuevo"]) || isset($_GET["nuevo_g"])){ '.$lang_label["message"].':
@@ -178,7 +178,7 @@ else { echo "".$lang_label["no_subject"].""; echo "".$row3["timestamp"].""; - echo ""; + echo ""; } echo "
"; } @@ -207,7 +207,7 @@ else { '; } - else echo '
'; + else echo '
'; } echo ''; ?> \ No newline at end of file diff --git a/pandora_console/operation/snmpconsole/snmp_alert.php b/pandora_console/operation/snmpconsole/snmp_alert.php index f20b1456d9..27fd6fcbcf 100644 --- a/pandora_console/operation/snmpconsole/snmp_alert.php +++ b/pandora_console/operation/snmpconsole/snmp_alert.php @@ -58,7 +58,7 @@ if (give_acl($id_user, 0, "LW")==1) { if (isset($_GET["submit"])){ $alert_submit=1; $create = entrada_limpia($_POST["create"]); - $update = entrada_limpia($_POST["create"]); + $update = entrada_limpia($_POST["update"]); $id_as = entrada_limpia($_POST["id_as"]); $max = entrada_limpia($_POST["max"]); $min = entrada_limpia($_POST["min"]); @@ -288,20 +288,20 @@ if (give_acl($id_user, 0, "LW")==1) { else echo $lang_label["never"]; echo ""; - echo "".$lang_label["delete"]."   "; + echo "".$lang_label["delete"]."   "; echo "".$lang_label["update"].""; } echo "
"; echo ""; echo '
'; - echo ''; + echo ''; echo "
"; echo ""; } else { echo "
".$lang_label["no_snmp_alert"]."
"; echo "

"; echo '
'; - echo ''; + echo ''; echo "
"; } // End of view snmp alert } diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php index 2cb754f5ed..b4c1e6aa57 100644 --- a/pandora_console/operation/snmpconsole/snmp_view.php +++ b/pandora_console/operation/snmpconsole/snmp_view.php @@ -141,9 +141,9 @@ if (comprueba_login() == 0) { echo " - ".$lang_label["alert"]; echo ""; echo ""; - echo " - ".$lang_label["validate_event"]; + echo " - ".$lang_label["validate_event"]; echo "
"; - echo " - ".$lang_label["delete_event"]; + echo " - ".$lang_label["delete_event"]; echo ""; echo ""; echo "
"; @@ -246,9 +246,9 @@ if (comprueba_login() == 0) { echo ""; if (($row["status"] == 0) and (give_acl($id_usuario,"0","IW") ==1)) - echo ""; + echo ""; if (give_acl($id_usuario,"0","IM") ==1) - echo ""; + echo ""; echo ""; echo ""; echo ""; diff --git a/pandora_console/operation/users/user.php b/pandora_console/operation/users/user.php index 664be5bad6..2f93011397 100644 --- a/pandora_console/operation/users/user.php +++ b/pandora_console/operation/users/user.php @@ -46,10 +46,12 @@ while ($rowdup=mysql_fetch_array($resq1)){ if ($color == 1){ $tdcolor = "datos"; $color = 0; + $tip = "tip"; } else { $tdcolor = "datos2"; $color = 1; + $tip = "tip2"; } echo "".$nombre.""; echo "".$fecha_registro.""; @@ -60,7 +62,7 @@ while ($rowdup=mysql_fetch_array($resq1)){ echo ""; $sql1='SELECT * FROM tusuario_perfil WHERE id_usuario = "'.$nombre.'"'; $result=mysql_query($sql1); - echo " "; + echo " "; if (mysql_num_rows($result)){ while ($row=mysql_fetch_array($result)){ echo dame_perfil($row["id_perfil"])."/ "; @@ -86,17 +88,17 @@ echo "

"; $query_del1="SELECT * FROM tperfil"; $resq1=mysql_query($query_del1); echo ""; - echo "".$lang_label["profiles"]; - echo "IR ".$help_label["IR"].""; - echo "IW ".$help_label["IW"].""; - echo "IM ".$help_label["IM"].""; - echo "AR ".$help_label["AR"].""; - echo "AW ".$help_label["AW"].""; - echo "LW ".$help_label["LW"].""; - echo "UM ".$help_label["UM"].""; - echo "DM ".$help_label["DM"].""; - echo "LM ".$help_label["LM"].""; - echo "PM ".$help_label["PM"].""; + echo "".$lang_label["profiles"]; + echo "IR ".$help_label["IR"].""; + echo "IW ".$help_label["IW"].""; + echo "IM ".$help_label["IM"].""; + echo "AR ".$help_label["AR"].""; + echo "AW ".$help_label["AW"].""; + echo "LW ".$help_label["LW"].""; + echo "UM ".$help_label["UM"].""; + echo "DM ".$help_label["DM"].""; + echo "LM ".$help_label["LM"].""; + echo "PM ".$help_label["PM"].""; $color = 1; while ($rowdup=mysql_fetch_array($resq1)){ $id_perfil = $rowdup["id_perfil"]; @@ -122,34 +124,34 @@ echo "

"; echo "".$nombre; echo ""; - if ($incident_view == 1) echo ""; + if ($incident_view == 1) echo ""; echo ""; - if ($incident_edit == 1) echo ""; + if ($incident_edit == 1) echo ""; echo ""; - if ($incident_management == 1) echo ""; + if ($incident_management == 1) echo ""; echo ""; - if ($agent_view == 1) echo ""; + if ($agent_view == 1) echo ""; echo ""; - if ($agent_edit == 1) echo ""; + if ($agent_edit == 1) echo ""; echo ""; - if ($alert_edit == 1) echo ""; + if ($alert_edit == 1) echo ""; echo ""; - if ($user_management == 1) echo ""; + if ($user_management == 1) echo ""; echo ""; - if ($db_management == 1) echo ""; + if ($db_management == 1) echo ""; echo ""; - if ($alert_management == 1) echo ""; + if ($alert_management == 1) echo ""; echo ""; - if ($pandora_management == 1) echo ""; + if ($pandora_management == 1) echo ""; } } //end of page