tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2009-02-04 Ramon Novoa <rnovoa@artica.es> 

* include/functions_db.php,
          godmode/snmpconsole/snmp_alert.php: Fixed SNMP alerts.

        * operation/snmpconsole/snmp_view.php: Show Custom OID as a tooltip.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1424 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2009-02-04 18:47:59 +00:00
parent e7db8d22d2
commit 6965af931f
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2009-02-04 Ramon Novoa <rnovoa@artica.es>
* include/functions_db.php,
godmode/snmpconsole/snmp_alert.php: Fixed SNMP alerts.
* operation/snmpconsole/snmp_view.php: Show Custom OID as a tooltip.
2009-02-04 Esteban Sanchez <estebans@artica.es> 2009-02-04 Esteban Sanchez <estebans@artica.es>
* general/main_menu.php: The menu has been rewritten to be more * general/main_menu.php: The menu has been rewritten to be more

4
pandora_console/godmode/snmpconsole/snmp_alert.php
View File

@ -148,13 +148,13 @@ if (isset ($_GET["update_alert"])) {
echo '<tr><td class="datos">'.__('Alert type').'</td><td class="datos">'; echo '<tr><td class="datos">'.__('Alert type').'</td><td class="datos">';
$fields = array (); $fields = array ();
$result = get_db_all_rows_in_table ("talerta", "nombre"); $result = get_db_all_rows_in_table ("talert_templates", "name");
if ($result === false) { if ($result === false) {
$result = array (); $result = array ();
} }
foreach ($result as $row) { foreach ($result as $row) {
$fields[$row["id_alerta"]] = $row["nombre"]; $fields[$row["id"]] = $row["name"];
} }
print_select ($fields, "alert_type", $alert_type, '', '', '0', false, false, false); print_select ($fields, "alert_type", $alert_type, '', '', '0', false, false, false);

2
pandora_console/include/functions_db.php
View File

@ -511,7 +511,7 @@ function get_agent_name ($id_agent, $case = "upper") {
* @return string Type name of the alert. * @return string Type name of the alert.
*/ */
function get_alert_type ($id_type) { function get_alert_type ($id_type) {
return (string) get_db_value ('nombre', 'talerta', 'id_alerta', (int) $id_type); return (string) get_db_value ('name', 'talert_templates', 'id', (int) $id_type);
} }
/** /**

2
pandora_console/operation/snmpconsole/snmp_view.php
View File

@ -309,7 +309,7 @@ foreach ($traps as $trap) {
} }
//Custom //Custom
$data[4] = $trap["value_custom"]; $data[4] = '<span title="' . $trap["oid_custom"] . '">' . $trap["value_custom"] . '</span>';
if (empty ($data[4])) { if (empty ($data[4])) {
$data[4] = __('N/A'); $data[4] = __('N/A');