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

Merge pull request #1353 from laf/issue-1348

Browse Source 
Now save the connection value selected and remove when not needed
This commit is contained in:
Daniel Preussker
2015-07-08 12:17:48 +00:00
parent 07ffef960d 4bef35c90a
commit 0dfd0dfb0f
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/forms/create-device-group.inc.php
-2
View File
@@ -23,8 +23,6 @@ $desc = mres($_POST['desc']);
if( is_array($pattern) ) {
$pattern = implode(" ", $pattern);
$pattern = rtrim($pattern,'&&');
$pattern = rtrim($pattern,'||');
} elseif( !empty($_POST['pattern']) && !empty($_POST['condition']) && !empty($_POST['value']) ) {
$pattern = '%'.$_POST['pattern'].' '.$_POST['condition'].' ';
if( is_numeric($_POST['value']) ) {
html/forms/parse-device-group.inc.php
+5 -1
View File
@@ -22,7 +22,11 @@ if(is_numeric($group_id) && $group_id > 0) {
$group = dbFetchRow("SELECT * FROM `device_groups` WHERE `id` = ? LIMIT 1",array($group_id));
$group_split = preg_split('/([a-zA-Z0-9_\-\.\=\%\<\>\ \"\'\!\~\(\)\*\/\@\[\]]+[&&\|\|]+)/',$group['pattern'], -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
$count = count($group_split) - 1;
$group_split[$count] = $group_split[$count].' &&';
if (preg_match("/\&\&$/",$group_split[$count]) == 1 || preg_match("/\|\|$/", $group_split[$count]) == 1) {
$group_split[$count] = $group_split[$count];
} else {
$group_split[$count] = $group_split[$count].' &&';
}
$output = array('name'=>$group['name'],'desc'=>$group['desc'],'pattern'=>$group_split);
echo _json_encode($output);
}
includes/device-groups.inc.php
+2
View File
@@ -63,6 +63,8 @@ function GenGroupSQL($pattern,$search='') {
*/
function GetDevicesFromGroup($group_id) {
$pattern = dbFetchCell("SELECT pattern FROM device_groups WHERE id = ?",array($group_id));
$pattern = rtrim($pattern,'&&');
$pattern = rtrim($pattern,'||');
if( !empty($pattern) ) {
return dbFetchRows(GenGroupSQL($pattern));
}