Changeset 96 for trunk/add.php

Timestamp:

Jan 5, 2026, 6:38:18 PM (3 days ago)

Author:

chronos

Message:

• Modfied: Allow to add measurements with different min, avg and max values.

File:

• trunk/add.php (modified) (3 diffs)

trunk/add.php

@@ -10 +10 @@
 $AddedValues = 0;
 
+$Time = time();
+if (array_key_exists('Time', $_GET)) $Time = $_GET['Time'] * 1;
+
 // Try to load single value
-$Time = time();
-if (array_key_exists('MeasureId', $_GET) and array_key_exists('Value', $_GET))
+if (array_key_exists('MeasureId', $_GET))
 {
-  if (array_key_exists('Time', $_GET)) $Time = $_GET['Time'] * 1;
-  AddValue(addslashes($_GET['MeasureId']), addslashes($_GET['Value']), $Time);
-  $AddedValues = $AddedValues + 1;
+  $MeasureId = $_GET['MeasureId'] * 1;
+  if (array_key_exists('Avg', $_GET)) $Avg = $_GET['Avg'] * 1;
+  else if (array_key_exists('Value', $_GET)) $Avg = $_GET['Value'] * 1; // For back compatibility
+  else die('Missing avg value parameter.');
+
+  if (array_key_exists('Min', $_GET)) $Min = $_GET['Min'] * 1; else $Min = $Avg;
+  if (array_key_exists('Max', $_GET)) $Max = $_GET['Max'] * 1; else $Max = $Avg;
+  AddValue($MeasureId, $Time, $Min, $Avg, $Max);
+  $AddedValues++;
 }
 
 // Try to load multiple values
-$Time = time();
 $I = 1;
 while (array_key_exists('MeasureId'.$I, $_GET) and array_key_exists('Value'.$I, $_GET))
 {
-  if (array_key_exists('Time'.$I, $_GET)) $Time = $_GET['Time'.$I] * 1;
-  AddValue(addslashes($_GET['MeasureId'.$I]), addslashes($_GET['Value'.$I]), $Time);
-  $AddedValues = $AddedValues + 1;
+  $MeasureId = $_GET['MeasureId'.$I] * 1;
+  if (array_key_exists('Avg'.$I, $_GET)) $Avg = $_GET['Avg'.$I] * 1;
+  else if (array_key_exists('Value'.$I, $_GET)) $Avg = $_GET['Value'.$I] * 1; // For back compatibility
+  else die('Missing avg value parameter.');
+
+  if (array_key_exists('Min'.$I, $_GET)) $Min = $_GET['Min'.$I] * 1; else $Min = $Avg;
+  if (array_key_exists('Max'.$I, $_GET)) $Max = $_GET['Max'.$I] * 1; else $Max = $Avg;
+  AddValue($MeasureId, $Time, $Min, $Avg, $Max);
+  $AddedValues++;
   $I++;
 }
@@ -32 +45 @@
 if ($AddedValues == 0) echo('Nebyly zadány potřebné parametry MeasureId a Value.'."\n");
 
-function AddValue(int $MeasureId, float $Value, int $Time): void
+function AddValue(int $MeasureId, int $Time, float $Min, float $Avg, float $Max): void
 {
   global $Core;
@@ -39 +52 @@
   $Measure->Load($MeasureId);
   $HostName = gethostbyaddr($_SERVER['REMOTE_ADDR']);
-  if (($HostName == $Measure->Data['PermissionAdd']) or ($_SERVER['REMOTE_ADDR'] == gethostbyname($Measure->Data['PermissionAdd'])))
+  if (($HostName == $Measure->Data['PermissionAdd']) or 
+    ($_SERVER['REMOTE_ADDR'] == gethostbyname($Measure->Data['PermissionAdd'])))
   {
-    $Measure->AddValue($Value, $Time);
-    echo('Hodnota '.$Value.' uložena'."\n");
-  } else echo('Nemáte oprávnění k aktualizaci zadané veličiny!<br>Vaše adresa: '.$HostName.'('.$_SERVER['REMOTE_ADDR'].')'."\n");
+    $Measure->AddValue($Time, $Min, $Avg, $Max);
+    echo('Hodnota avg: '.$Avg.', min: '.$Min.', max: '.$Max.' uložena'."\n");
+  } else echo('Nemáte oprávnění k aktualizaci zadané veličiny!<br>'.
+    'Vaše adresa: '.$HostName.'('.$_SERVER['REMOTE_ADDR'].')'."\n");
 }