Changeset 970 for trunk

Timestamp:

Jul 17, 2024, 10:48:28 PM (5 months ago)

Author:

chronos

Message:

• Modified: Service internet speed min and max used as contracted speeds. Real speed will be calculated with bonus speed and further queues calculations.
• Added: Bonus internet speed service field.
• Modified: Few PHP 8.3 fixes.

Location:

trunk

Files:

• Application/BaseView.php (modified) (5 diffs)
• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/Customer/Customer.php (modified) (2 diffs)
• Modules/NetworkConfigRouterOS/Generators/Queue.php (modified) (9 diffs)
• Packages/Common/Page.php (modified) (2 diffs)
• Packages/Common/UTF8.php (modified) (1 diff)

trunk/Application/BaseView.php

@@ -7 +7 @@
   public bool $FormatHTML = false;
   public bool $ShowRuntimeInfo = false;
-  public bool $RawPage = false;
-  public bool $BasicHTML = false;
   public string $ParentClass = '';
   public string $Title;
@@ -85 +83 @@
 
     $Output .= '</head><body'.$BodyParam.'>';
-    if ($this->BasicHTML == false)
+    if ($Page->BasicHTML == false)
     {
       //$Output .= '<div class="MainTitle">'.$Title.'</div>';
@@ -99 +97 @@
   }
 
-  function ShowFooter(): string
+  function ShowFooter(Page $Page): string
   {
     global $Revision, $ReleaseTime;
@@ -105 +103 @@
     $Time = round(GetMicrotime() - Core::Cast($this->System)->ScriptTimeStart, 2);
     $Output = '';
-    if ($this->BasicHTML == false)
+    if ($Page->BasicHTML == false)
     {
       $Output .= '<div id="Footer">'.
@@ -125 +123 @@
     if ($Page->RawPage == false)
     {
-      $Output = $this->ShowHeader($Page).$Output.$this->ShowFooter();
+      $Output = $this->ShowHeader($Page).$Output.$this->ShowFooter($Page);
       if ($this->FormatHTML == true) $Output = $this->FormatOutput($Output);
     }

trunk/Application/UpdateTrace.php

@@ -2259 +2259 @@
       "VALUES (NULL , 'Měsíční přehled', '".$DbRow['Id']."', '".$ActionId."', '1');");   
   }
+}
+
+function UpdateTo970(UpdateManager $Manager): void
+{
+  $Manager->Execute('ALTER TABLE `Service` ADD `InternetSpeedBonus` INT NULL DEFAULT NULL AFTER `InternetSpeedMin`;');
 }
 
@@ -2375 +2380 @@
       953 => array('Revision' => 957, 'Function' => 'UpdateTo957'),
       957 => array('Revision' => 967, 'Function' => 'UpdateTo967'),
+      967 => array('Revision' => 970, 'Function' => 'UpdateTo970'),
     );
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 969; // Subversion revision
-$DatabaseRevision = 967; // SQL structure revision
+$Revision = 970; // Subversion revision
+$DatabaseRevision = 970; // SQL structure revision
 $ReleaseTime = strtotime('2024-07-17');

trunk/Modules/Customer/Customer.php

@@ -85 +85 @@
         'InternetSpeedMin' => array('Type' => 'Integer', 'Caption' => 'Min. rychlost internetu', 'Default' => '0', 'Suffix' => 'bit/s'),
         'InternetSpeedMax' => array('Type' => 'Integer', 'Caption' => 'Max. rychlost internetu', 'Default' => '0', 'Suffix' => 'bit/s'),
+        'InternetSpeedBonus' => array('Type' => 'Integer', 'Caption' => 'Bonusová rychlost internetu', 'Default' => '0', 'Suffix' => 'bit/s'),
         'UploadAsymmetry' => array('Type' => 'Integer', 'Caption' => 'Asymetrie odesílání', 'Default' => '1'),
         'Memory' => array('Type' => 'Integer', 'Caption' => 'Paměť', 'Default' => '0', 'Suffix' => 'GB'),
@@ -385 +386 @@
     $Desc->AddInteger('InternetSpeedMax');
     $Desc->AddInteger('InternetSpeedMin');
+    $Desc->AddInteger('InternetSpeedBonus');
     $Desc->AddInteger('InternetUploadAsymmetry');
     $Desc->AddInteger('Memory');

trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

