From 9aebe0f1aa4b0f23817e46aab01bff5857549452 Mon Sep 17 00:00:00 2001 From: raulmateos Date: Sun, 27 May 2007 02:55:55 +0000 Subject: [PATCH] 2007-05-26 Raul Mateos Massive Update * include/styles/pandora.css: Cleaned and updated some styles. * index.php: Updated, now the page is allways at the center. * general/login*.php: Updated login/logoff pages with new sytles and clean code. * images/setup.png: New file (changed from setup.gif). * include/languages/*.php: Deleted old text about database and updated some strings.* help/en/chapter3.php, help/es/chapter3.php: Changed image setup.gif to the new setup.png file. * operation/*.php: Massive close HTML tags and changed all h3 to h2 for new console headings. * godmode/*.php * include/styles/pandora.css * godmode/*.php: Changed name for directories and files: New ones are alerts, profiles, groups and users, and now the files are named in english. All features seem to be OK. * godmode/menu.php: Updated to include new names and some highlighting. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@471 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 96 +++++++++----- pandora_console/general/error_install.php | 3 +- pandora_console/general/login_page.php | 28 ++--- pandora_console/general/logoff.php | 14 +-- pandora_console/general/logon_failed.php | 30 ++--- pandora_console/godmode/admin_access_logs.php | 23 ++-- .../godmode/agentes/agent_manager.php | 8 +- .../godmode/agentes/configurar_agente.php | 2 +- .../godmode/agentes/manage_config.php | 4 +- .../configure_alert.php} | 7 +- .../modify_alert.php} | 10 +- pandora_console/godmode/db/db_audit.php | 4 +- pandora_console/godmode/db/db_event.php | 6 +- pandora_console/godmode/db/db_info.php | 6 +- pandora_console/godmode/db/db_info_data.php | 10 +- pandora_console/godmode/db/db_main.php | 4 +- pandora_console/godmode/db/db_purge.php | 6 +- pandora_console/godmode/db/db_refine.php | 4 +- .../configure_group.php} | 26 ++-- .../group_list.php} | 19 ++- pandora_console/godmode/menu.php | 51 ++------ .../godmode/modules/manage_nc_groups.php | 4 +- .../modules/manage_network_components.php | 4 +- .../modules/manage_network_templates.php | 4 +- .../godmode/modules/module_list.php | 4 +- .../profile_list.php} | 19 +-- .../godmode/servers/manage_recontask.php | 3 +- .../godmode/servers/manage_recontask_form.php | 4 +- .../godmode/servers/modificar_server.php | 8 +- pandora_console/godmode/setup/links.php | 8 +- pandora_console/godmode/setup/setup.php | 41 +++--- .../configure_user.php} | 12 +- .../user_list.php} | 10 +- pandora_console/help/en/chap3.php | 2 +- pandora_console/help/es/chap3.php | 2 +- pandora_console/images/setup.gif | Bin 561 -> 0 bytes pandora_console/images/setup.png | Bin 0 -> 509 bytes pandora_console/include/config.inc.php | 4 +- .../include/languages/language_ast_es.php | 5 - .../include/languages/language_ca.php | 9 +- .../include/languages/language_de.php | 12 +- .../include/languages/language_en.php | 15 +-- .../include/languages/language_es_es.php | 5 - .../include/languages/language_es_la.php | 5 - .../include/languages/language_fr.php | 5 - .../include/languages/language_gl.php | 5 - .../include/languages/language_it.php | 5 - .../include/languages/language_pt_br.php | 5 - pandora_console/include/styles/calendar.css | 19 --- pandora_console/include/styles/op.css | 1 - pandora_console/include/styles/pandora.css | 118 +++++++++--------- pandora_console/include/styles/tip.css | 1 + pandora_console/index.php | 52 ++++---- pandora_console/install.php | 10 +- .../operation/agentes/estadisticas.php | 4 +- .../operation/agentes/estado_agente.php | 2 +- .../operation/agentes/estado_alertas.php | 13 +- .../operation/agentes/exportdata.php | 19 +-- .../operation/agentes/status_monitor.php | 6 +- .../operation/agentes/ver_agente.php | 9 +- .../operation/events/event_statistics.php | 4 +- .../operation/incidents/incident.php | 6 +- .../operation/incidents/incident_detail.php | 10 +- .../operation/incidents/incident_search.php | 4 +- .../incidents/incident_statistics.php | 4 +- .../operation/messages/message.php | 41 +++--- .../operation/reporting/graph_builder.php | 10 +- .../operation/reporting/graph_viewer.php | 8 +- .../operation/servers/view_server.php | 2 +- .../operation/snmpconsole/snmp_alert.php | 6 +- .../operation/snmpconsole/snmp_view.php | 4 +- pandora_console/operation/users/user_edit.php | 4 +- .../operation/users/user_statistics.php | 4 +- .../operation/visual_console/index.php | 2 +- 74 files changed, 433 insertions(+), 491 deletions(-) rename pandora_console/godmode/{alertas/configurar_alerta.php => alerts/configure_alert.php} (96%) rename pandora_console/godmode/{alertas/modificar_alerta.php => alerts/modify_alert.php} (84%) rename pandora_console/godmode/{grupos/configurar_grupo.php => groups/configure_group.php} (84%) rename pandora_console/godmode/{grupos/lista_grupos.php => groups/group_list.php} (88%) rename pandora_console/godmode/{perfiles/lista_perfiles.php => profiles/profile_list.php} (92%) rename pandora_console/godmode/{usuarios/configurar_usuarios.php => users/configure_user.php} (92%) rename pandora_console/godmode/{usuarios/lista_usuarios.php => users/user_list.php} (83%) delete mode 100644 pandora_console/images/setup.gif create mode 100644 pandora_console/images/setup.png delete mode 100644 pandora_console/include/styles/calendar.css diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 1b3e084ac5..55baeea9d8 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,51 +1,79 @@ -2007-05-24 Sancho Lerena +2007-05-26 Raul Mateos - * include/styles/pandora_red.css: Added alternate sample style. - - * include/styles/pandora.css: Some problems with fonts fixed (I - hope!) - - * include/config.inc.php: Modified code to support custom Style in - DB config. By default uses "pandora". - - * include/languages/language_en.php: new string to render style - setup. - - * images/header_red.jpg: New image for red style. - - * godmode/grupos/configurar_grupo.php: Updated styles. - - * godmode/setup/setup.php: Added support for style selector. + * include/styles/pandora.css: Cleaned and updated some styles. + + * index.php: Updated, now the page is allways at the center. + + * general/login*.php: Updated login/logoff pages with new sytles + and clean code. + + * images/setup.png: New file (changed from setup.gif). + + * include/languages/*.php: Deleted old text about database and + updated some strings. + + * help/en/chapter3.php, help/es/chapter3.php: Changed image setup.gif + to the new setup.png file. + + * operation/*.php: Massive close HTML tags and changed all h3 to h2 + for new console headings. + + * godmode/*.php * include/styles/pandora.css + + * godmode/*.php: Changed name for directories and files: New ones are + alerts, profiles, groups and users, and now the files are named in + english. All features seem to be OK. + + * godmode/menu.php: Updated to include new names and some highlighting. 2007-05-24 Sancho Lerena - * include/styles/pandora.css: Some margin adjustements for databox - classes and H1-3. + * include/styles/pandora_red.css: Added alternate sample style. - * include/config.inc.php: Added support to detect empty - configuration tokens in DB and abort. + * include/styles/pandora.css: Some problems with fonts fixed (I + hope!) - * include/languages/language_en.php: More strings. + * include/config.inc.php: Modified code to support custom Style in + DB config. By default uses "pandora". - * operation/visual_console/render_view.php: Fixed static links to - images. + * include/languages/language_en.php: new string to render style + setup. - * operation/agentes/estado_alertas.php: Databox style fixed. + * images/header_red.jpg: New image for red style. - * operation/agentes/estado_monitores.php: Added image instead - label. + * godmode/grupos/configurar_grupo.php: Updated styles. - * operation/servers/view_server.php: Fixed divbyzero notice. + * godmode/setup/setup.php: Added support for style selector. - * operation/servers/view_server_detail.php: Fixed static image URL. +2007-05-24 Sancho Lerena - * reporting/fgraph.php: Fixed distribution of X axis ticks. + * include/styles/pandora.css: Some margin adjustements for databox + classes and H1-3. - * general/login_page.php: Added "demo" user by default. + * include/config.inc.php: Added support to detect empty + configuration tokens in DB and abort. - * godmode/agentes/alert_manager.php, - godmode/alertas/modificar_alerta.php - godmode/alertas/configurar_alerta.php: Style 'databox' update. + * include/languages/language_en.php: More strings. + + * operation/visual_console/render_view.php: Fixed static links to + images. + + * operation/agentes/estado_alertas.php: Databox style fixed. + + * operation/agentes/estado_monitores.php: Added image instead + label. + + * operation/servers/view_server.php: Fixed divbyzero notice. + + * operation/servers/view_server_detail.php: Fixed static image URL. + + * reporting/fgraph.php: Fixed distribution of X axis ticks. + + * general/login_page.php: Added "demo" user by default. + + * godmode/agentes/alert_manager.php, + godmode/alertas/modificar_alerta.php + godmode/alertas/configurar_alerta.php: Style 'databox' update. 2007-05-22 Sancho Lerena diff --git a/pandora_console/general/error_install.php b/pandora_console/general/error_install.php index 52688bba98..04bd18c908 100644 --- a/pandora_console/general/error_install.php +++ b/pandora_console/general/error_install.php @@ -17,6 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + include "include/config.php"; if (file_exists("include/languages/language_".$language_code.".php")) { include "include/languages/language_".$language_code.".php"; @@ -48,7 +49,7 @@ if (file_exists("include/languages/language_".$language_code.".php")) { -


For security reasons, normal operation is not possible until you delete installer file. Please delete ./install.php file before running Pandora FMS Console.
+


For security reasons, normal operation is not possible until you delete installer file. Please delete the ./install.php file before running Pandora FMS Console.
diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index 6dc71f4f73..a1cb0c1ae1 100644 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -18,29 +18,29 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ?> -
-
-

-
+
+

+
- -
+ +
logo
 - Login
- - + Login
+ +
- Password
- + Password
+ +
- + +
'.$REMOTE_ADDR.''; ?>
- - + \ No newline at end of file diff --git a/pandora_console/general/logoff.php b/pandora_console/general/logoff.php index 5de4ba27f9..00024cbd71 100644 --- a/pandora_console/general/logoff.php +++ b/pandora_console/general/logoff.php @@ -19,18 +19,18 @@ ?>
-
-

-

-
+
+

+
- +
logo
- 		- + + +
diff --git a/pandora_console/general/logon_failed.php b/pandora_console/general/logon_failed.php index 02c0ec62c0..1dff1de5ac 100644 --- a/pandora_console/general/logon_failed.php +++ b/pandora_console/general/logon_failed.php @@ -18,22 +18,18 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ?> -
-
-
-

-
- +
+
+

+
+ +
+ +
+
+ +
+ +
- -
-
- -
- -
-
-
-
- diff --git a/pandora_console/godmode/admin_access_logs.php b/pandora_console/godmode/admin_access_logs.php index 44d93c2d29..7f0085d5e0 100644 --- a/pandora_console/godmode/admin_access_logs.php +++ b/pandora_console/godmode/admin_access_logs.php @@ -33,7 +33,7 @@ exit; } - echo "

".$lang_label["audit_title"]."

"; + echo "

".$lang_label["audit_title"]." > "; if (isset($_GET["offset"])) $offset=$_GET["offset"]; else @@ -56,24 +56,27 @@ // generate select - echo "

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

"; +  ".$lang_label["help"].""; echo "
"; echo "
"; echo ""; echo ""; diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index 51817444d7..b65358c098 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -147,12 +147,12 @@ while ($row=mysql_fetch_array($result)){ '; + '; echo $lang_label["normal_mode"].' '; } else { echo $lang_label["learning_mode"].' - '; + '; echo $lang_label["normal_mode"].' '; } @@ -161,12 +161,12 @@ while ($row=mysql_fetch_array($result)){ '; + '; echo $lang_label["active"].' '; } else { echo $lang_label["disabled"].' - '; + '; echo $lang_label["active"].' '; } diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 289b716552..d6d56be52a 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -129,7 +129,7 @@ echo ""; diff --git a/pandora_console/godmode/agentes/manage_config.php b/pandora_console/godmode/agentes/manage_config.php index 5884c502c3..faef0ac27f 100644 --- a/pandora_console/godmode/agentes/manage_config.php +++ b/pandora_console/godmode/agentes/manage_config.php @@ -249,8 +249,8 @@ if (comprueba_login() == 0) } else { // Form view ?> -

-

 

+

> +  

diff --git a/pandora_console/godmode/alertas/configurar_alerta.php b/pandora_console/godmode/alerts/configure_alert.php similarity index 96% rename from pandora_console/godmode/alertas/configurar_alerta.php rename to pandora_console/godmode/alerts/configure_alert.php index 1c1c37fc9d..72733643f9 100644 --- a/pandora_console/godmode/alertas/configurar_alerta.php +++ b/pandora_console/godmode/alerts/configure_alert.php @@ -52,8 +52,7 @@ if ( (give_acl($id_user, 0, "LM")==1)){ $creacion_alerta = 1; } -echo "

".$lang_label["alert_config"]."

"; -echo "

"; +echo "

".$lang_label["alert_config"]." > "; if (isset($_GET["creacion"])){ echo $lang_label["create_alert"]; } @@ -62,11 +61,11 @@ echo "

"; } echo ' '.$lang_label["help"].''; -echo "

"; +echo ""; ?>
- +".$lang_label["alert_config"].""; - echo "

".$lang_label["alert_defined2"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["alert_config"]." > "; + echo $lang_label["alert_defined2"]." ".$lang_label["help"]."

"; echo "
"; echo ""; echo ""; @@ -66,16 +66,16 @@ if ( (give_acl($id_user, 0, "LM")==1)){ $tdcolor = "datos2"; $color = 1; } - echo ""; + echo ""; echo ""; - echo ""; + echo ""; } echo "
".$lang_label["alertname"]."".$lang_label["description"]."
".$row["nombre"]."
".$row["nombre"]."".$row["descripcion"]."
"; echo "
"; echo ""; echo "
"; - echo ""; + echo ""; echo ""; echo ""; echo "
"; diff --git a/pandora_console/godmode/db/db_audit.php b/pandora_console/godmode/db/db_audit.php index 6f6fdbace6..0a3a0e0916 100644 --- a/pandora_console/godmode/db/db_audit.php +++ b/pandora_console/godmode/db/db_audit.php @@ -94,8 +94,8 @@ if (comprueba_login() == 0) } # End of get parameters block - echo "

".$lang_label["dbmain_title"]."

"; - echo "

".$lang_label["db_purge_audit"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["dbmain_title"]." > "; + echo $lang_label["db_purge_audit"]." ".$lang_label["help"]."

"; echo ""; echo "
"; diff --git a/pandora_console/godmode/db/db_event.php b/pandora_console/godmode/db/db_event.php index aeed283b90..b30d6f7137 100644 --- a/pandora_console/godmode/db/db_event.php +++ b/pandora_console/godmode/db/db_event.php @@ -8,8 +8,6 @@ // 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, "DM")==1) or (dame_admin($id_user)==1)) { @@ -75,8 +73,8 @@ if (comprueba_login() == 0) } # End of get parameters block - echo "

".$lang_label["dbmain_title"]."

"; - echo "

".$lang_label["db_purge_event"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["dbmain_title"]." > "; + echo $lang_label["db_purge_event"]." ".$lang_label["help"]."

"; echo ""; echo "
"; diff --git a/pandora_console/godmode/db/db_info.php b/pandora_console/godmode/db/db_info.php index b1566ce873..1777040171 100644 --- a/pandora_console/godmode/db/db_info.php +++ b/pandora_console/godmode/db/db_info.php @@ -8,8 +8,6 @@ // 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, "DM")==1) or (dame_admin($id_user)==1)) { // Todo for a good DB maintenance @@ -22,8 +20,8 @@ if (comprueba_login() == 0) - A more powerful selection (by Agent, by Module, etc). */ - echo "

