Refactor for MOODLE41 & PHP 7.4

Lesterhuis-Training-en-Consultancy · Dec 29, 2023 · 43ef30e · 43ef30e
1 parent 19998dd
commit 43ef30e
Showing 1 changed file with 4 additions and 19 deletions.
diff --git a/components/plot/line/plugin.class.php b/components/plot/line/plugin.class.php
@@ -75,25 +75,10 @@ public function execute($id, $data, $finalreport) {
 
         if ($finalreport) {
             foreach ($finalreport as $r) {
-
-                $val = 0;
-                $hash = null;
-                $hashkeyexists = isset($r[$data->serieid]);
-                $yaxiskeyexists = isset($r[$data->yaxis]);
-
-                if ($hashkeyexists) {
-                    $hash = md5(strtolower($r[$data->serieid]));
-                    $sname[$hash] = $r[$data->serieid];
-                }
-
-                if ($yaxiskeyexists && is_numeric($r[$data->yaxis])) {
-                    $val = $r[$data->yaxis];
-                }
-
-                if ($hash !== null) {
-                    $series[$hash][] = $val;
-                }
-
+                $hash = md5(strtolower($r[$data->serieid] ?? ''));
+                $sname[$hash] = $r[$data->serieid] ?? null;
+                $val = (isset($r[$data->yaxis]) && is_numeric($r[$data->yaxis])) ? $r[$data->yaxis] : 0;
+                $series[$hash][] = $val;
                 $minvalue = ($val < $minvalue) ? $val : $minvalue;
                 $maxvalue = ($val > $maxvalue) ? $val : $maxvalue;
             }