From 88f5d5e86e6b51fa8f05b63744e8a71786c018e0 Mon Sep 17 00:00:00 2001 From: raulmateos Date: Tue, 11 Jul 2006 08:49:21 +0000 Subject: [PATCH] (Pandora Console) * estado_agente.php: Clean code, add new text about authors * configurar_agente.php: Solve small bug that in some cases the module association form didn't work.Added the feature of disable the not required inputs for the different type of agents while editingmodule. * indicent_search.php: Add new text about authors and add a line between table and button (cosmetic change) * setup.php: Add new text about authors and add a line between table and button (cosmetic change) * estado_grupo.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available. * view_server.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available. * snmp_alert.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available. Cosmetic change, adding class 'suc' when creating alert is successful. * snmp_view.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available. * tip.css: Change class padding to not showing error in Firefox Javascript Console git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@119 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/CHANGELOG | 23 ++++++++++- .../godmode/agentes/configurar_agente.php | 24 +++++++++--- .../godmode/agentes/modificar_agente.php | 25 +++++++++--- pandora_console/godmode/setup/setup.php | 28 +++++++++----- pandora_console/include/styles/tip.css | 2 +- .../operation/agentes/estado_agente.php | 26 +++++++++---- .../operation/agentes/estado_grupo.php | 3 +- .../operation/incidents/incident_search.php | 34 +++++++++++------ .../operation/servers/view_server.php | 26 +++++++++---- .../operation/snmpconsole/snmp_alert.php | 38 +++++++++++++------ .../operation/snmpconsole/snmp_view.php | 27 +++++++++---- 11 files changed, 185 insertions(+), 71 deletions(-) diff --git a/pandora_console/CHANGELOG b/pandora_console/CHANGELOG index 4e16600f03..f7637bbacb 100644 --- a/pandora_console/CHANGELOG +++ b/pandora_console/CHANGELOG @@ -1,3 +1,25 @@ +2006-07-11 Raul Mateos + + * estado_agente.php: Clean code, add new text about authors + + * configurar_agente.php: Solve small bug that in some cases the module association form didn't work. + Added the feature of disable the not required inputs for the different type of agents while editing + module. + + * indicent_search.php: Add new text about authors and add a line between table and button (cosmetic change) + + * setup.php: Add new text about authors and add a line between table and button (cosmetic change) + + * estado_grupo.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available. + + * view_server.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available. + + * snmp_alert.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available. Cosmetic change, adding class 'suc' when creating alert is successful. + + * snmp_view.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available. + + * tip.css: Change class padding to not showing error in Firefox Javascript Console + 2006-07-09 Sancho Lerena * ChangeLog: Create this file, prior to launch final 1.2 version. For the next @@ -20,4 +42,3 @@ we take now the more higest interval in modules to calculate if an agent is DOWN. * fgraph.php: updated progressbar function to show N/A when data is above 100 or below 0. - diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 29303c067b..43340c10ad 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -145,6 +145,7 @@ function type_change() "; if ($id_tipo != -1) echo "".$lang_label["delete"]."   "; - echo "".$lang_label["update"].""; + echo "".$lang_label["update"].""; } echo "
"; } else @@ -828,7 +838,7 @@ echo '
'; - echo ''; } else { echo ''; @@ -848,8 +858,10 @@ else { "; echo "".$lang_label["no_change_field"].""; + } else { echo ' -, 2003-2006 -// Raul Mateos , 2005-2006 + +// Pandora - the Free monitoring system +// ==================================== +// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com +// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es +// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // Load global vars require("include/config.php"); + if (give_acl($id_user, 0, "AW")==1) { if (isset($_GET["borrar_agente"])){ // if delete agent $id_agente = entrada_limpia($_GET["borrar_agente"]); @@ -59,7 +72,7 @@ if (give_acl($id_user, 0, "AW")==1) { $sql1='SELECT * FROM tagente ORDER BY nombre'; $result=mysql_query($sql1); if (mysql_num_rows($result)){ - echo ""; + echo "
"; echo ""; + echo ""; echo "
".$lang_label["agent_name"]; echo "".$lang_label["group"]; echo "".$lang_label["description"]; diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php index ea536acafa..7949ec5fbd 100644 --- a/pandora_console/godmode/setup/setup.php +++ b/pandora_console/godmode/setup/setup.php @@ -1,15 +1,25 @@ , 2003-2006 -// Raul Mateos , 2005-2006 +// Pandora - the Free monitoring system +// ==================================== +// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com +// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es +// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// Cargamos variables globales +// Load global vars require("include/config.php"); -//require("include/functions.php"); -//require("include/functions_db.php"); + if (comprueba_login() == 0) if ((give_acl($id_user, 0, "PM")==1) or (dame_admin($id_user)==1)) { if (isset($_GET["update"])){ @@ -105,7 +115,7 @@ if (comprueba_login() == 0) } echo ''; - echo "
"; echo ''; echo "
"; diff --git a/pandora_console/include/styles/tip.css b/pandora_console/include/styles/tip.css index 7c40183f62..d82a518b7c 100644 --- a/pandora_console/include/styles/tip.css +++ b/pandora_console/include/styles/tip.css @@ -1,7 +1,7 @@ a.tip {cursor: help; position: relative; text-decoration: none; background:url(../../images/tip.gif) no-repeat; padding: 5px 2px 5px 12px;} a.tip2 {cursor: help; position: relative; text-decoration: none; background:url(../../images/tip.gif) no-repeat; padding: 2px 2px 2px 12px;} a.help {cursor: help; position: relative; text-decoration: none; background:url(../../images/help.gif) no-repeat; padding: 2px 2px 2px 12px; left: 5px;} -a.info {position: relative; text-decoration: none; padding: 25px 0px 0px -20px;} +a.info {position: relative; text-decoration: none; padding: 25px 0px 0px 0px;} a.info2 {position: relative; text-decoration: none; padding: 2px 0px 0px 0px;} a.tip:hover {text-decoration: none; background-color: #f5f5f5;} a.tip2:hover {text-decoration: none; background-color: #778866;} diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index a3f8cc6e99..183bcef82d 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_agente.php @@ -1,15 +1,25 @@ , 2003-2006 -// Raul Mateos , 2005-2006 +// Pandora - the Free monitoring system +// ==================================== +// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com +// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es +// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // Load global vars require("include/config.php"); -//require("include/functions.php"); -//require("include/functions_db.php"); + if (comprueba_login() == 0) { if ((give_acl($id_user, 0, "AR")==1) or (give_acl($id_user,0,"AW")) or (dame_admin($id_user)==1)) { @@ -65,7 +75,7 @@ if (comprueba_login() == 0) { if ($ag_group > 1) $sql='SELECT * FROM tagente WHERE id_grupo='.$ag_group.' and disabled = 0 order by nombre'; else - $sql='SELECT * FROM tagente where disabled = 0 order by id_grupo, nombre'; + $sql='SELECT * FROM tagente WHERE disabled = 0 ORDER BY id_grupo, nombre'; $result=mysql_query($sql); if (mysql_num_rows($result)){ diff --git a/pandora_console/operation/agentes/estado_grupo.php b/pandora_console/operation/agentes/estado_grupo.php index b7bbac446a..5f9290aac0 100644 --- a/pandora_console/operation/agentes/estado_grupo.php +++ b/pandora_console/operation/agentes/estado_grupo.php @@ -19,10 +19,11 @@ // Load global vars require("include/config.php"); + if (comprueba_login() == 0) if (give_acl($id_user, 0, "AR")==1) { echo "

