From 74e0b936e093964b468a19d8ed8026b122f54633 Mon Sep 17 00:00:00 2001 From: raulmateos Date: Sat, 16 Jun 2007 16:04:01 +0000 Subject: [PATCH] 2007-06-16 Raul Mateos * godmode/menu.php: Updated component groups highlight. * operation/snmpconsole/*.php, general/logon_ok.php, godmode/db/db_info_data.php, godmode/servers/manage_recontask.php, godmode/servers/modificar_server.php, operation/agentes/exportdata.php: Removed old raya style and changed to new style. Closed hundreds of unclosed html tags (review W3C standards) * operation/servers/view_server.php, godmode/reporting/graph_builder.php: Closed html tags. * include/styles/pandora.css: Deleted definetely raya style. * include/styles/tip.css: Updated tip2 style to datos2 colour. * godmode/alerts/configure_alert.php, godmode/modules/manage*form.php: Changed databox style to databox_color git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@514 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 20 ++++ pandora_console/general/logon_ok.php | 27 +++--- .../godmode/alerts/configure_alert.php | 4 +- pandora_console/godmode/db/db_info_data.php | 15 +-- pandora_console/godmode/menu.php | 2 +- .../godmode/modules/manage_nc_groups_form.php | 2 +- .../manage_network_components_form.php | 2 +- .../modules/manage_network_templates_form.php | 2 +- .../godmode/reporting/graph_builder.php | 50 +++++----- .../godmode/servers/manage_recontask.php | 36 ++++---- .../godmode/servers/modificar_server.php | 92 +++++++++++-------- pandora_console/include/styles/pandora.css | 7 -- pandora_console/include/styles/tip.css | 3 +- .../operation/agentes/exportdata.php | 39 ++++---- .../operation/agentes/tactical.php | 45 ++++----- .../operation/servers/view_server.php | 13 +-- .../operation/snmpconsole/snmp_alert.php | 29 +++--- .../operation/snmpconsole/snmp_view.php | 11 ++- pandora_console/reporting/fgraph.php | 2 +- 19 files changed, 220 insertions(+), 181 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 737abc3089..dfd9c428b1 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,23 @@ +2007-06-16 Raul Mateos + + * godmode/menu.php: Updated component groups highlight. + + * operation/snmpconsole/*.php, general/logon_ok.php, + godmode/db/db_info_data.php, godmode/servers/manage_recontask.php, + godmode/servers/modificar_server.php, operation/agentes/exportdata.php: + Removed old raya style and changed to new style. + Closed hundreds of unclosed html tags (review W3C standards) + + * operation/servers/view_server.php, godmode/reporting/graph_builder.php: + Closed html tags. + + * include/styles/pandora.css: Deleted definetely raya style. + + * include/styles/tip.css: Updated tip2 style to datos2 colour. + + * godmode/alerts/configure_alert.php, godmode/modules/manage*form.php: + Changed databox style to databox_color + 2007-06-13 Raul Mateos * godmode/menu.php, operation/menu.php, include/pandora.css, include/op.css, diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php index c739e62073..304e3df5f0 100644 --- a/pandora_console/general/logon_ok.php +++ b/pandora_console/general/logon_ok.php @@ -91,21 +91,21 @@ echo ""; echo ""; - echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo "
".$lang_label["Pandora_FMS_summary"]."
"."Total agents"; - echo "".$total_agents; - echo "
"."Total checks"; - echo "".$total_checks; - echo "
"."Monitor BAD"; - echo ""; + echo "
"."Total agents"."".$total_agents."
"."Total checks"."".$total_checks."
"."Monitor BAD".""; if ($monitor_bad > 0) echo $monitor_bad; else echo "-"; - echo "
"."Alerts defined"; - echo "".$total_alerts; - echo "
"."Total users"; - echo "".$users_defined; - echo "
"; + echo ""."Alerts defined".""; + echo "".$total_alerts.""; + echo ""."Total users".""; + echo "".$users_defined.""; + echo ""; echo ""; @@ -113,7 +113,7 @@ // Show last activity from this user echo "

" . $lang_label["user_last_activity"] . "

"; // Show table header - echo ''; + echo '
'; echo ''; echo ''; echo ''; @@ -149,8 +149,7 @@ $contador--; } - echo "
' . $lang_label["user"] . '' . $lang_label["action"] . '' . $lang_label["date"] . '
"; - echo "
"; + echo ""; echo ""; // activity echo ''; // class "jus" diff --git a/pandora_console/godmode/alerts/configure_alert.php b/pandora_console/godmode/alerts/configure_alert.php index 7ed53ef27f..5b22ec872f 100644 --- a/pandora_console/godmode/alerts/configure_alert.php +++ b/pandora_console/godmode/alerts/configure_alert.php @@ -73,7 +73,7 @@ echo ""; echo ""; } ?> - +
@@ -82,7 +82,7 @@ echo "";
-  +  Macros:
_field1_
_field2_
diff --git a/pandora_console/godmode/db/db_info_data.php b/pandora_console/godmode/db/db_info_data.php index 7daf1ccad0..78825687b7 100644 --- a/pandora_console/godmode/db/db_info_data.php +++ b/pandora_console/godmode/db/db_info_data.php @@ -34,8 +34,9 @@ if (comprueba_login() == 0) echo "

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

"; - echo ""; - echo ""; + echo "
".$lang_label["agent_name"]."
"; + echo " + "; echo ""; echo ""; $color=0; @@ -60,13 +61,15 @@ if (comprueba_login() == 0) $tdcolor = "datos2"; $color = 1; } - echo " + "; + echo ""; + echo ""; flush(); //ob_flush(); } - echo "
".$lang_label["agent_name"]."".$lang_label["assigned_module"]."".$lang_label["total_data"]."
".dame_nombre_agente($row2[0]).""; - echo "".$row3c[0]; - echo "".$total_agente; + echo "
+ ".dame_nombre_agente($row2[0])."".$row3c[0]."".$total_agente."
"; + echo "
"; } else { audit_db($id_user,$REMOTE_ADDR, "ACL Violation","Trying to access Database Management Info data"); diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index d9aa0751ec..1adb1d81a4 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -63,7 +63,7 @@ if (comprueba_login() == 0){ echo ''; if (isset($_GET["sec"]) && $_GET["sec"] == "gmodules"){ - if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/modules/manage_nc_groups") + if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/modules/manage_nc_groups" || $_GET["sec2"] == "godmode/modules/manage_nc_groups_form") echo "
"; else echo "
"; diff --git a/pandora_console/godmode/modules/manage_nc_groups_form.php b/pandora_console/godmode/modules/manage_nc_groups_form.php index 3530056029..1af758ef23 100644 --- a/pandora_console/godmode/modules/manage_nc_groups_form.php +++ b/pandora_console/godmode/modules/manage_nc_groups_form.php @@ -50,7 +50,7 @@ if (isset($_GET["edit"])){ // Edit mode } echo "

".$lang_label["network_component_group_management"]."

"; -echo ''; +echo '
'; // Different Form url if it's a create or if it's a update form if ($id_sg != -1) diff --git a/pandora_console/godmode/modules/manage_network_components_form.php b/pandora_console/godmode/modules/manage_network_components_form.php index db2bc4d1c5..6bcc77b718 100644 --- a/pandora_console/godmode/modules/manage_network_components_form.php +++ b/pandora_console/godmode/modules/manage_network_components_form.php @@ -184,7 +184,7 @@ if (isset($_GET["update"])){ // Edit mode } echo "

".$lang_label["network_component_management"]."

"; -echo '
'; +echo '
'; // Different Form url if it's a create or if it's a update form if ($id_nc != -1) { diff --git a/pandora_console/godmode/modules/manage_network_templates_form.php b/pandora_console/godmode/modules/manage_network_templates_form.php index a921e20acd..326fd947f1 100644 --- a/pandora_console/godmode/modules/manage_network_templates_form.php +++ b/pandora_console/godmode/modules/manage_network_templates_form.php @@ -104,7 +104,7 @@ if (isset($_GET["update"])){ // Update profile echo "

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

"; -echo "
"; +echo "
"; if ($id_np == -1) echo ''; diff --git a/pandora_console/godmode/reporting/graph_builder.php b/pandora_console/godmode/reporting/graph_builder.php index 098bac120e..d8f44918a0 100644 --- a/pandora_console/godmode/reporting/graph_builder.php +++ b/pandora_console/godmode/reporting/graph_builder.php @@ -207,7 +207,7 @@ if (isset($chunk1)) { if (isset($period)) echo ""; - echo "
"; + echo "
"; echo " @@ -231,10 +231,12 @@ if (isset($chunk1)) { echo dame_nombre_modulo_agentemodulo($module_array[$a]).""; echo ""; - echo ""; + echo ""; } - echo "
".$lang_label["agent"]." ".$lang_label["module"].""; echo $weight_array[$a].""; - echo "
"; + echo "
"; + echo "
"; + echo ""; + echo "
"; echo "
"; echo ""; } @@ -245,7 +247,7 @@ if (isset($chunk1)) { if (($render == 1) && (isset($modules))) { // parse chunk echo "

".$lang_label["combined_image"]."

"; - echo ""; + echo "
"; echo "
"; echo ""; echo "
"; @@ -261,7 +263,7 @@ if ( (!isset($_GET["add_module"]))){ } else { echo "

".$lang_label["graph_builder"]."

"; } -echo ""; +echo "
"; echo ""; if (isset($period)) @@ -275,11 +277,11 @@ echo ""; echo "
'; if (isset($chunkdata)) @@ -302,13 +304,13 @@ echo "
"; echo "".$lang_label["modules"].""; echo ""; echo ""; @@ -425,11 +427,12 @@ if ($alerts == 1){ } echo ""; */ - -echo "
"; +echo "
"; +echo ""; +echo "
"; echo ""; -echo "
"; +echo ""; // ----------------------- // STORE GRAPH FORM @@ -438,7 +441,7 @@ echo ""; // If we have something to save.. if (isset($module_array)){ echo "