@@ -3 +3 @@
 class SpeedLimit
 {
-  var $Min;
-  var $Max;
-  var $PacketMark;
+  public int $Min;
+  public int $Max;
+  public ?int $PacketMark;
 
   function __construct(int $Min, int $Max, int $PacketMark = null)
@@ -25 +25 @@
 class SpeedLimitItem
 {
-  var $Name;
-  var $Parent;
-  var $LimitIn;
-  var $LimitOut;
-  var $FixedSpeed;
-  var $SubItems;
+  public string $Name;
+  public ?SpeedLimitItem $Parent;
+  public SpeedLimit $LimitIn;
+  public SpeedLimit $LimitOut;
+  public bool $FixedSpeed;
+  public SpeedLimitItems $SubItems;
 
   function __construct(string $Name, SpeedLimitItem $Parent = null)
@@ -184 +184 @@
     $UsersMaxSpeedIn = round($Finance->MaxSpeed / $InDivider) * 1000;
     $UsersMaxSpeedOut = round($Finance->MaxSpeed / $OutDivider) * 1000;
-    $VoipMaxSpeedIn = $TotalMaxSpeedIn - 136;
-    $VoipMaxSpeedOut = $TotalMaxSpeedOut - 136;
-    $VoipSpeedIn = 100; //$SpeedReserve;
-    $VoipSpeedOut = 100; //$SpeedReserve;
     $OutInterface = 'eth1';
     $InInterface = 'ifb0';
@@ -206 +202 @@
     $this->LoadSpeedLimits($Main);
 
-    // Slow free internet
+    // Free internet
     $Free = new SpeedLimitItem('free', $Main);
     $Free->LimitIn = new SpeedLimit($FreeInetSpeed, $FreeInetSpeed, GetMarkByComment('free-in'));
@@ -226 +222 @@
       while ($Service = $DbResult4->fetch_assoc())
       {
+        $MinSpeed = $Service['InternetSpeedMin'];
+        $MaxSpeed = $Service['InternetSpeedMax'];
+        if ($Service['InternetSpeedBonus'] > $MaxSpeed) $MaxSpeed = $Service['InternetSpeedBonus'];
+
         echo('Služba '.$Service['Name'].': ');
         $MemberName = RouterOSIdent($Member['Name'].'-'.$Member['Id'].'-'.$ServiceIndex);
-        $SpeedIn = round($Service['InternetSpeedMin'] / $InDivider);
-        $SpeedOut = round($Service['InternetSpeedMin'] / $OutDivider);
-        $UserMaxSpeedIn = round($Service['InternetSpeedMax'] / $InDivider);
-        $UserMaxSpeedOut = round($Service['InternetSpeedMax'] / $OutDivider);
+        $MinReduction = 100;
+        $SpeedIn = round($MinSpeed / $InDivider / $MinReduction);
+        $SpeedOut = round($MinSpeed / $OutDivider / $MinReduction);
+        $UserMaxSpeedIn = round($MaxSpeed / $InDivider);
+        $UserMaxSpeedOut = round($MaxSpeed / $OutDivider);
 
         // Reduce max speed by speed limits
@@ -302 +303 @@
     echo($Main->Print());
     $ItemsQueue = $Main->GetCommands();
-    $Routerboard->ListUpdate($PathQueue, array('name', 'limit-at', 'max-limit', 'parent', 'packet-mark'), $ItemsQueue, array(), true);
+    //$Routerboard->ListUpdate($PathQueue, array('name', 'limit-at', 'max-limit', 'parent', 'packet-mark'), $ItemsQueue, array(), true);
   }
 
@@ -415 +416 @@
     while (count($DevicesToCheck) > 0)
     {
-      //echo('Pass'."\n");
       $NewDevicesToCheck = array();
       foreach ($DevicesToCheck as $DeviceId)
       {
-        //echo($this->Devices[$DeviceId]['Name'].': ');
         foreach ($this->Devices[$DeviceId]['Interfaces'] as $InterfaceId)
         {
@@ -435 +434 @@
               if ($NewMaxSpeed > $Link['MaxRealSpeed'])
                 $NewMaxSpeed = $Link['MaxRealSpeed'];
-              //echo($this->Devices[$Device2Id]['Name'].' '.$Device2Id.', ');
               $this->Devices[$Device2Id]['MaxSpeed'] = $NewMaxSpeed;
               // Set nodes tree relation
               $this->Devices[$Device2Id]['Parent'] = $DeviceId;
               $this->Devices[$DeviceId]['Childs'][] = $Device2Id;
-              //echo($NewMaxSpeed.", ".count($NewDevicesToCheck).' ');
               $NewDevicesToCheck[] = $Device2Id;
             }
           }
         }
-        //echo("\n");
       }
       $DevicesToCheck = $NewDevicesToCheck;
@@ -515 +511 @@
     $InDivider = 1;
     $OutDivider = 1;
-    $TotalMaxSpeedIn = round($Finance->RealMaxSpeed / $InDivider) * 1000;
-    $TotalMaxSpeedOut = round($Finance->RealMaxSpeed / $OutDivider) * 1000;
     $UsersMaxSpeedIn = round($Finance->MaxSpeed / $InDivider) * 1000;
     $UsersMaxSpeedOut = round($Finance->MaxSpeed / $OutDivider) * 1000;
-    $VoipMaxSpeedIn = $TotalMaxSpeedIn - 136;
-    $VoipMaxSpeedOut = $TotalMaxSpeedOut - 136;
-    $VoipSpeedIn = 100; //$SpeedReserve;
-    $VoipSpeedOut = 100; //$SpeedReserve;
-    $OutInterface = 'eth1';
-    $InInterface = 'ifb0';
-    $InetInterface = $this->System->Config['MainRouter']['InetInterface'];
 
     $DbResult = $this->Database->select('Service', '*', '(`ChangeAction` IS NULL) AND (`Id`='.TARIFF_FREE.')');

trunk/Packages/Common/Page.php

@@ -7 +7 @@
   public string $ParentClass;
   public bool $RawPage;
+  public bool $BasicHTML;
   public $OnSystemMessage;
   public string $Load;
@@ -15 +16 @@
     parent::__construct($System);
     $this->RawPage = false;
+    $this->BasicHTML = false;
     $this->OnSystemMessage = array();
     $this->Title = "";

trunk/Packages/Common/UTF8.php

@@ -33 +33 @@
 class Encoding
 {
+  public array $CharTable;
+  
   function __construct()
   {