diff options
| author | Colin Smith <colin@pfsense.org> | 2005-06-18 21:15:46 +0000 |
|---|---|---|
| committer | Colin Smith <colin@pfsense.org> | 2005-06-18 21:15:46 +0000 |
| commit | 02f2164b4885a13ecc883ac92f20fd42d0562ac9 (patch) | |
| tree | e7d57b42f08a677cc035087ffe35f4c44577b670 /etc/inc/pkg-utils.inc | |
| parent | b9496b5fd8c8e7160278eb85c5af1fc1f742cd52 (diff) | |
| download | pfsense-02f2164b4885a13ecc883ac92f20fd42d0562ac9.zip pfsense-02f2164b4885a13ecc883ac92f20fd42d0562ac9.tar.gz | |
parse_xml_config_pkg -> parse_xml_config.
Diffstat (limited to 'etc/inc/pkg-utils.inc')
| -rw-r--r-- | etc/inc/pkg-utils.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index f10fba0..65e0935 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -177,7 +177,7 @@ function get_pkg_depends($pkg_name, $filetype = ".xml", $format = "files", $retu switch ($filetype) { case "all": if(preg_match("/\.xml/i", $depend_file)) { - $depend_xml = parse_xml_config_pkg("/usr/local/pkg/" . $depend_file, "packagegui"); + $depend_xml = parse_xml_config("/usr/local/pkg/" . $depend_file, "packagegui"); $depends[] = $depend_xml['name']; break; } else { @@ -185,7 +185,7 @@ function get_pkg_depends($pkg_name, $filetype = ".xml", $format = "files", $retu break; } case ".xml": - $depend_xml = parse_xml_config_pkg("/usr/local/pkg/" . $depend_file, "packagegui"); + $depend_xml = parse_xml_config("/usr/local/pkg/" . $depend_file, "packagegui"); $depends[] = $depend_xml['name']; break; default: @@ -218,7 +218,7 @@ function sync_package($pkg_name, $sync_depends = true, $show_message = false) { if(!file_exists("/usr/local/pkg/" . $package['configurationfile'])) { file_notice($package['name'], "The {$package['name']} package is missing its configuration file and must be reinstalled.", "Packages", "/pkg_mgr_install.php?mode=reinstallpkg&pkg={$package['name']}", 1); } else { - $pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $package['configurationfile'], "packagegui"); + $pkg_config = parse_xml_config("/usr/local/pkg/" . $package['configurationfile'], "packagegui"); if(isset($pkg_config['nosync'])) continue; if($pkg['custom_php_global_functions'] <> "") eval($pkg['custom_php_global_functions']); @@ -233,7 +233,7 @@ function sync_package($pkg_name, $sync_depends = true, $show_message = false) { if(!file_exists("/usr/local/pkg" . $item)) { file_notice($package['name'], "The {$package['name']} package is missing required dependencies and must be reinstalled.", "Packages", "/pkg_mgr_install.php?mode=reinstallpkg&pkg={$package['name']}", 1); } else { - $item_config = parse_xml_config_pkg("/usr/local/pkg/" . $item, "packagegui"); + $item_config = parse_xml_config("/usr/local/pkg/" . $item, "packagegui"); if(isset($item_config['nosync'])) continue; if($item_config['custom_php_command_before_form'] <> "") { eval($item_config['custom_php_command_before_form']); |
