From 0db271e09aaffd33c624c625ff0a973b8c1bc9f5 Mon Sep 17 00:00:00 2001
From: Colin Smith <colin@pfsense.org>
Date: Mon, 25 Apr 2005 14:14:32 +0000
Subject: Sort the list of available packages.

---
 usr/local/www/pkg_mgr.php | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'usr/local')

diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php
index 1343535..08135aa 100755
--- a/usr/local/www/pkg_mgr.php
+++ b/usr/local/www/pkg_mgr.php
@@ -98,16 +98,19 @@ if(!$pkg_config['packages']) {
                 </tr>
 
 		<?php
-		 $i = 0;
+		 $pkgs = array();
+		 $instpkgs = array();
+		    foreach($config['installedpackages']['package'] as $instpkg) $instpkgs[] = $instpkg['name'];
 		    foreach ($pkg_config['packages']['package'] as $pkg) {
-			$pkgname = $pkg['name'];
-                        if($config['installedpackages']['package'] != "") {
-                            foreach ($config['installedpackages']['package'] as $installed) {
-                                        if($installed['name'] == $pkg['name'])
-                                                    $pkgname = "";
-                            }
-                        }
-                        if($pkgname <> "") {
+			if(!in_array($pkg, $instpkgs)) {
+				$pkgs[] = $pkg['name'];
+			}
+		    }
+		    sort($pkgs);
+		    foreach($pkgs as $pkg) {
+			    if(!is_string($instpkgs[0])) {
+				echo "<tr><td colspan=\"3\"><center>There are currently no available packages for installation.</td></tr>";
+			    }
                             ?>
                             <tr valign="top">
                                 <td class="listlr">
@@ -130,11 +133,6 @@ if(!$pkg_config['packages']) {
                                 </td>
                             </tr>
                             <?php
-                        }
-			$i++;
-		    }
-                    if($i == 0) {
-                        echo "<tr><td colspan=\"3\"><center>There are currently no available packages for installation.</td></tr>";
                     }
 		?>
         </table>
-- 
cgit v1.1