From 52da211042f455b568f15eda64f1ad7a38d5755b Mon Sep 17 00:00:00 2001 From: Colin Smith Date: Tue, 26 Apr 2005 22:16:10 +0000 Subject: * Fix XML error if no packages are defined. * Remove "clear" button. TODO: Cleanup. --- usr/local/www/diag_pkglogs.php | 66 +++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 36 deletions(-) (limited to 'usr/local/www/diag_pkglogs.php') diff --git a/usr/local/www/diag_pkglogs.php b/usr/local/www/diag_pkglogs.php index 2d089ac..1eba623 100755 --- a/usr/local/www/diag_pkglogs.php +++ b/usr/local/www/diag_pkglogs.php @@ -50,13 +50,11 @@ if ($_POST['clear']) { } $i = 0; + $apkg = $_POST['pkg']; if(!isset($_POST['pkg'])) { // If we aren't looking for a specific package, locate the first package that handles logging. - if(is_array($config['installedpackages']['package'])) { + if($config['installedpackages']['package'] <> "") { foreach($config['installedpackages']['package'] as $package) { - if(!file_exists("/usr/local/pkg/" . $package['configurationfile'])) { - $statustext = "Could not locate /usr/local/pkg/" . $package['configurationfile']; - } $pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $package['configurationfile'], "packagegui"); if(is_array($pkg_config['logging'])) { $apkg = $package['name']; @@ -68,8 +66,8 @@ if(!isset($_POST['pkg'])) { // If we aren't looking for a specific package, loca } } else { $apkgid = get_pkg_id($apkg); + $i = $apkgid; } - ?> @@ -82,41 +80,35 @@ if(!isset($_POST['pkg'])) { // If we aren't looking for a specific package, loca

Diagnostics: Package logs

- "") echo $statustext; -?>

"; - exit(); - } - if($i == 0) { - print_info_box_np("No packages are currently installed."); + if($config['installedpackages']['package'] == "") { + print_info_box("No packages are currently installed."); + ?> +

+ "; - exit(); + exit; } - foreach($config['installedpackages']['package'] as $package) { - if(!file_exists("/usr/local/pkg/" . $package['configurationfile'])) { - echo "Could not locate /usr/local/pkg/" . $package['configurationfile']; - } - $pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $package['configurationfile'], "packagegui"); - if(is_array($pkg_config['logging'])) { - $pkgname = $package['name']; - $logtab = $pkg_config['logging']['logtab']; - if(!isset($pkg_config['logging']['logtab'])) $logtab = $pkgname; - if($apkg == $pkgname) { - echo "

{$pkg_config['name']}

"; - } else { - echo "

{$logtab}

"; + if($config['installedpackages']['package'] <> "") { + foreach($config['installedpackages']['package'] as $package) { + $pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $package['configurationfile'], "packagegui"); + if(is_array($pkg_config['logging'])) { + $pkgname = $package['name']; + $logtab = $pkg_config['logging']['logtab']; + if(!isset($pkg_config['logging']['logtab'])) $logtab = $pkgname; + if($apkg == $pkgname) { ?> +

+ +

+ @@ -125,8 +117,7 @@ if(!isset($_POST['pkg'])) { // If we aren't looking for a specific package, loca + Last log entries

- Last log entries -