Changeset 554

Timestamp:

Jul 8, 2013, 12:44:10 AM (11 years ago)

Author:

chronos

Message:

• Opraveno: Negenerovat síťové fronty u služeb bez přiřazené rychlosti.

Location:

trunk

Files:

• Common/Version.php (modified) (1 diff)
• Modules/Finance/UserState.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/Queue.php (modified) (4 diffs)

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 553; // Subversion revision
+$Revision = 554; // Subversion revision
 $DatabaseRevision = 551; // SQL structure revision
 $ReleaseTime = '2013-07-07';

trunk/Modules/Finance/UserState.php

@@ -90 +90 @@
       if($Row['BillCode'] == '') $Row['BillCode'] = 'PDF';
       if($Row['File'] > 0) $Invoice = '<a href="'.$this->System->Link('/file?id='.$Row['File']).'">'.$Row['BillCode'].'</a>'; 
-        else $Invoice = '&nbsp;';
+        else $Invoice = NotBlank($Row['BillCode']);
       if($Row['PeriodFrom'] != '') $Period = HumanDate($Row['PeriodFrom']).' - '.HumanDate($Row['PeriodTo']);
         else $Period = '&nbsp;';

trunk/Modules/Network/Network.php

@@ -2 +2 @@
 
 include_once(dirname(__FILE__).'/HostList.php');
-include_once(dirname(__FILE__).'/Administration.php');
 include_once(dirname(__FILE__).'/Availability.php');
 include_once(dirname(__FILE__).'/Subnet.php');

trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

@@ -58 +58 @@
 while($Member = $DbResult->fetch_assoc())
 {
-  $Member['Name'] = RouterOSIdent($Member['Name'].'-'.$Member['Id'] );
-
   $ServiceIndex = 1;
   echo('Zákazník '.$Member['Name']."\n");
-  $DbResult4 = $System->Database->query('SELECT `Service`.*, `ServiceCustomerRel`.`Id` AS `RelId` FROM `ServiceCustomerRel` JOIN `Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service` '.
-    'WHERE (`ServiceCustomerRel`.`Customer` = '.$Member['Id'].') AND (`ServiceCustomerRel`.`Action` IS NULL)');
+  $DbResult4 = $System->Database->query('SELECT `Service`.*, `ServiceCustomerRel`.`Id` AS `RelId` FROM `ServiceCustomerRel` '.
+    'JOIN `Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service` '.
+    'WHERE (`ServiceCustomerRel`.`Customer` = '.$Member['Id'].') AND (`ServiceCustomerRel`.`Action` IS NULL) '.
+    'AND (`Service`.`InternetSpeedMax` > 0) AND (`Service`.`InternetSpeedMin` > 0)');
   while($Service = $DbResult4->fetch_assoc())
   {
     echo('Služba '.$Service['Name'].': ');
+    $MemberName = RouterOSIdent($Member['Name'].'-'.$Member['Id'].'-'.$ServiceIndex);
     $SpeedIn = round($Service['InternetSpeedMin'] / $InDivider) * 1000;
     $SpeedOut = round($Service['InternetSpeedMin'] / $OutDivider) * 1000;
@@ -73 +74 @@
     if($ServiceIndex == 1)
     {
-      $ItemsQueue[] = array('name' => $Member['Name'].'-out', 'limit-at' => $SpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => 'main-out');
-      $ItemsQueue[] = array('name' => $Member['Name'].'-in', 'limit-at' => $SpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => 'main-in');
+      $ItemsQueue[] = array('name' => $MemberName.'-out', 'limit-at' => $SpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => 'main-out');
+      $ItemsQueue[] = array('name' => $MemberName.'-in', 'limit-at' => $SpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => 'main-in');
     }
 
@@ -104 +105 @@
         $Subnet = $IPParts[2];
         $PacketMark = GetMarkByComment($Name.'-out');
-        $ItemsQueue[] = array('name' => $Name.'-out', 'limit-at' => $HostSpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => $Member['Name'].'-out', 'packet-mark' => $PacketMark);
+        $ItemsQueue[] = array('name' => $Name.'-out', 'limit-at' => $HostSpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => $MemberName.'-out', 'packet-mark' => $PacketMark);
         $PacketMark = GetMarkByComment($Name.'-in');
-        $ItemsQueue[] = array('name' => $Name.'-in', 'limit-at' => $HostSpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => $Member['Name'].'-in', 'packet-mark' => $PacketMark);
+        $ItemsQueue[] = array('name' => $Name.'-in', 'limit-at' => $HostSpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => $MemberName.'-in', 'packet-mark' => $PacketMark);
       }
     }
@@ -118 +119 @@
       $SubnetNumber = $IPParts[2];
       $PacketMark = GetMarkByComment($Subnet['Name'].'-out');
-      $ItemsQueue[] = array('name' => $Subnet['Name'].'-out', 'limit-at' => $HostSpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => $Member['Name'].'-out', 'packet-mark' => $PacketMark);
+      $ItemsQueue[] = array('name' => $Subnet['Name'].'-out', 'limit-at' => $HostSpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => $MemberName.'-out', 'packet-mark' => $PacketMark);
       $PacketMark = GetMarkByComment($Subnet['Name'].'-in');
-      $ItemsQueue[] = array('name' => $Subnet['Name'].'-in', 'limit-at' => $HostSpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => $Member['Name'].'-in', 'packet-mark' => $PacketMark);
+      $ItemsQueue[] = array('name' => $Subnet['Name'].'-in', 'limit-at' => $HostSpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => $MemberName.'-in', 'packet-mark' => $PacketMark);
     }
     echo("\n");