diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-09-09 13:19:23 -0400 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-09-09 13:19:23 -0400 |
commit | 239b51616c206f89fe727f062fcb0ad748cd855a (patch) | |
tree | fac31e33fbeff8478c22a415095e8bd64280a7c9 /src/usr/local/www/pkg_mgr.php | |
parent | 309e8f8f08b23eacbd40f6f99572d7116124f1d7 (diff) | |
download | pfsense-239b51616c206f89fe727f062fcb0ad748cd855a.zip pfsense-239b51616c206f89fe727f062fcb0ad748cd855a.tar.gz |
firewall_asliases_edit: minor edits to display hint text on page load
head.inc: Fixes to notification system
pkg_mgr: Removed calls to dicontinued function. Removed obsolete table columns, corrected description display
Diffstat (limited to 'src/usr/local/www/pkg_mgr.php')
-rw-r--r-- | src/usr/local/www/pkg_mgr.php | 113 |
1 files changed, 60 insertions, 53 deletions
diff --git a/src/usr/local/www/pkg_mgr.php b/src/usr/local/www/pkg_mgr.php index aa0ee0f..f23d981 100644 --- a/src/usr/local/www/pkg_mgr.php +++ b/src/usr/local/www/pkg_mgr.php @@ -2,36 +2,62 @@ /* $Id$ */ /* pkg_mgr.php - Copyright (C) 2013-2015 Electric Sheep Fencing, LP - Copyright (C) 2004-2012 Scott Ullrich <sullrich@gmail.com> - Copyright (C) 2013 Marcello Coutinho - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. */ +/* ==================================================================== + * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. + * Copyright (c) 2004, 2005 Scott Ullrich + * Copyright (c) 2013 Marcello Coutinho + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgment: + * "This product includes software developed by the pfSense Project + * for use in the pfSense software distribution. (http://www.pfsense.org/). + * + * 4. The names "pfSense" and "pfSense Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * coreteam@pfsense.org. + * + * 5. Products derived from this software may not be called "pfSense" + * nor may "pfSense" appear in their names without prior written + * permission of the Electric Sheep Fencing, LLC. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * + * "This product includes software developed by the pfSense Project + * for use in the pfSense software distribution (http://www.pfsense.org/). + * + * THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ==================================================================== + * + */ /* pfSense_BUILDER_BINARIES: /sbin/ifconfig - pfSense_MODULE: pkgs + pfSense_MODULE: pkgs */ ##|+PRIV @@ -121,7 +147,6 @@ if($pkg_info) { $categories=array(); if(is_array($pkg_keys)) { foreach($pkg_keys as $key) { - if (!package_skip_tests($pkg_info[$key],$requested_version)) $categories[$pkg_info[$key]['category']]++; } } @@ -166,14 +191,10 @@ if(!$pkg_info || !is_array($pkg_keys)):?> <thead> <tr> <th><?=gettext("Name")?></th> -<?php if ($show_category):?> - <th><?=gettext("Category")?></th> -<?php endif;?> - <th><?=gettext("Status")?></th> <?php if (!$g['disablepackagehistory']):?> <th><?=gettext("Version")?></th> <?php endif;?> - <th><?=gettext("Platform")?></th> + <th><?=gettext("Description")?></th> </tr> </thead> @@ -181,11 +202,10 @@ if(!$pkg_info || !is_array($pkg_keys)):?> <?php foreach($pkg_keys as $key): $index = &$pkg_info[$key]; - if(get_pkg_id($index['name']) >= 0 ) - continue; - if (package_skip_tests($index,$requested_version)) + if(get_pkg_id($index['name']) >= 0 ) continue; + continue; /* get history/changelog git dir */ $commit_dir=explode("/",$index['config_file']); @@ -200,20 +220,13 @@ if(!$pkg_info || !is_array($pkg_keys)):?> ?> <tr> <td> -<?php if ($index['website']):?> - <a title="<?=gettext("Visit official website")?>" target="_blank" href="<?=htmlspecialchars($index['website'])?>"> +<?php if ($index['www']):?> + <a title="<?=gettext("Visit official website")?>" target="_blank" href="<?=htmlspecialchars($index['www'])?>"> <?php endif; ?> <?=htmlspecialchars($index['name'])?> </a> </td> -<?php if ($show_category):?> - <td> - <?=gettext($index['category'])?> - </td> -<?php endif;?> - <td> - <?=ucfirst(strtolower($index['status']))?> - </td> + <?php if (!$g['disablepackagehistory']):?> <td> <a target="_blank" title="<?=gettext("View changelog")?>" href="<?=htmlspecialchars($changeloglink)?>"> @@ -222,13 +235,7 @@ if(!$pkg_info || !is_array($pkg_keys)):?> </td> <?php endif;?> <td> - <?=$index['required_version']?> - <?php if ($index['maximum_version']):?> - (< $index['maximum_version']) - <?php endif;?> - </td> - <td> - <?=$index['descr']?> + <?=$index['desc']?> </td> <td> <a title="<?=gettext("Click to install")?>" href="pkg_mgr_install.php?id=<?=$index['name']?>" class="btn btn-success">install</a> |