Changeset 736 for trunk/Modules/Network/Availability.php

Timestamp:

Apr 6, 2015, 11:08:10 PM (9 years ago)

Author:

chronos

Message:

• Modified: Merged NetworkLink Interface1 and Interface2 to single column in subtable of NetworkInterface.
• Added: Table NetworkLinkType.
• Fixed: Do not show symbol "-" if network interface doesn't have a name.

File:

• trunk/Modules/Network/Availability.php (modified) (1 diff)

trunk/Modules/Network/Availability.php

@@ -85 +85 @@
 
     $DbResult2 = $this->Database->query('SELECT `NetworkInterface`.`Name` AS `InterfaceName`'.$Columns.', '.
-      'CONCAT(`NetworkDevice`.`Name`, "-", `NetworkInterface`.`Name`) AS `Name`, `NetworkDevice`.`Name` AS `DeviceName` FROM `NetworkInterface` '.
+      'CONCAT_WS("-", `NetworkDevice`.`Name`, NULLIF(`NetworkInterface`.`Name`, "")) AS `Name`, `NetworkDevice`.`Name` AS `DeviceName` FROM `NetworkInterface` '.
       $Join.' JOIN `NetworkDevice` ON `NetworkInterface`.`Device` = `NetworkDevice`.`Id` WHERE `NetworkDevice`.`Used` = 1 AND `NetworkDevice`.`PermanentOnline`=1'.
       $Order['SQL'].$PageList['SQLLimit']);