summaryrefslogtreecommitdiffstats
path: root/usr/local/www/services_captiveportal_mac_edit.php
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2013-09-06 11:12:08 -0300
committerRenato Botelho <garga@FreeBSD.org>2013-09-12 08:44:50 -0300
commitcfd88fbc838ab0ab08c166ede807e866716fb11f (patch)
treed217d24c0dc7691abfd1633d2a1b67fd1149eb76 /usr/local/www/services_captiveportal_mac_edit.php
parent90a27e6453a01876bf2ea4acff95b760880919d8 (diff)
downloadpfsense-cfd88fbc838ab0ab08c166ede807e866716fb11f.zip
pfsense-cfd88fbc838ab0ab08c166ede807e866716fb11f.tar.gz
Fix indent and whitespaces
Diffstat (limited to 'usr/local/www/services_captiveportal_mac_edit.php')
-rwxr-xr-xusr/local/www/services_captiveportal_mac_edit.php137
1 files changed, 71 insertions, 66 deletions
diff --git a/usr/local/www/services_captiveportal_mac_edit.php b/usr/local/www/services_captiveportal_mac_edit.php
index bb36500..a27c683 100755
--- a/usr/local/www/services_captiveportal_mac_edit.php
+++ b/usr/local/www/services_captiveportal_mac_edit.php
@@ -1,21 +1,21 @@
-<?php
+<?php
/*
services_captiveportal_mac_edit.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
@@ -43,9 +43,9 @@ function passthrumacscmp($a, $b) {
}
function passthrumacs_sort() {
- global $config, $cpzone;
+ global $config, $cpzone;
- usort($config['captiveportal'][$cpzone]['passthrumac'],"passthrumacscmp");
+ usort($config['captiveportal'][$cpzone]['passthrumac'],"passthrumacscmp");
}
require("guiconfig.inc");
@@ -59,15 +59,15 @@ $shortcut_section = "captiveportal";
$cpzone = $_GET['zone'];
if (isset($_POST['zone']))
- $cpzone = $_POST['zone'];
+ $cpzone = $_POST['zone'];
if (empty($cpzone) || empty($config['captiveportal'][$cpzone])) {
- header("Location: services_captiveportal_zones.php");
- exit;
+ header("Location: services_captiveportal_zones.php");
+ exit;
}
if (!is_array($config['captiveportal']))
- $config['captiveportal'] = array();
+ $config['captiveportal'] = array();
$a_cp =& $config['captiveportal'];
$id = $_GET['id'];
@@ -94,11 +94,11 @@ if ($_POST) {
/* input validation */
$reqdfields = explode(" ", "mac");
$reqdfieldsn = array(gettext("MAC address"));
-
+
do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
-
+
$_POST['mac'] = str_replace("-", ":", $_POST['mac']);
-
+
if (($_POST['mac'] && !is_macaddr($_POST['mac']))) {
$input_errors[] = sprintf("%s. [%s]", gettext("A valid MAC address must be specified"), $_POST['mac']);
}
@@ -110,11 +110,11 @@ if ($_POST) {
foreach ($a_passthrumacs as $macent) {
if (isset($id) && ($a_passthrumacs[$id]) && ($a_passthrumacs[$id] === $macent))
continue;
-
+
if ($macent['mac'] == $_POST['mac']){
$input_errors[] = sprintf("[%s] %s.", $_POST['mac'], gettext("already allowed"));
break;
- }
+ }
}
if (!$input_errors) {
@@ -126,7 +126,7 @@ if ($_POST) {
$mac['bw_down'] = $_POST['bw_down'];
if ($_POST['username'])
$mac['username'] = $_POST['username'];
-
+
$mac['descr'] = $_POST['descr'];
if (isset($id) && $a_passthrumacs[$id]) {
@@ -137,7 +137,7 @@ if ($_POST) {
$a_passthrumacs[] = $mac;
}
passthrumacs_sort();
-
+
write_config();
if (isset($config['captiveportal'][$cpzone]['enable'])) {
@@ -154,7 +154,7 @@ if ($_POST) {
$rules = "delete {$ruleno}\n";
$rules .= "delete " . ++$ruleno . "\n";
}
-
+
$rules .= captiveportal_passthrumac_configure_entry($mac);
$uniqid = uniqid("{$cpzone}_macedit");
file_put_contents("{$g['tmp_path']}/{$uniqid}_tmp", $rules);
@@ -171,57 +171,62 @@ include("head.inc");
<?php include("fbegin.inc"); ?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php if ($input_errors) print_input_errors($input_errors); ?>
- <form action="services_captiveportal_mac_edit.php" method="post" name="iform" id="iform">
- <table width="100%" border="0" cellpadding="6" cellspacing="0">
+<form action="services_captiveportal_mac_edit.php" method="post" name="iform" id="iform">
+ <table width="100%" border="0" cellpadding="6" cellspacing="0">
+ <tr>
+ <td colspan="2" valign="top" class="listtopic"><?=gettext("Edit Pass-through MAC address");?></td>
+ </tr>
<tr>
- <td colspan="2" valign="top" class="listtopic"><?=gettext("Edit Pass-through MAC address");?></td>
- </tr>
+ <td width="22%" valign="top" class="vncellreq"><?=gettext("MAC address"); ?></td>
+ <td width="78%" class="vtable">
+ <?=$mandfldhtml;?><input name="mac" type="text" class="formfld unknown" id="mac" size="17" value="<?=htmlspecialchars($pconfig['mac']);?>">
+<?php
+ $ip = getenv('REMOTE_ADDR');
+ $mac = `/usr/sbin/arp -an | grep {$ip} | cut -d" " -f4`;
+ $mac = str_replace("\n","",$mac);
+?>
+ <a OnClick="document.forms[0].mac.value='<?=$mac?>';" href="#"><?=gettext("Copy my MAC address");?></a>
+ <br>
+ <span class="vexpl"><?=gettext("MAC address (6 hex octets separated by colons)"); ?></span></td>
+ </tr>
<tr>
- <td width="22%" valign="top" class="vncellreq"><?=gettext("MAC address"); ?></td>
- <td width="78%" class="vtable">
- <?=$mandfldhtml;?><input name="mac" type="text" class="formfld unknown" id="mac" size="17" value="<?=htmlspecialchars($pconfig['mac']);?>">
- <?php
- $ip = getenv('REMOTE_ADDR');
- $mac = `/usr/sbin/arp -an | grep {$ip} | cut -d" " -f4`;
- $mac = str_replace("\n","",$mac);
- ?>
- <a OnClick="document.forms[0].mac.value='<?=$mac?>';" href="#"><?=gettext("Copy my MAC address");?></a>
- <br>
- <span class="vexpl"><?=gettext("MAC address (6 hex octets separated by colons)"); ?></span></td>
- </tr>
+ <td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
+ <td width="78%" class="vtable">
+ <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
+ <br>
+ <span class="vexpl"><?=gettext("You may enter a description here for your reference (not parsed)"); ?>.</span>
+ </td>
+ </tr>
<tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
- <td width="78%" class="vtable">
- <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
- <br> <span class="vexpl"><?=gettext("You may enter a description here " .
- "for your reference (not parsed)"); ?>.</span></td>
- </tr>
+ <td width="22%" valign="top" class="vncell"><?=gettext("Bandwidth up"); ?></td>
+ <td width="78%" class="vtable">
+ <input name="bw_up" type="text" class="formfld unknown" id="bw_up" size="10" value="<?=htmlspecialchars($pconfig['bw_up']);?>">
+ <br>
+ <span class="vexpl"><?=gettext("Enter a upload limit to be enforced on this MAC address in Kbit/s"); ?></span>
+ </td>
+ </tr>
<tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Bandwidth up"); ?></td>
- <td width="78%" class="vtable">
- <input name="bw_up" type="text" class="formfld unknown" id="bw_up" size="10" value="<?=htmlspecialchars($pconfig['bw_up']);?>">
- <br> <span class="vexpl"><?=gettext("Enter a upload limit to be enforced on this MAC address in Kbit/s"); ?></span></td>
- </tr>
+ <td width="22%" valign="top" class="vncell"><?=gettext("Bandwidth down"); ?></td>
+ <td width="78%" class="vtable">
+ <input name="bw_down" type="text" class="formfld unknown" id="bw_down" size="10" value="<?=htmlspecialchars($pconfig['bw_down']);?>">
+ <br>
+ <span class="vexpl"><?=gettext("Enter a download limit to be enforced on this MAC address in Kbit/s"); ?></span>
+ </td>
+ </tr>
<tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Bandwidth down"); ?></td>
- <td width="78%" class="vtable">
- <input name="bw_down" type="text" class="formfld unknown" id="bw_down" size="10" value="<?=htmlspecialchars($pconfig['bw_down']);?>">
- <br> <span class="vexpl"><?=gettext("Enter a download limit to be enforced on this MAC address in Kbit/s"); ?></span></td>
- </tr>
- <tr>
- <td width="22%" valign="top">&nbsp;</td>
- <td width="78%">
- <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>">
- <input name="zone" type="hidden" value="<?=htmlspecialchars($cpzone);?>">
- <?php if (isset($id) && $a_passthrumacs[$id]): ?>
- <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>">
- <?php endif; ?>
- <?php if (isset($pconfig['username']) && $pconfig['username']): ?>
- <input name="username" type="hidden" value="<?=htmlspecialchars($pconfig['username']);?>">
- <?php endif; ?>
- </td>
- </tr>
- </table>
+ <td width="22%" valign="top">&nbsp;</td>
+ <td width="78%">
+ <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>">
+ <input name="zone" type="hidden" value="<?=htmlspecialchars($cpzone);?>">
+ <?php if (isset($id) && $a_passthrumacs[$id]): ?>
+ <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>">
+ <?php endif; ?>
+ <?php if (isset($pconfig['username']) && $pconfig['username']): ?>
+ <input name="username" type="hidden" value="<?=htmlspecialchars($pconfig['username']);?>">
+ <?php endif; ?>
+ </td>
+ </tr>
+ </table>
</form>
<?php include("fend.inc"); ?>
</body>
OpenPOWER on IntegriCloud