dynamic: remove menu entries that are hidden

dynamic/helpers/models.php

@@ -39,7 +39,6 @@ echo gettext('ACLs');
 echo gettext('ARP Table');
 echo gettext('Access');
 echo gettext('Access Lists');
-echo gettext('Act');
 echo gettext('Actions');
 echo gettext('Administration');
 echo gettext('Advanced');
@@ -74,13 +73,11 @@ echo gettext('DNS Tools');
 echo gettext('Dashboard');
 echo gettext('Defaults');
 echo gettext('Description should be a string between 1 and 255 characters');
-echo gettext('Details');
 echo gettext('Detault Parameters');
 echo gettext('Devices');
 echo gettext('Diagnostics');
 echo gettext('Documentation');
 echo gettext('Does not look like a valid cookie name (most special characters are not allowed).');
-echo gettext('Domains');
 echo gettext('DynDNS');
 echo gettext('Dynamic View');
 echo gettext('Edit');
@@ -95,7 +92,6 @@ echo gettext('Filter');
 echo gettext('Filter Reload');
 echo gettext('Firewall');
 echo gettext('Firmware');
-echo gettext('Floating');
 echo gettext('Forward');
 echo gettext('Frontends');
 echo gettext('GIF');
@@ -115,16 +111,13 @@ echo gettext('Hello World!');
 echo gettext('Help');
 echo gettext('High Availability');
 echo gettext('History');
-echo gettext('Hosts');
 echo gettext('ICAP');
 echo gettext('ICP port needs to be an integer value between 1 and 65535');
 echo gettext('IGMP Proxy');
-echo gettext('IGMPProxyEdit');
 echo gettext('IPsec');
 echo gettext('Idle timeout must be between 0(no timeout) and 10080 (a week)');
 echo gettext('Import');
 echo gettext('Insight');
-echo gettext('Interface');
 echo gettext('Interfaces');
 echo gettext('Intrusion Detection');
 echo gettext('L2TP');
@@ -145,7 +138,6 @@ echo gettext('Maximum number of zones reached');
 echo gettext('Miscellaneous');
 echo gettext('Mobile Clients');
 echo gettext('Monitors');
-echo gettext('More');
 echo gettext('NAT');
 echo gettext('NDP Table');
 echo gettext('NPT (IPv6)');
@@ -166,8 +158,6 @@ echo gettext('PPS');
 echo gettext('PPTP');
 echo gettext('Packet Capture');
 echo gettext('Password');
-echo gettext('Phase1');
-echo gettext('Phase2');
 echo gettext('Ping');
 echo gettext('Pipe number must be between 1...65535');
 echo gettext('Pipes');
@@ -208,13 +198,11 @@ echo gettext('Pool Status');
 echo gettext('Port Forward');
 echo gettext('Power Off');
 echo gettext('Pre-Shared Keys');
-echo gettext('Privileges');
 echo gettext('Proxy Server');
 echo gettext('Proxy port needs to be an integer value between 1 and 65535');
 echo gettext('QinQ');
 echo gettext('Queue number must be between 1...65535');
 echo gettext('Queues');
-echo gettext('RA');
 echo gettext('RFC 2136');
 echo gettext('Reboot');
 echo gettext('Related cron not found');
@@ -227,15 +215,12 @@ echo gettext('RemoteACL');
 echo gettext('Reporter');
 echo gettext('Reporting');
 echo gettext('Revocation');
-echo gettext('Root');
 echo gettext('Routes');
 echo gettext('Rules');
-echo gettext('RulesEdit');
 echo gettext('SMART');
 echo gettext('SNMP');
 echo gettext('SSL Proxy port needs to be an integer value between 1 and 65535');
 echo gettext('Schedules');
-echo gettext('SchedulesEdit');
 echo gettext('Security Association Database');
 echo gettext('Security Policy Database');
 echo gettext('Select a command from the list.');
@@ -250,7 +235,6 @@ echo gettext('Should be a number between 1 and 5 characters followed by either "
 echo gettext('Should be a number between 1 and 5 characters followed by either "k", "m" or "g".');
 echo gettext('Should be a string between 1 and 255 characters.');
 echo gettext('Sockets');
-echo gettext('SocketsDetails');
 echo gettext('Specify a maximum object size. (number of MB\'s)');
 echo gettext('Specify a positive cache size. (number of MB\'s)');
 echo gettext('Specify a positive memory cache size. (number of MB\'s)');
@@ -267,12 +251,10 @@ echo gettext('Statistics');
 echo gettext('Statistics Configuration');
 echo gettext('Status');
 echo gettext('Status Overview');
-echo gettext('Step');
 echo gettext('Stick Tables');
 echo gettext('Summary View');
 echo gettext('Synchronization');
 echo gettext('System');
-echo gettext('Tab');
 echo gettext('Template name should be a string between 1 and 255 characters');
 echo gettext('Test Port');
 echo gettext('Tester');
@@ -286,7 +268,6 @@ echo gettext('TrafficManagement');
 echo gettext('Trust');
 echo gettext('Tunables');
 echo gettext('Tunnel Settings');
-echo gettext('Type');
 echo gettext('Universal Plug and Play');
 echo gettext('Updates');
 echo gettext('User Forum');
@@ -302,17 +283,13 @@ echo gettext('View');
 echo gettext('Virtual IPs');
 echo gettext('Virtual Server Setup');
 echo gettext('Virtual Server Status');
-echo gettext('VirtualIPEdit');
 echo gettext('Vouchers');
 echo gettext('Wake on LAN');
 echo gettext('Weight must be between 1...100');
 echo gettext('Wireless');
 echo gettext('Wizard');
-echo gettext('WoLEdit');
-echo gettext('Wol');
 echo gettext('max size needs to be an integer value between 1 and 65535');
 echo gettext('menu');
-echo gettext('none');
 echo gettext('origin should be regular text of max 30 characters');
 echo gettext('pfInfo');
 echo gettext('pfTables');
@@ -322,4 +299,3 @@ echo gettext('provide a valid sequence for sorting');
 echo gettext('queue size should be between 2...100');
 echo gettext('sid should be a number');
 echo gettext('the number of sslrtd children needs to be an integer value between 1 and 32');
-echo gettext('workAround');

dynamic/plugins/models.py

@@ -43,10 +43,11 @@ def recursiveParseMenu(xmlNode):
         for tag in recursiveParseMenu(childNode):
             yield tag
 
-    if xmlNode.attrib.has_key('VisibleName'):
-        yield xmlNode.attrib['VisibleName']
-    else:
-        yield xmlNode.tag
+    if not xmlNode.attrib.has_key('visibility'):
+        if xmlNode.attrib.has_key('VisibleName'):
+            yield xmlNode.attrib['VisibleName']
+        else:
+            yield xmlNode.tag
 
 def getTranslations(root):
     import os
@@ -54,7 +55,6 @@ def getTranslations(root):
 
     rootpath='%s/opnsense/mvc/app/models/'%root
 
-
     for rootdir, dirs, files in os.walk(rootpath, topdown=False):
         for name in files:
             if name.lower()[-4:] == '.xml':