From 48bfc600a6dec5e9d3651c517c9cbab4bb6b5d4b Mon Sep 17 00:00:00 2001 From: crcro Date: Sat, 24 Sep 2016 14:56:44 +0300 Subject: [PATCH] code reduction --- html/includes/common/availability-map.inc.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/html/includes/common/availability-map.inc.php b/html/includes/common/availability-map.inc.php index ed47150a13..3a0a927232 100644 --- a/html/includes/common/availability-map.inc.php +++ b/html/includes/common/availability-map.inc.php @@ -135,11 +135,10 @@ if (defined('SHOW_SETTINGS')) { } if ($show_disabled_ignored != 1) { - $sql = 'SELECT `D`.`hostname`, `D`.`sysName`, `D`.`device_id`, `D`.`status`, `D`.`uptime`, `D`.`os`, `D`.`icon` FROM `devices` AS `D`'; - } else { - $sql = 'SELECT `D`.`hostname`, `D`.`sysName`, `D`.`device_id`, `D`.`status`, `D`.`uptime`, `D`.`os`, `D`.`icon`, `D`.`ignore`, `D`.`disabled` FROM `devices` AS `D`'; + $disabled_ignored = ', `D`.`ignore`, `D`.`disabled`'; } + $sql = 'SELECT `D`.`hostname`, `D`.`sysName`, `D`.`device_id`, `D`.`status`, `D`.`uptime`, `D`.`os`, `D`.`icon` '.$disabled_ignored.' FROM `devices` AS `D`'; if (is_normal_user() === true) { $sql .= ' , `devices_perms` AS P WHERE D.`device_id` = P.`device_id` AND P.`user_id` = ? AND';