fix auth for graphs to allow cidr filter. fix schema 006

git-svn-id: http://www.observium.org/svn/observer/trunk@3169 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2012-05-11 15:21:42 +00:00
parent 5883f9512d
commit f768558e7e
29 changed files with 43 additions and 48 deletions

View File

@@ -7,7 +7,7 @@
$mplug = dbFetchRow("SELECT * FROM `munin_plugins` AS M, `devices` AS D WHERE M.`device_id` = ? AND `mplug_type` = ? AND D.device_id = M.device_id", array($device['device_id'], $vars['plugin']));
}
if (is_numeric($mplug['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($mplug['device_id'])))
if (is_numeric($mplug['device_id']) && ($auth || device_permitted($mplug['device_id'])))
{
$device = &$mplug;
$title = generate_device_link($device);