Merge of Ilias8 with eduid

classes/administration/AdminScriptPageGUI.php

@@ -53,10 +53,9 @@ public function __construct(\ilEventoImportPlugin $plugin_object, \ilGlobalPageT
         $this->user = $user;
         $this->error = $error;
 
+        $this->ref_id = 31;
         if (isset($query_params['ref_id'])) {
             $this->ref_id = (int) $query_params['ref_id'];
-        } else {
-            $this->ref_id = 31;
         }
 
         $this->scripts = [
@@ -126,7 +125,7 @@ public function executeCommandAndRenderGUI()
                 $f->legacy($script->getParameterFormUI()->getHTML())
             );
 
-            if(!is_null($executed_script) && $script->getScriptId() == $executed_script) {
+            if (!is_null($executed_script) && $script->getScriptId() == $executed_script) {
                 try {
                     $modal = $script->getResultModalFromRequest(
                         $this->ctrl->getCmd(),

classes/administration/EventLocationsAdminGUI.php

@@ -3,6 +3,7 @@
 namespace EventoImport\administration;
 
 use EventoImport\config\locations\EventLocationsRepository;
+use EventoImport\config\locations\BaseLocationConfiguration;
 use ILIAS\DI\UIServices;
 
 class EventLocationsAdminGUI
@@ -29,7 +30,7 @@ public function getEventLocationsPanelHTML() : string
         $ui_components = [];
 
         // Show Location settings from the cron-job
-        $json_settings = $this->settings->get('crevento_location_settings');
+        $json_settings = $this->settings->get(BaseLocationConfiguration::CONF_LOCATIONS);
         $locations_settings = $json_settings ? json_decode($json_settings, true) : [];
         if (!is_array($locations_settings)) {
             $locations_settings = [];

classes/administration/EventLocationsBuilder.php

@@ -18,7 +18,7 @@ public function __construct(EventLocationsRepository $locations_repository, \ilT
 
         $this->hard_coded_department_mapping = [
             "Hochschule Luzern" => "HSLU",
-            "Design & Kunst" => "DK",
+            "Design Film Kunst" => "DK",
             "Informatik" => "I",
             "Musik" => "M",
             "Soziale Arbeit" => "SA",
@@ -47,13 +47,15 @@ public function buildCategoryObjectsForConfiguredKinds(array $locations_settings
 
         foreach ($locations_settings['departments'] as $department) {
             $department_ref_id = $this->fetchRefIdForObjTitle($repository_root_ref_id, $department);
-            if ($department_ref_id) {
-                foreach ($locations_settings['kinds'] as $kind) {
-                    $kind_ref_id = $this->fetchRefIdForObjTitle($department_ref_id, $kind);
-                    if (is_null($kind_ref_id)) {
-                        $this->createCategoryObject($department_ref_id, $kind);
-                        $newly_created_locations[] = strip_tags("$department/$kind");
-                    }
+            if ($department_ref_id === null) {
+                continue;
+            }
+
+            foreach ($locations_settings['kinds'] as $kind) {
+                $kind_ref_id = $this->fetchRefIdForObjTitle($department_ref_id, $kind);
+                if (is_null($kind_ref_id)) {
+                    $this->createCategoryObject($department_ref_id, $kind);
+                    $newly_created_locations[] = strip_tags("$department/$kind");
                 }
             }
         }
@@ -68,16 +70,16 @@ public function getListOfMissingKindCategories(array $locations_settings) : arra
         $missing_locations = [];
         foreach ($locations_settings['departments'] as $department) {
             $department_ref_id = $this->fetchRefIdForObjTitle($repository_root_ref_id, $department);
-            if (!is_null($department_ref_id)) {
-                foreach ($locations_settings['kinds'] as $kind) {
-                    $kind_ref_id = $this->fetchRefIdForObjTitle($department_ref_id, $kind);
-                    if (is_null($kind_ref_id)) {
-                        $missing_locations[] = strip_tags("/$department/$kind/*");
-                    }
-                }
-            } else {
+            if (is_null($department_ref_id)) {
                 $missing_locations[] = strip_tags("/$department/*");
             }
+
+            foreach ($locations_settings['kinds'] as $kind) {
+                $kind_ref_id = $this->fetchRefIdForObjTitle($department_ref_id, $kind);
+                if (is_null($kind_ref_id)) {
+                    $missing_locations[] = strip_tags("/$department/$kind/*");
+                }
+            }
         }
 
         return $missing_locations;
@@ -104,15 +106,13 @@ private function createCategoryObject(int $parent_ref_id, string $category_title
         $new_category->setPermissions($parent_ref_id);
 
         // default: sort by title
-        include_once('Services/Container/classes/class.ilContainerSortingSettings.php');
         $settings = new \ilContainerSortingSettings($new_category->getId());
         $settings->setSortMode(\ilContainer::SORT_TITLE);
         $settings->save();
 
         try {
             // inherit parents content style, if not individual
             $parent_id = \ilObject::_lookupObjId($parent_ref_id);
-            include_once("./Services/Style/Content/classes/class.ilObjStyleSheet.php");
             $style_id = \ilObjStyleSheet::lookupObjectStyle($parent_id);
             if ($style_id > 0) {
                 if (\ilObjStyleSheet::_lookupStandard($style_id)) {
@@ -129,7 +129,7 @@ private function fetchRefIdForObjTitle(int $root_ref_id, string $searched_obj_ti
     {
         foreach ($this->tree->getChildsByType($root_ref_id, 'cat') as $child_node) {
             $child_ref = $child_node['child'];
-            $obj_id = \ilObject::_lookupObjectId($child_ref);
+            $obj_id = \ilObject::_lookupObjectId((int) $child_ref);
             if (\ilObject::_lookupTitle($obj_id) == $searched_obj_title) {
                 return (int) $child_ref;
             }
@@ -152,20 +152,24 @@ private function fillRepositoryLocationsTable(array $locations_settings) : void
         $repository_root_ref_id = 1;
         foreach ($locations_settings['departments'] as $department) {
             $department_ref_id = $this->fetchRefIdForObjTitle($repository_root_ref_id, $department);
-            if ($department_ref_id) {
-                foreach ($locations_settings['kinds'] as $kind) {
-                    $kind_ref_id = $this->fetchRefIdForObjTitle($department_ref_id, $kind);
-                    if ($kind_ref_id) {
-                        foreach ($this->tree->getChildsByType($kind_ref_id, 'cat') as $child_node) {
-                            if ($this->isPossibleYearCategory($child_node)) {
-                                $this->locations_repository->addNewLocation(
-                                    $this->getMappedDepartmentName($department),
-                                    $kind,
-                                    (int) $child_node['title'],
-                                    (int) $child_node['ref_id']
-                                );
-                            }
-                        }
+            if ($department_ref_id === null) {
+                continue;
+            }
+
+            foreach ($locations_settings['kinds'] as $kind) {
+                $kind_ref_id = $this->fetchRefIdForObjTitle($department_ref_id, $kind);
+                if ($kind_ref_id === null) {
+                    continue;
+                }
+
+                foreach ($this->tree->getChildsByType($kind_ref_id, 'cat') as $child_node) {
+                    if ($this->isPossibleYearCategory($child_node)) {
+                        $this->locations_repository->addNewLocation(
+                            $this->getMappedDepartmentName($department),
+                            $kind,
+                            (int) $child_node['title'],
+                            (int) $child_node['ref_id']
+                        );
                     }
                 }
             }

classes/administration/EventoImportApiTester.php

@@ -39,38 +39,40 @@ public function fetchDataRecord(string $cmd, int $id) : ?ApiDataModelBase
                 $api_importer_settings->getMaxRetries()
             );
             return $importer->fetchUserDataRecordById($id);
-        } else {
-            if ($cmd == 'event') {
-                $importer = new EventoEventImporter(
-                    $request_client,
-                    $iterator,
-                    $logger,
-                    $api_importer_settings->getTimeoutAfterRequest(),
-                    $api_importer_settings->getMaxRetries()
-                );
-                return $importer->fetchEventDataRecordById($id);
-            } else {
-                if ($cmd == 'photo') {
-                    $importer = new EventoUserPhotoImporter(
-                        $request_client,
-                        $api_importer_settings->getTimeoutAfterRequest(),
-                        $api_importer_settings->getMaxRetries(),
-                        $logger
-                    );
-                    return $importer->fetchUserPhotoDataById($id);
-                } else {
-                    if ($cmd == 'admin') {
-                        $importer = new EventoAdminImporter(
-                            $request_client,
-                            $logger,
-                            $api_importer_settings->getTimeoutAfterRequest(),
-                            $api_importer_settings->getMaxRetries()
-                        );
-                        return $importer->fetchEventAdminDataRecordById($id);
-                    }
-                }
-            }
         }
+
+        if ($cmd == 'event') {
+            $importer = new EventoEventImporter(
+                $request_client,
+                $iterator,
+                $logger,
+                $api_importer_settings->getTimeoutAfterRequest(),
+                $api_importer_settings->getMaxRetries()
+            );
+            return $importer->fetchEventDataRecordById($id);
+        }
+
+        if ($cmd == 'photo') {
+            $importer = new EventoUserPhotoImporter(
+                $request_client,
+                $api_importer_settings->getTimeoutAfterRequest(),
+                $api_importer_settings->getMaxRetries(),
+                $logger
+            );
+            return $importer->fetchUserPhotoDataById($id);
+        }
+
+        if ($cmd == 'admin') {
+            $importer = new EventoAdminImporter(
+                $request_client,
+                $logger,
+                $api_importer_settings->getTimeoutAfterRequest(),
+                $api_importer_settings->getMaxRetries()
+            );
+            return $importer->fetchEventAdminDataRecordById($id);
+        }
+
+        return null;
     }
 
     public function fetchDataSet(string $cmd, int $skip, int $take) : array
@@ -90,18 +92,20 @@ public function fetchDataSet(string $cmd, int $skip, int $take) : array
                 $api_importer_settings->getMaxRetries()
             );
             return $importer->fetchSpecificUserDataSet($skip, $take);
-        } else {
-            if ($cmd == 'event') {
-                $importer = new EventoEventImporter(
-                    $request_client,
-                    $iterator,
-                    $logger,
-                    $api_importer_settings->getTimeoutAfterRequest(),
-                    $api_importer_settings->getMaxRetries()
-                );
-                return $importer->fetchSpecificEventDataSet($skip, $take);
-            }
         }
+
+        if ($cmd == 'event') {
+            $importer = new EventoEventImporter(
+                $request_client,
+                $iterator,
+                $logger,
+                $api_importer_settings->getTimeoutAfterRequest(),
+                $api_importer_settings->getMaxRetries()
+            );
+            return $importer->fetchSpecificEventDataSet($skip, $take);
+        }
+
+        return [];
     }
 
     public function fetchParameterlessDataset() : array
@@ -125,7 +129,7 @@ private function buildDataSource(ImporterApiSettings $api_importer_settings) : R
         return new RestClientService(
             $api_importer_settings->getUrl(),
             $api_importer_settings->getTimeoutAfterRequest(),
-            $api_importer_settings->getApikey(),
+            $api_importer_settings->getApiKey(),
             $api_importer_settings->getApiSecret()
         );
     }

classes/administration/EventoImportApiTesterGUI.php

@@ -185,25 +185,29 @@ private function buildMessageForNextPage(string $infos, string $output) : string
 
     public function getApiDataAsString($cmd) : string
     {
-        if ($cmd == 'by_id') {
+        if ($cmd === 'by_id') {
             $form = $this->initDataRecordForm()->withRequest($this->request);
             $data = $form->getData();
 
             if ($data) {
                 return $this->fetchDataRecordFromFormInput(...$data[0]);
-            } else {
-                return "Form data Invalid";
             }
-        } else if ($cmd == 'data_set') {
+
+            return "Form data Invalid";
+        }
+
+        if ($cmd === 'data_set') {
             $form = $this->initDataSetForm()->withRequest($this->request);
             $data = $form->getData();
 
             if ($data) {
                 return $this->fetchDataSetFromFormInput(...$data[0]);
-            } else {
-                return "Form data Invalid";
             }
-        } else if ($cmd == 'parameterless') {
+
+            return "Form data Invalid";
+        }
+
+        if ($cmd === 'parameterless') {
             return $this->fetchParameterlessDataset();
         }
 

classes/administration/scripts/AdminScriptCommonMethods.php

@@ -24,7 +24,7 @@ private function buildEventImporter($db)
             new RestClientService(
                 $api_settings->getUrl(),
                 $api_settings->getTimeoutFailedRequest(),
-                $api_settings->getApikey(),
+                $api_settings->getApiKey(),
                 $api_settings->getApiSecret()
             ),
             new ImporterIterator($api_settings->getPageSize()),

classes/administration/scripts/LookupEventByEventoTitle.php

@@ -64,7 +64,7 @@ public function getParameterFormUI() : \ilPropertyFormGUI
     public function getResultModalFromRequest(string $cmd, Factory $f) : Modal
     {
         $form = $this->getParameterFormUI();
-        if(!$form->checkInput()) {
+        if (!$form->checkInput()) {
             throw new \InvalidArgumentException("Invalid Form Input!");
         }
 

classes/administration/scripts/ReAddRemovedEventParticipants.php

@@ -99,7 +99,7 @@ private function listParticipantsInModal(Factory $f) : Modal
         $repo = new IliasEventoEventObjectRepository($this->db);
 
         $form = $this->getParameterFormUI();
-        if(!$form->checkInput()) {
+        if (!$form->checkInput()) {
             throw new \InvalidArgumentException('Invalid form input');
         }
 
@@ -136,13 +136,13 @@ private function listParticipantsInModal(Factory $f) : Modal
     private function reAddParticipants($f) : Modal
     {
         $query_params = $this->request->getQueryParams();
-        if(!isset($query_params['readd_to_event'])) {
+        if (!isset($query_params['readd_to_event'])) {
             throw new \InvalidArgumentException('No Event ID to readd participants');
         }
         $event = $this->repo->getEventByEventoId((int) $query_params['readd_to_event']);
 
         $readd_form = $this->getFormWithRemovedUsers($event);
-        if(!$readd_form->checkInput()) {
+        if (!$readd_form->checkInput()) {
             throw new \InvalidArgumentException('Invalid form input');
         }
 

classes/administration/scripts/ResetHiddenAdminPermissions.php

@@ -53,7 +53,7 @@ public function getParameterFormUI() : \ilPropertyFormGUI
     public function getResultModalFromRequest(string $cmd, Factory $f) : Modal
     {
         $form = $this->getParameterFormUI();
-        if(!$form->checkInput() || $cmd != self::CMD_SET_PERMISSION) {
+        if (!$form->checkInput() || $cmd != self::CMD_SET_PERMISSION) {
             throw new \InvalidArgumentException("Invalid Form Input!");
         }
 
@@ -68,9 +68,9 @@ public function getResultModalFromRequest(string $cmd, Factory $f) : Modal
                 $obj_ref_id = (int) $row[HiddenAdminsTableDef::COL_OBJECT_REF_ID];
                 if (!\ilObject::_exists($role_id)) {
                     $errors[] = "Role with role_id $role_id does not exist";
-                } else if (!\ilObject::_exists($obj_ref_id, true)) {
+                } elseif (!\ilObject::_exists($obj_ref_id, true)) {
                     $errors[] = "Object with ref_id $obj_ref_id does not exist";
-                } else if (!$this->tree->isInTree($obj_ref_id)) {
+                } elseif (!$this->tree->isInTree($obj_ref_id)) {
                     $errors[] = "Object with ref_id $obj_ref_id is not in tree";
                 } else {
                     $this->resetPermissionsForRole(