diff options
Diffstat (limited to 'modules-available/roomplanner')
| -rw-r--r-- | modules-available/roomplanner/baseconfig/getconfig.inc.php | 6 | ||||
| -rw-r--r-- | modules-available/roomplanner/clientscript.js | 10 | ||||
| -rw-r--r-- | modules-available/roomplanner/page.inc.php | 9 |
3 files changed, 15 insertions, 10 deletions
diff --git a/modules-available/roomplanner/baseconfig/getconfig.inc.php b/modules-available/roomplanner/baseconfig/getconfig.inc.php index 8518f751..92e7a8d3 100644 --- a/modules-available/roomplanner/baseconfig/getconfig.inc.php +++ b/modules-available/roomplanner/baseconfig/getconfig.inc.php @@ -1,12 +1,12 @@ <?php -$configVars["SLX_PVS_CONFIG_URL"] = 'http://' . $_SERVER['SERVER_ADDR'] . $_SERVER['SCRIPT_NAME'] . '?do=roomplanner'; +ConfigHolder::add("SLX_PVS_CONFIG_URL", 'http://' . $_SERVER['SERVER_ADDR'] . $_SERVER['SCRIPT_NAME'] . '?do=roomplanner'); $res = Database::queryFirst('SELECT dedicatedmgr FROM location_roomplan WHERE managerip = :ip LIMIT 1', ['ip' => $ip]); if ($res !== false) { if ((int)$res['dedicatedmgr'] !== 0) { - $configVars["SLX_PVS_DEDICATED"] = 'yes'; + ConfigHolder::add("SLX_PVS_DEDICATED", 'yes'); } else { - $configVars["SLX_PVS_HYBRID"] = 'yes'; + ConfigHolder::add("SLX_PVS_HYBRID", 'yes'); } }
\ No newline at end of file diff --git a/modules-available/roomplanner/clientscript.js b/modules-available/roomplanner/clientscript.js index 53e0164a..1cd65132 100644 --- a/modules-available/roomplanner/clientscript.js +++ b/modules-available/roomplanner/clientscript.js @@ -14,7 +14,7 @@ var placedMachines = []; function makeCombinedField(machineArray) { machineArray.forEach(function (v,i,a){ - machineArray[i].combined = (v.machineuuid + " " + v.hostname + " " + v.clientip + " " + v.macaddr).toLocaleLowerCase(); + machineArray[i].combined = (v.machineuuid + " " + v.hostname + " " + v.clientip + " " + v.macaddr + " " + v.macaddr.replace(/-/g, ':')).toLocaleLowerCase(); }); return machineArray; } @@ -48,6 +48,10 @@ function renderMachineEntry(item, escape) { + '</div>'; } +function renderMachineSelected(item, escape) { + return '<div>' + escape(item.hostname) + '</div>'; +} + var queryCache = {}; function filterCache(key, query) { @@ -113,7 +117,7 @@ function initSelectize() { searchField: "combined", openOnFocus: false, create: false, - render : { option : renderMachineEntry, item: renderMachineEntry}, + render : { option : renderMachineEntry, item: renderMachineSelected}, load: loadMachines, maxItems: 1, sortField: 'hostname', @@ -130,7 +134,7 @@ function initSelectize() { searchField: "combined", openOnFocus: true, create: false, - render : { option : renderMachineEntry, item: renderMachineEntry}, + render : { option : renderMachineEntry, item: renderMachineSelected}, maxItems: 1, sortField: 'hostname', sortDirection: 'asc', diff --git a/modules-available/roomplanner/page.inc.php b/modules-available/roomplanner/page.inc.php index a35023b9..4e36d3ba 100644 --- a/modules-available/roomplanner/page.inc.php +++ b/modules-available/roomplanner/page.inc.php @@ -88,14 +88,15 @@ class Page_Roomplanner extends Page if ($this->action === 'getmachines') { $query = Request::get('query', false, 'string'); + $aquery = preg_replace('/[^\x01-\x7f]+/', '%', $query); $result = Database::simpleQuery('SELECT machineuuid, macaddr, clientip, hostname ' . 'FROM machine ' - . 'WHERE machineuuid LIKE :query ' - . ' OR macaddr LIKE :query ' - . ' OR clientip LIKE :query ' + . 'WHERE machineuuid LIKE :aquery ' + . ' OR macaddr LIKE :aquery ' + . ' OR clientip LIKE :aquery ' . ' OR hostname LIKE :query ' - . ' LIMIT 100', ['query' => "%$query%"]); + . ' LIMIT 100', ['query' => "%$query%", 'aquery' => "%$aquery%"]); $returnObject = ['machines' => []]; |