".$lang_label["dbmain_title"]."

"; - echo "

".$lang_label["db_info2"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["dbmain_title"]." > "; + echo $lang_label["db_info2"]." ".$lang_label["help"]."

"; echo ""; echo "

"; echo "

"; diff --git a/pandora_console/godmode/db/db_info_data.php b/pandora_console/godmode/db/db_info_data.php index 8090a78249..7daf1ccad0 100644 --- a/pandora_console/godmode/db/db_info_data.php +++ b/pandora_console/godmode/db/db_info_data.php @@ -32,12 +32,12 @@ if (comprueba_login() == 0) - A more powerful selection (by Agent, by Module, etc). */ - echo "

".$lang_label["dbmain_title"]."

"; - echo "

".$lang_label["db_stat_agent"]."

"; + echo "

".$lang_label["dbmain_title"]." > "; + echo $lang_label["db_stat_agent"]."

"; echo ""; - echo ""; + echo ""; + echo ""; $color=0; $result_2=mysql_query("SELECT id_agente FROM tagente"); diff --git a/pandora_console/godmode/db/db_main.php b/pandora_console/godmode/db/db_main.php index ecd18fc31e..2cec094c41 100644 --- a/pandora_console/godmode/db/db_main.php +++ b/pandora_console/godmode/db/db_main.php @@ -22,8 +22,8 @@ if (comprueba_login() == 0) - A more powerful selection (by Agent, by Module, etc). */ ?> -

