r2879 - pull {$untagged} into trunk

diff --git a/ChangeLog b/ChangeLog
index 5d35bfb968e3e345790f063bfad1b02f26f96421..62feeffefc2f0424395eca3127ca55a70e1d5e52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 0.17.2
        new feature: configure default SNMP community (by jthurman)
+       new feature: "$untagged" autotag
        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/code.php b/inc/code.php
index 6ca9b18ae5dfc9775a41154d597515fb037c9ff1..1aae7ef17948079d5f1bd908251d4db788b31d46 100644 (file)
--- a/inc/code.php
+++ b/inc/code.php
@@ -1231,6 +1231,7 @@ function findAutoTagWarnings ($expr)
                                case (mb_ereg_match ('^\$fromvlan_[[:digit:]]+$', $expr['load'])):
                                case (mb_ereg_match ('^\$tovlan_[[:digit:]]+$', $expr['load'])):
                                case (mb_ereg_match ('^\$unmounted$', $expr['load'])):
+                               case (mb_ereg_match ('^\$untagged$', $expr['load'])):
                                        return array();
                                default:
                                        return array (array

diff --git a/inc/functions.php b/inc/functions.php
index caeddff1206add44efd8e0e3407af2f80e62ae7e..ef157b26c8c7366fabc7dcfc5b90e5207a5f0683 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -996,6 +996,8 @@ function generateEntityAutoTags ($cell)
                default: // HCF!
                        break;
        }
+       if (!count ($cell['etags']))
+               $ret[] = array ('tag' => '$untagged');
        return $ret;
 }