diff options
author | Colin Smith <colin@pfsense.org> | 2005-06-18 21:20:05 +0000 |
---|---|---|
committer | Colin Smith <colin@pfsense.org> | 2005-06-18 21:20:05 +0000 |
commit | e307a80910aab4c381d7c15828905bfd6524435e (patch) | |
tree | dd1841bf878aae3fbb960f2cc892c77f1c42ced0 | |
parent | 6e64220ac4d2a071ccc4e481defbf46da89bff3a (diff) | |
download | pfsense-e307a80910aab4c381d7c15828905bfd6524435e.zip pfsense-e307a80910aab4c381d7c15828905bfd6524435e.tar.gz |
Minor cleanup and parse_xml_config_pkg -> parse_xml_config.
-rwxr-xr-x | usr/local/www/pkg.php | 6 | ||||
-rwxr-xr-x | usr/local/www/pkg_edit.php | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/usr/local/www/pkg.php b/usr/local/www/pkg.php index a354e00..188ee4c 100755 --- a/usr/local/www/pkg.php +++ b/usr/local/www/pkg.php @@ -30,6 +30,7 @@ require("guiconfig.inc"); require("xmlparse_pkg.inc"); +require("pkg-utils.inc"); function gentitle_pkg($pgname) { global $config; @@ -39,11 +40,10 @@ function gentitle_pkg($pgname) { $xml = $_GET['xml']; if($xml == "") { - $xml = "not_defined"; - print_info_box_np("ERROR: Could not open " . $xml . "."); + print_info_box_np("ERROR: No package defined."); die; } else { - $pkg = parse_xml_config_pkg("/usr/local/pkg/" . $xml, "packagegui"); + $pkg = parse_xml_config("/usr/local/pkg/" . $xml, "packagegui"); } if($pkg['donotsave'] <> "") { diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php index 0c66c8c..bd61a5d 100755 --- a/usr/local/www/pkg_edit.php +++ b/usr/local/www/pkg_edit.php @@ -57,11 +57,10 @@ $xml = $_GET['xml']; if($_POST['xml']) $xml = $_POST['xml']; if($xml == "") { - $xml = "not_defined"; - print_info_box_np("ERROR: Could not open " . $xml . "."); + print_info_box_np("ERROR: No package defined."); die; } else { - $pkg = parse_xml_config_pkg("/usr/local/pkg/" . $xml, "packagegui"); + $pkg = parse_xml_config("/usr/local/pkg/" . $xml, "packagegui"); } $package_name = $pkg['menu'][0]['name']; |