Merge pull request #1604 from alacn1/multiple_fixes

Multiple fixes
OCSInventory-NG · Jul 2, 2024 · b376535 · b376535
2 parents 1eec819 + 9f803bd
commit b376535
Show file tree

Hide file tree

Showing 10 changed files with 35,366 additions and 50,726 deletions.
diff --git a/backend/ipdiscover/methode/local.php b/backend/ipdiscover/methode/local.php
@@ -40,7 +40,9 @@
     $req = "SELECT DISTINCT n.netid as ipsubnet, s.name, s.id, CONCAT(n.netid, ';', ifnull(s.tag, '')) as pass FROM netmap n 
             LEFT JOIN subnet s ON s.netid = n.netid";
     if (isset($_SESSION['OCS']["mesmachines"]) && $_SESSION['OCS']["mesmachines"] != '' && $_SESSION['OCS']["mesmachines"] != 'NOTAG') {
-        $req .= ", accountinfo a WHERE " . $_SESSION['OCS']["mesmachines"] . " ORDER BY n.netid";
+        $req .= " LEFT JOIN networks w ON w.macaddr = n.mac";
+        $req .= " LEFT JOIN accountinfo a ON w.hardware_id = a.hardware_id";
+        $req .= " WHERE " . $_SESSION['OCS']["mesmachines"] . " ORDER BY n.netid";
     } else {
         $req .= " UNION SELECT netid, name, id, CONCAT(netid,';',ifnull(tag,'')) FROM subnet";
     }
@@ -50,7 +52,8 @@
             FROM netmap n LEFT JOIN subnet s ON s.netid = n.netid";
 
     if (isset($_SESSION['OCS']["mesmachines"]) && $_SESSION['OCS']["mesmachines"] != '' && $_SESSION['OCS']["mesmachines"] != 'NOTAG') {
-        $req .= ", accountinfo a ";
+        $req .= " LEFT JOIN networks w ON w.macaddr = n.mac";
+        $req .= " LEFT JOIN accountinfo a ON w.hardware_id = a.hardware_id";
     }
 
     $req .= " WHERE (s.TAG IS NULL OR s.TAG = '')";