summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/inc/captiveportal.inc12
-rw-r--r--etc/inc/unbound.inc6
-rw-r--r--etc/inc/vpn.inc4
-rw-r--r--usr/local/share/locale/ja/LC_MESSAGES/pfSense.po2
-rw-r--r--usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po2
-rw-r--r--usr/local/www/firewall_shaper_vinterface.php2
-rw-r--r--usr/local/www/pkg_mgr.php2
-rw-r--r--usr/local/www/services_captiveportal.php2
-rw-r--r--usr/local/www/services_unbound.php12
-rw-r--r--usr/local/www/widgets/javascript/thermal_sensors.js33
10 files changed, 35 insertions, 42 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index 1837798..25bccdf 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -367,7 +367,7 @@ EOD;
/* Release allocated pipes for this zone */
captiveportal_free_dnrules();
- mwexec("/usr/local/sbin/ipfw zone {$cpzoneid} destory", true);
+ mwexec("/sbin/ipfw zone {$cpzoneid} destroy", true);
if (empty($config['captiveportal']))
mwexec("/sbin/sysctl net.link.ether.ipfw=0");
@@ -464,7 +464,7 @@ function captiveportal_init_rules($reinit = false) {
return;
captiveportal_load_modules();
- mwexec("/usr/local/sbin/ipfw zone {$cpzoneid} create", true);
+ mwexec("/sbin/ipfw zone {$cpzoneid} create", true);
$cpips = array();
$ifaces = get_configured_interface_list();
@@ -481,7 +481,7 @@ function captiveportal_init_rules($reinit = false) {
if (!empty($carpif)) {
$carpsif = explode(" ", $carpif);
foreach ($carpsif as $cpcarp) {
- mwexec("/usr/local/sbin/ipfw zone {$cpzoneid} madd {$cpcarp}", true);
+ mwexec("/sbin/ipfw zone {$cpzoneid} madd {$cpcarp}", true);
$carpip = find_interface_ip($cpcarp);
if (is_ipaddr($carpip))
$cpips[] = $carpip;
@@ -489,7 +489,7 @@ function captiveportal_init_rules($reinit = false) {
}
$cpips[] = $cpipm;
}
- mwexec("/usr/local/sbin/ipfw zone {$cpzoneid} madd {$tmpif}", true);
+ mwexec("/sbin/ipfw zone {$cpzoneid} madd {$tmpif}", true);
}
}
if (count($cpips) > 0) {
@@ -1478,7 +1478,7 @@ function captiveportal_get_dn_passthru_ruleno($value) {
if (file_exists("{$g['vardb_path']}/captiveportaldn.rules")) {
$rules = unserialize(file_get_contents("{$g['vardb_path']}/captiveportaldn.rules"));
unset($output);
- $_gb = exec("/sbin/ipfw -x {$cpzone} show | /usr/bin/grep {$value} | /usr/bin/grep -v grep | /usr/bin/cut -d \" \" -f 5 | /usr/bin/head -n 1", $output);
+ $_gb = exec("/sbin/ipfw -x {$cpzoneid} show | /usr/bin/grep " . escapeshellarg($value) . " | /usr/bin/grep -v grep | /usr/bin/awk '{print $5}' | /usr/bin/head -n 1", $output);
$ruleno = intval($output[0]);
if (!$rules[$ruleno])
$ruleno = NULL;
@@ -1566,7 +1566,7 @@ function captiveportal_get_ipfw_passthru_ruleno($value) {
if (file_exists("{$g['vardb_path']}/captiveportal_{$cpzone}.rules")) {
$rules = unserialize(file_get_contents("{$g['vardb_path']}/captiveportal_{$cpzone}.rules"));
unset($output);
- $_gb = exec("/sbin/ipfw -x {$cpzone} show | /usr/bin/grep {$value} | /usr/bin/grep -v grep | /usr/bin/cut -d \" \" -f 5 | /usr/bin/head -n 1", $output);
+ $_gb = exec("/sbin/ipfw -x {$cpzoneid} show | /usr/bin/grep " . escapeshellarg($value) . " | /usr/bin/grep -v grep | /usr/bin/awk '{print $1}' | /usr/bin/head -n 1", $output);
$ruleno = intval($output[0]);
if (!$rules[$ruleno])
$ruleno = NULL;
diff --git a/etc/inc/unbound.inc b/etc/inc/unbound.inc
index 563c038..68f60bb 100644
--- a/etc/inc/unbound.inc
+++ b/etc/inc/unbound.inc
@@ -106,9 +106,9 @@ function unbound_generate_config() {
$optimization = unbound_optimization();
// Setup DNSSEC support
- if (isset($config['unbound']['dnssec_status'])) {
+ if (isset($config['unbound']['dnssec'])) {
$module_config = "validator iterator";
- $anchor_file = "auto-trust-anchor-file: {$g['unbound_chroot_path']}/root-trust-anchor";
+ $anchor_file = "auto-trust-anchor-file: {$g['unbound_chroot_path']}/root.key";
} else
$module_config = "iterator";
@@ -263,7 +263,7 @@ interface: ::0
include: {$g['unbound_chroot_path']}/host_entries.conf
# Domain overrides
-include: {$g['unbound_chroot_path']}/domainove
+include: {$g['unbound_chroot_path']}/domainoverrides.conf
{$forward_conf}
{$custom_options}
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 0d875c4..ea0e974 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -279,6 +279,7 @@ charon {
auth {
default = -1
ike = 1
+ ike_name = yes
}
}
@@ -799,7 +800,7 @@ EOD;
$ipsecconf .=<<<EOD
-conn con{$ph2ent['ikeid']}{$ph2ent['ikeid']}
+conn con{$ph2ent['ikeid']}-{$ph2ent['ikeid']}
aggressive = {$aggressive}
fragmentation = yes
keyexchange = {$keyexchange}
@@ -845,6 +846,7 @@ EOD;
} else {
mwexec("/usr/local/sbin/ipsec start", false);
}
+ vpn_ipsec_configure_loglevels();
if ($natfilterrules == true)
filter_configure();
/* start filterdns, if necessary */
diff --git a/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po b/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po
index de8af4b..21d02f3 100644
--- a/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po
+++ b/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po
@@ -1,5 +1,5 @@
# Language translation for pfSense project.
-# Copyright (C) 2011 BSD Perimeter
+# Copyright (C) 2011-2014 Electric Sheep Fencing LLC
# This file is distributed under the same license as the pfSense package.
# Kiyo Takami and Isaac (.ike) Levy, 2013.
#
diff --git a/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po b/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po
index bfad148..f3c8b02 100644
--- a/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po
+++ b/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po
@@ -1,5 +1,5 @@
# Language translation for pfSense project.
-# Copyright (C) 2011 BSD Perimeter
+# Copyright (C) 2011-2014 Electric Sheep Fencing LLC
# This file is distributed under the same license as the pfSense package.
# Vinicius Coque <vcoque@gmail.com>, 2011.
# Luiz Gustavo <luizgustavo@luizgustavo.pro>, 2014 Powered by: TrustUX Network (www.trustux.com)
diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php
index e53deef..5384cde 100644
--- a/usr/local/www/firewall_shaper_vinterface.php
+++ b/usr/local/www/firewall_shaper_vinterface.php
@@ -336,7 +336,7 @@ $output_form .= "<input type=\"button\" class=\"formbtn\" name=\"delete\"";
if ($queue)
$output_form .= " value=\"" . gettext("Delete this queue") ."\" />";
else
- $output_form .= " value=\"" . gettext("Delete virtual interface") ."\" />";
+ $output_form .= " value=\"" . gettext("Delete Limiter") ."\" />";
$output_form .= "</a>";
$output_form .= "</td></tr>";
$output_form .= "</table>";
diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php
index 05179fc..518bfe6 100644
--- a/usr/local/www/pkg_mgr.php
+++ b/usr/local/www/pkg_mgr.php
@@ -75,7 +75,7 @@ function domTT_title($title_msg) {
$pkg_cache_file_time=($g['min_pkg_cache_file_time'] ? $g['min_pkg_cache_file_time'] : 120);
if (!file_exists("{$g['tmp_path']}/pkg_info.cache") || (time() - filemtime("{$g['tmp_path']}/pkg_info.cache")) > $pkg_cache_file_time) {
- $pkg_info = get_pkg_info('all', array("noembedded", "name", "category", "website", "version", "status", "descr", "maintainer", "required_version", "maximum_version", "pkginfolink", "supportedbybsdperimeter","config_file"));
+ $pkg_info = get_pkg_info('all', array("noembedded", "name", "category", "website", "version", "status", "descr", "maintainer", "required_version", "maximum_version", "pkginfolink", "config_file"));
//create cache file after get_pkg_info
if($pkg_info) {
$fout = fopen("{$g['tmp_path']}/pkg_info.cache", "w");
diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php
index b0d8abd..8ee0fe7 100644
--- a/usr/local/www/services_captiveportal.php
+++ b/usr/local/www/services_captiveportal.php
@@ -399,7 +399,7 @@ if ($_POST) {
if (!empty($toremove)) {
foreach ($toremove as $removeif) {
$removeif = get_real_interface($removeif);
- mwexec("/usr/local/sbin/ipfw zone {$cpzone} mdel {$removeif}");
+ mwexec("/sbin/ipfw zone {$cpzoneid} mdel {$removeif}");
}
}
captiveportal_configure_zone($newcp);
diff --git a/usr/local/www/services_unbound.php b/usr/local/www/services_unbound.php
index 21a1b2e..4753571 100644
--- a/usr/local/www/services_unbound.php
+++ b/usr/local/www/services_unbound.php
@@ -223,7 +223,7 @@ function show_advanced_dns() {
<tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("DNSSEC");?></td>
<td width="78%" class="vtable"><p>
- <input name="dnssec" type="checkbox" id="dnssec" value="yes" <?php if ($pconfig['dnssec'] === true) echo "checked";?>/>
+ <input name="dnssec" type="checkbox" id="dnssec" value="yes" <?php echo (isset($pconfig['dnssec']) ? "checked" : "");?>/>
<strong><?=gettext("Enable DNSSEC Support");?><br />
</strong></p>
</td>
@@ -231,7 +231,7 @@ function show_advanced_dns() {
<tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("DNS Query Forwarding");?></td>
<td width="78%" class="vtable"><p>
- <input name="forwarding" type="checkbox" id="forwarding" value="yes" <?php if ($pconfig['forwarding'] == "yes") echo "checked";?>>
+ <input name="forwarding" type="checkbox" id="forwarding" value="yes" <?php echo (isset($pconfig['forwarding']) ? "checked" : "");?>/>
<strong><?=gettext("Enable Forwarding Mode");?></strong><br /></p>
</td>
</tr>
@@ -259,6 +259,14 @@ function show_advanced_dns() {
</td>
</tr>
<tr>
+ <td width="22%" valign="top" class="vncellreq"><?=gettext("TXT Comment Support");?></td>
+ <td width="78%" class="vtable"><p>
+ <input name="txtsupport" type="checkbox" id="txtsupport" value="yes" <?php echo (isset($pconfig['txtsupport']) ? "checked" : "");?>/>
+ <strong><?=gettext("If this option is set, then any descriptions associated with Host entries and DHCP Static mappings will create a corresponding TXT record.");?><br />
+ </strong></p>
+ </td>
+ </tr>
+ <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Advanced");?></td>
<td width="78%" class="vtable"><p>
<div id="showadvbox" <?php if ($pconfig['custom_options']) echo "style='display:none'"; ?>>
diff --git a/usr/local/www/widgets/javascript/thermal_sensors.js b/usr/local/www/widgets/javascript/thermal_sensors.js
index 17f07d0..edc9990 100644
--- a/usr/local/www/widgets/javascript/thermal_sensors.js
+++ b/usr/local/www/widgets/javascript/thermal_sensors.js
@@ -278,33 +278,16 @@ function pulsateThermalSensorsItems(itemsToPulsate) {
}
function getSensorFriendlyName(sensorFullName){
+ var rzone = /^hw\.acpi\.thermal\.tz([0-9]+)\.temperature$/;
+ var rcore = /^dev\.cpu\.([0-9]+)\.temperature$/;
- var friendlyName = "";
-
- switch (sensorFullName) {
- case "hw.acpi.thermal.tz0.temperature":
- friendlyName = "Zone 0";
- break;
- case "hw.acpi.thermal.tz1.temperature":
- friendlyName = "Zone 1";
- break;
- case "dev.cpu.0.temperature":
- friendlyName = "Core 0";
- break;
- case "dev.cpu.1.temperature":
- friendlyName = "Core 1";
- break;
- case "dev.cpu.2.temperature":
- friendlyName = "Core 2";
- break;
- case "dev.cpu.3.temperature":
- friendlyName = "Core 3";
- break;
- default:
- friendlyName = sensorFullName;
- }
+ if (rzone.test(sensorFullName))
+ return "Zone " + rzone.exec(sensorFullName)[1];
+
+ if (rcore.test(sensorFullName))
+ return "Core " + rcore.exec(sensorFullName)[1];
- return friendlyName;
+ return sensorFullName;
}
function getThermalSensorValue(stringValue){
OpenPOWER on IntegriCloud