Project

General

Profile

« Previous | Next » 

Revision 38b357bd

Added by Ermal LUÇI over 15 years ago

Do not use the presence of lan as an indicator of having only one interface. Actually deduce that from the count of interfaces. It is perfectly legal on 2.0 to not have a lan interface and only opt/wan ones.

View differences:

usr/local/www/fbegin.inc
105 105
// Firewall
106 106
$firewall_menu = array();
107 107
$firewall_menu[] = array("Aliases", "/firewall_aliases.php");
108
if($config['interfaces']['lan']) 
108
if(count($config['interfaces']) > 1) 
109 109
	$firewall_menu[] = array("NAT", "/firewall_nat.php");
110 110
$firewall_menu[] = array("Rules", "/firewall_rules.php");
111 111
$firewall_menu[] = array("Schedules", "/firewall_schedule.php");
112
if($config['interfaces']['lan']) 
113
	$firewall_menu[] = array("Traffic Shaper", "/firewall_shaper.php");
112
$firewall_menu[] = array("Traffic Shaper", "/firewall_shaper.php");
114 113
$firewall_menu[] = array("Virtual IPs", "/firewall_virtual_ip.php");
115 114
$firewall_menu = msort(array_merge($firewall_menu, return_ext_menu("Firewall")),0);
116 115

  
......
128 127
$services_menu[] = array("PPPoE Server", "/vpn_pppoe.php");
129 128
$services_menu[] = array("RIP", "/pkg_edit.php?xml=routed/routed.xml&id=0");
130 129
$services_menu[] = array("SNMP", "/services_snmp.php");
131
if($config['interfaces']['lan']) {
130
if(count($config['interfaces']) > 1) {
132 131
	/* no use for UPnP in single-interface deployments
133 132
	remove to reduce user confusion
134 133
	*/
......
166 165
$status_menu[] = array("Services", "/status_services.php");
167 166
$status_menu[] = array("System Logs", "/diag_logs.php");
168 167
$status_menu[] = array("Traffic Graph", "/status_graph.php?if=wan");
169
if($config['interfaces']['lan']) 
168
if(count($config['interfaces']) > 1) 
170 169
	$status_menu[] = array("UPnP", "/status_upnp.php");
171 170
$ifentries = get_configured_interface_with_descr();
172 171
foreach ($ifentries as $ent => $entdesc) {

Also available in: Unified diff