From c1663de71ebbc53f478d9fcbcd089f90dac2a9d3 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Mon, 18 Sep 2023 13:43:14 +0100
Subject: [PATCH] MDL-79409 mod_imscp: appropriate unserialization of package
 structure.

---
 mod/imscp/lib.php      | 2 +-
 mod/imscp/locallib.php | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/mod/imscp/lib.php b/mod/imscp/lib.php
index ad8b4efa260..c2551234c23 100644
--- a/mod/imscp/lib.php
+++ b/mod/imscp/lib.php
@@ -392,7 +392,7 @@ function imscp_export_contents($cm, $baseurl) {
     $structure['fileurl']      = null;
     $structure['timecreated']  = $imscp->timemodified;
     $structure['timemodified'] = $imscp->timemodified;
-    $structure['content']      = json_encode(unserialize($imscp->structure));
+    $structure['content']      = json_encode(unserialize_array($imscp->structure));
     $structure['sortorder']    = 0;
     $structure['userid']       = null;
     $structure['author']       = null;
diff --git a/mod/imscp/locallib.php b/mod/imscp/locallib.php
index eed37bf3dad..f71499da078 100644
--- a/mod/imscp/locallib.php
+++ b/mod/imscp/locallib.php
@@ -38,12 +38,7 @@ require_once("$CFG->libdir/resourcelib.php");
 function imscp_print_content($imscp, $cm, $course) {
     global $PAGE, $CFG;
 
-    $items = unserialize($imscp->structure);
-    $first = reset($items);
-    $context = context_module::instance($cm->id);
-    $urlbase = "$CFG->wwwroot/pluginfile.php";
-    $path = '/'.$context->id.'/mod_imscp/content/'.$imscp->revision.'/'.$first['href'];
-    $firsturl = file_encode_url($urlbase, $path, false);
+    $items = array_filter((array) unserialize_array($imscp->structure));
 
     echo '<div id="imscp_layout">';
     echo '<div id="imscp_toc">';
@@ -60,7 +55,6 @@ function imscp_print_content($imscp, $cm, $course) {
     echo '</div>';
 
     $PAGE->requires->js_init_call('M.mod_imscp.init');
-    return;
 }
 
 /**