-

 

+

> +  

".$lang_label["agent_name"]; - echo "".$lang_label["assigned_module"]; - echo "".$lang_label["total_data"]; + echo "
".$lang_label["agent_name"]."".$lang_label["assigned_module"]."".$lang_label["total_data"]."
: 

diff --git a/pandora_console/godmode/db/db_purge.php b/pandora_console/godmode/db/db_purge.php index 8de95e5ddc..fa9fb7a301 100644 --- a/pandora_console/godmode/db/db_purge.php +++ b/pandora_console/godmode/db/db_purge.php @@ -8,8 +8,6 @@ // Load global vars require("include/config.php"); -//require("include/functions.php"); -//require("include/functions_db.php"); if (comprueba_login() == 0) $id_usuario= $_SESSION["id_usuario"]; if (give_acl($id_usuario, 0, "DM")==1){ @@ -22,8 +20,8 @@ if (comprueba_login() == 0) - A more powerful selection (by Agent, by Module, etc). */ ?> -

-

 

+

> +  



-

-

 

+

> +  

diff --git a/pandora_console/godmode/grupos/configurar_grupo.php b/pandora_console/godmode/groups/configure_group.php similarity index 84% rename from pandora_console/godmode/grupos/configurar_grupo.php rename to pandora_console/godmode/groups/configure_group.php index f7212330c8..2353c2018b 100644 --- a/pandora_console/godmode/grupos/configurar_grupo.php +++ b/pandora_console/godmode/groups/configure_group.php @@ -33,10 +33,10 @@ if (comprueba_login() == 0) $id_parent = ""; $disabled = 0; - if (isset($_GET["creacion_grupo"])){ // - $creacion_grupo = entrada_limpia($_GET["creacion_grupo"]); + if (isset($_GET["create_g"])){ // + $create_g = entrada_limpia($_GET["create_g"]); } else - $creacion_grupo = 0; + $create_g = 0; if (isset($_GET["id_grupo"])){ // Conecto con la BBDD @@ -57,21 +57,25 @@ if (comprueba_login() == 0) } } - echo "

".$lang_label["group_management"]."

"; - if (isset($_GET["creacion_grupo"])) {echo "

".$lang_label["create_group"]." ".$lang_label["help"]."

";} - if (isset($_GET["id_grupo"])) {echo "

".$lang_label["update_group"]." ".$lang_label["help"]."

";} + echo "

".$lang_label["group_management"]." > "; + if (isset($_GET["create_g"])) { + echo $lang_label["create_group"]." ".$lang_label["help"]."

"; + } + if (isset($_GET["id_grupo"])) { + echo $lang_label["update_group"]." ".$lang_label["help"].""; + } ?>
+sec2=godmode/groups/group_list"> "; + if ($create_g == 1) + echo ""; else { - echo ""; + echo ""; echo ""; } ?> @@ -135,7 +139,7 @@ sec2=godmode/grupos/lista_grupos"> echo "
"; echo ""; echo '
'; - if (isset($_GET["creacion_grupo"])) + if (isset($_GET["create_g"])) echo ""; else echo ""; diff --git a/pandora_console/godmode/grupos/lista_grupos.php b/pandora_console/godmode/groups/group_list.php similarity index 88% rename from pandora_console/godmode/grupos/lista_grupos.php rename to pandora_console/godmode/groups/group_list.php index 5f6ae8df77..6135f7a74e 100644 --- a/pandora_console/godmode/grupos/lista_grupos.php +++ b/pandora_console/godmode/groups/group_list.php @@ -28,7 +28,7 @@ if (comprueba_login() == 0) $id_user = $_SESSION["id_usuario"]; if (give_acl($id_user, 0, "PM")==1) { - if (isset($_POST["crear_grupo"])){ // Create group + if (isset($_POST["create_g"])){ // Create group $nombre = entrada_limpia($_POST["nombre"]); $icon = entrada_limpia($_POST["icon"]); $parent = entrada_limpia($_POST["parent"]); @@ -44,7 +44,7 @@ if (comprueba_login() == 0) } } - if (isset($_POST["update_grupo"])){ // if modified any parameter + if (isset($_POST["update_g"])){ // if modified any parameter $nombre = entrada_limpia($_POST["nombre"]); $id_grupo = entrada_limpia($_POST["id_grupo"]); $icon = entrada_limpia($_POST["icon"]); @@ -60,7 +60,7 @@ if (comprueba_login() == 0) echo "

".$lang_label["modify_group_ok"]."

"; } - if (isset($_GET["borrar_grupo"])){ // if delete + if (isset($_GET["delete_g"])){ // if delete $id_borrar_modulo = entrada_limpia($_GET["id_grupo"]); // First delete from tagente_modulo @@ -71,12 +71,11 @@ if (comprueba_login() == 0) else echo "

".$lang_label["delete_group_ok"]."

"; } - echo "

".$lang_label["group_management"]."

"; - echo " -

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

".$lang_label["group_management"]." > "; + echo $lang_label["definedgroups"]." ".$lang_label["help"]." -

"; + "; echo ""; echo ""; @@ -101,7 +100,7 @@ if (comprueba_login() == 0) echo ""; echo ""; echo ""; echo ""; echo ""; } @@ -124,7 +123,7 @@ if (comprueba_login() == 0) echo ""; echo "
".$lang_label["icon"].""; - echo "".$row["nombre"].""; + echo "".$row["nombre"].""; echo ""; echo dame_nombre_grupo ($row["parent"]); @@ -116,7 +115,7 @@ if (comprueba_login() == 0) echo ""; - echo "'; echo "
"; echo ""; + sec2=godmode/groups/configure_group&create_g=1'>"; echo ""; echo "
"; diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index 91529d257c..7029abffcb 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -47,12 +47,12 @@ if (comprueba_login() == 0){ else echo "
"; echo "
"; - if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/grupos/lista_grupos" || $_GET["sec2"] == "godmode/grupos/configurar_grupo")){ + if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/groups/group_list" || $_GET["sec2"] == "godmode/groups/configure_group")){ echo "
"; } else echo "
"; - echo "
"; + echo "
"; } } @@ -89,25 +89,25 @@ if (comprueba_login() == 0){ } if ((give_acl($id_user, 0, "LM")==1)){ - if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/alertas/modificar_alerta" || $_GET["sec2"] == "godmode/alertas/configurar_alerta")){ + if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/alerts/modify_alert" || $_GET["sec2"] == "godmode/alerts/configure_alert")){ echo ''; } if ((give_acl($id_user, 0, "UM")==1)){ - if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/usuarios/lista_usuarios" || $_GET["sec2"] == "godmode/usuarios/configurar_usuarios")){ + if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/users/user_list" || $_GET["sec2"] == "godmode/users/configure_user")){ echo ''; } if ( (give_acl($id_user, 0, "PM")==1)){ - if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/perfiles/lista_perfiles"){ + if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/profiles/profile_list"){ echo ''; if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/servers/modificar_server"){ echo '
'; @@ -117,44 +117,13 @@ if (comprueba_login() == 0){ echo '
'; if (isset($_GET["sec"]) && $_GET["sec"] == "gservers"){ - if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/servers/manage_recontask"){ + if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/servers/manage_recontask"|| $_GET["sec2"] == "godmode/servers/manage_recontask_form"){ echo "
"; } else echo "
"; echo "
"; } -/* - if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/agentes/modificar_agente" || $_GET["sec2"] == "godmode/agentes/configurar_agente")){ - echo '
'; - } - else - echo ''; - - if (isset($_GET["sec"]) && $_GET["sec"] == "gagente"){ - if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/agentes/manage_config"){ - echo "
"; - } - else echo "
"; - echo "
"; - - if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/grupos/lista_grupos" || $_GET["sec2"] == "godmode/grupos/configurar_grupo")){ - echo "
"; - } - else - echo "
"; - echo "
"; - } -*/ - - - - - - - - - + if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/admin_access_logs"){ echo '
'; } diff --git a/pandora_console/godmode/modules/manage_nc_groups.php b/pandora_console/godmode/modules/manage_nc_groups.php index 8ca06908f3..372d56da45 100644 --- a/pandora_console/godmode/modules/manage_nc_groups.php +++ b/pandora_console/godmode/modules/manage_nc_groups.php @@ -75,8 +75,8 @@ if (isset($_GET["delete"])){ // if delete $result=mysql_query($sql_delete); } - -echo "

".$lang_label["network_component_group_management"]."

"; +echo "

".$lang_label["module_management"]." > "; +echo $lang_label["network_component_group_management"]."

"; echo ""; echo ""; diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php index a957883f10..6f3ab9b726 100644 --- a/pandora_console/godmode/modules/manage_network_components.php +++ b/pandora_console/godmode/modules/manage_network_components.php @@ -155,8 +155,8 @@ if (isset($_GET["delete"])){ // if delete // ------------------ // SHOW MODULES // ------------------ - -echo "

".$lang_label["network_component_management"]."

"; +echo "

".$lang_label["module_management"]." > "; +echo $lang_label["network_component_management"]."

"; // Show group selector if (isset($_POST["ncgroup"])) diff --git a/pandora_console/godmode/modules/manage_network_templates.php b/pandora_console/godmode/modules/manage_network_templates.php index 64a694effa..4e50664079 100644 --- a/pandora_console/godmode/modules/manage_network_templates.php +++ b/pandora_console/godmode/modules/manage_network_templates.php @@ -41,8 +41,8 @@ if (isset($_GET["delete"])){ // if delete $result=mysql_query($sql_delete); } - -echo "

".$lang_label["network_profile_management"]."

"; +echo "

".$lang_label["module_management"]." > "; +echo $lang_label["network_profile_management"]."

"; $sql1='SELECT * FROM tnetwork_profile ORDER BY name'; diff --git a/pandora_console/godmode/modules/module_list.php b/pandora_console/godmode/modules/module_list.php index f43a3f4ca1..1b4712ceee 100644 --- a/pandora_console/godmode/modules/module_list.php +++ b/pandora_console/godmode/modules/module_list.php @@ -56,8 +56,8 @@ if (give_acl($id_user, 0, "PM")==1) { else echo "

".$lang_label["delete_group_ok"]."

"; }*/ - echo "

".$lang_label["module_management"]."

"; - echo "

".$lang_label["defined_modules"]."

"; + echo "

".$lang_label["module_management"]." > "; + echo $lang_label["defined_modules"]."

"; echo "
".$lang_label["name"]."
"; echo ""; diff --git a/pandora_console/godmode/perfiles/lista_perfiles.php b/pandora_console/godmode/profiles/profile_list.php similarity index 92% rename from pandora_console/godmode/perfiles/lista_perfiles.php rename to pandora_console/godmode/profiles/profile_list.php index 01e9754c2c..6e3a08b134 100644 --- a/pandora_console/godmode/perfiles/lista_perfiles.php +++ b/pandora_console/godmode/profiles/profile_list.php @@ -124,16 +124,19 @@ if (comprueba_login() == 0) } unset($id_perfil); } - echo '

'.$lang_label["profile_title"].'

'; + echo '

'.$lang_label["profile_title"].' > '; echo (isset($_GET["new_profile"]))? - ('

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

'): - ((isset($_GET["edit_profile"]))?('

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

'): - ('

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

')); + ($lang_label["create_profile"].' '.$lang_label["help"].''): + ( + (isset($_GET["edit_profile"]))? + ($lang_label["update_profile"].' '.$lang_label["help"].''): + ($lang_label["definedprofiles"].' '.$lang_label["help"].'') + ); // Form to manage date if (isset ($id_perfil)){ // There are values defined, let's show form with data for INSERT or UPDATE echo "
".$lang_label["icon"]."
"; echo ""; + echo ""; } echo ""; echo ""; echo "
"; - echo "
"; + echo ""; echo ""; echo "
".$lang_label["profile_name"].""; @@ -216,7 +219,7 @@ echo "
".$nombre.""; + echo "".$nombre.""; echo ""; if ($incident_view == 1) echo ""; @@ -247,13 +250,13 @@ echo "
"; if ($pandora_management == 1) 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 6864672842..b85d408ff6 100644 --- a/pandora_console/godmode/servers/manage_recontask.php +++ b/pandora_console/godmode/servers/manage_recontask.php @@ -87,7 +87,8 @@ if (isset($_GET["create"])) { // -------------------------------- // SHOW TABLE WITH ALL RECON TASKs // -------------------------------- -echo "

".$lang_label["manage_recontask"]."

"; +echo "

".$lang_label["view_servers"]." > "; +echo $lang_label["manage_recontask"]."

"; $query="SELECT * FROM trecon_task"; $result=mysql_query($query); $color=1; diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php index a96b57b4d2..5e512a11de 100644 --- a/pandora_console/godmode/servers/manage_recontask_form.php +++ b/pandora_console/godmode/servers/manage_recontask_form.php @@ -55,8 +55,8 @@ if (isset($_GET["update"])){ // Edit mode $id_network_profile = 1; $id_network_server_assigned = 0; } - -echo "

".$lang_label["manage_recontask"]."

"; +echo "

".$lang_label["view_servers"]." > "; +echo $lang_label["manage_recontask"]."

"; echo ''; // Different Form url if it's a create or if it's a update form diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php index dec24348fc..1bd8e23a98 100644 --- a/pandora_console/godmode/servers/modificar_server.php +++ b/pandora_console/godmode/servers/modificar_server.php @@ -48,8 +48,8 @@ if (comprueba_login() == 0) { } if (isset($_GET["server"])) { $id_server=entrada_limpia($_GET["server"]); - echo "

".$lang_label["view_servers"]."

"; - echo "

".$lang_label["update_server"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["view_servers"]." > "; + echo $lang_label["update_server"]." ".$lang_label["help"]."

"; $query="SELECT * FROM tserver WHERE id_server=".$id_server; $result=mysql_query($query); @@ -84,8 +84,8 @@ if (comprueba_login() == 0) { { $sql='SELECT * FROM tserver'; - echo "

".$lang_label["view_servers"]."

"; - echo "

".$lang_label["manage_servers"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["view_servers"]." > "; + echo $lang_label["manage_servers"]." ".$lang_label["help"]."

"; // Connect DataBase $result=mysql_query($sql); diff --git a/pandora_console/godmode/setup/links.php b/pandora_console/godmode/setup/links.php index 912c61af74..bafdc4f1c6 100644 --- a/pandora_console/godmode/setup/links.php +++ b/pandora_console/godmode/setup/links.php @@ -65,8 +65,8 @@ if (comprueba_login() == 0) } // Create link - echo "

".$lang_label["setup_screen"]."

"; - echo "

".$lang_label["link_management"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["setup_screen"]." > "; + echo $lang_label["link_management"]." ".$lang_label["help"]."

"; echo '
'; echo ''; if ($creation_mode == 1) @@ -85,8 +85,8 @@ if (comprueba_login() == 0) } else { // Main list view for Links editor - echo "

".$lang_label["setup_screen"]."

"; - echo "

".$lang_label["link_management"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["setup_screen"]." > "; + echo $lang_label["link_management"]." ".$lang_label["help"]."

"; echo "
"; echo "
".$lang_label["link_name"]; echo "".$lang_label["delete"]; diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php index 70bfa620fa..414a2d45b8 100644 --- a/pandora_console/godmode/setup/setup.php +++ b/pandora_console/godmode/setup/setup.php @@ -51,11 +51,11 @@ if (comprueba_login() == 0) $result2=mysql_query("UPDATE tconfig SET VALUE='".$config_show_lastalerts."' WHERE token='show_lastalerts'"); $result2=mysql_query("UPDATE tconfig SET VALUE='".$config_style."' WHERE token='style'"); } - echo "

".$lang_label["setup_screen"]."

"; - echo "

".$lang_label["general_config"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["setup_screen"]." > "; + echo $lang_label["general_config"]." ".$lang_label["help"]."

"; echo ""; echo ''; - echo ''; echo ''; echo ''; echo ''; echo ''; echo ''; - echo ''; + echo ''; - echo ''; echo ''; echo ''; + echo '
'.$lang_label["language_code"]; + echo '
'.$lang_label["language_code"].''; + echo '
'.$lang_label["block_size"]; - echo ''; + echo '
'.$lang_label["days_compact"]; - echo ''; + echo '
'.$lang_label["days_purge"]; - echo ''; + echo '
'.$lang_label["graph_res"]; - echo ''; + echo '
'.$lang_label["step_compact"]; - echo ''; + echo '
'.$lang_label["step_compact"].'
'.$lang_label["show_unknown"]; + echo '
'.$lang_label["show_unknown"].'
'.$lang_label["background_image"]; + echo '
'.$lang_label["background_image"].''; echo ''; - echo '
'.$lang_label["style_template"]; - echo ''; + echo '
'.$lang_label["style_template"].''; echo ''; @@ -143,6 +143,7 @@ if (comprueba_login() == 0) echo ""; echo ""; echo "
"; echo ''; + echo "
"; } else { diff --git a/pandora_console/godmode/usuarios/configurar_usuarios.php b/pandora_console/godmode/users/configure_user.php similarity index 92% rename from pandora_console/godmode/usuarios/configurar_usuarios.php rename to pandora_console/godmode/users/configure_user.php index ac91310757..003c1287ae 100644 --- a/pandora_console/godmode/usuarios/configurar_usuarios.php +++ b/pandora_console/godmode/users/configure_user.php @@ -145,23 +145,23 @@ if (comprueba_login() == 0) $id_usuario_mio = $nombre; $modo ="edicion"; } - echo "

".$lang_label["user_management"]."

"; + echo "

".$lang_label["user_management"]." > "; if (isset($_GET["alta"])){ if ($_GET["alta"]==1){ - echo '

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

'; + echo $lang_label["create_user"].' '.$lang_label["help"].''; } } if (isset($_GET["id_usuario_mio"]) OR isset($_GET["nuevo_usuario"])){ - echo '

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

'; + echo $lang_label["update_user"].' '.$lang_label["help"].''; } ?> '; + echo ''; } echo ""; } diff --git a/pandora_console/godmode/usuarios/lista_usuarios.php b/pandora_console/godmode/users/user_list.php similarity index 83% rename from pandora_console/godmode/usuarios/lista_usuarios.php rename to pandora_console/godmode/users/user_list.php index 6534470fa2..249c8a6372 100644 --- a/pandora_console/godmode/usuarios/lista_usuarios.php +++ b/pandora_console/godmode/users/user_list.php @@ -26,8 +26,8 @@ if (comprueba_login() == 0) } ?> -

