diff options
Diffstat (limited to 'usr')
-rwxr-xr-x | usr/local/www/firewall_aliases.php | 28 | ||||
-rwxr-xr-x | usr/local/www/services_captiveportal_ip.php | 22 | ||||
-rwxr-xr-x | usr/local/www/services_captiveportal_mac.php | 14 | ||||
-rwxr-xr-x | usr/local/www/services_dnsmasq.php | 60 | ||||
-rwxr-xr-x | usr/local/www/services_proxyarp.php | 16 | ||||
-rwxr-xr-x | usr/local/www/services_wol.php | 18 | ||||
-rwxr-xr-x | usr/local/www/vpn_ipsec.php | 36 |
7 files changed, 97 insertions, 97 deletions
diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php index cb94725..f2ab68f 100755 --- a/usr/local/www/firewall_aliases.php +++ b/usr/local/www/firewall_aliases.php @@ -3,20 +3,20 @@ /* firewall_aliases.php part of m0n0wall (http://m0n0.ch/wall) - + Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -101,26 +101,26 @@ if ($_GET['act'] == "del") { <?=htmlspecialchars($alias['address']);?> </td> <td class="listbg"> - <?=htmlspecialchars($alias['descr']);?> + <font color="#FFFFFF"><?=htmlspecialchars($alias['descr']);?> </td> <td valign="middle" nowrap class="list"> <a href="firewall_aliases_edit.php?id=<?=$i;?>"><img src="e.gif" width="17" height="17" border="0"></a> <a href="firewall_aliases.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this alias? All elements that still use it will become invalid (e.g. filter rules)!')"><img src="x.gif" width="17" height="17" border="0"></a></td> </tr> <?php $i++; endforeach; ?> - <tr> + <tr> <td class="list" colspan="3"></td> <td class="list"> <a href="firewall_aliases_edit.php"><img src="plus.gif" width="17" height="17" border="0"></a></td> </tr> </table> </form> <p><span class="vexpl"><span class="red"><strong>Note:<br> - </strong></span>Aliases act as placeholders for real IP addresses - and can be used to minimize the number of changes that have to - be made if a host or network address changes. You can enter the - name of an alias instead of an IP address in all address fields - that have a blue background. The alias will be resolved to its - current address according to the list below. If an alias cannot - be resolved (e.g. because you deleted it), the corresponding element + </strong></span>Aliases act as placeholders for real IP addresses + and can be used to minimize the number of changes that have to + be made if a host or network address changes. You can enter the + name of an alias instead of an IP address in all address fields + that have a blue background. The alias will be resolved to its + current address according to the list below. If an alias cannot + be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped.</span></p> <?php include("fend.inc"); ?> </body> diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php index b3d406a..f1b6f96 100755 --- a/usr/local/www/services_captiveportal_ip.php +++ b/usr/local/www/services_captiveportal_ip.php @@ -3,20 +3,20 @@ /* services_captiveportal_ip.php part of m0n0wall (http://m0n0.ch/wall) - + Copyright (C) 2004 Dinesh Nair <dinesh@alphaque.com> All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -103,22 +103,22 @@ if ($_GET['act'] == "del") { <?php $i = 0; foreach ($a_allowedips as $ip): ?> <tr> <td class="listlr"> - <?php if($ip['dir'] == "to") + <?php if($ip['dir'] == "to") echo "any <img src=\"in.gif\" width=\"11\" height=\"11\" align=\"absmiddle\">"; - ?> + ?> <?=strtolower($ip['ip']);?> - <?php if($ip['dir'] == "from") + <?php if($ip['dir'] == "from") echo "<img src=\"in.gif\" width=\"11\" height=\"11\" align=\"absmiddle\"> any"; - ?> + ?> </td> <td class="listbg"> - <?=htmlspecialchars($ip['descr']);?> + <font color="#FFFFFF"><?=htmlspecialchars($ip['descr']);?> </td> <td valign="middle" nowrap class="list"> <a href="services_captiveportal_ip_edit.php?id=<?=$i;?>"><img src="e.gif" width="17" height="17" border="0"></a> <a href="services_captiveportal_ip.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this address?')"><img src="x.gif" width="17" height="17" border="0"></a></td> </tr> <?php $i++; endforeach; ?> - <tr> + <tr> <td class="list" colspan="2"> </td> <td class="list"> <a href="services_captiveportal_ip_edit.php"><img src="plus.gif" width="17" height="17" border="0"></a></td> </tr> diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php index d38c58c..9edaf95 100755 --- a/usr/local/www/services_captiveportal_mac.php +++ b/usr/local/www/services_captiveportal_mac.php @@ -3,20 +3,20 @@ /* services_captiveportal_mac.php part of m0n0wall (http://m0n0.ch/wall) - + Copyright (C) 2004 Dinesh Nair <dinesh@alphaque.com> All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -106,13 +106,13 @@ if ($_GET['act'] == "del") { <?=strtolower($mac['mac']);?> </td> <td class="listbg"> - <?=htmlspecialchars($mac['descr']);?> + <font color="#FFFFFF"><?=htmlspecialchars($mac['descr']);?> </td> <td valign="middle" nowrap class="list"> <a href="services_captiveportal_mac_edit.php?id=<?=$i;?>"><img src="e.gif" width="17" height="17" border="0"></a> <a href="services_captiveportal_mac.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this host?')"><img src="x.gif" width="17" height="17" border="0"></a></td> </tr> <?php $i++; endforeach; ?> - <tr> + <tr> <td class="list" colspan="2"> </td> <td class="list"> <a href="services_captiveportal_mac_edit.php"><img src="plus.gif" width="17" height="17" border="0"></a></td> </tr> diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php index c69bb85..0c904f0 100755 --- a/usr/local/www/services_dnsmasq.php +++ b/usr/local/www/services_dnsmasq.php @@ -3,20 +3,20 @@ /* services_dnsmasq.php part of m0n0wall (http://m0n0.ch/wall) - + Copyright (C) 2003-2004 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -48,7 +48,7 @@ if ($_POST) { $config['dnsmasq']['regdhcp'] = ($_POST['regdhcp']) ? true : false; write_config(); - + $retval = 0; if (!file_exists($d_sysrebootreqd_path)) { config_lock(); @@ -91,42 +91,42 @@ if ($_GET['act'] == "del") { <input name="apply" type="submit" class="formbtn" id="apply" value="Apply changes"></p> <?php endif; ?> <table width="100%" border="0" cellpadding="6" cellspacing="0"> - <tr> - <td class="vtable"><p> + <tr> + <td class="vtable"><p> <input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable'] == "yes") echo "checked";?>> <strong>Enable DNS forwarder<br> </strong></p></td> </tr> - <tr> - <td class="vtable"><p> + <tr> + <td class="vtable"><p> <input name="regdhcp" type="checkbox" id="regdhcp" value="yes" <?php if ($pconfig['regdhcp'] == "yes") echo "checked";?>> <strong>Register DHCP leases in DNS forwarder<br> - </strong>If this option is set, then machines that specify - their hostname when requesting a DHCP lease will be registered - in the DNS forwarder, so that their name can be resolved. - You should also set the domain in <a href="system.php">System: + </strong>If this option is set, then machines that specify + their hostname when requesting a DHCP lease will be registered + in the DNS forwarder, so that their name can be resolved. + You should also set the domain in <a href="system.php">System: General setup</a> to the proper value.</p> </td> </tr> - <tr> - <td> <input name="submit" type="submit" class="formbtn" value="Save"> + <tr> + <td> <input name="submit" type="submit" class="formbtn" value="Save"> </td> </tr> - <tr> + <tr> <td><p><span class="vexpl"><span class="red"><strong>Note:<br> - </strong></span>If the DNS forwarder is enabled, the DHCP - service (if enabled) will automatically serve the LAN IP - address as a DNS server to DHCP clients so they will use - the forwarder. The DNS forwarder will use the DNS servers - entered in <a href="system.php">System: General setup</a> - or those obtained via DHCP or PPP on WAN if the "Allow - DNS server list to be overridden by DHCP/PPP on WAN"</span> - is checked. If you don't use that option (or if you use - a static IP address on WAN), you must manually specify at - least one DNS server on the <a href="system.php">System: + </strong></span>If the DNS forwarder is enabled, the DHCP + service (if enabled) will automatically serve the LAN IP + address as a DNS server to DHCP clients so they will use + the forwarder. The DNS forwarder will use the DNS servers + entered in <a href="system.php">System: General setup</a> + or those obtained via DHCP or PPP on WAN if the "Allow + DNS server list to be overridden by DHCP/PPP on WAN"</span> + is checked. If you don't use that option (or if you use + a static IP address on WAN), you must manually specify at + least one DNS server on the <a href="system.php">System: General setup</a> page.<br> <br> - You may enter records that override the results from the + You may enter records that override the results from the forwarders below.</p></td> </tr> </table> @@ -151,13 +151,13 @@ if ($_GET['act'] == "del") { <?=$hostent['ip'];?> </td> <td class="listbg"> - <?=htmlspecialchars($hostent['descr']);?> + <font color="#FFFFFF"><?=htmlspecialchars($hostent['descr']);?> </td> <td valign="middle" nowrap class="list"> <a href="services_dnsmasq_edit.php?id=<?=$i;?>"><img src="e.gif" width="17" height="17" border="0"></a> <a href="services_dnsmasq.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this host?')"><img src="x.gif" width="17" height="17" border="0"></a></td> </tr> <?php $i++; endforeach; ?> - <tr> + <tr> <td class="list" colspan="4"></td> <td class="list"> <a href="services_dnsmasq_edit.php"><img src="plus.gif" width="17" height="17" border="0"></a></td> </tr> diff --git a/usr/local/www/services_proxyarp.php b/usr/local/www/services_proxyarp.php index ecb7315..c881f1b 100755 --- a/usr/local/www/services_proxyarp.php +++ b/usr/local/www/services_proxyarp.php @@ -3,20 +3,20 @@ /* services_proxyarp.php part of m0n0wall (http://m0n0.ch/wall) - + Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -39,7 +39,7 @@ $a_proxyarp = &$config['proxyarp']['proxyarpnet']; if ($_POST) { $pconfig = $_POST; - + $retval = 0; if (!file_exists($d_sysrebootreqd_path)) { config_lock(); @@ -101,13 +101,13 @@ if ($_GET['act'] == "del") { ?> </td> <td class="listbg"> - <?=htmlspecialchars($arpent['descr']);?> + <font color="#FFFFFF"><?=htmlspecialchars($arpent['descr']);?> </td> <td valign="middle" nowrap class="list"> <a href="services_proxyarp_edit.php?id=<?=$i;?>"><img src="e.gif" width="17" height="17" border="0"></a> <a href="services_proxyarp.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this network?')"><img src="x.gif" width="17" height="17" border="0"></a></td> </tr> <?php $i++; endforeach; ?> - <tr> + <tr> <td class="list" colspan="2"></td> <td class="list"> <a href="services_proxyarp_edit.php"><img src="plus.gif" width="17" height="17" border="0"></a></td> </tr> diff --git a/usr/local/www/services_wol.php b/usr/local/www/services_wol.php index 1ee5946..089f3d6 100755 --- a/usr/local/www/services_wol.php +++ b/usr/local/www/services_wol.php @@ -39,7 +39,7 @@ $a_wol = &$config['wol']['wolentry']; if ($_POST || $_GET['mac']) { unset($input_errors); - + if ($_GET['mac']) { $mac = $_GET['mac']; $if = $_GET['if']; @@ -54,11 +54,11 @@ if ($_POST || $_GET['mac']) { if (!$if) $input_errors[] = "A valid interface must be specified."; - if (!$input_errors) { + if (!$input_errors) { /* determine broadcast address */ $bcip = gen_subnet_max($config['interfaces'][$if]['ipaddr'], $config['interfaces'][$if]['subnet']); - + mwexec("/usr/local/bin/wol -i {$bcip} {$mac}"); $savemsg = "Sent magic packet to {$mac}."; } @@ -88,7 +88,7 @@ if ($_GET['act'] == "del") { <?php if ($savemsg) print_info_box($savemsg); ?> <form action="services_wol.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> - <tr> + <tr> <td width="22%" valign="top" class="vncellreq">Interface</td> <td width="78%" class="vtable"> <select name="interface" class="formfld"> @@ -99,7 +99,7 @@ if ($_GET['act'] == "del") { $interfaces['opt' . $i] = $config['interfaces']['opt' . $i]['descr']; } foreach ($interfaces as $iface => $ifacename): ?> - <option value="<?=$iface;?>" <?php if ($iface == $if) echo "selected"; ?>> + <option value="<?=$iface;?>" <?php if ($iface == $if) echo "selected"; ?>> <?=htmlspecialchars($ifacename);?> </option> <?php endforeach; ?> @@ -114,14 +114,14 @@ if ($_GET['act'] == "del") { Enter a MAC address <span class="vexpl"> in the following format: xx:xx:xx:xx:xx:xx</span></td></tr> <tr> <td width="22%" valign="top"> </td> - <td width="78%"> + <td width="78%"> <input name="Submit" type="submit" class="formbtn" value="Send"> </td> </tr> </table> <span class="vexpl"><span class="red"><strong>Note:<br> </strong></span>This service can be used to wake up (power on) computers by sending special "Magic Packets". The NIC in the computer that is to be woken up must support Wake on LAN and has to be configured properly (WOL cable, BIOS settings). </span><br> - <br> + <br> You may store MAC addresses below for your convenience. Click the MAC address to wake up a computer. <br> @@ -145,13 +145,13 @@ Click the MAC address to wake up a computer. <br> <a href="?mac=<?=$wolent['mac'];?>&if=<?=$wolent['interface'];?>"><?=strtolower($wolent['mac']);?></a> </td> <td class="listbg"> - <?=htmlspecialchars($wolent['descr']);?> + <font color="#FFFFFF"><?=htmlspecialchars($wolent['descr']);?> </td> <td valign="middle" nowrap class="list"> <a href="services_wol_edit.php?id=<?=$i;?>"><img src="e.gif" width="17" height="17" border="0"></a> <a href="services_wol.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this entry?')"><img src="x.gif" width="17" height="17" border="0"></a></td> </tr> <?php $i++; endforeach; ?> - <tr> + <tr> <td class="list" colspan="3"></td> <td class="list"> <a href="services_wol_edit.php"><img src="plus.gif" width="17" height="17" border="0"></a></td> </tr> diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php index cea915a..8f26454 100755 --- a/usr/local/www/vpn_ipsec.php +++ b/usr/local/www/vpn_ipsec.php @@ -3,20 +3,20 @@ /* vpn_ipsec.php part of m0n0wall (http://m0n0.ch/wall) - + Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -52,11 +52,11 @@ if ($_POST) { } } else if ($_POST['submit']) { $pconfig = $_POST; - + $config['ipsec']['enable'] = $_POST['enable'] ? true : false; - + write_config(); - + $retval = 0; if (!file_exists($d_sysrebootreqd_path)) { config_lock(); @@ -106,17 +106,17 @@ if ($_GET['act'] == "del") { <li class="tabinact"><a href="vpn_ipsec_keys.php">Pre-shared keys</a></li> </ul> </td></tr> - <tr> + <tr> <td class="tabcont"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> - <tr> - <td class="vtable"><p><span class="vexpl"> </span> + <tr> + <td class="vtable"><p><span class="vexpl"> </span> <input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable'] == "yes") echo "checked";?>> <strong>Enable IPsec<br> </strong></p></td> </tr> - <tr> - <td> <input name="submit" type="submit" class="formbtn" value="Save"> + <tr> + <td> <input name="submit" type="submit" class="formbtn" value="Save"> </td> </tr> </table> @@ -141,7 +141,7 @@ if ($_GET['act'] == "del") { } ?> <tr valign="top"> - <td nowrap class="listlr"><?=$spans;?> + <td nowrap class="listlr"><?=$spans;?> <?php if ($ipsecent['local-subnet']['network']) echo strtoupper($ipsecent['local-subnet']['network']); else @@ -158,7 +158,7 @@ if ($_GET['act'] == "del") { $if = htmlspecialchars($iflabels[$ipsecent['interface']]); } else $if = "WAN"; - + echo $if . "<br>" . $ipsecent['remote-gateway']; ?> <?=$spane;?></td> @@ -172,13 +172,13 @@ if ($_GET['act'] == "del") { <?=$p1_halgos[$ipsecent['p1']['hash-algorithm']];?> <?=$spane;?></td> <td class="listbg"><?=$spans;?> - <?=htmlspecialchars($ipsecent['descr']);?> + <font color="#FFFFFF"><?=htmlspecialchars($ipsecent['descr']);?> <?=$spane;?></td> - <td valign="middle" nowrap class="list"> <a href="vpn_ipsec_edit.php?id=<?=$i;?>"><img src="e.gif" width="17" height="17" border="0"></a> + <td valign="middle" nowrap class="list"> <a href="vpn_ipsec_edit.php?id=<?=$i;?>"><img src="e.gif" width="17" height="17" border="0"></a> <a href="vpn_ipsec.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this tunnel?')"><img src="x.gif" width="17" height="17" border="0"></a></td> </tr> <?php $i++; endforeach; ?> - <tr> + <tr> <td class="list" colspan="6"></td> <td class="list"> <a href="vpn_ipsec_edit.php"><img src="plus.gif" width="17" height="17" border="0"></a></td> </tr> |