adjust include to cli dir.

lukastocker · Sep 12, 2023 · 16cfe1f · 16cfe1f
1 parent b46681f
commit 16cfe1f
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/components/ILIAS/COPage/test/ilServicesCOPageSuite.php b/components/ILIAS/COPage/test/ilServicesCOPageSuite.php
@@ -45,8 +45,8 @@ public static function suite(): self
         require_once("./components/ILIAS/COPage/test/PCSectionTest.php");
         $suite->addTestSuite("PCSectionTest");
 
-        require_once("./include/inc.xml5compliance.php");
-        require_once("./include/inc.xsl5compliance.php");
+        require_once("./cli/inc.xml5compliance.php");
+        require_once("./cli/inc.xsl5compliance.php");
         require_once("./components/ILIAS/COPage/test/class.ilUnitTestPageConfig.php");
         require_once("./components/ILIAS/COPage/test/PageObjectTest.php");
         require_once("./components/ILIAS/COPage/test/class.ilUnitTestPageObject.php");

diff --git a/components/ILIAS/Cron/classes/class.ilCronStartUp.php b/components/ILIAS/Cron/classes/class.ilCronStartUp.php
@@ -33,7 +33,7 @@ public function __construct(
 
         // TODO @see mantis 20371: To get rid of this, the authentication service has to provide a mechanism to pass the client_id
         $_GET['client_id'] = $this->client;
-        require_once './include/inc.header.php';
+        require_once './cli/inc.header.php';
 
         if (null === $authSession) {
             global $DIC;

diff --git a/components/ILIAS/Init/classes/class.ilInitialisation.php b/components/ILIAS/Init/classes/class.ilInitialisation.php
@@ -98,7 +98,7 @@ protected static function recursivelyRemoveUnsafeCharacters($var)
     protected static function requireCommonIncludes(): void
     {
         /** @noRector */
-        require_once "include/inc.ilias_version.php";
+        require_once "cli/inc.ilias_version.php";
 
         self::initGlobal("ilBench", "ilBenchmark", "./components/ILIAS/Utilities/classes/class.ilBenchmark.php");
     }
@@ -111,10 +111,10 @@ protected static function includePhp5Compliance(): void
     {
         if (ilAuthFactory::getContext() != ilAuthFactory::CONTEXT_CAS) {
             /** @noRector */
-            require_once("include/inc.xml5compliance.php");
+            require_once("cli/inc.xml5compliance.php");
         }
         /** @noRector */
-        require_once("include/inc.xsl5compliance.php");
+        require_once("cli/inc.xsl5compliance.php");
     }
 
     /**

diff --git a/components/ILIAS/Init/classes/class.ilPasswordAssistanceGUI.php b/components/ILIAS/Init/classes/class.ilPasswordAssistanceGUI.php
@@ -306,7 +306,7 @@ public function sendPasswordAssistanceMail(ilObjUser $userObj): void
     {
         global $DIC;
 
-        require_once 'include/inc.pwassist_session_handler.php';
+        require_once 'cli/inc.pwassist_session_handler.php';
 
         // Create a new session id
         // #9700 - this didn't do anything before?!
@@ -413,7 +413,7 @@ public function showAssignPasswordForm(ilPropertyFormGUI $form = null, string $p
         }
 
         // Retrieve the session, and check if it is valid
-        require_once 'include/inc.pwassist_session_handler.php';
+        require_once 'cli/inc.pwassist_session_handler.php';
         $pwassist_session = db_pwassist_session_read($pwassist_id);
         if (
             !is_array($pwassist_session) ||
@@ -459,7 +459,7 @@ public function showAssignPasswordForm(ilPropertyFormGUI $form = null, string $p
      */
     public function submitAssignPasswordForm(): void
     {
-        require_once 'include/inc.pwassist_session_handler.php';
+        require_once 'cli/inc.pwassist_session_handler.php';
 
         // We need to fetch this before form instantiation
         $pwassist_id = ilUtil::stripSlashes($_POST['key']);
@@ -659,7 +659,7 @@ public function sendUsernameAssistanceMail(string $email, array $logins): void
     {
         global $DIC;
 
-        require_once 'include/inc.pwassist_session_handler.php';
+        require_once 'cli/inc.pwassist_session_handler.php';
 
         $login_url = $this->buildUrl(
             'pwassist.php',

diff --git a/components/ILIAS/TestQuestionPool/save_question_post_data.php b/components/ILIAS/TestQuestionPool/save_question_post_data.php
@@ -3,7 +3,7 @@
 /* Copyright (c) 1998-2013 ILIAS open source, Extended GPL, see docs/LICENSE */
 
 chdir("../..");
-require_once "./include/inc.header.php";
+require_once "./cli/inc.header.php";
 include_once "./webservice/soap/include/inc.soap_functions.php";
 $results = array();
 foreach ($_POST as $key => $value) {

diff --git a/components/ILIAS/WebServices/Rest/server.php b/components/ILIAS/WebServices/Rest/server.php
@@ -9,7 +9,7 @@
 
 $_COOKIE['client_id'] = $_GET['client_id'] = $_REQUEST['client_id'];
 
-include_once './include/inc.header.php';
+include_once './cli/inc.header.php';
 
 
 include_once './components/ILIAS/WebServices/Rest/classes/class.ilRestServer.php';

diff --git a/setup/cli.php b/setup/cli.php
@@ -9,7 +9,7 @@
 
 require_once(__DIR__ . "/../libs/composer/vendor/autoload.php");
 
-require_once(__DIR__ . "/../include/inc.ilias_version.php");
+require_once(__DIR__ . "/../cli/inc.ilias_version.php");
 
 // according to ./components/ILIAS/Feeds/classes/class.ilExternalFeed.php:
 if (!defined("MAGPIE_DIR")) {

diff --git a/webservice/soap/classes/class.ilSoapSCORMAdministration.php b/webservice/soap/classes/class.ilSoapSCORMAdministration.php
@@ -157,7 +157,7 @@ public function getSCORMCompletionStatus(string $sid, int $a_usr_id, int $a_ref_
             return $this->raiseError('No ref_id given. Aborting!', 'Client');
         }
 
-        include_once 'include/inc.header.php';
+        include_once 'cli/inc.header.php';
 
         if (!$obj_id = ilObject::_lookupObjectId($a_ref_id)) {
             return $this->raiseError(