Changeset 888

Timestamp:

Nov 24, 2020, 10:58:56 AM (3 years ago)

Author:

chronos

Message:

• Modified: More static types added.

Location:

trunk

Files:

• Modules/Chat/irc_bot.php (modified) (1 diff)
• Modules/EmailQueue/EmailQueue.php (modified) (1 diff)
• Modules/Finance/Bill.php (modified) (1 diff)
• Modules/Finance/Finance.php (modified) (4 diffs)
• Modules/Finance/Import.php (modified) (1 diff)
• Modules/Finance/Trade.php (modified) (14 diffs)
• Modules/Finance/UserState.php (modified) (1 diff)
• Modules/FinanceBankAPI/FioAPI.php (modified) (2 diffs)
• Modules/IS/IS.php (modified) (1 diff)
• Modules/Log/Log.php (modified) (1 diff)
• Modules/Map/MapAPI.php (modified) (1 diff)
• Modules/Meals/Meals.php (modified) (1 diff)
• Modules/Meteostation/Meteostation.php (modified) (3 diffs)
• Modules/NetworkConfig/NetworkConfig.php (modified) (1 diff)
• Modules/NetworkConfigAirOS/Generators/SSHClient.php (modified) (3 diffs)
• Modules/NetworkConfigRouterOS/Routerboard.php (modified) (4 diffs)
• Modules/NetworkConfigRouterOS/Routerboard2.php (modified) (2 diffs)
• Modules/NetworkConfigRouterOS/RouterboardAPI.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/SSH.php (modified) (2 diffs)
• Modules/NetworkShare/SharePage.php (modified) (4 diffs)
• Modules/NetworkTopology/NetworkTopology.php (modified) (3 diffs)
• Modules/TimeMeasure/Graph.php (modified) (1 diff)
• Modules/TimeMeasure/Measure.php (modified) (3 diffs)
• Packages/Common/BigInt.php (modified) (25 diffs)
• Packages/Common/Config.php (modified) (5 diffs)
• Packages/Common/Database.php (modified) (1 diff)
• Packages/Common/Generics.php (modified) (1 diff)
• Packages/Common/NetworkAddress.php (modified) (11 diffs)
• Packages/Common/Page.php (modified) (1 diff)
• Packages/Common/Process.php (modified) (5 diffs)
• Packages/Common/Table.php (modified) (1 diff)
• Packages/Common/UTF8.php (modified) (1 diff)
• Packages/Common/Update.php (modified) (5 diffs)

trunk/Modules/Chat/irc_bot.php

@@ -5 +5 @@
 class IRCBot
 {
-  var $OwnerName = 'Chronosův';
-  var $Server = "game.zdechov.net";
-  var $Port = 6667;
-  var $Channel = "#zdechov";
-  var $Nick = "History";
-  var $JokeFileName = "jokes.txt";
-  var $File;
+  public string $OwnerName = 'Chronosův';
+  public string $Server = "game.zdechov.net";
+  public int $Port = 6667;
+  public string $Channel = "#zdechov";
+  public string $Nick = "History";
+  public string $JokeFileName = "jokes.txt";
+  public $File;
 
   function __construct()

trunk/Modules/EmailQueue/EmailQueue.php

@@ -78 +78 @@
   }
 
