Changeset 95 for trunk/Modules


Ignore:
Timestamp:
Dec 6, 2021, 11:33:48 AM (2 years ago)
Author:
chronos
Message:
  • Modified: Updated Common package.
  • Added: Explicit types for better type checking.
  • Fixed: Support for php 8.0.
Location:
trunk/Modules
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Modules/Admin/Admin.php

    r92 r95  
    11<?php
    22
    3 class ModuleAdmin extends AppModule
     3class ModuleAdmin extends Module
    44{
    55  function __construct($System)
    … …  
    1414  }
    1515
    16   function DoStart()
     16  function DoStart(): void
    1717  {
    18     $this->System->RegisterPage('admin', 'PageAdmin');
    19   }
    20 
    21   function DoInstall()
    22   {
    23    }
    24 
    25   function DoUninstall()
    26   {
    27   }
    28 
    29   function DoUpgrade()
    30   {
     18    $this->System->RegisterPage(['admin'], 'PageAdmin');
    3119  }
    3220}
    … …  
    3927  }
    4028
    41   function Show()
     29  function Show(): string
    4230  {
    4331    if (array_key_exists('Operation', $_GET)) $Operation = $_GET['Operation']; else $Operation = '';
    … …  
    6250  }
    6351
    64   function ShowNone()
     52  function ShowNone(): string
    6553  {
    6654    $Table = array(
    … …  
    7866  }
    7967
    80   function ShowEdit()
     68  function ShowEdit(): string
    8169  {
    8270    $DbResult = $this->Database->select('Measure', '*', 'Id='.addslashes($_GET['MeasureId']));
    … …  
    8674  }
    8775
    88   function ShowAdd()
     76  function ShowAdd(): string
    8977  {
    9078    $Values = array();
    … …  
    9280  }
    9381
    94   function ShowRebuildCache()
     82  function ShowDelete(): string
     83  {
     84    return '';
     85  }
     86
     87  function ShowRebuildCache(): string
    9588  {
    9689    echo("Vytvařím novou cache...<br>");
    … …  
    10093    $Measure->RebuildMeasureCache();
    10194    echo('Dokončeno<br>');
     95    return '';
    10296  }
    10397}

  • trunk/Modules/Measure/Measure.php

    r92 r95  
    33include_once(dirname(__FILE__).'/Page.php');
    44
    5 class ModuleMeasure extends AppModule
     5class ModuleMeasure extends Module
    66{
    77  function __construct($System)
    … …  
    1616  }
    1717
    18   function DoStart()
    19   {
    20     $this->System->RegisterPage('', 'PageMain');
    21   }
    22 
    23   function DoInstall()
    24   {
    25    $this->Database->query('CREATE TABLE IF NOT EXISTS `Measure` (
    26   `Id` int(11) NOT NULL auto_increment,
    27   `Name` varchar(255) collate utf8_general_ci NOT NULL,
    28   `Description` varchar(255) collate utf8_general_ci NOT NULL,
    29   `Divider` int(11) NOT NULL default 1,
    30   `Unit` varchar(16) collate utf8_general_ci NOT NULL,
    31   `Continuity` tinyint(1) NOT NULL default 0,
    32   `Period` int(11) NOT NULL default 60,
    33   `PermissionView` varchar(255) collate utf8_general_ci NOT NULL default "all",
    34   `PermissionAdd` varchar(255) collate utf8_general_ci NOT NULL default "localhost.localdomain",
    35   `Info` varchar(255) collate utf8_general_ci NOT NULL,
    36   `Enabled` int(11) NOT NULL default 1,
    37   `Cumulative` int(11) NOT NULL default 0,
    38   `DataTable` varchar(32) collate utf8_general_ci NOT NULL default "data",
    39   `DataType` varchar(32) collate utf8_general_ci NOT NULL,
    40   PRIMARY KEY  (`Id`)
    41 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;');
    42    }
    43 
    44   function DoUninstall()
     18  function DoStart(): void
     19  {
     20    $this->System->RegisterPage(array(''), 'PageMain');
     21  }
     22
     23  function DoInstall(): void
     24  {
     25    $this->Database->query('CREATE TABLE IF NOT EXISTS `Measure` (
     26    `Id` int(11) NOT NULL auto_increment,
     27    `Name` varchar(255) collate utf8_general_ci NOT NULL,
     28    `Description` varchar(255) collate utf8_general_ci NOT NULL,
     29    `Divider` int(11) NOT NULL default 1,
     30    `Unit` varchar(16) collate utf8_general_ci NOT NULL,
     31    `Continuity` tinyint(1) NOT NULL default 0,
     32    `Period` int(11) NOT NULL default 60,
     33    `PermissionView` varchar(255) collate utf8_general_ci NOT NULL default "all",
     34    `PermissionAdd` varchar(255) collate utf8_general_ci NOT NULL default "localhost.localdomain",
     35    `Info` varchar(255) collate utf8_general_ci NOT NULL,
     36    `Enabled` int(11) NOT NULL default 1,
     37    `Cumulative` int(11) NOT NULL default 0,
     38    `DataTable` varchar(32) collate utf8_general_ci NOT NULL default "data",
     39    `DataType` varchar(32) collate utf8_general_ci NOT NULL,
     40    PRIMARY KEY  (`Id`)
     41    ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;');
     42  }
     43
     44  function DoUninstall(): void
    4545  {
    4646    $this->Database->query('DROP TABLE IF EXISTS `Measure`');
    47   }
    48 
    49   function DoUpgrade()
    50   {
    51 
    5247  }
    5348}
    … …  
    8176  }
    8277
    83   function TimeSegment($Level)
     78  function TimeSegment(int $Level): int
    8479  {
    8580    return pow($this->LevelReducing, $Level) * 60;
    8681  }
    8782
    88   function GetDataTable()
     83  function GetDataTable(): string
    8984  {
    9085    return 'data_'.$this->Data['Name'];
    9186  }
    9287
    93   function AlignTime($Time, $TimeSegment)
     88  function AlignTime(int $Time, int $TimeSegment): int
    9489  {
    9590    return round(($Time - $this->ReferenceTime) / $TimeSegment) * $TimeSegment +
    … …  
    9792  }
    9893
    99   function Load($Id)
     94  function Load(int $Id): void
    10095  {
    10196    $Result = $this->Database->select('Measure', '*', '`Id`='.$Id);
    … …  
    108103  }
    109104
    110   function AddValue($Value, $Time)
     105  function AddValue(float $Value, int $Time): void
    111106  {
    112107    $Result = $this->Database->select($this->Data['DataTable'], '*', '(`Measure`='.$this->Data['Id'].') AND '.
    … …  
    163158  }
    164159
    165   function UpdateHigherLevels($Time)
     160  function UpdateHigherLevels(int $Time): void
    166161  {
    167162    for ($Level = 1; $Level <= $this->MaxLevel; $Level++)
    … …  
    206201
    207202  /* Compute one value for upper time level from multiple values */
    208   function ComputeOneValue($LeftTime, $RightTime, $Values, $Level)
     203  function ComputeOneValue(int $LeftTime, int $RightTime, array $Values, int $Level): array
    209204  {
    210205    $NewValue = array('Min' => +1000000000000000000, 'Avg' => 0, 'Max' => -1000000000000000000);
    … …  
    294289  }
    295290
    296   function GetTimeRange($Level)
     291  function GetTimeRange(int $Level): array
    297292  {
    298293    // Get first and last time
    … …  
    317312
    318313  // Load one nearest value newer then given time
    319   function LoadRightSideValue($Level, $Time)
     314  function LoadRightSideValue(int $Level, int $Time): array
    320315  {
    321316    $Result = array();
    … …  
    350345
    351346  // Load one nearest value older then given time
    352   function LoadLeftSideValue($Level, $Time)
     347  function LoadLeftSideValue(int $Level, int $Time): array
    353348  {
    354349    $Result = array();
    … …  
    382377  }
    383378
    384   function GetValues($TimeFrom, $TimeTo, $Level)
     379  function GetValues(int $TimeFrom, int $TimeTo, int $Level): array
    385380  {
    386381  //$AbsoluteTime = GetTimeRange($this->DataId);
    … …  
    430425  }
    431426
    432   function RebuildMeasureCache()
     427  function RebuildMeasureCache(): void
    433428  {
    434429    echo('Velicina '.$this->Data['Name']."<br>\n");
    … …  
    508503  }
    509504
    510   function RebuildAllMeasuresCache()
     505  function RebuildAllMeasuresCache(): void
    511506  {
    512507    $Result = $this->Database->select('Measure', 'Id');
    513508    while ($Row = $Result->fetch_array())
    514509    {
    515       $Measure = new Measure();
     510      $Measure = new Measure($this->Database);
    516511      $Measure->Load($Row['Id']);
    517512      $Measure->RebuildMeasureCache();
    … …  
    520515  }
    521516
    522   function ClearData()
     517  function ClearData(): void
    523518  {
    524519    $this->Database->delete($this->Data['DataTable'], '1');

  • trunk/Modules/Measure/Page.php

    r92 r95  
    4444    $this->Time = time();
    4545  }
    46  
    47   function GetTimeRange()
     46
     47  function GetTimeRange(): string
    4848  {
    4949    if (!array_key_exists($_SESSION['Period'], $this->GraphTimeRanges))
    5050      $_SESSION['Period'] = 'day';
    51    
     51
    5252    $Result = $this->GraphTimeRanges[$_SESSION['Period']]['period'];
    5353    if ($Result == -1)
    … …  
    6161  }
    6262
    63   function EditTime($Time)
     63  function EditTime($Time): string
    6464  {
    6565    $Output = '<form style="display: inline;" action="?Operation=SetTime&amp;Time='.$Time.'" method="post">';
    … …  
    119119    return $Output;
    120120  }
    121  
    122   function GetFirstMeasure($Measure)
     121
     122  function GetFirstMeasure($Measure): array
    123123  {
    124124    $Result2 = $this->Database->select($Measure['DataTable'], '`Time`, `Avg`', '(`Measure`='.$Measure['Id'].') AND (`Level`=0) ORDER BY `Time` ASC LIMIT 1');
    … …  
    135135  }
    136136
    137   function GetLastMeasure($Measure)
     137  function GetLastMeasure($Measure): array
    138138  {
    139139    $Result2 = $this->Database->select($Measure['DataTable'], '`Time`, `Avg`', '(`Measure`='.$Measure['Id'].') AND (`Level`=0) ORDER BY `Time` DESC LIMIT 1');
    … …  
    149149    return array('Time' => $LastMeasureTime, 'Value' => $LastMeasureValue);
    150150  }
    151  
    152   function LoadMeasure($Id)
     151
     152  function LoadMeasure($Id): array
    153153  {
    154154    $DbResult = $this->Database->select('Measure', '*', '( `Enabled`=1) AND (`Id`='.$Id.') AND ((`PermissionView`="all") OR (`PermissionView`="'.
    155       gethostbyaddr($_SERVER['REMOTE_ADDR']).'"))');   
     155      gethostbyaddr($_SERVER['REMOTE_ADDR']).'"))');
    156156    $DbRow = $DbResult->fetch_array();
    157157    return $DbRow;
    158158  }
    159  
     159
    160160  /* Produce table with available measures */
    161   function ShowMeasureTable()
     161  function ShowMeasureTable(): string
    162162  {
    163163    $PrefixMultiplier = new PrefixMultiplier();
    … …  
    195195        $LastMeasureValue.'</td><td align="center">'.$LastMeasureTime.'</td><td align="center">'.
    196196        $Interpolate.'</td><td>'.$Measure['Info'].'</td>';
    197       if (array_key_exists('Debug', $_GET)) 
     197      if (array_key_exists('Debug', $_GET))
    198198        $Output .= '<td>'.$RowCount.'</td><td>'.$GenerationTime.'</td>';
    199199      $Output .= '</tr>';
    … …  
    203203  }
    204204
    205   function ShowGraph()
     205  function ShowGraph(): string
    206206  {
    207207    $Output = '<strong>Graf:</strong><br>';
    … …  
    217217  }
    218218
    219   function ShowTimeRange()
     219  function ShowTimeRange(): string
    220220  {
    221221    $Output = '';
    … …  
    269269
    270270  }
    271  
    272   function HandleURL()
    273   {
    274     global $Config;
    275    
    276     foreach ($Config['DefaultVariables'] as $Index => $Variable)
     271
     272  function HandleURL(): void
     273  {
     274    foreach ($this->System->Config['DefaultVariables'] as $Index => $Variable)
    277275    {
    278276      if (!array_key_exists($Index, $_SESSION)) $_SESSION[$Index] = $Variable;
    … …  
    285283      $_SESSION['Period'] = $_GET['Period'];
    286284      // Update time start according time period
    287       if ($_SESSION['Period'] == 'all') 
     285      if ($_SESSION['Period'] == 'all')
    288286      {
    289287        $Measure = $this->LoadMeasure($_SESSION['Measure']);
    … …  
    322320      $_SESSION['TimeSpecify'] = $_GET['TimeSpecify'];
    323321    }
    324    
     322
    325323    if (array_key_exists('Move', $_GET))
    326324    {
    327325      $Move = $_GET['Move'];
    328       if ($Move == 'Left') 
     326      if ($Move == 'Left')
    329327      {
    330328        $_SESSION['TimeStart'] = $_SESSION['TimeStart'] - $this->GetTimeRange();
    331329        $_SESSION['TimeEnd'] = $_SESSION['TimeEnd'] - $this->GetTimeRange();
    332330      } else
    333       if ($Move == 'Right') 
     331      if ($Move == 'Right')
    334332      {
    335333        $_SESSION['TimeStart'] = $_SESSION['TimeStart'] + $this->GetTimeRange();
    336334        $_SESSION['TimeEnd'] = $_SESSION['TimeEnd'] + $this->GetTimeRange();
    337       } else 
     335      } else
    338336      if ($Move == 'Now')
    339337      {
    … …  
    358356  }
    359357
    360   function Show()
     358  function Show(): string
    361359  {
    362360    global $Config;
    … …  
    364362    $Debug = 0;
    365363    $this->HandleURL();
    366    
     364
    367365    $Output = '<div style="text-align: center"><div class="Title">'.$Config['Web']['Title'].'</div>';
    368366
Note: See TracChangeset for help on using the changeset viewer.