From 0ffe81c3abbc0605cf010a4872a01363a26f408f Mon Sep 17 00:00:00 2001
From: Robert Kaiser <kairo@kairo.at>
Date: Sun, 9 May 2021 20:01:39 +0200
Subject: [PATCH] remove a lot of error suppression in favor of ?? in various
 utility classes

---
 classes/email.php-class   |  8 ++++----
 classes/rrdstat.php-class | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/classes/email.php-class b/classes/email.php-class
index 3bbb5e9..7c20b5a 100644
--- a/classes/email.php-class
+++ b/classes/email.php-class
@@ -169,7 +169,7 @@ class email {
 
     if (in_array('to', $addrtype)) {
       foreach ($this->recipients as $address) {
-        if (strlen(@$address['mail'])) {
+        if (strlen($address['mail'] ?? '')) {
           $mailaddresses[] = array('mail'=>$address['mail'],
                                    'name'=>strlen($address['name'])?$address['name']:'',
                                    'addrtype'=>'to');
@@ -178,7 +178,7 @@ class email {
     }
     if (in_array('cc', $addrtype)) {
       foreach ($this->cc as $address) {
-        if (strlen(@$address['mail'])) {
+        if (strlen($address['mail'] ?? '')) {
           $mailaddresses[] = array('mail'=>$address['mail'],
                                    'name'=>strlen($address['name'])?$address['name']:'',
                                    'addrtype'=>'cc');
@@ -187,7 +187,7 @@ class email {
     }
     if (in_array('bcc', $addrtype)) {
       foreach ($this->bcc as $address) {
-        if (strlen(@$address['mail'])) {
+        if (strlen($address['mail'] ?? '')) {
           $mailaddresses[] = array('mail'=>$address['mail'],
                                    'name'=>strlen($address['name'])?$address['name']:'',
                                    'addrtype'=>'bcc');
@@ -216,7 +216,7 @@ class email {
     if (count($this->recipients)) {
       $recpt = '';
       foreach ($this->recipients as $address) {
-        if (strlen(@$address['mail'])) {
+        if (strlen($address['mail'] ?? '')) {
           if (strlen($address['name'])) { $recpt .= $this->mimeencode($address['name'], true).' <'.$address['mail'].'>,'; }
           else { $recpt .= $address['mail'].','; }
         }
diff --git a/classes/rrdstat.php-class b/classes/rrdstat.php-class
index 2770af7..1ed4504 100644
--- a/classes/rrdstat.php-class
+++ b/classes/rrdstat.php-class
@@ -576,7 +576,7 @@ class rrdstat {
         }
         foreach (array('scale_time_src','scale_time_tgt') as $st) {
           if (!isset($erow[$st]) || !is_numeric($erow[$st])) {
-            switch (@$erow[$st]) {
+            switch ($erow[$st] ?? null) {
               case 'dyn':
               case 'auto':
                 $erow[$st] = $slice;
@@ -785,7 +785,7 @@ class rrdstat {
     $legendlines = '';
     foreach ($graphrows as $grow) {
       $legendline = isset($grow['desc'])?$grow['desc']:(isset($grow['legend'])?$grow['legend']:$grow['name']);
-      $legendline .= '|'.@$grow['color'];
+      $legendline .= '|'.($grow['color'] ?? '');
       $legendline .= '|'.(isset($grow['color_bg'])?$grow['color_bg']:'');
       $legendline .= '|'.(isset($grow['legend_long'])?$grow['legend_long']:'');
       $legendlines .= 'legend:'.$legendline."\n";
@@ -845,7 +845,7 @@ class rrdstat {
     $pconf = $pconf + (array)$this->config_page;
 
     $return = null;
-    switch (@$pconf['type']) {
+    switch ($pconf['type'] ?? null) {
       case 'index':
         $return = $this->page_index($pconf);
         break;
@@ -971,9 +971,9 @@ class rrdstat {
     if (isset($pconf['stats_url_add'])) { $sURL_add = $pconf['stats_url_add']; }
     else { $sURL_add = '&amp;sub=%s'; }
 
-    $default_num_cols = $GLOBALS['ua']->isMobile()?1:2;
-    $num_cols = is_numeric(@$pconf['num_rows'])?$pconf['num_rows']:$default_num_cols;
-    $num_rows = ceil(count($stats)/$num_cols);
+    $default_num_cols = $GLOBALS['ua']->isMobile() ? 1 : 2;
+    $num_cols = is_numeric($pconf['num_rows'] ?? null) ? $pconf['num_rows'] : $default_num_cols;
+    $num_rows = ceil(count($stats) / $num_cols);
 
     $out .= '<table class="overview">'."\n";
     for ($row = 0; $row < $num_rows; $row++) {
@@ -984,7 +984,7 @@ class rrdstat {
         if ($idx < count($stats)) {
           @list($sname, $s_psub) = explode('|', $stats[$idx]['name'], 2);
           $s_psname = 'page'.(isset($s_psub)?'.'.$s_psub:'');
-          $g_sub = @$this->config_all[$sname][$s_psname]['graph_sub'];
+          $g_sub = $this->config_all[$sname][$s_psname]['graph_sub'] ?? '';
 
           if (isset($this->config_all[$sname][$s_psname]['title_page'])) {
             $s_ptitle = $this->config_all[$sname][$s_psname]['title_page'];
@@ -1204,7 +1204,7 @@ class rrdstat {
     foreach ($snames as $iname) {
       $newstat = array('name'=>$iname);
       $sfiles[] = isset($this->config_all[$iname]['file'])?$this->config_all[$iname]['file']:$iname.'.rrd';
-      if (is_array(@$this->config_all[$iname])) {
+      if (is_array($this->config_all[$iname] ?? null)) {
         foreach ($this->config_all[$iname] as $key=>$val) {
           if (substr($key, 0, 5) == 'page.') { $newstat['sub'][] = substr($key, 5); }
         }
-- 
2.35.3