Reintroduce part of 5779ade6707ba530517da239d9ec3fc751d17d83 lost during bootstrap merge

5 files changed, 7 insertions, 10 deletions

diff --git a/src/usr/local/www/pkg_mgr_installed.php b/src/usr/local/www/pkg_mgr_installed.php
index b47357b..e1506b8 100644
--- a/src/usr/local/www/pkg_mgr_installed.php
+++ b/src/usr/local/www/pkg_mgr_installed.php
@@ -77,10 +77,9 @@ if (!verify_all_package_servers())
 if (check_package_server_ssl() === false)
 	print_info_box(package_server_ssl_failure_message());
 
-$version = file_get_contents("/etc/version");
 $tab_array = array();
 $tab_array[] = array(gettext("Available Packages"), false, "pkg_mgr.php");
-//	$tab_array[] = array("{$version} " . gettext("packages"), false, "pkg_mgr.php");
+//	$tab_array[] = array("{$g['product_version']} " . gettext("packages"), false, "pkg_mgr.php");
 //	$tab_array[] = array("Packages for any platform", false, "pkg_mgr.php?ver=none");
 //	$tab_array[] = array("Packages for a different platform", $requested_version == "other" ? true : false, "pkg_mgr.php?ver=other");
 $tab_array[] = array(gettext("Installed Packages"), true, "pkg_mgr_installed.php");
@@ -178,4 +177,4 @@ if(!is_array($config['installedpackages']['package'])):?>
 </table>
 </div>
 <?php endif; ?>
-<?php include("foot.inc")?>
\ No newline at end of file
+<?php include("foot.inc")?>
diff --git a/src/usr/local/www/pkg_mgr_settings.php b/src/usr/local/www/pkg_mgr_settings.php
index 13a6b40..f44b0be 100644
--- a/src/usr/local/www/pkg_mgr_settings.php
+++ b/src/usr/local/www/pkg_mgr_settings.php
@@ -76,9 +76,8 @@ if (check_package_server_ssl() === false)
 if ($savemsg)
 	print_info_box($savemsg);
 
-$version = file_get_contents("/etc/version");
 $tab_array = array();
-$tab_array[] = array(sprintf(gettext("%s packages"), $version), false, "pkg_mgr.php");
+$tab_array[] = array(sprintf(gettext("%s packages"), $g['product_version']), false, "pkg_mgr.php");
 $tab_array[] = array(gettext("Installed Packages"), false, "pkg_mgr_installed.php");
 $tab_array[] = array(gettext("Package Settings"), true, "pkg_mgr_settings.php");
 display_top_tabs($tab_array);
@@ -112,4 +111,4 @@ $section->addInput(new Form_Input(
 $form->add($section);
 print($form);
 
-include("foot.inc");
\ No newline at end of file
+include("foot.inc");
diff --git a/src/usr/local/www/system_firmware_auto.php b/src/usr/local/www/system_firmware_auto.php
index 0d01fa3..015ff07 100755
--- a/src/usr/local/www/system_firmware_auto.php
+++ b/src/usr/local/www/system_firmware_auto.php
@@ -118,7 +118,7 @@ if (!$latest_version) {
 		require("foot.inc");
 		exit;
 	} else {
-		if (pfs_version_compare($current_installed_buildtime, $current_installed_version, $latest_version) == -1) {
+		if (pfs_version_compare($current_installed_buildtime, $g['product_version'], $latest_version) == -1) {
 			panel_heading_text(gettext("Downloading updates") . '...');
 			panel_heading_class('info');
 
diff --git a/src/usr/local/www/system_firmware_check.php b/src/usr/local/www/system_firmware_check.php
index e1032d5..a908af1 100644
--- a/src/usr/local/www/system_firmware_check.php
+++ b/src/usr/local/www/system_firmware_check.php
@@ -141,7 +141,7 @@ if ($needs_system_upgrade == false) {
 <?php
 
 $txt  = gettext("A new version is now available") . "<br />";
-$txt .= gettext("Current version") .": ". $current_installed_version . "<br />";
+$txt .= gettext("Current version") .": ". $g['product_version'] . "<br />";
 if ($g['platform'] == "nanobsd") {
 	$txt .= "  " . gettext("NanoBSD Size") . " : " . trim(file_get_contents("/etc/nanosize.txt")) . "<br />";
 }
diff --git a/src/usr/local/www/widgets/widgets/system_information.widget.php b/src/usr/local/www/widgets/widgets/system_information.widget.php
index 21aaf92..5868d65 100644
--- a/src/usr/local/www/widgets/widgets/system_information.widget.php
+++ b/src/usr/local/www/widgets/widgets/system_information.widget.php
@@ -66,7 +66,6 @@ if ($_REQUEST['getupdatestatus']) {
 		echo "<i>Unable to check for updates</i>";
 	else {
 		$current_installed_buildtime = trim(file_get_contents("/etc/version.buildtime"));
-		$current_installed_version = trim(file_get_contents("/etc/version"));
 
 		if(!$remote_version) {
 			echo "<i>Unable to check for updates</i>";
@@ -104,7 +103,7 @@ $filesystems = get_mounted_filesystems();
 		<tr>
 			<th><?=gettext("Version");?></th>
 			<td>
-				<strong><?php readfile("/etc/version"); ?></strong>
+				<strong><?=$g['product_version']?></strong>
 				(<?php echo php_uname("m"); ?>)
 				<br />
 				built on <?php readfile("/etc/version.buildtime"); ?>