diff --git a/htdocs/monitor.php b/htdocs/monitor.php index a47c881..b1293b8 100644 --- a/htdocs/monitor.php +++ b/htdocs/monitor.php @@ -13,18 +13,12 @@ require './common.php'; -# Fetch basic RootDSE attributes using the + and *. +$attrs = $app['server']->getRootDSE(); + $query = array(); -$query['base'] = ''; -$query['scope'] = 'base'; -$query['attrs'] = $app['server']->getValue('server','root_dse_attributes'); -$query['baseok'] = true; -$results = $app['server']->query($query,null); - -$attrs = array_change_key_case(array_pop($results)); - $query['base'] = $attrs['monitorcontext']; $query['scope'] = 'sub'; +$query['attrs'] = array('+','*'); $results = $app['server']->query($query,null); if (! isset($attrs['monitorcontext']) || ! count($results)) diff --git a/htdocs/server_info.php b/htdocs/server_info.php index ee13784..efc1ffb 100644 --- a/htdocs/server_info.php +++ b/htdocs/server_info.php @@ -13,14 +13,7 @@ require './common.php'; -# Fetch basic RootDSE attributes using the + and *. -$query = array(); -$query['base'] = ''; -$query['scope'] = 'base'; -$query['attrs'] = $app['server']->getValue('server','root_dse_attributes'); -$query['baseok'] = true; -$results = $app['server']->query($query,null); -$attrs = array_pop($results); +$attrs = $app['server']->getRootDSE(); printf('