".$lang_label["graph_store"]."

"; - echo ""; + echo "
"; echo ""; // hidden fields with data begin @@ -457,24 +460,25 @@ if (isset($module_array)){ // hidden fields end echo ""; - echo ""; echo ""; echo ""; echo ""; echo ""; echo ""; - echo ""; echo ""; echo "
".$lang_label["name"]; + echo "".$lang_label["name"].""; - echo "".$lang_label["private"]; + echo "".$lang_label["private"].""; - + echo "
".$lang_label["description"]; + echo "".$lang_label["description"].""; - - echo "
"; + echo "
"; + echo ""; + echo ""; echo ""; echo ""; - // echo ""; - //echo ""; - //echo ""; echo ""; echo ""; $color=1; @@ -210,7 +207,7 @@ if (comprueba_login() == 0) { echo "+1 ".$lang_label["day"]; } else 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 b85d408ff6..5fa1c46461 100644 --- a/pandora_console/godmode/servers/manage_recontask.php +++ b/pandora_console/godmode/servers/manage_recontask.php @@ -93,7 +93,7 @@ $query="SELECT * FROM trecon_task"; $result=mysql_query($query); $color=1; if (mysql_num_rows($result)){ - echo ""; + echo "
"; echo ""; } -if (mysql_num_rows($result)){ - echo ''; -} else { +echo "
".$lang_label["name"]; echo "".$lang_label['type']; echo "".$lang_label['network']; @@ -130,51 +130,51 @@ while ($row=mysql_fetch_array($result)){ echo ""; echo "$name"; - echo ""; + echo ""; if ($type ==1) echo "ICMP"; // Network - echo ""; + echo ""; echo $network; // Network profile name - echo ""; + echo ""; echo "".give_network_profile_name($id_network_profile).""; // GROUP - echo ""; - echo ""; + echo ""; + echo ""; // INCIDENT - echo ""; + echo ""; if ($create_incident == 1) echo $lang_label["yes"]; else echo $lang_label["no"]; // INTERVAL - echo ""; + echo ""; echo $interval; // Recon server - echo ""; + echo ""; echo "".give_server_name($id_network_server).""; // Network server assigned - echo ""; + echo ""; echo "".give_server_name($id_network_server_assigned)."";; // ACTION - echo ""; - + echo "
"; +if (!mysql_num_rows($result)){ echo "
".$lang_label["no_rtask"]."
"; echo ""; +} else { + echo "
"; } -echo "
"; + +echo "
"; echo "
"; -echo ""; +echo ""; echo "
"; ?> diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php index 630fc96f8a..baa66b48f1 100644 --- a/pandora_console/godmode/servers/modificar_server.php +++ b/pandora_console/godmode/servers/modificar_server.php @@ -66,8 +66,8 @@ if (comprueba_login() == 0) { $master = $row["master"]; $checksum = $row["checksum"]; $description = $row["description"]; - echo '
'; - echo ""; + echo ''; + echo "
"; echo ""; echo "
".$lang_label["name"].""; echo "
".$lang_label['ip_address'].""; @@ -90,21 +90,17 @@ if (comprueba_login() == 0) { // Connect DataBase $result=mysql_query($sql); - if (mysql_num_rows($result)){ - echo ""; - echo "
".$lang_label["name"]; - echo "".$lang_label['status']; - echo "".$lang_label['ip_address']; - echo "".$lang_label['description']; - echo "".$lang_label['network']; - echo "".$lang_label['data']; - echo "".$lang_label['snmp']; - echo "".$lang_label['master']; - echo "".$lang_label['checksum']; - echo "".$lang_label['laststart']; - echo "".$lang_label['lastupdate']; - echo "".$lang_label['delete']; - $color=1; + if (mysql_num_rows($result)){ + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + $color=1; while ($row=mysql_fetch_array($result)){ $name = $row["name"]; $address = $row["ip_address"]; @@ -128,41 +124,59 @@ if (comprueba_login() == 0) { $color = 1; } echo ""; + echo ""; + echo ""; } - echo '
".$lang_label["name"]."".$lang_label['status']."".$lang_label['ip_address']."".$lang_label['description']."".$lang_label['type']."".$lang_label['laststart']."".$lang_label['lastupdate']."".$lang_label['delete']."
"; - echo "$name"; - echo ""; + echo "$name"; + echo ""; if ($status ==0){ echo ""; } else { echo ""; } - echo ""; + echo ""; echo "$address"; - echo "".substr($description,0,25); - echo ""; + echo "".substr($description,0,25); + echo ""; if ($network_server == 1){ - echo ""; - } - echo ""; + echo "  "; + } if ($data_server == 1){ - echo ""; - } - echo ""; + echo "  "; + } if ($snmp_server == 1){ - echo ""; - } - echo ""; + echo "  "; + } if ($master == 1){ - echo ""; - } - echo ""; + echo "  "; + } if ($checksum == 1){ - echo ""; + echo "  "; } - echo "".substr($keepalive,0,25); - echo "".substr($laststart,0,25); - echo ""; + echo "".substr($keepalive,0,25)."".substr($laststart,0,25)." + +
'; + echo '
'; + echo ""; + echo " + + + + + + + "; + echo "
+ ".$lang_label["network_server"]." + + ".$lang_label["master"]." + + ".$lang_label["data_server"]." + + ".$lang_label["md5_checksum"]." + + ".$lang_label["snmp_console"]." +
"; } else { echo "
".$lang_label["no_server"]."
"; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 77b450d4de..2bfb5fc2c9 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -375,13 +375,6 @@ td.datos_jus, td.datos2_jus { .redb, .greenb, td.datos_id, td.datos2_id, f9b { font-weight: bold; } -.raya { - border-top: 1px solid #786; - width: 100%; -} -.raya, .noraya { - margin-bottom: -10px; -} .p10 { padding-top: 1px; padding-bottom: 0px; diff --git a/pandora_console/include/styles/tip.css b/pandora_console/include/styles/tip.css index 90c57baa43..99ba0e4900 100644 --- a/pandora_console/include/styles/tip.css +++ b/pandora_console/include/styles/tip.css @@ -31,7 +31,8 @@ a.tip:hover { } a.tip2:hover { text-decoration: none; - background-color: #e6e9cd; +/* background-color: #e6e9cd;*/ + background-color: #efefef } a.tipp:hover { text-decoration: none; diff --git a/pandora_console/operation/agentes/exportdata.php b/pandora_console/operation/agentes/exportdata.php index 6fde8128a1..b125ba85a0 100644 --- a/pandora_console/operation/agentes/exportdata.php +++ b/pandora_console/operation/agentes/exportdata.php @@ -53,8 +53,10 @@ function generate_average_table ($id_de_mi_agente, $id_agente_modulo, $fecha_ini // Table header echo ""; - echo ""; - echo ""; + echo " + "; + echo " + "; echo ""; for ($dia=0;$dia<7;++$dia) echo ""; @@ -72,11 +74,11 @@ function generate_average_table ($id_de_mi_agente, $id_agente_modulo, $fecha_ini for ($dia=0; $dia<7; ++$dia){ echo ""; + echo ""; } echo ""; } - echo "
".$lang_label["hour"]."".$lang_label["day"]."
".$lang_label["hour"]."".$lang_label["day"]."
".$dias_de_la_semana[$dia].""; echo format_numeric (give_average_from_module ($id_de_mi_agente, $id_agente_modulo, $hora, $dia, $fecha_inicio, $fecha_fin)); - echo "
"; + echo "
"; } // ---------------------------------- @@ -184,7 +186,10 @@ if ((isset($_POST["export"])) AND (! isset($_POST["update_agent"]))){ echo $lang_label["db_agent_bra"]. "" . dame_nombre_agente($origen). "- $agentmodule_name". $lang_label["from2"]. "". $from_date. "". $lang_label["to2"]. "". $to_date. "
"; echo "
"; - echo ""; + echo " + + + "; // Begin the render ! for ($a=0; $a  ".$lang_label["help"].""; echo ''; - echo '
".$lang_label["module"]."".$lang_label["data"]."Timestamp
".$lang_label["module"]."".$lang_label["data"]."Timestamp
'; + echo '
'; echo ''; - echo ""; echo "'; echo "
".$lang_label["source_agent"]."

