From 5e927537b91f69c6a62a973156869fd1741fe827 Mon Sep 17 00:00:00 2001 From: raulmateos Date: Sun, 9 Jul 2006 14:58:02 +0000 Subject: [PATCH] - Create new var. for help language in config.php and changed in all the .php files where the help was available (Pandora Console) - Change tlanguage table definition to add ISO 639-2 compliant lang codes in pandoradb.sql file and also changed the name of bable from bb to ast_es in pandoradbdata.sql and changed name of include lang files and help files (Pandora Console) git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@112 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- .../godmode/agentes/configurar_agente.php | 12 +++---- .../godmode/agentes/manage_config.php | 2 +- .../godmode/agentes/modificar_agente.php | 2 +- .../godmode/alertas/configurar_alerta.php | 2 +- .../godmode/alertas/modificar_alerta.php | 2 +- pandora_console/godmode/db/db_audit.php | 2 +- pandora_console/godmode/db/db_event.php | 2 +- pandora_console/godmode/db/db_info.php | 2 +- pandora_console/godmode/db/db_main.php | 2 +- pandora_console/godmode/db/db_purge.php | 2 +- pandora_console/godmode/db/db_refine.php | 2 +- .../godmode/grupos/configurar_grupo.php | 4 +-- .../godmode/grupos/lista_grupos.php | 2 +- .../godmode/perfiles/lista_perfiles.php | 6 ++-- pandora_console/godmode/setup/setup.php | 2 +- .../godmode/usuarios/configurar_usuarios.php | 4 +-- .../godmode/usuarios/lista_usuarios.php | 2 +- pandora_console/help/bb/chap1.php | 34 ------------------- pandora_console/help/bb/chap2.php | 34 ------------------- pandora_console/help/bb/chap3.php | 34 ------------------- pandora_console/help/bb/chap4.php | 34 ------------------- pandora_console/help/bb/chap5.php | 34 ------------------- pandora_console/help/bb/chap6.php | 34 ------------------- pandora_console/help/bb/chap7.php | 34 ------------------- pandora_console/help/bb/chap8.php | 34 ------------------- pandora_console/help/es/toc.php | 4 +-- pandora_console/include/config.php | 7 +++- .../{language_bb.php => language_ast_es.php} | 0 .../operation/agentes/estadisticas.php | 2 +- .../operation/agentes/estado_agente.php | 2 +- .../operation/agentes/estado_alertas.php | 4 +-- .../agentes/estado_generalagente.php | 2 +- .../operation/agentes/estado_monitores.php | 2 +- .../agentes/estado_ultimopaquete.php | 2 +- .../operation/agentes/exportdata.php | 4 +-- .../operation/agentes/status_monitor.php | 2 +- .../operation/events/event_statistics.php | 2 +- pandora_console/operation/events/events.php | 2 +- .../operation/incidents/incident.php | 2 +- .../operation/incidents/incident_detail.php | 4 +-- .../operation/incidents/incident_search.php | 2 +- .../incidents/incident_statistics.php | 2 +- pandora_console/operation/users/user.php | 4 +-- pandora_console/operation/users/user_edit.php | 2 +- .../operation/users/user_statistics.php | 2 +- pandora_console/pandoradb.sql | 4 +-- pandora_console/pandoradb_data.sql | 2 +- 47 files changed, 58 insertions(+), 325 deletions(-) delete mode 100644 pandora_console/help/bb/chap1.php delete mode 100644 pandora_console/help/bb/chap2.php delete mode 100644 pandora_console/help/bb/chap3.php delete mode 100644 pandora_console/help/bb/chap4.php delete mode 100644 pandora_console/help/bb/chap5.php delete mode 100644 pandora_console/help/bb/chap6.php delete mode 100644 pandora_console/help/bb/chap7.php delete mode 100644 pandora_console/help/bb/chap8.php rename pandora_console/include/languages/{language_bb.php => language_ast_es.php} (100%) diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index a9751db13d..5adae8a5c3 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -583,8 +583,8 @@ if (give_acl($id_user, 0, "AW")==1) { // ======================== echo "

".$lang_label["agent_conf"]."

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

".$lang_label["create_agent"]." ".$lang_label["help"]."

";} -else {echo "

".$lang_label["update_agent"]." ".$lang_label["help"]."

";} +if (isset($_GET["creacion"])){echo "

".$lang_label["create_agent"]." ".$lang_label["help"]."

";} +else {echo "

".$lang_label["update_agent"]." ".$lang_label["help"]."

";} echo '
'; if ($creacion_agente == 1) echo ""; @@ -692,7 +692,7 @@ if ( $creacion_agente != 1) { $result=mysql_query($sql1); if ($row=mysql_num_rows($result)){ ?> -

 

+

 

@@ -760,7 +760,7 @@ $sql1='SELECT * FROM tagente_modulo WHERE id_agente = "'.$id_agente.'"'; $result=mysql_query($sql1); if ($row=mysql_num_rows($result)){ - echo "

".$lang_label["assigned_alerts"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["assigned_alerts"]." ".$lang_label["help"]."

"; $color=1; while ($row=mysql_fetch_array($result)){ // All modules of this agent @@ -838,7 +838,7 @@ else { } } ?> -

 

+

 

@@ -948,7 +948,7 @@ if (isset($_POST["oid"])){ ?> -

 

+

 

-

 

+

 

diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index 6e211d87a8..459a23dfff 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -46,7 +46,7 @@ if (give_acl($id_user, 0, "AW")==1) { } } echo "

".$lang_label["agent_conf"]."

"; - echo "

".$lang_label["agent_defined2"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["agent_defined2"]." ".$lang_label["help"]."

"; // Load icon index from tgrupos $iconindex_g[]=""; diff --git a/pandora_console/godmode/alertas/configurar_alerta.php b/pandora_console/godmode/alertas/configurar_alerta.php index f1916703c9..a02f5ce53a 100644 --- a/pandora_console/godmode/alertas/configurar_alerta.php +++ b/pandora_console/godmode/alertas/configurar_alerta.php @@ -40,7 +40,7 @@ if ( (give_acl($id_user, 0, "LM")==1)){ ?>

-

 

+

 

diff --git a/pandora_console/godmode/alertas/modificar_alerta.php b/pandora_console/godmode/alertas/modificar_alerta.php index 995b245fa7..0fa0f0cc8c 100644 --- a/pandora_console/godmode/alertas/modificar_alerta.php +++ b/pandora_console/godmode/alertas/modificar_alerta.php @@ -51,7 +51,7 @@ if ( (give_acl($id_user, 0, "LM")==1)){ } echo "

".$lang_label["alert_config"]."

"; - echo "

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

"; + echo "

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

"; echo "
"; echo "
".$lang_label["alertname"]; echo "".$lang_label["description"]; diff --git a/pandora_console/godmode/db/db_audit.php b/pandora_console/godmode/db/db_audit.php index 14e33be6ae..2294ccbe94 100644 --- a/pandora_console/godmode/db/db_audit.php +++ b/pandora_console/godmode/db/db_audit.php @@ -85,7 +85,7 @@ 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["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 b8038832ef..4127111c9e 100644 --- a/pandora_console/godmode/db/db_event.php +++ b/pandora_console/godmode/db/db_event.php @@ -76,7 +76,7 @@ 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["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 78b9515b95..b1566ce873 100644 --- a/pandora_console/godmode/db/db_info.php +++ b/pandora_console/godmode/db/db_info.php @@ -23,7 +23,7 @@ if (comprueba_login() == 0) */ echo "

".$lang_label["dbmain_title"]."

"; - echo "

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

"; + echo "

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

"; echo ""; echo "

"; echo "

"; diff --git a/pandora_console/godmode/db/db_main.php b/pandora_console/godmode/db/db_main.php index 7a772c5726..ecd18fc31e 100644 --- a/pandora_console/godmode/db/db_main.php +++ b/pandora_console/godmode/db/db_main.php @@ -23,7 +23,7 @@ if (comprueba_login() == 0) */ ?>

-

 

+

 

: 

diff --git a/pandora_console/godmode/db/db_purge.php b/pandora_console/godmode/db/db_purge.php index 13802a159c..5005883acc 100644 --- a/pandora_console/godmode/db/db_purge.php +++ b/pandora_console/godmode/db/db_purge.php @@ -23,7 +23,7 @@ if (comprueba_login() == 0) */ ?>

-

 

+

 



-

 

+

 

diff --git a/pandora_console/godmode/grupos/configurar_grupo.php b/pandora_console/godmode/grupos/configurar_grupo.php index eae8d2121a..caa2da964b 100644 --- a/pandora_console/godmode/grupos/configurar_grupo.php +++ b/pandora_console/godmode/grupos/configurar_grupo.php @@ -38,8 +38,8 @@ 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"]."

";} + 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"]."

";} ?>
diff --git a/pandora_console/godmode/grupos/lista_grupos.php b/pandora_console/godmode/grupos/lista_grupos.php index 15497c6033..17be797838 100644 --- a/pandora_console/godmode/grupos/lista_grupos.php +++ b/pandora_console/godmode/grupos/lista_grupos.php @@ -47,7 +47,7 @@ if (comprueba_login() == 0) echo "

".$lang_label["delete_group_ok"]."

"; } echo "

".$lang_label["group_management"]."

"; - echo "

".$lang_label["definedgroups"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["definedgroups"]." ".$lang_label["help"]."

"; // Load icon index from tgrupos $iconindex_g[]=""; diff --git a/pandora_console/godmode/perfiles/lista_perfiles.php b/pandora_console/godmode/perfiles/lista_perfiles.php index eb8765f7b6..410a577d2d 100644 --- a/pandora_console/godmode/perfiles/lista_perfiles.php +++ b/pandora_console/godmode/perfiles/lista_perfiles.php @@ -126,9 +126,9 @@ if (comprueba_login() == 0) } 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 "
"; diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php index 8aea225d0d..ea536acafa 100644 --- a/pandora_console/godmode/setup/setup.php +++ b/pandora_console/godmode/setup/setup.php @@ -33,7 +33,7 @@ if (comprueba_login() == 0) $result2=mysql_query("UPDATE tconfig SET VALUE='".$config_bgimage."' WHERE token='bgimage'"); } echo "

".$lang_label["setup_screen"]."

"; - echo "

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

"; + echo "

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

"; echo ""; echo '
'; echo '
'.$lang_label["language_code"]; diff --git a/pandora_console/godmode/usuarios/configurar_usuarios.php b/pandora_console/godmode/usuarios/configurar_usuarios.php index 4828ecb386..4e80e49c64 100644 --- a/pandora_console/godmode/usuarios/configurar_usuarios.php +++ b/pandora_console/godmode/usuarios/configurar_usuarios.php @@ -136,11 +136,11 @@ if (comprueba_login() == 0) 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"].'

'; } ?> diff --git a/pandora_console/godmode/usuarios/lista_usuarios.php b/pandora_console/godmode/usuarios/lista_usuarios.php index fa71e9fe9c..cae6cf2672 100644 --- a/pandora_console/godmode/usuarios/lista_usuarios.php +++ b/pandora_console/godmode/usuarios/lista_usuarios.php @@ -28,7 +28,7 @@ if (comprueba_login() == 0) ?>

-

 

+

 

diff --git a/pandora_console/help/bb/chap1.php b/pandora_console/help/bb/chap1.php deleted file mode 100644 index 66482ce896..0000000000 --- a/pandora_console/help/bb/chap1.php +++ /dev/null @@ -1,34 +0,0 @@ -, 2003-2006 -// Raul Mateos , 2004-2006 -?> - - -Pandora - Sistema de monitorización de Software Libre / Free Software Monitoring System - - - - - -
-

Pandora is a GPL Software Project. English version © Sancho Lerena 2003-2005, David villanueva 2004-2005, Alex Arnal 2005, Raúl Mateos 2004-2005.

-

Pandora es un proyecto de software GPL. Versión en español© Sancho Lerena 2003-2005, David Villanueva 2004-2005 y Raúl Mateos 2004-2005.

-
- -

Not translated yet / No se ha traducido todavía

- -

Please use English version or Spanish version.

-

Utiliza la versión en castellano (español) o en inglés. - - - - \ No newline at end of file diff --git a/pandora_console/help/bb/chap2.php b/pandora_console/help/bb/chap2.php deleted file mode 100644 index 66482ce896..0000000000 --- a/pandora_console/help/bb/chap2.php +++ /dev/null @@ -1,34 +0,0 @@ -, 2003-2006 -// Raul Mateos , 2004-2006 -?> - - -Pandora - Sistema de monitorización de Software Libre / Free Software Monitoring System - - - -

- -
-

Pandora is a GPL Software Project. English version © Sancho Lerena 2003-2005, David villanueva 2004-2005, Alex Arnal 2005, Raúl Mateos 2004-2005.

-

Pandora es un proyecto de software GPL. Versión en español© Sancho Lerena 2003-2005, David Villanueva 2004-2005 y Raúl Mateos 2004-2005.

-
- -

Not translated yet / No se ha traducido todavía

- -

Please use English version or Spanish version.

-

Utiliza la versión en castellano (español) o en inglés. - - - - \ No newline at end of file diff --git a/pandora_console/help/bb/chap3.php b/pandora_console/help/bb/chap3.php deleted file mode 100644 index 66482ce896..0000000000 --- a/pandora_console/help/bb/chap3.php +++ /dev/null @@ -1,34 +0,0 @@ -, 2003-2006 -// Raul Mateos , 2004-2006 -?> - - -Pandora - Sistema de monitorización de Software Libre / Free Software Monitoring System - - - -

- -
-

Pandora is a GPL Software Project. English version © Sancho Lerena 2003-2005, David villanueva 2004-2005, Alex Arnal 2005, Raúl Mateos 2004-2005.

-

Pandora es un proyecto de software GPL. Versión en español© Sancho Lerena 2003-2005, David Villanueva 2004-2005 y Raúl Mateos 2004-2005.

-
- -

Not translated yet / No se ha traducido todavía

- -

Please use English version or Spanish version.

-

Utiliza la versión en castellano (español) o en inglés. - - - - \ No newline at end of file diff --git a/pandora_console/help/bb/chap4.php b/pandora_console/help/bb/chap4.php deleted file mode 100644 index 66482ce896..0000000000 --- a/pandora_console/help/bb/chap4.php +++ /dev/null @@ -1,34 +0,0 @@ -, 2003-2006 -// Raul Mateos , 2004-2006 -?> - - -Pandora - Sistema de monitorización de Software Libre / Free Software Monitoring System - - - -

- -
-

Pandora is a GPL Software Project. English version © Sancho Lerena 2003-2005, David villanueva 2004-2005, Alex Arnal 2005, Raúl Mateos 2004-2005.

-

Pandora es un proyecto de software GPL. Versión en español© Sancho Lerena 2003-2005, David Villanueva 2004-2005 y Raúl Mateos 2004-2005.

-
- -

Not translated yet / No se ha traducido todavía

- -

Please use English version or Spanish version.

-

Utiliza la versión en castellano (español) o en inglés. - - - - \ No newline at end of file diff --git a/pandora_console/help/bb/chap5.php b/pandora_console/help/bb/chap5.php deleted file mode 100644 index 66482ce896..0000000000 --- a/pandora_console/help/bb/chap5.php +++ /dev/null @@ -1,34 +0,0 @@ -, 2003-2006 -// Raul Mateos , 2004-2006 -?> - - -Pandora - Sistema de monitorización de Software Libre / Free Software Monitoring System - - - -

- -
-

Pandora is a GPL Software Project. English version © Sancho Lerena 2003-2005, David villanueva 2004-2005, Alex Arnal 2005, Raúl Mateos 2004-2005.

-

Pandora es un proyecto de software GPL. Versión en español© Sancho Lerena 2003-2005, David Villanueva 2004-2005 y Raúl Mateos 2004-2005.

-
- -

Not translated yet / No se ha traducido todavía

- -

Please use English version or Spanish version.

-

Utiliza la versión en castellano (español) o en inglés. - - - - \ No newline at end of file diff --git a/pandora_console/help/bb/chap6.php b/pandora_console/help/bb/chap6.php deleted file mode 100644 index 66482ce896..0000000000 --- a/pandora_console/help/bb/chap6.php +++ /dev/null @@ -1,34 +0,0 @@ -, 2003-2006 -// Raul Mateos , 2004-2006 -?> - - -Pandora - Sistema de monitorización de Software Libre / Free Software Monitoring System - - - -

- -
-

Pandora is a GPL Software Project. English version © Sancho Lerena 2003-2005, David villanueva 2004-2005, Alex Arnal 2005, Raúl Mateos 2004-2005.

-

Pandora es un proyecto de software GPL. Versión en español© Sancho Lerena 2003-2005, David Villanueva 2004-2005 y Raúl Mateos 2004-2005.

-
- -

Not translated yet / No se ha traducido todavía

- -

Please use English version or Spanish version.

-

Utiliza la versión en castellano (español) o en inglés. - - - - \ No newline at end of file diff --git a/pandora_console/help/bb/chap7.php b/pandora_console/help/bb/chap7.php deleted file mode 100644 index 66482ce896..0000000000 --- a/pandora_console/help/bb/chap7.php +++ /dev/null @@ -1,34 +0,0 @@ -, 2003-2006 -// Raul Mateos , 2004-2006 -?> - - -Pandora - Sistema de monitorización de Software Libre / Free Software Monitoring System - - - -

- -
-

Pandora is a GPL Software Project. English version © Sancho Lerena 2003-2005, David villanueva 2004-2005, Alex Arnal 2005, Raúl Mateos 2004-2005.

-

Pandora es un proyecto de software GPL. Versión en español© Sancho Lerena 2003-2005, David Villanueva 2004-2005 y Raúl Mateos 2004-2005.

-
- -

Not translated yet / No se ha traducido todavía

- -

Please use English version or Spanish version.

-

Utiliza la versión en castellano (español) o en inglés. - - - - \ No newline at end of file diff --git a/pandora_console/help/bb/chap8.php b/pandora_console/help/bb/chap8.php deleted file mode 100644 index 66482ce896..0000000000 --- a/pandora_console/help/bb/chap8.php +++ /dev/null @@ -1,34 +0,0 @@ -, 2003-2006 -// Raul Mateos , 2004-2006 -?> - - -Pandora - Sistema de monitorización de Software Libre / Free Software Monitoring System - - - -

- -
-

Pandora is a GPL Software Project. English version © Sancho Lerena 2003-2005, David villanueva 2004-2005, Alex Arnal 2005, Raúl Mateos 2004-2005.

-

Pandora es un proyecto de software GPL. Versión en español© Sancho Lerena 2003-2005, David Villanueva 2004-2005 y Raúl Mateos 2004-2005.

-
- -

Not translated yet / No se ha traducido todavía

- -

Please use English version or Spanish version.

-

Utiliza la versión en castellano (español) o en inglés. - - - - \ No newline at end of file diff --git a/pandora_console/help/es/toc.php b/pandora_console/help/es/toc.php index ba72c81c8c..598cfb0b36 100644 --- a/pandora_console/help/es/toc.php +++ b/pandora_console/help/es/toc.php @@ -30,8 +30,8 @@ dd.help_t4 {margin-left: 92px; margin-top: 3px; margin-bottom: 2px;}

-

1. Introduction

-
1.1. Administración de Pandora
+

1. Introducción

+
1.1. Administración de Pandora

2. Usuarios

2.1. Gestión de perfiles
diff --git a/pandora_console/include/config.php b/pandora_console/include/config.php index f5aac6663c..c8f52b56d2 100644 --- a/pandora_console/include/config.php +++ b/pandora_console/include/config.php @@ -52,4 +52,9 @@ while ($row2=mysql_fetch_array($result2)){ break; } } -?> +if ($language_code == 'ast_es') { + $help_code='ast'; + } +else $help_code = substr($language_code,0,2); + +?> \ No newline at end of file diff --git a/pandora_console/include/languages/language_bb.php b/pandora_console/include/languages/language_ast_es.php similarity index 100% rename from pandora_console/include/languages/language_bb.php rename to pandora_console/include/languages/language_ast_es.php diff --git a/pandora_console/operation/agentes/estadisticas.php b/pandora_console/operation/agentes/estadisticas.php index 54cf81e70f..2b9072bbb6 100644 --- a/pandora_console/operation/agentes/estadisticas.php +++ b/pandora_console/operation/agentes/estadisticas.php @@ -12,7 +12,7 @@ if (comprueba_login() == 0){ $iduser_temp=$_SESSION['id_usuario']; if (give_acl($iduser_temp, 0, "AR") == 1){ echo "

".$lang_label["ag_title"]."

"; - echo "

".$lang_label["db_stat_agent"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["db_stat_agent"]." ".$lang_label["help"]."

"; echo ""; echo "

"; echo "

"; diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index 84f36f905c..71444cef07 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_agente.php @@ -24,7 +24,7 @@ if (comprueba_login() == 0) { $ag_group = $_GET["ag_group_refresh"]; } echo "

".$lang_label["ag_title"]."

"; - echo "

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

"; + echo "

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

"; $iduser_temp=$_SESSION['id_usuario']; diff --git a/pandora_console/operation/agentes/estado_alertas.php b/pandora_console/operation/agentes/estado_alertas.php index ae4cbdf289..5f352db9ba 100644 --- a/pandora_console/operation/agentes/estado_alertas.php +++ b/pandora_console/operation/agentes/estado_alertas.php @@ -22,7 +22,7 @@ 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)) { if (isset($_GET["id_agente"])){ - echo "

".$lang_label["alert_listing"]."".$lang_label["help"]."

"; + echo "

".$lang_label["alert_listing"]."".$lang_label["help"]."

"; $id_agente = $_GET["id_agente"]; $query_gen='SELECT talerta_agente_modulo.id_alerta, talerta_agente_modulo.descripcion, talerta_agente_modulo.last_fired, talerta_agente_modulo.times_fired, tagente_modulo.nombre, talerta_agente_modulo.dis_max, talerta_agente_modulo.dis_min, talerta_agente_modulo.max_alerts, talerta_agente_modulo.time_threshold, talerta_agente_modulo.min_alerts, talerta_agente_modulo.id_agente_modulo, tagente_modulo.id_agente_modulo FROM tagente_modulo, talerta_agente_modulo WHERE tagente_modulo.id_agente = '.$id_agente.' AND tagente_modulo.id_agente_modulo = talerta_agente_modulo.id_agente_modulo order by tagente_modulo.nombre'; $result_gen=mysql_query($query_gen); @@ -59,7 +59,7 @@ if (comprueba_login() == 0) { else { echo "

".$lang_label["ag_title"]."

"; - echo "

".$lang_label["alert_listing"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["alert_listing"]." ".$lang_label["help"]."

"; $iduser_temp=$_SESSION['id_usuario']; if (isset($_POST["ag_group"])) $ag_group = $_POST["ag_group"]; diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index bcb283a822..3173191fb5 100644 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -49,7 +49,7 @@ if (comprueba_login() == 0) { } echo "

".$lang_label["ag_title"]."

"; - echo "

".$lang_label["view_agent_general_data"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["view_agent_general_data"]." ".$lang_label["help"]."

"; echo ''; echo '
'.$lang_label["agent_name"].' '.salida_limpia($nombre_agente); diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index 8bfb849e68..4441cc8b73 100644 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -24,7 +24,7 @@ if (comprueba_login() == 0) { if (isset($_GET["id_agente"])){ $id_agente = $_GET["id_agente"]; } - echo "

".$lang_label["monitor_listing"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["monitor_listing"]." ".$lang_label["help"]."

"; // Get all module from agent $sql_t='SELECT * FROM tagente_estado, tagente_modulo WHERE tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_modulo.id_agente='.$id_agente.' and tagente_estado.estado != 100 order by tagente_modulo.nombre'; $result_t=mysql_query($sql_t); diff --git a/pandora_console/operation/agentes/estado_ultimopaquete.php b/pandora_console/operation/agentes/estado_ultimopaquete.php index 2791f159a4..416819090d 100644 --- a/pandora_console/operation/agentes/estado_ultimopaquete.php +++ b/pandora_console/operation/agentes/estado_ultimopaquete.php @@ -72,7 +72,7 @@ if (comprueba_login() == 0) { //$sql3='SELECT * FROM tagente_modulo WHERE id_agente = '.$id_agente.' order by id_module_group'; $label_group=0; $last_label = ""; - echo "

".$lang_label["last_data_chunk"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["last_data_chunk"]." ".$lang_label["help"]."

"; $result3=mysql_query($sql3); if (mysql_num_rows ($result3)) { echo "
X".$lang_label["module_name"]; diff --git a/pandora_console/operation/agentes/exportdata.php b/pandora_console/operation/agentes/exportdata.php index c6cff657e0..b19738bfc3 100644 --- a/pandora_console/operation/agentes/exportdata.php +++ b/pandora_console/operation/agentes/exportdata.php @@ -13,7 +13,7 @@ if (comprueba_login() == 0) if ((isset($_GET["operacion"])) AND (! isset($_POST["update_agent"]))){ if (isset ($_POST["copiar"])){ // Export main button echo "

".$lang_label["ag_title"]."

"; - echo "

".$lang_label["export_title"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["export_title"]." ".$lang_label["help"]."

"; if (isset ($_POST["origen_modulo"])){ if (isset ($_POST["csv"])) // CSV version $csv = 1; @@ -64,7 +64,7 @@ if (comprueba_login() == 0) } else { // Form view ?>

-

 

+

 

diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index dc9b67a154..1b3f9a3c1a 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -30,7 +30,7 @@ if (comprueba_login() == 0) { } echo "

".$lang_label["ag_title"]."

"; - echo "

".$lang_label["monitor_listing"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["monitor_listing"]." ".$lang_label["help"]."

"; $iduser_temp=$_SESSION['id_usuario']; diff --git a/pandora_console/operation/events/event_statistics.php b/pandora_console/operation/events/event_statistics.php index c975e56ed7..8de65cea84 100644 --- a/pandora_console/operation/events/event_statistics.php +++ b/pandora_console/operation/events/event_statistics.php @@ -13,7 +13,7 @@ if (comprueba_login() == 0) { $id_usuario =$_SESSION["id_usuario"]; if (give_acl($id_usuario, 0, "AR")==1) { echo "

".$lang_label["events"]."

"; - echo "

".$lang_label["event_statistics"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["event_statistics"]." ".$lang_label["help"]."

"; echo ''; echo "

"; echo ''; diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index d96689ca6d..9ba9fd5fc9 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -109,7 +109,7 @@ if (comprueba_login() == 0) { } echo "

".$lang_label["events"]."

"; - echo "

".$lang_label["event_main_view"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["event_main_view"]." ".$lang_label["help"]."

"; // Prepare index for pagination $event_list[]=""; diff --git a/pandora_console/operation/incidents/incident.php b/pandora_console/operation/incidents/incident.php index 5bf159a00a..b3d1b12de5 100644 --- a/pandora_console/operation/incidents/incident.php +++ b/pandora_console/operation/incidents/incident.php @@ -127,7 +127,7 @@ if ((give_acl($id_user, 0, "IR")==1) OR (give_acl($id_user, 0, "IM")==1) or (dam $sql1_count="SELECT COUNT(id_incidencia) FROM tincidencia ".$sql1; $sql1=$sql0; echo "

".$lang_label["incident_manag"]."

"; - echo "

".$lang_label["manage_incidents"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["manage_incidents"]." ".$lang_label["help"]."

"; ?> ";} echo "

".$lang_label["incident_manag"]."

"; - if (isset($id_inc)) {echo "

".$lang_label["rev_incident"]." # ".$id_inc."  ".$lang_label["help"]."

";} - else {echo "

".$lang_label["create_incident"]." ".$lang_label["help"]."

";} + if (isset($id_inc)) {echo "

".$lang_label["rev_incident"]." # ".$id_inc."  ".$lang_label["help"]."

";} + else {echo "

".$lang_label["create_incident"]." ".$lang_label["help"]."

";} echo '
'; if ((give_acl($iduser_temp, $id_grupo, "IM")==1) OR ($usuario == $iduser_temp)) echo '
'.$lang_label["incident"].''; diff --git a/pandora_console/operation/incidents/incident_search.php b/pandora_console/operation/incidents/incident_search.php index 31fc78aca2..f9f03a59f5 100644 --- a/pandora_console/operation/incidents/incident_search.php +++ b/pandora_console/operation/incidents/incident_search.php @@ -13,7 +13,7 @@ if (comprueba_login() == 0) { echo "

".$lang_label["incident_manag"]."

"; -echo "

".$lang_label["find_crit"]."  ".$lang_label["help"]."

"; +echo "

".$lang_label["find_crit"]."  ".$lang_label["help"]."

"; echo "
"; echo "
"; ?> diff --git a/pandora_console/operation/incidents/incident_statistics.php b/pandora_console/operation/incidents/incident_statistics.php index 17ea47897c..d76946d1c5 100644 --- a/pandora_console/operation/incidents/incident_statistics.php +++ b/pandora_console/operation/incidents/incident_statistics.php @@ -14,7 +14,7 @@ if (comprueba_login() == 0) { $iduser=$_SESSION['id_usuario']; if (give_acl($id_user, 0, "IR")==1) { echo "

".$lang_label["incident_manag"]."

"; - echo "

".$lang_label["statistics"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["statistics"]." ".$lang_label["help"]."

"; echo ''; echo "

"; echo ''; diff --git a/pandora_console/operation/users/user.php b/pandora_console/operation/users/user.php index 4e72c60240..c5f83b5f2a 100644 --- a/pandora_console/operation/users/user.php +++ b/pandora_console/operation/users/user.php @@ -15,7 +15,7 @@ if (comprueba_login() == 0) { ?>

-

 

+

 

@@ -68,7 +68,7 @@ echo "

"; ?> -

 

+

 

".$lang_label["users_"].""; - echo "

".$lang_label["user_edit_title"]." ".$lang_label["help"]."

"; + echo "

".$lang_label["user_edit_title"]." ".$lang_label["help"]."

"; // Sino se obtiene la variable "modificado" es que se esta visualizando la informacion y // preparandola para su modificacion, no se almacenan los datos diff --git a/pandora_console/operation/users/user_statistics.php b/pandora_console/operation/users/user_statistics.php index f3b8432df2..9e28343f05 100644 --- a/pandora_console/operation/users/user_statistics.php +++ b/pandora_console/operation/users/user_statistics.php @@ -10,7 +10,7 @@ require("include/config.php"); //require("include/functions_db.php"); if (comprueba_login() == 0) { echo "

".$lang_label["users"]."

"; -echo "

".$lang_label["users_statistics"]." ".$lang_label["help"]."

"; +echo "

".$lang_label["users_statistics"]." ".$lang_label["help"]."

"; echo ''; echo "

"; } diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index d789829a04..38fc67327e 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -261,8 +261,8 @@ CREATE TABLE `tincidencia` ( # Table: 'tlanguage' # CREATE TABLE `tlanguage` ( - `id_language` char(5) NOT NULL default '', - `name` varchar(100) NOT NULL default '', + `id_language` char(6) NOT NULL default '', + `name` varchar(50) NOT NULL default '', PRIMARY KEY (`id_language`) ) TYPE=InnoDB; diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 760922dd76..1205272504 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -134,7 +134,7 @@ INSERT INTO `tusuario_perfil` VALUES (2,'admin',5,1,'admin'); -- -INSERT INTO `tlanguage` VALUES ('bb','Bable'); +INSERT INTO `tlanguage` VALUES ('ast_es','Bable'); INSERT INTO `tlanguage` VALUES ('en','English'); INSERT INTO `tlanguage` VALUES ('es_es','Español'); INSERT INTO `tlanguage` VALUES ('es_la','Español-Latinoamérica');