Changeset 873 for trunk/Modules/NetworkConfigLinux/Generators

Timestamp:

Apr 6, 2020, 11:17:40 PM (5 years ago)

Author:

chronos

Message:

• Modified: Improved code format.

Location:

trunk/Modules/NetworkConfigLinux/Generators

Files:

• CheckPorts.php (modified) (5 diffs)
• DHCP.php (modified) (3 diffs)
• DNS.php (modified) (19 diffs)
• IPTables.php (modified) (5 diffs)
• Latency.php (modified) (2 diffs)
• NAT.php (modified) (5 diffs)
• TrafficShaping.php (modified) (12 diffs)

trunk/Modules/NetworkConfigLinux/Generators/CheckPorts.php

@@ -7 +7 @@
     $Timeout = 1;
     $State = 0;
-    if($Protocol == 'tcp') $Prefix = '';
-      else if($Protocol == 'udp') $Prefix = 'udp://';
+    if ($Protocol == 'tcp') $Prefix = '';
+      else if ($Protocol == 'udp') $Prefix = 'udp://';
       else throw new Exception('Unsupported protocol "'.$Protocol.'"');
-    if($Socket = @fsockopen($Prefix.$IP, $Port, $ErrorNumber, $ErrorString, $Timeout))
+    if ($Socket = @fsockopen($Prefix.$IP, $Port, $ErrorNumber, $ErrorString, $Timeout))
     {
       fclose($Socket);
       $State = 1;
     }
-    return($State);
+    return ($State);
   }
   
@@ -29 +29 @@
       'LEFT JOIN `NetworkInterface` ON `NetworkInterface`.`Id`=`NetworkPort`.`Interface` '.
       'WHERE (`NetworkPort`.`Enabled`=1) AND (`NetworkInterface`.`LocalIP` !="")');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
       $Ports[$DbRow['Id']] = $DbRow;
 
