diff options
| -rw-r--r-- | etc/inc/pkg-utils.inc | 14 | ||||
| -rwxr-xr-x | usr/local/www/pkg.php | 2 | ||||
| -rwxr-xr-x | usr/local/www/pkg_edit.php | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index b135792..64d3e70 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -164,7 +164,7 @@ function get_pkg_depends($pkg_name, $filetype = ".xml", $format = "files", $retu 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); return; } - $pkg_xml = parse_xml_config("/usr/local/pkg/" . $package['configurationfile'], "packagegui"); + $pkg_xml = parse_xml_config_pkg("/usr/local/pkg/" . $package['configurationfile'], "packagegui"); if($pkg_xml['additional_files_needed'] != "") { foreach($pkg_xml['additional_files_needed'] as $item) { if (($return_nosync == 0) && (isset($item['nosync']))) continue; // Do not return depends with nosync set if not required. @@ -187,7 +187,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("/usr/local/pkg/" . $depend_file, "packagegui"); + $depend_xml = parse_xml_config_pkg("/usr/local/pkg/" . $depend_file, "packagegui"); $depends[] = $depend_xml['name']; break; } else { @@ -195,7 +195,7 @@ function get_pkg_depends($pkg_name, $filetype = ".xml", $format = "files", $retu break; } case ".xml": - $depend_xml = parse_xml_config("/usr/local/pkg/" . $depend_file, "packagegui"); + $depend_xml = parse_xml_config_pkg("/usr/local/pkg/" . $depend_file, "packagegui"); $depends[] = $depend_xml['name']; break; default: @@ -228,7 +228,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("/usr/local/pkg/" . $package['configurationfile'], "packagegui"); + $pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $package['configurationfile'], "packagegui"); if(isset($pkg_config['nosync'])) continue; if($pkg['custom_php_global_functions'] <> "") eval($pkg['custom_php_global_functions']); @@ -243,7 +243,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("/usr/local/pkg/" . $item, "packagegui"); + $item_config = parse_xml_config_pkg("/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']); @@ -496,7 +496,7 @@ function install_package_xml($pkg) { if(file_exists("/usr/local/pkg/" . $configfile)) { $static_output .= "Loading package configuration... "; update_output_window($static_output); - $pkg_config = parse_xml_config("/usr/local/pkg/" . $configfile, "packagegui"); + $pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $configfile, "packagegui"); $static_output .= "done.\n"; update_output_window($static_output); $static_output .= "Configuring package components...\n"; @@ -655,7 +655,7 @@ function delete_package_xml($pkg) { $menus = &$config['installedpackages']['menu']; $services = &$config['installedpackages']['service']; if(file_exists("/usr/local/pkg/" . $packages[$pkgid]['configurationfile'])) { - $pkg_config = parse_xml_config("/usr/local/pkg/" . $packages[$pkgid]['configurationfile'], "packagegui"); + $pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $packages[$pkgid]['configurationfile'], "packagegui"); /* remove menu items */ if(is_array($pkg_config['menu'])) { $static_output .= "\tMenu items... "; diff --git a/usr/local/www/pkg.php b/usr/local/www/pkg.php index bc0e152..1e2a56f 100755 --- a/usr/local/www/pkg.php +++ b/usr/local/www/pkg.php @@ -42,7 +42,7 @@ if($xml == "") { print_info_box_np("ERROR: No package defined."); die; } else { - $pkg = parse_xml_config("/usr/local/pkg/" . $xml, "packagegui"); + $pkg = parse_xml_config_pkg("/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 b5e7ded..7cc9281 100755 --- a/usr/local/www/pkg_edit.php +++ b/usr/local/www/pkg_edit.php @@ -56,7 +56,7 @@ if($xml == "") { print_info_box_np("ERROR: No package defined."); die; } else { - $pkg = parse_xml_config("/usr/local/pkg/" . $xml, "packagegui"); + $pkg = parse_xml_config_pkg("/usr/local/pkg/" . $xml, "packagegui"); } $package_name = $pkg['menu'][0]['name']; $section = $pkg['menu'][0]['section']; |
