From ea1a814c4093993290c18c825fa737d78c2147c0 Mon Sep 17 00:00:00 2001 From: raulmateos <noreply@pandorafms.org> Date: Mon, 2 Apr 2007 17:17:27 +0000 Subject: [PATCH] 2007-04-02 Raul Mateos <raulofpandora@gmail.com> * 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 <raulofpandora@gmail.com> + + * 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 <raulofpandora@gmail.com> * 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."<a href='index.php?sec=gagente& sec2=godmode/agentes/configurar_agente& id_agente=".$id_agente."&delete_alert=".$row3["id_aam"]."'> - <img src='images/cancel.gif' border=0 alt='".$lang_label["delete"]."'></a> "; + <img src='images/cross.png' border=0 alt='".$lang_label["delete"]."'></a> "; $string = $string."<a href='index.php?sec=gagente& sec2=godmode/agentes/configurar_agente& id_agente=".$id_agente."&update_alert=".$row3["id_aam"]."#alerts'> 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;'> - <img border='0' src='images/cancel.gif'></a></td>"; + <img border='0' src='images/cross.png'></a></td>"; } } echo "<tr><td colspan='5'><div class='raya'></div></td></tr>"; echo "<tr><td align='right' colspan='5'>"; echo "<form method='post' action='index.php?sec=gagente& sec2=godmode/agentes/configurar_agente&create_agent=1'>"; - echo "<input type='submit' class='sub' name='crt' + echo "<input type='submit' class='sub next' name='crt' value='".$lang_label["create_agent"]."'>"; echo "</form></td></tr>"; echo "</table>"; } 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 "<div class='nf'>".$lang_label["no_agent_def"]."</div>"; echo "<form method='post' action='index.php?sec=gagente& sec2=godmode/agentes/configurar_agente&creacion=1'>"; - echo "<input type='submit' class='sub' name='crt' + echo "<input type='submit' class='sub next' name='crt' value='".$lang_label["create_agent"]."'>"; echo "</form>"; } 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"]."'> - <img src='images/cancel.gif' border=0 alt='".$lang_label["delete"]."'> + <img src='images/cross.png' border=0 alt='".$lang_label["delete"]."'> </b></a> "; echo "<a href='index.php?sec=gagente& sec2=godmode/agentes/configurar_agente& diff --git a/pandora_console/godmode/alertas/modificar_alerta.php b/pandora_console/godmode/alertas/modificar_alerta.php index 0fa0f0cc8c..41216f5bba 100644 --- a/pandora_console/godmode/alertas/modificar_alerta.php +++ b/pandora_console/godmode/alertas/modificar_alerta.php @@ -2,15 +2,14 @@ // Pandora - The Free Monitoring System // This code is protected by GPL license. // Este codigo esta protegido por la licencia GPL. -// Sancho Lerena <slerena@gmail.com>, 2003-2006 -// Raul Mateos <raulofpandora@gmail.com>, 2005-2006 +// Sancho Lerena <slerena@gmail.com>, 2003-2007 +// Raul Mateos <raulofpandora@gmail.com>, 2005-2007 // Load global vars require("include/config.php"); -//require("include/functions.php"); -//require("include/functions_db.php"); + if ( (give_acl($id_user, 0, "LM")==1)){ - if (isset($_POST["update_alerta"])){ // se ha modificado algun parametro de agente + if (isset($_POST["update_alerta"])){ // if modified any parameter $id_alerta = entrada_limpia($_POST["id_alerta"]); $nombre = entrada_limpia($_POST["nombre"]); $comando = entrada_limpia($_POST["comando"]); @@ -23,8 +22,7 @@ if ( (give_acl($id_user, 0, "LM")==1)){ echo "<h3 class='suc'>".$lang_label["update_alert_ok"]."</h3>"; } - 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 "<h3 class='suc'>".$lang_label["create_alert_ok"]."</h3>"; } - 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 "<tr><td class='$tdcolor'><b><a href='index.php?sec=galertas&sec2=godmode/alertas/configurar_alerta&id_alerta=".$row["id_alerta"]."'>".$row["nombre"]."</a></b>"; echo "<td class='$tdcolor'>".$row["descripcion"]; - echo "<td class='$tdcolor' align='center'><a href='index.php?sec=gagente&sec2=godmode/alertas/modificar_alerta&borrar_alerta=".$row["id_alerta"]."' onClick='if (!confirm(\' ".$lang_label["are_you_sure"]."\')) return false;'><img border='0' src='images/cancel.gif'></a>"; + echo "<td class='$tdcolor' align='center'><a href='index.php?sec=gagente&sec2=godmode/alertas/modificar_alerta&borrar_alerta=".$row["id_alerta"]."' onClick='if (!confirm(\' ".$lang_label["are_you_sure"]."\')) return false;'><img border='0' src='images/cross.png'></a>"; } echo "<tr><td colspan='3'><div class='raya'></div></td></tr>"; echo "<tr><td align='right' colspan='3'>"; echo "<form method=post action='index.php?sec=galertas&sec2=godmode/alertas/configurar_alerta&creacion=1'>"; - echo "<input type='submit' class='sub' name='crt' value='".$lang_label["create_alert"]."'>"; + echo "<input type='submit' class='sub next' name='crt' value='".$lang_label["create_alert"]."'>"; echo "</form>"; echo "</td></tr></table>"; -} // 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;'> - <img border='0' src='images/cancel.gif'></a> + <img border='0' src='images/cross.png'></a> </td> </tr>"; } @@ -122,7 +122,7 @@ if (comprueba_login() == 0) echo "<tr><td colspan='4' align='right'>"; echo "<form method=post action='index.php?sec=gagente& sec2=godmode/grupos/configurar_grupo&creacion_grupo=1'>"; - echo "<input type='submit' class='sub' name='crt' value='".$lang_label["create_group"]."'>"; + echo "<input type='submit' class='sub next' name='crt' value='".$lang_label["create_group"]."'>"; echo "</form></td></tr></table>"; } // 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)){ <a href='index.php?sec=gmodules&sec2=godmode/modules/manage_nc_groups&delete=1&id_sg=".$row["id_sg"]."' onClick='if (!confirm(\' ".$lang_label["are_you_sure"]."\')) return false;'> - <img border='0' src='images/cancel.gif'></a> + <img border='0' src='images/cross.png'></a> </td> </tr>"; 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 "<td class='$tdcolor' align='center'>"; echo "<a href='index.php?sec=gmodules&sec2=godmode/modules/manage_network_components&delete=1&id_nc=".$row["id_nc"]."'>"; - echo "<img src='images/cancel.gif' border=0 alt='".$lang_label["delete"]."'></A>"; + echo "<img src='images/cross.png' border=0 alt='".$lang_label["delete"]."'></A>"; } echo "<tr><td colspan='7'><div class='raya'></div></td></tr>"; echo "<tr><td colspan='7' align='right'>"; 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)){ <a href='index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates&delete=".$row["id_np"]."' onClick='if (!confirm(\' ".$lang_label["are_you_sure"]."\')) return false;'> - <img border='0' src='images/cancel.gif'></a> + <img border='0' src='images/cross.png'></a> </td> </tr>"; 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 "<td class='$tdcolor'>".substr($descripcion,0,30)."</td>"; echo "<td class='$tdcolor'>".give_network_component_group_name($id_group)."</td>"; - echo "<td class='$tdcolor'><a href='index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates_form&id_np=$id_np&delete_module=$id_npc'><img src='images/cancel.gif'></a></td>"; + echo "<td class='$tdcolor'><a href='index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates_form&id_np=$id_np&delete_module=$id_npc'><img src='images/cross.png'></a></td>"; } } echo "</table>"; 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 "<tr><td colspan='4' align='right'>"; echo "<form method=post action='index.php?sec=gmodules& sec2=godmode/modules/manage_modules&create=1'>"; - echo "<input type='submit' class='sub' name='crt' value='".$lang_label["create_module"]."'>"; + echo "<input type='submit' class='sub next' name='crt' value='".$lang_label["create_module"]."'>"; echo "</form></td></tr></table>"; } // 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 <slerena@gmail.com>, 2003-2006 -// Raul Mateos <raulofpandora@gmail.com>, 2005-2006 +// Sancho Lerena <slerena@gmail.com>, 2003-2007 +// Raul Mateos <raulofpandora@gmail.com>, 2005-2007 // Global variables require("include/config.php"); @@ -183,18 +183,18 @@ echo "<tr><td colspan='3' align='right'><input name='uptbutton' type='submit' cl $query_del1="SELECT * FROM tperfil"; $resq1=mysql_query($query_del1); echo "<tr>"; - echo "<th class='w180'><font size=1>".$lang_label["profiles"]; - echo "<th class='w40'><font size=1>IR<a href='#' class='tip2'> <span>".$help_label["IR"]."</span></a>"; - echo "<th class='w40'><font size=1>IW<a href='#' class='tip2'> <span>".$help_label["IW"]."</span></a>"; - echo "<th class='w40'><font size=1>IM<a href='#' class='tip2'> <span>".$help_label["IM"]."</span></a>"; - echo "<th class='w40'><font size=1>AR<a href='#' class='tip2'> <span>".$help_label["AR"]."</span></a>"; - echo "<th class='w40'><font size=1>AW<a href='#' class='tip2'> <span>".$help_label["AW"]."</span></a>"; - echo "<th class='w40'><font size=1>LW<a href='#' class='tip2'> <span>".$help_label["LW"]."</span></a>"; - echo "<th class='w40'><font size=1>UM<a href='#' class='tip2'> <span>".$help_label["UM"]."</span></a>"; - echo "<th class='w40'><font size=1>DM<a href='#' class='tip2'> <span>".$help_label["DM"]."</span></a>"; - echo "<th class='w40'><font size=1>LM<a href='#' class='tip2'> <span>".$help_label["LM"]."</span></a>"; - echo "<th class='w40'><font size=1>PM<a href='#' class='tip2'> <span>".$help_label["PM"]."</span></a>"; - echo "<th class='w30'>".$lang_label["delete"]."</th></tr>"; + echo "<th width='180px'><font size=1>".$lang_label["profiles"]; + echo "<th width='40px'><font size=1>IR<a href='#' class='tipp'> <span>".$help_label["IR"]."</span></a>"; + echo "<th width='40px'><font size=1>IW<a href='#' class='tipp'> <span>".$help_label["IW"]."</span></a>"; + echo "<th width='40px'><font size=1>IM<a href='#' class='tipp'> <span>".$help_label["IM"]."</span></a>"; + echo "<th width='40px'><font size=1>AR<a href='#' class='tipp'> <span>".$help_label["AR"]."</span></a>"; + echo "<th width='40px'><font size=1>AW<a href='#' class='tipp'> <span>".$help_label["AW"]."</span></a>"; + echo "<th width='40px'><font size=1>LW<a href='#' class='tipp'> <span>".$help_label["LW"]."</span></a>"; + echo "<th width='40px'><font size=1>UM<a href='#' class='tipp'> <span>".$help_label["UM"]."</span></a>"; + echo "<th width='40px'><font size=1>DM<a href='#' class='tipp'> <span>".$help_label["DM"]."</span></a>"; + echo "<th width='40px'><font size=1>LM<a href='#' class='tipp'> <span>".$help_label["LM"]."</span></a>"; + echo "<th width='40px'><font size=1>PM<a href='#' class='tipp'> <span>".$help_label["PM"]."</span></a>"; + echo "<th width='40px'>".$lang_label["delete"]."</th></tr>"; while ($rowdup=mysql_fetch_array($resq1)){ $id_perfil = $rowdup["id_perfil"]; $nombre=$rowdup["name"]; @@ -219,42 +219,42 @@ echo "<tr><td colspan='3' align='right'><input name='uptbutton' type='submit' cl echo "<td class='$tdcolor'><a href='index.php?sec=gperfiles&sec2=godmode/perfiles/lista_perfiles&edit_profile=".$id_perfil."'><b>".$nombre."</b></a>"; echo "<td class='$tdcolor'>"; - if ($incident_view == 1) echo "<img src='images/ok.gif' border=0>"; + if ($incident_view == 1) echo "<img src='images/ok.png' border=0>"; echo "<td class='$tdcolor'>"; - if ($incident_edit == 1) echo "<img src='images/ok.gif' border=0>"; + if ($incident_edit == 1) echo "<img src='images/ok.png' border=0>"; echo "<td class='$tdcolor'>"; - if ($incident_management == 1) echo "<img src='images/ok.gif' border=0>"; + if ($incident_management == 1) echo "<img src='images/ok.png' border=0>"; echo "<td class='$tdcolor'>"; - if ($agent_view == 1) echo "<img src='images/ok.gif' border=0>"; + if ($agent_view == 1) echo "<img src='images/ok.png' border=0>"; echo "<td class='$tdcolor'>"; - if ($agent_edit == 1) echo "<img src='images/ok.gif' border=0>"; + if ($agent_edit == 1) echo "<img src='images/ok.png' border=0>"; echo "<td class='$tdcolor'>"; - if ($alert_edit == 1) echo "<img src='images/ok.gif' border=0>"; + if ($alert_edit == 1) echo "<img src='images/ok.png' border=0>"; echo "<td class='$tdcolor'>"; - if ($user_management == 1) echo "<img src='images/ok.gif' border=0>"; + if ($user_management == 1) echo "<img src='images/ok.png' border=0>"; echo "<td class='$tdcolor'>"; - if ($db_management == 1) echo "<img src='images/ok.gif' border=0>"; + if ($db_management == 1) echo "<img src='images/ok.png' border=0>"; echo "<td class='$tdcolor'>"; - if ($alert_management == 1) echo "<img src='images/ok.gif' border=0>"; + if ($alert_management == 1) echo "<img src='images/ok.png' border=0>"; echo "<td class='$tdcolor'>"; - if ($pandora_management == 1) echo "<img src='images/ok.gif' border=0>"; - echo "<td class='$tdcolor' align='center'><a href='index.php?sec=gagente&sec2=godmode/perfiles/lista_perfiles&delete_profile=".$id_perfil."' onClick='if (!confirm(\' ".$lang_label["are_you_sure"]."\')) return false;'><img border='0' src='images/cancel.gif'></a></td></tr>"; + if ($pandora_management == 1) echo "<img src='images/ok.png' border=0>"; + echo "<td class='$tdcolor' align='center'><a href='index.php?sec=gagente&sec2=godmode/perfiles/lista_perfiles&delete_profile=".$id_perfil."' onClick='if (!confirm(\' ".$lang_label["are_you_sure"]."\')) return false;'><img border='0' src='images/cross.png'></a></td></tr>"; } echo "</div></td></tr>"; echo "<tr><td colspan='12'><div class='raya'></div></td></tr>"; echo "<tr><td colspan='12' align='right'>"; echo "<form method=post action='index.php?sec=gperfiles&sec2=godmode/perfiles/lista_perfiles&new_profile=1'>"; - echo "<input type='submit' class='sub' name='crt' value='".$lang_label["create_profile"]."'>"; + echo "<input type='submit' class='sub next' name='crt' value='".$lang_label["create_profile"]."'>"; echo "</form></table>"; } } 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 "<h2>".$lang_label["manage_recontask"]."</h2>"; $query="SELECT * FROM trecon_task"; $result=mysql_query($query); $color=1; - -echo "<table cellpadding='4' cellspacing='4' witdh='750'>"; -echo "<tr><th class='datos'>".$lang_label["name"]; -echo "<th class='datos'>".$lang_label['type']; -echo "<th class='datos'>".$lang_label['network']; -echo "<th class='datos'>".$lang_label['network_profile']; -echo "<th class='datos'>".$lang_label['group']; -echo "<th class='datos'>".$lang_label['incident']; -echo "<th class='datos'>".$lang_label['interval']; -echo "<th class='datos'>".$lang_label['recon_server']; -echo "<th class='datos'>".$lang_label['network_server']; -echo "<th class='datos'>X"; +if (mysql_num_rows($result)){ + echo "<table cellpadding='4' cellspacing='4' witdh='750'>"; + echo "<tr><th class='datos'>".$lang_label["name"]; + echo "<th class='datos'>".$lang_label['type']; + echo "<th class='datos'>".$lang_label['network']; + echo "<th class='datos'>".$lang_label['network_profile']; + echo "<th class='datos'>".$lang_label['group']; + echo "<th class='datos'>".$lang_label['incident']; + echo "<th class='datos'>".$lang_label['interval']; + echo "<th class='datos'>".$lang_label['recon_server']; + echo "<th class='datos'>".$lang_label['network_server']; + echo "<th class='datos'>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 "<a href='index.php?sec=gserver&sec2=godmode/servers/modificar_server&server=$id_network_server_assigned'>".give_server_name($id_network_server_assigned)."</a>";; // ACTION - echo "<td class='".$tdcolor."' align='center'><a href='index.php?sec=gservers&sec2=godmode/servers/manage_recontask&delete=$id_rt'><img src='images/cancel.gif' border='0'>"; + echo "<td class='".$tdcolor."' align='center'><a href='index.php?sec=gservers&sec2=godmode/servers/manage_recontask&delete=$id_rt'><img src='images/cross.png' border='0'>"; } - -echo '<tr><td colspan="12"><div class="raya"></div></td></tr>'; +if (mysql_num_rows($result)){ + echo '<tr><td colspan="12"><div class="raya"></div></td></tr>'; +} else { + echo "<div class='nf'>".$lang_label["no_rtask"]."</div>"; + echo "<table>"; +} echo "<tr><td align='right' colspan='11'>"; echo "<form method='post' action='index.php?sec=gservers&sec2=godmode/servers/manage_recontask_form&create'>"; -echo "<input type='submit' class='sub' name='crt' +echo "<input type='submit' class='sub next' name='crt' value='".$lang_label["create"]."'>"; echo "</form></table>"; 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 "<td class='".$tdcolor."f9' align='middle'>".substr($keepalive,0,25); echo "<td class='".$tdcolor."f9' align='middle'>".substr($laststart,0,25); - echo "<td class='".$tdcolor."f9' align='middle'><a href='index.php?sec=gserver&sec2=godmode/servers/modificar_server&server_del=".$id_server."&delete'><img src='images/cancel.gif' border='0'>"; + echo "<td class='".$tdcolor."f9' align='middle'><a href='index.php?sec=gserver&sec2=godmode/servers/modificar_server&server_del=".$id_server."&delete'><img src='images/cross.png' border='0'>"; } echo '<tr><td colspan="12"><div class="raya"></div></td></tr></table>'; } 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 <slerena@gmail.com>, 2003-2006 -// Raul Mateos <raulofpandora@gmail.com>, 2005-2006 +// Sancho Lerena <slerena@gmail.com>, 2003-2007 +// Raul Mateos <raulofpandora@gmail.com>, 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 "<h3 class='suc'>".$lang_label["modify_link_ok"]."</h3>"; } - 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 "<tr><td class='$tdcolor'><b><a href='index.php?sec=gsetup&sec2=godmode/setup/links&form_edit=1&id_link=".$row["id_link"]."'>".$row["name"]."</a></b>"; - echo '<td class="'.$tdcolor.'" align="center"><a href="index.php?sec=gsetup&sec2=godmode/setup/links&id_link='.$row["id_link"].'&borrar='.$row["id_link"].'" onClick="if (!confirm(\' '.$lang_label["are_you_sure"].'\')) return false;"><img border=0 src="images/cancel.gif"></a>'; + echo '<td class="'.$tdcolor.'" align="center"><a href="index.php?sec=gsetup&sec2=godmode/setup/links&id_link='.$row["id_link"].'&borrar='.$row["id_link"].'" onClick="if (!confirm(\' '.$lang_label["are_you_sure"].'\')) return false;"><img border=0 src="images/cross.png"></a>'; } echo "<tr><td colspan='2'><div class='raya'></div></td>"; echo "<tr><td colspan='2' align='right'>"; echo "<form method='post' action='index.php?sec=gsetup&sec2=godmode/setup/links&form_add=1'>"; - echo "<input type='submit' class='sub' name='form_add' value='".$lang_label["add"]."'>"; + echo "<input type='submit' class='sub next' name='form_add' value='".$lang_label["add"]."'>"; echo "</form></table>"; } // 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 "<form name='setup' method='POST' action='index.php?sec=gsetup&sec2=godmode/setup/setup&update=1'>"; echo '<table width="500" cellpadding="3" cellspacing="3">'; echo '<tr><td class="lb" rowspan="9" width="5"></td><td class="datos">'.$lang_label["language_code"]; - echo '<td class="datos"><select name="language_code" onChange="javascript:this.form.submit();" class="w180">'; + echo '<td class="datos"><select name="language_code" onChange="javascript:this.form.submit();" width="180px">'; $sql="SELECT * FROM tlanguage"; $result=mysql_query($sql); @@ -124,7 +124,7 @@ if (comprueba_login() == 0) echo "<tr><td colspan='3'><div class='raya'></div></td></tr>"; echo "<tr><td colspan='3' align='right'>"; - echo '<input type="submit" class="sub" value="'.$lang_label["update"].'">'; + echo '<input type="submit" class="sub upd" value="'.$lang_label["update"].'">'; echo "</table>"; } 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 '<td class="'.$tdcolor.'">'; echo "<b style='margin-left:10px'>".dame_perfil($row["id_perfil"])."</b> / "; echo "<b>".dame_grupo($row["id_grupo"])."</b>"; - echo '<td class="'.$tdcolor.'t"><a href="index.php?sec=gusuarios&sec2=godmode/usuarios/configurar_usuarios&id_usuario_mio='.$id_usuario_mio.'&borrar_grupo='.$row["id_up"].' " onClick="if (!confirm(\' '.$lang_label["are_you_sure"].'\')) return false;"><img border=0 src="images/cancel.gif"></a><tr>'; + echo '<td class="'.$tdcolor.'t"><a href="index.php?sec=gusuarios&sec2=godmode/usuarios/configurar_usuarios&id_usuario_mio='.$id_usuario_mio.'&borrar_grupo='.$row["id_up"].' " onClick="if (!confirm(\' '.$lang_label["are_you_sure"].'\')) return false;"><img border=0 src="images/cross.png"></a><tr>'; } echo "<tr><td colspan='3'><div class='raya'></div></td></tr>"; } 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 <slerena@gmail.com>, 2003-2006 -// Raul Mateos <raulofpandora@gmail.com>, 2005-2006 +// Sancho Lerena <slerena@gmail.com>, 2003-2007 +// Raul Mateos <raulofpandora@gmail.com>, 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) <?php $query1="SELECT * FROM tusuario"; $resq1=mysql_query($query1); -// Inicializacion variables +// Init vars $nombre = ""; $nivel = ""; $comentarios = ""; @@ -82,13 +81,13 @@ while ($rowdup=mysql_fetch_array($resq1)){ echo "</span></a>"; echo "<td class='$tdcolor'>".$comentarios; - echo "<td class='$tdcolor' align='center'><a href='index.php?sec=gagente&sec2=godmode/usuarios/lista_usuarios&borrar_usuario=".$nombre."' onClick='if (!confirm(\' ".$lang_label["are_you_sure"]."\')) return false;'><img border='0' src='images/cancel.gif'></a>"; + echo "<td class='$tdcolor' align='center'><a href='index.php?sec=gagente&sec2=godmode/usuarios/lista_usuarios&borrar_usuario=".$nombre."' onClick='if (!confirm(\' ".$lang_label["are_you_sure"]."\')) return false;'><img border='0' src='images/cross.png'></a>"; } echo "<tr><td colspan='5'><div class='raya'></div></td></tr>"; echo "<tr><td colspan='5' align='right'>"; echo "<form method=post action='index.php?sec=gusuarios&sec2=godmode/usuarios/configurar_usuarios&alta=1'>"; - echo "<input type='submit' class='sub' name='crt' value='".$lang_label["create_user"]."'>"; - echo "</form></td></tr></table>"; + echo "<input type='submit' class='sub next' name='crt' value='".$lang_label["create_user"]."'>"; + echo "</form></td></tr></table>"; echo "</table>"; 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.</ <p class="center"><img src="images/image004.png"></p> -<p>A user profile is deleted by clicking on the delete icon <img src="../../images/cancel.gif">�on the right hand side of the profile.</p> +<p>A user profile is deleted by clicking on the delete icon <img src="../../images/cross.png">�on the right hand side of the profile.</p> <h2><a name="23">2.3. Deleting a user</a></h2> -<p>A user is deleted by clicking on the delete icon <img src="../../images/cancel.gif">�on the right hand side of the user. The list of users is accessed through the "Manage Users" option in the Administration menu.</p> +<p>A user is deleted by clicking on the delete icon <img src="../../images/cross.png">�on the right hand side of the user. The list of users is accessed through the "Manage Users" option in the Administration menu.</p> <p class="center"><img src="images/image005.png"></p> 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.</p> A group is added by clicking "Create group" and assigning a name to it.</p> <p> -A group is deleted by clicking the delete icon <img src="../../images/cancel.gif"> in the right hand side of each group.</p> +A group is deleted by clicking the delete icon <img src="../../images/cross.png"> in the right hand side of each group.</p> <h2><a name="32">3.2. Adding an agent</a></h2> @@ -155,7 +155,7 @@ user views.</li> <p>In this screen the modules can be:</p> <ul> -<li>Deleted by clicking <img src="../../images/cancel.gif"></li> +<li>Deleted by clicking <img src="../../images/cross.png"></li> <li>Edited by clicking <img src="../../images/config.gif"></li> </ul> @@ -185,7 +185,7 @@ Operating System.</p> <p class="center"><img src="images/image011.png"></p> -<p>An Alert is deleted by clicking on the delete icon <img src="../../images/cancel.gif"> placed on the right hand side of the Alert. A new customised Alert can be created clicking in "Create Alert".</p> +<p>An Alert is deleted by clicking on the delete icon <img src="../../images/cross.png"> placed on the right hand side of the Alert. A new customised Alert can be created clicking in "Create Alert".</p> <p>The values "<code>_field1_</code>", "<code>_field2_</code>" and "<code>_field3_</code>" 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.</p> 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.</p> <p><b>User ID: </b>User that validated the event.</p> <p><b>Timestamp:</b> Date and time when the event was raised or validated- if it has been validated.</p> <p><b>Action:</b> Action that can be executed over the event.</p> -<p class="ml25"><img src="../../images/ok.gif"> This icon will validate the event, disappearing the icon</p> -<p class="ml25"><img src="../../images/cancel.gif"> This icon will delete the event</p> +<p class="ml25"><img src="../../images/ok.png"> This icon will validate the event, disappearing the icon</p> +<p class="ml25"><img src="../../images/cross.png"> This icon will delete the event</p> <p>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.</p> servers.</p> <p> It is possible delete a server using the icon - <img src="../../images/cancel.gif"> + <img src="../../images/cross.png"> </p> <p> 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 <p class="center"><img src="images/image004.png"></p> -<p>Para borrar un perfil de un usuario bastará con pulsar en el icono <img src="../../images/cancel.gif"> +<p>Para borrar un perfil de un usuario bastará con pulsar en el icono <img src="../../images/cross.png"> correspondiente que hay a la derecha de cada perfil.</p> <h2><a name="23">2.3. Borrar un usuario</a></h2> -<p>Para borrar un usuario bastará en pulsar en el icono <img src="../../images/cancel.gif"> +<p>Para borrar un usuario bastará en pulsar en el icono <img src="../../images/cross.png"> 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.</p> <p class="center"><img src="images/image005.png"></p> 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.</p> <p>Se pueden crear todos los grupos que se necesiten pulsando en �Crear grupo� y asignándole un nombre.</p> <p>Para borrar un grupo se pulsa en -el icono <img src="../../images/cancel.gif"> que cada grupo tienen a su derecha.</p> +el icono <img src="../../images/cross.png"> que cada grupo tienen a su derecha.</p> <h2><a name="32">3.2. Añadir un agente</a></h2> @@ -171,7 +171,7 @@ Cualquier valor por debajo del mínimo definido se interpretará com <p>Desde aquí se puede:</p> <ul> -<li>borrar un módulo pinchando en el icono <img src="../../images/cancel.gif"></li> +<li>borrar un módulo pinchando en el icono <img src="../../images/cross.png"></li> <li>o editarlo, pinchando en el icono <img src="../../images/config.gif"></li> </ul> @@ -203,7 +203,7 @@ Operativo de Pandora.</p> <p class="center"><img src="images/image011.png"></p> -<p>Para borrar una alerta pulsamos en <img src="../../images/cancel.gif"> que se encuentra a la derecha de la alerta que se quiere borrar.</p> +<p>Para borrar una alerta pulsamos en <img src="../../images/cross.png"> que se encuentra a la derecha de la alerta que se quiere borrar.</p> <p>Para crear una alerta personalizada se accede a �Gestión de alertas� > �Crear alertas�, en el menú de administración</p> 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.</p> <p><b>ID de usuario:</b> Usuario que ha validado el evento.</p> <p><b>Fecha y hora:</b> Fecha y hora de aparición del evento o de validación en caso de estar validado.</p> <p><b>Acción:</b> Acción que se puede ejecutar sobre el evento:</p> -<p class="ml25"><img src="../../images/ok.gif"> Pinchando en este icono se validará el evento y desaparecerá el icono</p> -<p class="ml25"><img src="../../images/cancel.gif"> Pinchando en este icono se borrará (y desaparecerá) el evento</p> +<p class="ml25"><img src="../../images/ok.png"> Pinchando en este icono se validará el evento y desaparecerá el icono</p> +<p class="ml25"><img src="../../images/cross.png"> Pinchando en este icono se borrará (y desaparecerá) el evento</p> <p>Los eventos también se pueden validar y eliminar, marcándolos en la columna de la derecha y pinchando en �Validar� o �Borrar�.</p> 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.</p> <p>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.</p> <p> Para borrar un servidor utilizamos el icono - <img src="../../images/cancel.gif"> + <img src="../../images/cross.png"> </p> <p> 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)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!AxT6*R5;6( zlj}|sQ51!ViOGr2pjL^7$dQ1=8$w$KD6I_$CeZtZUZjAurR}6mp*HFdO?(oc3q-}< zu+o`!I@9H@m`W`r;m1zSWX}5bthM(H02sJT)z?DT&OUcv5HmU|-dF4oa@p;T*KAHh zFQ6^X?4p&<LW?JRAa!4W*8^cRHn#BV<;v&k;?li;fWKno-=RgNB}6ngw>uEoyT++I zn$b9r%cFfhHe2K68Pk<hKq}2z2~lh9z5zadf|kv-0cZq5T=w`mb%(MY1L(c%58!zI zxmp(Hu69|_VhN_cj;WfM0p5Rrno6S{41>Bu*@^<$y+7xQ$wJ~;c5aBx$R=xq*41Wo zhwQus_VOgm0hughj}MhOvs#{>Vg09Y8WxjWUJY5Y<Msg#Hz1}_nVr{4MuGi*zXu>W zJ?&8eG!59Cz=|E%Ns@013KLWOLV)CObIIj_5{>{#k%TEAMs_GbdDV`x-iYsG<NRDe z&F<oo(+wrG4$v4ShYJ*zTAVUyCyUEKWCOJq%P2g2jKiT}-UXn|;?x~V@D+7UK%!5l zu+-wDffb%iu%q!uYSm;0f+3t(tT-AO#lfvX-T}~N2{oGoN+1Mj)d31iEk4tC0{b>H z#=Z{USAQA>NY(}X7=3{K8#<xO0&SL1U06cNFs)HoJ!v1_9b#Vw@2F?RJt3C#MxpR@ plJ)zU4s^HK{`H%}g=4&I{RVQoq{rLsz7zle002ovPDHLkV1j2<C=vhw literal 0 HcmV?d00001 diff --git a/pandora_console/images/go.png b/pandora_console/images/go.png new file mode 100644 index 0000000000000000000000000000000000000000..bc4faa709e7980514e6aaa5360e6208e63248c65 GIT binary patch literal 410 zcmV;L0cHM)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzEJ;K`R5;6H z`2YVu10|SYm>ZD2*!*kie8d0ob9Fh%G9Y=r;n&8^QUAkdX#Dq|D$hyKfc&Ml|8p0c z|4m<L{5Nr~{@<GQq5oH%p7_6Hwf}$De(}Gy-GV%L4FEd%|AuqZ{;xed1*~z!=?VWQ z>?!%b@Oan%jHPb>P21W3>NYd-<1_&1WU%JGUHShzcVz!>-In&hVRPdDrmgA!XB=w& zAG5&bziK_hADjk6&({3E^3;U?OHcIvUwEwR|Gc9eKtr<rPe0W3KW(YUf5lpcSJIUX z1~?4}oUZuKbE5P==YG+D*4_O7;^tfZpLVd}f6`*N|MImA&m}7vv`C5t?PkWW@e7^* z%U3fz0cut!IU0dZ{wi0^{9m+^L6Pi~C|u6KIk@uz0Ed;w`VQT!>;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)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!y-7qtR5*>LlS^onXB38?@6QEeG-)n` zWaf{O3~d%syp<LiQnjsU8$oHHg2X7g5_D7OwovJ!ilD_RNH<l}*iANKyHHTt5YP#9 zhD4*ijA6|DGpR#syi6wleBXDzE=r?Ty0P!_aCkVJ_kERfj{l>|e-HL0HpYzByR4Og zP|vrD7!a93IA^RKy14C5`q_Q;>;-$T_w<G3@MM%&+p3lxYOCr2cwC<4#=R@td6di} z9J;zQGyDQzU^L!W(&5>7eQ#}7(`s_1X>xM`0FlK}T5EhJ^9e58{H9n5dlLJnhZg|- zKd$c#jUI_N^hRE7TE%GL8b&Ne1P@R^rK%v_vWZ*S1cT#4IfR~xgW0<tfHk^5s$!9@ zrqzrVt}$;kWvekpQ`TjS)@+XSl9(A`h5rU?npQ+YO+SDKpl!H&P1{>!=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 zCbHLAAAOf<QT$oVb9(GECi6)uoJX}+!G_p-jHO3NP5zvt%;0lD>i)v-D~9gu{?|XK zUArvK^usBF2U9o^{KiiFy5-zR|G?MZT`GE2YER~PF#H?<pyR0DC!ssJuDz>mYxiav zYMQ}8p*X|$$;*u2PUn@U4rNXRFGl$vE&tSyVcjka11@x}SWrsM0O!yQWxfplyG$>m ZzW}f<UJcznv)}*#002ovPDHLkV1kd-ce?-p diff --git a/pandora_console/images/ok.png b/pandora_console/images/ok.png new file mode 100644 index 0000000000000000000000000000000000000000..89c8129a490b329f3165f32fa0781701aab417ea GIT binary patch literal 781 zcmV+o1M>WdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!pGibPR5;6} zlj}=UVI0T(J9f@?Yy$~oL?MENP<s_55<8j=#k?#_)7`z&He=XKi!yRv#z-kGv(##H zPHpPc=GK%laoJHq%)RMCwPAFzZ|CgAOcEn{;0q5A&*$@du5ke3{wIG76!;E_a;FdK zvpp$H#^e2A>4-QibtN)VXQDpczE`xXAkUjh%RI>;okxb7K@0kpyQ1k_Y(|Oe7$m(^ zNYX>mI||sUbmn+c<m#Le&eeX{US5M~t}+^~?^x|a<4hF}*!YoT8=u}L$nm5IGu=t+ z9L!Cu36!D2Ujog{8R*!Qv#Iu-h5hwCT%4+a*g~$0uam-<K;}*|sK&CQl{uILRo+uj zOcz2iRRHx=A>3<&FnE=4u#()KBS^SH8e)Qs5i!#lY=$-1gbH6VluzU=m=EP78&5vQ z-?+fFP-G2l&l_QzYealK$;1Rl?FkzXR&Jv<pn=v~#I9rjiy!8pnkdBB+E5h!vH2Zs z&o03*QH;J|Cj>@fBPNjCr#AYRyJ7UJQ0v#?)7Ott=>3<sG1xL&549^BdiQDc2Rk6B z`CZUMF*oL$(7tdPx=A_AzG_6ieU8GLKR01{dI4q5ENECkOP~(zUNfjFVrvVjw*&_H zKpN~TcTqhdhuVD-b<^codbfbK*#?vj9*4ql0y<|7?610!ZaoaDlGr-LWGi2|kG&eR zM}vpV9aN6yK|7oS)sPHI2Nw>`#-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<CFVY6wQ4<%I<*UYM=Ou+dYcgy^ro@n7=`XV9$WdAihN00000 LNkvXXu0mjf{u*Ke literal 0 HcmV?d00001 diff --git a/pandora_console/images/upd.png b/pandora_console/images/upd.png new file mode 100644 index 0000000000000000000000000000000000000000..a2db978fa3490c115809a840425802a6d553db41 GIT binary patch literal 600 zcmV-e0;m0nP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60 z0RN!9r;`8x0u4z-K~#9!rBgj<Q&AND?z`tbwE<i3r%fu&leRo6RUG0bC`52@2zD%P ziiol8;!p@Kf=h8J(ZS8F;v&UGDA-0&5ras@lr+YqQuC}W8izEMch9{pqN$0r;s<9q zKYX0?opWG}!B#eS#WR1)S=a`oO*lL{U|QvbG0pM##POsG_!0*^sFXq^+zn<%saV4N z<br6drA8-l=X68`Jbmzh8|&I1LEFw<V56Z8Lu(Bo1dfayGV_x;(UQQnX}UMk8|&%p zK`mGZSp-Wn*jUhlK_o%8M9U7&-5W|qyP~na&VI0Agq#p^#kVLeml4_54aEu-zk*jc z-)tJ;mxyH3h`ZMX8-_7J=JlNRzxY!#SDy%ftpfjZ1<$T$#h-dL5J<1RtsNmJgq5lf z+o2l|FV77BB*)|Nr=ryssBu+N5QN2$L?HXOJhnsQXVP(_0)|owDqv(%&&4JJBANfr z8=e#v+&wNzYsJ*?)LC%AAe&Mrj-JF0a!{>(!|aRMd~*jR)1TJ;TYVk<&_*NfowAm` zmannW2zP`*(gqvG$JJ$!L+O@>G&*<wWi;f*qPwH0s|}El(8i#y>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+VKe0000<MNUMnLSTZXToZKw literal 0 HcmV?d00001 diff --git a/pandora_console/images/zoom.png b/pandora_console/images/zoom.png index 908612e394525fc2e52a7e9b94689c25ce167381..b51e2df6134fda92726b147e45779614ea591adc 100644 GIT binary patch delta 542 zcmV+(0^$9%1*`;+8Gi!+001a04^sdD0WVNYR7E2>VHqt_AUI?gEKejkU?n?aB|Kv# zJY*+8Ybru*EJSZFMsPPxb2d$PI#GK&QhY{Sg;{QtXM3J<gr;?esD6*GfRV3-ma}%8 z&3m8Cd!W#bow$Fc(}k(lhN{<@r@))3!HTZgjIi6Eti+SH-+z|4;hehPox9(kz~`dF z=%~o-uF2@D%kHku@UPGDwa@Ig(CxI-^tjgcz18r$*7Ld7_q*5gz1Q=-*z>#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<L>&bEq&Ag0004WQchC<K<3zH00009a7bBm000XU z000XU0RWnu7ytkOmPtfGRCwBBV88+#ER78HbP#;Iz<>DUq!?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=CcBte7<Wu&HbwtuLk@Sqa(f=UpK%^q6r zio5@Lb=ehdjr_qd5BPm%elsJSa{x@<4+jyl9eg1nd;w=IR;f9yyix1vj=Hn`W2_Mp zV6yL2tB{#PI4Z1{==2t&HQr*ZMknH(&Qc*n#?XtK4XtYdV&YzNP{_<7tG&CjzN;6g z0m=XaOapIYkAK2vz}KSUiKB-uJzjMZ>5%Q#n24<J>H!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<k0&N-gl zIMOP8@~T!QVm&=*l<BwDfpLx5f!r$vJGRT5;!0FJ#?;g2{QB~(`1q}tv&#U$$o0cP zpdBGY0)GO|I+UlQ8NSTC%KCle6mCIC$?utuynZlZjZKuExHC4p4E!sGFB}NxmzVaG z2ZQ)?^GU>_%)Xi6$-t}66-66s{|f*No(qNZN(+0+cJ0I=`T6NRU*Ap7c}uEdT>!wt zw!LAsq<c136|gWfAMrd@+tfY&W8DBiU(4=5EFi8gW@m|OP2Cf5fIlgzEBhUZNc8{! N002ovPDHLkV1mpBKcN5s diff --git a/pandora_console/include/languages/language_en.php b/pandora_console/include/languages/language_en.php index 858da18cf5..f95fa1b2b6 100644 --- a/pandora_console/include/languages/language_en.php +++ b/pandora_console/include/languages/language_en.php @@ -740,6 +740,9 @@ $lang_label["Data"]="Data"; $lang_label["Main"]="Main"; $lang_label["version"]="Version"; +//2 Apr 2007 +$lang_label["no_rtask"]="There are no recon task configured"; + global $lang_label; global $help_label; diff --git a/pandora_console/include/languages/language_es_es.php b/pandora_console/include/languages/language_es_es.php index 8200d6bf97..a4e7adb715 100644 --- a/pandora_console/include/languages/language_es_es.php +++ b/pandora_console/include/languages/language_es_es.php @@ -659,6 +659,9 @@ $lang_label["agent_general_reporting"]="Agent overview"; $lang_label["active_console"]="Consola activa"; $lang_label["parent"]="Padre"; +//2 Apr 2007 +$lang_label["no_rtask"]="No hay ninguna tarea de reconocimiento configurada"; + global $lang_label; global $help_label; ?> 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)){ <TD></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD> <TD> - <IMG SRC='imagenes/utiles/cancel.gif' border=0 onclick=\"setCookieEstado();location.href='index.php?action=cerrarVista&mode='+modo\"> + <IMG SRC='imagenes/utiles/cross.png' border=0 onclick=\"setCookieEstado();location.href='index.php?action=cerrarVista&mode='+modo\"> </TD> </TR> 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 "<br>"; echo "<img src='images/dot_red.gif'> - ".$lang_label["not_validated_event"]; echo "</td>"; echo "<td class='f9l30w17t'>"; -echo "<img src='images/ok.gif'> - ".$lang_label["validate_event"]; +echo "<img src='images/ok.png'> - ".$lang_label["validate_event"]; echo "<br>"; -echo "<img src='images/cancel.gif'> - ".$lang_label["delete_event"]; +echo "<img src='images/cross.png'> - ".$lang_label["delete_event"]; echo "</td>"; echo "<tr><td valign='middle'>".$lang_label["events"]."</td>"; echo "<td><form method='post' action='index.php?sec=eventos&sec2=operation/events/events&refr=60'>"; @@ -297,9 +297,9 @@ if ($total_events > 0){ echo "<td class='$tdcolor' align='right'>"; if (($row2["estado"] == 0) and (give_acl($id_user,$id_group,"IW") ==1)) - echo "<a href='index.php?sec=eventos&sec2=operation/events/events&offset=".$offset."&check=".$row2["id_evento"]."'><img src='images/ok.gif' border='0'></a> "; + echo "<a href='index.php?sec=eventos&sec2=operation/events/events&offset=".$offset."&check=".$row2["id_evento"]."'><img src='images/ok.png' border='0'></a> "; if (give_acl($id_user,$id_group,"IM") ==1) - echo "<a href='index.php?sec=eventos&sec2=operation/events/events&delete=".$row2["id_evento"]."&refr=60&offset=".$offset."'><img src='images/cancel.gif' border=0></a> "; + echo "<a href='index.php?sec=eventos&sec2=operation/events/events&delete=".$row2["id_evento"]."&refr=60&offset=".$offset."'><img src='images/cross.png' border=0></a> "; if (give_acl($id_user,$id_group,"IW") == 1) echo "<a href='index.php?sec=incidencias&sec2=operation/incidents/incident_detail&insert_form&from_event=".$row2["id_evento"]."'><img src='images/page_lightning.png' border=0></a>"; 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 "<td class='$tdcolor' align='center'><a href='index.php?sec=incidencias&sec2=operation/incidents/incident&quick_delete=".$row2["id_incidencia"]."' onClick='if (!confirm(\' ".$lang_label["are_you_sure"]."\')) return false;'><img src='images/cancel.gif' border='0'></a></td>"; + echo "<td class='$tdcolor' align='center'><a href='index.php?sec=incidencias&sec2=operation/incidents/incident&quick_delete=".$row2["id_incidencia"]."' onClick='if (!confirm(\' ".$lang_label["are_you_sure"]."\')) return false;'><img src='images/cross.png' border='0'></a></td>"; } } } @@ -440,7 +440,7 @@ if ($row2_count[0] <= 0 ) { if (give_acl($_SESSION["id_usuario"], 0, "IW")==1) { echo "<tr><td align='right' colspan='9'>"; echo "<form method='post' action='index.php?sec=incidencias&sec2=operation/incidents/incident_detail&insert_form'>"; - echo "<input type='submit' class='sub' name='crt' value='".$lang_label["create_incident"]."'></form>"; + echo "<input type='submit' class='sub next' name='crt' value='".$lang_label["create_incident"]."'></form>"; } echo "</td></tr></table>"; 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"])){ <tr><td class="datos2">'.$lang_label["message"].':</td></tr> <tr><td class="datos" colspan="4"><textarea name="mensaje" rows="10" class="w540">'; if (isset($_POST["mensaje"])) { - echo $_POST["mensaje"]; + echo $_POST["mensaje"]; } echo '</textarea></td></tr> <tr><td colspan="2"><div class="noraya"></div></td></tr> @@ -178,7 +178,7 @@ else { echo "<i>".$lang_label["no_subject"]."</i></a>"; echo "</a></td><td class='".$tdcolor."'>".$row3["timestamp"]."</td>"; - echo "<td class='$tdcolor' align='center'><a href='index.php?sec=messages&sec2=operation/messages/message&borrar=1&id_mensaje=".$row3["id_mensaje"]."'><img src='images/cancel.gif' border='0'></a></td></tr>"; + echo "<td class='$tdcolor' align='center'><a href='index.php?sec=messages&sec2=operation/messages/message&borrar=1&id_mensaje=".$row3["id_mensaje"]."'><img src='images/cross.png' border='0'></a></td></tr>"; } echo "<tr><td colspan='5'><div class='raya'></div></td></tr>"; } @@ -207,7 +207,7 @@ else { <input type="submit" class="sub" name="send_mes" value="'.$lang_label["reply"].'"> </form></td></tr>'; } - else echo '<tr><td colspan="5"><div class="noraya"></div></td></tr><tr><td colspan="5" align="right"><form method="post" name="new_mes" action="index.php?sec=messages&sec2=operation/messages/message&nuevo"><input type="submit" class="sub" name="send_mes" value="'.$lang_label["new_message"].'"></form></td></tr>'; + else echo '<tr><td colspan="5"><div class="noraya"></div></td></tr><tr><td colspan="5" align="right"><form method="post" name="new_mes" action="index.php?sec=messages&sec2=operation/messages/message&nuevo"><input type="submit" class="sub next" name="send_mes" value="'.$lang_label["new_message"].'"></form></td></tr>'; } echo '</table>'; ?> \ 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 "<td class='$tdcolor'>"; - echo "<a href='index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_alert&delete_alert=".$id_as."'><img src='images/cancel.gif' border=0 alt='".$lang_label["delete"]."'></b></a> "; + echo "<a href='index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_alert&delete_alert=".$id_as."'><img src='images/cross.png' border=0 alt='".$lang_label["delete"]."'></b></a> "; echo "<a href='index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_alert&update_alert=".$id_as."'><img src='images/config.gif' border=0 alt='".$lang_label["update"]."'></b></a>"; } echo "<tr><td colspan='9'><div class='raya'></div></td></tr>"; echo "<tr><td colspan=9 align='right'>"; echo '<form name="agente" method="post" action="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_alert">'; - echo '<input name="add_alert" type="submit" class="sub" value="'.$lang_label["create"].'">'; + echo '<input name="add_alert" type="submit" class="sub next" value="'.$lang_label["create"].'">'; echo "</form>"; echo "</table>"; } else { echo "<div class='nf'>".$lang_label["no_snmp_alert"]."</div>"; echo "<br><br>"; echo '<form name="agente" method="post" action="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_alert">'; - echo '<input name="add_alert" type="submit" class="sub" value="'.$lang_label["create"].'">'; + echo '<input name="add_alert" type="submit" class="sub next" value="'.$lang_label["create"].'">'; echo "</form>"; } // 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 "<img src='images/dot_yellow.gif'> - ".$lang_label["alert"]; echo "</td>"; echo "<td class='f9l20'>"; - echo "<img src='images/ok.gif'> - ".$lang_label["validate_event"]; + echo "<img src='images/ok.png'> - ".$lang_label["validate_event"]; echo "<br>"; - echo "<img src='images/cancel.gif '> - ".$lang_label["delete_event"]; + echo "<img src='images/cross.png '> - ".$lang_label["delete_event"]; echo "</td>"; echo "</tr></table>"; echo "<br>"; @@ -246,9 +246,9 @@ if (comprueba_login() == 0) { echo "<td class='datos' align='center'>"; if (($row["status"] == 0) and (give_acl($id_usuario,"0","IW") ==1)) - echo "<a href='index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&check=".$row["id_trap"]."'><img src='images/ok.gif' border='0'></a>"; + echo "<a href='index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&check=".$row["id_trap"]."'><img src='images/ok.png' border='0'></a>"; if (give_acl($id_usuario,"0","IM") ==1) - echo "<a href='index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&delete=".$row["id_trap"]."&refr=60&offset=".$offset."'><img src='images/cancel.gif' border=0></a>"; + echo "<a href='index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&delete=".$row["id_trap"]."&refr=60&offset=".$offset."'><img src='images/cross.png' border=0></a>"; echo "<td class='datos' align='center'>"; echo "<input type='checkbox' class='chk' name='snmptrapid".$offset_counter."' value='".$row["id_trap"]."'>"; echo "</td></tr>"; 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 "<tr><td class='$tdcolor'><a href='index.php?sec=usuarios&sec2=operation/users/user_edit&ver=".$nombre."'><b>".$nombre."</b></a>"; echo "<td class='$tdcolor'><font size=1>".$fecha_registro."</font>"; @@ -60,7 +62,7 @@ while ($rowdup=mysql_fetch_array($resq1)){ echo "<img src='images/user_green.png'>"; $sql1='SELECT * FROM tusuario_perfil WHERE id_usuario = "'.$nombre.'"'; $result=mysql_query($sql1); - echo "<a href='#' class='tip'> <span>"; + echo "<a href='#' class='$tip'> <span>"; if (mysql_num_rows($result)){ while ($row=mysql_fetch_array($result)){ echo dame_perfil($row["id_perfil"])."/ "; @@ -86,17 +88,17 @@ echo "<tr><td colspan='5'><div class='raya'></div></td></tr></table><br>"; $query_del1="SELECT * FROM tperfil"; $resq1=mysql_query($query_del1); echo "<tr>"; - echo "<th class='w180'><font size=1>".$lang_label["profiles"]; - echo "<th class='w40'><font size=1>IR<a href='#' class='tip2'> <span>".$help_label["IR"]."</span></a>"; - echo "<th class='w40'><font size=1>IW<a href='#' class='tip2'> <span>".$help_label["IW"]."</span></a>"; - echo "<th class='w40'><font size=1>IM<a href='#' class='tip2'> <span>".$help_label["IM"]."</span></a>"; - echo "<th class='w40'><font size=1>AR<a href='#' class='tip2'> <span>".$help_label["AR"]."</span></a>"; - echo "<th class='w40'><font size=1>AW<a href='#' class='tip2'> <span>".$help_label["AW"]."</span></a>"; - echo "<th class='w40'><font size=1>LW<a href='#' class='tip2'> <span>".$help_label["LW"]."</span></a>"; - echo "<th class='w40'><font size=1>UM<a href='#' class='tip2'> <span>".$help_label["UM"]."</span></a>"; - echo "<th class='w40'><font size=1>DM<a href='#' class='tip2'> <span>".$help_label["DM"]."</span></a>"; - echo "<th class='w40'><font size=1>LM<a href='#' class='tip2'> <span>".$help_label["LM"]."</span></a>"; - echo "<th class='w40'><font size=1>PM<a href='#' class='tip2'> <span>".$help_label["PM"]."</span></a>"; + echo "<th width='180px'><font size=1>".$lang_label["profiles"]; + echo "<th width='40px'><font size=1>IR<a href='#' class='tipp'> <span>".$help_label["IR"]."</span></a>"; + echo "<th width='40px'><font size=1>IW<a href='#' class='tipp'> <span>".$help_label["IW"]."</span></a>"; + echo "<th width='40px'><font size=1>IM<a href='#' class='tipp'> <span>".$help_label["IM"]."</span></a>"; + echo "<th width='40px'><font size=1>AR<a href='#' class='tipp'> <span>".$help_label["AR"]."</span></a>"; + echo "<th width='40px'><font size=1>AW<a href='#' class='tipp'> <span>".$help_label["AW"]."</span></a>"; + echo "<th width='40px'><font size=1>LW<a href='#' class='tipp'> <span>".$help_label["LW"]."</span></a>"; + echo "<th width='40px'><font size=1>UM<a href='#' class='tipp'> <span>".$help_label["UM"]."</span></a>"; + echo "<th width='40px'><font size=1>DM<a href='#' class='tipp'> <span>".$help_label["DM"]."</span></a>"; + echo "<th width='40px'><font size=1>LM<a href='#' class='tipp'> <span>".$help_label["LM"]."</span></a>"; + echo "<th width='40px'><font size=1>PM<a href='#' class='tipp'> <span>".$help_label["PM"]."</span></a>"; $color = 1; while ($rowdup=mysql_fetch_array($resq1)){ $id_perfil = $rowdup["id_perfil"]; @@ -122,34 +124,34 @@ echo "<tr><td colspan='5'><div class='raya'></div></td></tr></table><br>"; echo "<tr><td class='$tdcolor"."_id'>".$nombre; echo "<td class='$tdcolor'>"; - if ($incident_view == 1) echo "<img src='images/ok.gif' border=0>"; + if ($incident_view == 1) echo "<img src='images/ok.png' border=0>"; echo "<td class='$tdcolor'>"; - if ($incident_edit == 1) echo "<img src='images/ok.gif' border=0>"; + if ($incident_edit == 1) echo "<img src='images/ok.png' border=0>"; echo "<td class='$tdcolor'>"; - if ($incident_management == 1) echo "<img src='images/ok.gif' border=0>"; + if ($incident_management == 1) echo "<img src='images/ok.png' border=0>"; echo "<td class='$tdcolor'>"; - if ($agent_view == 1) echo "<img src='images/ok.gif' border=0>"; + if ($agent_view == 1) echo "<img src='images/ok.png' border=0>"; echo "<td class='$tdcolor'>"; - if ($agent_edit == 1) echo "<img src='images/ok.gif' border=0>"; + if ($agent_edit == 1) echo "<img src='images/ok.png' border=0>"; echo "<td class='$tdcolor'>"; - if ($alert_edit == 1) echo "<img src='images/ok.gif' border=0>"; + if ($alert_edit == 1) echo "<img src='images/ok.png' border=0>"; echo "<td class='$tdcolor'>"; - if ($user_management == 1) echo "<img src='images/ok.gif' border=0>"; + if ($user_management == 1) echo "<img src='images/ok.png' border=0>"; echo "<td class='$tdcolor'>"; - if ($db_management == 1) echo "<img src='images/ok.gif' border=0>"; + if ($db_management == 1) echo "<img src='images/ok.png' border=0>"; echo "<td class='$tdcolor'>"; - if ($alert_management == 1) echo "<img src='images/ok.gif' border=0>"; + if ($alert_management == 1) echo "<img src='images/ok.png' border=0>"; echo "<td class='$tdcolor'>"; - if ($pandora_management == 1) echo "<img src='images/ok.gif' border=0>"; + if ($pandora_management == 1) echo "<img src='images/ok.png' border=0>"; } } //end of page