Changeset 904 for trunk

Timestamp:

Feb 19, 2021, 12:03:36 PM (4 years ago)

Author:

chronos

Message:

• Added: Show gateway and net mask in contract.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Contract/Contract.php (modified) (3 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 903; // Subversion revision
+$Revision = 904; // Subversion revision
 $DatabaseRevision = 901; // SQL structure revision
 $ReleaseTime = strtotime('2021-02-19');

trunk/Modules/Contract/Contract.php

@@ -185 +185 @@
     $IpAddress = $NetworkInterface['LocalIP'];
     $MacAddress = $NetworkInterface['MAC'];
-    $NetMask = '';
-    $DefaultGateway = '';
+
+    $DbResult = $this->Database->query('SELECT * FROM NetworkSubnet '.
+      'WHERE CompareNetworkPrefix(INET_ATON("'.$IpAddress.'"), INET_ATON(`AddressRange`), `Mask`)');
+    if ($DbResult->num_rows > 0)
+    {
+      $Subnet = $DbResult->fetch_assoc();
+      $DefaultGateway = $Subnet['Gateway'];
+      $NetworkAddressIPv4 = new NetworkAddressIPv4();
+      $NetworkAddressIPv4->Prefix = $Subnet['Mask'];
+      $NetworkAddressIPv4->Address = $NetworkAddressIPv4->GetNetMask();
+      $NetMask = $NetworkAddressIPv4->AddressToString();
+    } else die('Subnet not found.');
+
     $Interface = 'Ethernet';
     $PrimaryDNS = '10.145.64.8';
@@ -291 +302 @@
       '<strong>II. Poskytované služby:</strong><br/>'.
       '<table width="100%" border="1">'.
-      '<tr><td width="50%" aling="center">Zvolený typ (tarif) služby:</td><td width="50%">'.NotBlank($ServiceType).'</td></tr>'.
+      '<tr><td width="50%">Zvolený typ (tarif) služby:</td><td>'.NotBlank($ServiceType).'</td></tr>'.
       '</table>'.
       '<br/>'.
@@ -320 +331 @@
       '<br/><br/><br/><br/>'.
       '<table width="100%">'.
-      '<tr><td width="50%" aling="center">odběratel</td><td width="50%">dodavatel</td></tr>'.
+      '<tr><td width="50%" align="center">odběratel</td><td width="50%" align="center">dodavatel</td></tr>'.
       '</table>'.
       '</td></tr>'.