From 52cf107d518e23cbd4d45a6aa0edac293dd7c27c Mon Sep 17 00:00:00 2001 From: gnhb Date: Mon, 21 Jun 2010 21:12:08 +0700 Subject: Fix #683. Show PPPs tab as selected when tab is selected. --- usr/local/www/interfaces_ppps.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr') diff --git a/usr/local/www/interfaces_ppps.php b/usr/local/www/interfaces_ppps.php index 5a6c306..e6d4880 100644 --- a/usr/local/www/interfaces_ppps.php +++ b/usr/local/www/interfaces_ppps.php @@ -88,7 +88,7 @@ include("head.inc"); $tab_array[2] = array("Wireless", false, "interfaces_wireless.php"); $tab_array[3] = array("VLANs", false, "interfaces_vlan.php"); $tab_array[4] = array("QinQs", false, "interfaces_qinq.php"); - $tab_array[5] = array("PPPs", false, "interfaces_ppps.php"); + $tab_array[5] = array("PPPs", true, "interfaces_ppps.php"); $tab_array[6] = array("GRE", false, "interfaces_gre.php"); $tab_array[7] = array("GIF", false, "interfaces_gif.php"); $tab_array[8] = array("Bridges", false, "interfaces_bridge.php"); -- cgit v1.1 From 414053da6935d6f8927e18befe17dfa3847c3720 Mon Sep 17 00:00:00 2001 From: jim-p Date: Mon, 21 Jun 2010 16:07:45 -0400 Subject: Fix NanoBSD automatic update checks. --- usr/local/www/system_firmware_auto.php | 12 +++++++++--- usr/local/www/system_firmware_check.php | 11 ++++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) (limited to 'usr') diff --git a/usr/local/www/system_firmware_auto.php b/usr/local/www/system_firmware_auto.php index d5b7cd5..e18c681 100755 --- a/usr/local/www/system_firmware_auto.php +++ b/usr/local/www/system_firmware_auto.php @@ -124,7 +124,12 @@ include("head.inc"); $('invokeupgrade').style.visibility = 'visible';"; $txt = gettext("A new version is now available") . "\\n\\n"; $txt .= gettext("Current version") .": ". $current_installed_version . "\\n"; +if ($g['platform'] == "nanobsd") { + $txt .= " " . gettext("NanoBSD Size") . " : " . trim(file_get_contents("/etc/nanosize.txt")) . "\\n"; +} $txt .= " " . gettext("Built On") .": ". $current_installed_buildtime . "\\n"; $txt .= " " . gettext("New version") .": ". $remote_version . "\\n\\n"; $txt .= " " . gettext("Update source") .": ". $updater_url . "\\n"; -- cgit v1.1 From 087d875cd9bfa318344f678a3686b38f055bf9a2 Mon Sep 17 00:00:00 2001 From: jim-p Date: Mon, 21 Jun 2010 16:14:29 -0400 Subject: Correct NanoBSD update filename --- usr/local/www/system_firmware_auto.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'usr') diff --git a/usr/local/www/system_firmware_auto.php b/usr/local/www/system_firmware_auto.php index e18c681..48d727c 100755 --- a/usr/local/www/system_firmware_auto.php +++ b/usr/local/www/system_firmware_auto.php @@ -148,9 +148,13 @@ if(!$latest_version) { if (pfs_version_compare($current_installed_buildtime, $current_installed_version, $latest_version) == -1) { update_status(gettext("Downloading updates") . "..."); conf_mount_rw(); - - $status = download_file_with_progress_bar("{$updater_url}/latest{$nanosize}.tgz", "{$g['upload_path']}/latest.tgz", "read_body_firmware"); - $status = download_file_with_progress_bar("{$updater_url}/latest{$nanosize}.tgz.sha256", "{$g['upload_path']}/latest.tgz.sha256"); + if ($g['platform'] == "nanobsd") { + $update_filename = "latest{$nanosize}.img.gz"; + } else { + $update_filename = "latest.tgz"; + } + $status = download_file_with_progress_bar("{$updater_url}/{$update_filename}", "{$g['upload_path']}/latest.tgz", "read_body_firmware"); + $status = download_file_with_progress_bar("{$updater_url}/{$update_filename}.sha256", "{$g['upload_path']}/latest.tgz.sha256"); conf_mount_ro(); update_output_window("{$g['product_name']} " . gettext("download complete.")); } else { -- cgit v1.1 From e879fc815effb1477ba13f2dfc2aed4b8f2d40be Mon Sep 17 00:00:00 2001 From: Ermal Date: Tue, 22 Jun 2010 14:29:45 +0000 Subject: Fixes #613. Add correctly users to all users group. --- usr/local/www/system_usermanager.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'usr') diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php index c3da004..058046a 100644 --- a/usr/local/www/system_usermanager.php +++ b/usr/local/www/system_usermanager.php @@ -174,7 +174,6 @@ if (isAllowedPage("system_usermanager")) { } if ($_POST) { - conf_mount_rw(); unset($input_errors); $pconfig = $_POST; @@ -253,6 +252,7 @@ if (isAllowedPage("system_usermanager")) { } if (!$input_errors) { + conf_mount_rw(); $userent = array(); if (isset($id) && $a_user[$id]) $userent = $a_user[$id]; @@ -303,6 +303,16 @@ if (isAllowedPage("system_usermanager")) { $userent['cert'][] = $cert; } $userent['uid'] = $config['system']['nextuid']++; + /* Add the user to All Users group. */ + if (!is_array($config['system']['group']['member'])) + $config['system']['group']['member'] = array(); + foreach ($config['system']['group'] as $gidx => $group) { + if ($group['name'] == "all") { + $config['system']['group'][$gidx]['member'][] = $userent['uid']; + break; + } + } + $a_user[] = $userent; } -- cgit v1.1