diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 7c8e967c45..9968819289 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,17 @@ +2010-11-11 Raúl Mateos + + * general/error_install.php, general/error_perms.php, general/header.php, + general/logon_menu.php, general/logon_ok.php, include/functions_menu.php, + include/functions_ui.php, extensions/agents_modules.php, + operation/menu.php, godmode/menu.php, operation/estado_agente.php, + operation/agentes/estado_agente.php, operation/agentes/status_monitor.php, + operation/agentes/estado_monitores.php, + operation/agentes/estado_ultimopaquete.php, + operation/agentes/estado_generalagente.php, pandoradb_data.sql: Closed + some HTML tags, autoclose others, added alt to images, and changed some + & to "&" to help validation for XHTML 1.0 Transitional. Tested and + not error found, but needs more tests... + 2010-11-11 Junichi Satoh * godmode/setup/gis_step_2.php: Added UTF-8 charset to htmlentities(). diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php index e8c1528535..0300f4fc7c 100644 --- a/pandora_console/extensions/agents_modules.php +++ b/pandora_console/extensions/agents_modules.php @@ -78,11 +78,11 @@ function mainAgentsModules() { $comborefr .= ""; if ($config["pure"] == 0) { - $fullscreen = '' + $fullscreen = '' . print_image ("images/fullscreen.png", true, array ("title" => __('Full screen mode'))) . ""; } else { - $fullscreen = '' + $fullscreen = '' . print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode'))) . ""; $config['refr'] = $refr; diff --git a/pandora_console/general/error_install.php b/pandora_console/general/error_install.php index 4cdeb04027..53eee0201e 100644 --- a/pandora_console/general/error_install.php +++ b/pandora_console/general/error_install.php @@ -2,7 +2,7 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas +// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -37,7 +37,7 @@

Installer active

-
+ Pandora FMS


diff --git a/pandora_console/general/error_perms.php b/pandora_console/general/error_perms.php index 1268b61146..c3a2ccb9df 100644 --- a/pandora_console/general/error_perms.php +++ b/pandora_console/general/error_perms.php @@ -2,7 +2,7 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas +// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -35,7 +35,7 @@

Bad permission for include/config.php

-
+ Pandora FMS


For security reasons, config.php must have restrictive permissions, and "other" users diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index 665dedb0f7..4776f2e869 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -24,16 +24,16 @@ $msg_cnt = 0; "; + echo "Pandora FMS Opensource"; } else { - echo "Pandora FMS Enterprise"; + echo "Pandora FMS Enterprise"; } ?> .png" class="bot" alt="user" /> - [] + [] '; + echo ''; $servers["all"] = (int) get_db_value ('COUNT(id_server)','tserver'); $servers["up"] = (int) check_server_status (); @@ -118,7 +118,8 @@ $msg_cnt = 0; echo ""; echo ""; if (isset($config["custom_logo"])) - echo ""; + echo "Logo"; + echo ""; ?> @@ -128,7 +129,7 @@ $msg_cnt = 0; -
+ @@ -143,7 +144,7 @@ if ($config["metaconsole"] == 0){ onfocus="javascript: if (fieldKeyWordEmpty) $('#keywords').val('');" size="100" style="background: white url('images/lupa_15x15.png') no-repeat right; padding: 0; padding-left:0px; margin: 0; width: 90%; height: 19px; margin-bottom: 5px; margin-left: 2px;" /> - +
lightning_go '.__('Events').''; + echo 'lightning_go '.__('Events').''; } ?> diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php index 4e6d606dbc..6e7fc54f2b 100644 --- a/pandora_console/general/logon_ok.php +++ b/pandora_console/general/logon_ok.php @@ -135,7 +135,7 @@ foreach ($cells as $key => $row) { echo ''; echo "
"; echo '
'; -echo "

"; +echo "

"; // Show last activity from this user echo "

" . __('This is your last activity in Pandora FMS console') . "

"; diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index 578287334e..a7800a0f81 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -49,11 +49,11 @@ if (give_acl ($config['id_user'], 0, "AW")) { $menu["gmassive"]["id"] = "god-massive"; $sub = array (); - $sub["godmode/massive/massive_operations&tab=massive_agents"]["text"] = __('Agents operations'); + $sub["godmode/massive/massive_operations&tab=massive_agents"]["text"] = __('Agents operations'); - $sub["godmode/massive/massive_operations&tab=massive_modules"]["text"] = __('Modules operations'); + $sub["godmode/massive/massive_operations&tab=massive_modules"]["text"] = __('Modules operations'); - $sub["godmode/massive/massive_operations&tab=massive_alerts"]["text"] = __('Alerts operations'); + $sub["godmode/massive/massive_operations&tab=massive_alerts"]["text"] = __('Alerts operations'); enterprise_hook('massivepolicies_submenu'); diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index d4b76386c3..3022ff27aa 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -2,7 +2,7 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas +// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas // Please see http://pandorafms.org for full contribution list // This program is free software; you can redistribute it and/or @@ -150,7 +150,7 @@ function print_menu (&$menu) { if (array_key_exists('sec',$sub)) $secExtension = $sub["sec"]; if (strlen($secExtension) > 0) { $secUrl = $secExtension; - $extensionInMenu = 'extension_in_menu='.$mainsec.'&'; + $extensionInMenu = 'extension_in_menu='.$mainsec.'&'; } else { $secUrl = $mainsec; diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index a46b8f6702..2d9b387712 100644 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -437,7 +437,7 @@ function format_alert_row ($alert, $compound = false, $agent = true, $url = '') else { $img = 'images/policies.png'; - $data[$index['policy']] = '' . + $data[$index['policy']] = '' . print_image($img,true, array('title' => $policyInfo['name'])) . ''; } @@ -456,11 +456,11 @@ function format_alert_row ($alert, $compound = false, $agent = true, $url = '') if (! $compound) { if ($alert["force_execution"] == 0) { $data[$index['force_execution']] = - ''; + ''; } else { $data[$index['force_execution']] = - ''; + ''; } } @@ -499,7 +499,7 @@ function format_alert_row ($alert, $compound = false, $agent = true, $url = '') if ($action["fires_min"] != $action["fires_max"]){ $actionText .= " (".$action["fires_min"] . " / ". $action["fires_max"] . ")"; } - $actionText .= '
'; + $actionText .= '
'; } $actionText .= '
'; } @@ -1389,7 +1389,7 @@ if($hidde_default) { $image_b = "images/go.png"; } // Link to toggle -echo ''.$name.' '.print_image ($image_b, true, array ("title" => $title, "id" => "image_".$uniqid)).'

'; +echo ''.$name.' '.print_image ($image_b, true, array ("title" => $title, "id" => "image_".$uniqid)).'

'; // Code into a div echo "
\n"; @@ -1571,11 +1571,11 @@ function print_page_header ($title, $icon = "", $return = false, $help = "", $go $buffer = '
'; + $buffer .= '
'; if (is_array($options)) { $buffer .= '


'; + $buffer .= '



'; if (!$return) echo $buffer; diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index 20a0e53853..7dd8a5222f 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_agente.php @@ -247,23 +247,23 @@ $table->class = "databox"; $table->head = array (); $table->head[0] = __('Agent'). ' ' . - '' . - ''; + 'up' . + 'down'; $table->head[1] = __('OS'). ' ' . - '' . - ''; + 'up' . + 'down'; $table->head[2] = __('Interval'). ' ' . - '' . - ''; + 'up' . + 'down'; $table->head[3] = __('Group'). ' ' . - '' . - ''; + 'up' . + 'down'; $table->head[4] = __('Modules'); $table->head[5] = __('Status'); $table->head[6] = __('Alerts'); $table->head[7] = __('Last contact'). ' ' . - '' . - ''; + 'up' . + 'down'; $table->align = array (); $table->align[1] = "center"; diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index 45fdab9ade..f895202d2c 100644 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -2,7 +2,7 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas +// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas // Please see http://pandorafms.org for full contribution list // This program is free software; you can redistribute it and/or @@ -75,8 +75,8 @@ else { $cellName = print_agent_name ($agent["id_agente"], true, "upper"); } echo ''.$cellName.''; -echo ' '; -echo ''; +echo ' '; +echo ''; //Addresses echo ''.__('IP Address').''; @@ -100,7 +100,7 @@ echo ' '.substr($agent["os_versio // Parent echo ''.__('Parent').''; -echo ''.get_agent_name ($agent["id_parent"]).''; +echo ''.get_agent_name ($agent["id_parent"]).''; // Agent Interval echo ''.__('Interval').''; @@ -132,7 +132,7 @@ if ($config['activate_gis']) { echo __('There is no GIS data.'); } else { - echo ''.$dataPositionAgent['stored_longitude'].', '.$dataPositionAgent['stored_latitude'].''; + echo ''.$dataPositionAgent['stored_longitude'].', '.$dataPositionAgent['stored_latitude'].''; } echo ''; } @@ -158,7 +158,7 @@ if ($agent['timezone_offset'] != 0) { $progress = getNextAgentContact($id_agente); echo ''.__('Next agent contact').''; -echo ''; +echo ''; // Custom fields $fields = get_db_all_rows_filter('tagent_custom_fields', array('display_on_front' => 1)); diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index 5935be7e94..3f1083d204 100644 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -25,7 +25,7 @@ if (!isset ($id_agente)) { } $id_agent = get_parameter('id_agente'); -$url = 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $id_agent; +$url = 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $id_agent; $selectTypeUp = ''; $selectTypeDown = ''; $selectNameUp = ''; @@ -151,22 +151,22 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) { } $table->head[2] = __('Type') . ' ' . - '' . - ''; + 'up' . + 'down'; $table->head[3] = __('Module name') . ' ' . - '' . - ''; + 'up' . + 'down'; $table->head[4] = __('Description'); $table->head[5] = __('Status') . ' ' . - '' . - ''; + 'up' . + ''; $table->head[6] = __('Data') . ' ' . - '' . - ''; + 'up' . + 'down'; $table->head[7] = __('Graph'); $table->head[8] = __('Last contact') . ' ' . - '' . - ''; + 'up' . + 'down'; $table->align = array("left","left","left","left","left","center"); @@ -191,10 +191,10 @@ foreach ($modules as $module) { $data = array (); if (($module["id_modulo"] != 1) && ($module["id_tipo_modulo"] != 100)) { if ($module["flag"] == 0) { - $data[0] = ''; + $data[0] = 'target'; } else { - $data[0] = ''; + $data[0] = 'refresh'; } } else { @@ -234,7 +234,7 @@ foreach ($modules as $module) { } } - $data[1] = '' . + $data[1] = '' . print_image($img,true, array('title' => $title)) . ''; } @@ -246,7 +246,7 @@ foreach ($modules as $module) { $data[2] = show_server_type ($module['id_modulo']); if (give_acl ($config['id_user'], $id_grupo, "AW")) - $data[2] .= ''; + $data[2] .= ''; $data[3] = print_string_substr ($module["nombre"], 25, true); $data[4] = print_string_substr ($module["descripcion"], 30, true); @@ -323,11 +323,11 @@ foreach ($modules as $module) { $url = 'include/procesos.php?agente='.$module["id_agente_modulo"]; $win_handle=dechex(crc32($module["id_agente_modulo"].$module["nombre"])); - $link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$module["id_agente_modulo"]."&label=".$module["nombre"]."&refresh=600','day_".$win_handle."')"; + $link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$module["id_agente_modulo"]."&label=".$module["nombre"]."&refresh=600','day_".$win_handle."')"; // if ($nombre_tipo_modulo != "log4x") - $data[7] .= ''; - $data[7] .= " "; + $data[7] .= ''; + $data[7] .= " "; } if ($module['estado'] == 3) { diff --git a/pandora_console/operation/agentes/estado_ultimopaquete.php b/pandora_console/operation/agentes/estado_ultimopaquete.php index b8bbb16330..6e543d0367 100644 --- a/pandora_console/operation/agentes/estado_ultimopaquete.php +++ b/pandora_console/operation/agentes/estado_ultimopaquete.php @@ -44,13 +44,13 @@ $last_label = ""; // Title echo "

".__('Display of last data modules received by agent'); -echo " "; +echo " "; echo "

"; $sortField = get_parameter('sort_field'); $sort = get_parameter('sort', 'none'); $selected = 'border: 1px solid black;'; -$url = 'index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=data&id_agente=' . $id_agente; +$url = 'index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=data&id_agente=' . $id_agente; $selectNameUp = ''; $selectNameDown = ''; $selectTypeUp = ''; @@ -159,27 +159,27 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) { echo "".__('P.').""; } echo "".__('Module name') . ' ' . - '' . - ''; + 'up' . + 'down'; echo ""; echo "".__('Type') . ' ' . - '' . - ''; + 'up' . + 'down'; echo ""; echo "".__('int') . ' ' . - '' . - ''; + 'up' . + 'down'; echo ""; echo "".__('Description') . ""; echo "".__('Data') . ' ' . - '' . - ''; + 'up' . + 'down'; echo ""; echo "".__('Graph').""; echo "".__('Raw Data').""; echo "".__('Timestamp') . ' ' . - '' . - ''; + 'up' . + 'down'; echo ""; $texto=''; $last_modulegroup = 0; $color = 1; @@ -212,9 +212,9 @@ foreach ($modules as $module) { // Has flag = 0 if ($write && $module["id_modulo"] > 1 && $module["id_tipo_modulo"] < 100) { if ($module["flag"] == 0) { - echo ""; + echo ""; } else { - echo ""; + echo ""; } } echo ""; @@ -254,7 +254,7 @@ foreach ($modules as $module) { echo ""; - echo'' . + echo'' . print_image($img,true, array('title' => $title)) . ''; echo ""; @@ -339,16 +339,16 @@ foreach ($modules as $module) { echo ""; $graph_label = output_clean_strict ($module["nombre"]); - echo " "; + echo " "; $link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=604800&id=".$module["id_agente_modulo"]."&label=".$graph_label."&refresh=6000','week_".$win_handle."')"; - echo ' '; + echo ' '; $link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$module["id_agente_modulo"]."&label=".$graph_label."&refresh=600','day_".$win_handle."')"; - echo ' '; + echo ' '; $link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=3600&id=".$module["id_agente_modulo"]."&label=".$graph_label."&refresh=60','hour_".$win_handle."')"; - echo ''; + echo ''; } @@ -356,9 +356,9 @@ foreach ($modules as $module) { if ($module['history_data'] == 1){ // RAW Table data echo ""; - echo "  "; - echo "  "; - echo ""; + echo "  "; + echo "  "; + echo ""; } else { echo ""; } diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index 8373aff814..98b4ac3909 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -40,7 +40,7 @@ $offset = (int) get_parameter ('offset'); $status = (int) get_parameter ('status', 4); $modulegroup = (int) get_parameter ('modulegroup'); -echo '
'; +echo ''; echo ''; echo ''; @@ -68,7 +68,7 @@ echo ''; +echo ''; echo '"; echo "
'.__('Group').''; print_select_from_sql ("SELECT * FROM tmodule_group ORDER BY name", 'modulegroup', $modulegroup, '',__('All'), 0, false, false, true, false, 'width: 100px;'); -echo '
'.__('Module name').'
'.__('Module name').''; $user_groups = implode (",", array_keys (get_user_groups ())); @@ -86,8 +86,9 @@ print_input_text ("ag_freestring", $ag_freestring, '', 15,30, false); echo ''; print_submit_button (__('Show'), "uptbutton", false, 'class="sub search"'); -echo ""; +echo "
"; +echo ""; // Begin Build SQL sentences $sql = " FROM tagente, tagente_modulo, tagente_estado @@ -249,13 +250,13 @@ foreach ($result as $row) { } } - $data[0] = '' . + $data[0] = '' . print_image($img,true, array('title' => $title)) . ''; } } - $data[1] = ''; + $data[1] = ''; $data[1] .= substr ($row["agent_name"], 0, 25); $data[1] .= ''; @@ -305,8 +306,8 @@ foreach ($result as $row) { $link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$row["id_agente_modulo"]."&label=".$row["module_name"]."&refresh=600','day_".$win_handle."')"; - $data[6] = ''; - $data[6] .= " "; + $data[6] = ''; + $data[6] .= " "; } if (is_numeric($row["datos"])) diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index 09469c7be0..c39fb6b1e2 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -134,7 +134,7 @@ if (give_acl ($config['id_user'], 0, "PM")) { } foreach ($servers as $serverItem) { - $sub["operation/servers/view_server_detail&server_id=".$serverItem["id_server"]]["text"] = $serverItem["name"]; + $sub["operation/servers/view_server_detail&server_id=".$serverItem["id_server"]]["text"] = $serverItem["name"]; } $menu["estado_server"]["sub"] = $sub; @@ -173,8 +173,8 @@ if (give_acl ($config['id_user'], 0, "AR")) { $pss = get_user_info($config['id_user']); $hashup = md5($config['id_user'].$pss['password']); - $sub["operation/events/events_rss.php?user=".$config['id_user']."&hashup=".$hashup]["text"] = __('RSS'); - $sub["operation/events/events_rss.php?user=".$config['id_user']."&hashup=".$hashup]["type"] = "direct"; + $sub["operation/events/events_rss.php?user=".$config['id_user']."&hashup=".$hashup]["text"] = __('RSS'); + $sub["operation/events/events_rss.php?user=".$config['id_user']."&hashup=".$hashup]["type"] = "direct"; //CSV $sub["operation/events/export_csv.php"]["text"] = __('CSV File'); diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 7ce4afda46..97befdc589 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -170,9 +170,9 @@ LOCK TABLES `tlink` WRITE; INSERT INTO `tlink` VALUES (1,'Pandora FMS Manual','https://openideas.info/wiki/index.php?title=Pandora_3.x:Documentation'), (2,'Pandora FMS','http://pandorafms.org'), -(3,'Report a bug','https://sourceforge.net/tracker/?func=add&group_id=155200&atid=794852'), -(4,'Suggest new feature','http://sourceforge.net/tracker/?group_id=155200&atid=794855'), -(5,'Module library','http://pandorafms.org/?sec=community&sec2=repository&lng=es'); +(3,'Report a bug','https://sourceforge.net/tracker/?func=add&group_id=155200&atid=794852'), +(4,'Suggest new feature','http://sourceforge.net/tracker/?group_id=155200&atid=794855'), +(5,'Module library','http://pandorafms.org/?sec=community&sec2=repository&lng=es'); UNLOCK TABLES; --