-

 

+

> + 

'; + echo '
'; else - echo '
'; + echo '
'; ?> @@ -236,7 +236,7 @@ if (comprueba_login() == 0) echo ''; echo "".dame_perfil($row["id_perfil"])." / "; echo "".dame_grupo($row["id_grupo"]).""; - echo '
"; echo ""; - echo ""; echo "
@@ -62,7 +62,7 @@ while ($rowdup=mysql_fetch_array($resq1)){ $color = 1; } echo "
"; - echo "".$name.""; + echo "".$name.""; echo "".$fecha_registro; echo ""; if ($nivel == 1) @@ -84,11 +84,11 @@ while ($rowdup=mysql_fetch_array($resq1)){ echo "".substr($real_name,0,16)."".$comments.""; + echo ""; } echo "
"; - echo ""; + echo ""; echo ""; echo "
"; diff --git a/pandora_console/help/en/chap3.php b/pandora_console/help/en/chap3.php index 1113902f58..b2a0d91d7f 100644 --- a/pandora_console/help/en/chap3.php +++ b/pandora_console/help/en/chap3.php @@ -311,7 +311,7 @@ all in black save the last one.

Last contact: Shows the time and date of the last data package sent by the agent, using a progress bar, according to value of the interval. If you see the image , the agent has not send data during the interval. Passing the mouse over the image will show you the last contact in time and date format.

