PHP8 updates

Author: sergejey

3rdparty/phpmqtt/phpMQTT.php

@@ -1151,7 +1151,8 @@ public function trigger_template_error($args = null, $line = null, $tagline = nu
             flush();
         }
         $e = new SmartyCompilerException($error_text);
-        $e->line = $line;
+        //$e->line = $line;
+        $e->setLine($line);
         $e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ]));
         $e->desc = $args;
         $e->template = $this->template->source->filepath;

3rdparty/smarty3/sysplugins/smarty_internal_templatecompilerbase.php

@@ -20,7 +20,10 @@ public function __toString()
      *
      * @type int|null
      */
-    public $line = null;
+    public function setLine($line)
+    {
+        $this->line = $line;
+    }
 
     /**
      * The template source snippet relating to the error
@@ -42,4 +45,5 @@ public function __toString()
      * @type string|null
      */
     public $template = null;
+
 }

3rdparty/smarty3/sysplugins/smartycompilerexception.php

@@ -41,12 +41,13 @@
 if ($app->action != '' && $app->action != 'docs') $fake_doc = '';
 
 $result = $app->run();
-$result = str_replace("nf.php", "index.php", $result);
-
+if ($result) {
+    $result = str_replace("nf.php", "index.php", $result);
+    require(ROOT.'lib/utils/postprocess_general.inc.php');
+    require(ROOT.'lib/utils/postprocess_subscriptions.inc.php');
+    require(ROOT.'lib/utils/postprocess_result.inc.php');
+}
 endMeasure('prepare');
-require(ROOT.'lib/utils/postprocess_general.inc.php');
-require(ROOT.'lib/utils/postprocess_subscriptions.inc.php');
-require(ROOT.'lib/utils/postprocess_result.inc.php');
 
 /**
  * Echo large text
@@ -75,7 +76,9 @@ function echobig($string, $bufferSize = 8192)
    }
 }
 
-echobig($result);
+if ($result) {
+    echobig($result);
+}
 
 endMeasure('final_echo', 1);
 

index.php

@@ -938,7 +938,7 @@ function cleanUpValueHistory($value_id, $max_age_days, $data_type = 0)
     $total_removed = 0;
 
     if (defined('SEPARATE_HISTORY_STORAGE') && SEPARATE_HISTORY_STORAGE == 1) {
-        $table_name = 'phistory_value_'.$value_id;
+        $table_name = 'phistory_value_' . $value_id;
     } else {
         $table_name = 'phistory';
     }
@@ -958,7 +958,7 @@ function cleanUpValueHistory($value_id, $max_age_days, $data_type = 0)
     }
 
     $tmp = SQLSelectOne("SELECT COUNT(*) as TOTAL FROM $table_name WHERE $qry");
-    if (isset($tmp['TOTAL']) && $tmp['TOTAL']>0) {
+    if (isset($tmp['TOTAL']) && $tmp['TOTAL'] > 0) {
         $total_removed = (int)$tmp['TOTAL'];
         SQLExec("DELETE FROM $table_name WHERE $qry");
     }
@@ -968,12 +968,12 @@ function cleanUpValueHistory($value_id, $max_age_days, $data_type = 0)
 function cleanUpPropertyHistory($property_id, $max_age_days)
 {
     $total_removed = 0;
-    $property = SQLSelectOne("SELECT * FROM properties WHERE ID=".(int)$property_id);
+    $property = SQLSelectOne("SELECT * FROM properties WHERE ID=" . (int)$property_id);
     if (isset($property['ID'])) {
         $pvalues = SQLSelect("SELECT * FROM pvalues WHERE PROPERTY_ID='" . $property_id . "'");
         $total = count($pvalues);
         for ($i = 0; $i < $total; $i++) {
-            $total_removed+=cleanUpValueHistory($pvalues[$i]['ID'], $max_age_days, $property['DATA_TYPE']);
+            $total_removed += cleanUpValueHistory($pvalues[$i]['ID'], $max_age_days, $property['DATA_TYPE']);
         }
     }
     return $total_removed;
@@ -1487,7 +1487,7 @@ function objectClassChanged($object_id)
 function checkOperationsQueue($topic)
 {
     $data = SQLSelect("SELECT * FROM operations_queue WHERE TOPIC='" . DBSafe($topic) . "' ORDER BY EXPIRE");
-    if ($data[0]['TOPIC']) {
+    if (isset($data[0]['TOPIC'])) {
         SQLExec("DELETE FROM operations_queue WHERE TOPIC='" . DBSafe($topic) . "'");
     }
     return $data;

lib/objects.class.php

@@ -192,16 +192,16 @@ function sortFiles($a, $b)
         }
 
         if ($this->action != 'apps') {
-            if (preg_match('/^app_\w+$/is', $this->action) || $this->action == 'xray') {
+            if ($this->action && (preg_match('/^app_\w+$/is', $this->action) || $this->action == 'xray')) {
                 $out['APP_ACTION'] = 1;
             }
 
-            if ($this->app_action) {
+            if (isset($this->app_action)) {
                 $out['APP_ACTION'] = 1;
             }
         }
 
-        if ($this->app_action == 'panel') {
+        if (isset($this->app_action) && $this->app_action == 'panel') {
             $this->redirect(ROOTHTML . 'admin.php');
         }