Customizing: remove directory /Customizing

components/ILIAS/App/tests/RootFolderTest.php

@@ -63,7 +63,6 @@ final class RootFolderTest extends TestCase
         'artifacts',
         'cli',
         'components',
-        'Customizing',
         'docs',
         'extern',
         'lang',

components/ILIAS/FileServices/classes/class.ilFileUtils.php

@@ -364,7 +364,7 @@ protected static function sanitateTargetPath(string $a_target): array
             str_starts_with($a_target, CLIENT_DATA_DIR . "/temp") => Location::TEMPORARY,
             str_starts_with($a_target, CLIENT_DATA_DIR) => Location::STORAGE,
 
-            str_starts_with($a_target, ILIAS_ABSOLUTE_PATH . '/Customizing') => Location::CUSTOMIZING,
+            str_starts_with($a_target, ILIAS_ABSOLUTE_PATH . '/public/Customizing') => Location::CUSTOMIZING,
             default => throw new InvalidArgumentException(
                 "Can not move files to \"$a_target\" because path can not be mapped to web, storage or customizing location."
             ),

components/ILIAS/Filesystem/classes/Setup/class.ilFileSystemDirectoriesCreatedObjective.php

@@ -90,7 +90,7 @@ public function getPreconditions(Setup\Environment $environment): array
             );
             $customizing_dir_objective = new ilFileSystemDirectoryCopiedRecursivelyObjective(
                 $tmp_dir . DIRECTORY_SEPARATOR . "Customizing",
-                $root . "/Customizing",
+                $root . "/public/Customizing",
                 false,
                 true
             );

components/ILIAS/Filesystem/src/Util/LegacyPathHelper.php

@@ -220,7 +220,7 @@ private static function listPaths(): array
         $webRelativeWithLeadingDot = './' . ILIAS_WEB_DIR . '/' . CLIENT_ID;
         $webRelativeWithoutLeadingDot = ILIAS_WEB_DIR . '/' . CLIENT_ID;
         $storage = CLIENT_DATA_DIR;
-        $customizing = ILIAS_ABSOLUTE_PATH . '/Customizing';
+        $customizing = ILIAS_ABSOLUTE_PATH . '/public/Customizing';
         $customizingRelativeWithLeadingDot = './Customizing';
         $libs = ILIAS_ABSOLUTE_PATH . '/vendor';
         $libsRelativeWithLeadingDot = "./vendor";

components/ILIAS/Init/classes/class.ilInitialisation.php

@@ -269,7 +269,7 @@ public static function bootstrapFilesystems(): void
              * @var FilesystemFactory $delegatingFactory
              */
             $delegatingFactory = $c['filesystem.factory'];
-            $customizingConfiguration = new \ILIAS\Filesystem\Provider\Configuration\LocalConfig(ILIAS_ABSOLUTE_PATH . '/' . 'Customizing');
+            $customizingConfiguration = new \ILIAS\Filesystem\Provider\Configuration\LocalConfig(ILIAS_ABSOLUTE_PATH . '/public/' . 'Customizing');
             return $delegatingFactory->getLocal($customizingConfiguration);
         };
 

components/ILIAS/Language/classes/Setup/class.ilSetupLanguage.php

@@ -55,7 +55,7 @@ public function __construct(string $a_lang_key)
         $this->lang_key = $a_lang_key ?: $this->lang_default;
         $il_absolute_path = realpath(__DIR__ . "/../../../../../");
         $this->lang_path = $il_absolute_path . "/lang";