-

Note: The icon is only visible if you're and administrator and it's a link to the "Manage Agents" > "Update Agent" option in the Administration menu.

+

Note: The icon is only visible if you're and administrator and it's a link to the "Manage Agents" > "Update Agent" option in the Administration menu.

3.3.2. Accessing the data of an agent

diff --git a/pandora_console/help/es/chap3.php b/pandora_console/help/es/chap3.php index 09f9f27f99..eb17c2efa5 100644 --- a/pandora_console/help/es/chap3.php +++ b/pandora_console/help/es/chap3.php @@ -338,7 +338,7 @@ problema de comunicación o a un

Último contacto: Muestra la fecha y hora en que se recibieron los últimos datos del agente, utilizando una barra de progreso, de acuerdo con el valor del intervalo. Si se muestra la imagen , el agente no ha enviado datos al finalizar el intervalo. Si pasamos el ratón encima de la imagen, se mostrará el último contacto en formato de fecha y hora.

-

Nota: El icono sólo es visible si es usuario es administrador y es un enlace a la opción «Gestionar agentes» > «Actualizar agente» del menú de administración.

+

Nota: El icono sólo es visible si es usuario es administrador y es un enlace a la opción «Gestionar agentes» > «Actualizar agente» del menú de administración.

3.3.2. Acceso a los datos de un agente concreto

