Merge pull request #6422 from nhaagen/_8/SCORM/38025

SCORM: #38025, check for empty result when checking (Tracking)Permissions
ILIAS-eLearning · Oct 17, 2023 · c7760dc · c7760dc
2 parents ac19467 + 4a37050
commit c7760dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/Modules/Scorm2004/classes/class.ilSCORM2004StoreData.php b/Modules/Scorm2004/classes/class.ilSCORM2004StoreData.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
@@ -18,6 +16,8 @@
  *
  *********************************************************************/
 
+declare(strict_types=1);
+
 /**
  * Class ilSCORM2004StoreData
  * @author Alex Killing <[email protected]>
@@ -99,7 +99,7 @@ public static function checkIfAllowed(int $packageId, int $userId, int $hash): v
             array($packageId, $userId, date('Y-m-d H:i:s'))
         );
         $rowtmp = $ilDB->fetchAssoc($res);
-        if ((int) $rowtmp['hash'] == $hash) {
+        if ($rowtmp && (int) $rowtmp['hash'] == $hash) {
             return;
         }
 

diff --git a/Modules/ScormAicc/classes/SCORM/class.ilObjSCORMTracking.php b/Modules/ScormAicc/classes/SCORM/class.ilObjSCORMTracking.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
@@ -18,6 +16,8 @@
  *
  *********************************************************************/
 
+declare(strict_types=1);
+
 /**
  * Class ilObjSCORMTracking
  * @author  Alex Killing <[email protected]>
@@ -622,10 +622,7 @@ public static function checkIfAllowed(int $packageId, int $userId, int $hash): v
             array($packageId, $userId, date('Y-m-d H:i:s'))
         );
         $rowtmp = $ilDB->fetchAssoc($res);
-        if ($rowtmp['hash'] == $hash) {
-            //ok - do nothing
-            //            die("allowed");
-        } else {
+        if (! ($rowtmp && $rowtmp['hash'] == $hash)) {
             //output used by api
             die("not allowed");
         }