".$lang_label["ag_title"]."

"; - echo "

".$lang_label["group_view"]."

"; + echo "

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

"; $iduser_temp=$_SESSION['id_usuario']; $sql1='SELECT * FROM tgrupo'; diff --git a/pandora_console/operation/incidents/incident_search.php b/pandora_console/operation/incidents/incident_search.php index f9f03a59f5..a755ae5809 100644 --- a/pandora_console/operation/incidents/incident_search.php +++ b/pandora_console/operation/incidents/incident_search.php @@ -1,14 +1,25 @@ , 2003-2006 -// Raul Mateos , 2005-2006 -// Cargamos variables globales +// Pandora - the Free monitoring system +// ==================================== +// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com +// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es +// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +// Load global vars require("include/config.php"); -//require("include/functions.php"); -//require("include/functions_db.php"); + if (comprueba_login() == 0) { @@ -35,10 +46,9 @@ echo "
- - - - + + +
"; ?> diff --git a/pandora_console/operation/servers/view_server.php b/pandora_console/operation/servers/view_server.php index 70ac205640..4382b59a67 100644 --- a/pandora_console/operation/servers/view_server.php +++ b/pandora_console/operation/servers/view_server.php @@ -1,20 +1,32 @@ , 2003-2006 -// Raul Mateos , 2005-2006 +// Pandora - the Free monitoring system +// ==================================== +// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com +// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es +// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// Cargamos variables globales +// Load global vars require("include/config.php"); + if (comprueba_login() == 0) { if ((give_acl($id_user, 0, "AR")==1) or (give_acl($id_user,0,"AW")) or (dame_admin($id_user)==1)) { $sql='SELECT * FROM tserver'; echo "

