summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/usr/local/www/pkg_mgr.php5
-rw-r--r--src/usr/local/www/pkg_mgr_installed.php9
2 files changed, 3 insertions, 11 deletions
diff --git a/src/usr/local/www/pkg_mgr.php b/src/usr/local/www/pkg_mgr.php
index 01e990b..c88bbee 100644
--- a/src/usr/local/www/pkg_mgr.php
+++ b/src/usr/local/www/pkg_mgr.php
@@ -193,9 +193,6 @@ if(!$pkg_info || !is_array($pkg_info)):?>
continue;
}
- $shortname = $index['name'];
- pkg_remove_prefix($shortname);
-
if ($menu_category != "All" && $index['categories'][0] != $menu_category && !($menu_category == "Other" && !in_array($index['categories'][0], $visible_categories))) {
continue;
}
@@ -206,7 +203,7 @@ if(!$pkg_info || !is_array($pkg_info)):?>
<?php if ($index['www']):?>
<a title="<?=gettext("Visit official website")?>" target="_blank" href="<?=htmlspecialchars($index['www'])?>">
<?php endif; ?>
- <?=htmlspecialchars($shortname)?>
+ <?=htmlspecialchars($index['shortname'])?>
</a>
</td>
diff --git a/src/usr/local/www/pkg_mgr_installed.php b/src/usr/local/www/pkg_mgr_installed.php
index e4c487a..d63ac60 100644
--- a/src/usr/local/www/pkg_mgr_installed.php
+++ b/src/usr/local/www/pkg_mgr_installed.php
@@ -119,11 +119,6 @@ if(empty($installed_packages)):?>
continue;
}
- $shortname = $pkg['name'];
- pkg_remove_prefix($shortname);
-
- // XXX: Add it to globals.inc?
- $changeloglink ="https://github.com/pfsense/FreeBSD-ports/commits/devel/{$pkg['categories'][0]}/{$pkg['name']}";
#check package version
$txtcolor = "black";
$upgradeavail = false;
@@ -165,14 +160,14 @@ if(empty($installed_packages)):?>
<?php } ?>
</td>
<td>
- <font color="<?=$txtcolor?>"><?=$shortname?></font>
+ <font color="<?=$txtcolor?>"><?=$pkg['shortname']?></font>
</td>
<td>
<?=implode(" ", $pkg['categories'])?>
</td>
<td>
<?php if (!$g['disablepackagehistory']):?>
- <a target="_blank" title="<?=gettext("View changelog")?>" href="<?=htmlspecialchars($changeloglink)?>">
+ <a target="_blank" title="<?=gettext("View changelog")?>" href="<?=htmlspecialchars($pkg['changeloglink'])?>">
<?php endif;?>
<?=htmlspecialchars($pkg['installed_version'])?>
<?php if (!$g['disablepackagehistory']):?>
OpenPOWER on IntegriCloud