diff options
author | Renato Botelho <renato.botelho@bluepex.com> | 2010-06-25 08:33:17 -0300 |
---|---|---|
committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-06-25 08:33:17 -0300 |
commit | 45ad772ae72e25639d995af771cefb8584594d08 (patch) | |
tree | ce6cf319f1d53ae04d996d844261b698f7a948e3 /usr | |
parent | ac8c0663a7bad7d1b8d7624e33f54696866b18f8 (diff) | |
parent | cf7ac033abed3fb70cf33839f266a3471f38dbc7 (diff) | |
download | pfsense-45ad772ae72e25639d995af771cefb8584594d08.zip pfsense-45ad772ae72e25639d995af771cefb8584594d08.tar.gz |
Merge remote branch 'mainline/master'
Diffstat (limited to 'usr')
-rwxr-xr-x | usr/local/www/services_captiveportal_mac.php | 10 | ||||
-rw-r--r-- | usr/local/www/system_advanced_admin.php | 2 | ||||
-rw-r--r-- | usr/local/www/widgets/widgets/system_information.widget.php | 9 |
3 files changed, 17 insertions, 4 deletions
diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php index 828c9e5..38989a5 100755 --- a/usr/local/www/services_captiveportal_mac.php +++ b/usr/local/www/services_captiveportal_mac.php @@ -68,12 +68,16 @@ if ($_POST) { } if ($_POST['postafterlogin']) { - if (!is_array($a_passthrumacs)) + if (!is_array($a_passthrumacs)) { + echo "No entry exists yet!\n"; exit; + } if ($_POST['username']) { $mac = captiveportal_passthrumac_findbyname($_POST['username']); if (!empty($mac)) $_POST['delmac'] = $mac['mac']; + else + echo "No entry exists for this username: {$_POST['username']}\n"; } if ($_POST['delmac']) { $found = false; @@ -91,7 +95,9 @@ if ($_POST) { } unset($a_passthrumacs[$idx]); write_config(); - } + echo "The entry was sucessfully deleted\n"; + } else + echo "No entry exists for this mac address: {$_POST['delmac']}\n"; } exit; } diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php index ca4cee3..bfa5061 100644 --- a/usr/local/www/system_advanced_admin.php +++ b/usr/local/www/system_advanced_admin.php @@ -412,7 +412,7 @@ function prot_change() { <?php if ($restart_sshd) { - killbyname(sshd); + killbyname("sshd"); log_error(gettext("secure shell configuration has changed. Stopping sshd.")); if ($config['system']['enablesshd']) { diff --git a/usr/local/www/widgets/widgets/system_information.widget.php b/usr/local/www/widgets/widgets/system_information.widget.php index b395fc6..066133f 100644 --- a/usr/local/www/widgets/widgets/system_information.widget.php +++ b/usr/local/www/widgets/widgets/system_information.widget.php @@ -41,7 +41,14 @@ if($_REQUEST['getupdatestatus']) { $updater_url = "{$config['system']['firmware']['alturl']['firmwareurl']}"; else $updater_url = $g['update_url']; - download_file_with_progress_bar("{$updater_url}/version", "/tmp/{$g['product_name']}_version"); + + $nanosize = ""; + if ($g['platform'] == "nanobsd") { + $nanosize = "-nanobsd-" . strtolower(trim(file_get_contents("/etc/nanosize.txt"))); + } + + download_file_with_progress_bar("{$updater_url}/version{$nanosize}", "/tmp/{$g['product_name']}_version"); + $remote_version = trim(@file_get_contents("/tmp/{$g['product_name']}_version")); if(empty($remote_version)) echo "<br /><br />Unable to check for updates."; |