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

2013-08-09 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/snmpconsole/snmp_alert.php: fixed the link to edit in the
	button to edit, and fixed the free text filter.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8650 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-08-09 06:38:57 +00:00
parent e487a60e0b
commit c7d06fb0fb
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2013-08-09 Miguel de Dios <miguel.dedios@artica.es>
* godmode/snmpconsole/snmp_alert.php: fixed the link to edit in the
button to edit, and fixed the free text filter.
2013-08-08 Koichiro Kikuchi <koichiro@rworks.jp>
* index.php: Fixed footer layout probrems: Now we can see the

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

@ -619,29 +619,27 @@ else {
}
if (!empty($free_search)) {
$where_sql .= " AND (`single_value` = '" . $free_search . "'
OR `_snmp_f10_` = '" . $free_search . "'
OR `_snmp_f9_` = '" . $free_search . "'
OR `_snmp_f8_` = '" . $free_search . "'
OR `_snmp_f7_` = '" . $free_search . "'
OR `_snmp_f6_` = '" . $free_search . "'
OR `_snmp_f5_` = '" . $free_search . "'
OR `_snmp_f4_` = '" . $free_search . "'
OR `_snmp_f3_` = '" . $free_search . "'
OR `_snmp_f2_` = '" . $free_search . "'
OR `_snmp_f1_` = '" . $free_search . "'
OR `oid` = '" . $free_search . "'
OR `custom_oid` = '" . $free_search . "'
OR `agent` = '" . $free_search . "'
OR `description` = '" . $free_search . "')";
$where_sql .= " AND (`single_value` LIKE '%" . $free_search . "%'
OR `_snmp_f10_` LIKE '%" . $free_search . "%'
OR `_snmp_f9_` LIKE '%" . $free_search . "%'
OR `_snmp_f8_` LIKE '%" . $free_search . "%'
OR `_snmp_f7_` LIKE '%" . $free_search . "%'
OR `_snmp_f6_` LIKE '%" . $free_search . "%'
OR `_snmp_f5_` LIKE '%" . $free_search . "%'
OR `_snmp_f4_` LIKE '%" . $free_search . "%'
OR `_snmp_f3_` LIKE '%" . $free_search . "%'
OR `_snmp_f2_` LIKE '%" . $free_search . "%'
OR `_snmp_f1_` LIKE '%" . $free_search . "%'
OR `oid` LIKE '%" . $free_search . "%'
OR `custom_oid` LIKE '%" . $free_search . "%'
OR `agent` LIKE '%" . $free_search . "%'
OR `description` LIKE '%" . $free_search . "%')";
}
$count = db_get_value_sql('SELECT COUNT(*)
FROM talert_snmp WHERE' . $where_sql);
$result = array();
//Overview
@ -723,7 +721,11 @@ else {
$data[7] = __('Never');
}
$data[8] = '<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&update_alert='.$row["id_as"].'">' .
$data[8] = '<a href="index.php?' .
'sec=snmpconsole&' .
'sec2=godmode/snmpconsole/snmp_alert&' .
'update_alert=1&'.
'id_alert_snmp='.$row["id_as"].'">' .
html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>' .
'&nbsp;&nbsp;<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_alert='.$row["id_as"].'">' .
html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))) . '</a>';