mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2978 from librenms/revert-2976-sanity

Browse Source 
Revert "Variable/Environment sanity"
This commit is contained in:
Daniel Preussker
2016-02-10 14:31:25 +00:00
parent 25657881e7 2b55c06d9e
commit 860dad81cb
5 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/includes/vars.inc.php
View File

@@ -43,5 +43,3 @@ foreach ($_GET as $name => $value) {
foreach ($_POST as $name => $value) { foreach ($_POST as $name => $value) {
$vars[$name] = $value; $vars[$name] = $value;
} }
array_walk_recursive($vars,'sanitize_array');

8
html/index.php
View File

@@ -214,6 +214,14 @@ else {
<div class="col-md-12"> <div class="col-md-12">
<?php <?php
// To help debug the new URLs :)
if (isset($devel) || isset($vars['devel'])) {
echo("<pre>");
print_r($_GET);
print_r($vars);
echo("</pre>");
}
if ($_SESSION['authenticated']) { if ($_SESSION['authenticated']) {
// Authenticated. Print a page. // Authenticated. Print a page.
if (isset($vars['page']) && !strstr("..", $vars['page']) && is_file("pages/" . $vars['page'] . ".inc.php")) { if (isset($vars['page']) && !strstr("..", $vars['page']) && is_file("pages/" . $vars['page'] . ".inc.php")) {

10
includes/common.php
View File

@@ -1255,13 +1255,3 @@ function get_port_id ($ports_mapped, $port, $port_association_mode) {
return $port_id; return $port_id;
} }
/**
* Sanitize
* @param mixed $item Reference to Item
* @param mixed $key Key
* @return void
*/
function sanitize_array(&$item, $key) {
$item = htmlentities($item);
}

2
includes/dbFacile.mysql.php
View File

@@ -266,7 +266,6 @@ function dbFetchRows($sql, $parameters=array(), $nocache=false) {
if ($config['memcached']['enable'] && $nocache === false) { if ($config['memcached']['enable'] && $nocache === false) {
$config['memcached']['resource']->set(hash('sha512',$sql.'|'.serialize($parameters)),$rows,$config['memcached']['ttl']); $config['memcached']['resource']->set(hash('sha512',$sql.'|'.serialize($parameters)),$rows,$config['memcached']['ttl']);
} }
array_walk_recursive($rows,'sanitize_array');
return $rows; return $rows;
} }
@@ -334,7 +333,6 @@ function dbFetchRow($sql=null, $parameters=array(), $nocache=false) {
if ($config['memcached']['enable'] && $nocache === false) { if ($config['memcached']['enable'] && $nocache === false) {
$config['memcached']['resource']->set(hash('sha512',$sql.'|'.serialize($parameters)),$row,$config['memcached']['ttl']); $config['memcached']['resource']->set(hash('sha512',$sql.'|'.serialize($parameters)),$row,$config['memcached']['ttl']);
} }
array_walk_recursive($row,'sanitize_array');
return $row; return $row;
} }
else { else {

2
includes/dbFacile.mysqli.php
View File

@@ -267,7 +267,6 @@ function dbFetchRows($sql, $parameters=array(), $nocache=false) {
if ($config['memcached']['enable'] && $nocache === false) { if ($config['memcached']['enable'] && $nocache === false) {
$config['memcached']['resource']->set(hash('sha512',$sql.'|'.serialize($parameters)),$rows,$config['memcached']['ttl']); $config['memcached']['resource']->set(hash('sha512',$sql.'|'.serialize($parameters)),$rows,$config['memcached']['ttl']);
} }
array_walk_recursive($rows,'sanitize_array');
return $rows; return $rows;
} }
@@ -335,7 +334,6 @@ function dbFetchRow($sql=null, $parameters=array(), $nocache=false) {
if ($config['memcached']['enable'] && $nocache === false) { if ($config['memcached']['enable'] && $nocache === false) {
$config['memcached']['resource']->set(hash('sha512',$sql.'|'.serialize($parameters)),$row,$config['memcached']['ttl']); $config['memcached']['resource']->set(hash('sha512',$sql.'|'.serialize($parameters)),$row,$config['memcached']['ttl']);
} }
array_walk_recursive($row,'sanitize_array');
return $row; return $row;
} }
else { else {