"; + echo "		".$lang_label["source_agent"].""; // Show combo with agents echo '   "; - echo "

"; + echo ""; echo '
"; - echo "".$lang_label["modules"]."

"; + echo "".$lang_label["modules"].""; echo "		"; // Combo with modules @@ -290,7 +295,7 @@ if ((isset($_POST["export"])) AND (! isset($_POST["update_agent"]))){ echo ""; } echo ""; @@ -313,14 +318,14 @@ if ((isset($_POST["export"])) AND (! isset($_POST["update_agent"]))){ echo ""; // Combo for data export type echo ""; echo "
"; // Submit button - echo ""; + echo "
"; echo "
"; echo ""; echo "
"; diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php index 36b1de630d..41b51f74da 100644 --- a/pandora_console/operation/agentes/tactical.php +++ b/pandora_console/operation/agentes/tactical.php @@ -32,7 +32,8 @@ require ("general/noaccess.php"); exit; } - echo "

".$lang_label["tactical_view"]."

"; + echo "

".$lang_label["ag_title"]." > "; + echo $lang_label["tactical_view"]."

"; /* @@ -155,29 +156,29 @@ echo "
"; echo ""; echo ""; - echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; echo ""; echo ""; echo "
".$lang_label["monitor_checks"]."
"."Monitor checks"; - echo "".$monitor_checks; - echo "
"."Monitor OK"; - echo "".$monitor_ok; - echo "
"."Monitor BAD"; - echo ""; + echo "
"."Monitor checks"."".$monitor_checks."
"."Monitor OK"."".$monitor_ok."
"."Monitor BAD".""; if ($monitor_bad > 0) echo $monitor_bad; else echo "-"; - echo "
"."Monitor Unknown"; + echo "
"."Monitor Unknown".""; if ($monitor_unknown > 0) echo $monitor_unknown; else echo "-"; - echo "
"."Alerts Fired"; + echo "
"."Alerts Fired".""; if ($monitor_alert > 0) echo $monitor_alert; else echo "-"; - echo "
"."Alerts Total"; + echo "
"."Alerts Total"."".$monitor_alert_total; echo "
"; @@ -185,42 +186,42 @@ // ~~~~~~~~~~~~~~~ echo ""; echo ""; - echo ""; echo ""; echo ""; + echo "
".$lang_label["data_checks"]."
"."Data checks"; + echo "
"."Data checks"."".$data_checks; - echo "
"."Data Unknown"; + echo "
"."Data Unknown".""; if ($data_unknown > 0) echo $data_unknown; else echo "-"; - echo "
"."Alerts Fired"; - echo ""; + echo "
"."Alerts Fired".""; if ($data_alert > 0) echo $data_alert; else echo "-"; echo "
"."Alerts Total"; - echo "".$data_alert_total; + echo "".$data_alert_total; echo "
"; // Summary // ~~~~~~~~~~~~~~~ echo ""; - echo ""; - echo ""; + echo ""; + echo ""; + echo "
".$lang_label["summary"]."
"."Total agents"; - echo "".$total_agents; - echo "
"."Total checks"; - echo "".$total_checks; + echo "".$lang_label["summary"]."
"."Total agents"."".$total_agents; + echo "
"."Total checks"."".$total_checks; echo "
"; - echo "		"; + echo ""; // Odometer Graph // ~~~~~~~~~~~~~~~ $monitor_health = format_numeric ((($monitor_ok - $monitor_alert - $monitor_unknown)/ $monitor_checks) * 100,1); $data_health = format_numeric ( (($data_checks -($data_unknown + $data_alert)) / $data_checks ) * 100,1);; $global_health = format_numeric( ((($monitor_ok -$monitor_alert - $monitor_unknown )+($data_checks -($data_unknown + $data_alert))) / ($data_checks + $monitor_checks) ) * 100, 1); - echo "