-  function AddItem($To, $Subject, $Content, $From, $AttachmentFileId = '')
+  function AddItem(string $To, string $Subject, string $Content, string $From, string $AttachmentFileId = ''): void
   {
     $Values = array('To' => $To,

trunk/Modules/Finance/Bill.php

@@ -6 +6 @@
   public bool $Checked = false;
 
-  function GenerateHTML()
+  function GenerateHTML(): string
   {
     return '';
   }
 
-  function SaveToFile(string $FileName)
+  function SaveToFile(string $FileName): void
   {
     $PdfData = $this->HtmlToPdf($this->GenerateHTML());

trunk/Modules/Finance/Finance.php

@@ -22 +22 @@
 class Finance extends Model
 {
-  var $kWh;
-  var $Internet;
-  var $Sprava;
-  var $DatumOdecteni;
-  var $InternetUsers;
-  var $SpravaUsers;
-  var $MaxSpeed;
-  var $RealMaxSpeed;
-  var $SpeedReserve;
-  var $BaseSpeedElement;
-  var $BaseTariffPrice;
-  var $TopTariffPrice;
-  var $TotalPaid;
-  var $TotalInternetPaid;
-  var $MainSubject;
-  var $BillingPeriods;
-  var $DirectoryId;
-  var $Rounding;
+  public string $kWh;
+  public string $Internet;
+  public string $Sprava;
+  public string $DatumOdecteni;
+  public string $InternetUsers;
+  public string $SpravaUsers;
+  public string $MaxSpeed;
+  public string $RealMaxSpeed;
+  public string $SpeedReserve;
+  public string $BaseSpeedElement;
+  public string $BaseTariffPrice;
+  public string $TopTariffPrice;
+  public string $TotalPaid;
+  public string $TotalInternetPaid;
+  public string $MainSubject;
+  public array $BillingPeriods;
+  public string $DirectoryId;
+  public string $Rounding;
 
   function LoadMonthParameters(int $Period = 1) // 0 - now, 1 - next month
@@ -83 +83 @@
   }
 
-  function CreateFinanceYear($Year)
+  function CreateFinanceYear(int $Year)
   {
     $StartTime = mktime(0, 0, 0, 1, 1, $Year);
@@ -100 +100 @@
   }
 
-  function GetFinanceYear(int $Year)
+  function GetFinanceYear(int $Year): array
   {
     if ($Year == 0)
@@ -121 +121 @@
   }
 
-  function GetNextDocumentLineNumber(string $Id, int $FinanceYear = 0)
+  function GetNextDocumentLineNumber(string $Id, int $FinanceYear = 0): string
   {
           $FinanceYear = $this->GetFinanceYear($FinanceYear);

trunk/Modules/Finance/Import.php

@@ -128 +128 @@
   }
 
-  function InsertMoney(string $Subject, string $Value, string $Cash, string $Taxable, string $Time, string $Text, array $Group)
+  function InsertMoney(string $Subject, string $Value, string $Cash, string $Taxable, string $Time, string $Text, array $Group): void
   {
     $Year = date('Y', $Time);

trunk/Modules/Finance/Trade.php

@@ -3 +3 @@
 class PageFinanceTaxFiling extends Page
 {
-  var $StartEvidence = 0;
+  public int $StartEvidence = 0;
 
   function __construct(System $System)
@@ -13 +13 @@
   }
 
-  function GetTimePeriodBalance($StartTime, $EndTime)
+  function GetTimePeriodBalance(int $StartTime, int $EndTime): array
   {
     $Balance = array();
@@ -73 +73 @@
   }
 
-  function ShowAnnualBalance()
+  function ShowAnnualBalance(): string
   {
     $Output = '<table style="font-size: smaller;" class="WideTable">';
@@ -109 +109 @@
   }
 
-  function ShowMonthlyBalance()
+  function ShowMonthlyBalance(): string
   {
     $Output = '<table class="WideTable" style="font-size: smaller;">';
@@ -151 +151 @@
   }
 
-  function ShowIncomes()
+  function ShowIncomes(): string
   {
     $Table = array('Ne', 'Ano');
@@ -190 +190 @@
   }
 
-  function ShowExpenses()
+  function ShowExpenses(): string
   {
     $Table = array('Ne', 'Ano');
@@ -231 +231 @@
   }
 
-  function ShowClaims()
+  function ShowClaims(): string
   {
     $Table = array('Ne', 'Ano');
@@ -262 +262 @@
   }
 
-  function ShowLiabilities()
+  function ShowLiabilities(): string
   {
     $Table = array('Ne', 'Ano');
@@ -294 +294 @@
   }
 
-  function ShowSubjectList()
+  function ShowSubjectList(): string
   {
     $Output = '<strong>Seznam subjektů</strong>';
@@ -327 +327 @@
   }
 
-  function ShowSmallAssets()
+  function ShowSmallAssets(): string
   {
     $Output = '<strong>Drobný majetek</strong>';
@@ -343 +343 @@
   }
 
-  function ShowSubjectAccount()
+  function ShowSubjectAccount(): string
   {
     $Finance = &ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance;
@@ -408 +408 @@
   }
 
-  function ShowDefault()
+  function ShowDefault(): string
   {
     $Output = '<strong>Celkové přehledy</strong><br/>';
@@ -486 +486 @@
   }
 
-  function ShowFinanceYears()
+  function ShowFinanceYears(): string
   {
     $Output = 'Roky: ';
@@ -499 +499 @@
   {
     $TimeDue = $Time + 15 * 24 * 3600; // 15 dnů
-
   }
 

trunk/Modules/Finance/UserState.php

@@ -11 +11 @@
   }
 
-  function ShowFinanceOperation($Subject)
+  function ShowFinanceOperation(int $Subject): string
   {
     $UserOperationTableQuery = '((SELECT `Text`, `Time`, `Value`, `File`, `BillCode`, NULL AS `PeriodFrom`, NULL AS `PeriodTo`, `DocumentLineCode`.`Name` AS `BillName` '.

trunk/Modules/FinanceBankAPI/FioAPI.php

@@ -5 +5 @@
 include('GPC.php');
 
-function RemoveComma($Text)
+function RemoveComma(string $Text): string
 {
   if ((mb_strlen($Text) >= 2) and ($Text[0] == '"') and (mb_substr($Text, -1, 1) == '"')) return mb_substr($Text, 1, -1);
@@ -13 +13 @@
 class FioAPI
 {
-  var $Token;
-  var $Encoding;
-  var $Format;
+  public string $Token;
+  public string $Encoding;
+  public string $Format;
 
   function __construct()

trunk/Modules/IS/IS.php

@@ -845 +845 @@
 class ModuleIS extends AppModule
 {
-  var $DashboardItems;
+  public array $DashboardItems;
 
   function __construct(System $System)

trunk/Modules/Log/Log.php

@@ -67 +67 @@
     $Count = 100;
 
-    $Output = '';
     $Items = array();
     if (array_key_exists('type', $_GET)) $Where = ' WHERE `Type` = "'.($_GET['type'] * 1).'"';

trunk/Modules/Map/MapAPI.php

@@ -18 +18 @@
   public int $Zoom;
   public string $Key;
-  var $OnClickObject;
+  public $OnClickObject;
   public string $MarkerText;
   public array $Markers;

trunk/Modules/Meals/Meals.php

@@ -3 +3 @@
 class PageEatingPlace extends Page
 {
-  var $DayNames = array('Neděle', 'Pondělí', 'Úterý', 'Středa', 'Čtvrtek', 'Pátek', 'Sobota');
-  var $DayNamesShort = array('NE', 'PO', 'ÚT', 'ST', 'ČT', 'PÁ', 'SO');
-  var $Status = array('Nezveřejněno', 'Otevřeno', 'Zavřeno - svátek', 'Zavřeno - dovolená');
-  var $DayCount = 20;    // počet dopředu zobrazených dnů
+  public array $DayNames = array('Neděle', 'Pondělí', 'Úterý', 'Středa', 'Čtvrtek', 'Pátek', 'Sobota');
+  public array $DayNamesShort = array('NE', 'PO', 'ÚT', 'ST', 'ČT', 'PÁ', 'SO');
+  public array $Status = array('Nezveřejněno', 'Otevřeno', 'Zavřeno - svátek', 'Zavřeno - dovolená');
+  public int $DayCount = 20;    // počet dopředu zobrazených dnů
 
   function __construct(System $System)

trunk/Modules/Meteostation/Meteostation.php

@@ -21 +21 @@
 class MeteoStation extends Model
 {
-  var $Id;
-  var $Name;
-  var $Period;
-  var $URL;
+  public int $Id;
+  public string $Name;
+  public int $Period;
+  public string $URL;
 
   function DownloadData(): void
@@ -54 +54 @@
   }
 
-  function CreateImage($FileName): void
+  function CreateImage(string $FileName): void
   {
     $Image = new Image();
@@ -79 +79 @@
 class ModuleMeteoStation extends AppModule
 {
-  var $Data;
-
   function __construct(System $System)
   {

trunk/Modules/NetworkConfig/NetworkConfig.php

@@ -3 +3 @@
 class ModuleNetworkConfig extends AppModule
 {
-  var $ConfigItems;
+  public array $ConfigItems;
 
   function __construct(System $System)

trunk/Modules/NetworkConfigAirOS/Generators/SSHClient.php

@@ -3 +3 @@
 class SSHClient
 {
-  var $SSHPath;
-  var $Timeout;
-  var $HostName;
-  var $UserName;
-  var $Password;
-  var $PrivateKey;
-  var $Debug;
+  public string $SSHPath;
+  public int $Timeout;
+  public string $HostName;
+  public string $UserName;
+  public string $Password;
+  public string $PrivateKey;
+  public bool $Debug;
 
   function __construct($HostName = 'localhost', $UserName = 'admin', $Password = '')
@@ -22 +22 @@
   }
 
-  function Execute($Commands)
+  function Execute(string $Commands): array
   {
     $Commands = trim($Commands);
@@ -37 +37 @@
       $Output = array();
       exec($Command, $Output);
-    } else $Output = '';
+    } else $Output = array();
     if ($this->Debug) print_r($Output);
     return $Output;

trunk/Modules/NetworkConfigRouterOS/Routerboard.php

@@ -3 +3 @@
 class Routerboard
 {
-  var $SSHPath = '/usr/bin/ssh';
-  var $Timeout = 3;
-  var $HostName;
-  var $UserName;
-  var $Password;
-  var $PrivateKey = '~/.ssh/id_rsa';
-  var $MaxBurstLineCount = 100;
-  var $Debug = false;
+  public string $SSHPath = '/usr/bin/ssh';
+  public int $Timeout = 3;
+  public string $HostName;
+  public string $UserName;
+  public string $Password;
+  public string $PrivateKey = '~/.ssh/id_rsa';
+  public int $MaxBurstLineCount = 100;
+  public bool $Debug = false;
 
   function __construct($HostName = 'localhost', $UserName = 'admin', $Password = '')
@@ -19 +19 @@
   }
 
-  function Execute(array $Commands): array
+  function Execute($Commands): array
   {
     $Output = array();
@@ -75 +75 @@
       if (count($ResultLineParts) > 1)
       {
-        if ($ResultLineParts[1]{0} == '"') $ResultLineParts[1] = substr($ResultLineParts[1], 1, -1); // Remove quotes
+        if ($ResultLineParts[1][0] == '"') $ResultLineParts[1] = substr($ResultLineParts[1], 1, -1); // Remove quotes
         $List[substr($ResultLineParts[0], 0, -1)] = $ResultLineParts[1];
       } else $List[substr($ResultLineParts[0], 0, -1)] = '';
@@ -116 +116 @@
   }
 
-  function ListGetPrint($Path, $Properties, $Conditions = array()): array
+  function ListGetPrint(array $Path, array $Properties, array $Conditions = array()): array
   {
     $ConditionList = '';

trunk/Modules/NetworkConfigRouterOS/Routerboard2.php

@@ -5 +5 @@
 class Routerboard extends SSH
 {
-  var $Methods = array(
+  public array $Methods = array(
     'kex' => 'diffie-hellman-group1-sha1',
     'client_to_server' => array('crypt' => '3des-cbc', 'comp' => 'none'),
@@ -11 +11 @@
   );
 
-  function Execute($Commands): array
+  function Execute(array $Commands): array
   {
     if (is_array($Commands)) $Commands = implode(';', $Commands);

trunk/Modules/NetworkConfigRouterOS/RouterboardAPI.php

@@ -3 +3 @@
 class RouterosAPI
 {
-  var $ErrorNo;           // Variable for storing connection error number, if any
-  var $ErrorStr;          // Variable for storing connection error text, if any
-  var $Attempts;       // Connection attempt count
-  var $Connected;  // Connection state
-  var $Delay;          // Delay between connection attempts in seconds
-  var $Port;        // Port to connect to
-  var $Timeout;        // Connection attempt timeout and data read timeout
-  var $Socket;             // Variable for storing socket resource
-  var $Debug;
-  var $SSL; // If SSL API connection is used. You need also change port to 8729
+  public int $ErrorNo;           // Variable for storing connection error number, if any
+  public string $ErrorStr;          // Variable for storing connection error text, if any
+  public int $Attempts;       // Connection attempt count
+  public bool $Connected;  // Connection state
+  public int $Delay;          // Delay between connection attempts in seconds
+  public int $Port;        // Port to connect to
+  public int $Timeout;        // Connection attempt timeout and data read timeout
+  public int $Socket;             // Variable for storing socket resource
+  public bool $Debug;
+  public bool $SSL; // If SSL API connection is used. You need also change port to 8729
 
   function __construct()

trunk/Modules/NetworkConfigRouterOS/SSH.php

@@ -3 +3 @@
 class SSH
 {
-  var $HostName;
-  var $UserName;
-  var $Password;
-  var $Methods;
+  public string $HostName;
+  public string $UserName;
+  public string $Password;
+  public array $Methods;
 
   function __construct($HostName = 'localhost', $UserName = 'admin', $Password = '')
@@ -13 +13 @@
     $this->UserName = $UserName;
     $this->Password = $Password;
+    $this->Methods = array();
   }
 
-  function Execute($Commands)
+  function Execute(array $Commands): array
   {
     echo($Commands);

trunk/Modules/NetworkShare/SharePage.php

@@ -3 +3 @@
 class SharePage extends Page
 {
-  var $Dependencies = array('Log');
-  var $MaxNesting = 20; // Maximální vnoření
-  var $Promene = array( // Automatické zapamatování proměnných
+  public array $Dependencies = array('Log');
+  public int $MaxNesting = 20; // Maximální vnoření
+  public array $Promene = array( // Automatické zapamatování proměnných
     'keyword' => '',
     'file_type' => 0,
@@ -25 +25 @@
   }
 
-  function ShowTime()
+  function ShowTime(): string
   {
     return date("H:i:s")."<br />\n";
@@ -40 +40 @@
 
     // Najde cestu ke keřenu
-  function PlnaCesta($Row)
+  function PlnaCesta($Row): string
   {
     // Vyhledání cesty
@@ -60 +60 @@
 
   // Převede velikost v bajtech na odpovídající jednotky
-  function PrevedVelikost($Velikost)
+  function PrevedVelikost($Velikost): string
   {
     $Jednotky = array('B','kB','MB','GB','TB','PB','EB');

trunk/Modules/NetworkTopology/NetworkTopology.php

@@ -3 +3 @@
 class PageNetworkTopology extends Page
 {
-  var $TopHostName = 'NIX-ROUTER';
+  public string $TopHostName = 'NIX-ROUTER';
 
   function __construct(System $System)
@@ -23 +23 @@
   }
 
-  function ShowImage()
+  function ShowImage(): string
   {
     $this->SimplePage = true;
@@ -117 +117 @@
   }
 
-  function ShowOverview()
+  function ShowOverview(): string
   {
     $Output = '<img src="topologie.png"><br/>

trunk/Modules/TimeMeasure/Graph.php

@@ -3 +3 @@
 class PageGraph extends Page
 {
-  var $FontSize;
-  var $FontFileName;
-  var $ValueToImageHeigthCoefficient;
-  var $DefaultWidth;
-  var $DefaultHeight;
+  public int $FontSize;
+  public string $FontFileName;
+  public float $ValueToImageHeigthCoefficient;
+  public int $DefaultWidth;
+  public int $DefaultHeight;
 
   function __construct(System $System)

trunk/Modules/TimeMeasure/Measure.php

@@ -3 +3 @@
 class Measure extends Model
 {
-  var $Data;
-  var $LevelReducing = 5;
-  var $ReferenceTime = 0;
-  var $MaxLevel = 4;
-  var $Differential = 0;
-  var $Debug = 0;
-  var $DivisionCount = 500;
-  var $ValueTypes = array('Min', 'Avg', 'Max');
-
-  function Load($Id)
+  public array $Data;
+  public int $LevelReducing = 5;
+  public int $ReferenceTime = 0;
+  public int $MaxLevel = 4;
+  public int $Differential = 0;
+  public int $Debug = 0;
+  public int $DivisionCount = 500;
+  public array $ValueTypes = array('Min', 'Avg', 'Max');
+
+  function Load(int $Id): void
   {
     $Result = $this->Database->select('Measure', '*', 'Id='.$Id);
@@ -28 +28 @@
   }
 
-  function StatTableName($Level)
+  function StatTableName(int $Level): string
   {
     if ($Level == 0) return 'Data';
@@ -419 +419 @@
     // Load measures
     $Measures = array();
-    $Result = $Database->select('Measure', '*');
+    $Result = $this->Database->select('Measure', '*');
     while ($Row = $Result->fetch_assoc())
     {
-      $Measures = new Measure();
+      $Measure = new Measure($this->System);
       $Measure->Load($Row['Id']);
     }

trunk/Packages/Common/BigInt.php

@@ -9 +9 @@
 // First byte is MSB and last byte is LSB
 
-function BigIntNew($BitWidth)
+function BigIntNew($BitWidth): string
 {
   return str_repeat(chr(0), $BitWidth >> 3);
 }
 
-function BigIntNewAs($A)
+function BigIntNewAs($A): string
 {
   return str_repeat(chr(0), strlen($A));
 }
 
-function BigIntCheck($A, $B)
+function BigIntCheck(string $A, string $B): void
 {
     if (strlen($A) != strlen($B))
@@ -25 +25 @@
 }
 
-function BigIntAdd($A, $B)
+function BigIntAdd(string $A, string $B): string
 {
   BigIntCheck($A, $B);
@@ -40 +40 @@
 }
 
-function BigIntSub($A, $B)
+function BigIntSub(string $A, string $B): string
 {
   BigIntCheck($A, $B);
@@ -55 +55 @@
 }
 
-function BigIntInc($A)
+function BigIntInc(string $A): string
 {
   $Result = BigIntNewAs($A);
@@ -69 +69 @@
 }
 
-function BigIntDec($A)
+function BigIntDec(string $A): string
 {
   $Result = BigIntNewAs($A);
@@ -83 +83 @@
 }
 
-function BigIntNeg($A)
+function BigIntNeg(string $A): string
 {
   return BigIntInc(BigIntNot($A));
 }
 
-function BigIntIsNeg($A)
+function BigIntIsNeg(string $A): string
 {
   return ord($A[0]) & 0x80;
 }
 
-function BigIntEqual($A, $B)
+function BigIntEqual(string $A, string $B): bool
 {
   return $A == $B; // Simple string comparison
 }
 
-function BigIntNotEqual($A, $B)
+function BigIntNotEqual(string $A, string $B): bool
 {
   return $A != $B; // Simple string comparison
 }
 
-function BigIntGreater($A, $B)
+function BigIntGreater(string $A, string $B): bool
 {
   return BigIntIsNeg(BigIntSub($B, $A));
 }
 
-function BigIntGreaterOrEqual($A, $B)
+function BigIntGreaterOrEqual(string $A, string $B): bool
 {
   return BigIntIsNeg(BigIntSub($B, $A)) or BigIntEqual($A, $B);
 }
 
-function BigIntLesser($A, $B)
+function BigIntLesser(string $A, string $B): bool
 {
   return BigIntIsNeg(BigIntSub($A, $B));
 }
 
-function BigIntLesserOrEqual($A, $B)
+function BigIntLesserOrEqual(string $A, string $B): bool
 {
   return BigIntIsNeg(BigIntSub($A, $B)) or BigIntEqual($A, $B);
 }
 
-function BigIntMul($A, $B)
-{
-  BigIntCheck($A, $B);
-  $Result = BigIntNewAs($A);
-  while (BigIntGreater($B, BigIntNew()))
+function BigIntMul(string $A, string $B): string
+{
+  BigIntCheck($A, $B);
+  $Result = BigIntNewAs($A);
+  while (BigIntGreater($B, BigIntNewAs($A)))
   {
     $Result = BigIntAdd($Result, $A);
@@ -135 +135 @@
 }
 
-function BigIntDiv($A, $B)
+function BigIntDiv(string $A, string $B): string
 {
   BigIntCheck($A, $B);
@@ -147 +147 @@
 }
 
-function BigIntMod($A, $B)
+function BigIntMod(string $A, string $B): string
 {
   BigIntCheck($A, $B);
@@ -159 +159 @@
 }
 
-function BigIntAnd($A, $B)
+function BigIntAnd(string $A, string $B): string
 {
   BigIntCheck($A, $B);
@@ -170 +170 @@
 }
 
-function BigIntOr($A, $B)
+function BigIntOr(string $A, string $B): string
 {
   BigIntCheck($A, $B);
@@ -181 +181 @@
 }
 
-function BigIntXor($A, $B)
+function BigIntXor(string $A, string $B): string
 {
   BigIntCheck($A, $B);
@@ -192 +192 @@
 }
 
-function BigIntNot($A)
+function BigIntNot(string $A): string
 {
   $Result = BigIntNewAs($A);
@@ -202 +202 @@
 }
 
-function BigIntShl1($A)
+function BigIntShl1(string $A): string
 {
   $Result = BigIntNewAs($A);
@@ -213 +213 @@
 }
 
-function BigIntShl($A, $B)
+function BigIntShl(string $A, string $B): string
 {
   BigIntCheck($A, $B);
@@ -224 +224 @@
 }
 
-function BigIntShr1($A)
+function BigIntShr1(string $A): string
 {
   $Result = BigIntNewAs($A);
@@ -235 +235 @@
 }
 
-function BigIntShr($A, $B)
+function BigIntShr(string $A, string $B): string
 {
   BigIntCheck($A, $B);
@@ -246 +246 @@
 }
 
-function BigIntToHex($A)
+function BigIntToHex(string $A): string
 {
   $Result = '';
@@ -256 +256 @@
 }
 
-function HexToBigInt($A, $BitWidth)
+function HexToBigInt(string $A, int $BitWidth): string
 {
   $Result = BigIntNew($BitWidth);
@@ -275 +275 @@
 }
 
-function BigIntToBin($A)
+function BigIntToBin(string $A): string
 {
   $Result = '';
@@ -285 +285 @@
 }
 
-function BinToBigInt($A, $BitWidth)
+function BinToBigInt(string $A, int $BitWidth): string
 {
   $Result = BigIntNew($BitWidth);
@@ -305 +305 @@
 }
 
-function BigIntToInt($A)
+function BigIntToInt(string $A): int
 {
   // 32-bit int support
@@ -311 +311 @@
 }
 
-function IntToBigInt($A, $BitWidth)
+function IntToBigInt(int $A, int $BitWidth): string
 {
   $Result = BigIntNew($BitWidth);
@@ -322 +322 @@
 }
 
-function BigIntToDec($A)
+function BigIntToDec(string $A): string
 {
   $BitWidth = strlen($A) << 3;
@@ -335 +335 @@
 }
 
-function DecToBigInt($A, $BitWidth)
+function DecToBigInt(string $A, int $BitWidth): string
 {
   $Result = BigIntNew($BitWidth);
@@ -342 +342 @@
   {
     $Result = BigIntMul($Result, IntToBigInt(10, $BitWidth));
-    $Result = BigIntAdd($Result, IntToBigInt(intval($A[$I], $BitWidth)));
+    $Result = BigIntAdd($Result, IntToBigInt(intval($A[$I]), $BitWidth));
     $I++;
   }

trunk/Packages/Common/Config.php

@@ -3 +3 @@
 class Config
 {
-  var $Data;
+  public array $Data;
 
   function __construct()
@@ -10 +10 @@
   }
 
-  function ReadValue($Name)
+  function ReadValue(string $Name)
   {
     if (!is_array($Name)) $Name = explode('/', $Name);
@@ -22 +22 @@
   }
 
-  function WriteValue($Name, $Value)
+  function WriteValue(string $Name, $Value)
   {
     if (!is_array($Name)) $Name = explode('/', $Name);
@@ -34 +34 @@
   }
 
-  function LoadFromFile($FileName)
+  function LoadFromFile(string $FileName): void
   {
     $ConfigData = array();
@@ -40 +40 @@
     foreach ($this->Data as $Index => $Item)
     {
-      if (array_key_exits($Index, $ConfigData))
+      if (array_key_exists($Index, $ConfigData))
         $this->Data[$Index] = $ConfigData[$Index];
     }
   }
 
-  function SaveToFile($FileName)
+  function SaveToFile(string $FileName): void
   {
     file_put_contents($FileName, "<?php \n\n\$ConfigData = ".var_export($this->Data, true).";\n");
   }
 
-  function GetAsArray()
+  function GetAsArray(): array
   {
     return $this->Data;

trunk/Packages/Common/Database.php

@@ -12 +12 @@
 class DatabaseResult
 {
-  var $PDOStatement;
+  public PDOStatement $PDOStatement;
   public int $num_rows = 0;
 

trunk/Packages/Common/Generics.php

@@ -3 +3 @@
 class GenericList
 {
-  var $Items = array();
+  public array $Items = array();
 
   function Add($Item): void

trunk/Packages/Common/NetworkAddress.php

@@ -5 +5 @@
 class NetworkAddressIPv4
 {
-  var $Address;
-  var $Prefix;
+  public int $Address;
+  public int $Prefix;
 
   function __construct()
@@ -14 +14 @@
   }
 
-  function GetNetMask()
+  function GetNetMask(): int
   {
     return ((1 << IPV4_BIT_WIDTH) - 1) ^ ((1 << (IPV4_BIT_WIDTH - $this->Prefix)) - 1);
   }
 
-  function AddressToString()
+  function AddressToString(): string
   {
     return implode('.', array(($this->Address >> 24) & 255, ($this->Address >> 16) & 255, ($this->Address >> 8) & 255, ($this->Address & 255)));
   }
 
-  function AddressFromString($Value)
+  function AddressFromString(string $Value): void
   {
     $Parts = explode('.', $Value);
@@ -30 +30 @@
   }
 
-  function GetRange()
+  function GetRange(): array
   {
     $From = new NetworkAddressIPv4();
@@ -42 +42 @@
   }
 
-  function ChangePrefix($NewPrefix)
+  function ChangePrefix(int $NewPrefix): void
   {
     $this->Prefix = $NewPrefix;
@@ -50 +50 @@
   }
 
-  function Contain($Address)
+  function Contain(NetworkAddressIPv4 $Address): bool
   {
     $UpperNetmask = $this->GetNetMask();
@@ -63 +63 @@
 class NetworkAddressIPv6
 {
-  var $Address;
-  var $Prefix;
+  public string $Address;
+  public int $Prefix;
 
   function __construct()
@@ -72 +72 @@
   }
 
-  function GetNetMask()
+  function GetNetMask(): string
   {
     return Int128Xor(Int128Sub(Int128Shl(IntToInt128(1), IntToInt128(IPV6_BIT_WIDTH)), IntToInt128(1)),
@@ -78 +78 @@
   }
 
-  function AddressToString()
+  function AddressToString(): string
   {
     return inet_ntop($this->Address);
   }
 
-  function AddressFromString($Value)
+  function AddressFromString(string $Value)
   {
     $this->Address = inet_pton($Value);
   }
 
-  function ChangePrefix($NewPrefix)
+  function ChangePrefix(int $NewPrefix): void
   {
     $this->Prefix = $NewPrefix;
@@ -96 +96 @@
   }
 
-  function GetOctets()
+  function GetOctets(): array
   {
     $Result = array();
@@ -109 +109 @@
   }
 
-  function EncodeMAC($MAC)
+  function EncodeMAC(string $MAC): void
   {
     $MAC = explode(':', $MAC);
@@ -124 +124 @@
   }
 
-  function Contain($Address)
+  function Contain(NetworkAddressIPv6 $Address): bool
   {
     $UpperNetmask = $this->GetNetMask();

trunk/Packages/Common/Page.php

@@ -7 +7 @@
   public string $ParentClass;
   public bool $ClearPage;
-  var $OnSystemMessage;
+  public $OnSystemMessage;
   public string $Load;
   public string $Unload;

trunk/Packages/Common/Process.php

@@ -3 +3 @@
 class Process
 {
-  var $Command;
-  var $Handle;
-  var $Pipes;
-  var $Environment;
-  var $WorkingDir;
-  
+  public string $Command;
+  public $Handle;
+  public array $Pipes;
+  public array $Environment;
+  public ?string $WorkingDir;
+
   function __construct()
   {
@@ -17 +17 @@
     $this->WorkingDir = null;
   }
-  
-  function Start()
+
+  function Start(): void
   {
     if (!$this->IsRunning())
@@ -28 +28 @@
       );
 
-      $this->Handle = proc_open($this->Command, $DescriptorSpec, $this->Pipes, 
+      $this->Handle = proc_open($this->Command, $DescriptorSpec, $this->Pipes,
         $this->WorkingDir, $this->Environment);
       stream_set_blocking($this->Pipes[0], FALSE);
@@ -35 +35 @@
     }
   }
-  
-  function Stop()
+
+  function Stop(): void
   {
-    if ($this->IsRunning()) 
+    if ($this->IsRunning())
     {
       proc_close($this->Handle);
@@ -44 +44 @@
     }
   }
-  
-  function IsRunning()
+
+  function IsRunning(): bool
   {
     return is_resource($this->Handle);

trunk/Packages/Common/Table.php

@@ -3 +3 @@
 class Control
 {
-  var $Name;
+  public string $Name;
 
   function Show(): string

trunk/Packages/Common/UTF8.php

@@ -526 +526 @@
   }
 
-  function ToUTF8string ($String, string $Charset = 'iso2'): string
+  function ToUTF8string(string $String, string $Charset = 'iso2'): string
   {
     $Result = '';

trunk/Packages/Common/Update.php

@@ -18 +18 @@
   }
 
-  function GetDbVersion()
+  function GetDbVersion(): string
   {
     $DbResult = $this->Database->select($this->VersionTable, '*', 'Id=1');
@@ -25 +25 @@
   }
 
-  function IsInstalled()
+  function IsInstalled(): bool
   {
     $DbResult = $this->Database->query('SHOW TABLES LIKE "'.$this->VersionTable.'"');
@@ -31 +31 @@
   }
 
-  function IsUpToDate()
+  function IsUpToDate(): bool
   {
     return $this->Revision <= $this->GetDbVersion();
   }
 
-  function Upgrade()
+  function Upgrade(): string
   {
     $DbRevision = $this->GetDbVersion();
@@ -58 +58 @@
   }
 
-  function Install()
+  function Install(): void
   {
     $InstallMethod = $this->InstallMethod;
@@ -64 +64 @@
   }
 
-  function Uninstall()
+  function Uninstall(): void
   {
-
   }
 
-  function InsertSampleData()
+  function InsertSampleData(): void
   {
     $InstallMethod = $this->InsertSampleDataMethod;