-        $this->cust_lang_path = $il_absolute_path . "/Customizing/global/lang";
+        $this->cust_lang_path = $il_absolute_path . "/lang/Customizing";
     }
 
     /**

components/ILIAS/Language/classes/class.ilLanguage.php

@@ -83,7 +83,7 @@ public function __construct(string $a_lang_key)
         $this->usage_log_enabled = self::isUsageLogEnabled();
 
         $this->lang_path = ILIAS_ABSOLUTE_PATH . "/lang";
-        $this->cust_lang_path = ILIAS_ABSOLUTE_PATH . "/Customizing/global/lang";
+        $this->cust_lang_path = ILIAS_ABSOLUTE_PATH . "/lang/Customizing";
 
         $this->lang_default = $client_ini->readVariable("language", "default") ?? 'en';
         $this->lang_user = $this->lang_default;

components/ILIAS/Mail/README.md

@@ -95,7 +95,7 @@ when no template can be determined.
 Per Skin, one HTML template can be defined and has to be
 stored in the following location:
 
-    ./Customizing/global/skin/<SKIN-NAME>/<STYLE-NAME>/components/ILIAS/Mail/tpl.html_mail_template.html.
+    ./public/Customizing/skin/<SKIN-NAME>/<STYLE-NAME>/components/ILIAS/Mail/tpl.html_mail_template.html.
 
 The HTML frame template concept consists of the HTML
 markup file itself and some optional attachments.

components/ILIAS/Mail/classes/class.ilMimeMail.php

@@ -288,7 +288,7 @@ protected function getHtmlEnvelope(string $skin, string $style): string
 
             foreach ($locations as $location) {
                 $custom_path = $this->getPathToRootDirectory(
-                ) . '/public/Customizing/global/skin/' . $location . '/components/ILIAS/Mail/tpl.html_mail_template.html';
+                ) . '/public/Customizing/skin/' . $location . '/components/ILIAS/Mail/tpl.html_mail_template.html';
                 if (is_file($custom_path)) {
                     $bracket_path = $custom_path;
                     break;
@@ -313,7 +313,7 @@ protected function buildHtmlInlineImages(string $skin, string $style): void
 
             foreach ($locations as $location) {
                 $custom_directory = $this->getPathToRootDirectory(
-                ) . '/public/Customizing/global/skin/' . $location . '/components/ILIAS/Mail/img';
+                ) . '/public/Customizing/skin/' . $location . '/components/ILIAS/Mail/img';
                 if (is_dir($custom_directory) && is_readable($custom_directory)) {
                     $this->gatherImagesFromDirectory($custom_directory, true);
                     break;

components/ILIAS/OrgUnit/classes/Positions/Authorities/class.ilOrgUnitGenericMultiInputGUI.php

@@ -228,7 +228,6 @@ private function createInputPostVar(string $iterator_id, \ilFormPropertyGUI $inp
     public function render(int|string $iterator_id = 0, bool $clean_render = false): string
     {
         $first_label = true;
-        //		$tpl = new \ilTemplate("tpl.multi_line_input.html", true, true, 'Customizing/global/plugins/Services/Repository/RepositoryObject/LiveVoting');
         $tpl = new ilTemplate("tpl.prop_generic_multi_line.html", true, true, 'components/ILIAS/OrgUnit');
 
         $class = 'multi_input_line';

components/ILIAS/StaticURL/tests/URIBuilderTest.php

@@ -44,7 +44,7 @@ public static function getILIAS_HTTP_Paths(): array
             ['http://test9.ilias.de/goto.php', 'http://test9.ilias.de'],
             ['http://test9.ilias.de/go/hello', 'http://test9.ilias.de'],
             ['http://test9.ilias.de/go/hello', 'http://test9.ilias.de'],
-            ['http://test9.ilias.de/Customizing/global/plugins/Services/index.php', 'http://test9.ilias.de'],
+            ['http://test9.ilias.de/Customizing/plugins/Services/index.php', 'http://test9.ilias.de'],
         ];
     }
 

components/ILIAS/Style/System/classes/class.ilImagePathResolver.php

@@ -39,7 +39,7 @@ public function resolveImagePath(string $image_path): string
 
         if (is_object($styleDefinition) && $current_skin != "default") {
             $image_dir = $styleDefinition->getImageDirectory($current_style);
-            $skin_img = "./Customizing/global/skin/" .
+            $skin_img = "./Customizing/skin/" .
                 $current_skin . "/" . $current_style . "/" . $image_dir . "/" . $image_path;
         }
 

components/ILIAS/Test/classes/class.ilTestHTMLGenerator.php

@@ -152,7 +152,7 @@ private function getTemplatePath($a_filename, $module_path = 'components/ILIAS/T
     {
         $fname = '';
         if (ilStyleDefinition::getCurrentSkin() !== 'default') {
-            $fname = './Customizing/global/skin/' .
+            $fname = './Customizing/skin/' .
                     ilStyleDefinition::getCurrentSkin() . '/' . $module_path . basename($a_filename);
         }
 

components/ILIAS/UICore/classes/class.ilTemplate.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
@@ -18,6 +16,8 @@
  *
  *********************************************************************/
 
