r2883 - generateEntityAutoTags(): don't generate {$tagless} in 'user' realm; generat...

diff --git a/ChangeLog b/ChangeLog
index 62feeffefc2f0424395eca3127ca55a70e1d5e52..c716d1d6ec6c51ab3259a2b7c03652e6c77f9827 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 0.17.2
        new feature: configure default SNMP community (by jthurman)
-       new feature: "$untagged" autotag
+       new feature: "$untagged" and "$masklen_NN" autotags
        update: show appropriate message, if a record cannot be found
        update: add Cisco dictionary entry for WS-CBS3030-DEL. closes ticket 225 (by jthurman)
        update: add OS, router, fibre switch dictionary entries for ticket 238 (by Aaron)

diff --git a/inc/functions.php b/inc/functions.php
index ef157b26c8c7366fabc7dcfc5b90e5207a5f0683..98b1b1537862d6a8380381e4492433ae48cba0fe 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -957,7 +957,7 @@ function generateEntityAutoTags ($cell)
                        $ret[] = array ('tag' => '$rackid_' . $cell['id']);
                        $ret[] = array ('tag' => '$any_rack');
                        break;
-               case 'object': // during transition bypass is already the whole structure
+               case 'object':
                        $ret[] = array ('tag' => '$id_' . $cell['id']);
                        $ret[] = array ('tag' => '$typeid_' . $cell['objtype_id']);
                        $ret[] = array ('tag' => '$any_object');
@@ -966,9 +966,10 @@ function generateEntityAutoTags ($cell)
                        if (!strlen ($cell['rack_id']))
                                $ret[] = array ('tag' => '$unmounted');
                        break;
-               case 'ipv4net': // during transition bypass is already the whole structure
+               case 'ipv4net':
                        $ret[] = array ('tag' => '$ip4netid_' . $cell['id']);
                        $ret[] = array ('tag' => '$ip4net-' . str_replace ('.', '-', $cell['ip']) . '-' . $cell['mask']);
+                       $ret[] = array ('tag' => '$masklen_' . $cell['mask']);
                        $ret[] = array ('tag' => '$any_ip4net');
                        $ret[] = array ('tag' => '$any_net');
                        break;
@@ -996,8 +997,21 @@ function generateEntityAutoTags ($cell)
                default: // HCF!
                        break;
        }
-       if (!count ($cell['etags']))
-               $ret[] = array ('tag' => '$untagged');
+       // {$tagless} doesn't apply to users
+       switch ($cell['realm'])
+       {
+               case 'rack':
+               case 'object':
+               case 'ipv4net':
+               case 'ipv4vs':
+               case 'ipv4rspool':
+               case 'file':
+                       if (!count ($cell['etags']))
+                               $ret[] = array ('tag' => '$untagged');
+                       break;
+               default:
+                       break;
+       }
        return $ret;
 }