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

Remove redundant function

Browse Source
This commit is contained in:
Paul Gear
2016-01-02 07:10:43 +10:00
parent e89984e316
commit eb1dbc74c7
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/table/device_mibs.inc.php
+2 -2
View File
@@ -46,7 +46,7 @@ else {
// all columns are searchable - search across them
if (isset($searchPhrase) && !empty($searchPhrase)) {
$searchsql = implode(' OR ', array_map("search_phrase_column", array_map("quote_sql_word", $columns)));
$searchsql = implode(' OR ', array_map("search_phrase_column", array_map("mres", $columns)));
$wheresql .= " AND ( $searchsql )";
}
$sql .= $wheresql;
@@ -59,7 +59,7 @@ if (empty($total)) {
// set up default sort
if (!isset($sort) || empty($sort)) {
$sort = implode(', ', array_map("quote_sql_word", array_slice($columns, 0, $sortcolumns)));
$sort = implode(', ', array_map("mres", array_slice($columns, 0, $sortcolumns)));
}
$sql .= " ORDER BY $sort";
html/includes/table/device_oids.inc.php
+2 -2
View File
@@ -37,7 +37,7 @@ $wheresql = ' WHERE `device_id` = ?';
// all columns are searchable - search across them
if (isset($searchPhrase) && !empty($searchPhrase)) {
$searchsql = implode(' OR ', array_map("search_phrase_column", array_map("quote_sql_word", $columns)));
$searchsql = implode(' OR ', array_map("search_phrase_column", array_map("mres", $columns)));
$wheresql .= " AND ( $searchsql )";
}
$sql .= $wheresql;
@@ -51,7 +51,7 @@ if (empty($total)) {
// sort by first three columns by default
if (!isset($sort) || empty($sort)) {
$sort = implode(', ', array_map("quote_sql_word", array_slice($columns, 0, 3)));
$sort = implode(', ', array_map("mres", array_slice($columns, 0, 3)));
}
$sql .= " ORDER BY $sort";
html/includes/table/mibs.inc.php
+2 -2
View File
@@ -35,7 +35,7 @@ $sql = 'SELECT * FROM `mibdefs`';
// all columns are searchable - search across them
if (isset($searchPhrase) && !empty($searchPhrase)) {
$searchsql = implode(' OR ', array_map("search_phrase_column", array_map("quote_sql_word", $columns)));
$searchsql = implode(' OR ', array_map("search_phrase_column", array_map("mres", $columns)));
$wheresql .= " WHERE ( $searchsql )";
$sql .= $wheresql;
}
@@ -49,7 +49,7 @@ if (empty($total)) {
// sort by first three columns by default
if (!isset($sort) || empty($sort)) {
$sort = implode(', ', array_map("quote_sql_word", array_slice($columns, 0, 3)));
$sort = implode(', ', array_map("mres", array_slice($columns, 0, 3)));
}
$sql .= " ORDER BY $sort";
includes/common.php
-6
View File
@@ -955,12 +955,6 @@ function search_phrase_column($c)
} // search_phrase_column
function quote_sql_word($c)
{
return "`$c`";
} // quote_sql_word
/**
* Constructs the path to an RRD for the Ceph application
* @param string $gtype The type of rrd we're looking for