nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 00:24:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix apps page, stupid array()

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2369 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-26 20:26:01 +00:00
parent 305d25eb8e
commit 3b95c74add
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/graphs/graph.inc.php
+5 -4
View File
@@ -36,11 +36,12 @@ $vertical = mres($_GET['vertical']);
$legend = mres($_GET['legend']);
$id = mres($_GET['id']);
if (!$config['allow_unauth_graphs'])
if (isset($config['allow_unauth_graphs']) && $config['allow_unauth_graphs'])
{
} else {
if (!$_SESSION['authenticated']) { graph_error("Session not authenticated"); exit; }
} else {
$auth = TRUE; ## hardcode auth for all
$auth = "1"; ## hardcode auth for all
}
preg_match('/^(?P<type>[A-Za-z0-9]+)_(?P<subtype>.+)/', mres($_GET['type']), $graphtype);
@@ -60,7 +61,7 @@ if (is_file($config['install_dir'] . "/html/includes/graphs/$type/$subtype.inc.p
{
if (Net_IPv4::ipInNetwork($_SERVER['REMOTE_ADDR'], $range))
{
$auth = TRUE;
$auth = "1";
break;
}
}
@@ -68,7 +69,7 @@ if (is_file($config['install_dir'] . "/html/includes/graphs/$type/$subtype.inc.p
include($config['install_dir'] . "/html/includes/graphs/$type/auth.inc.php");
if ($auth)
if (isset($auth) && $auth)
{
include($config['install_dir'] . "/html/includes/graphs/$type/$subtype.inc.php");
}
html/pages/device/edit/apps.inc.php
+3 -3
View File
@@ -22,19 +22,19 @@ if ($handle = opendir($config['install_dir'] . "/includes/polling/applications/"
if ($_POST['device'])
{
$updated = 0;
$param = array($device['device_id']);
$param[] = array($device['device_id']);
foreach (array_keys($_POST) as $key)
{
if (substr($key,0,4) == 'app_')
{
$param[] = substr($key,4);
$enabled[] = substr($key,4);
$query[] = "?";
$replace[] = "?";
}
}
if(count($enabled)) {
$updated += dbDelete('applications', "`device_id` = ? AND `app_type` NOT IN (".implode(',',$query).")", array($param));
$updated += dbDelete('applications', "`device_id` = ? AND `app_type` NOT IN (".implode(",",$replace).")", $param);
} else {
$updated += dbDelete('applications', "`device_id` = ?", array($param));
}