Updates

* Diagnostic script: added php and web-server details
* Simple Devices: PHP8 fix
* Simple Devices: counter fix

Author: sergejey

diagnostic.php

@@ -66,6 +66,16 @@ function collectData()
     }
     $result['OS'] = $os;
     $result['locale'] = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+    $result['PHP']['version'] = phpversion();
+    $result['PHP']['extensions'] = get_loaded_extensions();
+
+    $server_keys = array('SERVER_SOFTWARE','GATEWAY_INTERFACE','DOCUMENT_ROOT','FCGI_ROLE','USER','HOME','HTTP_HOST');
+    foreach($server_keys as $key) {
+        if (isset($_SERVER[$key])) {
+            $result['SERVER'][$key]=$_SERVER[$key];
+        }
+    }
+
 
     $cycles = array();
     if ($lib_dir = opendir("./scripts")) {

modules/devices/SCounters_valueUpdated.php

@@ -4,37 +4,74 @@
 $new_value = (float)$params['NEW_VALUE'];
 $old_value = (float)$params['OLD_VALUE'];
 
+$timer_name = $ot . '_counter_update_h';
+clearTimeOut($timer_name);
+
+$timer_name = $ot . '_counter_update_d';
+clearTimeOut($timer_name);
+
+$timer_name = $ot . '_counter_update_m';
+clearTimeOut($timer_name);
+
+if ($new_value != $old_value) {
+
+    // HOUR
+    $timer_name = $ot . '_counter_update_h';
+    $when_start = strtotime(date('Y-m-d H:59:59')) + 1;
+    $timeout = $when_start - time() + 1;
+    setTimeOut($timer_name, "DebMes('H: Updating $ot.value to $new_value','counter_update');setGlobal('$ot.value', '" . $new_value . "');", $timeout);
+    $prev_timeout = $timeout;
+
+    // DAY
+    $timer_name = $ot . '_counter_update_d';
+    $when_start = strtotime(date('Y-m-d 23:59:59')) + 1;
+    $timeout = $when_start - time() + 1;
+    if ($prev_timeout != $timeout) {
+        setTimeOut($timer_name, "DebMes('D: Updating $ot.value to $new_value','counter_update');setGlobal('$ot.value', '" . $new_value . "');", $timeout);
+        $prev_timeout = $timeout;
+    }
+
+    // MONTH
+    $timer_name = $ot . '_counter_update_m';
+    $when_start = strtotime(date('Y-m-t 23:59:59')) + 1;
+    $timeout = $when_start - time() + 1;
+    if ($prev_timeout != $timeout) {
+        setTimeOut($timer_name, "DebMes('M: Updating $ot.value to $new_value','counter_update');setGlobal('$ot.value', '" . $new_value . "');", $timeout);
+    }
+
+}
+
 $this->callMethodSafe('keepAlive');
 $this->callMethodSafe('statusUpdated');
 $this->callMethodSafe('logicAction');
 
 $history_values = array(
- 'valueHour'=>date('Y-m-d H:00:00'),
- 'valueDay'=>date('Y-m-d 00:00:00'),
- 'valueMonth'=>date('Y-m-01 00:00:00')
+    'valueHour' => date('Y-m-d H:00:00'),
+    'valueDay' => date('Y-m-d 00:00:00'),
+    'valueMonth' => date('Y-m-01 00:00:00')
 );
 
-foreach ($history_values as $history_value=>$time) {
- $value_id = (int)getHistoryValueId($ot . '.' . $history_value);
- if (defined('SEPARATE_HISTORY_STORAGE') && SEPARATE_HISTORY_STORAGE == 1) {
-  $table_name = createHistoryTable($value_id);
- } else {
-  $table_name = 'phistory';
- }
- $val1 = SQLSelectOne("SELECT ID, VALUE FROM pvalues WHERE ID='" . $value_id . "' AND UPDATED>=('" . $time . "')");
- if ($val1['ID']) {
-  SQLExec("DELETE FROM $table_name WHERE VALUE_ID=$value_id AND ADDED>=('" . $time . "')");
-  $set_value = $val1['VALUE'] + ($new_value - $old_value);
-  $set_value = round($set_value, 3);
-  $this->setProperty($history_value, $set_value);
- } else {
-  $set_value = $new_value - $old_value;
-  $set_value = round($set_value, 3);
-  $this->setProperty($history_value, $set_value);
-  //DebMes($history_value . ' ' . $time . ' - id - ' . $value_id .  ' - new - ' . $new_value . ' - old - ' . $old_value, $ot);
- }
+foreach ($history_values as $history_value => $time) {
+    $value_id = (int)getHistoryValueId($ot . '.' . $history_value);
+    if (defined('SEPARATE_HISTORY_STORAGE') && SEPARATE_HISTORY_STORAGE == 1) {
+        $table_name = createHistoryTable($value_id);
+    } else {
+        $table_name = 'phistory';
+    }
+    $val1 = SQLSelectOne("SELECT ID, VALUE FROM pvalues WHERE ID='" . $value_id . "' AND UPDATED>=('" . $time . "')");
+    if ($val1['ID']) {
+        SQLExec("DELETE FROM $table_name WHERE VALUE_ID=$value_id AND ADDED>=('" . $time . "')");
+        $set_value = $val1['VALUE'] + ($new_value - $old_value);
+        $set_value = round($set_value, 2);
+        $this->setProperty($history_value, $set_value);
+    } else {
+        $set_value = $new_value - $old_value;
+        $set_value = round($set_value, 2);
+        $this->setProperty($history_value, $set_value);
+        //DebMes($history_value . ' ' . $time . ' - id - ' . $value_id .  ' - new - ' . $new_value . ' - old - ' . $old_value, $ot);
+    }
 }
 
-include_once(dirname(__FILE__).'/devices.class.php');
-$dv=new devices();
+include_once(dirname(__FILE__) . '/devices.class.php');
+$dv = new devices();
 $dv->checkLinkedDevicesAction($this->object_title, $new_value);

modules/devices/devices_search.inc.php

@@ -113,7 +113,7 @@
 $out['SORTBY'] = $sortby_devices;
 // SEARCH RESULTS
 $res = SQLSelect("SELECT devices.*, locations.TITLE as LOCATION_TITLE FROM devices LEFT JOIN locations ON devices.LOCATION_ID=locations.ID WHERE $qry ORDER BY " . $sortby_devices);
-if ($res[0]['ID']) {
+if (isset($res[0])) {
     //paging($res, 100, $out); // search result paging
     $total = count($res);
     $out['TOTAL_FOUND'] = $total;