".$lang_label["tactical_indicator"]."

"; + echo "

".$lang_label["tactical_indicator"]."

"; echo ""; diff --git a/pandora_console/operation/servers/view_server.php b/pandora_console/operation/servers/view_server.php index 6a2eee67d4..03d781bb30 100644 --- a/pandora_console/operation/servers/view_server.php +++ b/pandora_console/operation/servers/view_server.php @@ -57,9 +57,6 @@ if (comprueba_login() == 0) { echo "		".$lang_label['lag']."".$lang_label['description']."".$lang_label['type']."".$lang_label['master']."".$lang_label['checksum']."".$lang_label['laststart']."".$lang_label['version']."".$lang_label['lastupdate']."".substr($description,0,25); + echo "".substr($description,0,25).""; if ($network_server == 1){ echo " "; @@ -230,16 +227,14 @@ if (comprueba_login() == 0) { if ($checksum == 1){ echo "  "; } - //echo "" - //.substr($laststart,0,25).""; + echo ""; echo $version; - echo ""; + echo ""; // if ($status ==0) echo substr($keepalive,0,25)."
'; + echo ''; echo ""; echo " diff --git a/pandora_console/operation/snmpconsole/snmp_alert.php b/pandora_console/operation/snmpconsole/snmp_alert.php index c3a287edf2..00ccb1db4d 100644 --- a/pandora_console/operation/snmpconsole/snmp_alert.php +++ b/pandora_console/operation/snmpconsole/snmp_alert.php @@ -214,7 +214,7 @@ if (give_acl($id_user, 0, "LW")==1) { echo $lang_label["snmp_assigned_alerts"]." ".$lang_label["help"].""; if (mysql_num_rows($result)){ - echo '
'; + echo '
'; echo '"; echo '"; echo '"; @@ -253,7 +253,7 @@ if (give_acl($id_user, 0, "LW")==1) { echo ""; } - echo ""; - echo "
'.$lang_label["alert"]."'.$lang_label["alert_type"]."'.$lang_label["SNMP_agent"]."
"; echo $nombre_alerta; - echo ""; + echo ""; if ($alert_type == 0) { $tipo_alerta = $lang_label["OID"]; } elseif ($alert_type == 1) { @@ -264,43 +264,46 @@ if (give_acl($id_user, 0, "LW")==1) { $tipo_alerta = "N/A"; } echo $tipo_alerta; - echo ""; + echo ""; if ($alert_type == 2) { echo $agent; } else { echo "N/A"; } - echo ""; + echo ""; if ($alert_type == 0) { echo $oid; } else { echo "N/A"; } - echo ""; + echo ""; if ($alert_type == 1) { echo $custom_oid; } else { echo "N/A"; } - echo ""; + echo ""; echo $description; - echo ""; + echo ""; echo $times_fired; - echo ""; + echo ""; if ($last_fired != "0000-00-00 00:00:00") echo $last_fired; else echo $lang_label["never"]; - echo ""; - echo "".$lang_label["delete"]."   "; - echo "".$lang_label["update"].""; + echo ""; + echo " + ".$lang_label["delete"]."   "; + echo " + ".$lang_label["update"]."
"; + echo "
"; + echo ""; + echo "
"; echo ''; echo ''; echo ""; diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php index 5617d5623e..cffb9fa7ed 100644 --- a/pandora_console/operation/snmpconsole/snmp_view.php +++ b/pandora_console/operation/snmpconsole/snmp_view.php @@ -188,7 +188,7 @@ if (comprueba_login() == 0) { $offset=0; } echo "
"; - echo ""; + echo "
"; echo ""; echo ""; echo ""; @@ -200,7 +200,8 @@ if (comprueba_login() == 0) { echo ""; echo "'; + echo ' + '; echo ""; $id_trap = 0; if ($offset !=0) @@ -255,15 +256,15 @@ if (comprueba_login() == 0) { } } } - echo ""; + echo "
".$lang_label["status"]."".$lang_label["OID"]."".$lang_label["action"].""; echo ""; - echo '
"; $offset_counter = 0; - echo "
"; + echo "
"; echo " "; if (give_acl($id_usuario, 0,"IM") ==1){ echo ""; } - echo "
"; + echo "
"; } else { echo "
".$lang_label["no_snmp_agent"]."
"; diff --git a/pandora_console/reporting/fgraph.php b/pandora_console/reporting/fgraph.php index 05fe1fe382..13a44c5448 100644 --- a/pandora_console/reporting/fgraph.php +++ b/pandora_console/reporting/fgraph.php @@ -2000,4 +2000,4 @@ if (isset($_GET["tipo"])){ graphic_error (); } else graphic_error (); -?> +?> \ No newline at end of file