diff --git a/pandora_console/images/setup.gif b/pandora_console/images/setup.gif deleted file mode 100644 index 72ac80e0bc8f32d51ec035d971f8c2c12da5e7d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 561 zcmZ?wbhEHb6krfwIOflwo+4?OuVPlLVP2wXQL1HGrejsEYg?)BP-E=fY8TMy9N6s| z((4i4?;SD0Cw59;+|;0iX(7oo!c%5OHa9n?&5CMiX=!b3&72$8-rk-wKe4m3v#YBs ze_={bPfu@eZ{gy!zP`SqB^mww{Uu8?%a&zNnlx$hoH%pl%=z=@FI~EH<;s=o*RS8bd-u_!M^BzS zdH($QyLa#Y4?dvylZBCsp`Jm90SG{G!oc3wP~X(tVxXtn(%G!%4K+qv`hpzCI~8+>By=Y^Ragc$eL-%su=OIP2e@vkWzZZI-SepfFTdd^mwUX@Z{mQ-Vy zS7e!4gM))+np%W}goTBLX`Nn&hlgyRVTp-}ii(PFp=6AVjE#+raieCAj*fDqXpfJN zbfsx_rfZUtl9Q8@d#Z4jmX>_0a+sKyeyntvnVFlLn}V-+oSdA4uz7{Cdx*1tinW1` zw}p_nhmpF8tgNiHwY9mqxw^W#yu7@?z`(-7!o$PE#KgqK#l^dCU$jHdd%*@Zv z&(hM;)YR11*Vo zL;#2d9Y_EG00(qQO+^RS1sehY3HDF56951Jn@L1LRCwBBV1NSyJzWN5py%VKiNg2x zwNghG(DrdtV^EZnfeUDQIV#IrcuK+r)ID5mtnD1cAv{rjMrT)NCwp5l2wzx5LBQQo zT2fpD!WU99HZGc8#aBVIO`0$x)MDJ3Ib zR=5dVCMpVsJS+$&a|#&hb2B4*f`grv35g2;+Tjq>edwJW00000NkvXXu0mjf?uy@q literal 0 HcmV?d00001 diff --git a/pandora_console/include/config.inc.php b/pandora_console/include/config.inc.php index a3492ad53b..b0997c24e8 100644 --- a/pandora_console/include/config.inc.php +++ b/pandora_console/include/config.inc.php @@ -61,7 +61,7 @@ if (! mysql_connect($dbhost,$dbuser,$dbpassword)){
-

Pandora Console Error DB-001

+

Pandora Console Error DB-001

Cannot connect with Database, please check your database setup in the ./include/config.php file and read documentation.

Probably any of your user/database/hostname values are incorrect or @@ -106,7 +106,7 @@ if($result2=mysql_query("SELECT * FROM tconfig")){
-

Pandora Console Error DB-002

+

Pandora Console Error DB-002

Cannot load configuration variables. Please check your database setup in the ./include/config.php file and read documentation.

Probably database schema is created but there are no data inside it or you have a problem with DB access credentials. diff --git a/pandora_console/include/languages/language_ast_es.php b/pandora_console/include/languages/language_ast_es.php index 3b512af40b..07705ed4b4 100644 --- a/pandora_console/include/languages/language_ast_es.php +++ b/pandora_console/include/languages/language_ast_es.php @@ -227,11 +227,6 @@ $lang_label["total"]="Total"; $lang_label["checked_by"]="Validáu per"; $lang_label["disabled"]="deshabilitáu"; $lang_label["active"]="Activu"; -$lang_label["db_description"]="La base datos ye el núcleu de Pandora. Nesta base de datos resire tola información de la empresa, por exemplu, tolos datos recopilaos pelos axentes, tola información definía pol alministrador, tolos eventos, incidentes o información d'auditoría. -

-El rendimientu y fiabilidá d'esti núcleu ye vital pal funcionamientu correutu de Pandora. Ye necesariu mantener esta Base de Datos utilizando comandos estándar de MySQL. -

-El tamañu de la Base de Datos aumentará de manera llineal. Utilizamos un métodu de compactación pa reducir el númberu d'eventos almacenáos na base de datos ensin perder l'información necesaria. Esta compautación produzse cada ciertu tiempu."; $lang_label["begin_date"]="Fecha comienzu (*)"; $lang_label["end_date"]="Fecha fin (*)"; $lang_label["resolution"]="Resolución (%)"; diff --git a/pandora_console/include/languages/language_ca.php b/pandora_console/include/languages/language_ca.php index 5c7d0345c7..487e9cb03f 100644 --- a/pandora_console/include/languages/language_ca.php +++ b/pandora_console/include/languages/language_ca.php @@ -145,7 +145,7 @@ $lang_label["normal_user"]="Usuari Estandard"; $lang_label["has_connected"]="Estás conectat com"; $lang_label["logged_out"]="Sessió finalitzada"; $lang_label["logout_msg"]="La teva sessió ha caducat. Si us plau tanca el teu navegador web per finalitzar la sessió del Pandora.

"; -$lang_label["user_last_activity"]="Aquesta es la teva última activitat amb el Pandora"; +$lang_label["user_last_activity"]="Aquesta es la teva última activitat amb el Pandora FMS"; $lang_label["err_auth"]="Error d'autenticació"; $lang_label["err_auth_msg"]="Pot ser que el teu usuari o contrasenya no sigui correcte. Si us plau tingues en compte que les contrasenyes diferencien MAJUSCULES i minuscules. Comproba que no tinguis la tecla de bloqueig de majuscules (CAPS LOCK).

Totes les accions, inclosos els intents de login fallides son enregistrats pel sistema de logs del Pandora, i aquests poden ser revisats per cada usuari. Si us plau notifica al administrador qualsevol incident o funcionament incorrecte."; $lang_label["find_crit"]="Si us plau selecciona un creiteri de cerca"; @@ -225,17 +225,12 @@ $lang_label["total"]="Total"; $lang_label["checked_by"]="Comprobat per"; $lang_label["disabled"]="Desabilitat"; $lang_label["active"]="Actiu"; -$lang_label["db_description"]="La base de dades es el nucli de Pandora. En aquesta base de dades es trova tota la informació de l'empresa, per exemple, totes les dades recolectades pels agents, tots els events, incidents, informació d'auditories... -

-El rendiment y la fiabilitat del nucli es vital per poder utilitzar correctament Pandora. Es necessari mantenir correctament aquesta base de dades utilitzant el comandaments estandar de MySQL. -

-El tamany de la base de dades augmentarà de manera lineal. Estem utilitzant un mètode per reduir el nombre d'events emmagatzemats en la base de dades sense perdre informació, compactant les dades cada vegada que es configura el Pandora en 'Configuració del Pandora'"; $lang_label["begin_date"]="Començar data (*)"; $lang_label["end_date"]="Finalitzar data (*)"; $lang_label["resolution"]="Resolució (%)"; $lang_label["date_format"]="(*) Si us plaus introdueix la data amb el seguent format yyyy/mm/dd hh:mm:ss"; $lang_label["please_wait"]="Si us plau, sigues pacient. Aquesta operació por trigar molt de temps (5-10 minuts)"; -$lang_label["welcome_title"]="Benvingut a la Consola Web del Pandora"; +$lang_label["welcome_title"]="Benvingut a la Consola Web del Pandora FMS"; $lang_label["incident_view_filter"]="Veure incidents filtrats"; $lang_label["there_are"]="Hi ha "; $lang_label["user_defined"]="usuaris definits en el Pandora"; diff --git a/pandora_console/include/languages/language_de.php b/pandora_console/include/languages/language_de.php index cb9df89afd..dcec114fba 100644 --- a/pandora_console/include/languages/language_de.php +++ b/pandora_console/include/languages/language_de.php @@ -247,16 +247,6 @@ $lang_label["checked_by"]="Überprüft durch"; $lang_label["disabled"]="Inaktiv"; $lang_label["active"]="Aktiv"; -$lang_label["db_description"]="Die Datenbasis ist das Kernelement von Pandora. In dieser Datenbasis sind all die Informationen des zu überwachenden Systems gespeichert. Zu diesen Informationen gehören -die Daten, die durch die Agenten gesammelt werden, die Konfigurationseinstellungen, die durch die Administratoren eingestellt wurden, -alle Ereignisse, Vorfälle und Überwachungsinformationen ... -

-The performance and reliability of the core is vital for the correct use of Pandora. It's necessary to maintain correctly this Database using the MySQL standard commands. -

-Die Datenbasis vergrösert sich linear. -Wir nutzen Methoden, um die Anzahl der Ereignisse, die in der Datenbasis gespeichert werden, zu minimieren, -ohne benötigte Informationen zu verlieren. Die Daten werden zu Zeiten zusammengefasst, -die in der Konfiguration von Pandora definiert werden."; $lang_label["begin_date"]="Beginndatum (*)"; $lang_label["end_date"]="Endedatum (*)"; @@ -264,7 +254,7 @@ $lang_label["resolution"]="Auflösung (%)"; $lang_label["date_format"]="(*) Bitte geben Sie das Datum im folgenden Format ein: yyyy/mm/dd hh:mm:ss"; $lang_label["please_wait"]="Bitte, haben Sie Geduld. Diese Operation kann sehr lange dauern (5-10 minutes)"; -$lang_label["welcome_title"]="Willkommen auf der Pandora Web Konsole"; +$lang_label["welcome_title"]="Willkommen auf der Pandora FMS Web Konsole"; $lang_label["incident_view_filter"]="Sicht der Vorfälle"; $lang_label["there_are"]="Es gibt "; $lang_label["user_defined"]="Nutzer, die in Pandora eingetragen sind"; diff --git a/pandora_console/include/languages/language_en.php b/pandora_console/include/languages/language_en.php index e84e61a5b5..9aba6c7939 100644 --- a/pandora_console/include/languages/language_en.php +++ b/pandora_console/include/languages/language_en.php @@ -64,7 +64,7 @@ $lang_label["in_openedby"]="Owner"; $lang_label["in_openedwhen"]="Opened at"; $lang_label["updated_at"]="Updated at"; -$lang_label["main_text"]="This is the Web Management System for Pandora. From here you can manage its agents, alerts and incidents. Session will be open while activity exists."; +$lang_label["main_text"]="This is the Web Management System for Pandora FMS. From here you can manage its agents, alerts and incidents. Session is open while activity exists."; $lang_label["id_user"]="User ID"; $lang_label["real_name"]="Real name"; @@ -164,7 +164,7 @@ $lang_label["logged_out"]="Logged Out"; $lang_label["logout_msg"]="Your session is over. Please close your browser window to close session on Pandora.

"; $lang_label["user_last_activity"]="This is your last activity in Pandora FMS console"; $lang_label["err_auth"]="Authentication Error"; -$lang_label["err_auth_msg"]="Either, your password or your login are incorrect. Please check your CAPS LOCK key, username and password are case SeNSiTiVe.

All actions, included failed login attempts are logged in Pandora System logs, and these can be reviewed by each user, please report to admin any incident or malfunction."; +$lang_label["err_auth_msg"]="Either, your password or your login are incorrect. Please check your CAPS LOCK key, username and password are case SeNSiTiVe.

All actions, included failed login attempts are logged in Pandora FMS System logs, and these can be reviewed by each user, please report to admin any incident or malfunction."; $lang_label["find_crit"]="Please select a search criterion"; $lang_label["all"]="All"; $lang_label["free_text_search"]="Free text for search (*)"; @@ -250,11 +250,6 @@ $lang_label["checked_by"]="Checked by"; $lang_label["disabled"]="Disabled"; $lang_label["active"]="Active"; -$lang_label["db_description"]="Database is the core of Pandora. In this database resides all the information of the enterprise, for example, all data gathered by agents, all configuration defined by administrator, all events, incidents, audit info... -

-The performance and reliability of the core is vital for the correct use of Pandora. It's necessary to maintain correctly this Database using the MySQL standard commands. -

-The database size will increase in a linear way. We use a method to reduce the number of event stored in the database without losing the information we need, compacting data when every time configured in Pandora Setup."; $lang_label["begin_date"]="Begin date (*)"; $lang_label["end_date"]="End date (*)"; @@ -262,7 +257,7 @@ $lang_label["resolution"]="Resolution (%)"; $lang_label["date_format"]="(*) Please enter date with format yyyy/mm/dd hh:mm:ss"; $lang_label["please_wait"]="Please be patient. This operation can be very long in time (5-10 minutes)"; -$lang_label["welcome_title"]="Welcome to Pandora Web Console"; +$lang_label["welcome_title"]="Welcome to Pandora FMS Web Console"; $lang_label["incident_view_filter"]="Viewing incidents"; $lang_label["there_are"]="There are "; $lang_label["user_defined"]="users defined in Pandora"; @@ -351,7 +346,7 @@ $lang_label["config_manage"]="Configuration Management"; $lang_label["get_info"]="Get Info"; $lang_label["are_you_sure"]="Are you sure?"; -$lang_label["users_msg"]="User profiles in Pandora define which users can access Pandora as well as what each user can do. Groups define elements in common among various users. Each user could be in one or more groups at any one time. Each group has user profiles which are defined and attached to it. A profile is a list of things a user can do, such as view incidents, manage database or other. A list of available profiles is defined below by the local Pandora administrators "; +$lang_label["users_msg"]="User profiles in Pandora define which users can access Pandora as well as what each user can do. Groups define elements in common among various users. Each user could be in one or more groups at any one time. Each group has user profiles which are defined and attached to it. A profile is a list of things a user can do, such as view incidents, manage database or other. A list of available profiles is defined below by the local Pandora administrators"; $help_label["users_msg1"]="This user has permissions to manage all. This is admin user and overwrites all permissions given in profiles/groups."; $help_label["users_msg2"]="This user has separated permissions to view data in his group agents, create incidents belong to his groups, add notes in another incidents, create personal assignments or reviews and other tasks, on different profiles"; @@ -360,7 +355,7 @@ $help_label["db_purge1"]="This button refresh info about database usage among ti $help_label["db_purge0"]="Use this combo to select agent for operation. You need to select an agent to purge data and to get info about database usage"; $lang_label["profiles"] ="Profiles"; -$lang_label["current_dbsetup"]="This is your current database maintenance setup"; +$lang_label["current_dbsetup"]="Current database maintenance setup"; $lang_label["dbsetup_info"]="Please check your Pandora Server setup and be sure that database maintenance daemon is running. It's very important to keep up-to-date database to get the best performance and results in Pandora"; $lang_label["profile_title"]="Profile management"; diff --git a/pandora_console/include/languages/language_es_es.php b/pandora_console/include/languages/language_es_es.php index f801472d6b..595a0d8695 100644 --- a/pandora_console/include/languages/language_es_es.php +++ b/pandora_console/include/languages/language_es_es.php @@ -257,11 +257,6 @@ $lang_label["checked_by"]="Validado por"; $lang_label["disabled"]="Desactivado"; $lang_label["active"]="Activo"; -$lang_label["db_description"]="La base de datos es el núcleo de Pandora . En esta base de datos reside toda la información de la empresa, por ejemplo, todos los datos recopilados por los agentes, toda la información definida por el administrador, todos los eventos, incidentes o información de auditoría. -

-El rendimiento y fiabilidad de este núcleo es vital para el funcionamiento correcto de Pandora. Es necesario mantener esta Base de Datos utilizando los comandos estándar de MySQL. -

-El tamaño de la Base de Datos aumentará de manera lineal. Utilizamos un método de compactación para reducir el número de eventos almacenados en la base de datos sin perder la información necesaria. Esta compactación se produce cada cierto tiempo (configurable)."; $lang_label["begin_date"]="Fecha comienzo (*)"; $lang_label["end_date"]="Fecha fin (*)"; diff --git a/pandora_console/include/languages/language_es_la.php b/pandora_console/include/languages/language_es_la.php index 3bd258ccd2..4ebfaceea6 100644 --- a/pandora_console/include/languages/language_es_la.php +++ b/pandora_console/include/languages/language_es_la.php @@ -254,11 +254,6 @@ $lang_label["checked_by"]="Validado por"; $lang_label["disabled"]="Desactivado"; $lang_label["active"]="Activo"; -$lang_label["db_description"]="La base de datos es el núcleo de Pandora . En esta base de datos reside toda la información de la empresa, por ejemplo, todos los datos recopilados por los agentes, toda la información definida por el administrador, todos los eventos, incidentes o información de auditoría. -

-El rendimiento y fiabilidad de este núcleo es vital para el funcionamiento correcto de Pandora. Es necesario mantener esta Base de Datos utilizando los comandos estándar de MySQL. -

-El tamaño de la Base de Datos aumentará de manera lineal. Utilizamos un método de compactación para reducir el número de eventos almacenados en la base de datos sin perder la información necesaria. Esta compactación se produce cada cierto tiempo (configurable)."; $lang_label["begin_date"]="Fecha comienzo (*)"; $lang_label["end_date"]="Fecha fin (*)"; diff --git a/pandora_console/include/languages/language_fr.php b/pandora_console/include/languages/language_fr.php index 419ebf3672..03f6670768 100644 --- a/pandora_console/include/languages/language_fr.php +++ b/pandora_console/include/languages/language_fr.php @@ -253,11 +253,6 @@ $lang_label["checked_by"]="Validé par"; $lang_label["disabled"]="Desactivé"; $lang_label["active"]="Activé"; -$lang_label["db_description"]="La base de données est le noyau de Pandora . C'est sur cette base de données qu'est gardée tout l'information concernant l'entreprise, par exemlpe, toutes les données réunies par les agents, toute l'information définie par l'administrateur, tous les événements, les incidents ou l'information de l'audit. -

-Le rendement et la fiabilité de ce noyau est d'une importance vitale pour que Pandora fonctionne correctement. Il est nécessaire de entretenir cette Base de Données en utilisant des commandes standard MySQL. -

-La taille de la Base de Données augmentera de façon linéaire. Nous utilisons une méthode de compression afin de réduire le nombre d'événements archivés dans la base de données sans perdre l'information necessaire. Cette compression est lancé périodiquement (configurable)."; $lang_label["begin_date"]="Date début (*)"; $lang_label["end_date"]="Date fin (*)"; diff --git a/pandora_console/include/languages/language_gl.php b/pandora_console/include/languages/language_gl.php index 832d39532f..4c5f7f0fc3 100644 --- a/pandora_console/include/languages/language_gl.php +++ b/pandora_console/include/languages/language_gl.php @@ -253,11 +253,6 @@ $lang_label["checked_by"]="Validado por"; $lang_label["disabled"]="Desactivado"; $lang_label["active"]="Activo"; -$lang_label["db_description"]="A base de datos é o núcleo de Pandora. Nesta base de datos reside toda a información da empresa, por exemplo, tódolos datos recopilados polos axentes, toda a información definida polo administrador, tódolos eventos, incidentes ou información de auditoría. -

-O rendemento e fiabilidade deste núcleo é vital para o funcionamento correcto de Pandora. É preciso manter esta Base de Datos empregando os comandos estándar de MySQL. -

-O tamaño da base de datos aumentará de xeito lineal. Empregamos un método de compactación para reducir o número dos eventos almaceados na base de datos sen perder a información necesaria. Esta compactación producese cada certo tempo (configurable)."; $lang_label["begin_date"]="Data comezo (*)"; $lang_label["end_date"]="Data fin (*)"; diff --git a/pandora_console/include/languages/language_it.php b/pandora_console/include/languages/language_it.php index ee42ec5f9d..fbb174eb7a 100644 --- a/pandora_console/include/languages/language_it.php +++ b/pandora_console/include/languages/language_it.php @@ -226,11 +226,6 @@ $lang_label["total"] = "Totale"; $lang_label["checked_by"] = "Verificato da"; $lang_label["disabled"] = "Disabilitato"; $lang_label["active"] = "Attivo"; -$lang_label["db_description"] = "Il database à il nucleo di Pandora. In questo database risiedono tutte le informazioni dell'impresa, ad esempio, tutti i dati raccolti dagli agenti; tutte le configurazioni definite dall'amministratore, tutti gli eventi, avvenimenti, informazioni di verifica ... -

-Le prestazioni e l'affidabilità del nucleo sono vitali per il corretto uso di Pandora. E' necessario gestire correttamente il Database usando i comandi standard di MySQL. -

-La dimensione del database aumenterà in modo lineare. Usiamo un metodo per ridurre il numero di eventi registrati nel database senza che vengano perse le informazioni necessarie, compattando i dati ogniqualvolta sia configurato nelle Impostazioni di Pandora"; $lang_label["begin_date"] = "Data di inizio (*)"; $lang_label["end_date"] = "Data di fine (*)"; $lang_label["resolution"] = "Risoluzione (%)"; diff --git a/pandora_console/include/languages/language_pt_br.php b/pandora_console/include/languages/language_pt_br.php index bbd73605f9..14a7ef6bd5 100644 --- a/pandora_console/include/languages/language_pt_br.php +++ b/pandora_console/include/languages/language_pt_br.php @@ -225,11 +225,6 @@ $lang_label["total"] = "Total"; $lang_label["checked_by"] = "Checado por"; $lang_label["disabled"] = "Desativado"; $lang_label["active"] = "Ativo"; -$lang_label["db_description"] = "A base de dados é o núcleo do Pandora. Nesta base de dados residem todas as informações da empresa, por exemplo, todos os dados recompilados pelos agentes, todas as informações definidas pelo administrador, todos os eventos, incidentes ou informações de auditoria. -

-O desempenho e confiabilidade deste núcleo são vitais para o funcionamento correto do Pandora. é necessário manter esta base de dados utilizando os comandos disponíveis como padrão no MySQL. -

-O tamanho da Base de Dados aumentará de maneira linear. Utilizamos um método de compactação para reduzir o número de eventos armazenados na base de dados sem perder as informações necessárias. Esta compactação ocorre dentro de certos intervalos de tempo. (configurável)."; $lang_label["begin_date"] = "Data de início"; $lang_label["end_date"] = "Data final"; $lang_label["resolution"] = "Resolução (%)"; diff --git a/pandora_console/include/styles/calendar.css b/pandora_console/include/styles/calendar.css deleted file mode 100644 index 46c51635bc..0000000000 --- a/pandora_console/include/styles/calendar.css +++ /dev/null @@ -1,19 +0,0 @@ -.calendar-month -{ -font-family: Verdana, sans-serif, Arial, Helvetica; -color: #5a8629; -font-weight: bold; -margin-top: 2px; -font-size: 12px; -text-align: center; -} -table.calendar th td -{ -text-align: center; -} -table.calendar th -{ -background-color: #f5f5f5; -height: 10px; -color: #103a3a; -} \ No newline at end of file diff --git a/pandora_console/include/styles/op.css b/pandora_console/include/styles/op.css index ec7ac2abd1..87fe1de103 100644 --- a/pandora_console/include/styles/op.css +++ b/pandora_console/include/styles/op.css @@ -12,7 +12,6 @@ div.menuop { background-color: #e6e9cd; border: 1px solid #dadbdb; - /* border: 1px solid #4a6629; */ width: 155px; margin-bottom: 5px; } diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index a33cc7886a..08cefc3fdf 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -32,7 +32,7 @@ font-size: 8pt; } body { - margin-top: 0; + text-align: center; } input, textarea { border: 1px solid #ddd; @@ -43,7 +43,7 @@ textarea { padding: 5px; height: 100px; font-family: verdana, sans-serif; - font-size: 8pt; + font-size: 8pt; } input { padding: 2px 3px 4px 3px; @@ -60,7 +60,7 @@ select { padding: 0px; border:1px solid #ddd; font-family: verdana, sans-serif; - font-size: 8pt; + font-size: 8pt; } checkbox { padding: 4px; @@ -69,19 +69,19 @@ checkbox { h1, h2, h3 { font: bold 1em Arial, Sans-serif; text-transform: uppercase; - color: #778855; + color: #786; padding-bottom: 5px; padding-top: 7px; } -h3 { - font-size: 13px; -} h1 { font-size: 16px; } h2 { font-size: 15px; } +h3 { + font-size: 13px; +} a { color: #486787; text-decoration: none; @@ -91,54 +91,43 @@ a:hover { text-decoration: underline; } a.white_bold { - color: #eeeeee; + color: #eee; text-decoration: none; font-weight: bold; } a.white { - color: #eeeeee; + color: #eee; text-decoration: none; } p.center { text-align: center; } h1#log { - border-bottom: 1px solid #778866; - padding-bottom: 3px; - margin-top: 5em; - width: 29em; - text-align: left; + font-size: 18px; + margin-bottom: 0px; + color: #000; } -h1#log_f, h1#db_fh1 { - color: #ff0000; - border-bottom: 1px solid #ff0000; +h1#log_f { + color: #f00; + border-bottom: 1px solid #f00; padding-bottom: 3px; } div#login { - text-align: left; - border: 1px solid #999999; - margin-top: 2em; - margin-bottom: -1em; - padding: 0.5em; - width: 40em; - background: url(../../images/backgrounds/background10.jpg); + margin: 0 auto; + margin-top: 200px; + width: 460px; + border-left: solid 1px #000; + border-top: solid 1px #000; + border-bottom: solid 2px #000; + border-right: solid 2px #000 +} +div#login_in, #login_f { + margin: 0 auto; + width: 400px; } div#login_f { - text-align: left; - margin: auto; - padding: 0.5em; - width: 48em; - margin-top: 5em; -} -div#login_box { - float: right; - padding-right: 10px; - margin-top: 25px; - width: 140px; -} -div#logo_box { - margin-top: 25px; - padding-left: 5px; + margin-top: 10px; + margin-bottom: 25px; } div#noaccess { width: 350px; @@ -164,11 +153,21 @@ div#db_ftxt { float: right; padding-top: 10px; } +div#container { + margin: 0 auto; + width: 960px; + text-align: left; + border-left: solid 2px #000; + border-right: solid 2px #000; + border-top: solid 2px #000; + margin-top: 5px; +} div#page { width: 960px; background: #fff; clear: both; - border-bottom: solid 5px #778855; + border-bottom: solid 5px #786; + border-top: solid 5px #786; } div#main { width: 780px; @@ -194,6 +193,7 @@ div#head { width: 960px; height: 60px; background: url(../../images/header.jpg); + border-bottom: solid 2px #555; } div#foot { font-size: 7pt; @@ -210,7 +210,7 @@ div#foot { } #ip { margin-top: 10px; - clear: both; + margin-bottom: 5px; } label { display: block; @@ -234,7 +234,7 @@ input.datos_readonly { background-color: #050505; } input.login { - border-color: #778866; + border-color: #786; background-color: #f5f5f5; margin: 2px 0 8px; width: 90px; @@ -265,14 +265,9 @@ input.delete { table, img { border: 0px; } -th, td.lb { +th, td.lb, td.lb_view { color: #fff; - background-color: #778866; -} -td.lb_view { - color: #fff; - /*background-color: #7ba04a;*/ - background-color: #778866; + background-color: #786; } td.lb, td.lb_view { height: 16px; @@ -286,7 +281,6 @@ td.datos2, td.datos2t, td.datos2b, td.datos2_id , td.datos2f9 { background-color: #efefef; } td.datos3 { - /*background-color: #a7b896;*/ background-color: #d4ddc6; } td.datos_id { @@ -295,8 +289,8 @@ td.datos_id { td.datos_jus, td.datos2_jus { text-align: justify; } -.bg , .bgt { /* op menu */ - background-color: #778855; +.bg { /* op menu */ + background-color: #786; } .bg2 { /* main page */ background-color: #d84437; @@ -365,7 +359,7 @@ td.datos_jus, td.datos2_jus { font-weight: bold; } .raya { - border-top: 1px solid #778866; + border-top: 1px solid #786; width: 100%; } .raya, .noraya { @@ -404,12 +398,6 @@ td.datos_jus, td.datos2_jus { margin-top: 15px; text-align: justify; } -.mr40 { - margin-right: 40px; -} -.mt35 { - margin-top: 35px; -} ul.mn { list-style: none; padding: 0px 0px 0px 0px; @@ -492,8 +480,7 @@ div.title_line { float: left; position: relative; } -#menu_tab_left li a, #menu_tab_left li.nomn a { - background: #ac4444; +#menu_tab_left li a { background: #d84437; padding: 2px 10px 2px 10px; color: #fff; @@ -504,6 +491,13 @@ div.title_line { display: block; text-decoration: none; } +#menu_tab_left li.view a { + background: #6a4; + padding: 2px 10px 2px 10px; + color: #fff; + font-weight: bold; + line-height: 18px; +} span.users { background: url(../../images/group.png) no-repeat; } @@ -552,7 +546,7 @@ span.master, span.snmp, span.binary, span.recon { background-color: #fafafa; } .databox_color { - border-left: 4px solid #778855; + border-left: 4px solid #786; } #head_l { float: left; diff --git a/pandora_console/include/styles/tip.css b/pandora_console/include/styles/tip.css index 35e98ea426..90c57baa43 100644 --- a/pandora_console/include/styles/tip.css +++ b/pandora_console/include/styles/tip.css @@ -13,6 +13,7 @@ a.help { background: url(../../images/help.gif) no-repeat; padding: 2px 2px 2px 12px; left: 5px; + text-transform: capitalize; } a.info { padding: 25px 0px 0px 0px; diff --git a/pandora_console/index.php b/pandora_console/index.php index 51606c30ba..e170c94bbf 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -96,7 +96,7 @@ if ( (isset ($_GET["refr"])) || (isset($_POST["refr"])) ){ -'; ?> @@ -106,7 +106,7 @@ if ( (isset ($_GET["refr"])) || (isset($_POST["refr"])) ){ '; + echo ''; $REMOTE_ADDR = getenv ("REMOTE_ADDR"); global $REMOTE_ADDR; @@ -191,32 +191,32 @@ if ( (isset ($_GET["refr"])) || (isset($_POST["refr"])) ){ session_write_close(); ?> -
- -
-