diff --git a/lib/ilias_interface/IliasSoap.class.php b/lib/ilias_interface/IliasSoap.class.php index e140a9f570583fd6c58fdd84f17721db2169532d..0ba7dd3d719c4255e80a18ea1023353fdf27e53e 100644 --- a/lib/ilias_interface/IliasSoap.class.php +++ b/lib/ilias_interface/IliasSoap.class.php @@ -377,18 +377,9 @@ class IliasSoap extends StudipSoapClient if ($user_id != "") $param["user_id"] = $user_id; $result = $this->call('searchObjects', $param); - if ($result != false) + if ($result) { - //$objects = $this->parseXML($result); - $objects = $this->parseIliasObject($result); -// var_dump($objects); - return $objects; - if (count(objects)){ - foreach($all_objects as $one_object){ - $ret[$one_object['ref_id']] = $one_object; - } - return $ret; - } + return $this->parseIliasObject($result); } return false; diff --git a/lib/models/Courseware/StructuralElement.php b/lib/models/Courseware/StructuralElement.php index 11227d233c767c0240e89be2730787ab79510f2f..8c6d1ded6151cf54d56b1cd3f08b8a31fdaabe0b 100644 --- a/lib/models/Courseware/StructuralElement.php +++ b/lib/models/Courseware/StructuralElement.php @@ -177,10 +177,10 @@ class StructuralElement extends \SimpleORMap implements \PrivacyObject { if (is_null($image)) { $this->image_id = null; - } elseif (is_a($image, \FileRef)) { + } elseif (is_a($image, \FileRef::class)) { $this->image_id = $image->getId(); $this->image_type = \FileRef::class; - } elseif (is_a($image, \StockImage)) { + } elseif (is_a($image, \StockImage::class)) { $this->image_id = $image->getId(); $this->image_type = \StockImage::class; } else { @@ -1167,6 +1167,6 @@ SQL; if ($structuralElements) { $storage->addTabularData(_('Courseware Seiten'), 'cw_structural_elements', $structuralElements); } - + } }