+declare(strict_types=1);
+
 require_once __DIR__ . '/../lib/html-it/IT.php';
 require_once __DIR__ . '/../lib/html-it/ITX.php';
 
@@ -332,12 +332,12 @@ protected function getTemplatePath(string $a_tplname, string $a_in_module = null
             if (ilStyleDefinition::getCurrentSkin() !== "default") {
                 $style = ilStyleDefinition::getCurrentStyle();
 
-                $fname = "./Customizing/global/skin/" .
+                $fname = "./Customizing/skin/" .
                     ilStyleDefinition::getCurrentSkin() . "/" . $style . "/" . $module_path
                     . basename($a_tplname);
 
                 if ($fname === "" || !file_exists($fname)) {
-                    $fname = "./Customizing/global/skin/" .
+                    $fname = "./Customizing/skin/" .
                         ilStyleDefinition::getCurrentSkin() . "/" . $module_path . basename($a_tplname);
                 }
             }
@@ -350,7 +350,7 @@ protected function getTemplatePath(string $a_tplname, string $a_in_module = null
                 && ilStyleDefinition::getCurrentSkin() != "default") {
                 $style = ilStyleDefinition::getCurrentStyle();
                 $skin = ilStyleDefinition::getCurrentSkin();
-                $base_path = "./Customizing/global/skin/";
+                $base_path = "./Customizing/skin/";
                 $ui_path = "/" . str_replace("components/ILIAS/UI/src/templates/default", "UI", $a_tplname);
                 $fname = $base_path . ilStyleDefinition::getCurrentSkin() . "/" . $style . "/" . $ui_path;
 

components/ILIAS/Utilities/classes/class.ilUtil.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
@@ -185,7 +186,7 @@ public static function getNewContentStyleSheetLocation(string $mode = "output"):
             $in_style = "./templates/" . ilStyleDefinition::getCurrentSkin() . "/"
                 . ilStyleDefinition::getCurrentStyle() . "_cont.css";
         } else {
-            $in_style = "./Customizing/global/skin/" . ilStyleDefinition::getCurrentSkin() . "/"
+            $in_style = "./Customizing/skin/" . ilStyleDefinition::getCurrentSkin() . "/"
                 . ilStyleDefinition::getCurrentStyle() . "_cont.css";
         }
 

composer.json

@@ -19,7 +19,8 @@
 			"@php cli/setup.php build --yes"
 		],
 		"pre-install-cmd": [
-			"mkdir -p public/Customizing/plugins"
+			"mkdir -p public/Customizing/plugins",
+			"mkdir -p public/Customizing/skin"
 		],
 		"post-install-cmd": [
 			"@php vendor/composer/rmdirs.php"
@@ -98,7 +99,6 @@
 		"exclude-from-classmap": [
 			"./components/ILIAS/Migration",
 			"./*/*/lib",
-			"./Customizing/**/vendor",
 			"./public/Customizing/**/vendor",
 			"./components/ILIAS/setup_/sql",
 			"./cli/setup.php",

lang/Customizing/README.md

@@ -0,0 +1,10 @@
+# Custom Language Changes
+
+You may change terms used in the user interface of ILIAS. To do this, use the
+same format as is used in the language files in directory `/lang`. Store the
+values to be overwritten in files ending with `.lang.local` and put them into
+the `/lang/Customizing` directory.
+
+```
+/lang/Customizing/ilias_<lang_code>.lang.local
+```