".$lang_label["view_servers"]."

"; - echo "

".$lang_label["server_detail"]."

"; + echo "

".$lang_label["server_detail"]." ".$lang_label["help"]."

"; // Connect DataBase $result=mysql_query($sql); diff --git a/pandora_console/operation/snmpconsole/snmp_alert.php b/pandora_console/operation/snmpconsole/snmp_alert.php index 78980e4a13..578411d788 100644 --- a/pandora_console/operation/snmpconsole/snmp_alert.php +++ b/pandora_console/operation/snmpconsole/snmp_alert.php @@ -1,12 +1,25 @@ , 2003-2005 -// Raul Mateos , 2004-2005 -// Cargamos variables globales +// Pandora - the Free monitoring system +// ==================================== +// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com +// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es +// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +// Load global vars require("include/config.php"); + if (give_acl($id_user, 0, "LW")==1) { // Variable init $view_alert=1; @@ -97,7 +110,7 @@ if (give_acl($id_user, 0, "LW")==1) { echo ''; echo ''; // if known, if add will be undetermined (0). - echo '

'.$lang_label["create_alert"]."

"; + echo '

'.$lang_label["create_alert"]." ".$lang_label["help"]."

"; echo ''; echo ''; // Update or Add button if ($alert_update != 0) { echo '
'; // Alert @@ -149,12 +162,13 @@ if (give_acl($id_user, 0, "LW")==1) { echo ''; // max & min alerts, time threshold - echo '
'.$lang_label["max_alerts"]; - echo ''; echo '
'.$lang_label["min_alerts"]; echo ''; + echo '
'.$lang_label["max_alerts"]; + echo ''; echo '
'.$lang_label["time_threshold"]; echo ''; + echo '
'; @@ -177,11 +191,11 @@ if (give_acl($id_user, 0, "LW")==1) { $sql1='SELECT * FROM talert_snmp'; $result=mysql_query($sql1); - echo '

'.$lang_label["snmp_assigned_alerts"]."

"; + echo '

'.$lang_label["snmp_assigned_alerts"]." ".$lang_label["help"]."

"; if (mysql_num_rows($result)){ if ($alert_submit !=0) { - echo '

'.$lang_label["update_alert_ok"]."

"; + echo '

'.$lang_label["create_alert_ok"].'

'; } echo ''; echo '
'.$lang_label["alert"]; @@ -193,7 +207,7 @@ if (give_acl($id_user, 0, "LW")==1) { echo ''.$lang_label["times_fired"]; echo ''.$lang_label["last_fired"]; echo ''.$lang_label["action"]; - ; + while ($row=mysql_fetch_array($result)){ $id_as = $row["id_as"]; $id_alert = $row["id_alert"]; diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php index d5665135ad..a9c19788ed 100644 --- a/pandora_console/operation/snmpconsole/snmp_view.php +++ b/pandora_console/operation/snmpconsole/snmp_view.php @@ -28,16 +28,27 @@ , 2003-2005 -// Raul Mateos , 2005-2006 + +// Pandora - the Free monitoring system +// ==================================== +// Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com +// Copyright (c) 2005-2006 Artica Soluciones Tecnologicas S.L, info@artica.es +// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // Load global vars require("include/config.php"); -//require("include/functions.php"); -//require("include/functions_db.php"); + if (comprueba_login() == 0) { // Var init $accion = ""; @@ -105,7 +116,7 @@ if (comprueba_login() == 0) { } } echo "

Pandora SNMP

"; - echo "

".$lang_label["SNMP_console"]."

"; + echo "

".$lang_label["SNMP_console"]." ".$lang_label["help"]."

"; if (isset($_GET["offset"])) $offset=$_GET["offset"];