* Add pkg.php which will parse the package xml file and present an interface (see http://www.pfsense.com/screens/pkg.JPG )

* Correct behavior of pkg_mgr.php when multiple packages are included
* Other minor cleanups

5 files changed, 135 insertions, 12 deletions

diff --git a/usr/local/www/edit.php b/usr/local/www/edit.php
index e57edbf..5ff055d 100755
--- a/usr/local/www/edit.php
+++ b/usr/local/www/edit.php
@@ -1,5 +1,32 @@
 #!/usr/local/bin/php
 <?php
+/*
+    edit.php
+    Copyright (C) 2004 Scott Ullrich
+    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.
+*/
+
 if (($_POST['submit'] == "Load") && file_exists($_POST['savetopath'])) {
 	$fd = fopen($_POST['savetopath'], "r");
 	$content = fread($fd, filesize($_POST['savetopath']));
diff --git a/usr/local/www/pkg.php b/usr/local/www/pkg.php
new file mode 100755
index 0000000..26df475
--- /dev/null
+++ b/usr/local/www/pkg.php
@@ -0,0 +1,106 @@
+#!/usr/local/bin/php
+<?php
+/*
+    pkg.php
+    Copyright (C) 2004 Scott Ullrich
+    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.
+*/
+
+require("guiconfig.inc");
+require("xmlparse_pkg.inc");
+
+$pfSense_config = $config; // copy this since we will be parsing
+                           // another xml file which will be clobbered.
+
+function gentitle_pkg($pgname) {
+	global $pfSense_config;
+	return $pfSense_config['system']['hostname'] . "." . $pfSense_config['system']['domain'] . " - " . $pgname;
+}
+
+$xml = $_GET['xml'];
+
+if($xml == "") {
+            $xml = "not_defined";
+            print_info_box_np("ERROR:  Could not open " . $xml . ".");
+            die;
+} else {
+            $pkg = parse_xml_config("/usr/local/pkg/" . $xml, "packagegui");
+}
+
+$package_name = $pkg['menu']['name'];
+$section      = $pkg['menu']['section'];
+$config_path  = $pkg['configpath'];
+$title        = $section . ": " . $package_name
+
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title><?=gentitle_pkg($title);?></title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link href="gui.css" rel="stylesheet" type="text/css">
+</head>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?=$title?></p>
+<form action="firewall_nat_out_load_balancing.php" method="post">
+<?php if ($savemsg) print_info_box($savemsg); ?>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr>
+    <td class="tabcont">
+              <table width="100%" border="0" cellpadding="6" cellspacing="0">
+                <tr>
+                <?php
+                $cols = 0;
+                foreach ($pkg['adddeleteeditpagefields']['columnitem'] as $column) {
+                        echo "<td class=\"listhdrr\">" . $column['fielddescr'] . "</td>";
+                        $cols++;
+                }
+                echo "</tr>";
+                if($pfSense_config[$config_path]['item']) {
+                        foreach ($pkg['adddeleteeditpagefields']['columnitem'] as $column) { ?>
+                                   <tr valign="top">
+                                    <td class="listlr">
+                                            XXX: TODO
+                                    </td>
+                                    <td valign="middle" class="list" nowrap>
+                                       &nbsp;<a href="pkg_del.php?xml=<?=$xml?>&act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this item?')"><img src="x.gif" width="17" height="17" border="0"></a>
+                                    </td>
+                                </tr>
+                                <?php
+                        }
+               }
+               $i++;
+               ?>
+               <tr><td colspan=<?=$cols?></td><td><a href="pkg_add.php?xml=<?=$xml?>&id=<?=$i;?>"><img src="plus.gif" width="17" height="17" border="0"></a></td></tr>
+        </table>
+    </td>
+  </tr>
+</table>
+</form>
+<?php include("fend.inc"); ?>
+</body>
+</html>
+
diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php
index d496450..2610346 100755
--- a/usr/local/www/pkg_mgr.php
+++ b/usr/local/www/pkg_mgr.php
@@ -5,10 +5,6 @@
     Copyright (C) 2004 Scott Ullrich
     All rights reserved.
 
-    originally part of m0n0wall (http://m0n0.ch/wall)
-    Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
-    All rights reserved.
-
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -130,10 +126,8 @@ if(!$pkg_config['packages']) {
                                 </td>
                                 <td valign="middle" class="list" nowrap>
                                     <a onclick="return confirm('Do you really want to install this package?')" href="pkg_mgr_install.php?id=<?=$i;?>"><img src="plus.gif" width="17" height="17" border="0"></a>
-
                                 </td>
                             </tr>
-
                             <?php
                             $i++;
                         }
@@ -151,5 +145,5 @@ if(!$pkg_config['packages']) {
 </body>
 </html>
 
-<?php mwexec("rm /tmp/pkg_config.xml"); ?>
+
 
diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php
index 9b6bf9a..af46a39 100755
--- a/usr/local/www/pkg_mgr_install.php
+++ b/usr/local/www/pkg_mgr_install.php
@@ -277,7 +277,7 @@ fwrite($fd_log, "End of Package Manager installation session.\n");
 // return dependency list to output later.
 $command = "TODELETE=`ls /var/db/pkg | grep " . $name . "` && /usr/sbin/pkg_info -r \$TODELETE | grep Dependency: | cut -d\" \" -f2";
 $dependencies = exec_command_and_return_text($command);
-fwrite($fd_log, "Installed " . $name . " and the following depdencies:\n" . $dependencies);
+fwrite($fd_log, "Installed " . $name . " and the following dependencies:\n" . $dependencies);
 
 $status = exec_command_and_return_text("ls /var/db/pkg | grep " . $pkgent['name']);
 fwrite($fd_log, "ls /var/db/pkg | grep " . $pkgent['name'] . "\n" . $status);
diff --git a/usr/local/www/pkg_mgr_installed.php b/usr/local/www/pkg_mgr_installed.php
index 9eb7152..a2fc43a 100755
--- a/usr/local/www/pkg_mgr_installed.php
+++ b/usr/local/www/pkg_mgr_installed.php
@@ -5,10 +5,6 @@
     Copyright (C) 2004 Scott Ullrich
     All rights reserved.
 
-    originally part of m0n0wall (http://m0n0.ch/wall)
-    Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
-    All rights reserved.
-
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met: