summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/inc/filter.inc2
-rw-r--r--etc/inc/globals.inc2
-rw-r--r--etc/inc/services.inc2
-rw-r--r--etc/phpshellsessions/disablereferercheck11
-rwxr-xr-xusr/local/www/status_wireless.php91
-rw-r--r--usr/local/www/system_certmanager.php2
-rw-r--r--usr/local/www/system_usermanager.php2
-rw-r--r--usr/local/www/widgets/widgets/system_information.widget.php4
8 files changed, 65 insertions, 51 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 11204bc..dc635cd 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -1945,7 +1945,7 @@ function filter_generate_user_rule($rule) {
update_filter_reload_status(sprintf(gettext("Setting up pass/block rules %s"), $rule['descr']));
/* do not process reply-to for gateway'd rules */
- if($rule['gateway'] == "" && $aline['direction'] <> "" && interface_has_gateway($rule['interface']) && !isset($config['system']['disablereplyto']) && $type != "match") {
+ if($rule['gateway'] == "" && $aline['direction'] <> "" && interface_has_gateway($rule['interface']) && !isset($config['system']['disablereplyto']) && !isset($rule['disablereplyto']) && $type != "match") {
if($rule['ipprotocol'] == "inet6") {
$rg = get_interface_gateway_v6($rule['interface']);
if(is_ipaddrv6($rg)) {
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc
index 3dbb903..ee9853d 100644
--- a/etc/inc/globals.inc
+++ b/etc/inc/globals.inc
@@ -65,7 +65,7 @@ $g = array(
"product_name" => "pfSense",
"product_copyright" => "BSD Perimeter LLC",
"product_copyright_url" => "http://www.bsdperimeter.com",
- "product_copyright_years" => "2004 - 2011",
+ "product_copyright_years" => "2004 - 2012",
"product_website" => "www.pfsense.org",
"product_website_footer" => "http://www.pfsense.org/?gui20",
"product_email" => "coreteam@pfsense.org",
diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index c14066f..c49b929 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -1545,7 +1545,7 @@ function services_dnsupdate_process($int = "") {
this is dumb - public and private keys are the same for HMAC-MD5,
but nsupdate insists on having both */
$fd = fopen("{$g['varetc_path']}/K{$i}{$keyname}+157+00000.private", "w");
- $privkey .= <<<EOD
+ $privkey = <<<EOD
Private-key-format: v1.2
Algorithm: 157 (HMAC)
Key: {$dnsupdate['keydata']}
diff --git a/etc/phpshellsessions/disablereferercheck b/etc/phpshellsessions/disablereferercheck
new file mode 100644
index 0000000..97d444a
--- /dev/null
+++ b/etc/phpshellsessions/disablereferercheck
@@ -0,0 +1,11 @@
+global $config;
+
+$config = parse_config(true);
+
+$config['system']['webgui']['nohttpreferercheck'] = true;
+
+echo "Disabling HTTP referer check...";
+
+write_config("PHP shell disabled HTTP referer check");
+
+echo "done.\n";
diff --git a/usr/local/www/status_wireless.php b/usr/local/www/status_wireless.php
index cc04bb3..d8d076a 100755
--- a/usr/local/www/status_wireless.php
+++ b/usr/local/www/status_wireless.php
@@ -3,17 +3,17 @@
status_wireless.php
Copyright (C) 2004 Scott Ullrich
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
@@ -87,25 +87,24 @@ display_top_tabs($tab_array);
?>
</td></tr>
<tr><td>
-<div id="mainarea">
-<table class="tabcont" colspan="3" cellpadding="3" width="100%">
+<div id="mainarea" class="tabcont">
+<input type="hidden" name="if" id="if" value="<?php echo $if; ?>">
+<b><input type="submit" name="rescanwifi" id="rescanwifi" value="Rescan"></b><br/><br/>
+<b><?php echo gettext("Nearby access points or ad-hoc peers"); ?></b>
+<table class="tabcont sortable" colspan="3" cellpadding="3" width="100%">
+ <thead>
+ <tr bgcolor='#990000'>
+ <td><b><font color='#ffffff'>SSID</font></b></td>
+ <td><b><font color='#ffffff'>BSSID</font></b></td>
+ <td><b><font color='#ffffff'>CHAN</font></b></td>
+ <td><b><font color='#ffffff'>RATE</font></b></td>
+ <td><b><font color='#ffffff'>RSSI</font></b></td>
+ <td><b><font color='#ffffff'>INT</font></b></td>
+ <td><b><font color='#ffffff'>CAPS</font></b></td>
+ </tr>
+ </thead>
+ <tbody>
<?php
-
- /* table header */
- print "<input type=\"hidden\" name=\"if\" id=\"if\" value=\"{$if}\">\n";
- print "<tr><td colspan=7><b><input type=\"submit\" name=\"rescanwifi\" id=\"rescanwifi\" value=\"Rescan\"><br/></td></tr>\n";
- print "<tr><td colspan=7><b>" . gettext("Nearby access points or ad-hoc peers") . ".<br/></td></tr>\n";
- print "\n<tr>";
- print "<tr bgcolor='#990000'>";
- print "<td><b><font color='#ffffff'>SSID</td>";
- print "<td><b><font color='#ffffff'>BSSID</td>";
- print "<td><b><font color='#ffffff'>CHAN</td>";
- print "<td><b><font color='#ffffff'>RATE</td>";
- print "<td><b><font color='#ffffff'>RSSI</td>";
- print "<td><b><font color='#ffffff'>INT</td>";
- print "<td><b><font color='#ffffff'>CAPS</td>";
- print "</tr>\n\n";
-
exec("/sbin/ifconfig {$rwlif} list scan 2>&1", $states, $ret);
/* Skip Header */
array_shift($states);
@@ -135,25 +134,28 @@ display_top_tabs($tab_array);
print "<td>{$caps}</td>";
print "</tr>\n";
}
+?>
+ </tbody>
+</table>
+<b><?php echo gettext("Associated or ad-hoc peers"); ?></b><br/>
+<table class="tabcont sortable" colspan="3" cellpadding="3" width="100%">
+ <thead>
+ <tr bgcolor='#990000'>
+ <td><b><font color='#ffffff'>ADDR</font></b></td>
+ <td><b><font color='#ffffff'>AID</font></b></td>
+ <td><b><font color='#ffffff'>CHAN</font></b></td>
+ <td><b><font color='#ffffff'>RATE</font></b></td>
+ <td><b><font color='#ffffff'>RSSI</font></b></td>
+ <td><b><font color='#ffffff'>IDLE</font></b></td>
+ <td><b><font color='#ffffff'>TXSEQ</font></b></td>
+ <td><b><font color='#ffffff'>RXSEQ</font></b></td>
+ <td><b><font color='#ffffff'>CAPS</font></b></td>
+ <td><b><font color='#ffffff'>ERP</font></b></td>
+ </tr>
+ </thead>
+ <tbody>
- print "</table><table class=\"tabcont\" colspan=\"3\" cellpadding=\"3\" width=\"100%\">";
-
- /* table header */
- print "\n<tr>";
- print "<tr><td colspan=7><b>" . gettext("Associated or ad-hoc peers") . "<br/></td></tr>\n";
- print "<tr bgcolor='#990000'>";
- print "<td><b><font color='#ffffff'>ADDR</td>";
- print "<td><b><font color='#ffffff'>AID</td>";
- print "<td><b><font color='#ffffff'>CHAN</td>";
- print "<td><b><font color='#ffffff'>RATE</td>";
- print "<td><b><font color='#ffffff'>RSSI</td>";
- print "<td><b><font color='#ffffff'>IDLE</td>";
- print "<td><b><font color='#ffffff'>TXSEQ</td>";
- print "<td><b><font color='#ffffff'>RXSEQ</td>";
- print "<td><b><font color='#ffffff'>CAPS</td>";
- print "<td><b><font color='#ffffff'>ERP</td>";
- print "</tr>\n\n";
-
+<?php
$states = array();
exec("/sbin/ifconfig {$rwlif} list sta 2>&1", $states, $ret);
array_shift($states);
@@ -176,14 +178,15 @@ display_top_tabs($tab_array);
print "</tr>\n";
}
-/* XXX: what stats to we get for adhoc mode? */
+/* XXX: what stats to we get for adhoc mode? */
?>
+ </tbody>
</table>
</div><br>
- <b>Flags:</b> A = authorized, E = Extended Rate (802.11g), P = Power save mode<br>
- <b>Capabilities:</b> E = ESS (infrastructure mode), I = IBSS (ad-hoc mode), P = privacy (WEP/TKIP/AES),
- S = Short preamble, s = Short slot time
+ <b>Flags:</b> A = authorized, E = Extended Rate (802.11g), P = Power save mode<br>
+ <b>Capabilities:</b> E = ESS (infrastructure mode), I = IBSS (ad-hoc mode), P = privacy (WEP/TKIP/AES),
+ S = Short preamble, s = Short slot time
</td></tr>
</table>
diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php
index 06a7a59..5820dd1 100644
--- a/usr/local/www/system_certmanager.php
+++ b/usr/local/www/system_certmanager.php
@@ -56,7 +56,7 @@ $pgtitle = array(gettext("System"), gettext("Certificate Manager"));
$userid = $_GET['userid'];
if (isset($_POST['userid']))
$userid = $_POST['userid'];
-if ($userid) {
+if (is_numeric($userid)) {
$cert_methods["existing"] = gettext("Choose an existing certificate");
if (!is_array($config['system']['user']))
$config['system']['user'] = array();
diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php
index ea26726..07a0241 100644
--- a/usr/local/www/system_usermanager.php
+++ b/usr/local/www/system_usermanager.php
@@ -566,7 +566,7 @@ function sshkeyClicked(obj) {
</td>
</tr>
- <?php if ($pconfig['uid']): ?>
+ <?php if (isset($pconfig['uid'])): ?>
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Effective Privileges");?></td>
diff --git a/usr/local/www/widgets/widgets/system_information.widget.php b/usr/local/www/widgets/widgets/system_information.widget.php
index 757e5c8..7dab2cc 100644
--- a/usr/local/www/widgets/widgets/system_information.widget.php
+++ b/usr/local/www/widgets/widgets/system_information.widget.php
@@ -157,7 +157,7 @@ $curcfg = $config['system']['firmware'];
<?php endif; ?>
<tr>
<td width="25%" class="vncellt">Uptime</td>
- <td width="75%" class="listr"><input style="border: 0px solid white;" size="30" name="uptime" id="uptime" value="<?= htmlspecialchars(get_uptime()); ?>" /></td>
+ <td width="75%" class="listr"><input style="border: 0px solid white;" size="50" name="uptime" id="uptime" value="<?= htmlspecialchars(get_uptime()); ?>" /></td>
</tr>
<tr>
<td width="25%" class="vncellt"><?=gettext("Current date/time");?></td>
@@ -286,4 +286,4 @@ $curcfg = $config['system']['firmware'];
jQuery('#uname').html("<?php echo php_uname("a"); ?>");
}
setTimeout('getstatus()', 4000);
-</script> \ No newline at end of file
+</script>
OpenPOWER on IntegriCloud