Changeset 95 for trunk/Modules/Measure/Page.php

Timestamp:

Dec 6, 2021, 11:33:48 AM (3 years ago)

Author:

chronos

Message:

• Modified: Updated Common package.
• Added: Explicit types for better type checking.
• Fixed: Support for php 8.0.

File:

• trunk/Modules/Measure/Page.php (modified) (13 diffs)

trunk/Modules/Measure/Page.php

@@ -44 +44 @@
     $this->Time = time();
   }
-  
-  function GetTimeRange()
+
+  function GetTimeRange(): string
   {
     if (!array_key_exists($_SESSION['Period'], $this->GraphTimeRanges))
       $_SESSION['Period'] = 'day';
-    
+
     $Result = $this->GraphTimeRanges[$_SESSION['Period']]['period'];
     if ($Result == -1)
@@ -61 +61 @@
   }
 
-  function EditTime($Time)
+  function EditTime($Time): string
   {
     $Output = '<form style="display: inline;" action="?Operation=SetTime&amp;Time='.$Time.'" method="post">';
@@ -119 +119 @@
     return $Output;
   }
-  
-  function GetFirstMeasure($Measure)
+
+  function GetFirstMeasure($Measure): array
   {
     $Result2 = $this->Database->select($Measure['DataTable'], '`Time`, `Avg`', '(`Measure`='.$Measure['Id'].') AND (`Level`=0) ORDER BY `Time` ASC LIMIT 1');
@@ -135 +135 @@
   }
 
-  function GetLastMeasure($Measure)
+  function GetLastMeasure($Measure): array
   {
     $Result2 = $this->Database->select($Measure['DataTable'], '`Time`, `Avg`', '(`Measure`='.$Measure['Id'].') AND (`Level`=0) ORDER BY `Time` DESC LIMIT 1');
@@ -149 +149 @@
     return array('Time' => $LastMeasureTime, 'Value' => $LastMeasureValue);
   }
-  
-  function LoadMeasure($Id)
+
+  function LoadMeasure($Id): array
   {
     $DbResult = $this->Database->select('Measure', '*', '( `Enabled`=1) AND (`Id`='.$Id.') AND ((`PermissionView`="all") OR (`PermissionView`="'.
-      gethostbyaddr($_SERVER['REMOTE_ADDR']).'"))');    
+      gethostbyaddr($_SERVER['REMOTE_ADDR']).'"))');
     $DbRow = $DbResult->fetch_array();
     return $DbRow;
   }
-  
+
   /* Produce table with available measures */
-  function ShowMeasureTable()
+  function ShowMeasureTable(): string
   {
     $PrefixMultiplier = new PrefixMultiplier();
@@ -195 +195 @@
         $LastMeasureValue.'</td><td align="center">'.$LastMeasureTime.'</td><td align="center">'.
         $Interpolate.'</td><td>'.$Measure['Info'].'</td>';
-      if (array_key_exists('Debug', $_GET)) 
+      if (array_key_exists('Debug', $_GET))
         $Output .= '<td>'.$RowCount.'</td><td>'.$GenerationTime.'</td>';
       $Output .= '</tr>';
@@ -203 +203 @@
   }
 
-  function ShowGraph()
+  function ShowGraph(): string
   {
     $Output = '<strong>Graf:</strong><br>';
@@ -217 +217 @@
   }
 
-  function ShowTimeRange()
+  function ShowTimeRange(): string
   {
     $Output = '';
@@ -269 +269 @@
 
   }
-  
-  function HandleURL()
-  {
-    global $Config;
-    
-    foreach ($Config['DefaultVariables'] as $Index => $Variable)
+
+  function HandleURL(): void
+  {
+    foreach ($this->System->Config['DefaultVariables'] as $Index => $Variable)
     {
       if (!array_key_exists($Index, $_SESSION)) $_SESSION[$Index] = $Variable;
@@ -285 +283 @@
       $_SESSION['Period'] = $_GET['Period'];
       // Update time start according time period
-      if ($_SESSION['Period'] == 'all') 
+      if ($_SESSION['Period'] == 'all')
       {
         $Measure = $this->LoadMeasure($_SESSION['Measure']);
@@ -322 +320 @@
       $_SESSION['TimeSpecify'] = $_GET['TimeSpecify'];
     }
-    
+
     if (array_key_exists('Move', $_GET))
     {
       $Move = $_GET['Move'];
-      if ($Move == 'Left') 
+      if ($Move == 'Left')
       {
         $_SESSION['TimeStart'] = $_SESSION['TimeStart'] - $this->GetTimeRange();
         $_SESSION['TimeEnd'] = $_SESSION['TimeEnd'] - $this->GetTimeRange();
       } else
-      if ($Move == 'Right') 
+      if ($Move == 'Right')
       {
         $_SESSION['TimeStart'] = $_SESSION['TimeStart'] + $this->GetTimeRange();
         $_SESSION['TimeEnd'] = $_SESSION['TimeEnd'] + $this->GetTimeRange();
-      } else 
+      } else
       if ($Move == 'Now')
       {
@@ -358 +356 @@
   }
 
-  function Show()
+  function Show(): string
   {
     global $Config;
@@ -364 +362 @@
     $Debug = 0;
     $this->HandleURL();
-    
+
     $Output = '<div style="text-align: center"><div class="Title">'.$Config['Web']['Title'].'</div>';