Compare commits
No commits in common. "52688a5e70f44cf6e099592abf0e96d6ec9cc09d" and "ac43bdaf640e21c95a253fb883267de29aaa7fa0" have entirely different histories.
52688a5e70
...
ac43bdaf64
@ -81,7 +81,6 @@ class SubDeviceManager
|
|||||||
JOIN devices d ON sd.device_id = d.device_id
|
JOIN devices d ON sd.device_id = d.device_id
|
||||||
JOIN records r ON r.subdevice_id = sd.subdevice_id
|
JOIN records r ON r.subdevice_id = sd.subdevice_id
|
||||||
WHERE d.room_id IN (".str_repeat("?,", count($roomIds)-1)."?)
|
WHERE d.room_id IN (".str_repeat("?,", count($roomIds)-1)."?)
|
||||||
/*AND value != '999'*/
|
|
||||||
AND r.record_id IN (
|
AND r.record_id IN (
|
||||||
SELECT MAX(record_id)
|
SELECT MAX(record_id)
|
||||||
FROM records
|
FROM records
|
||||||
|
@ -62,10 +62,6 @@ class Device extends Template
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Firmware Status
|
//Firmware Status
|
||||||
if (empty($devices[$key]['mac'])) {
|
|
||||||
$devices[$key]['firmware_hash'] = "";
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$localBinary = "../updater/" . str_replace(':', '', $device['mac']) . ".bin";
|
$localBinary = "../updater/" . str_replace(':', '', $device['mac']) . ".bin";
|
||||||
$devices[$key]['firmware_hash'] = "";
|
$devices[$key]['firmware_hash'] = "";
|
||||||
if (file_exists($localBinary)) {
|
if (file_exists($localBinary)) {
|
||||||
|
@ -32,9 +32,9 @@
|
|||||||
<th><a href="device/signal/<?php echo $SORTTYPE; ?>">Signal</a><i class="fa"><?php echo (!empty($SORTICON['signal']) ? $SORTICON['signal'] : ""); ?></i></th>
|
<th><a href="device/signal/<?php echo $SORTTYPE; ?>">Signal</a><i class="fa"><?php echo (!empty($SORTICON['signal']) ? $SORTICON['signal'] : ""); ?></i></th>
|
||||||
<th><a href="device/firmware/<?php echo $SORTTYPE; ?>">Firmware</a><i class="fa"><?php echo (!empty($SORTICON['firmware']) ? $SORTICON['firmware'] : ""); ?></i></th>
|
<th><a href="device/firmware/<?php echo $SORTTYPE; ?>">Firmware</a><i class="fa"><?php echo (!empty($SORTICON['firmware']) ? $SORTICON['firmware'] : ""); ?></i></th>
|
||||||
<th>
|
<th>
|
||||||
<a href="device/ip/<?php echo $SORTTYPE; ?>">IP Address</a><i class="fa"><?php echo (!empty($SORTICON['ip']) ? $SORTICON['ip'] : ""); ?></i><br>
|
<a href="/device/ip/<?php echo $SORTTYPE; ?>">IP Address</a><i class="fa"><?php echo (!empty($SORTICON['ip']) ? $SORTICON['ip'] : ""); ?></i><br>
|
||||||
<a href="device/mac/<?php echo $SORTTYPE; ?>">(Mac)</a><i class="fa"><?php echo (!empty($SORTICON['mac']) ? $SORTICON['mac'] : ""); ?></i><br>
|
<a href="/device/mac/<?php echo $SORTTYPE; ?>">(Mac)</a><i class="fa"><?php echo (!empty($SORTICON['mac']) ? $SORTICON['mac'] : ""); ?></i><br>
|
||||||
<a href="device/token/<?php echo $SORTTYPE; ?>">Token</a><i class="fa"><?php echo (!empty($SORTICON['token']) ? $SORTICON['token'] : ""); ?></i>
|
<a href="/device/token/<?php echo $SORTTYPE; ?>">Token</a><i class="fa"><?php echo (!empty($SORTICON['token']) ? $SORTICON['token'] : ""); ?></i>
|
||||||
</th>
|
</th>
|
||||||
<th>Action
|
<th>Action
|
||||||
<form method="post" action="">
|
<form method="post" action="">
|
||||||
|
Loading…
Reference in New Issue
Block a user