summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
authorErmal Luçi <eri@pfsense.org>2008-09-07 19:34:18 +0000
committerErmal Luçi <eri@pfsense.org>2008-09-07 19:34:18 +0000
commit4476d4475167263b170ea831dece50426655398a (patch)
tree16b1d9407d4f435d8ba4395e8221431ded72dc32 /usr/local
parent9f6f3e04c7527781692165adcdf1b392fd0fb765 (diff)
downloadpfsense-4476d4475167263b170ea831dece50426655398a.zip
pfsense-4476d4475167263b170ea831dece50426655398a.tar.gz
Merge lan configuration to the interfaces_wan.php page wich does the configuration of all
other assigned interfaces.
Diffstat (limited to 'usr/local')
-rwxr-xr-xusr/local/www/fbegin.inc8
-rwxr-xr-xusr/local/www/guiconfig.inc2
-rwxr-xr-xusr/local/www/interfaces.php23
-rwxr-xr-xusr/local/www/interfaces_vlan_edit.php4
-rwxr-xr-xusr/local/www/interfaces_wan.php23
-rw-r--r--usr/local/www/widgets/widgets/interfaces.widget.php13
6 files changed, 37 insertions, 36 deletions
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc
index fe1aaa8..7f8c0c1 100755
--- a/usr/local/www/fbegin.inc
+++ b/usr/local/www/fbegin.inc
@@ -139,13 +139,7 @@ if ($_REQUEST['noticeaction'] == 'acknowledge') {
<?php if (!isset($config['system']['webgui']['noassigninterfaces'])): ?>
<?=output_menu_item("/interfaces_assign.php", "(assign)");?>
<?php endif; ?>
- <?=output_menu_item("/interfaces_wan.php?if=wan", "WAN");?>
- <?php
- if($config['interfaces']['lan']) {
- output_menu_item("/interfaces_lan.php", "LAN");
- }
- ?>
- <?php $opts = get_configured_interface_with_descr(true, true);
+ <?php $opts = get_configured_interface_with_descr(false, true);
foreach ($opts as $oif => $odescr):
if (!isset($config['interfaces'][$oif]['ovpn'])): ?>
<?=output_menu_item("/interfaces_wan.php?if={$oif}", htmlspecialchars($odescr))?>
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
index b80c62f..289787a 100755
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -975,4 +975,4 @@ function echo_array($array,$return_me=false){
}
-?> \ No newline at end of file
+?>
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 9a5cbb0..cb82e0f 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -150,7 +150,10 @@ $pconfig['dhcphostname'] = $wancfg['dhcphostname'];
$pconfig['alias-address'] = $wancfg['alias-address'];
$pconfig['alias-subnet'] = $wancfg['alias-subnet'];
$pconfig['descr'] = remove_bad_chars($wancfg['descr']);
-$pconfig['enable'] = $if == "wan" ? true : isset($wancfg['enable']);
+if ($if == "wan" || $if == "lan")
+ $pconfig['enable'] = true;
+else
+ $pconfig['enable'] = isset($wancfg['enable']);
if (is_array($config['aliases']['alias']))
foreach($config['aliases']['alias'] as $alias)
@@ -190,12 +193,12 @@ if (isset($wancfg['wireless'])) {
if ($_POST) {
unset($input_errors);
-// $pconfig = $_POST;
+ $pconfig = $_POST;
/* filter out spaces from descriptions */
$_POST['descr'] = remove_bad_chars($_POST['descr']);
- if ($_POST['enable'] || $if == "wan") {
+ if ($_POST['enable'] || $if == "wan" || $if = "lan") {
/* optional interface if list */
$iflist = get_configured_interface_with_descr(true);
@@ -356,7 +359,10 @@ n already exists.";
}
$wancfg['descr'] = remove_bad_chars($_POST['descr']);
- $wancfg['enable'] = $if == "wan" ? true : $_POST['enable'] ? true : false;
+ if ($if == "wan" || $if == "lan")
+ $wancfg['enable'] = true;
+ else
+ $wancfg['enable'] = $_POST['enable'] ? true : false;
if ($_POST['type'] == "static") {
$wancfg['ipaddr'] = $_POST['ipaddr'];
@@ -495,7 +501,7 @@ n already exists.";
$wancfg['mtu'] = $_POST['mtu'];
write_config();
-
+
if ($if = "lan") {
/* restart snmp so that it binds to correct address */
services_snmpd_configure();
@@ -528,6 +534,8 @@ n already exists.";
// Populate page descr if it does not exist.
if($if == "wan" && !$wancfg['descr'])
$wancfg['descr'] = "WAN";
+else if ($if == "lan" && !$wancfg['descr'])
+ $wancfg['descr'] = "LAN";
$pgtitle = array("Interfaces", $wancfg['descr']);
$closehead = false;
@@ -586,13 +594,14 @@ function show_mon_config() {
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
<?php if ($input_errors) print_input_errors($input_errors); ?>
+
<?php if ($savemsg) print_info_box($savemsg); ?>
<form action="interfaces_wan.php?if=<?php echo "{$if}";?>" method="post" name="iform" id="iform">
<table width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td colspan="2" valign="top" class="listtopic">General configuration</td>
</tr>
-<?php if ($if != "wan"): ?>
+<?php if ($if != "wan" || $if != "lan"): ?>
<tr>
<td width="22%" valign="top" class="vtable">&nbsp;</td>
<td width="78%" class="vtable">
@@ -939,7 +948,7 @@ seconds<br>If no qualifying outgoing packets are transmitted for the specified n
<script language="JavaScript">
<!--
<?php
-if ($if == "wan")
+if ($if == "wan" || $if = "lan")
echo "\$('allcfg').appear();";
else
echo "show_allcfg(document.iform.enable);";
diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php
index 912a321..ad8e7c8 100755
--- a/usr/local/www/interfaces_vlan_edit.php
+++ b/usr/local/www/interfaces_vlan_edit.php
@@ -101,9 +101,7 @@ if ($_POST) {
write_config();
$confif = convert_real_interface_to_friendly_interface_name($vlan['vlanif']);
- if ($confif == "lan")
- interfaces_lan_configure();
- else if ($confif <> "")
+ if ($confif <> "")
interfaces_wan_configure($confif);
header("Location: interfaces_vlan.php");
diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php
index 9a5cbb0..cb82e0f 100755
--- a/usr/local/www/interfaces_wan.php
+++ b/usr/local/www/interfaces_wan.php
@@ -150,7 +150,10 @@ $pconfig['dhcphostname'] = $wancfg['dhcphostname'];
$pconfig['alias-address'] = $wancfg['alias-address'];
$pconfig['alias-subnet'] = $wancfg['alias-subnet'];
$pconfig['descr'] = remove_bad_chars($wancfg['descr']);
-$pconfig['enable'] = $if == "wan" ? true : isset($wancfg['enable']);
+if ($if == "wan" || $if == "lan")
+ $pconfig['enable'] = true;
+else
+ $pconfig['enable'] = isset($wancfg['enable']);
if (is_array($config['aliases']['alias']))
foreach($config['aliases']['alias'] as $alias)
@@ -190,12 +193,12 @@ if (isset($wancfg['wireless'])) {
if ($_POST) {
unset($input_errors);
-// $pconfig = $_POST;
+ $pconfig = $_POST;
/* filter out spaces from descriptions */
$_POST['descr'] = remove_bad_chars($_POST['descr']);
- if ($_POST['enable'] || $if == "wan") {
+ if ($_POST['enable'] || $if == "wan" || $if = "lan") {
/* optional interface if list */
$iflist = get_configured_interface_with_descr(true);
@@ -356,7 +359,10 @@ n already exists.";
}
$wancfg['descr'] = remove_bad_chars($_POST['descr']);
- $wancfg['enable'] = $if == "wan" ? true : $_POST['enable'] ? true : false;
+ if ($if == "wan" || $if == "lan")
+ $wancfg['enable'] = true;
+ else
+ $wancfg['enable'] = $_POST['enable'] ? true : false;
if ($_POST['type'] == "static") {
$wancfg['ipaddr'] = $_POST['ipaddr'];
@@ -495,7 +501,7 @@ n already exists.";
$wancfg['mtu'] = $_POST['mtu'];
write_config();
-
+
if ($if = "lan") {
/* restart snmp so that it binds to correct address */
services_snmpd_configure();
@@ -528,6 +534,8 @@ n already exists.";
// Populate page descr if it does not exist.
if($if == "wan" && !$wancfg['descr'])
$wancfg['descr'] = "WAN";
+else if ($if == "lan" && !$wancfg['descr'])
+ $wancfg['descr'] = "LAN";
$pgtitle = array("Interfaces", $wancfg['descr']);
$closehead = false;
@@ -586,13 +594,14 @@ function show_mon_config() {
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
<?php if ($input_errors) print_input_errors($input_errors); ?>
+
<?php if ($savemsg) print_info_box($savemsg); ?>
<form action="interfaces_wan.php?if=<?php echo "{$if}";?>" method="post" name="iform" id="iform">
<table width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td colspan="2" valign="top" class="listtopic">General configuration</td>
</tr>
-<?php if ($if != "wan"): ?>
+<?php if ($if != "wan" || $if != "lan"): ?>
<tr>
<td width="22%" valign="top" class="vtable">&nbsp;</td>
<td width="78%" class="vtable">
@@ -939,7 +948,7 @@ seconds<br>If no qualifying outgoing packets are transmitted for the specified n
<script language="JavaScript">
<!--
<?php
-if ($if == "wan")
+if ($if == "wan" || $if = "lan")
echo "\$('allcfg').appear();";
else
echo "show_allcfg(document.iform.enable);";
diff --git a/usr/local/www/widgets/widgets/interfaces.widget.php b/usr/local/www/widgets/widgets/interfaces.widget.php
index e223f2e..3d67744 100644
--- a/usr/local/www/widgets/widgets/interfaces.widget.php
+++ b/usr/local/www/widgets/widgets/interfaces.widget.php
@@ -41,7 +41,7 @@ require_once("/usr/local/www/widgets/include/interfaces.inc");
<table bgcolor="#990000" width="100%" border="0" cellspacing="0" cellpadding="0">
<?php
- foreach ($ifdescrs as $ifdescr => $ifname){
+ foreach ($ifdescrs as $ifdescr => $ifname) {
$ifinfo = get_interface_info($ifdescr);
$iswireless = is_interface_wireless($ifdescr);
?>
@@ -57,16 +57,7 @@ require_once("/usr/local/www/widgets/include/interfaces.inc");
<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_cablenic.gif"/>
<? } ?>&nbsp;
<strong><u>
- <?php
- if ($ifname == "WAN") { ?>
- <span onClick="location.href='/interfaces_wan.php'" style="cursor:pointer">
- <? } else if ($ifname == "LAN") { ?>
- <span onClick="location.href='/interfaces_lan.php'" style="cursor:pointer">
- <? } else { ?>
- <span onClick="location.href='/interfaces_wan.php?optif=<?=$ifdescr; ?>'" style="cursor:pointer">
- <?
- } ?>
-
+ <span onClick="location.href='/interfaces_wan.php?if=<?=$ifdescr; ?>'" style="cursor:pointer">
<?=htmlspecialchars($ifname);?></span></u></strong>
OpenPOWER on IntegriCloud