diff options
| author | Phil Davis <phil.davis@inf.org> | 2014-12-03 17:27:58 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2014-12-03 17:27:58 +0545 |
| commit | efa286920993c8be6fb848a82ccd2622acf4db79 (patch) | |
| tree | 35f51cda08f87514d846ea1c0d689f8d4bd130cc /usr/local/www/pkg_mgr_installed.php | |
| parent | a94b1edc7f812eef904da0b196ae1abfe1e9c354 (diff) | |
| download | pfsense-efa286920993c8be6fb848a82ccd2622acf4db79.zip pfsense-efa286920993c8be6fb848a82ccd2622acf4db79.tar.gz | |
Display installed pkg version even if pkg server not available
Forum: https://forum.pfsense.org/index.php?topic=84820.0
It seems reasonable to me to display the currently installed package version numbers, along with text like "Latest: N/A". and the Version box being red-filled when someone goes to System->Packages and displays the installed packages but the package server is not reachable for some reason.
This code does it.
What do you think?
Diffstat (limited to 'usr/local/www/pkg_mgr_installed.php')
| -rw-r--r-- | usr/local/www/pkg_mgr_installed.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr/local/www/pkg_mgr_installed.php b/usr/local/www/pkg_mgr_installed.php index d4bbebb..9875f4f 100644 --- a/usr/local/www/pkg_mgr_installed.php +++ b/usr/local/www/pkg_mgr_installed.php @@ -1,7 +1,7 @@ <?php /* $Id$ */ /* - pkg_mgr.php + pkg_mgr_installed.php Copyright (C) 2013-2014 Electric Sheep Fencing, LP Copyright (C) 2004-2012 Scott Ullrich <sullrich@gmail.com> All rights reserved. @@ -173,16 +173,16 @@ include("head.inc"); else $pkgver = "<a target='_blank' href='$changeloglink'>{$pkg['version']}</a>"; } + $pkgdescr = $currentvers[$pkg['name']]['descr']; } else { // unknown available package version - $pkgver = ""; - if(!strcmp($pkg['version'], $latest_package)) { - $tdclass = "listr"; - if ($g['disablepackagehistory']) - $pkgver = "<a>{$pkg['version']}</a>"; - else - $pkgver = "<a target='_blank' href='$changeloglink'>{$pkg['version']}</a>"; - } + $tdclass = "listbg"; + if ($g['disablepackagehistory']) + $pkgver = "<a><font color='#ffffff'>" . gettext("Latest") .": ". gettext("N/A") . "</font><br />"; + else + $pkgver = "<a target='_blank' href='$changeloglink'><font color='#ffffff'>" . gettext("Latest") .": ". gettext("N/A") . "<br />"; + $pkgver .= gettext("Installed") .": ". $pkg['version']."</font></a>"; + $pkgdescr = $pkg['descr']; } /* Check package info link */ if($pkg['pkginfolink']){ @@ -209,7 +209,7 @@ include("head.inc"); echo "<td class='{$tdclass}' ".domTT_title(gettext("Click on ".ucfirst($pkg['name'])." version to check its change log."),"return").">{$pkgver}</td>"; ?> <td class="listbg" style="overflow:hidden; text-align:justify;" <?=domTT_title(gettext("Click package info for more details about ".ucfirst($pkg['name'])." package."))?>> - <?=$currentvers[$pkg['name']]['descr'];?> + <?=$pkgdescr;?> <?php if (! $g['disablepackageinfo']): ?> <br /><br /> <a target='_blank' href='<?=$pkginfolink?>' style='align:center;color:#ffffff; filter:Glow(color=#ff0000, strength=12);'><?=$pkginfo?></a> |
