diff options
author | Phil Davis <phil.davis@inf.org> | 2015-08-09 13:42:43 +0545 |
---|---|---|
committer | Phil Davis <phil.davis@inf.org> | 2015-08-09 13:42:43 +0545 |
commit | 5685a7410277b2a671f5d85bc76bfda525f70dfc (patch) | |
tree | 427f6b55ace01cf649b005007ee31a60671b457b /usr | |
parent | cac80f49de715aa88fdca3357a97157606fd42b4 (diff) | |
download | pfsense-5685a7410277b2a671f5d85bc76bfda525f70dfc.zip pfsense-5685a7410277b2a671f5d85bc76bfda525f70dfc.tar.gz |
Compare package version strings with compare_pkg_versions
This fixes redmine #4924
Diffstat (limited to 'usr')
-rw-r--r-- | usr/local/www/pkg_mgr_installed.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr/local/www/pkg_mgr_installed.php b/usr/local/www/pkg_mgr_installed.php index cd86295..2384a2d 100644 --- a/usr/local/www/pkg_mgr_installed.php +++ b/usr/local/www/pkg_mgr_installed.php @@ -147,8 +147,10 @@ include("head.inc"); #check package version $latest_package = $currentvers[$pkg['name']]['version']; if ($latest_package) { + $pkg_compare_result = compare_pkg_versions($pkg['version'], $latest_package); + // we're running a newer version of the package - if(strcmp($pkg['version'], $latest_package) > 0) { + if ($pkg_compare_result > 0) { $tdclass = "listbggrey"; if ($g['disablepackagehistory']) $pkgver = "<a>".gettext("Available") .": ". $latest_package . "<br />"; @@ -157,7 +159,7 @@ include("head.inc"); $pkgver .= gettext("Installed") .": ". $pkg['version']. "</a>"; } // we're running an older version of the package - if(strcmp($pkg['version'], $latest_package) < 0) { + if ($pkg_compare_result < 0) { $tdclass = "listbg"; if ($g['disablepackagehistory']) $pkgver = "<a><font color='#ffffff'>" . gettext("Available") .": ". $latest_package . "</font><br />"; @@ -166,7 +168,7 @@ include("head.inc"); $pkgver .= gettext("Installed") .": ". $pkg['version']."</font></a>"; } // we're running the current version - if(!strcmp($pkg['version'], $latest_package)) { + if ($pkg_compare_result == 0) { $tdclass = "listr"; if ($g['disablepackagehistory']) $pkgver = "<a>{$pkg['version']}</a>"; |