summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorRenato Botelho <renato.botelho@bluepex.com>2010-06-21 08:33:23 -0300
committerRenato Botelho <renato.botelho@bluepex.com>2010-06-21 08:33:23 -0300
commitc4908666c15de945a0089c6131d4dac2e5a85881 (patch)
tree7d773d04f2c808b7862f988ddf14ede0a591c594 /usr
parent8f8fa997758ff4a4a90d79904f768b981ef5a5e2 (diff)
parenteade409a42bdb17e208dbf9f212ec7c9b6b0b4f1 (diff)
downloadpfsense-c4908666c15de945a0089c6131d4dac2e5a85881.zip
pfsense-c4908666c15de945a0089c6131d4dac2e5a85881.tar.gz
Merge remote branch 'mainline/master'
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/index.php2
-rwxr-xr-xusr/local/www/status_gateways.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index 68755f9..ec3122e 100755
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -109,7 +109,7 @@ if (!is_array($config['widgets'])) {
if(file_exists('/conf/needs_package_sync')) {
if($config['installedpackages'] <> '') {
conf_mount_rw();
- unlink('/conf/needs_package_sync');
+ @unlink('/conf/needs_package_sync');
conf_mount_ro();
if($g['platform'] == "pfSense" || $g['platform'] == "nanobsd") {
header('Location: pkg_mgr_install.php?mode=reinstallall');
diff --git a/usr/local/www/status_gateways.php b/usr/local/www/status_gateways.php
index 4d85a42..6d6c43d 100755
--- a/usr/local/www/status_gateways.php
+++ b/usr/local/www/status_gateways.php
@@ -79,7 +79,7 @@ include("head.inc");
?>
<tr>
<td class="listlr">
- <?=strtoupper($gateway['name']);?>
+ <?=$gateway['name'];?>
</td>
<td class="listr" align="center" >
<?php echo lookup_gateway_ip_by_name($gateway['name']);?>
OpenPOWER on IntegriCloud