rdp-racktables-filter.diff (3,135 bytes)
diff --git a/wwwroot/inc/install.php b/wwwroot/inc/install.php
index dbf0278..d22e590 100644
--- a/wwwroot/inc/install.php
+++ b/wwwroot/inc/install.php
@@ -1629,6 +1629,7 @@ INSERT INTO `Config` (varname, varvalue, vartype, emptyok, is_hidden, is_userdef
('PORT_EXCLUSION_LISTSRC','{\$typeid_3} or {\$typeid_10} or {\$typeid_11} or {\$typeid_1505} or {\$typeid_1506}','string','yes','no','no','List source: objects without ports'),
('FILTER_RACKLIST_BY_TAGS','yes','string','yes','no','yes','Rackspace: show only racks matching the current object\'s tags'),
('SSH_OBJS_LISTSRC','false','string','yes','no','yes','Rackcode filter for SSH-managed objects'),
+('RDP_OBJS_LISTSRC','false','string','yes','no','yes','Rackcode filter for RDP-managed objects'),
('TELNET_OBJS_LISTSRC','false','string','yes','no','yes','Rackcode filter for telnet-managed objects'),
('SYNC_802Q_LISTSRC','','string','yes','no','no','List of VLAN switches sync is enabled on'),
('QUICK_LINK_PAGES','depot,ipv4space,rackspace','string','yes','no','yes','List of pages to dislay in quick links'),
diff --git a/wwwroot/inc/interface.php b/wwwroot/inc/interface.php
index 40ca19f..1ce2c42 100644
--- a/wwwroot/inc/interface.php
+++ b/wwwroot/inc/interface.php
@@ -8128,8 +8128,9 @@ function formatAttributeValue ($record)
if ($record['id'] == 3) // FQDN attribute
{
$protos_to_try = array (
- 'ssh' => 'SSH_OBJS_LISTSRC',
+ 'ssh' => 'SSH_OBJS_LISTSRC',
'telnet' => 'TELNET_OBJS_LISTSRC',
+ 'rdp' => 'RDP_OBJS_LISTSRC',
);
foreach ($protos_to_try as $proto => $cfgvar)
if (considerConfiguredConstraint (NULL, $cfgvar))
diff --git a/wwwroot/inc/ophandlers.php b/wwwroot/inc/ophandlers.php
index 7412fb5..84c47ee 100644
--- a/wwwroot/inc/ophandlers.php
+++ b/wwwroot/inc/ophandlers.php
@@ -1465,6 +1465,7 @@ function resetUIConfig()
setConfigVar ('PORT_EXCLUSION_LISTSRC', '{$typeid_3} or {$typeid_10} or {$typeid_11} or {$typeid_1505} or {$typeid_1506}');
setConfigVar ('FILTER_RACKLIST_BY_TAGS', 'yes');
setConfigVar ('SSH_OBJS_LISTSRC', 'false');
+ setConfigVar ('RDP_OBJS_LISTSRC', 'false');
setConfigVar ('TELNET_OBJS_LISTSRC', 'false');
setConfigVar ('SYNC_802Q_LISTSRC', '');
setConfigVar ('QUICK_LINK_PAGES', 'depot,ipv4space,rackspace');
diff --git a/wwwroot/inc/upgrade.php b/wwwroot/inc/upgrade.php
index 86088d6..070b0e7 100644
--- a/wwwroot/inc/upgrade.php
+++ b/wwwroot/inc/upgrade.php
@@ -1650,6 +1650,9 @@ CREATE TABLE `MuninGraph` (
$query[] = "INSERT INTO `Config` (varname, varvalue, vartype, emptyok, is_hidden, is_userdefined, description) VALUES ('NEAREST_RACKS_CHECKBOX', 'yes', 'string', 'yes', 'no', 'yes', 'Enable nearest racks in port list filter by default')";
$query[] = "UPDATE Config SET varvalue = '0.20.4' WHERE varname = 'DB_VERSION'";
break;
+ case '0.20.5':
+ $query[] = "INSERT INTO `Config` (varname, varvalue, vartype, emptyok, is_hidden, is_userdefined, description) VALUES ('RDP_OBJS_LISTSRC','false','string','yes','no','yes','Rackcode filter for RDP-managed objects')";
+ break;
case 'dictionary':
$query = reloadDictionary();
break;
