From ccb241551c04f33b7a451a5f5ef60de59b622c66 Mon Sep 17 00:00:00 2001 From: Luka Stocker Date: Wed, 13 Sep 2023 11:26:48 +0200 Subject: [PATCH] Soap: adjust references. --- .../OrgUnit/classes/Webservices/SOAP/Base.php | 2 +- .../classes/class.ilAuthProviderSoap.php | 2 +- .../SOAPAuth/classes/class.ilSOAPAuth.php | 4 +- .../examples/class.ilSoapDummyAuthServer.php | 2 +- .../ILIAS/SOAPAuth/examples/dummy_client.php | 4 +- .../save_question_post_data.php | 2 +- .../test/ilServicesWebServicesSuite.php | 2 +- ...lass.ilNusoapUserAdministrationAdapter.php | 4 +- .../classes/class.ilSoapAdministration.php | 6 +- .../class.ilSoapCourseAdministration.php | 6 +- ...ass.ilSoapDataCollectionAdministration.php | 2 +- .../class.ilSoapExerciseAdministration.php | 2 +- .../class.ilSoapFileAdministration.php | 2 +- .../class.ilSoapGLOStructureReader.php | 4 +- ...ilSoapGLOTermDefinitionStructureObject.php | 2 +- .../class.ilSoapGLOTermStructureObject.php | 2 +- .../class.ilSoapGroupAdministration.php | 6 +- .../class.ilSoapLMChapterStructureObject.php | 2 +- .../class.ilSoapLMPageStructureObject.php | 2 +- .../classes/class.ilSoapLMStructureReader.php | 4 +- ...s.ilSoapLearningProgressAdministration.php | 2 +- .../class.ilSoapObjectAdministration.php | 30 +-- .../class.ilSoapRBACAdministration.php | 14 +- .../class.ilSoapRepositoryStructureObject.php | 2 +- .../class.ilSoapRoleObjectXMLWriter.php | 2 +- .../class.ilSoapSCORMAdministration.php | 2 +- ...ss.ilSoapStructureObjectAdministration.php | 6 +- .../class.ilSoapStructureObjectFactory.php | 10 +- .../classes/class.ilSoapStructureReader.php | 2 +- .../class.ilSoapTestAdministration.php | 6 +- .../class.ilSoapUserAdministration.php | 10 +- .../class.ilSoapUserAdministrationAdapter.php | 2 +- .../ILIAS/soap/classes/class.ilSoapUtils.php | 6 +- .../soap/classes/class.ilXMLResultSet.php | 4 +- .../ILIAS/soap/include/inc.soap_functions.php | 178 +++++++++--------- composer.json | 2 +- public/soap/nusoapserver.php | 6 +- public/soap/server.php | 4 +- tests/App/RootFolderTest.php | 1 - 39 files changed, 175 insertions(+), 176 deletions(-) diff --git a/components/ILIAS/OrgUnit/classes/Webservices/SOAP/Base.php b/components/ILIAS/OrgUnit/classes/Webservices/SOAP/Base.php index 172930b96812..d40b47a1e97e 100644 --- a/components/ILIAS/OrgUnit/classes/Webservices/SOAP/Base.php +++ b/components/ILIAS/OrgUnit/classes/Webservices/SOAP/Base.php @@ -18,7 +18,7 @@ namespace ILIAS\OrgUnit\Webservices\SOAP; -require_once('./webservice/soap/classes/class.ilSoapAdministration.php'); +require_once('./components/ILIAS/soap/classes/class.ilSoapAdministration.php'); require_once('./components/ILIAS/WebServices/SOAP/classes/class.ilSoapPluginException.php'); use ilOrgUnitSOAPServicesPlugin; diff --git a/components/ILIAS/SOAPAuth/classes/class.ilAuthProviderSoap.php b/components/ILIAS/SOAPAuth/classes/class.ilAuthProviderSoap.php index 3e0a8f5cac65..3b0acb9b8ab3 100644 --- a/components/ILIAS/SOAPAuth/classes/class.ilAuthProviderSoap.php +++ b/components/ILIAS/SOAPAuth/classes/class.ilAuthProviderSoap.php @@ -67,7 +67,7 @@ private function initClient(): void $this->uri .= ('/' . $this->server_uri); } - require_once './webservice/soap/lib/nusoap.php'; + require_once './components/ILIAS/soap/lib/nusoap.php'; $this->client = new nusoap_client($this->uri); } diff --git a/components/ILIAS/SOAPAuth/classes/class.ilSOAPAuth.php b/components/ILIAS/SOAPAuth/classes/class.ilSOAPAuth.php index 494aad5d1eeb..8736005e0657 100644 --- a/components/ILIAS/SOAPAuth/classes/class.ilSOAPAuth.php +++ b/components/ILIAS/SOAPAuth/classes/class.ilSOAPAuth.php @@ -17,7 +17,7 @@ declare(strict_types=1); -include_once("./webservice/soap/lib/nusoap.php"); +include_once("./components/ILIAS/soap/lib/nusoap.php"); class ilSOAPAuth { @@ -47,7 +47,7 @@ public static function testConnection(string $a_ext_uid, string $a_soap_pw, bool $uri .= "/" . $server_uri; } - require_once './webservice/soap/lib/nusoap.php'; + require_once './components/ILIAS/soap/lib/nusoap.php'; $soap_client = new nusoap_client($uri); if ($err = $soap_client->getError()) { return "SOAP Authentication Initialisation Error: " . $err; diff --git a/components/ILIAS/SOAPAuth/examples/class.ilSoapDummyAuthServer.php b/components/ILIAS/SOAPAuth/examples/class.ilSoapDummyAuthServer.php index 3d5f112669c1..842fc79e9e64 100644 --- a/components/ILIAS/SOAPAuth/examples/class.ilSoapDummyAuthServer.php +++ b/components/ILIAS/SOAPAuth/examples/class.ilSoapDummyAuthServer.php @@ -22,7 +22,7 @@ * @author Alex Killing */ -include_once './webservice/soap/lib/nusoap.php'; +include_once './components/ILIAS/soap/lib/nusoap.php'; function isValidSession(string $ext_uid, string $soap_pw, bool $new_user): array { diff --git a/components/ILIAS/SOAPAuth/examples/dummy_client.php b/components/ILIAS/SOAPAuth/examples/dummy_client.php index 9bd65b0f019e..30f1f00be9fb 100644 --- a/components/ILIAS/SOAPAuth/examples/dummy_client.php +++ b/components/ILIAS/SOAPAuth/examples/dummy_client.php @@ -17,7 +17,7 @@ *****************************************************************************/ exit; -include_once './webservice/soap/lib/nusoap.php'; +include_once './components/ILIAS/soap/lib/nusoap.php'; $server = $_GET["server"] ?: "http://localhost/components/ILIAS/SOAPAuth/dummy_server.php"; @@ -39,7 +39,7 @@ echo "

----------------------------------------------

Calling Server..."; // initialize soap client -require_once './webservice/soap/lib/nusoap.php'; +require_once './components/ILIAS/soap/lib/nusoap.php'; $client = new nusoap_client($server); if ($err = $client->getError()) { echo '

Constructor error

' . $err . '
'; diff --git a/components/ILIAS/TestQuestionPool/save_question_post_data.php b/components/ILIAS/TestQuestionPool/save_question_post_data.php index 1dae020cea47..52d1051f7071 100644 --- a/components/ILIAS/TestQuestionPool/save_question_post_data.php +++ b/components/ILIAS/TestQuestionPool/save_question_post_data.php @@ -4,7 +4,7 @@ chdir("../.."); require_once "./cli/inc.header.php"; -include_once "./webservice/soap/include/inc.soap_functions.php"; +include_once "./components/ILIAS/soap/include/inc.soap_functions.php"; $results = array(); foreach ($_POST as $key => $value) { if (preg_match("/value_(\d+)_1/", $key, $matches)) { diff --git a/components/ILIAS/WebServices/test/ilServicesWebServicesSuite.php b/components/ILIAS/WebServices/test/ilServicesWebServicesSuite.php index e046d3fe92b0..c85dd74b8cb3 100644 --- a/components/ILIAS/WebServices/test/ilServicesWebServicesSuite.php +++ b/components/ILIAS/WebServices/test/ilServicesWebServicesSuite.php @@ -12,7 +12,7 @@ public static function suite(): self include_once("./components/ILIAS/WebServices/test/ilRPCServerSettingsTest.php"); $suite->addTestSuite(ilRPCServerSettingsTest::class); - include_once './webservice/soap/test/ilSoapFunctionsTest.php'; + include_once './components/ILIAS/soap/test/ilSoapFunctionsTest.php'; $suite->addTestSuite(ilSoapFunctionsTest::class); return $suite; diff --git a/components/ILIAS/soap/classes/class.ilNusoapUserAdministrationAdapter.php b/components/ILIAS/soap/classes/class.ilNusoapUserAdministrationAdapter.php index 423f6f06bd1a..3275203d0eb8 100644 --- a/components/ILIAS/soap/classes/class.ilNusoapUserAdministrationAdapter.php +++ b/components/ILIAS/soap/classes/class.ilNusoapUserAdministrationAdapter.php @@ -36,8 +36,8 @@ use ILIAS\OrgUnit\Webservices\SOAP\UserIdsOfPosition; use ILIAS\OrgUnit\Webservices\SOAP\UserIdsOfPositionAndOrgUnit; -include_once './webservice/soap/lib/nusoap.php'; -include_once './webservice/soap/include/inc.soap_functions.php'; +include_once './components/ILIAS/soap/lib/nusoap.php'; +include_once './components/ILIAS/soap/include/inc.soap_functions.php'; require_once('./components/ILIAS/WebServices/SOAP/classes/class.ilSoapHook.php'); require_once('./components/ILIAS/Init/classes/class.ilInitialisation.php'); diff --git a/components/ILIAS/soap/classes/class.ilSoapAdministration.php b/components/ILIAS/soap/classes/class.ilSoapAdministration.php index 91a242ec475b..d8bdbe1f4ea2 100644 --- a/components/ILIAS/soap/classes/class.ilSoapAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapAdministration.php @@ -29,7 +29,7 @@ * @author Stefan Meyer */ -include_once './webservice/soap/lib/nusoap.php'; +include_once './components/ILIAS/soap/lib/nusoap.php'; include_once("./components/ILIAS/Authentication/classes/class.ilAuthUtils.php"); // to get auth mode constants class ilSoapAdministration @@ -252,7 +252,7 @@ public function getInstallationInfoXML(): string ilInitialisation::initILIAS(); $clientdirs = glob(ILIAS_WEB_DIR . "/*", GLOB_ONLYDIR); - require_once("webservice/soap/classes/class.ilSoapInstallationInfoXMLWriter.php"); + require_once("components/ILIAS/soap/classes/class.ilSoapInstallationInfoXMLWriter.php"); $writer = new ilSoapInstallationInfoXMLWriter(); $writer->start(); if (is_array($clientdirs)) { @@ -276,7 +276,7 @@ public function getClientInfoXML(string $clientid) ilInitialisation::initILIAS(); $clientdir = ILIAS_WEB_DIR . "/" . $clientid; - require_once("webservice/soap/classes/class.ilSoapInstallationInfoXMLWriter.php"); + require_once("components/ILIAS/soap/classes/class.ilSoapInstallationInfoXMLWriter.php"); $writer = new ilSoapInstallationInfoXMLWriter(); $writer->start(); if (!$writer->addClient($clientdir)) { diff --git a/components/ILIAS/soap/classes/class.ilSoapCourseAdministration.php b/components/ILIAS/soap/classes/class.ilSoapCourseAdministration.php index a57c7264a917..31635d8ab20e 100644 --- a/components/ILIAS/soap/classes/class.ilSoapCourseAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapCourseAdministration.php @@ -27,7 +27,7 @@ * @version $Id$ * @package ilias */ -include_once './webservice/soap/classes/class.ilSoapAdministration.php'; +include_once './components/ILIAS/soap/classes/class.ilSoapAdministration.php'; class ilSoapCourseAdministration extends ilSoapAdministration { @@ -422,7 +422,7 @@ public function getCoursesForUser(string $sid, string $parameters) $ilObjDataCache = $DIC['ilObjDataCache']; $tree = $DIC['tree']; - include_once 'webservice/soap/classes/class.ilXMLResultSetParser.php'; + include_once 'components/ILIAS/soap/classes/class.ilXMLResultSetParser.php'; $parser = new ilXMLResultSetParser($parameters); try { $parser->startParsing(); @@ -507,7 +507,7 @@ public function getCoursesForUser(string $sid, string $parameters) $ref_ids = array_unique($ref_ids); - include_once 'webservice/soap/classes/class.ilXMLResultSetWriter.php'; + include_once 'components/ILIAS/soap/classes/class.ilXMLResultSetWriter.php'; include_once 'components/ILIAS/Course/classes/class.ilObjCourse.php'; include_once 'components/ILIAS/Course/classes/class.ilCourseXMLWriter.php'; diff --git a/components/ILIAS/soap/classes/class.ilSoapDataCollectionAdministration.php b/components/ILIAS/soap/classes/class.ilSoapDataCollectionAdministration.php index 7f321a8f838b..afb117ae5db0 100644 --- a/components/ILIAS/soap/classes/class.ilSoapDataCollectionAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapDataCollectionAdministration.php @@ -20,7 +20,7 @@ | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | +-----------------------------------------------------------------------------+ */ -require_once('./webservice/soap/classes/class.ilSoapAdministration.php'); +require_once('./components/ILIAS/soap/classes/class.ilSoapAdministration.php'); /** * Soap data-collection administration methods diff --git a/components/ILIAS/soap/classes/class.ilSoapExerciseAdministration.php b/components/ILIAS/soap/classes/class.ilSoapExerciseAdministration.php index b277e32dd657..1c91f99f181f 100644 --- a/components/ILIAS/soap/classes/class.ilSoapExerciseAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapExerciseAdministration.php @@ -27,7 +27,7 @@ * Soap exercise administration methods * @author Roland Küstermann */ -include_once './webservice/soap/classes/class.ilSoapAdministration.php'; +include_once './components/ILIAS/soap/classes/class.ilSoapAdministration.php'; class ilSoapExerciseAdministration extends ilSoapAdministration { diff --git a/components/ILIAS/soap/classes/class.ilSoapFileAdministration.php b/components/ILIAS/soap/classes/class.ilSoapFileAdministration.php index 813b86364b7c..9b224678a363 100644 --- a/components/ILIAS/soap/classes/class.ilSoapFileAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapFileAdministration.php @@ -25,7 +25,7 @@ * Soap file administration methods * @author Roland Küstermann */ -include_once './webservice/soap/classes/class.ilSoapAdministration.php'; +include_once './components/ILIAS/soap/classes/class.ilSoapAdministration.php'; class ilSoapFileAdministration extends ilSoapAdministration { diff --git a/components/ILIAS/soap/classes/class.ilSoapGLOStructureReader.php b/components/ILIAS/soap/classes/class.ilSoapGLOStructureReader.php index 49c1a5c7b908..3ecfb158174a 100644 --- a/components/ILIAS/soap/classes/class.ilSoapGLOStructureReader.php +++ b/components/ILIAS/soap/classes/class.ilSoapGLOStructureReader.php @@ -22,8 +22,8 @@ +-----------------------------------------------------------------------------+ */ -include_once "./webservice/soap/classes/class.ilSoapStructureReader.php"; -include_once "./webservice/soap/classes/class.ilSoapStructureObjectFactory.php"; +include_once "./components/ILIAS/soap/classes/class.ilSoapStructureReader.php"; +include_once "./components/ILIAS/soap/classes/class.ilSoapStructureObjectFactory.php"; /** * class reading a glossary to transform it into a structure object diff --git a/components/ILIAS/soap/classes/class.ilSoapGLOTermDefinitionStructureObject.php b/components/ILIAS/soap/classes/class.ilSoapGLOTermDefinitionStructureObject.php index ab5f5dead3bc..24ee926e6b8a 100644 --- a/components/ILIAS/soap/classes/class.ilSoapGLOTermDefinitionStructureObject.php +++ b/components/ILIAS/soap/classes/class.ilSoapGLOTermDefinitionStructureObject.php @@ -29,7 +29,7 @@ * @package ilias */ -include_once "./webservice/soap/classes/class.ilSoapStructureObject.php"; +include_once "./components/ILIAS/soap/classes/class.ilSoapStructureObject.php"; class ilSoapGLOTermDefinitionStructureObject extends ilSoapStructureObject { diff --git a/components/ILIAS/soap/classes/class.ilSoapGLOTermStructureObject.php b/components/ILIAS/soap/classes/class.ilSoapGLOTermStructureObject.php index af6ea860f1e3..bf78a8fd3376 100644 --- a/components/ILIAS/soap/classes/class.ilSoapGLOTermStructureObject.php +++ b/components/ILIAS/soap/classes/class.ilSoapGLOTermStructureObject.php @@ -29,7 +29,7 @@ * @package ilias */ -include_once "./webservice/soap/classes/class.ilSoapStructureObject.php"; +include_once "./components/ILIAS/soap/classes/class.ilSoapStructureObject.php"; class ilSoapGLOTermStructureObject extends ilSoapStructureObject { diff --git a/components/ILIAS/soap/classes/class.ilSoapGroupAdministration.php b/components/ILIAS/soap/classes/class.ilSoapGroupAdministration.php index c2bb00759bdd..088b6073f3dd 100644 --- a/components/ILIAS/soap/classes/class.ilSoapGroupAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapGroupAdministration.php @@ -21,7 +21,7 @@ +-----------------------------------------------------------------------------+ */ -include_once './webservice/soap/classes/class.ilSoapAdministration.php'; +include_once './components/ILIAS/soap/classes/class.ilSoapAdministration.php'; /** * Soap grp administration methods @@ -350,7 +350,7 @@ public function getGroupsForUser(string $sid, string $parameters) $ilObjDataCache = $DIC['ilObjDataCache']; $tree = $DIC['tree']; - include_once 'webservice/soap/classes/class.ilXMLResultSetParser.php'; + include_once 'components/ILIAS/soap/classes/class.ilXMLResultSetParser.php'; $parser = new ilXMLResultSetParser($parameters); try { $parser->startParsing(); @@ -428,7 +428,7 @@ public function getGroupsForUser(string $sid, string $parameters) } $ref_ids = array_unique($ref_ids); - include_once 'webservice/soap/classes/class.ilXMLResultSetWriter.php'; + include_once 'components/ILIAS/soap/classes/class.ilXMLResultSetWriter.php'; include_once 'components/ILIAS/Group/classes/class.ilObjGroup.php'; include_once 'components/ILIAS/Group/classes/class.ilGroupXMLWriter.php'; diff --git a/components/ILIAS/soap/classes/class.ilSoapLMChapterStructureObject.php b/components/ILIAS/soap/classes/class.ilSoapLMChapterStructureObject.php index 0c52b809120b..0ae4b3ba7052 100644 --- a/components/ILIAS/soap/classes/class.ilSoapLMChapterStructureObject.php +++ b/components/ILIAS/soap/classes/class.ilSoapLMChapterStructureObject.php @@ -29,7 +29,7 @@ * @package ilias */ -include_once "./webservice/soap/classes/class.ilSoapStructureObject.php"; +include_once "./components/ILIAS/soap/classes/class.ilSoapStructureObject.php"; class ilSoapLMChapterStructureObject extends ilSoapStructureObject { diff --git a/components/ILIAS/soap/classes/class.ilSoapLMPageStructureObject.php b/components/ILIAS/soap/classes/class.ilSoapLMPageStructureObject.php index 4a2dde83e161..88d5c84f172f 100644 --- a/components/ILIAS/soap/classes/class.ilSoapLMPageStructureObject.php +++ b/components/ILIAS/soap/classes/class.ilSoapLMPageStructureObject.php @@ -29,7 +29,7 @@ * @package ilias */ -include_once "./webservice/soap/classes/class.ilSoapStructureObject.php"; +include_once "./components/ILIAS/soap/classes/class.ilSoapStructureObject.php"; class ilSoapLMPageStructureObject extends ilSoapStructureObject { diff --git a/components/ILIAS/soap/classes/class.ilSoapLMStructureReader.php b/components/ILIAS/soap/classes/class.ilSoapLMStructureReader.php index 81e6cedaa554..225e9736ad81 100644 --- a/components/ILIAS/soap/classes/class.ilSoapLMStructureReader.php +++ b/components/ILIAS/soap/classes/class.ilSoapLMStructureReader.php @@ -21,8 +21,8 @@ +-----------------------------------------------------------------------------+ */ -include_once "./webservice/soap/classes/class.ilSoapStructureReader.php"; -include_once "./webservice/soap/classes/class.ilSoapStructureObjectFactory.php"; +include_once "./components/ILIAS/soap/classes/class.ilSoapStructureReader.php"; +include_once "./components/ILIAS/soap/classes/class.ilSoapStructureObjectFactory.php"; /** * class for reading a learning module as structure object diff --git a/components/ILIAS/soap/classes/class.ilSoapLearningProgressAdministration.php b/components/ILIAS/soap/classes/class.ilSoapLearningProgressAdministration.php index 30e8b8829797..66a409e90265 100644 --- a/components/ILIAS/soap/classes/class.ilSoapLearningProgressAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapLearningProgressAdministration.php @@ -2,7 +2,7 @@ /* Copyright (c) 1998-2010 ILIAS open source, Extended GPL, see docs/LICENSE */ -include_once './webservice/soap/classes/class.ilSoapAdministration.php'; +include_once './components/ILIAS/soap/classes/class.ilSoapAdministration.php'; /** * This class handles all DB changes necessary for fraunhofer diff --git a/components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php b/components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php index 3bb26ccbfe34..ccefa04e7657 100644 --- a/components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php @@ -28,7 +28,7 @@ * @version $Id$ * @package ilias */ -include_once './webservice/soap/classes/class.ilSoapAdministration.php'; +include_once './components/ILIAS/soap/classes/class.ilSoapAdministration.php'; class ilSoapObjectAdministration extends ilSoapAdministration { @@ -174,7 +174,7 @@ public function getObjectByReference(string $sid, int $a_ref_id, int $user_id) if (ilObject::_isInTrash($a_ref_id)) { return $this->raiseError("Object with ID $a_ref_id has been deleted.", 'Client'); } - include_once './webservice/soap/classes/class.ilObjectXMLWriter.php'; + include_once './components/ILIAS/soap/classes/class.ilObjectXMLWriter.php'; $xml_writer = new ilObjectXMLWriter(); $xml_writer->enablePermissionCheck(true); @@ -247,7 +247,7 @@ public function getObjectsByTitle(string $sid, string $a_title, int $user_id) return ''; } - include_once './webservice/soap/classes/class.ilObjectXMLWriter.php'; + include_once './components/ILIAS/soap/classes/class.ilObjectXMLWriter.php'; $xml_writer = new ilObjectXMLWriter(); $xml_writer->enablePermissionCheck(true); @@ -363,7 +363,7 @@ public function searchObjects(string $sid, array $types, string $key, string $co return ''; } - include_once './webservice/soap/classes/class.ilObjectXMLWriter.php'; + include_once './components/ILIAS/soap/classes/class.ilObjectXMLWriter.php'; $xml_writer = new ilObjectXMLWriter(); if (ilSearchSettings::getInstance()->enabledLucene()) { $xml_writer->enableReferences(false); @@ -431,7 +431,7 @@ public function getTreeChilds(string $sid, int $ref_id, array $types, int $user_ } } - include_once './webservice/soap/classes/class.ilObjectXMLWriter.php'; + include_once './components/ILIAS/soap/classes/class.ilObjectXMLWriter.php'; $xml_writer = new ilObjectXMLWriter(); $xml_writer->enablePermissionCheck(true); $xml_writer->setObjects($objs); @@ -483,7 +483,7 @@ public function getXMLTree(string $sid, int $ref_id, array $types, int $user_id) } } - include_once './webservice/soap/classes/class.ilObjectXMLWriter.php'; + include_once './components/ILIAS/soap/classes/class.ilObjectXMLWriter.php'; $xml_writer = new ilObjectXMLWriter(); $xml_writer->enablePermissionCheck(true); $xml_writer->setObjects($nodes); @@ -553,7 +553,7 @@ public function addObject(string $sid, int $a_target_id, string $a_xml) } } - include_once './webservice/soap/classes/class.ilObjectXMLParser.php'; + include_once './components/ILIAS/soap/classes/class.ilObjectXMLParser.php'; $xml_parser = new ilObjectXMLParser($a_xml, true); try { @@ -930,7 +930,7 @@ public function updateObjects(string $sid, string $a_xml) $ilAccess = $DIC['ilAccess']; $objDefinition = $DIC['objDefinition']; - include_once './webservice/soap/classes/class.ilObjectXMLParser.php'; + include_once './components/ILIAS/soap/classes/class.ilObjectXMLParser.php'; $xml_parser = new ilObjectXMLParser($a_xml, true); try { $xml_parser->startParsing(); @@ -1048,7 +1048,7 @@ public function moveObject(string $sid, int $ref_id, int $target_id) return $this->raiseError($this->getMessage(), $this->getMessageCode()); } - include_once './webservice/soap/classes/class.ilSoapUtils.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapUtils.php'; global $DIC; $rbacreview = $DIC['rbacreview']; @@ -1116,7 +1116,7 @@ public function copyObject(string $sid, string $copy_settings_xml) return $this->raiseError($this->getMessage(), $this->getMessageCode()); } - include_once './webservice/soap/classes/class.ilSoapUtils.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapUtils.php'; global $DIC; $rbacreview = $DIC['rbacreview']; @@ -1125,7 +1125,7 @@ public function copyObject(string $sid, string $copy_settings_xml) $lng = $DIC['lng']; $ilUser = $DIC['ilUser']; - include_once './webservice/soap/classes/class.ilCopyWizardSettingsXMLParser.php'; + include_once './components/ILIAS/soap/classes/class.ilCopyWizardSettingsXMLParser.php'; $xml_parser = new ilCopyWizardSettingsXMLParser($copy_settings_xml); try { $xml_parser->startParsing(); @@ -1231,8 +1231,8 @@ public function getPathForRefId(string $sid, int $ref_id) $lng = $DIC['lng']; $items = $tree->getPathFull($ref_id); - include_once 'webservice/soap/classes/class.ilXMLResultSet.php'; - include_once 'webservice/soap/classes/class.ilXMLResultSetWriter.php'; + include_once 'components/ILIAS/soap/classes/class.ilXMLResultSet.php'; + include_once 'components/ILIAS/soap/classes/class.ilXMLResultSetWriter.php'; include_once 'components/ILIAS/Course/classes/class.ilCourseXMLWriter.php'; $xmlResultSet = new ilXMLResultSet(); @@ -1370,7 +1370,7 @@ private function updateReferences(array $a_object_data): void foreach ($a_object_data['references'] as $ref_data) { if (isset($ref_data['time_target'])) { - include_once('./webservice/soap/classes/class.ilObjectXMLWriter.php'); + include_once('./components/ILIAS/soap/classes/class.ilObjectXMLWriter.php'); include_once('./components/ILIAS/Object/classes/class.ilObjectActivation.php'); $old = ilObjectActivation::getItem($ref_data['ref_id']); @@ -1425,7 +1425,7 @@ private function addReferences(ilObject $source, array $a_object_data): void $source->setPermissions($ref_data['parent_id']); } if (isset($ref_data['time_target']) /* and ($crs_ref_id = $tree->checkForParentType($new_ref_id,'crs')) */) { - include_once('./webservice/soap/classes/class.ilObjectXMLWriter.php'); + include_once('./components/ILIAS/soap/classes/class.ilObjectXMLWriter.php'); include_once('./components/ILIAS/Object/classes/class.ilObjectActivation.php'); if (!isset($ref_data['time_target']['starting_time'])) { diff --git a/components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php b/components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php index 87fe637fb2dd..da77a4380dd6 100644 --- a/components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php @@ -21,7 +21,7 @@ +-----------------------------------------------------------------------------+ */ -include_once './webservice/soap/classes/class.ilSoapAdministration.php'; +include_once './components/ILIAS/soap/classes/class.ilSoapAdministration.php'; /** * Soap rbac administration methods @@ -321,7 +321,7 @@ public function getLocalRoles(string $sid, int $ref_id) } } if (count($objs)) { - include_once './webservice/soap/classes/class.ilObjectXMLWriter.php'; + include_once './components/ILIAS/soap/classes/class.ilObjectXMLWriter.php'; $xml_writer = new ilObjectXMLWriter(); $xml_writer->setObjects($objs); @@ -362,7 +362,7 @@ public function getUserRoles(string $sid, int $user_id) } } if (count($objs)) { - include_once './webservice/soap/classes/class.ilObjectXMLWriter.php'; + include_once './components/ILIAS/soap/classes/class.ilObjectXMLWriter.php'; $xml_writer = new ilObjectXMLWriter(); $xml_writer->setObjects($objs); @@ -407,7 +407,7 @@ public function addRole(string $sid, int $target_id, string $role_xml) return $this->raiseError('Check access failed. No permission to create roles', 'Server'); } - include_once 'webservice/soap/classes/class.ilObjectXMLParser.php'; + include_once 'components/ILIAS/soap/classes/class.ilObjectXMLParser.php'; $xml_parser = new ilObjectXMLParser($role_xml); $xml_parser->startParsing(); @@ -475,7 +475,7 @@ public function addRoleFromTemplate(string $sid, int $target_id, string $role_xm return $this->raiseError('Check access failed. No permission to create roles', 'Server'); } - include_once 'webservice/soap/classes/class.ilObjectXMLParser.php'; + include_once 'components/ILIAS/soap/classes/class.ilObjectXMLParser.php'; $xml_parser = new ilObjectXMLParser($role_xml); $xml_parser->startParsing(); @@ -678,7 +678,7 @@ public function getRoles(string $sid, string $role_type, int $id) } } - include_once './webservice/soap/classes/class.ilSoapRoleObjectXMLWriter.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapRoleObjectXMLWriter.php'; $xml_writer = new ilSoapRoleObjectXMLWriter(); $xml_writer->setObjects($roles); @@ -755,7 +755,7 @@ public function searchRoles(string $sid, string $key, string $combination, strin $roles = $rbacreview->getRolesForIDs($obj_ids, $role_type === "template"); } - include_once './webservice/soap/classes/class.ilSoapRoleObjectXMLWriter.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapRoleObjectXMLWriter.php'; $xml_writer = new ilSoapRoleObjectXMLWriter(); $xml_writer->setObjects($roles); $xml_writer->setType($role_type); diff --git a/components/ILIAS/soap/classes/class.ilSoapRepositoryStructureObject.php b/components/ILIAS/soap/classes/class.ilSoapRepositoryStructureObject.php index 6c72d5708e85..781ecd465129 100644 --- a/components/ILIAS/soap/classes/class.ilSoapRepositoryStructureObject.php +++ b/components/ILIAS/soap/classes/class.ilSoapRepositoryStructureObject.php @@ -29,7 +29,7 @@ * @package ilias */ -include_once "./webservice/soap/classes/class.ilSoapStructureObject.php"; +include_once "./components/ILIAS/soap/classes/class.ilSoapStructureObject.php"; class ilSoapRepositoryStructureObject extends ilSoapStructureObject { diff --git a/components/ILIAS/soap/classes/class.ilSoapRoleObjectXMLWriter.php b/components/ILIAS/soap/classes/class.ilSoapRoleObjectXMLWriter.php index b68b430a6311..cac31cb245b1 100644 --- a/components/ILIAS/soap/classes/class.ilSoapRoleObjectXMLWriter.php +++ b/components/ILIAS/soap/classes/class.ilSoapRoleObjectXMLWriter.php @@ -49,7 +49,7 @@ public function start(): bool $this->buildHeader(); include_once './components/ILIAS/AccessControl/classes/class.ilObjRole.php'; - include_once './webservice/soap/classes/class.ilObjectXMLWriter.php'; + include_once './components/ILIAS/soap/classes/class.ilObjectXMLWriter.php'; foreach ($this->roles as $role) { // if role type is not empty and does not match, then continue; diff --git a/components/ILIAS/soap/classes/class.ilSoapSCORMAdministration.php b/components/ILIAS/soap/classes/class.ilSoapSCORMAdministration.php index 8bab43d65e75..ab98d288515e 100644 --- a/components/ILIAS/soap/classes/class.ilSoapSCORMAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapSCORMAdministration.php @@ -27,7 +27,7 @@ * @version $Id: class.ilSoapExerciseAdministration.php 12992 2007-01-25 10:04:26Z rkuester $ * @package ilias */ -include_once './webservice/soap/classes/class.ilSoapAdministration.php'; +include_once './components/ILIAS/soap/classes/class.ilSoapAdministration.php'; class ilSoapSCORMAdministration extends ilSoapAdministration { diff --git a/components/ILIAS/soap/classes/class.ilSoapStructureObjectAdministration.php b/components/ILIAS/soap/classes/class.ilSoapStructureObjectAdministration.php index 9ab7a5f4f45c..20fa0825bd70 100644 --- a/components/ILIAS/soap/classes/class.ilSoapStructureObjectAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapStructureObjectAdministration.php @@ -21,7 +21,7 @@ +-----------------------------------------------------------------------------+ */ -include_once './webservice/soap/classes/class.ilSoapAdministration.php'; +include_once './components/ILIAS/soap/classes/class.ilSoapAdministration.php'; /** * administration for structure objects @@ -46,7 +46,7 @@ public function getStructureObjects(string $sid, int $ref_id) } $structureReaderClassname = "ilSoap" . strtoupper($target_obj->getType()) . "StructureReader"; - $filename = "./webservice/soap/classes/class." . $structureReaderClassname . ".php"; + $filename = "./components/ILIAS/soap/classes/class." . $structureReaderClassname . ".php"; if (!file_exists($filename)) { return $this->raiseError("Object type '" . $target_obj->getType() . "'is not supported.", 'Client'); @@ -54,7 +54,7 @@ public function getStructureObjects(string $sid, int $ref_id) include_once $filename; $structureReader = new $structureReaderClassname($target_obj); - include_once './webservice/soap/classes/class.ilSoapStructureObjectXMLWriter.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapStructureObjectXMLWriter.php'; $xml_writer = new ilSoapStructureObjectXMLWriter(); $structureObject = &$structureReader->getStructureObject(); $xml_writer->setStructureObject($structureObject); diff --git a/components/ILIAS/soap/classes/class.ilSoapStructureObjectFactory.php b/components/ILIAS/soap/classes/class.ilSoapStructureObjectFactory.php index 28130fa9fbd4..f63933a6b045 100644 --- a/components/ILIAS/soap/classes/class.ilSoapStructureObjectFactory.php +++ b/components/ILIAS/soap/classes/class.ilSoapStructureObjectFactory.php @@ -69,19 +69,19 @@ public function _getClassnameForType(string $type): ?string switch ($type) { case "glo": case "lm": - include_once "./webservice/soap/classes/class.ilSoapRepositoryStructureObject.php"; + include_once "./components/ILIAS/soap/classes/class.ilSoapRepositoryStructureObject.php"; return "ilSoapRepositoryStructureObject"; case "st": - include_once "./webservice/soap/classes/class.ilSoapLMChapterStructureObject.php"; + include_once "./components/ILIAS/soap/classes/class.ilSoapLMChapterStructureObject.php"; return "ilSoapLMChapterStructureObject"; case "pg": - include_once "./webservice/soap/classes/class.ilSoapLMPageStructureObject.php"; + include_once "./components/ILIAS/soap/classes/class.ilSoapLMPageStructureObject.php"; return "ilSoapLMPageStructureObject"; case "git": - include_once "./webservice/soap/classes/class.ilSoapGLOTermStructureObject.php"; + include_once "./components/ILIAS/soap/classes/class.ilSoapGLOTermStructureObject.php"; return "ilSoapGLOTermStructureObject"; case "term": - include_once "./webservice/soap/classes/class.ilSoapGLOTermDefinitionStructureObject.php"; + include_once "./components/ILIAS/soap/classes/class.ilSoapGLOTermDefinitionStructureObject.php"; return "ilSoapGLOTermDefinitionStructureObject"; } diff --git a/components/ILIAS/soap/classes/class.ilSoapStructureReader.php b/components/ILIAS/soap/classes/class.ilSoapStructureReader.php index 4576ba0536df..a1a003586088 100644 --- a/components/ILIAS/soap/classes/class.ilSoapStructureReader.php +++ b/components/ILIAS/soap/classes/class.ilSoapStructureReader.php @@ -1,6 +1,6 @@ addColumn("user_id"); diff --git a/components/ILIAS/soap/classes/class.ilSoapUserAdministration.php b/components/ILIAS/soap/classes/class.ilSoapUserAdministration.php index 63b736bb70e9..bbb49a568892 100644 --- a/components/ILIAS/soap/classes/class.ilSoapUserAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapUserAdministration.php @@ -27,7 +27,7 @@ * @version $Id$ * @package ilias */ -include_once './webservice/soap/classes/class.ilSoapAdministration.php'; +include_once './components/ILIAS/soap/classes/class.ilSoapAdministration.php'; class ilSoapUserAdministration extends ilSoapAdministration { @@ -593,8 +593,8 @@ public function getUserForRole(string $sid, int $role_id, bool $attachRoles, int **/ private function getImportProtocolAsXML(array $a_array): string { - include_once './webservice/soap/classes/class.ilXMLResultSet.php'; - include_once './webservice/soap/classes/class.ilXMLResultSetWriter.php'; + include_once './components/ILIAS/soap/classes/class.ilXMLResultSet.php'; + include_once './components/ILIAS/soap/classes/class.ilXMLResultSetWriter.php'; $xmlResultSet = new ilXMLResultSet(); $xmlResultSet->addColumn("userid"); @@ -629,8 +629,8 @@ private function getImportProtocolAsXML(array $a_array): string */ private function getUserMappingAsXML(array $a_array) { - include_once './webservice/soap/classes/class.ilXMLResultSet.php'; - include_once './webservice/soap/classes/class.ilXMLResultSetWriter.php'; + include_once './components/ILIAS/soap/classes/class.ilXMLResultSet.php'; + include_once './components/ILIAS/soap/classes/class.ilXMLResultSetWriter.php'; $xmlResultSet = new ilXMLResultSet(); $xmlResultSet->addColumn("userid"); diff --git a/components/ILIAS/soap/classes/class.ilSoapUserAdministrationAdapter.php b/components/ILIAS/soap/classes/class.ilSoapUserAdministrationAdapter.php index a1a9f84ed2c8..797388163241 100644 --- a/components/ILIAS/soap/classes/class.ilSoapUserAdministrationAdapter.php +++ b/components/ILIAS/soap/classes/class.ilSoapUserAdministrationAdapter.php @@ -46,7 +46,7 @@ public function start(): void private function registerMethods(): void { - include_once './webservice/soap/include/inc.soap_functions.php'; + include_once './components/ILIAS/soap/include/inc.soap_functions.php'; $this->server->addFunction(SOAP_FUNCTIONS_ALL); } diff --git a/components/ILIAS/soap/classes/class.ilSoapUtils.php b/components/ILIAS/soap/classes/class.ilSoapUtils.php index 1c84b685b950..c7c7eed9bd6f 100644 --- a/components/ILIAS/soap/classes/class.ilSoapUtils.php +++ b/components/ILIAS/soap/classes/class.ilSoapUtils.php @@ -22,7 +22,7 @@ * Soap utitliy functions * @author Stefan Meyer */ -include_once './webservice/soap/classes/class.ilSoapAdministration.php'; +include_once './components/ILIAS/soap/classes/class.ilSoapAdministration.php'; class ilSoapUtils extends ilSoapAdministration { @@ -269,7 +269,7 @@ private function callNextNode(string $sid, ilCopyWizardOptions $cp_options): voi } else { ilLoggerFactory::getLogger('obj')->warning('SOAP clone call failed. Calling clone method manually'); $cp_options->read(); - include_once('./webservice/soap/include/inc.soap_functions.php'); + include_once('./components/ILIAS/soap/include/inc.soap_functions.php'); $res = ilSoapFunctions::ilClone($sid, $cp_options->getCopyId()); } } @@ -289,7 +289,7 @@ private function callNextDependency(string $sid, ilCopyWizardOptions $cp_options } else { ilLoggerFactory::getLogger('obj')->warning('SOAP clone call failed. Calling clone method manually'); $cp_options->read(); - include_once('./webservice/soap/include/inc.soap_functions.php'); + include_once('./components/ILIAS/soap/include/inc.soap_functions.php'); $res = ilSoapFunctions::ilCloneDependencies($sid, $cp_options->getCopyId()); } } diff --git a/components/ILIAS/soap/classes/class.ilXMLResultSet.php b/components/ILIAS/soap/classes/class.ilXMLResultSet.php index bfd589247ca7..7176aef5fd02 100644 --- a/components/ILIAS/soap/classes/class.ilXMLResultSet.php +++ b/components/ILIAS/soap/classes/class.ilXMLResultSet.php @@ -24,8 +24,8 @@ +-----------------------------------------------------------------------------+ */ -include_once './webservice/soap/classes/class.ilXMLResultSetColumn.php'; -include_once './webservice/soap/classes/class.ilXMLResultSetRow.php'; +include_once './components/ILIAS/soap/classes/class.ilXMLResultSetColumn.php'; +include_once './components/ILIAS/soap/classes/class.ilXMLResultSetRow.php'; /** * Class to handle XML ResultSets diff --git a/components/ILIAS/soap/include/inc.soap_functions.php b/components/ILIAS/soap/include/inc.soap_functions.php index a7592bb78bbd..ed2c50ec0590 100644 --- a/components/ILIAS/soap/include/inc.soap_functions.php +++ b/components/ILIAS/soap/include/inc.soap_functions.php @@ -45,7 +45,7 @@ class ilSoapFunctions */ public static function login(string $client, string $username, string $password) { - include_once './webservice/soap/classes/class.ilSoapUserAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapUserAdministration.php'; $sua = new ilSoapUserAdministration(); return $sua->login($client, $username, $password); } @@ -55,7 +55,7 @@ public static function login(string $client, string $username, string $password) */ public static function logout(string $sid) { - include_once './webservice/soap/classes/class.ilSoapUserAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapUserAdministration.php'; $sua = new ilSoapUserAdministration(); return $sua->logout($sid); } @@ -65,7 +65,7 @@ public static function logout(string $sid) */ public static function lookupUser(string $sid, string $user_name) { - include_once './webservice/soap/classes/class.ilSoapUserAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapUserAdministration.php'; $sua = new ilSoapUserAdministration(); return $sua->lookupUser($sid, $user_name); } @@ -75,7 +75,7 @@ public static function lookupUser(string $sid, string $user_name) */ public static function addCourse(string $sid, int $target_id, string $crs_xml) { - include_once './webservice/soap/classes/class.ilSoapCourseAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapCourseAdministration.php'; $sca = new ilSoapCourseAdministration(); return $sca->addCourse($sid, $target_id, $crs_xml); } @@ -85,7 +85,7 @@ public static function addCourse(string $sid, int $target_id, string $crs_xml) */ public static function deleteCourse(string $sid, int $course_id) { - include_once './webservice/soap/classes/class.ilSoapCourseAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapCourseAdministration.php'; $sca = new ilSoapCourseAdministration(); return $sca->deleteCourse($sid, $course_id); } @@ -95,7 +95,7 @@ public static function deleteCourse(string $sid, int $course_id) */ public static function assignCourseMember(string $sid, int $course_id, int $user_id, string $type) { - include_once './webservice/soap/classes/class.ilSoapCourseAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapCourseAdministration.php'; $sca = new ilSoapCourseAdministration(); return $sca->assignCourseMember($sid, $course_id, $user_id, $type); } @@ -105,7 +105,7 @@ public static function assignCourseMember(string $sid, int $course_id, int $user */ public static function isAssignedToCourse(string $sid, int $course_id, int $user_id) { - include_once './webservice/soap/classes/class.ilSoapCourseAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapCourseAdministration.php'; $sca = new ilSoapCourseAdministration(); return $sca->isAssignedToCourse($sid, $course_id, $user_id); } @@ -115,7 +115,7 @@ public static function isAssignedToCourse(string $sid, int $course_id, int $user */ public static function excludeCourseMember(string $sid, int $course_id, int $user_id) { - include_once './webservice/soap/classes/class.ilSoapCourseAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapCourseAdministration.php'; $sca = new ilSoapCourseAdministration(); return $sca->excludeCourseMember($sid, $course_id, $user_id); } @@ -125,7 +125,7 @@ public static function excludeCourseMember(string $sid, int $course_id, int $use */ public static function getCourseXML(string $sid, int $course_id) { - include_once './webservice/soap/classes/class.ilSoapCourseAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapCourseAdministration.php'; $sca = new ilSoapCourseAdministration(); return $sca->getCourseXML($sid, $course_id); } @@ -135,7 +135,7 @@ public static function getCourseXML(string $sid, int $course_id) */ public static function updateCourse(string $sid, int $course_id, string $xml) { - include_once './webservice/soap/classes/class.ilSoapCourseAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapCourseAdministration.php'; $sca = new ilSoapCourseAdministration(); return $sca->updateCourse($sid, $course_id, $xml); } @@ -145,7 +145,7 @@ public static function updateCourse(string $sid, int $course_id, string $xml) */ public static function getObjIdByImportId(string $sid, string $import_id) { - include_once './webservice/soap/classes/class.ilSoapObjectAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php'; $soa = new ilSoapObjectAdministration(); return $soa->getObjIdByImportId($sid, $import_id); } @@ -155,7 +155,7 @@ public static function getObjIdByImportId(string $sid, string $import_id) */ public static function getRefIdsByImportId(string $sid, string $import_id) { - include_once './webservice/soap/classes/class.ilSoapObjectAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php'; $soa = new ilSoapObjectAdministration(); return $soa->getRefIdsByImportId($sid, $import_id); } @@ -165,7 +165,7 @@ public static function getRefIdsByImportId(string $sid, string $import_id) */ public static function getRefIdsByObjId(string $sid, int $object_id) { - include_once './webservice/soap/classes/class.ilSoapObjectAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php'; $soa = new ilSoapObjectAdministration(); return $soa->getRefIdsByObjId($sid, $object_id); } @@ -175,7 +175,7 @@ public static function getRefIdsByObjId(string $sid, int $object_id) */ public static function getObjectByReference(string $sid, int $a_ref_id, int $user_id) { - include_once './webservice/soap/classes/class.ilSoapObjectAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php'; $soa = new ilSoapObjectAdministration(); return $soa->getObjectByReference($sid, $a_ref_id, $user_id); } @@ -185,7 +185,7 @@ public static function getObjectByReference(string $sid, int $a_ref_id, int $use */ public static function getObjectsByTitle(string $sid, string $a_title, int $user_id) { - include_once './webservice/soap/classes/class.ilSoapObjectAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php'; $soa = new ilSoapObjectAdministration(); return $soa->getObjectsByTitle($sid, $a_title, $user_id); } @@ -195,7 +195,7 @@ public static function getObjectsByTitle(string $sid, string $a_title, int $user */ public static function addObject(string $sid, int $a_target_id, string $a_xml) { - include_once './webservice/soap/classes/class.ilSoapObjectAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php'; $soa = new ilSoapObjectAdministration(); return $soa->addObject($sid, $a_target_id, $a_xml); } @@ -205,7 +205,7 @@ public static function addObject(string $sid, int $a_target_id, string $a_xml) */ public static function addReference(string $sid, int $a_source_id, int $a_target_id) { - include_once './webservice/soap/classes/class.ilSoapObjectAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php'; $soa = new ilSoapObjectAdministration(); return $soa->addReference($sid, $a_source_id, $a_target_id); } @@ -215,7 +215,7 @@ public static function addReference(string $sid, int $a_source_id, int $a_target */ public static function deleteObject(string $sid, int $reference_id) { - include_once './webservice/soap/classes/class.ilSoapObjectAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php'; $soa = new ilSoapObjectAdministration(); return $soa->deleteObject($sid, $reference_id); } @@ -225,7 +225,7 @@ public static function deleteObject(string $sid, int $reference_id) */ public static function removeFromSystemByImportId(string $sid, string $import_id) { - include_once './webservice/soap/classes/class.ilSoapObjectAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php'; $soa = new ilSoapObjectAdministration(); return $soa->removeFromSystemByImportId($sid, $import_id); } @@ -235,7 +235,7 @@ public static function removeFromSystemByImportId(string $sid, string $import_id */ public static function updateObjects(string $sid, string $obj_xml) { - include_once './webservice/soap/classes/class.ilSoapObjectAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php'; $soa = new ilSoapObjectAdministration(); return $soa->updateObjects($sid, $obj_xml); } @@ -245,7 +245,7 @@ public static function updateObjects(string $sid, string $obj_xml) */ public static function searchObjects(string $sid, array $types, string $key, string $combination, int $user_id) { - include_once './webservice/soap/classes/class.ilSoapObjectAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php'; $soa = new ilSoapObjectAdministration(); return $soa->searchObjects($sid, $types, $key, $combination, $user_id); } @@ -255,7 +255,7 @@ public static function searchObjects(string $sid, array $types, string $key, str */ public static function getTreeChilds(string $sid, int $ref_id, array $types, int $user_id) { - include_once './webservice/soap/classes/class.ilSoapObjectAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php'; $soa = new ilSoapObjectAdministration(); return $soa->getTreeChilds($sid, $ref_id, $types, $user_id); } @@ -265,7 +265,7 @@ public static function getTreeChilds(string $sid, int $ref_id, array $types, int */ public static function getXMLTree(string $sid, int $ref_id, array $types, int $user_id) { - include_once './webservice/soap/classes/class.ilSoapObjectAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php'; $soa = new ilSoapObjectAdministration(); return $soa->getXMLTree($sid, $ref_id, $types, $user_id); } @@ -275,7 +275,7 @@ public static function getXMLTree(string $sid, int $ref_id, array $types, int $u */ public static function getOperations(string $sid) { - include_once './webservice/soap/classes/class.ilSoapRBACAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php'; $soa = new ilSoapRBACAdministration(); return $soa->getOperations($sid); } @@ -285,7 +285,7 @@ public static function getOperations(string $sid) */ public static function addUserRoleEntry(string $sid, int $user_id, int $role_id) { - include_once './webservice/soap/classes/class.ilSoapRBACAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php'; $soa = new ilSoapRBACAdministration(); return $soa->addUserRoleEntry($sid, $user_id, $role_id); } @@ -295,7 +295,7 @@ public static function addUserRoleEntry(string $sid, int $user_id, int $role_id) */ public static function deleteUserRoleEntry(string $sid, int $user_id, int $role_id) { - include_once './webservice/soap/classes/class.ilSoapRBACAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php'; $soa = new ilSoapRBACAdministration(); return $soa->deleteUserRoleEntry($sid, $user_id, $role_id); } @@ -305,7 +305,7 @@ public static function deleteUserRoleEntry(string $sid, int $user_id, int $role_ */ public static function revokePermissions(string $sid, int $ref_id, int $role_id) { - include_once './webservice/soap/classes/class.ilSoapRBACAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php'; $soa = new ilSoapRBACAdministration(); return $soa->revokePermissions($sid, $ref_id, $role_id); } @@ -315,7 +315,7 @@ public static function revokePermissions(string $sid, int $ref_id, int $role_id) */ public static function grantPermissions(string $sid, int $ref_id, int $role_id, array $permissions) { - include_once './webservice/soap/classes/class.ilSoapRBACAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php'; $soa = new ilSoapRBACAdministration(); return $soa->grantPermissions($sid, $ref_id, $role_id, $permissions); } @@ -325,7 +325,7 @@ public static function grantPermissions(string $sid, int $ref_id, int $role_id, */ public static function getLocalRoles(string $sid, int $ref_id) { - include_once './webservice/soap/classes/class.ilSoapRBACAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php'; $soa = new ilSoapRBACAdministration(); return $soa->getLocalRoles($sid, $ref_id); } @@ -335,7 +335,7 @@ public static function getLocalRoles(string $sid, int $ref_id) */ public static function getUserRoles(string $sid, int $user_id) { - include_once './webservice/soap/classes/class.ilSoapRBACAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php'; $soa = new ilSoapRBACAdministration(); return $soa->getUserRoles($sid, $user_id); } @@ -345,7 +345,7 @@ public static function getUserRoles(string $sid, int $user_id) */ public static function deleteRole(string $sid, int $role_id) { - include_once './webservice/soap/classes/class.ilSoapRBACAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php'; $soa = new ilSoapRBACAdministration(); return $soa->deleteRole($sid, $role_id); } @@ -355,7 +355,7 @@ public static function deleteRole(string $sid, int $role_id) */ public static function addRole(string $sid, int $target_id, string $obj_xml) { - include_once './webservice/soap/classes/class.ilSoapRBACAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php'; $soa = new ilSoapRBACAdministration(); return $soa->addRole($sid, $target_id, $obj_xml); } @@ -365,7 +365,7 @@ public static function addRole(string $sid, int $target_id, string $obj_xml) */ public static function addRoleFromTemplate(string $sid, int $target_id, string $obj_xml, int $template_id) { - include_once './webservice/soap/classes/class.ilSoapRBACAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php'; $soa = new ilSoapRBACAdministration(); return $soa->addRoleFromTemplate($sid, $target_id, $obj_xml, $template_id); } @@ -375,7 +375,7 @@ public static function addRoleFromTemplate(string $sid, int $target_id, string $ */ public static function getObjectTreeOperations(string $sid, int $ref_id, int $user_id) { - include_once './webservice/soap/classes/class.ilSoapRBACAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php'; $soa = new ilSoapRBACAdministration(); return $soa->getObjectTreeOperations($sid, $ref_id, $user_id); } @@ -385,7 +385,7 @@ public static function getObjectTreeOperations(string $sid, int $ref_id, int $us */ public static function addGroup(string $sid, int $target_id, int $group_xml) { - include_once './webservice/soap/classes/class.ilSoapGroupAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapGroupAdministration.php'; $soa = new ilSoapGroupAdministration(); return $soa->addGroup($sid, $target_id, $group_xml); } @@ -395,7 +395,7 @@ public static function addGroup(string $sid, int $target_id, int $group_xml) */ public static function groupExists(string $sid, string $title) { - include_once './webservice/soap/classes/class.ilSoapGroupAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapGroupAdministration.php'; $soa = new ilSoapGroupAdministration(); return $soa->groupExists($sid, $title); } @@ -405,7 +405,7 @@ public static function groupExists(string $sid, string $title) */ public static function getGroup(string $sid, int $ref_id) { - include_once './webservice/soap/classes/class.ilSoapGroupAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapGroupAdministration.php'; $soa = new ilSoapGroupAdministration(); return $soa->getGroup($sid, $ref_id); } @@ -415,7 +415,7 @@ public static function getGroup(string $sid, int $ref_id) */ public static function assignGroupMember(string $sid, int $group_id, int $user_id, string $type) { - include_once './webservice/soap/classes/class.ilSoapGroupAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapGroupAdministration.php'; $sca = new ilSoapGroupAdministration(); return $sca->assignGroupMember($sid, $group_id, $user_id, $type); } @@ -425,7 +425,7 @@ public static function assignGroupMember(string $sid, int $group_id, int $user_i */ public static function isAssignedToGroup(string $sid, int $group_id, int $user_id) { - include_once './webservice/soap/classes/class.ilSoapGroupAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapGroupAdministration.php'; $sca = new ilSoapGroupAdministration(); return $sca->isAssignedToGroup($sid, $group_id, $user_id); } @@ -435,7 +435,7 @@ public static function isAssignedToGroup(string $sid, int $group_id, int $user_i */ public static function excludeGroupMember(string $sid, int $group_id, int $user_id) { - include_once './webservice/soap/classes/class.ilSoapGroupAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapGroupAdministration.php'; $sca = new ilSoapGroupAdministration(); return $sca->excludeGroupMember($sid, $group_id, $user_id); } @@ -445,7 +445,7 @@ public static function excludeGroupMember(string $sid, int $group_id, int $user_ */ public static function ilClone(string $sid, int $copy_identifier) { - include_once './webservice/soap/classes/class.ilSoapUtils.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapUtils.php'; $sou = new ilSoapUtils(); $sou->disableSOAPCheck(); @@ -458,7 +458,7 @@ public static function ilClone(string $sid, int $copy_identifier) */ public static function ilCloneDependencies(string $sid, int $copy_identifier) { - include_once './webservice/soap/classes/class.ilSoapUtils.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapUtils.php'; $sou = new ilSoapUtils(); $sou->disableSOAPCheck(); @@ -471,7 +471,7 @@ public static function ilCloneDependencies(string $sid, int $copy_identifier) */ public static function saveQuestion(string $sid, int $active_id, int $question_id, int $pass, array $solution) { - include_once './webservice/soap/classes/class.ilSoapTestAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapTestAdministration.php'; $sass = new ilSoapTestAdministration(); return $sass->saveQuestion($sid, $active_id, $question_id, $pass, $solution); } @@ -481,7 +481,7 @@ public static function saveQuestion(string $sid, int $active_id, int $question_i */ public static function saveQuestionSolution(string $sid, int $active_id, int $question_id, int $pass, int $solution) { - include_once './webservice/soap/classes/class.ilSoapTestAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapTestAdministration.php'; $sass = new ilSoapTestAdministration(); return $sass->saveQuestionSolution($sid, $active_id, $question_id, $pass, $solution); } @@ -491,7 +491,7 @@ public static function saveQuestionSolution(string $sid, int $active_id, int $qu */ public static function getQuestionSolution(string $sid, int $active_id, int $question_id, int $pass) { - include_once './webservice/soap/classes/class.ilSoapTestAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapTestAdministration.php'; $sass = new ilSoapTestAdministration(); return $sass->getQuestionSolution($sid, $active_id, $question_id, $pass); } @@ -501,7 +501,7 @@ public static function getQuestionSolution(string $sid, int $active_id, int $que */ public static function getTestUserData(string $sid, int $active_id) { - include_once './webservice/soap/classes/class.ilSoapTestAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapTestAdministration.php'; $sass = new ilSoapTestAdministration(); return $sass->getTestUserData($sid, $active_id); } @@ -511,7 +511,7 @@ public static function getTestUserData(string $sid, int $active_id) */ public static function getNrOfQuestionsInPass(string $sid, int $active_id, int $pass) { - include_once './webservice/soap/classes/class.ilSoapTestAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapTestAdministration.php'; $sass = new ilSoapTestAdministration(); return $sass->getNrOfQuestionsInPass($sid, $active_id, $pass); } @@ -521,7 +521,7 @@ public static function getNrOfQuestionsInPass(string $sid, int $active_id, int $ */ public static function getPositionOfQuestion(string $sid, int $active_id, int $question_id, int $pass) { - include_once './webservice/soap/classes/class.ilSoapTestAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapTestAdministration.php'; $sass = new ilSoapTestAdministration(); return $sass->getPositionOfQuestion($sid, $active_id, $question_id, $pass); } @@ -531,7 +531,7 @@ public static function getPositionOfQuestion(string $sid, int $active_id, int $q */ public static function getPreviousReachedPoints(string $sid, int $active_id, int $question_id, int $pass) { - include_once './webservice/soap/classes/class.ilSoapTestAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapTestAdministration.php'; $sass = new ilSoapTestAdministration(); return $sass->getPreviousReachedPoints($sid, $active_id, $question_id, $pass); } @@ -541,7 +541,7 @@ public static function getPreviousReachedPoints(string $sid, int $active_id, int */ public static function saveTempFileAsMediaObject(string $sid, string $name, string $tmp_name) { - include_once './webservice/soap/classes/class.ilSoapUtils.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapUtils.php'; $sou = new ilSoapUtils(); $sou->disableSOAPCheck(); @@ -553,7 +553,7 @@ public static function saveTempFileAsMediaObject(string $sid, string $name, stri */ public static function getMobsOfObject(string $sid, string $a_type, int $a_id) { - include_once './webservice/soap/classes/class.ilSoapUtils.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapUtils.php'; $sou = new ilSoapUtils(); $sou->disableSOAPCheck(); return $sou->getMobsOfObject($sid, $a_type, $a_id); @@ -564,7 +564,7 @@ public static function getMobsOfObject(string $sid, string $a_type, int $a_id) */ public static function getStructureObjects(string $sid, int $ref_id) { - include_once './webservice/soap/classes/class.ilSoapStructureObjectAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapStructureObjectAdministration.php'; $sca = new ilSOAPStructureObjectAdministration(); return $sca->getStructureObjects($sid, $ref_id); } @@ -574,7 +574,7 @@ public static function getStructureObjects(string $sid, int $ref_id) */ public static function getRoles(string $sid, string $role_type, int $id) { - include_once './webservice/soap/classes/class.ilSoapRBACAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php'; $soa = new ilSoapRBACAdministration(); return $soa->getRoles($sid, $role_type, $id); } @@ -584,7 +584,7 @@ public static function getRoles(string $sid, string $role_type, int $id) */ public static function importUsers(string $sid, int $folder_id, string $usr_xml, int $conflict_rule, bool $send_account_mail) { - include_once './webservice/soap/classes/class.ilSoapUserAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapUserAdministration.php'; $sua = new ilSoapUserAdministration(); return $sua->importUsers($sid, $folder_id, $usr_xml, $conflict_rule, $send_account_mail); } @@ -594,7 +594,7 @@ public static function importUsers(string $sid, int $folder_id, string $usr_xml, */ public static function getUsersForContainer(string $sid, int $ref_id, bool $attach_roles, int $active) { - include_once './webservice/soap/classes/class.ilSoapUserAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapUserAdministration.php'; $sua = new ilSoapUserAdministration(); return $sua->getUsersForContainer($sid, $ref_id, $attach_roles, $active); } @@ -604,7 +604,7 @@ public static function getUsersForContainer(string $sid, int $ref_id, bool $atta */ public static function getUsersForRole(string $sid, int $role_id, bool $attach_roles, int $active) { - include_once './webservice/soap/classes/class.ilSoapUserAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapUserAdministration.php'; $sua = new ilSoapUserAdministration(); return $sua->getUserForRole($sid, $role_id, $attach_roles, $active); } @@ -614,7 +614,7 @@ public static function getUsersForRole(string $sid, int $role_id, bool $attach_r */ public static function searchUser(string $sid, array $a_keyfields, string $query_operator, array $a_keyvalues, bool $attach_roles, int $active) { - include_once './webservice/soap/classes/class.ilSoapUserAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapUserAdministration.php'; $sua = new ilSoapUserAdministration(); return $sua->searchUser($sid, $a_keyfields, $query_operator, $a_keyvalues, $attach_roles, $active); } @@ -624,7 +624,7 @@ public static function searchUser(string $sid, array $a_keyfields, string $query */ public static function hasNewMail(string $sid) { - include_once './webservice/soap/classes/class.ilSoapUserAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapUserAdministration.php'; $sua = new ilSoapUserAdministration(); return $sua->hasNewMail($sid); } @@ -634,7 +634,7 @@ public static function hasNewMail(string $sid) */ public static function getExerciseXML(string $sid, int $ref_id, int $attachFileContentsMode) { - include_once './webservice/soap/classes/class.ilSoapExerciseAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapExerciseAdministration.php'; $sta = new ilSoapExerciseAdministration(); return $sta->getExerciseXML($sid, $ref_id, $attachFileContentsMode); } @@ -644,7 +644,7 @@ public static function getExerciseXML(string $sid, int $ref_id, int $attachFileC */ public static function updateExercise(string $sid, int $ref_id, string $xml) { - include_once './webservice/soap/classes/class.ilSoapExerciseAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapExerciseAdministration.php'; $sta = new ilSoapExerciseAdministration(); return $sta->updateExercise($sid, $ref_id, $xml); } @@ -654,7 +654,7 @@ public static function updateExercise(string $sid, int $ref_id, string $xml) */ public static function addExercise(string $sid, int $ref_id, string $xml) { - include_once './webservice/soap/classes/class.ilSoapExerciseAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapExerciseAdministration.php'; $sta = new ilSoapExerciseAdministration(); return $sta->addExercise($sid, $ref_id, $xml); } @@ -664,7 +664,7 @@ public static function addExercise(string $sid, int $ref_id, string $xml) */ public static function getFileXML(string $sid, int $ref_id, int $attachFileContentsMode) { - include_once './webservice/soap/classes/class.ilSoapFileAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapFileAdministration.php'; $sta = new ilSoapFileAdministration(); return $sta->getFileXML($sid, $ref_id, $attachFileContentsMode); } @@ -674,7 +674,7 @@ public static function getFileXML(string $sid, int $ref_id, int $attachFileConte */ public static function updateFile(string $sid, int $ref_id, string $xml) { - include_once './webservice/soap/classes/class.ilSoapFileAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapFileAdministration.php'; $sta = new ilSoapFileAdministration(); return $sta->updateFile($sid, $ref_id, $xml); } @@ -684,7 +684,7 @@ public static function updateFile(string $sid, int $ref_id, string $xml) */ public static function addFile(string $sid, int $ref_id, string $xml) { - include_once './webservice/soap/classes/class.ilSoapFileAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapFileAdministration.php'; $sta = new ilSoapFileAdministration(); return $sta->addFile($sid, $ref_id, $xml); } @@ -694,7 +694,7 @@ public static function addFile(string $sid, int $ref_id, string $xml) */ public static function getObjIdsByRefIds(string $sid, array $ref_ids) { - include_once './webservice/soap/classes/class.ilSoapObjectAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php'; $soa = new ilSoapObjectAdministration(); return $soa->getObjIdsByRefIds($sid, $ref_ids); } @@ -704,7 +704,7 @@ public static function getObjIdsByRefIds(string $sid, array $ref_ids) */ public static function getUserXML(string $sid, array $user_ids, bool $attach_roles) { - include_once './webservice/soap/classes/class.ilSoapUserAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapUserAdministration.php'; $sua = new ilSoapUserAdministration(); return $sua->getUserXML($sid, $user_ids, $attach_roles); } @@ -714,7 +714,7 @@ public static function getUserXML(string $sid, array $user_ids, bool $attach_rol */ public static function updateGroup(string $sid, int $ref_id, string $grp_xml) { - include_once './webservice/soap/classes/class.ilSoapGroupAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapGroupAdministration.php'; $sua = new ilSoapGroupAdministration(); return $sua->updateGroup($sid, $ref_id, $grp_xml); } @@ -724,14 +724,14 @@ public static function updateGroup(string $sid, int $ref_id, string $grp_xml) */ public static function getIMSManifestXML(string $sid, int $ref_id) { - include_once './webservice/soap/classes/class.ilSoapSCORMAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapSCORMAdministration.php'; $sua = new ilSoapSCORMAdministration(); return $sua->getIMSManifestXML($sid, $ref_id); } public static function hasSCORMCertificate(string $sid, int $ref_id, int $usr_id) { - include_once './webservice/soap/classes/class.ilSoapSCORMAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapSCORMAdministration.php'; $sua = new ilSoapSCORMAdministration(); return $sua->hasSCORMCertificate($sid, $ref_id, $usr_id); } @@ -741,7 +741,7 @@ public static function hasSCORMCertificate(string $sid, int $ref_id, int $usr_id */ public static function copyObject(string $sid, string $copy_settings_xml) { - include_once './webservice/soap/classes/class.ilSoapObjectAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php'; $soa = new ilSoapObjectAdministration(); return $soa->copyObject($sid, $copy_settings_xml); } @@ -761,7 +761,7 @@ public static function startBackgroundTaskWorker(string $sid) */ public static function moveObject(string $sid, int $ref_id, int $target_id) { - include_once './webservice/soap/classes/class.ilSoapObjectAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php'; $soa = new ilSoapObjectAdministration(); return $soa->moveObject($sid, $ref_id, $target_id); } @@ -771,7 +771,7 @@ public static function moveObject(string $sid, int $ref_id, int $target_id) */ public static function getTestResults(string $sid, int $ref_id, bool $sum_only) { - include_once './webservice/soap/classes/class.ilSoapTestAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapTestAdministration.php'; $soa = new ilSoapTestAdministration(); return $soa->getTestResults($sid, $ref_id, $sum_only); } @@ -781,7 +781,7 @@ public static function getTestResults(string $sid, int $ref_id, bool $sum_only) */ public static function removeTestResults(string $sid, int $ref_id, array $a_user_ids) { - include_once './webservice/soap/classes/class.ilSoapTestAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapTestAdministration.php'; $soa = new ilSoapTestAdministration(); return $soa->removeTestResults($sid, $ref_id, $a_user_ids); } @@ -791,7 +791,7 @@ public static function removeTestResults(string $sid, int $ref_id, array $a_user */ public static function getCoursesForUser(string $sid, string $parameters) { - include_once 'webservice/soap/classes/class.ilSoapCourseAdministration.php'; + include_once 'components/ILIAS/soap/classes/class.ilSoapCourseAdministration.php'; $soc = new ilSoapCourseAdministration(); return $soc->getCoursesForUser($sid, $parameters); } @@ -801,7 +801,7 @@ public static function getCoursesForUser(string $sid, string $parameters) */ public static function getGroupsForUser(string $sid, string $parameters) { - include_once 'webservice/soap/classes/class.ilSoapGroupAdministration.php'; + include_once 'components/ILIAS/soap/classes/class.ilSoapGroupAdministration.php'; $soc = new ilSoapGroupAdministration(); return $soc->getGroupsForUser($sid, $parameters); } @@ -811,7 +811,7 @@ public static function getGroupsForUser(string $sid, string $parameters) */ public static function getPathForRefId(string $sid, int $ref_id) { - include_once 'webservice/soap/classes/class.ilSoapObjectAdministration.php'; + include_once 'components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php'; $soa = new ilSoapObjectAdministration(); return $soa->getPathForRefId($sid, $ref_id); } @@ -821,14 +821,14 @@ public static function getPathForRefId(string $sid, int $ref_id) */ public static function searchRoles(string $sid, string $key, string $combination, string $role_type) { - include_once 'webservice/soap/classes/class.ilSoapRBACAdministration.php'; + include_once 'components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php'; $roa = new ilSoapRBACAdministration(); return $roa->searchRoles($sid, $key, $combination, $role_type); } public static function getInstallationInfoXML(): string { - include_once 'webservice/soap/classes/class.ilSoapAdministration.php'; + include_once 'components/ILIAS/soap/classes/class.ilSoapAdministration.php'; $roa = new ilSoapAdministration(); return $roa->getInstallationInfoXML(); } @@ -838,7 +838,7 @@ public static function getInstallationInfoXML(): string */ public static function getClientInfoXML(string $clientid) { - include_once 'webservice/soap/classes/class.ilSoapAdministration.php'; + include_once 'components/ILIAS/soap/classes/class.ilSoapAdministration.php'; $roa = new ilSoapAdministration(); return $roa->getClientInfoXML($clientid); } @@ -874,7 +874,7 @@ public static function buildHTTPPath(): string */ public static function getSCORMCompletionStatus(string $sid, int $usr_id, int $a_ref_id) { - include_once './webservice/soap/classes/class.ilSoapSCORMAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapSCORMAdministration.php'; $sua = new ilSoapSCORMAdministration(); return $sua->getSCORMCompletionStatus($sid, $usr_id, $a_ref_id); } @@ -884,7 +884,7 @@ public static function getSCORMCompletionStatus(string $sid, int $usr_id, int $a */ public static function getUserIdBySid(string $sid) { - include_once './webservice/soap/classes/class.ilSoapUserAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapUserAdministration.php'; $sua = new ilSoapUserAdministration(); return $sua->getUserIdBySid($sid); } @@ -894,7 +894,7 @@ public static function getUserIdBySid(string $sid) */ public static function readWebLink(string $sid, int $ref_id) { - include_once './webservice/soap/classes/class.ilSoapWebLinkAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapWebLinkAdministration.php'; $swa = new ilSoapWebLinkAdministration(); return $swa->readWebLink($sid, $ref_id); } @@ -904,7 +904,7 @@ public static function readWebLink(string $sid, int $ref_id) */ public static function createWebLink(string $sid, int $ref_id, string $xml) { - include_once './webservice/soap/classes/class.ilSoapWebLinkAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapWebLinkAdministration.php'; $swa = new ilSoapWebLinkAdministration(); return $swa->createWebLink($sid, $ref_id, $xml); @@ -915,14 +915,14 @@ public static function createWebLink(string $sid, int $ref_id, string $xml) */ public static function updateWebLink(string $sid, int $ref_id, string $xml) { - include_once './webservice/soap/classes/class.ilSoapWebLinkAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapWebLinkAdministration.php'; $swa = new ilSoapWebLinkAdministration(); return $swa->updateWebLink($sid, $ref_id, $xml); } public static function deleteExpiredDualOptInUserObjects(string $sid, int $usr_id): bool { - include_once './webservice/soap/classes/class.ilSoapUtils.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapUtils.php'; $sou = new ilSoapUtils(); $sou->disableSOAPCheck(); @@ -935,7 +935,7 @@ public static function deleteExpiredDualOptInUserObjects(string $sid, int $usr_i */ public static function deleteProgress(string $sid, array $ref_ids, array $usr_ids, array $type_filter, array $progress_filter) { - include_once './webservice/soap/classes/class.ilSoapLearningProgressAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapLearningProgressAdministration.php'; $sla = new ilSoapLearningProgressAdministration(); return $sla->deleteProgress($sid, $ref_ids, $usr_ids, $type_filter, $progress_filter); } @@ -945,7 +945,7 @@ public static function deleteProgress(string $sid, array $ref_ids, array $usr_id */ public static function getLearningProgressChanges(string $sid, string $timestamp, bool $include_ref_ids, array $type_filter) { - include_once './webservice/soap/classes/class.ilSoapLearningProgressAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapLearningProgressAdministration.php'; $s = new ilSoapLearningProgressAdministration(); return $s->getLearningProgressChanges($sid, $timestamp, $include_ref_ids, $type_filter); } @@ -955,7 +955,7 @@ public static function getLearningProgressChanges(string $sid, string $timestamp */ public static function getProgressInfo(string $sid, int $ref_id, array $progress_filter) { - include_once './webservice/soap/classes/class.ilSoapLearningProgressAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapLearningProgressAdministration.php'; $sla = new ilSoapLearningProgressAdministration(); return $sla->getProgressInfo($sid, $ref_id, $progress_filter); } @@ -965,7 +965,7 @@ public static function getProgressInfo(string $sid, int $ref_id, array $progress */ public static function exportDataCollectionContent(string $sid, int $data_collection_id, ?int $table_id = null, string $format = "xls", ?string $filepath = null) { - include_once './webservice/soap/classes/class.ilSoapDataCollectionAdministration.php'; + include_once './components/ILIAS/soap/classes/class.ilSoapDataCollectionAdministration.php'; $dcl = new ilSoapDataCollectionAdministration(); return $dcl->exportDataCollectionContent($sid, $data_collection_id, $table_id, $format, $filepath); } diff --git a/composer.json b/composer.json index 55aecaa696c2..b3038f4f6d82 100644 --- a/composer.json +++ b/composer.json @@ -94,7 +94,7 @@ "./components/SERVICEPROVIDER", "./components/ILIAS", "./libs/ilias", - "./webservice/soap", + "./components/ILIAS/soap", "./setup/classes" ], "exclude-from-classmap": [ diff --git a/public/soap/nusoapserver.php b/public/soap/nusoapserver.php index e8212b3a8fa4..89b97369093a 100644 --- a/public/soap/nusoapserver.php +++ b/public/soap/nusoapserver.php @@ -31,15 +31,15 @@ * @package ilias */ -if (!defined('ILIAS_MODULE') || (defined('ILIAS_MODULE') && ILIAS_MODULE !== "webservice/soap")) { +if (!defined('ILIAS_MODULE') || (defined('ILIAS_MODULE') && ILIAS_MODULE !== "components/ILIAS/soap")) { //direct call to this endpoint chdir("../.."); - define("ILIAS_MODULE", "webservice/soap"); + define("ILIAS_MODULE", "components/ILIAS/soap"); define("IL_SOAPMODE_NUSOAP", 0); define("IL_SOAPMODE_INTERNAL", 1); define("IL_SOAPMODE", IL_SOAPMODE_NUSOAP); } -include_once './webservice/soap/classes/class.ilNusoapUserAdministrationAdapter.php'; +include_once './components/ILIAS/soap/classes/class.ilNusoapUserAdministrationAdapter.php'; $server = new ilNusoapUserAdministrationAdapter(true); $server->start(); diff --git a/public/soap/server.php b/public/soap/server.php index 9b279e0e2b9c..ec8dd5a02aa9 100644 --- a/public/soap/server.php +++ b/public/soap/server.php @@ -12,7 +12,7 @@ */ chdir("../.."); -const ILIAS_MODULE = "webservice/soap"; +const ILIAS_MODULE = "components/ILIAS/soap"; const IL_SOAPMODE_NUSOAP = 0; const IL_SOAPMODE_INTERNAL = 1; @@ -37,7 +37,7 @@ if (IL_SOAPMODE === IL_SOAPMODE_INTERNAL && strcasecmp($_SERVER["REQUEST_METHOD"], "post") === 0) { // This is a SOAP request - include_once('webservice/soap/include/inc.soap_functions.php'); + include_once('components/ILIAS/soap/include/inc.soap_functions.php'); $uri = ilSoapFunctions::buildHTTPPath() . '/public/soap/server.php'; if (isset($_GET['client_id'])) { $uri .= '?client_id=' . $_GET['client_id']; diff --git a/tests/App/RootFolderTest.php b/tests/App/RootFolderTest.php index 06312abcda23..8218ec91c98f 100644 --- a/tests/App/RootFolderTest.php +++ b/tests/App/RootFolderTest.php @@ -99,7 +99,6 @@ final class RootFolderTest extends TestCase 'test', 'tests', 'vendor', - 'webservice', 'xml', '.settings' ];