From b9c19ddcb0a07f9fdd0eef9f8e4741ca7eb2302e Mon Sep 17 00:00:00 2001 From: guruevi Date: Tue, 12 Aug 2008 14:15:42 +0000 Subject: [PATCH] 2008-08-12 Evi Vanoost * operation/menu.php: Made short tag, normal tag * include/functions.php: Got rid of references to language files * godmode/servers/plugin.php: Made proper english * godmode/servers/manage_recontask.php: Made proper HTML * godmode/profiles/profile_list.php: Translation of help strings * godmode/agentes/manage_config_remote.php: Fixed typo that generated errors git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1008 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 14 +++++++++++++ .../godmode/agentes/manage_config_remote.php | 2 +- .../godmode/profiles/profile_list.php | 20 +++++++++---------- .../godmode/servers/manage_recontask.php | 18 ++++++++--------- pandora_console/godmode/servers/plugin.php | 2 +- pandora_console/include/functions.php | 5 +---- 6 files changed, 36 insertions(+), 25 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 4268112bc5..c3c0142d7f 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,17 @@ +2008-08-12 Evi Vanoost + + * operation/menu.php: Made short tag, normal tag + + * include/functions.php: Got rid of references to language files + + * godmode/servers/plugin.php: Made proper english + + * godmode/servers/manage_recontask.php: Made proper HTML + + * godmode/profiles/profile_list.php: Translation of help strings + + * godmode/agentes/manage_config_remote.php: Fixed typo that generated errors + 2008-08-12 Esteban Sanchez * pandoradb_data.sql: Added default languages. diff --git a/pandora_console/godmode/agentes/manage_config_remote.php b/pandora_console/godmode/agentes/manage_config_remote.php index c798b38841..1809ed2767 100644 --- a/pandora_console/godmode/agentes/manage_config_remote.php +++ b/pandora_console/godmode/agentes/manage_config_remote.php @@ -138,7 +138,7 @@ if ((isset($_GET["operacion"])) AND ($update_agent == -1) AND ($update_group == // Form buttons echo ''; - echo ''; + echo ''; echo ''; echo ''; echo ''; diff --git a/pandora_console/godmode/profiles/profile_list.php b/pandora_console/godmode/profiles/profile_list.php index ff11b84bda..9ae8e07160 100644 --- a/pandora_console/godmode/profiles/profile_list.php +++ b/pandora_console/godmode/profiles/profile_list.php @@ -214,25 +214,25 @@ if (isset ($id_perfil)){ // There are values defined, let's show form with data echo ""; echo "".__('Profiles'); echo " - IR ".$help_label["IR"].""; + IR ".__("System Incidents Reading rights").""; echo " - IW ".$help_label["IW"].""; + IW ".__("System Incidents Writing rights").""; echo " - IM ".$help_label["IM"].""; + IM ".__("System Incidents Management rights").""; echo " - AR ".$help_label["AR"].""; + AR ".__("Agents Reading rights").""; echo " - AW ".$help_label["AW"].""; + AW ".__("Agents Writing rights").""; echo " - LW ".$help_label["LW"].""; + LW ".__("Alerts Edition rights").""; echo " - UM ".$help_label["UM"].""; + UM ".__("Users Management rights").""; echo " - DM ".$help_label["DM"].""; + DM ".__("Database Management rights").""; echo " - LM ".$help_label["LM"].""; + LM ".__("Alerts Management rights").""; echo " - PM ".$help_label["PM"].""; + PM ".__("Pandora System Management rights").""; echo "".__('Delete').""; while ($rowdup=mysql_fetch_array($resq1)){ $id_perfil = $rowdup["id_perfil"]; diff --git a/pandora_console/godmode/servers/manage_recontask.php b/pandora_console/godmode/servers/manage_recontask.php index 5f41cdd970..bcfa70cf32 100644 --- a/pandora_console/godmode/servers/manage_recontask.php +++ b/pandora_console/godmode/servers/manage_recontask.php @@ -93,15 +93,15 @@ $result=mysql_query($query); $color=1; if (mysql_num_rows($result)){ echo ""; - echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; } while ($row=mysql_fetch_array($result)){ $id_rt = $row["id_rt"]; diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php index 0b3188b59e..7e2d22f6e9 100644 --- a/pandora_console/godmode/servers/plugin.php +++ b/pandora_console/godmode/servers/plugin.php @@ -219,7 +219,7 @@ else { } echo "
".__('Name'); - echo "".__('Type'); - echo "".__('Network'); - echo "".__('Network profile'); - echo "".__('Group'); - echo "".__('Incident'); - echo "".__('OS'); - echo "".__('Interval'); - echo "".__('Action'); + echo "
".__('Name')."".__('Type')."".__('Network')."".__('Network profile')."".__('Group')."".__('Incident')."".__('OS')."".__('Interval')."".__('Action')."
"; } else { - echo '
'. __('There is no plugins in the system'); + echo '
'. __('There are no plugins in the system'); echo "
"; } echo ""; diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 5a657ffc9d..b8920316ad 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -197,7 +197,6 @@ function popup_help ($help_id, $return = false) { */ function no_permission () { require("config.php"); - require ("include/languages/language_".$config["language"].".php"); echo "

".__('You don\'t have access')."

"; echo "No access

"; echo "
"; @@ -216,9 +215,8 @@ function no_permission () { */ function unmanaged_error ($error = "") { require("config.php"); - require ("include/languages/language_".$config["language"].".php"); echo "

".__('Unmanaged error')."

"; - echo "error

"; + echo "error

"; echo "
"; echo "
"; echo __('Unmanaged error'); @@ -283,7 +281,6 @@ function list_files ($directory, $stringSearch, $searchHandler, $return) { */ function pagination ($count, $url, $offset) { global $config; - require ("include/languages/language_".$config["language"].".php"); /* URL passed render links with some parameter &offset - Offset records passed to next page