-    foreach($Ports as $Index => $Port)
+    foreach ($Ports as $Index => $Port)
     {
-      if($Port['Protocol'] == 0) $Port['Protocol'] = 'tcp';
-      if($Port['Protocol'] == 1) $Port['Protocol'] = 'udp';
+      if ($Port['Protocol'] == 0) $Port['Protocol'] = 'tcp';
+      if ($Port['Protocol'] == 1) $Port['Protocol'] = 'udp';
       $Port['NewOnline'] = $this->CheckPortStatus($Port['LocalIP'], $Port['Number'], $Port['Protocol']);
 
       // Update last online time if still online
-      if($Port['NewOnline'])
+      if ($Port['NewOnline'])
       {
         $DbResult = $this->Database->update('NetworkPort', '`Id` = "'.$Port['Id'].'"',
@@ -46 +46 @@
 
       // Update UpDown table
-      if($Port['Online'] != $Port['NewOnline'])
+      if ($Port['Online'] != $Port['NewOnline'])
       {
         // Online state changed
@@ -65 +65 @@
     $DbResult = $this->Database->select('NetworkPort', '*', '(`Online` = 1) AND '.
       '(`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'")');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
     {
       echo('Port '.$DbRow['Number'].' online but time not updated.'."\n");
@@ -71 +71 @@
     $DbResult = $this->Database->select('NetworkPort', '*', '(`Online` = 0) AND '.
       '(`LastOnline` >= "'.TimeToMysqlDateTime($StartTime).'")');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
     {
       echo('Port '.$DbRow['Number'].' not online but time updated.'."\n");

trunk/Modules/NetworkConfigLinux/Generators/DHCP.php

@@ -1 +1 @@
 <?php
 
-if(isset($_SERVER['REMOTE_ADDR'])) die();
+if (isset($_SERVER['REMOTE_ADDR'])) die();
 /*
 include_once('../../global.php');
@@ -23 +23 @@
 'option netbios-scope "";'."\n".
 "server-identifier 192.168.0.1;\n\n");
-for($i = 0; $i <= $MaxSubnet; $i++)
+for ($i = 0; $i <= $MaxSubnet; $i++)
 {
   fputs($File, "subnet 192.168.".$i.".0 netmask 255.255.255.0 {\n".
@@ -30 +30 @@
   "  option routers 192.168.".$i.".1;\n");
   $DbResult = $Database->select('hosts', '*', "IP LIKE '192.168.".$i."%' ORDER BY IP");
-  while($Row = $DbResult->fetch_array())
+  while ($Row = $DbResult->fetch_array())
   {
     $Data = $Row['name'];
-    if(strlen($Data) < 9) $Data .= "\t";
+    if (strlen($Data) < 9) $Data .= "\t";
     fputs($File, "  host ".$Data."\t{ fixed-address ".$Row['IP'].";\thardware ethernet ".$Row['MAC']."; }\n");
   }

trunk/Modules/NetworkConfigLinux/Generators/DNS.php

@@ -18 +18 @@
         "\t\t\t".$DNS['Minimum']."\t; minimum\n".
         "\t\t\t)\n";
-    foreach($DNS['NameServer'] as $NameServer)
+    foreach ($DNS['NameServer'] as $NameServer)
     {
       $Output .= "\t\tIN\tNS\t".strtolower($NameServer).".\n";
@@ -26 +26 @@
     // Mail server records
     $Priority = 10;
-    foreach($DNS['MailServer'] as $MailServer)
+    foreach ($DNS['MailServer'] as $MailServer)
     {
       $Output .="\t\t\tMX\t".$Priority." ".strtolower($MailServer).".\n";
@@ -34 +34 @@
         $DNS['Domain'].".\tIN\tTXT\t\"v=spf1 mx -all\"\n".
         $DNS['Domain'].".\tIN\tSPF\t\"v=spf1 mx -all\"\n";
-    foreach($DNS['MailServer'] as $MailServer)
+    foreach ($DNS['MailServer'] as $MailServer)
     {
       $Output .= $MailServer.".\tIN\tTXT\t\"v=spf1 a -all\"\n".
@@ -45 +45 @@
 
     // IPv4 host list
-    foreach($DNS['Host'] as $Host)
-    {
-      if(strlen($Host['Name']) < 8) $Host['Name'] .= "\t";
+    foreach ($DNS['Host'] as $Host)
+    {
+      if (strlen($Host['Name']) < 8) $Host['Name'] .= "\t";
       $Output .= strtolower($Host['Name'])."\tIN\tA\t".$Host['Address']."\n";
     }
 
     // IPv6 host list
-    foreach($DNS['Host'] as $Host)
-    {
-      if(strlen($Host['Name']) < 8) $Host['Name'] .= "\t";
-      if(array_key_exists('IPv6', $Host) and ($Host['IPv6'] != ''))
+    foreach ($DNS['Host'] as $Host)
+    {
+      if (strlen($Host['Name']) < 8) $Host['Name'] .= "\t";
+      if (array_key_exists('IPv6', $Host) and ($Host['IPv6'] != ''))
         $Output .= strtolower($Host['Name'])."\tIN\tAAAA\t".$Host['IPv6']."\n";
     }
 
     // Alias list
-    foreach($DNS['Alias'] as $Alias)
-    {
-      if(strlen($Alias['Name']) < 8) $Alias['Name'] .= "\t";
+    foreach ($DNS['Alias'] as $Alias)
+    {
+      if (strlen($Alias['Name']) < 8) $Alias['Name'] .= "\t";
       $Output .= strtolower($Alias['Name'])."\tIN\tCNAME\t".strtolower($Alias['Target'])."\n";
     }
@@ -71 +71 @@
 
     // Generate reverse DNS records
-    foreach($DNS['Network'] as $Network)
+    foreach ($DNS['Network'] as $Network)
     {
       $Parts = explode('.', $Network);
@@ -83 +83 @@
       "\t\t\t\t".$DNS['Minimum']."\t; minimum\n".
       "\t\t\t\t)\n";
-      foreach($DNS['ReverseNameServer'] as $NameServer)
+      foreach ($DNS['ReverseNameServer'] as $NameServer)
       {
-        if(substr($NameServer, -strlen($DNS['Domain'])) == $DNS['Domain'])
+        if (substr($NameServer, -strlen($DNS['Domain'])) == $DNS['Domain'])
           $Output .= "@\tIN\tNS\t".$NameServer.".\n";
         else $Output .= "\tIN\tNS\t".$NameServer.".\n";
       }
-      foreach($DNS['Host'] as $Host)
-        if(substr($Host['Address'], 0, strlen($Network)) == $Network)
+      foreach ($DNS['Host'] as $Host)
+        if (substr($Host['Address'], 0, strlen($Network)) == $Network)
         {
           $AddressParts = explode('.', $Host['Address']);
@@ -103 +103 @@
 
     // Generate reverse DNS IPv6 records
-    foreach($DNS['IPv6Network'] as $Network)
+    foreach ($DNS['IPv6Network'] as $Network)
     {
       $Parts = explode('/', $Network);
@@ -117 +117 @@
       "\t\t\t\t".$DNS['Minimum']."\t; minimum\n".
       "\t\t\t\t)\n";
-      foreach($DNS['ReverseNameServer'] as $NameServer)
+      foreach ($DNS['ReverseNameServer'] as $NameServer)
       {
-        if(substr($NameServer, -strlen($DNS['Domain'])) == $DNS['Domain'])
+        if (substr($NameServer, -strlen($DNS['Domain'])) == $DNS['Domain'])
           $Output .= "@\tIN\tNS\t".$NameServer.".\n";
         else $Output .= "\tIN\tNS\t".$NameServer.".\n";
       }
-      foreach($DNS['Host'] as $Host)
-        if(array_key_exists('IPv6', $Host) and ($Host['IPv6'] != ''))
+      foreach ($DNS['Host'] as $Host)
+        if (array_key_exists('IPv6', $Host) and ($Host['IPv6'] != ''))
         {
           $Addr = new NetworkAddressIPv6();
@@ -161 +161 @@
     $BaseDir = '/var/cache/bind';
     //$BaseDir = '/home/chronos/Projekty/centrala/trunk/var/named';
-    if(!file_exists($BaseDir)) die('Base directory "'.$BaseDir.'" not exists.');
+    if (!file_exists($BaseDir)) die('Base directory "'.$BaseDir.'" not exists.');
     $MailServer = 'centrala';
 
@@ -193 +193 @@
       'JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` '.
       'WHERE (`NetworkInterface`.`LocalIP` <> "") AND (`NetworkDevice`.`Used` = 1)');
-    while($Interface = $DbResult->fetch_assoc())
-    {
-      $Name = $Interface['DeviceName'];
-      if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+    while ($Interface = $DbResult->fetch_assoc())
+    {
+      $Name = $Interface['DeviceName'];
+      if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
       $LocalDNS['Host'][] = array('Name' => $Name, 'Address' => $Interface['LocalIP'],
           'IPv6' => $Interface['IPv6']);
@@ -205 +205 @@
         'JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` '.
         'WHERE (`NetworkInterface`.`ExternalIP` <> "") AND (`NetworkDevice`.`Used` = 1)');
-    while($Interface = $DbResult->fetch_assoc())
-    {
-      $Name = $Interface['DeviceName'];
-      if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+    while ($Interface = $DbResult->fetch_assoc())
+    {
+      $Name = $Interface['DeviceName'];
+      if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
       $LocalDNS['Host'][] = array('Name' => $Name.'-ext', 'Address' => $Interface['ExternalIP']);
     }
@@ -216 +216 @@
      $DbResult = $Database->query('SELECT NetworkInterface.*, NetworkDevice.Name AS DeviceName FROM NetworkInterface '.
      'JOIN NetworkDevice ON NetworkDevice.Id = NetworkInterface.Device WHERE NetworkInterface.CZFreeIP <> ""');
-     while($Interface = $DbResult->fetch_assoc())
+     while ($Interface = $DbResult->fetch_assoc())
      {
      $Name = $Interface['DeviceName'];
-     if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+     if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
      $LocalDNS['Host'][] = array('Name' => $Name.'-czfree', 'Address' => $Interface['CZFreeIP']);
      }
@@ -226 +226 @@
     // Domain aliases
     $DbResult = $this->Database->select('NetworkDomainAlias', '*');
-    while($Alias = $DbResult->fetch_assoc())
+    while ($Alias = $DbResult->fetch_assoc())
     {
       $LocalDNS['Alias'][] = array('Name' => $Alias['Name'], 'Target' => $Alias['Target']);
@@ -257 +257 @@
         'JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` WHERE '.
         '(`NetworkInterface`.`ExternalIP` != "") AND (`NetworkDevice`.`Used` = 1)');
-    while($Interface = $DbResult->fetch_assoc())
-    {
-      $Name = $Interface['DeviceName'];
-      if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+    while ($Interface = $DbResult->fetch_assoc())
+    {
+      $Name = $Interface['DeviceName'];
+      if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
       $ExternalDNS['Host'][] = array('Name' => $Name, 'Address' => $Interface['ExternalIP'],
           'IPv6' => $Interface['IPv6']);
@@ -268 +268 @@
     $DbResult = $this->Database->query('SELECT `NetworkDomainAlias`.* FROM `NetworkDomainAlias`');
     // JOIN `NetworkDevice` ON NetworkDomainAlias.Target LIKE NetworkDevice.Name AND NetworkInterface.ExternalIP != ""');
-    while($Alias = $DbResult->fetch_assoc())
+    while ($Alias = $DbResult->fetch_assoc())
     {
       $ExternalDNS['Alias'][] = array('Name' => $Alias['Name'], 'Target' => $Alias['Target']);
@@ -302 +302 @@
         'JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` '.
         'WHERE (`NetworkInterface`.`LocalIP` != "") AND (`NetworkDevice`.`Used` = 1)');
-    while($Interface = $DbResult->fetch_assoc())
-    {
-      $Name = $Interface['DeviceName'];
-      if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+    while ($Interface = $DbResult->fetch_assoc())
+    {
+      $Name = $Interface['DeviceName'];
+      if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
       $CZFreeDNS['Host'][] = array('Name' => $Name, 'Address' => $Interface['LocalIP']);
     }
@@ -312 +312 @@
     $DbResult = $this->Database->query('SELECT `NetworkDomainAlias`.* FROM `NetworkDomainAlias`');
     // JOIN `hosts` ON NetworkDomainAlias.Target LIKE hosts.name AND hosts.czfree_ip != ""');
-    while($Alias = $DbResult->fetch_assoc())
+    while ($Alias = $DbResult->fetch_assoc())
     {
       $CZFreeDNS['Alias'][] = array('Name' => $Alias['Name'], 'Target' => $Alias['Target']);
@@ -344 +344 @@
     $DbResult = $this->Database->query('SELECT `NetworkInterface`.*, `NetworkDevice`.`Name` AS `DeviceName` FROM `NetworkInterface` '.
         'JOIN `NetworkDevice` ON `NetworkDevice`.`Id` = `NetworkInterface`.`Device` WHERE `NetworkInterface`.`LocalIP` != ""');
-    while($Interface = $DbResult->fetch_assoc())
-    {
-      $Name = $Interface['DeviceName'];
-      if($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
+    while ($Interface = $DbResult->fetch_assoc())
+    {
+      $Name = $Interface['DeviceName'];
+      if ($Interface['Name'] != '') $Name .= '-'.$Interface['Name'];
       //  $CZFreeLocalDNS['Host'][] = array('Name' => $Name.'-czfree', 'Address' => $Interface['LocalIP']);
       $CZFreeLocalDNS['Host'][] = array('Name' => $Name, 'Address' => $Interface['LocalIP']);
@@ -355 +355 @@
     $DbResult = $this->Database->query('SELECT `NetworkDomainAlias`.* FROM `NetworkDomainAlias`');
     // JOIN `hosts` ON NetworkDomainAlias.Target LIKE hosts.name AND hosts.czfree_ip != ""');
-    while($Alias = $DbResult->fetch_assoc())
+    while ($Alias = $DbResult->fetch_assoc())
     {
       $CZFreeLocalDNS['Alias'][] = array('Name' => $Alias['Name'], 'Target' => $Alias['Target']);

trunk/Modules/NetworkConfigLinux/Generators/IPTables.php

@@ -1 +1 @@
 <?php
-if(isset($_SERVER['REMOTE_ADDR'])) die();
+if (isset($_SERVER['REMOTE_ADDR'])) die();
 include_once('../../../Common/Global.php');
 
@@ -14 +14 @@
 // Blocking according IP address
 $DbResult = $Database->select('users', '*', 'inet = 0');
-while($User = $DbResult->fetch_array())
+while ($User = $DbResult->fetch_array())
 {
   $DbResult2 = $Database->select('hosts', '*', "block<2 AND MAC!='' AND user=".$User['id']);
-  while($Row = $DbResult2->fetch_array())
+  while ($Row = $DbResult2->fetch_array())
   {
     exec('/sbin/iptables -t nat -A Block -s '.$Row['IP'].' -j Local');
@@ -23 +23 @@
 }
 $DbResult = $Database->select('users', '*', 'inet = 1');
-while($User = $DbResult->fetch_array())
+while ($User = $DbResult->fetch_array())
 {
   $DbResult2 = $Database->select('hosts','*',"block<2 AND MAC!='' AND vpn=1 AND user=".$User['id']);
-  while($Row = $DbResult2->fetch_array())
+  while ($Row = $DbResult2->fetch_array())
   {
     exec('/sbin/iptables -t nat -A Block -s '.$Row['IP'].' -j Local');
@@ -36 +36 @@
 // Blocking according MAC address
 $DbResult = $Database->select('users', '*');
-while($User = $DbResult->fetch_array())
+while ($User = $DbResult->fetch_array())
 {
   //echo($User['fullname']."\n");
   $DbResult2 = $Database->select('hosts', '*', '(block < 2) AND (MAC != "") AND (user='.$User['id'].') AND (IP != external_ip) ORDER BY id DESC');
-  while($Row = $DbResult2->fetch_array())
+  while ($Row = $DbResult2->fetch_array())
   {
     //echo(' '.$Row['name']." ".$Row['MAC']." ");
-    if($User['inet'] == 0)
+    if ($User['inet'] == 0)
     {
-      //if(($Row['block'] == 0) and ($Row['type'] == 1)) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
+      //if (($Row['block'] == 0) and ($Row['type'] == 1)) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
       //    else exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Local");
     } else {
-      if($Row['vpn'] == 0)
+      if ($Row['vpn'] == 0)
       {
   $CZFreeLocalIP = $Row['IP'];
         //echo($Row['external_ip']."\n");
-  //if($Row['name'] == 'TBC')
+  //if ($Row['name'] == 'TBC')
   //{
         //  exec('/sbin/iptables -t nat -A PreroutingDNAT -m tcp -p tcp --dport 3724 -d '.$Row['external_ip'].' -j DNAT --to-destination '.$Row['IP'].':3725');
         //  exec('/sbin/iptables -t nat -A POSTROUTING -m tcp -p tcp -s '.$Row['IP'].' --sport 3725 -o '.$InetInterface.' -j SNAT --to-source '.$Row['external_ip'].':3724');
   //}
-        if(strtolower($Row['name']) != 'gate')
+        if (strtolower($Row['name']) != 'gate')
   {
-      if($Row['external_ip'] != '')
+      if ($Row['external_ip'] != '')
           {
             echo($Row['name'].'='.$Row['external_ip']."\n");
@@ -75 +75 @@
  //echo('vpn');
         //exec('/sbin/iptables -t nat -A PreroutingDNAT -s '.$Row['IP'].' -p udp -m udp --dport 55556 -j DROP');
-        if($Row['external_ip'] != '') exec('/sbin/iptables -t nat -A PreroutingDNAT -d '.$Row['external_ip'].' -j ACCEPT');
+        if ($Row['external_ip'] != '') exec('/sbin/iptables -t nat -A PreroutingDNAT -d '.$Row['external_ip'].' -j ACCEPT');
         exec('/sbin/iptables -t nat -A Block -s '.ToVpnIp($Row)." -j Proxy");
 
-        //if($Row['vpn'] == 1)
+        //if ($Row['vpn'] == 1)
   //{
     //exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Local");
-        //} else if($Row['vpn'] == 2) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
+        //} else if ($Row['vpn'] == 2) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
       }
-      if($Row['czfree_ip'] != '')
+      if ($Row['czfree_ip'] != '')
       {
         // CZFree

trunk/Modules/NetworkConfigLinux/Generators/Latency.php

@@ -14 +14 @@
       'FROM `NetworkInterface` '.
       'WHERE (`NetworkInterface`.`Enabled`=1) AND (`NetworkInterface`.`LocalIP` !="")');
-    while($DbRow = $DbResult->fetch_assoc())
+    while ($DbRow = $DbResult->fetch_assoc())
     {
       $Hosts[] = $DbRow['LocalIP'];
@@ -23 +23 @@
 
     $Queries = array();
-    foreach($Output as $Index => $Line) 
+    foreach ($Output as $Index => $Line) 
     {
       $IP = substr($Line, 0, strPos($Line, ' '));

trunk/Modules/NetworkConfigLinux/Generators/NAT.php

@@ -1 +1 @@
 <?php
-if(isset($_SERVER['REMOTE_ADDR'])) die();
+if (isset($_SERVER['REMOTE_ADDR'])) die();
 include_once('../../../Common/Global.php');
 
@@ -14 +14 @@
 // Blocking according IP address
 $DbResult = $Database->select('users', '*', 'inet = 0');
-while($User = $DbResult->fetch_array())
+while ($User = $DbResult->fetch_array())
 {
   $DbResult2 = $Database->select('hosts', '*', "block<2 AND MAC!='' AND user=".$User['id']);
-  while($Row = $DbResult2->fetch_array())
+  while ($Row = $DbResult2->fetch_array())
   {
     exec('/sbin/iptables -t nat -A Block -s '.$Row['IP'].' -j Local');
@@ -23 +23 @@
 }
 $DbResult = $Database->select('users', '*', 'inet = 1');
-while($User = $DbResult->fetch_array())
+while ($User = $DbResult->fetch_array())
 {
   $DbResult2 = $Database->select('hosts','*',"block<2 AND MAC!='' AND vpn=1 AND user=".$User['id']);
-  while($Row = $DbResult2->fetch_array())
+  while ($Row = $DbResult2->fetch_array())
   {
     exec('/sbin/iptables -t nat -A Block -s '.$Row['IP'].' -j Local');
@@ -36 +36 @@
 // Blocking according MAC address
 $DbResult = $Database->select('users', '*');
-while($User = $DbResult->fetch_array())
+while ($User = $DbResult->fetch_array())
 {
   //echo($User['fullname']."\n");
   $DbResult2 = $Database->select('hosts','*','block<2 AND MAC!="" AND user='.$User['id'].' ORDER BY id DESC');
-  while($Row = $DbResult2->fetch_array())
+  while ($Row = $DbResult2->fetch_array())
   {
     //echo(' '.$Row['name']." ".$Row['MAC']." ");
-    if($User['inet'] == 0)
+    if ($User['inet'] == 0)
     {
-      //if(($Row['block'] == 0) and ($Row['type'] == 1)) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
+      //if (($Row['block'] == 0) and ($Row['type'] == 1)) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
       //    else exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Local");
     } else {
-      if($Row['vpn'] == 0)
+      if ($Row['vpn'] == 0)
       {
   $CZFreeLocalIP = $Row['IP'];
         //echo($Row['external_ip']."\n");
-  //if($Row['name'] == 'TBC')
+  //if ($Row['name'] == 'TBC')
   //{
         //  exec('/sbin/iptables -t nat -A PreroutingDNAT -m tcp -p tcp --dport 3724 -d '.$Row['external_ip'].' -j DNAT --to-destination '.$Row['IP'].':3725');
         //  exec('/sbin/iptables -t nat -A POSTROUTING -m tcp -p tcp -s '.$Row['IP'].' --sport 3725 -o eth1 -j SNAT --to-source '.$Row['external_ip'].':3724');
   //}
-        if(strtolower($Row['name']) != 'centrala')
+        if (strtolower($Row['name']) != 'centrala')
   {
-      if($Row['external_ip'] != '')
+      if ($Row['external_ip'] != '')
           {
             echo($Row['name'].'='.$Row['external_ip']."\n");
@@ -75 +75 @@
  //echo('vpn');
         //exec('/sbin/iptables -t nat -A PreroutingDNAT -s '.$Row['IP'].' -p udp -m udp --dport 55556 -j DROP');
-        if($Row['external_ip'] != '') exec('/sbin/iptables -t nat -A PreroutingDNAT -d '.$Row['external_ip'].' -j ACCEPT');
+        if ($Row['external_ip'] != '') exec('/sbin/iptables -t nat -A PreroutingDNAT -d '.$Row['external_ip'].' -j ACCEPT');
         exec('/sbin/iptables -t nat -A Block -s '.ToVpnIp($Row)." -j Proxy");
 
-        //if($Row['vpn'] == 1)
+        //if ($Row['vpn'] == 1)
   //{
     //exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Local");
-        //} else if($Row['vpn'] == 2) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
+        //} else if ($Row['vpn'] == 2) exec('/sbin/iptables -t nat -A Block -m mac --mac-source '.$Row['MAC']." -j Proxy");
       }
-      if($Row['czfree_ip'] != '')
+      if ($Row['czfree_ip'] != '')
       {
         // CZFree

trunk/Modules/NetworkConfigLinux/Generators/TrafficShaping.php

@@ -1 +1 @@
 <?php
 
-if(isset($_SERVER['REMOTE_ADDR'])) die();
+if (isset($_SERVER['REMOTE_ADDR'])) die();
 
 $Enabled = 1;
@@ -37 +37 @@
   exec('/sbin/iptables -t mangle -F PREROUTING');
   exec('/sbin/iptables -t mangle -F POSTROUTING');
-  if($Enabled)
+  if ($Enabled)
   {
     //exec('/sbin/iptables -t mangle -A FORWARD -j MARK --set-mark 0');
@@ -48 +48 @@
   // In going traffic
   fputs($File, "/sbin/tc qdisc del dev ".$InInterface." root\n");
-  if($Enabled)
+  if ($Enabled)
   {
     fputs($File, "/sbin/tc qdisc add dev ".$InInterface." root handle 1:0 htb default 2\n");
@@ -59 +59 @@
   // Out going traffic
   fputs($File, "/sbin/tc qdisc del dev ".$OutInterface." root\n");
-  if($Enabled)
+  if ($Enabled)
   {
     fputs($File, "/sbin/tc qdisc add dev ".$OutInterface." root handle 1:0 htb default 2\n");
@@ -69 +69 @@
   }
 
-  if(!$Enabled) die("Traffic shaping disabled\n");
-
-  if($ClassesEnabled)
+  if (!$Enabled) die("Traffic shaping disabled\n");
+
+  if ($ClassesEnabled)
   {
   $ClassId = 3;
@@ -124 +124 @@
 
   $DbResult = $Database->select('users', '*, CONCAT(second_name, " ", first_name) as fullname', '(inet=1)');
-  while($User = $DbResult->fetch_array())
+  while ($User = $DbResult->fetch_array())
   {
     $UserClassId = $ClassId;
@@ -152 +152 @@
 
     $DbResult2 = $Database->select('hosts','*',"block=0 AND MAC!='' AND user=".$User['id']);
-    while($Host = $DbResult2->fetch_array())
-    //if($Row['name'] != 'WOW')
+    while ($Host = $DbResult2->fetch_array())
+    //if ($Row['name'] != 'WOW')
     {
       $HostClassId = $ClassId;
@@ -160 +160 @@
       fputs($FileClassInfo, '1:'.$HostClassId.' '.$Host['name']."\n");
       //echo('  Host class id: '.$HostClassId."\n");
-    //if($User['inet'] == 1)
+    //if ($User['inet'] == 1)
       {
         $Prio = 1;
-        if($Host['vpn'] == 1)
+        if ($Host['vpn'] == 1)
         {
-          if($Host['external_ip'] != '') $Host['IP'] = $Host['external_ip'];
+          if ($Host['external_ip'] != '') $Host['IP'] = $Host['external_ip'];
           else $Host['IP'] = ToVpnIp($Host);
         }
 
-        //if($Host['name'] == 'TERMINAL') $SpeedDivider = 0.5;
+        //if ($Host['name'] == 'TERMINAL') $SpeedDivider = 0.5;
           //else
         $SpeedDivider = 1;
 
-        if($Host['name'] == 'centrala')
+        if ($Host['name'] == 'centrala')
         {
           $Host['IP'] = $Host['external_ip'];
@@ -183 +183 @@
            $TableIn = 'FORWARD';
          }
-        //if($Row['name'] == 'TERMINAL2') $Prio = 0;
-        //  if($Row['name'] = 'TERMINAL2') $Prio = 0;
-        if($Host['name'] == 'voip-hajda') $Protocol = ' -p tcp';
+        //if ($Row['name'] == 'TERMINAL2') $Prio = 0;
+        //  if ($Row['name'] = 'TERMINAL2') $Prio = 0;
+        if ($Host['name'] == 'voip-hajda') $Protocol = ' -p tcp';
         else $Protocol = '';
-        //  if($Host['name'] == 'KARLOS') $UserMaxSpeedIn = 128000;
+        //  if ($Host['name'] == 'KARLOS') $UserMaxSpeedIn = 128000;
         /*
-if($Host['name'] == 'GAME')
+if ($Host['name'] == 'GAME')
         {
           exec('/sbin/iptables -t mangle -F game-server');
@@ -195 +195 @@
           $TableIn = 'game-server';
         }*/
-        //if($Host['name'] == 'TBC') continue;
+        //if ($Host['name'] == 'TBC') continue;
 
         // In going traffic
@@ -213 +213 @@
       }
       // Free inet
-      if($Tarify[$User['inet_tarif_now']]['group_id'] == 3)
+      if ($Tarify[$User['inet_tarif_now']]['group_id'] == 3)
       {
         //exec('/sbin/iptables -t mangle -A '.$TableIn.' -i eth1 -d '.$Host['IP'].$Protocol." -j MARK --set-mark ".$FreeInetClass);
@@ -220 +220 @@
       // VoIP devices
 /*
-      if(($Host['name'] == 'HAJDA-VOIP') || ($Host['name'] == 'NAVRATIL-VOIP'))
+      if (($Host['name'] == 'HAJDA-VOIP') || ($Host['name'] == 'NAVRATIL-VOIP'))
       {
         exec('/sbin/iptables -t mangle -A '.$TableIn." -i eth1 -d ".$Host['IP']." -p udp -j MARK --set-mark ".$VoipClassId);
         exec('/sbin/iptables -t mangle -A '.$TableOut." -o eth1 -s ".$Host['IP']." -p udp -j MARK --set-mark ".$VoipClassId);
       } else
-      if($Host['name'] == 'GAME')
+      if ($Host['name'] == 'GAME')
       {
         exec('/sbin/iptables -t mangle -A FORWARD -o eth1 -s '.$Host['IP']." -j game-server");