mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove external uses of GenGroupSQL()

Browse Source
This commit is contained in:
Tony Murray
2016-09-18 19:08:33 -05:00
parent b8d085202d
commit c48b71d0af
3 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
html/includes/print-map.inc.php
View File

@@ -40,14 +40,10 @@ $devices = array();
$where = "";
if (is_numeric($vars['group'])) {
$group_pattern = dbFetchCell('SELECT `pattern` FROM `device_groups` WHERE id = '.$vars['group']);
$group_pattern = rtrim($group_pattern, '&&');
$group_pattern = rtrim($group_pattern, '||');
$device_id_sql = GenGroupSQL($group_pattern);
if ($device_id_sql) {
$where .= " AND D1.device_id IN ($device_id_sql) OR D2.device_id IN ($device_id_sql)";
}
$where .= " AND D1.device_id IN (SELECT `device_id` FROM `device_group_device` WHERE `device_group_id` = ?)";
$sql_array[] = $vars['group'];
$where .= " OR D2.device_id IN (SELECT `device_id` FROM `device_group_device` WHERE `device_group_id` = ?)";
$sql_array[] = $vars['group'];
}
if (in_array('mac', $config['network_map_items'])) {

10
html/includes/table/alerts.inc.php
View File

@@ -50,14 +50,8 @@ if (isset($_POST['min_severity'])) {
}
if (is_numeric($_POST['group'])) {
$group_pattern = dbFetchCell('SELECT `pattern` FROM `device_groups` WHERE id = '.$_POST['group']);
$group_pattern = rtrim($group_pattern, '&&');
$group_pattern = rtrim($group_pattern, '||');
$device_id_sql = GenGroupSQL($group_pattern);
if ($device_id_sql) {
$where .= " AND devices.device_id IN ($device_id_sql)";
}
$where .= " AND devices.device_id IN (SELECT `device_id` FROM `device_group_device` WHERE `device_group_id` = ?)";
$param[] = $_POST['group'];
}
if (!$show_recovered) {

2
includes/device-groups.inc.php
View File

@@ -74,7 +74,7 @@ function EditDeviceGroup($group_id, $name = null, $desc = null, $pattern = null)
* Generate SQL from Group-Pattern
* @param string $pattern Pattern to generate SQL for
* @param string $search What to searchid for
* @return string
* @return string sql to perform the search
*/
function GenGroupSQL($pattern, $search = '', $extra = 0)
{